Show More
@@ -928,7 +928,7 def between(repo, old, new, keep): | |||
|
928 | 928 | raise util.Abort(_('cannot edit history that contains merges')) |
|
929 | 929 | root = ctxs[0] # list is already sorted by repo.set |
|
930 | 930 | if not root.mutable(): |
|
931 |
raise util.Abort(_('cannot edit |
|
|
931 | raise util.Abort(_('cannot edit public changeset: %s') % root) | |
|
932 | 932 | return [c.node() for c in ctxs] |
|
933 | 933 | |
|
934 | 934 | def makedesc(repo, action, rev): |
@@ -1526,7 +1526,7 class queue(object): | |||
|
1526 | 1526 | "managed by this patch queue")) |
|
1527 | 1527 | if not repo[self.applied[-1].node].mutable(): |
|
1528 | 1528 | raise util.Abort( |
|
1529 |
_("popping would remove a |
|
|
1529 | _("popping would remove a public revision"), | |
|
1530 | 1530 | hint=_('see "hg help phases" for details')) |
|
1531 | 1531 | |
|
1532 | 1532 | # we know there are no local changes, so we can make a simplified |
@@ -1597,7 +1597,7 class queue(object): | |||
|
1597 | 1597 | if repo.changelog.heads(top) != [top]: |
|
1598 | 1598 | raise util.Abort(_("cannot refresh a revision with children")) |
|
1599 | 1599 | if not repo[top].mutable(): |
|
1600 |
raise util.Abort(_("cannot refresh |
|
|
1600 | raise util.Abort(_("cannot refresh public revision"), | |
|
1601 | 1601 | hint=_('see "hg help phases" for details')) |
|
1602 | 1602 | |
|
1603 | 1603 | cparents = repo.changelog.parents(top) |
@@ -330,7 +330,7 def rebase(ui, repo, **opts): | |||
|
330 | 330 | |
|
331 | 331 | root = min(rebaseset) |
|
332 | 332 | if not keepf and not repo[root].mutable(): |
|
333 |
raise util.Abort(_("can't rebase |
|
|
333 | raise util.Abort(_("can't rebase public changeset %s") | |
|
334 | 334 | % repo[root], |
|
335 | 335 | hint=_('see "hg help phases" for details')) |
|
336 | 336 | |
@@ -869,7 +869,7 def abort(repo, originalwd, target, stat | |||
|
869 | 869 | immutable = [d for d in dstates if not repo[d].mutable()] |
|
870 | 870 | cleanup = True |
|
871 | 871 | if immutable: |
|
872 |
repo.ui.warn(_("warning: can't clean up |
|
|
872 | repo.ui.warn(_("warning: can't clean up public changesets %s\n") | |
|
873 | 873 | % ', '.join(str(repo[r]) for r in immutable), |
|
874 | 874 | hint=_('see "hg help phases" for details')) |
|
875 | 875 | cleanup = False |
@@ -1214,7 +1214,7 def createmarkers(repo, relations, flag= | |||
|
1214 | 1214 | localmetadata.update(rel[2]) |
|
1215 | 1215 | |
|
1216 | 1216 | if not prec.mutable(): |
|
1217 |
raise util.Abort("cannot obsolete |
|
|
1217 | raise util.Abort("cannot obsolete public changeset: %s" | |
|
1218 | 1218 | % prec) |
|
1219 | 1219 | nprec = prec.node() |
|
1220 | 1220 | nsucs = tuple(s.node() for s in sucs) |
@@ -219,7 +219,7 Check that histedit respect immutability | |||
|
219 | 219 | o 0:cb9a9f314b8b (public) a |
|
220 | 220 | |
|
221 | 221 | $ hg histedit -r '.~2' |
|
222 |
abort: cannot edit |
|
|
222 | abort: cannot edit public changeset: cb9a9f314b8b | |
|
223 | 223 | [255] |
|
224 | 224 | |
|
225 | 225 |
@@ -25,17 +25,17 Try to operate on public mq changeset | |||
|
25 | 25 | $ hg phase --public qbase |
|
26 | 26 | $ echo babar >> foo |
|
27 | 27 | $ hg qref |
|
28 |
abort: cannot refresh |
|
|
28 | abort: cannot refresh public revision | |
|
29 | 29 | (see "hg help phases" for details) |
|
30 | 30 | [255] |
|
31 | 31 | $ hg revert -a |
|
32 | 32 | reverting foo |
|
33 | 33 | $ hg qpop |
|
34 |
abort: popping would remove a |
|
|
34 | abort: popping would remove a public revision | |
|
35 | 35 | (see "hg help phases" for details) |
|
36 | 36 | [255] |
|
37 | 37 | $ hg qfold bar |
|
38 |
abort: cannot refresh |
|
|
38 | abort: cannot refresh public revision | |
|
39 | 39 | (see "hg help phases" for details) |
|
40 | 40 | [255] |
|
41 | 41 | $ hg revert -a |
General Comments 0
You need to be logged in to leave comments.
Login now