public MergeCommandResult Pop(MercurialProgressMonitor monitor)
{
List <Shelf> stashes = ReadShelfes();
Shelf last = stashes.Last();
MergeCommandResult res = last.Apply(monitor);
if (res.Result == MergeResult.Success)
{
Remove(stashes, last);
}
return(res);
}
/// <summary>
/// Initializes a new instance of the <see cref="MergeJob"/> class.
/// </summary>
/// <param name="repository">
/// The repository the merge was initiated in.
/// </param>
/// <param name="mergeCommand">
/// The <see cref="MergeCommand"/> that initiated the merge.
/// </param>
/// <exception cref="ArgumentNullException">
/// <para><paramref name="repository"/> is <c>null</c>.</para>
/// <para>- or -</para>
/// <para><paramref name="mergeCommand"/> is <c>null</c>.</para>
/// </exception>
public MergeJob(Repository repository, MergeCommand mergeCommand)
{
if (repository == null)
{
throw new ArgumentNullException("repository");
}
if (mergeCommand == null)
{
throw new ArgumentNullException("mergeCommand");
}
_Repository = repository;
_MergeCommand = mergeCommand;
if (_MergeCommand.Result == MergeResult.UnresolvedFiles)
{
InitialRefresh();
}
}
internal static string GetMergeResultErrorDetail(MergeCommandResult result)
{
throw new NotImplementedException();
/*
* string msg = "";
* if (result.GetFailingPaths () != null) {
* foreach (var f in result.GetFailingPaths ()) {
* if (msg.Length > 0)
* msg += "\n";
* switch (f.Value) {
* case NGit.Merge.ResolveMerger.MergeFailureReason.DIRTY_WORKTREE: msg += GettextCatalog.GetString ("The file '{0}' has unstaged changes", f.Key); break;
* case NGit.Merge.ResolveMerger.MergeFailureReason.DIRTY_INDEX: msg += GettextCatalog.GetString ("The file '{0}' has staged changes", f.Key); break;
* case NGit.Merge.ResolveMerger.MergeFailureReason.COULD_NOT_DELETE: msg += GettextCatalog.GetString ("The file '{0}' could not be deleted", f.Key); break;
* }
* }
* }
* return msg;
*/
}
internal static string GetMergeResultErrorDetail(MergeCommandResult result)
{
throw new NotImplementedException ();
/*
string msg = "";
if (result.GetFailingPaths () != null) {
foreach (var f in result.GetFailingPaths ()) {
if (msg.Length > 0)
msg += "\n";
switch (f.Value) {
case NGit.Merge.ResolveMerger.MergeFailureReason.DIRTY_WORKTREE: msg += GettextCatalog.GetString ("The file '{0}' has unstaged changes", f.Key); break;
case NGit.Merge.ResolveMerger.MergeFailureReason.DIRTY_INDEX: msg += GettextCatalog.GetString ("The file '{0}' has staged changes", f.Key); break;
case NGit.Merge.ResolveMerger.MergeFailureReason.COULD_NOT_DELETE: msg += GettextCatalog.GetString ("The file '{0}' could not be deleted", f.Key); break;
}
}
}
return msg;
*/
}
