1 $ cat >> $HGRCPATH <<EOF |
|
2 > [liquid] |
|
3 > publish = False |
|
4 > [extensions] |
|
5 > graphlog= |
|
6 > EOF |
|
7 $ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH |
|
8 |
|
9 $ mkcommit() { |
|
10 > echo "$1" > "$1" |
|
11 > hg add "$1" |
|
12 > hg ci -m "add $1" |
|
13 > } |
|
14 |
|
15 $ hg init alpha |
|
16 $ cd alpha |
|
17 $ hg states ready |
|
18 $ mkcommit z |
|
19 $ mkcommit a |
|
20 $ mkcommit b |
|
21 $ mkcommit c |
|
22 $ hg published 1 |
|
23 $ hg log --graph |
|
24 @ changeset: 3:090483935bca |
|
25 | tag: tip |
|
26 | user: test |
|
27 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
28 | summary: add c |
|
29 | |
|
30 o changeset: 2:720fd97246d7 |
|
31 | user: test |
|
32 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
33 | summary: add b |
|
34 | |
|
35 o changeset: 1:7a344d213ee2 |
|
36 | user: test |
|
37 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
38 | summary: add a |
|
39 | |
|
40 o changeset: 0:d32fd17cb041 |
|
41 user: test |
|
42 date: Thu Jan 01 00:00:00 1970 +0000 |
|
43 summary: add z |
|
44 |
|
45 $ cat .hg/states/published-heads |
|
46 7a344d213ee2eb3359d94630d4e076460d59dbf0 |
|
47 |
|
48 publishedheads() should return only revision 1: |
|
49 $ hg log -r 'publishedheads()' --graph |
|
50 o changeset: 1:7a344d213ee2 |
|
51 | user: test |
|
52 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
53 | summary: add a |
|
54 | |
|
55 |
|
56 ancestors of publishedheads shows all frozen revisions: |
|
57 $ hg log -r '::publishedheads()' --graph |
|
58 o changeset: 1:7a344d213ee2 |
|
59 | user: test |
|
60 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
61 | summary: add a |
|
62 | |
|
63 o changeset: 0:d32fd17cb041 |
|
64 user: test |
|
65 date: Thu Jan 01 00:00:00 1970 +0000 |
|
66 summary: add z |
|
67 |
|
68 $ cd .. |
|
69 $ hg init beta |
|
70 $ cd beta |
|
71 $ hg states ready |
|
72 $ hg pull ../alpha --update |
|
73 pulling from ../alpha |
|
74 requesting all changes |
|
75 adding changesets |
|
76 adding manifests |
|
77 adding file changes |
|
78 added 4 changesets with 4 changes to 4 files |
|
79 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
80 $ hg log --graph -r 'publishedheads()' |
|
81 o changeset: 1:7a344d213ee2 |
|
82 | user: test |
|
83 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
84 | summary: add a |
|
85 | |
|
86 |
|
87 Freeze in beta and push to alpha: |
|
88 $ hg published 3 |
|
89 $ mkcommit d |
|
90 $ hg push --traceback ../alpha |
|
91 pushing to ../alpha |
|
92 searching for changes |
|
93 adding changesets |
|
94 adding manifests |
|
95 adding file changes |
|
96 added 1 changesets with 1 changes to 1 files |
|
97 $ cd ../alpha |
|
98 $ hg debugrevspec 'publishedheads()' |
|
99 3 |
|
100 $ hg log --graph -r 'publishedheads()' |
|
101 @ changeset: 3:090483935bca |
|
102 | user: test |
|
103 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
104 | summary: add c |
|
105 | |
|
106 |
|
107 $ hg log -r tip |
|
108 changeset: 4:fb98f3f5bba0 |
|
109 tag: tip |
|
110 user: test |
|
111 date: Thu Jan 01 00:00:00 1970 +0000 |
|
112 summary: add d |
|
113 |
|
114 $ mkcommit e |
|
115 created new head |
|
116 $ hg up -C 4 |
|
117 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
118 $ hg log -r 'publishedheads()' |
|
119 changeset: 3:090483935bca |
|
120 user: test |
|
121 date: Thu Jan 01 00:00:00 1970 +0000 |
|
122 summary: add c |
|
123 |
|
124 $ hg tag -fr tip babar |
|
125 $ hg log -r 'publishedheads()' |
|
126 changeset: 5:cdaaa31e4239 |
|
127 tag: babar |
|
128 parent: 3:090483935bca |
|
129 user: test |
|
130 date: Thu Jan 01 00:00:00 1970 +0000 |
|
131 summary: add e |
|
132 |
|
133 changeset: 6:bd66bf1525ee |
|
134 tag: tip |
|
135 parent: 4:fb98f3f5bba0 |
|
136 user: test |
|
137 date: Thu Jan 01 00:00:00 1970 +0000 |
|
138 summary: Added tag babar for changeset cdaaa31e4239 |
|
139 |
|
140 Check rollback |
|
141 |
|
142 $ hg merge |
|
143 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
144 (branch merge, don't forget to commit) |
|
145 $ hg commit -m 'merge' |
|
146 $ hg published tip |
|
147 $ hg log -r 'publishedheads()' |
|
148 changeset: 7:26631d82e09e |
|
149 tag: tip |
|
150 parent: 6:bd66bf1525ee |
|
151 parent: 5:cdaaa31e4239 |
|
152 user: test |
|
153 date: Thu Jan 01 00:00:00 1970 +0000 |
|
154 summary: merge |
|
155 |
|
156 test rollback does not mess up the liquid changeset |
|
157 $ mkcommit bibi |
|
158 $ hg rollback |
|
159 repository tip rolled back to revision 7 (undo commit) |
|
160 working directory now based on revision 7 |
|
161 $ hg log -r 'publishedheads()' |
|
162 changeset: 7:26631d82e09e |
|
163 tag: tip |
|
164 parent: 6:bd66bf1525ee |
|
165 parent: 5:cdaaa31e4239 |
|
166 user: test |
|
167 date: Thu Jan 01 00:00:00 1970 +0000 |
|
168 summary: merge |
|
169 |
|
170 |
|
171 test rollback even when rollbacking frozen |
|
172 |
|
173 $ mkcommit bubu |
|
174 $ hg published tip |
|
175 $ hg rollback |
|
176 repository tip rolled back to revision 7 (undo commit) |
|
177 working directory now based on revision 7 |
|
178 $ hg log -r 'publishedheads()' |
|
179 changeset: 7:26631d82e09e |
|
180 tag: tip |
|
181 parent: 6:bd66bf1525ee |
|
182 parent: 5:cdaaa31e4239 |
|
183 user: test |
|
184 date: Thu Jan 01 00:00:00 1970 +0000 |
|
185 summary: merge |
|
186 |
|