##// END OF EJS Templates
tests: show that hgweb contains hidden revisions in /filelog/ view...
Martin von Zweigbergk -
r37380:c16b55ed default
parent child Browse files
Show More
@@ -1,1602 +1,1665 b''
1 $ cat >> $HGRCPATH << EOF
1 $ cat >> $HGRCPATH << EOF
2 > [phases]
2 > [phases]
3 > # public changeset are not obsolete
3 > # public changeset are not obsolete
4 > publish=false
4 > publish=false
5 > [ui]
5 > [ui]
6 > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n"
6 > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n"
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 log -T "{node}\n" --hidden -r "desc('$1')"
14 > hg log -T "{node}\n" --hidden -r "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(b'listkeys %s\n' % (namespace,))
21 > ui.write(b'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: creating obsolete markers is not enabled on this repo
35 abort: creating obsolete markers is not enabled on this repo
36 [255]
36 [255]
37
37
38 Enabling it
38 Enabling it
39
39
40 $ cat >> $HGRCPATH << EOF
40 $ cat >> $HGRCPATH << EOF
41 > [experimental]
41 > [experimental]
42 > evolution=exchange
42 > evolution=exchange
43 > evolution.createmarkers=True
43 > evolution.createmarkers=True
44 > EOF
44 > EOF
45
45
46 Killing a single changeset without replacement
46 Killing a single changeset without replacement
47
47
48 $ hg debugobsolete 0
48 $ hg debugobsolete 0
49 abort: changeset references must be full hexadecimal node identifiers
49 abort: changeset references must be full hexadecimal node identifiers
50 [255]
50 [255]
51 $ hg debugobsolete '00'
51 $ hg debugobsolete '00'
52 abort: changeset references must be full hexadecimal node identifiers
52 abort: changeset references must be full hexadecimal node identifiers
53 [255]
53 [255]
54 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
54 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
55 obsoleted 1 changesets
55 obsoleted 1 changesets
56 $ hg debugobsolete
56 $ hg debugobsolete
57 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
57 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'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 -1:000000000000 (public) [tip ]
63 -1:000000000000 (public) [tip ]
64 $ hg up --hidden tip --quiet
64 $ hg up --hidden tip --quiet
65 updating to a hidden changeset 97b7c2d76b18
65 updating to a hidden changeset 97b7c2d76b18
66 (hidden revision '97b7c2d76b18' is pruned)
66 (hidden revision '97b7c2d76b18' is pruned)
67
67
68 Killing a single changeset with itself should fail
68 Killing a single changeset with itself should fail
69 (simple local safeguard)
69 (simple local safeguard)
70
70
71 $ hg debugobsolete `getid kill_me` `getid kill_me`
71 $ hg debugobsolete `getid kill_me` `getid kill_me`
72 abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
72 abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
73 [255]
73 [255]
74
74
75 $ cd ..
75 $ cd ..
76
76
77 Killing a single changeset with replacement
77 Killing a single changeset with replacement
78 (and testing the format option)
78 (and testing the format option)
79
79
80 $ hg init tmpb
80 $ hg init tmpb
81 $ cd tmpb
81 $ cd tmpb
82 $ mkcommit a
82 $ mkcommit a
83 $ mkcommit b
83 $ mkcommit b
84 $ mkcommit original_c
84 $ mkcommit original_c
85 $ hg up "desc('b')"
85 $ hg up "desc('b')"
86 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
86 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
87 $ mkcommit new_c
87 $ mkcommit new_c
88 created new head
88 created new head
89 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
89 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
90 $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120'
90 $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120'
91 obsoleted 1 changesets
91 obsoleted 1 changesets
92 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
92 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
93 2:245bde4270cd add original_c
93 2:245bde4270cd add original_c
94 $ hg debugrevlog -cd
94 $ hg debugrevlog -cd
95 # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen
95 # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen
96 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0
96 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0
97 1 0 -1 59 118 59 59 0 0 58 116 0 1 0
97 1 0 -1 59 118 59 59 0 0 58 116 0 1 0
98 2 1 -1 118 193 118 118 59 0 76 192 0 1 0
98 2 1 -1 118 193 118 118 59 0 76 192 0 1 0
99 3 1 -1 193 260 193 193 59 0 66 258 0 2 0
99 3 1 -1 193 260 193 193 59 0 66 258 0 2 0
100 $ hg debugobsolete
100 $ hg debugobsolete
101 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
101 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
102
102
103 (check for version number of the obsstore)
103 (check for version number of the obsstore)
104
104
105 $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null
105 $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null
106 \x00 (no-eol) (esc)
106 \x00 (no-eol) (esc)
107
107
108 do it again (it read the obsstore before adding new changeset)
108 do it again (it read the obsstore before adding new changeset)
109
109
110 $ hg up '.^'
110 $ hg up '.^'
111 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
111 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
112 $ mkcommit new_2_c
112 $ mkcommit new_2_c
113 created new head
113 created new head
114 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
114 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
115 obsoleted 1 changesets
115 obsoleted 1 changesets
116 $ hg debugobsolete
116 $ hg debugobsolete
117 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
117 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
118 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
118 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
119
119
120 Register two markers with a missing node
120 Register two markers with a missing node
121
121
122 $ hg up '.^'
122 $ hg up '.^'
123 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
123 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
124 $ mkcommit new_3_c
124 $ mkcommit new_3_c
125 created new head
125 created new head
126 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
126 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
127 obsoleted 1 changesets
127 obsoleted 1 changesets
128 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
128 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
129 $ hg debugobsolete
129 $ hg debugobsolete
130 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
130 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
131 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
131 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
132 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
132 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
133 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
133 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
134
134
135 Test the --index option of debugobsolete command
135 Test the --index option of debugobsolete command
136 $ hg debugobsolete --index
136 $ hg debugobsolete --index
137 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
137 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
138 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
138 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
139 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
139 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
140 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
140 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
141
141
142 Refuse pathological nullid successors
142 Refuse pathological nullid successors
143 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
143 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
144 transaction abort!
144 transaction abort!
145 rollback completed
145 rollback completed
146 abort: bad obsolescence marker detected: invalid successors nullid
146 abort: bad obsolescence marker detected: invalid successors nullid
147 [255]
147 [255]
148
148
149 Check that graphlog detect that a changeset is obsolete:
149 Check that graphlog detect that a changeset is obsolete:
150
150
151 $ hg log -G
151 $ hg log -G
152 @ 5:5601fb93a350 (draft) [tip ] add new_3_c
152 @ 5:5601fb93a350 (draft) [tip ] add new_3_c
153 |
153 |
154 o 1:7c3bad9141dc (draft) [ ] add b
154 o 1:7c3bad9141dc (draft) [ ] add b
155 |
155 |
156 o 0:1f0dee641bb7 (draft) [ ] add a
156 o 0:1f0dee641bb7 (draft) [ ] add a
157
157
158
158
159 check that heads does not report them
159 check that heads does not report them
160
160
161 $ hg heads
161 $ hg heads
162 5:5601fb93a350 (draft) [tip ] add new_3_c
162 5:5601fb93a350 (draft) [tip ] add new_3_c
163 $ hg heads --hidden
163 $ hg heads --hidden
164 5:5601fb93a350 (draft) [tip ] add new_3_c
164 5:5601fb93a350 (draft) [tip ] add new_3_c
165 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
165 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
166 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
166 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
167 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163]
167 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163]
168
168
169
169
170 check that summary does not report them
170 check that summary does not report them
171
171
172 $ hg init ../sink
172 $ hg init ../sink
173 $ echo '[paths]' >> .hg/hgrc
173 $ echo '[paths]' >> .hg/hgrc
174 $ echo 'default=../sink' >> .hg/hgrc
174 $ echo 'default=../sink' >> .hg/hgrc
175 $ hg summary --remote
175 $ hg summary --remote
176 parent: 5:5601fb93a350 tip
176 parent: 5:5601fb93a350 tip
177 add new_3_c
177 add new_3_c
178 branch: default
178 branch: default
179 commit: (clean)
179 commit: (clean)
180 update: (current)
180 update: (current)
181 phases: 3 draft
181 phases: 3 draft
182 remote: 3 outgoing
182 remote: 3 outgoing
183
183
184 $ hg summary --remote --hidden
184 $ hg summary --remote --hidden
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: 3 new changesets, 4 branch heads (merge)
189 update: 3 new changesets, 4 branch heads (merge)
190 phases: 6 draft
190 phases: 6 draft
191 remote: 3 outgoing
191 remote: 3 outgoing
192
192
193 check that various commands work well with filtering
193 check that various commands work well with filtering
194
194
195 $ hg tip
195 $ hg tip
196 5:5601fb93a350 (draft) [tip ] add new_3_c
196 5:5601fb93a350 (draft) [tip ] add new_3_c
197 $ hg log -r 6
197 $ hg log -r 6
198 abort: unknown revision '6'!
198 abort: unknown revision '6'!
199 [255]
199 [255]
200 $ hg log -r 4
200 $ hg log -r 4
201 abort: hidden revision '4' was rewritten as: 5601fb93a350!
201 abort: hidden revision '4' was rewritten as: 5601fb93a350!
202 (use --hidden to access hidden revisions)
202 (use --hidden to access hidden revisions)
203 [255]
203 [255]
204 $ hg debugrevspec 'rev(6)'
204 $ hg debugrevspec 'rev(6)'
205 $ hg debugrevspec 'rev(4)'
205 $ hg debugrevspec 'rev(4)'
206 $ hg debugrevspec 'null'
206 $ hg debugrevspec 'null'
207 -1
207 -1
208
208
209 Check that public changeset are not accounted as obsolete:
209 Check that public changeset are not accounted as obsolete:
210
210
211 $ hg --hidden phase --public 2
211 $ hg --hidden phase --public 2
212 1 new phase-divergent changesets
212 1 new phase-divergent changesets
213 $ hg log -G
213 $ hg log -G
214 @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
214 @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
215 |
215 |
216 | o 2:245bde4270cd (public) [ ] add original_c
216 | o 2:245bde4270cd (public) [ ] add original_c
217 |/
217 |/
218 o 1:7c3bad9141dc (public) [ ] add b
218 o 1:7c3bad9141dc (public) [ ] add b
219 |
219 |
220 o 0:1f0dee641bb7 (public) [ ] add a
220 o 0:1f0dee641bb7 (public) [ ] add a
221
221
222
222
223 And that bumped changeset are detected
223 And that bumped changeset are detected
224 --------------------------------------
224 --------------------------------------
225
225
226 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
226 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
227 note that the bumped changeset (5:5601fb93a350) is not a direct successor of
227 note that the bumped changeset (5:5601fb93a350) is not a direct successor of
228 the public changeset
228 the public changeset
229
229
230 $ hg log --hidden -r 'phasedivergent()'
230 $ hg log --hidden -r 'phasedivergent()'
231 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
231 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
232
232
233 And that we can't push bumped changeset
233 And that we can't push bumped changeset
234
234
235 $ hg push ../tmpa -r 0 --force #(make repo related)
235 $ hg push ../tmpa -r 0 --force #(make repo related)
236 pushing to ../tmpa
236 pushing to ../tmpa
237 searching for changes
237 searching for changes
238 warning: repository is unrelated
238 warning: repository is unrelated
239 adding changesets
239 adding changesets
240 adding manifests
240 adding manifests
241 adding file changes
241 adding file changes
242 added 1 changesets with 1 changes to 1 files (+1 heads)
242 added 1 changesets with 1 changes to 1 files (+1 heads)
243 $ hg push ../tmpa
243 $ hg push ../tmpa
244 pushing to ../tmpa
244 pushing to ../tmpa
245 searching for changes
245 searching for changes
246 abort: push includes phase-divergent changeset: 5601fb93a350!
246 abort: push includes phase-divergent changeset: 5601fb93a350!
247 [255]
247 [255]
248
248
249 Fixing "bumped" situation
249 Fixing "bumped" situation
250 We need to create a clone of 5 and add a special marker with a flag
250 We need to create a clone of 5 and add a special marker with a flag
251
251
252 $ hg summary
252 $ hg summary
253 parent: 5:5601fb93a350 tip (phase-divergent)
253 parent: 5:5601fb93a350 tip (phase-divergent)
254 add new_3_c
254 add new_3_c
255 branch: default
255 branch: default
256 commit: (clean)
256 commit: (clean)
257 update: 1 new changesets, 2 branch heads (merge)
257 update: 1 new changesets, 2 branch heads (merge)
258 phases: 1 draft
258 phases: 1 draft
259 phase-divergent: 1 changesets
259 phase-divergent: 1 changesets
260 $ hg up '5^'
260 $ hg up '5^'
261 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
261 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
262 $ hg revert -ar 5
262 $ hg revert -ar 5
263 adding new_3_c
263 adding new_3_c
264 $ hg ci -m 'add n3w_3_c'
264 $ hg ci -m 'add n3w_3_c'
265 created new head
265 created new head
266 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
266 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
267 obsoleted 1 changesets
267 obsoleted 1 changesets
268 $ hg log -r 'phasedivergent()'
268 $ hg log -r 'phasedivergent()'
269 $ hg log -G
269 $ hg log -G
270 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
270 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
271 |
271 |
272 | o 2:245bde4270cd (public) [ ] add original_c
272 | o 2:245bde4270cd (public) [ ] add original_c
273 |/
273 |/
274 o 1:7c3bad9141dc (public) [ ] add b
274 o 1:7c3bad9141dc (public) [ ] add b
275 |
275 |
276 o 0:1f0dee641bb7 (public) [ ] add a
276 o 0:1f0dee641bb7 (public) [ ] add a
277
277
278
278
279 Basic exclusive testing
279 Basic exclusive testing
280
280
281 $ hg log -G --hidden
281 $ hg log -G --hidden
282 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
282 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
283 |
283 |
284 | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
284 | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
285 |/
285 |/
286 | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
286 | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
287 |/
287 |/
288 | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
288 | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
289 |/
289 |/
290 | o 2:245bde4270cd (public) [ ] add original_c
290 | o 2:245bde4270cd (public) [ ] add original_c
291 |/
291 |/
292 o 1:7c3bad9141dc (public) [ ] add b
292 o 1:7c3bad9141dc (public) [ ] add b
293 |
293 |
294 o 0:1f0dee641bb7 (public) [ ] add a
294 o 0:1f0dee641bb7 (public) [ ] add a
295
295
296 $ hg debugobsolete --rev 6f9641995072
296 $ hg debugobsolete --rev 6f9641995072
297 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
297 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
298 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
298 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
299 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
299 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
300 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
300 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
301 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
301 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
302 $ hg debugobsolete --rev 6f9641995072 --exclusive
302 $ hg debugobsolete --rev 6f9641995072 --exclusive
303 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
303 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
304 $ hg debugobsolete --rev 5601fb93a350 --hidden
304 $ hg debugobsolete --rev 5601fb93a350 --hidden
305 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
305 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
306 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
306 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
307 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
307 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
308 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
308 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
309 $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive
309 $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive
310 $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive
310 $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive
311 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
311 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
312 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
312 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
313 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
313 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
314
314
315 $ cd ..
315 $ cd ..
316
316
317 Revision 0 is hidden
317 Revision 0 is hidden
318 --------------------
318 --------------------
319
319
320 $ hg init rev0hidden
320 $ hg init rev0hidden
321 $ cd rev0hidden
321 $ cd rev0hidden
322
322
323 $ mkcommit kill0
323 $ mkcommit kill0
324 $ hg up -q null
324 $ hg up -q null
325 $ hg debugobsolete `getid kill0`
325 $ hg debugobsolete `getid kill0`
326 obsoleted 1 changesets
326 obsoleted 1 changesets
327 $ mkcommit a
327 $ mkcommit a
328 $ mkcommit b
328 $ mkcommit b
329
329
330 Should pick the first visible revision as "repo" node
330 Should pick the first visible revision as "repo" node
331
331
332 $ hg archive ../archive-null
332 $ hg archive ../archive-null
333 $ cat ../archive-null/.hg_archival.txt
333 $ cat ../archive-null/.hg_archival.txt
334 repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e
334 repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e
335 node: 7c3bad9141dcb46ff89abf5f61856facd56e476c
335 node: 7c3bad9141dcb46ff89abf5f61856facd56e476c
336 branch: default
336 branch: default
337 latesttag: null
337 latesttag: null
338 latesttagdistance: 2
338 latesttagdistance: 2
339 changessincelatesttag: 2
339 changessincelatesttag: 2
340
340
341
341
342 $ cd ..
342 $ cd ..
343
343
344 Can disable transaction summary report
344 Can disable transaction summary report
345
345
346 $ hg init transaction-summary
346 $ hg init transaction-summary
347 $ cd transaction-summary
347 $ cd transaction-summary
348 $ mkcommit a
348 $ mkcommit a
349 $ mkcommit b
349 $ mkcommit b
350 $ hg up -q null
350 $ hg up -q null
351 $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a`
351 $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a`
352 obsoleted 1 changesets
352 obsoleted 1 changesets
353 $ cd ..
353 $ cd ..
354
354
355 Exchange Test
355 Exchange Test
356 ============================
356 ============================
357
357
358 Destination repo does not have any data
358 Destination repo does not have any data
359 ---------------------------------------
359 ---------------------------------------
360
360
361 Simple incoming test
361 Simple incoming test
362
362
363 $ hg init tmpc
363 $ hg init tmpc
364 $ cd tmpc
364 $ cd tmpc
365 $ hg incoming ../tmpb
365 $ hg incoming ../tmpb
366 comparing with ../tmpb
366 comparing with ../tmpb
367 0:1f0dee641bb7 (public) [ ] add a
367 0:1f0dee641bb7 (public) [ ] add a
368 1:7c3bad9141dc (public) [ ] add b
368 1:7c3bad9141dc (public) [ ] add b
369 2:245bde4270cd (public) [ ] add original_c
369 2:245bde4270cd (public) [ ] add original_c
370 6:6f9641995072 (draft) [tip ] add n3w_3_c
370 6:6f9641995072 (draft) [tip ] add n3w_3_c
371
371
372 Try to pull markers
372 Try to pull markers
373 (extinct changeset are excluded but marker are pushed)
373 (extinct changeset are excluded but marker are pushed)
374
374
375 $ hg pull ../tmpb
375 $ hg pull ../tmpb
376 pulling from ../tmpb
376 pulling from ../tmpb
377 requesting all changes
377 requesting all changes
378 adding changesets
378 adding changesets
379 adding manifests
379 adding manifests
380 adding file changes
380 adding file changes
381 added 4 changesets with 4 changes to 4 files (+1 heads)
381 added 4 changesets with 4 changes to 4 files (+1 heads)
382 5 new obsolescence markers
382 5 new obsolescence markers
383 new changesets 1f0dee641bb7:6f9641995072
383 new changesets 1f0dee641bb7:6f9641995072
384 (run 'hg heads' to see heads, 'hg merge' to merge)
384 (run 'hg heads' to see heads, 'hg merge' to merge)
385 $ hg debugobsolete
385 $ hg debugobsolete
386 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
386 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
387 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
387 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
388 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
388 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
389 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
389 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
390 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
390 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
391
391
392 Rollback//Transaction support
392 Rollback//Transaction support
393
393
394 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
394 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
395 $ hg debugobsolete
395 $ hg debugobsolete
396 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
396 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
397 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
397 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
398 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
398 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
399 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
399 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
400 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
400 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
401 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'}
401 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'}
402 $ hg rollback -n
402 $ hg rollback -n
403 repository tip rolled back to revision 3 (undo debugobsolete)
403 repository tip rolled back to revision 3 (undo debugobsolete)
404 $ hg rollback
404 $ hg rollback
405 repository tip rolled back to revision 3 (undo debugobsolete)
405 repository tip rolled back to revision 3 (undo debugobsolete)
406 $ hg debugobsolete
406 $ hg debugobsolete
407 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
407 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
408 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
408 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
409 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
409 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
410 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
410 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
411 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
411 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
412
412
413 $ cd ..
413 $ cd ..
414
414
415 Try to push markers
415 Try to push markers
416
416
417 $ hg init tmpd
417 $ hg init tmpd
418 $ hg -R tmpb push tmpd
418 $ hg -R tmpb push tmpd
419 pushing to tmpd
419 pushing to tmpd
420 searching for changes
420 searching for changes
421 adding changesets
421 adding changesets
422 adding manifests
422 adding manifests
423 adding file changes
423 adding file changes
424 added 4 changesets with 4 changes to 4 files (+1 heads)
424 added 4 changesets with 4 changes to 4 files (+1 heads)
425 5 new obsolescence markers
425 5 new obsolescence markers
426 $ hg -R tmpd debugobsolete | sort
426 $ hg -R tmpd debugobsolete | sort
427 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
427 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
428 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
428 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
429 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
429 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
430 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
430 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
431 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
431 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
432
432
433 Check obsolete keys are exchanged only if source has an obsolete store
433 Check obsolete keys are exchanged only if source has an obsolete store
434
434
435 $ hg init empty
435 $ hg init empty
436 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
436 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
437 pushing to tmpd
437 pushing to tmpd
438 listkeys phases
438 listkeys phases
439 listkeys bookmarks
439 listkeys bookmarks
440 no changes found
440 no changes found
441 listkeys phases
441 listkeys phases
442 [1]
442 [1]
443
443
444 clone support
444 clone support
445 (markers are copied and extinct changesets are included to allow hardlinks)
445 (markers are copied and extinct changesets are included to allow hardlinks)
446
446
447 $ hg clone tmpb clone-dest
447 $ hg clone tmpb clone-dest
448 updating to branch default
448 updating to branch default
449 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
449 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
450 $ hg -R clone-dest log -G --hidden
450 $ hg -R clone-dest log -G --hidden
451 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
451 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
452 |
452 |
453 | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
453 | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
454 |/
454 |/
455 | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
455 | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
456 |/
456 |/
457 | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
457 | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
458 |/
458 |/
459 | o 2:245bde4270cd (public) [ ] add original_c
459 | o 2:245bde4270cd (public) [ ] add original_c
460 |/
460 |/
461 o 1:7c3bad9141dc (public) [ ] add b
461 o 1:7c3bad9141dc (public) [ ] add b
462 |
462 |
463 o 0:1f0dee641bb7 (public) [ ] add a
463 o 0:1f0dee641bb7 (public) [ ] add a
464
464
465 $ hg -R clone-dest debugobsolete
465 $ hg -R clone-dest debugobsolete
466 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
466 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
467 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
467 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
468 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
468 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
469 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
469 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
470 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
470 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
471
471
472
472
473 Destination repo have existing data
473 Destination repo have existing data
474 ---------------------------------------
474 ---------------------------------------
475
475
476 On pull
476 On pull
477
477
478 $ hg init tmpe
478 $ hg init tmpe
479 $ cd tmpe
479 $ cd tmpe
480 $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00
480 $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00
481 $ hg pull ../tmpb
481 $ hg pull ../tmpb
482 pulling from ../tmpb
482 pulling from ../tmpb
483 requesting all changes
483 requesting all changes
484 adding changesets
484 adding changesets
485 adding manifests
485 adding manifests
486 adding file changes
486 adding file changes
487 added 4 changesets with 4 changes to 4 files (+1 heads)
487 added 4 changesets with 4 changes to 4 files (+1 heads)
488 5 new obsolescence markers
488 5 new obsolescence markers
489 new changesets 1f0dee641bb7:6f9641995072
489 new changesets 1f0dee641bb7:6f9641995072
490 (run 'hg heads' to see heads, 'hg merge' to merge)
490 (run 'hg heads' to see heads, 'hg merge' to merge)
491 $ hg debugobsolete
491 $ hg debugobsolete
492 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
492 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
493 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
493 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
494 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
494 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
495 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
495 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
496 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
496 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
497 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
497 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
498
498
499
499
500 On push
500 On push
501
501
502 $ hg push ../tmpc
502 $ hg push ../tmpc
503 pushing to ../tmpc
503 pushing to ../tmpc
504 searching for changes
504 searching for changes
505 no changes found
505 no changes found
506 1 new obsolescence markers
506 1 new obsolescence markers
507 [1]
507 [1]
508 $ hg -R ../tmpc debugobsolete
508 $ hg -R ../tmpc debugobsolete
509 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
509 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
510 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
510 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
511 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
511 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
512 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
512 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
513 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
513 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
514 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
514 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
515
515
516 detect outgoing obsolete and unstable
516 detect outgoing obsolete and unstable
517 ---------------------------------------
517 ---------------------------------------
518
518
519
519
520 $ hg log -G
520 $ hg log -G
521 o 3:6f9641995072 (draft) [tip ] add n3w_3_c
521 o 3:6f9641995072 (draft) [tip ] add n3w_3_c
522 |
522 |
523 | o 2:245bde4270cd (public) [ ] add original_c
523 | o 2:245bde4270cd (public) [ ] add original_c
524 |/
524 |/
525 o 1:7c3bad9141dc (public) [ ] add b
525 o 1:7c3bad9141dc (public) [ ] add b
526 |
526 |
527 o 0:1f0dee641bb7 (public) [ ] add a
527 o 0:1f0dee641bb7 (public) [ ] add a
528
528
529 $ hg up 'desc("n3w_3_c")'
529 $ hg up 'desc("n3w_3_c")'
530 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
530 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
531 $ mkcommit original_d
531 $ mkcommit original_d
532 $ mkcommit original_e
532 $ mkcommit original_e
533 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
533 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
534 obsoleted 1 changesets
534 obsoleted 1 changesets
535 1 new orphan changesets
535 1 new orphan changesets
536 $ hg debugobsolete | grep `getid original_d`
536 $ hg debugobsolete | grep `getid original_d`
537 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
537 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
538 $ hg log -r 'obsolete()'
538 $ hg log -r 'obsolete()'
539 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
539 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
540 $ hg summary
540 $ hg summary
541 parent: 5:cda648ca50f5 tip (orphan)
541 parent: 5:cda648ca50f5 tip (orphan)
542 add original_e
542 add original_e
543 branch: default
543 branch: default
544 commit: (clean)
544 commit: (clean)
545 update: 1 new changesets, 2 branch heads (merge)
545 update: 1 new changesets, 2 branch heads (merge)
546 phases: 3 draft
546 phases: 3 draft
547 orphan: 1 changesets
547 orphan: 1 changesets
548 $ hg log -G -r '::orphan()'
548 $ hg log -G -r '::orphan()'
549 @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
549 @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
550 |
550 |
551 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
551 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
552 |
552 |
553 o 3:6f9641995072 (draft) [ ] add n3w_3_c
553 o 3:6f9641995072 (draft) [ ] add n3w_3_c
554 |
554 |
555 o 1:7c3bad9141dc (public) [ ] add b
555 o 1:7c3bad9141dc (public) [ ] add b
556 |
556 |
557 o 0:1f0dee641bb7 (public) [ ] add a
557 o 0:1f0dee641bb7 (public) [ ] add a
558
558
559
559
560 refuse to push obsolete changeset
560 refuse to push obsolete changeset
561
561
562 $ hg push ../tmpc/ -r 'desc("original_d")'
562 $ hg push ../tmpc/ -r 'desc("original_d")'
563 pushing to ../tmpc/
563 pushing to ../tmpc/
564 searching for changes
564 searching for changes
565 abort: push includes obsolete changeset: 94b33453f93b!
565 abort: push includes obsolete changeset: 94b33453f93b!
566 [255]
566 [255]
567
567
568 refuse to push unstable changeset
568 refuse to push unstable changeset
569
569
570 $ hg push ../tmpc/
570 $ hg push ../tmpc/
571 pushing to ../tmpc/
571 pushing to ../tmpc/
572 searching for changes
572 searching for changes
573 abort: push includes orphan changeset: cda648ca50f5!
573 abort: push includes orphan changeset: cda648ca50f5!
574 [255]
574 [255]
575
575
576 Test that extinct changeset are properly detected
576 Test that extinct changeset are properly detected
577
577
578 $ hg log -r 'extinct()'
578 $ hg log -r 'extinct()'
579
579
580 Don't try to push extinct changeset
580 Don't try to push extinct changeset
581
581
582 $ hg init ../tmpf
582 $ hg init ../tmpf
583 $ hg out ../tmpf
583 $ hg out ../tmpf
584 comparing with ../tmpf
584 comparing with ../tmpf
585 searching for changes
585 searching for changes
586 0:1f0dee641bb7 (public) [ ] add a
586 0:1f0dee641bb7 (public) [ ] add a
587 1:7c3bad9141dc (public) [ ] add b
587 1:7c3bad9141dc (public) [ ] add b
588 2:245bde4270cd (public) [ ] add original_c
588 2:245bde4270cd (public) [ ] add original_c
589 3:6f9641995072 (draft) [ ] add n3w_3_c
589 3:6f9641995072 (draft) [ ] add n3w_3_c
590 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
590 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
591 5:cda648ca50f5 (draft orphan) [tip ] add original_e
591 5:cda648ca50f5 (draft orphan) [tip ] add original_e
592 $ hg push ../tmpf -f # -f because be push unstable too
592 $ hg push ../tmpf -f # -f because be push unstable too
593 pushing to ../tmpf
593 pushing to ../tmpf
594 searching for changes
594 searching for changes
595 adding changesets
595 adding changesets
596 adding manifests
596 adding manifests
597 adding file changes
597 adding file changes
598 added 6 changesets with 6 changes to 6 files (+1 heads)
598 added 6 changesets with 6 changes to 6 files (+1 heads)
599 7 new obsolescence markers
599 7 new obsolescence markers
600 1 new orphan changesets
600 1 new orphan changesets
601
601
602 no warning displayed
602 no warning displayed
603
603
604 $ hg push ../tmpf
604 $ hg push ../tmpf
605 pushing to ../tmpf
605 pushing to ../tmpf
606 searching for changes
606 searching for changes
607 no changes found
607 no changes found
608 [1]
608 [1]
609
609
610 Do not warn about new head when the new head is a successors of a remote one
610 Do not warn about new head when the new head is a successors of a remote one
611
611
612 $ hg log -G
612 $ hg log -G
613 @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
613 @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
614 |
614 |
615 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
615 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
616 |
616 |
617 o 3:6f9641995072 (draft) [ ] add n3w_3_c
617 o 3:6f9641995072 (draft) [ ] add n3w_3_c
618 |
618 |
619 | o 2:245bde4270cd (public) [ ] add original_c
619 | o 2:245bde4270cd (public) [ ] add original_c
620 |/
620 |/
621 o 1:7c3bad9141dc (public) [ ] add b
621 o 1:7c3bad9141dc (public) [ ] add b
622 |
622 |
623 o 0:1f0dee641bb7 (public) [ ] add a
623 o 0:1f0dee641bb7 (public) [ ] add a
624
624
625 $ hg up -q 'desc(n3w_3_c)'
625 $ hg up -q 'desc(n3w_3_c)'
626 $ mkcommit obsolete_e
626 $ mkcommit obsolete_e
627 created new head
627 created new head
628 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
628 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
629 > -u 'test <test@example.net>'
629 > -u 'test <test@example.net>'
630 obsoleted 1 changesets
630 obsoleted 1 changesets
631 $ hg outgoing ../tmpf # parasite hg outgoing testin
631 $ hg outgoing ../tmpf # parasite hg outgoing testin
632 comparing with ../tmpf
632 comparing with ../tmpf
633 searching for changes
633 searching for changes
634 6:3de5eca88c00 (draft) [tip ] add obsolete_e
634 6:3de5eca88c00 (draft) [tip ] add obsolete_e
635 $ hg push ../tmpf
635 $ hg push ../tmpf
636 pushing to ../tmpf
636 pushing to ../tmpf
637 searching for changes
637 searching for changes
638 adding changesets
638 adding changesets
639 adding manifests
639 adding manifests
640 adding file changes
640 adding file changes
641 added 1 changesets with 1 changes to 1 files (+1 heads)
641 added 1 changesets with 1 changes to 1 files (+1 heads)
642 1 new obsolescence markers
642 1 new obsolescence markers
643 obsoleted 1 changesets
643 obsoleted 1 changesets
644
644
645 test relevance computation
645 test relevance computation
646 ---------------------------------------
646 ---------------------------------------
647
647
648 Checking simple case of "marker relevance".
648 Checking simple case of "marker relevance".
649
649
650
650
651 Reminder of the repo situation
651 Reminder of the repo situation
652
652
653 $ hg log --hidden --graph
653 $ hg log --hidden --graph
654 @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e
654 @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e
655 |
655 |
656 | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>]
656 | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>]
657 | |
657 | |
658 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
658 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
659 |/
659 |/
660 o 3:6f9641995072 (draft) [ ] add n3w_3_c
660 o 3:6f9641995072 (draft) [ ] add n3w_3_c
661 |
661 |
662 | o 2:245bde4270cd (public) [ ] add original_c
662 | o 2:245bde4270cd (public) [ ] add original_c
663 |/
663 |/
664 o 1:7c3bad9141dc (public) [ ] add b
664 o 1:7c3bad9141dc (public) [ ] add b
665 |
665 |
666 o 0:1f0dee641bb7 (public) [ ] add a
666 o 0:1f0dee641bb7 (public) [ ] add a
667
667
668
668
669 List of all markers
669 List of all markers
670
670
671 $ hg debugobsolete
671 $ hg debugobsolete
672 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
672 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
673 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
673 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
674 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
674 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
675 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
675 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
676 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
676 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
677 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
677 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
678 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
678 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
679 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
679 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
680
680
681 List of changesets with no chain
681 List of changesets with no chain
682
682
683 $ hg debugobsolete --hidden --rev ::2
683 $ hg debugobsolete --hidden --rev ::2
684
684
685 List of changesets that are included on marker chain
685 List of changesets that are included on marker chain
686
686
687 $ hg debugobsolete --hidden --rev 6
687 $ hg debugobsolete --hidden --rev 6
688 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
688 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
689
689
690 List of changesets with a longer chain, (including a pruned children)
690 List of changesets with a longer chain, (including a pruned children)
691
691
692 $ hg debugobsolete --hidden --rev 3
692 $ hg debugobsolete --hidden --rev 3
693 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
693 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
694 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
694 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
695 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
695 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
696 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
696 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
697 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
697 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
698 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
698 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
699 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
699 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
700
700
701 List of both
701 List of both
702
702
703 $ hg debugobsolete --hidden --rev 3::6
703 $ hg debugobsolete --hidden --rev 3::6
704 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
704 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
705 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
705 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
706 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
706 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
707 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
707 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
708 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
708 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
709 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
709 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
710 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
710 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
711 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
711 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
712
712
713 List of all markers in JSON
713 List of all markers in JSON
714
714
715 $ hg debugobsolete -Tjson
715 $ hg debugobsolete -Tjson
716 [
716 [
717 {
717 {
718 "date": [1339.0, 0],
718 "date": [1339.0, 0],
719 "flag": 0,
719 "flag": 0,
720 "metadata": {"user": "test"},
720 "metadata": {"user": "test"},
721 "prednode": "1339133913391339133913391339133913391339",
721 "prednode": "1339133913391339133913391339133913391339",
722 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
722 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
723 },
723 },
724 {
724 {
725 "date": [1339.0, 0],
725 "date": [1339.0, 0],
726 "flag": 0,
726 "flag": 0,
727 "metadata": {"user": "test"},
727 "metadata": {"user": "test"},
728 "prednode": "1337133713371337133713371337133713371337",
728 "prednode": "1337133713371337133713371337133713371337",
729 "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"]
729 "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"]
730 },
730 },
731 {
731 {
732 "date": [121.0, 120],
732 "date": [121.0, 120],
733 "flag": 12,
733 "flag": 12,
734 "metadata": {"user": "test"},
734 "metadata": {"user": "test"},
735 "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca",
735 "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca",
736 "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"]
736 "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"]
737 },
737 },
738 {
738 {
739 "date": [1338.0, 0],
739 "date": [1338.0, 0],
740 "flag": 1,
740 "flag": 1,
741 "metadata": {"user": "test"},
741 "metadata": {"user": "test"},
742 "prednode": "5601fb93a350734d935195fee37f4054c529ff39",
742 "prednode": "5601fb93a350734d935195fee37f4054c529ff39",
743 "succnodes": ["6f96419950729f3671185b847352890f074f7557"]
743 "succnodes": ["6f96419950729f3671185b847352890f074f7557"]
744 },
744 },
745 {
745 {
746 "date": [1338.0, 0],
746 "date": [1338.0, 0],
747 "flag": 0,
747 "flag": 0,
748 "metadata": {"user": "test"},
748 "metadata": {"user": "test"},
749 "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00",
749 "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00",
750 "succnodes": ["1337133713371337133713371337133713371337"]
750 "succnodes": ["1337133713371337133713371337133713371337"]
751 },
751 },
752 {
752 {
753 "date": [1337.0, 0],
753 "date": [1337.0, 0],
754 "flag": 0,
754 "flag": 0,
755 "metadata": {"user": "test"},
755 "metadata": {"user": "test"},
756 "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f",
756 "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f",
757 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
757 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
758 },
758 },
759 {
759 {
760 "date": [0.0, 0],
760 "date": [0.0, 0],
761 "flag": 0,
761 "flag": 0,
762 "metadata": {"user": "test"},
762 "metadata": {"user": "test"},
763 "parentnodes": ["6f96419950729f3671185b847352890f074f7557"],
763 "parentnodes": ["6f96419950729f3671185b847352890f074f7557"],
764 "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1",
764 "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1",
765 "succnodes": []
765 "succnodes": []
766 },
766 },
767 {
767 {
768 "date": *, (glob)
768 "date": *, (glob)
769 "flag": 0,
769 "flag": 0,
770 "metadata": {"user": "test <test@example.net>"},
770 "metadata": {"user": "test <test@example.net>"},
771 "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9",
771 "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9",
772 "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"]
772 "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"]
773 }
773 }
774 ]
774 ]
775
775
776 Template keywords
776 Template keywords
777
777
778 $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n'
778 $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n'
779 3de5eca88c00 ????-??-?? (glob)
779 3de5eca88c00 ????-??-?? (glob)
780 $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n'
780 $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n'
781 user=test <test@example.net>
781 user=test <test@example.net>
782 $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n'
782 $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n'
783 'user': 'test <test@example.net>'
783 'user': 'test <test@example.net>'
784 'user': 'test <test@example.net>'
784 'user': 'test <test@example.net>'
785 $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n'
785 $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n'
786 3de5eca88c00aa039da7399a220f4a5221faa585
786 3de5eca88c00aa039da7399a220f4a5221faa585
787 3de5eca88c00aa039da7399a220f4a5221faa585
787 3de5eca88c00aa039da7399a220f4a5221faa585
788 $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n'
788 $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n'
789 0 test <test@example.net>
789 0 test <test@example.net>
790
790
791 Test the debug output for exchange
791 Test the debug output for exchange
792 ----------------------------------
792 ----------------------------------
793
793
794 $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2
794 $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2
795 pulling from ../tmpb
795 pulling from ../tmpb
796 searching for changes
796 searching for changes
797 no changes found
797 no changes found
798 obsmarker-exchange: 346 bytes received
798 obsmarker-exchange: 346 bytes received
799
799
800 check hgweb does not explode
800 check hgweb does not explode
801 ====================================
801 ====================================
802
802
803 $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
803 $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
804 adding changesets
804 adding changesets
805 adding manifests
805 adding manifests
806 adding file changes
806 adding file changes
807 added 62 changesets with 63 changes to 9 files (+60 heads)
807 added 62 changesets with 63 changes to 9 files (+60 heads)
808 new changesets 50c51b361e60:c15e9edfca13
808 new changesets 50c51b361e60:c15e9edfca13
809 (run 'hg heads .' to see heads, 'hg merge' to merge)
809 (run 'hg heads .' to see heads, 'hg merge' to merge)
810 $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
810 $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
811 > do
811 > do
812 > hg debugobsolete $node
812 > hg debugobsolete $node
813 > done
813 > done
814 obsoleted 1 changesets
814 obsoleted 1 changesets
815 obsoleted 1 changesets
815 obsoleted 1 changesets
816 obsoleted 1 changesets
816 obsoleted 1 changesets
817 obsoleted 1 changesets
817 obsoleted 1 changesets
818 obsoleted 1 changesets
818 obsoleted 1 changesets
819 obsoleted 1 changesets
819 obsoleted 1 changesets
820 obsoleted 1 changesets
820 obsoleted 1 changesets
821 obsoleted 1 changesets
821 obsoleted 1 changesets
822 obsoleted 1 changesets
822 obsoleted 1 changesets
823 obsoleted 1 changesets
823 obsoleted 1 changesets
824 obsoleted 1 changesets
824 obsoleted 1 changesets
825 obsoleted 1 changesets
825 obsoleted 1 changesets
826 obsoleted 1 changesets
826 obsoleted 1 changesets
827 obsoleted 1 changesets
827 obsoleted 1 changesets
828 obsoleted 1 changesets
828 obsoleted 1 changesets
829 obsoleted 1 changesets
829 obsoleted 1 changesets
830 obsoleted 1 changesets
830 obsoleted 1 changesets
831 obsoleted 1 changesets
831 obsoleted 1 changesets
832 obsoleted 1 changesets
832 obsoleted 1 changesets
833 obsoleted 1 changesets
833 obsoleted 1 changesets
834 obsoleted 1 changesets
834 obsoleted 1 changesets
835 obsoleted 1 changesets
835 obsoleted 1 changesets
836 obsoleted 1 changesets
836 obsoleted 1 changesets
837 obsoleted 1 changesets
837 obsoleted 1 changesets
838 obsoleted 1 changesets
838 obsoleted 1 changesets
839 obsoleted 1 changesets
839 obsoleted 1 changesets
840 obsoleted 1 changesets
840 obsoleted 1 changesets
841 obsoleted 1 changesets
841 obsoleted 1 changesets
842 obsoleted 1 changesets
842 obsoleted 1 changesets
843 obsoleted 1 changesets
843 obsoleted 1 changesets
844 obsoleted 1 changesets
844 obsoleted 1 changesets
845 obsoleted 1 changesets
845 obsoleted 1 changesets
846 obsoleted 1 changesets
846 obsoleted 1 changesets
847 obsoleted 1 changesets
847 obsoleted 1 changesets
848 obsoleted 1 changesets
848 obsoleted 1 changesets
849 obsoleted 1 changesets
849 obsoleted 1 changesets
850 obsoleted 1 changesets
850 obsoleted 1 changesets
851 obsoleted 1 changesets
851 obsoleted 1 changesets
852 obsoleted 1 changesets
852 obsoleted 1 changesets
853 obsoleted 1 changesets
853 obsoleted 1 changesets
854 obsoleted 1 changesets
854 obsoleted 1 changesets
855 obsoleted 1 changesets
855 obsoleted 1 changesets
856 obsoleted 1 changesets
856 obsoleted 1 changesets
857 obsoleted 1 changesets
857 obsoleted 1 changesets
858 obsoleted 1 changesets
858 obsoleted 1 changesets
859 obsoleted 1 changesets
859 obsoleted 1 changesets
860 obsoleted 1 changesets
860 obsoleted 1 changesets
861 obsoleted 1 changesets
861 obsoleted 1 changesets
862 obsoleted 1 changesets
862 obsoleted 1 changesets
863 obsoleted 1 changesets
863 obsoleted 1 changesets
864 obsoleted 1 changesets
864 obsoleted 1 changesets
865 obsoleted 1 changesets
865 obsoleted 1 changesets
866 obsoleted 1 changesets
866 obsoleted 1 changesets
867 obsoleted 1 changesets
867 obsoleted 1 changesets
868 obsoleted 1 changesets
868 obsoleted 1 changesets
869 obsoleted 1 changesets
869 obsoleted 1 changesets
870 obsoleted 1 changesets
870 obsoleted 1 changesets
871 obsoleted 1 changesets
871 obsoleted 1 changesets
872 obsoleted 1 changesets
872 obsoleted 1 changesets
873 obsoleted 1 changesets
873 obsoleted 1 changesets
874 $ hg up tip
874 $ hg up tip
875 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
875 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
876
876
877 #if serve
877 #if serve
878
878
879 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
879 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
880 $ cat hg.pid >> $DAEMON_PIDS
880 $ cat hg.pid >> $DAEMON_PIDS
881
881
882 check changelog view
882 check changelog view
883
883
884 $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/'
884 $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/'
885 200 Script output follows
885 200 Script output follows
886
886
887 check graph view
887 check graph view
888
888
889 $ get-with-headers.py --headeronly localhost:$HGPORT 'graph'
889 $ get-with-headers.py --headeronly localhost:$HGPORT 'graph'
890 200 Script output follows
890 200 Script output follows
891
891
892 check filelog view
892 check filelog view
893
893
894 $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar'
894 $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar'
895 200 Script output follows
895 200 Script output follows
896
896
897 check filelog view for hidden commits (obsolete ones are hidden here)
898
899 $ get-with-headers.py localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | grep obsolete
900 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
901 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
902 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
903 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
904 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
905 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
906 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
907 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
908 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
909 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
910 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
911 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
912 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
913 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
914 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
915 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
916 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
917 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
918 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
919 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
920 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
921 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
922 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
923 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
924 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
925 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
926 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
927 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
928 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
929 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
930 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
931 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
932 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
933 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
934 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
935 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
936 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
937 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
938 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
939 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
940 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
941 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
942 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
943 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
944 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
945 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
946 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
947 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
948 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
949 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
950 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
951 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
952 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
953 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
954 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
955 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
956 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
957 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
958 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
959
897 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68'
960 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68'
898 200 Script output follows
961 200 Script output follows
899 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
962 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
900 404 Not Found
963 404 Not Found
901 [1]
964 [1]
902
965
903 check that web.view config option:
966 check that web.view config option:
904
967
905 $ killdaemons.py hg.pid
968 $ killdaemons.py hg.pid
906 $ cat >> .hg/hgrc << EOF
969 $ cat >> .hg/hgrc << EOF
907 > [web]
970 > [web]
908 > view=all
971 > view=all
909 > EOF
972 > EOF
910 $ wait
973 $ wait
911 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
974 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
912 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
975 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
913 200 Script output follows
976 200 Script output follows
914 $ killdaemons.py hg.pid
977 $ killdaemons.py hg.pid
915
978
916 Checking _enable=False warning if obsolete marker exists
979 Checking _enable=False warning if obsolete marker exists
917
980
918 $ echo '[experimental]' >> $HGRCPATH
981 $ echo '[experimental]' >> $HGRCPATH
919 $ echo "evolution=" >> $HGRCPATH
982 $ echo "evolution=" >> $HGRCPATH
920 $ hg log -r tip
983 $ hg log -r tip
921 68:c15e9edfca13 (draft) [tip ] add celestine
984 68:c15e9edfca13 (draft) [tip ] add celestine
922
985
923 reenable for later test
986 reenable for later test
924
987
925 $ echo '[experimental]' >> $HGRCPATH
988 $ echo '[experimental]' >> $HGRCPATH
926 $ echo "evolution.exchange=True" >> $HGRCPATH
989 $ echo "evolution.exchange=True" >> $HGRCPATH
927 $ echo "evolution.createmarkers=True" >> $HGRCPATH
990 $ echo "evolution.createmarkers=True" >> $HGRCPATH
928
991
929 $ rm hg.pid access.log errors.log
992 $ rm hg.pid access.log errors.log
930 #endif
993 #endif
931
994
932 Several troubles on the same changeset (create an unstable and bumped changeset)
995 Several troubles on the same changeset (create an unstable and bumped changeset)
933
996
934 $ hg debugobsolete `getid obsolete_e`
997 $ hg debugobsolete `getid obsolete_e`
935 obsoleted 1 changesets
998 obsoleted 1 changesets
936 2 new orphan changesets
999 2 new orphan changesets
937 $ hg debugobsolete `getid original_c` `getid babar`
1000 $ hg debugobsolete `getid original_c` `getid babar`
938 1 new phase-divergent changesets
1001 1 new phase-divergent changesets
939 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()'
1002 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()'
940 changeset: 7:50c51b361e60
1003 changeset: 7:50c51b361e60
941 user: test
1004 user: test
942 date: Thu Jan 01 00:00:00 1970 +0000
1005 date: Thu Jan 01 00:00:00 1970 +0000
943 instability: orphan, phase-divergent
1006 instability: orphan, phase-divergent
944 summary: add babar
1007 summary: add babar
945
1008
946
1009
947 test the "obsolete" templatekw
1010 test the "obsolete" templatekw
948
1011
949 $ hg log -r 'obsolete()'
1012 $ hg log -r 'obsolete()'
950 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned]
1013 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned]
951
1014
952 test the "troubles" templatekw
1015 test the "troubles" templatekw
953
1016
954 $ hg log -r 'phasedivergent() and orphan()'
1017 $ hg log -r 'phasedivergent() and orphan()'
955 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar
1018 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar
956
1019
957 test the default cmdline template
1020 test the default cmdline template
958
1021
959 $ hg log -T default -r 'phasedivergent()'
1022 $ hg log -T default -r 'phasedivergent()'
960 changeset: 7:50c51b361e60
1023 changeset: 7:50c51b361e60
961 user: test
1024 user: test
962 date: Thu Jan 01 00:00:00 1970 +0000
1025 date: Thu Jan 01 00:00:00 1970 +0000
963 instability: orphan, phase-divergent
1026 instability: orphan, phase-divergent
964 summary: add babar
1027 summary: add babar
965
1028
966 $ hg log -T default -r 'obsolete()'
1029 $ hg log -T default -r 'obsolete()'
967 changeset: 6:3de5eca88c00
1030 changeset: 6:3de5eca88c00
968 parent: 3:6f9641995072
1031 parent: 3:6f9641995072
969 user: test
1032 user: test
970 date: Thu Jan 01 00:00:00 1970 +0000
1033 date: Thu Jan 01 00:00:00 1970 +0000
971 obsolete: pruned
1034 obsolete: pruned
972 summary: add obsolete_e
1035 summary: add obsolete_e
973
1036
974
1037
975 test the obsolete labels
1038 test the obsolete labels
976
1039
977 $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
1040 $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
978 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60]
1041 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60]
979 [log.user|user: test]
1042 [log.user|user: test]
980 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
1043 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
981 [log.instability|instability: orphan, phase-divergent]
1044 [log.instability|instability: orphan, phase-divergent]
982 [log.summary|summary: add babar]
1045 [log.summary|summary: add babar]
983
1046
984
1047
985 $ hg log -T default -r 'phasedivergent()' --color=debug
1048 $ hg log -T default -r 'phasedivergent()' --color=debug
986 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60]
1049 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60]
987 [log.user|user: test]
1050 [log.user|user: test]
988 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
1051 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
989 [log.instability|instability: orphan, phase-divergent]
1052 [log.instability|instability: orphan, phase-divergent]
990 [log.summary|summary: add babar]
1053 [log.summary|summary: add babar]
991
1054
992
1055
993 $ hg log --config ui.logtemplate= --color=debug -r "obsolete()"
1056 $ hg log --config ui.logtemplate= --color=debug -r "obsolete()"
994 [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00]
1057 [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00]
995 [log.parent changeset.draft|parent: 3:6f9641995072]
1058 [log.parent changeset.draft|parent: 3:6f9641995072]
996 [log.user|user: test]
1059 [log.user|user: test]
997 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
1060 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
998 [log.obsfate|obsolete: pruned]
1061 [log.obsfate|obsolete: pruned]
999 [log.summary|summary: add obsolete_e]
1062 [log.summary|summary: add obsolete_e]
1000
1063
1001
1064
1002 $ hg log -T default -r 'obsolete()' --color=debug
1065 $ hg log -T default -r 'obsolete()' --color=debug
1003 [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00]
1066 [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00]
1004 [log.parent changeset.draft|parent: 3:6f9641995072]
1067 [log.parent changeset.draft|parent: 3:6f9641995072]
1005 [log.user|user: test]
1068 [log.user|user: test]
1006 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
1069 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
1007 [log.obsfate|obsolete: pruned]
1070 [log.obsfate|obsolete: pruned]
1008 [log.summary|summary: add obsolete_e]
1071 [log.summary|summary: add obsolete_e]
1009
1072
1010
1073
1011 test summary output
1074 test summary output
1012
1075
1013 $ hg up -r 'phasedivergent() and orphan()'
1076 $ hg up -r 'phasedivergent() and orphan()'
1014 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1077 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1015 $ hg summary
1078 $ hg summary
1016 parent: 7:50c51b361e60 (orphan, phase-divergent)
1079 parent: 7:50c51b361e60 (orphan, phase-divergent)
1017 add babar
1080 add babar
1018 branch: default
1081 branch: default
1019 commit: (clean)
1082 commit: (clean)
1020 update: 2 new changesets (update)
1083 update: 2 new changesets (update)
1021 phases: 4 draft
1084 phases: 4 draft
1022 orphan: 2 changesets
1085 orphan: 2 changesets
1023 phase-divergent: 1 changesets
1086 phase-divergent: 1 changesets
1024 $ hg up -r 'obsolete()'
1087 $ hg up -r 'obsolete()'
1025 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1088 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1026 $ hg summary
1089 $ hg summary
1027 parent: 6:3de5eca88c00 (obsolete)
1090 parent: 6:3de5eca88c00 (obsolete)
1028 add obsolete_e
1091 add obsolete_e
1029 branch: default
1092 branch: default
1030 commit: (clean)
1093 commit: (clean)
1031 update: 3 new changesets (update)
1094 update: 3 new changesets (update)
1032 phases: 4 draft
1095 phases: 4 draft
1033 orphan: 2 changesets
1096 orphan: 2 changesets
1034 phase-divergent: 1 changesets
1097 phase-divergent: 1 changesets
1035
1098
1036 test debugwhyunstable output
1099 test debugwhyunstable output
1037
1100
1038 $ hg debugwhyunstable 50c51b361e60
1101 $ hg debugwhyunstable 50c51b361e60
1039 orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585
1102 orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585
1040 phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
1103 phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
1041
1104
1042 #if serve
1105 #if serve
1043
1106
1044 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1107 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1045 $ cat hg.pid >> $DAEMON_PIDS
1108 $ cat hg.pid >> $DAEMON_PIDS
1046
1109
1047 check obsolete changeset
1110 check obsolete changeset
1048
1111
1049 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">'
1112 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">'
1050 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
1113 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
1051 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">'
1114 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">'
1052 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
1115 <span class="phase">draft</span> <span class="obsolete">obsolete</span>
1053 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">'
1116 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">'
1054 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
1117 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
1055 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">'
1118 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">'
1056 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
1119 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
1057 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"'
1120 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"'
1058 <th class="obsolete">obsolete:</th>
1121 <th class="obsolete">obsolete:</th>
1059 <td class="obsolete">pruned by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
1122 <td class="obsolete">pruned by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
1060
1123
1061 check changeset with instabilities
1124 check changeset with instabilities
1062
1125
1063 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">'
1126 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">'
1064 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
1127 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
1065 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">'
1128 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">'
1066 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
1129 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
1067 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">'
1130 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">'
1068 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span>
1131 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span>
1069 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">'
1132 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">'
1070 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span>
1133 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span>
1071 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"'
1134 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"'
1072 <th class="unstable">unstable:</th>
1135 <th class="unstable">unstable:</th>
1073 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1136 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1074 <th class="unstable">unstable:</th>
1137 <th class="unstable">unstable:</th>
1075 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1138 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1076
1139
1077 check explanation for an orphan and phase-divergent changeset
1140 check explanation for an orphan and phase-divergent changeset
1078
1141
1079 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent):'
1142 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent):'
1080 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br>
1143 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br>
1081 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td>
1144 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td>
1082 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent):'
1145 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent):'
1083 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br>
1146 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br>
1084 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td>
1147 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td>
1085 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent):'
1148 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent):'
1086 <td>orphan: obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td>
1149 <td>orphan: obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td>
1087 <td>phase-divergent: immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
1150 <td>phase-divergent: immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
1088 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent):'
1151 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent):'
1089 <dd>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd>
1152 <dd>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd>
1090 <dd>phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
1153 <dd>phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
1091 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent):'
1154 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent):'
1092 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1155 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1093 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1156 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1094
1157
1095 $ killdaemons.py
1158 $ killdaemons.py
1096
1159
1097 $ rm hg.pid access.log errors.log
1160 $ rm hg.pid access.log errors.log
1098
1161
1099 #endif
1162 #endif
1100
1163
1101 Test incoming/outcoming with changesets obsoleted remotely, known locally
1164 Test incoming/outcoming with changesets obsoleted remotely, known locally
1102 ===============================================================================
1165 ===============================================================================
1103
1166
1104 This test issue 3805
1167 This test issue 3805
1105
1168
1106 $ hg init repo-issue3805
1169 $ hg init repo-issue3805
1107 $ cd repo-issue3805
1170 $ cd repo-issue3805
1108 $ echo "base" > base
1171 $ echo "base" > base
1109 $ hg ci -Am "base"
1172 $ hg ci -Am "base"
1110 adding base
1173 adding base
1111 $ echo "foo" > foo
1174 $ echo "foo" > foo
1112 $ hg ci -Am "A"
1175 $ hg ci -Am "A"
1113 adding foo
1176 adding foo
1114 $ hg clone . ../other-issue3805
1177 $ hg clone . ../other-issue3805
1115 updating to branch default
1178 updating to branch default
1116 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1179 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1117 $ echo "bar" >> foo
1180 $ echo "bar" >> foo
1118 $ hg ci --amend
1181 $ hg ci --amend
1119 $ cd ../other-issue3805
1182 $ cd ../other-issue3805
1120 $ hg log -G
1183 $ hg log -G
1121 @ 1:29f0c6921ddd (draft) [tip ] A
1184 @ 1:29f0c6921ddd (draft) [tip ] A
1122 |
1185 |
1123 o 0:d20a80d4def3 (draft) [ ] base
1186 o 0:d20a80d4def3 (draft) [ ] base
1124
1187
1125 $ hg log -G -R ../repo-issue3805
1188 $ hg log -G -R ../repo-issue3805
1126 @ 2:323a9c3ddd91 (draft) [tip ] A
1189 @ 2:323a9c3ddd91 (draft) [tip ] A
1127 |
1190 |
1128 o 0:d20a80d4def3 (draft) [ ] base
1191 o 0:d20a80d4def3 (draft) [ ] base
1129
1192
1130 $ hg incoming
1193 $ hg incoming
1131 comparing with $TESTTMP/tmpe/repo-issue3805
1194 comparing with $TESTTMP/tmpe/repo-issue3805
1132 searching for changes
1195 searching for changes
1133 2:323a9c3ddd91 (draft) [tip ] A
1196 2:323a9c3ddd91 (draft) [tip ] A
1134 $ hg incoming --bundle ../issue3805.hg
1197 $ hg incoming --bundle ../issue3805.hg
1135 comparing with $TESTTMP/tmpe/repo-issue3805
1198 comparing with $TESTTMP/tmpe/repo-issue3805
1136 searching for changes
1199 searching for changes
1137 2:323a9c3ddd91 (draft) [tip ] A
1200 2:323a9c3ddd91 (draft) [tip ] A
1138 $ hg outgoing
1201 $ hg outgoing
1139 comparing with $TESTTMP/tmpe/repo-issue3805
1202 comparing with $TESTTMP/tmpe/repo-issue3805
1140 searching for changes
1203 searching for changes
1141 1:29f0c6921ddd (draft) [tip ] A
1204 1:29f0c6921ddd (draft) [tip ] A
1142
1205
1143 #if serve
1206 #if serve
1144
1207
1145 $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1208 $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1146 $ cat hg.pid >> $DAEMON_PIDS
1209 $ cat hg.pid >> $DAEMON_PIDS
1147
1210
1148 $ hg incoming http://localhost:$HGPORT
1211 $ hg incoming http://localhost:$HGPORT
1149 comparing with http://localhost:$HGPORT/
1212 comparing with http://localhost:$HGPORT/
1150 searching for changes
1213 searching for changes
1151 2:323a9c3ddd91 (draft) [tip ] A
1214 2:323a9c3ddd91 (draft) [tip ] A
1152 $ hg outgoing http://localhost:$HGPORT
1215 $ hg outgoing http://localhost:$HGPORT
1153 comparing with http://localhost:$HGPORT/
1216 comparing with http://localhost:$HGPORT/
1154 searching for changes
1217 searching for changes
1155 1:29f0c6921ddd (draft) [tip ] A
1218 1:29f0c6921ddd (draft) [tip ] A
1156
1219
1157 $ killdaemons.py
1220 $ killdaemons.py
1158
1221
1159 #endif
1222 #endif
1160
1223
1161 This test issue 3814
1224 This test issue 3814
1162
1225
1163 (nothing to push but locally hidden changeset)
1226 (nothing to push but locally hidden changeset)
1164
1227
1165 $ cd ..
1228 $ cd ..
1166 $ hg init repo-issue3814
1229 $ hg init repo-issue3814
1167 $ cd repo-issue3805
1230 $ cd repo-issue3805
1168 $ hg push -r 323a9c3ddd91 ../repo-issue3814
1231 $ hg push -r 323a9c3ddd91 ../repo-issue3814
1169 pushing to ../repo-issue3814
1232 pushing to ../repo-issue3814
1170 searching for changes
1233 searching for changes
1171 adding changesets
1234 adding changesets
1172 adding manifests
1235 adding manifests
1173 adding file changes
1236 adding file changes
1174 added 2 changesets with 2 changes to 2 files
1237 added 2 changesets with 2 changes to 2 files
1175 1 new obsolescence markers
1238 1 new obsolescence markers
1176 $ hg out ../repo-issue3814
1239 $ hg out ../repo-issue3814
1177 comparing with ../repo-issue3814
1240 comparing with ../repo-issue3814
1178 searching for changes
1241 searching for changes
1179 no changes found
1242 no changes found
1180 [1]
1243 [1]
1181
1244
1182 Test that a local tag blocks a changeset from being hidden
1245 Test that a local tag blocks a changeset from being hidden
1183
1246
1184 $ hg tag -l visible -r 1 --hidden
1247 $ hg tag -l visible -r 1 --hidden
1185 $ hg log -G
1248 $ hg log -G
1186 @ 2:323a9c3ddd91 (draft) [tip ] A
1249 @ 2:323a9c3ddd91 (draft) [tip ] A
1187 |
1250 |
1188 | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91]
1251 | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91]
1189 |/
1252 |/
1190 o 0:d20a80d4def3 (draft) [ ] base
1253 o 0:d20a80d4def3 (draft) [ ] base
1191
1254
1192 Test that removing a local tag does not cause some commands to fail
1255 Test that removing a local tag does not cause some commands to fail
1193
1256
1194 $ hg tag -l -r tip tiptag
1257 $ hg tag -l -r tip tiptag
1195 $ hg tags
1258 $ hg tags
1196 tiptag 2:323a9c3ddd91
1259 tiptag 2:323a9c3ddd91
1197 tip 2:323a9c3ddd91
1260 tip 2:323a9c3ddd91
1198 visible 1:29f0c6921ddd
1261 visible 1:29f0c6921ddd
1199 $ hg --config extensions.strip= strip -r tip --no-backup
1262 $ hg --config extensions.strip= strip -r tip --no-backup
1200 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1263 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1201 $ hg tags
1264 $ hg tags
1202 visible 1:29f0c6921ddd
1265 visible 1:29f0c6921ddd
1203 tip 1:29f0c6921ddd
1266 tip 1:29f0c6921ddd
1204
1267
1205 Test bundle overlay onto hidden revision
1268 Test bundle overlay onto hidden revision
1206
1269
1207 $ cd ..
1270 $ cd ..
1208 $ hg init repo-bundleoverlay
1271 $ hg init repo-bundleoverlay
1209 $ cd repo-bundleoverlay
1272 $ cd repo-bundleoverlay
1210 $ echo "A" > foo
1273 $ echo "A" > foo
1211 $ hg ci -Am "A"
1274 $ hg ci -Am "A"
1212 adding foo
1275 adding foo
1213 $ echo "B" >> foo
1276 $ echo "B" >> foo
1214 $ hg ci -m "B"
1277 $ hg ci -m "B"
1215 $ hg up 0
1278 $ hg up 0
1216 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1279 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1217 $ echo "C" >> foo
1280 $ echo "C" >> foo
1218 $ hg ci -m "C"
1281 $ hg ci -m "C"
1219 created new head
1282 created new head
1220 $ hg log -G
1283 $ hg log -G
1221 @ 2:c186d7714947 (draft) [tip ] C
1284 @ 2:c186d7714947 (draft) [tip ] C
1222 |
1285 |
1223 | o 1:44526ebb0f98 (draft) [ ] B
1286 | o 1:44526ebb0f98 (draft) [ ] B
1224 |/
1287 |/
1225 o 0:4b34ecfb0d56 (draft) [ ] A
1288 o 0:4b34ecfb0d56 (draft) [ ] A
1226
1289
1227
1290
1228 $ hg clone -r1 . ../other-bundleoverlay
1291 $ hg clone -r1 . ../other-bundleoverlay
1229 adding changesets
1292 adding changesets
1230 adding manifests
1293 adding manifests
1231 adding file changes
1294 adding file changes
1232 added 2 changesets with 2 changes to 1 files
1295 added 2 changesets with 2 changes to 1 files
1233 new changesets 4b34ecfb0d56:44526ebb0f98
1296 new changesets 4b34ecfb0d56:44526ebb0f98
1234 updating to branch default
1297 updating to branch default
1235 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1298 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1236 $ cd ../other-bundleoverlay
1299 $ cd ../other-bundleoverlay
1237 $ echo "B+" >> foo
1300 $ echo "B+" >> foo
1238 $ hg ci --amend -m "B+"
1301 $ hg ci --amend -m "B+"
1239 $ hg log -G --hidden
1302 $ hg log -G --hidden
1240 @ 2:b7d587542d40 (draft) [tip ] B+
1303 @ 2:b7d587542d40 (draft) [tip ] B+
1241 |
1304 |
1242 | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40]
1305 | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40]
1243 |/
1306 |/
1244 o 0:4b34ecfb0d56 (draft) [ ] A
1307 o 0:4b34ecfb0d56 (draft) [ ] A
1245
1308
1246
1309
1247 #if repobundlerepo
1310 #if repobundlerepo
1248 $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
1311 $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
1249 comparing with ../repo-bundleoverlay
1312 comparing with ../repo-bundleoverlay
1250 searching for changes
1313 searching for changes
1251 1:44526ebb0f98 (draft) [ ] B
1314 1:44526ebb0f98 (draft) [ ] B
1252 2:c186d7714947 (draft) [tip ] C
1315 2:c186d7714947 (draft) [tip ] C
1253 $ hg log -G -R ../bundleoverlay.hg
1316 $ hg log -G -R ../bundleoverlay.hg
1254 o 3:c186d7714947 (draft) [tip ] C
1317 o 3:c186d7714947 (draft) [tip ] C
1255 |
1318 |
1256 | @ 2:b7d587542d40 (draft) [ ] B+
1319 | @ 2:b7d587542d40 (draft) [ ] B+
1257 |/
1320 |/
1258 o 0:4b34ecfb0d56 (draft) [ ] A
1321 o 0:4b34ecfb0d56 (draft) [ ] A
1259
1322
1260 #endif
1323 #endif
1261
1324
1262 #if serve
1325 #if serve
1263
1326
1264 Test issue 4506
1327 Test issue 4506
1265
1328
1266 $ cd ..
1329 $ cd ..
1267 $ hg init repo-issue4506
1330 $ hg init repo-issue4506
1268 $ cd repo-issue4506
1331 $ cd repo-issue4506
1269 $ echo "0" > foo
1332 $ echo "0" > foo
1270 $ hg add foo
1333 $ hg add foo
1271 $ hg ci -m "content-0"
1334 $ hg ci -m "content-0"
1272
1335
1273 $ hg up null
1336 $ hg up null
1274 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1337 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1275 $ echo "1" > bar
1338 $ echo "1" > bar
1276 $ hg add bar
1339 $ hg add bar
1277 $ hg ci -m "content-1"
1340 $ hg ci -m "content-1"
1278 created new head
1341 created new head
1279 $ hg up 0
1342 $ hg up 0
1280 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1343 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1281 $ hg graft 1
1344 $ hg graft 1
1282 grafting 1:1c9eddb02162 "content-1" (tip)
1345 grafting 1:1c9eddb02162 "content-1" (tip)
1283
1346
1284 $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
1347 $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
1285 obsoleted 1 changesets
1348 obsoleted 1 changesets
1286
1349
1287 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1350 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1288 $ cat hg.pid >> $DAEMON_PIDS
1351 $ cat hg.pid >> $DAEMON_PIDS
1289
1352
1290 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1'
1353 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1'
1291 404 Not Found
1354 404 Not Found
1292 [1]
1355 [1]
1293 $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar'
1356 $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar'
1294 200 Script output follows
1357 200 Script output follows
1295 $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar'
1358 $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar'
1296 200 Script output follows
1359 200 Script output follows
1297
1360
1298 $ killdaemons.py
1361 $ killdaemons.py
1299
1362
1300 #endif
1363 #endif
1301
1364
1302 Test heads computation on pending index changes with obsolescence markers
1365 Test heads computation on pending index changes with obsolescence markers
1303 $ cd ..
1366 $ cd ..
1304 $ cat >$TESTTMP/test_extension.py << EOF
1367 $ cat >$TESTTMP/test_extension.py << EOF
1305 > from __future__ import absolute_import
1368 > from __future__ import absolute_import
1306 > from mercurial.i18n import _
1369 > from mercurial.i18n import _
1307 > from mercurial import cmdutil, registrar
1370 > from mercurial import cmdutil, registrar
1308 >
1371 >
1309 > cmdtable = {}
1372 > cmdtable = {}
1310 > command = registrar.command(cmdtable)
1373 > command = registrar.command(cmdtable)
1311 > @command(b"amendtransient",[], _(b'hg amendtransient [rev]'))
1374 > @command(b"amendtransient",[], _(b'hg amendtransient [rev]'))
1312 > def amend(ui, repo, *pats, **opts):
1375 > def amend(ui, repo, *pats, **opts):
1313 > opts['message'] = 'Test'
1376 > opts['message'] = 'Test'
1314 > opts['logfile'] = None
1377 > opts['logfile'] = None
1315 > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts)
1378 > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts)
1316 > ui.write(b'%s\n' % repo.changelog.headrevs())
1379 > ui.write(b'%s\n' % repo.changelog.headrevs())
1317 > EOF
1380 > EOF
1318 $ cat >> $HGRCPATH << EOF
1381 $ cat >> $HGRCPATH << EOF
1319 > [extensions]
1382 > [extensions]
1320 > testextension=$TESTTMP/test_extension.py
1383 > testextension=$TESTTMP/test_extension.py
1321 > EOF
1384 > EOF
1322 $ hg init repo-issue-nativerevs-pending-changes
1385 $ hg init repo-issue-nativerevs-pending-changes
1323 $ cd repo-issue-nativerevs-pending-changes
1386 $ cd repo-issue-nativerevs-pending-changes
1324 $ mkcommit a
1387 $ mkcommit a
1325 $ mkcommit b
1388 $ mkcommit b
1326 $ hg up ".^"
1389 $ hg up ".^"
1327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1390 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1328 $ echo aa > a
1391 $ echo aa > a
1329 $ hg amendtransient
1392 $ hg amendtransient
1330 1 new orphan changesets
1393 1 new orphan changesets
1331 [1, 2]
1394 [1, 2]
1332
1395
1333 Test cache consistency for the visible filter
1396 Test cache consistency for the visible filter
1334 1) We want to make sure that the cached filtered revs are invalidated when
1397 1) We want to make sure that the cached filtered revs are invalidated when
1335 bookmarks change
1398 bookmarks change
1336 $ cd ..
1399 $ cd ..
1337 $ cat >$TESTTMP/test_extension.py << EOF
1400 $ cat >$TESTTMP/test_extension.py << EOF
1338 > from __future__ import absolute_import, print_function
1401 > from __future__ import absolute_import, print_function
1339 > import weakref
1402 > import weakref
1340 > from mercurial import (
1403 > from mercurial import (
1341 > bookmarks,
1404 > bookmarks,
1342 > cmdutil,
1405 > cmdutil,
1343 > extensions,
1406 > extensions,
1344 > repoview,
1407 > repoview,
1345 > )
1408 > )
1346 > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs):
1409 > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs):
1347 > reporef = weakref.ref(bkmstoreinst._repo)
1410 > reporef = weakref.ref(bkmstoreinst._repo)
1348 > def trhook(tr):
1411 > def trhook(tr):
1349 > repo = reporef()
1412 > repo = reporef()
1350 > hidden1 = repoview.computehidden(repo)
1413 > hidden1 = repoview.computehidden(repo)
1351 > hidden = repoview.filterrevs(repo, b'visible')
1414 > hidden = repoview.filterrevs(repo, b'visible')
1352 > if sorted(hidden1) != sorted(hidden):
1415 > if sorted(hidden1) != sorted(hidden):
1353 > print("cache inconsistency")
1416 > print("cache inconsistency")
1354 > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook)
1417 > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook)
1355 > orig(bkmstoreinst, *args, **kwargs)
1418 > orig(bkmstoreinst, *args, **kwargs)
1356 > def extsetup(ui):
1419 > def extsetup(ui):
1357 > extensions.wrapfunction(bookmarks.bmstore, '_recordchange',
1420 > extensions.wrapfunction(bookmarks.bmstore, '_recordchange',
1358 > _bookmarkchanged)
1421 > _bookmarkchanged)
1359 > EOF
1422 > EOF
1360
1423
1361 $ hg init repo-cache-inconsistency
1424 $ hg init repo-cache-inconsistency
1362 $ cd repo-issue-nativerevs-pending-changes
1425 $ cd repo-issue-nativerevs-pending-changes
1363 $ mkcommit a
1426 $ mkcommit a
1364 a already tracked!
1427 a already tracked!
1365 $ mkcommit b
1428 $ mkcommit b
1366 $ hg id
1429 $ hg id
1367 13bedc178fce tip
1430 13bedc178fce tip
1368 $ echo "hello" > b
1431 $ echo "hello" > b
1369 $ hg commit --amend -m "message"
1432 $ hg commit --amend -m "message"
1370 $ hg book bookb -r 13bedc178fce --hidden
1433 $ hg book bookb -r 13bedc178fce --hidden
1371 bookmarking hidden changeset 13bedc178fce
1434 bookmarking hidden changeset 13bedc178fce
1372 (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753)
1435 (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753)
1373 $ hg log -r 13bedc178fce
1436 $ hg log -r 13bedc178fce
1374 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
1437 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
1375 $ hg book -d bookb
1438 $ hg book -d bookb
1376 $ hg log -r 13bedc178fce
1439 $ hg log -r 13bedc178fce
1377 abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753!
1440 abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753!
1378 (use --hidden to access hidden revisions)
1441 (use --hidden to access hidden revisions)
1379 [255]
1442 [255]
1380
1443
1381 Empty out the test extension, as it isn't compatible with later parts
1444 Empty out the test extension, as it isn't compatible with later parts
1382 of the test.
1445 of the test.
1383 $ echo > $TESTTMP/test_extension.py
1446 $ echo > $TESTTMP/test_extension.py
1384
1447
1385 Test ability to pull changeset with locally applying obsolescence markers
1448 Test ability to pull changeset with locally applying obsolescence markers
1386 (issue4945)
1449 (issue4945)
1387
1450
1388 $ cd ..
1451 $ cd ..
1389 $ hg init issue4845
1452 $ hg init issue4845
1390 $ cd issue4845
1453 $ cd issue4845
1391
1454
1392 $ echo foo > f0
1455 $ echo foo > f0
1393 $ hg add f0
1456 $ hg add f0
1394 $ hg ci -m '0'
1457 $ hg ci -m '0'
1395 $ echo foo > f1
1458 $ echo foo > f1
1396 $ hg add f1
1459 $ hg add f1
1397 $ hg ci -m '1'
1460 $ hg ci -m '1'
1398 $ echo foo > f2
1461 $ echo foo > f2
1399 $ hg add f2
1462 $ hg add f2
1400 $ hg ci -m '2'
1463 $ hg ci -m '2'
1401
1464
1402 $ echo bar > f2
1465 $ echo bar > f2
1403 $ hg commit --amend --config experimental.evolution.createmarkers=True
1466 $ hg commit --amend --config experimental.evolution.createmarkers=True
1404 $ hg log -G
1467 $ hg log -G
1405 @ 3:b0551702f918 (draft) [tip ] 2
1468 @ 3:b0551702f918 (draft) [tip ] 2
1406 |
1469 |
1407 o 1:e016b03fd86f (draft) [ ] 1
1470 o 1:e016b03fd86f (draft) [ ] 1
1408 |
1471 |
1409 o 0:a78f55e5508c (draft) [ ] 0
1472 o 0:a78f55e5508c (draft) [ ] 0
1410
1473
1411 $ hg log -G --hidden
1474 $ hg log -G --hidden
1412 @ 3:b0551702f918 (draft) [tip ] 2
1475 @ 3:b0551702f918 (draft) [tip ] 2
1413 |
1476 |
1414 | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918]
1477 | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918]
1415 |/
1478 |/
1416 o 1:e016b03fd86f (draft) [ ] 1
1479 o 1:e016b03fd86f (draft) [ ] 1
1417 |
1480 |
1418 o 0:a78f55e5508c (draft) [ ] 0
1481 o 0:a78f55e5508c (draft) [ ] 0
1419
1482
1420
1483
1421 $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no
1484 $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no
1422 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg
1485 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg
1423 $ hg debugobsolete
1486 $ hg debugobsolete
1424 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1487 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1425 $ hg log -G
1488 $ hg log -G
1426 @ 2:b0551702f918 (draft) [tip ] 2
1489 @ 2:b0551702f918 (draft) [tip ] 2
1427 |
1490 |
1428 o 1:e016b03fd86f (draft) [ ] 1
1491 o 1:e016b03fd86f (draft) [ ] 1
1429 |
1492 |
1430 o 0:a78f55e5508c (draft) [ ] 0
1493 o 0:a78f55e5508c (draft) [ ] 0
1431
1494
1432 $ hg log -G --hidden
1495 $ hg log -G --hidden
1433 @ 2:b0551702f918 (draft) [tip ] 2
1496 @ 2:b0551702f918 (draft) [tip ] 2
1434 |
1497 |
1435 o 1:e016b03fd86f (draft) [ ] 1
1498 o 1:e016b03fd86f (draft) [ ] 1
1436 |
1499 |
1437 o 0:a78f55e5508c (draft) [ ] 0
1500 o 0:a78f55e5508c (draft) [ ] 0
1438
1501
1439 $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg
1502 $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg
1440 Stream params: {Compression: BZ}
1503 Stream params: {Compression: BZ}
1441 changegroup -- {nbchanges: 1, version: 02}
1504 changegroup -- {nbchanges: 1, version: 02}
1442 e008cf2834908e5d6b0f792a9d4b0e2272260fb8
1505 e008cf2834908e5d6b0f792a9d4b0e2272260fb8
1443 cache:rev-branch-cache -- {}
1506 cache:rev-branch-cache -- {}
1444 phase-heads -- {}
1507 phase-heads -- {}
1445 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft
1508 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft
1446
1509
1447 $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
1510 $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
1448 pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
1511 pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
1449 searching for changes
1512 searching for changes
1450 no changes found
1513 no changes found
1451 $ hg debugobsolete
1514 $ hg debugobsolete
1452 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1515 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1453 $ hg log -G
1516 $ hg log -G
1454 @ 2:b0551702f918 (draft) [tip ] 2
1517 @ 2:b0551702f918 (draft) [tip ] 2
1455 |
1518 |
1456 o 1:e016b03fd86f (draft) [ ] 1
1519 o 1:e016b03fd86f (draft) [ ] 1
1457 |
1520 |
1458 o 0:a78f55e5508c (draft) [ ] 0
1521 o 0:a78f55e5508c (draft) [ ] 0
1459
1522
1460 $ hg log -G --hidden
1523 $ hg log -G --hidden
1461 @ 2:b0551702f918 (draft) [tip ] 2
1524 @ 2:b0551702f918 (draft) [tip ] 2
1462 |
1525 |
1463 o 1:e016b03fd86f (draft) [ ] 1
1526 o 1:e016b03fd86f (draft) [ ] 1
1464 |
1527 |
1465 o 0:a78f55e5508c (draft) [ ] 0
1528 o 0:a78f55e5508c (draft) [ ] 0
1466
1529
1467
1530
1468 Testing that strip remove markers:
1531 Testing that strip remove markers:
1469
1532
1470 $ hg strip -r 1 --config extensions.strip=
1533 $ hg strip -r 1 --config extensions.strip=
1471 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1534 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1472 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg
1535 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg
1473 $ hg debugobsolete
1536 $ hg debugobsolete
1474 $ hg log -G
1537 $ hg log -G
1475 @ 0:a78f55e5508c (draft) [tip ] 0
1538 @ 0:a78f55e5508c (draft) [tip ] 0
1476
1539
1477 $ hg log -G --hidden
1540 $ hg log -G --hidden
1478 @ 0:a78f55e5508c (draft) [tip ] 0
1541 @ 0:a78f55e5508c (draft) [tip ] 0
1479
1542
1480 $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
1543 $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
1481 Stream params: {Compression: BZ}
1544 Stream params: {Compression: BZ}
1482 changegroup -- {nbchanges: 2, version: 02}
1545 changegroup -- {nbchanges: 2, version: 02}
1483 e016b03fd86fcccc54817d120b90b751aaf367d6
1546 e016b03fd86fcccc54817d120b90b751aaf367d6
1484 b0551702f918510f01ae838ab03a463054c67b46
1547 b0551702f918510f01ae838ab03a463054c67b46
1485 cache:rev-branch-cache -- {}
1548 cache:rev-branch-cache -- {}
1486 obsmarkers -- {}
1549 obsmarkers -- {}
1487 version: 1 (92 bytes)
1550 version: 1 (92 bytes)
1488 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1551 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1489 phase-heads -- {}
1552 phase-heads -- {}
1490 b0551702f918510f01ae838ab03a463054c67b46 draft
1553 b0551702f918510f01ae838ab03a463054c67b46 draft
1491
1554
1492 $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
1555 $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
1493 adding changesets
1556 adding changesets
1494 adding manifests
1557 adding manifests
1495 adding file changes
1558 adding file changes
1496 added 2 changesets with 2 changes to 2 files
1559 added 2 changesets with 2 changes to 2 files
1497 1 new obsolescence markers
1560 1 new obsolescence markers
1498 new changesets e016b03fd86f:b0551702f918
1561 new changesets e016b03fd86f:b0551702f918
1499 (run 'hg update' to get a working copy)
1562 (run 'hg update' to get a working copy)
1500 $ hg debugobsolete | sort
1563 $ hg debugobsolete | sort
1501 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1564 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1502 $ hg log -G
1565 $ hg log -G
1503 o 2:b0551702f918 (draft) [tip ] 2
1566 o 2:b0551702f918 (draft) [tip ] 2
1504 |
1567 |
1505 o 1:e016b03fd86f (draft) [ ] 1
1568 o 1:e016b03fd86f (draft) [ ] 1
1506 |
1569 |
1507 @ 0:a78f55e5508c (draft) [ ] 0
1570 @ 0:a78f55e5508c (draft) [ ] 0
1508
1571
1509 $ hg log -G --hidden
1572 $ hg log -G --hidden
1510 o 2:b0551702f918 (draft) [tip ] 2
1573 o 2:b0551702f918 (draft) [tip ] 2
1511 |
1574 |
1512 o 1:e016b03fd86f (draft) [ ] 1
1575 o 1:e016b03fd86f (draft) [ ] 1
1513 |
1576 |
1514 @ 0:a78f55e5508c (draft) [ ] 0
1577 @ 0:a78f55e5508c (draft) [ ] 0
1515
1578
1516 Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when
1579 Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when
1517 only a subset of those are displayed (because of --rev option)
1580 only a subset of those are displayed (because of --rev option)
1518 $ hg init doindexrev
1581 $ hg init doindexrev
1519 $ cd doindexrev
1582 $ cd doindexrev
1520 $ echo a > a
1583 $ echo a > a
1521 $ hg ci -Am a
1584 $ hg ci -Am a
1522 adding a
1585 adding a
1523 $ hg ci --amend -m aa
1586 $ hg ci --amend -m aa
1524 $ echo b > b
1587 $ echo b > b
1525 $ hg ci -Am b
1588 $ hg ci -Am b
1526 adding b
1589 adding b
1527 $ hg ci --amend -m bb
1590 $ hg ci --amend -m bb
1528 $ echo c > c
1591 $ echo c > c
1529 $ hg ci -Am c
1592 $ hg ci -Am c
1530 adding c
1593 adding c
1531 $ hg ci --amend -m cc
1594 $ hg ci --amend -m cc
1532 $ echo d > d
1595 $ echo d > d
1533 $ hg ci -Am d
1596 $ hg ci -Am d
1534 adding d
1597 adding d
1535 $ hg ci --amend -m dd --config experimental.evolution.track-operation=1
1598 $ hg ci --amend -m dd --config experimental.evolution.track-operation=1
1536 $ hg debugobsolete --index --rev "3+7"
1599 $ hg debugobsolete --index --rev "3+7"
1537 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1600 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1538 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1601 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1539 $ hg debugobsolete --index --rev "3+7" -Tjson
1602 $ hg debugobsolete --index --rev "3+7" -Tjson
1540 [
1603 [
1541 {
1604 {
1542 "date": [0.0, 0],
1605 "date": [0.0, 0],
1543 "flag": 0,
1606 "flag": 0,
1544 "index": 1,
1607 "index": 1,
1545 "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
1608 "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
1546 "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1",
1609 "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1",
1547 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"]
1610 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"]
1548 },
1611 },
1549 {
1612 {
1550 "date": [0.0, 0],
1613 "date": [0.0, 0],
1551 "flag": 0,
1614 "flag": 0,
1552 "index": 3,
1615 "index": 3,
1553 "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
1616 "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
1554 "prednode": "4715cf767440ed891755448016c2b8cf70760c30",
1617 "prednode": "4715cf767440ed891755448016c2b8cf70760c30",
1555 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"]
1618 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"]
1556 }
1619 }
1557 ]
1620 ]
1558
1621
1559 Test the --delete option of debugobsolete command
1622 Test the --delete option of debugobsolete command
1560 $ hg debugobsolete --index
1623 $ hg debugobsolete --index
1561 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1624 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1562 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1625 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1563 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1626 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1564 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1627 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1565 $ hg debugobsolete --delete 1 --delete 3
1628 $ hg debugobsolete --delete 1 --delete 3
1566 deleted 2 obsolescence markers
1629 deleted 2 obsolescence markers
1567 $ hg debugobsolete
1630 $ hg debugobsolete
1568 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1631 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1569 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1632 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
1570
1633
1571 Test adding changeset after obsmarkers affecting it
1634 Test adding changeset after obsmarkers affecting it
1572 (eg: during pull, or unbundle)
1635 (eg: during pull, or unbundle)
1573
1636
1574 $ mkcommit e
1637 $ mkcommit e
1575 $ hg bundle -r . --base .~1 ../bundle-2.hg
1638 $ hg bundle -r . --base .~1 ../bundle-2.hg
1576 1 changesets found
1639 1 changesets found
1577 $ getid .
1640 $ getid .
1578 $ hg --config extensions.strip= strip -r .
1641 $ hg --config extensions.strip= strip -r .
1579 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1642 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1580 saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg
1643 saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg
1581 $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b
1644 $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b
1582 $ hg unbundle ../bundle-2.hg
1645 $ hg unbundle ../bundle-2.hg
1583 adding changesets
1646 adding changesets
1584 adding manifests
1647 adding manifests
1585 adding file changes
1648 adding file changes
1586 added 1 changesets with 1 changes to 1 files
1649 added 1 changesets with 1 changes to 1 files
1587 (run 'hg update' to get a working copy)
1650 (run 'hg update' to get a working copy)
1588 $ hg log -G
1651 $ hg log -G
1589 @ 7:7ae79c5d60f0 (draft) [tip ] dd
1652 @ 7:7ae79c5d60f0 (draft) [tip ] dd
1590 |
1653 |
1591 | o 6:4715cf767440 (draft) [ ] d
1654 | o 6:4715cf767440 (draft) [ ] d
1592 |/
1655 |/
1593 o 5:29346082e4a9 (draft) [ ] cc
1656 o 5:29346082e4a9 (draft) [ ] cc
1594 |
1657 |
1595 o 3:d27fb9b06607 (draft) [ ] bb
1658 o 3:d27fb9b06607 (draft) [ ] bb
1596 |
1659 |
1597 | o 2:6fdef60fcbab (draft) [ ] b
1660 | o 2:6fdef60fcbab (draft) [ ] b
1598 |/
1661 |/
1599 o 1:f9bd49731b0b (draft) [ ] aa
1662 o 1:f9bd49731b0b (draft) [ ] aa
1600
1663
1601
1664
1602 $ cd ..
1665 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now