Mercurial > hg
comparison hgext/histedit.py @ 25412:443d4635e630
phases: add `hg help phases` hint to failures to edit public commits
There were a couple of locations that were missing this hint after an
edition of some kind failed due to the public phase.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Mon, 01 Jun 2015 14:16:52 -0400 |
parents | d298805fb639 |
children | 7e36c3000ead |
comparison
equal
deleted
inserted
replaced
25411:d298805fb639 | 25412:443d4635e630 |
---|---|
926 raise util.Abort(_('cannot edit history that would orphan nodes')) | 926 raise util.Abort(_('cannot edit history that would orphan nodes')) |
927 if repo.revs('(%ld) and merge()', ctxs): | 927 if repo.revs('(%ld) and merge()', ctxs): |
928 raise util.Abort(_('cannot edit history that contains merges')) | 928 raise util.Abort(_('cannot edit history that contains merges')) |
929 root = ctxs[0] # list is already sorted by repo.set | 929 root = ctxs[0] # list is already sorted by repo.set |
930 if not root.mutable(): | 930 if not root.mutable(): |
931 raise util.Abort(_('cannot edit public changeset: %s') % root) | 931 raise util.Abort(_('cannot edit public changeset: %s') % root, |
932 hint=_('see "hg help phases" for details')) | |
932 return [c.node() for c in ctxs] | 933 return [c.node() for c in ctxs] |
933 | 934 |
934 def makedesc(repo, action, rev): | 935 def makedesc(repo, action, rev): |
935 """build a initial action line for a ctx | 936 """build a initial action line for a ctx |
936 | 937 |