hgkw/keyword.py
author Christian Ebert <blacktrash@gmx.net>
Fri, 13 Jul 2007 08:43:39 +0200
branchkwmap-templates
changeset 174 c5f655d5d8b4
parent 173 5329863fb64e
child 175 f8e5cafa7b99
permissions -rw-r--r--
Handle rename and copy properly Touching a renamed or copied file made it seem modified.
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
# 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
    27
# Incremental expansion (like CVS' $Log$) is not supported.
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    28
#
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    29
# Binary files are not touched.
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    30
#
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    31
# Setup in hgrc:
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    32
#
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    33
#     # enable extension
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    34
#     keyword = /full/path/to/keyword.py
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    35
#     # or, if script in hgext folder:
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    36
#     # hgext.keyword =
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    37
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    38
'''keyword expansion in local repositories
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    39
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    40
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
    41
the text files selected by your configuration.
102
393d6f8ea83c More doc, link to KeywordPlan
Christian Ebert <blacktrash@gmx.net>
parents: 101
diff changeset
    42
114
09847a7eb5d7 Describe substitution mechanism in doc
Christian Ebert <blacktrash@gmx.net>
parents: 113
diff changeset
    43
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
    44
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
    45
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
    46
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    47
Caveat: "hg import" might fail if the patches were exported from a
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    48
repo with a different/no keyword setup, whereas "hg unbundle" is
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    49
safe.
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    50
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    51
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
    52
hgrc files.
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    53
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    54
Example:
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    55
     [keyword]
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    56
     # filename patterns for expansion are configured in this section
165
01c42124151a Remove obsolete archive mode from __doc__
Christian Ebert <blacktrash@gmx.net>
parents: 164
diff changeset
    57
     # files matching patterns with value 'ignore' are ignored
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    58
     **.py =          ## expand keywords in all python files
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    59
     x* = ignore      ## but ignore files matching "x*"
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    60
     ...
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    61
     [keywordmaps]
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    62
     # custom hg template maps _replace_ the CVS-like default ones
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    63
     HGdate = {date|rfc822date}
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    64
     lastlog = {desc} ## same as {desc|firstline} in this context
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    65
     checked in by = {author}
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    66
     ...
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    67
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    68
If no [keywordmaps] are configured the extension falls back on the
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    69
following defaults:
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    70
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    71
     Revision: changeset id
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    72
     Author: username
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    73
     Date: %Y/%m/%d %H:%M:%S      ## [UTC]
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    74
     RCSFile: basename,v
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    75
     Source: /path/to/basename,v
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    76
     Id: basename,v csetid %Y/%m/%d %H:%M:%S username
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    77
     Header: /path/to/basename,v csetid %Y/%m/%d %H:%M:%S username
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    78
'''
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    79
159
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    80
from mercurial.i18n import gettext as _
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    81
from mercurial import commands, fancyopts, templater, util
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    82
from mercurial import cmdutil, context, filelog
163
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    83
# findcmd might be in cmdutil or commands
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    84
# depending on mercurial version
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    85
if hasattr(cmdutil, "findcmd"):
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    86
    findcmd = cmdutil.findcmd
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    87
else:
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    88
    findcmd = commands.findcmd
159
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    89
import os, re, sys, time
47
0617e7d497f6 Branch standalone extension, including pretxncommit hook function
Christian Ebert <blacktrash@gmx.net>
parents: 44
diff changeset
    90
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    91
deftemplates = {
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    92
        'Revision': '{node|short}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    93
        'Author': '{author|user}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    94
        'Date': '{date|utcdate}',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    95
        'RCSFile': '{file|basename},v',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    96
        'Source': '{root}/{file},v',
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    97
        '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
    98
        '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
    99
        }
59
94b26168791d Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents: 58
diff changeset
   100
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   101
nokwcommands = ('add', 'addremove', 'bundle', 'clone', 'copy', 'export',
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   102
                'incoming', 'outgoing', 'push', 'remove', 'rename', 'rollback')
164
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   103
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   104
def utcdate(date):
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   105
    '''Returns hgdate in cvs-like UTC format.'''
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   106
    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
   107
149
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   108
def getcmd(ui):
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   109
    '''Returns current hg command.'''
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   110
    # commands.parse(ui, sys.argv[1:])[0] breaks "hg diff -r"
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   111
    try:
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   112
        args = fancyopts.fancyopts(sys.argv[1:], commands.globalopts, {})
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   113
    except fancyopts.getopt.GetoptError, inst:
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   114
        raise commands.ParseError(None, inst)
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   115
    if args:
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   116
        cmd = args[0]
163
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
   117
        aliases, i = findcmd(ui, cmd)
149
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   118
        return aliases[0]
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   119
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   120
class kwtemplater(object):
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   121
    '''
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   122
    Sets up keyword templates, corresponding keyword regex, and
139
0ea07bb56ff6 Move context into kwtemplater.expand
Christian Ebert <blacktrash@gmx.net>
parents: 138
diff changeset
   123
    provides keyword substitution functions.
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   124
    '''
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   125
    def __init__(self, ui, repo, path='', node=None):
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   126
        self.ui = ui
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   127
        self.repo = repo
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   128
        self.path = path
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   129
        self.node = node
136
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   130
        templates = dict(ui.configitems('keywordmaps'))
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   131
        if templates:
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   132
            # parse templates here for less overhead in kwsub matchfunc
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   133
            for k in templates.keys():
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   134
                templates[k] = templater.parsestring(templates[k],
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   135
                                                     quoted=False)
136
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   136
        self.templates = templates or deftemplates
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   137
        escaped = [re.escape(k) for k in self.templates.keys()]
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   138
        self.re_kw = re.compile(r'\$(%s)[^$]*?\$' % '|'.join(escaped))
109
b2cc6a8d4a18 Extend templater.common_filters in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 108
diff changeset
   139
        templater.common_filters['utcdate'] = utcdate
135
a4c748fc7e00 Standalone compatibility fixes: demandload, changeset_templater
Christian Ebert <blacktrash@gmx.net>
parents: 134
diff changeset
   140
        try:
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   141
            self.t = cmdutil.changeset_templater(ui, repo, False, '', False)
135
a4c748fc7e00 Standalone compatibility fixes: demandload, changeset_templater
Christian Ebert <blacktrash@gmx.net>
parents: 134
diff changeset
   142
        except TypeError:
a4c748fc7e00 Standalone compatibility fixes: demandload, changeset_templater
Christian Ebert <blacktrash@gmx.net>
parents: 134
diff changeset
   143
            # depending on hg rev changeset_templater has extra "brinfo" arg
a4c748fc7e00 Standalone compatibility fixes: demandload, changeset_templater
Christian Ebert <blacktrash@gmx.net>
parents: 134
diff changeset
   144
            self.t = cmdutil.changeset_templater(ui, repo,
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   145
                                                 False, None, '', False)
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   146
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   147
    def kwsub(self, mobj):
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   148
        '''Substitutes keyword using corresponding template.'''
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   149
        kw = mobj.group(1)
136
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   150
        self.t.use_template(self.templates[kw])
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   151
        self.ui.pushbuffer()
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   152
        self.t.show(changenode=self.node, root=self.repo.root, file=self.path)
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   153
        keywordsub = templater.firstline(self.ui.popbuffer())
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   154
        return '$%s: %s $' % (kw, keywordsub)
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   155
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   156
    def expand(self, node, data):
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   157
        '''Returns data with expanded keywords.'''
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   158
        if util.binary(data):
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   159
            return data
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   160
        c = context.filectx(self.repo, self.path, fileid=node)
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   161
        self.node = c.node()
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   162
        return self.re_kw.sub(self.kwsub, data)
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   163
133
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   164
    def shrink(self, text):
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   165
        '''Returns text with all keyword substitutions removed.'''
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   166
        if util.binary(text):
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   167
            return text
133
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   168
        return self.re_kw.sub(r'$\1$', text)
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   169
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   170
    def overwrite(self, candidates):
138
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   171
        '''Overwrites candidates in working dir expanding keywords.'''
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   172
        files = []
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   173
        for f in candidates:
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   174
            data = self.repo.wfile(f).read()
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   175
            if not util.binary(data):
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   176
                self.path = f
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   177
                data, kwct = self.re_kw.subn(self.kwsub, data)
138
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   178
                if kwct:
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   179
                    self.ui.debug(_('overwriting %s expanding keywords\n') % f)
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   180
                    self.repo.wfile(f, 'w').write(data)
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   181
                    files.append(f)
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   182
        if files:
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   183
            self.repo.dirstate.update(files, 'n')
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   184
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   185
class kwfilelog(filelog.filelog):
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   186
    '''
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   187
    Subclass of filelog to hook into its read, add, cmp methods.
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   188
    Keywords are "stored" unexpanded, and expanded on reading.
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   189
    '''
156
0382bccf861e Omit keyword argument for filelog __init__
Christian Ebert <blacktrash@gmx.net>
parents: 155
diff changeset
   190
    def __init__(self, opener, path, kwtemplater):
0382bccf861e Omit keyword argument for filelog __init__
Christian Ebert <blacktrash@gmx.net>
parents: 155
diff changeset
   191
        super(kwfilelog, self).__init__(opener, path)
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   192
        self.kwtemplater = kwtemplater
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   193
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   194
    def read(self, node):
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   195
        '''Substitutes keywords when reading filelog.'''
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   196
        data = super(kwfilelog, self).read(node)
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   197
        return self.kwtemplater.expand(node, data)
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   198
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   199
    def add(self, text, meta, tr, link, p1=None, p2=None):
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   200
        '''Removes keyword substitutions when adding to filelog.'''
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   201
        text = self.kwtemplater.shrink(text)
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   202
        return super(kwfilelog, self).add(text, meta, tr, link, p1=p1, p2=p2)
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   203
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   204
    def cmp(self, node, text):
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   205
        '''Removes keyword substitutions for comparison.'''
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   206
        text = self.kwtemplater.shrink(text)
174
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   207
        if self.renamed(node):
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   208
            t2 = super(kwfilelog, self).read(node)
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   209
            return t2 != text
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   210
        return super(kwfilelog, self).cmp(node, text)
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   211
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   212
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   213
def reposetup(ui, repo):
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   214
    '''Sets up repo as kwrepo for keyword substitution.
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   215
    Overrides file method to return kwfilelog instead of filelog
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   216
    if file matches user configuration.
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   217
    Wraps commit to overwrite configured files with updated
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   218
    keyword substitutions.
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   219
    This is done for local repos only, and only if there are
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   220
    files configured at all for keyword substitution.'''
108
25dac950a1f0 Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net>
parents: 107
diff changeset
   221
167
b0a5c3535727 reverse logic for detection of excluding commands
Christian Ebert <blacktrash@gmx.net>
parents: 166
diff changeset
   222
    if not repo.local() or getcmd(repo.ui) in nokwcommands:
110
b0b85b383f36 Move all that can be done only once per repo into reposetup
Christian Ebert <blacktrash@gmx.net>
parents: 109
diff changeset
   223
        return
108
25dac950a1f0 Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net>
parents: 107
diff changeset
   224
164
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   225
    inc, exc = [], ['.hg*']
167
b0a5c3535727 reverse logic for detection of excluding commands
Christian Ebert <blacktrash@gmx.net>
parents: 166
diff changeset
   226
    for pat, opt in repo.ui.configitems('keyword'):
164
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   227
        if opt != 'ignore':
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   228
            inc.append(pat)
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   229
        else:
149
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   230
            exc.append(pat)
122
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   231
    if not inc:
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   232
        return
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   233
168
368fbd5b054c Reduce use of kwrepo methods
Christian Ebert <blacktrash@gmx.net>
parents: 167
diff changeset
   234
    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
   235
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   236
    class kwrepo(repo.__class__):
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   237
        '''
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   238
        Subclass of repo's class attribute to wrap its file and commit methods.
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   239
        '''
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   240
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   241
        def file(self, f):
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   242
            '''Opens kwfilelog instead of filelog if needed.'''
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   243
            if f[0] == '/':
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   244
                f = f[1:]
168
368fbd5b054c Reduce use of kwrepo methods
Christian Ebert <blacktrash@gmx.net>
parents: 167
diff changeset
   245
            if kwfmatcher(f):
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   246
                kwt = kwtemplater(repo.ui, self, path=f)
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   247
                return kwfilelog(self.sopener, f, kwt)
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   248
            else:
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   249
                return filelog.filelog(self.sopener, f)
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   250
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   251
        def commit(self, files=None, text="", user=None, date=None,
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   252
                   match=util.always, force=False, lock=None, wlock=None,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   253
                   force_editor=False, p1=None, p2=None, extra={}):
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   254
            '''Wraps commit, expanding keywords of committed and
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   255
            configured files in working directory.'''
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   256
            wrelease = False
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   257
            if not wlock:
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   258
                wlock = self.wlock()
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   259
                wrelease = True
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   260
            try:
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   261
                removed = self.status(node1=p1, node2=p2, files=files,
168
368fbd5b054c Reduce use of kwrepo methods
Christian Ebert <blacktrash@gmx.net>
parents: 167
diff changeset
   262
                                      match=match, wlock=wlock)[2]
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   263
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   264
                node = super(kwrepo,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   265
                             self).commit(files=files, text=text, user=user,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   266
                                          date=date, match=match, force=force,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   267
                                          lock=lock, wlock=wlock,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   268
                                          force_editor=force_editor,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   269
                                          p1=p1, p2=p2, extra=extra)
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   270
                if node is None:
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   271
                    return node
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   272
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   273
                candidates = self.changelog.read(node)[3]
168
368fbd5b054c Reduce use of kwrepo methods
Christian Ebert <blacktrash@gmx.net>
parents: 167
diff changeset
   274
                candidates = [f for f in candidates if kwfmatcher(f)
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   275
                              and f not in removed
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   276
                              and not os.path.islink(self.wjoin(f))]
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   277
                if not candidates:
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   278
                    return node
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   279
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   280
                kwt = kwtemplater(repo.ui, self, node=node)
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   281
                kwt.overwrite(candidates)
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   282
                return node
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   283
            finally:
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   284
                if wrelease:
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   285
                    wlock.release()
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   286
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   287
    repo.__class__ = kwrepo