upstream/mercurial-mirror Files · mercurial/osutil.py

localrepo.commit: normalize commit message even for rawcommit....

localrepo.commit: normalize commit message even for rawcommit. This normalization consists of: - stripping trailing whitespace - always using "\n" as the line separator I think the main reason rawcommit was skipping this normalization was an attempt to preserve hashes during an hg->hg conversion. While this is a nice goal, it's not particularly interesting in practice. Since SHA-1 is so strong, the only safe way to do it is to have absolutely identical revisions. But: - if the original revision was created with a recent version of hg, the commit message will be the same, with or without that normalization - if it was created with an ancient version of hg that didn't do any normalization, even if the commit message is identical, the file list in the changelog is likely to be different (e.g. no removed files), and there were some old issues with e.g. extra file merging, which will end up changing the hash anyway - in any case, if one *really* has to preserve hashes, it's easier (and faster) to fake a partial conversion using something like: hg clone -U -r rev orig-repo new-repo hg -R new-repo log --template '#node# #node#\n' > new-repo/.hg/shamap Additionally, we've had some reports of problems arising from this lack of normalization - e.g. issue871, and a user that was wondering why hg export/hg import was not preserving hashes when there was nothing unusual going on (it was just import doing the normalization that had been skipped). This also means that it's even more unlikely to get identical revisions when going $VCS->hg->$VCS.

Bryan O'Sullivan - - Load All Authors

File last commit:

r5396:5105b119 default


                r6254:3667b6e4

default

Download file

             osutil.py
        
                    37 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / osutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import os, stat

      def _mode_to_kind(mode):

          if stat.S_ISREG(mode): return stat.S_IFREG

          if stat.S_ISDIR(mode): return stat.S_IFDIR

          if stat.S_ISLNK(mode): return stat.S_IFLNK

          if stat.S_ISBLK(mode): return stat.S_IFBLK

          if stat.S_ISCHR(mode): return stat.S_IFCHR

          if stat.S_ISFIFO(mode): return stat.S_IFIFO

          if stat.S_ISSOCK(mode): return stat.S_IFSOCK

          return mode

      def listdir(path, stat=False):

          '''listdir(path, stat=False) -> list_of_tuples

          Return a sorted list containing information about the entries

          in the directory.

          If stat is True, each element is a 3-tuple:

            (name, type, stat object)

          Otherwise, each element is a 2-tuple:

            (name, type)

          '''

          result = []

          prefix = path + os.sep

          names = os.listdir(path)

          names.sort()

          for fn in names:

              st = os.lstat(prefix + fn)

              if stat:

                  result.append((fn, _mode_to_kind(st.st_mode), st))

              else:

                  result.append((fn, _mode_to_kind(st.st_mode)))

          return result

	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

				import os, stat

				def _mode_to_kind(mode):
				if stat.S_ISREG(mode): return stat.S_IFREG
				if stat.S_ISDIR(mode): return stat.S_IFDIR
				if stat.S_ISLNK(mode): return stat.S_IFLNK
				if stat.S_ISBLK(mode): return stat.S_IFBLK
				if stat.S_ISCHR(mode): return stat.S_IFCHR
				if stat.S_ISFIFO(mode): return stat.S_IFIFO
				if stat.S_ISSOCK(mode): return stat.S_IFSOCK
				return mode

				def listdir(path, stat=False):
				'''listdir(path, stat=False) -> list_of_tuples

				Return a sorted list containing information about the entries
				in the directory.

				If stat is True, each element is a 3-tuple:

				(name, type, stat object)

				Otherwise, each element is a 2-tuple:

				(name, type)
				'''
				result = []
				prefix = path + os.sep
				names = os.listdir(path)
				names.sort()
				for fn in names:
				st = os.lstat(prefix + fn)
				if stat:
				result.append((fn, _mode_to_kind(st.st_mode), st))
				else:
				result.append((fn, _mode_to_kind(st.st_mode)))
				return result