hgkw/keyword.py
author Christian Ebert <blacktrash@gmx.net>
Sun, 15 Jul 2007 17:34:34 +0200
branchkwmap-templates
changeset 181 8019554adbb2
parent 180 5d20f5d642f3
child 182 de32fbee75a4
permissions -rw-r--r--
kwdemo is demo internally; rearrange code
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
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    47
An additional date template filter {date|utcdate} is provided.
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    48
147
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    49
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
    50
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
    51
safe.
11a031a33ea2 Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net>
parents: 146
diff changeset
    52
118
d9cea05cb74c Prepare test: split doc into help and comment
Christian Ebert <blacktrash@gmx.net>
parents: 117
diff changeset
    53
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
    54
hgrc files.
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    55
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    56
Example:
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    57
    [extensions]
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    58
    hgext.keyword =
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    59
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    60
    [keyword]
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    61
    # expand keywords in every python file,
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    62
    # except those matching "x*"
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    63
    **.py =
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    64
    x* = ignore
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    65
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    66
For [keywordmaps] demonstration run "hg kwdemo".
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    67
'''
128
fe37939db543 Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net>
parents: 126
diff changeset
    68
159
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    69
from mercurial.i18n import gettext as _
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    70
from mercurial import commands, fancyopts, templater, util
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    71
from mercurial import cmdutil, context, filelog, localrepo
163
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    72
# findcmd might be in cmdutil or commands
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    73
# depending on mercurial version
176
3aed363c9eaf Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net>
parents: 175
diff changeset
    74
if hasattr(cmdutil, 'findcmd'):
163
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    75
    findcmd = cmdutil.findcmd
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    76
else:
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
    77
    findcmd = commands.findcmd
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    78
import os, re, shutil, sys, tempfile, 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 = {
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    81
    'Revision': '{node|short}',
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    82
    'Author': '{author|user}',
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    83
    'Date': '{date|utcdate}',
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    84
    'RCSFile': '{file|basename},v',
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    85
    'Source': '{root}/{file},v',
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    86
    'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    87
    'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    88
}
59
94b26168791d Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents: 58
diff changeset
    89
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
    90
nokwcommands = ('add', 'addremove', 'bundle', 'clone', 'copy', 'export',
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
    91
                '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
    92
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    93
def utcdate(date):
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    94
    '''Returns hgdate in cvs-like UTC format.'''
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
    95
    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
    96
149
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
    97
def getcmd(ui):
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
    98
    '''Returns current hg command.'''
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
    99
    # 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
   100
    try:
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   101
        args = fancyopts.fancyopts(sys.argv[1:], commands.globalopts, {})
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   102
    except fancyopts.getopt.GetoptError, inst:
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   103
        raise commands.ParseError(None, inst)
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   104
    if args:
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   105
        cmd = args[0]
163
c18c0c80b6c2 Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net>
parents: 162
diff changeset
   106
        aliases, i = findcmd(ui, cmd)
149
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   107
        return aliases[0]
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   108
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   109
class kwtemplater(object):
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   110
    '''
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   111
    Sets up keyword templates, corresponding keyword regex, and
139
0ea07bb56ff6 Move context into kwtemplater.expand
Christian Ebert <blacktrash@gmx.net>
parents: 138
diff changeset
   112
    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
   113
    '''
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   114
    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
   115
        self.ui = ui
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   116
        self.repo = repo
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   117
        self.path = path
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   118
        self.node = node
136
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   119
        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
   120
        if templates:
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   121
            # 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
   122
            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
   123
                templates[k] = templater.parsestring(templates[k],
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   124
                                                     quoted=False)
136
5e9d6c57d679 Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net>
parents: 135
diff changeset
   125
        self.templates = templates or deftemplates
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   126
        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
   127
        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
   128
        templater.common_filters['utcdate'] = utcdate
135
a4c748fc7e00 Standalone compatibility fixes: demandload, changeset_templater
Christian Ebert <blacktrash@gmx.net>
parents: 134
diff changeset
   129
        try:
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   130
            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
   131
        except TypeError:
a4c748fc7e00 Standalone compatibility fixes: demandload, changeset_templater
Christian Ebert <blacktrash@gmx.net>
parents: 134
diff changeset
   132
            # 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
   133
            self.t = cmdutil.changeset_templater(ui, repo,
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   134
                                                 False, None, '', False)
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   135
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   136
    def kwsub(self, mobj):
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   137
        '''Substitutes keyword using corresponding template.'''
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   138
        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
   139
        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
   140
        self.ui.pushbuffer()
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   141
        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
   142
        keywordsub = templater.firstline(self.ui.popbuffer())
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   143
        return '$%s: %s $' % (kw, keywordsub)
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   144
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   145
    def expand(self, node, data):
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   146
        '''Returns data with expanded keywords.'''
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   147
        if util.binary(data):
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   148
            return data
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   149
        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
   150
        self.node = c.node()
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   151
        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
   152
133
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   153
    def shrink(self, text):
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   154
        '''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
   155
        if util.binary(text):
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   156
            return text
133
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   157
        return self.re_kw.sub(r'$\1$', text)
cb60196a500b Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 129
diff changeset
   158
177
261a6844145e wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents: 176
diff changeset
   159
    def overwrite(self, candidates, mn):
138
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   160
        '''Overwrites candidates in working dir expanding keywords.'''
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   161
        files = []
177
261a6844145e wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents: 176
diff changeset
   162
        m = self.repo.manifest.read(mn)
138
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   163
        for f in candidates:
177
261a6844145e wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents: 176
diff changeset
   164
            data = self.repo.wread(f)
138
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   165
            if not util.binary(data):
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   166
                self.path = f
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   167
                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
   168
                if kwct:
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   169
                    self.ui.debug(_('overwriting %s expanding keywords\n') % f)
177
261a6844145e wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents: 176
diff changeset
   170
                    self.repo.wwrite(f, data, m.flags(f))
138
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   171
                    files.append(f)
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   172
        if files:
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   173
            self.repo.dirstate.update(files, 'n')
bf8622c50309 Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net>
parents: 137
diff changeset
   174
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   175
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
   176
    '''
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   177
    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
   178
    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
   179
    '''
156
0382bccf861e Omit keyword argument for filelog __init__
Christian Ebert <blacktrash@gmx.net>
parents: 155
diff changeset
   180
    def __init__(self, opener, path, kwtemplater):
0382bccf861e Omit keyword argument for filelog __init__
Christian Ebert <blacktrash@gmx.net>
parents: 155
diff changeset
   181
        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
   182
        self.kwtemplater = kwtemplater
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   183
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   184
    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
   185
        '''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
   186
        data = super(kwfilelog, self).read(node)
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   187
        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
   188
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   189
    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
   190
        '''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
   191
        text = self.kwtemplater.shrink(text)
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   192
        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
   193
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   194
    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
   195
        '''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
   196
        text = self.kwtemplater.shrink(text)
174
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   197
        if self.renamed(node):
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   198
            t2 = super(kwfilelog, self).read(node)
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   199
            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
   200
        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
   201
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   202
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   203
def demo(ui, repo, **opts):
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   204
    '''print [keywordmaps] configuration and an expansion example
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   205
    '''
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   206
    log = 'hg keyword config and expansion example'
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   207
    fn = 'demo.txt'
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   208
    tmpdir = tempfile.mkdtemp('', 'kwdemo.')
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   209
    if ui.verbose:
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   210
        ui.status(_('creating temporary repo at %s\n') % tmpdir)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   211
    _repo = localrepo.localrepository(ui, path=tmpdir, create=True)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   212
    _repo.ui.setconfig('keyword', fn, '')
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   213
    if opts['default']:
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   214
        kwstatus = 'default'
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   215
        kwmaps = deftemplates
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   216
    else:
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   217
        kwstatus = 'current'
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   218
        kwmaps = dict(ui.configitems('keywordmaps')) or deftemplates
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   219
    if ui.configitems('keywordmaps'):
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   220
        for k, v in kwmaps.items():
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   221
            _repo.ui.setconfig('keywordmaps', k, v)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   222
    reposetup(_repo.ui, _repo)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   223
    ui.status(_('config with %s keyword maps:\n') % kwstatus)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   224
    ui.write('[keyword]\n%s =\n[keywordmaps]\n' % fn)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   225
    for k, v in kwmaps.items():
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   226
        ui.write('%s = %s\n' % (k, v))
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   227
    path = _repo.wjoin(fn)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   228
    keywords = '$' + '$\n$'.join(kwmaps.keys()) + '$\n'
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   229
    _repo.wfile(fn, 'w').write(keywords)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   230
    _repo.add([fn])
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   231
    if ui.verbose:
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   232
        ui.status(_('\n%s keywords written to %s:\n') % (kwstatus, path))
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   233
        ui.write(keywords)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   234
        ui.status(_("\nhg --repository '%s' commit\n") % tmpdir)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   235
    _repo.commit(text=log)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   236
    if ui.verbose:
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   237
        ui.status(_('\n%s keywords expanded in %s:\n') % (kwstatus, path))
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   238
    else:
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   239
        ui.status(_('\n%s keywords expanded:\n') % kwstatus)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   240
    ui.write(_repo.wread(fn))
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   241
    ui.debug(_('\nremoving temporary repo\n'))
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   242
    shutil.rmtree(tmpdir)
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   243
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   244
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
   245
    '''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
   246
    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
   247
    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
   248
    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
   249
    keyword substitutions.
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   250
    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
   251
    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
   252
167
b0a5c3535727 reverse logic for detection of excluding commands
Christian Ebert <blacktrash@gmx.net>
parents: 166
diff changeset
   253
    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
   254
        return
108
25dac950a1f0 Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net>
parents: 107
diff changeset
   255
164
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   256
    inc, exc = [], ['.hg*']
167
b0a5c3535727 reverse logic for detection of excluding commands
Christian Ebert <blacktrash@gmx.net>
parents: 166
diff changeset
   257
    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
   258
        if opt != 'ignore':
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   259
            inc.append(pat)
d16332759801 Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net>
parents: 163
diff changeset
   260
        else:
149
0c8b7e5c25a6 Implement archive mode by configuration
Christian Ebert <blacktrash@gmx.net>
parents: 147
diff changeset
   261
            exc.append(pat)
122
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   262
    if not inc:
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   263
        return
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   264
168
368fbd5b054c Reduce use of kwrepo methods
Christian Ebert <blacktrash@gmx.net>
parents: 167
diff changeset
   265
    kwfmatcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
175
f8e5cafa7b99 Change ui inheritance to stay compatible with recent Hg
Christian Ebert <blacktrash@gmx.net>
parents: 174
diff changeset
   266
    ui = repo.ui
122
d5c80df59655 No reposetup when no filenames are specified for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 120
diff changeset
   267
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   268
    class kwrepo(repo.__class__):
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   269
        def file(self, f):
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   270
            if f[0] == '/':
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   271
                f = f[1:]
168
368fbd5b054c Reduce use of kwrepo methods
Christian Ebert <blacktrash@gmx.net>
parents: 167
diff changeset
   272
            if kwfmatcher(f):
175
f8e5cafa7b99 Change ui inheritance to stay compatible with recent Hg
Christian Ebert <blacktrash@gmx.net>
parents: 174
diff changeset
   273
                kwt = kwtemplater(ui, self, path=f)
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   274
                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
   275
            else:
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   276
                return filelog.filelog(self.sopener, f)
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   277
176
3aed363c9eaf Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net>
parents: 175
diff changeset
   278
        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
   279
                   match=util.always, force=False, lock=None, wlock=None,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   280
                   force_editor=False, p1=None, p2=None, extra={}):
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   281
            wrelease = False
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   282
            if not wlock:
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   283
                wlock = self.wlock()
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   284
                wrelease = True
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   285
            try:
172
ad0da655bd12 Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 171
diff changeset
   286
                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
   287
                                      match=match, wlock=wlock)[2]
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   288
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   289
                node = super(kwrepo,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   290
                             self).commit(files=files, text=text, user=user,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   291
                                          date=date, match=match, force=force,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   292
                                          lock=lock, wlock=wlock,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   293
                                          force_editor=force_editor,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   294
                                          p1=p1, p2=p2, extra=extra)
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   295
                if node is None:
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   296
                    return node
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   297
177
261a6844145e wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents: 176
diff changeset
   298
                cl = self.changelog.read(node)
261a6844145e wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents: 176
diff changeset
   299
                candidates = [f for f in cl[3] if kwfmatcher(f)
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   300
                              and f not in removed
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   301
                              and not os.path.islink(self.wjoin(f))]
176
3aed363c9eaf Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net>
parents: 175
diff changeset
   302
                if candidates:
3aed363c9eaf Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net>
parents: 175
diff changeset
   303
                    kwt = kwtemplater(ui, self, node=node)
177
261a6844145e wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents: 176
diff changeset
   304
                    kwt.overwrite(candidates, cl[0])
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   305
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   306
                return node
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   307
            finally:
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   308
                if wrelease:
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   309
                    wlock.release()
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   310
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   311
    repo.__class__ = kwrepo
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   312
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   313
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   314
cmdtable = {
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   315
    'kwdemo':
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   316
        (demo,
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   317
         [('d', 'default', None, _('use default keyword maps'))],
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   318
         _('hg kwdemo [-d]')),
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   319
}