Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-28 13:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
116,999 Commits 3,084 Branches 347 Tags
b7fcbef3e2ebf668d428201c5c5d90a41346ada2
Commit Graph

2281 Commits

Author SHA1 Message Date
Ladislau Szomoru
b0b6913211 Git - gif config should not throw if key does not exist (#200358) 2023-12-08 15:10:52 +01:00
Francis Chartrand
bef295a70b timeline: use follow option so timeline follow file beyond renames (#187174) 
feat(git): use follow option so timeline follow file beyond renames

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2023-12-08 13:03:59 +00:00
Roberto Huertas
62a957135b feat(stash): return the stash result (#177732) 
re #177726
 2023-12-08 12:29:19 +01:00
Ladislau Szomoru
fe055af0a4 Git - improve branch picker when merging (#200331) 
* Git - improve branch picker when merging

* 💄
 2023-12-08 12:26:40 +01:00
Ladislau Szomoru
1466cbfcdf SCM - delete scmInputBoxActionButton proposal (#200012) 2023-12-05 10:52:01 +01:00
Ladislau Szomoru
c5874782c5 SCM - delete scmInputBoxValueProvider proposal (#199778) 2023-12-01 08:54:59 -08:00
Ladislau Szomoru
18b2c92451 Git - remove history provider action button (#199764) 
* Git - remove history provider action button

* Remove debug messages
 2023-12-01 16:10:44 +01:00
Ladislau Szomoru
c6b48c364d Git - remove references of scm.experimental.showSyncView from the Commit action button (#199616) 2023-11-30 01:21:33 +01:00
Henning Dieterichs
2ec8b37bf3 Adopts diff-multiple icon 2023-11-29 10:43:12 +01:00
Ladislau Szomoru
37425a6fbf Git - do not show incoming/outgoing for tags, detached (#199476) 2023-11-28 17:46:31 -08:00
Ladislau Szomoru
aebfa4798c Git - Commit action button fix (#199475) 2023-11-29 02:16:59 +01:00
Ladislau Szomoru
d689bb7950 SCM - handle empty commit in diff statistics badge (#199438) 
* SCM - handle empty commit in diff statistics badge

* Undefined shortStat handled by the history provider
 2023-11-28 15:41:20 -08:00
Henning Dieterichs
b5f1966e92 Merge pull request #199007 from microsoft/hediet/b/like-wolverine 
Adopt config.multiDiffEditor.experimental.enabled
 2023-11-27 12:31:58 +01:00
Ladislau Szomoru
abd2f00bcc SCM - implement scm/inputBox menu (#199147) 
* SCM - fix regression related to the scm input box action button

* Single action working as expected

* Saving my work

* Fix enablement when there is only one action

* More polish when there are multiple actions

* WIP - Select default action

* Add proposal

* Another refactoring

* Update setting type

* Remove setting, store last executed command

* Revert code that was used for testing

* Fix compilation errors

* Remove test commands
 2023-11-27 12:17:26 +01:00
Ladislau Szomoru
10e672c687 Revert "Git - deprecate registerCommitMessageProvider (#198953)" (#199022) 
This reverts commit 93ab1bfe22.
 2023-11-24 14:12:45 +01:00
Ladislau Szomoru
79f8189bb4 Git - update git.inputValidation default value (#199019) 2023-11-24 12:32:54 +01:00
Henning Dieterichs
95d76848a1 Adopt config.multiDiffEditor.experimental.enabled 2023-11-24 10:49:17 +01:00
Ladislau Szomoru
ed6dc7b6b3 Git - fix command titles (#198996) 2023-11-24 09:41:44 +01:00
Ladislau Szomoru
93ab1bfe22 Git - deprecate registerCommitMessageProvider (#198953) 2023-11-23 17:42:17 +01:00
Ladislau Szomoru
a776d5fe0a SCM - input box value provider rendering (#198923) 
* Initial implementation

* Remove debug messages

* Implementation using a custom ActionViewItem

* Switched to using a custom action along with the custom action view item

* Switch to using arrays

* Refactored code (single provider is working)

* Add ActionRunner to options

* WIP - saving my work

* Refactor things to support one provider

* Add setting to enable/disable input action button

* Add sourceControlId to the proposed API

* Fix issue related to enablement

* Remove code that is not in scope

* Have the old action bar work with the setting

* Remove code that was commented out

* Add extension API changes

* Update extensions/git/src/commitMessageProvider.ts

Co-authored-by: João Moreno <joao.moreno@microsoft.com>

* Fix compilation errors

---------

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2023-11-23 16:39:53 +01:00
Henning Dieterichs
9e69692508 Improves editor title 2023-11-21 15:09:29 +01:00
Henning Dieterichs
4328415767 Improves open multi diff editor icon 2023-11-21 14:59:01 +01:00
Ladislau Szomoru
6aa249db00 Git - fix incorrect check (#198396) 2023-11-16 10:45:13 +01:00
Ladislau Szomoru
e0b70e58b3 SCM - add caching layer to incoming/outgoing tree nodes (#198306) 
* Upstream commit + improve onDidChangeCurrentHistoryItemGroup

* Refactor expanding a history item group

* Wire up caching

* Invoking the git.refresh command invalidates the cache

* Clean up cache data structure
 2023-11-15 15:09:18 +01:00
Ladislau Szomoru
ed30010d3f Git - better error handling for git merge-base (#198208) 2023-11-14 14:51:17 +01:00
Ladislau Szomoru
e447d54e1e SCM - Add short state badge for history items (#198126) 
* Git - Extract parsing of git diff short stat

* Add shortStat badge for commits

* Git - specify diff-merges for merge commits

* Add tests
 2023-11-13 16:49:28 +01:00
Ladislau Szomoru
d5b3ed3f68 Git - update open commit command icon (#198084) 2023-11-13 09:37:46 +01:00
Ladislau Szomoru
2095b6f5a3 Git - fix readOnly for the Config operation (#197918) 2023-11-10 15:05:39 +01:00
Ladislau Szomoru
64783a4eb9 Git - incoming/outgoing polish (#197877) 
* Git - refactor diffBetweenShortStat to return an object with files, insertions, and deletions

* Add statistics label tooltip
 2023-11-10 02:40:58 +01:00
Ladislau Szomoru
8de9ba22b2 SCM - add statistics badge for incoming/outgoing (#197876) 
* Initial implementation of the stats pill

* Parse git output and propagate the statistics
 2023-11-09 18:05:34 -07:00
Ladislau Szomoru
acff02431f SCM - Add Incoming/Outgoing information into the Source Control view (#197771) 2023-11-09 20:18:09 +01:00
Henning Dieterichs
090fd2c772 Implements first iteration of multi diff editors. 
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2023-11-07 16:51:38 +01:00
Logan Ramos
9bea1fc96a Bump telemetry package (#197168) 2023-11-01 20:51:03 +01:00
Ladislau Szomoru
56088b01d9 Git - fix issue related to opening parent repositories (#196822) 2023-10-27 06:42:08 -07:00
Ladislau Szomoru
9d2ff86b00 Git - Track attempt count in the test commit message provider (#196348) 2023-10-25 10:15:45 +02:00
Tatsunori Uchino
2683aa01ac Add support for --force-if-includes to force push more safely (#187932) 
* Add support for `--force-if-includes` to force push

* Change force push failed error message

* Separate force push (no with lease) failed error message

* Switch to `"markdownDescription"`

* Add Git version requirement for config description

* Improve error message when safer force push is rejected

* Eliminate the option's effect if Git is too old

* Minor improvements to community contribution

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2023-10-23 17:47:46 +02:00
Ladislau Szomoru
4cd1f6ce84 Git - automatically wrap generated commit message (#196268) 
* Git - automatically wrap generated commit messages

* Handle edge cases when wrapping the commit message
 2023-10-23 15:22:45 +02:00
Ulugbek Abdullaev
c6dcdc753b git: print more info when relative path not found 2023-10-23 13:57:39 +02:00
Ulugbek Abdullaev
d4586b43cd git: GitError captures stacktrace 2023-10-23 13:57:39 +02:00
Ladislau Szomoru
67df0670ba Git - set action button command argument (#196216) 2023-10-23 08:19:52 +02:00
Ladislau Szomoru
b8c3c75f5d Git - Update CommitMessageProvider git extension API (#196170) 
Update CommitMessageProvider git extension API
 2023-10-21 09:15:39 -07:00
Ladislau Szomoru
c05b49710b SCM - Add proposal for inputBox action button (#196121) 
* SCM - Add proposal for inputBox action button

* More reliable fix for overlapping
 2023-10-21 09:51:24 +02:00
Ladislau Szomoru
fdb4d48ff1 Git - cleanup OperationKind enum (#195327) 2023-10-10 22:49:10 -07:00
Greg Van Liew
ef0871b7bb Edits to setting descriptions (#195007) 2023-10-06 10:04:37 -07:00
Ladislau Szomoru
d4fb31c56d Git - fix relativePath() edge case (#194653) 2023-10-05 15:37:52 +02:00
Ladislau Szomoru
9434d9437a Git - do not show origin/HEAD in the checkout quick pick. This item will only be shown when checking out detached. (#194592) 2023-10-02 12:38:10 +02:00
Ladislau Szomoru
707e061b3a Git - use commit id for the left-hand editor (#194302) 
* Git - use commit id for the left-hand editor

* Remove console.log
 2023-09-27 15:24:35 +01:00
Ladislau Szomoru
3a0b6baa61 Git - provide correct editor title for resources under the "All Changes" node (#194273) 2023-09-27 12:05:58 +02:00
Ladislau Szomoru
8e80e950a4 Git - improve heuristics for determining branch base (#193986) 
* Add getBranchBaseFromReflog

* Read/store branch merge base in the git config

* Add getBranchBase() extension api
 2023-09-25 15:12:10 +01:00
Ladislau Szomoru
33ba908ab4 Git - refactor getting base of a branch (#193973) 2023-09-25 14:41:47 +02:00