Mercurial > hg
comparison tests/test-status.t @ 29000:2d3837a4bded stable
log: fix status template to list copy source per dest (issue5155)
Before, copied files were assumed as "A" (added) and listed followed by
non-copy added files. This could double entries of a copy if it had "M"
(modified) state.
So, this patch makes the template check if a file is included in copies dict.
This way, entries should never be doubled.
The output of "log -Tstatus -C" does not always agree with "status -C --change"
due to the bug of "status", which is documented in test-status.t. See also
2963d5c9d90b.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Thu, 24 Mar 2016 22:55:56 +0900 |
parents | 215b47449e47 |
children | 6a98f9408a50 |
comparison
equal
deleted
inserted
replaced
28999:790c076cd4a2 | 29000:2d3837a4bded |
---|---|
511 R b | 511 R b |
512 $ hg st --config ui.statuscopies=false | 512 $ hg st --config ui.statuscopies=false |
513 M a | 513 M a |
514 R b | 514 R b |
515 | 515 |
516 using log status template (issue5155) | |
517 $ hg log -Tstatus -r 'wdir()' -C | |
518 changeset: 2147483647:ffffffffffff | |
519 parent: 0:8c55c58b4c0e | |
520 user: test | |
521 date: * (glob) | |
522 files: | |
523 M a | |
524 b | |
525 R b | |
526 | |
527 | |
516 Other "bug" highlight, the revision status does not report the copy information. | 528 Other "bug" highlight, the revision status does not report the copy information. |
517 This is buggy behavior. | 529 This is buggy behavior. |
518 | 530 |
519 $ hg commit -m 'blah' | 531 $ hg commit -m 'blah' |
520 $ hg st --copies --change . | 532 $ hg st --copies --change . |
521 M a | 533 M a |
522 R b | 534 R b |
523 | 535 |
524 $ cd .. | 536 using log status template, the copy information is displayed correctly. |
537 $ hg log -Tstatus -r. -C | |
538 changeset: 1:6685fde43d21 | |
539 tag: tip | |
540 user: test | |
541 date: * (glob) | |
542 summary: blah | |
543 files: | |
544 M a | |
545 b | |
546 R b | |
547 | |
548 | |
549 $ cd .. |