Commit graph

88 commits

Author SHA1 Message Date
leo
3275dd07d2
enhance: auto stash and re-apply local changes before squashing (#1141)
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 16:04:10 +08:00
leo
a0cddaea80
feature: support --ff-only option for git merge command
Signed-off-by: leo <longshuang@msn.cn>
2025-03-17 19:53:47 +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
cf8cff6b64
code_style: add ViewModels.Repository.GetCustomAction(scope)
Signed-off-by: leo <longshuang@msn.cn>
2025-03-10 21:30:04 +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
639bff9ad8
code_style: run dotnet format
Signed-off-by: leo <longshuang@msn.cn>
2025-02-28 17:27:17 +08:00
Andre Greeff
f930967698
feat: remove IsMerged check from "Interactive Rebase" context menu conditional (#1033) 2025-02-28 17:05:49 +08:00
leo
12597fd3e3
code_style: run dotnet format
Signed-off-by: leo <longshuang@msn.cn>
2025-02-07 12:06:29 +08:00
leo
766b60d05e
enhance: disable unused context menus for bare repository (#899) 2025-01-14 17:53:26 +08:00
leo
5acc6e6928
enhance: double-click commit in histories of a bare repository 2025-01-14 17:26:01 +08:00
leo
f06b1d5d51
refactor: merge ViewModels.PopupHost into ViewModels.LauncherPage 2025-01-08 21:36:49 +08:00
leo
4e06944c9f
fix: auto-filter does not work well (#855) 2025-01-02 20:05:04 +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
leo
2053ce033d
feature: supports merge selected commit to current branch (#800) 2024-12-12 10:03:34 +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
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
dfc03d7a8f
feature: allows to copy branch/tag name from the context menu of selected commit 2024-11-29 09:51:50 +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
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
a980cc987d
fix: wired ordering when cherry-pick multiple commits (#726)
Since the items in `ListBox.SelectedItems`  are not ordered by their position in the list, but in the order user selected, it need be sorted before `cherry-pick`

Signed-off-by: leo <longshuang@msn.cn>
2024-11-21 09:57:43 +08:00
leo
8de37720fa
code_style: remove Rider warnings
Signed-off-by: leo <longshuang@msn.cn>
2024-11-10 13:19:25 +08:00
Dmitrij D. Czarkoff
4924e960bf
feature: allow merging tags into branches (#671)
Adds "Merge {tag} into {branch}" menu item to tag menu in histories.
The rest is handled by already existing merge code.
2024-11-10 12:51:15 +08:00
leo
9cb85081ab
feature: saving as patch supports multiple commits (#658)
Signed-off-by: leo <longshuang@msn.cn>
2024-11-06 12:35:55 +08:00
leo
d50b2c0298
code_review: PR #657
* add hotkey `Ctrl+Down/⌘+Down` to fetch directly
* keep translation keys of en_US in order
* add translations for zh_CN and zh_TW
* do NOT using namespace under `SourceGit`
* use `⇧` instead of `Shift` in hotkey tips
* hotkey mismatch on macOS
* hotkeys to start fetch/pull/push directly not work on macOS
* remove the hotkey of `Create Branch` context menu item
   - there are other objects (such as branch and tag) also have the `Create Branch` context menu item without hotkeys
   - on macOS, we already use `⌘+B` to create branch with selected commit, not `Ctrl + B`

Signed-off-by: leo <longshuang@msn.cn>
2024-11-06 10:25:44 +08:00
Fernando Medeiros
2e6eca26f7
Adding hotkeys for creating branch, pushing and pulling (#657) 2024-11-06 09:14:56 +08:00
leo
2f9e825b63
refactor: pass Models.Commit instead of just sha of it
Signed-off-by: leo <longshuang@msn.cn>
2024-11-01 18:10:22 +08:00
leo
a36058ec51
feature: supports custom actions (#638)
Signed-off-by: leo <longshuang@msn.cn>
2024-11-01 17:23:31 +08:00
leo
ccdc849baa
code_style: run dotnet format 2024-10-15 09:39:01 +08:00
leo
5fef6e93b9
enhance: cherry-pick (#563)
* supports to cherry-pick a merge commit
* add option to enable the `-x` parameter
2024-10-14 15:20:02 +08:00
leo
b5000f920f
enhance: highlight selected search commits 2024-10-11 11:04:27 +08:00
leo
0ed1f369e9
feature: display commit's detail info even if the commit is not shown in histories 2024-09-19 14:38:11 +08:00
leo
1a4d3d0086
enhance: remember the height/width of commit list and detail panel in histories page (#472) 2024-09-14 17:22:29 +08:00
leo
3ea80d99f1
code_style: remove unused namespace using and run dotnet format 2024-08-28 13:42:25 +08:00
leo
ce2340456e
feature: cherry-pick multiple commits (#418) 2024-08-28 11:26:00 +08:00
leo
bd6228bb26
refactor: using ListBox instead of DataGrid for commit list and remove dependency of Avalonia.Controls.DataGrid 2024-08-28 10:02:14 +08:00
Gadfly
80559ce199
fix: try-catch OpenFolderPickerAsync to avoid crash when select a directory is NOT exist 2024-08-27 10:40:49 +08:00
leo
184c89ea1d
feature: supports squash multiple commits into selected commit (#408) 2024-08-25 21:39:59 +08:00
leo
24dde77548
refactor: rewrite SourceGit.App 2024-08-19 12:49:29 +08:00
leo
ec14d9d533
refactor: remove binding errors 2024-08-13 20:40:05 +08:00
leo
f3406e93fc
fix: try to fix issue #338
* upgrade Avalonia to `11.1.3`
* use reactive property instead of simple getter
2024-08-13 17:38:58 +08:00
leo
34a598d421
feature: add commit web links (#357) 2024-08-13 17:15:17 +08:00
leo
a145d6e4c3
revert: remove issue link support in commit list
* improve render performance
* the links in commit list are very easy to click by mistake
2024-08-13 15:58:34 +08:00
leo
9bee51686a
feature: show issue link on commit list of histories view (#315) 2024-08-06 11:02:52 +08:00
leo
dfd098e131
refactor: merge sourcegit.issuetracker.setting to sourcegit.settings. 2024-08-05 18:18:57 +08:00
leo
f754b2c63a
feature: supports issue tracker in commit message (#315) 2024-08-05 17:34:49 +08:00
leo
7891b1124e
feature: asking to create local branch instead of checkout commit if some remote branch's HEAD is selected commit (#295) 2024-08-01 16:59:39 +08:00
leo
addfb449cc
feature: double click on commit (#295)
* when commit is current branch head, do nothing
* when commit is head of some local branch which is not current, try to checkout this branch
* otherwise, ask user should checkout selected commit as deteched
2024-07-30 11:47:58 +08:00
leo
6f317039ab
feature: add CurrentBranch property to ViewModels.Repository 2024-07-24 15:36:26 +08:00