Mercurial > public > mercurial-scm > hg-stable
diff mercurial/error.py @ 28141:13bb8de97f87
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 |
line wrap: on
line diff
--- a/mercurial/error.py Mon Feb 08 22:58:15 2016 +0000 +++ b/mercurial/error.py Tue Feb 09 23:30:41 2016 +0000 @@ -72,6 +72,15 @@ class UpdateAbort(Abort): """Raised when an update is aborted for destination issue""" +class MergeDestAbort(Abort): + """Raised when an update is aborted for destination issues""" + +class NoMergeDestAbort(MergeDestAbort): + """Raised when an update is aborted because there is nothing to merge""" + +class ManyMergeDestAbort(MergeDestAbort): + """Raised when an update is aborted because destination is ambigious""" + class ResponseExpected(Abort): """Raised when an EOF is received for a prompt""" def __init__(self):