Commit Graph

1986 Commits

Author SHA1 Message Date
Ladislau Szomoru
557228e262 SCM - Source Control Graph view (#226250)
* Added the new view

* Add support for getting N number of commits

* Added view title actions

* More work to enable view/repository actions

* Expand the view by default, and always show the last N commits

* Add context menu actions

* Improve actions

* Basic infinite scrolling implemented

* Better implementation using --skip instead of a cursor

* Do not refresh graph when pressing Refresh

* Refactor load more/caching

* Rename the view

* Add support for the find widget
2024-08-22 15:54:22 +02:00
Ladislau Szomoru
cd360e0318 SCM - remove incoming/outgoing/history graph from the Source Control view (#226241) 2024-08-22 12:42:14 +02:00
Ladislau Szomoru
6b0fa93c81 Git - extension should only open repositories for resources with the file scheme (#225024) 2024-08-07 02:20:56 -07:00
Ladislau Szomoru
dad736b252 Git - handle files that contain [ in their name when adding to .gitignore (#224777) 2024-08-05 09:33:22 +02:00
Ladislau Szomoru
151e03b633 Git - add support for reftable storage format (#224395) 2024-07-31 08:49:46 -07:00
Ladislau Szomoru
887cdf05ee Git - add more git sub-commands that would result in refreshing the SCM viewlet (#224185) 2024-07-29 06:58:00 -07:00
Ladislau Szomoru
9c9ef6614b Git - improve handling of first commit (#224165) 2024-07-29 11:01:34 +02:00
Ladislau Szomoru
78d09a85c7 SCM - improve history graph filtering (#223497) 2024-07-24 16:39:57 +02:00
Ladislau Szomoru
03f4cbc915 Git - fix condition for setting the base branch (#223493) 2024-07-24 06:23:37 -07:00
Ladislau Szomoru
9219bf5f1f Git - use first commit as common ancestor if the repository has not been published to a remote (#223476) 2024-07-24 01:38:31 -07:00
Ladislau Szomoru
b97d0a2cb5 Git - include changes from both commits in the range (#223050) 2024-07-22 14:03:38 +02:00
Ladislau Szomoru
cba3b82197 Git - get short stats for the common ancestor commit (#222937) 2024-07-22 10:47:07 +02:00
Ladislau Szomoru
08c88cee36 SCM - better handle empty commits (#222194) 2024-07-19 07:59:30 -07:00
Ladislau Szomoru
0c0837460f SCM - add support for multi-select in the history graph (#222186) 2024-07-19 07:23:01 -07:00
Ladislau Szomoru
129edfe9cd SCM - add basic context menu to history graph (#222162) 2024-07-19 03:20:53 -07:00
Ladislau Szomoru
f674ef206c Git - only set base if it's different than remote (#222163) 2024-07-19 03:05:52 -07:00
Ladislau Szomoru
466bb876a6 Git - update terminal shell integration (#222155) 2024-07-19 09:26:50 +02:00
Ladislau Szomoru
b17732f43c Git - add terminal shell execution listener (#221895) 2024-07-17 14:28:09 +05:30
Ladislau Szomoru
31f831310c SCM - 💄 history provider observables cleanup (#221474) 2024-07-11 08:21:53 -07:00
Ladislau Szomoru
3b37bcdc19 SCM - add revision to history item group (#221408)
* SCM - add revision to history item group

* 💄 Cleaned things up
2024-07-10 12:53:20 -07:00
Tyler James Leonhardt
b07596a8aa Polish QuickInputButtonLocation (#221403)
* Fix a bug where the buttons would show up when they shouldn't by clearing them on show like the other ActionBars
* Introduce Proposed API (changed the core shape to reflect)
* Adopted in Git extension

ref https://github.com/microsoft/vscode/issues/221397
2024-07-10 11:39:24 -07:00
Ladislau Szomoru
233ccb7df9 SCM - refactoring to enable filtering of history item groups (#221395) 2024-07-10 11:00:19 -07:00
Ladislau Szomoru
7ed4861b96 Git - do not use commit^.. to get the list of commits (#221287) 2024-07-09 17:15:07 +02:00
Ladislau Szomoru
c4e1a5aabc Git - fix fetchRef, pullRef, pushRef commands (#221273) 2024-07-09 15:12:19 +02:00
Ladislau Szomoru
fc8ade92b0 Git - add exception handling to handle edge cases (#221254) 2024-07-09 12:16:19 +02:00
Ladislau Szomoru
f3930566bd Git - 💄 fix log message format (#221218) 2024-07-08 20:51:52 +02:00
Ladislau Szomoru
cf8fdae691 SCM - update history graph hover (#221039) 2024-07-08 13:21:05 +02:00
Ladislau Szomoru
d0f0de52df Git - fix commit flow regression (#220991) 2024-07-08 09:14:50 +02:00
Ladislau Szomoru
c040699c44 Git - standardize logging in the git extension (#220043)
* Git - more logging

* Git - more logging changes
2024-07-05 11:26:48 +02:00
Ladislau Szomoru
83c722d9a1 Git - 💄 better error handling and clean-up logging (#219975) 2024-07-04 17:12:06 +02:00
Ladislau Szomoru
f94698b3dd Git - do not show progress while running Config and GetBranch operations (#219940) 2024-07-04 12:56:55 +02:00
Ladislau Szomoru
a238e15485 Git - fix timing issue with branch picker (#219864) 2024-07-03 16:11:57 +02:00
Ladislau Szomoru
3c7cbd264e Git - include unstaged changes when amending a commit and smart commit is enabled (#219675) 2024-07-02 14:50:50 +02:00
Ladislau Szomoru
64c1b1cc60 Revert "Git - do not show smart commit dialog when using Commit (Amend) (#214595)" (#218377)
This reverts commit 5422f5f940.
2024-06-26 15:04:40 +02:00
Ladislau Szomoru
68ca9a7f4c SCM - improve merge-base detection (#216823) 2024-06-21 17:53:13 +02:00
Ladislau Szomoru
eb4092a6de Git - more cleanup of the history item labels (#216648)
* Git - 💄 history provider cleanup

* Git - more cleanup of the history item labels
2024-06-20 01:23:05 +02:00
Ladislau Szomoru
f280d9980f Git - 💄 history provider cleanup (#216647) 2024-06-19 16:01:02 -07:00
Ladislau Szomoru
856fba0b67 SCM - more work related to history (#216641)
* Rename base to remote

* introduce base

* Remove resolveHistoryItemGroupBase

* 💄

* More 💄

* Remove file that is out of scope
2024-06-19 22:05:10 +02:00
Ladislau Szomoru
484cd68eff SCM - history view (#216629)
* Hacked up the starting point

* More progress

* More progress

* Simplified algo, basic support for colors

* Add the concept of secondary colors for merge commits

* Further optimizations of the algo

* Bug fixes to clean-up algo

* Add support for curved branches

* Keep track of nodes that are moved so that the second parent for the merge commit is rendered in the correct swimlane

* Account for offset when drawing a base commit

* Algo rework completed

* Revert some of the hacks that were put in place to quickly get going

* Add caching to the history items used in the graph
Remove more hacks that were in place

* Added initial tests

* More work so that incoming/outgoing works along history

* Uncomment more code

* Bug fixes to edge cases

* Experiment with a new rendering for curved branches

* Handle repository with a single commit

* Maintain swimlanes

* Fix condition

* Saving my changes

* More polish and clean-up

* Remove code that is not needed

* Revert change

* Revert more changes

* More fixes

* Rename interface

* One last minor change

* Pull request feedback

* More refactoring

* More pull request feedback

* Fix layering issues
2024-06-19 19:45:06 +02:00
Ladislau Szomoru
a8e00a00dd Git - expose untracked changes group (#216414) 2024-06-18 10:59:53 +02:00
Ladislau Szomoru
5422f5f940 Git - do not show smart commit dialog when using Commit (Amend) (#214595) 2024-06-07 15:51:20 +02:00
Ladislau Szomoru
3d7e352d2d Git - empty commit should not include unstaged changes (#214587) 2024-06-07 14:08:33 +02:00
yutotnh
3ab7948e14 Add the ability to specify a list of candidate encodings when guessing encoding (#36951) (#208550)
* Allow to configure a list of encodings to use when guessing #36951

* Bump up the jschardet version into 3.1.2 #36951

* missing merge

* some polish

* renames

* some polish

* some polish

* cleanup

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
2024-06-05 10:23:20 +00:00
Ladislau Szomoru
cf3e34fc2f Git - add error handling for traversing workspace folders during repository discovery (#213975) 2024-05-31 11:24:12 +02:00
Connor Peet
6629c4e0a9 git: allow querying whether files are gitignore (#212982)
* git: allow querying whether files are gitignore

This exposes `checkIgnore`, which I want to use in copilot to determine
which files I should go into when checking references.

* rename method
2024-05-23 21:28:04 +02:00
Robo
5216c04428 chore: update to electron 29 (#209818)
* chore: update electron@29.1.0

* chore: update typings to 20.x

* chore: bump electron@29.1.5

* ci: fix crash in compiling extensions-ci

* chore: disable .d.ts check for build/

$ ../node_modules/.bin/tsc -p tsconfig.build.json
node_modules/@types/chokidar/index.d.ts:21:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/@types/chokidar/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'.
  Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref

21 export class FSWatcher extends EventEmitter implements fs.FSWatcher {
                ~~~~~~~~~

node_modules/chokidar/types/index.d.ts:8:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/chokidar/types/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'.
  Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref

8 export class FSWatcher extends EventEmitter implements fs.FSWatcher {
               ~~~~~~~~~

Found 2 errors in 2 files.

Errors  Files
     1  node_modules/@types/chokidar/index.d.ts:21
     1  node_modules/chokidar/types/index.d.ts:8

Refs a0f9e09f64

* chore: update core types

* temp: fix layer validation

* chore: update nodejs checksums

* ci: use latest v20 LTS for missing node-gyp

Refs eacec5f490

* ci: define LIBCPP_HARDENING_MODE

* ci: fix crash in vscode-web-min-ci

* chore: update rpm deps-list

* chore: bump tree-sitter-typescript@0.20.5

* chore: bump electron@29.3.0

* chore: bump electron@29.3.1

* chore: update rpm deps-list for x86_64

* ci: disable io_uring UV backend on linux

* ci: disable io_uring backend for oss as well

* chore: update typings to 20.x

* ci: add TODO for io_uring workaround

* chore: bump distro

* chore: update preinstall node version checks

* chore: update @types/gulp

Refs https://github.com/microsoft/vscode/issues/212442

* ci: disable io_uring in more test suites
2024-05-11 01:20:28 +09:00
Ladislau Szomoru
b4b87ffac4 Git - show notification when there are no staged changes/changes/untracked changes (#211170) 2024-04-23 21:21:02 +02:00
Pig Fang
a7d0bc8982 Auto close Git multi-diff editor when all files staged or comitted (#210327)
* auto close multi-diff editor when all files staged or comitted

* remove unused vars
2024-04-17 11:16:33 +00:00
Ladislau Szomoru
f9554073cc Git - add dedicated commands to view changes (#209942) 2024-04-09 14:33:13 +02:00
Alex Ross
a1815b994a Fix git merge editor for renames (#209542) 2024-04-08 23:34:48 +02:00