Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-27 05:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,188 Commits 2,497 Branches 340 Tags
59cd6e48d8a94bcf591c07167fe0270c8b433ef9
Commit Graph

1959 Commits

Author SHA1 Message Date
Ladislau Szomoru
d01945923c Git - Fix regression with Commit action button icon (#156417) 
Fix regression with Commit action button icon
 2022-07-27 13:11:07 +02:00
Ladislau Szomoru
e210bbfea4 Git - fix edge case during rebase (#156410) 
Fix blocking issue while resolving conflicts during rebase
 2022-07-27 12:03:47 +03:00
易良
fbdc848c29 fix: typos (#155310) 
* fix: typos

* chore: revert formatting changes

* fix: Remove redundant blank lines
 2022-07-25 15:41:30 -07:00
Johannes Rieken
b8876a2d60 enable merge editor by default (#155937) 2022-07-22 11:28:49 +02:00
Johannes Rieken
bbbae594da show "Accept Merge" only for files currently under conflict. (#155822) 
While the merge editor shows users can handle merge conflicts outside of it, e.g on the console via `git add <FILE>`. The merge editor should have this graceful and step one is to hide the "Accept Merge" command when the file isn't conflicting anymore

* Adds a git-context key that contains all resource-uri-strings under conflict
* Enable/placement of the Accept Merge command is driven by that
* some merge editor context key sugar
 2022-07-21 13:25:23 +02:00
Ladislau Szomoru
ace330ba2c SCM - Fixed a regression due to which post-commit commands were not being executed (#155824) 
Fixed a regression due to which post-commit commands were not being executed
 2022-07-21 12:25:15 +02:00
Ladislau Szomoru
cd90b2b5ad Git - Add telemetry comments (#155811) 
Add telemetry comments
 2022-07-21 09:34:19 +02:00
Ladislau Szomoru
e0e7ad368e Git - Enable action button while rebasing (#155744) 
Enable action button while rebasing
 2022-07-20 23:35:05 -07:00
Ladislau Szomoru
f19251a4ca Git - Use GIT_EDITOR environment variable to suppress the git commit editor during rebase (#155748) 
Use GIT_EDITOR environment variable to suppress the git commit editor during rebase
 2022-07-20 17:52:56 +02:00
Ping
0b2c56eb7b Fix #114461 (#151824) 
suppress the editor during git rebase, fix #114461

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-07-20 15:03:43 +02:00
Johannes Rieken
ce5d92e998 use commit-icon for description, tweak codicon font-size (#155714) 
https://github.com/microsoft/vscode/issues/150863
 2022-07-20 13:49:24 +02:00
Johannes Rieken
7cdaa57928 also default to opening merge editor when conflict is about adding (#155711) 
fixes https://github.com/microsoft/vscode/issues/153737#issuecomment-1189357241
 2022-07-20 12:36:08 +02:00
Ladislau Szomoru
03c16c9c00 Git - The git.sync command should use the git.rebaseWhenSync setting (#155511) 
The git.sync command should use the git.rebaseWhenSync setting
 2022-07-18 18:38:58 +02:00
Ladislau Szomoru
b3218963c4 Git - Do not show SmartCommit dialog when using "Commit All" (#155486) 
Do not show SmartCommit dialog when using "Commit All"
 2022-07-18 16:55:41 +02:00
Johannes Rieken
8bada27fdd Merge pull request #155148 from microsoft/joh/double-barnacle 
joh/double barnacle
 2022-07-18 16:45:00 +02:00
Johannes Rieken
1878583319 read REBASE_HEAD when rebasing, swap yours/theirs (label, sides) as well (#155208) 
https://github.com/microsoft/vscode/issues/153737
 2022-07-14 09:23:44 -07:00
Ladislau Szomoru
ee18db8144 Sync Changes button - only show when local branch is ahead/behind the remote branch (#155192) 
Only show Sync Changes button when local branch is ahead/behind the remote branch
 2022-07-14 13:51:47 +00:00
Ladislau Szomoru
70a1ebd595 Git - Add events to IPostCommitCommandsProviderRegistry (#155051) 
* Add events to IPostCommitCommandsProviderRegistry

* Pull request feedback
 2022-07-14 10:46:57 +02:00
Johannes
0f0101be5f use TabInputTextMerge in git extensions 
For now only when checking for tabs, not yet for opening tabs
 2022-07-14 09:41:54 +02:00
Ladislau Szomoru
f6332bd86d Git - Use cloud icon for remote branches (#155140) 
Use cloud icon for remote branches
 2022-07-14 08:55:29 +02:00
Ladislau Szomoru
bc51adde6f git - Add localization comment for Publish Branch action button (#155053) 
* Add localization comment for Publish Branch action button

* Pull request feedback
 2022-07-13 14:39:18 +00:00
Ladislau Szomoru
c7c0acd2ce Git - Commit action button extension api (#154555) 2022-07-12 17:06:16 +02:00
Ladislau Szomoru
acd1db24f2 Git - fix edge case with Windows mapped drives (#154342) 
* Fix an edge case with computing relative path on Windows

* Refactor the fix
 2022-07-12 12:20:41 +02:00
Ladislau Szomoru
5d18f94bb0 Git - Maintain spaces in the arguments (#154685) 
Maintain spaces in the arguments
 2022-07-11 02:28:57 -07:00
Ladislau Szomoru
eb2e5d8558 Git - Commit action button should use smart commit settings (#154169) 
Consider smart commit settings when rendering the commit action button
 2022-07-07 21:31:10 +02:00
Logan Ramos
a20329d291 Switch extensions to 1DS (#154299) 
* Move extensions to 1DS

* Switch extensions to 1DS
 2022-07-06 17:18:41 -07:00
Ladislau Szomoru
57609a19da Git - Update commit button icon and tooltip based on branch protection (#154101) 
Update commit button icon and tooltip based on branch protection
 2022-07-04 20:18:16 +02:00
Ladislau Szomoru
32406a7157 Debt - Prevent icon translations (#154094) 
Prevent icon translations
 2022-07-04 14:37:52 +00:00
João Moreno
2fcd34a41b Fixes #148568 (#154008) 
fixes #148568
 2022-07-04 07:41:54 +02:00
Ladislau Szomoru
53c752ac8a Git - Disable commit button while merge is in progress (#153890) 
Disable commit button while merge is in progress
 2022-07-01 02:56:29 -07:00
Ladislau Szomoru
b18f9e0630 Git - Do not show Sync Changes and Publish Branch action button when commit is in progress (#153821) 
Do not show Sync Changes and Publish Branch action button when commit is in progress
 2022-06-30 07:27:42 -07:00
Ladislau Szomoru
cf532ac7db Git - Tweak the git.useEditorAsCommitInput setting description (#153794) 
* Tweak the setting description

* Update extensions/git/package.nls.json

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

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2022-06-30 06:42:23 -07:00
Ladislau Szomoru
1230b7c300 Git - "Commit & Push" command now publishes the branch if there is no tracking remote (#153749) 
"Commit & Push" command now publishes the branch if there is no tracking remote
 2022-06-30 02:12:31 -07:00
Ladislau Szomoru
6ca8db83e7 Git - Disable undo last commit command while commit is in progress (#153739) 
Disable undo last commit command while commit is in progress
 2022-06-29 18:45:21 +00:00
Ladislau Szomoru
8045df1b94 Git - Add commands to the editor title to accept/discard commit message (#153692) 
Add commands to the editor title to accept/discard commit message
 2022-06-29 14:00:09 +00:00
Johannes Rieken
7aec222831 joh/issue150862 (#153677) 
* execute `workbench.view.scm` to reval SCM view after accepting merge

fixes https://github.com/microsoft/vscode/issues/150862

* only reveal viewlet when stage/accept was done
 2022-06-29 12:20:49 +00:00
Johannes Rieken
bd24f72d42 fix 153492 (#153667) 
* enable "accept merge" for merge editor only
* close merge editor before staging file, only stage file when editor has been closed

fixes https://github.com/microsoft/vscode/issues/153492
 2022-06-29 14:08:09 +02:00
Ladislau Szomoru
a424998dfd Git - Action button precedence (#153662) 2022-06-29 12:48:22 +02:00
Harald Kirschner
56cade24a3 Make the guided git.missing welcome view default (#149668) 2022-06-29 01:14:39 -07:00
Ladislau Szomoru
e773c97507 Git - commit action button does not appear on the initial commit (#153605) 
Fix #153507
 2022-06-28 14:07:16 -07:00
Ladislau Szomoru
adecb6b529 Git - fix secondary action localization (#153604) 
Fix #153503
 2022-06-28 20:46:03 +00:00
Ladislau Szomoru
75b3fd5253 Git - Remove icons from branch picker to address regression (#153433) 
* Remove icons from branch picker to address regression

* Fix create branch from issue

* Pull request feedback
 2022-06-28 14:12:08 +02:00
Johannes
aae22c1605 rename setting to git.mergeEditor, no more experimental 2022-06-27 12:54:55 +02:00
Ladislau Szomoru
45427b2346 Git - Add icons to branch picker (#153149) 
Add icons to branch picker
 2022-06-24 15:46:51 -04:00
Ladislau Szomoru
367eefd5f1 Git - commit action button (#153031) 2022-06-24 16:07:24 +02:00
Johannes Rieken
dfeb3e0050 joh/careful silverfish (#153089) 
* don't show `openChange` command for merge editor

https://github.com/microsoft/vscode/issues/151125

* disable and not-place the conflicting merge-conflict navigation commands for the merge editor

https://github.com/microsoft/vscode/issues/153087

* disable (configurable) merge-conflict featues (code lens, decorations) when git is configured to use merge editor

https://github.com/microsoft/vscode/issues/153087
 2022-06-24 09:33:06 +00:00
Ladislau Szomoru
4a72009c59 Git - Update git.terminalGitEditor default value (#153085) 
Update git.terminalGitEditor default value
 2022-06-24 10:54:24 +02:00
Logan Ramos
4a7a6a597a Update extension telemetry modules (#153057) 2022-06-24 00:53:23 +00:00
Ladislau Szomoru
25cc6c0dd0 Git - Remove git.branchProtectionIndicator setting (#153020) 
Remove git.branchProtectionIndicator setting
 2022-06-23 21:56:54 +02:00
Henning Dieterichs
a2eccb109e Merge pull request #152865 from microsoft/3wm 2022-06-23 17:35:24 +02:00