upstream/mercurial-mirror Files · mercurial/repo.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.

Adrian Buehlmann - - Load All Authors

File last commit:

r13382:d747774c default


                r17103:5146de7b

default

Download file

             repo.py
        
                    40 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / repo.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # repo.py - repository base classes for mercurial

      #

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

      # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>

      #

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

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

      from i18n import _

      import error

      class repository(object):

          def capable(self, name):

              '''tell whether repo supports named capability.

              return False if not supported.

              if boolean capability, return True.

              if string capability, return string.'''

              if name in self.capabilities:

                  return True

              name_eq = name + '='

              for cap in self.capabilities:

                  if cap.startswith(name_eq):

                      return cap[len(name_eq):]

              return False

          def requirecap(self, name, purpose):

              '''raise an exception if the given capability is not present'''

              if not self.capable(name):

                  raise error.CapabilityError(

                      _('cannot %s; remote repository does not '

                        'support the %r capability') % (purpose, name))

          def local(self):

              return False

          def cancopy(self):

              return self.local()

          def close(self):

              pass

	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

				# repo.py - repository base classes for mercurial
				#
				# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
				# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from i18n import _
				import error

				class repository(object):
				def capable(self, name):
				'''tell whether repo supports named capability.
				return False if not supported.
				if boolean capability, return True.
				if string capability, return string.'''
				if name in self.capabilities:
				return True
				name_eq = name + '='
				for cap in self.capabilities:
				if cap.startswith(name_eq):
				return cap[len(name_eq):]
				return False

				def requirecap(self, name, purpose):
				'''raise an exception if the given capability is not present'''
				if not self.capable(name):
				raise error.CapabilityError(
				_('cannot %s; remote repository does not '
				'support the %r capability') % (purpose, name))

				def local(self):
				return False

				def cancopy(self):
				return self.local()

				def close(self):
				pass