# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1213230426 -7200
# Node ID 2f017ca736ce6b6660cb928bc191d3f409b442aa
# Parent  55f535bc13bcf6aee6a2623854a71ebe675777b4
(stable) 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

diff -r 55f535bc13bc -r 2f017ca736ce hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Jun 12 11:10:04 2008 +0200
+++ b/hgkw/keyword.py	Thu Jun 12 02:27:06 2008 +0200
@@ -265,11 +265,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()
diff -r 55f535bc13bc -r 2f017ca736ce tests/test-keyword.out
--- a/tests/test-keyword.out	Thu Jun 12 11:10:04 2008 +0200
+++ b/tests/test-keyword.out	Thu Jun 12 02:27:06 2008 +0200
@@ -350,7 +350,7 @@
 % kwexpand a
 overwriting a expanding keywords
 % kwexpand x/a should abort
-abort: outstanding uncommitted changes in given files
+abort: outstanding uncommitted changes
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords