upstream/mercurial-mirror Files · tests/test-filelog.py

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Augie Fackler - - Load All Authors

File last commit:

r20684:2761a791 default


                r23524:a1a7c94d

default

Download file

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

      #!/usr/bin/env python

      """

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

      """

      from mercurial import ui, hg

      from mercurial.node import nullid, hex

      myui = ui.ui()

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

      fl = repo.file('foobar')

      def addrev(text, renamed=False):

          if renamed:

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

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

          else:

              meta = {}

          lock = t = None

          try:

              lock = repo.lock()

              t = repo.transaction('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 = '\1\nfoo'

      without = '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 behaviour of filelog w.r.t. data starting with '\1\n'
				"""
				from mercurial import ui, hg
				from mercurial.node import nullid, hex

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

				fl = repo.file('foobar')

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

				lock = t = None
				try:
				lock = repo.lock()
				t = repo.transaction('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 = '\1\nfoo'
				without = '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.'