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
Yuriy Artamonov
fae6be63ba
[vcs] IJPL-34876 Declare icons and texts for actions declaratively
...
GitOrigin-RevId: af4079f82cbe94d8daad91fcb4b046c8e0b90bb4
2024-06-15 21:01:31 +00:00
Gregory.Shrago
2d30c1b81f
drop deprecated KeepingPopupOpenAction usages
...
GitOrigin-RevId: 41e9de067bbcbc527ebd7ce3c5d11a22cf332649
2024-06-15 02:29:32 +00:00
Denis Zaichenko
efed2ca992
[vcs] IJPL-72638 Changed default value of 'Git.Settings.ShowTags' to true.
...
GitOrigin-RevId: e7938630fbaea470d56ba89553458f4106950e77
2024-06-14 12:18:27 +00:00
Denis Zaichenko
06512ffebd
[vcs][log] Fixed race condition when VcsLogFileHistoryHandler is accessed before it is initialized.
...
GitOrigin-RevId: 29bdcf349b534e298ab6718cf5ba1673928cac3a
2024-06-12 15:36:36 +00:00
Denis Zaichenko
febb2fd10f
[vcs] IJPL-72638 Added tests for tag loading.
...
GitOrigin-RevId: 1ce7b33c5487d02f4fce9ad1dfb4cc8b56364ccd
2024-06-12 14:38:57 +00:00
Denis Zaichenko
5e9471c5b1
[vcs] IJPL-72638 Added Tags actions to the branch widget.
...
GitOrigin-RevId: 672623f1cc4bda147c7c201dacbc27e305a698f6
2024-06-12 14:38:57 +00:00
Denis Zaichenko
43cebd0a21
[vcs] IJPL-72638 Added Tags node to the branch widget
...
GitOrigin-RevId: cd62f96101af5644719cf3abcdf057fe91b0652b
2024-06-12 14:38:57 +00:00
Denis Zaichenko
f4c72136d6
[vcs] IJPL-72638 Added tag name and tag icon support to branch widget
...
GitOrigin-RevId: ec60bca2d226811ddc6a1f781463892a2bd08674
2024-06-12 14:38:57 +00:00
Denis Zaichenko
56d136bb42
[vcs] IJPL-72638 refactoring: extract method.
...
GitOrigin-RevId: c6c7fd88c5cc2d663e3673ce00c8c5df0ef494a1
2024-06-12 14:38:57 +00:00
Denis Zaichenko
af10d1b315
[vcs] IJPL-72638 refactoring GitBranch -> GitReference
...
GitOrigin-RevId: c9828a04eda93f3b1d5076335f3dd1a7e7773b31
2024-06-12 14:38:57 +00:00
Denis Zaichenko
9d9ad513fe
[vcs] IJPL-72638 Async loading of git tags.
...
GitOrigin-RevId: ff165c7924adb789c695a951a8d7c5c9e37ddb27
2024-06-12 14:38:57 +00:00
Denis Zaichenko
91679623fa
[vcs] IJPL-72638 MockGitRepository convert java to kotlin.
...
GitOrigin-RevId: f059c1c638a336220f870880a924622fee9d8a27
2024-06-12 14:38:57 +00:00
Denis Zaichenko
b8d2d47676
[vcs] IJPL-72638 MockGitRepository Rename .java to .kt
...
GitOrigin-RevId: 1203e8df4974624d964de540318514a1d6b3a7a7
2024-06-12 14:38:57 +00:00
Denis Zaichenko
854d98f2e1
[vcs] IJPL-72638 Expose CoroutineScope from GitRepository
...
GitOrigin-RevId: eea49554bd60ad17dc3ed44a9774204f069bb3c3
2024-06-12 14:38:56 +00:00
Denis Zaichenko
53b3a7520e
[vcs] IJPL-72638 Convert GiRepositoryImpl to kotlin.
...
GitOrigin-RevId: 94aef9d0e6b2a5ca029aa5023e73c69d4ac954f7
2024-06-12 14:38:56 +00:00
Denis Zaichenko
a958f80d2b
[vcs] IJPL-72638 Rename GitRepositoryImpl .java to .kt
...
GitOrigin-RevId: c6afc60ff402c1a15181ee7797dc8494a98c2e06
2024-06-12 14:38:56 +00:00
Denis Zaichenko
efac4b0af6
[vcs] IJPL-72638 convert GitDisposable to kotlin
...
GitOrigin-RevId: 19fd489cce0c36d52e16e710ad1d013a74936ebf
2024-06-12 14:38:56 +00:00
Denis Zaichenko
f56071e659
[vcs] IJPL-72638 Rename GitDisposable .java to .kt
...
GitOrigin-RevId: 894a37a8e724f2a478231ce198c2c656d5962ee2
2024-06-12 14:38:56 +00:00
Denis Zaichenko
f58301e9fc
[vcs] IJPL-72638 Added Tags @ApiStatus.NonExtendable to GitRepository class.
...
GitOrigin-RevId: fae4f41e0cb5a2a0cb8b4092d5ae6e0972bd93a9
2024-06-12 14:38:56 +00:00
Denis Zaichenko
9b21694eb6
[vcs] IJPL-72638 Added "Show Tags" option to branch widget settings
...
GitOrigin-RevId: 36a3f755e93f2a98912ecb1a594689f1bfdfdd92
2024-06-12 14:38:56 +00:00
Chris Lemaire
a7a884760f
[git-term] Add tests for terminal-output parsing and fix branch listing formatting
...
GitOrigin-RevId: 43009b31fe6b4a659f2e93878730979950f9ec78
2024-06-10 17:32:43 +00:00
Chris Lemaire
0e0a0208c0
[git-term] Internationalize all git terminal strings
...
GitOrigin-RevId: 0eba5926776dded82041dc34333eafbc788787ff
2024-06-10 17:32:43 +00:00
Chris Lemaire
a16acb0ece
[git-term] Add tests for Git terminal completions
...
GitOrigin-RevId: 648b5ba71764ae58ba8f298cdba0abc3b64fee8a
2024-06-10 17:32:43 +00:00
Chris Lemaire
156296657e
[git-term] Add custom completion for branches (IJPL-101545)
...
#IJPL-101545 Fixed
Adds completion suggestions for local and remote branches taken from GitRepository if possible.
GitOrigin-RevId: c30497d5408cacf5b7b0f716ec4e711965a1a292
2024-06-10 17:32:43 +00:00
Chris Lemaire
7a5cb2f419
[git-term] Add custom completion for remotes (IJPL-101545)
...
Adds completion suggestions for remotes taken from GitRepository if possible.
This applies to terminal commands such as `git remote rm [remote]`,
where `[remote]` can be completed with `main` for instance.
GitOrigin-RevId: c0d506ba8e66be5c20e77cdbf51fa0a4777b2da3
2024-06-10 17:32:43 +00:00
Ivan Semenov
392dc655fb
[collab] focus head branch selector by default
...
GitOrigin-RevId: 4fa10cb23625d0fe9f97dcdf6b936b419c3b5b58
2024-06-10 12:39:38 +00:00
Maksim Zuev
c0e9691d2b
[coverage] IDEA-353814 Files filtering based on git commit history
...
IJ-CR-135534
GitOrigin-RevId: 93c6aa5c27f75224a2819ea8097c1a749d5434d4
2024-06-07 19:24:29 +00:00
Dmitry Zhuravlev
72f242e291
[fragments] implement check if sparse checkout is active
...
GitOrigin-RevId: e7b68514ea6473a08794fbad51638bee9c3ca543
2024-06-07 15:15:59 +00:00
Gregory.Shrago
933fb9fe64
IJPL-156190 VCS: Branch search: Backspace key does nothing
...
GitOrigin-RevId: 04afdb76416ddad27fadbce8da9089bfa958566f
2024-06-07 11:25:08 +00:00
Julia Beliaeva
ab8f5f5b3a
[lvcs] record a different name for the amend
...
GitOrigin-RevId: 6f61814cb3562bc5e5a9ff568e4094fe07223470
2024-06-05 13:34:15 +00:00
Alexander Bubenchikov
43c39b29af
[vcs][git] override method, to allow get git repository structure without Project instance
...
GitOrigin-RevId: b4b9b75ea50d584390ce2e8c930be384fb2e4eaf
2024-06-05 12:27:10 +00:00
Aleksey Pivovarov
c1aa63c583
EA-934127 git: fix AlreadyDisposedException
...
GitOrigin-RevId: e81cff46235aa018fea93fc1314b99e0a3783143
2024-06-04 17:31:13 +00:00
Chris Lemaire
f22dae4aad
[git-term] Add completion for git aliases (IJPL-103668)
...
#IJPL-103668 Fixed
Comes in two parts:
1. Make sure aliases are resolved to their actual commands through a
ShellAliasContributor.
2. Add an override spec that generates alias subcommands to make sure
aliases show up in completion after `git `.
GitOrigin-RevId: 65a3d50ce1e02aa134cbcf0cbc809ff3e79c8cb9
2024-06-03 13:11:37 +00:00
Chris Lemaire
3322621879
[git-term] Add an initial terminal git autocompletion specification
...
GitOrigin-RevId: 74057c98261777f7b260e13c15a706ef388e48d5
2024-06-03 13:11:37 +00:00
Julia Beliaeva
df9406ddf3
[file-history] cleanup: remove usage of the deprecated class
...
GitOrigin-RevId: 340c213a10830e14f522e25722c4d881998e4309
2024-06-02 12:12:51 +00:00
Julia Beliaeva
7ded014d91
[git-stash] remove periods from the tooltip messages
...
GitOrigin-RevId: 351bac2c21979f6d22936b104f33f67f01b6a47a
2024-06-01 00:03:56 +00:00
Julia Beliaeva
35139f33eb
[git-stash] show the stashed version as the after version in the stashed diff
...
The stashed version should be considered as the after version in the diff, as it contains the modifications to be applied to the local version. This behavior is consistent with the diff for the shelves and with the previous implementation. Additionally, showing the local version as the before version would allow displaying a correct background for added or deleted files.
IJPL-155908
GitOrigin-RevId: 59bb2d41b7c30c9d43acdf82ff37d2f6074647fa
2024-05-31 13:26:29 +00:00
Julia Beliaeva
ce273667e6
[git-stash] use the same name for the diff preview action as in the other tabs
...
follow-up: 4eb71c12a5e69f148cb06dd7ef9067754c091fc5
IJPL-155921
GitOrigin-RevId: 24c21f8f0856ab1ec9b0d4fa204db92b87cb765a
2024-05-30 18:25:42 +00:00
Julia Beliaeva
68561d0980
[git-stash] improve the tooltip message for the "Keep index" checkbox
...
GitOrigin-RevId: 6ea91ebe2ec37b3d2304139e769d86e3ce519e1b
2024-05-29 17:11:18 +00:00
Julia Beliaeva
aee74b5fdd
[git-stash] restore tooltip for the "Keep index" checkbox
...
follow-up: ec039b40de34d03d9bec8fe9bfd99174d49f53a2
GitOrigin-RevId: 5781491782f3125cab5031b6563e582f3eba995a
2024-05-29 17:11:18 +00:00
Julia Beliaeva
bd8f475552
[git-stash] add an action to toggle split preview in the stash tab
...
IJPL-155749
GitOrigin-RevId: 4eb71c12a5e69f148cb06dd7ef9067754c091fc5
2024-05-29 12:31:11 +00:00
