hgkw/keyword.py
author Christian Ebert <blacktrash@gmx.net>
Thu, 08 Feb 2007 14:40:20 +0100
branchkwmap-templates
changeset 129 15e8cd7f5295
parent 128 fe37939db543
child 133 cb60196a500b
permissions -rw-r--r--
Wrap commit instead of calling pretxncommit hook a) probably faster b) relying on pretxncommit hook is problematic [issue273] This version "openly" updates dirstate after overwriting files after commit. Changed test output accordingly.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
     1
# keyword.py - keyword expansion for Mercurial
120
4a8a861da58c Add licence (again)
Christian Ebert <blacktrash@gmx.net>
parents: 119
diff changeset
     2
#
4a8a861da58c Add licence (again)
Christian Ebert <blacktrash@gmx.net>
parents: 119
diff changeset
     3
# Copyright 2007 Christian Ebert <blacktrash@gmx.net>
4a8a861da58c Add licence (again)
Christian Ebert <blacktrash@gmx.net>
parents: 119
diff changeset
     4
#
4a8a861da58c Add licence (again)
Christian Ebert <blacktrash@gmx.net>
parents: 119
diff changeset
     5
# This software may be used and distributed according to the terms
4a8a861da58c Add licence (again)
Christian Ebert <blacktrash@gmx.net>
parents: 119
diff changeset
     6
# of the GNU General Public License, incorporated herein by reference.
4a8a861da58c Add licence (again)
Christian Ebert <blacktrash@gmx.net>
parents: 119
diff changeset
     7
#
82
9bf0f7db5928 Add keyword; comment backwards compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 81
diff changeset
     8
# $Id$
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
     9
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    10
# Keyword expansion hack against the grain of a DSCM
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    11
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    12
# There are many good reasons why this is not needed in a distributed
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    13
# SCM, still it may be useful in very small projects based on single
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    14
# files (like LaTeX packages), that are mostly addressed to an audience
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    15
# not running a version control system.
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    16
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    17
# For in-depth discussion refer to
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    18
# <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>.
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    19
#
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    20
# Keyword expansion is based on Mercurial's changeset template mappings.
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    21
# The extension provides an additional UTC-date filter ({date|utcdate}).
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    22
#
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    23
# The user has the choice either to create his own keywords and their
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    24
# expansions or to use the CVS-like default ones.
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    25
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    26
# Default $keywords$ and their $keyword: substition $ are:
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    27
#     Revision: changeset id
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    28
#     Author:   username
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    29
#     Date:     %Y/%m/%d %H:%M:%S [UTC]
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    30
#     RCSFile:  basename,v
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    31
#     Source:   /path/to/basename,v
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    32
#     Id:       basename,v csetid %Y/%m/%d %H:%M:%S username
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    33
#     Header:   /path/to/basename,v csetid %Y/%m/%d %H:%M:%S username
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    34
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    35
# Expansions spanning more than one line are truncated to their first line.
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    36
# Incremental expansion (like CVS' $Log$) is not supported.
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    37
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    38
# Simple setup in hgrc:
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    39
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    40
#     # enable extension
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    41
#     keyword = /full/path/to/keyword.py
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    42
#     # or, if script in hgext folder:
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    43
#     # hgext.keyword =
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    44
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    45
#     # filename patterns for expansion are configured in this section
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    46
#     # files matching patterns with value 'ignore' are ignored
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    47
#     [keyword]
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    48
#     **.py =
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    49
#     x* = ignore
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    50
#     ...
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    51
#     # in case you prefer your own keyword maps over the cvs-like defaults:
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    52
#     [keywordmaps]
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    53
#     HGdate = {date|rfc822date}
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    54
#     lastlog = {desc} ## same as {desc|firstline} in this context
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    55
#     checked in by = {author}
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    56
#     ...
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    57
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    58
'''keyword expansion in local repositories
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    59
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    60
This extension expands RCS/CVS-like or self-customized keywords in
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    61
the text files selected by your configuration.
102
393d6f8ea83c More doc, link to KeywordPlan
Christian Ebert <blacktrash@gmx.net>
parents: 101
diff changeset
    62
114
09847a7eb5d7 Describe substitution mechanism in doc
Christian Ebert <blacktrash@gmx.net>
parents: 113
diff changeset
    63
Keywords are only expanded in local repositories and not logged by
09847a7eb5d7 Describe substitution mechanism in doc
Christian Ebert <blacktrash@gmx.net>
parents: 113
diff changeset
    64
Mercurial internally. The mechanism can be regarded as a convenience
09847a7eb5d7 Describe substitution mechanism in doc
Christian Ebert <blacktrash@gmx.net>
parents: 113
diff changeset
    65
for the current user and may be turned off anytime.
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    66
114
09847a7eb5d7 Describe substitution mechanism in doc
Christian Ebert <blacktrash@gmx.net>
parents: 113
diff changeset
    67
Substitution takes place on every commit and update of the working
09847a7eb5d7 Describe substitution mechanism in doc
Christian Ebert <blacktrash@gmx.net>
parents: 113
diff changeset
    68
repository.
108
25dac950a1f0 Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net>
parents: 107
diff changeset
    69
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    70
Configuration is done in the [keyword] and [keywordmaps] sections of
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    71
hgrc files.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    72
'''
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    73
105
2a8b0a71c2ec Use full power of util.matcher for kwfmatches()
Christian Ebert <blacktrash@gmx.net>
parents: 104
diff changeset
    74
from mercurial.i18n import gettext as _
126
47b45198a30d "or" for "if" in getmodulename; shorter comment on backwards compatibiliy
Christian Ebert <blacktrash@gmx.net>
parents: 123
diff changeset
    75
# above line for backwards compatibility of standalone version
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
    76
from mercurial import cmdutil, templater, util
110
b0b85b383f36 Move all that can be done only once per repo into reposetup
Christian Ebert <blacktrash@gmx.net>
parents: 109
diff changeset
    77
from mercurial import context, filelog, revlog
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
    78
import os.path, re, time
47
0617e7d497f6 Branch standalone extension, including pretxncommit hook function
Christian Ebert <blacktrash@gmx.net>
parents: 44
diff changeset
    79
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    80
deftemplates = {
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    81
        'Revision': '{node|short}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    82
        'Author': '{author|user}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    83
        'Date': '{date|utcdate}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    84
        'RCSFile': '{file|basename},v',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    85
        'Source': '{root}/{file},v',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    86
        'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    87
        'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    88
        }
59
94b26168791d Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents: 58
diff changeset
    89
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    90
def utcdate(date):
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    91
    '''Returns hgdate in cvs-like UTC format.'''
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    92
    return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    93
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    94
class kwtemplater(object):
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
    95
    '''
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    96
    Sets up keyword templates, corresponding keyword regex, and
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    97
    provides keyword expansion function.
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
    98
    '''
101
98a65d978098 No need to read changelog in show(); node mandatory arg for expand()
Christian Ebert <blacktrash@gmx.net>
parents: 100
diff changeset
    99
    def __init__(self, ui, repo):
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   100
        self.ui = ui
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   101
        self.repo = repo
106
61afa140949e Only initialize kwtemplater in kwfilelog if needed
Christian Ebert <blacktrash@gmx.net>
parents: 105
diff changeset
   102
        self.templates = dict(ui.configitems('keywordmaps')) or deftemplates
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   103
        self.re_kw = re.compile(r'\$(%s)[^$]*?\$' %
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   104
                '|'.join(re.escape(k) for k in self.templates.keys()))
109
b2cc6a8d4a18 Extend templater.common_filters in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 108
diff changeset
   105
        templater.common_filters['utcdate'] = utcdate
106
61afa140949e Only initialize kwtemplater in kwfilelog if needed
Christian Ebert <blacktrash@gmx.net>
parents: 105
diff changeset
   106
        self.t = cmdutil.changeset_templater(ui, repo, False, '', False)
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   107
101
98a65d978098 No need to read changelog in show(); node mandatory arg for expand()
Christian Ebert <blacktrash@gmx.net>
parents: 100
diff changeset
   108
    def expand(self, mobj, path, node):
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
   109
        '''Expands keyword using corresponding template.'''
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   110
        kw = mobj.group(1)
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   111
        template = templater.parsestring(self.templates[kw], quoted=False)
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   112
        self.t.use_template(template)
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   113
        self.ui.pushbuffer()
101
98a65d978098 No need to read changelog in show(); node mandatory arg for expand()
Christian Ebert <blacktrash@gmx.net>
parents: 100
diff changeset
   114
        self.t.show(changenode=node, root=self.repo.root, file=path)
110
b0b85b383f36 Move all that can be done only once per repo into reposetup
Christian Ebert <blacktrash@gmx.net>
parents: 109
diff changeset
   115
        kwsub = templater.firstline(self.ui.popbuffer())
b0b85b383f36 Move all that can be done only once per repo into reposetup
Christian Ebert <blacktrash@gmx.net>
parents: 109
diff changeset
   116
        return '$%s: %s $' % (kw, kwsub)
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   117
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   118
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   119
def reposetup(ui, repo):
108
25dac950a1f0 Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net>
parents: 107
diff changeset
   120
    '''Sets up repo, and filelog especially, as kwrepo and kwfilelog
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
   121
    for keyword substitution. This is done for local repos only.'''
108
25dac950a1f0 Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net>
parents: 107
diff changeset
   122
110
b0b85b383f36 Move all that can be done only once per repo into reposetup
Christian Ebert <blacktrash@gmx.net>
parents: 109
diff changeset
   123
    if not repo.local():
b0b85b383f36 Move all that can be done only once per repo into reposetup
Christian Ebert <blacktrash@gmx.net>
parents: 109
diff changeset
   124
        return
108
25dac950a1f0 Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net>
parents: 107
diff changeset
   125
122
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   126
    inc, exc = [], ['.hg*']
123
6cf933de685a Make all ui config and kwfmatcher a local repo attribute
Christian Ebert <blacktrash@gmx.net>
parents: 122
diff changeset
   127
    for pat, opt in repo.ui.configitems('keyword'):
122
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   128
        if opt != 'ignore':
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   129
            inc.append(pat)
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   130
        else:
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   131
            exc.append(pat)
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   132
    if not inc:
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   133
        return
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   134
123
6cf933de685a Make all ui config and kwfmatcher a local repo attribute
Christian Ebert <blacktrash@gmx.net>
parents: 122
diff changeset
   135
    repo.kwfmatcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
122
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   136
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   137
    class kwrepo(repo.__class__):
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   138
        def file(self, f):
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   139
            if f[0] == '/':
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   140
                f = f[1:]
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   141
            return filelog.filelog(self.sopener, f, self, self.revlogversion)
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   142
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   143
        def commit(self, files=None, text="", user=None, date=None,
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   144
                match=util.always, force=False, lock=None, wlock=None,
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   145
                force_editor=False, p1=None, p2=None, extra={}):
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   146
            '''Wraps commit, expanding keywords of committed and
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   147
            configured files in working directory.'''
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   148
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   149
            node = super(kwrepo, self).commit(files=files,
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   150
                    text=text, user=user, date=date,
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   151
                    match=match, force=force, lock=lock, wlock=wlock,
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   152
                    force_editor=force_editor, p1=p1, p2=p2, extra=extra)
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   153
            if node is None:
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   154
                return node
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   155
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   156
            candidates = self.changelog.read(node)[3]
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   157
            candidates = [f for f in candidates
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   158
                    if self.kwfmatcher(f) and os.path.isfile(self.wjoin(f))]
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   159
            if not candidates:
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   160
                return node
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   161
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   162
            kwt = kwtemplater(self.ui, self)
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   163
            overwrite = []
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   164
            for f in candidates:
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   165
                data = self.wfile(f).read()
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   166
                if not util.binary(data):
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   167
                    data, kwct = kwt.re_kw.subn(lambda m:
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   168
                            kwt.expand(m, f, node), data)
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   169
                    if kwct:
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   170
                        ui.debug(_('overwriting %s expanding keywords\n' % f))
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   171
                        self.wfile(f, 'w').write(data)
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   172
                        overwrite.append(f)
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   173
            self.dirstate.update(overwrite, 'n')
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   174
            return node
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   175
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   176
    class kwfilelog(filelog.filelog):
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   177
        '''
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   178
        Superclass over filelog to customize it's read, add, cmp methods.
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   179
        Keywords are "stored" unexpanded, and expanded on reading.
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   180
        '''
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   181
        def __init__(self, opener, path, repo,
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   182
                     defversion=revlog.REVLOG_DEFAULT_VERSION):
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   183
            super(kwfilelog, self).__init__(opener, path, defversion)
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   184
            self._repo = repo
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   185
            self._path = path
106
61afa140949e Only initialize kwtemplater in kwfilelog if needed
Christian Ebert <blacktrash@gmx.net>
parents: 105
diff changeset
   186
            # only init kwtemplater if needed
123
6cf933de685a Make all ui config and kwfmatcher a local repo attribute
Christian Ebert <blacktrash@gmx.net>
parents: 122
diff changeset
   187
            if not isinstance(repo, int) and repo.kwfmatcher(path):
6cf933de685a Make all ui config and kwfmatcher a local repo attribute
Christian Ebert <blacktrash@gmx.net>
parents: 122
diff changeset
   188
                self.kwt = kwtemplater(repo.ui, repo)
106
61afa140949e Only initialize kwtemplater in kwfilelog if needed
Christian Ebert <blacktrash@gmx.net>
parents: 105
diff changeset
   189
            else:
61afa140949e Only initialize kwtemplater in kwfilelog if needed
Christian Ebert <blacktrash@gmx.net>
parents: 105
diff changeset
   190
                self.kwt = None
36
b3ace8cc5a33 Change config opt "expand" to accept filename patterns
Christian Ebert <blacktrash@gmx.net>
parents: 34
diff changeset
   191
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   192
        def iskwcandidate(self, data):
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   193
            '''Decides whether to act on keywords.'''
106
61afa140949e Only initialize kwtemplater in kwfilelog if needed
Christian Ebert <blacktrash@gmx.net>
parents: 105
diff changeset
   194
            return self.kwt is not None and not util.binary(data)
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   195
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   196
        def read(self, node):
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   197
            '''Substitutes keywords when reading filelog.'''
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   198
            data = super(kwfilelog, self).read(node)
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   199
            if self.iskwcandidate(data):
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   200
                c = context.filectx(self._repo, self._path,
100
4f1129ddbdb8 Just re-bin the node kwarg of the hook, instead of using changelog
Christian Ebert <blacktrash@gmx.net>
parents: 99
diff changeset
   201
                                    fileid=node, filelog=self)
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   202
                return self.kwt.re_kw.sub(lambda m:
101
98a65d978098 No need to read changelog in show(); node mandatory arg for expand()
Christian Ebert <blacktrash@gmx.net>
parents: 100
diff changeset
   203
                        self.kwt.expand(m, self._path, c.node()), data)
51
1ecb6ec5d16b Reintroduce simpler kwfilelog.add(); simplify kwfilelog.read()
Christian Ebert <blacktrash@gmx.net>
parents: 50
diff changeset
   204
            return data
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   205
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   206
        def add(self, text, meta, tr, link, p1=None, p2=None):
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   207
            '''Removes keyword substitutions when adding to filelog.'''
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   208
            if self.iskwcandidate(text):
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   209
                text = self.kwt.re_kw.sub(r'$\1$', text)
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   210
            return super(kwfilelog, self).add(text,
102
393d6f8ea83c More doc, link to KeywordPlan
Christian Ebert <blacktrash@gmx.net>
parents: 101
diff changeset
   211
                            meta, tr, link, p1=p1, p2=p2)
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   212
49
5acfe7dc3086 Override filelog's size(), cmp() as well; remove add()
Christian Ebert <blacktrash@gmx.net>
parents: 48
diff changeset
   213
        def cmp(self, node, text):
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   214
            '''Removes keyword substitutions for comparison.'''
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   215
            if self.iskwcandidate(text):
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   216
                text = self.kwt.re_kw.sub(r'$\1$', text)
71
f7a2a246740c No keyword substitution in cmp(); no overriding of size() ATM
Christian Ebert <blacktrash@gmx.net>
parents: 69
diff changeset
   217
            return super(kwfilelog, self).cmp(node, text)
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   218
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   219
    filelog.filelog = kwfilelog
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   220
    repo.__class__ = kwrepo