Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 30755:0fbb3a5c188e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: provide detailed hint to abort message if working dir is not clean Detailed hint message is now provided when 'pull --rebase' operation detects unclean working dir, for example: abort: uncommitted changes (cannot pull with rebase: please commit or shelve your changes first) Added tests for uncommitted merge, and for subrepo support verifying that same hint is also passed to subrepo state check.
author Valters Vingolds <valters@vingolds.ch>
date Tue, 10 Jan 2017 09:32:27 +0100
parents c2bd2f77965b
children 01512564ddd5
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Jan 09 16:02:56 2017 +0900
+++ b/hgext/rebase.py	Tue Jan 10 09:32:27 2017 +0100
@@ -1316,9 +1316,9 @@
                 ui.debug('--update and --rebase are not compatible, ignoring '
                          'the update flag\n')
 
-            ui.debug('before rebase: ensure working dir is clean\n')
             cmdutil.checkunfinished(repo)
-            cmdutil.bailifchanged(repo)
+            cmdutil.bailifchanged(repo, hint=_('cannot pull with rebase: '
+                'please commit or shelve your changes first'))
 
             revsprepull = len(repo)
             origpostincoming = commands.postincoming