equal
deleted
inserted
replaced
1890 for f in self._status.modified: |
1890 for f in self._status.modified: |
1891 p1node = nullid |
1891 p1node = nullid |
1892 p2node = nullid |
1892 p2node = nullid |
1893 p = pctx[f].parents() # if file isn't in pctx, check p2? |
1893 p = pctx[f].parents() # if file isn't in pctx, check p2? |
1894 if len(p) > 0: |
1894 if len(p) > 0: |
1895 p1node = p[0].node() |
1895 p1node = p[0].filenode() |
1896 if len(p) > 1: |
1896 if len(p) > 1: |
1897 p2node = p[1].node() |
1897 p2node = p[1].filenode() |
1898 man[f] = revlog.hash(self[f].data(), p1node, p2node) |
1898 man[f] = revlog.hash(self[f].data(), p1node, p2node) |
1899 |
1899 |
1900 for f in self._status.added: |
1900 for f in self._status.added: |
1901 man[f] = revlog.hash(self[f].data(), nullid, nullid) |
1901 man[f] = revlog.hash(self[f].data(), nullid, nullid) |
1902 |
1902 |