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

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r53823:f33f37ac

tip default

Download file

             fakemergerecord.py
        
                    31 lines
            
             | 763 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 mercurial import (

          mergestate as mergestatemod,

          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 = mergestatemod.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 mercurial import (
				mergestate as mergestatemod,
				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 = mergestatemod.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)