github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-26 03:40:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,970 Commits 3 Branches 160 Tags
463e304491d655ec50daaa7f6e571ff3b5d868c3
Commit Graph

914 Commits

Author SHA1 Message Date
Nathan Baulch
463e304491 feature: async (#1492) 
* Async command methods
* Async `Task.Run` where possible
* Remove redundant `Task.Run` in `Sure` methods
* Remove leftover braces and reformat
* Async event handlers as needed
 2025-07-03 15:38:39 +08:00
leo
d8bc3f924a fix: PR #1501 
- returns `null` to fallback to git's `merge.ff` configure when user does not configure `Preferred Merge Mode`
- since `GetGitConfigBranchMergeOptions` is the last one, returns `Default` as fallback

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-03 15:30:23 +08:00
Sina Hinderks
35d681dd50 fix: merge.ff is ignored (#1501) 
After changing the priority of the preferences/configurations for the
merge mode in #1495, the git configuration `merge.ff` was ignored.  The
reason is, that `GetSettingsPreferredMergeMode()` does not return `null`
in the default case.  This is now fixed.
 2025-07-03 15:20:03 +08:00
leo
3fe72e919c code_review: PR #1497 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-03 11:15:14 +08:00
Nathan Baulch
ec17ea9901 code_style: general cleanup (#1497) 2025-07-03 10:32:03 +08:00
leo
5240222846 code_review: PR #1495 
- remove unused namespace using
- prefer to use repository's configuration than the global `merge.ff`

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-03 10:24:43 +08:00
Sina Hinderks
626a20ac97 enhance: respect git config merge.ff (#1495) 
This adds another configuration possibility for the default merge mode
to the already existing per branch git configuration
`branch.<name>.mergeoptions` (#540) and the per repo preference
"Preferred Merge Mode" (#1156).

Defined values:
 - `false`: do no fast-forward merge
 - `only`: do only a fast-forward merge

This is configurable by for example `git config set --global merge.ff
<value>` for a global (meaning the current user) configuration.

The priority between these configurations/preferences is:

 - git configuration `branch.<name>.mergeoptions` (#540)
 - git configuration `merge.ff`
 - preference "Preferred Merge Mode" (#1156)
 2025-07-03 10:20:44 +08:00
leo
945c63c78a ux: add badge for global custom actions (#1490) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-02 16:24:48 +08:00
leo
3a1827eb3d code_review: PR #1489 
- Remove unnecessary `CallUIThread` in `ViewModels.Clone`
- Code style

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-02 13:16:49 +08:00
Nathan Baulch
25afcba44b refactor: auto dispatch notifications to UI thread in Launcher (#1489) 2025-07-02 13:09:30 +08:00
leo
44ea8cb04a ux: re-design custom action control editor 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-02 11:24:45 +08:00
leo
fc188e2344 code_review: PR #1484 
- Check `Type` instead of `Name` while selecting external shell/terminal
- External merge tool named `Custom` is not supported
- Add `try-catch` statement to other file pickers in `Preferences` window

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-02 10:38:54 +08:00
leo
e1bbbe042d feature: supports to use ComboBox input control in cutom actions (#1482) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 22:01:12 +08:00
leo
13215d5c33 fix: double-click change in INFORMATION tab does not switch to CHANGES tab 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 20:19:32 +08:00
leo
a7fc8effc2 enhance: pre-fill SearchChangeFilter in Dir Histories window (#1470) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 16:28:29 +08:00
leo
4c4705a51f enhance: only remember active tab index of commit details panel in HISTORY page 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 16:19:25 +08:00
leo
d4723eeea2 feature: supports show commit histories under selected folder (#1470) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 16:03:27 +08:00
Nathan Baulch
25e6adeb08 enhance: stream directly to files where possible (#1481) 2025-07-01 12:14:10 +08:00
leo
ada767db86 feature: remember author column width 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 20:25:10 +08:00
leo
93ffbdd21d refactor: use DataGrid instead of ListBox displaying history commits 
Sometimes, `Grid.IsSharedSizeScope` does not work when navigating to the first commit

Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 15:01:18 +08:00
leo
61372e2ffd code_review: PR #1472 
Move `Commands.IsCommitSHA` testing from `Commands.QuerySingleCommit` to `ViewModels.Repository.StartSearchCommits`,  because we only need test the SHA user typed in

Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 10:06:13 +08:00
leo
133b69de4a feature: supports to copy selected folder path in changes and rename searching by file to searching by path (#1470) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-28 12:38:03 +08:00
Nathan Baulch
1acf2a14df code_style: general cleanup (#1469) 2025-06-28 10:25:56 +08:00
leo
5f9d181a6c ux: use simple TextBox instead of NameHighlightedTextBlock for commit message histories 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-27 17:03:59 +08:00
leo
042ae5cc29 code_style: run dotnet format 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-27 16:12:57 +08:00
leo
0a8323bc1b enhance: supports to use $REPO in Default field of TextBox/PathSelector in custom actions (#1466) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-27 16:05:50 +08:00
leo
b31495b89b fix: wrong pattern to fill input control's value to custom action commandline arguments (#1467) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-27 16:02:56 +08:00
leo
0729c3044a enhance: supports to use ${BRANCH}/${COMMIT}/${TAG} in Default field of TextBox/PathSelector in custom actions (#1466) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-27 15:58:00 +08:00
leo
b0a80e41ee ux: always show the scope target of custom action (#1466) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-27 15:37:20 +08:00
leo
f36ab4a189 feature: remember main window position (#1315) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-26 17:42:02 +08:00
leo
0e22503b22 feature: warn users when checking out new branch with commits not connected to any branches (#1463) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-26 12:58:31 +08:00
leo
67efe76b97 fix: mismatch of local repo name after cloning git-bundle without specifying Local Name (#1460) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-26 10:21:57 +08:00
leo
054d5e41f3 feature: warn when creating commit on a detached HEAD (#1462) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-26 10:13:12 +08:00
leo
271f02b694 refactor: apply input control value from end to start 
For example, this will avoid applying the first parameter to $10 - $19

Signed-off-by: leo <longshuang@msn.cn>
 2025-06-26 09:28:39 +08:00
leo
295718effe code_style: execute custom action has nothing to do with git command 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-25 19:22:57 +08:00
leo
ad7aaa34f0 feature: add Tag scope for custom actions (#1457) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-25 17:46:26 +08:00
Göran W
743be5491a enhance: allow drag-drop of item (or folder) anywhere in repo-list (#1459) 
Dropping on a non-Group item was not allowed earlier, but now it adds/moves the dragged item into the parent Group (possibly Root) of the drop-target item.
 2025-06-25 16:37:18 +08:00
leo
676785f8b1 feature: support to use input control in custom action 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-25 16:28:54 +08:00
leo
71dd58a5d6 enhance: prefer to use workspace's default clone dir if it is set (#1454) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-24 21:27:32 +08:00
leo
dd01c74d11 feature: supports to scan workspace's default clone dir (#1454) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-24 21:19:52 +08:00
leo
d4edb41e9f ux: use CommitSubjectPresenter instead of simple TextBlock to display commit's subject in interactive rebase window 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-24 15:27:45 +08:00
leo
b519ead5a1 feature: supports to add ignored file(s) locally (saved in $GIT_DIR/info/exclude) (#1447) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-23 17:22:57 +08:00
leo
9bfc315ace feature: allow to push revision where local branch is ahead of its upstream (#1394) (#1441) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-21 11:58:56 +08:00
leo
64ffbb113f fix: wrong localization key to compare remote branch with current 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-21 10:45:40 +08:00
leo
c5ad4b837d feature: auto-follow HEAD when bisecting (#1438) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-20 09:19:21 +08:00
leo
957c52aac4 fix: crash after remove worktree while it is opened in sourcegit (#1436) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-19 17:58:02 +08:00
leo
af2b644792 code_review: PR #1416 
- Split `DoubleTapped` into two methods: `CheckoutBranchByDecorator` and `CheckoutBranchByCommit`
- Move `DoubleTappedEvent` from whole ListBox to the row tapped actually
- Do nothing if the decorator double-clicked is HEAD
- Code-style

Signed-off-by: leo <longshuang@msn.cn>
 2025-06-19 11:31:04 +08:00
Nathan Baulch
88fd8f32f1 feature: double tap specific branch (#1416) 
* feature: double tap specific branch
* exactly match behavior of left sidebar
 2025-06-19 10:27:31 +08:00
leo
cadcf40d74 feature: support to open selected folder in file manager 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-19 09:32:27 +08:00
leo
e81674912c refactor: remove duplicated context menu to ignore untracked files under folder 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-19 09:12:27 +08:00