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

mq: check subrepo synchronizations against parent of workdir or other appropriate context...

mq: check subrepo synchronizations against parent of workdir or other appropriate context Before this patch, MQ checks each subrepo synchronizations against the working directory context, so ".hgsubstate" updating is not imported into MQ revision correctly in cases below: - qrefresh when current ".hgsubstate" is already synchronized with each subrepos: you can reproduce this easily by just twice or more qrefresh invocations - qnew just after rollback of commit which updates ".hgsubstate" This patch resolves this by checking subrepo states against: - the parent of "qtop" for qrefresh, or - the parent of working context otherwise

Pierre-Yves.David@ens-lyon.org - - Load All Authors

File last commit:

r17075:28ed1c45 default


                r17153:54da604f

default

Download file

             pushkey.py
        
                    37 lines
            
             | 1.1 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.

      import bookmarks, phases, obsolete

      def _nslist(repo):

          n = {}

          for k in _namespaces:

              n[k] = ""

          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)

	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.

				import bookmarks, phases, obsolete

				def _nslist(repo):
				n = {}
				for k in _namespaces:
				n[k] = ""
				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)