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

branching: fix wrong merge conflict resolution from 13dfad0f9f7a...

branching: fix wrong merge conflict resolution from merged stable into default, but accidentally added the _blockingreader class from stable (but deindented) instead of merging the changes from stable (2fe4efaa59af) into the existing _blockingreader class. This resulted in the _blockingreader being there two times.

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r50119:cdb85d05

default

Download file

             repoviewutil.py
        
                    23 lines
            
             | 757 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / utils / repoviewutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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.

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

      subsettable = {

          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',

      }

	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

				# 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.


				### 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
				subsettable = {
				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',
				}