Commit 7c23d0bf authored by Steve Borho's avatar Steve Borho
Browse files

fileview: catch util.Abort from subrepository status code

parent 29fdc4c61485
...@@ -620,8 +620,8 @@ class FileData(object): ...@@ -620,8 +620,8 @@ class FileData(object):
self.flabel += _(' <i>(is a dirty sub-repository)</i>') self.flabel += _(' <i>(is a dirty sub-repository)</i>')
lbl = u' <a href="subrepo:%s">%s...</a>' lbl = u' <a href="subrepo:%s">%s...</a>'
self.flabel += lbl % (hglib.tounicode(sroot), _('open')) self.flabel += lbl % (hglib.tounicode(sroot), _('open'))
except error.RepoError: except (error.RepoError, util.Abort), e:
self.error = _('Not an hg subrepo, not previewable') self.error = _('Not a Mercurial subrepo, not previewable')
return return
# TODO: elif check if a subdirectory (for manifest tool) # TODO: elif check if a subdirectory (for manifest tool)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment