This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10884

ui: add a context manager for silencing the ui (pushbuffer+popbuffer)
ClosedPublic

Authored by martinvonz on Jun 18 2021, 7:57 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7a430116f639: ui: add a context manager for silencing the ui (pushbuffer+popbuffer)
Summary

We often silence the ui by calling ui.pushbuffer() followed (a later
in the code) by ui.popbuffer(). These places can be identified by
the fact that they ignore the output returned from
ui.popbuffer(). Let's create a context manager for these cases, to
avoid repetition, and to avoid accidentally leaving the ui silent on
exceptions. I deliberately called the new function silent() instead
of buffered(), because it's just an implementation detail that it
uses pushbuffer() and popbuffer(). We could later optimize it to
not buffer the output.

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.Jun 18 2021, 7:57 PM
pulkit accepted this revision.Jun 21 2021, 3:03 AM
This revision is now accepted and ready to land.Jun 21 2021, 3:03 AM
Alphare added a subscriber: Alphare.Jun 21 2021, 10:40 AM

This revision breaks test-check-imports.t, please follow-up.

martinvonz added a comment.Jun 21 2021, 11:21 AM
In D10884#166556, @Alphare wrote:

This revision breaks test-check-imports.t, please follow-up.

Hmm, sorry about that. I noticed that it was failing, but it has been failing since D10513 for me. This is how it fails for me:

--- /usr/local/google/home/martinvonz/hg/tests/test-check-module-imports.t
+++ /usr/local/google/home/martinvonz/hg/tests/test-check-module-imports.t.err
@@ -42,3 +42,10 @@
   > -X tests/test-imports-checker.t \
   > -X tests/test-verify-repo-operations.py \
   > | sed 's-\\-/-g' | "$PYTHON" "$import_checker" -
+  tests/test-convert-bzr.t:117: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr.t:117: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  tests/test-convert-bzr-ghosts.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr-ghosts.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  tests/test-convert-bzr-treeroot.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr-treeroot.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  [1]

ERROR: test-check-module-imports.t output changed

Does it fail in some other way for you?

Alphare added a comment.EditedJun 22 2021, 4:21 AM
In D10884#166613, @martinvonz wrote:
In D10884#166556, @Alphare wrote:

This revision breaks test-check-imports.t, please follow-up.

Hmm, sorry about that. I noticed that it was failing, but it has been failing since D10513 for me. This is how it fails for me:

--- /usr/local/google/home/martinvonz/hg/tests/test-check-module-imports.t
+++ /usr/local/google/home/martinvonz/hg/tests/test-check-module-imports.t.err
@@ -42,3 +42,10 @@
   > -X tests/test-imports-checker.t \
   > -X tests/test-verify-repo-operations.py \
   > | sed 's-\\-/-g' | "$PYTHON" "$import_checker" -
+  tests/test-convert-bzr.t:117: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr.t:117: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  tests/test-convert-bzr-ghosts.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr-ghosts.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  tests/test-convert-bzr-treeroot.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr-treeroot.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  [1]
ERROR: test-check-module-imports.t output changed

Does it fail in some other way for you?

Sorry, I was thinking about test-check-pyflakes.t, I got mixed up.

However test-check-imports.t does not fail for me either locally or on the CI, that's weird, I'll look at the test a little to see what could be happening.

Don't hesitate to mention new failures like these as soon as you see them so we can improve the CI, I'm always interested.

martinvonz added a comment.Jun 22 2021, 11:18 AM
In D10884#166644, @Alphare wrote:
In D10884#166613, @martinvonz wrote:
In D10884#166556, @Alphare wrote:

This revision breaks test-check-imports.t, please follow-up.

Hmm, sorry about that. I noticed that it was failing, but it has been failing since D10513 for me. This is how it fails for me:

--- /usr/local/google/home/martinvonz/hg/tests/test-check-module-imports.t
+++ /usr/local/google/home/martinvonz/hg/tests/test-check-module-imports.t.err
@@ -42,3 +42,10 @@
   > -X tests/test-imports-checker.t \
   > -X tests/test-verify-repo-operations.py \
   > | sed 's-\\-/-g' | "$PYTHON" "$import_checker" -
+  tests/test-convert-bzr.t:117: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr.t:117: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  tests/test-convert-bzr-ghosts.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr-ghosts.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  tests/test-convert-bzr-treeroot.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
+  tests/test-convert-bzr-treeroot.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
+  [1]
ERROR: test-check-module-imports.t output changed

Does it fail in some other way for you?

Sorry, I was thinking about test-check-pyflakes.t, I got mixed up.

Ohh, turns out I didn't have pyflakes installed. I feel like I must have had that installed at some point after switching to Python 3. Ah, they're installed per minor version, so I must have lost it when I upgraded to Python 3.9. Anyway, I see the failure now, so I'll send a patch.

However test-check-imports.t does not fail for me either locally or on the CI, that's weird, I'll look at the test a little to see what could be happening.
Don't hesitate to mention new failures like these as soon as you see them so we can improve the CI, I'm always interested.

I'm used to having some tests fail so it doesn't bother me much :) FWIW, I also have this failure (I've seen it for months):

--- /usr/local/google/home/martinvonz/hg/tests/test-fuzz-targets.t
+++ /usr/local/google/home/martinvonz/hg/tests/test-fuzz-targets.t.err
@@ -43,6 +43,9 @@
 #if no-clang-libfuzzer clang-6.0
   $ CXX=clang++-6.0 havefuzz || exit 80
   $ $MAKE -s clean all CC=clang-6.0 CXX=clang++-6.0 PYTHON_CONFIG="$PYTHON_CONFIG"
+  clang: error: unknown argument: '-ffile-prefix-map=/build/python3.9-TR50zI/python3.9-3.9.2=.'
+  gmake: *** [Makefile:35: pyutil.o] Error 1
+  [2]
 #endif
 #if no-clang-libfuzzer no-clang-6.0
   $ exit 80
@@ -59,14 +62,7 @@
   >   ./$fuzzer dummy.cc > /dev/null 2>&1
   > done
   run bdiff_fuzzer...
-  run dirs_fuzzer...
-  run dirstate_fuzzer...
-  run fm1readmarkers_fuzzer...
-  run fncache_fuzzer...
-  run jsonescapeu8fast_fuzzer...
-  run manifest_fuzzer...
   run mpatch_fuzzer...
-  run revlog_fuzzer...
   run xdiff_fuzzer...

 Clean up.

ERROR: test-fuzz-targets.t output changed

Revision Contents
Changeset List

Diff 28641

contrib/benchmarks/__init__.py

ui = uimod.ui.load() ui = uimod.ui.load()
else: else:
ui = uimod.ui() ui = uimod.ui()
repo = hg.repository(ui, os.path.join(reposdir, reponame)) repo = hg.repository(ui, os.path.join(reposdir, reponame))
perfext = extensions.load( perfext = extensions.load(
ui, 'perfext', os.path.join(basedir, 'contrib', 'perf.py') ui, 'perfext', os.path.join(basedir, 'contrib', 'perf.py')
) )
cmd = getattr(perfext, command) cmd = getattr(perfext, command)
ui.pushbuffer() with ui.silent():
cmd(ui, repo, *args, **kwargs) cmd(ui, repo, *args, **kwargs)
output = ui.popbuffer()
match = outputre.search(output) match = outputre.search(output)
if not match: if not match:
raise ValueError("Invalid output {}".format(output)) raise ValueError("Invalid output {}".format(output))
return float(match.group(1)) return float(match.group(1))
def perfbench(repos=reposnames, name=None, params=None): def perfbench(repos=reposnames, name=None, params=None):
"""decorator to declare ASV benchmark based on contrib/perf.py extension """decorator to declare ASV benchmark based on contrib/perf.py extension

hgext/histedit.py

self.continuedirty() self.continuedirty()
return self.continueclean() return self.continueclean()
def applychange(self): def applychange(self):
"""Applies the changes from this action's rulectx onto the current """Applies the changes from this action's rulectx onto the current
parentctx, but does not commit them.""" parentctx, but does not commit them."""
repo = self.repo repo = self.repo
rulectx = repo[self.node] rulectx = repo[self.node]
repo.ui.pushbuffer() with repo.ui.silent():
hg.update(repo, self.state.parentctxnode, quietempty=True) hg.update(repo, self.state.parentctxnode, quietempty=True)
repo.ui.popbuffer()
stats = applychanges(repo.ui, repo, rulectx, {}) stats = applychanges(repo.ui, repo, rulectx, {})
repo.dirstate.setbranch(rulectx.branch()) repo.dirstate.setbranch(rulectx.branch())
if stats.unresolvedcount: if stats.unresolvedcount:
raise error.InterventionRequired( raise error.InterventionRequired(
_(b'Fix up the change (%s %s)') % (self.verb, short(self.node)), _(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),
hint=_(b'hg histedit --continue to resume'), hint=_(b'hg histedit --continue to resume'),
) )
return commitfunc return commitfunc
def applychanges(ui, repo, ctx, opts): def applychanges(ui, repo, ctx, opts):
"""Merge changeset from ctx (only) in the current working directory""" """Merge changeset from ctx (only) in the current working directory"""
if ctx.p1().node() == repo.dirstate.p1(): if ctx.p1().node() == repo.dirstate.p1():
# edits are "in place" we do not need to make any merge, # edits are "in place" we do not need to make any merge,
# just applies changes on parent for editing # just applies changes on parent for editing
ui.pushbuffer() with ui.silent():
cmdutil.revert(ui, repo, ctx, all=True) cmdutil.revert(ui, repo, ctx, all=True)
stats = mergemod.updateresult(0, 0, 0, 0) stats = mergemod.updateresult(0, 0, 0, 0)
ui.popbuffer()
else: else:
try: try:
# ui.forcemerge is an internal variable, do not document # ui.forcemerge is an internal variable, do not document
repo.ui.setconfig( repo.ui.setconfig(
b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
) )
stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit']) stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit'])
finally: finally:

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
except error.RepoError: except error.RepoError:
if opts.get(b'remote'): if opts.get(b'remote'):
raise raise
return source, sbranch, None, None, None return source, sbranch, None, None, None
revs, checkout = hg.addbranchrevs(repo, other, branches, None) revs, checkout = hg.addbranchrevs(repo, other, branches, None)
if revs: if revs:
revs = [other.lookup(rev) for rev in revs] revs = [other.lookup(rev) for rev in revs]
ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source)) ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
repo.ui.pushbuffer() with repo.ui.silent():
commoninc = discovery.findcommonincoming(repo, other, heads=revs) commoninc = discovery.findcommonincoming(repo, other, heads=revs)
repo.ui.popbuffer()
return source, sbranch, other, commoninc, commoninc[1] return source, sbranch, other, commoninc, commoninc[1]
if needsincoming: if needsincoming:
source, sbranch, sother, commoninc, incoming = getincoming() source, sbranch, sother, commoninc, incoming = getincoming()
else: else:
source = sbranch = sother = commoninc = incoming = None source = sbranch = sother = commoninc = incoming = None
def getoutgoing(): def getoutgoing():
else: else:
dother = sother dother = sother
if source != dest or (sbranch is not None and sbranch != dbranch): if source != dest or (sbranch is not None and sbranch != dbranch):
common = None common = None
else: else:
common = commoninc common = commoninc
if revs: if revs:
revs = [repo.lookup(rev) for rev in revs] revs = [repo.lookup(rev) for rev in revs]
repo.ui.pushbuffer() with repo.ui.silent():
outgoing = discovery.findcommonoutgoing( outgoing = discovery.findcommonoutgoing(
repo, dother, onlyheads=revs, commoninc=common repo, dother, onlyheads=revs, commoninc=common
) )
repo.ui.popbuffer()
return dest, dbranch, dother, outgoing return dest, dbranch, dother, outgoing
if needsoutgoing: if needsoutgoing:
dest, dbranch, dother, outgoing = getoutgoing() dest, dbranch, dother, outgoing = getoutgoing()
else: else:
dest = dbranch = dother = outgoing = None dest = dbranch = dother = outgoing = None
if opts.get(b'remote'): if opts.get(b'remote'):

mercurial/debugcommands.py

if uimerge: if uimerge:
ui.notenoi18n(b'with ui.merge=%r\n' % (pycompat.bytestr(uimerge))) ui.notenoi18n(b'with ui.merge=%r\n' % (pycompat.bytestr(uimerge)))
ctx = scmutil.revsingle(repo, opts.get(b'rev')) ctx = scmutil.revsingle(repo, opts.get(b'rev'))
m = scmutil.match(ctx, pats, opts) m = scmutil.match(ctx, pats, opts)
changedelete = opts[b'changedelete'] changedelete = opts[b'changedelete']
for path in ctx.walk(m): for path in ctx.walk(m):
fctx = ctx[path] fctx = ctx[path]
try: with ui.silent(
if not ui.debugflag: error=True
ui.pushbuffer(error=True) ) if not ui.debugflag else util.nullcontextmanager():
tool, toolpath = filemerge._picktool( tool, toolpath = filemerge._picktool(
repo, repo,
ui, ui,
path, path,
fctx.isbinary(), fctx.isbinary(),
b'l' in fctx.flags(), b'l' in fctx.flags(),
changedelete, changedelete,
) )
finally:
if not ui.debugflag:
ui.popbuffer()
ui.write(b'%s = %s\n' % (path, tool)) ui.write(b'%s = %s\n' % (path, tool))
@command(b'debugpushkey', [], _(b'REPO NAMESPACE [KEY OLD NEW]'), norepo=True) @command(b'debugpushkey', [], _(b'REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
"""access the pushkey key/value protocol """access the pushkey key/value protocol
With two args, list the keys in the given namespace. With two args, list the keys in the given namespace.
openerargs['sendaccept'] = False openerargs['sendaccept'] = False
opener = urlmod.opener(ui, authinfo, **openerargs) opener = urlmod.opener(ui, authinfo, **openerargs)
if opts[b'peer'] == b'http2': if opts[b'peer'] == b'http2':
ui.write(_(b'creating http peer for wire protocol version 2\n')) ui.write(_(b'creating http peer for wire protocol version 2\n'))
# We go through makepeer() because we need an API descriptor for # We go through makepeer() because we need an API descriptor for
# the peer instance to be useful. # the peer instance to be useful.
with ui.configoverride( maybe_silent = (
ui.silent()
if opts[b'nologhandshake']
else util.nullcontextmanager()
)
with maybe_silent, ui.configoverride(
{(b'experimental', b'httppeer.advertise-v2'): True} {(b'experimental', b'httppeer.advertise-v2'): True}
): ):
if opts[b'nologhandshake']:
ui.pushbuffer()
peer = httppeer.makepeer(ui, path, opener=opener) peer = httppeer.makepeer(ui, path, opener=opener)
if opts[b'nologhandshake']:
ui.popbuffer()
if not isinstance(peer, httppeer.httpv2peer): if not isinstance(peer, httppeer.httpv2peer):
raise error.Abort( raise error.Abort(
_( _(
b'could not instantiate HTTP peer for ' b'could not instantiate HTTP peer for '
b'wire protocol version 2' b'wire protocol version 2'
), ),
hint=_( hint=_(
b'the server may not have the feature ' b'the server may not have the feature '

mercurial/logcmdutil.py

{ {
( (
b"ui", b"ui",
b"forcemerge", b"forcemerge",
): b"internal:merge3-lie-about-conflicts", ): b"internal:merge3-lie-about-conflicts",
}, },
b"merge-diff", b"merge-diff",
): ):
repo.ui.pushbuffer() with repo.ui.silent():
merge.merge(ctx.p2(), wc=wctx) merge.merge(ctx.p2(), wc=wctx)
repo.ui.popbuffer()
return wctx return wctx
else: else:
return ctx.p1() return ctx.p1()
def diffordiffstat( def diffordiffstat(
ui, ui,
repo, repo,

mercurial/repair.py

exchange, exchange,
obsolete, obsolete,
obsutil, obsutil,
pathutil, pathutil,
phases, phases,
pycompat, pycompat,
requirements, requirements,
scmutil, scmutil,
util,
) )
from .utils import ( from .utils import (
hashutil, hashutil,
stringutil, stringutil,
urlutil, urlutil,
) )
del repo.obsstore del repo.obsstore
repo.invalidatevolatilesets() repo.invalidatevolatilesets()
repo._phasecache.filterunknown(repo) repo._phasecache.filterunknown(repo)
if tmpbundlefile: if tmpbundlefile:
ui.note(_(b"adding branch\n")) ui.note(_(b"adding branch\n"))
f = vfs.open(tmpbundlefile, b"rb") f = vfs.open(tmpbundlefile, b"rb")
gen = exchange.readbundle(ui, f, tmpbundlefile, vfs) gen = exchange.readbundle(ui, f, tmpbundlefile, vfs)
if not repo.ui.verbose:
# silence internal shuffling chatter # silence internal shuffling chatter
repo.ui.pushbuffer() maybe_silent = (
repo.ui.silent()
if not repo.ui.verbose
else util.nullcontextmanager()
)
with maybe_silent:
tmpbundleurl = b'bundle:' + vfs.join(tmpbundlefile) tmpbundleurl = b'bundle:' + vfs.join(tmpbundlefile)
txnname = b'strip' txnname = b'strip'
if not isinstance(gen, bundle2.unbundle20): if not isinstance(gen, bundle2.unbundle20):
txnname = b"strip\n%s" % urlutil.hidepassword(tmpbundleurl) txnname = b"strip\n%s" % urlutil.hidepassword(
tmpbundleurl
)
with repo.transaction(txnname) as tr: with repo.transaction(txnname) as tr:
bundle2.applybundle( bundle2.applybundle(
repo, gen, tr, source=b'strip', url=tmpbundleurl repo, gen, tr, source=b'strip', url=tmpbundleurl
) )
if not repo.ui.verbose:
repo.ui.popbuffer()
f.close() f.close()
with repo.transaction(b'repair') as tr: with repo.transaction(b'repair') as tr:
bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm]
repo._bookmarks.applychanges(repo, tr, bmchanges) repo._bookmarks.applychanges(repo, tr, bmchanges)
# remove undo files # remove undo files
for undovfs, undofile in repo.undofiles(): for undovfs, undofile in repo.undofiles():

mercurial/revset.py

dest = path.pushloc or path.loc dest = path.pushloc or path.loc
branches = path.branch, [] branches = path.branch, []
revs, checkout = hg.addbranchrevs(repo, repo, branches, []) revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
if revs: if revs:
revs = [repo.lookup(rev) for rev in revs] revs = [repo.lookup(rev) for rev in revs]
other = hg.peer(repo, {}, dest) other = hg.peer(repo, {}, dest)
try: try:
repo.ui.pushbuffer() with repo.ui.silent():
outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs) outgoing = discovery.findcommonoutgoing(
repo.ui.popbuffer() repo, other, onlyheads=revs
)
finally: finally:
other.close() other.close()
missing.update(outgoing.missing) missing.update(outgoing.missing)
cl = repo.changelog cl = repo.changelog
o = {cl.rev(r) for r in missing} o = {cl.rev(r) for r in missing}
return subset & o return subset & o

mercurial/ui.py

fout/ferr are used""" fout/ferr are used"""
return self._fmsg return self._fmsg
@fmsg.setter @fmsg.setter
def fmsg(self, f): def fmsg(self, f):
self._fmsg = f self._fmsg = f
self._fmsgout, self._fmsgerr = _selectmsgdests(self) self._fmsgout, self._fmsgerr = _selectmsgdests(self)
@contextlib.contextmanager
def silent(self, error=False, subproc=False, labeled=False):
self.pushbuffer(error=error, subproc=subproc, labeled=labeled)
try:
yield
finally:
self.popbuffer()
def pushbuffer(self, error=False, subproc=False, labeled=False): def pushbuffer(self, error=False, subproc=False, labeled=False):
"""install a buffer to capture standard output of the ui object """install a buffer to capture standard output of the ui object
If error is True, the error output will be captured too. If error is True, the error output will be captured too.
If subproc is True, output from subprocesses (typically hooks) will be If subproc is True, output from subprocesses (typically hooks) will be
captured too. captured too.

tests/bruterebase.py

return result return result
for i in xrange(1, 2 ** len(srevs)): for i in xrange(1, 2 ** len(srevs)):
subset = [rev for j, rev in enumerate(srevs) if i & (1 << j) != 0] subset = [rev for j, rev in enumerate(srevs) if i & (1 << j) != 0]
spec = revsetlang.formatspec(b'%ld', subset) spec = revsetlang.formatspec(b'%ld', subset)
tr = repo.transaction(b'rebase') tr = repo.transaction(b'rebase')
tr._report = lambda x: 0 # hide "transaction abort" tr._report = lambda x: 0 # hide "transaction abort"
ui.pushbuffer() with ui.silent():
try: try:
rebase.rebase(ui, repo, dest=dest, rev=[spec]) rebase.rebase(ui, repo, dest=dest, rev=[spec])
except error.Abort as ex: except error.Abort as ex:
summary = b'ABORT: %s' % ex.message summary = b'ABORT: %s' % ex.message
except Exception as ex: except Exception as ex:
summary = b'CRASH: %s' % ex summary = b'CRASH: %s' % ex
else: else:
# short summary about new nodes # short summary about new nodes
cl = repo.changelog cl = repo.changelog
descs = [] descs = []
for rev in xrange(repolen, len(repo)): for rev in xrange(repolen, len(repo)):
desc = b'%s:' % getdesc(rev) desc = b'%s:' % getdesc(rev)
for prev in cl.parentrevs(rev): for prev in cl.parentrevs(rev):
if prev > -1: if prev > -1:
desc += getdesc(prev) desc += getdesc(prev)
descs.append(desc) descs.append(desc)
descs.sort() descs.sort()
summary = b' '.join(descs) summary = b' '.join(descs)
ui.popbuffer()
repo.vfs.tryunlink(b'rebasestate') repo.vfs.tryunlink(b'rebasestate')
subsetdesc = b''.join(getdesc(rev) for rev in subset) subsetdesc = b''.join(getdesc(rev) for rev in subset)
ui.write(b'%s: %s\n' % (subsetdesc.rjust(len(srevs)), summary)) ui.write(b'%s: %s\n' % (subsetdesc.rjust(len(srevs)), summary))
tr.abort() tr.abort()