Mercurial > hg
annotate tests/bruterebase.py @ 44550:bbb170f9396d
phabricator: add a `phabimport` command
I've had `alias.phabimport = $hg phabread --stack $1 | $hg import --bypass -`
for a while now, and I suspect others do too. That's limited though, in that it
can't use the information on Phabricator to restore it in the original location,
so I'm making it a first class command.
This doesn't do anything ambitious like that- this is mostly a simplification of
`hg import` to get the equivalent of the alias mentioned above. The `--bypass`
option is hardcoded to be enabled and the message about amending rejects
dropped (rejects aren't created with `--bypass`), because editing patches on
Phabricator seems like an unusual workflow.
This will need other options, like `--obsolete` and `--secret`. I think these
would be more useful as config settings, as I imagine the workflows are pretty
fixed depending on roles. Reviewers who don't queue patches probably never want
`--obsolete`, but may need `--secret`. Reviewers who do will want the former,
but not the latter. I left `--stack` as an option, but that should probably be
a config knob too (or at least default to on)- if the point of this is to avoid
rejects, it doesn't make sense to skip dependencies in most cases.
Evolve is going to need a fix to its wrapping of `cmdutil.tryimportone()`, as it
currently assumes `opts` has an `obsolete` key. It's worked around for now.
Differential Revision: https://phab.mercurial-scm.org/D8136
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 16 Feb 2020 16:13:36 -0500 |
parents | 2372284d9457 |
children | d2e1dcd4490d |
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 | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
39683
diff
changeset
|
26 |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
27 @command(b'debugbruterebase') |
33708 | 28 def debugbruterebase(ui, repo, source, dest): |
29 """for every non-empty subset of source, run rebase -r subset -d dest | |
30 | |
31 Print one line summary for each subset. Assume obsstore is enabled. | |
32 """ | |
33 srevs = list(repo.revs(source)) | |
34 | |
35 with repo.wlock(), repo.lock(): | |
36 repolen = len(repo) | |
37 cl = repo.changelog | |
38 | |
39 def getdesc(rev): | |
40 result = cl.changelogrevision(rev).description | |
41 if rev >= repolen: | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
42 result += b"'" |
33708 | 43 return result |
44 | |
45 for i in xrange(1, 2 ** len(srevs)): | |
46 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
|
47 spec = revsetlang.formatspec(b'%ld', subset) |
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
48 tr = repo.transaction(b'rebase') |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
39683
diff
changeset
|
49 tr._report = lambda x: 0 # hide "transaction abort" |
33708 | 50 |
51 ui.pushbuffer() | |
52 try: | |
53 rebase.rebase(ui, repo, dest=dest, rev=[spec]) | |
54 except error.Abort as ex: | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
55 summary = b'ABORT: %s' % ex |
33708 | 56 except Exception as ex: |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
57 summary = b'CRASH: %s' % ex |
33708 | 58 else: |
59 # short summary about new nodes | |
60 cl = repo.changelog | |
61 descs = [] | |
62 for rev in xrange(repolen, len(repo)): | |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
63 desc = b'%s:' % getdesc(rev) |
33708 | 64 for prev in cl.parentrevs(rev): |
65 if prev > -1: | |
66 desc += getdesc(prev) | |
67 descs.append(desc) | |
68 descs.sort() | |
36479
3b98ffd2dde3
py3: add a missing b'' in tests/bruterebase.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34204
diff
changeset
|
69 summary = b' '.join(descs) |
33708 | 70 ui.popbuffer() |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
71 repo.vfs.tryunlink(b'rebasestate') |
33708 | 72 |
34204
bab82c43c065
bruterebase: port to python 3
Augie Fackler <raf@durin42.com>
parents:
33708
diff
changeset
|
73 subsetdesc = b''.join(getdesc(rev) for rev in subset) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
39683
diff
changeset
|
74 ui.write(b'%s: %s\n' % (subsetdesc.rjust(len(srevs)), summary)) |
33708 | 75 tr.abort() |