Commit Graph

4076 Commits

Author SHA1 Message Date
leo
8f9094fc77 fix: should use File.Create instead of File.OpenWrite
Signed-off-by: leo <longshuang@msn.cn>
2025-07-11 10:39:33 +08:00
leo
aa803c3141 code_review: PR #1555
- Remove unnecessary reference to `System.Linq`
- Stop to auto-stage and commit when there is unsolved conflict(s)

Signed-off-by: leo <longshuang@msn.cn>
2025-07-11 09:59:19 +08:00
Sina Hinderks
7aa008372b fix: prevent staging conflicted files (#1555)
It was possible to stage a file with conflicts (double tap, space,
enter, or a stage button).  As a result it would no longer be shown as
conflicted, and the user could no longer solve the conflict in any way
(use theirs, use mine, or execute merge tool), not even after unstaging
again.

Now conflicted files are ignored when staging.
2025-07-11 09:43:49 +08:00
github-actions[bot]
862fe40b56 doc: Update translation status and sort locale files 2025-07-11 01:40:33 +00:00
AquariusStar
e998f78f3a localization: update russian translate (#1554) 2025-07-11 09:40:20 +08:00
leo
d5745b4a65 enhance: do nothing if target is a binary file while blaming 2025-07-10 17:42:18 +08:00
Gadfly
44f7877926 feat: Add blame visibility condition and file size formatting (#1552)
- Add conditional visibility binding to blame data display using a negated binary file flag converter.
- Format size property as human-readable file size using LongConverters.ToFileSize converter in UI display.
2025-07-10 17:37:14 +08:00
leo
24d3998808 ux: add loading icon 2025-07-10 17:34:15 +08:00
leo
de0d0c15f8 enhance: it's not necessary to change thread's culture 2025-07-10 16:11:02 +08:00
leo
cc0a223f50 enhance: use G3 instead of N3 to format file size in double 2025-07-10 13:15:03 +08:00
leo
a687de36da ux: format file size based on current culture 2025-07-10 11:49:12 +08:00
leo
d3d1377334 refactor: auto-select merge mode
- Change the description of `Default` merge mode to `Use git configuration`
- It's not necessary to read global `merge.ff` configuration
2025-07-09 17:25:06 +08:00
leo
7b0292722e enhance: do not show end of line any more since we can not restore the original line-endings 2025-07-09 16:47:50 +08:00
leo
8bdc1c5976 code_style: a few more to PR #1543
Signed-off-by: leo <longshuang@msn.cn>
2025-07-09 16:37:12 +08:00
Nathan Baulch
796f8898c9 code_style: general cleanup (#1543)
* code_style: general cleanup

* feedback fixes
2025-07-09 16:12:03 +08:00
leo
666305e40c ux: file history layout
Signed-off-by: leo <longshuang@msn.cn>
2025-07-09 15:59:43 +08:00
leo
af7e68b3db ux: use the same tooltip style for submodule when displaying as tree
Signed-off-by: leo <longshuang@msn.cn>
2025-07-09 15:18:04 +08:00
leo
f6b0f14106 ux: style for filter mode switcher in graph
Signed-off-by: leo <longshuang@msn.cn>
2025-07-09 14:27:08 +08:00
leo
7c59183391 feature: add hotkeys to stashes page
Signed-off-by: leo <longshuang@msn.cn>
2025-07-09 12:57:11 +08:00
Nathan Baulch
23e578f355 enhance: double tap stash to apply (#1546) 2025-07-09 12:02:26 +08:00
github-actions[bot]
4b05cf15bf doc: Update translation status and sort locale files 2025-07-09 03:46:47 +00:00
leo
58678e88e4 ux: styles for hotkey tips
Signed-off-by: leo <longshuang@msn.cn>
2025-07-09 11:46:12 +08:00
leo
094749f935 refactor: use Ctrl+Shift+S to save revision file
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 21:33:03 +08:00
github-actions[bot]
4daa0f00d3 doc: Update translation status and sort locale files 2025-07-08 12:56:18 +00:00
leo
3c5abc525a feature!: change hotkey for COMMIT & PUSH to Ctrl+Alt+Enter/⌘+⌥+Enter
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 20:55:42 +08:00
leo
0eaa7d35ff feature: add hotkeys to save revision file
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 20:25:21 +08:00
leo
7f838f1f88 feature: add hotkeys to open file with default editor
Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 20:05:37 +08:00
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
github-actions[bot]
85559cdc41 doc: Update translation status and sort locale files 2025-07-08 05:27:49 +00:00
Nathan Baulch
e70010b57e localization: remove unused translations (#1545) 2025-07-08 13:27:36 +08:00
Nathan Baulch
aa3c0605c3 ux: inconsistent tabs/pages terminology (#1536) 2025-07-08 11:56:44 +08:00
github-actions[bot]
8958c7882e doc: Update translation status and sort locale files 2025-07-08 03:49:55 +00:00
leo
719bdaae3c code_review: PR #1544
Add tooltip for reordering commits

Signed-off-by: leo <longshuang@msn.cn>
2025-07-08 11:49:37 +08:00
Nathan Baulch
11a759e4d6 enhance: rebase move up/down with arrow keys (#1544) 2025-07-08 11:02:29 +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
05b9fac62a ux: avoid revision file tree view flickering when selecting another commit
Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 17:59:48 +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
122de2ea92 ux: new style for submodule tooltip
Signed-off-by: leo <longshuang@msn.cn>
2025-07-07 15:59:54 +08:00
github-actions[bot]
abf610a69d doc: Update translation status and sort locale files 2025-07-07 07:49:42 +00: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