Commit Graph

553 Commits

Author SHA1 Message Date
leo
c058b4744b feature: allows to change DateTime format (#755) 2024-12-30 17:19:55 +08:00
leo
7028e08390 enhance: remove invalid expanded node records in repository's settings 2024-12-23 16:56:49 +08:00
leo
37bf6dec5e feature: remember --reflog, --first-parent, --topo-order and --date-order toggle states 2024-12-18 19:49:08 +08:00
leo
31ad317a57 feature: remember the Include Untracked Files toggle state in local changes 2024-12-18 17:30:04 +08:00
leo
5ec8279d38 feature: remember the state of repository sidebar (#823) 2024-12-18 15:33:09 +08:00
leo
cb3727b524 feature: remember --force check state in git fetch popup (#824) 2024-12-18 09:36:25 +08:00
leo
f418b72c64 feature: use [$workspace] $repo_name ($repo_path) as main window's title (#818) 2024-12-16 15:47:33 +08:00
leo
0a0e2bc044 enhance: only create squash menu item if it is needed 2024-12-13 16:24:39 +08:00
leo
24b6153226 ux: context menu of selected commits
* update English translation
* re-order the menu items
2024-12-13 16:02:10 +08:00
Ezra
26923435e7 enhance: improve readability of default clone dir errors. (#813) 2024-12-13 10:08:47 +08:00
leo
2053ce033d feature: supports merge selected commit to current branch (#800) 2024-12-12 10:03:34 +08:00
leo
9dd4166009 refactor: use MultiBinding instead of code to control visibility of Commit & Push button 2024-12-11 16:08:23 +08:00
leo
a10f9e0dd0 enhance: popup will be closed when cherry-pick or revert failed 2024-12-11 15:27:00 +08:00
leo
0dd6692cd8 enhance: supports --skip while reverting commits 2024-12-11 15:12:25 +08:00
leo
dcaeaef48a refactor: re-design conflict panel 2024-12-11 11:33:20 +08:00
leo
55ad194e0e code_style: remove unused code 2024-12-10 21:09:26 +08:00
leo
93d9a04460 enhance: show reverting commit in banner while reverting is in-progress 2024-12-10 20:57:10 +08:00
leo
2dd9cab695 enhance: try to use friendly name instead of commit hash 2024-12-10 20:23:46 +08:00
leo
3b5d87391d ux: use Views.NameHighlightedTextBlock instead of plan text for FileCM.ResolveUsing 2024-12-10 16:56:05 +08:00
leo
feb7e96b2c enhance: show friendly name instead of --theirs or --mine while resolving conflicts 2024-12-10 16:44:37 +08:00
leo
2504a52398 fix: wrong display when merge tag
* remove `Text.Merge.Source`  translations from `de_DE`/`es_ES`/`fr_FR`/`it_IT`/`pt_BR`/`ru_RU` because its content has been changed
2024-12-10 15:38:06 +08:00
leo
ef40e4b738 enhance: show source branch/tag/commit in banner while merging request in progress 2024-12-10 15:17:54 +08:00
leo
33ef9a612d fix: avoid crash if fontfamily contains consecutive whitespace (#799) 2024-12-10 12:06:36 +08:00
leo
aee3abfffb enhance: redesign in-progress banner (#790)
* show head for cherry-pick
* show stopped at for rebase
* supports `--skip` for cherry-pick and rebase
2024-12-10 11:17:30 +08:00
leo
94daa46db9 code_review: PR #793
* do NOT modify the existing merge, and add a new constructor for `Commands.Merge` instead
* rewrite `ViewModels.MergeMultiple`
  - since `_histories.Commits.Find` may returns null, use `List<object>` instead of `List<Models.Commits>`
  - supports display merge target as both `Models.Commit` and `Models.Branch`
* rename translation key `Text.MergeMultiple.Commit` to `Text.MergeMultiple.Targets`, and add translations for zh_CN and zh_TW
* some UI/UX changes
2024-12-09 21:12:58 +08:00
Dmitrij D. Czarkoff
dce33fdf60 feature: merge multiple heads (#793)
* feature: allow merging multiple heads
* feature: allow merging multiple branches from branch tree
2024-12-09 21:04:25 +08:00
leo
962055dd2a code_style: run dotnet format
Signed-off-by: leo <longshuang@msn.cn>
2024-12-08 21:51:33 +08:00
leo
15d3ad355d code_review: PR #703
* change the name of this feature to `Enable Block-Navigation`
* change the icon of the toggle button used to enable this feature
* use a new class `BlockNavigation` to hold all the data about this feature
* create `BlockNavigation` data only when it is enabled

Signed-off-by: leo <longshuang@msn.cn>
2024-12-08 21:02:30 +08:00
Göran W
655d71b0bc Add navigation and highlighting of change-blocks in Text Diff (#616, #717) (#703)
* Corrected misspelled local variable nextHigh(t)light

* Implemented change-block navigation

* Modified behavior of the Prev/Next Change buttons in DiffView toolbar.
* Well-defined change-blocks are pre-calculated and can be navigated between.
* Current change-block is highlighted in the Diff panel(s).
* Prev/next at start/end of range (re-)scrolls to first/last change-block
(I.e when unset, or already at first/last change-block, or at the only one.)
* Current change-block is unset in RefreshContent().

* Added safeguards for edge cases

* Added indicator of current/total change-blocks in DiffView toolbar

* Added new Icon and String (en-US) for Highlighted Diff Navigation

* Added Preference and ToggleButton for diff navigation style
2024-12-08 17:50:33 +08:00
GadflyFang
c062f27081 fix: Dispose _autoFetchTimer before _setting set to null (#792)
Signed-off-by: Gadfly <gadfly@gadfly.vip>
2024-12-06 15:09:14 +08:00
leo
75e9f1e9a4 feature: show track status in Delete Multiple Branches panel (#785) 2024-12-04 19:14:48 +08:00
leo
1ddd348a40 feature: show tracking status in Delete Branch panel if possible (#785) 2024-12-04 18:04:57 +08:00
leo
ca29a232e4 enhance: call gc after viewing commit changed 2024-12-03 10:44:27 +08:00
leo
d1a1b4b2b9 enhance: do NOT show search suggestion if input string is empty (#775) 2024-12-02 21:51:05 +08:00
leo
894f3e9b03 feature: supports searching revision files (#775) 2024-12-02 21:44:15 +08:00
leo
4cb9dbfd14 code_style: remove unused namespace using 2024-11-29 10:35:23 +08:00
leo
4aad6a7f86 fix: System.ArgumentException when hover the commit link multiple times before the first time tooltip shows (#765) 2024-11-29 10:26:36 +08:00
leo
dfc03d7a8f feature: allows to copy branch/tag name from the context menu of selected commit 2024-11-29 09:51:50 +08:00
leo
1c0d8a2697 fix: git rev-list do not support --decorate-refs-exclude (#746)
Do not use histories filters to query commit children
2024-11-27 17:06:44 +08:00
leo
4fc32b2b59 fix: crash due to font family name is an empty space (#745) 2024-11-27 09:17:18 +08:00
leo
693940368b code_style: remove unused variable
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 10:20:40 +08:00
Dmitrij D. Czarkoff
546f628470 fix: don't reverse commit order when cherry-picking (#736)
Fixes #726.  Looks like a980cc987d isn't sufficient.  It sorts the commits according to the ordering in history,  but then CherryPick ViewModel reverses the order.

This commit changes CherryPick ViewModel to use string.Join on the commit list without reordering,  so that the ordering is controlled entirely by the caller.
2024-11-24 09:32:47 +08:00
leo
c78e2e59d9 enhance: git format-patch
* use `--output=<file>` instead of `-o <dir>` to avoid failure because the directory cannot be created
* make generated patches in order when format multiple commits

Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 18:40:59 +08:00
leo
c50508d4ac fix: try to fix the issue that the branch tree did not update after deleting multiple branches (#729)
Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 10:42:53 +08:00
leo
153a1f30b2 feature: supports toggle --force option for git fetch command (#721)
* Background auto fetch will always disable this option
* This option is not add to pull operation

Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 09:39:50 +08:00
leo
8a95a17b0e ux: re-order menu items
Signed-off-by: leo <longshuang@msn.cn>
2024-11-21 20:55:59 +08:00
leo
8bd5bd864e feature: add context menu to switch histories filter mode to selected commit
Signed-off-by: leo <longshuang@msn.cn>
2024-11-21 20:50:51 +08:00
leo
b407dd97a1 enhance: reduce repository scanning time (#728)
* skip special folders, such as `node_modules`, `.svn`, `.vs` .etc.
* change max scanning depth to 5

Signed-off-by: leo <longshuang@msn.cn>
2024-11-21 14:18:41 +08:00
leo
069dc255d1 enhance: skip scanning sub folders if current is not a git repository but has .git subfolder/file (#728)
Signed-off-by: leo <longshuang@msn.cn>
2024-11-21 12:56:12 +08:00
leo
d3eca59036 refactor: rewrite the way to make sure scan repositories panel shows at least 0.5s (#728)
Signed-off-by: leo <longshuang@msn.cn>
2024-11-21 12:14:11 +08:00