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

r36799:ffa3026d default
r38649:e1987261 default
Show More
svn-safe-append.py
28 lines | 562 B | text/x-python | PythonLexer
/ tests / svn-safe-append.py
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 #!/usr/bin/env python
Pulkit Goyal
py3: make tests/svn-safe-append.py use absolute_import
r29195 from __future__ import absolute_import
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 __doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.
Without this svn will not detect workspace changes."""
Pulkit Goyal
py3: make tests/svn-safe-append.py use absolute_import
r29195 import os
Augie Fackler
cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime...
r36799 import stat
Pulkit Goyal
py3: make tests/svn-safe-append.py use absolute_import
r29195 import sys
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439
text = sys.argv[1]
fname = sys.argv[2]
f = open(fname, "ab")
try:
Augie Fackler
cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime...
r36799 before = os.fstat(f.fileno())[stat.ST_MTIME]
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 f.write(text)
f.write("\n")
finally:
f.close()
inc = 1
Augie Fackler
cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime...
r36799 now = os.stat(fname)[stat.ST_MTIME]
Peter Arrenbrecht
convert: fix test-convert-svn-* problems with mtime not changing...
r6439 while now == before:
t = now + inc
inc += 1
os.utime(fname, (t, t))
Augie Fackler
cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime...
r36799 now = os.stat(fname)[stat.ST_MTIME]