Patchwork D1691: debugdiscovery: drop reference to invalid --branch option

login
register
mail settings
Submitter phabricator
Date Dec. 14, 2017, 11:35 p.m.
Message ID <differential-rev-PHID-DREV-bji3n3v7zt4zvkcyzang-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/26286/
State Superseded
Headers show

Comments

phabricator - Dec. 14, 2017, 11:35 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  It seems like it didn't even exist when debugdiscovery was introduced
  in https://phab.mercurial-scm.org/rHGcb98fed5249517b558fa07c7d0414c14cdfe4e4d (discovery: add new set-based discovery, 2011-05-02).

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1691

AFFECTED FILES
  mercurial/debugcommands.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel
phabricator - Dec. 15, 2017, 4:18 p.m.
krbullock added inline comments.

INLINE COMMENTS

> debugcommands.py:747
>      opts = pycompat.byteskwargs(opts)
> -    remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
> -                                      opts.get('branch'))
> +    remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl))
>      remote = hg.peer(repo, opts, remoteurl)

Drop `[-b BRANCH]` from the usage string above too?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1691

To: martinvonz, #hg-reviewers, yuja
Cc: krbullock, mercurial-devel
phabricator - Dec. 15, 2017, 4:44 p.m.
martinvonz added inline comments.

INLINE COMMENTS

> krbullock wrote in debugcommands.py:747
> Drop `[-b BRANCH]` from the usage string above too?

Sure, will send a separate patch

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1691

To: martinvonz, #hg-reviewers, yuja
Cc: krbullock, mercurial-devel

Patch

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -744,8 +744,7 @@ 
 def debugdiscovery(ui, repo, remoteurl="default", **opts):
     """runs the changeset discovery protocol in isolation"""
     opts = pycompat.byteskwargs(opts)
-    remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
-                                      opts.get('branch'))
+    remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl))
     remote = hg.peer(repo, opts, remoteurl)
     ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))