upstream/mercurial-mirror Files · mercurial/pure/parsers.py

subrepos: prompt on conflicts on update with dirty subrepos...

subrepos: prompt on conflicts on update with dirty subrepos Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?

Matt Mackall - - Load All Authors

File last commit:

r13261:20a54bdf default


                r13417:0748e18b

default

Download file

             parsers.py
        
                    87 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pure / parsers.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # parsers.py - Python implementation of parsers.c

      #

      # Copyright 2009 Matt Mackall <mpm@selenic.com> and others

      #

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

      # GNU General Public License version 2 or any later version.

      from mercurial.node import bin, nullid, nullrev

      from mercurial import util

      import struct, zlib

      _pack = struct.pack

      _unpack = struct.unpack

      _compress = zlib.compress

      _decompress = zlib.decompress

      _sha = util.sha1

      def parse_manifest(mfdict, fdict, lines):

          for l in lines.splitlines():

              f, n = l.split('\0')

              if len(n) > 40:

                  fdict[f] = n[40:]

                  mfdict[f] = bin(n[:40])

              else:

                  mfdict[f] = bin(n)

      def parse_index2(data, inline):

          def gettype(q):

              return int(q & 0xFFFF)

          def offset_type(offset, type):

              return long(long(offset) << 16 | type)

          indexformatng = ">Qiiiiii20s12x"

          s = struct.calcsize(indexformatng)

          index = []

          cache = None

          n = off = 0

          l = len(data) - s

          append = index.append

          if inline:

              cache = (0, data)

              while off <= l:

                  e = _unpack(indexformatng, data[off:off + s])

                  append(e)

                  n += 1

                  if e[1] < 0:

                      break

                  off += e[1] + s

          else:

              while off <= l:

                  e = _unpack(indexformatng, data[off:off + s])

                  append(e)

                  n += 1

                  off += s

          e = list(index[0])

          type = gettype(e[0])

          e[0] = offset_type(0, type)

          index[0] = tuple(e)

          # add the magic null revision at -1

          index.append((0, 0, 0, -1, -1, -1, -1, nullid))

          return index, cache

      def parse_dirstate(dmap, copymap, st):

          parents = [st[:20], st[20: 40]]

          # deref fields so they will be local in loop

          format = ">cllll"

          e_size = struct.calcsize(format)

          pos1 = 40

          l = len(st)

          # the inner loop

          while pos1 < l:

              pos2 = pos1 + e_size

              e = _unpack(">cllll", st[pos1:pos2]) # a literal here is faster

              pos1 = pos2 + e[4]

              f = st[pos2:pos1]

              if '\0' in f:

                  f, c = f.split('\0')

                  copymap[f] = c

              dmap[f] = e[:4]

          return parents

	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

				# parsers.py - Python implementation of parsers.c
				#
				# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from mercurial.node import bin, nullid, nullrev
				from mercurial import util
				import struct, zlib

				_pack = struct.pack
				_unpack = struct.unpack
				_compress = zlib.compress
				_decompress = zlib.decompress
				_sha = util.sha1

				def parse_manifest(mfdict, fdict, lines):
				for l in lines.splitlines():
				f, n = l.split('\0')
				if len(n) > 40:
				fdict[f] = n[40:]
				mfdict[f] = bin(n[:40])
				else:
				mfdict[f] = bin(n)

				def parse_index2(data, inline):
				def gettype(q):
				return int(q & 0xFFFF)

				def offset_type(offset, type):
				return long(long(offset) << 16 \| type)

				indexformatng = ">Qiiiiii20s12x"

				s = struct.calcsize(indexformatng)
				index = []
				cache = None
				n = off = 0

				l = len(data) - s
				append = index.append
				if inline:
				cache = (0, data)
				while off <= l:
				e = _unpack(indexformatng, data[off:off + s])
				append(e)
				n += 1
				if e[1] < 0:
				break
				off += e[1] + s
				else:
				while off <= l:
				e = _unpack(indexformatng, data[off:off + s])
				append(e)
				n += 1
				off += s

				e = list(index[0])
				type = gettype(e[0])
				e[0] = offset_type(0, type)
				index[0] = tuple(e)

				# add the magic null revision at -1
				index.append((0, 0, 0, -1, -1, -1, -1, nullid))

				return index, cache

				def parse_dirstate(dmap, copymap, st):
				parents = [st[:20], st[20: 40]]
				# deref fields so they will be local in loop
				format = ">cllll"
				e_size = struct.calcsize(format)
				pos1 = 40
				l = len(st)

				# the inner loop
				while pos1 < l:
				pos2 = pos1 + e_size
				e = _unpack(">cllll", st[pos1:pos2]) # a literal here is faster
				pos1 = pos2 + e[4]
				f = st[pos2:pos1]
				if '\0' in f:
				f, c = f.split('\0')
				copymap[f] = c
				dmap[f] = e[:4]
				return parents