comparison hgext/keyword.py @ 29055:4a65c9c6cd3f

keyword: replace use of _filerev with _filenode To be independent of rev numbers. Analogous to ba8257cb53e8.
author Christian Ebert <blacktrash@gmx.net>
date Tue, 19 Apr 2016 11:00:15 +0100
parents 9a6fa1d93bc8
children a0939666b836
comparison
equal deleted inserted replaced
29054:acc4c6070f31 29055:4a65c9c6cd3f
733 return ret 733 return ret
734 734
735 def kwfilectx_cmp(orig, self, fctx): 735 def kwfilectx_cmp(orig, self, fctx):
736 # keyword affects data size, comparing wdir and filelog size does 736 # keyword affects data size, comparing wdir and filelog size does
737 # not make sense 737 # not make sense
738 if (fctx._filerev is None and 738 if (fctx._filenode is None and
739 (self._repo._encodefilterpats or 739 (self._repo._encodefilterpats or
740 kwt.match(fctx.path()) and 'l' not in fctx.flags() or 740 kwt.match(fctx.path()) and 'l' not in fctx.flags() or
741 self.size() - 4 == fctx.size()) or 741 self.size() - 4 == fctx.size()) or
742 self.size() == fctx.size()): 742 self.size() == fctx.size()):
743 return self._filelog.cmp(self._filenode, fctx.data()) 743 return self._filelog.cmp(self._filenode, fctx.data())