##// 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:

r34662:eb586ed5 default
r38649:e1987261 default
Show More
test-clone-pull-corruption.t
53 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-clone-pull-corruption.t
Matt Mackall
tests: unify test-clone-pull-corruption
r12412 Corrupt an hg repo with a pull started during an aborted commit
Create two repos, so that one of them can pull from the other one.
$ hg init source
$ cd source
$ touch foo
$ hg add foo
$ hg ci -m 'add foo'
$ hg clone . ../corrupted
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo >> foo
$ hg ci -m 'change foo'
Add a hook to wait 5 seconds and then abort the commit
$ cd ../corrupted
Adrian Buehlmann
test-clone-pull-corruption: adapt for Windows
r16962 $ echo "[hooks]" >> .hg/hgrc
FUJIWARA Katsunori
tests: use double quote to quote arguments in hook for portability...
r24838 $ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc
Matt Mackall
tests: unify test-clone-pull-corruption
r12412
start a commit...
$ touch bar
$ hg add bar
$ hg ci -m 'add bar' &
... and start a pull while the commit is still running
$ sleep 1
$ hg pull ../source 2>/dev/null
pulling from ../source
transaction abort!
rollback completed
abort: pretxncommit hook exited with status 1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 52998019f625
Matt Mackall
tests: unify test-clone-pull-corruption
r12412 (run 'hg update' to get a working copy)
see what happened
$ wait
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..