upstream/mercurial-mirror Files · mercurial/pushkey.py

strip: don't allow empty changegroup in bundle1...

strip: don't allow empty changegroup in bundle1 Applying an empty changegroup has been an error since the beginning. The only exception was strip, which would allow to apply an empty changegroup from the temporary bundle. However, the emptyok=True option was only set for bundle1 bundles. In other words, temporary bundle2 bundles would fail if they were empty. Bundle2 has now been used enough that it seems safe to say that we simply don't create bundle2 bundles with empty changegroups. That also suggests that we never create bundle1 bundles with empty changegroups (i.e. empty bundle1 bundles, since bundle1 is just a changegroup), because, AFAICT, the code leading up to the application of the bundle is the same for bundle1 and bundle2. Therefore, let's stop passing emptyok=True, so we more clearly get the same behavior for bundle1 and bundle2.

Gregory Szorc - - Load All Authors

File last commit:

r25969:7b200566 default


                r33307:665271d6

default

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