upstream/mercurial-mirror Files · mercurial/stack.py

revlog: use proper version comparison during verify...

revlog: use proper version comparison during verify Verify appears to want to compare the changelog's revlog version number with the version number of filelogs and error if they are different. But what it was actually doing was comparing the full 32-bit header integer, which contains 2 shorts: 1 for the revlog version number and 1 for feature flags. This commit tweaks the verification code so it only looks at the version number component of the header and emits a warning if they differ. The new code is more robust because it accounts for future revlog version numbers without them needing to be special cased. Differential Revision: https://phab.mercurial-scm.org/D4704

Boris Feld - - Load All Authors

File last commit:

r37022:68fcc550 default


                r39881:e6d3d39c

default

Download file

             stack.py
        
                    29 lines
            
             | 869 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / stack.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # stack.py - Mercurial functions for stack definition

      #

      #  Copyright Matt Mackall <mpm@selenic.com> and other

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      from . import (

          revsetlang,

          scmutil,

      )

      def getstack(repo, rev=None):

          """return a sorted smartrev of the stack containing either rev if it is

          not None or the current working directory parent.

          The stack will always contain all drafts changesets which are ancestors to

          the revision and are not merges.

          """

          if rev is None:

              rev = '.'

          revspec = 'reverse(only(%s) and not public() and not ::merge())'

          revset = revsetlang.formatspec(revspec, rev)

          revisions = scmutil.revrange(repo, [revset])

          revisions.sort()

          return revisions

	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

				# stack.py - Mercurial functions for stack definition
				#
				# Copyright Matt Mackall <mpm@selenic.com> and other
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				from . import (
				revsetlang,
				scmutil,
				)

				def getstack(repo, rev=None):
				"""return a sorted smartrev of the stack containing either rev if it is
				not None or the current working directory parent.

				The stack will always contain all drafts changesets which are ancestors to
				the revision and are not merges.
				"""
				if rev is None:
				rev = '.'

				revspec = 'reverse(only(%s) and not public() and not ::merge())'
				revset = revsetlang.formatspec(revspec, rev)
				revisions = scmutil.revrange(repo, [revset])
				revisions.sort()
				return revisions