Show More
@@ -1633,10 +1633,9 b' class memctx(committablectx):' | |||
|
1633 | 1633 | |
|
1634 | 1634 | # keep this simple for now; just worry about p1 |
|
1635 | 1635 | pctx = self._parents[0] |
|
1636 | pman = pctx.manifest() | |
|
1637 | 1636 | man = pctx.manifest().copy() |
|
1638 | 1637 | |
|
1639 | for f, fnode in pman.iteritems(): | |
|
1638 | for f in self._status.modified: | |
|
1640 | 1639 | p1node = nullid |
|
1641 | 1640 | p2node = nullid |
|
1642 | 1641 | p = pctx[f].parents() # if file isn't in pctx, check p2? |
@@ -1644,12 +1643,7 b' class memctx(committablectx):' | |||
|
1644 | 1643 | p1node = p[0].node() |
|
1645 | 1644 | if len(p) > 1: |
|
1646 | 1645 | p2node = p[1].node() |
|
1647 | fctx = self[f] | |
|
1648 | if fctx is None: | |
|
1649 | # removed file | |
|
1650 | del man[f] | |
|
1651 | else: | |
|
1652 | man[f] = revlog.hash(fctx.data(), p1node, p2node) | |
|
1646 | man[f] = revlog.hash(self[f].data(), p1node, p2node) | |
|
1653 | 1647 | |
|
1654 | 1648 | for f in self._status.added: |
|
1655 | 1649 | man[f] = revlog.hash(self[f].data(), nullid, nullid) |
General Comments 0
You need to be logged in to leave comments.
Login now