Submitter | Boris Feld |
---|---|
Date | Dec. 21, 2018, 11:47 a.m. |
Message ID | <4067f496c37ec6d10860.1545392828@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/37297/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -1535,11 +1535,17 @@ class revlog(object): """ if rev == nullrev: return True - deltap = self.deltaparent(rev) + entry = self.index[rev] + deltap = entry[3] + if deltap == rev: + return True + if not self._generaldelta: + return False if deltap == nullrev: return True - p1, p2 = self.parentrevs(rev) - if deltap in (p1, p2): + p1 = entry[5] + p2 = entry[6] + if deltap == p1 or deltap == p2: return False return self.issnapshot(deltap)