michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-26 21:17:20 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
2713 commits 3 branches 109 tags 34 MiB
Commit graph

2713 commits

This branch
This branch
All branches
Author SHA1 Message Date
Göran W
3e5764a031
Merge 408ece148e into 7a9c8d7444 2024-11-19 10:07:30 -03:00
leo
7a9c8d7444
ux: enable TextTrimming for author name in FileHistories
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details
Localization Check / localization-check (push) Waiting to run
Details 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 20:07:49 +08:00
aikawayataro
8021cd8566
enhance: introduce template engine for commit templates (#704) (#719) 2024-11-19 19:46:44 +08:00
leo
73687689ce
ux: min height of change block in minimap 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 16:45:07 +08:00
leo
b452e13453
localization: update Text.Repository.HistoriesOrder.ByDate 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 14:42:59 +08:00
leo
814529a690
feature: add hotkeys to stage/unstage/discard block or selected lines in text diff view (#718) 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 12:12:54 +08:00
github-actions[bot]
00804e453e doc: Update translation status and missing keys 2024-11-19 03:33:55 +00:00
leo
b25f9bdb6c
feature: supports switch histories order mode (#705) 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 11:32:13 +08:00
leo
f45bed6f92
fix: avoid NRE 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 10:31:17 +08:00
leo
3be90b2ef6
Merge branch 'master' into develop 2024-11-19 09:53:24 +08:00
leo
f7ef61f1ce
Merge branch 'release/8.39' 2024-11-19 09:53:03 +08:00
leo
0da46cb90b
version: Release 8.39 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 09:52:52 +08:00
leo
8b3d129890
code_review: PR #711 
* SourceGit.Commands.* should not reference code in SourceGit.ViewModels.

Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 09:46:06 +08:00
Dmitrij D. Czarkoff
309db6e362
enhance: slightly improve statistics (#711) 
* use preference MaxHistoryCommits
* use current culture to adjust first days of the week
 2024-11-19 09:35:32 +08:00
leo
5b55e3530d
ux: better drop shadow effect for notifications 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 09:34:09 +08:00
leo
d07a664166
code_review: PR #714 
* remove `string.ToLower` warning
* override `OnLoaded` method directly
* clean namespace using

Signed-off-by: leo <longshuang@msn.cn>
 2024-11-19 09:27:31 +08:00
Enner Pérez
ea1d966d27
feat: Reset Mode Hotkey (#714) 2024-11-19 09:14:53 +08:00
Dmitrij D. Czarkoff
f4618afee6
feature: switch WinMerge from 3-way to 2-way UI (#712)
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
2024-11-18 09:03:27 +08:00
goran-w
408ece148e Added ToggleTwoSideDiff(), so we can refresh change-block indicator 2024-11-17 23:24:04 +01:00
goran-w
11a02343a0 Added safeguards for edge cases 2024-11-17 22:41:25 +01:00
goran-w
aeea77078b Merge remote-tracking branch 'origin/develop' into diff-prev-next-change-616 2024-11-17 22:21:12 +01:00
leo
3b09ea45f5
feature: add change minimap for text diff view
Some checks failed
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details
Localization Check / localization-check (push) Has been cancelled
Details 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-17 21:49:33 +08:00
github-actions[bot]
b7abf2ee50 doc: Update translation status and missing keys 2024-11-17 03:16:44 +00:00
Nils van Rijsinge
6f256f6f5b
Add and improve de_DE keys (#709) 
* localization: add missing de_DE keys

added for #690

* localization: improve de_DE keys

- mostly code review suggestions from #664
- ClearAllCommitsFilter is not an action of deleting (löschen)
 2024-11-17 11:16:31 +08:00
Dmitrij D. Czarkoff
5301645f8b
fix: in commit view get file histories by commit (#708) 
When file histories are accessed from the commit details view, run git log for the inspected commit.  Previously the log was ran against current branch regardless whether the inspected commit belongs to that branch.
 2024-11-17 11:14:56 +08:00
goran-w
760e240db7 The 2 implementations can now be switched 
Added a bool property DiffView.UseChangeBlocks.
It's not bound from UI yet, but could be used for runtime switching between the two different implementations of prev/next change.
The buttons are now using the OnGoto[Prev|Next]Change Click-handler, regardless of implementation.
 2024-11-16 18:39:04 +01:00
goran-w
636be4a7a8 Merge branch 'develop' into diff-prev-next-change-616 2024-11-16 18:09:56 +01:00
goran-w
4882ad0ad6 Added indicator of current/total change-blocks in Diff toolbar 2024-11-16 13:33:10 +01:00
goran-w
dc5bd42477 Make sure SyncScrollOffset is updated after JumpToChangeBlock() 2024-11-16 13:31:39 +01:00
goran-w
5597d25313 Re-enabled my implementation, after merge from pushed alternative 2024-11-16 11:36:10 +01:00
leo
882878dbe5
refactor: text diff view go to next/prev change
Some checks are pending
Continuous Integration / Package (push) Blocked by required conditions
Details
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-16 18:24:37 +08:00
goran-w
07cf4e6fe0 Corrected method duplication mistake, from rebase conflict resolve 2024-11-16 10:47:10 +01:00
goran-w
57e147e84c Revert "Added icons for "Previous/Next Difference"" 
This reverts commit 1f8dc29de20708a78cba26a341d3451d11304ef9.
 2024-11-16 10:43:13 +01:00
goran-w
1a99ce54d3 Cherrypick - feature: add buttons to go to prev/next change in text diff view (#616) 
Signed-off-by: leo <longshuang@msn.cn>
(cherry picked from commit 134c71064e)

# Conflicts:
#	src/Views/DiffView.axaml
#	src/Views/TextDiffView.axaml.cs
 2024-11-16 10:43:13 +01:00
goran-w
96a9019487 Prev/next will (re-)scroll to first/last change-block in edge-cases 
I.e when unset or already at first/last change-block (or the only one).
 2024-11-16 10:43:13 +01:00
goran-w
e0c219b46d Unset current change-block in RefreshContent() 2024-11-16 10:43:13 +01:00
goran-w
0007072789 Implemented change-block navigation 2024-11-16 10:43:13 +01:00
goran-w
d0dc9ac1fe Corrected misspelled local variable nextHigh(t)light 2024-11-16 10:41:33 +01:00
goran-w
fbb07cf75f Added 2 new buttons for prev/next change in Diff 
These new buttons in DiffView toolbar are visible when IsTextDiff.
They invoke new (and currently empty) methods PrevChange() / NextChange() in DiffContext.
 2024-11-16 10:41:33 +01:00
goran-w
875d4b5382 Added icons for "Previous/Next Difference" 
New StreamGeometry "Icons.Diff.Prev" / "Icons.Diff.Next" using SVG paths from "arrow_up_regular" / "arrow_down_regular" at https://avaloniaui.github.io/icons.html.
 2024-11-16 10:39:46 +01:00
leo
52c7388a38
project: upgrade to .NET 9 (#694) 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-16 16:06:30 +08:00
leo
134c71064e
feature: add buttons to go to prev/next change in text diff view (#616) 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-16 15:17:29 +08:00
leo
cd137e222c
feature: enable --no-ext-diff for git diff command 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-16 09:26:13 +08:00
leo
8d84d0f6a1
enhance: improve update filter mode performance 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-16 09:14:57 +08:00
leo
4b6bb70f20
fix: parent commit's tooltip does not close when move mouse out of bound fast
Some checks failed
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details
Localization Check / localization-check (push) Has been cancelled
Details 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-15 16:04:42 +08:00
leo
bd85b41da7
ux: clear histories filter button style 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-15 14:50:18 +08:00
leo
5861482455
fix: wrong format 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-15 11:55:18 +08:00
leo
30741b0f25
project: upgrade dependencies 
* upgrade Avalonia to 11.1.4
* upgrade LiveChartsCore.SkiaSharpView.Avalonia to 2.0.0-rc4.5
* upgrade TextMateSharp to 1.0.64

Signed-off-by: leo <longshuang@msn.cn>
 2024-11-15 11:51:13 +08:00
leo
e78b58cb81
localization: remove duplicated keys 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-15 11:49:49 +08:00
leo
a5f37800f6
code_style: remove unused var 
Signed-off-by: leo <longshuang@msn.cn>
 2024-11-15 10:52:39 +08:00