Mercurial > public > mercurial-scm > hg-stable

diff hgext/transplant.py @ 41393:608c15f76f50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: use bailifchanged() instead of reimplementing it Differential Revision: https://phab.mercurial-scm.org/D5691
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 24 Jan 2019 16:16:10 -0800
parents b14fdf1fb615
children 5cb8158a61f7
line wrap: on
line diff
--- a/hgext/transplant.py	Thu Jan 24 12:47:54 2019 -0800
+++ b/hgext/transplant.py	Thu Jan 24 16:16:10 2019 -0800
@@ -676,11 +676,7 @@
             raise error.Abort(_('no transplant to continue'))
     else:
         cmdutil.checkunfinished(repo)
-        if p2 != revlog.nullid:
-            raise error.Abort(_('outstanding uncommitted merges'))
-        m, a, r, d = repo.status()[:4]
-        if m or a or r or d:
-            raise error.Abort(_('outstanding local changes'))
+        cmdutil.bailifchanged(repo)
 
     sourcerepo = opts.get('source')
     if sourcerepo: