comparison hgext/keyword.py @ 33063:7f569ce30216

keyword: restore kwtemplater.restrict at the end of wrapped patch.diff

Before this patch, kwdiff doesn't restore kwtemplater.restrict after
invocation of wrapped patch.diff(). This suppresses keyword expansion
at subsequent filelog.read().

Typical usecase of this issue is "hg cat" after "hg diff" with command
server. In this case, kwtemplater.restrict=True is kept in command
server process even after "hg diff".

To ensure kwtemplater.restrict=True while original patch.diff()
running, this patch makes kwdiff() yield values returned by it,
because it returns generator object.

Strictly speaking, if filelog.read() is invoked before completely
evaluating the result of previous patch.diff(), keyword expansion is
still suppressed, because kwtemplater.restrict isn't restored yet.

But this fixing should be reasonable enough, because patch.diff() is
consumed immediately, AFAIK.

33062:e21b750c9b9e

        # shrink keywords read from working dir
        self.lines = kwt.shrinklines(self.fname, self.lines)

    def kwdiff(orig, *args, **kwargs):
        '''Monkeypatch patch.diff to avoid expansion.'''
        kwt.restrict = True
        return orig(*args, **kwargs)

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

33063:7f569ce30216

        # shrink keywords read from working dir
        self.lines = kwt.shrinklines(self.fname, self.lines)

    def kwdiff(orig, *args, **kwargs):
        '''Monkeypatch patch.diff to avoid expansion.'''
        restrict = kwt.restrict
        kwt.restrict = True
        try:
            for chunk in orig(*args, **kwargs):
                yield chunk
        finally:
            kwt.restrict = restrict

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