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

r37918:bbff7170 @28 default
r38649:e1987261 default
Show More
test-status-inprocess.py
47 lines | 996 B | text/x-python | PythonLexer
/ tests / test-status-inprocess.py
timeless
tests: use /usr/bin/env python for test-status-inprocess.py...
r28824 #!/usr/bin/env python
Robert Stanca
py3: use print_function in test-status-inprocess.py
r28766 from __future__ import absolute_import, print_function
Yuya Nishihara
tests: stop direct symbol import of mercurial modules in test-status-inprocess
r28843
Augie Fackler
tests: fix test-status-inprocess.py on Python 3...
r37918 import sys
Yuya Nishihara
tests: stop direct symbol import of mercurial modules in test-status-inprocess
r28843 from mercurial import (
commands,
localrepo,
ui as uimod,
Robert Stanca
py3: use absolute_import in test-status-inprocess.py
r28765 )
Ronny Pfannschmidt
add a test for the inprocess status dirstate race
r10838
Augie Fackler
tests: fix test-status-inprocess.py on Python 3...
r37918 print_ = print
def print(*args, **kwargs):
"""print() wrapper that flushes stdout buffers to avoid py3 buffer issues
We could also just write directly to sys.stdout.buffer the way the
ui object will, but this was easier for porting the test.
"""
print_(*args, **kwargs)
sys.stdout.flush()
Yuya Nishihara
ui: factor out ui.load() to create a ui without loading configs (API)...
r30559 u = uimod.ui.load()
Ronny Pfannschmidt
add a test for the inprocess status dirstate race
r10838
Robert Stanca
py3: use print_function in test-status-inprocess.py
r28766 print('% creating repo')
Pulkit Goyal
py3: add b'' prefixes to tests/test-status-inprocess.py...
r37678 repo = localrepo.localrepository(u, b'.', create=True)
Ronny Pfannschmidt
add a test for the inprocess status dirstate race
r10838
f = open('test.py', 'w')
try:
f.write('foo\n')
finally:
f.close
Robert Stanca
py3: use print_function in test-status-inprocess.py
r28766 print('% add and commit')
Pulkit Goyal
py3: add b'' prefixes to tests/test-status-inprocess.py...
r37678 commands.add(u, repo, b'test.py')
commands.commit(u, repo, message=b'*')
Yuya Nishihara
tests: stop direct symbol import of mercurial modules in test-status-inprocess
r28843 commands.status(u, repo, clean=True)
Ronny Pfannschmidt
add a test for the inprocess status dirstate race
r10838
Robert Stanca
py3: use print_function in test-status-inprocess.py
r28766 print('% change')
Ronny Pfannschmidt
add a test for the inprocess status dirstate race
r10838 f = open('test.py', 'w')
try:
f.write('bar\n')
finally:
f.close()
# this would return clean instead of changed before the fix
Yuya Nishihara
tests: stop direct symbol import of mercurial modules in test-status-inprocess
r28843 commands.status(u, repo, clean=True, modified=True)