Mercurial > hg
annotate tests/test-rebase-brute-force.t @ 42669:36c692eb28d3
transaction: leave unfinished without crashing when not properly released
I think the transaction.__del__ is there just as a last resort in case
we (or an extension) forgot to release the transaction. When that
happens, the repo can (or will on Python 3?) get deleted before the
transaction. This leads to a crash in test-devel-warnings.t on Python
3 because we tried to access repo.dirstate, where repo was retried
from a weak reference. There's not much we can do here, but let's at
least avoid the crash. The user will have run `hg recover` afterwards
regardless.
Differential Revision: https://phab.mercurial-scm.org/D6664
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 21 Jul 2019 07:59:16 -0700 |
parents | 7f183c643eb6 |
children |
rev | line source |
---|---|
33708 | 1 $ cat >> $HGRCPATH <<EOF |
2 > [extensions] | |
3 > drawdag=$TESTDIR/drawdag.py | |
4 > bruterebase=$TESTDIR/bruterebase.py | |
5 > [experimental] | |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
33789
diff
changeset
|
6 > evolution.createmarkers=True |
34867
7f183c643eb6
config: use 'experimental.evolution.allowunstable'
Boris Feld <boris.feld@octobus.net>
parents:
34866
diff
changeset
|
7 > evolution.allowunstable=True |
33708 | 8 > EOF |
9 $ init() { | |
10 > N=`expr ${N:-0} + 1` | |
11 > cd $TESTTMP && hg init repo$N && cd repo$N | |
12 > hg debugdrawdag | |
13 > } | |
14 | |
15 Source looks like "N" | |
16 | |
17 $ init <<'EOS' | |
18 > C D | |
19 > |\| | |
20 > A B Z | |
21 > EOS | |
22 | |
23 $ hg debugbruterebase 'all()-Z' Z | |
24 A: A':Z | |
25 B: B':Z | |
26 AB: A':Z B':Z | |
33789
19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
Jun Wu <quark@fb.com>
parents:
33786
diff
changeset
|
27 C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents |
33708 | 28 AC: A':Z C':A'B |
29 BC: B':Z C':B'A | |
30 ABC: A':Z B':Z C':A'B' | |
31 D: D':Z | |
32 AD: A':Z D':Z | |
33 BD: B':Z D':B' | |
34 ABD: A':Z B':Z D':B' | |
33789
19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
Jun Wu <quark@fb.com>
parents:
33786
diff
changeset
|
35 CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents |
33786
0975506120fb
rebase: rewrite core algorithm (issue5578) (issue5630)
Jun Wu <quark@fb.com>
parents:
33708
diff
changeset
|
36 ACD: A':Z C':A'B D':Z |
33708 | 37 BCD: B':Z C':B'A D':B' |
38 ABCD: A':Z B':Z C':A'B' D':B' | |
39 | |
40 Moving backwards | |
41 | |
42 $ init <<'EOS' | |
43 > C | |
44 > |\ | |
45 > A B | |
46 > | | |
47 > Z | |
48 > EOS | |
49 $ hg debugbruterebase 'all()-Z' Z | |
50 B: B':Z | |
51 A: | |
52 BA: B':Z | |
33789
19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
Jun Wu <quark@fb.com>
parents:
33786
diff
changeset
|
53 C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents |
33708 | 54 BC: B':Z C':B'A |
55 AC: | |
33786
0975506120fb
rebase: rewrite core algorithm (issue5578) (issue5630)
Jun Wu <quark@fb.com>
parents:
33708
diff
changeset
|
56 BAC: B':Z C':B'A |