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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Gregory Szorc - - Load All Authors

File last commit:

r36382:01e29e88 default


                r38817:bb54db4a

@96 default

Download file

             test-cappedreader.py
        
                    91 lines
            
             | 2.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-cappedreader.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, print_function

      import io

      import unittest

      from mercurial import (

          util,

      )

      class CappedReaderTests(unittest.TestCase):

          def testreadfull(self):

              source = io.BytesIO(b'x' * 100)

              reader = util.cappedreader(source, 10)

              res = reader.read(10)

              self.assertEqual(res, b'x' * 10)

              self.assertEqual(source.tell(), 10)

              source.seek(0)

              reader = util.cappedreader(source, 15)

              res = reader.read(16)

              self.assertEqual(res, b'x' * 15)

              self.assertEqual(source.tell(), 15)

              source.seek(0)

              reader = util.cappedreader(source, 100)

              res = reader.read(100)

              self.assertEqual(res, b'x' * 100)

              self.assertEqual(source.tell(), 100)

              source.seek(0)

              reader = util.cappedreader(source, 50)

              res = reader.read()

              self.assertEqual(res, b'x' * 50)

              self.assertEqual(source.tell(), 50)

              source.seek(0)

          def testreadnegative(self):

              source = io.BytesIO(b'x' * 100)

              reader = util.cappedreader(source, 20)

              res = reader.read(-1)

              self.assertEqual(res, b'x' * 20)

              self.assertEqual(source.tell(), 20)

              source.seek(0)

              reader = util.cappedreader(source, 100)

              res = reader.read(-1)

              self.assertEqual(res, b'x' * 100)

              self.assertEqual(source.tell(), 100)

              source.seek(0)

          def testreadmultiple(self):

              source = io.BytesIO(b'x' * 100)

              reader = util.cappedreader(source, 10)

              for i in range(10):

                  res = reader.read(1)

                  self.assertEqual(res, b'x')

                  self.assertEqual(source.tell(), i + 1)

              self.assertEqual(source.tell(), 10)

              res = reader.read(1)

              self.assertEqual(res, b'')

              self.assertEqual(source.tell(), 10)

              source.seek(0)

              reader = util.cappedreader(source, 45)

              for i in range(4):

                  res = reader.read(10)

                  self.assertEqual(res, b'x' * 10)

                  self.assertEqual(source.tell(), (i + 1) * 10)

              res = reader.read(10)

              self.assertEqual(res, b'x' * 5)

              self.assertEqual(source.tell(), 45)

          def readlimitpasteof(self):

              source = io.BytesIO(b'x' * 100)

              reader = util.cappedreader(source, 1024)

              res = reader.read(1000)

              self.assertEqual(res, b'x' * 100)

              self.assertEqual(source.tell(), 100)

              res = reader.read(1000)

              self.assertEqual(res, b'')

              self.assertEqual(source.tell(), 100)

      if __name__ == '__main__':

          import silenttestrunner

          silenttestrunner.main(__name__)

	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

				from __future__ import absolute_import, print_function

				import io
				import unittest

				from mercurial import (
				util,
				)

				class CappedReaderTests(unittest.TestCase):
				def testreadfull(self):
				source = io.BytesIO(b'x' * 100)

				reader = util.cappedreader(source, 10)
				res = reader.read(10)
				self.assertEqual(res, b'x' * 10)
				self.assertEqual(source.tell(), 10)
				source.seek(0)

				reader = util.cappedreader(source, 15)
				res = reader.read(16)
				self.assertEqual(res, b'x' * 15)
				self.assertEqual(source.tell(), 15)
				source.seek(0)

				reader = util.cappedreader(source, 100)
				res = reader.read(100)
				self.assertEqual(res, b'x' * 100)
				self.assertEqual(source.tell(), 100)
				source.seek(0)

				reader = util.cappedreader(source, 50)
				res = reader.read()
				self.assertEqual(res, b'x' * 50)
				self.assertEqual(source.tell(), 50)
				source.seek(0)

				def testreadnegative(self):
				source = io.BytesIO(b'x' * 100)

				reader = util.cappedreader(source, 20)
				res = reader.read(-1)
				self.assertEqual(res, b'x' * 20)
				self.assertEqual(source.tell(), 20)
				source.seek(0)

				reader = util.cappedreader(source, 100)
				res = reader.read(-1)
				self.assertEqual(res, b'x' * 100)
				self.assertEqual(source.tell(), 100)
				source.seek(0)

				def testreadmultiple(self):
				source = io.BytesIO(b'x' * 100)

				reader = util.cappedreader(source, 10)
				for i in range(10):
				res = reader.read(1)
				self.assertEqual(res, b'x')
				self.assertEqual(source.tell(), i + 1)

				self.assertEqual(source.tell(), 10)
				res = reader.read(1)
				self.assertEqual(res, b'')
				self.assertEqual(source.tell(), 10)
				source.seek(0)

				reader = util.cappedreader(source, 45)
				for i in range(4):
				res = reader.read(10)
				self.assertEqual(res, b'x' * 10)
				self.assertEqual(source.tell(), (i + 1) * 10)

				res = reader.read(10)
				self.assertEqual(res, b'x' * 5)
				self.assertEqual(source.tell(), 45)

				def readlimitpasteof(self):
				source = io.BytesIO(b'x' * 100)

				reader = util.cappedreader(source, 1024)
				res = reader.read(1000)
				self.assertEqual(res, b'x' * 100)
				self.assertEqual(source.tell(), 100)
				res = reader.read(1000)
				self.assertEqual(res, b'')
				self.assertEqual(source.tell(), 100)

				if __name__ == '__main__':
				import silenttestrunner
				silenttestrunner.main(__name__)