Patchwork largefiles: remove bailifchanged check from overridepull

login
register
mail settings
Submitter Siddharth Agarwal
Date Sept. 20, 2013, 10:26 p.m.
Message ID <bc5cc8470bbee5c4cee0.1379716017@dev1091.prn1.facebook.com>
Download mbox | patch
Permalink /patch/2583/
State Rejected, archived
Headers show

Comments

Siddharth Agarwal - Sept. 20, 2013, 10:26 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1379715990 25200
#      Fri Sep 20 15:26:30 2013 -0700
# Node ID bc5cc8470bbee5c4cee08cec8c00417932347a85
# Parent  86f62a28e24c9a0107d28059247335e60083c09e
largefiles: remove bailifchanged check from overridepull

If we were performing an hg pull --rebase in a repo with largefiles, we'd check
for a clean working directory before even doing the pull. That is overkill
because rebase would check for a clean working directory anyway.
Siddharth Agarwal - Sept. 20, 2013, 10:35 p.m.
On 09/20/2013 03:26 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1379715990 25200
> #      Fri Sep 20 15:26:30 2013 -0700
> # Node ID bc5cc8470bbee5c4cee08cec8c00417932347a85
> # Parent  86f62a28e24c9a0107d28059247335e60083c09e
> largefiles: remove bailifchanged check from overridepull

Oops -- this patch is likely incorrect. Please drop.

Patch

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -717,7 +717,6 @@ 
                 ui.debug('--update and --rebase are not compatible, ignoring '
                          'the update flag\n')
             del opts['rebase']
-            cmdutil.bailifchanged(repo)
             origpostincoming = commands.postincoming
             def _dummy(*args, **kwargs):
                 pass