##// END OF EJS Templates
revlog: use revlog.display_id in error related to bad revisions...
marmoute -
r47934:6bc7c467 default
parent child Browse files
Show More
@@ -2033,7 +2033,7 b' class revlog(object):'
2033 """
2033 """
2034 if link == nullrev:
2034 if link == nullrev:
2035 raise error.RevlogError(
2035 raise error.RevlogError(
2036 _(b"attempted to add linkrev -1 to %s") % self._indexfile
2036 _(b"attempted to add linkrev -1 to %s") % self.display_id
2037 )
2037 )
2038
2038
2039 if sidedata is None:
2039 if sidedata is None:
@@ -2229,14 +2229,14 b' class revlog(object):'
2229 """
2229 """
2230 if node == self.nullid:
2230 if node == self.nullid:
2231 raise error.RevlogError(
2231 raise error.RevlogError(
2232 _(b"%s: attempt to add null revision") % self._indexfile
2232 _(b"%s: attempt to add null revision") % self.display_id
2233 )
2233 )
2234 if (
2234 if (
2235 node == self.nodeconstants.wdirid
2235 node == self.nodeconstants.wdirid
2236 or node in self.nodeconstants.wdirfilenodeids
2236 or node in self.nodeconstants.wdirfilenodeids
2237 ):
2237 ):
2238 raise error.RevlogError(
2238 raise error.RevlogError(
2239 _(b"%s: attempt to add wdir revision") % self._indexfile
2239 _(b"%s: attempt to add wdir revision") % self.display_id
2240 )
2240 )
2241
2241
2242 if self._inline:
2242 if self._inline:
General Comments 0
You need to be logged in to leave comments. Login now