##// END OF EJS Templates
addrevision: only use the incoming base if it is a good delta (issue4975)...
Pierre-Yves David -
r27180:8e7db961 default
parent child Browse files
Show More
@@ -1427,7 +1427,12 b' class revlog(object):'
1427 if cachedelta and self._generaldelta and self._lazydeltabase:
1427 if cachedelta and self._generaldelta and self._lazydeltabase:
1428 # Assume what we received from the server is a good choice
1428 # Assume what we received from the server is a good choice
1429 # build delta will reuse the cache
1429 # build delta will reuse the cache
1430 delta = builddelta(cachedelta[0])
1430 candidatedelta = builddelta(cachedelta[0])
1431 if self._isgooddelta(candidatedelta, textlen):
1432 delta = candidatedelta
1433 elif prev != candidatedelta[3]:
1434 # Try against prev to hopefully save us a fulltext.
1435 delta = builddelta(prev)
1431 elif self._generaldelta:
1436 elif self._generaldelta:
1432 if p2r != nullrev and self._aggressivemergedeltas:
1437 if p2r != nullrev and self._aggressivemergedeltas:
1433 delta = builddelta(p1r)
1438 delta = builddelta(p1r)
General Comments 0
You need to be logged in to leave comments. Login now