upstream/mercurial-mirror Files · mercurial/repo.py

merge: allow smarter tool configuration...

merge: allow smarter tool configuration Add [merge-tool] hgrc section with: <tool>.executable = name or path (<tool>) <tool>.args = args with $local/base/other/output ($local $base $other) <tool>.priority = priority (default 0) <tool>.binary = handles binary (False) <tool>.symlink = handles symlinks (False) <tool>.checkconflict = check for conflict markers (False) <tool>.premerge = try internal simplemerge (True if not binary or symlink) Four built-in tools: internal:{merge,local,other,fail} Add [merge-patterns] section of the form: <pattern> = <tool> Priority of settings is: HGMERGE merge-patterns ui:merge merge-tools by priority hgmerge, if it can be found Changes: unsuccessful merges leave .orig files

Benoit Boissinot - - Load All Authors

File last commit:

r5455:08d6e875 default


                r6004:5af5f0f9

default

Download file

             repo.py
        
                    36 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, incorporated herein by reference.

      from i18n import _

      class RepoError(Exception):

          pass

      class NoCapability(RepoError):

          pass

      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 NoCapability(_('cannot %s; remote repository does not '

                                       'support the %r capability') %

                                     (purpose, name))

	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, incorporated herein by reference.

				from i18n import _

				class RepoError(Exception):
				pass

				class NoCapability(RepoError):
				pass

				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 NoCapability(_('cannot %s; remote repository does not '
				'support the %r capability') %
				(purpose, name))