83 demo.txt = |
83 demo.txt = |
84 [keywordmaps] |
84 [keywordmaps] |
85 Branch = {branches} |
85 Branch = {branches} |
86 $Branch: demobranch $ |
86 $Branch: demobranch $ |
87 % kwshrink should exit silently in empty/invalid repo |
87 % kwshrink should exit silently in empty/invalid repo |
|
88 % symlink nonexisting file |
|
89 % commit hook must fail with missing file |
|
90 cp: a: No such file or directory |
|
91 adding sym |
|
92 sym |
|
93 running hook commit.test: cp a hooktest |
|
94 warning: commit.test hook exited with status 1 |
|
95 % bundle null revision containing empty symlink |
|
96 1 changesets found |
|
97 % pull from bundle |
|
98 pulling from ../test-keyword.hg |
|
99 requesting all changes |
|
100 adding changesets |
|
101 adding manifests |
|
102 adding file changes |
|
103 added 1 changesets with 1 changes to 1 files |
|
104 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 % cat |
105 % cat |
89 expand $Id$ |
106 expand $Id$ |
90 do not process $Id: |
107 do not process $Id: |
91 xxx $ |
108 xxx $ |
92 expand $Id$ |
109 expand $Id$ |
94 xxx $ |
111 xxx $ |
95 ignore $Id$ |
112 ignore $Id$ |
96 % addremove |
113 % addremove |
97 adding a |
114 adding a |
98 adding b |
115 adding b |
99 adding sym |
|
100 % status |
116 % status |
101 A a |
117 A a |
102 A b |
118 A b |
103 A sym |
|
104 % default keyword expansion including commit hook |
119 % default keyword expansion including commit hook |
105 % interrupted commit should not change state or run commit hook |
120 % interrupted commit should not change state or run commit hook |
106 a |
121 a |
107 b |
122 b |
108 sym |
|
109 transaction abort! |
123 transaction abort! |
110 rollback completed |
124 rollback completed |
111 abort: empty commit message |
125 abort: empty commit message |
112 % status |
126 % status |
113 A a |
127 A a |
114 A b |
128 A b |
115 A sym |
|
116 % commit |
129 % commit |
117 a |
130 a |
118 b |
131 b |
119 sym |
|
120 overwriting a expanding keywords |
132 overwriting a expanding keywords |
121 running hook commit.test: cp a hooktest |
133 running hook commit.test: cp a hooktest |
122 % status |
134 % status |
123 ? hooktest |
135 ? hooktest |
124 % identify |
136 % identify |
125 f782df5f9602 |
137 cecf1e2cc3d3 |
126 % cat |
138 % cat |
127 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
139 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
128 do not process $Id: |
140 do not process $Id: |
129 xxx $ |
141 xxx $ |
130 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
142 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
131 do not process $Id: |
143 do not process $Id: |
132 xxx $ |
144 xxx $ |
133 ignore $Id$ |
145 ignore $Id$ |
134 % hg kwcat |
146 % hg kwcat |
135 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
147 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
136 do not process $Id: |
148 do not process $Id: |
137 xxx $ |
149 xxx $ |
138 ignore $Id$ |
150 ignore $Id$ |
139 a |
151 a |
140 % diff a hooktest |
152 % diff a hooktest |
142 % touch |
154 % touch |
143 % status |
155 % status |
144 % update |
156 % update |
145 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
157 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
146 % cat |
158 % cat |
147 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
159 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
148 do not process $Id: |
160 do not process $Id: |
149 xxx $ |
161 xxx $ |
150 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
162 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
151 do not process $Id: |
163 do not process $Id: |
152 xxx $ |
164 xxx $ |
153 ignore $Id$ |
165 ignore $Id$ |
154 % check whether expansion is filewise |
166 % check whether expansion is filewise |
155 % commit c |
167 % commit c |
156 adding c |
168 adding c |
157 % force expansion |
169 % force expansion |
158 overwriting a expanding keywords |
170 overwriting a expanding keywords |
159 overwriting c expanding keywords |
171 overwriting c expanding keywords |
160 % compare changenodes in a c |
172 % compare changenodes in a c |
161 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
173 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
162 do not process $Id: |
174 do not process $Id: |
163 xxx $ |
175 xxx $ |
164 $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ |
176 $Id: c,v c033759cd8fd 1970/01/01 00:00:02 user $ |
165 tests for different changenodes |
177 tests for different changenodes |
166 % qinit -c |
178 % qinit -c |
167 % qimport |
179 % qimport |
168 % qcommit |
180 % qcommit |
169 % keywords should not be expanded in patch |
181 % keywords should not be expanded in patch |
170 # HG changeset patch |
182 # HG changeset patch |
171 # User User Name <user@example.com> |
183 # User User Name <user@example.com> |
172 # Date 1 0 |
184 # Date 2 0 |
173 # Node ID ba4426d1938ec9673e03ab274d88c44e24618f7f |
185 # Node ID c033759cd8fd162b7863dc4e5d1eea433603880f |
174 # Parent f782df5f9602483b4e51c31a12315f353bba380c |
186 # Parent cecf1e2cc3d3447fcc20dd4eac5c4faa8a615df3 |
175 cndiff |
187 cndiff |
176 |
188 |
177 diff -r f782df5f9602 -r ba4426d1938e c |
189 diff -r cecf1e2cc3d3 -r c033759cd8fd c |
178 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
190 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
179 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
191 +++ b/c Thu Jan 01 00:00:02 1970 +0000 |
180 @@ -0,0 +1,2 @@ |
192 @@ -0,0 +1,2 @@ |
181 +$Id$ |
193 +$Id$ |
182 +tests for different changenodes |
194 +tests for different changenodes |
183 % qpop |
195 % qpop |
184 Patch queue now empty |
196 Patch queue now empty |
185 % qgoto - should imply qpush |
197 % qgoto - should imply qpush |
186 applying mqtest.diff |
198 applying mqtest.diff |
187 Now at: mqtest.diff |
199 Now at: mqtest.diff |
188 % cat |
200 % cat |
189 $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ |
201 $Id: c,v c033759cd8fd 1970/01/01 00:00:02 user $ |
190 tests for different changenodes |
202 tests for different changenodes |
191 % qpop and move on |
203 % qpop and move on |
192 Patch queue now empty |
204 Patch queue now empty |
193 % copy |
205 % copy |
194 % kwfiles added |
206 % kwfiles added |
197 % commit |
209 % commit |
198 c |
210 c |
199 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
211 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
200 overwriting c expanding keywords |
212 overwriting c expanding keywords |
201 % cat a c |
213 % cat a c |
202 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
214 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
203 do not process $Id: |
215 do not process $Id: |
204 xxx $ |
216 xxx $ |
205 expand $Id: c,v 0ba462c0f077 1970/01/01 00:00:01 user $ |
217 expand $Id: c,v 1fed52d26fd0 1970/01/01 00:00:02 user $ |
206 do not process $Id: |
218 do not process $Id: |
207 xxx $ |
219 xxx $ |
208 % touch copied c after 1 second |
220 % touch copied c after 1 second |
209 % status |
221 % status |
210 % kwfiles |
222 % kwfiles |
211 a |
223 a |
212 c |
224 c |
213 % diff --rev |
225 % diff --rev |
214 diff -r f782df5f9602 c |
226 diff -r cecf1e2cc3d3 c |
215 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
227 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
216 @@ -0,0 +1,3 @@ |
228 @@ -0,0 +1,3 @@ |
217 +expand $Id$ |
229 +expand $Id$ |
218 +do not process $Id: |
230 +do not process $Id: |
219 +xxx $ |
231 +xxx $ |
233 demo.txt = |
245 demo.txt = |
234 [keywordmaps] |
246 [keywordmaps] |
235 Xinfo = {author}: {desc} |
247 Xinfo = {author}: {desc} |
236 $Xinfo: test: hg keyword config and expansion example $ |
248 $Xinfo: test: hg keyword config and expansion example $ |
237 % cat |
249 % cat |
238 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
250 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
239 do not process $Id: |
251 do not process $Id: |
240 xxx $ |
252 xxx $ |
241 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
253 expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
242 do not process $Id: |
254 do not process $Id: |
243 xxx $ |
255 xxx $ |
244 ignore $Id$ |
256 ignore $Id$ |
245 % hg kwcat |
257 % hg kwcat |
246 expand $Id: a f782df5f9602 Thu, 01 Jan 1970 00:00:00 +0000 user $ |
258 expand $Id: a cecf1e2cc3d3 Thu, 01 Jan 1970 00:00:01 +0000 user $ |
247 do not process $Id: |
259 do not process $Id: |
248 xxx $ |
260 xxx $ |
249 ignore $Id$ |
261 ignore $Id$ |
250 a |
262 a |
251 % interrupted commit should not change state |
263 % interrupted commit should not change state |
258 % commit |
270 % commit |
259 a |
271 a |
260 overwriting a expanding keywords |
272 overwriting a expanding keywords |
261 % status |
273 % status |
262 % cat |
274 % cat |
263 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
275 expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
264 do not process $Id: |
276 do not process $Id: |
265 xxx $ |
277 xxx $ |
266 $Xinfo: User Name <user@example.com>: firstline $ |
278 $Xinfo: User Name <user@example.com>: firstline $ |
267 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
279 expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
268 do not process $Id: |
280 do not process $Id: |
269 xxx $ |
281 xxx $ |
270 $Xinfo: User Name <user@example.com>: firstline $ |
282 $Xinfo: User Name <user@example.com>: firstline $ |
271 ignore $Id$ |
283 ignore $Id$ |
272 % hg kwcat |
284 % hg kwcat |
273 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
285 expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
274 do not process $Id: |
286 do not process $Id: |
275 xxx $ |
287 xxx $ |
276 $Xinfo: User Name <user@example.com>: firstline $ |
288 $Xinfo: User Name <user@example.com>: firstline $ |
277 ignore $Id$ |
289 ignore $Id$ |
278 a |
290 a |
282 rolling back last transaction |
294 rolling back last transaction |
283 % status |
295 % status |
284 R a |
296 R a |
285 % revert a |
297 % revert a |
286 % cat a |
298 % cat a |
287 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
299 expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
288 do not process $Id: |
300 do not process $Id: |
289 xxx $ |
301 xxx $ |
290 $Xinfo: User Name <user@example.com>: firstline $ |
302 $Xinfo: User Name <user@example.com>: firstline $ |
291 % clone to test incoming |
303 % clone to test incoming |
292 requesting all changes |
304 requesting all changes |
293 adding changesets |
305 adding changesets |
294 adding manifests |
306 adding manifests |
295 adding file changes |
307 adding file changes |
296 added 1 changesets with 3 changes to 3 files |
308 added 2 changesets with 3 changes to 3 files |
297 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
309 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
298 % incoming |
310 % incoming |
299 comparing with test-keyword/Test |
311 comparing with test-keyword/Test |
300 searching for changes |
312 searching for changes |
301 changeset: 1:0729690beff6 |
313 changeset: 2:a576e5647736 |
302 tag: tip |
314 tag: tip |
303 user: User Name <user@example.com> |
315 user: User Name <user@example.com> |
304 date: Thu Jan 01 00:00:02 1970 +0000 |
316 date: Thu Jan 01 00:00:03 1970 +0000 |
305 summary: firstline |
317 summary: firstline |
306 |
318 |
307 % commit rejecttest |
319 % commit rejecttest |
308 a |
320 a |
309 overwriting a expanding keywords |
321 overwriting a expanding keywords |
310 % export |
322 % export |
311 % import |
323 % import |
312 applying ../rejecttest.diff |
324 applying ../rejecttest.diff |
313 % cat |
325 % cat |
314 expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
326 expand $Id: a 97b8d4afd122 Thu, 01 Jan 1970 00:00:04 +0000 user $ rejecttest |
315 do not process $Id: rejecttest |
327 do not process $Id: rejecttest |
316 xxx $ |
328 xxx $ |
317 $Xinfo: User Name <user@example.com>: rejects? $ |
329 $Xinfo: User Name <user@example.com>: rejects? $ |
318 expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
330 expand $Id: a 97b8d4afd122 Thu, 01 Jan 1970 00:00:04 +0000 user $ rejecttest |
319 do not process $Id: rejecttest |
331 do not process $Id: rejecttest |
320 xxx $ |
332 xxx $ |
321 $Xinfo: User Name <user@example.com>: rejects? $ |
333 $Xinfo: User Name <user@example.com>: rejects? $ |
322 ignore $Id$ |
334 ignore $Id$ |
323 |
335 |
333 abort: outstanding uncommitted changes in given files |
345 abort: outstanding uncommitted changes in given files |
334 x/a |
346 x/a |
335 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
347 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
336 overwriting x/a expanding keywords |
348 overwriting x/a expanding keywords |
337 % cat a |
349 % cat a |
338 expand $Id: x/a f27c134d2d9b Thu, 01 Jan 1970 00:00:03 +0000 user $ |
350 expand $Id: x/a 6ae8e7fbf16c Thu, 01 Jan 1970 00:00:04 +0000 user $ |
339 do not process $Id: |
351 do not process $Id: |
340 xxx $ |
352 xxx $ |
341 $Xinfo: User Name <user@example.com>: xa $ |
353 $Xinfo: User Name <user@example.com>: xa $ |
342 % kwshrink a inside directory x |
354 % kwshrink a inside directory x |
343 overwriting x/a shrinking keywords |
355 overwriting x/a shrinking keywords |