Commit graph

2820 commits

Author SHA1 Message Date
leo
b4fbc2372b
enhance: show commit info tip when hover SHA in conflict view
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 20:02:09 +08:00
leo
2b2f070c4a
enhance: use --no-optional-locks parameter for git status command
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 18:29:11 +08:00
leo
e65cb50495
fix: use \ as path delim on Windows when executing custom actions (#1077)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 17:48:02 +08:00
Gadfly
c1c0e7b2a0
enhance: Save Preferences after switched Workspace and closed Preferences (#1073) 2025-03-10 12:04:19 +08:00
leo
df6cbcaa28
fix: app crashed after enable Show children in the commit details (#1072)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 11:33:38 +08:00
leo
855466686d
ux: show conflict sources when it comes from a stash or patch (#1067)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 10:22:49 +08:00
AquariusStar
2fb1d7e14a
update and fix translation russian (#1070) 2025-03-10 09:27:25 +08:00
Gustav Andersson
89f655c84d
fix: Show detached HEAD (#1060) 2025-03-07 16:16:15 +08:00
leo
0860245674
code_style: simple window do not using DataContext
Signed-off-by: leo <longshuang@msn.cn>
2025-03-07 15:44:50 +08:00
leo
43fed8e04d
refactor: re-write About window
Signed-off-by: leo <longshuang@msn.cn>
2025-03-07 15:15:47 +08:00
leo
83f23583be
enhance: supports to navigate to target commit while resolving conflicts
Signed-off-by: leo <longshuang@msn.cn>
2025-03-07 12:22:47 +08:00
leo
ca6d41ee60
enhance: try to get stopped at revision info from .git/rebase-merge/head
Signed-off-by: leo <longshuang@msn.cn>
2025-03-07 11:39:15 +08:00
Javier J. Martínez M.
14877d4d63
localization: update spanish translations (#1061)
add missing spanish translations
update previous references of `patch` as `parche`
2025-03-07 09:32:05 +08:00
leo
92fa25ae8d
ux: disable scrollbar in NumericUpDown control (#1023)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-06 15:14:05 +08:00
leo
aa0d4b4296
ux: adjust column width of commit hash and time after font size changed (#994)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-06 11:50:22 +08:00
leo
78c0d8d334
fix: both --tags and --no-tags are used in git pull command
Signed-off-by: leo <longshuang@msn.cn>
2025-03-06 10:37:50 +08:00
leo
81bbe11345
code_style: rename some variables in ParseLinksInMessage
Signed-off-by: leo <longshuang@msn.cn>
2025-03-05 17:06:45 +08:00
leo
fb8d4a2542
code_review: PR #1055
- since the author and time are already shown in the blame view, use the full message as tooltip is better.
- cache the commit message in `ViewModels.Blame` since the `Tooltip` of control may change.
- querying commit message synchronously (it's very fast) to avoid similar issues in commit details panel.

Signed-off-by: leo <longshuang@msn.cn>
2025-03-05 09:54:23 +08:00
GadflyFang
269903503f
feat: Add commit Tooltip in Blame (#1055)
Fixes #993
2025-03-05 09:36:32 +08:00
leo
5e898a809e
enhance: check commit hash after intersect testing
Signed-off-by: leo <longshuang@msn.cn>
2025-03-05 09:30:55 +08:00
leo
792e61b24f
ux: re-design the layout for Interactive Rebase window that tries to fix issue #1037
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 18:23:13 +08:00
leo
e884f27f67
code_style: re-order CommitDetail properties
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 18:02:29 +08:00
leo
e28f8611ef
ux: re-design the layout for Interactive Rebase window that tries to fix issue #1037
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 17:39:21 +08:00
leo
2137ad9ec9
enhance: allow to configure editor tab width in preferences window (#1048)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 17:26:27 +08:00
leo
11af5d9b29
code_style: use ?: operator instead of if ... else statement
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 16:42:32 +08:00
GadflyFang
68e96f428e
fix: validate result not update #1052 (#1053) 2025-03-04 16:34:51 +08:00
GadflyFang
25e6e261a6
refactor: Improve key modifier checks and AltGr detection (#1051) 2025-03-04 16:33:43 +08:00
leo
96538b9a62
fix: there's an extra line-ending while copy multiple lines from text diff view (#1049)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 16:26:14 +08:00
leo
b75676a7f8
refactor: commit message
- move issue tracker and commit hash links parsing to view models
- parsing links async
- make sure matched hash is a valid commit oid
- disable `CHILDREN` row in submodule info panel

Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 16:04:19 +08:00
leo
5301a368e0
ux: re-design the layout for Interactive Rebase window that tries to fix issue #1037
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 09:46:02 +08:00
leo
d4bcc60113
enhance: disable CONTINUE button while it is running (#1046)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-04 09:29:07 +08:00
leo
35ee4a47db
fix: the last selected line is missing while trying to copy multiple lines in text diff view (#1044)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-03 15:39:59 +08:00
leo
598bba5210
code_review: PR #1043
`FileModeChange` should not be changed out of UIThread

Signed-off-by: leo <longshuang@msn.cn>
2025-03-03 14:25:49 +08:00
GadflyFang
72c7f24e2f
fix: set FileModeChange after RefreshAll (#1043) 2025-03-03 14:17:03 +08:00
GadflyFang
7f8372f6b5
enhance: Handle file mode changes for new/deleted file (#1040) 2025-03-03 10:38:58 +08:00
leo
25fa223c6b
enhance: better regex for remote URL (#1039)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-02 10:39:04 +08:00
heartacker
8423f53ace
chore: 升级Avalonia和CommunityToolkit.Mvvm包 (#1038)
- Upgrade Avalonia packages to version 11.2.5 and CommunityToolkit.Mvvm to version 8.4.0.
2025-03-01 19:20:37 +08:00
leo
8dd0274bdd
enhance: only write MERGE_MSG when commit message is not null
Signed-off-by: leo <longshuang@msn.cn>
2025-03-01 09:21:52 +08:00
leo
5199fb2b74
enhance: do NOT remember the last selected handling method of uncommitted local changes (#977)
Signed-off-by: leo <longshuang@msn.cn>
2025-02-28 22:14:21 +08:00
leo
c90b7afac1
feature: makes the base on branch name selectable (#1036)
Signed-off-by: leo <longshuang@msn.cn>
2025-02-28 19:18:10 +08:00
leo
88c7d5bbc9
fix: app crashes when Return key is pressed while current action is already running (#1035)
Signed-off-by: leo <longshuang@msn.cn>
2025-02-28 19:15:02 +08:00
leo
9cf1cba9b7
feature: apply commit message while continue merge/revert (#1027)
Signed-off-by: leo <longshuang@msn.cn>
2025-02-28 19:08:27 +08:00
leo
639bff9ad8
code_style: run dotnet format
Signed-off-by: leo <longshuang@msn.cn>
2025-02-28 17:27:17 +08:00
leo
3e70ff94b0
fix: should not use ... to get revision range for rebasing (#1033)
Signed-off-by: leo <longshuang@msn.cn>
2025-02-28 17:06:07 +08:00
Andre Greeff
f930967698
feat: remove IsMerged check from "Interactive Rebase" context menu conditional (#1033) 2025-02-28 17:05:49 +08:00
GadflyFang
57cb9d0909
fix: Dynamic load copyright (#1030) 2025-02-27 21:14:24 +08:00
Leonardo
337ee1a55d
localization: update italian translation (#1029) 2025-02-27 21:12:14 +08:00
leo
fc3043b93c
fix: double-clicking button trigger binded command twice (#1032)
Signed-off-by: leo <longshuang@msn.cn>
2025-02-27 21:10:41 +08:00
leo
61d7f36be4
enhance: reset diff view context for empty commit
Signed-off-by: leo <longshuang@msn.cn>
2025-02-27 10:59:00 +08:00
leo
bdf439a742
enhance: do not show error message if it is empty
Signed-off-by: leo <longshuang@msn.cn>
2025-02-26 16:33:11 +08:00