Patchwork D1692: debugdiscovery: drop reference to non-existent --serverlog option

login
register
mail settings
Submitter phabricator
Date Dec. 15, 2017, 1:52 p.m.
Message ID <0830ee9ddf8e42c3629a0eb639b9eb33@localhost.localdomain>
Download mbox | patch
Permalink /patch/26305/
State Not Applicable
Headers show

Comments

phabricator - Dec. 15, 2017, 1:52 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc73d23cbb129: debugdiscovery: drop reference to non-existent --serverlog option (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1692?vs=4441&id=4474

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

AFFECTED FILES
  mercurial/debugcommands.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -782,26 +782,10 @@ 
         elif rheads <= common:
             ui.write(("remote is subset\n"))
 
-    serverlogs = opts.get('serverlog')
-    if serverlogs:
-        for filename in serverlogs:
-            with open(filename, 'r') as logfile:
-                line = logfile.readline()
-                while line:
-                    parts = line.strip().split(';')
-                    op = parts[1]
-                    if op == 'cg':
-                        pass
-                    elif op == 'cgss':
-                        doit(parts[2].split(' '), parts[3].split(' '))
-                    elif op == 'unb':
-                        doit(parts[3].split(' '), parts[2].split(' '))
-                    line = logfile.readline()
-    else:
-        remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
-                                                 opts.get('remote_head'))
-        localrevs = opts.get('rev')
-        doit(localrevs, remoterevs)
+    remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
+                                             opts.get('remote_head'))
+    localrevs = opts['rev']
+    doit(localrevs, remoterevs)
 
 @command('debugextensions', cmdutil.formatteropts, [], norepo=True)
 def debugextensions(ui, **opts):