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

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Augie Fackler - - Load All Authors

File last commit:

r37952:f71c97d9 default


                r41198:0101a35d

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