upstream/mercurial-mirror Files · contrib/fixpax.py

changegroup: cg3 has two empty groups *after* manifests...

changegroup: cg3 has two empty groups *after* manifests changegroup.getchunks() determines the end of the stream by looking for an empty chunk group (two consecutive empty chunks). It ignores empty groups in the first two groups. Changegroup 3 introduced an empty chunk between the manifests and the files, which confuses getchunks(). Since it comes after the first two, getchunks() will stop there. Fix by rewriting getchunks so it first counts two groups (empty or not) and then keeps antostarts counting empty groups. With this counting, changegroup 1 and 2 have exactly one empty group after the first two groups, while changegroup 3 has two (one for directories and one for files). It's a little hard to test this at this point, but I have verified that this patch fixes narrowhg (which was broken before this patch). Also, future patches will fix "hg strip" with treemanifests, and once that's done, getchunks() will be tested through tests of "hg strip".

timeless - - Load All Authors

File last commit:

r27495:58eb1c5b default


                r27920:da5f2336

stable

Download file

             fixpax.py
        
                    61 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / fixpax.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      # fixpax - fix ownership in bdist_mpkg output

      #

      # Copyright 2015 Matt Mackall <mpm@selenic.com>

      #

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

      # MIT license (http://opensource.org/licenses/MIT)

      """Set file ownership to 0 in an Archive.pax.gz.

      Suitable for fixing files bdist_mpkg output:

      *.mpkg/Contents/Packages/*.pkg/Contents/Archive.pax.gz

      """

      import sys, os, gzip

      def fixpax(iname, oname):

          i = gzip.GzipFile(iname)

          o = gzip.GzipFile(oname, "w")

          while True:

              magic = i.read(6)

              dev = i.read(6)

              ino = i.read(6)

              mode = i.read(6)

              i.read(6) # uid

              i.read(6) # gid

              nlink = i.read(6)

              rdev = i.read(6)

              mtime = i.read(11)

              namesize = i.read(6)

              filesize = i.read(11)

              name = i.read(int(namesize, 8))

              data = i.read(int(filesize, 8))

              o.write(magic)

              o.write(dev)

              o.write(ino)

              o.write(mode)

              o.write("000000")

              o.write("000000")

              o.write(nlink)

              o.write(rdev)

              o.write(mtime)

              o.write(namesize)

              o.write(filesize)

              o.write(name)

              o.write(data)

              if name.startswith("TRAILER!!!"):

                  o.write(i.read())

                  break

          o.close()

          i.close()

      if __name__ == '__main__':

          for iname in sys.argv[1:]:

              print 'fixing file ownership in %s' % iname

              oname = sys.argv[1] + '.tmp'

              fixpax(iname, oname)

              os.rename(oname, iname)

	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
				# fixpax - fix ownership in bdist_mpkg output
				#
				# Copyright 2015 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# MIT license (http://opensource.org/licenses/MIT)

				"""Set file ownership to 0 in an Archive.pax.gz.
				Suitable for fixing files bdist_mpkg output:
				.mpkg/Contents/Packages/.pkg/Contents/Archive.pax.gz
				"""

				import sys, os, gzip

				def fixpax(iname, oname):
				i = gzip.GzipFile(iname)
				o = gzip.GzipFile(oname, "w")

				while True:
				magic = i.read(6)
				dev = i.read(6)
				ino = i.read(6)
				mode = i.read(6)
				i.read(6) # uid
				i.read(6) # gid
				nlink = i.read(6)
				rdev = i.read(6)
				mtime = i.read(11)
				namesize = i.read(6)
				filesize = i.read(11)
				name = i.read(int(namesize, 8))
				data = i.read(int(filesize, 8))

				o.write(magic)
				o.write(dev)
				o.write(ino)
				o.write(mode)
				o.write("000000")
				o.write("000000")
				o.write(nlink)
				o.write(rdev)
				o.write(mtime)
				o.write(namesize)
				o.write(filesize)
				o.write(name)
				o.write(data)

				if name.startswith("TRAILER!!!"):
				o.write(i.read())
				break

				o.close()
				i.close()

				if __name__ == '__main__':
				for iname in sys.argv[1:]:
				print 'fixing file ownership in %s' % iname
				oname = sys.argv[1] + '.tmp'
				fixpax(iname, oname)
				os.rename(oname, iname)