743 commits

Author	SHA1	Message	Date
leo	0cb2ca78fe	code_review: PR #1180 ... - replace `SetNeedNavigateToUpstreamHead` with `NavigateToBranchDelayed` - navigate to current HEAD instead of original source HEAD after merge Signed-off-by: leo <longshuang@msn.cn>	2025-04-14 11:35:50 +08:00
Gadfly	17cf402c78	enhance: navigate to upstream head after fetch, pull, and merge (#1180)	2025-04-14 10:42:34 +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	768b324356	ux: if there are no local changes, show different confirm message (#1143) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-08 20:06:00 +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	3275dd07d2	enhance: auto stash and re-apply local changes before squashing (#1141) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 16:04:10 +08:00
leo	3049730dd5	feature: add Preferred Merge Mode in repository configure (#1156) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 14:42:46 +08:00
leo	ad9021e892	enhance: allow using + character in branch name (#1152) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 14:07:58 +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	8e55ba1b47	enhance: avoid unhandled exceptions in timer ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-31 19:06:10 +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
Iacopo Sbalchiero	ca0fb7ae10	Adding template for Azure DevOps workitems (#1128) ... * feat: add Azure DevOps issue tracker integration * localization: add Azure DevOps sample rule to issue tracker in multiple languages	2025-03-26 09:27:10 +08:00
leo	fc85dd3269	enhance: improve Repository.Open() performance (#1121) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-24 19:37:39 +08:00
leo	38d87fa1a1	feature: use git stash show -u --name-status <stash_name> command to query changes in selected stash if git >= 2.32.0 ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-20 21:12:08 +08:00
leo	65dbfd336d	refactor: it's not necessary to store untracked file list for selected stash ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-20 20:53:30 +08:00
leo	145273b4a7	refactor: move Show tags in commit graph to Preferences (#1109) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-20 11:10:48 +08:00
leo	a5bdcab341	code_style: move dynamic context menu creation to view models ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-20 09:38:02 +08:00
leo	2512d3be7a	feature: allow to hide tags in graph (#1109) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-18 21:40:31 +08:00
leo	a0cddaea80	feature: support --ff-only option for git merge command ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 19:53:47 +08:00
leo	398b14695c	enhance: the git dir of worktree's owner repository may not named .git ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 17:10:59 +08:00
leo	7031693489	refactor: pass dirs to watcher directly ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 16:30:16 +08:00
leo	b4ab4afd3a	code_review: PR #1103 ... Since we only use `$GIT_COMMON_DIR` in filesystem watcher, it is unnecessary to store this value in `Repository`, and we can query the `$GIT_COMMON_DIR` only when it looks like a worktree Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 16:19:59 +08:00
Gadfly	cea8a90680	refactor: use $GIT_COMMON_DIR instead of cut $GIT_DIR/worktrees (#1103)	2025-03-17 15:56:13 +08:00
leo	cdd1926e2f	refactor: rewrite git apply implementation ... - Do not translate commandline options for `git` - Re-design combox layout for `git apply` popup Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 15:30:32 +08:00
leo	ddfc868df3	ux: re-design merge option style ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 15:08:49 +08:00
leo	c8bee2f6ba	code_review: PR #1093 ... Merge deleting branch and tag on remote into `SourceGit.Commands.Push(repo, remote, refname, isDelete)` Signed-off-by: leo <longshuang@msn.cn>	2025-03-14 09:36:34 +08:00
leo	9560496c7b	code_review: PR #1092 ... - Remove `SourceGit.ViewModels.Preference.FixFontFamilyName` (it is not necessary any more) - Use `string.Join` instead of `StringBuilder` to make the logic more clear Signed-off-by: leo <longshuang@msn.cn>	2025-03-13 15:17:20 +08:00
leo	0e261cffd2	refactor: rewrite the way to deal with uncommitted local changes when checkout/pull/create branch (#1085) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-13 10:21:54 +08:00
leo	e430e847ff	enhance: auto convert spaces with dashes while renaming a branch (#1088) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-13 09:50:42 +08:00
leo	bb2284c4c9	refactor: re-write commit searching (part 3) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-12 11:53:24 +08:00
leo	ee7ccc0391	refactor: re-write commit searching (part 2) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-12 11:05:19 +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	64a41dce39	refactor: rewrite searching commit by file path ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-11 20:55:39 +08:00
leo	2fc03025ee	fix: file suggestion popup did not show while searching commit by file path ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-11 19:52:50 +08:00
leo	471452646b	refactor: use System.Threading.CancellationToken instead of SourceGit.Commands.Command.CancelToken to cancel fetching information of selected commit ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-11 16:53:51 +08:00
leo	54d49a9eda	fix: app crashes when close a repository on read-only drive (#1080) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-11 09:36:13 +08:00
leo	cf8cff6b64	code_style: add ViewModels.Repository.GetCustomAction(scope) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-10 21:30:04 +08:00
leo	5c279b4b56	feature: add global configuration for custom action (#1077) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-10 21:19:38 +08:00
leo	b4fbc2372b	enhance: show commit info tip when hover SHA in conflict view ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-10 20:02:09 +08:00
leo	e65cb50495	fix: use \ as path delim on Windows when executing custom actions (#1077) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-10 17:48:02 +08:00
Gadfly	c1c0e7b2a0	enhance: Save Preferences after switched Workspace and closed Preferences (#1073)	2025-03-10 12:04:19 +08:00
leo	df6cbcaa28	fix: app crashed after enable Show children in the commit details (#1072) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-10 11:33:38 +08:00
leo	855466686d	ux: show conflict sources when it comes from a stash or patch (#1067) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-10 10:22:49 +08:00
Gustav Andersson	89f655c84d	fix: Show detached HEAD (#1060)	2025-03-07 16:16:15 +08:00
leo	83f23583be	enhance: supports to navigate to target commit while resolving conflicts ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-07 12:22:47 +08:00
leo	ca6d41ee60	enhance: try to get stopped at revision info from .git/rebase-merge/head ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-07 11:39:15 +08:00
leo	81bbe11345	code_style: rename some variables in ParseLinksInMessage ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-05 17:06:45 +08:00
leo	fb8d4a2542	code_review: PR #1055 ... - since the author and time are already shown in the blame view, use the full message as tooltip is better. - cache the commit message in `ViewModels.Blame` since the `Tooltip` of control may change. - querying commit message synchronously (it's very fast) to avoid similar issues in commit details panel. Signed-off-by: leo <longshuang@msn.cn>	2025-03-05 09:54:23 +08:00