Mercurial > public > mercurial-scm > hg-stable

diff hgext/histedit.py @ 18608:3adbd57e1794

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: report when revisions to edit are not ancestors of working dir Editing the history only is possible when the working dir is a descendant of the revisions to edit. When this happens explain it by writing abort: %s is not an ancestor of working directory
author Simon Heimberg <simohe@besonet.ch>
date Sat, 03 Aug 2013 16:37:17 +0200
parents c795c9f87792
children 909cb9ddba4a
line wrap: on
line diff
--- a/hgext/histedit.py	Sat Feb 09 15:59:44 2013 +0000
+++ b/hgext/histedit.py	Sat Aug 03 16:37:17 2013 +0200
@@ -498,8 +498,8 @@
         keep = opts.get('keep', False)
         revs = between(repo, parent, topmost, keep)
         if not revs:
-            ui.warn(_('nothing to edit\n'))
-            return 1
+            raise util.Abort(_('%s is not an ancestor of working directory') %
+                             node.short(parent))
 
         ctxs = [repo[r] for r in revs]
         rules = opts.get('commands', '')