Mercurial > hg
annotate tests/test-rebase-mq.t @ 23367:115af8de76a4
subrepo: add "_cachestorehashvfs" to handle cache store hash files via vfs
This "vfs" object will be used by subsequent patches to handle cache
store hash files without direct file APIs.
This patch decorates "_cachestorehashvfs" with "@propertycache" to
delay vfs creation, because it is used only for cooperation with other
repositories.
In this patch, "/" is used as the path separator, even though
"self._repo.join" uses platform specific path separator (e.g. "\\" on
Windows). But it is reasonable enough, because "store" and other
management file handling already include such implementation, and they
work well.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 19 Nov 2014 18:35:14 +0900 |
parents | b081decd9062 |
children | 7856a87bbb02 |
rev | line source |
---|---|
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
2 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
3 > rebase= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
4 > mq= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
5 > |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
6 > [mq] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
7 > plain=true |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
8 > |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
9 > [alias] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
10 > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
11 > EOF |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
10672
diff
changeset
|
12 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
13 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
14 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
15 $ cd a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
16 $ hg qinit -c |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
17 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
18 $ echo c1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
19 $ hg add f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
20 $ hg ci -m C1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
21 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
22 $ echo r1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
23 $ hg ci -m R1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
24 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
25 $ hg up -q 0 |
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
8168
diff
changeset
|
26 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
27 $ hg qnew f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
28 $ echo mq1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
29 $ hg qref -m P0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
30 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
31 $ hg qnew f2.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
32 $ echo mq2 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
33 $ hg qref -m P1 |
6931
02f4a0bcfdce
test-rebase-mq: '|' is a GNU sed extension, unfold it
Patrick Mezard <pmezard@gmail.com>
parents:
6906
diff
changeset
|
34 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
35 $ hg tglog |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
36 @ 3: 'P1' tags: f2.patch qtip tip |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
37 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
38 o 2: 'P0' tags: f.patch qbase |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
39 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
40 | o 1: 'R1' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
41 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
42 o 0: 'C1' tags: qparent |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
43 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
44 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
45 Rebase - try to rebase on an applied mq patch: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
46 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
47 $ hg rebase -s 1 -d 3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
48 abort: cannot rebase onto an applied mq patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
49 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
50 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
51 Rebase - same thing, but mq patch is default dest: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
52 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
53 $ hg up -q 1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
54 $ hg rebase |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
55 abort: cannot rebase onto an applied mq patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
56 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
57 $ hg up -q qtip |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
58 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
59 Rebase - generate a conflict: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
60 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
61 $ hg rebase -s 2 -d 1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
62 merging f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
63 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
14599
diff
changeset
|
64 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18648
diff
changeset
|
65 unresolved conflicts (see hg resolve, then hg rebase --continue) |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18933
diff
changeset
|
66 [1] |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
67 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
68 Fix the 1st conflict: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
69 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
70 $ echo mq1r1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
71 $ hg resolve -m f |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
72 (no more unresolved files) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
73 $ hg rebase -c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
74 merging f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
75 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
14599
diff
changeset
|
76 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18648
diff
changeset
|
77 unresolved conflicts (see hg resolve, then hg rebase --continue) |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18933
diff
changeset
|
78 [1] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
79 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
80 Fix the 2nd conflict: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
81 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
82 $ echo mq1r1mq2 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
83 $ hg resolve -m f |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
84 (no more unresolved files) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
85 $ hg rebase -c |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12608
diff
changeset
|
86 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
87 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
88 $ hg tglog |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
89 @ 3: 'P1' tags: f2.patch qtip tip |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
90 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
91 o 2: 'P0' tags: f.patch qbase |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
92 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
93 o 1: 'R1' tags: qparent |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
94 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
95 o 0: 'C1' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
96 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
97 $ hg up -q qbase |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
98 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
99 $ cat f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
100 mq1r1 |
10672
c2e1e637d4da
rebase: always check if rebasing onto an applied mq patch.
Greg Ward <greg-hg@gerg.ca>
parents:
10397
diff
changeset
|
101 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
102 $ cat .hg/patches/f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
103 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
104 # User test |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
105 # Date ?????????? ? (glob) |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
106 # * (glob) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
107 # Node ID ???????????????????????????????????????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
108 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
109 P0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
110 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
111 diff -r bac9ed9960d8 -r ???????????? f (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
112 --- a/f Thu Jan 01 00:00:00 1970 +0000 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
113 +++ b/f ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
114 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
115 -r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
116 +mq1r1 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
117 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
118 Update to qtip: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
119 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
120 $ hg up -q qtip |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
121 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
122 $ cat f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
123 mq1r1mq2 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
124 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
125 $ cat .hg/patches/f2.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
126 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
127 # User test |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
128 # Date ?????????? ? (glob) |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
129 # * (glob) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
130 # Node ID ???????????????????????????????????????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
131 # Parent ???????????????????????????????????????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
132 P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
133 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
134 diff -r ???????????? -r ???????????? f (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
135 --- a/f ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
136 +++ b/f ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
137 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
138 -mq1r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
139 +mq1r1mq2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
140 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
141 Adding one git-style patch and one normal: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
142 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
143 $ hg qpop -a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
144 popping f2.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
145 popping f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
146 patch queue now empty |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
147 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
148 $ rm -fr .hg/patches |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
149 $ hg qinit -c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
150 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
151 $ hg up -q 0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
152 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
153 $ hg qnew --git f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
154 $ echo mq1 > p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
155 $ hg add p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
156 $ hg qref --git -m 'P0 (git)' |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
157 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
158 $ hg qnew f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
159 $ echo mq2 > p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
160 $ hg qref -m P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
161 $ hg qci -m 'save patch state' |
6931
02f4a0bcfdce
test-rebase-mq: '|' is a GNU sed extension, unfold it
Patrick Mezard <pmezard@gmail.com>
parents:
6906
diff
changeset
|
162 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
163 $ hg qseries -s |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
164 f_git.patch: P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
165 f.patch: P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
166 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
167 $ hg -R .hg/patches manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
168 .hgignore |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
169 f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
170 f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
171 series |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
172 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
173 $ cat .hg/patches/f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
174 P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
175 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
176 diff --git a/p b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
177 new file mode 100644 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
178 --- /dev/null |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
179 +++ b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
180 @@ -0,0 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
181 +mq1 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
182 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
183 $ cat .hg/patches/f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
184 P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
185 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
186 diff -r ???????????? p (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
187 --- a/p ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
188 +++ b/p ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
189 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
190 -mq1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
191 +mq2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
192 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
193 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
194 Rebase the applied mq patches: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
195 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
196 $ hg rebase -s 2 -d 1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12608
diff
changeset
|
197 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
198 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
199 $ hg qci -m 'save patch state' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
200 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
201 $ hg qseries -s |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
202 f_git.patch: P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
203 f.patch: P1 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
204 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
205 $ hg -R .hg/patches manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
206 .hgignore |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
207 f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
208 f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
209 series |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
210 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
211 $ cat .hg/patches/f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
212 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
213 # User test |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
214 # Date ?????????? ? (glob) |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
215 # * (glob) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
216 # Node ID ???????????????????????????????????????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
217 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
218 P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
219 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
220 diff --git a/p b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
221 new file mode 100644 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
222 --- /dev/null |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
223 +++ b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
224 @@ -0,0 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
225 +mq1 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
226 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
227 $ cat .hg/patches/f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
228 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
229 # User test |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
230 # Date ?????????? ? (glob) |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
231 # * (glob) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
232 # Node ID ???????????????????????????????????????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
233 # Parent ???????????????????????????????????????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
234 P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
235 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
236 diff -r ???????????? -r ???????????? p (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
237 --- a/p ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
238 +++ b/p ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
239 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
240 -mq1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
241 +mq2 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
242 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16531
diff
changeset
|
243 $ cd .. |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
244 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
245 Rebase with guards |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
246 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
247 $ hg init foo |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
248 $ cd foo |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
249 $ echo a > a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
250 $ hg ci -Am a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
251 adding a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
252 |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
253 Create mq repo with guarded patches foo and bar and empty patch: |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
254 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
255 $ hg qinit |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
256 $ echo guarded > guarded |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
257 $ hg add guarded |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
258 $ hg qnew guarded |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
259 $ hg qnew empty-important -m 'important commit message' |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
260 $ echo bar > bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
261 $ hg add bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
262 $ hg qnew bar |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
263 $ echo foo > foo |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
264 $ hg add foo |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
265 $ hg qnew foo |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
266 $ hg qpop -a |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
267 popping foo |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
268 popping bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
269 popping empty-important |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
270 popping guarded |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
271 patch queue now empty |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
272 $ hg qguard guarded +guarded |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
273 $ hg qguard bar +baz |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
274 $ hg qguard foo +baz |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
275 $ hg qselect baz |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
276 number of unguarded, unapplied patches has changed from 1 to 3 |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
277 $ hg qpush bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
278 applying empty-important |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
279 patch empty-important is empty |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
280 applying bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
281 now at: bar |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
282 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
283 $ hg qguard -l |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
284 guarded: +guarded |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
285 empty-important: unguarded |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
286 bar: +baz |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
287 foo: +baz |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
288 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
289 $ hg tglog |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
290 @ 2: 'imported patch bar' tags: bar qtip tip |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
291 | |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
292 o 1: 'important commit message' tags: empty-important qbase |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
293 | |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
294 o 0: 'a' tags: qparent |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
295 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
296 Create new head to rebase bar onto: |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
297 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
298 $ hg up -C 0 |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
299 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
300 $ echo b > b |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
301 $ hg add b |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
302 $ hg ci -m b |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
303 created new head |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
304 $ hg up -C 2 |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
305 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
306 $ echo a >> a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
307 $ hg qref |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
308 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
309 $ hg tglog |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
310 @ 3: '[mq]: bar' tags: bar qtip tip |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
311 | |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
312 | o 2: 'b' tags: |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
313 | | |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
314 o | 1: 'important commit message' tags: empty-important qbase |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
315 |/ |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
316 o 0: 'a' tags: qparent |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
317 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
318 |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
319 Rebase bar (make sure series order is preserved and empty-important also is |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
320 removed from the series): |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
321 |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
322 $ hg qseries |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
323 guarded |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
324 empty-important |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
325 bar |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
326 foo |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
327 $ [ -f .hg/patches/empty-important ] |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
328 $ hg -q rebase -d 2 |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
329 $ hg qseries |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
330 guarded |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
331 bar |
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
332 foo |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
333 $ [ -f .hg/patches/empty-important ] |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
334 [1] |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
335 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
336 $ hg qguard -l |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
337 guarded: +guarded |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
338 bar: +baz |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
339 foo: +baz |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
340 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
341 $ hg tglog |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
342 @ 2:* '[mq]: bar' tags: bar qbase qtip tip (glob) |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
343 | |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
344 o 1:* 'b' tags: qparent (glob) |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
345 | |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
346 o 0:* 'a' tags: (glob) |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
347 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16531
diff
changeset
|
348 $ cd .. |