upstream/mercurial-mirror Files · tests/svn-safe-append.py

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.

Augie Fackler - - Load All Authors

File last commit:

r36799:ffa3026d default


                r38649:e1987261

default

Download file

             svn-safe-append.py
        
                    28 lines
            
             | 562 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / svn-safe-append.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      from __future__ import absolute_import

      __doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.

      Without this svn will not detect workspace changes."""

      import os

      import stat

      import sys

      text = sys.argv[1]

      fname = sys.argv[2]

      f = open(fname, "ab")

      try:

          before = os.fstat(f.fileno())[stat.ST_MTIME]

          f.write(text)

          f.write("\n")

      finally:

          f.close()

      inc = 1

      now = os.stat(fname)[stat.ST_MTIME]

      while now == before:

          t = now + inc

          inc += 1

          os.utime(fname, (t, t))

          now = os.stat(fname)[stat.ST_MTIME]

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#!/usr/bin/env python

				from __future__ import absolute_import

				__doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.
				Without this svn will not detect workspace changes."""

				import os
				import stat
				import sys

				text = sys.argv[1]
				fname = sys.argv[2]

				f = open(fname, "ab")
				try:
				before = os.fstat(f.fileno())[stat.ST_MTIME]
				f.write(text)
				f.write("\n")
				finally:
				f.close()
				inc = 1
				now = os.stat(fname)[stat.ST_MTIME]
				while now == before:
				t = now + inc
				inc += 1
				os.utime(fname, (t, t))
				now = os.stat(fname)[stat.ST_MTIME]