leo
e89dbd8f43
code_review: PR #1177
...
- use `Command.ReadToEnd` instead of `Command.Exec` to avoid git trims line endings.
- use `StringBuilder.Append('\n')` instead of `StringBuilder.AppendLine()` to restore original line endings (we split the original diff output by `\n` not `\r')
- there's no need to show file content (the `StreamReader.ReadLine()` will trim line endings)
Signed-off-by: leo <longshuang@msn.cn>
2025-04-14 16:06:52 +08:00
Massimo
81820e7034
refactor: improve diff handling for EOL changes and enhance text diff… ( #1177 )
...
* refactor: improve diff handling for EOL changes and enhance text diff display
- Updated `Diff.cs` to streamline whitespace handling in diff arguments.
- Enhanced `DiffContext.cs` to check for EOL changes when old and new hashes differ, creating a text diff if necessary.
- Added support for showing end-of-line symbols in `TextDiffView.axaml.cs` options.
* localization: update translations to include EOF handling in ignore whitespace messages
- Modified the ignore whitespace text in multiple language files to specify that EOF changes are also ignored.
- Ensured consistency across all localization files for the patch application feature.
* revert: Typo in DiffResult comment
* revert: update diff arguments to ignore CR at EOL in whitespace handling (like before changes)
* revert: update translations to remove EOF references in Text.Apply.IgnoreWS and fixed typo in Text.Diff.IgnoreWhitespace (EOF => EOL)
---------
Co-authored-by: mpagani <massimo.pagani@unitec-group.com>
2025-04-14 15:18:45 +08:00
leo
e7f0217a7b
refactor: move binding for ToolTip.IsOpen
from code to axaml
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-14 11:51:40 +08:00
leo
245de9b458
fix: tooltip did not hide after pointer move out ( #1178 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-14 10:40:24 +08:00
leo
1799de4907
code_review: PR #1173
...
- rename c-style `file_arg` to `fileArg`
- add missing translations for zh_CN and zh_TW
- re-design conflict view and add tooltip for `USE THEIRS` and `USE MINE`
- re-order unstaged toolbar buttons
Signed-off-by: leo <longshuang@msn.cn>
2025-04-11 10:02:33 +08:00
Göran W
47824dc27a
Add button for running external mergetool on ALL conflicts ( #1173 )
...
* Make a few non-translated strings localizable (in Conflict view)
* Add button and wiring to run mergetool on all conflicts
* Corrected spelling and wording in related code and exception msg
2025-04-11 09:33:07 +08:00
leo
768b324356
ux: if there are no local changes, show different confirm message ( #1143 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 20:06:00 +08:00
leo
506af95963
enhance: new confirm empty commit dialog ( #1143 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 20:00:42 +08:00
leo
898a8bc69a
ux: resize confirm commit dialog
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 18:05:53 +08:00
leo
da38b72ee5
ux: disable commit button when commit message is empty
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-08 18:03:40 +08:00
leo
7cda7211f1
refactor: statistics dialog
...
- use `%aN+%aE` instead of `%aN` to get commit author
- show user avatar in statistics dialog
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 21:20:59 +08:00
leo
3049730dd5
feature: add Preferred Merge Mode
in repository configure ( #1156 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 14:42:46 +08:00
leo
fa02c65da5
code_review: PR #1153
...
- use a single filter for both unstage and staged files
- show confirm dialog if staged files are displayed partially
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 11:48:38 +08:00
Göran W
a37c6b29ec
In Local Changes, added filter-box in Staged area, to match Unstaged area ( #1153 )
...
Also added minimal handling (RaiseException) if trying to commit with active filter (might commit more changes than visible, so disallow).
Minor unification in unstageChanges() to make it more similar to StageChanges().
2025-04-07 10:37:58 +08:00
leo
ac7b02590b
enhance: add comma between date and time ( #1150 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 10:23:37 +08:00
Iacopo Sbalchiero
ca0fb7ae10
Adding template for Azure DevOps workitems ( #1128 )
...
* feat: add Azure DevOps issue tracker integration
* localization: add Azure DevOps sample rule to issue tracker in multiple languages
2025-03-26 09:27:10 +08:00
leo
d335cac167
enhance: only raise BlockNavigationChangedEvent
when UseBlockNavigation
enabled
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 18:00:46 +08:00
leo
9590f96a44
enhance: clear highlight chunk while scrolling out of TextArea.TextView
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 17:46:11 +08:00
leo
03f49ccff0
refactor: text diff view block navigation
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 17:35:59 +08:00
leo
8c1e1a3e6a
fix: text diff view scrolling issue introduced by AvaloniaEdit 11.2.0
(commit 7caa03a09b
)
...
- `SyncScrollOffset` does not update in `side-by-side` mode while scrolling
- Highlighted chunk is not cleared when scroll by drag scrollbar
Signed-off-by: leo <longshuang@msn.cn>
2025-03-21 10:09:43 +08:00
leo
891e1b2ec8
ux: show name of stash instead of SHA which is useless to user
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 19:56:06 +08:00
leo
145273b4a7
refactor: move Show tags in commit graph
to Preferences
( #1109 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 11:10:48 +08:00
leo
a5bdcab341
code_style: move dynamic context menu creation to view models
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-20 09:38:02 +08:00
leo
2512d3be7a
feature: allow to hide tags in graph ( #1109 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-18 21:40:31 +08:00
leo
ae1e46b586
fix: layout horizontal not working since 2025.9 after switching away from history screen ( #1108 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-18 19:47:54 +08:00
leo
822452a20c
enhance: show inner exception message if possible when check update failed
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-18 15:55:32 +08:00
leo
695db2a319
code_style: run dotnet format
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 20:57:18 +08:00
leo
3e8bba0d0b
ux: re-design About
page
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 17:06:26 +08:00
leo
cdd1926e2f
refactor: rewrite git apply
implementation
...
- Do not translate commandline options for `git`
- Re-design combox layout for `git apply` popup
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 15:30:32 +08:00
leo
ddfc868df3
ux: re-design merge option style
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 15:08:49 +08:00
leo
84979b20b3
ux: force using VertialAlignment="Center"
for sign info of commit ( #1098 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 09:32:31 +08:00
Gadfly
66517fd4bf
enhance: add tooltips to various UI elements for better accessibility ( #1097 )
...
* enhance: add tooltips to various UI elements for better accessibility
* refactor: simplify user string conversion
2025-03-16 11:23:42 +08:00
Asurada
db504241ea
feat: add translation for "1 hour ago" in multiple languages ( #1096 )
2025-03-14 16:57:03 +08:00
leo
0e261cffd2
refactor: rewrite the way to deal with uncommitted local changes when checkout/pull/create branch ( #1085 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-13 10:21:54 +08:00
leo
e430e847ff
enhance: auto convert spaces with dashes while renaming a branch ( #1088 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-13 09:50:42 +08:00
leo
e4f5c34e0c
code_style: remove whitespaces
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 17:58:57 +08:00
leo
eaa322dfab
enhance: re-design commit search result display ( #1083 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 17:57:31 +08:00
leo
77d8afe056
refactor: reduce the times to call RefreshLayout
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 15:10:43 +08:00
leo
0476a825ef
code_style: move some code from Histories.axaml
to separate files
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 14:58:59 +08:00
leo
ee7ccc0391
refactor: re-write commit searching (part 2)
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-12 11:05:19 +08:00
leo
64a41dce39
refactor: rewrite searching commit by file path
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 20:55:39 +08:00
leo
fa4d9d24e9
enhance: hide suggestion popups when window is deactived ( #963 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 20:22:32 +08:00
leo
f23e3478e6
fix: do not save preference in design mode
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 11:41:37 +08:00
leo
5f2bd8ad94
ux: layout for Preferences
window
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-11 09:27:32 +08:00
leo
5c279b4b56
feature: add global configuration for custom action ( #1077 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 21:19:38 +08:00
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
Gadfly
c1c0e7b2a0
enhance: Save Preferences after switched Workspace and closed Preferences ( #1073 )
2025-03-10 12:04:19 +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
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