comparison mercurial/debugcommands.py @ 35418:c73d23cbb129

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
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 13 Dec 2017 11:20:52 -0800
parents 2105bdd9462a
children fed2c040764e
comparison
equal deleted inserted replaced
35417:2105bdd9462a 35418:c73d23cbb129
780 if lheads <= common: 780 if lheads <= common:
781 ui.write(("local is subset\n")) 781 ui.write(("local is subset\n"))
782 elif rheads <= common: 782 elif rheads <= common:
783 ui.write(("remote is subset\n")) 783 ui.write(("remote is subset\n"))
784 784
785 serverlogs = opts.get('serverlog') 785 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
786 if serverlogs: 786 opts.get('remote_head'))
787 for filename in serverlogs: 787 localrevs = opts['rev']
788 with open(filename, 'r') as logfile: 788 doit(localrevs, remoterevs)
789 line = logfile.readline()
790 while line:
791 parts = line.strip().split(';')
792 op = parts[1]
793 if op == 'cg':
794 pass
795 elif op == 'cgss':
796 doit(parts[2].split(' '), parts[3].split(' '))
797 elif op == 'unb':
798 doit(parts[3].split(' '), parts[2].split(' '))
799 line = logfile.readline()
800 else:
801 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
802 opts.get('remote_head'))
803 localrevs = opts.get('rev')
804 doit(localrevs, remoterevs)
805 789
806 @command('debugextensions', cmdutil.formatteropts, [], norepo=True) 790 @command('debugextensions', cmdutil.formatteropts, [], norepo=True)
807 def debugextensions(ui, **opts): 791 def debugextensions(ui, **opts):
808 '''show information about active extensions''' 792 '''show information about active extensions'''
809 opts = pycompat.byteskwargs(opts) 793 opts = pycompat.byteskwargs(opts)