github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-23 10:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,465 Commits 3 Branches 160 Tags
87ebe3741df33375ae380c28bfcd838d2f973d5b
Commit Graph

131 Commits

Author SHA1 Message Date
leo
87ebe3741d fix: for init-commit, app will crash with COMMIT & PUSH due to local branch has not been updated (#1229) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-04-22 18:45:14 +08:00
leo
750ca8ec61 refactor: use custom view locator to create new window/dialog (#1216) 
Signed-off-by: leo <longshuang@msn.cn>
(cherry picked from commit 3e6f2b25f15b263e2b84922abc5cf6d621d62a83)
 2025-04-21 15:32:21 +08:00
leo
41416a6bed refactor: use DataTemplates instead of create NamedHighlightedTextBlock manually for menu item (#1216) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-04-20 11:05:24 +08:00
leo
75b4a4b294 enhance: record more git command logs 
Signed-off-by: leo <longshuang@msn.cn>
 2025-04-18 11:29:59 +08:00
leo
0e967ffc8e fix: pressing Alt+Enter to commit and push in a repository that has no remotes will crash (#1205) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-04-17 13:30:41 +08:00
leo
8b39df32cc feature: git command logs 
Signed-off-by: leo <longshuang@msn.cn>
 2025-04-17 13:23:56 +08:00
Gadfly
3b1018e0e2 fix: update visible staged changes retrieval in WorkingCopy (#1187) 
* doc: Update translation status and missing keys

* fix: update visible staged changes retrieval in WorkingCopy

* fix: prevent unintended amend behavior when changing current branch

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
 2025-04-14 22:05:05 +08:00
Göran W
47824dc27a Add button for running external mergetool on ALL conflicts (#1173) 
* Make a few non-translated strings localizable (in Conflict view)

* Add button and wiring to run mergetool on all conflicts

* Corrected spelling and wording in related code and exception msg
 2025-04-11 09:33:07 +08:00
leo
506af95963 enhance: new confirm empty commit dialog (#1143) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-04-08 20:00:42 +08:00
leo
da38b72ee5 ux: disable commit button when commit message is empty 
Signed-off-by: leo <longshuang@msn.cn>
 2025-04-08 18:03:40 +08:00
leo
fa02c65da5 code_review: PR #1153 
- use a single filter for both unstage and staged files
- show confirm dialog if staged files are displayed partially

Signed-off-by: leo <longshuang@msn.cn>
 2025-04-07 11:48:38 +08:00
Göran W
a37c6b29ec In Local Changes, added filter-box in Staged area, to match Unstaged area (#1153) 
Also added minimal handling (RaiseException) if trying to commit with active filter (might commit more changes than visible, so disallow).
Minor unification in unstageChanges() to make it more similar to StageChanges().
 2025-04-07 10:37:58 +08:00
leo
276d000bcf refactor: change Copy File Name to Copy Full Path for selected file or change (#1132) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-03-28 18:01:53 +08:00
leo
f5d6e1264d refactor: use List<T> instead of AvaloniaList<T> since it is not used for bindings 
Signed-off-by: leo <longshuang@msn.cn>
 2025-03-11 23:01:34 +08:00
leo
d4bcc60113 enhance: disable CONTINUE button while it is running (#1046) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-03-04 09:29:07 +08:00
leo
8dd0274bdd enhance: only write MERGE_MSG when commit message is not null 
Signed-off-by: leo <longshuang@msn.cn>
 2025-03-01 09:21:52 +08:00
leo
9cf1cba9b7 feature: apply commit message while continue merge/revert (#1027) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-28 19:08:27 +08:00
leo
c6747f72f9 feature: auto-select first change in commit details panel and revision/branch compare panel (#1019) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-25 10:53:42 +08:00
leo
2b4fc64c73 fix: resolve conflict with deleted files does not work (#1009) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-21 10:26:14 +08:00
leo
b5feabfd37 enhance: auto-set commit message while rebasing is inprogress (#1003) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-20 15:42:11 +08:00
leo
0e1dfba7ef code_review: PR #1007 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-20 09:34:03 +08:00
Oleg Kosmakov
cbc2e46beb fix: Update unstaged filed counter when unstaged files change (#1007) 
* Add missing OnPropertyChanged in Cleanup

* Force unstaged count to refresh
 2025-02-20 09:31:07 +08:00
leo
aebfffee00 fix: GUI stops refreshing after manually refresh while merge tool is open (#949) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-10 20:51:36 +08:00
leo
8cc056d2af enhance: supports searching/filtering unstaged changes (#960) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-08 17:16:56 +08:00
leo
a915708db3 refactor: rewrite OpenAI integration 
- use `OpenAI` and `Azure.AI.OpenAI`
- use `developer` role instead of `system` for OpenAI's `o1` series models
- use streaming response
- re-design `AIAssistant`

Signed-off-by: leo <longshuang@msn.cn>
 2025-02-08 10:03:11 +08:00
leo
8ed7a99923 fix: COMMIT & PUSH should hide when there's no remotes available (#956) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-02-07 11:45:18 +08:00
GadflyFang
2105fd450d fix: when upstream is null show CommitAndPush and stop auto push (#955) (#956) 2025-02-07 11:30:14 +08:00
GadflyFang
a4157e11e6 fix: Improve in-progress rebase handling (#933) 
* fix: Improve in-progress rebase handling

* fix: Close merge popup even if there are conflicts (#941)
 2025-02-06 10:00:35 +08:00
leo
49ee9c8e33 ux: move --signoff toggle from repository configuration window to commit options bar 
Signed-off-by: leo <longshuang@msn.cn>
 2025-01-24 14:45:49 +08:00
leo
cb4ad63ba3 fix: discarding changes with selected changes should never be traited as Discard all changes (#904) 2025-01-22 10:52:01 +08:00
wl2776
6e5626f267 fix: several typos in source code (#895) 2025-01-13 10:11:28 +08:00
leo
b26838ff68 refactor: git version related commands 
* use `--pathspec-from-file=<FILE>` in `git add` command if git >= 2.25.0
* use `--pathspec-from-file=<FILE>` in `git stash push` command if git >= 2.26.0
* use `--staged` in `git stash push` command only if git >= 2.35.0
 2025-01-11 17:29:38 +08:00
leo
a3d744f426 code_style: run dotnet format 2025-01-08 21:44:35 +08:00
leo
f06b1d5d51 refactor: merge ViewModels.PopupHost into ViewModels.LauncherPage 2025-01-08 21:36:49 +08:00
leo
0628e3d3f7 feature: clear commit message when toggle off Amend 2025-01-03 14:27:54 +08:00
leo
82fc261743 feature: shows the git configured commit template in Template/Histories popup (#846) 2024-12-30 19:40:58 +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
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
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
ef40e4b738 enhance: show source branch/tag/commit in banner while merging request in progress 2024-12-10 15:17:54 +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
a53787c754 fix: git rebase --continue fail (#693) 
* fix the exit code when start `SourceGit` as core editor (rebasing).
* redesign the layout of working copy page for in-progress states.

Signed-off-by: leo <longshuang@msn.cn>
 2024-11-14 19:19:58 +08:00
leo
ffeb63613c fix: ignoring new files under folder creates invalid .gitignore entries (#663) 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-07 17:18:04 +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
498d2b54ae feature: add per-repository setting for prefered OpenAI service 
* If there is only one OpenAI service available, discard the setting of prefered OpenAI service. Instead, use it directly
* If there are multiple OpenAI service available, try to find the prefered one or show a context menu for users to choose the one they want to use

Signed-off-by: leo <longshuang@msn.cn>
 2024-10-28 21:36:10 +08:00
leo
134d69d403 feature: supports generate commit message by OpenAI with selected staged changes (#608) 
Signed-off-by: leo <longshuang@msn.cn>
 2024-10-28 15:56:38 +08:00