Patchwork [2,of,2,stable?] pull: all pass along extra opargs

login
register
mail settings
Submitter Sean Farley
Date Oct. 19, 2015, 10:55 p.m.
Message ID <8a36c36fe27a83966712.1445295315@laptop.office.atlassian.com>
Download mbox | patch
Permalink /patch/11180/
State Accepted
Headers show

Comments

Sean Farley - Oct. 19, 2015, 10:55 p.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1445294860 25200
#      Mon Oct 19 15:47:40 2015 -0700
# Node ID 8a36c36fe27a8396671242ad05ff42c33f394dd4
# Parent  c549dd6871dae90812949df9f9fe2d225a060068
pull: all pass along extra opargs

Wihtout this patch, commands.pull silently drops opargs defeating the whole
purpose of the argument.
Matt Mackall - Oct. 20, 2015, 8:48 p.m.
On Mon, 2015-10-19 at 15:55 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1445294860 25200
> #      Mon Oct 19 15:47:40 2015 -0700
> # Node ID 8a36c36fe27a8396671242ad05ff42c33f394dd4
> # Parent  c549dd6871dae90812949df9f9fe2d225a060068
> pull: all pass along extra opargs

These are queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5310,10 +5310,11 @@  def pull(ui, repo, source="default", **o
             except error.CapabilityError:
                 err = _("other repository doesn't support revision lookup, "
                         "so a rev cannot be specified.")
                 raise error.Abort(err)
 
+        pullopargs.update(opts.get('opargs', {}))
         modheads = exchange.pull(repo, other, heads=revs,
                                  force=opts.get('force'),
                                  bookmarks=opts.get('bookmark', ()),
                                  opargs=pullopargs).cgresult
         if checkout: