Show More
@@ -1,3 +1,8 b'' | |||||
|
1 | $ cat > $TESTTMP/filter.py <<EOF | |||
|
2 | > from __future__ import print_function | |||
|
3 | > import sys, re | |||
|
4 | > print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="") | |||
|
5 | > EOF | |||
1 |
|
6 | |||
2 |
$ |
|
7 | $ cat <<EOF >> $HGRCPATH | |
3 | > [extensions] |
|
8 | > [extensions] | |
@@ -175,8 +180,7 b' the python call below wraps continuation' | |||||
175 | of the very long subject line |
|
180 | of the very long subject line | |
176 | pull (minimal config) |
|
181 | pull (minimal config) | |
177 |
|
182 | |||
178 |
$ hg --traceback --cwd b pull ../a | |
|
183 | $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py | |
179 | > $PYTHON -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),' |
|
|||
180 | pulling from ../a |
|
184 | pulling from ../a | |
181 | searching for changes |
|
185 | searching for changes | |
182 | adding changesets |
|
186 | adding changesets | |
@@ -205,6 +209,7 b' pull (minimal config)' | |||||
205 | @@ -1,1 +1,2 @@ a |
|
209 | @@ -1,1 +1,2 @@ a | |
206 | +a |
|
210 | +a | |
207 | (run 'hg update' to get a working copy) |
|
211 | (run 'hg update' to get a working copy) | |
|
212 | ||||
208 | $ cat <<EOF >> $HGRCPATH |
|
213 | $ cat <<EOF >> $HGRCPATH | |
209 | > [notify] |
|
214 | > [notify] | |
210 | > config = `pwd`/.notify.conf |
|
215 | > config = `pwd`/.notify.conf | |
@@ -228,8 +233,7 b' pull' | |||||
228 |
|
233 | |||
229 | $ hg --cwd b rollback |
|
234 | $ hg --cwd b rollback | |
230 | repository tip rolled back to revision 0 (undo pull) |
|
235 | repository tip rolled back to revision 0 (undo pull) | |
231 |
$ hg --traceback --cwd b pull ../a | |
|
236 | $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py | |
232 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
233 | pulling from ../a |
|
237 | pulling from ../a | |
234 | searching for changes |
|
238 | searching for changes | |
235 | adding changesets |
|
239 | adding changesets | |
@@ -254,8 +258,7 b' pull' | |||||
254 | diff -r cb9a9f314b8b -r 0647d048b600 a |
|
258 | diff -r cb9a9f314b8b -r 0647d048b600 a | |
255 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
259 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
256 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
260 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
257 | @@ -1,1 +1,2 @@ |
|
261 | @@ -1,1 +1,2 @@ a | |
258 | a |
|
|||
259 | +a |
|
262 | +a | |
260 | (run 'hg update' to get a working copy) |
|
263 | (run 'hg update' to get a working copy) | |
261 |
|
264 | |||
@@ -272,8 +275,7 b' pull' | |||||
272 |
|
275 | |||
273 | $ hg --cwd b rollback |
|
276 | $ hg --cwd b rollback | |
274 | repository tip rolled back to revision 0 (undo pull) |
|
277 | repository tip rolled back to revision 0 (undo pull) | |
275 |
$ hg --traceback --cwd b pull ../a | |
|
278 | $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py | |
276 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
277 | pulling from ../a |
|
279 | pulling from ../a | |
278 | searching for changes |
|
280 | searching for changes | |
279 | adding changesets |
|
281 | adding changesets | |
@@ -294,17 +296,14 b' pull' | |||||
294 | changeset 0647d048b600 in b |
|
296 | changeset 0647d048b600 in b | |
295 | description: b |
|
297 | description: b | |
296 | diffstat: |
|
298 | diffstat: | |
297 |
|
299 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | ||
298 | a | 1 + |
|
|||
299 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
|||
300 |
|
300 | |||
301 | diffs (6 lines): |
|
301 | diffs (6 lines): | |
302 |
|
302 | |||
303 | diff -r cb9a9f314b8b -r 0647d048b600 a |
|
303 | diff -r cb9a9f314b8b -r 0647d048b600 a | |
304 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
304 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
305 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
305 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
306 | @@ -1,1 +1,2 @@ |
|
306 | @@ -1,1 +1,2 @@ a | |
307 | a |
|
|||
308 | +a |
|
307 | +a | |
309 | (run 'hg update' to get a working copy) |
|
308 | (run 'hg update' to get a working copy) | |
310 |
|
309 | |||
@@ -321,8 +320,7 b' test merge' | |||||
321 | (branch merge, don't forget to commit) |
|
320 | (branch merge, don't forget to commit) | |
322 | $ hg ci -m merge -d '3 0' |
|
321 | $ hg ci -m merge -d '3 0' | |
323 | $ cd .. |
|
322 | $ cd .. | |
324 |
$ hg --traceback --cwd b pull ../a | |
|
323 | $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py | |
325 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
326 | pulling from ../a |
|
324 | pulling from ../a | |
327 | searching for changes |
|
325 | searching for changes | |
328 | adding changesets |
|
326 | adding changesets | |
@@ -343,17 +341,14 b' test merge' | |||||
343 | changeset 0a184ce6067f in b |
|
341 | changeset 0a184ce6067f in b | |
344 | description: adda2 |
|
342 | description: adda2 | |
345 | diffstat: |
|
343 | diffstat: | |
346 |
|
344 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | ||
347 | a | 1 + |
|
|||
348 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
|||
349 |
|
345 | |||
350 | diffs (6 lines): |
|
346 | diffs (6 lines): | |
351 |
|
347 | |||
352 | diff -r cb9a9f314b8b -r 0a184ce6067f a |
|
348 | diff -r cb9a9f314b8b -r 0a184ce6067f a | |
353 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
349 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
354 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
|
350 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 | |
355 | @@ -1,1 +1,2 @@ |
|
351 | @@ -1,1 +1,2 @@ a | |
356 | a |
|
|||
357 | +a |
|
352 | +a | |
358 | Content-Type: text/plain; charset="us-ascii" |
|
353 | Content-Type: text/plain; charset="us-ascii" | |
359 | MIME-Version: 1.0 |
|
354 | MIME-Version: 1.0 | |
@@ -380,7 +375,7 b' non-ascii content and truncation of mult' | |||||
380 | $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ |
|
375 | $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ | |
381 | > -m `$PYTHON -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'` |
|
376 | > -m `$PYTHON -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'` | |
382 | $ hg --traceback --cwd b --encoding utf-8 pull ../a | \ |
|
377 | $ hg --traceback --cwd b --encoding utf-8 pull ../a | \ | |
383 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
378 | > $PYTHON $TESTTMP/filter.py | |
384 | pulling from ../a |
|
379 | pulling from ../a | |
385 | searching for changes |
|
380 | searching for changes | |
386 | adding changesets |
|
381 | adding changesets | |
@@ -401,18 +396,14 b' non-ascii content and truncation of mult' | |||||
401 | changeset 7ea05ad269dc in b |
|
396 | changeset 7ea05ad269dc in b | |
402 | description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) |
|
397 | description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) | |
403 | diffstat: |
|
398 | diffstat: | |
404 |
|
399 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | ||
405 | a | 1 + |
|
|||
406 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
|||
407 |
|
400 | |||
408 | diffs (7 lines): |
|
401 | diffs (7 lines): | |
409 |
|
402 | |||
410 | diff -r 6a0cf76b2701 -r 7ea05ad269dc a |
|
403 | diff -r 6a0cf76b2701 -r 7ea05ad269dc a | |
411 | --- a/a Thu Jan 01 00:00:03 1970 +0000 |
|
404 | --- a/a Thu Jan 01 00:00:03 1970 +0000 | |
412 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
405 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
413 | @@ -1,2 +1,3 @@ |
|
406 | @@ -1,2 +1,3 @@ a a | |
414 | a |
|
|||
415 | a |
|
|||
416 | +a |
|
407 | +a | |
417 | (run 'hg update' to get a working copy) |
|
408 | (run 'hg update' to get a working copy) | |
418 |
|
409 | |||
@@ -435,7 +426,7 b' long lines' | |||||
435 | added 1 changesets with 1 changes to 1 files |
|
426 | added 1 changesets with 1 changes to 1 files | |
436 | notify: sending 2 subscribers 1 changes |
|
427 | notify: sending 2 subscribers 1 changes | |
437 | (run 'hg update' to get a working copy) |
|
428 | (run 'hg update' to get a working copy) | |
438 | $ $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", file("b/mbox").read()),' |
|
429 | $ $PYTHON $TESTTMP/filter.py < b/mbox | |
439 | From test@test.com ... ... .. ..:..:.. .... (re) |
|
430 | From test@test.com ... ... .. ..:..:.. .... (re) | |
440 | Content-Type: text/plain; charset="us-ascii" |
|
431 | Content-Type: text/plain; charset="us-ascii" | |
441 | MIME-Version: 1.0 |
|
432 | MIME-Version: 1.0 | |
@@ -451,19 +442,14 b' long lines' | |||||
451 | changeset e0be44cf638b in b |
|
442 | changeset e0be44cf638b in b | |
452 | description: long line |
|
443 | description: long line | |
453 | diffstat: |
|
444 | diffstat: | |
454 |
|
445 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | ||
455 | a | 1 + |
|
|||
456 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
|||
457 |
|
446 | |||
458 | diffs (8 lines): |
|
447 | diffs (8 lines): | |
459 |
|
448 | |||
460 | diff -r 7ea05ad269dc -r e0be44cf638b a |
|
449 | diff -r 7ea05ad269dc -r e0be44cf638b a | |
461 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
450 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
462 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
451 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
463 | @@ -1,3 +1,4 @@ |
|
452 | @@ -1,3 +1,4 @@ a a a | |
464 | a |
|
|||
465 | a |
|
|||
466 | a |
|
|||
467 | +nonononononononononononononononononononononononononononononononononononono= |
|
453 | +nonononononononononononononononononononononononononononononononononononono= | |
468 | nononononononononononononononononononononononononononononononononononononon= |
|
454 | nononononononononononononononononononononononononononononononononononononon= | |
469 | ononononononononononononononononononononononononononononononononononononono= |
|
455 | ononononononononononononononononononononononononononononononononononononono= | |
@@ -500,8 +486,7 b' long lines' | |||||
500 | (branches are permanent and global, did you want a bookmark?) |
|
486 | (branches are permanent and global, did you want a bookmark?) | |
501 | $ echo a >> a/a |
|
487 | $ echo a >> a/a | |
502 | $ hg --cwd a ci -m test -d '1 0' |
|
488 | $ hg --cwd a ci -m test -d '1 0' | |
503 |
$ hg --traceback --cwd b pull ../a | |
|
489 | $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py | |
504 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
505 | pulling from ../a |
|
490 | pulling from ../a | |
506 | searching for changes |
|
491 | searching for changes | |
507 | adding changesets |
|
492 | adding changesets | |
@@ -530,8 +515,7 b' from different branch' | |||||
530 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
515 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
531 | $ echo a >> a/a |
|
516 | $ echo a >> a/a | |
532 | $ hg --cwd a ci -m test -d '1 0' |
|
517 | $ hg --cwd a ci -m test -d '1 0' | |
533 |
$ hg --traceback --cwd b pull ../a | |
|
518 | $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py | |
534 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
535 | pulling from ../a |
|
519 | pulling from ../a | |
536 | searching for changes |
|
520 | searching for changes | |
537 | adding changesets |
|
521 | adding changesets | |
@@ -559,8 +543,7 b' default template:' | |||||
559 | $ mv "$HGRCPATH.new" $HGRCPATH |
|
543 | $ mv "$HGRCPATH.new" $HGRCPATH | |
560 | $ echo a >> a/a |
|
544 | $ echo a >> a/a | |
561 | $ hg --cwd a commit -m 'default template' |
|
545 | $ hg --cwd a commit -m 'default template' | |
562 |
$ hg --cwd b pull ../a -q | |
|
546 | $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py | |
563 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
564 | Content-Type: text/plain; charset="us-ascii" |
|
547 | Content-Type: text/plain; charset="us-ascii" | |
565 | MIME-Version: 1.0 |
|
548 | MIME-Version: 1.0 | |
566 | Content-Transfer-Encoding: 7bit |
|
549 | Content-Transfer-Encoding: 7bit | |
@@ -589,8 +572,7 b' with style:' | |||||
589 | > EOF |
|
572 | > EOF | |
590 | $ echo a >> a/a |
|
573 | $ echo a >> a/a | |
591 | $ hg --cwd a commit -m 'with style' |
|
574 | $ hg --cwd a commit -m 'with style' | |
592 |
$ hg --cwd b pull ../a -q | |
|
575 | $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py | |
593 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
594 | Content-Type: text/plain; charset="us-ascii" |
|
576 | Content-Type: text/plain; charset="us-ascii" | |
595 | MIME-Version: 1.0 |
|
577 | MIME-Version: 1.0 | |
596 | Content-Transfer-Encoding: 7bit |
|
578 | Content-Transfer-Encoding: 7bit | |
@@ -613,8 +595,7 b' with template (overrides style):' | |||||
613 | > EOF |
|
595 | > EOF | |
614 | $ echo a >> a/a |
|
596 | $ echo a >> a/a | |
615 | $ hg --cwd a commit -m 'with template' |
|
597 | $ hg --cwd a commit -m 'with template' | |
616 |
$ hg --cwd b pull ../a -q | |
|
598 | $ hg --cwd b pull ../a -q | $PYTHON $TESTTMP/filter.py | |
617 | > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
|||
618 | Content-Type: text/plain; charset="us-ascii" |
|
599 | Content-Type: text/plain; charset="us-ascii" | |
619 | MIME-Version: 1.0 |
|
600 | MIME-Version: 1.0 | |
620 | Content-Transfer-Encoding: 7bit |
|
601 | Content-Transfer-Encoding: 7bit |
General Comments 0
You need to be logged in to leave comments.
Login now