github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 13:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,917 Commits 3 Branches 160 Tags
a8ca89736a74896b3ba146038f653b162f5a0ff8
Commit Graph

3865 Commits

Author SHA1 Message Date
leo
bf8e392bb2 feature: supports to hide AUTHOR and SHA columns in HISTORY (#2097) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-04 15:12:22 +08:00
leo
6c2a89bd58 enhance: trim [bot] for email address which ends with @users.noreply.github.com (#2098) 2026-02-04 12:01:52 +08:00
leo
ceea4a18fc refactor: commit message editor (#2096) 
- When using `SourceGit` as standalone commit message editor, always quits with code `0`.
- Use hotkey `ESC` and dialog titlebar button instead of a custom `OK` button to close this window.
 2026-02-04 10:43:16 +08:00
leo
5f0bd16eac feature: add log for git cherry-pick/rebase/revert/merge --continue/--skip/--abort (#2096) 2026-02-04 10:22:02 +08:00
leo
52281a404f project: upgrade AvaloniaEdit to 11.4.0 2026-02-03 19:31:25 +08:00
leo
62d2908a79 refactor!: split repository settings into two parts - shared settings and ui states (#2071) 
- All the attributes that can be changed from `Repository Configuration` window are `shared settings`, and will be shared (also synced) between worktrees
- The other UI states, such as current history filters, branch/tag sort methods, tree states etc., will be saved into each worktree's real git dir. And those states will not be synced between each others.

BREAKING CHANGE: Users will lost their old UI states. But the shared settings remains.
 2026-02-03 18:59:29 +08:00
leo
3b576b02f5 fix: left LineNumberMargin in text editor did not update its width 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-03 12:47:55 +08:00
leo
1d80d001dd feature: show MINE and THEIRS revision in merge conflict editor 
- Rename some resources about conflicts
- Rename `MergeConflictEditor.XXXDiffLines` to `MergeConflictEditor.XXXLines`
- It's not necessary to show commit info in tooltip for conflict revisions
- New UI/UX for merge conflict editor

Signed-off-by: leo <longshuang@msn.cn>
 2026-02-03 12:45:39 +08:00
leo
1038855a8f enhance: auto-select the first conflict file when no files are selected (#2053) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-03 11:36:46 +08:00
leo
65d122f9ce refactor: stores runtime data in ~/.sourcegit instead of ~/.local/share/SourceGit (#2088) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-03 11:02:29 +08:00
leo
8a5b0245b6 fix: gets doubled EOLs while coping content with CRLF line-endings in diff view (#2091) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-03 10:28:48 +08:00
leo
bf2078477d enhance: make sure the $XDG_DATA_HOME dir exists 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-02 17:41:45 +08:00
leo
47a7c90bb6 refactor: move data from $XDG_CONFIG_HOME/SourceGit to $XDG_DATA_HOME/SourceGit on Linux (#2088) 
Old datas will be migrated automatically

Signed-off-by: leo <longshuang@msn.cn>
 2026-02-02 17:03:47 +08:00
leo
98bee996d8 refactor: stores crash logs into crashes sub-folder and removes the User line in crash log 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-02 15:47:44 +08:00
AquariusStar
833faf5536 localization: update Russian translate (#2089) 2026-02-02 15:05:42 +08:00
leo
5eaa71fd65 code_style: simplify code about conflicts 
Signed-off-by: leo <longshuang@msn.cn>
 2026-02-02 14:23:35 +08:00
vitorpc4
1652b0500b feature: support visualstudio.com urls for Azure DevOps pull requests (#2087) 2026-02-02 10:29:33 +08:00
leo
4f11be1148 enhance: do nothing if current line is not in a conflict region 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-30 11:13:32 +08:00
leo
7f757e11d5 refactor: use a new class Models.ConflictLine for conflict editor instead of Models.TextDiffLine 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-30 11:05:58 +08:00
leo
2006fa8040 enhance: keep scroll after staging/unstaging/discarding hunks (#2072) (#2083) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-29 19:42:44 +08:00
leo
25b56fb18a ux: color for ref name in comparision 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-29 15:17:50 +08:00
leo
f545eeacd8 feature: add Reset File(s) to <revision> context menu entry to selected change(s) in compare view (#2079) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-29 14:53:26 +08:00
leo
96a9e99621 feature: add Reset File(s) to <revision> context menu entry to selected change(s) in revision compare view (#2079) 
Co-authored-by: ybeapps <ybeapps@gmail.com>
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-29 12:03:47 +08:00
leo
769c22083d refactor: rewrite Reset to This/Parent Revision feature in commit details panel (#2079) 
Better handle for `added/deleted/renamed` file changes

Co-authored-by: ybeapps <ybeapps@gmail.com>
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-29 11:17:20 +08:00
leo
7585f0d8e3 ux: move Open as Folder to the bottom of context menu (#2080) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-29 10:16:49 +08:00
github-actions[bot]
7cc4f9ba98 doc: Update translation status and sort locale files 2026-01-28 09:33:35 +00:00
leo
6c1ef2cc99 localization: remove unused translations 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-28 17:33:15 +08:00
leo
ca39f6185d fix: designer stops working 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-28 16:08:30 +08:00
leo
738357b13b fix: closing alert shows in wrong condition 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-28 15:53:07 +08:00
leo
bc2d13a3b8 feature: add a minimap to merge conflict editor 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-28 15:39:37 +08:00
leo
7c2053a81d code_review: PR #2070 
- Use `HotKey` binding for buttons
- Better error handling

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-28 14:42:16 +08:00
leo
54c733bb85 ux: sometimes padding is not work 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-28 11:52:22 +08:00
leo
0b0882b460 code_review: PR #2070 
- Remove duplicated attributes in `Models.ConflictRegion`
- Add `ViewModels.MergeConflictEditor.Resolve(object resolution)` to replace `AcceptOurs/AcceptTheirs/AcceptBothMineFirst/AcceptBothTheirsFirst/Undo`
- Use command-binding instead of listening `Click` event for command buttons
- Remove `IsOldSide` and `IsResult` properties since `PanelType` is enough
- Rewrite the way to calculate current hovered conflict chunk

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-28 11:48:04 +08:00
Matthias Wetter
d13f3a6c52 localization: update German Translation (#2075) 
* Use proper UTF-8 horizontal ellipsis char instead of triple dots
* Fix and improve various compound hyphenations
* Use proper en dash instead of minus char
* Replace straight quotes with typographic ones in non-technical friendly strings
* Reduce deviations from original texts (content and formatting)
* Remove indentations from multiline strings because they are visible in UI
* Fix typos and missing or superfluous punctuation marks
* Add missing translations and improve existing ones
* Further improve existing translations
* Improve keywords: translations for 'prune' and 'theirs' are now disambiguated and clearer
* Add new keys and translate their texts
* Mark German translation as complete and remove list of missing keys
 2026-01-28 10:12:14 +08:00
Javier J. Martínez M.
91938bd31c localization: update Spanish translation (#2074) 
+ Add missing strings.
 2026-01-28 10:10:55 +08:00
leo
f295f1b293 refactor: simplify ViewModels.MergeConflictEditor 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 21:45:01 +08:00
leo
add3469844 ux: always show Merge (Built-in) context menu entry for conflicts 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 18:24:56 +08:00
leo
89675c3dac refactor: move data-only structures and enums to SourceGit.Models 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 18:20:07 +08:00
leo
4516b0020c enhance: handle binary file in built-in merge tool 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 17:51:22 +08:00
leo
52da0168fd ux: new style for SplitButton 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 17:30:02 +08:00
leo
008e4c07bd code_review: PR #2070 
- `Commands.DiffConflictStage` and `Commands.QueryConflictContent` are never used
- Remove unnecessary attributes of `Views.MergeConflictEditor`
- New line-background render for conflict editor

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 17:07:29 +08:00
github-actions[bot]
a376545157 doc: Update translation status and sort locale files 2026-01-27 05:34:28 +00:00
leo
ea9517eef9 code_review: PR #2070 
- Remove unused code
- Add translations for Chinese (Simplified & Traditional)
- UI/UX changes
- Fix sync-scroll function sometimes does not work
- Re-arrange context menu items for local change

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 13:34:06 +08:00
Iacopo Sbalchiero
e5a5fad432 feature: built-in merge conflict solver (#2070) 
* feat: first implementation of merge tool
* feat: three way merge test
* feat: moved to two way merge solver
* refactor: moved files
* feat: color themes in merge conflict panel
* feat: updated logic
* feat: better scroll
* fix: localization
* feat: code cleanup
* feat: scroll sync
* fix: arrows work
* fix: scroll with wheel
* fix: arrow and scrollbar handlers
* feat: added popup buttons
* feat: moving and clicable flying buttons
* fix: moving buttons
* feat: undo button
* fix: separator line
* fix: scroll sync works with keyboard and scrollbar
* feat: accept both
* refactor: removed "accept all" buttons
* feat: better navigation
* feat: added right click entry and shortcut
* fix: scroll sync works with keyboard and scrollbar (again)
* fix: removed unnecessary directive
 2026-01-27 10:24:13 +08:00
leo
bdff65aa8f enhance: supports to clone into a local folder with spaces (#2069) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 10:04:49 +08:00
leo
4716124b9e feature: Linux AppImages support portable data dir (#2062) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-26 18:03:09 +08:00
leo
d6288719ad ux: add a check mark to indicate which side is HEAD in Compare window 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-26 16:10:14 +08:00
leo
fba8f2375e localization: update Brazilian Portuguese translations 
`StashAndReapply` has been removed because typo on keys

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-26 15:10:20 +08:00
github-actions[bot]
357352c4cd doc: Update translation status and sort locale files 2026-01-26 02:30:10 +00:00
Ramon Melo
29cb03524d localization: update Brazilian Portuguese translate (#2067) 2026-01-26 10:29:57 +08:00