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

resolve: simplify "finished" message...

resolve: simplify "finished" message The recently introduced message was: no unresolved files; you may continue your unfinished operation This had three problems: - looks a bit like an error message because it's not saying "we've just resolved the last file" - refers to "unfinished operation", which won't be the case with "update" or "merge" - introduces semicolons to error messages, which is stylistically questionable I've simplified this to: no more unresolved files In the future, if we want to prompt someone to continue a particular operation, we should use a hint style: no more unresolved files (use 'hg graft --continue' to finish grafting)

Simon Heimberg - - Load All Authors

File last commit:

r17273:4ed6b3a2 stable


                r21267:e4f451c8

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