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

tests: test divergence created during interrupted rebase...

tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r47586:6648307d

default

Download file

             repoviewutil.py
        
                    24 lines
            
             | 796 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.

      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

      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.

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