Show More
@@ -1745,6 +1745,10 b' class revlog(object):' | |||||
1745 | tr.replace(self.indexfile, trindex * self._io.size) |
|
1745 | tr.replace(self.indexfile, trindex * self._io.size) | |
1746 | self._chunkclear() |
|
1746 | self._chunkclear() | |
1747 |
|
1747 | |||
|
1748 | def _nodeduplicatecallback(self, transaction, node): | |||
|
1749 | """called when trying to add a node already stored. | |||
|
1750 | """ | |||
|
1751 | ||||
1748 | def addrevision(self, text, transaction, link, p1, p2, cachedelta=None, |
|
1752 | def addrevision(self, text, transaction, link, p1, p2, cachedelta=None, | |
1749 | node=None, flags=REVIDX_DEFAULT_FLAGS, deltacomputer=None): |
|
1753 | node=None, flags=REVIDX_DEFAULT_FLAGS, deltacomputer=None): | |
1750 | """add a revision to the log |
|
1754 | """add a revision to the log | |
@@ -2026,6 +2030,7 b' class revlog(object):' | |||||
2026 | nodes.append(node) |
|
2030 | nodes.append(node) | |
2027 |
|
2031 | |||
2028 | if node in self.nodemap: |
|
2032 | if node in self.nodemap: | |
|
2033 | self._nodeduplicatecallback(transaction, node) | |||
2029 | # this can happen if two branches make the same change |
|
2034 | # this can happen if two branches make the same change | |
2030 | continue |
|
2035 | continue | |
2031 |
|
2036 |
General Comments 0
You need to be logged in to leave comments.
Login now