Mercurial > hg-stable
changeset 18858:f02045645d12
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 02 Apr 2013 01:15:31 -0500 |
| parents | 78d760aa3607 (current diff) 801d3db0473c (diff) |
| children | 0f2eb3d16a1a |
| files | mercurial/commands.py mercurial/context.py mercurial/hgweb/hgweb_mod.py |
| diffstat | 6 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Thu Mar 28 18:27:19 2013 -0700 +++ b/.hgsigs Tue Apr 02 01:15:31 2013 -0500 @@ -67,3 +67,4 @@ a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 0 iD8DBQBRDDROywK+sNU5EO8RAh75AJ9uJCGoCWnP0Lv/+XuYs4hvUl+sAgCcD36QgAnuw8IQXrvv684BAXAnHcA= 7511d4df752e61fe7ae4f3682e0a0008573b0402 0 iD8DBQBRFYaoywK+sNU5EO8RAuErAJoDyhXn+lptU3+AevVdwAIeNFyR2gCdHzPHyWd+JDeWCUR+pSOBi8O2ppM= 5b7175377babacce80a6c1e12366d8032a6d4340 0 iD8DBQBRMCYgywK+sNU5EO8RAq1/AKCWKlt9ysibyQgYwoxxIOZv5J8rpwCcDSHQaaf1fFZUTnQsOePwcM2Y/Sg= +50c922c1b5145dab8baefefb0437d363b6a6c21c 0 iD8DBQBRWnUnywK+sNU5EO8RAuQRAJwM42cJqJPeqJ0jVNdMqKMDqr4dSACeP0cRVGz1gitMuV0x8f3mrZrqc7I=
--- a/.hgtags Thu Mar 28 18:27:19 2013 -0700 +++ b/.hgtags Tue Apr 02 01:15:31 2013 -0500 @@ -80,3 +80,4 @@ a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 2.5 7511d4df752e61fe7ae4f3682e0a0008573b0402 2.5.1 5b7175377babacce80a6c1e12366d8032a6d4340 2.5.2 +50c922c1b5145dab8baefefb0437d363b6a6c21c 2.5.3
--- a/mercurial/commands.py Thu Mar 28 18:27:19 2013 -0700 +++ b/mercurial/commands.py Tue Apr 02 01:15:31 2013 -0500 @@ -2095,7 +2095,7 @@ def debugobsolete(ui, repo, precursor=None, *successors, **opts): """create arbitrary obsolete marker - With no arguments it it display the list obsolescence marker.""" + With no arguments, displays the list of obsolescence markers.""" def parsenodeid(s): try: # We do not use revsingle/revrange functions here to accept
--- a/mercurial/context.py Thu Mar 28 18:27:19 2013 -0700 +++ b/mercurial/context.py Tue Apr 02 01:15:31 2013 -0500 @@ -291,16 +291,16 @@ try: return self._manifest[path], self._manifest.flags(path) except KeyError: - raise error.LookupError(self._node, path, - _('not found in manifest')) + raise error.ManifestLookupError(self._node, path, + _('not found in manifest')) if '_manifestdelta' in self.__dict__ or path in self.files(): if path in self._manifestdelta: return (self._manifestdelta[path], self._manifestdelta.flags(path)) node, flag = self._repo.manifest.find(self._changeset[0], path) if not node: - raise error.LookupError(self._node, path, - _('not found in manifest')) + raise error.ManifestLookupError(self._node, path, + _('not found in manifest')) return node, flag
--- a/mercurial/error.py Thu Mar 28 18:27:19 2013 -0700 +++ b/mercurial/error.py Tue Apr 02 01:15:31 2013 -0500 @@ -27,6 +27,9 @@ def __str__(self): return RevlogError.__str__(self) +class ManifestLookupError(LookupError): + pass + class CommandError(Exception): """Exception raised on errors in parsing the command line."""
--- a/mercurial/hgweb/hgweb_mod.py Thu Mar 28 18:27:19 2013 -0700 +++ b/mercurial/hgweb/hgweb_mod.py Tue Apr 02 01:15:31 2013 -0500 @@ -250,7 +250,8 @@ except (error.LookupError, error.RepoLookupError), err: req.respond(HTTP_NOT_FOUND, ctype) msg = str(err) - if util.safehasattr(err, 'name') and 'manifest' not in msg: + if (util.safehasattr(err, 'name') and + not isinstance(err, error.ManifestLookupError)): msg = 'revision not found: %s' % err.name return tmpl('error', error=msg) except (error.RepoError, error.RevlogError), inst: