Mercurial > hg
annotate tests/testlib/ext-phase-report.py @ 38679:b3d0c97a0820
rebase: in --confirm option just abort if hit a conflict
Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.
Differential Revision: https://phab.mercurial-scm.org/D3944
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 08:59:42 +0530 |
parents | 3b4d14beac3d |
children | 2372284d9457 |
rev | line source |
---|---|
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 # tiny extension to report phase changes during transaction |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 from __future__ import absolute_import |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 def reposetup(ui, repo): |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 def reportphasemove(tr): |
36044
3b4d14beac3d
py3: port ext-phase-report.py extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33459
diff
changeset
|
8 for rev, move in sorted(tr.changes[b'phases'].items()): |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 if move[0] is None: |
36044
3b4d14beac3d
py3: port ext-phase-report.py extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33459
diff
changeset
|
10 ui.write((b'test-debug-phase: new rev %d: x -> %d\n' |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 % (rev, move[1]))) |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 else: |
36044
3b4d14beac3d
py3: port ext-phase-report.py extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33459
diff
changeset
|
13 ui.write((b'test-debug-phase: move rev %d: %d -> %d\n' |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 % (rev, move[0], move[1]))) |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 class reportphaserepo(repo.__class__): |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 def transaction(self, *args, **kwargs): |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 tr = super(reportphaserepo, self).transaction(*args, **kwargs) |
36044
3b4d14beac3d
py3: port ext-phase-report.py extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33459
diff
changeset
|
19 tr.addpostclose(b'report-phase', reportphasemove) |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 return tr |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 repo.__class__ = reportphaserepo |