MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity
447,331 Commits 17 Branches 7 Tags
4c3b919103432dee08d0a2ca32782d74fd8372c5
Commit Graph

10891 Commits

Author SHA1 Message Date
Denis Zaichenko
ed3ae46a60 [vcs] Added call to ChangeListManagerImpl.update() before requesting the file history to fix flakiness of test. 
GitOrigin-RevId: 8430181eb5c59a9afc9a2e2466f207e872561210
 2024-06-28 17:14:03 +00:00
Ilia.Shulgin
d2fba3447f [git] Consistent cyclic scrolling behavior in branches trees 
`UISettings.getInstance().cycleScrolling` was checked when searching for branches, making cyclic scrolling behavior different when just navigating through it


Merge-request: IJ-MR-138223
Merged-by: Ilia Shulgin <ilia.shulgin@jetbrains.com>

GitOrigin-RevId: 6c188fb13ed62210054208e9c36cca22c4762d23
 2024-06-28 14:43:15 +00:00
Maksim Zuev
da71819ee6 [coverage] IDEA-355476 Convert cache into service 
GitOrigin-RevId: 13c8af920bd68a26b6f07f7719fe35a3f1715d28
 2024-06-28 10:07:37 +00:00
Denis Zaichenko
ee0f6e812c Update history assertion to include file-specific messages 
Refactor `assertSameHistory` to accept a custom message for more descriptive error reporting. This change aids in identifying discrepancies in file-specific history comparisons.

GitOrigin-RevId: 145d57e58249c7b635f009ccfd724e8933676e33
 2024-06-27 22:07:03 +00:00
Denis Zaichenko
09c529d0c4 [vcs][log] Fixed rename detection for file history. 
Avoid stopping the traversal of renames when one branch returns no commits.

GitOrigin-RevId: 20ac1952ca9c4f3d8f1157db1bbe736b64e50142
 2024-06-27 18:16:49 +00:00
Aleksey Pivovarov
c6b6232e1c vcs: update progress text during VFS refreshes in VCS operations 
GitOrigin-RevId: b2a9d035438a933002cc96aeeca2b5873933118c
 2024-06-27 15:25:23 +00:00
Aleksey Pivovarov
e545bafa29 git: cleanup 
GitOrigin-RevId: e0434c7474f9aed21eab57028786771bfa70adce
 2024-06-27 15:25:22 +00:00
Ivan Semenov
32741760d7 [github/gitlab] match account with git url by host in silent auth data provider 
Git http authorizer recieves only a host, so matching by path is futile

#IJPL-157215 Fixed

GitOrigin-RevId: 2f150163c9be69c03c84a5efc3053e723ad14f6e
 2024-06-27 11:45:52 +00:00
Alexander Lobas
db4181013a IJPL-150231 Move icon mappings from json to icon generator (remove ExpUiIcons) 
GitOrigin-RevId: ec563768e3a10df6a758997d6be43bb707a70fe8
 2024-06-27 10:30:26 +00:00
Ivan Semenov
5f6f276e8c [github] implement a more modern changes browser for PR creation view 
GitOrigin-RevId: 99cb0f37597ff158a0d3b4579a1fbd90fcbd6db4
 2024-06-26 19:43:35 +00:00
Maksim Zuev
6675f5d123 [coverage] IDEA-355476 Cache git filter when the state of the repository is not changed 
GitOrigin-RevId: b831dd5a66b918e9b5d36d62508e16c32ac3992d
 2024-06-26 18:39:49 +00:00
Maksim Zuev
aa75c9c4d6 [coverage] IDEA-355476 Use batch convertToNodeIds method for faster git history search 
GitOrigin-RevId: d606d103761c1a9c214116aee650fd9ca52a2b5a
 2024-06-26 18:39:49 +00:00
Denis Zaichenko
c01ab0099b [vcs] IJPL-156509 Added new git stats. 
GitOrigin-RevId: be02739f2136eb9119913678549f5ec5529b9370
 2024-06-26 12:12:10 +00:00
Ilia.Shulgin
4834a2af34 [vcs] Return file content in VcsBaseRevisionAdviser::getBaseVersionContent 
GitOrigin-RevId: 7c09ed1c01d3b7f54b35728dd1a0985118d977f7
 2024-06-26 09:03:46 +00:00
Aleksey Pivovarov
d2b3736e4b git: cleanup - use utility method 
GitOrigin-RevId: 46406b387c37cbedb902af4703a17e9c10beef63
 2024-06-26 09:03:46 +00:00
Aleksey Pivovarov
47671a16fc IJPL-155863 patch: fix base content loading for git patches 
GitOrigin-RevId: cab2395609cf07709b38e2cca1850d0d54597055
 2024-06-26 09:03:46 +00:00
Gregory.Shrago
4d5b8847eb migrate getData to uiDataSnapshot: vcs 
GitOrigin-RevId: 0dc4a83894cd35777959eab7235d2603117a1c9e
 2024-06-26 02:39:39 +00:00
Denis Zaichenko
c9769597e1 [vcs] Removed GitMergeTagAction.kt. It was unused since we have GitMergeRefAction. 
GitOrigin-RevId: 94efdecbe30ede7bcc3b96724c64cfc12ba02fd0
 2024-06-25 18:08:12 +00:00
Ivan Migalev
fc7bb4d813 Rider Main Toolbar: rename from Experimental New Toolbar 
GitOrigin-RevId: 7a73ae00a892f49d06f0217233ec3668938ddbdd
 2024-06-25 15:41:28 +00:00
Chris Lemaire
dd900f8db2 [git4idea] Add a flow for resolving conflicts from MR/PR 
GitOrigin-RevId: e517f674266631bd04417c9aceb9c6044f8ca5a6
 2024-06-25 10:57:15 +00:00
Chris Lemaire
3ccb7e84b6 [git4idea] Cleanup: correct naming of repositoryMapping.kt 
GitOrigin-RevId: 57a5c4e62b0879b6f9d7e877f97016c23b674fba
 2024-06-25 10:57:15 +00:00
Aleksey Pivovarov
f85912f527 git: fix merge notifications not being updated properly 
The 'updateNotifications' method is broken.

GitOrigin-RevId: 45c25667c0abb6c9b6d14626567415e4030f7ee3
 2024-06-24 18:38:50 +00:00
Aleksey Pivovarov
43eee1c5e6 IJPL-157180 git: show merge conflict resolution on double click 
GitOrigin-RevId: 855ef49515bdfe85fedc1f18c09d6eaffdca352c
 2024-06-24 18:38:50 +00:00
Ivan Semenov
cb480552af [collab/git] make an API for current git branch status presenter 
GitOrigin-RevId: c494d5daac991cb4fc8486c5662a98edad81eb90
 2024-06-24 16:14:52 +00:00
Denis Zaichenko
75ec21a5f1 [vcs] GitTagHolder cleanup. 
Refactor GitTagHolder to use immutable Map for tags cache

GitOrigin-RevId: 10b7585572af2166a0328164a828c7e1e3a148df
 2024-06-24 12:36:34 +00:00
Ilia.Shulgin
cfbbdf36fa [git] Make action final when parsing rebase file 
GitOrigin-RevId: fa0eb37d9ae39745193bc347a69cc1dd8a73fe78
 2024-06-21 13:38:42 +00:00
Ilia.Shulgin
8c7ba50c37 [git] Single way to suggest message for squashed commits 
GitOrigin-RevId: 419ea33ea10588824d9997db3e0d867b513ecf49
 2024-06-21 13:38:42 +00:00
Ilia.Shulgin
d45d0cab48 [git] Improve commit matching in GitRebaseEntryGeneratedUsingLog 
GitOrigin-RevId: 6a12655c34c1f1dffc82ae56c196e686d4f3c389
 2024-06-21 13:38:42 +00:00
Ilia.Shulgin
5fc894ce34 [git] Check size of git-rebase-todo entries generated via log 
GitOrigin-RevId: 3a2ba9dfb19ac220c7d67a448110604cc0eb732e
 2024-06-21 13:38:42 +00:00
Aleksey Pivovarov
ddae57c6b8 IJPL-149986 git: fix interactive rebase with autosquash for 'amend!' commits 
Fix the commit message not being properly updated on 'squash!'.

GitOrigin-RevId: a5ab7c29250e0946cbe5cdcf77558f0e49f9c858
 2024-06-21 13:38:42 +00:00
Aleksey Pivovarov
792323dc9c IJPL-149986 git: fix interactive rebase for empty commits 
GitOrigin-RevId: f34510119737ebe87ae012d70f00cff26a865ee5
 2024-06-21 13:38:42 +00:00
Julia Beliaeva
f3c99e97a8 refresh stashes after clearing 
IJPL-157013

Closes #2783

GitOrigin-RevId: a965d22f9914b8b0a39b5e3ec3dbfe72cafe4b51
 2024-06-20 19:05:57 +00:00
Aleksey Pivovarov
c7c408b68c git: restore binary compatibility 
GitOrigin-RevId: c83432974040308a870511b5ea7344dfba9e36d0
 2024-06-20 18:50:26 +00:00
Ivan Semenov
ec8d5fcae8 [git/github/gitlab] extract some git calls to a common place 
GitOrigin-RevId: 1c217cc3b5e3b99740b186561c58891a9b2fa972
 2024-06-20 18:20:56 +00:00
Aleksey Pivovarov
2d03254956 git: do not spam log files with files that got filtered out 
GitOrigin-RevId: 788f49accce7828a5d9f041b1358778b555bf51d
 2024-06-20 12:39:47 +00:00
Denis Zaichenko
66142921b2 [vcs] IJPL-156950 Added git tag-by-hash cache initialization to background. 
GitOrigin-RevId: fd552f0ed4e94064101e5cdcde899e65b87ad686
 2024-06-19 20:31:16 +00:00
Aleksandr Krasilnikov
6964d8f107 git: cleanup 
GitOrigin-RevId: 2246a116e3be8c5cf7cd422226f4e48360bb0d58
 2024-06-19 17:39:40 +00:00
Aleksandr Krasilnikov
758fe55474 git: Drop usage of old api in GitMergeRebaseWidget 
GitOrigin-RevId: 71443d4c3484a86af8640339698f6bf845192f95
 2024-06-19 17:39:40 +00:00
Denis Zaichenko
8c921b1a26 [vcs] IJPL-72638 Git tags comparison performance fix. 
GitOrigin-RevId: 191df0dc90fa5261ee8ea10ef7ac3cda3fddf2f7
 2024-06-19 09:59:09 +00:00
Ilia.Shulgin
c519ec4a36 [git] Simplify BranchTreeNodeComparator 
GitOrigin-RevId: 3c316944bb7a03f26545dc5bac8ff3917efc8349
 2024-06-18 22:19:25 +00:00
Ilia.Shulgin
16e0e2eb74 [git] Ignore case when listing git branches 
IJPL-86830 IJPL-150396 IJPL-112392

GitOrigin-RevId: 312a60bbbd45da06610012f1b4710c76d8c65fdd
 2024-06-18 22:19:25 +00:00
Ilia.Shulgin
08b168383a [git] Explicitly define git initial branch in tests 
GitOrigin-RevId: e92d6a5a46b0aa01b631bcd7ecbe6b82fb82cdb2
 2024-06-18 22:16:06 +00:00
Ilia.Shulgin
d9897bf276 [git] Handle rebase from detached HEAD 
GitOrigin-RevId: cdea3d40f759a5a8d3ce37e11c3e42412787ff7b
 2024-06-18 20:32:34 +00:00
Ilia.Shulgin
725d79f330 [git] Get branch name from GitRepoInfo 
Calling `GitRepository::getCurrentBranch` after checking `GitRepository::isOnBranch` can produce unexpected result

GitOrigin-RevId: 204b7dacbc5340e20660c3d2451adc90cfe2c06c
 2024-06-18 20:32:34 +00:00
Ilia.Shulgin
417829326b [git] Improve branch tooltip when rebase is in progress 
GitOrigin-RevId: d07201a7ccacbf51c48e0b32a4eb4490dfc5cfda
 2024-06-18 20:32:34 +00:00
Ilia.Shulgin
7e521ba63c [git] Ensure that currentBranch != null in isOnBranch 
At least it won't return true when failed to detect current branch

GitOrigin-RevId: ae8c65485476da4b1f2d5c7e34af97693e0caf65
 2024-06-18 20:32:34 +00:00
Ilia.Shulgin
38377cb2c2 Return GitLocalBranch even if a branch is not found among local branches 
Branch can be simultaneously deleted and checked-out (making it missing in `localBranches`), which was leading to `AssertionError` in `git4idea.branch.GitBranchUtil.getBranchNameOrRev(GitBranchUtil.java:129)`
EA report #28159905

GitOrigin-RevId: 8072a7ac8819461db762e4d34d7b201017ac968a
 2024-06-18 20:32:34 +00:00
Chris Lemaire
4c9d8474ca [git-term] Update --rebase option description 
Follow-up: 0eba5926776dded82041dc34333eafbc788787ff

GitOrigin-RevId: 69ebda26cf2a9bdd8cb0ca79cd2058563dc9cea5
 2024-06-17 19:41:32 +00:00
Gregory.Shrago
144d3d5ca0 update api-dumps 
GitOrigin-RevId: 7bd4fd1530673a8bcc29caa814338ee0437f991c
 2024-06-17 00:35:34 +00:00
Alexander Lobas
89d58ee436 IJPL-150231 Move icon mappings from json to icon generator 
GitOrigin-RevId: 4d4576fc7eeb92ec43c36abec2d62d271b45d9a4
 2024-06-15 23:19:46 +00:00