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

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Gregory Szorc - - Load All Authors

File last commit:

r21254:51e5c793 default


                r22180:17011b36

stable

Download file

             autodiff.py
        
                    44 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / autodiff.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Extension dedicated to test patch.diff() upgrade modes

      #

      #

      from mercurial import cmdutil, scmutil, patch, util

      cmdtable = {}

      command = cmdutil.command(cmdtable)

      @command('autodiff',

          [('', 'git', '', 'git upgrade mode (yes/no/auto/warn/abort)')],

          '[OPTION]... [FILE]...')

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

          diffopts = patch.diffopts(ui, opts)

          git = opts.get('git', 'no')

          brokenfiles = set()

          losedatafn = None

          if git in ('yes', 'no'):

              diffopts.git = git == 'yes'

              diffopts.upgrade = False

          elif git == 'auto':

              diffopts.git = False

              diffopts.upgrade = True

          elif git == 'warn':

              diffopts.git = False

              diffopts.upgrade = True

              def losedatafn(fn=None, **kwargs):

                  brokenfiles.add(fn)

                  return True

          elif git == 'abort':

              diffopts.git = False

              diffopts.upgrade = True

              def losedatafn(fn=None, **kwargs):

                  raise util.Abort('losing data for %s' % fn)

          else:

              raise util.Abort('--git must be yes, no or auto')

          node1, node2 = scmutil.revpair(repo, [])

          m = scmutil.match(repo[node2], pats, opts)

          it = patch.diff(repo, node1, node2, match=m, opts=diffopts,

                          losedatafn=losedatafn)

          for chunk in it:

              ui.write(chunk)

          for fn in sorted(brokenfiles):

              ui.write(('data lost for: %s\n' % fn))

	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 dedicated to test patch.diff() upgrade modes
				#
				#
				from mercurial import cmdutil, scmutil, patch, util

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

				@command('autodiff',
				[('', 'git', '', 'git upgrade mode (yes/no/auto/warn/abort)')],
				'[OPTION]... [FILE]...')
				def autodiff(ui, repo, pats, *opts):
				diffopts = patch.diffopts(ui, opts)
				git = opts.get('git', 'no')
				brokenfiles = set()
				losedatafn = None
				if git in ('yes', 'no'):
				diffopts.git = git == 'yes'
				diffopts.upgrade = False
				elif git == 'auto':
				diffopts.git = False
				diffopts.upgrade = True
				elif git == 'warn':
				diffopts.git = False
				diffopts.upgrade = True
				def losedatafn(fn=None, **kwargs):
				brokenfiles.add(fn)
				return True
				elif git == 'abort':
				diffopts.git = False
				diffopts.upgrade = True
				def losedatafn(fn=None, **kwargs):
				raise util.Abort('losing data for %s' % fn)
				else:
				raise util.Abort('--git must be yes, no or auto')

				node1, node2 = scmutil.revpair(repo, [])
				m = scmutil.match(repo[node2], pats, opts)
				it = patch.diff(repo, node1, node2, match=m, opts=diffopts,
				losedatafn=losedatafn)
				for chunk in it:
				ui.write(chunk)
				for fn in sorted(brokenfiles):
				ui.write(('data lost for: %s\n' % fn))