upstream/mercurial-mirror Files · hgext/fastannotate/error.py

destutil: provide hint on rebase+merge for how to specify destination/rev...

destutil: provide hint on rebase+merge for how to specify destination/rev Without a destination specified, rebase and merge attempt to identify a good candidate; this fails if there's too many heads, the heads have a bookmark, or other reasons. Complicating the issue, users may have specified -t, thinking it means target, and are confused when the error message says that they need to specify an explicit rev or explicit destination - they feel like they already have. Differential Revision: https://phab.mercurial-scm.org/D7024

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r43384:8197b395

default

Download file

             error.py
        
                    15 lines
            
             | 413 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / fastannotate / error.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Copyright 2016-present Facebook. All Rights Reserved.

      #

      # error: errors used in fastannotate

      #

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

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

      from __future__ import absolute_import

      class CorruptedFileError(Exception):

          pass

      class CannotReuseError(Exception):

          """cannot reuse or update the cache incrementally"""

	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

				# Copyright 2016-present Facebook. All Rights Reserved.
				#
				# error: errors used in fastannotate
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.
				from __future__ import absolute_import


				class CorruptedFileError(Exception):
				pass


				class CannotReuseError(Exception):
				"""cannot reuse or update the cache incrementally"""