upstream/mercurial-mirror Files · tests/md5sum.py

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Augie Fackler - - Load All Authors

File last commit:

r29731:8d1cdee3 default


                r32255:7e35d31b

default

Download file

             md5sum.py
        
                    44 lines
            
             | 1020 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / md5sum.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      #

      # Based on python's Tools/scripts/md5sum.py

      #

      # This software may be used and distributed according to the terms

      # of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2, which is

      # GPL-compatible.

      from __future__ import absolute_import

      import os

      import sys

      try:

          import hashlib

          md5 = hashlib.md5

      except ImportError:

          import md5

          md5 = md5.md5

      try:

          import msvcrt

          msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

          msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

      except ImportError:

          pass

      for filename in sys.argv[1:]:

          try:

              fp = open(filename, 'rb')

          except IOError as msg:

              sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))

              sys.exit(1)

          m = md5()

          try:

              for data in iter(lambda: fp.read(8192), ''):

                  m.update(data)

          except IOError as msg:

              sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))

              sys.exit(1)

          sys.stdout.write('%s  %s\n' % (m.hexdigest(), filename))

      sys.exit(0)

	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
				#
				# Based on python's Tools/scripts/md5sum.py
				#
				# This software may be used and distributed according to the terms
				# of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2, which is
				# GPL-compatible.

				from __future__ import absolute_import

				import os
				import sys

				try:
				import hashlib
				md5 = hashlib.md5
				except ImportError:
				import md5
				md5 = md5.md5

				try:
				import msvcrt
				msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
				msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
				except ImportError:
				pass

				for filename in sys.argv[1:]:
				try:
				fp = open(filename, 'rb')
				except IOError as msg:
				sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))
				sys.exit(1)

				m = md5()
				try:
				for data in iter(lambda: fp.read(8192), ''):
				m.update(data)
				except IOError as msg:
				sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))
				sys.exit(1)
				sys.stdout.write('%s %s\n' % (m.hexdigest(), filename))

				sys.exit(0)