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

diff: add --binary option for git mode diffs...

diff: add --binary option for git mode diffs This patch adds --binary option to `hg diff` and `hg export` to allow more control about when binary diffs are displayed in Git mode as well as some tests to verify it behaves correctly (issue5510).

Pierre-Yves David - - Load All Authors

File last commit:

r29754:b303b381 default


                r31822:fde4822b

default

Download file

             fakemergerecord.py
        
                    26 lines
            
             | 737 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 (

          cmdutil,

          merge,

      )

      cmdtable = {}

      command = cmdutil.command(cmdtable)

      @command('fakemergerecord',

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

                ('x', 'advisory', None, '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(('X', 'mandatory record'))

              if opts.get('advisory'):

                  records.append(('x', '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 (
				cmdutil,
				merge,
				)

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

				@command('fakemergerecord',
				[('X', 'mandatory', None, 'add a fake mandatory record'),
				('x', 'advisory', None, '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(('X', 'mandatory record'))
				if opts.get('advisory'):
				records.append(('x', 'advisory record'))
				ms._writerecords(records)