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

log: fix crash on empty revision with --copies switch...

log: fix crash on empty revision with --copies switch If a revset is empty, .max() raises ValueError. I don't see any reason to recompute the revs, so I made it reuse the one returned by logcmdutil.getrevs(). If no revs specified by command line, the endrev will be smartset.spanset(repo) + 1, which is basically the same as len(repo), the default of getrenamedfn(). If --follow specified, revs.max() points to the working parent, which seems more correct.

Pulkit Goyal - - Load All Authors

File last commit:

r36498:4dc6f090 default


                r37794:141017c7

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)