##// END OF EJS Templates
urlutil: use bytes for Abort messages...
Matt Harbison -
r47690:93c224dc default
parent child Browse files
Show More
@@ -643,11 +643,11 b' class path(object):'
643 try:
643 try:
644 subpath = paths[self.url.host]
644 subpath = paths[self.url.host]
645 except KeyError:
645 except KeyError:
646 m = _('cannot use `%s`, "%s" is not a known path')
646 m = _(b'cannot use `%s`, "%s" is not a known path')
647 m %= (self.rawloc, self.url.host)
647 m %= (self.rawloc, self.url.host)
648 raise error.Abort(m)
648 raise error.Abort(m)
649 if subpath.raw_url.scheme == b'path':
649 if subpath.raw_url.scheme == b'path':
650 m = _('cannot use `%s`, "%s" is also define as a `path://`')
650 m = _(b'cannot use `%s`, "%s" is also defined as a `path://`')
651 m %= (self.rawloc, self.url.host)
651 m %= (self.rawloc, self.url.host)
652 raise error.Abort(m)
652 raise error.Abort(m)
653 self.url = subpath.url
653 self.url = subpath.url
@@ -348,10 +348,10 b' dependency detection.'
348 $ hg id
348 $ hg id
349 000000000000
349 000000000000
350 $ hg path
350 $ hg path
351 abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
351 abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
352 [255]
352 [255]
353 $ hg pull chain_path
353 $ hg pull chain_path
354 abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
354 abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
355 [255]
355 [255]
356
356
357 Doing an actual circle should always be an issue
357 Doing an actual circle should always be an issue
@@ -365,10 +365,10 b' Doing an actual circle should always be '
365 $ hg id
365 $ hg id
366 000000000000
366 000000000000
367 $ hg path
367 $ hg path
368 abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
368 abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
369 [255]
369 [255]
370 $ hg pull chain_path
370 $ hg pull chain_path
371 abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
371 abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
372 [255]
372 [255]
373
373
374 Test basic error cases
374 Test basic error cases
General Comments 0
You need to be logged in to leave comments. Login now