upstream/mercurial-mirror Files · mercurial/hgweb/__init__.py

convert: keep branch switching merges with ancestors (issue3340)...

convert: keep branch switching merges with ancestors (issue3340) When running convert with a filemap, merge parents which are ancestors of other parents are ignored. This is hardly a problem when parents belong to the same branch, but the result could be confusing when named branches are involved. With: -o-a1-a2-a3... <- A \ \ b1-b2-b3...-m- <- B If all b* revisions are discarded, it is useful to preserve 'm' even if it is empty after filtering to record the branch switch. This patch makes filemap preserve "ancestor parents" if there is no "non-ancestor parent" on the same branch than the merge revision. Remarks: - I am not completely convinced by the reasons given above and those detailed by Matt in this thread: http://selenic.com/pipermail/mercurial-devel/2012-May/040627.html The properties we try to preserve are not clearly defined. That said, I know this patch already helped someone on IRC and the tests output look reasonable. - This is a new version of the original "convert: filemap must preserve fast-forward merges" patch. It has exactly the same output for 2 parents merges, the additional complexity is here to handle more than two parents.

Matt Mackall - - Load All Authors

File last commit:

r10996:f6d41bfc default


                r17103:5146de7b

default

Download file

             __init__.py
        
                    31 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / hgweb / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # hgweb/__init__.py - web interface to a mercurial repository

      #

      # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>

      # Copyright 2005 Matt Mackall <mpm@selenic.com>

      #

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

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

      import os

      import hgweb_mod, hgwebdir_mod

      def hgweb(config, name=None, baseui=None):

          '''create an hgweb wsgi object

          config can be one of:

          - repo object (single repo view)

          - path to repo (single repo view)

          - path to config file (multi-repo view)

          - dict of virtual:real pairs (multi-repo view)

          - list of virtual:real tuples (multi-repo view)

          '''

          if ((isinstance(config, str) and not os.path.isdir(config)) or

              isinstance(config, dict) or isinstance(config, list)):

              # create a multi-dir interface

              return hgwebdir_mod.hgwebdir(config, baseui=baseui)

          return hgweb_mod.hgweb(config, name=name, baseui=baseui)

      def hgwebdir(config, baseui=None):

          return hgwebdir_mod.hgwebdir(config, baseui=baseui)

	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

				# hgweb/__init__.py - web interface to a mercurial repository
				#
				# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
				# Copyright 2005 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				import os
				import hgweb_mod, hgwebdir_mod

				def hgweb(config, name=None, baseui=None):
				'''create an hgweb wsgi object

				config can be one of:
				- repo object (single repo view)
				- path to repo (single repo view)
				- path to config file (multi-repo view)
				- dict of virtual:real pairs (multi-repo view)
				- list of virtual:real tuples (multi-repo view)
				'''

				if ((isinstance(config, str) and not os.path.isdir(config)) or
				isinstance(config, dict) or isinstance(config, list)):
				# create a multi-dir interface
				return hgwebdir_mod.hgwebdir(config, baseui=baseui)
				return hgweb_mod.hgweb(config, name=name, baseui=baseui)

				def hgwebdir(config, baseui=None):
				return hgwebdir_mod.hgwebdir(config, baseui=baseui)