Mercurial > hg
view tests/bruterebase.py @ 33883:e5d104c35e51
morestatus: check whether the conflict message is None before printing
There are cases like bisect when the conflict message can be None. So we make
sure that we don't print None in that case.
Thanks to Martin for catching this.
Differential Revision: https://phab.mercurial-scm.org/D461
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 21 Aug 2017 16:43:37 +0530 |
parents | 71b77b61ed60 |
children | bab82c43c065 |
line wrap: on
line source
# bruterebase.py - brute force rebase testing # # Copyright 2017 Facebook, Inc. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from mercurial import ( error, registrar, revsetlang, ) from hgext import rebase cmdtable = {} command = registrar.command(cmdtable) @command('debugbruterebase') def debugbruterebase(ui, repo, source, dest): """for every non-empty subset of source, run rebase -r subset -d dest Print one line summary for each subset. Assume obsstore is enabled. """ srevs = list(repo.revs(source)) with repo.wlock(), repo.lock(): repolen = len(repo) cl = repo.changelog def getdesc(rev): result = cl.changelogrevision(rev).description if rev >= repolen: result += "'" return result for i in xrange(1, 2 ** len(srevs)): subset = [rev for j, rev in enumerate(srevs) if i & (1 << j) != 0] spec = revsetlang.formatspec('%ld', subset) tr = repo.transaction('rebase') tr.report = lambda x: 0 # hide "transaction abort" ui.pushbuffer() try: rebase.rebase(ui, repo, dest=dest, rev=[spec]) except error.Abort as ex: summary = 'ABORT: %s' % ex except Exception as ex: summary = 'CRASH: %s' % ex else: # short summary about new nodes cl = repo.changelog descs = [] for rev in xrange(repolen, len(repo)): desc = '%s:' % getdesc(rev) for prev in cl.parentrevs(rev): if prev > -1: desc += getdesc(prev) descs.append(desc) descs.sort() summary = ' '.join(descs) ui.popbuffer() repo.vfs.tryunlink('rebasestate') subsetdesc = ''.join(getdesc(rev) for rev in subset) ui.write(('%s: %s\n') % (subsetdesc.rjust(len(srevs)), summary)) tr.abort()