upstream/mercurial-mirror Files · mercurial/utils/repoviewutil.py

revlog: fix revset in reachableroots docstring...

revlog: fix revset in reachableroots docstring `reachableroots` will only return a subset of `roots` when `includepath` is False. For example, given the following linear DAG: 2 | 1 | 0 Using roots=0+2, heads=1, the definition in the docstring does not match what `reachableroots` actually does: ipdb> repo.changelog.reachableroots(0, roots=[0,2],heads=[1]) [0] ipdb> repo.revs('heads(::(0+2) & (0+2)::1)') <baseset+ [1]> The fix is to do `heads & ::roots` (or `heads & heads::roots`) first, then select their ancestors: ipdb> repo.revs('heads(::((0+2) & (0+2)::1))') <baseset+ [0]> The docstring was introduced by (2015-06-19 "revset: rename revsbetween to reachableroots and add an argument"), which introduced the `includepath=False` behavior for graphlog grandparents use-case. I believe the docstring instead of the code should be changed because changing the code to match the docstring can result in suboptimal graphlog like: o :\ : o : : :/ o As opposite to the current "linearized" graphlog: o | o : o Differential Revision: https://phab.mercurial-scm.org/D7518

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r44168:1a42f845

default

Download file

             repoviewutil.py
        
                    24 lines
            
             | 796 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / utils / repoviewutil.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marmoute
    
repoview: move subsettable in a dedicated module...

              r42314
            
      # repoviewutil.py - constaints data relevant to repoview.py and other module

      #

      # Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>

      #                Logilab SA        <contact@logilab.fr>

      #

      # 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

      ### Nearest subset relation

      # Nearest subset of filter X is a filter Y so that:

      # * Y is included in X,

      # * X - Y is as small as possible.

      # This create and ordering used for branchmap purpose.

      # the ordering may be partial

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
      subsettable = {

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
          None: b'visible',

          b'visible-hidden': b'visible',

          b'visible': b'served',

          b'served.hidden': b'served',

          b'served': b'immutable',

          b'immutable': b'base',

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
      }

	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

marmoute repoview: move subsettable in a dedicated module...	r42314	# repoviewutil.py - constaints data relevant to repoview.py and other module
		#
		# Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
		# Logilab SA <contact@logilab.fr>
		#
		# 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

		### Nearest subset relation
		# Nearest subset of filter X is a filter Y so that:
		# * Y is included in X,
		# * X - Y is as small as possible.
		# This create and ordering used for branchmap purpose.
		# the ordering may be partial
Augie Fackler formatting: blacken the codebase...	r43346	subsettable = {
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	None: b'visible',
		b'visible-hidden': b'visible',
		b'visible': b'served',
		b'served.hidden': b'served',
		b'served': b'immutable',
		b'immutable': b'base',
Augie Fackler formatting: blacken the codebase...	r43346	}