Mercurial > hg
annotate tests/bruterebase.py @ 41163:0101a35deae2
phabricator: warn if unable to amend, instead of aborting after posting
There was a divergence in behavior here between obsolete and strip based
amending. I first noticed the abort when testing outside of the test harness,
but then had trouble recreating it here after reverting the code changes. It
turns out, strip based amend was successfully amending the public commit after
it was posted! It looks like the protection is in the `commit --amend` command,
not in the underlying code that it calls.
I considered doing a preflight check and aborting. But the locks are only
acquired at the end, if amending, and this is too large a section of code to be
wrapped in a maybe-it's-held-or-not context manager for my tastes.
Additionally, some people do post-push reviews, and amending is the default
behavior, so they shouldn't see a misleading error message.
The lack of a 'Differential Revision' entry in the commit message breaks a
{phabreview} test, so it had to be partially conditionalized.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 05 Jan 2019 15:20:33 -0500 |
parents | 337d6e0fd9c9 |
children | 2372284d9457 |
rev | line source |
---|---|
33708 | 1 # bruterebase.py - brute force rebase testing |
2 # | |
3 # Copyright 2017 Facebook, Inc. | |
4 # | |
5 # This software may be used and distributed according to the terms of the | |
6 # GNU General Public License version 2 or any later version. | |
7 | |
8 from __future__ import absolute_import | |
9 | |
10 from mercurial import ( | |
11 error, | |
12 registrar, | |
13 revsetlang, | |
14 ) | |
15 | |
16 from hgext import rebase | |
17 | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
18 try: |
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
19 xrange |
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
20 except NameError: |
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
21 xrange = range |
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
22 |
33708 | 23 cmdtable = {} |
24 command = registrar.command(cmdtable) | |
25 | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
26 @command(b'debugbruterebase') |
33708 | 27 def debugbruterebase(ui, repo, source, dest): |
28 """for every non-empty subset of source, run rebase -r subset -d dest | |
29 | |
30 Print one line summary for each subset. Assume obsstore is enabled. | |
31 """ | |
32 srevs = list(repo.revs(source)) | |
33 | |
34 with repo.wlock(), repo.lock(): | |
35 repolen = len(repo) | |
36 cl = repo.changelog | |
37 | |
38 def getdesc(rev): | |
39 result = cl.changelogrevision(rev).description | |
40 if rev >= repolen: | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
41 result += b"'" |
33708 | 42 return result |
43 | |
44 for i in xrange(1, 2 ** len(srevs)): | |
45 subset = [rev for j, rev in enumerate(srevs) if i & (1 << j) != 0] | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
46 spec = revsetlang.formatspec(b'%ld', subset) |
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
47 tr = repo.transaction(b'rebase') |
39683
337d6e0fd9c9
transaction: make report a private attribute
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36479
diff
changeset
|
48 tr._report = lambda x: 0 # hide "transaction abort" |
33708 | 49 |
50 ui.pushbuffer() | |
51 try: | |
52 rebase.rebase(ui, repo, dest=dest, rev=[spec]) | |
53 except error.Abort as ex: | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
54 summary = b'ABORT: %s' % ex |
33708 | 55 except Exception as ex: |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
56 summary = b'CRASH: %s' % ex |
33708 | 57 else: |
58 # short summary about new nodes | |
59 cl = repo.changelog | |
60 descs = [] | |
61 for rev in xrange(repolen, len(repo)): | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
62 desc = b'%s:' % getdesc(rev) |
33708 | 63 for prev in cl.parentrevs(rev): |
64 if prev > -1: | |
65 desc += getdesc(prev) | |
66 descs.append(desc) | |
67 descs.sort() | |
36479
3b98ffd2dde3
py3: add a missing b'' in tests/bruterebase.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34204
diff
changeset
|
68 summary = b' '.join(descs) |
33708 | 69 ui.popbuffer() |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
70 repo.vfs.tryunlink(b'rebasestate') |
33708 | 71 |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
72 subsetdesc = b''.join(getdesc(rev) for rev in subset) |
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
73 ui.write((b'%s: %s\n') % (subsetdesc.rjust(len(srevs)), summary)) |
33708 | 74 tr.abort() |