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

largefiles: factor out procedures to update lfdirstate for post-committing...

largefiles: factor out procedures to update lfdirstate for post-committing Before this patch, procedures to update lfdirstate for post-committing are scattered in "lfilesrepo.commit". In the case of "hg commit" with patterns for target files ("Case 2"), lfdirstate is updated BEFORE real committing. This patch factors out procedures to update lfdirstate for post-committing into "lfutil.markcommitted", and makes it callable via "markcommitted" of the context passed to "lfilesrepo.commitctx". "markcommitted" of the context is called, only when it is committed successfully. Passing original "markcommitted" of the context is meaningless in this patch, but required in subsequent one to prepare something before invocation of it.

Gregory Szorc - - Load All Authors

File last commit:

r21254:51e5c793 default


                r23184:3100d1cb

default

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))