Commit Graph

958 Commits

Author SHA1 Message Date
leo
7fa1912721 fix: hotkeys not work in change list (INFORMATION page)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 18:06:11 +08:00
leo
92fb4c8625 feature: add hotkeys to copy file path
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 17:54:15 +08:00
Nathan Baulch
f2778ee07a ux: hotkey tag on external merger menu items (#1547) 2025-07-08 16:30:49 +08:00
leo
170308e84f code_review: PR #1541
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 14:36:55 +08:00
oikku
4ef3ed8740 enhance: supports to open Blame (HEAD only) from LOCAL CHANGES (#1541) 2025-07-08 14:15:50 +08:00
leo
6142591ad1 ux: auto-focus commits list box and select the first commit on startup
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 10:44:31 +08:00
leo
8f8ed68744 fix: do not change original commit message
Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 18:04:27 +08:00
leo
c1d6b388f7 code_review: PR #1540
- Fix the issue that `StringReader` traits all outputs of `git ls-tree -z` command as a single-line
- Remove unused namespace using

Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 17:52:19 +08:00
Nathan Baulch
5c9d96fe7a refactor: streamline certain string operations (#1540) 2025-07-07 17:36:41 +08:00
leo
f7b2063e8d refactor: rewrite integration for git branch command
Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 17:25:48 +08:00
leo
b2aac68600 refactor: rewrite integration for git difftool and git mergetool command
Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 17:16:22 +08:00
leo
8277d7fc1b enhance: open external tool to merge conflicts instead of viewing diff
Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 15:49:02 +08:00
leo
4f4b90d424 ux: re-order context menu items
Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 15:09:05 +08:00
Nathan Baulch
6d068157b4 enhance: diff with merger option on local changes (#1534) 2025-07-07 14:53:09 +08:00
leo
2b3e94e1d1 refactor: rewrite the way to create context menu for selected commits
- `DataGrid` always returns selected items in order. There's no need to sort commits
- Use callback instead of passing the `DataGrid` to ViewModels.

Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 14:43:08 +08:00
Nathan Baulch
7c33470843 fix: correct "GitHub" capitalization everywhere (#1538) 2025-07-07 13:40:10 +08:00
leo
0938ccc98f feature!: change hotkeys
- change the hotkey to create branch based on selected commit to `Ctrl+Shift+B`
- add a new hotkey to create tag based on selected commit to `Ctrl+Shift+T`

Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 13:10:12 +08:00
leo
b85f100d84 code_review: PR #1532
- remove `MenuItemExtension`
- display `Tag` as hotkey tips when `InputGesture` is null
- remove `Avalonia.Input` reference in `ViewModels`
- rewrite `InteractiveRebase` view to avoid using `Tag` in menu item

Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 12:44:31 +08:00
Nathan Baulch
dd3c658a0d ux: show a few more shortcuts on menu items (#1532) 2025-07-07 11:38:06 +08:00
leo
68b5afb60d code_review: PR #1531
Makes sure observable property are changed in UIThread

Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 10:47:09 +08:00
Nathan Baulch
95ec6e723c fix: deadlock on ctrl+N (#1531) 2025-07-07 10:43:44 +08:00
leo
6c7a4e97b2 code_review: PR #1521
- Remove `ConfigureAwait(false)` since we need go back to UIThread
- Add Chinese translations for `Text.CommitCM.CopyCommitMessage`

Signed-off-by: leo <longshuang@msn.cn>
2025-07-05 21:30:38 +08:00
heartacker
08af39de34 feature: supports to copy full commit message (#1521)
Co-authored-by: leo <longshuang@msn.cn>
2025-07-05 21:23:45 +08:00
leo
fba1b63af8 feature: supports to change submodule's branch (#1513)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-05 19:16:07 +08:00
leo
0a7430b552 localization: remove Text.CopyInfo
Signed-off-by: leo <longshuang@msn.cn>
2025-07-05 17:22:53 +08:00
leo
62a546a33a feature: supports to copy sha and remote url of selected submodule (#1518) (#1522)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-05 17:05:20 +08:00
leo
eb45380b8d code_review: PR #1525
- `OpenForDiffAsync` should not use `await` (we do not need to wait it ends)
- Modify `Checkout`, `CheckoutCommit` and `CreateBranch`

Signed-off-by: leo <longshuang@msn.cn>
2025-07-05 16:22:52 +08:00
Nathan Baulch
3583527026 code_style: general cleanup (#1525) 2025-07-05 15:58:16 +08:00
leo
ffc06f7574 feature: support to open submodule change histories from context menu
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 17:12:40 +08:00
leo
21db4905e8 code_review: PR #1510
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 17:01:28 +08:00
Nathan Baulch
71a743c80a enhance: use regex to fix branch names (#1510) 2025-07-04 16:55:05 +08:00
leo
5687265582 feature: supports git submodule set-url -- <path> <new_url> (#1506)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 16:53:27 +08:00
leo
cdb84c7c43 typo: ShowDailog -> ShowDialog
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 15:36:45 +08:00
leo
a6ebc1502c refactor: show child-window and modal dialog
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 14:49:04 +08:00
leo
937ad0c708 feature: add Update Submodule context menu entry for selected submodule
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 11:38:34 +08:00
leo
56a9447e19 feature: supports to move selected submodule (#1507)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-04 11:00:24 +08:00
leo
2263e43203 fix: Move Repository Node popup never close
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 21:15:01 +08:00
leo
c499978198 feature: supports to switch change display mode in STASHES page (#1504)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 20:42:15 +08:00
leo
92ab85bb3f enhance: do not warn when creating branch with current detached HEAD
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 20:11:21 +08:00
leo
f33edb7601 Merge branch 'develop' into feature/async 2025-07-03 19:13:37 +08:00
leo
b6c8190d4e fix: text diff view in commit detail panel may display wrong data when switching between repositories (#1503)
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 19:06:26 +08:00
leo
18b9d982ce refactor: remove ConfigureAwait when we need to go back to UIThread after it
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 18:42:56 +08:00
leo
2a0f9f4192 fix: onSure is not asigned to Views.Confirm.OnSure
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 17:49:39 +08:00
leo
40765826ce code_review: PR #1492
- Remove all synchronous method in commands
- `Command.ReadToEndAsync` now is protected method
- Rename `ResultAsync` to `GetResultAsync`
- Call `ConfigureAwait(false)` when there's no context

Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 17:30:06 +08:00
Nathan Baulch
463e304491 feature: async (#1492)
* Async command methods
* Async `Task.Run` where possible
* Remove redundant `Task.Run` in `Sure` methods
* Remove leftover braces and reformat
* Async event handlers as needed
2025-07-03 15:38:39 +08:00
leo
d8bc3f924a fix: PR #1501
- returns `null` to fallback to git's `merge.ff` configure when user does not configure `Preferred Merge Mode`
- since `GetGitConfigBranchMergeOptions` is the last one, returns `Default` as fallback

Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 15:30:23 +08:00
Sina Hinderks
35d681dd50 fix: merge.ff is ignored (#1501)
After changing the priority of the preferences/configurations for the
merge mode in #1495, the git configuration `merge.ff` was ignored.  The
reason is, that `GetSettingsPreferredMergeMode()` does not return `null`
in the default case.  This is now fixed.
2025-07-03 15:20:03 +08:00
leo
3fe72e919c code_review: PR #1497
Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 11:15:14 +08:00
Nathan Baulch
ec17ea9901 code_style: general cleanup (#1497) 2025-07-03 10:32:03 +08:00
leo
5240222846 code_review: PR #1495
- remove unused namespace using
- prefer to use repository's configuration than the global `merge.ff`

Signed-off-by: leo <longshuang@msn.cn>
2025-07-03 10:24:43 +08:00