upstream/mercurial-mirror Files · tests/test-filelog.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:

r37952:f71c97d9 default


                r38649:e1987261

default

Download file

             test-filelog.py
        
                    63 lines
            
             | 1.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-filelog.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      """

      Tests the behavior of filelog w.r.t. data starting with '\1\n'

      """

      from __future__ import absolute_import, print_function

      from mercurial.node import (

          hex,

          nullid,

      )

      from mercurial import (

          hg,

          ui as uimod,

      )

      myui = uimod.ui.load()

      repo = hg.repository(myui, path=b'.', create=True)

      fl = repo.file(b'foobar')

      def addrev(text, renamed=False):

          if renamed:

              # data doesn't matter. Just make sure filelog.renamed() returns True

              meta = {b'copyrev': hex(nullid), b'copy': b'bar'}

          else:

              meta = {}

          lock = t = None

          try:

              lock = repo.lock()

              t = repo.transaction(b'commit')

              node = fl.add(text, meta, t, 0, nullid, nullid)

              return node

          finally:

              if t:

                  t.close()

              if lock:

                  lock.release()

      def error(text):

          print('ERROR: ' + text)

      textwith = b'\1\nfoo'

      without = b'foo'

      node = addrev(textwith)

      if not textwith == fl.read(node):

          error('filelog.read for data starting with \\1\\n')

      if fl.cmp(node, textwith) or not fl.cmp(node, without):

          error('filelog.cmp for data starting with \\1\\n')

      if fl.size(0) != len(textwith):

          error('FIXME: This is a known failure of filelog.size for data starting '

              'with \\1\\n')

      node = addrev(textwith, renamed=True)

      if not textwith == fl.read(node):

          error('filelog.read for a renaming + data starting with \\1\\n')

      if fl.cmp(node, textwith) or not fl.cmp(node, without):

          error('filelog.cmp for a renaming + data starting with \\1\\n')

      if fl.size(1) != len(textwith):

          error('filelog.size for a renaming + data starting with \\1\\n')

      print('OK.')

	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
				"""
				Tests the behavior of filelog w.r.t. data starting with '\1\n'
				"""
				from __future__ import absolute_import, print_function

				from mercurial.node import (
				hex,
				nullid,
				)
				from mercurial import (
				hg,
				ui as uimod,
				)

				myui = uimod.ui.load()
				repo = hg.repository(myui, path=b'.', create=True)

				fl = repo.file(b'foobar')

				def addrev(text, renamed=False):
				if renamed:
				# data doesn't matter. Just make sure filelog.renamed() returns True
				meta = {b'copyrev': hex(nullid), b'copy': b'bar'}
				else:
				meta = {}

				lock = t = None
				try:
				lock = repo.lock()
				t = repo.transaction(b'commit')
				node = fl.add(text, meta, t, 0, nullid, nullid)
				return node
				finally:
				if t:
				t.close()
				if lock:
				lock.release()

				def error(text):
				print('ERROR: ' + text)

				textwith = b'\1\nfoo'
				without = b'foo'

				node = addrev(textwith)
				if not textwith == fl.read(node):
				error('filelog.read for data starting with \\1\\n')
				if fl.cmp(node, textwith) or not fl.cmp(node, without):
				error('filelog.cmp for data starting with \\1\\n')
				if fl.size(0) != len(textwith):
				error('FIXME: This is a known failure of filelog.size for data starting '
				'with \\1\\n')

				node = addrev(textwith, renamed=True)
				if not textwith == fl.read(node):
				error('filelog.read for a renaming + data starting with \\1\\n')
				if fl.cmp(node, textwith) or not fl.cmp(node, without):
				error('filelog.cmp for a renaming + data starting with \\1\\n')
				if fl.size(1) != len(textwith):
				error('filelog.size for a renaming + data starting with \\1\\n')

				print('OK.')