upstream/mercurial-mirror Files · tests/fakemergerecord.py

shelve: directly handle the initial parent alignment...

shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

Pulkit Goyal - - Load All Authors

File last commit:

r36498:4dc6f090 default


                r38637:c829749e

default

Download file

             fakemergerecord.py
        
                    26 lines
            
             | 752 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / fakemergerecord.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Extension to write out fake unsupported records into the merge state

      #

      #

      from __future__ import absolute_import

      from mercurial import (

          merge,

          registrar,

      )

      cmdtable = {}

      command = registrar.command(cmdtable)

      @command(b'fakemergerecord',

               [(b'X', b'mandatory', None, b'add a fake mandatory record'),

                (b'x', b'advisory', None, b'add a fake advisory record')], '')

      def fakemergerecord(ui, repo, *pats, **opts):

          with repo.wlock():

              ms = merge.mergestate.read(repo)

              records = ms._makerecords()

              if opts.get('mandatory'):

                  records.append((b'X', b'mandatory record'))

              if opts.get('advisory'):

                  records.append((b'x', b'advisory record'))

              ms._writerecords(records)

	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

				# Extension to write out fake unsupported records into the merge state
				#
				#

				from __future__ import absolute_import

				from mercurial import (
				merge,
				registrar,
				)

				cmdtable = {}
				command = registrar.command(cmdtable)

				@command(b'fakemergerecord',
				[(b'X', b'mandatory', None, b'add a fake mandatory record'),
				(b'x', b'advisory', None, b'add a fake advisory record')], '')
				def fakemergerecord(ui, repo, pats, *opts):
				with repo.wlock():
				ms = merge.mergestate.read(repo)
				records = ms._makerecords()
				if opts.get('mandatory'):
				records.append((b'X', b'mandatory record'))
				if opts.get('advisory'):
				records.append((b'x', b'advisory record'))
				ms._writerecords(records)