This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1692

debugdiscovery: drop reference to non-existent --serverlog option
ClosedPublic

Authored by martinvonz on Dec 14 2017, 6:35 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGc73d23cbb129: debugdiscovery: drop reference to non-existent --serverlog option
Summary

It seems like it didn't even exist when debugdiscovery was introduced
in cb98fed52495 (discovery: add new set-based discovery, 2011-05-02).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 14 2017, 6:35 PM
yuja accepted this revision.Dec 15 2017, 8:25 AM
This revision is now accepted and ready to land.Dec 15 2017, 8:25 AM
Closed by commit rHGc73d23cbb129: debugdiscovery: drop reference to non-existent --serverlog option (authored by martinvonz). · Explain WhyDec 15 2017, 8:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (24 lines)

Diff 4474

mercurial/debugcommands.py

lheads = set(repo.heads()) lheads = set(repo.heads())
ui.write(("common heads: %s\n") % ui.write(("common heads: %s\n") %
" ".join(sorted(short(n) for n in common))) " ".join(sorted(short(n) for n in common)))
if lheads <= common: if lheads <= common:
ui.write(("local is subset\n")) ui.write(("local is subset\n"))
elif rheads <= common: elif rheads <= common:
ui.write(("remote is subset\n")) 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, remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
opts.get('remote_head')) opts.get('remote_head'))
localrevs = opts.get('rev') localrevs = opts['rev']
doit(localrevs, remoterevs) doit(localrevs, remoterevs)
@command('debugextensions', cmdutil.formatteropts, [], norepo=True) @command('debugextensions', cmdutil.formatteropts, [], norepo=True)
def debugextensions(ui, **opts): def debugextensions(ui, **opts):
'''show information about active extensions''' '''show information about active extensions'''
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
exts = extensions.extensions(ui) exts = extensions.extensions(ui)
hgver = util.version() hgver = util.version()
fm = ui.formatter('debugextensions', opts) fm = ui.formatter('debugextensions', opts)