Mercurial > hg
annotate tests/test-rebase-transaction.t @ 36815:f4e9e89330d4
tests: simplify test-rebase-transaction.t
The file was extracted from test-rebase-base.t in 8cef8f7d51d0
(test-rebase-base: clarify it is about the "--base" flag,
2017-10-05). This patch follows up that and clarifies the new file's
purpose and simplifies it a bit.
Differential Revision: https://phab.mercurial-scm.org/D2756
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 08 Mar 2018 20:55:51 -0800 |
parents | 8cef8f7d51d0 |
children | 9ab7eba99fe5 |
rev | line source |
---|---|
36815
f4e9e89330d4
tests: simplify test-rebase-transaction.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
34504
diff
changeset
|
1 Rebasing using a single transaction |
f4e9e89330d4
tests: simplify test-rebase-transaction.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
34504
diff
changeset
|
2 |
30580
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
4 > [extensions] |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
5 > rebase= |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
6 > drawdag=$TESTDIR/drawdag.py |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
7 > |
36815
f4e9e89330d4
tests: simplify test-rebase-transaction.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
34504
diff
changeset
|
8 > [rebase] |
f4e9e89330d4
tests: simplify test-rebase-transaction.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
34504
diff
changeset
|
9 > singletransaction=True |
f4e9e89330d4
tests: simplify test-rebase-transaction.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
34504
diff
changeset
|
10 > |
30580
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
11 > [phases] |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
12 > publish=False |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
13 > |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
14 > [alias] |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
15 > tglog = log -G --template "{rev}: {desc}" |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
16 > EOF |
51e7c83e05ee
rebase: calculate ancestors for --base separately (issue5420)
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
17 |
36815
f4e9e89330d4
tests: simplify test-rebase-transaction.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
34504
diff
changeset
|
18 Check that a simple rebase works |
33619
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
19 |
36815
f4e9e89330d4
tests: simplify test-rebase-transaction.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
34504
diff
changeset
|
20 $ hg init simple && cd simple |
33619
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
21 $ hg debugdrawdag <<'EOF' |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
22 > Z |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
23 > | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
24 > | D |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
25 > | | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
26 > | C |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
27 > | | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
28 > Y B |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
29 > |/ |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
30 > A |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
31 > EOF |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
32 - We should only see two status stored messages. One from the start, one from |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
33 - the end. |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
34 $ hg rebase --debug -b D -d Z | grep 'status stored' |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
35 rebase status stored |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
36 rebase status stored |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
37 $ hg tglog |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
38 o 5: D |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
39 | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
40 o 4: C |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
41 | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
42 o 3: B |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
43 | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
44 o 2: Z |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
45 | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
46 o 1: Y |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
47 | |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
48 o 0: A |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
49 |
609606d21765
rebase: use one dirstateguard for when using rebase.singletransaction
Durham Goode <durham@fb.com>
parents:
33558
diff
changeset
|
50 $ cd .. |