Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
( )
Lint Skipped |
Unit Tests Skipped |
Path | Packages | |||
---|---|---|---|---|
M | mercurial/unionrepo.py (5 lines) |
Commit | Parents | Author | Summary | Date |
---|---|---|---|---|
c148765cbc87 | e1a10699890a | Pierre-Yves David | Nov 9 2019, 7:23 AM |
Status | Author | Revision | |
---|---|---|---|
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute | ||
Closed | marmoute |
assert linkrev == rev2 # we never link back | assert linkrev == rev2 # we never link back | ||||
link = n | link = n | ||||
else: # rev must be mapped from repo2 cl to unified cl by linkmapper | else: # rev must be mapped from repo2 cl to unified cl by linkmapper | ||||
link = linkmapper(linkrev) | link = linkmapper(linkrev) | ||||
if linkmapper is not None: # link is to same revlog | if linkmapper is not None: # link is to same revlog | ||||
base = linkmapper(base) | base = linkmapper(base) | ||||
if node in self.nodemap: | this_rev = self.index.get_rev(node) | ||||
if this_rev is not None: | |||||
# this happens for the common revlog revisions | # this happens for the common revlog revisions | ||||
self.bundlerevs.add(self.nodemap[node]) | self.bundlerevs.add(this_rev) | ||||
continue | continue | ||||
p1node = self.revlog2.node(p1rev) | p1node = self.revlog2.node(p1rev) | ||||
p2node = self.revlog2.node(p2rev) | p2node = self.revlog2.node(p2rev) | ||||
# TODO: it's probably wrong to set compressed length to None, but | # TODO: it's probably wrong to set compressed length to None, but | ||||
# I have no idea if csize is valid in the base revlog context. | # I have no idea if csize is valid in the base revlog context. | ||||
e = ( | e = ( |