[PATCH 1 of 2 RFC] rebase: remove bailifchanged check from pullrebase (BC)
Siddharth Agarwal
sid0 at fb.com
Fri Sep 20 18:54:19 CDT 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1379719925 25200
# Fri Sep 20 16:32:05 2013 -0700
# Node ID a71c696cfb5d11a04e0fcef3507ca1f4764d2989
# Parent 86f62a28e24c9a0107d28059247335e60083c09e
rebase: remove bailifchanged check from pullrebase (BC)
This saves us a relatively superfluous status check for pull --rebase (if
rebase runs, it'll check for a clean working directory anyway), and brings hg
pull --rebase closer to hg pull && hg rebase.
This is a behavior change because pull --rebase with a dirty working directory
will now abort after performing the pull rather than before.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -769,7 +769,6 @@
'the update flag\n')
movemarkfrom = repo['.'].node()
- cmdutil.bailifchanged(repo)
revsprepull = len(repo)
origpostincoming = commands.postincoming
def _dummy(*args, **kwargs):
More information about the Mercurial-devel
mailing list