dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-22 04:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

enhance: redesign in-progress banner (#790)

Browse source 
* show head for cherry-pick
* show stopped at for rebase
* supports `--skip` for cherry-pick and rebase
This commit is contained in:
leo 2024-12-10 11:17:30 +08:00
parent 1644b4c8ce
commit aee3abfffb
No known key found for this signature in database
12 changed files with 135 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/ViewModels/InProgressContexts.cs
View file

@ -16,10 +16,17 @@ namespace SourceGit.ViewModels
set;
}
public InProgressContext(string repo, string cmd)
public bool CanSkip
{
get;
protected set;
}
public InProgressContext(string repo, string cmd, bool canSkip)
{
Repository = repo;
Cmd = cmd;
CanSkip = canSkip;
}
public bool Abort()
@ -32,6 +39,19 @@ namespace SourceGit.ViewModels
}.Exec();
}
public bool Skip()
{
if (!CanSkip)
return true;
return new Commands.Command()
{
WorkingDirectory = Repository,
Context = Repository,
Args = $"{Cmd} --skip",
}.Exec();
}
public virtual bool Continue()
{
return new Commands.Command()
@ -46,14 +66,33 @@ namespace SourceGit.ViewModels
public class CherryPickInProgress : InProgressContext
{
public CherryPickInProgress(string repo) : base(repo, "cherry-pick") { }
public Models.Commit Head
{
get;
private set;
}
public CherryPickInProgress(Repository repo) : base(repo.FullPath, "cherry-pick", true)
{
var headSHA = File.ReadAllText(Path.Combine(repo.GitDir, "CHERRY_PICK_HEAD")).Trim();
Head = new Commands.QuerySingleCommit(repo.FullPath, headSHA).Result();
}
}
public class RebaseInProgress : InProgressContext
{
public RebaseInProgress(Repository repo) : base(repo.FullPath, "rebase")
public Models.Commit StoppedAt
{
get;
private set;
}
public RebaseInProgress(Repository repo) : base(repo.FullPath, "rebase", true)
{
_gitDir = repo.GitDir;
var stoppedSHA = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "stopped-sha")).Trim();
StoppedAt = new Commands.QuerySingleCommit(repo.FullPath, stoppedSHA).Result();
}
public override bool Continue()
@ -90,11 +129,11 @@ namespace SourceGit.ViewModels
public class RevertInProgress : InProgressContext
{
public RevertInProgress(string repo) : base(repo, "revert") { }
public RevertInProgress(string repo) : base(repo, "revert", false) { }
}
public class MergeInProgress : InProgressContext
{
public MergeInProgress(string repo) : base(repo, "merge") { }
public MergeInProgress(string repo) : base(repo, "merge", false) { }
}
}