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

treemanifest: make node reuse match flat manifest behavior...

treemanifest: make node reuse match flat manifest behavior In a flat manifest, a node with the same content but different parents is still considered a new node. In the current tree manifests however, if the content is the same, we ignore the parents entirely and just reuse the existing node. In our external treemanifest extension, we want to allow having one treemanifest for every flat manifests, as a way of easeing the migration to treemanifests. To make this possible, let's change the root node treemanifest behavior to match the behavior for flat manifests, so we can have a 1:1 relationship. While this sounds like a BC breakage, it's not actually a state users can normally get in because: A) you can't make empty commits, and B) even if you try to make an empty commit (by making a commit then amending it's changes away), the higher level commit logic in localrepo.commitctx() forces the commit to use the original p1 manifest node if no files were changed. So this would only affect extensions and automation that reached passed the normal localrepo.commit() logic straight into the manifest logic.

Gregory Szorc - - Load All Authors

File last commit:

r25969:7b200566 default


                r31294:c134a33b

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