comparison hgext/keyword.py @ 7308:b6f5490effbf

patch: turn patch.diff() into a generator

This should even be a little faster than passing in an fp argument.

7307:56380212d630

        rejects or conflicts due to expanded keywords in working dir.'''
        orig(self, ui, fname, missing)
        # shrink keywords read from working dir
        self.lines = kwt.shrinklines(self.fname, self.lines)

    def kw_diff(orig, repo, node1=None, node2=None, match=None,
                fp=None, changes=None, opts=None):
        '''Monkeypatch patch.diff to avoid expansion except when
        comparing against working dir.'''
        if node2 is not None:
            kwt.matcher = util.never
        elif node1 is not None and node1 != repo['.'].node():
            kwt.restrict = True
        orig(repo, node1, node2, match, fp, changes, opts)

    def kwweb_skip(orig, web, req, tmpl):
        '''Wraps webcommands.x turning off keyword expansion.'''
        kwt.matcher = util.never
        return orig(web, req, tmpl)

7308:b6f5490effbf

        rejects or conflicts due to expanded keywords in working dir.'''
        orig(self, ui, fname, missing)
        # shrink keywords read from working dir
        self.lines = kwt.shrinklines(self.fname, self.lines)

    def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
                opts=None):
        '''Monkeypatch patch.diff to avoid expansion except when
        comparing against working dir.'''
        if node2 is not None:
            kwt.matcher = util.never
        elif node1 is not None and node1 != repo['.'].node():
            kwt.restrict = True
        return orig(repo, node1, node2, match, changes, opts)

    def kwweb_skip(orig, web, req, tmpl):
        '''Wraps webcommands.x turning off keyword expansion.'''
        kwt.matcher = util.never
        return orig(web, req, tmpl)