github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-24 19:02:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,970 Commits 3 Branches 160 Tags
b6c8190d4e4595118bc8beec1e173e9daf82381b
Commit Graph

3970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leo
b6c8190d4e fix: text diff view in commit detail panel may display wrong data when switching between repositories (#1503) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-03 19:06:26 +08:00
leo
3b8dcd72ee ux: grid lines brush for DataGrid 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-03 15:36:13 +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
Nathan Baulch
b40ad9ad86 ux: better lossless PNG compression (#1500) 2025-07-03 15:22:02 +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
Sina Hinderks
baeef2d924 fix: too many closing curly braces (#1496) 2025-07-03 10:25:28 +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
github-actions[bot]
b7d1f936a8 doc: Update translation status and sort locale files 2025-07-03 02:15:59 +00:00
Sina Hinderks
e8523f14cd localization: update German translations (#1494) 2025-07-03 10:15:44 +08:00
leo
501bf03fc7 fix: only trigger deleting tag when pressing Key.Delete or Key.Back (#1412) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-02 18:00:10 +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
19d82243a9 ux: re-design custom action control editor 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-02 11:45:28 +08:00
github-actions[bot]
4b291658b5 doc: Update translation status and sort locale files 2025-07-02 03:37:09 +00:00
leo
a3f17f7a7e ux: re-design custom action control editor 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-02 11:36:17 +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
Nathan Baulch
4f266a2342 ci: code format check (#1487) 2025-07-02 10:54:22 +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
Enner Pérez
118894907e fix: Custom Shell/Terminal or Diff/Merge Tool crash fix (#1484) 
* fix(1483): FilePickerOpenOptions Fix
* fix(1483): Missing Try Cath Block
 2025-07-02 10:25:38 +08:00
github-actions[bot]
db5efbd3fa doc: Update translation status and sort locale files 2025-07-01 14:04:03 +00: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
9a7be7e4ca enhance: prefer to use default clone dir of current workspace (#1454) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 20:45:59 +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
github-actions[bot]
28b8325bc0 doc: Update translation status and sort locale files 2025-07-01 08:04:11 +00: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
leo
f62eb88cc8 code_style: trim whitespaces at end of line 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 14:07:51 +08:00
Nathan Baulch
25e6adeb08 enhance: stream directly to files where possible (#1481) 2025-07-01 12:14:10 +08:00
leo
1bafdf2a8d ci: runner-image windows-2019 has been deprecated, replace it with windows-2022 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 10:03:39 +08:00
leo
777bba0593 code_review: PR #1478 
- Style for `ContentPresenter` in `ItemsControl.Styles` also overrides the default style of TextBox
- Use simple for-each-loop instead of Linq expr

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-01 09:44:00 +08:00
Natan-Gorecki
81da026296 enhance: enable focus for custom action edits (#1478) 2025-07-01 09:22:11 +08:00
leo
2a1a53711c fix: OnCommitListKeyDown not triggered when pressing Ctrl+C 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 21:00:15 +08:00
leo
ae9ce331dc enhance: make sure mouse is hover commit row (not empty area or headers in DataGrid) when trying to open context menu 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 20:40:04 +08:00
leo
cbee179b5e ux: commit graph clip width 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 20:31:28 +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
d1cc83648b refactor: only redraw commit graph when it is necessary 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 17:27:45 +08:00
leo
09fadea152 fix: add missing key-down event 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 16:23:07 +08:00
leo
4e47235596 fix: should use Alt instead of ⌥ in hotkey bindings (#1476) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 16:12:47 +08:00
leo
63affefed8 enhance: auto-scroll to selected commit 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 15:56:31 +08:00
leo
af1788e746 fix: selecting issue within cells 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 15:21:48 +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
db77c61dd5 Merge branch 'master' into develop 2025-06-30 10:17:35 +08:00
leo
9439df8745 Merge branch 'release/v2025.24' v2025.24 2025-06-30 10:16:25 +08:00
leo
84e9c44f0f version: Release 2025.24 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-30 10:16:12 +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