upstream/mercurial-mirror Files · mercurial/pushkey.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".

Gregory Szorc - - Load All Authors

File last commit:

r25969:7b200566 default


                r27920:da5f2336

stable

Download file

             pushkey.py
        
                    61 lines
            
             | 1.7 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pushkey.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # pushkey.py - dispatching for pushing and pulling keys

      #

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

      #

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

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

      from __future__ import absolute_import

      from . import (

          bookmarks,

          encoding,

          obsolete,

          phases,

      )

      def _nslist(repo):

          n = {}

          for k in _namespaces:

              n[k] = ""

          if not obsolete.isenabled(repo, obsolete.exchangeopt):

              n.pop('obsolete')

          return n

      _namespaces = {"namespaces": (lambda *x: False, _nslist),

                     "bookmarks": (bookmarks.pushbookmark, bookmarks.listbookmarks),

                     "phases": (phases.pushphase, phases.listphases),

                     "obsolete": (obsolete.pushmarker, obsolete.listmarkers),

                    }

      def register(namespace, pushkey, listkeys):

          _namespaces[namespace] = (pushkey, listkeys)

      def _get(namespace):

          return _namespaces.get(namespace, (lambda *x: False, lambda *x: {}))

      def push(repo, namespace, key, old, new):

          '''should succeed iff value was old'''

          pk = _get(namespace)[0]

          return pk(repo, key, old, new)

      def list(repo, namespace):

          '''return a dict'''

          lk = _get(namespace)[1]

          return lk(repo)

      encode = encoding.fromlocal

      decode = encoding.tolocal

      def encodekeys(keys):

          """encode the content of a pushkey namespace for exchange over the wire"""

          return '\n'.join(['%s\t%s' % (encode(k), encode(v)) for k, v in keys])

      def decodekeys(data):

          """decode the content of a pushkey namespace from exchange over the wire"""

          result = {}

          for l in data.splitlines():

              k, v = l.split('\t')

              result[decode(k)] = decode(v)

          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

				# pushkey.py - dispatching for pushing and pulling keys
				#
				# Copyright 2010 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				from . import (
				bookmarks,
				encoding,
				obsolete,
				phases,
				)

				def _nslist(repo):
				n = {}
				for k in _namespaces:
				n[k] = ""
				if not obsolete.isenabled(repo, obsolete.exchangeopt):
				n.pop('obsolete')
				return n

				_namespaces = {"namespaces": (lambda *x: False, _nslist),
				"bookmarks": (bookmarks.pushbookmark, bookmarks.listbookmarks),
				"phases": (phases.pushphase, phases.listphases),
				"obsolete": (obsolete.pushmarker, obsolete.listmarkers),
				}

				def register(namespace, pushkey, listkeys):
				_namespaces[namespace] = (pushkey, listkeys)

				def _get(namespace):
				return _namespaces.get(namespace, (lambda x: False, lambda x: {}))

				def push(repo, namespace, key, old, new):
				'''should succeed iff value was old'''
				pk = _get(namespace)[0]
				return pk(repo, key, old, new)

				def list(repo, namespace):
				'''return a dict'''
				lk = _get(namespace)[1]
				return lk(repo)

				encode = encoding.fromlocal

				decode = encoding.tolocal

				def encodekeys(keys):
				"""encode the content of a pushkey namespace for exchange over the wire"""
				return '\n'.join(['%s\t%s' % (encode(k), encode(v)) for k, v in keys])

				def decodekeys(data):
				"""decode the content of a pushkey namespace from exchange over the wire"""
				result = {}
				for l in data.splitlines():
				k, v = l.split('\t')
				result[decode(k)] = decode(v)
				return result