##// END OF EJS Templates
test: minor documentation fix...
Pierre-Yves David -
r18492:45445187 stable
parent child Browse files
Show More
@@ -1,721 +1,721 b''
1 $ cat >> $HGRCPATH << EOF
1 $ cat >> $HGRCPATH << EOF
2 > [extensions]
2 > [extensions]
3 > graphlog=
3 > graphlog=
4 > [phases]
4 > [phases]
5 > # public changeset are not obsolete
5 > # public changeset are not obsolete
6 > publish=false
6 > publish=false
7 > EOF
7 > EOF
8 $ mkcommit() {
8 $ mkcommit() {
9 > echo "$1" > "$1"
9 > echo "$1" > "$1"
10 > hg add "$1"
10 > hg add "$1"
11 > hg ci -m "add $1"
11 > hg ci -m "add $1"
12 > }
12 > }
13 $ getid() {
13 $ getid() {
14 > hg id --debug --hidden -ir "desc('$1')"
14 > hg id --debug --hidden -ir "desc('$1')"
15 > }
15 > }
16
16
17 $ cat > debugkeys.py <<EOF
17 $ cat > debugkeys.py <<EOF
18 > def reposetup(ui, repo):
18 > def reposetup(ui, repo):
19 > class debugkeysrepo(repo.__class__):
19 > class debugkeysrepo(repo.__class__):
20 > def listkeys(self, namespace):
20 > def listkeys(self, namespace):
21 > ui.write('listkeys %s\n' % (namespace,))
21 > ui.write('listkeys %s\n' % (namespace,))
22 > return super(debugkeysrepo, self).listkeys(namespace)
22 > return super(debugkeysrepo, self).listkeys(namespace)
23 >
23 >
24 > if repo.local():
24 > if repo.local():
25 > repo.__class__ = debugkeysrepo
25 > repo.__class__ = debugkeysrepo
26 > EOF
26 > EOF
27
27
28 $ hg init tmpa
28 $ hg init tmpa
29 $ cd tmpa
29 $ cd tmpa
30 $ mkcommit kill_me
30 $ mkcommit kill_me
31
31
32 Checking that the feature is properly disabled
32 Checking that the feature is properly disabled
33
33
34 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
34 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
35 abort: obsolete feature is not enabled on this repo
35 abort: obsolete feature is not enabled on this repo
36 [255]
36 [255]
37
37
38 Enabling it
38 Enabling it
39
39
40 $ cat > ../obs.py << EOF
40 $ cat > ../obs.py << EOF
41 > import mercurial.obsolete
41 > import mercurial.obsolete
42 > mercurial.obsolete._enabled = True
42 > mercurial.obsolete._enabled = True
43 > EOF
43 > EOF
44 $ echo '[extensions]' >> $HGRCPATH
44 $ echo '[extensions]' >> $HGRCPATH
45 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
45 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
46
46
47 Killing a single changeset without replacement
47 Killing a single changeset without replacement
48
48
49 $ hg debugobsolete 0
49 $ hg debugobsolete 0
50 abort: changeset references must be full hexadecimal node identifiers
50 abort: changeset references must be full hexadecimal node identifiers
51 [255]
51 [255]
52 $ hg debugobsolete '00'
52 $ hg debugobsolete '00'
53 abort: changeset references must be full hexadecimal node identifiers
53 abort: changeset references must be full hexadecimal node identifiers
54 [255]
54 [255]
55 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
55 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
56 $ hg debugobsolete
56 $ hg debugobsolete
57 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 {'date': '0 0', 'user': 'babar'}
57 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 {'date': '0 0', 'user': 'babar'}
58
58
59 (test that mercurial is not confused)
59 (test that mercurial is not confused)
60
60
61 $ hg up null --quiet # having 0 as parent prevents it to be hidden
61 $ hg up null --quiet # having 0 as parent prevents it to be hidden
62 $ hg tip
62 $ hg tip
63 changeset: -1:000000000000
63 changeset: -1:000000000000
64 tag: tip
64 tag: tip
65 user:
65 user:
66 date: Thu Jan 01 00:00:00 1970 +0000
66 date: Thu Jan 01 00:00:00 1970 +0000
67
67
68 $ hg up --hidden tip --quiet
68 $ hg up --hidden tip --quiet
69 $ cd ..
69 $ cd ..
70
70
71 Killing a single changeset with replacement
71 Killing a single changeset with replacement
72
72
73 $ hg init tmpb
73 $ hg init tmpb
74 $ cd tmpb
74 $ cd tmpb
75 $ mkcommit a
75 $ mkcommit a
76 $ mkcommit b
76 $ mkcommit b
77 $ mkcommit original_c
77 $ mkcommit original_c
78 $ hg up "desc('b')"
78 $ hg up "desc('b')"
79 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
79 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
80 $ mkcommit new_c
80 $ mkcommit new_c
81 created new head
81 created new head
82 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
82 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
83 $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12'
83 $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12'
84 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
84 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
85 2:245bde4270cd add original_c
85 2:245bde4270cd add original_c
86 $ hg debugobsolete
86 $ hg debugobsolete
87 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
87 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
88
88
89 do it again (it read the obsstore before adding new changeset)
89 do it again (it read the obsstore before adding new changeset)
90
90
91 $ hg up '.^'
91 $ hg up '.^'
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
93 $ mkcommit new_2_c
93 $ mkcommit new_2_c
94 created new head
94 created new head
95 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
95 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
96 $ hg debugobsolete
96 $ hg debugobsolete
97 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
97 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
98 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
98 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
99
99
100 Register two markers with a missing node
100 Register two markers with a missing node
101
101
102 $ hg up '.^'
102 $ hg up '.^'
103 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
103 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
104 $ mkcommit new_3_c
104 $ mkcommit new_3_c
105 created new head
105 created new head
106 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
106 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
107 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
107 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
108 $ hg debugobsolete
108 $ hg debugobsolete
109 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
109 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
110 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
110 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
111 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
111 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
112 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
112 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
113
113
114 Refuse pathological nullid successors
114 Refuse pathological nullid successors
115 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
115 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
116 transaction abort!
116 transaction abort!
117 rollback completed
117 rollback completed
118 abort: bad obsolescence marker detected: invalid successors nullid
118 abort: bad obsolescence marker detected: invalid successors nullid
119 [255]
119 [255]
120
120
121 Check that graphlog detect that a changeset is obsolete:
121 Check that graphlog detect that a changeset is obsolete:
122
122
123 $ hg glog
123 $ hg glog
124 @ changeset: 5:5601fb93a350
124 @ changeset: 5:5601fb93a350
125 | tag: tip
125 | tag: tip
126 | parent: 1:7c3bad9141dc
126 | parent: 1:7c3bad9141dc
127 | user: test
127 | user: test
128 | date: Thu Jan 01 00:00:00 1970 +0000
128 | date: Thu Jan 01 00:00:00 1970 +0000
129 | summary: add new_3_c
129 | summary: add new_3_c
130 |
130 |
131 o changeset: 1:7c3bad9141dc
131 o changeset: 1:7c3bad9141dc
132 | user: test
132 | user: test
133 | date: Thu Jan 01 00:00:00 1970 +0000
133 | date: Thu Jan 01 00:00:00 1970 +0000
134 | summary: add b
134 | summary: add b
135 |
135 |
136 o changeset: 0:1f0dee641bb7
136 o changeset: 0:1f0dee641bb7
137 user: test
137 user: test
138 date: Thu Jan 01 00:00:00 1970 +0000
138 date: Thu Jan 01 00:00:00 1970 +0000
139 summary: add a
139 summary: add a
140
140
141
141
142 check that heads does not report them
142 check that heads does not report them
143
143
144 $ hg heads
144 $ hg heads
145 changeset: 5:5601fb93a350
145 changeset: 5:5601fb93a350
146 tag: tip
146 tag: tip
147 parent: 1:7c3bad9141dc
147 parent: 1:7c3bad9141dc
148 user: test
148 user: test
149 date: Thu Jan 01 00:00:00 1970 +0000
149 date: Thu Jan 01 00:00:00 1970 +0000
150 summary: add new_3_c
150 summary: add new_3_c
151
151
152 $ hg heads --hidden
152 $ hg heads --hidden
153 changeset: 5:5601fb93a350
153 changeset: 5:5601fb93a350
154 tag: tip
154 tag: tip
155 parent: 1:7c3bad9141dc
155 parent: 1:7c3bad9141dc
156 user: test
156 user: test
157 date: Thu Jan 01 00:00:00 1970 +0000
157 date: Thu Jan 01 00:00:00 1970 +0000
158 summary: add new_3_c
158 summary: add new_3_c
159
159
160 changeset: 4:ca819180edb9
160 changeset: 4:ca819180edb9
161 parent: 1:7c3bad9141dc
161 parent: 1:7c3bad9141dc
162 user: test
162 user: test
163 date: Thu Jan 01 00:00:00 1970 +0000
163 date: Thu Jan 01 00:00:00 1970 +0000
164 summary: add new_2_c
164 summary: add new_2_c
165
165
166 changeset: 3:cdbce2fbb163
166 changeset: 3:cdbce2fbb163
167 parent: 1:7c3bad9141dc
167 parent: 1:7c3bad9141dc
168 user: test
168 user: test
169 date: Thu Jan 01 00:00:00 1970 +0000
169 date: Thu Jan 01 00:00:00 1970 +0000
170 summary: add new_c
170 summary: add new_c
171
171
172 changeset: 2:245bde4270cd
172 changeset: 2:245bde4270cd
173 user: test
173 user: test
174 date: Thu Jan 01 00:00:00 1970 +0000
174 date: Thu Jan 01 00:00:00 1970 +0000
175 summary: add original_c
175 summary: add original_c
176
176
177
177
178
178
179 check that summary does not report them
179 check that summary does not report them
180
180
181 $ hg init ../sink
181 $ hg init ../sink
182 $ echo '[paths]' >> .hg/hgrc
182 $ echo '[paths]' >> .hg/hgrc
183 $ echo 'default=../sink' >> .hg/hgrc
183 $ echo 'default=../sink' >> .hg/hgrc
184 $ hg summary --remote
184 $ hg summary --remote
185 parent: 5:5601fb93a350 tip
185 parent: 5:5601fb93a350 tip
186 add new_3_c
186 add new_3_c
187 branch: default
187 branch: default
188 commit: (clean)
188 commit: (clean)
189 update: (current)
189 update: (current)
190 remote: 3 outgoing
190 remote: 3 outgoing
191
191
192 $ hg summary --remote --hidden
192 $ hg summary --remote --hidden
193 parent: 5:5601fb93a350 tip
193 parent: 5:5601fb93a350 tip
194 add new_3_c
194 add new_3_c
195 branch: default
195 branch: default
196 commit: (clean)
196 commit: (clean)
197 update: 3 new changesets, 4 branch heads (merge)
197 update: 3 new changesets, 4 branch heads (merge)
198 remote: 3 outgoing
198 remote: 3 outgoing
199
199
200 check that various commands work well with filtering
200 check that various commands work well with filtering
201
201
202 $ hg tip
202 $ hg tip
203 changeset: 5:5601fb93a350
203 changeset: 5:5601fb93a350
204 tag: tip
204 tag: tip
205 parent: 1:7c3bad9141dc
205 parent: 1:7c3bad9141dc
206 user: test
206 user: test
207 date: Thu Jan 01 00:00:00 1970 +0000
207 date: Thu Jan 01 00:00:00 1970 +0000
208 summary: add new_3_c
208 summary: add new_3_c
209
209
210 $ hg log -r 6
210 $ hg log -r 6
211 abort: unknown revision '6'!
211 abort: unknown revision '6'!
212 [255]
212 [255]
213 $ hg log -r 4
213 $ hg log -r 4
214 abort: unknown revision '4'!
214 abort: unknown revision '4'!
215 [255]
215 [255]
216
216
217 Check that public changeset are not accounted as obsolete:
217 Check that public changeset are not accounted as obsolete:
218
218
219 $ hg --hidden phase --public 2
219 $ hg --hidden phase --public 2
220 $ hg --config 'extensions.graphlog=' glog
220 $ hg --config 'extensions.graphlog=' glog
221 @ changeset: 5:5601fb93a350
221 @ changeset: 5:5601fb93a350
222 | tag: tip
222 | tag: tip
223 | parent: 1:7c3bad9141dc
223 | parent: 1:7c3bad9141dc
224 | user: test
224 | user: test
225 | date: Thu Jan 01 00:00:00 1970 +0000
225 | date: Thu Jan 01 00:00:00 1970 +0000
226 | summary: add new_3_c
226 | summary: add new_3_c
227 |
227 |
228 | o changeset: 2:245bde4270cd
228 | o changeset: 2:245bde4270cd
229 |/ user: test
229 |/ user: test
230 | date: Thu Jan 01 00:00:00 1970 +0000
230 | date: Thu Jan 01 00:00:00 1970 +0000
231 | summary: add original_c
231 | summary: add original_c
232 |
232 |
233 o changeset: 1:7c3bad9141dc
233 o changeset: 1:7c3bad9141dc
234 | user: test
234 | user: test
235 | date: Thu Jan 01 00:00:00 1970 +0000
235 | date: Thu Jan 01 00:00:00 1970 +0000
236 | summary: add b
236 | summary: add b
237 |
237 |
238 o changeset: 0:1f0dee641bb7
238 o changeset: 0:1f0dee641bb7
239 user: test
239 user: test
240 date: Thu Jan 01 00:00:00 1970 +0000
240 date: Thu Jan 01 00:00:00 1970 +0000
241 summary: add a
241 summary: add a
242
242
243
243
244 And that bumped changeset are detected
244 And that bumped changeset are detected
245 --------------------------------------
245 --------------------------------------
246
246
247 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
247 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
248 note that the bumped changeset (5:5601fb93a350) is not a direct successor of
248 note that the bumped changeset (5:5601fb93a350) is not a direct successor of
249 the public changeset
249 the public changeset
250
250
251 $ hg log --hidden -r 'bumped()'
251 $ hg log --hidden -r 'bumped()'
252 changeset: 5:5601fb93a350
252 changeset: 5:5601fb93a350
253 tag: tip
253 tag: tip
254 parent: 1:7c3bad9141dc
254 parent: 1:7c3bad9141dc
255 user: test
255 user: test
256 date: Thu Jan 01 00:00:00 1970 +0000
256 date: Thu Jan 01 00:00:00 1970 +0000
257 summary: add new_3_c
257 summary: add new_3_c
258
258
259
259
260 And that we can't push bumped changeset
260 And that we can't push bumped changeset
261
261
262 $ hg push ../tmpa -r 0 --force #(make repo related)
262 $ hg push ../tmpa -r 0 --force #(make repo related)
263 pushing to ../tmpa
263 pushing to ../tmpa
264 searching for changes
264 searching for changes
265 warning: repository is unrelated
265 warning: repository is unrelated
266 adding changesets
266 adding changesets
267 adding manifests
267 adding manifests
268 adding file changes
268 adding file changes
269 added 1 changesets with 1 changes to 1 files (+1 heads)
269 added 1 changesets with 1 changes to 1 files (+1 heads)
270 $ hg push ../tmpa
270 $ hg push ../tmpa
271 pushing to ../tmpa
271 pushing to ../tmpa
272 searching for changes
272 searching for changes
273 abort: push includes bumped changeset: 5601fb93a350!
273 abort: push includes bumped changeset: 5601fb93a350!
274 [255]
274 [255]
275
275
276 Fixing "bumped" situation
276 Fixing "bumped" situation
277 We need to create a clone of 5 and add a special marker with a flag
277 We need to create a clone of 5 and add a special marker with a flag
278
278
279 $ hg up '5^'
279 $ hg up '5^'
280 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
280 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
281 $ hg revert -ar 5
281 $ hg revert -ar 5
282 adding new_3_c
282 adding new_3_c
283 $ hg ci -m 'add n3w_3_c'
283 $ hg ci -m 'add n3w_3_c'
284 created new head
284 created new head
285 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
285 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
286 $ hg log -r 'bumped()'
286 $ hg log -r 'bumped()'
287 $ hg log -G
287 $ hg log -G
288 @ changeset: 6:6f9641995072
288 @ changeset: 6:6f9641995072
289 | tag: tip
289 | tag: tip
290 | parent: 1:7c3bad9141dc
290 | parent: 1:7c3bad9141dc
291 | user: test
291 | user: test
292 | date: Thu Jan 01 00:00:00 1970 +0000
292 | date: Thu Jan 01 00:00:00 1970 +0000
293 | summary: add n3w_3_c
293 | summary: add n3w_3_c
294 |
294 |
295 | o changeset: 2:245bde4270cd
295 | o changeset: 2:245bde4270cd
296 |/ user: test
296 |/ user: test
297 | date: Thu Jan 01 00:00:00 1970 +0000
297 | date: Thu Jan 01 00:00:00 1970 +0000
298 | summary: add original_c
298 | summary: add original_c
299 |
299 |
300 o changeset: 1:7c3bad9141dc
300 o changeset: 1:7c3bad9141dc
301 | user: test
301 | user: test
302 | date: Thu Jan 01 00:00:00 1970 +0000
302 | date: Thu Jan 01 00:00:00 1970 +0000
303 | summary: add b
303 | summary: add b
304 |
304 |
305 o changeset: 0:1f0dee641bb7
305 o changeset: 0:1f0dee641bb7
306 user: test
306 user: test
307 date: Thu Jan 01 00:00:00 1970 +0000
307 date: Thu Jan 01 00:00:00 1970 +0000
308 summary: add a
308 summary: add a
309
309
310
310
311
311
312
312
313 $ cd ..
313 $ cd ..
314
314
315 Exchange Test
315 Exchange Test
316 ============================
316 ============================
317
317
318 Destination repo does not have any data
318 Destination repo does not have any data
319 ---------------------------------------
319 ---------------------------------------
320
320
321 Try to pull markers
321 Try to pull markers
322 (extinct changeset are excluded but marker are pushed)
322 (extinct changeset are excluded but marker are pushed)
323
323
324 $ hg init tmpc
324 $ hg init tmpc
325 $ cd tmpc
325 $ cd tmpc
326 $ hg pull ../tmpb
326 $ hg pull ../tmpb
327 pulling from ../tmpb
327 pulling from ../tmpb
328 requesting all changes
328 requesting all changes
329 adding changesets
329 adding changesets
330 adding manifests
330 adding manifests
331 adding file changes
331 adding file changes
332 added 4 changesets with 4 changes to 4 files (+1 heads)
332 added 4 changesets with 4 changes to 4 files (+1 heads)
333 (run 'hg heads' to see heads, 'hg merge' to merge)
333 (run 'hg heads' to see heads, 'hg merge' to merge)
334 $ hg debugobsolete
334 $ hg debugobsolete
335 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
335 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
336 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
336 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
337 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
337 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
338 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
338 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
339 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
339 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
340
340
341 Rollback//Transaction support
341 Rollback//Transaction support
342
342
343 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
343 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
344 $ hg debugobsolete
344 $ hg debugobsolete
345 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
345 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
346 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
346 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
347 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
347 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
348 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
348 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
349 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
349 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
350 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '1340 0', 'user': 'test'}
350 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '1340 0', 'user': 'test'}
351 $ hg rollback -n
351 $ hg rollback -n
352 repository tip rolled back to revision 3 (undo debugobsolete)
352 repository tip rolled back to revision 3 (undo debugobsolete)
353 $ hg rollback
353 $ hg rollback
354 repository tip rolled back to revision 3 (undo debugobsolete)
354 repository tip rolled back to revision 3 (undo debugobsolete)
355 $ hg debugobsolete
355 $ hg debugobsolete
356 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
356 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
357 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
357 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
358 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
358 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
359 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
359 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
360 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
360 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
361
361
362 $ cd ..
362 $ cd ..
363
363
364 Try to pull markers
364 Try to push markers
365
365
366 $ hg init tmpd
366 $ hg init tmpd
367 $ hg -R tmpb push tmpd
367 $ hg -R tmpb push tmpd
368 pushing to tmpd
368 pushing to tmpd
369 searching for changes
369 searching for changes
370 adding changesets
370 adding changesets
371 adding manifests
371 adding manifests
372 adding file changes
372 adding file changes
373 added 4 changesets with 4 changes to 4 files (+1 heads)
373 added 4 changesets with 4 changes to 4 files (+1 heads)
374 $ hg -R tmpd debugobsolete
374 $ hg -R tmpd debugobsolete
375 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
375 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
376 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
376 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
377 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
377 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
378 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
378 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
379 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
379 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
380
380
381 Check obsolete keys are exchanged only if source has an obsolete store
381 Check obsolete keys are exchanged only if source has an obsolete store
382
382
383 $ hg init empty
383 $ hg init empty
384 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
384 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
385 pushing to tmpd
385 pushing to tmpd
386 no changes found
386 no changes found
387 listkeys phases
387 listkeys phases
388 listkeys bookmarks
388 listkeys bookmarks
389 [1]
389 [1]
390
390
391 clone support
391 clone support
392 (markers are copied and extinct changesets are included to allow hardlinks)
392 (markers are copied and extinct changesets are included to allow hardlinks)
393
393
394 $ hg clone tmpb clone-dest
394 $ hg clone tmpb clone-dest
395 updating to branch default
395 updating to branch default
396 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
396 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
397 $ hg -R clone-dest log -G --hidden
397 $ hg -R clone-dest log -G --hidden
398 @ changeset: 6:6f9641995072
398 @ changeset: 6:6f9641995072
399 | tag: tip
399 | tag: tip
400 | parent: 1:7c3bad9141dc
400 | parent: 1:7c3bad9141dc
401 | user: test
401 | user: test
402 | date: Thu Jan 01 00:00:00 1970 +0000
402 | date: Thu Jan 01 00:00:00 1970 +0000
403 | summary: add n3w_3_c
403 | summary: add n3w_3_c
404 |
404 |
405 | x changeset: 5:5601fb93a350
405 | x changeset: 5:5601fb93a350
406 |/ parent: 1:7c3bad9141dc
406 |/ parent: 1:7c3bad9141dc
407 | user: test
407 | user: test
408 | date: Thu Jan 01 00:00:00 1970 +0000
408 | date: Thu Jan 01 00:00:00 1970 +0000
409 | summary: add new_3_c
409 | summary: add new_3_c
410 |
410 |
411 | x changeset: 4:ca819180edb9
411 | x changeset: 4:ca819180edb9
412 |/ parent: 1:7c3bad9141dc
412 |/ parent: 1:7c3bad9141dc
413 | user: test
413 | user: test
414 | date: Thu Jan 01 00:00:00 1970 +0000
414 | date: Thu Jan 01 00:00:00 1970 +0000
415 | summary: add new_2_c
415 | summary: add new_2_c
416 |
416 |
417 | x changeset: 3:cdbce2fbb163
417 | x changeset: 3:cdbce2fbb163
418 |/ parent: 1:7c3bad9141dc
418 |/ parent: 1:7c3bad9141dc
419 | user: test
419 | user: test
420 | date: Thu Jan 01 00:00:00 1970 +0000
420 | date: Thu Jan 01 00:00:00 1970 +0000
421 | summary: add new_c
421 | summary: add new_c
422 |
422 |
423 | o changeset: 2:245bde4270cd
423 | o changeset: 2:245bde4270cd
424 |/ user: test
424 |/ user: test
425 | date: Thu Jan 01 00:00:00 1970 +0000
425 | date: Thu Jan 01 00:00:00 1970 +0000
426 | summary: add original_c
426 | summary: add original_c
427 |
427 |
428 o changeset: 1:7c3bad9141dc
428 o changeset: 1:7c3bad9141dc
429 | user: test
429 | user: test
430 | date: Thu Jan 01 00:00:00 1970 +0000
430 | date: Thu Jan 01 00:00:00 1970 +0000
431 | summary: add b
431 | summary: add b
432 |
432 |
433 o changeset: 0:1f0dee641bb7
433 o changeset: 0:1f0dee641bb7
434 user: test
434 user: test
435 date: Thu Jan 01 00:00:00 1970 +0000
435 date: Thu Jan 01 00:00:00 1970 +0000
436 summary: add a
436 summary: add a
437
437
438 $ hg -R clone-dest debugobsolete
438 $ hg -R clone-dest debugobsolete
439 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
439 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
440 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
440 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
441 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
441 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
442 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
442 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
443 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
443 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
444
444
445
445
446 Destination repo have existing data
446 Destination repo have existing data
447 ---------------------------------------
447 ---------------------------------------
448
448
449 On pull
449 On pull
450
450
451 $ hg init tmpe
451 $ hg init tmpe
452 $ cd tmpe
452 $ cd tmpe
453 $ hg debugobsolete -d '1339 0' 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339
453 $ hg debugobsolete -d '1339 0' 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339
454 $ hg pull ../tmpb
454 $ hg pull ../tmpb
455 pulling from ../tmpb
455 pulling from ../tmpb
456 requesting all changes
456 requesting all changes
457 adding changesets
457 adding changesets
458 adding manifests
458 adding manifests
459 adding file changes
459 adding file changes
460 added 4 changesets with 4 changes to 4 files (+1 heads)
460 added 4 changesets with 4 changes to 4 files (+1 heads)
461 (run 'hg heads' to see heads, 'hg merge' to merge)
461 (run 'hg heads' to see heads, 'hg merge' to merge)
462 $ hg debugobsolete
462 $ hg debugobsolete
463 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
463 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
464 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
464 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
465 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
465 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
466 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
466 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
467 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
467 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
468 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
468 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
469
469
470
470
471 On push
471 On push
472
472
473 $ hg push ../tmpc
473 $ hg push ../tmpc
474 pushing to ../tmpc
474 pushing to ../tmpc
475 searching for changes
475 searching for changes
476 no changes found
476 no changes found
477 [1]
477 [1]
478 $ hg -R ../tmpc debugobsolete
478 $ hg -R ../tmpc debugobsolete
479 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
479 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'}
480 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
480 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
481 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
481 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
482 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
482 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
483 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
483 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'}
484 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
484 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'}
485
485
486 detect outgoing obsolete and unstable
486 detect outgoing obsolete and unstable
487 ---------------------------------------
487 ---------------------------------------
488
488
489
489
490 $ hg glog
490 $ hg glog
491 o changeset: 3:6f9641995072
491 o changeset: 3:6f9641995072
492 | tag: tip
492 | tag: tip
493 | parent: 1:7c3bad9141dc
493 | parent: 1:7c3bad9141dc
494 | user: test
494 | user: test
495 | date: Thu Jan 01 00:00:00 1970 +0000
495 | date: Thu Jan 01 00:00:00 1970 +0000
496 | summary: add n3w_3_c
496 | summary: add n3w_3_c
497 |
497 |
498 | o changeset: 2:245bde4270cd
498 | o changeset: 2:245bde4270cd
499 |/ user: test
499 |/ user: test
500 | date: Thu Jan 01 00:00:00 1970 +0000
500 | date: Thu Jan 01 00:00:00 1970 +0000
501 | summary: add original_c
501 | summary: add original_c
502 |
502 |
503 o changeset: 1:7c3bad9141dc
503 o changeset: 1:7c3bad9141dc
504 | user: test
504 | user: test
505 | date: Thu Jan 01 00:00:00 1970 +0000
505 | date: Thu Jan 01 00:00:00 1970 +0000
506 | summary: add b
506 | summary: add b
507 |
507 |
508 o changeset: 0:1f0dee641bb7
508 o changeset: 0:1f0dee641bb7
509 user: test
509 user: test
510 date: Thu Jan 01 00:00:00 1970 +0000
510 date: Thu Jan 01 00:00:00 1970 +0000
511 summary: add a
511 summary: add a
512
512
513 $ hg up 'desc("n3w_3_c")'
513 $ hg up 'desc("n3w_3_c")'
514 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
514 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
515 $ mkcommit original_d
515 $ mkcommit original_d
516 $ mkcommit original_e
516 $ mkcommit original_e
517 $ hg debugobsolete `getid original_d` -d '0 0'
517 $ hg debugobsolete `getid original_d` -d '0 0'
518 $ hg log -r 'obsolete()'
518 $ hg log -r 'obsolete()'
519 changeset: 4:94b33453f93b
519 changeset: 4:94b33453f93b
520 user: test
520 user: test
521 date: Thu Jan 01 00:00:00 1970 +0000
521 date: Thu Jan 01 00:00:00 1970 +0000
522 summary: add original_d
522 summary: add original_d
523
523
524 $ hg glog -r '::unstable()'
524 $ hg glog -r '::unstable()'
525 @ changeset: 5:cda648ca50f5
525 @ changeset: 5:cda648ca50f5
526 | tag: tip
526 | tag: tip
527 | user: test
527 | user: test
528 | date: Thu Jan 01 00:00:00 1970 +0000
528 | date: Thu Jan 01 00:00:00 1970 +0000
529 | summary: add original_e
529 | summary: add original_e
530 |
530 |
531 x changeset: 4:94b33453f93b
531 x changeset: 4:94b33453f93b
532 | user: test
532 | user: test
533 | date: Thu Jan 01 00:00:00 1970 +0000
533 | date: Thu Jan 01 00:00:00 1970 +0000
534 | summary: add original_d
534 | summary: add original_d
535 |
535 |
536 o changeset: 3:6f9641995072
536 o changeset: 3:6f9641995072
537 | parent: 1:7c3bad9141dc
537 | parent: 1:7c3bad9141dc
538 | user: test
538 | user: test
539 | date: Thu Jan 01 00:00:00 1970 +0000
539 | date: Thu Jan 01 00:00:00 1970 +0000
540 | summary: add n3w_3_c
540 | summary: add n3w_3_c
541 |
541 |
542 o changeset: 1:7c3bad9141dc
542 o changeset: 1:7c3bad9141dc
543 | user: test
543 | user: test
544 | date: Thu Jan 01 00:00:00 1970 +0000
544 | date: Thu Jan 01 00:00:00 1970 +0000
545 | summary: add b
545 | summary: add b
546 |
546 |
547 o changeset: 0:1f0dee641bb7
547 o changeset: 0:1f0dee641bb7
548 user: test
548 user: test
549 date: Thu Jan 01 00:00:00 1970 +0000
549 date: Thu Jan 01 00:00:00 1970 +0000
550 summary: add a
550 summary: add a
551
551
552
552
553 refuse to push obsolete changeset
553 refuse to push obsolete changeset
554
554
555 $ hg push ../tmpc/ -r 'desc("original_d")'
555 $ hg push ../tmpc/ -r 'desc("original_d")'
556 pushing to ../tmpc/
556 pushing to ../tmpc/
557 searching for changes
557 searching for changes
558 abort: push includes obsolete changeset: 94b33453f93b!
558 abort: push includes obsolete changeset: 94b33453f93b!
559 [255]
559 [255]
560
560
561 refuse to push unstable changeset
561 refuse to push unstable changeset
562
562
563 $ hg push ../tmpc/
563 $ hg push ../tmpc/
564 pushing to ../tmpc/
564 pushing to ../tmpc/
565 searching for changes
565 searching for changes
566 abort: push includes unstable changeset: cda648ca50f5!
566 abort: push includes unstable changeset: cda648ca50f5!
567 [255]
567 [255]
568
568
569 Test that extinct changeset are properly detected
569 Test that extinct changeset are properly detected
570
570
571 $ hg log -r 'extinct()'
571 $ hg log -r 'extinct()'
572
572
573 Don't try to push extinct changeset
573 Don't try to push extinct changeset
574
574
575 $ hg init ../tmpf
575 $ hg init ../tmpf
576 $ hg out ../tmpf
576 $ hg out ../tmpf
577 comparing with ../tmpf
577 comparing with ../tmpf
578 searching for changes
578 searching for changes
579 changeset: 0:1f0dee641bb7
579 changeset: 0:1f0dee641bb7
580 user: test
580 user: test
581 date: Thu Jan 01 00:00:00 1970 +0000
581 date: Thu Jan 01 00:00:00 1970 +0000
582 summary: add a
582 summary: add a
583
583
584 changeset: 1:7c3bad9141dc
584 changeset: 1:7c3bad9141dc
585 user: test
585 user: test
586 date: Thu Jan 01 00:00:00 1970 +0000
586 date: Thu Jan 01 00:00:00 1970 +0000
587 summary: add b
587 summary: add b
588
588
589 changeset: 2:245bde4270cd
589 changeset: 2:245bde4270cd
590 user: test
590 user: test
591 date: Thu Jan 01 00:00:00 1970 +0000
591 date: Thu Jan 01 00:00:00 1970 +0000
592 summary: add original_c
592 summary: add original_c
593
593
594 changeset: 3:6f9641995072
594 changeset: 3:6f9641995072
595 parent: 1:7c3bad9141dc
595 parent: 1:7c3bad9141dc
596 user: test
596 user: test
597 date: Thu Jan 01 00:00:00 1970 +0000
597 date: Thu Jan 01 00:00:00 1970 +0000
598 summary: add n3w_3_c
598 summary: add n3w_3_c
599
599
600 changeset: 4:94b33453f93b
600 changeset: 4:94b33453f93b
601 user: test
601 user: test
602 date: Thu Jan 01 00:00:00 1970 +0000
602 date: Thu Jan 01 00:00:00 1970 +0000
603 summary: add original_d
603 summary: add original_d
604
604
605 changeset: 5:cda648ca50f5
605 changeset: 5:cda648ca50f5
606 tag: tip
606 tag: tip
607 user: test
607 user: test
608 date: Thu Jan 01 00:00:00 1970 +0000
608 date: Thu Jan 01 00:00:00 1970 +0000
609 summary: add original_e
609 summary: add original_e
610
610
611 $ hg push ../tmpf -f # -f because be push unstable too
611 $ hg push ../tmpf -f # -f because be push unstable too
612 pushing to ../tmpf
612 pushing to ../tmpf
613 searching for changes
613 searching for changes
614 adding changesets
614 adding changesets
615 adding manifests
615 adding manifests
616 adding file changes
616 adding file changes
617 added 6 changesets with 6 changes to 6 files (+1 heads)
617 added 6 changesets with 6 changes to 6 files (+1 heads)
618
618
619 no warning displayed
619 no warning displayed
620
620
621 $ hg push ../tmpf
621 $ hg push ../tmpf
622 pushing to ../tmpf
622 pushing to ../tmpf
623 searching for changes
623 searching for changes
624 no changes found
624 no changes found
625 [1]
625 [1]
626
626
627 Do not warn about new head when the new head is a successors of a remote one
627 Do not warn about new head when the new head is a successors of a remote one
628
628
629 $ hg glog
629 $ hg glog
630 @ changeset: 5:cda648ca50f5
630 @ changeset: 5:cda648ca50f5
631 | tag: tip
631 | tag: tip
632 | user: test
632 | user: test
633 | date: Thu Jan 01 00:00:00 1970 +0000
633 | date: Thu Jan 01 00:00:00 1970 +0000
634 | summary: add original_e
634 | summary: add original_e
635 |
635 |
636 x changeset: 4:94b33453f93b
636 x changeset: 4:94b33453f93b
637 | user: test
637 | user: test
638 | date: Thu Jan 01 00:00:00 1970 +0000
638 | date: Thu Jan 01 00:00:00 1970 +0000
639 | summary: add original_d
639 | summary: add original_d
640 |
640 |
641 o changeset: 3:6f9641995072
641 o changeset: 3:6f9641995072
642 | parent: 1:7c3bad9141dc
642 | parent: 1:7c3bad9141dc
643 | user: test
643 | user: test
644 | date: Thu Jan 01 00:00:00 1970 +0000
644 | date: Thu Jan 01 00:00:00 1970 +0000
645 | summary: add n3w_3_c
645 | summary: add n3w_3_c
646 |
646 |
647 | o changeset: 2:245bde4270cd
647 | o changeset: 2:245bde4270cd
648 |/ user: test
648 |/ user: test
649 | date: Thu Jan 01 00:00:00 1970 +0000
649 | date: Thu Jan 01 00:00:00 1970 +0000
650 | summary: add original_c
650 | summary: add original_c
651 |
651 |
652 o changeset: 1:7c3bad9141dc
652 o changeset: 1:7c3bad9141dc
653 | user: test
653 | user: test
654 | date: Thu Jan 01 00:00:00 1970 +0000
654 | date: Thu Jan 01 00:00:00 1970 +0000
655 | summary: add b
655 | summary: add b
656 |
656 |
657 o changeset: 0:1f0dee641bb7
657 o changeset: 0:1f0dee641bb7
658 user: test
658 user: test
659 date: Thu Jan 01 00:00:00 1970 +0000
659 date: Thu Jan 01 00:00:00 1970 +0000
660 summary: add a
660 summary: add a
661
661
662 $ hg up -q 'desc(n3w_3_c)'
662 $ hg up -q 'desc(n3w_3_c)'
663 $ mkcommit obsolete_e
663 $ mkcommit obsolete_e
664 created new head
664 created new head
665 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
665 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
666 $ hg push ../tmpf
666 $ hg push ../tmpf
667 pushing to ../tmpf
667 pushing to ../tmpf
668 searching for changes
668 searching for changes
669 adding changesets
669 adding changesets
670 adding manifests
670 adding manifests
671 adding file changes
671 adding file changes
672 added 1 changesets with 1 changes to 1 files (+1 heads)
672 added 1 changesets with 1 changes to 1 files (+1 heads)
673
673
674 check hgweb does not explode
674 check hgweb does not explode
675 ====================================
675 ====================================
676
676
677 $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
677 $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
678 adding changesets
678 adding changesets
679 adding manifests
679 adding manifests
680 adding file changes
680 adding file changes
681 added 62 changesets with 63 changes to 9 files (+60 heads)
681 added 62 changesets with 63 changes to 9 files (+60 heads)
682 (run 'hg heads .' to see heads, 'hg merge' to merge)
682 (run 'hg heads .' to see heads, 'hg merge' to merge)
683 $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
683 $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
684 > do
684 > do
685 > hg debugobsolete $node
685 > hg debugobsolete $node
686 > done
686 > done
687 $ hg up tip
687 $ hg up tip
688 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
688 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
689
689
690 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
690 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
691 $ cat hg.pid >> $DAEMON_PIDS
691 $ cat hg.pid >> $DAEMON_PIDS
692
692
693 check changelog view
693 check changelog view
694
694
695 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'shortlog/'
695 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'shortlog/'
696 200 Script output follows
696 200 Script output follows
697
697
698 check graph view
698 check graph view
699
699
700 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'graph'
700 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'graph'
701 200 Script output follows
701 200 Script output follows
702
702
703 check filelog view
703 check filelog view
704
704
705 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'log/'`hg id --debug --id`/'babar'
705 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'log/'`hg id --debug --id`/'babar'
706 200 Script output follows
706 200 Script output follows
707 $ kill `cat hg.pid`
707 $ kill `cat hg.pid`
708
708
709 Checking _enable=False warning if obsolete marker exists
709 Checking _enable=False warning if obsolete marker exists
710
710
711 $ echo '[extensions]' >> $HGRCPATH
711 $ echo '[extensions]' >> $HGRCPATH
712 $ echo "obs=!" >> $HGRCPATH
712 $ echo "obs=!" >> $HGRCPATH
713 $ hg log -r tip
713 $ hg log -r tip
714 obsolete feature not enabled but 68 markers found!
714 obsolete feature not enabled but 68 markers found!
715 changeset: 68:c15e9edfca13
715 changeset: 68:c15e9edfca13
716 tag: tip
716 tag: tip
717 parent: 7:50c51b361e60
717 parent: 7:50c51b361e60
718 user: test
718 user: test
719 date: Thu Jan 01 00:00:00 1970 +0000
719 date: Thu Jan 01 00:00:00 1970 +0000
720 summary: add celestine
720 summary: add celestine
721
721
General Comments 0
You need to be logged in to leave comments. Login now