mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-27 21:27:19 -08:00
94daa46db9
* do NOT modify the existing merge, and add a new constructor for `Commands.Merge` instead * rewrite `ViewModels.MergeMultiple` - since `_histories.Commits.Find` may returns null, use `List<object>` instead of `List<Models.Commits>` - supports display merge target as both `Models.Commit` and `Models.Branch` * rename translation key `Text.MergeMultiple.Commit` to `Text.MergeMultiple.Targets`, and add translations for zh_CN and zh_TW * some UI/UX changes
48 lines
1.4 KiB
C#
48 lines
1.4 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Text;
|
|
|
|
namespace SourceGit.Commands
|
|
{
|
|
public class Merge : Command
|
|
{
|
|
public Merge(string repo, string source, string mode, Action<string> outputHandler)
|
|
{
|
|
_outputHandler = outputHandler;
|
|
WorkingDirectory = repo;
|
|
Context = repo;
|
|
TraitErrorAsOutput = true;
|
|
Args = $"merge --progress {source} {mode}";
|
|
}
|
|
|
|
public Merge(string repo, List<string> targets, bool autoCommit, string strategy, Action<string> outputHandler)
|
|
{
|
|
_outputHandler = outputHandler;
|
|
WorkingDirectory = repo;
|
|
Context = repo;
|
|
TraitErrorAsOutput = true;
|
|
|
|
var builder = new StringBuilder();
|
|
builder.Append("merge --progress ");
|
|
if (!string.IsNullOrEmpty(strategy))
|
|
builder.Append($"--strategy={strategy} ");
|
|
if (!autoCommit)
|
|
builder.Append("--no-commit ");
|
|
|
|
foreach (var t in targets)
|
|
{
|
|
builder.Append(t);
|
|
builder.Append(' ');
|
|
}
|
|
|
|
Args = builder.ToString();
|
|
}
|
|
|
|
protected override void OnReadline(string line)
|
|
{
|
|
_outputHandler?.Invoke(line);
|
|
}
|
|
|
|
private readonly Action<string> _outputHandler = null;
|
|
}
|
|
}
|