hgkw/keyword.py
author Christian Ebert <blacktrash@gmx.net>
Wed, 14 Sep 2011 16:19:33 +0100
branch0.9.2compat
changeset 984 a4ea5c2d3ff3
parent 704 772628d1ccb5
parent 981 0b32ba113ad2
permissions -rw-r--r--
(0.9.2compat) merge with default Adapt preserving filemode. Fix a typo. Clean up last merge.
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
#
696
2305f9255f04 Update copyright
Christian Ebert <blacktrash@gmx.net>
parents: 695
diff changeset
     3
# Copyright 2007-2010 Christian Ebert <blacktrash@gmx.net>
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     4
#
540
e30c2a251010 updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents: 538
diff changeset
     5
# This software may be used and distributed according to the terms of the
674
0efa9d6ac11f Update license to GPLv2+
Matt Mackall <mpm@selenic.com>
parents: 668
diff changeset
     6
# GNU General Public License version 2 or any later version.
157
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
527
59cb740ebf83 keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 525
diff changeset
    14
# files (like LaTeX packages), that are mostly addressed to an
59cb740ebf83 keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 525
diff changeset
    15
# audience not running a version control system.
157
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
656
89e0584cdc5c change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 654
diff changeset
    18
# <http://mercurial.selenic.com/wiki/KeywordPlan>.
157
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:
673
b94f7991f06b (0.9.2compat) load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents: 672
diff changeset
    30
#   # keyword =
208
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
584
763d20224433 extensions: improve the consistency of synopses
C?dric Duval <cedricduval@free.fr>
parents: 582
diff changeset
    37
'''expand keywords in tracked files
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    38
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    39
This extension expands RCS/CVS-like or self-customized $Keywords$ in
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    40
tracked text files selected by your configuration.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    41
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    42
Keywords are only expanded in local repositories and not stored in the
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    43
change history. The mechanism can be regarded as a convenience for the
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    44
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
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    46
Configuration is done in the [keyword] and [keywordmaps] sections of
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    47
hgrc files.
790
b14093780eaf Explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net>
parents: 788
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
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    56
NOTE: the more specific you are in your filename patterns the less you
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    57
lose speed in huge repositories.
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    58
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    59
For [keywordmaps] template mapping and expansion demonstration and
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    60
control run "hg kwdemo".
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    61
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    62
An additional date template filter {date|utcdate} is provided. It
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    63
returns a date like "2006/09/18 15:13:13".
756
c39a201b2b7f Add 2 svn-like date filters
Christian Ebert <blacktrash@gmx.net>
parents: 754
diff changeset
    64
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    65
The default template mappings (view with "hg kwdemo -d") can be
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    66
replaced with customized keywords and templates. Again, run "hg
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    67
kwdemo" to control the results of your config changes.
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    68
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    69
Before changing/disabling active keywords, run "hg kwshrink" to avoid
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    70
the risk of inadvertently storing expanded keywords in the change
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    71
history.
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    72
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    73
To force expansion after enabling it, or a configuration change, run
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    74
"hg kwexpand".
211
110c76a94d1c help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
    75
640
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    76
Also, when committing with the record extension or using mq's qrecord,
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    77
be aware that keywords cannot be updated. Again, run "hg kwexpand" on
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    78
the files in question to update keyword expansions after all changes
7e80fc29ba27 (0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net>
parents: 639
diff changeset
    79
have been checked in.
211
110c76a94d1c help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
    80
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    81
Expansions spanning more than one line and incremental expansions,
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    82
like CVS' $Log$, are not supported. A keyword template map "Log =
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
    83
{desc}" expands to the first line of the changeset description.
201
e826c3cdc52d Make sure there are no newlines in expansion
Christian Ebert <blacktrash@gmx.net>
parents: 192
diff changeset
    84
360
ed06223f88fc (0.9.2compat) clean import handling when patchfile class available
Christian Ebert <blacktrash@gmx.net>
parents: 359
diff changeset
    85
Caveat: With Mercurial versions prior to 4574925db5c0 "hg import" might
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    86
        cause rejects if the patch context contains an active keyword. In that
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    87
        case run "hg kwshrink", and then reimport. Or, better, use
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    88
        bundle/unbundle to share changes.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    89
'''
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    90
477
03268523c017 (0.9.2compat) ddb8a222249b is backwards compatible
Christian Ebert <blacktrash@gmx.net>
parents: 464
diff changeset
    91
from mercurial import commands, cmdutil, fancyopts, filelog
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
    92
from mercurial import localrepo, patch, revlog, templater, util
422
c9899d769cdb (0.9.2compat) expand * import
Christian Ebert <blacktrash@gmx.net>
parents: 420
diff changeset
    93
from mercurial.node import nullid, hex
159
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    94
from mercurial.i18n import gettext as _
678
5684a76da263 (0.9.2compat) fix utcdate filter
Christian Ebert <blacktrash@gmx.net>
parents: 673
diff changeset
    95
import getopt, os, re, shutil, tempfile, time
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
    96
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    97
commands.optionalrepo += ' kwdemo'
59
94b26168791d Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents: 58
diff changeset
    98
374
03fc5e667518 Make nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents: 373
diff changeset
    99
# hg commands that do not act on keywords
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   100
nokwcommands = ('add addremove annotate bundle copy export grep incoming init'
480
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 478
diff changeset
   101
                ' log outgoing push rename rollback tip verify'
402
5e3707030bce (0.9.2compat) add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 400
diff changeset
   102
                ' convert email glog')
374
03fc5e667518 Make nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents: 373
diff changeset
   103
347
c912b8c3f3ff Detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents: 346
diff changeset
   104
# hg commands that trigger expansion only when writing to working dir,
c912b8c3f3ff Detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents: 346
diff changeset
   105
# not when reading filelog, and unexpand when reading from working dir
672
0d7642e39cfe (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted
Christian Ebert <blacktrash@gmx.net>
parents: 664
diff changeset
   106
restricted = ('merge record resolve qfold qimport qnew qpush qrefresh qrecord'
0d7642e39cfe (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted
Christian Ebert <blacktrash@gmx.net>
parents: 664
diff changeset
   107
              ' transplant')
870
ef8b368bf24b Colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents: 868
diff changeset
   108
639
d41074cb161b (0.9.2compat) prefer util.datestr over time module import
Christian Ebert <blacktrash@gmx.net>
parents: 630
diff changeset
   109
# provide cvs-like UTC date filter
678
5684a76da263 (0.9.2compat) fix utcdate filter
Christian Ebert <blacktrash@gmx.net>
parents: 673
diff changeset
   110
utcdate = lambda x: time.strftime('%Y/%m/%d %H:%M:%S',
5684a76da263 (0.9.2compat) fix utcdate filter
Christian Ebert <blacktrash@gmx.net>
parents: 673
diff changeset
   111
                                  time.gmtime(float(x[0])))
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   112
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   113
def textsafe(s):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   114
    '''Safe version of util.binary with reversed logic.
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   115
    Note: argument may not be None, which is allowed for util.binary.'''
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   116
    return '\0' not in s
893
24924dfb8326 Offer additional datefilters when the extension is enabled
Christian Ebert <blacktrash@gmx.net>
parents: 892
diff changeset
   117
408
33e5b8a51e47 Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents: 407
diff changeset
   118
# make keyword tools accessible
773
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   119
kwtools = {'templater': None, 'hgcmd': ''}
385
e93c63004ec2 Monkeypatch dispatch._parse to avoid running it twice
Christian Ebert <blacktrash@gmx.net>
parents: 384
diff changeset
   120
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   121
# monkeypatch argument parsing
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   122
# due to backwards compatibility this can't be done in uisetup
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   123
# uisetup introduced with extensions module in 930ed513c864
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   124
def _kwdispatch_parse(ui, args):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   125
    '''Monkeypatch dispatch._parse to obtain running hg command.'''
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   126
    cmd, func, args, options, cmdoptions = _dispatch_parse(ui, args)
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   127
    kwtools['hgcmd'] = cmd
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   128
    return cmd, func, args, options, cmdoptions
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   129
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   130
try:
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   131
    # cmdutil.parse moves to dispatch._parse in 18a9fbb5cd78
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   132
    from mercurial import dispatch
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   133
    _dispatch_parse = dispatch._parse
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   134
    dispatch._parse = _kwdispatch_parse
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   135
except ImportError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   136
    try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   137
        # commands.parse moves to cmdutil.parse in 0c61124ad877
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   138
        _dispatch_parse = cmdutil.parse
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   139
        cmdutil.parse = _kwdispatch_parse
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   140
    except AttributeError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   141
        _dispatch_parse = commands.parse
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   142
        commands.parse = _kwdispatch_parse
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   143
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   144
try:
366
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   145
    # templatefilters module introduced in 9f1e6ab76069
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   146
    from mercurial import templatefilters
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   147
    template_filters = templatefilters.filters
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   148
    template_firstline = templatefilters.firstline
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   149
except ImportError:
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   150
    template_filters = templater.common_filters
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   151
    template_firstline = templater.firstline
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   152
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   153
def _wwrite(repo, f, data, mf):
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   154
    '''Makes repo.wwrite backwards compatible.'''
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   155
    # 656e06eebda7 removed file descriptor argument
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   156
    # 67982d3ee76c added flags argument
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   157
    try:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   158
        repo.wwrite(f, data, mf.flags(f))
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   159
    except (AttributeError, TypeError):
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   160
        repo.wwrite(f, data)
370
a8983fed9a9e (0.9.2compat) expand keywords in raw web output, and other changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 366
diff changeset
   161
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   162
def _normal(repo, files):
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   163
    '''Backwards compatible repo.dirstate.normal/update.'''
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   164
    # 6fd953d5faea introduced dirstate.normal()
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   165
    try:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   166
        for f in files:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   167
            repo.dirstate.normal(f)
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   168
    except AttributeError:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   169
        repo.dirstate.update(files, 'n')
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   170
278
232df68a0bcc cwd optional argument of _pathto to simplify _kwfwrite
Christian Ebert <blacktrash@gmx.net>
parents: 277
diff changeset
   171
def _pathto(repo, f, cwd=None):
264
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   172
    '''kwfiles behaves similar to status, using pathto since 78b6add1f966.'''
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   173
    try:
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   174
        return repo.pathto(f, cwd)
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   175
    except AttributeError:
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   176
        return f
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   177
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   178
'''Default match argument for commit, depending on version.'''
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   179
if hasattr(cmdutil, 'match'):
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   180
    _defmatch = None
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   181
else:
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   182
    _defmatch = util.always
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   183
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   184
# 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
   185
# "hg diff --rev" before 88803a69b24a due to bug in fancyopts
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   186
def _fancyopts(args, options, state):
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   187
    '''Fixed fancyopts from a9b7e425674f.'''
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   188
    namelist = []
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   189
    shortlist = ''
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   190
    argmap = {}
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   191
    defmap = {}
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   192
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   193
    for short, name, default, comment in options:
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   194
        # convert opts to getopt format
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   195
        oname = name
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   196
        name = name.replace('-', '_')
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   197
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   198
        argmap['-' + short] = argmap['--' + oname] = name
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   199
        defmap[name] = default
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   200
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   201
        # copy defaults to state
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   202
        if isinstance(default, list):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   203
            state[name] = default[:]
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   204
        elif callable(default):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   205
            print "whoa", name, default
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   206
            state[name] = None
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   207
        else:
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   208
            state[name] = default
59
94b26168791d Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents: 58
diff changeset
   209
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   210
        # does it take a parameter?
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   211
        if not (default is None or default is True or default is False):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   212
            if short: short += ':'
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   213
            if oname: oname += '='
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   214
        if short:
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   215
            shortlist += short
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   216
        if name:
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   217
            namelist.append(oname)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   218
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   219
    # parse arguments
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   220
    opts, args = getopt.getopt(args, shortlist, namelist)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   221
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   222
    # transfer result to state
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   223
    for opt, val in opts:
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   224
        name = argmap[opt]
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   225
        t = type(defmap[name])
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   226
        if t is type(fancyopts):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   227
            state[name] = defmap[name](val)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   228
        elif t is type(1):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   229
            state[name] = int(val)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   230
        elif t is type(''):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   231
            state[name] = val
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   232
        elif t is type([]):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   233
            state[name].append(val)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   234
        elif t is type(None) or t is type(False):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   235
            state[name] = True
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   236
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   237
    # return unparsed args
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   238
    return args
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   239
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   240
fancyopts.fancyopts = _fancyopts
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   241
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   242
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   243
class kwtemplater(object):
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   244
    '''
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   245
    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
   246
    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
   247
    '''
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   248
    templates = {
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   249
        'Revision': '{node|short}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   250
        'Author': '{author|user}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   251
        'Date': '{date|utcdate}',
662
25e813ce68e2 The CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net>
parents: 660
diff changeset
   252
        'RCSfile': '{file|basename},v',
665
06ccaeb6cfc1 keyword: clarify object of backwards compatibility
timeless
parents: 662
diff changeset
   253
        'RCSFile': '{file|basename},v', # kept for backwards compatibility
06ccaeb6cfc1 keyword: clarify object of backwards compatibility
timeless
parents: 662
diff changeset
   254
                                        # with hg-keyword
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   255
        'Source': '{root}/{file},v',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   256
        '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
   257
        '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
   258
    }
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   259
773
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   260
    def __init__(self, ui, repo, inc, exc):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   261
        self.ui = ui
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   262
        self.repo = repo
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   263
        self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
416
b69dca43ef08 Rename kwx to kwtools
Christian Ebert <blacktrash@gmx.net>
parents: 415
diff changeset
   264
        self.restrict = kwtools['hgcmd'] in restricted.split()
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   265
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   266
        kwmaps = self.ui.configitems('keywordmaps')
253
22e08d0f25dc List comprehension instead of loop to create ui template dictionary
Christian Ebert <blacktrash@gmx.net>
parents: 252
diff changeset
   267
        if kwmaps: # override default templates
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   268
            kwmaps = [(k, templater.parsestring(v, False))
253
22e08d0f25dc List comprehension instead of loop to create ui template dictionary
Christian Ebert <blacktrash@gmx.net>
parents: 252
diff changeset
   269
                      for (k, v) in kwmaps]
22e08d0f25dc List comprehension instead of loop to create ui template dictionary
Christian Ebert <blacktrash@gmx.net>
parents: 252
diff changeset
   270
            self.templates = dict(kwmaps)
254
474eccf2964f Map re.escape
Christian Ebert <blacktrash@gmx.net>
parents: 253
diff changeset
   271
        escaped = map(re.escape, self.templates.keys())
252
001902b60bdd String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents: 251
diff changeset
   272
        kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped)
001902b60bdd String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents: 251
diff changeset
   273
        self.re_kw = re.compile(kwpat)
235
baef9dcfb219 Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents: 234
diff changeset
   274
366
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   275
        template_filters['utcdate'] = utcdate
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   276
        self.ct = self._changeset_templater()
848
3e57838f5434 Compile regexes on demand
Christian Ebert <blacktrash@gmx.net>
parents: 846
diff changeset
   277
233
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   278
    def _changeset_templater(self):
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   279
        '''Backwards compatible cmdutil.changeset_templater.'''
237
0a0049700af5 Document revisions of interface changes
Christian Ebert <blacktrash@gmx.net>
parents: 236
diff changeset
   280
        # 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
   281
        try:
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   282
            return cmdutil.changeset_templater(self.ui, self.repo,
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   283
                                               False, '', False)
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   284
        except TypeError:
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   285
            return cmdutil.changeset_templater(self.ui, self.repo,
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   286
                                               False, None, '', False)
848
3e57838f5434 Compile regexes on demand
Christian Ebert <blacktrash@gmx.net>
parents: 846
diff changeset
   287
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   288
    def getnode(self, path, fnode):
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   289
        '''Derives changenode from file path and filenode.'''
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   290
        # used by kwfilelog.read and kwexpand
477
03268523c017 (0.9.2compat) ddb8a222249b is backwards compatible
Christian Ebert <blacktrash@gmx.net>
parents: 464
diff changeset
   291
        c = self.repo.filectx(path, fileid=fnode)
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   292
        return c.node()
848
3e57838f5434 Compile regexes on demand
Christian Ebert <blacktrash@gmx.net>
parents: 846
diff changeset
   293
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   294
    def substitute(self, data, path, node, subfunc):
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   295
        '''Replaces keywords in data with expanded template.'''
301
e92c6762e2be Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents: 300
diff changeset
   296
        def kwsub(mobj):
e92c6762e2be Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents: 300
diff changeset
   297
            kw = mobj.group(1)
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   298
            self.ct.use_template(self.templates[kw])
301
e92c6762e2be Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents: 300
diff changeset
   299
            self.ui.pushbuffer()
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   300
            self.ct.show(changenode=node, root=self.repo.root, file=path)
379
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   301
            return '$%s: %s $' % (kw, template_firstline(self.ui.popbuffer()))
301
e92c6762e2be Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents: 300
diff changeset
   302
        return subfunc(kwsub, data)
255
c4f37735be9b Turn off debug while expanding
Christian Ebert <blacktrash@gmx.net>
parents: 254
diff changeset
   303
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   304
    def expand(self, path, node, data):
186
c1b7b1d052de Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents: 185
diff changeset
   305
        '''Returns data with keywords expanded.'''
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   306
        if not self.restrict and self.matcher(path) and textsafe(data):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   307
            changenode = self.getnode(path, node)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   308
            return self.substitute(data, path, changenode, self.re_kw.sub)
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   309
        return data
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   310
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   311
    def iskwfile(self, path, islink):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   312
        '''Returns true if path matches [keyword] pattern
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   313
        and is not a symbolic link.
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   314
        Caveat: localrepository._link fails on Windows.'''
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   315
        return self.matcher(path) and not islink(path)
134
f869c65156f7 2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 133
diff changeset
   316
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   317
    def overwrite(self, node, expand, candidates):
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   318
        '''Overwrites selected files expanding/shrinking keywords.'''
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   319
        # repo[changeid] introduced in f6c00b17387c
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   320
        if node is not None:     # commit
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   321
            try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   322
                ctx = self.repo[node]
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   323
            except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   324
                ctx = self.repo.changectx(node)
769
3bf3212b13bc Postpone manifest calculation in kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 767
diff changeset
   325
            mf = ctx.manifest()
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   326
            candidates = [f for f in ctx.files() if f in mf]
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   327
        else:                    # kwexpand/kwshrink
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   328
            try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   329
                ctx = self.repo['.']
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   330
            except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   331
                ctx = self.repo.changectx()
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   332
            mf = ctx.manifest()
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   333
        if hasattr(ctx, 'flags'):
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   334
            # 51b0e799352f
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   335
            islink = lambda p: 'l' in ctx.flags(p)
979
6cabb1c47f21 Avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents: 973
diff changeset
   336
        else:
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   337
            islink = mf.linkf
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   338
        candidates = [f for f in candidates if self.iskwfile(f, islink)]
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   339
        if candidates:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   340
            self.restrict = True # do not expand when reading
813
9d01f9cab5e2 Refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents: 812
diff changeset
   341
            if expand:
984
a4ea5c2d3ff3 (0.9.2compat) merge with default
Christian Ebert <blacktrash@gmx.net>
parents: 704 981
diff changeset
   342
                msg = _('overwriting %s expanding keywords\n')
813
9d01f9cab5e2 Refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents: 812
diff changeset
   343
            else:
984
a4ea5c2d3ff3 (0.9.2compat) merge with default
Christian Ebert <blacktrash@gmx.net>
parents: 704 981
diff changeset
   344
                msg = _('overwriting %s shrinking keywords\n')
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   345
            overwritten = []
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   346
            for f in candidates:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   347
                fp = self.repo.file(f)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   348
                data = fp.read(mf[f])
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   349
                if not textsafe(data):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   350
                    continue
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   351
                if expand:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   352
                    changenode = node or self.getnode(f, mf[f])
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   353
                    data, found = self.substitute(data, f, changenode,
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   354
                                                  self.re_kw.subn)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   355
                else:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   356
                    found = self.re_kw.search(data)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   357
                if found:
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   358
                    self.ui.note(msg % f)
984
a4ea5c2d3ff3 (0.9.2compat) merge with default
Christian Ebert <blacktrash@gmx.net>
parents: 704 981
diff changeset
   359
                    fpath = self.repo.wjoin(f)
a4ea5c2d3ff3 (0.9.2compat) merge with default
Christian Ebert <blacktrash@gmx.net>
parents: 704 981
diff changeset
   360
                    mode = os.lstat(fpath).st_mode
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   361
                    self.repo.wwrite(f, data, mf.flags(f))
984
a4ea5c2d3ff3 (0.9.2compat) merge with default
Christian Ebert <blacktrash@gmx.net>
parents: 704 981
diff changeset
   362
                    os.chmod(fpath, mode)
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   363
                    overwritten.append(f)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   364
            _normal(self.repo, overwritten)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   365
            self.restrict = False
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   366
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   367
    def shrinktext(self, text):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   368
        '''Unconditionally removes all keyword substitutions from text.'''
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   369
        return self.re_kw.sub(r'$\1$', text)
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   370
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   371
    def shrink(self, fname, text):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   372
        '''Returns text with all keyword substitutions removed.'''
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   373
        if self.matcher(fname) and textsafe(text):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   374
            return self.shrinktext(text)
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   375
        return text
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   376
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   377
    def shrinklines(self, fname, lines):
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   378
        '''Returns lines with keyword substitutions removed.'''
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   379
        if self.matcher(fname):
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   380
            text = ''.join(lines)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   381
            if textsafe(text):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   382
                return self.shrinktext(text).splitlines(True)
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   383
        return lines
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   384
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   385
    def wread(self, fname, data):
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   386
        '''If in restricted mode returns data read from wdir with
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   387
        keyword substitutions removed.'''
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   388
        return self.restrict and self.shrink(fname, data) or data
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   389
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   390
class kwfilelog(filelog.filelog):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   391
    '''
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   392
    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
   393
    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
   394
    '''
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   395
    def __init__(self, opener, kwt, path):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   396
        super(kwfilelog, self).__init__(opener, path)
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   397
        self.kwt = kwt
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   398
        self.path = path
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   399
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   400
    def read(self, node):
265
1b6b7835e3f9 Count keywords in a customized kwfilelog read method
Christian Ebert <blacktrash@gmx.net>
parents: 264
diff changeset
   401
        '''Expands keywords when reading filelog.'''
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   402
        data = super(kwfilelog, self).read(node)
408
33e5b8a51e47 Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents: 407
diff changeset
   403
        return self.kwt.expand(self.path, node, data)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   404
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   405
    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
   406
        '''Removes keyword substitutions when adding to filelog.'''
408
33e5b8a51e47 Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents: 407
diff changeset
   407
        text = self.kwt.shrink(self.path, text)
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   408
        return super(kwfilelog, self).add(text, meta, tr, link, p1, p2)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   409
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   410
    def cmp(self, node, text):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   411
        '''Removes keyword substitutions for comparison.'''
408
33e5b8a51e47 Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents: 407
diff changeset
   412
        text = self.kwt.shrink(self.path, text)
174
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   413
        if self.renamed(node):
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   414
            t2 = super(kwfilelog, self).read(node)
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   415
            return t2 != text
248
2c222367dab3 Use revlog.cmp to avoid checking for rename twice
Christian Ebert <blacktrash@gmx.net>
parents: 246
diff changeset
   416
        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
   417
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   418
def _status(ui, repo, kwt, unknown, *pats, **opts):
290
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 288
diff changeset
   419
    '''Bails out if [keyword] configuration is not active.
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 288
diff changeset
   420
    Returns status of working directory.'''
408
33e5b8a51e47 Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents: 407
diff changeset
   421
    if kwt:
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   422
        try:
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   423
            # 0159b7a36184 ff.
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   424
            matcher = cmdutil.match(repo, pats, opts)
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   425
            try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   426
                # 4faaa0535ea7
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   427
                return repo.status(match=matcher, unknown=unknown, clean=True)
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   428
            except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   429
                return repo.status(match=matcher, list_clean=True)
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   430
        except AttributeError:
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   431
            files, match, anypats = cmdutil.matchpats(repo, pats, opts)
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   432
            return repo.status(files=files, match=match, list_clean=True)
271
35f43e2ce5b6 For overwriting commands use node and manifest to speed up walk
Christian Ebert <blacktrash@gmx.net>
parents: 270
diff changeset
   433
    if ui.configitems('keyword'):
35f43e2ce5b6 For overwriting commands use node and manifest to speed up walk
Christian Ebert <blacktrash@gmx.net>
parents: 270
diff changeset
   434
        raise util.Abort(_('[keyword] patterns cannot match'))
35f43e2ce5b6 For overwriting commands use node and manifest to speed up walk
Christian Ebert <blacktrash@gmx.net>
parents: 270
diff changeset
   435
    raise util.Abort(_('no [keyword] patterns configured'))
263
fc7f60b109b6 kwfiles notifies if there are no files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents: 262
diff changeset
   436
275
cb2b11e63906 _overwrite method for kwrepo.commit, kwexpand, kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 274
diff changeset
   437
def _kwfwrite(ui, repo, expand, *pats, **opts):
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   438
    '''Selects files and passes them to kwtemplater.overwrite.'''
458
dd5eca480af6 (0.9.2compat) get some changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 453
diff changeset
   439
    if repo.dirstate.parents()[1] != nullid:
465
2f017ca736ce (stable) mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents: 463
diff changeset
   440
        raise util.Abort(_('outstanding uncommitted merge'))
416
b69dca43ef08 Rename kwx to kwtools
Christian Ebert <blacktrash@gmx.net>
parents: 415
diff changeset
   441
    kwt = kwtools['templater']
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   442
    status = _status(ui, repo, kwt, False, *pats, **opts)
689
c23ba1aef69d (0.9.2compat) use status' names for readability
Christian Ebert <blacktrash@gmx.net>
parents: 678
diff changeset
   443
    modified, added, removed, deleted, unknown, ignored, clean = status
280
2088e409d360 Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents: 278
diff changeset
   444
    if modified or added or removed or deleted:
458
dd5eca480af6 (0.9.2compat) get some changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 453
diff changeset
   445
        raise util.Abort(_('outstanding uncommitted changes'))
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   446
    wlock = lock = None
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   447
    try:
206
8d16b70359da Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents: 205
diff changeset
   448
        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
   449
        lock = repo.lock()
689
c23ba1aef69d (0.9.2compat) use status' names for readability
Christian Ebert <blacktrash@gmx.net>
parents: 678
diff changeset
   450
        kwt.overwrite(None, expand, clean)
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   451
    finally:
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   452
        del wlock, lock
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   453
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   454
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   455
def demo(ui, repo, *args, **opts):
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   456
    '''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
   457
527
59cb740ebf83 keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 525
diff changeset
   458
    Show current, custom, or default keyword template maps and their
573
197aeca9108a keyword: improve English
timeless <timeless@gmail.com>
parents: 569
diff changeset
   459
    expansions.
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   460
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   461
    Extend the current configuration by specifying maps as arguments
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   462
    and using -f/--rcfile to source an external hgrc file.
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   463
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   464
    Use -d/--default to disable current configuration.
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   465
    '''
266
50ce25f8c676 Underscore prefixes only for names at top level, or compatibility wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 265
diff changeset
   466
    def demoitems(section, items):
664
c339bd5b183b (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Christian Ebert <blacktrash@gmx.net>
parents: 658
diff changeset
   467
        items.sort()
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   468
        ui.write('[%s]\n' % section)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   469
        for k, v in items:
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   470
            ui.write('%s = %s\n' % (k, v))
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   471
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   472
    kwstatus = 'current'
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   473
    fn = 'demo.txt'
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   474
    tmpdir = tempfile.mkdtemp('', 'kwdemo.')
529
7197324dfa4d expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 527
diff changeset
   475
    ui.note(_('creating temporary repository at %s\n') % tmpdir)
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   476
    repo = localrepo.localrepository(ui, tmpdir, True)
184
30b3e6a09a9d Set ui to repo.ui at once where needed for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 183
diff changeset
   477
    ui.setconfig('keyword', fn, '')
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   478
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   479
    uikwmaps = ui.configitems('keywordmaps')
319
2da9ab0bc400 Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents: 318
diff changeset
   480
    if args or opts.get('rcfile'):
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   481
        ui.status(_('\n\tconfiguration using custom keyword template maps\n'))
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   482
        if uikwmaps:
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   483
            ui.status(_('\textending current template maps\n'))
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   484
        if opts.get('default') or not uikwmaps:
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   485
            ui.status(_('\toverriding default template maps\n'))
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   486
        if opts.get('rcfile'):
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   487
            ui.readconfig(opts.get('rcfile'))
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   488
        if args:
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   489
            # simulate hgrc parsing
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   490
            rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   491
            fp = repo.opener('hgrc', 'w')
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   492
            fp.writelines(rcmaps)
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   493
            fp.close()
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   494
            ui.readconfig(repo.join('hgrc'))
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   495
        kwmaps = dict(ui.configitems('keywordmaps'))
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   496
    elif opts.get('default'):
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   497
        ui.status(_('\n\tconfiguration using default keyword template maps\n'))
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   498
        kwmaps = kwtemplater.templates
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   499
        if uikwmaps:
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   500
            ui.status(_('\tdisabling current template maps\n'))
346
2c2b49def9d8 Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents: 345
diff changeset
   501
            for k, v in kwmaps.iteritems():
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   502
                ui.setconfig('keywordmaps', k, v)
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   503
    else:
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   504
        ui.status(_('\n\tconfiguration using current keyword template maps\n'))
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   505
        kwmaps = dict(uikwmaps) or kwtemplater.templates
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   506
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   507
    reposetup(ui, repo)
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   508
    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
   509
        if k.endswith('keyword'):
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   510
            extension = '%s = %s' % (k, v)
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   511
            break
610
5b87f3ea105a (0.9.2compat) kwdemo: get rid of subfunction and ease translation
Christian Ebert <blacktrash@gmx.net>
parents: 607
diff changeset
   512
    ui.status(_('\n\tconfig using %s keyword template maps\n') % kwstatus)
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   513
    ui.write('[extensions]\n%s\n' % extension)
266
50ce25f8c676 Underscore prefixes only for names at top level, or compatibility wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 265
diff changeset
   514
    demoitems('keyword', ui.configitems('keyword'))
664
c339bd5b183b (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Christian Ebert <blacktrash@gmx.net>
parents: 658
diff changeset
   515
    demoitems('keywordmaps', kwmaps.items())
c339bd5b183b (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Christian Ebert <blacktrash@gmx.net>
parents: 658
diff changeset
   516
    kwkeys = kwmaps.keys()
c339bd5b183b (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Christian Ebert <blacktrash@gmx.net>
parents: 658
diff changeset
   517
    kwkeys.sort()
c339bd5b183b (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Christian Ebert <blacktrash@gmx.net>
parents: 658
diff changeset
   518
    keywords = '$' + '$\n$'.join(kwkeys) + '$\n'
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   519
    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
   520
    repo.add([fn])
702
c118a9c5ca24 Make kwdemo less verbose
Christian Ebert <blacktrash@gmx.net>
parents: 701
diff changeset
   521
    ui.note(_('\nkeywords written to %s:\n') % fn)
183
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   522
    ui.note(keywords)
704
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   523
    try:
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   524
        repo.dirstate.setbranch('demobranch')
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   525
    except AttributeError:
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   526
        # before 7e1c8a565a4f
772628d1ccb5 (0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 698
diff changeset
   527
        repo.opener('branch', 'w').write('demobranch\n')
293
a7d568671575 Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents: 292
diff changeset
   528
    for name, cmd in ui.configitems('hooks'):
a7d568671575 Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents: 292
diff changeset
   529
        if name.split('.', 1)[0].find('commit') > -1:
a7d568671575 Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents: 292
diff changeset
   530
            repo.ui.setconfig('hooks', name, '')
699
57f8b7f021e8 Mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net>
parents: 696
diff changeset
   531
    msg = _('hg keyword configuration and expansion example')
702
c118a9c5ca24 Make kwdemo less verbose
Christian Ebert <blacktrash@gmx.net>
parents: 701
diff changeset
   532
    ui.note("hg ci -m '%s'\n" % msg)
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   533
    repo.commit(text=msg)
633
ca4b437a817c Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents: 631
diff changeset
   534
    ui.status(_('\n\tkeywords expanded\n'))
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   535
    ui.write(repo.wread(fn))
251
b37f2f065a9c Ignore errors when removing temp dir in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 250
diff changeset
   536
    shutil.rmtree(tmpdir, ignore_errors=True)
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   537
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   538
def expand(ui, repo, *pats, **opts):
573
197aeca9108a keyword: improve English
timeless <timeless@gmail.com>
parents: 569
diff changeset
   539
    '''expand keywords in the working directory
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   540
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   541
    Run after (re)enabling keyword expansion.
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   542
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   543
    kwexpand refuses to run if given files contain local changes.
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   544
    '''
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   545
    # 3rd argument sets expansion to True
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   546
    _kwfwrite(ui, repo, True, *pats, **opts)
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   547
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   548
def files(ui, repo, *pats, **opts):
597
795a95d7dc61 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 596
diff changeset
   549
    '''show files configured for keyword expansion
593
23da65f04361 keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 590
diff changeset
   550
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
   551
    List which files in the working directory are matched by the
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
   552
    [keyword] configuration patterns.
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   553
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
   554
    Useful to prevent inadvertent keyword expansion and to speed up
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
   555
    execution by including only files that are actual candidates for
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
   556
    expansion.
593
23da65f04361 keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 590
diff changeset
   557
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   558
    See "hg help keyword" on how to construct patterns both for
625
b17b1cf1341a keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents: 624
diff changeset
   559
    inclusion and exclusion of files.
597
795a95d7dc61 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 596
diff changeset
   560
654
e188e35ff4ad Uppercase short option for kwfiles --all, like hg status -A
Christian Ebert <blacktrash@gmx.net>
parents: 653
diff changeset
   561
    With -A/--all and -v/--verbose the codes used to show the status
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   562
    of files are:
620
04781aad754a Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents: 614
diff changeset
   563
04781aad754a Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents: 614
diff changeset
   564
      K = keyword expansion candidate
651
a047bb9bab24 kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents: 646
diff changeset
   565
      k = keyword expansion candidate (not tracked)
620
04781aad754a Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents: 614
diff changeset
   566
      I = ignored
651
a047bb9bab24 kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents: 646
diff changeset
   567
      i = ignored (not tracked)
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   568
    '''
416
b69dca43ef08 Rename kwx to kwtools
Christian Ebert <blacktrash@gmx.net>
parents: 415
diff changeset
   569
    kwt = kwtools['templater']
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   570
    status = _status(ui, repo, kwt, *pats, **opts)
653
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 652
diff changeset
   571
    cwd = pats and repo.getcwd() or ''
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   572
    modified, added, removed, deleted, unknown, ignored, clean = status
653
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 652
diff changeset
   573
    files = []
695
31b9e6615cec Remove deprecated options
Christian Ebert <blacktrash@gmx.net>
parents: 688
diff changeset
   574
    if not opts.get('unknown') or opts.get('all'):
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   575
        try:
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   576
            # f67d1468ac50
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   577
            files = util.sort(modified + added + clean)
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   578
        except AttributeError:
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   579
            files = modified + added + clean
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   580
            files.sort()
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   581
    try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   582
        # f6c00b17387c
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   583
        wctx = repo[None]
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   584
    except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   585
        wctx = repo.workingctx()
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   586
    if hasattr(wctx, 'flags'):
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   587
        islink = lambda p: 'l' in wctx.flags(p)
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   588
    elif hasattr(wctx, 'fileflags'):
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   589
        islink = lambda p: 'l' in wctx.fileflags(p)
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   590
    else:
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   591
        mf = wctx.manifest()
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   592
        islink = mf.linkf
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   593
    kwfiles = [f for f in files if kwt.iskwfile(f, islink)]
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   594
    kwunknown = [f for f in unknown if kwt.iskwfile(f, islink)]
653
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 652
diff changeset
   595
    if not opts.get('ignore') or opts.get('all'):
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   596
        showfiles = kwfiles, kwunknown
653
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 652
diff changeset
   597
    else:
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   598
        showfiles = [], []
319
2da9ab0bc400 Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents: 318
diff changeset
   599
    if opts.get('all') or opts.get('ignore'):
653
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 652
diff changeset
   600
        showfiles += ([f for f in files if f not in kwfiles],
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 652
diff changeset
   601
                      [f for f in unknown if f not in kwunknown])
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   602
    for char, filenames in zip('KkIi', showfiles):
509
16b690351c0d Do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents: 507
diff changeset
   603
        fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
298
c8afb99bb70f kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents: 297
diff changeset
   604
        for f in filenames:
519
22a306a7b411 (0.9.2compat) do not use builtin format
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   605
            ui.write(fmt % _pathto(repo, f, cwd))
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   606
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   607
def shrink(ui, repo, *pats, **opts):
573
197aeca9108a keyword: improve English
timeless <timeless@gmail.com>
parents: 569
diff changeset
   608
    '''revert expanded keywords in the working directory
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   609
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   610
    Run before changing/disabling active keywords or if you experience
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   611
    problems with "hg import" or "hg merge".
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   612
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   613
    kwshrink refuses to run if given files contain local changes.
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   614
    '''
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   615
    # 3rd argument sets expansion to False
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   616
    _kwfwrite(ui, repo, False, *pats, **opts)
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   617
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   618
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   619
def reposetup(ui, repo):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   620
    '''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
   621
    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
   622
    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
   623
    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
   624
    keyword substitutions.
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   625
    Monkeypatches patch and webcommands.'''
64
4cd7b993c5f8 Imports specific to functions
Christian Ebert <blacktrash@gmx.net>
parents: 63
diff changeset
   626
525
6028e8046c14 bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 523
diff changeset
   627
    try:
773
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   628
        if (not repo.local() or kwtools['hgcmd'] in nokwcommands.split()
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   629
            or '.hg' in repo.root.split(os.sep)
525
6028e8046c14 bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 523
diff changeset
   630
            or repo._url.startswith('bundle:')):
6028e8046c14 bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 523
diff changeset
   631
            return
6028e8046c14 bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 523
diff changeset
   632
    except AttributeError:
6028e8046c14 bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 523
diff changeset
   633
        pass
292
783c1310e20f Avoid dispatch import, revert to simple argument parser
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
   634
773
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   635
    inc, exc = [], ['.hg*']
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   636
    for pat, opt in ui.configitems('keyword'):
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   637
        if opt != 'ignore':
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   638
            inc.append(pat)
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   639
        else:
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   640
            exc.append(pat)
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   641
    if not inc:
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   642
        return
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   643
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 771
diff changeset
   644
    kwtools['templater'] = kwt = kwtemplater(ui, repo, inc, exc)
261
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   645
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   646
    class kwrepo(repo.__class__):
407
60c993ce6acb Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents: 406
diff changeset
   647
        def file(self, f):
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   648
            if f[0] == '/':
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   649
                f = f[1:]
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   650
            return kwfilelog(self.sopener, kwt, f)
78
474b415433a1 Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents: 77
diff changeset
   651
340
9e9f6cbcf20b Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents: 335
diff changeset
   652
        def wread(self, filename):
9e9f6cbcf20b Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents: 335
diff changeset
   653
            data = super(kwrepo, self).wread(filename)
408
33e5b8a51e47 Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents: 407
diff changeset
   654
            return kwt.wread(filename, data)
340
9e9f6cbcf20b Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents: 335
diff changeset
   655
230
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   656
        def _commit(self, files, text, user, date, match, force, lock, wlock,
359
4ac7e51443fe (0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Christian Ebert <blacktrash@gmx.net>
parents: 352
diff changeset
   657
                    force_editor, p1, p2, extra, empty_ok):
230
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   658
            '''Private commit wrapper for backwards compatibility.'''
611
c50f56b5f4b8 Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 609
diff changeset
   659
            try:
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   660
                return super(kwrepo,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   661
                             self).commit(files=files, text=text,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   662
                                          user=user, date=date, match=match,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   663
                                          force=force, lock=lock, wlock=wlock,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   664
                                          force_editor=force_editor,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   665
                                          p1=p1, p2=p2, extra=extra)
230
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   666
            except TypeError:
359
4ac7e51443fe (0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Christian Ebert <blacktrash@gmx.net>
parents: 352
diff changeset
   667
                try:
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   668
                    return super(kwrepo,
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   669
                                 self).commit(files=files, text=text,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   670
                                              user=user, date=date,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   671
                                              match=match, force=force,
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   672
                                              force_editor=force_editor,
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   673
                                              p1=p1, p2=p2, extra=extra,
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   674
                                              empty_ok=empty_ok)
359
4ac7e51443fe (0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Christian Ebert <blacktrash@gmx.net>
parents: 352
diff changeset
   675
                except TypeError:
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   676
                    return super(kwrepo,
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   677
                                 self).commit(files=files, text=text,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   678
                                              user=user, date=date,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   679
                                              match=match, force=force,
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   680
                                              force_editor=force_editor,
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   681
                                              p1=p1, p2=p2, extra=extra)
600
b40e7861defd Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents: 597
diff changeset
   682
176
3aed363c9eaf Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net>
parents: 175
diff changeset
   683
        def commit(self, files=None, text='', user=None, date=None,
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   684
                   match=_defmatch, force=False, lock=None, wlock=None,
359
4ac7e51443fe (0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Christian Ebert <blacktrash@gmx.net>
parents: 352
diff changeset
   685
                   force_editor=False, p1=None, p2=None, extra={},
4ac7e51443fe (0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Christian Ebert <blacktrash@gmx.net>
parents: 352
diff changeset
   686
                   empty_ok=False):
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   687
            # (w)lock arguments removed in 126f527b3ba3
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   688
            # 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
   689
            # use private _(w)lock for deletion
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   690
            _lock = lock
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   691
            _wlock = wlock
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   692
            del wlock, lock
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   693
            _p1 = _p2 = None
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   694
            try:
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   695
                if not _wlock:
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   696
                    _wlock = self.wlock()
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   697
                if not _lock:
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   698
                    _lock = self.lock()
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   699
                # store and postpone commit hooks
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 343
diff changeset
   700
                commithooks = {}
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   701
                for name, cmd in ui.configitems('hooks'):
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   702
                    if name.split('.', 1)[0] == 'commit':
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 343
diff changeset
   703
                        commithooks[name] = cmd
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   704
                        ui.setconfig('hooks', name, '')
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   705
                if commithooks:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   706
                    # store parents for commit hook environment
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   707
                    if p1 is None:
613
cae62580bea3 (0.9.2compat) prefer self.func over repo.func in kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 610
diff changeset
   708
                        _p1, _p2 = self.dirstate.parents()
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   709
                    else:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   710
                        _p1, _p2 = p1, p2 or nullid
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   711
                    _p1 = hex(_p1)
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   712
                    if _p2 == nullid:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   713
                        _p2 = ''
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   714
                    else:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   715
                        _p2 = hex(_p2)
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   716
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   717
                n = self._commit(files, text, user, date, match, force, _lock,
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   718
                                 _wlock, force_editor, p1, p2, extra, empty_ok)
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   719
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   720
                # restore commit hooks
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 343
diff changeset
   721
                for name, cmd in commithooks.iteritems():
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   722
                    ui.setconfig('hooks', name, cmd)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   723
                if n is not None:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   724
                    kwt.overwrite(n, True, None)
613
cae62580bea3 (0.9.2compat) prefer self.func over repo.func in kwrepo
Christian Ebert <blacktrash@gmx.net>
parents: 610
diff changeset
   725
                    self.hook('commit', node=n, parent1=_p1, parent2=_p2)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   726
                return n
809
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 808
diff changeset
   727
            finally:
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   728
                del _wlock, _lock
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   729
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   730
    repo.__class__ = kwrepo
809
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 808
diff changeset
   731
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   732
    # monkeypatches
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   733
    try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   734
        # avoid spurious rejects if patchfile is available
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   735
        def kwpatchfile_init(self, ui, fname, missing=False):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   736
            '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   737
            rejects or conflicts due to expanded keywords in working dir.'''
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   738
            try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   739
                patchfile_init(self, ui, fname, missing)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   740
            except TypeError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   741
                # "missing" arg added in e90e72c6b4c7
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   742
                patchfile_init(self, ui, fname)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   743
            self.lines = kwt.shrinklines(self.fname, self.lines)
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   744
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   745
        patchfile_init = patch.patchfile.__init__
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   746
        patch.patchfile.__init__ = kwpatchfile_init
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   747
    except AttributeError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   748
        pass
445
0c91995647e9 (stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents: 431
diff changeset
   749
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   750
    def kw_diff(repo, node1=None, node2=None, files=None, match=_defmatch,
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   751
                 fp=None, changes=None, opts=None):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   752
        # only expand if comparing against working dir
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   753
        if node2 is not None:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   754
            kwt.matcher = util.never
458
dd5eca480af6 (0.9.2compat) get some changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 453
diff changeset
   755
        elif node1 is not None and node1 != repo.dirstate.parents()[0]:
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   756
            kwt.restrict = True
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   757
        try:
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   758
            patch_diff(repo, node1=node1, node2=node2, files=files,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   759
                       match=match, fp=fp, changes=changes, opts=opts)
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   760
        except TypeError:
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   761
            patch_diff(repo, node1=node1, node2=node2, match=match, fp=fp,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   762
                       changes=changes, opts=opts)
868
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 864
diff changeset
   763
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   764
    patch_diff = patch.diff
672
0d7642e39cfe (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted
Christian Ebert <blacktrash@gmx.net>
parents: 664
diff changeset
   765
    if not kwt.restrict:
0d7642e39cfe (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted
Christian Ebert <blacktrash@gmx.net>
parents: 664
diff changeset
   766
        patch.diff = kw_diff
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   767
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   768
    try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   769
        from mercurial.hgweb import webcommands
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   770
        def kwweb_annotate(web, req, tmpl):
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   771
            '''Wraps webcommands.annotate turning off keyword expansion.'''
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   772
            kwt.matcher = util.never
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   773
            return webcommands_annotate(web, req, tmpl)
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   774
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   775
        def kwweb_changeset(web, req, tmpl):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   776
            '''Wraps webcommands.changeset turning off keyword expansion.'''
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   777
            kwt.matcher = util.never
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   778
            return webcommands_changeset(web, req, tmpl)
868
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 864
diff changeset
   779
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   780
        def kwweb_filediff(web, req, tmpl):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   781
            '''Wraps webcommands.filediff turning off keyword expansion.'''
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   782
            kwt.matcher = util.never
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   783
            return webcommands_filediff(web, req, tmpl)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   784
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   785
        webcommands_annotate = webcommands.annotate
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   786
        webcommands_changeset = webcommands.changeset
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   787
        webcommands_filediff = webcommands.filediff
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   788
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   789
        webcommands.annotate = kwweb_annotate
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   790
        webcommands.changeset = webcommands.rev = kwweb_changeset
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   791
        webcommands.filediff = webcommands.diff = kwweb_filediff
814
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 813
diff changeset
   792
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   793
    except ImportError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   794
        from mercurial.hgweb.hgweb_mod import hgweb
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   795
        def kwweb_do_annotate(self, req):
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   796
            kwt.matcher = util.never
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   797
            hgweb_do_annotate(self, req)
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   798
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   799
        def kwweb_do_changeset(self, req):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   800
            kwt.matcher = util.never
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   801
            hgweb_do_changeset(self, req)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   802
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   803
        def kwweb_do_filediff(self, req):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   804
            kwt.matcher = util.never
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   805
            hgweb_do_filediff(self, req)
736
38ef84cc9dd1 Support (q)record
Christian Ebert <blacktrash@gmx.net>
parents: 735
diff changeset
   806
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   807
        hgweb_do_annotate = hgweb.do_annotate
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   808
        hgweb_do_changeset = hgweb.do_changeset
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   809
        hgweb_do_filediff = hgweb.do_filediff
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   810
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   811
        hgweb.do_annotate = kwweb_do_annotate
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   812
        hgweb.do_changeset = hgweb.do_rev = kwweb_do_changeset
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   813
        hgweb.do_filediff = hgweb.do_diff = kwweb_do_filediff
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   814
842
12f6e285e4e7 Only use expensive fctx.cmp when needed
Christian Ebert <blacktrash@gmx.net>
parents: 840
diff changeset
   815
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   816
cmdtable = {
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   817
    'kwdemo':
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   818
        (demo,
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   819
         [('d', 'default', None, _('show default keyword template maps')),
622
7f14aa4b0e1f (0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix)
Christian Ebert <blacktrash@gmx.net>
parents: 616
diff changeset
   820
          ('f', 'rcfile', '', _('read maps from rcfile'))],
283
071bfbd482b4 Respect Mercurial conventions in kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 282
diff changeset
   821
         _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')),
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   822
    'kwexpand': (expand, commands.walkopts,
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   823
                 _('hg kwexpand [OPTION]... [FILE]...')),
264
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   824
    'kwfiles':
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   825
        (files,
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   826
         [('A', 'all', None, _('show keyword status flags of all files')),
270
371ce7fe5f13 kwfiles: change option "ignored" to "ignore", add option "untracked"
Christian Ebert <blacktrash@gmx.net>
parents: 269
diff changeset
   827
          ('i', 'ignore', None, _('show files excluded from expansion')),
690
19a327dfb68d (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Christian Ebert <blacktrash@gmx.net>
parents: 689
diff changeset
   828
          ('u', 'unknown', None, _('only show unknown (not tracked) files')),
264
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   829
         ] + commands.walkopts,
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   830
         _('hg kwfiles [OPTION]... [FILE]...')),
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   831
    'kwshrink': (shrink, commands.walkopts,
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   832
                 _('hg kwshrink [OPTION]... [FILE]...')),
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   833
}