##// END OF EJS Templates
patch: don't separate \r and \n when colorizing diff output...
patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

File last commit:

r38561:ece3f2d0 default
r38649:e1987261 default
Show More
test-manifest.t
95 lines | 1.5 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
r12328 Source bundle was generated with the following script:
Adrian Buehlmann
tests: unify test-manifest*
r12253 # hg init
# echo a > a
# ln -s a l
# hg ci -Ama -d'0 0'
# mkdir b
# echo a > b/a
# chmod +x b/a
# hg ci -Amb -d'1 0'
$ hg init
Gregory Szorc
commands: document the layering violation in `manifest --all`...
r37455 $ hg unbundle "$TESTDIR/bundles/test-manifest.hg"
adding changesets
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
new changesets b73562a03cfe:5bdc995175ba
(run 'hg update' to get a working copy)
Adrian Buehlmann
tests: unify test-manifest*
r12253
The next call is expected to return nothing:
$ hg manifest
$ hg co
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg manifest
a
b/a
l
Matt Mackall
files: add new command unifying locate and manifest functionality
r22423 $ hg files -vr .
2 a
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 2 x b/a
Matt Mackall
files: add new command unifying locate and manifest functionality
r22423 1 l l
$ hg files -r . -X b
a
l
Yuya Nishihara
files: automatically populate fields referenced from template
r38559 $ hg files -T '{path} {size} {flags}\n'
a 2
b/a 2 x
l 1 l
Yuya Nishihara
files: add support for log-like template keywords and functions...
r38560 $ hg files -T '{path} {node|shortest}\n' -r.
a 5bdc
b/a 5bdc
l 5bdc
Matt Mackall
files: add new command unifying locate and manifest functionality
r22423
Adrian Buehlmann
tests: unify test-manifest*
r12253 $ hg manifest -v
644 a
755 * b/a
644 @ l
Yuya Nishihara
manifest: add support for log-like template keywords and functions...
r38561 $ hg manifest -T '{path} {rev}\n'
a 1
b/a 1
l 1
Adrian Buehlmann
tests: unify test-manifest*
r12253
$ hg manifest --debug
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
$ hg manifest -r 0
a
l
$ hg manifest -r 1
a
b/a
l
$ hg manifest -r tip
a
b/a
l
$ hg manifest tip
a
b/a
l
Adrian Buehlmann
add new option --all to manifest command...
r14399 $ hg manifest --all
Gregory Szorc
commands: don't violate storage abstractions in `manifest --all`...
r37456 a
b/a
l
Adrian Buehlmann
tests: unify test-manifest*
r12253
The next two calls are expected to abort:
$ hg manifest -r 2
abort: unknown revision '2'!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-manifest*
r12253
$ hg manifest -r tip tip
abort: please specify just one revision
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]