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

copies: distinguish between merged and touched files during upgrade...

copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r47571:433cef8f

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	}