Mercurial > public > mercurial-scm > hg

comparison mercurial/error.py @ 28141:13bb8de97f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
destutil: add more precise error classes for destmerge Having exception classes more precise than 'Abort' will allow us to properly catch "nothing to rebase" situations when we will be using 'destmerge' in rebase.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 09 Feb 2016 23:30:41 +0000
parents 707d66afce21
children 945b4c14c570
comparison
equal deleted inserted replaced
28140:276644ae9e8d 28141:13bb8de97f87
69 class ConfigError(Abort): 69 class ConfigError(Abort):
70 """Exception raised when parsing config files""" 70 """Exception raised when parsing config files"""
71 71
72 class UpdateAbort(Abort): 72 class UpdateAbort(Abort):
73 """Raised when an update is aborted for destination issue""" 73 """Raised when an update is aborted for destination issue"""
74
75 class MergeDestAbort(Abort):
76 """Raised when an update is aborted for destination issues"""
77
78 class NoMergeDestAbort(MergeDestAbort):
79 """Raised when an update is aborted because there is nothing to merge"""
80
81 class ManyMergeDestAbort(MergeDestAbort):
82 """Raised when an update is aborted because destination is ambigious"""
74 83
75 class ResponseExpected(Abort): 84 class ResponseExpected(Abort):
76 """Raised when an EOF is received for a prompt""" 85 """Raised when an EOF is received for a prompt"""
77 def __init__(self): 86 def __init__(self):
78 from .i18n import _ 87 from .i18n import _