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

rebase: restore active bookmark after rebase --continue...

rebase: restore active bookmark after rebase --continue When a rebase has conflicts and the user uses rebase --continue, the previously active bookmark was not being made active once again. With this change that bookmark is made active again, just as if the rebase had never been interrupted. This changes the rebasestate file format, but should handle old formats correctly. Since the file is transient, this is even less of a problem. Adds a test to verify the new behavior. I manually tested continuing rebases with and without an active bookmark, and with and without being on the bookmark being rebased.

Siddharth Agarwal - - Load All Authors

File last commit:

r18567:194e63c1 default


                r18755:72412afe

stable

Download file

             parsers.py
        
                    89 lines
            
             | 2.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pure / parsers.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
      # parsers.py - Python implementation of parsers.c

      #

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

      #

        Martin Geisler
    
updated license to be explicit about GPL version 2

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

        Matt Mackall
    
Update license to GPLv2+

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

        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
        Alexander Solovyov
    
remove unused imports and variables

              r14064
            
      from mercurial.node import bin, nullid

        Matt Mackall
    
pure/parsers: fix circular imports, import mercurial modules properly

              r7945
            
      from mercurial import util

      import struct, zlib

        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
      _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)

        Matt Mackall
    
pure: update index parsing

              r13261
            
      def parse_index2(data, inline):

        Matt Mackall
    
pure/parsers: fix circular imports, import mercurial modules properly

              r7945
            
          def gettype(q):

              return int(q & 0xFFFF)

          def offset_type(offset, type):

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

          indexformatng = ">Qiiiiii20s12x"

        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
          s = struct.calcsize(indexformatng)

          index = []

          cache = None

        py4fun
    
parsers: remove redundant 'n' variable in parsers.parse_index2() (issue2935)

              r14995
            
          off = 0

        Matt Mackall
    
revlog: remove lazy index

              r13253
            
        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
          l = len(data) - s

          append = index.append

          if inline:

              cache = (0, data)

              while off <= l:

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

                  append(e)

                  if e[1] < 0:

                      break

                  off += e[1] + s

          else:

              while off <= l:

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

                  append(e)

                  off += s

        Augie Fackler
    
pure parsers: properly detect corrupt index files...

              r14421
            
          if off != len(data):

              raise ValueError('corrupt index file')

        Wagner Bruna
    
pure: fix index parsing on empty repositories

              r13435
            
          if index:

              e = list(index[0])

              type = gettype(e[0])

              e[0] = offset_type(0, type)

              index[0] = tuple(e)

        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
          # add the magic null revision at -1

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

        Matt Mackall
    
pure: update index parsing

              r13261
            
          return index, cache

        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
      def parse_dirstate(dmap, copymap, st):

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

        Mads Kiilerich
    
fix wording and not-completely-trivial spelling errors and bad docstrings

              r17425
            
          # dereference fields so they will be local in loop

        Matt Mackall
    
pure/parsers: fix circular imports, import mercurial modules properly

              r7945
            
          format = ">cllll"

          e_size = struct.calcsize(format)

        Martin Geisler
    
pure Python implementation of parsers.c

              r7700
            
          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

Martin Geisler pure Python implementation of parsers.c	r7700	# parsers.py - Python implementation of parsers.c
		#
		# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
		#
Martin Geisler updated license to be explicit about GPL version 2	r8225	# This software may be used and distributed according to the terms of the
Matt Mackall Update license to GPLv2+	r10263	# GNU General Public License version 2 or any later version.
Martin Geisler pure Python implementation of parsers.c	r7700
Alexander Solovyov remove unused imports and variables	r14064	from mercurial.node import bin, nullid
Matt Mackall pure/parsers: fix circular imports, import mercurial modules properly	r7945	from mercurial import util
		import struct, zlib
Martin Geisler pure Python implementation of parsers.c	r7700
		_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)

Matt Mackall pure: update index parsing	r13261	def parse_index2(data, inline):
Matt Mackall pure/parsers: fix circular imports, import mercurial modules properly	r7945	def gettype(q):
		return int(q & 0xFFFF)

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

		indexformatng = ">Qiiiiii20s12x"

Martin Geisler pure Python implementation of parsers.c	r7700	s = struct.calcsize(indexformatng)
		index = []
		cache = None
py4fun parsers: remove redundant 'n' variable in parsers.parse_index2() (issue2935)	r14995	off = 0
Matt Mackall revlog: remove lazy index	r13253
Martin Geisler pure Python implementation of parsers.c	r7700	l = len(data) - s
		append = index.append
		if inline:
		cache = (0, data)
		while off <= l:
		e = _unpack(indexformatng, data[off:off + s])
		append(e)
		if e[1] < 0:
		break
		off += e[1] + s
		else:
		while off <= l:
		e = _unpack(indexformatng, data[off:off + s])
		append(e)
		off += s

Augie Fackler pure parsers: properly detect corrupt index files...	r14421	if off != len(data):
		raise ValueError('corrupt index file')

Wagner Bruna pure: fix index parsing on empty repositories	r13435	if index:
		e = list(index[0])
		type = gettype(e[0])
		e[0] = offset_type(0, type)
		index[0] = tuple(e)
Martin Geisler pure Python implementation of parsers.c	r7700
		# add the magic null revision at -1
		index.append((0, 0, 0, -1, -1, -1, -1, nullid))

Matt Mackall pure: update index parsing	r13261	return index, cache
Martin Geisler pure Python implementation of parsers.c	r7700
		def parse_dirstate(dmap, copymap, st):
		parents = [st[:20], st[20: 40]]
Mads Kiilerich fix wording and not-completely-trivial spelling errors and bad docstrings	r17425	# dereference fields so they will be local in loop
Matt Mackall pure/parsers: fix circular imports, import mercurial modules properly	r7945	format = ">cllll"
		e_size = struct.calcsize(format)
Martin Geisler pure Python implementation of parsers.c	r7700	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