##// END OF EJS Templates
manifest: use `read_delta_parents` when adjusting linkrev in remotefile...
marmoute -
r52675:4704c4c7 default
parent child Browse files
Show More
@@ -100,7 +100,11 class remotefilectx(context.filectx):
100 100 if path in data[3]: # checking the 'files' field.
101 101 # The file has been touched, check if the hash is what we're
102 102 # looking for.
103 if fileid == mfl[data[0]].readfast().get(path):
103 #
104 # The change has to be against a parent, otherwise we might be
105 # missing linkrev worthy changes.
106 m = mfl[data[0]].read_delta_parents(exact=False)
107 if fileid == m.get(path):
104 108 return rev
105 109
106 110 # Couldn't find the linkrev. This should generally not happen, and will
@@ -199,7 +203,9 class remotefilectx(context.filectx):
199 203 manifestnode, files = ancctx[0], ancctx[3]
200 204 # If the file was touched in this ancestor, and the content is similar
201 205 # to the one we are searching for.
202 if path in files and fnode == mfl[manifestnode].readfast().get(path):
206 if path in files:
207 m = mfl[manifestnode].read_delta_parents(exact=False)
208 if fnode == m.get(path):
203 209 return cl.node(ancrev)
204 210 return None
205 211
General Comments 0
You need to be logged in to leave comments. Login now