rebase: do not pass in user option to rollback in-memory merge conflict
Nothing passed before
e9e742bd0501.
# tiny extension to report phase changes during transaction
from __future__ import absolute_import
def reposetup(ui, repo):
def reportphasemove(tr):
for rev, move in sorted(tr.changes[b'phases'].items()):
if move[0] is None:
ui.write((b'test-debug-phase: new rev %d: x -> %d\n'
% (rev, move[1])))
else:
ui.write((b'test-debug-phase: move rev %d: %d -> %d\n'
% (rev, move[0], move[1])))
class reportphaserepo(repo.__class__):
def transaction(self, *args, **kwargs):
tr = super(reportphaserepo, self).transaction(*args, **kwargs)
tr.addpostclose(b'report-phase', reportphasemove)
return tr
repo.__class__ = reportphaserepo