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

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904) This adds UI portion of the feature that has resided in mercurial since 2012. Back then the interface was added together with the code, but was shortly backed out because it was deemed "not ready". Code, however, stayed. For the original feature and its implementation, see issue2810 and d605a82cf189. In short, the backed-out interface had two outstanding issues: 1. it was introducing an entirely new term (baseline) and 2. it was present on every changeset's page, even for changesets with 1 parent (or no parents), which didn't make sense This patch implements a hopefully better interface because: 1. it uses the usual terms (diff) and 2. it only shows up when there actually are 2 parents.

Simon Heimberg - - Load All Authors

File last commit:

r17273:4ed6b3a2 stable


                r23740:9e1f4c65

default

Download file

             peer.py
        
                    46 lines
            
             | 1.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / peer.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # peer.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 peerrepository(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.'''

              caps = self._capabilities()

              if name in caps:

                  return True

              name_eq = name + '='

              for cap in caps:

                  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 peer as a localrepo, or None'''

              return None

          def peer(self):

              return self

          def canpush(self):

              return True

          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

				# peer.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 peerrepository(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.'''
				caps = self._capabilities()
				if name in caps:
				return True
				name_eq = name + '='
				for cap in caps:
				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 peer as a localrepo, or None'''
				return None

				def peer(self):
				return self

				def canpush(self):
				return True

				def close(self):
				pass