Patchwork outgoing: drop an extraneous URL parse

login
register
mail settings
Submitter Matt Harbison
Date June 2, 2018, 4:33 p.m.
Message ID <22edd5321489205e44f2.1527957184@Envy>
Download mbox | patch
Permalink /patch/31933/
State Accepted
Headers show

Comments

Matt Harbison - June 2, 2018, 4:33 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1527910397 14400
#      Fri Jun 01 23:33:17 2018 -0400
# Node ID 22edd5321489205e44f27f5eaf31f105f7f7e10b
# Parent  f715faeaceeec38ff1551fbccdd45c0c0ba3df85
outgoing: drop an extraneous URL parse

This was left over from dfb888aae17a.  'branches' wasn't used, and the only
thing parseurl() would do is slice any branch fragment off 'dest'.  But path.loc
and path.pushloc already have the fragment removed.
Yuya Nishihara - June 3, 2018, 2:48 a.m.
On Sat, 02 Jun 2018 12:33:04 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1527910397 14400
> #      Fri Jun 01 23:33:17 2018 -0400
> # Node ID 22edd5321489205e44f27f5eaf31f105f7f7e10b
> # Parent  f715faeaceeec38ff1551fbccdd45c0c0ba3df85
> outgoing: drop an extraneous URL parse
> 
> This was left over from dfb888aae17a.  'branches' wasn't used, and the only
> thing parseurl() would do is slice any branch fragment off 'dest'.  But path.loc
> and path.pushloc already have the fragment removed.

Good catch. Queued, thanks.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3736,7 +3736,6 @@  def outgoing(ui, repo, dest=None, **opts
 
     if opts.get('bookmarks'):
         dest = path.pushloc or path.loc
-        dest, branches = hg.parseurl(dest, opts.get('branch'))
         other = hg.peer(repo, opts, dest)
         if 'bookmarks' not in other.listkeys('namespaces'):
             ui.warn(_("remote doesn't support bookmarks\n"))