Ilia.Shulgin
55bf2f0155
[git] Disable interactive callbacks when calling git tag -l
...
GitOrigin-RevId: e6b09a265754f5afb33006bc29efe480cb2fe246
2025-01-24 11:05:25 +00:00
Ilia.Shulgin
c786682e6c
[git] IJPL-158448 Ignore "error: cannot read" when loading of non-existing content
...
`git cat-file --filters` with prints "error: cannot read object" if the object is missing.
However, `git cat-file -p` fails with "fatal: Not a valid object name" under the same condition.
See 92999a42db/builtin/cat-file.c (L73) and 92999a42db/builtin/cat-file.c (L184)
GitOrigin-RevId: 6131554a65c38f12adba70c72117bc17b3dd01dd
2025-01-10 13:54:58 +00:00
Vladimir Lagunov
2653654fd3
IJPL-162321 Git: don't use relative paths in GitExecutableFileTester for executing commands on WSL
...
(cherry picked from commit 815801e1c7e105319cd100a2aae84705a5b0e1c7)
IJ-CR-150934
GitOrigin-RevId: 8311951fc9220c4fef9bb214d4294a3977c664c5
2024-12-19 18:52:43 +00:00
Ilia Shulgin
da00fd4e04
[git] IJPL-173721 Detect git executable in WSL v1
...
WSL v1 is still not supported. However, there is a notification suggesting a hack.
Previously, no notification was shown and git was detected on a host machine producing
"detected dubious ownership" errors.
Also introduced `UnsupportedWSLVersionException` preventing potential miss-leading
notifications in `WindowsExecutableProblemHandler` and hide VCS widget for the
unsupported WSL case.
(cherry picked from commit 9f86bd101b0d2612e116933d2ef086c4b7ae8148)
IJ-MR-151925
GitOrigin-RevId: 5ae4e5711900c7c14f1688f26b245b0f6ddb380f
2024-12-19 14:04:29 +00:00
Dmitry Zhuravlev
f45c905fe2
git: extract gpg agent configuration action (IJPL-173525)
...
Follow-up: a6ec805357dd60578f2408a2ffaabadc53dad00e
(cherry picked from commit 771857ed0cafbdf74d9c82af47bd609a6bd58ea7)
IJ-CR-151739
GitOrigin-RevId: a537016fa7cae17945baf1b297696924d5281210
2024-12-17 16:26:16 +00:00
Dmitry Zhuravlev
f4380c4522
git: add a registry key to control GPG Agent configuration proposal (IJPL-173525)
...
(cherry picked from commit a6ec805357dd60578f2408a2ffaabadc53dad00e)
IJ-CR-151739
GitOrigin-RevId: 9b042866d32efa53fcc23e6aafaaf91481f9d8d1
2024-12-17 16:26:16 +00:00
Aleksey Pivovarov
958784b947
IJPL-163688 IJPL-161046 vcs: use adaptive layout for Stash toolwindow
...
Show splitter-preview for vertical toolwindow if it shares the toolwindow with VCS-Log.
(cherry picked from commit 874fb91ce8d58fd5373ed9b12f7dd12e12112d2e)
IJ-CR-150517
GitOrigin-RevId: 8c3609e6a537f96bf0b7601b297a4c8e0f58f56a
2024-12-09 11:56:39 +00:00
Aleksey Pivovarov
a79c5a028a
IJPL-163688 IJPL-161046 vcs: use adaptive layout for Local Changes and Shelve toolwindows
...
Show splitter-preview for vertical toolwindows if they share the toolwindow with VCS-Log.
(cherry picked from commit 3711ab15aa5b6d71aa7276312abe957409c1f960)
IJ-CR-150517
GitOrigin-RevId: e011ff96a81d6d0495eaa571f59ac0c6e278589a
2024-12-09 11:56:39 +00:00
Dmitry Zhuravlev
62683ce762
git: REWA: show pinentry UI
...
(cherry picked from commit 5725cbc42c55011a22ce760cdd785406bf840007)
(cherry picked from commit 6f665545255dc29993e202f7b1a33c2f6c425bad)
IJ-MR-150633
GitOrigin-RevId: e6581074db22cab23000de25b3e392f1332ec908
2024-12-02 19:31:02 +00:00
Dmitry Zhuravlev
e254015f4c
git: ensure config cache always cleared before listeners become notified (IJPL-172018)
...
(cherry picked from commit 437166be6a41404e91c6b91c6a4a2fa352cb1c9a)
(cherry picked from commit 81e758847fab72d0bccfc7839d26c32e7a5bb45b)
IJ-MR-150633
GitOrigin-RevId: 053dc10c1ebde774cedcf5004f7d3b9a32321ba5
2024-12-02 19:31:02 +00:00
Dmitry Zhuravlev
a8bed5c2bb
git: enable the ability to configure own pinentry for GPG sign for all Unix
...
(cherry picked from commit 604c78c0c16014246c9e987b774986e12b3856ee)
(cherry picked from commit 9cfac3ea5f204a051a83c50b9c87c3e91b5f43de)
IJ-MR-150633
GitOrigin-RevId: b346649a511d2f73dec0eb20eacc72ff662340c2
2024-12-02 19:31:02 +00:00
Dmitry Zhuravlev
4e17d10d9e
git: propose own pinentry configuration for GPG sign
...
(cherry picked from commit 50ad24fb91692345982d0097e15c00efa5d0e895)
(cherry picked from commit 4bd249081cf311d35f434151d2d2bb0949cb342b)
IJ-MR-150633
GitOrigin-RevId: cb18abab9aa45a34a9a38644247ced781aab5cf8
2024-12-02 19:31:02 +00:00
Dmitry Zhuravlev
7a879e6b84
git: notify about successful pinentry configuration for GPG sign
...
(cherry picked from commit 24b9c564fca629e0ff8c831f28fa8c0457f3cc19)
(cherry picked from commit 52d739680dedb81ef8adccaf5c16525dd838284d)
IJ-MR-150633
GitOrigin-RevId: 3a4d4a12825e89a54a3d2903cf4812f1bd78bad0
2024-12-02 19:31:02 +00:00
Ilia.Shulgin
ffbe2f59c3
[git] IJPL-171799 Allow setting upstream when changing remote only
...
(cherry picked from commit 254d0905374904611564cbb154007885441fb605)
IJ-MR-150510
GitOrigin-RevId: a7ba139ac6095ec83bd80fe96e7b89d66a30fe12
2024-11-29 17:26:51 +00:00
Aleksandr Krasilnikov
6901adc6dc
IJPL-165414: vcs marker: Rework the popup opening
...
Delegate the popup building and opening to the `LineStatusMarkerPopupService` and control that opened popup is disposed
before creating the new marker panel
(cherry picked from commit fff881f00d75ce4d4b9fa0fc5fa2e2407f7e8813)
IJ-CR-149651
GitOrigin-RevId: 3458a2e0f1e7830d5c67aa539839182840e9d64c
2024-11-25 17:22:14 +00:00
Aleksandr Krasilnikov
633ffa3474
IJPL-165414: vcs marker: Move "Highlight words" action form toolbar to the context menu
...
Add "Copy" as well to the context menu
(cherry picked from commit 7a64bba4ba719d3a5a45e9ca51ecf27ca8ed9bd0)
IJ-CR-149651
GitOrigin-RevId: 4dac3794ff4e2716cfdf5fed1fbc6b5cd1c1550f
2024-11-25 17:22:14 +00:00
Dmitry Zhuravlev
26b513be7f
git: generate a proper pinentry script with existing fallback
...
Since "[[]]" properly handled by bash/zsh shell and may not be handled in the others
IJPL-165453
Follow-up: 89951442ccaf2feec1b6b04efb9dff4dd1b0d32c
(cherry picked from commit 55b82745c5045ea46a03e11b581c9b6384e8af49)
IJ-CR-149656
GitOrigin-RevId: dbd131f64eb298d43519433543bc2906f517078c
2024-11-19 15:11:12 +00:00
Dmitry Zhuravlev
bb24b2aacb
git: do not query GPG sign configuration by commands not related to sign
...
Follow-up: a32f415e4732699f6fd062a3b8bf902e99dccf13
(cherry picked from commit 69249b47ec79e297290980c15f0d0fae928feaf6)
IJ-CR-149656
GitOrigin-RevId: 63229dd650f7941e9abbfad402f0ec4542d89784
2024-11-19 15:11:12 +00:00
Dmitry Zhuravlev
60e0fff2fd
vcs: ensure min pinentry password length in tests
...
(cherry picked from commit 60e4b656f84c29abd8074d7b9f232167af8d2a9f)
IJ-CR-149656
GitOrigin-RevId: a4d567960fc50e2282b3cf9d158da8d1afb4b284
2024-11-19 15:11:12 +00:00
Ilia.Shulgin
29bb5c47e5
Fix binary compatibility for GitUntrackedFilesHolder
...
(cherry picked from commit 35ed639ab981a288583b9542d71bc2a1579ae2a0)
IJ-CR-148090
GitOrigin-RevId: 05e34aff00a6cbeddc678e4e1f9e8c6462736e63
2024-10-30 14:31:46 +00:00
Ilia.Shulgin
4d55ea4904
Rollback GitRepositoryIgnoredFilesHolder to class
...
(cherry picked from commit 7ae5a7406a1452360ed409d72b86fc13674e0487)
IJ-CR-148090
GitOrigin-RevId: 6ad3789755105354adba2c0a95693fd69f13fd75
2024-10-30 14:31:46 +00:00
Ilia.Shulgin
1dd218de70
[git] IJPL-165127 Exclude ignored files from git tracked scope
...
(cherry picked from commit c00bb120deb041fa25bdcd4f188023f69eaebffa)
IJ-CR-147722
GitOrigin-RevId: 8d024fa1343278209b816c002f5176d4f961c58e
2024-10-28 11:33:10 +00:00
Ilia.Shulgin
83fc84993c
[git] IJPL-84816 Delete git.clone.shallow registry key
...
(cherry picked from commit 256392f36282aca50551dc92614b554c8f52f98b)
IJ-CR-147381
GitOrigin-RevId: 6572d5656d8682e426d58c70b7f998085c3a9c30
2024-10-22 14:12:15 +00:00
Ilia.Shulgin
0d52f67739
[git] IJPL-84816 Add "Unshallow Repository" action to Git main menu group and VCS pop-up
...
(cherry picked from commit e713d0ccf39a881b701c4bdca9397137d45e1561)
IJ-CR-147381
GitOrigin-RevId: aa55d5f12e66c5be198efecb05784584f8dc04b1
2024-10-22 14:12:15 +00:00
Dmitry Zhuravlev
cce74de518
git: get the proper type for the recent branch node
...
Follow-up: acc414e94a3b4cc272d803edeb0dc440afec68cd
(cherry picked from commit b3b0e09509c8dc4fbb16c3f41362e1bb58d74d4b)
IJ-CR-147312
GitOrigin-RevId: fce48b43a0a7ea7e0aeae2ede8d5bf1005c3387f
2024-10-22 13:16:58 +00:00
Ilia.Shulgin
e7df9669b4
fixup! IJPL-164123 Enable missing actions for tags
...
(cherry picked from commit 23a8a0ecc8bba0917837b3b2f9b5197427fb6214)
IJ-CR-147030
GitOrigin-RevId: b951bb6d6c94bcd61b324f7695418e921b1500fa
2024-10-22 07:47:34 +00:00
Ilia.Shulgin
35c90a6c67
[git] IJPL-164123 Enable missing actions for tags
...
(cherry picked from commit 0bde50748e732431e66c2dd981a87a1efef41564)
IJ-CR-147030
GitOrigin-RevId: d1380bea34812b2aa077d0f9e73566043a3b8fdf
2024-10-22 07:47:34 +00:00
Ilia.Shulgin
00760b25cf
[gh/gl] IJPL-84816 Support shallow clone in GitLab and GitHub clone dialogs
...
GitOrigin-RevId: 15d1b26659829721be8340651f2c45895deac6d1
2024-10-14 22:26:50 +00:00
Dmitry Zhuravlev
d641d05793
[vcs-log] commit message prefix navigation in VCS Log table (IJPL-89240)
...
GitOrigin-RevId: 3b0196284ac76797ee92b7f050643e01393850a5
2024-10-14 18:17:37 +00:00
Ilia.Shulgin
144b7c2510
[git] IJPL-72576 Add option to set upstream in push dialog
...
GitOrigin-RevId: 7c50f0d3fe29bec2113cd5073df00224cdc38d9d
2024-10-14 17:39:52 +00:00
Ilia.Shulgin
a9dda8946f
[git] AT-1563 Don't use lateinit for GitRepositoryImpl#repoInfo
...
GitOrigin-RevId: 67fa30e797617718c6a0efb2e5941c0035a84fd0
2024-10-14 11:15:18 +00:00
Ilia.Shulgin
74ae64a93c
[git] Fix double listeners registration in GitRepository
...
GitOrigin-RevId: b061f7dacf5f83c200254eb44724c15ea7f3a780
2024-10-14 11:15:18 +00:00
Ilia.Shulgin
e0627cf8ba
[git] Don't rely on ChangeListManager to get local changes
...
GitOrigin-RevId: f407e58cadb329fcb0cbd9d9a36ecb092cae7ff4
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
a29cf67f98
[git] Use GitRepositoryStateChangeListener for cherry-pick/revert notifications cleanup
...
GitOrigin-RevId: 81362adb0a5e331d2d34d83c588503386591c23f
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
a17da27fc8
git: introduce GitRepositoryStateChangeListener
...
This might be useful for places that want to know if current branch or HEAD were changed,
without requiring to explicitly store the previous state in the listener.
GitOrigin-RevId: 08e43f29a975a132bb5d77176dea7c80059a44a8
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
71a87e8fd1
git: clarify GitRepositoryImpl initialization order
...
GitOrigin-RevId: 7763cdf1c122bc81aa86055dc7f339def6e9c411
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
dc23e7c94e
[git] Delete GitOngoingOperationAction
...
GitOrigin-RevId: e9cb8ee2e92070f7ba41523a624d849777d4bb84
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
37600c5ef0
[git] IJPL-73913 Suggest stashing/shelving changes and retry cherry-pick
...
GitOrigin-RevId: d73345928d536ddfe9f22666b4f2dd3272263c31
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
ed0d05e826
[git] Reset conflicts notification after exiting cherry-picking status
...
GitOrigin-RevId: a7ec39444a3c3f619ba7fa0eae55d8ce8f667083
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
96d9d76c7b
[git] IJPL-81885 Don't leave repository in cherry-picking state if nothing to cherry-pick
...
GitOrigin-RevId: e56ab7d928506d850f4f1c7092014d3c3627ea46
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
ac6d781ba1
[git] Convert GitRevertOperation to abstract class
...
GitOrigin-RevId: 19551d77364bdbc448689ee603213dce5c71a558
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
af34ed9d71
[git] IJPL-73913 Unify creation of "Your local changes will be overwritten by" warning
...
GitOrigin-RevId: d3f9997b9764ed269492d0e2918b57f089f0b919
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
0fbdcaaf7e
[git] Hide "noting to cherry-pick/revert" notification on abort
...
GitOrigin-RevId: b87fd2e597db588e32c69b02853e7f67b456b6a0
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
01d6906e3a
[git] Use stash push instead of deprecated save
...
`git stash save` was deprecated since v2.16
GitOrigin-RevId: 6811ae21f2104367dac97dddcfd76675991e028c
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
777cc6554b
[git] Cleanup conflict notification on cherry-pick/revert aborted
...
GitOrigin-RevId: 2945893918c7aa00504efe5072ba13fe5bab6301
2024-10-11 09:23:54 +00:00
Aleksey Pivovarov
f1be858574
vcs: set notification DisplayId
...
GitOrigin-RevId: 4a03c72d6efc72ea258133080475155153ed7e83
2024-10-11 09:23:54 +00:00
Aleksey Pivovarov
2167c357f0
git: do not use 'Unresolved conflicts during Update Project' error in generic GitPreservingProcess callback
...
GitOrigin-RevId: 050e0b5aa1d373a7220fe5f086969494216c8d40
2024-10-11 09:23:54 +00:00
Aleksey Pivovarov
87ab6043a7
vcs: cleanup - extract method
...
GitOrigin-RevId: ecf44584e037131f422c9de033058c06ae497ee9
2024-10-11 09:23:54 +00:00
Aleksey Pivovarov
0e0a62ebee
vcs: use utility method
...
GitOrigin-RevId: 17e0515ff778046ef2ff8166f52b4459546851b5
2024-10-11 09:23:54 +00:00
Aleksey Pivovarov
c281407f63
vcs: unify error messages on GitChangesSaver error
...
GitOrigin-RevId: e92e6d592831e4cfd06964893f0bb9cf6a0d983c
2024-10-11 09:23:54 +00:00