hgkw/keyword.py
author Christian Ebert <blacktrash@gmx.net>
Wed, 05 Aug 2009 17:01:55 +0200
branch0.9.2compat
changeset 638 439e096ce144
parent 630 d0185236a089
child 639 d41074cb161b
permissions -rw-r--r--
(0.9.2compat) remove "help keyword" from test
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
#
630
d0185236a089 (0.9.2compat) update copyright
Christian Ebert <blacktrash@gmx.net>
parents: 622
diff changeset
     3
# Copyright 2007-2009 Christian Ebert <blacktrash@gmx.net>
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
     4
#
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
     5
# This software may be used and distributed according to the terms of the
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
     6
# GNU General Public License version 2, incorporated herein by reference.
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
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
    14
# files (like LaTeX packages), that are mostly addressed to an
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
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
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    18
# <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    19
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    20
# Keyword expansion is based on Mercurial's changeset template mappings.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    21
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    22
# Binary files are not touched.
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    23
#
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    24
# Setup in hgrc:
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    25
#
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    26
#   [extensions]
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    27
#   # enable extension
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    28
#   keyword = /full/path/to/hgkw/keyword.py
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    29
#   # or, if script in canonical hgext folder:
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    30
#   # hgext.keyword =
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    31
#
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    32
# Files to act upon/ignore are specified in the [keyword] section.
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    33
# Customized keyword template mappings in the [keywordmaps] section.
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    34
#
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    35
# Run "hg help keyword" and "hg kwdemo" to get info on configuration.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    36
589
3cad5778d217 (0.9.2compat) update synopsis
Christian Ebert <blacktrash@gmx.net>
parents: 581
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
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    39
This extension expands RCS/CVS-like or self-customized $Keywords$ in tracked
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    40
text files selected by your configuration.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    41
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    42
Keywords are only expanded in local repositories and not stored in the change
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    43
history. The mechanism can be regarded as a convenience for the current user
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    44
or for archive distribution.
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    45
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    46
Configuration is done in the [keyword] and [keywordmaps] sections of hgrc
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    47
files.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    48
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    49
Example:
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    50
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    51
    [keyword]
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    52
    # expand keywords in every python file except those matching "x*"
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
    53
    **.py =
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
    54
    x*    = ignore
146
df9de07ce002 Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents: 145
diff changeset
    55
615
36de1c074e13 (0.9.2compat) use all caps NOTE: in help string
Christian Ebert <blacktrash@gmx.net>
parents: 613
diff changeset
    56
NOTE: the more specific you are in your filename patterns the less you lose
36de1c074e13 (0.9.2compat) use all caps NOTE: in help string
Christian Ebert <blacktrash@gmx.net>
parents: 613
diff changeset
    57
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
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    59
For [keywordmaps] template mapping and expansion demonstration and control run
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    60
"hg kwdemo".
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    61
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    62
An additional date template filter {date|utcdate} is provided.
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    63
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    64
The default template mappings (view with "hg kwdemo -d") can be replaced with
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    65
customized keywords and templates. Again, run "hg kwdemo" to control the
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    66
results of your config changes.
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
    67
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    68
Before changing/disabling active keywords, run "hg kwshrink" to avoid the risk
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    69
of inadvertently storing expanded keywords in the change history.
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
    70
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    71
To force expansion after enabling it, or a configuration change, run "hg
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    72
kwexpand".
211
110c76a94d1c help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
    73
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    74
Also, when committing with the record extension or using mq's qrecord, be
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    75
aware that keywords cannot be updated. Again, run "hg kwexpand" on the files
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    76
in question to update keyword expansions after all changes have been checked
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    77
in.
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
    78
607
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    79
Expansions spanning more than one line and incremental expansions, like CVS'
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    80
$Log$, are not supported. A keyword template map "Log = {desc}" expands to the
783774a5eff3 (0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents: 598
diff changeset
    81
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
    82
360
ed06223f88fc (0.9.2compat) clean import handling when patchfile class available
Christian Ebert <blacktrash@gmx.net>
parents: 359
diff changeset
    83
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
    84
        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
    85
        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
    86
        bundle/unbundle to share changes.
48
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    87
'''
59fedb6b41da add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents: 47
diff changeset
    88
477
03268523c017 (0.9.2compat) ddb8a222249b is backwards compatible
Christian Ebert <blacktrash@gmx.net>
parents: 464
diff changeset
    89
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
    90
from mercurial import localrepo, patch, revlog, templater, util
422
c9899d769cdb (0.9.2compat) expand * import
Christian Ebert <blacktrash@gmx.net>
parents: 420
diff changeset
    91
from mercurial.node import nullid, hex
159
28fd5b5eb3ad Simplify backward compatible import
Christian Ebert <blacktrash@gmx.net>
parents: 158
diff changeset
    92
from mercurial.i18n import gettext as _
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
    93
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
    94
379
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
    95
commands.optionalrepo += ' kwdemo'
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
    96
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
    97
# 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
    98
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
    99
                ' 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
   100
                ' convert email glog')
379
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   101
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   102
# hg commands that trigger expansion only when writing to working dir,
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   103
# not when reading filelog, and unexpand when reading from working dir
486
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   104
restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord'
379
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   105
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   106
def utcdate(date):
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   107
    '''Returns hgdate in cvs-like UTC format.'''
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   108
    return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   109
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   110
def textsafe(s):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   111
    '''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
   112
    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
   113
    return '\0' not in s
379
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   114
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   115
# make keyword tools accessible
616
0b02f86cfb89 (0.9.2compat) empty string as default value for hgcmd
Christian Ebert <blacktrash@gmx.net>
parents: 615
diff changeset
   116
kwtools = {'templater': None, 'hgcmd': ''}
379
290d023e8306 (0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 348
diff changeset
   117
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   118
# monkeypatch argument parsing
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   119
# 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
   120
# 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
   121
def _kwdispatch_parse(ui, args):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   122
    '''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
   123
    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
   124
    kwtools['hgcmd'] = cmd
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   125
    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
   126
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   127
try:
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   128
    # 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
   129
    from mercurial import dispatch
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   130
    _dispatch_parse = dispatch._parse
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   131
    dispatch._parse = _kwdispatch_parse
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   132
except ImportError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   133
    try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   134
        # 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
   135
        _dispatch_parse = cmdutil.parse
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   136
        cmdutil.parse = _kwdispatch_parse
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   137
    except AttributeError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   138
        _dispatch_parse = commands.parse
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   139
        commands.parse = _kwdispatch_parse
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   140
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   141
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
   142
    # 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
   143
    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
   144
    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
   145
    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
   146
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
   147
    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
   148
    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
   149
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   150
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
   151
    '''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
   152
    # 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
   153
    # 67982d3ee76c added flags argument
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   154
    try:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   155
        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
   156
    except (AttributeError, TypeError):
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   157
        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
   158
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   159
def _normal(repo, files):
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   160
    '''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
   161
    # 6fd953d5faea introduced dirstate.normal()
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   162
    try:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   163
        for f in files:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   164
            repo.dirstate.normal(f)
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   165
    except AttributeError:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   166
        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
   167
278
232df68a0bcc cwd optional argument of _pathto to simplify _kwfwrite
Christian Ebert <blacktrash@gmx.net>
parents: 277
diff changeset
   168
def _pathto(repo, f, cwd=None):
264
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   169
    '''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
   170
    try:
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   171
        return repo.pathto(f, cwd)
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   172
    except AttributeError:
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   173
        return f
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   174
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   175
'''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
   176
if hasattr(cmdutil, 'match'):
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   177
    _defmatch = None
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   178
else:
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   179
    _defmatch = util.always
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   180
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   181
# 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
   182
# "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
   183
def _fancyopts(args, options, state):
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   184
    '''Fixed fancyopts from a9b7e425674f.'''
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   185
    namelist = []
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   186
    shortlist = ''
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   187
    argmap = {}
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   188
    defmap = {}
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   189
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   190
    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
   191
        # convert opts to getopt format
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   192
        oname = name
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   193
        name = name.replace('-', '_')
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   194
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   195
        argmap['-' + short] = argmap['--' + oname] = name
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   196
        defmap[name] = default
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
        # copy defaults to state
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   199
        if isinstance(default, list):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   200
            state[name] = default[:]
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   201
        elif callable(default):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   202
            print "whoa", name, default
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   203
            state[name] = None
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   204
        else:
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   205
            state[name] = default
59
94b26168791d Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents: 58
diff changeset
   206
312
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   207
        # does it take a parameter?
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   208
        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
   209
            if short: short += ':'
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   210
            if oname: oname += '='
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   211
        if short:
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   212
            shortlist += short
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   213
        if name:
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   214
            namelist.append(oname)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   215
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   216
    # parse arguments
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   217
    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
   218
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   219
    # transfer result to state
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   220
    for opt, val in opts:
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   221
        name = argmap[opt]
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   222
        t = type(defmap[name])
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   223
        if t is type(fancyopts):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   224
            state[name] = defmap[name](val)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   225
        elif t is type(1):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   226
            state[name] = int(val)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   227
        elif t is type(''):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   228
            state[name] = val
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   229
        elif t is type([]):
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   230
            state[name].append(val)
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   231
        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
   232
            state[name] = True
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   233
b92767fb8fb5 (0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   234
    # return unparsed args
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   235
    return args
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   236
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   237
fancyopts.fancyopts = _fancyopts
227
8ae160f24b9f cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents: 226
diff changeset
   238
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   239
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   240
class kwtemplater(object):
92
3c7c187e4001 Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents: 90
diff changeset
   241
    '''
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   242
    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
   243
    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
   244
    '''
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   245
    templates = {
204
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   246
        'Revision': '{node|short}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   247
        'Author': '{author|user}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   248
        'Date': '{date|utcdate}',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   249
        'RCSFile': '{file|basename},v',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   250
        'Source': '{root}/{file},v',
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   251
        '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
   252
        '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
   253
    }
2d089b691b31 Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   254
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   255
    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
   256
        self.ui = ui
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   257
        self.repo = repo
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   258
        self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   259
        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
   260
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   261
        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
   262
        if kwmaps: # override default templates
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   263
            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
   264
                      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
   265
            self.templates = dict(kwmaps)
254
474eccf2964f Map re.escape
Christian Ebert <blacktrash@gmx.net>
parents: 253
diff changeset
   266
        escaped = map(re.escape, self.templates.keys())
252
001902b60bdd String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents: 251
diff changeset
   267
        kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped)
001902b60bdd String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents: 251
diff changeset
   268
        self.re_kw = re.compile(kwpat)
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   269
366
b1105cc0982f (0.9.2compat) use templatefilters module if available; bail out in mq dir
Christian Ebert <blacktrash@gmx.net>
parents: 360
diff changeset
   270
        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
   271
        self.ct = self._changeset_templater()
233
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   272
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   273
    def _changeset_templater(self):
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   274
        '''Backwards compatible cmdutil.changeset_templater.'''
237
0a0049700af5 Document revisions of interface changes
Christian Ebert <blacktrash@gmx.net>
parents: 236
diff changeset
   275
        # 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
   276
        try:
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   277
            return cmdutil.changeset_templater(self.ui, self.repo,
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   278
                                               False, '', False)
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   279
        except TypeError:
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   280
            return cmdutil.changeset_templater(self.ui, self.repo,
e60fdc1990e3 Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net>
parents: 232
diff changeset
   281
                                               False, None, '', False)
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   282
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   283
    def getnode(self, path, fnode):
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   284
        '''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
   285
        # used by kwfilelog.read and kwexpand
477
03268523c017 (0.9.2compat) ddb8a222249b is backwards compatible
Christian Ebert <blacktrash@gmx.net>
parents: 464
diff changeset
   286
        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
   287
        return c.node()
303
46ccec2f325f (0.9.2compat) do not bother about debug templates
Christian Ebert <blacktrash@gmx.net>
parents: 299
diff changeset
   288
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   289
    def substitute(self, data, path, node, subfunc):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   290
        '''Replaces keywords in data with expanded template.'''
303
46ccec2f325f (0.9.2compat) do not bother about debug templates
Christian Ebert <blacktrash@gmx.net>
parents: 299
diff changeset
   291
        def kwsub(mobj):
46ccec2f325f (0.9.2compat) do not bother about debug templates
Christian Ebert <blacktrash@gmx.net>
parents: 299
diff changeset
   292
            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
   293
            self.ct.use_template(self.templates[kw])
303
46ccec2f325f (0.9.2compat) do not bother about debug templates
Christian Ebert <blacktrash@gmx.net>
parents: 299
diff changeset
   294
            self.ui.pushbuffer()
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   295
            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
   296
            return '$%s: %s $' % (kw, template_firstline(self.ui.popbuffer()))
303
46ccec2f325f (0.9.2compat) do not bother about debug templates
Christian Ebert <blacktrash@gmx.net>
parents: 299
diff changeset
   297
        return subfunc(kwsub, data)
255
c4f37735be9b Turn off debug while expanding
Christian Ebert <blacktrash@gmx.net>
parents: 254
diff changeset
   298
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   299
    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
   300
        '''Returns data with keywords expanded.'''
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   301
        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
   302
            changenode = self.getnode(path, node)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   303
            return self.substitute(data, path, changenode, self.re_kw.sub)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   304
        return data
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   305
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   306
    def iskwfile(self, path, islink):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   307
        '''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
   308
        and is not a symbolic link.
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   309
        Caveat: localrepository._link fails on Windows.'''
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   310
        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
   311
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   312
    def overwrite(self, node, expand, files):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   313
        '''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
   314
        # repo[changeid] introduced in f6c00b17387c
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   315
        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
   316
            try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   317
                ctx = self.repo[node]
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   318
            except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   319
                ctx = self.repo.changectx(node)
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   320
            mf = ctx.manifest()
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   321
            files = [f for f in ctx.files() if f in mf]
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   322
            notify = self.ui.debug
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   323
        else:                    # kwexpand/kwshrink
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   324
            try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   325
                ctx = self.repo['.']
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   326
            except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   327
                ctx = self.repo.changectx()
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   328
            mf = ctx.manifest()
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   329
            notify = self.ui.note
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   330
        if hasattr(ctx, 'flags'):
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   331
            # 51b0e799352f
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   332
            islink = lambda p: 'l' in ctx.flags(p)
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   333
        else:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   334
            islink = mf.linkf
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   335
        candidates = [f for f in files if self.iskwfile(f, islink)]
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   336
        if candidates:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   337
            self.restrict = True # do not expand when reading
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   338
            candidates.sort()
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   339
            action = expand and 'expanding' or 'shrinking'
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   340
            overwritten = []
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   341
            for f in candidates:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   342
                fp = self.repo.file(f)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   343
                data = fp.read(mf[f])
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   344
                if not textsafe(data):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   345
                    continue
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   346
                if expand:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   347
                    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
   348
                    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
   349
                                                  self.re_kw.subn)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   350
                else:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   351
                    found = self.re_kw.search(data)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   352
                if found:
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   353
                    notify(_('overwriting %s %s keywords\n') % (f, action))
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   354
                    self.repo.wwrite(f, data, mf.flags(f))
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   355
                    overwritten.append(f)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   356
            _normal(self.repo, overwritten)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   357
            self.restrict = False
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   358
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   359
    def shrinktext(self, text):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   360
        '''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
   361
        return self.re_kw.sub(r'$\1$', text)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   362
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   363
    def shrink(self, fname, text):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   364
        '''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
   365
        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
   366
            return self.shrinktext(text)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   367
        return text
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   368
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   369
    def shrinklines(self, fname, lines):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   370
        '''Returns lines with keyword substitutions removed.'''
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   371
        if self.matcher(fname):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   372
            text = ''.join(lines)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   373
            if 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).splitlines(True)
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   375
        return lines
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   376
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   377
    def wread(self, fname, data):
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   378
        '''If in restricted mode returns data read from wdir with
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   379
        keyword substitutions removed.'''
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   380
        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
   381
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   382
class kwfilelog(filelog.filelog):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   383
    '''
173
5329863fb64e filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 172
diff changeset
   384
    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
   385
    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
   386
    '''
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   387
    def __init__(self, opener, kwt, path):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   388
        super(kwfilelog, self).__init__(opener, path)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   389
        self.kwt = kwt
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   390
        self.path = path
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   391
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   392
    def read(self, node):
265
1b6b7835e3f9 Count keywords in a customized kwfilelog read method
Christian Ebert <blacktrash@gmx.net>
parents: 264
diff changeset
   393
        '''Expands keywords when reading filelog.'''
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   394
        data = super(kwfilelog, self).read(node)
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   395
        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
   396
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   397
    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
   398
        '''Removes keyword substitutions when adding to filelog.'''
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   399
        text = self.kwt.shrink(self.path, text)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   400
        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
   401
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   402
    def cmp(self, node, text):
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   403
        '''Removes keyword substitutions for comparison.'''
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   404
        text = self.kwt.shrink(self.path, text)
174
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   405
        if self.renamed(node):
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   406
            t2 = super(kwfilelog, self).read(node)
c5f655d5d8b4 Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents: 173
diff changeset
   407
            return t2 != text
248
2c222367dab3 Use revlog.cmp to avoid checking for rename twice
Christian Ebert <blacktrash@gmx.net>
parents: 246
diff changeset
   408
        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
   409
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   410
def _status(ui, repo, kwt, unknown, *pats, **opts):
295
5b4039ca6867 (0.9.2compat) update doc strings
Christian Ebert <blacktrash@gmx.net>
parents: 291
diff changeset
   411
    '''Bails out if [keyword] configuration is not active.
5b4039ca6867 (0.9.2compat) update doc strings
Christian Ebert <blacktrash@gmx.net>
parents: 291
diff changeset
   412
    Returns status of working directory.'''
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   413
    if kwt:
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   414
        try:
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   415
            # 0159b7a36184 ff.
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   416
            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
   417
            try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   418
                # 4faaa0535ea7
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   419
                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
   420
            except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   421
                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
   422
        except AttributeError:
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   423
            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
   424
            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
   425
    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
   426
        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
   427
    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
   428
275
cb2b11e63906 _overwrite method for kwrepo.commit, kwexpand, kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 274
diff changeset
   429
def _kwfwrite(ui, repo, expand, *pats, **opts):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   430
    '''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
   431
    if repo.dirstate.parents()[1] != nullid:
dd5eca480af6 (0.9.2compat) get some changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 453
diff changeset
   432
        raise util.Abort(_('outstanding uncommitted merge'))
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   433
    kwt = kwtools['templater']
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   434
    status = _status(ui, repo, kwt, False, *pats, **opts)
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   435
    modified, added, removed, deleted = status[:4]
280
2088e409d360 Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents: 278
diff changeset
   436
    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
   437
        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
   438
    wlock = lock = None
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   439
    try:
206
8d16b70359da Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents: 205
diff changeset
   440
        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
   441
        lock = repo.lock()
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   442
        kwt.overwrite(None, expand, status[6])
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   443
    finally:
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   444
        del wlock, lock
185
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   445
bc5cd6cf69bc Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents: 184
diff changeset
   446
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   447
def demo(ui, repo, *args, **opts):
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   448
    '''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
   449
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   450
    Show current, custom, or default keyword template maps and their
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   451
    expansions.
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   452
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   453
    Extend current configuration by specifying maps as arguments and
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   454
    optionally by reading from an additional hgrc file.
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   455
260
af9ddafeeb96 Unlowercase command help
Christian Ebert <blacktrash@gmx.net>
parents: 258
diff changeset
   456
    Override current keyword template maps with "default" option.
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   457
    '''
266
50ce25f8c676 Underscore prefixes only for names at top level, or compatibility wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 265
diff changeset
   458
    def demoitems(section, items):
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   459
        ui.write('[%s]\n' % section)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   460
        for k, v in items:
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   461
            ui.write('%s = %s\n' % (k, v))
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   462
183
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   463
    msg = 'hg keyword config and expansion example'
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   464
    kwstatus = 'current'
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   465
    fn = 'demo.txt'
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   466
    branchname = 'demobranch'
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   467
    tmpdir = tempfile.mkdtemp('', 'kwdemo.')
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   468
    ui.note(_('creating temporary repository at %s\n') % tmpdir)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   469
    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
   470
    ui.setconfig('keyword', fn, '')
322
b1ac738404f8 (0.9.2compat) get backwards compatible changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 312
diff changeset
   471
    if args or opts.get('rcfile'):
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   472
        kwstatus = 'custom'
322
b1ac738404f8 (0.9.2compat) get backwards compatible changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 312
diff changeset
   473
    if opts.get('rcfile'):
b1ac738404f8 (0.9.2compat) get backwards compatible changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 312
diff changeset
   474
        ui.readconfig(opts.get('rcfile'))
b1ac738404f8 (0.9.2compat) get backwards compatible changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 312
diff changeset
   475
    if opts.get('default'):
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   476
        kwstatus = 'default'
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   477
        kwmaps = kwtemplater.templates
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   478
        if ui.configitems('keywordmaps'):
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   479
            # override maps from optional rcfile
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 343
diff changeset
   480
            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
   481
                ui.setconfig('keywordmaps', k, v)
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   482
    elif args:
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   483
        # simulate hgrc parsing
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   484
        rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   485
        fp = repo.opener('hgrc', 'w')
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   486
        fp.writelines(rcmaps)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   487
        fp.close()
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   488
        ui.readconfig(repo.join('hgrc'))
322
b1ac738404f8 (0.9.2compat) get backwards compatible changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 312
diff changeset
   489
    if not opts.get('default'):
222
f956a8301c25 Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents: 221
diff changeset
   490
        kwmaps = dict(ui.configitems('keywordmaps')) or kwtemplater.templates
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   491
    reposetup(ui, repo)
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   492
    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
   493
        if k.endswith('keyword'):
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   494
            extension = '%s = %s' % (k, v)
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 207
diff changeset
   495
            break
610
5b87f3ea105a (0.9.2compat) kwdemo: get rid of subfunction and ease translation
Christian Ebert <blacktrash@gmx.net>
parents: 607
diff changeset
   496
    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
   497
    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
   498
    demoitems('keyword', ui.configitems('keyword'))
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 343
diff changeset
   499
    demoitems('keywordmaps', kwmaps.iteritems())
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   500
    keywords = '$' + '$\n$'.join(kwmaps.keys()) + '$\n'
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   501
    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
   502
    repo.add([fn])
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   503
    path = repo.wjoin(fn)
183
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   504
    ui.note(_('\n%s keywords written to %s:\n') % (kwstatus, path))
80fa00250c6d Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 182
diff changeset
   505
    ui.note(keywords)
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   506
    ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname))
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   507
    # silence branch command if not verbose
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   508
    quiet = ui.quiet
329
27f2e2126447 (0.9.2compat) obtain simplifications from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 322
diff changeset
   509
    ui.quiet = not ui.verbose
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   510
    commands.branch(ui, repo, branchname)
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   511
    ui.quiet = quiet
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   512
    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
   513
        if name.split('.', 1)[0].find('commit') > -1:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   514
            repo.ui.setconfig('hooks', name, '')
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   515
    ui.note(_('unhooked all commit hooks\n'))
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   516
    ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   517
    repo.commit(text=msg)
519
22a306a7b411 (0.9.2compat) do not use builtin format
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   518
    fmt = ui.verbose and ' in %s' % path or ''
610
5b87f3ea105a (0.9.2compat) kwdemo: get rid of subfunction and ease translation
Christian Ebert <blacktrash@gmx.net>
parents: 607
diff changeset
   519
    ui.status(_('\n\t%s keywords expanded%s\n') % (kwstatus, fmt))
205
f2d2e36053f9 kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents: 204
diff changeset
   520
    ui.write(repo.wread(fn))
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   521
    ui.debug(_('\nremoving temporary repository %s\n') % tmpdir)
251
b37f2f065a9c Ignore errors when removing temp dir in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 250
diff changeset
   522
    shutil.rmtree(tmpdir, ignore_errors=True)
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   523
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   524
def expand(ui, repo, *pats, **opts):
574
9353633b1611 (0.9.2compat) improve English; from stable
Christian Ebert <blacktrash@gmx.net>
parents: 519
diff changeset
   525
    '''expand keywords in the working directory
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   526
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   527
    Run after (re)enabling keyword expansion.
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   528
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   529
    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
   530
    '''
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   531
    # 3rd argument sets expansion to True
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   532
    _kwfwrite(ui, repo, True, *pats, **opts)
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   533
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   534
def files(ui, repo, *pats, **opts):
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   535
    '''show files configured for keyword expansion
594
748c766e6424 (0.9.2compat) improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 589
diff changeset
   536
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   537
    List which files in the working directory are matched by the
594
748c766e6424 (0.9.2compat) improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 589
diff changeset
   538
    [keyword] configuration patterns.
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   539
594
748c766e6424 (0.9.2compat) improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 589
diff changeset
   540
    Useful to prevent inadvertent keyword expansion and to speed up
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   541
    execution by including only files that are actual candidates
594
748c766e6424 (0.9.2compat) improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 589
diff changeset
   542
    for expansion.
748c766e6424 (0.9.2compat) improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents: 589
diff changeset
   543
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   544
    See "hg help keyword" on how to construct patterns both for
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   545
    inclusion and exclusion of files.
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   546
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   547
    Use -u/--untracked to list untracked files as well.
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   548
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   549
    With -a/--all and -v/--verbose the codes used to show the status
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   550
    of files are:
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   551
    K = keyword expansion candidate
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   552
    k = keyword expansion candidate (untracked)
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   553
    I = ignored
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   554
    i = ignored (untracked)
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   555
    '''
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   556
    kwt = kwtools['templater']
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   557
    status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts)
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   558
    modified, added, removed, deleted, unknown, ignored, clean = status
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   559
    try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   560
        # f67d1468ac50
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   561
        files = util.sort(modified + added + clean)
478
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   562
    except AttributeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   563
        files = modified + added + clean
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   564
        files.sort()
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   565
    try:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   566
        # f6c00b17387c
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   567
        wctx = repo[None]
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   568
    except TypeError:
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   569
        wctx = repo.workingctx()
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   570
    if hasattr(wctx, 'flags'):
a3b8a3a03cc7 (0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net>
parents: 477
diff changeset
   571
        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
   572
    elif hasattr(wctx, 'fileflags'):
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   573
        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
   574
    else:
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   575
        mf = wctx.manifest()
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 388
diff changeset
   576
        islink = mf.linkf
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   577
    kwfiles = [f for f in files if kwt.iskwfile(f, islink)]
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   578
    kwuntracked = [f for f in unknown if kwt.iskwfile(f, islink)]
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   579
    cwd = pats and repo.getcwd() or ''
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   580
    kwfstats = (not opts.get('ignore') and
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   581
                (('K', kwfiles), ('k', kwuntracked),) or ())
322
b1ac738404f8 (0.9.2compat) get backwards compatible changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 312
diff changeset
   582
    if opts.get('all') or opts.get('ignore'):
598
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   583
        kwfstats += (('I', [f for f in files if f not in kwfiles]),
2b1565ab7db3 (0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents: 594
diff changeset
   584
                     ('i', [f for f in unknown if f not in kwuntracked]),)
299
50bb27cfd926 (0.9.2compat) kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents: 295
diff changeset
   585
    for char, filenames in kwfstats:
519
22a306a7b411 (0.9.2compat) do not use builtin format
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   586
        fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
299
50bb27cfd926 (0.9.2compat) kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents: 295
diff changeset
   587
        for f in filenames:
519
22a306a7b411 (0.9.2compat) do not use builtin format
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   588
            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
   589
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   590
def shrink(ui, repo, *pats, **opts):
574
9353633b1611 (0.9.2compat) improve English; from stable
Christian Ebert <blacktrash@gmx.net>
parents: 519
diff changeset
   591
    '''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
   592
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   593
    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
   594
    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
   595
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   596
    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
   597
    '''
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   598
    # 3rd argument sets expansion to False
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   599
    _kwfwrite(ui, repo, False, *pats, **opts)
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   600
42
ba000e29ecf3 Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents: 41
diff changeset
   601
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   602
def reposetup(ui, repo):
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   603
    '''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
   604
    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
   605
    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
   606
    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
   607
    keyword substitutions.
575
fdb3a5bf2c5c (0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net>
parents: 574
diff changeset
   608
    Monkeypatches patch and webcommands.'''
64
4cd7b993c5f8 Imports specific to functions
Christian Ebert <blacktrash@gmx.net>
parents: 63
diff changeset
   609
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   610
    try:
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   611
        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
   612
            or '.hg' in repo.root.split(os.sep)
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   613
            or repo._url.startswith('bundle:')):
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   614
            return
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   615
    except AttributeError:
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   616
        pass
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   617
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   618
    inc, exc = [], ['.hg*']
261
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   619
    for pat, opt in ui.configitems('keyword'):
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   620
        if opt != 'ignore':
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   621
            inc.append(pat)
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   622
        else:
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   623
            exc.append(pat)
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   624
    if not inc:
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   625
        return
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   626
417
e089672ef9b4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 414
diff changeset
   627
    kwtools['templater'] = kwt = kwtemplater(ui, repo, inc, exc)
261
28e64bebc298 Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents: 260
diff changeset
   628
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   629
    class kwrepo(repo.__class__):
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   630
        def file(self, f):
33
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   631
            if f[0] == '/':
ebb39c6a1476 Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   632
                f = f[1:]
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   633
            return kwfilelog(self.sopener, kwt, f)
359
4ac7e51443fe (0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Christian Ebert <blacktrash@gmx.net>
parents: 352
diff changeset
   634
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   635
        def wread(self, filename):
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   636
            data = super(kwrepo, self).wread(filename)
411
b1a7f5eddeba (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 402
diff changeset
   637
            return kwt.wread(filename, data)
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   638
230
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   639
        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
   640
                    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
   641
            '''Private commit wrapper for backwards compatibility.'''
9fe9a9839387 Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents: 229
diff changeset
   642
            try:
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   643
                return super(kwrepo,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   644
                             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
   645
                                          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
   646
                                          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
   647
                                          force_editor=force_editor,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   648
                                          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
   649
            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
   650
                try:
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   651
                    return super(kwrepo,
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   652
                                 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
   653
                                              user=user, date=date,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   654
                                              match=match, force=force,
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   655
                                              force_editor=force_editor,
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   656
                                              p1=p1, p2=p2, extra=extra,
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   657
                                              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
   658
                except TypeError:
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   659
                    return super(kwrepo,
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   660
                                 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
   661
                                              user=user, date=date,
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   662
                                              match=match, force=force,
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   663
                                              force_editor=force_editor,
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   664
                                              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
   665
176
3aed363c9eaf Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net>
parents: 175
diff changeset
   666
        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
   667
                   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
   668
                   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
   669
                   empty_ok=False):
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   670
            # (w)lock arguments removed in 126f527b3ba3
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   671
            # 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
   672
            # use private _(w)lock for deletion
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   673
            _lock = lock
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   674
            _wlock = wlock
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   675
            del wlock, lock
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   676
            _p1 = _p2 = None
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   677
            try:
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   678
                if not _wlock:
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   679
                    _wlock = self.wlock()
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   680
                if not _lock:
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   681
                    _lock = self.lock()
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   682
                # store and postpone commit hooks
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 343
diff changeset
   683
                commithooks = {}
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   684
                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
   685
                    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
   686
                        commithooks[name] = cmd
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   687
                        ui.setconfig('hooks', name, '')
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   688
                if commithooks:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   689
                    # 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
   690
                    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
   691
                        _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
   692
                    else:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   693
                        _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
   694
                    _p1 = hex(_p1)
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   695
                    if _p2 == nullid:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   696
                        _p2 = ''
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   697
                    else:
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   698
                        _p2 = hex(_p2)
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   699
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   700
                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
   701
                                 _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
   702
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   703
                # restore commit hooks
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 343
diff changeset
   704
                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
   705
                    ui.setconfig('hooks', name, cmd)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   706
                if n is not None:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   707
                    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
   708
                    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
   709
                return n
143
3485b0ef99c4 Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents: 142
diff changeset
   710
            finally:
229
8e5ba738e36d Remove spurious NameError checking for locks
Christian Ebert <blacktrash@gmx.net>
parents: 228
diff changeset
   711
                del _wlock, _lock
129
15e8cd7f5295 Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 128
diff changeset
   712
157
64dce6787d82 Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents: 98
diff changeset
   713
    repo.__class__ = kwrepo
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   714
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   715
    # monkeypatches
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   716
    try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   717
        # 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
   718
        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
   719
            '''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
   720
            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
   721
            try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   722
                patchfile_init(self, ui, fname, missing)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   723
            except TypeError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   724
                # "missing" arg added in e90e72c6b4c7
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   725
                patchfile_init(self, ui, fname)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   726
            self.lines = kwt.shrinklines(self.fname, self.lines)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   727
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   728
        patchfile_init = patch.patchfile.__init__
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   729
        patch.patchfile.__init__ = kwpatchfile_init
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   730
    except AttributeError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   731
        pass
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   732
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   733
    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
   734
                 fp=None, changes=None, opts=None):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   735
        # 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
   736
        if node2 is not None:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   737
            kwt.matcher = util.never
458
dd5eca480af6 (0.9.2compat) get some changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 453
diff changeset
   738
        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
   739
            kwt.restrict = True
453
0804ead55da7 Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net>
parents: 444
diff changeset
   740
        try:
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   741
            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
   742
                       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
   743
        except TypeError:
464
509fbcac51c7 (0.9.2compat) secure keyword arguments in backwards compatible wrappers
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   744
            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
   745
                       changes=changes, opts=opts)
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   746
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   747
    patch_diff = patch.diff
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   748
    patch.diff = kw_diff
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   749
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   750
    try:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   751
        from mercurial.hgweb import webcommands
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   752
        def kwweb_annotate(web, req, tmpl):
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   753
            '''Wraps webcommands.annotate turning off keyword expansion.'''
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   754
            kwt.matcher = util.never
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   755
            return webcommands_annotate(web, req, tmpl)
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   756
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   757
        def kwweb_changeset(web, req, tmpl):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   758
            '''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
   759
            kwt.matcher = util.never
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   760
            return webcommands_changeset(web, req, tmpl)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   761
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   762
        def kwweb_filediff(web, req, tmpl):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   763
            '''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
   764
            kwt.matcher = util.never
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   765
            return webcommands_filediff(web, req, tmpl)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   766
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   767
        webcommands_annotate = webcommands.annotate
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   768
        webcommands_changeset = webcommands.changeset
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   769
        webcommands_filediff = webcommands.filediff
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   770
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   771
        webcommands.annotate = kwweb_annotate
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   772
        webcommands.changeset = webcommands.rev = kwweb_changeset
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   773
        webcommands.filediff = webcommands.diff = kwweb_filediff
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   774
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   775
    except ImportError:
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   776
        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
   777
        def kwweb_do_annotate(self, req):
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   778
            kwt.matcher = util.never
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   779
            hgweb_do_annotate(self, req)
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   780
444
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   781
        def kwweb_do_changeset(self, req):
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
            hgweb_do_changeset(self, req)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   784
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   785
        def kwweb_do_filediff(self, req):
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   786
            kwt.matcher = util.never
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   787
            hgweb_do_filediff(self, req)
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   788
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   789
        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
   790
        hgweb_do_changeset = hgweb.do_changeset
987648c1ff69 (0.9.2compat) backwards compatible changes from default
Christian Ebert <blacktrash@gmx.net>
parents: 435
diff changeset
   791
        hgweb_do_filediff = hgweb.do_filediff
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   792
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   793
        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
   794
        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
   795
        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
   796
81
fd5d3a974ea7 Implement self initializing pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents: 80
diff changeset
   797
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   798
cmdtable = {
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   799
    'kwdemo':
181
8019554adbb2 kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents: 180
diff changeset
   800
        (demo,
187
a01a0392f648 kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents: 186
diff changeset
   801
         [('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
   802
          ('f', 'rcfile', '', _('read maps from rcfile'))],
283
071bfbd482b4 Respect Mercurial conventions in kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents: 282
diff changeset
   803
         _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')),
285
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   804
    'kwexpand': (expand, commands.walkopts,
0aa02d36b3b1 Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents: 284
diff changeset
   805
                 _('hg kwexpand [OPTION]... [FILE]...')),
264
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   806
    'kwfiles':
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   807
        (files,
270
371ce7fe5f13 kwfiles: change option "ignored" to "ignore", add option "untracked"
Christian Ebert <blacktrash@gmx.net>
parents: 269
diff changeset
   808
         [('a', 'all', None, _('show keyword status flags of all files')),
371ce7fe5f13 kwfiles: change option "ignored" to "ignore", add option "untracked"
Christian Ebert <blacktrash@gmx.net>
parents: 269
diff changeset
   809
          ('i', 'ignore', None, _('show files excluded from expansion')),
371ce7fe5f13 kwfiles: change option "ignored" to "ignore", add option "untracked"
Christian Ebert <blacktrash@gmx.net>
parents: 269
diff changeset
   810
          ('u', 'untracked', None, _('additionally show untracked files')),
264
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   811
         ] + commands.walkopts,
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   812
         _('hg kwfiles [OPTION]... [FILE]...')),
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   813
    'kwshrink': (shrink, commands.walkopts,
7c637046c0e2 walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents: 263
diff changeset
   814
                 _('hg kwshrink [OPTION]... [FILE]...')),
178
4a27c306c6a2 Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents: 177
diff changeset
   815
}