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

shelve: use rebase instead of merge (issue4068)...

shelve: use rebase instead of merge (issue4068) Previously, shelve used merge to unshelve things. This meant that if you shelved changes on one branch, then unshelved on another, all the changes from the first branch would be present in the second branch, and not just the shelved changes. The fix is to use rebase to pick the shelve commit off the original branch and place it on top of the new branch. This means only the shelved changes are brought across. This has the side effect of fixing several other issues in shelve: - you can now unshelve into a file that already has pending changes - unshelve a mv/cp now has the correct dirstate value (A instead of M) - you can now unshelve to an ancestor of the shelve - unshelve now no longer deletes untracked .orig files Updates tests and adds a new one to cover the issue. The test changes fall into a few categories: - I removed some excess output - The --continue/--abort state is a little different, so the parents and dirstate needed updating - Removed some untracked files at certain points that cluttered the output

Pierre-Yves David - - Load All Authors

File last commit:

r17298:59c14bf5 stable


                r19961:1d7a36ff

stable

Download file

             pushkey.py
        
                    39 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] = ""

          if not obsolete._enabled:

              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)

	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] = ""
				if not obsolete._enabled:
				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)