metaedit: check for public changeset before instability
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Mon, 02 May 2016 18:24:36 +0200
changeset 1688 031682c1faa2
parent 1687 73e0018c423f
child 1689 60752ed8d2d4
metaedit: check for public changeset before instability Public changeset will stay public even if the selection is adjusted, this is a more definitive condition that is worth warning about first.
hgext/evolve.py
--- a/hgext/evolve.py	Mon May 02 18:21:54 2016 +0200
+++ b/hgext/evolve.py	Mon May 02 18:24:36 2016 +0200
@@ -3221,14 +3221,14 @@
         if opts['fold']:
             root, head = _foldcheck(repo, revs)
         else:
+            if repo.revs("%ld and public()", revs):
+                raise error.Abort(_('cannot edit commit information for public '
+                                    'revisions'))
             newunstable = _disallowednewunstable(repo, revs)
             if newunstable:
                 raise error.Abort(
                     _('cannot edit commit information in the middle of a stack'),
                     hint=_('%s will be affected') % repo[newunstable.first()])
-            if repo.revs("%ld and public()", revs):
-                raise error.Abort(_('cannot edit commit information for public '
-                                    'revisions'))
             root = head = repo[revs.first()]
 
         wctx = repo[None]