727 commits

Author	SHA1	Message	Date
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
GadflyFang	269903503f	feat: Add commit Tooltip in Blame (#1055) ... Fixes #993	2025-03-05 09:36:32 +08:00
leo	5e898a809e	enhance: check commit hash after intersect testing ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-05 09:30:55 +08:00
leo	e884f27f67	code_style: re-order CommitDetail properties ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-04 18:02:29 +08:00
leo	2137ad9ec9	enhance: allow to configure editor tab width in preferences window (#1048) ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-04 17:26:27 +08:00
GadflyFang	68e96f428e	fix: validate result not update #1052 (#1053)	2025-03-04 16:34:51 +08:00
leo	b75676a7f8	refactor: commit message ... - move issue tracker and commit hash links parsing to view models - parsing links async - make sure matched hash is a valid commit oid - disable `CHILDREN` row in submodule info panel Signed-off-by: leo <longshuang@msn.cn>	2025-03-04 16:04:19 +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	598bba5210	code_review: PR #1043 ... `FileModeChange` should not be changed out of UIThread Signed-off-by: leo <longshuang@msn.cn>	2025-03-03 14:25:49 +08:00
GadflyFang	72c7f24e2f	fix: set FileModeChange after RefreshAll (#1043)	2025-03-03 14:17:03 +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	5199fb2b74	enhance: do NOT remember the last selected handling method of uncommitted local changes (#977) ... Signed-off-by: leo <longshuang@msn.cn>	2025-02-28 22:14:21 +08:00
leo	88c7d5bbc9	fix: app crashes when Return key is pressed while current action is already running (#1035) ... Signed-off-by: leo <longshuang@msn.cn>	2025-02-28 19:15:02 +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	639bff9ad8	code_style: run dotnet format ... Signed-off-by: leo <longshuang@msn.cn>	2025-02-28 17:27:17 +08:00
leo	3e70ff94b0	fix: should not use ... to get revision range for rebasing (#1033) ... Signed-off-by: leo <longshuang@msn.cn>	2025-02-28 17:06:07 +08:00
Andre Greeff	f930967698	feat: remove IsMerged check from "Interactive Rebase" context menu conditional (#1033)	2025-02-28 17:05:49 +08:00