##// END OF EJS Templates
revlog: choose between ifh and dfh once for all
Paul Morelle -
r35653:0b52c0ec default
parent child Browse files
Show More
@@ -1901,6 +1901,11 b' class revlog(object):'
1901 raise RevlogError(_("%s: attempt to add wdir revision") %
1901 raise RevlogError(_("%s: attempt to add wdir revision") %
1902 (self.indexfile))
1902 (self.indexfile))
1903
1903
1904 if self._inline:
1905 fh = ifh
1906 else:
1907 fh = dfh
1908
1904 btext = [rawtext]
1909 btext = [rawtext]
1905 def buildtext():
1910 def buildtext():
1906 if btext[0] is not None:
1911 if btext[0] is not None:
@@ -1915,10 +1920,6 b' class revlog(object):'
1915 len(delta) - hlen):
1920 len(delta) - hlen):
1916 btext[0] = delta[hlen:]
1921 btext[0] = delta[hlen:]
1917 else:
1922 else:
1918 if self._inline:
1919 fh = ifh
1920 else:
1921 fh = dfh
1922 basetext = self.revision(baserev, _df=fh, raw=True)
1923 basetext = self.revision(baserev, _df=fh, raw=True)
1923 btext[0] = mdiff.patch(basetext, delta)
1924 btext[0] = mdiff.patch(basetext, delta)
1924
1925
@@ -1947,10 +1948,6 b' class revlog(object):'
1947 header = mdiff.replacediffheader(self.rawsize(rev), len(t))
1948 header = mdiff.replacediffheader(self.rawsize(rev), len(t))
1948 delta = header + t
1949 delta = header + t
1949 else:
1950 else:
1950 if self._inline:
1951 fh = ifh
1952 else:
1953 fh = dfh
1954 ptext = self.revision(rev, _df=fh, raw=True)
1951 ptext = self.revision(rev, _df=fh, raw=True)
1955 delta = mdiff.textdiff(ptext, t)
1952 delta = mdiff.textdiff(ptext, t)
1956 header, data = self.compress(delta)
1953 header, data = self.compress(delta)
General Comments 0
You need to be logged in to leave comments. Login now