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

merge-tools: allow marking a mergetool as completely disabled...

merge-tools: allow marking a mergetool as completely disabled Very often in my life I'm finding that the only configured merge tool present on the system is vimdiff[0], and it's currently impossible (as far as I can tell) short of specifying `ui.merge = `[1] to actually *disable* a merge tool. This allows vimdiff-haters to put: [merge-tools] vimdiff.disable = yes in their ~/.hgrc and never see vimdiff again. I'm stopping short of putting this as a commented out entry in the sample new user hgrc (seen when a user runs `hg config --edit` with no ~/.hgrc) for now, but I might come back and do that later. 0: vimdiff is at an awkward intersection: it's usually installed by the vim package which is often installed as a vi substitute, so it's mere presence doesn't imply me wanting it, unlike (say) kdiff3. 1: There's a related problem I ran into today where specifying `ui.merge = :merge` failed because :merge isn't a command, which I think is a regression. I'll try and figure that out and at least file a bug.

Mads Kiilerich - - Load All Authors

File last commit:

r23940:d0ef4077 stable


                r26730:a1e43e85

default

Download file

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

      # 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

				# 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)