Aleksandr Krasilnikov
01c85b6341
IDEA-349647 vcs: deduplicate tab display name logic
...
GitOrigin-RevId: bf2304480bd9da274727dc7440b1065025245d3d
2024-03-21 14:55:29 +00:00
Aleksandr Krasilnikov
c672292b39
IDEA-349647 vcs: fix missing "Commit" toolwindow title after Project opening
...
GitOrigin-RevId: 2a678fd07de311f72455d0599fe98ad3506bbf84
2024-03-21 14:55:29 +00:00
Julia Beliaeva
f4ffae1199
[vcs-log] move "Show in Git Log" action to the vcs.log.impl module
...
GitOrigin-RevId: c09d78a8f5ceed3f42c29183c5bdd6276808ab4c
2024-03-17 23:44:29 +00:00
Vladimir Krivosheev
f0d9f28372
caffeine - don't use FJP
...
GitOrigin-RevId: 263ba2f88f42065e0d9d5c9efd94d8a1ca922398
2024-03-15 20:16:36 +00:00
Aleksey Pivovarov
966478b882
git: convert GitCheckinEnvironment to Kotlin
...
GitOrigin-RevId: 9aed2d6839393ec273591c01a26c19c7351b4ba0
2024-03-15 20:00:20 +00:00
Aleksey Pivovarov
723842607d
git: convert GitCheckinEnvironment to Kotlin
...
GitOrigin-RevId: 1d648c5db4c1a13ce117db863f8429673a07e1a4
2024-03-15 20:00:15 +00:00
Aleksey Pivovarov
7ef02e4509
Rename .java to .kt
...
GitOrigin-RevId: 53b542eb5a022e6dba53aa28f2e00d9496c723fd
2024-03-15 20:00:11 +00:00
Aleksey Pivovarov
6cc04b9b39
IDEA-348926 git: wait for CLM update in tests
...
GitOrigin-RevId: 6611e009f9bfb1ca7553309631659fbebc2d0032
2024-03-15 14:19:32 +00:00
Aleksey Pivovarov
9ec33c4dab
vcs: remove 'performActionDumbAwareWithCallbacks' usage in GitUnstash
...
GitOrigin-RevId: c4b6beada73afa00dc3dc730a159594940f58cfb
2024-03-14 18:34:01 +00:00
Aleksey Pivovarov
f9304ac9dd
vcs: remove dead code
...
GitOrigin-RevId: b885e17a86e0dc8ffb480608dbd8b6d601e23bae
2024-03-14 17:05:01 +00:00
Denis Zaichenko
d5acebb5e7
IDEA-305851 Support --update-refs for interactive rebase dialog
...
GitOrigin-RevId: cd6d1739dcbbb01b4ef86d7d55c6f41807cd4186
2024-03-13 18:58:12 +00:00
Denis Zaichenko
fa22fd4b0a
[vcs][instantGit] File history fixes for local commits.
...
Added renames handling for local commits. Replaced GitHistoryUtils.history call with GitFileHistory.loadHistory to prevent loading of history all files.
GitOrigin-RevId: cddf1c14b1666380dc068d3c2f79dcbb4c708181
2024-03-13 18:05:06 +00:00
Aleksey Pivovarov
43d8f66760
IDEA-348619 git: do not capture "No Git roots in the project" label by 'TraverseUI'
...
GitOrigin-RevId: e6afbe4fbac16c73643c0afda4c7dbe91930c56a
2024-03-13 14:23:46 +00:00
Aleksey Pivovarov
12a096ccf8
IDEA-348926 git: improve test error output
...
GitOrigin-RevId: 403ee255c5cb8ee9ae02ba3dcc8b4aa81f740ef9
2024-03-12 18:43:12 +00:00
Dmitry Zhuravlev
ba7b59fd6c
Revert "git: ensure update non-current branch operation is executed against proper reference (IDEA-134799)"
...
Full local branch name in the refspec breaks update for local branches which have tracked branch with different name.
This reverts commit 8c3fd6b869c66bb2125af2e7d45c7ac4cca1aa5b.
GitOrigin-RevId: 53e329107bffe649726782334e4c0b7b5c708ed1
2024-03-12 15:46:38 +00:00
Julia Beliaeva
269a7a6ce7
[git] allow to call "Rebase..." action when the HEAD is detached
...
IDEA-195601
GitOrigin-RevId: b53f5adfc6a1bc7375a0e09d68313e6c98673ccb
2024-03-12 11:11:41 +00:00
Julia Beliaeva
34760d0f55
[git] allow to call "Merge..." action when the HEAD is detached
...
GitOrigin-RevId: 396675eabad9d38125380c43b44ff59e828191b3
2024-03-12 11:11:37 +00:00
Julia Beliaeva
7c0afca7de
[vcs-log] convert classes to kotlin
...
GitOrigin-RevId: 5692f109943bd905a5542e564e2081782c880704
2024-03-11 03:36:34 +00:00
Julia Beliaeva
07412e466a
[git-stash] do not mention the Commit tool window in the action description
...
follow-up: fa65786f3fc4a0f89638a8d637b3cc6d1b598fd7
GitOrigin-RevId: 414901ba61258358fc7f943eb66bf17075bd9d98
2024-03-08 14:15:40 +00:00
Julia Beliaeva
714569e9df
[git-stash] fix action description
...
GitOrigin-RevId: fa65786f3fc4a0f89638a8d637b3cc6d1b598fd7
2024-03-07 19:55:59 +00:00
Julia Beliaeva
f41a01d86f
[git-stash] change action text to "Show Stashes and Shelves" when stashes are combined with shelves
...
GitOrigin-RevId: cc93db58fff582d4021398ad5d8070a53ebd1f11
2024-03-05 23:33:16 +00:00
Julia Beliaeva
e691ee900f
[git-stash] fix action description capitalization
...
GitOrigin-RevId: e90cea1b54ae61498c293fc873fcbae2c07e558c
2024-03-05 23:33:16 +00:00
Julia Beliaeva
d47366358d
[git-stash] add "Show Git Stash" action to the main menu and keymap group
...
GitOrigin-RevId: 444aa1739ddafdcc2be5ce21d3c1001bd404d1f6
2024-03-05 23:33:16 +00:00
Chris Lemaire
670010ad75
[gitlab] Make private forks checkout through special ref (IDEA-326553)
...
Fixes IDEA-326553
refs/merge-requests/{iid}/head is used here.
Changes to other places where getSourceRemoteDescriptor is called
should still follow sometime.
Currently, the special ref is checked out as a local branch named fork/refs/merge-requests/{iid}/head.
This is not ideal for a few reasons, but future commits should solve this:
Checking out as a branch makes it possible to confuse the special ref as a remote branch. It's not a remote branch and it cannot be made one. You shouldn't be able to push to it, but pull might be made possible in some special fetch way.
GitOrigin-RevId: c74b15971b2620e707a523206fb4ec9ae1f95d70
2024-03-05 19:10:51 +00:00
Denis Zaichenko
0ce1eb457e
IDEA-173548 Added last branch to the recent project's metadata
...
GitOrigin-RevId: 77b3ccc4eda407699a9ab3b656f90768b7e2ebf2
2024-03-04 21:22:41 +00:00
Alexey Kryuchkov
e9719bcc1e
Logging for investigation ShowFileHistoryCommand unstable behavior
...
GitOrigin-RevId: b048cac1ff202baf79858a0e910570bbe30ed5b9
2024-03-02 22:09:37 +00:00
Alexey Kryuchkov
472ee69eb3
Debug logging for ShowFileHistoryCommand to find test 'empty list' problem
...
GitOrigin-RevId: 36c24d4eb5ad1ce6648907f6e0c12717182c3246
2024-03-01 18:53:05 +00:00
Ivan Semenov
4b170fa639
[git/github/gitlab] don't show review creation action if push is unsuccessful
...
#IDEA-346954 Fixed
GitOrigin-RevId: 6356f5dd236846055b9bec9a769206f876b63d0d
2024-03-01 17:22:14 +00:00
Alexey Kryuchkov
5cd4e5a632
Vcs filter date test for noindex scenario
...
GitOrigin-RevId: 6ef6dd13e9a91387452ca9d7fc9e97fdddece58a
2024-03-01 12:04:20 +00:00
Chris Lemaire
d00daebc7c
[github/gitlab] Show warning in panels before login progress
...
Instead, we show the warnings before entering the steps to progress through login.
This should be enough to indicate to the user that something is wrong.
GitOrigin-RevId: 44224ef46c43431a4981732791c88bd2c3ad1b75
2024-02-29 16:07:38 +00:00
Julia Beliaeva
08b6251a9f
[performance-tests] do not stop when the small data pack arrives
...
SmallDataPack is not saved in the VcsLogManager, so the check "isLogUpToDate" uses the old data pack, while refresh is still in progress.
GitOrigin-RevId: 8ac97086f966f88fe7f00ee754eced70ebc5c940
2024-02-27 17:34:50 +00:00
Julia Beliaeva
c5636b46a6
[file-history] remove the registry key to disable new file history without the indexes
...
Also remove the notification for the old file history which suggested enabling indexing.
GitOrigin-RevId: f145758325d3544f630f1670ecd3a30b8d819201
2024-02-23 21:59:12 +00:00
Julia Beliaeva
9f2db56799
[vcs-log] remove obsolete "git.log.index.inexact.renames" registry property
...
follow-up: 66b5f579d7a9d84554044eea0e62814cda15c569
GitOrigin-RevId: c75589f295ea10eaed31a99285edba36ef98bd90
2024-02-22 19:51:07 +00:00
Dmitry Zhuravlev
9e56d5d1e2
git: scroll to prefered branch in branches popup without showing it in the center
...
GitOrigin-RevId: 438f059ee6b1c212140e472bdb920f0423c6a245
2024-02-21 15:30:12 +00:00
Dmitry Zhuravlev
feb0036fd9
git: register branch filter separator as a group
...
Resolve the corresponding warning.
Follow-up: 453176bf8b60f29be8052f987332ca9430e0dc6f
GitOrigin-RevId: 2b71bab0e2ccb357eb8f22ef74030b8d2a4d99ac
2024-02-20 18:44:44 +00:00
Julia Beliaeva
43a2ec67fa
[vcs] do not report nested activity during update to the local history
...
Currently, nesting of the local history actions is not properly supported.
IDEA-346459
GitOrigin-RevId: 51550e6e594ac50b4fdea8e7baefe185ec804c0d
2024-02-20 04:20:48 +00:00
Julia Beliaeva
b918a0562c
[git] report stashing to local history
...
GitOrigin-RevId: 0765f73dec33f4bb5eaee119c5f4d221f4d842b1
2024-02-20 04:20:43 +00:00
Dmitry Zhuravlev
b974d315cc
git: ensure update non-current branch operation is executed against proper reference (IDEA-134799)
...
GitOrigin-RevId: 8c3fd6b869c66bb2125af2e7d45c7ac4cca1aa5b
2024-02-19 21:05:44 +00:00
Dmitry Zhuravlev
15313af31f
git: ensure rebase branch operation is executed against proper reference (IDEA-134799)
...
GitOrigin-RevId: 52e5984ad38cdb9ea8dba58b87470c3807276ee6
2024-02-19 21:05:41 +00:00
Dmitry Zhuravlev
fead3c9cb4
git: ensure merge branch operation is executed against proper reference (IDEA-134799)
...
GitOrigin-RevId: a6bd78e584c4fb8b7c96b650b87ca7de29e134dd
2024-02-19 21:05:38 +00:00
Aleksey Pivovarov
d5746cfcbd
git: use GitBranch for branches dashboard nodes
...
GitOrigin-RevId: e6c9b25783aa05d4aea6a8e48cf32a4d84809218
2024-02-19 21:05:34 +00:00
Dmitry Zhuravlev
06232bde44
git: remove unused field
...
GitOrigin-RevId: 21734e8d8a95f4bd40e15319d957685d39a1b20b
2024-02-19 21:05:31 +00:00
Dmitry Zhuravlev
0a502fa192
git: ensure delete remote branch operation executed against branch (IDEA-188236)
...
GitOrigin-RevId: bf89a9bf2805e4492512e41a8ba483f49ca4e0ef
2024-02-19 21:05:28 +00:00
Julia Beliaeva
4128c8ffcb
[git-index] fix calling diff in the staging area by double click or enter
...
Double click and enter handlers try to first call the "Merge" action before invoking diff, in case a node with conflict is selected. "performDumbAwareUpdate" was invoked to update the action, but after 15d32dad64857f15e49b95e5a19af77d34e4131c this does not work anymore. Because of this "Merge" action started to get called even for the non-conflicting nodes. This commit uses utility method instead of an action.
IDEA-346579
GitOrigin-RevId: 7d03e750220a98bce27184c2303562439e6f0e15
2024-02-19 18:30:24 +00:00
Julia Beliaeva
01770f0d8a
[git] cleanup
...
GitOrigin-RevId: 84ede07e42c311c2704c8350cae350d8fc01e7f2
2024-02-19 18:30:19 +00:00
Julia Beliaeva
ea0dc2acb2
[file-history] implement branch filter in file history without indexes
...
This commit reworks VcsLogFileHistoryHandler to accept a filter collection and to specify which filters are supported. Handler can also throw a UnsupportedHistoryFiltersException when passed filters are not supported.
Currently, GitFileHistory can not accept starting points and filters separately, so branch heads passed as starting points and hash is ignored. Because of this, filtering by branches is disabled for history for revision.
GitOrigin-RevId: d8232b71419587a62d6d1487a073f172d14acc8f
2024-02-17 00:02:02 +00:00
Julia Beliaeva
4f50ea102d
[file-history] implement tracking history from multiple starting points in GitFileHistory
...
GitOrigin-RevId: fc9097d3d825fdf33f857a5a9dd385383e6e2ae2
2024-02-17 00:02:02 +00:00
Nikolay Chashnikov
c9fa2c68fc
[git] API: mark for removal unused deprecated API (IJPL-275)
...
GitOrigin-RevId: a9eff1fd16dee240f0c5c35cf2b86297ae5ccc48
2024-02-16 15:45:50 +00:00
Julia Beliaeva
22dabc6260
[performance-tests] subscribe to the DataPack changes before making the commit
...
GitOrigin-RevId: dcd307f10a9f1cf46ecfb7207e6a033e54489f75
2024-02-16 15:43:29 +00:00
Gregory.Shrago
b4d1f5af37
avoid AnActionEvent.getRequiredData: vcs
...
Prefer silent exit to throwing an exception.
GitOrigin-RevId: ddfeec9d7c078cf0cd6e357554c8a49e6d54e75e
2024-02-16 03:08:43 +00:00
