Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: correctly check commit mutability during commit --amend
authorAugie Fackler <raf@durin42.com>
Tue, 19 Aug 2014 14:33:31 -0400
changeset 22417 ca854cd4a26a
parent 22416 810d37485e85
child 22418 192c798aabee
commit: correctly check commit mutability during commit --amend The right way to check if a context is mutable is to call .mutable(), not to compare .phase() with public.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Tue Aug 19 14:33:01 2014 -0400
+++ b/mercurial/commands.py	Tue Aug 19 14:33:31 2014 -0400
@@ -1409,7 +1409,7 @@
             raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
 
         old = repo['.']
-        if old.phase() == phases.public:
+        if not old.mutable():
             raise util.Abort(_('cannot amend public changesets'))
         if len(repo[None].parents()) > 1:
             raise util.Abort(_('cannot amend while merging'))
Mercurial