##// END OF EJS Templates
subrepo: Add exception for subrepo merge errors.
Martin Bornhold -
r1107:6bc055e1 default
parent child
Show More
@@ -128,6 +128,14 class NodeAlreadyRemovedError(Committing
128 pass
128 pass
129
129
130
130
131 class SubrepoMergeError(RepositoryError):
132 """
133 This happens if we try to merge a repository which contains subrepos and
134 the subrepos cannot be merged. The subrepos are not merged itself but
135 their references in the root repo are merged.
136 """
137
138
131 class ImproperArchiveTypeError(VCSError):
139 class ImproperArchiveTypeError(VCSError):
132 pass
140 pass
133
141
@@ -156,6 +164,7 class UnhandledException(VCSError):
156 # TODO: johbo: Define our own exception for this and stop abusing
164 # TODO: johbo: Define our own exception for this and stop abusing
157 # urllib's exception class.
165 # urllib's exception class.
158 'url_error': urllib2.URLError,
166 'url_error': urllib2.URLError,
167 'subrepo_merge_error': SubrepoMergeError,
159 }
168 }
160
169
161
170
General Comments 0
You need to be logged in to leave comments. Login now