##// END OF EJS Templates
memctx: simplify _manifest with new revlog nodeids...
Sean Farley -
r39749:a5dafefc default
parent child Browse files
Show More
@@ -36,7 +36,6 b' from . import ('
36 phases,
36 phases,
37 pycompat,
37 pycompat,
38 repoview,
38 repoview,
39 revlog,
40 scmutil,
39 scmutil,
41 sparse,
40 sparse,
42 subrepo,
41 subrepo,
@@ -2287,17 +2286,10 b' class memctx(committablectx):'
2287 man = pctx.manifest().copy()
2286 man = pctx.manifest().copy()
2288
2287
2289 for f in self._status.modified:
2288 for f in self._status.modified:
2290 p1node = nullid
2289 man[f] = modifiednodeid
2291 p2node = nullid
2292 p = pctx[f].parents() # if file isn't in pctx, check p2?
2293 if len(p) > 0:
2294 p1node = p[0].filenode()
2295 if len(p) > 1:
2296 p2node = p[1].filenode()
2297 man[f] = revlog.hash(self[f].data(), p1node, p2node)
2298
2290
2299 for f in self._status.added:
2291 for f in self._status.added:
2300 man[f] = revlog.hash(self[f].data(), nullid, nullid)
2292 man[f] = addednodeid
2301
2293
2302 for f in self._status.removed:
2294 for f in self._status.removed:
2303 if f in man:
2295 if f in man:
General Comments 0
You need to be logged in to leave comments. Login now