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

Vadim Gelfer - - Load All Authors

File last commit:

r2859:345bac2b default


                r6004:5af5f0f9

default

Download file

             remoterepo.py
        
                    25 lines
            
             | 621 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / remoterepo.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # remoterepo - remote repository proxy classes for mercurial

      #

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

      #

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

      # of the GNU General Public License, incorporated herein by reference.

      import repo

      class remoterepository(repo.repository):

          def dev(self):

              return -1

          def local(self):

              return False

      class remotelock(object):

          def __init__(self, repo):

              self.repo = repo

          def release(self):

              self.repo.unlock()

              self.repo = None

          def __del__(self):

              if self.repo:

                  self.release()

	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

				# remoterepo - remote repository proxy classes for mercurial
				#
				# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms
				# of the GNU General Public License, incorporated herein by reference.

				import repo

				class remoterepository(repo.repository):
				def dev(self):
				return -1

				def local(self):
				return False

				class remotelock(object):
				def __init__(self, repo):
				self.repo = repo
				def release(self):
				self.repo.unlock()
				self.repo = None
				def __del__(self):
				if self.repo:
				self.release()