Show More
@@ -1916,11 +1916,11 b' class revlog(object):' | |||||
1916 | flags = chunkdata['flags'] or REVIDX_DEFAULT_FLAGS |
|
1916 | flags = chunkdata['flags'] or REVIDX_DEFAULT_FLAGS | |
1917 |
|
1917 | |||
1918 | nodes.append(node) |
|
1918 | nodes.append(node) | |
|
1919 | chain = node | |||
1919 |
|
1920 | |||
1920 | link = linkmapper(cs) |
|
1921 | link = linkmapper(cs) | |
1921 | if node in self.nodemap: |
|
1922 | if node in self.nodemap: | |
1922 | # this can happen if two branches make the same change |
|
1923 | # this can happen if two branches make the same change | |
1923 | chain = node |
|
|||
1924 | continue |
|
1924 | continue | |
1925 |
|
1925 | |||
1926 | for p in (p1, p2): |
|
1926 | for p in (p1, p2): | |
@@ -1954,13 +1954,13 b' class revlog(object):' | |||||
1954 | # We're only using addgroup() in the context of changegroup |
|
1954 | # We're only using addgroup() in the context of changegroup | |
1955 | # generation so the revision data can always be handled as raw |
|
1955 | # generation so the revision data can always be handled as raw | |
1956 | # by the flagprocessor. |
|
1956 | # by the flagprocessor. | |
1957 |
|
|
1957 | self._addrevision(node, None, transaction, link, | |
1958 |
|
|
1958 | p1, p2, flags, (baserev, delta), | |
1959 |
|
|
1959 | ifh, dfh, | |
1960 |
|
|
1960 | alwayscache=bool(addrevisioncb)) | |
1961 |
|
1961 | |||
1962 | if addrevisioncb: |
|
1962 | if addrevisioncb: | |
1963 |
addrevisioncb(self, |
|
1963 | addrevisioncb(self, node) | |
1964 |
|
1964 | |||
1965 | if not dfh and not self._inline: |
|
1965 | if not dfh and not self._inline: | |
1966 | # addrevision switched from inline to conventional |
|
1966 | # addrevision switched from inline to conventional |
General Comments 0
You need to be logged in to leave comments.
Login now