Patchwork [4,of,4] shelve: don't reimplement mergestate.unresolved()

login
register
mail settings
Submitter via Mercurial-devel
Date July 6, 2017, 5:39 p.m.
Message ID <eca76edfc5574a598c0e.1499362767@martinvonz.svl.corp.google.com>
Download mbox | patch
Permalink /patch/22028/
State Accepted
Headers show

Comments

via Mercurial-devel - July 6, 2017, 5:39 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1448990394 28800
#      Tue Dec 01 09:19:54 2015 -0800
# Node ID eca76edfc5574a598c0e347b22de7d236900312a
# Parent  30ac13304e5d0e8b4e68455f18adc058e219db7f
shelve: don't reimplement mergestate.unresolved()
Sean Farley - July 6, 2017, 10:47 p.m.
Martin von Zweigbergk via Mercurial-devel <mercurial-devel@mercurial-scm.org> writes:

> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz@google.com>
> # Date 1448990394 28800
> #      Tue Dec 01 09:19:54 2015 -0800
> # Node ID eca76edfc5574a598c0e347b22de7d236900312a
> # Parent  30ac13304e5d0e8b4e68455f18adc058e219db7f
> shelve: don't reimplement mergestate.unresolved()

Looks good, queued!

Patch

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -659,7 +659,7 @@ 
     with repo.lock():
         checkparents(repo, state)
         ms = merge.mergestate.read(repo)
-        if [f for f in ms if ms[f] == 'u']:
+        if list(ms.unresolved()):
             raise error.Abort(
                 _("unresolved conflicts, can't continue"),
                 hint=_("see 'hg resolve', then 'hg unshelve --continue'"))