diff: replace --merge option by config option
I can't think of any reason you'd want to enable the merge diff on a
run-to-run basis; you'd probably either always or never want it set
(though I can't see why you'd never want it set). If you have it set,
you'll probably also want the same output in `hg log -p`
output. Having a single config option for the feature makes sense.
Differential Revision: https://phab.mercurial-scm.org/D9956
# tiny extension to report phase changes during transaction
from __future__ import absolute_import
def reposetup(ui, repo):
def reportphasemove(tr):
for revs, move in sorted(tr.changes[b"phases"], key=lambda r: r[0][0]):
for rev in revs:
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