Mercurial > public > mercurial-scm > hg

comparison mercurial/revlog.py @ 35640:fa4278171add

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: rename 'rev' to 'base', as it is the base revision
author Paul Morelle <paul.morelle@octobus.net>
date Sun, 14 Jan 2018 13:01:35 -0800
parents 30f5f33250c8
children c41bb85c09ff
comparison
equal deleted inserted replaced
35639:30f5f33250c8 35640:fa4278171add
1946 ptext = self.revision(base, _df=fh, raw=True) 1946 ptext = self.revision(base, _df=fh, raw=True)
1947 delta = mdiff.textdiff(ptext, t) 1947 delta = mdiff.textdiff(ptext, t)
1948 1948
1949 return delta 1949 return delta
1950 1950
1951 def _builddeltainfo(self, node, rev, p1, p2, btext, cachedelta, fh, flags): 1951 def _builddeltainfo(self, node, base, p1, p2, btext, cachedelta, fh, flags):
1952 # can we use the cached delta? 1952 # can we use the cached delta?
1953 if cachedelta and cachedelta[0] == rev: 1953 if cachedelta and cachedelta[0] == base:
1954 delta = cachedelta[1] 1954 delta = cachedelta[1]
1955 else: 1955 else:
1956 delta = self._builddeltadiff(rev, node, p1, p2, btext, cachedelta, 1956 delta = self._builddeltadiff(base, node, p1, p2, btext, cachedelta,
1957 fh, flags) 1957 fh, flags)
1958 header, data = self.compress(delta) 1958 header, data = self.compress(delta)
1959 deltalen = len(header) + len(data) 1959 deltalen = len(header) + len(data)
1960 chainbase = self.chainbase(rev) 1960 chainbase = self.chainbase(base)
1961 offset = self.end(len(self) - 1) 1961 offset = self.end(len(self) - 1)
1962 dist = deltalen + offset - self.start(chainbase) 1962 dist = deltalen + offset - self.start(chainbase)
1963 if self._generaldelta: 1963 if self._generaldelta:
1964 base = rev 1964 deltabase = base
1965 else: 1965 else:
1966 base = chainbase 1966 deltabase = chainbase
1967 chainlen, compresseddeltalen = self._chaininfo(rev) 1967 chainlen, compresseddeltalen = self._chaininfo(base)
1968 chainlen += 1 1968 chainlen += 1
1969 compresseddeltalen += deltalen 1969 compresseddeltalen += deltalen
1970 return _deltainfo(dist, deltalen, (header, data), base, 1970 return _deltainfo(dist, deltalen, (header, data), deltabase,
1971 chainbase, chainlen, compresseddeltalen) 1971 chainbase, chainlen, compresseddeltalen)
1972 1972
1973 def _addrevision(self, node, rawtext, transaction, link, p1, p2, flags, 1973 def _addrevision(self, node, rawtext, transaction, link, p1, p2, flags,
1974 cachedelta, ifh, dfh, alwayscache=False): 1974 cachedelta, ifh, dfh, alwayscache=False):
1975 """internal function to add revisions to the log 1975 """internal function to add revisions to the log