author | Laurent Charignon <lcharignon@fb.com> |
Fri, 04 Dec 2015 14:00:59 -0800 | |
changeset 1546 | 69a0d60f9c99 |
parent 1443 | 6c122c975125 |
child 1589 | d6630a6bff86 |
permissions | -rw-r--r-- |
700
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 |
$ cat >> $HGRCPATH <<EOF |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 |
> [ui] |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 |
> logtemplate={rev}:{node|short} {desc}\n |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 |
> [defaults] |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 |
> amend=-d "0 0" |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 |
> [extensions] |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 |
> hgext.rebase= |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 |
> EOF |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
12 |
$ hg init repo |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
13 |
$ cd repo |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 |
$ echo A > a |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 |
$ hg add a |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 |
$ hg commit -m a |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 |
Basic usage |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 |
$ hg log -G |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
@ 0:e93df3427f45 a |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 |
$ hg touch . |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
$ hg log -G |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 |
@ 1:[0-9a-f]{12} a (re) |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
27 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 |
Revive usage |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 |
$ echo A > b |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 |
$ hg add b |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 |
$ hg commit -m ab --amend |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 |
$ hg up --hidden 1 |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
35 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
743
af74a5cdf96b
conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
702
diff
changeset
|
36 |
working directory parent is obsolete! |
1443
6c122c975125
evolve: add a hint when the parent working copy become obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1188
diff
changeset
|
37 |
(use "hg evolve" to update to its successor) |
700
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
38 |
$ hg log -G |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
39 |
o 3:[0-9a-f]{12} ab (re) |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 |
@ 1:[0-9a-f]{12} a (re) |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 |
$ hg touch . |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 |
2 new divergent changesets |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
45 |
$ hg log -G |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
46 |
@ 4:[0-9a-f]{12} a (re) |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
48 |
o 3:[0-9a-f]{12} ab (re) |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
49 |
|
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
50 |
$ hg prune 3 |
ebcfd72e7609
touch: add basic testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
51 |
1 changesets pruned |
701
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
52 |
|
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
53 |
Duplicate |
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
54 |
|
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
55 |
$ hg touch --duplicate . |
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
56 |
$ hg log -G |
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
57 |
@ 5:[0-9a-f]{12} a (re) |
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
58 |
|
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
59 |
o 4:[0-9a-f]{12} a (re) |
f752089479ce
add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
700
diff
changeset
|
60 |
|
702
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
61 |
|
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
62 |
Multiple touch |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
63 |
|
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
64 |
$ echo C > c |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
65 |
$ hg add c |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
66 |
$ hg commit -m c |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
67 |
$ echo D > d |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
68 |
$ hg add d |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
69 |
$ hg commit -m d |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
70 |
$ hg log -G |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
71 |
@ 7:[0-9a-f]{12} d (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
72 |
| |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
73 |
o 6:[0-9a-f]{12} c (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
74 |
| |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
75 |
o 5:[0-9a-f]{12} a (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
76 |
|
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
77 |
o 4:[0-9a-f]{12} a (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
78 |
|
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
79 |
$ hg touch 6:7 |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
80 |
$ hg log -G |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
81 |
@ 9:[0-9a-f]{12} d (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
82 |
| |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
83 |
o 8:[0-9a-f]{12} c (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
84 |
| |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
85 |
o 5:[0-9a-f]{12} a (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
86 |
|
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
87 |
o 4:[0-9a-f]{12} a (re) |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
88 |
|
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
701
diff
changeset
|
89 |
|
1151
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
90 |
check move data kept after rebase on touch: |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
91 |
|
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
92 |
$ touch gna1 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
93 |
$ hg commit -Am gna1 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
94 |
adding gna1 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
95 |
$ hg mv gna1 gna2 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
96 |
$ hg commit -m move |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
97 |
$ hg st -C --change=tip |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
98 |
A gna2 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
99 |
gna1 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
100 |
R gna1 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
101 |
$ hg up .^ |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
102 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
103 |
|
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
104 |
$ hg touch |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
105 |
1 new unstable changesets |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
106 |
|
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
107 |
$ hg rebase -s 11 -d 12 |
1188
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1151
diff
changeset
|
108 |
rebasing 11:* "move" (glob) |
1151
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
109 |
$ hg st -C --change=tip |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
110 |
A gna2 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
111 |
gna1 |
802a87359017
test-touch: add a test for rename preservation after touch
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
743
diff
changeset
|
112 |
R gna1 |