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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Augie Fackler - - Load All Authors

File last commit:

r20684:2761a791 default


                r22284:72b37865

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.'