Commit Graph

11128 Commits

Author SHA1 Message Date
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
Ilia.Shulgin
0f9618f398 [git] IJPL-73913 Fix local changes overwritten check
GitOrigin-RevId: 9e8c86796f9dc3ae0db689465705e9facaf47c35
2024-10-11 09:23:54 +00:00
Ilia.Shulgin
365c295124 [git] Introduce GitLineEventDetector to structure GitLineHandlerListener detecting events
GitOrigin-RevId: e393c2a20d9b5fbad947e57920a5b877307247f9
2024-10-11 09:23:54 +00:00
Nikolay Chashnikov
4b7d75d8f5 [git] API cleanup: mark deprecated unused API for removal (IJPL-156972)
GitOrigin-RevId: d4dd2be05e27b6dcd1390b5f123c7fdb5d762f31
2024-10-10 23:55:42 +00:00
Vladimir Krivosheev
387be9d569 IJ-CR-146078 extract intellij.platform.ide.ui
GitOrigin-RevId: 1d77381f1bcc811dbf644e47e70972a572c095f2
2024-10-10 23:38:08 +00:00
Ilia.Shulgin
cf718af37c [git] IJPL-50010 Add search scope for files tracked by git
GitOrigin-RevId: 82aa67bd104ba1a268258b6f3efbf5a28eda025b
2024-10-09 10:44:15 +00:00
Ilia.Shulgin
ea33fd0d5b [git] IJPL-50010 Use immutable collection for storing untracked files
GitOrigin-RevId: cc2b972012fe39cf5ba4777a4633934f5388354e
2024-10-09 10:44:15 +00:00
Ilia.Shulgin
f6271ccde9 [git] Fix detached HEAD state when checking out local branch
GitOrigin-RevId: c99e848d89f8a419c39e5a5611557d353d9ef01b
2024-10-08 11:08:27 +00:00
Ilia.Shulgin
7a9d061d3a [git] Better accessors for BranchesTreeSelection
GitOrigin-RevId: cf8b54c3d08791ab1c7890f2bf5aa841c962615b
2024-10-08 08:22:38 +00:00
Ilia.Shulgin
0a7c5ba215 [git] IJPL-105878 Support tags push
GitOrigin-RevId: dcdb776f3cfd40d9271f35516e442f9990c1c388
2024-10-07 20:54:52 +00:00
Ilia.Shulgin
68707f6fc9 [git] IJPL-84816 Suggest to unshallow repository
GitOrigin-RevId: 197ff50c9347d58aaea6400666236305511bf5c6
2024-10-07 13:44:36 +00:00
Ilia.Shulgin
08e08e8603 [git] IJPL-84816 Report clone depth in metrics
GitOrigin-RevId: e9a20d79aadaac8c38786ff0aef2c30302ff2b06
2024-10-07 13:44:36 +00:00
Ilia.Shulgin
ca7bfcfe06 [git] IJPL-84816 Support shallow clone at "Get from Version Control" screen
GitOrigin-RevId: 27e27e722ce57d5807e7081bedbaf4f487077962
2024-10-07 13:44:33 +00:00
Ivan Semenov
a658b96946 [github] do no clear review file history change entry when adding a new entry
#IJPL-163061 Fixed

GitOrigin-RevId: 3e02c2ebaf7b881a667ebe65c0ec86805d0d443a
2024-10-07 13:11:08 +00:00
Dmitry Zhuravlev
0a0b47c9d4 [rdct] [wsl] enable embedded pinentry
GitOrigin-RevId: 4bbe0145e7aa9eb745da04166b953622a3a8951c
2024-10-07 13:04:58 +00:00
Ilia.Shulgin
bb20903bb9 [git] Notify about tags visibility changes from GitVcsSettings
GitOrigin-RevId: b3c54e29b29ccfd2162d48dd87e46e8e7078c4b5
2024-10-07 12:53:40 +00:00
Ilia.Shulgin
c0970600c0 [git] Unify handling of selection in git log branches tree
`BranchesTreeSelection` and data key `GIT_BRANCHES_TREE_SELECTION` were added to simplify setting and getting the current selection state.
As a bonus point - support for tags actions (IJPL-160069) was added almost automatically

GitOrigin-RevId: f7a30fa06c5ac386ce829742f4586083645ae10b
2024-10-07 12:53:40 +00:00
Ilia.Shulgin
5995f8f134 [git/refactor] Cleanup duplicating branch and tag actions
GitOrigin-RevId: a9091e8e840483d17afb34e222db3b5a391d9d81
2024-10-07 12:53:39 +00:00
Ilia.Shulgin
bea9a43f2f [git] IJPL-160069 Show tags in git log branches widget
GitOrigin-RevId: c0e2f01d59d50561b880b20666a16e80fdbf85b3
2024-10-07 12:53:39 +00:00
Ilia.Shulgin
e3064e3924 [git] IJPL-160069 Reuse "Show tags" action in git log
GitOrigin-RevId: 453b21a663f6354949d37a38aeb0b8cd1d6ba667
2024-10-07 12:53:39 +00:00