- 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>
* 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>
- replace `SetNeedNavigateToUpstreamHead` with `NavigateToBranchDelayed`
- navigate to current HEAD instead of original source HEAD after merge
Signed-off-by: leo <longshuang@msn.cn>
- 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>
* 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
- 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>
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().
* Initial Japanese translation
Only a small part was translated
* Unspecified words will be in English
When new words are added, they will be displayed in English even if Japanese support is delayed.
* Expanded translation scope
* Expanded translation scope
* Proceed with translation with a focus on overall settings
* Re-translated the outdated settings screen
* Add items that only exist in the latest en_US and remove items that do not exist in en_US
* A lot of translation work done
* A lot more translation work has been done
* ja_JP.axaml has been translated into Japanese
* Fixed three incomplete parts of the Japanese translation
- `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>
