hgkw/keyword.py
author Christian Ebert <blacktrash@gmx.net>
Thu, 04 Oct 2007 14:55:38 +0200
changeset 252 001902b60bdd
parent 251 b37f2f065a9c
child 253 22e08d0f25dc
permissions -rw-r--r--
String format keyword pattern before compilation
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
     1
# keyword.py - $Keyword$ expansion for Mercurial
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     2
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     3
# Copyright 2007 Christian Ebert <blacktrash@gmx.net>
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     4
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     5
# This software may be used and distributed according to the terms
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     6
# of the GNU General Public License, incorporated herein by reference.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     7
#
82
9bf0f7db5928 Add keyword; comment backwards compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 81
diff changeset
     8
# $Id$
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     9
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    10
# Keyword expansion hack against the grain of a DSCM
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    11
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    12
# There are many good reasons why this is not needed in a distributed
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    13
# SCM, still it may be useful in very small projects based on single
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    14
# files (like LaTeX packages), that are mostly addressed to an audience
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    15
# not running a version control system.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    16
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    17
# For in-depth discussion refer to
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    18
# <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    19
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    20
# Keyword expansion is based on Mercurial's changeset template mappings.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    21
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    22
# Binary files are not touched.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    23
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    24
# Setup in hgrc:
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    25
#
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    26
#   [extensions]
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    27
#   # enable extension
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    28
#   keyword = /full/path/to/hgkw/keyword.py
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    29
#   # or, if script in canonical hgext folder:
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    30
#   # hgext.keyword =
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    31
#
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    32
# Files to act upon/ignore are specified in the [keyword] section.
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    33
# Customized keyword template mappings in the [keywordmaps] section.
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    34
#
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    35
# Run "hg help keyword" and "hg kwdemo" to get info on configuration.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    36
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    37
'''keyword expansion in local repositories
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    38
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    39
This extension expands RCS/CVS-like or self-customized $Keywords$
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    40
in tracked text files selected by your configuration.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    41
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    42
Keywords are only expanded in local repositories and not stored in
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    43
the change history. The mechanism can be regarded as a convenience
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    44
for the current user or for archive distribution.
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    45
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    46
Configuration is done in the [keyword] and [keywordmaps] sections
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    47
of hgrc files.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    48
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    49
Example:
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    50
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    51
    [keyword]
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    52
    # expand keywords in every python file except those matching "x*"
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    53
    **.py =
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    54
    x*    = ignore
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    55
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    56
Note: the more specific you are in your filename patterns
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    57
      the less you lose speed in huge repos.
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    58
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    59
For [keywordmaps] template mapping and expansion demonstration and
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    60
control run "hg kwdemo".
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    61
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    62
An additional date template filter {date|utcdate} is provided.
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    63
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    64
The default template mappings (view with "hg kwdemo -d") can be replaced
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    65
with customized keywords and templates.
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    66
Again, run "hg kwdemo" to control the results of your config changes.
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    67
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    68
Before changing/disabling active keywords, run "hg kwshrink" to avoid
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    69
the risk of inadvertedly storing expanded keywords in the change history.
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    70
211
110c76a94d1c help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
    71
To force expansion after enabling it, or a configuration change, run
110c76a94d1c help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
    72
"hg kwexpand".
110c76a94d1c help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
    73
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    74
Expansions spanning more than one line and incremental expansions,
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    75
like CVS' $Log$, are not supported. A keyword template map
201
e826c3cdc52d Make sure there are no newlines in expansion
Christian Ebert <blacktrash@gmx.net>
parents: 192
diff changeset
    76
"Log = {desc}" expands to the first line of the changeset description.
e826c3cdc52d Make sure there are no newlines in expansion
Christian Ebert <blacktrash@gmx.net>
parents: 192
diff changeset
    77
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    78
Caveat: "hg import" fails if the patch context contains an active
211
110c76a94d1c help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
    79
        keyword. In that case run "hg kwshrink", and then reimport.
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    80
        Or, better, use bundle/unbundle to share changes.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    81
'''
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    82
250
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 248
diff changeset
    83
from mercurial import commands, cmdutil, context, fancyopts
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 248
diff changeset
    84
from mercurial import filelog, localrepo, revlog, templater, util
159
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    85
from mercurial.i18n import gettext as _
244
e449107a0501 Use Mercurial's getcwd()
Christian Ebert <blacktrash@gmx.net>
parents: 243
diff changeset
    86
import getopt, re, shutil, sys, tempfile, time
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
    87
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
    88
# backwards compatibility hacks
203
20eaa6147391 Clean up logic and messages for overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 201
diff changeset
    89
20eaa6147391 Clean up logic and messages for overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 201
diff changeset
    90
try:
228
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
    91
    # cmdutil.parse moves to dispatch._parse in 18a9fbb5cd78
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
    92
    from mercurial import dispatch
231
95fa2165e4eb Keep names of inherited commands
Christian Ebert <blacktrash@gmx.net>
parents: 230
diff changeset
    93
    _parse = dispatch._parse
228
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
    94
except ImportError:
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
    95
    try:
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
    96
        # commands.parse moves to cmdutil.parse in 0c61124ad877
231
95fa2165e4eb Keep names of inherited commands
Christian Ebert <blacktrash@gmx.net>
parents: 230
diff changeset
    97
        _parse = cmdutil.parse
228
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
    98
    except AttributeError:
231
95fa2165e4eb Keep names of inherited commands
Christian Ebert <blacktrash@gmx.net>
parents: 230
diff changeset
    99
        _parse = commands.parse
228
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
   100
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
   101
try:
88362a9b5afd Clean up backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 227
diff changeset
   102
    # bail_if_changed moves from commands to cmdutil in 0c61124ad877
231
95fa2165e4eb Keep names of inherited commands
Christian Ebert <blacktrash@gmx.net>
parents: 230
diff changeset
   103
    bail_if_changed = cmdutil.bail_if_changed
203
20eaa6147391 Clean up logic and messages for overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 201
diff changeset
   104
except AttributeError:
231
95fa2165e4eb Keep names of inherited commands
Christian Ebert <blacktrash@gmx.net>
parents: 230
diff changeset
   105
    bail_if_changed = commands.bail_if_changed
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   106
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   107
# commands.parse/cmdutil.parse returned nothing for
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   108
# "hg diff --rev" before 88803a69b24a due to bug in fancyopts
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   109
def _fancyopts(args, options, state):
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   110
    '''Fixed fancyopts from 88803a69b24a.'''
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   111
    long = []
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   112
    short = ''
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   113
    map = {}
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   114
    dt = {}
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   115
    for s, l, d, c in options:
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   116
        pl = l.replace('-', '_')
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   117
        map['-'+s] = map['--'+l] = pl
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   118
        if isinstance(d, list):
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   119
            state[pl] = d[:]
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   120
        else:
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   121
            state[pl] = d
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   122
        dt[pl] = type(d)
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   123
        if (d is not None and d is not True and d is not False and
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   124
            not callable(d)):
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   125
            if s: s += ':'
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   126
            if l: l += '='
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   127
        if s: short = short + s
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   128
        if l: long.append(l)
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   129
    opts, args = getopt.getopt(args, short, long)
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   130
    for opt, arg in opts:
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   131
        if dt[map[opt]] is type(fancyopts): state[map[opt]](state, map[opt], arg)
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   132
        elif dt[map[opt]] is type(1): state[map[opt]] = int(arg)
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   133
        elif dt[map[opt]] is type(''): state[map[opt]] = arg
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   134
        elif dt[map[opt]] is type([]): state[map[opt]].append(arg)
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   135
        elif dt[map[opt]] is type(None): state[map[opt]] = True
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   136
        elif dt[map[opt]] is type(False): state[map[opt]] = True
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   137
    return args
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   138
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   139
fancyopts.fancyopts = _fancyopts
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   140
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   141
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   142
commands.optionalrepo += ' kwdemo'
59
94b26168791d Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents: 58
diff changeset
   143
93
9f70f953dd3b Clean keyword arg assignment in kwfilelog.add; rename utc() to utcdate()
Christian Ebert <blacktrash@gmx.net>
parents: 92
diff changeset
   144
def utcdate(date):
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   145
    '''Returns hgdate in cvs-like UTC format.'''
93
9f70f953dd3b Clean keyword arg assignment in kwfilelog.add; rename utc() to utcdate()
Christian Ebert <blacktrash@gmx.net>
parents: 92
diff changeset
   146
    return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   147
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   148
class kwtemplater(object):
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   149
    '''
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   150
    Sets up keyword templates, corresponding keyword regex, and
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   151
    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
   152
    '''
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   153
    templates = {
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   154
        'Revision': '{node|short}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   155
        'Author': '{author|user}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   156
        'Date': '{date|utcdate}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   157
        'RCSFile': '{file|basename},v',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   158
        'Source': '{root}/{file},v',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   159
        'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   160
        'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   161
    }
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   162
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   163
    def __init__(self, ui, repo, expand, path='', node=None):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   164
        self.ui = ui
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   165
        self.repo = repo
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   166
        self.t = expand or None
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   167
        self.path = path
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   168
        self.node = node
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   169
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   170
        kwmaps = self.ui.configitems('keywordmaps')
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   171
        if kwmaps:
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   172
            self.templates = {}
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   173
            for k, v in kwmaps:
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   174
                self.templates[k] = templater.parsestring(v, quoted=False)
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   175
        escaped = [re.escape(k) for k in self.templates.keys()]
252
001902b60bdd String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents: 251
diff changeset
   176
        kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped)
001902b60bdd String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents: 251
diff changeset
   177
        self.re_kw = re.compile(kwpat)
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   178
        if self.t:
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   179
            templater.common_filters['utcdate'] = utcdate
233
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   180
            self.t = self._changeset_templater()
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   181
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   182
    def _changeset_templater(self):
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   183
        '''Backwards compatible cmdutil.changeset_templater.'''
237
0a0049700af5 Document revisions of interface changes
Christian Ebert <blacktrash@gmx.net>
parents: 236
diff changeset
   184
        # before 1e0b94cfba0e there was an extra "brinfo" argument
233
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   185
        try:
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   186
            return cmdutil.changeset_templater(self.ui, self.repo,
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   187
                                               False, '', False)
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   188
        except TypeError:
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   189
            return cmdutil.changeset_templater(self.ui, self.repo,
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   190
                                               False, None, '', False)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   191
234
6f1ed470541c Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net>
parents: 233
diff changeset
   192
    def _wwrite(self, f, data, man):
6f1ed470541c Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net>
parents: 233
diff changeset
   193
        '''Makes repo.wwrite backwards compatible.'''
236
e52075167842 Catch TypeError in repo.wwrite for Mercurial rev 656e06eebda7
Christian Ebert <blacktrash@gmx.net>
parents: 235
diff changeset
   194
        # 656e06eebda7 removed file descriptor argument
e52075167842 Catch TypeError in repo.wwrite for Mercurial rev 656e06eebda7
Christian Ebert <blacktrash@gmx.net>
parents: 235
diff changeset
   195
        # 67982d3ee76c added flags argument
234
6f1ed470541c Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net>
parents: 233
diff changeset
   196
        try:
6f1ed470541c Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net>
parents: 233
diff changeset
   197
            self.repo.wwrite(f, data, man.flags(f))
236
e52075167842 Catch TypeError in repo.wwrite for Mercurial rev 656e06eebda7
Christian Ebert <blacktrash@gmx.net>
parents: 235
diff changeset
   198
        except (AttributeError, TypeError):
234
6f1ed470541c Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net>
parents: 233
diff changeset
   199
            self.repo.wwrite(f, data)
6f1ed470541c Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net>
parents: 233
diff changeset
   200
235
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   201
    def _normal(self, files):
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   202
        '''Backwards compatible repo.dirstate.normal/update.'''
237
0a0049700af5 Document revisions of interface changes
Christian Ebert <blacktrash@gmx.net>
parents: 236
diff changeset
   203
        # 6fd953d5faea introduced dirstate.normal()
235
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   204
        try:
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   205
            for f in files:
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   206
                self.repo.dirstate.normal(f)
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   207
        except AttributeError:
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   208
            self.repo.dirstate.update(files, 'n')
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   209
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   210
    def _ctxnode(self, node):
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   211
        '''Obtains missing node from file context.'''
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   212
        if not self.node:
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   213
            c = context.filectx(self.repo, self.path, fileid=node)
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   214
            self.node = c.node()
95
9e4cbe64fb4f Implement custom keyword map templates in hgrc
Christian Ebert <blacktrash@gmx.net>
parents: 93
diff changeset
   215
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   216
    def _kwsub(self, mobj):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   217
        '''Substitutes keyword using corresponding template.'''
96
682e684a15e9 Expansion entirely in kwfilectx.expand()
Christian Ebert <blacktrash@gmx.net>
parents: 94
diff changeset
   218
        kw = mobj.group(1)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   219
        self.t.use_template(self.templates[kw])
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   220
        self.ui.pushbuffer()
160
e45d804d28dd Make path, node kwtemplater attribs
Christian Ebert <blacktrash@gmx.net>
parents: 159
diff changeset
   221
        self.t.show(changenode=self.node, root=self.repo.root, file=self.path)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   222
        keywordsub = templater.firstline(self.ui.popbuffer())
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   223
        return '$%s: %s $' % (kw, keywordsub)
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   224
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   225
    def expand(self, node, data):
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   226
        '''Returns data with keywords expanded.'''
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   227
        if util.binary(data):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   228
            return data
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   229
        self._ctxnode(node)
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   230
        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
   231
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   232
    def process(self, node, data):
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   233
        '''Returns a tuple: data, count.
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   234
        Count is number of keywords/keyword substitutions.
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   235
        Keywords in data are expanded, if templater was initialized.'''
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   236
        if util.binary(data):
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   237
            return data, None
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   238
        if self.t:
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   239
            self._ctxnode(node)
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   240
            return self.re_kw.subn(self._kwsub, data)
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   241
        return data, self.re_kw.search(data)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   242
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   243
    def shrink(self, text):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   244
        '''Returns text with all keyword substitutions removed.'''
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   245
        if util.binary(text):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   246
            return text
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   247
        return self.re_kw.sub(r'$\1$', text)
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   248
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   249
    def overwrite(self, candidates, man, commit):
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   250
        '''Overwrites files in working directory if keywords are detected.
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   251
        Keywords are expanded if keyword templater is initialized,
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   252
        otherwise their substitution is removed.'''
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   253
        expand = self.t is not None
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   254
        action = ('shrinking', 'expanding')[expand]
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   255
        notify = (self.ui.note, self.ui.debug)[commit]
217
e55e3f6c6608 try for dirstate.update instead of hasattr
Christian Ebert <blacktrash@gmx.net>
parents: 216
diff changeset
   256
        overwritten = []
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   257
        for f in candidates:
242
71056c5042de Avoid calling kwfmatcher twice (kwtemplater.overwrite, kwrepo.file) when overwriting
Christian Ebert <blacktrash@gmx.net>
parents: 240
diff changeset
   258
            fp = self.repo.file(f, kwexp=expand, kwcnt=True, kwmatch=True)
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   259
            data, kwfound = fp.read(man[f])
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   260
            if kwfound:
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   261
                notify(_('overwriting %s %s keywords\n') % (f, action))
234
6f1ed470541c Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net>
parents: 233
diff changeset
   262
                self._wwrite(f, data, man)
217
e55e3f6c6608 try for dirstate.update instead of hasattr
Christian Ebert <blacktrash@gmx.net>
parents: 216
diff changeset
   263
                overwritten.append(f)
235
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   264
        self._normal(overwritten)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   265
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   266
class kwfilelog(filelog.filelog):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   267
    '''
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   268
    Subclass of filelog to hook into its read, add, cmp methods.
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   269
    Keywords are "stored" unexpanded, and processed on reading.
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   270
    '''
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   271
    def __init__(self, opener, path, kwtemplater, kwcnt):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   272
        super(kwfilelog, self).__init__(opener, path)
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   273
        self.kwtemplater = kwtemplater
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   274
        self.kwcnt = kwcnt
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   275
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   276
    def read(self, node):
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   277
        '''Passes data through kwemplater methods for
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   278
        either unconditional keyword expansion
232
030712a46eb9 Improve doc of kwfilelog.read
Christian Ebert <blacktrash@gmx.net>
parents: 231
diff changeset
   279
        or counting of keywords and substitution.'''
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   280
        data = super(kwfilelog, self).read(node)
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   281
        if not self.kwcnt:
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   282
            return self.kwtemplater.expand(node, data)
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   283
        return self.kwtemplater.process(node, data)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   284
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   285
    def add(self, text, meta, tr, link, p1=None, p2=None):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   286
        '''Removes keyword substitutions when adding to filelog.'''
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   287
        text = self.kwtemplater.shrink(text)
166
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   288
        return super(kwfilelog, self).add(text, meta, tr, link, p1=p1, p2=p2)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   289
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   290
    def cmp(self, node, text):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   291
        '''Removes keyword substitutions for comparison.'''
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   292
        text = self.kwtemplater.shrink(text)
174
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   293
        if self.renamed(node):
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   294
            t2 = super(kwfilelog, self).read(node)
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   295
            return t2 != text
248
2c222367dab3 Use revlog.cmp to avoid checking for rename twice
Christian Ebert <blacktrash@gmx.net>
parents: 246
diff changeset
   296
        return revlog.revlog.cmp(self, node, text)
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   297
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   298
def _keywordmatcher(ui, repo):
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   299
    '''Collects include/exclude filename patterns for expansion
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   300
    candidates of current configuration. Returns filename matching
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   301
    function if include patterns exist, None otherwise.'''
245
b0316be232da Always exclude .hgtags only
Christian Ebert <blacktrash@gmx.net>
parents: 244
diff changeset
   302
    inc, exc = [], ['.hgtags']
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   303
    for pat, opt in ui.configitems('keyword'):
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   304
        if opt != 'ignore':
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   305
            inc.append(pat)
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   306
        else:
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   307
            exc.append(pat)
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   308
    if inc:
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   309
        return util.matcher(repo.root, inc=inc, exc=exc)[1]
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   310
    return None
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   311
213
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   312
def _weedcandidates(man, kwfmatcher, candidates):
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   313
    '''Weeds out files that do not match keyword file matcher,
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   314
    are not tracked, or are links.'''
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   315
    files = man.keys()
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   316
    if candidates:
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   317
        return [f for f in candidates if kwfmatcher(f)
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   318
                and f in files and not man.linkf(f)]
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   319
    return [f for f in files if kwfmatcher(f) and not man.linkf(f)]
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   320
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   321
def _overwrite(ui, repo, files, expand):
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   322
    '''Expands/shrinks keywords in working directory.'''
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   323
    wlock = lock = None
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   324
    try:
206
8d16b70359da Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents: 205
diff changeset
   325
        wlock = repo.wlock()
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   326
        lock = repo.lock()
231
95fa2165e4eb Keep names of inherited commands
Christian Ebert <blacktrash@gmx.net>
parents: 230
diff changeset
   327
        bail_if_changed(repo)
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   328
        ctx = repo.changectx()
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   329
        kwfmatcher = _keywordmatcher(ui, repo)
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   330
        if kwfmatcher is None:
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   331
            ui.warn(_('no files configured for keyword expansion\n'))
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   332
            return
213
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   333
        man = ctx.manifest()
240
fb234089cc4c Arguments to kwshrink/expand must be filtered thru canonpath
Christian Ebert <blacktrash@gmx.net>
parents: 237
diff changeset
   334
        if files:
244
e449107a0501 Use Mercurial's getcwd()
Christian Ebert <blacktrash@gmx.net>
parents: 243
diff changeset
   335
            cwd = repo.getcwd()
240
fb234089cc4c Arguments to kwshrink/expand must be filtered thru canonpath
Christian Ebert <blacktrash@gmx.net>
parents: 237
diff changeset
   336
            files = [util.canonpath(repo.root, cwd, f) for f in files]
213
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   337
        files = _weedcandidates(man, kwfmatcher, files)
250
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 248
diff changeset
   338
        if files:
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 248
diff changeset
   339
            kwt = kwtemplater(ui, repo, expand, node=ctx.node())
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 248
diff changeset
   340
            # 3rd argument sets commit to False
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 248
diff changeset
   341
            kwt.overwrite(files, man, False)
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   342
    finally:
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   343
        del wlock, lock
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   344
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   345
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   346
def shrink(ui, repo, *args):
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   347
    '''revert expanded keywords in working directory
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   348
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   349
    run before changing/disabling active keywords
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   350
    or if you experience problems with "hg import" or "hg merge"
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   351
    '''
243
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   352
    # 4th argument sets expansion to False
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   353
    _overwrite(ui, repo, args, False)
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   354
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   355
def expand(ui, repo, *args):
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   356
    '''expand keywords in working directory
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   357
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   358
    run after (re)enabling keyword expansion
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   359
    '''
243
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   360
    # 4th argument sets expansion to True
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   361
    _overwrite(ui, repo, args, True)
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   362
246
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   363
def files(ui, repo):
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   364
    '''print files currently configured for keyword expansion
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   365
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   366
    crosscheck which files are matched by [keyword] config patterns
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   367
    '''
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   368
    kwfmatcher = _keywordmatcher(ui, repo)
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   369
    if kwfmatcher is not None:
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   370
        ctx = repo.changectx()
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   371
        files = _weedcandidates(ctx.manifest(), kwfmatcher, None)
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   372
        files.sort()
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   373
        ui.write('\n'.join(files) + '\n')
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   374
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   375
def demo(ui, repo, *args, **opts):
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   376
    '''print [keywordmaps] configuration and an expansion example
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   377
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   378
    show current, custom, or default keyword template maps and their expansion
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   379
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   380
    extend current configuration by specifying maps as arguments
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   381
    and optionally by reading from an additional hgrc file
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   382
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   383
    override current keyword template maps with "default" option
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   384
    '''
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   385
    def _demostatus(stat):
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   386
        ui.status(_('\n\t%s\n') % stat)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   387
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   388
    def _showitems(section, items):
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   389
        ui.write('[%s]\n' % section)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   390
        for k, v in items:
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   391
            ui.write('%s = %s\n' % (k, v))
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   392
183
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   393
    msg = 'hg keyword config and expansion example'
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   394
    kwstatus = 'current'
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   395
    fn = 'demo.txt'
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   396
    branchname = 'demobranch'
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   397
    tmpdir = tempfile.mkdtemp('', 'kwdemo.')
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   398
    ui.note(_('creating temporary repo at %s\n') % tmpdir)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   399
    repo = localrepo.localrepository(ui, path=tmpdir, create=True)
184
30b3e6a09a9d Set ui to repo.ui at once where needed for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 183
diff changeset
   400
    ui.setconfig('keyword', fn, '')
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   401
    if args or opts['rcfile']:
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   402
        kwstatus = 'custom'
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   403
    if opts['rcfile']:
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   404
        ui.readconfig(opts['rcfile'])
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   405
    if opts['default']:
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   406
        kwstatus = 'default'
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   407
        kwmaps = kwtemplater.templates
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   408
        if ui.configitems('keywordmaps'):
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   409
            # override maps from optional rcfile
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   410
            for k, v in kwmaps.items():
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   411
                ui.setconfig('keywordmaps', k, v)
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   412
    elif args:
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   413
        # simulate hgrc parsing
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   414
        rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   415
        fp = repo.opener('hgrc', 'w')
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   416
        fp.writelines(rcmaps)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   417
        fp.close()
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   418
        ui.readconfig(repo.join('hgrc'))
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   419
    if not opts['default']:
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   420
        kwmaps = dict(ui.configitems('keywordmaps')) or kwtemplater.templates
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   421
    reposetup(ui, repo)
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   422
    for k, v in ui.configitems('extensions'):
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   423
        if k.endswith('keyword'):
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   424
            extension = '%s = %s' % (k, v)
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   425
            break
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   426
    _demostatus('config using %s keyword template maps' % kwstatus)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   427
    ui.write('[extensions]\n%s\n' % extension)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   428
    _showitems('keyword', ui.configitems('keyword'))
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   429
    _showitems('keywordmaps', kwmaps.items())
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   430
    keywords = '$' + '$\n$'.join(kwmaps.keys()) + '$\n'
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   431
    repo.wopener(fn, 'w').write(keywords)
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   432
    repo.add([fn])
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   433
    path = repo.wjoin(fn)
183
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   434
    ui.note(_('\n%s keywords written to %s:\n') % (kwstatus, path))
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   435
    ui.note(keywords)
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   436
    ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname))
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   437
    # silence branch command if not verbose
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   438
    quiet = ui.quiet
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   439
    verbose = ui.verbose
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   440
    ui.quiet = not verbose
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   441
    commands.branch(ui, repo, branchname)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   442
    ui.quiet = quiet
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   443
    ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   444
    repo.commit(text=msg)
183
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   445
    pathinfo = ('', ' in %s' % path)[ui.verbose]
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   446
    _demostatus('%s keywords expanded%s' % (kwstatus, pathinfo))
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   447
    ui.write(repo.wread(fn))
183
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   448
    ui.debug(_('\nremoving temporary repo %s\n') % tmpdir)
251
b37f2f065a9c Ignore errors when removing temp dir in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 250
diff changeset
   449
    shutil.rmtree(tmpdir, ignore_errors=True)
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   450
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   451
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   452
def reposetup(ui, repo):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   453
    '''Sets up repo as kwrepo for keyword substitution.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   454
    Overrides file method to return kwfilelog instead of filelog
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   455
    if file matches user configuration.
144
19b3d1de3db0 Move kwfilelog out of reposetup; only use kwfilelog if file matches
Christian Ebert <blacktrash@gmx.net>
parents: 143
diff changeset
   456
    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
   457
    keyword substitutions.
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   458
    This is done for local repos only, and only if there are
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   459
    files configured at all for keyword substitution.'''
64
4cd7b993c5f8 Imports specific to functions
Christian Ebert <blacktrash@gmx.net>
parents: 63
diff changeset
   460
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   461
    nokwcommands = ['add', 'addremove', 'bundle', 'clone', 'copy', 'export',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   462
                    'grep', 'identify', 'incoming', 'init', 'outgoing', 'push',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   463
                    'remove', 'rename', 'rollback']
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   464
231
95fa2165e4eb Keep names of inherited commands
Christian Ebert <blacktrash@gmx.net>
parents: 230
diff changeset
   465
    if not repo.local() or _parse(ui, sys.argv[1:])[0] in nokwcommands:
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   466
        return
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   467
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   468
    kwfmatcher = _keywordmatcher(ui, repo)
182
de32fbee75a4 Obtain filename matcher from function keywordmatcher
Christian Ebert <blacktrash@gmx.net>
parents: 181
diff changeset
   469
    if kwfmatcher is None:
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   470
        return
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   471
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   472
    class kwrepo(repo.__class__):
242
71056c5042de Avoid calling kwfmatcher twice (kwtemplater.overwrite, kwrepo.file) when overwriting
Christian Ebert <blacktrash@gmx.net>
parents: 240
diff changeset
   473
        def file(self, f, kwexp=True, kwcnt=False, kwmatch=False):
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   474
            if f[0] == '/':
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   475
                f = f[1:]
242
71056c5042de Avoid calling kwfmatcher twice (kwtemplater.overwrite, kwrepo.file) when overwriting
Christian Ebert <blacktrash@gmx.net>
parents: 240
diff changeset
   476
            if kwmatch or kwfmatcher(f):
207
affc18a621f5 Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net>
parents: 206
diff changeset
   477
                kwt = kwtemplater(ui, self, kwexp, path=f)
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   478
                return kwfilelog(self.sopener, f, kwt, kwcnt)
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   479
            return filelog.filelog(self.sopener, f)
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   480
230
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   481
        def _commit(self, files, text, user, date, match, force, lock, wlock,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   482
                    force_editor, p1, p2, extra):
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   483
            '''Private commit wrapper for backwards compatibility.'''
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   484
            try:
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   485
                return super(kwrepo, self).commit(files=files, text=text,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   486
                                                  user=user, date=date,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   487
                                                  match=match, force=force,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   488
                                                  lock=lock, wlock=wlock,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   489
                                                  force_editor=force_editor,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   490
                                                  p1=p1, p2=p2, extra=extra)
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   491
            except TypeError:
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   492
                return super(kwrepo, self).commit(files=files, text=text,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   493
                                                  user=user, date=date,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   494
                                                  match=match, force=force,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   495
                                                  force_editor=force_editor,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   496
                                                  p1=p1, p2=p2, extra=extra)
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   497
176
3aed363c9eaf Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net>
parents: 175
diff changeset
   498
        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
   499
                   match=util.always, force=False, lock=None, wlock=None,
849e28e03fb4 Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net>
parents: 165
diff changeset
   500
                   force_editor=False, p1=None, p2=None, extra={}):
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   501
            # (w)lock arguments removed in 126f527b3ba3
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   502
            # so they are None or what was passed to commit
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   503
            # use private _(w)lock for deletion
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   504
            _lock = lock
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   505
            _wlock = wlock
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   506
            del wlock, lock
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   507
            try:
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   508
                if not _wlock:
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   509
                    _wlock = self.wlock()
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   510
                if not _lock:
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   511
                    _lock = self.lock()
230
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   512
                node = self._commit(files, text, user, date, match, force,
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   513
                                    _lock, _wlock, force_editor, p1, p2, extra)
206
8d16b70359da Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents: 205
diff changeset
   514
                if node is not None:
8d16b70359da Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents: 205
diff changeset
   515
                    cl = self.changelog.read(node)
213
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   516
                    mn = self.manifest.read(cl[0])
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   517
                    candidates = _weedcandidates(mn, kwfmatcher, cl[3])
206
8d16b70359da Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents: 205
diff changeset
   518
                    if candidates:
243
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   519
                        # 3rd argument sets expansion to True
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   520
                        kwt = kwtemplater(ui, self, True, node=node)
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   521
                        # 3rd argument sets commit to True
bbd5af3ec247 Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net>
parents: 242
diff changeset
   522
                        kwt.overwrite(candidates, mn, True)
145
1c2cefa97b96 Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents: 144
diff changeset
   523
                return node
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   524
            finally:
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   525
                del _wlock, _lock
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   526
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   527
    repo.__class__ = kwrepo
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   528
81
fd5d3a974ea7 Implement self initializing pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 80
diff changeset
   529
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   530
cmdtable = {
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   531
    'kwdemo':
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   532
        (demo,
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   533
         [('d', 'default', None, _('show default keyword template maps')),
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   534
          ('f', 'rcfile', [], _('read maps from RCFILE'))],
213
948500df7c55 Weed out removed and links using manifest
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   535
         _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP ...]')),
246
d232d7082991 New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 245
diff changeset
   536
    'kwfiles': (files, [], _('hg kwfiles')),
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   537
    'kwshrink': (shrink, [], _('hg kwshrink [NAME] ...')),
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   538
    'kwexpand': (expand, [], _('hg kwexpand [NAME] ...')),
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   539
}