comparison hgext/keyword.py @ 5885:53be157543d4

keyword: avoid extra diffs when not comparing against working dir

When diffing against specified revisions expanded keywords
only get in the way.

Update test output.

5884:a139f141dcae

def _kwrestrict(cmd):
    '''Returns True if cmd should trigger restricted expansion.
    Keywords will only expanded when writing to working dir.
    Crucial for mq as expanded keywords should not make it into patches.'''
    return cmd in ('qimport', 'qnew', 'qpush', 'qrefresh', 'record', 'qrecord')


_kwtemplater = None

class kwtemplater(object):

                    'convert')
    hgcmd, func, args, opts, cmdopts = dispatch._parse(ui, sys.argv[1:])
    if hgcmd in nokwcommands:
        return

    inc, exc = [], ['.hgtags']
    for pat, opt in ui.configitems('keyword'):
        if opt != 'ignore':
            inc.append(pat)
        else:

5885:53be157543d4

def _kwrestrict(cmd):
    '''Returns True if cmd should trigger restricted expansion.
    Keywords will only expanded when writing to working dir.
    Crucial for mq as expanded keywords should not make it into patches.'''
    return cmd in ('diff1', 
                   'qimport', 'qnew', 'qpush', 'qrefresh', 'record', 'qrecord')


_kwtemplater = None

class kwtemplater(object):

                    'convert')
    hgcmd, func, args, opts, cmdopts = dispatch._parse(ui, sys.argv[1:])
    if hgcmd in nokwcommands:
        return

    if hgcmd == 'diff':
        # only expand if comparing against working dir
        node1, node2 = cmdutil.revpair(repo, cmdopts.get('rev'))
        if node2 is not None:
            return
        # shrink if rev is not current node
        if node1 is not None and node1 != repo.changectx().node():
            hgcmd = 'diff1'

    inc, exc = [], ['.hgtags']
    for pat, opt in ui.configitems('keyword'):
        if opt != 'ignore':
            inc.append(pat)
        else: