# HG changeset patch # User Martin von Zweigbergk # Date 1513192852 28800 # Node ID c73d23cbb129e9b2b51fdf179d9827aa834f519a # Parent 2105bdd9462aac5573c3c9572d2a616614b096ba debugdiscovery: drop reference to non-existent --serverlog option It seems like it didn't even exist when debugdiscovery was introduced in cb98fed52495 (discovery: add new set-based discovery, 2011-05-02). Differential Revision: https://phab.mercurial-scm.org/D1692 diff -r 2105bdd9462a -r c73d23cbb129 mercurial/debugcommands.py --- a/mercurial/debugcommands.py Wed Dec 13 11:19:24 2017 -0800 +++ b/mercurial/debugcommands.py Wed Dec 13 11:20:52 2017 -0800 @@ -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):