Mercurial > public > mercurial-scm > hg-stable

diff hgext/keyword.py @ 6672:6004eedb13f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
author Christian Ebert <blacktrash@gmx.net>
date Thu, 12 Jun 2008 02:27:06 +0200
parents 01e95d4bc66c
children 336fda65759a
line wrap: on
line diff
--- a/hgext/keyword.py	Fri Jun 13 17:29:10 2008 -0500
+++ b/hgext/keyword.py	Thu Jun 12 02:27:06 2008 +0200
@@ -263,11 +263,13 @@
 
 def _kwfwrite(ui, repo, expand, *pats, **opts):
     '''Selects files and passes them to kwtemplater.overwrite.'''
+    if repo.dirstate.parents()[1] != nullid:
+        raise util.Abort(_('outstanding uncommitted merge'))
     kwt = kwtools['templater']
     status = _status(ui, repo, kwt, *pats, **opts)
     modified, added, removed, deleted, unknown, ignored, clean = status
     if modified or added or removed or deleted:
-        raise util.Abort(_('outstanding uncommitted changes in given files'))
+        raise util.Abort(_('outstanding uncommitted changes'))
     wlock = lock = None
     try:
         wlock = repo.wlock()