Show More
@@ -100,7 +100,11 b' class remotefilectx(context.filectx):' | |||||
100 | if path in data[3]: # checking the 'files' field. |
|
100 | if path in data[3]: # checking the 'files' field. | |
101 | # The file has been touched, check if the hash is what we're |
|
101 | # The file has been touched, check if the hash is what we're | |
102 | # looking for. |
|
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 | return rev |
|
108 | return rev | |
105 |
|
109 | |||
106 | # Couldn't find the linkrev. This should generally not happen, and will |
|
110 | # Couldn't find the linkrev. This should generally not happen, and will | |
@@ -199,8 +203,10 b' class remotefilectx(context.filectx):' | |||||
199 | manifestnode, files = ancctx[0], ancctx[3] |
|
203 | manifestnode, files = ancctx[0], ancctx[3] | |
200 | # If the file was touched in this ancestor, and the content is similar |
|
204 | # If the file was touched in this ancestor, and the content is similar | |
201 | # to the one we are searching for. |
|
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: | |
203 | return cl.node(ancrev) |
|
207 | m = mfl[manifestnode].read_delta_parents(exact=False) | |
|
208 | if fnode == m.get(path): | |||
|
209 | return cl.node(ancrev) | |||
204 | return None |
|
210 | return None | |
205 |
|
211 | |||
206 | def _adjustlinknode(self, path, filelog, fnode, srcrev, inclusive=False): |
|
212 | def _adjustlinknode(self, path, filelog, fnode, srcrev, inclusive=False): |
General Comments 0
You need to be logged in to leave comments.
Login now