Mercurial > public > mercurial-scm > hg-stable
diff hgext/mq.py @ 25411:d298805fb639
phases: rewrite "immutable changeset" to "public changeset"
The phrase "cannot edit immutable changeset" is kind of tautological.
Of course unchangeable things can't be changed. We instead mention
"public" and provide a hint so that we can point to the actual
problem. Even in cases where some operation other than edition cannot
be performed, "public" gives the root cause that results in the
"immutable" effect.
There is a precedent for saying "public" instead of "immutable", for
example, in `hg commit --amend`.
| author | Jordi Guti?rrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Mon, 01 Jun 2015 18:05:38 +0000 |
| parents | 80c5b2666a96 |
| children | d3a00fc3680f |
line wrap: on
line diff
--- a/hgext/mq.py Tue Jun 02 15:04:39 2015 -0400 +++ b/hgext/mq.py Mon Jun 01 18:05:38 2015 +0000 @@ -1526,7 +1526,7 @@ "managed by this patch queue")) if not repo[self.applied[-1].node].mutable(): raise util.Abort( - _("popping would remove an immutable revision"), + _("popping would remove a public revision"), hint=_('see "hg help phases" for details')) # we know there are no local changes, so we can make a simplified @@ -1597,7 +1597,7 @@ if repo.changelog.heads(top) != [top]: raise util.Abort(_("cannot refresh a revision with children")) if not repo[top].mutable(): - raise util.Abort(_("cannot refresh immutable revision"), + raise util.Abort(_("cannot refresh public revision"), hint=_('see "hg help phases" for details')) cparents = repo.changelog.parents(top)