author | Christian Ebert <blacktrash@gmx.net> |
Wed, 30 Jan 2008 01:24:10 +0100 | |
changeset 358 | 3eff5c04034f |
parent 357 | 7b165e66b81b |
child 364 | d935536a6abc |
permissions | -rw-r--r-- |
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 |
# |
335
9f78d508764b
Fix some doc strings; update copyright
Christian Ebert <blacktrash@gmx.net>
parents:
331
diff
changeset
|
3 |
# Copyright 2007, 2008 Christian Ebert <blacktrash@gmx.net> |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
4 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
5 |
# This software may be used and distributed according to the terms |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
6 |
# of the GNU General Public License, incorporated herein by reference. |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
7 |
# |
82
9bf0f7db5928
Add keyword; comment backwards compatible import
Christian Ebert <blacktrash@gmx.net>
parents:
81
diff
changeset
|
8 |
# $Id$ |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
9 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
10 |
# Keyword expansion hack against the grain of a DSCM |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
11 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
12 |
# There are many good reasons why this is not needed in a distributed |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
13 |
# SCM, still it may be useful in very small projects based on single |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
14 |
# files (like LaTeX packages), that are mostly addressed to an audience |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
15 |
# not running a version control system. |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
16 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
17 |
# For in-depth discussion refer to |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
18 |
# <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>. |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
19 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
20 |
# Keyword expansion is based on Mercurial's changeset template mappings. |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
21 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
22 |
# Binary files are not touched. |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
23 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
24 |
# Setup in hgrc: |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
25 |
# |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
26 |
# [extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
27 |
# # enable extension |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
28 |
# keyword = /full/path/to/hgkw/keyword.py |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
29 |
# # or, if script in canonical hgext folder: |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
30 |
# # hgext.keyword = |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
31 |
# |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
32 |
# Files to act upon/ignore are specified in the [keyword] section. |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
33 |
# Customized keyword template mappings in the [keywordmaps] section. |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
34 |
# |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
35 |
# Run "hg help keyword" and "hg kwdemo" to get info on configuration. |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
36 |
|
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
37 |
'''keyword expansion in local repositories |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
38 |
|
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
39 |
This extension expands RCS/CVS-like or self-customized $Keywords$ |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
40 |
in tracked text files selected by your configuration. |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
41 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
42 |
Keywords are only expanded in local repositories and not stored in |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
43 |
the change history. The mechanism can be regarded as a convenience |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
44 |
for the current user or for archive distribution. |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
45 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
46 |
Configuration is done in the [keyword] and [keywordmaps] sections |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
47 |
of hgrc files. |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
48 |
|
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
49 |
Example: |
146
df9de07ce002
Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents:
145
diff
changeset
|
50 |
|
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
51 |
[keyword] |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
52 |
# expand keywords in every python file except those matching "x*" |
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
53 |
**.py = |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
54 |
x* = ignore |
146
df9de07ce002
Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents:
145
diff
changeset
|
55 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
56 |
Note: the more specific you are in your filename patterns |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
57 |
the less you lose speed in huge repos. |
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
58 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
59 |
For [keywordmaps] template mapping and expansion demonstration and |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
60 |
control run "hg kwdemo". |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
61 |
|
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
62 |
An additional date template filter {date|utcdate} is provided. |
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
63 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
64 |
The default template mappings (view with "hg kwdemo -d") can be replaced |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
65 |
with customized keywords and templates. |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
66 |
Again, run "hg kwdemo" to control the results of your config changes. |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
67 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
68 |
Before changing/disabling active keywords, run "hg kwshrink" to avoid |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
69 |
the risk of inadvertedly storing expanded keywords in the change history. |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
70 |
|
211
110c76a94d1c
help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents:
210
diff
changeset
|
71 |
To force expansion after enabling it, or a configuration change, run |
110c76a94d1c
help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents:
210
diff
changeset
|
72 |
"hg kwexpand". |
110c76a94d1c
help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents:
210
diff
changeset
|
73 |
|
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
74 |
Also, when committing with the record extension or using mq's qrecord, be aware |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
75 |
that keywords cannot be updated. Again, run "hg kwexpand" on the files in |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
76 |
question to update keyword expansions after all changes have been checked in. |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
77 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
78 |
Expansions spanning more than one line and incremental expansions, |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
79 |
like CVS' $Log$, are not supported. A keyword template map |
201
e826c3cdc52d
Make sure there are no newlines in expansion
Christian Ebert <blacktrash@gmx.net>
parents:
192
diff
changeset
|
80 |
"Log = {desc}" expands to the first line of the changeset description. |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
81 |
''' |
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
82 |
|
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
83 |
from mercurial import commands, cmdutil, context, filelog, localrepo |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
84 |
from mercurial import patch, revlog, templater, util |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
85 |
from mercurial.node import * |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
86 |
from mercurial.i18n import _ |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
87 |
import re, shutil, tempfile, time |
227
8ae160f24b9f
cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Christian Ebert <blacktrash@gmx.net>
parents:
226
diff
changeset
|
88 |
|
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
89 |
commands.optionalrepo += ' kwdemo' |
59
94b26168791d
Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents:
58
diff
changeset
|
90 |
|
93
9f70f953dd3b
Clean keyword arg assignment in kwfilelog.add; rename utc() to utcdate()
Christian Ebert <blacktrash@gmx.net>
parents:
92
diff
changeset
|
91 |
def utcdate(date): |
92
3c7c187e4001
Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents:
90
diff
changeset
|
92 |
'''Returns hgdate in cvs-like UTC format.''' |
93
9f70f953dd3b
Clean keyword arg assignment in kwfilelog.add; rename utc() to utcdate()
Christian Ebert <blacktrash@gmx.net>
parents:
92
diff
changeset
|
93 |
return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0])) |
92
3c7c187e4001
Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents:
90
diff
changeset
|
94 |
|
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
95 |
class kwtemplater(object): |
92
3c7c187e4001
Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents:
90
diff
changeset
|
96 |
''' |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
97 |
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
|
98 |
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
|
99 |
''' |
222
f956a8301c25
Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents:
221
diff
changeset
|
100 |
templates = { |
204
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
101 |
'Revision': '{node|short}', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
102 |
'Author': '{author|user}', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
103 |
'Date': '{date|utcdate}', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
104 |
'RCSFile': '{file|basename},v', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
105 |
'Source': '{root}/{file},v', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
106 |
'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
|
107 |
'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
|
108 |
} |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
109 |
|
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
110 |
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
|
111 |
self.ui = ui |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
112 |
self.repo = repo |
310
574128f982a2
Reintroduce _iskwfile with link method as argument
Christian Ebert <blacktrash@gmx.net>
parents:
309
diff
changeset
|
113 |
self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1] |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
114 |
self.ctx = None |
204
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
115 |
|
222
f956a8301c25
Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents:
221
diff
changeset
|
116 |
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
|
117 |
if kwmaps: # override default templates |
22e08d0f25dc
List comprehension instead of loop to create ui template dictionary
Christian Ebert <blacktrash@gmx.net>
parents:
252
diff
changeset
|
118 |
kwmaps = [(k, templater.parsestring(v, quoted=False)) |
22e08d0f25dc
List comprehension instead of loop to create ui template dictionary
Christian Ebert <blacktrash@gmx.net>
parents:
252
diff
changeset
|
119 |
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
|
120 |
self.templates = dict(kwmaps) |
254 | 121 |
escaped = map(re.escape, self.templates.keys()) |
252
001902b60bdd
String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents:
251
diff
changeset
|
122 |
kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped) |
001902b60bdd
String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents:
251
diff
changeset
|
123 |
self.re_kw = re.compile(kwpat) |
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
124 |
|
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
125 |
templater.common_filters['utcdate'] = utcdate |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
126 |
self.ct = cmdutil.changeset_templater(self.ui, self.repo, |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
127 |
False, '', False) |
235
baef9dcfb219
Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents:
234
diff
changeset
|
128 |
|
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
129 |
def substitute(self, path, data, node, subfunc): |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
130 |
'''Obtains file's changenode if node not given, |
330
c5bba07dadd5
fix: only set general changenode for kwtemplater when committing
Christian Ebert <blacktrash@gmx.net>
parents:
328
diff
changeset
|
131 |
and calls given substitution function.''' |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
132 |
if node is None: |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
133 |
# kwrepo.wwrite except when overwriting on commit |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
134 |
if self.ctx is None: |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
135 |
self.ctx = self.repo.changectx() |
358
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
136 |
try: |
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
137 |
fnode = self.ctx.filenode(path) |
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
138 |
fl = self.repo.file(path) |
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
139 |
c = context.filectx(self.repo, path, fileid=fnode, filelog=fl) |
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
140 |
node = c.node() |
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
141 |
except revlog.LookupError: |
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
142 |
# eg: convert |
3eff5c04034f
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net>
parents:
357
diff
changeset
|
143 |
return subfunc == self.re_kw.sub and data or (data, None) |
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
144 |
elif subfunc == self.re_kw.sub: |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
145 |
# hg kwcat using kwfilelog.read |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
146 |
c = context.filectx(self.repo, path, fileid=node) |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
147 |
node = c.node() |
301
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
148 |
|
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
149 |
def kwsub(mobj): |
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
150 |
'''Substitutes keyword using corresponding template.''' |
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
151 |
kw = mobj.group(1) |
306
78b80b2511de
Rename kwtemplater.t to kwtemplater.ct
Christian Ebert <blacktrash@gmx.net>
parents:
304
diff
changeset
|
152 |
self.ct.use_template(self.templates[kw]) |
301
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
153 |
self.ui.pushbuffer() |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
154 |
self.ct.show(changenode=node, root=self.repo.root, file=path) |
301
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
155 |
return '$%s: %s $' % (kw, templater.firstline(self.ui.popbuffer())) |
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
156 |
|
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
157 |
return subfunc(kwsub, data) |
255
c4f37735be9b
Turn off debug while expanding
Christian Ebert <blacktrash@gmx.net>
parents:
254
diff
changeset
|
158 |
|
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
159 |
def expand(self, path, data, node): |
186
c1b7b1d052de
Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents:
185
diff
changeset
|
160 |
'''Returns data with keywords expanded.''' |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
161 |
if util.binary(data): |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
162 |
return data |
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
163 |
return self.substitute(path, data, node, self.re_kw.sub) |
134
f869c65156f7
2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
133
diff
changeset
|
164 |
|
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
165 |
def process(self, path, data, expand, ctx, node): |
186
c1b7b1d052de
Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents:
185
diff
changeset
|
166 |
'''Returns a tuple: data, count. |
335
9f78d508764b
Fix some doc strings; update copyright
Christian Ebert <blacktrash@gmx.net>
parents:
331
diff
changeset
|
167 |
Count is number of keywords/keyword substitutions, |
9f78d508764b
Fix some doc strings; update copyright
Christian Ebert <blacktrash@gmx.net>
parents:
331
diff
changeset
|
168 |
telling caller whether to act on file containing data.''' |
186
c1b7b1d052de
Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents:
185
diff
changeset
|
169 |
if util.binary(data): |
c1b7b1d052de
Avoid global vars by passing opt args to kwrepo.file
Christian Ebert <blacktrash@gmx.net>
parents:
185
diff
changeset
|
170 |
return data, None |
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
171 |
if expand: |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
172 |
self.ctx = ctx |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
173 |
return self.substitute(path, data, node, self.re_kw.subn) |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
174 |
return self.re_kw.subn(r'$\1$', data) |
265
1b6b7835e3f9
Count keywords in a customized kwfilelog read method
Christian Ebert <blacktrash@gmx.net>
parents:
264
diff
changeset
|
175 |
|
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
176 |
def shrink(self, data): |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
177 |
'''Returns text with all keyword substitutions removed.''' |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
178 |
if util.binary(data): |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
179 |
return data |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
180 |
return self.re_kw.sub(r'$\1$', data) |
92
3c7c187e4001
Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents:
90
diff
changeset
|
181 |
|
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
182 |
class kwfilelog(filelog.filelog): |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
183 |
''' |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
184 |
Subclass of filelog to hook into its read method for kwcat. |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
185 |
''' |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
186 |
def __init__(self, opener, path, kwt): |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
187 |
super(kwfilelog, self).__init__(opener, path) |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
188 |
self._kwt = kwt |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
189 |
self._path = path |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
190 |
|
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
191 |
def read(self, node): |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
192 |
'''Expands keywords when reading filelog.''' |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
193 |
data = super(kwfilelog, self).read(node) |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
194 |
return self._kwt.expand(self._path, data, node) |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
195 |
|
317
b18631f0dbdc
Turn patch.patchfile.__init__ monkeypatch into a wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
315
diff
changeset
|
196 |
# store original patch.patchfile.__init__ |
b18631f0dbdc
Turn patch.patchfile.__init__ monkeypatch into a wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
315
diff
changeset
|
197 |
_patchfile_init = patch.patchfile.__init__ |
315
c1ec4ffd1279
Avoid import and merge conflicts caused by expanded keywords
Christian Ebert <blacktrash@gmx.net>
parents:
314
diff
changeset
|
198 |
|
c1ec4ffd1279
Avoid import and merge conflicts caused by expanded keywords
Christian Ebert <blacktrash@gmx.net>
parents:
314
diff
changeset
|
199 |
|
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
200 |
def _iskwfile(f, link, kwt): |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
201 |
return not link(f) and kwt.matcher(f) |
310
574128f982a2
Reintroduce _iskwfile with link method as argument
Christian Ebert <blacktrash@gmx.net>
parents:
309
diff
changeset
|
202 |
|
314
d9f84b36de26
Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net>
parents:
310
diff
changeset
|
203 |
def _status(ui, repo, *pats, **opts): |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
204 |
'''Bails out if [keyword] configuration is not active. |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
205 |
Returns status of working directory.''' |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
206 |
if hasattr(repo, '_kwt'): |
280
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
278
diff
changeset
|
207 |
files, match, anypats = cmdutil.matchpats(repo, pats, opts) |
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
278
diff
changeset
|
208 |
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
|
209 |
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
|
210 |
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
|
211 |
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
|
212 |
|
314
d9f84b36de26
Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net>
parents:
310
diff
changeset
|
213 |
def _overwrite(ui, repo, node=None, expand=True, files=None): |
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
214 |
'''Overwrites selected files expanding/shrinking keywords.''' |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
215 |
ctx = repo.changectx(node) |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
216 |
mf = ctx.manifest() |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
217 |
if node is not None: |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
218 |
# commit |
344
1346cc5a6461
Prefer item in dict over dict.has_key(item)
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
219 |
files = [f for f in ctx.files() if f in mf] |
330
c5bba07dadd5
fix: only set general changenode for kwtemplater when committing
Christian Ebert <blacktrash@gmx.net>
parents:
328
diff
changeset
|
220 |
notify = ui.debug |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
221 |
else: |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
222 |
# kwexpand/kwshrink |
330
c5bba07dadd5
fix: only set general changenode for kwtemplater when committing
Christian Ebert <blacktrash@gmx.net>
parents:
328
diff
changeset
|
223 |
notify = ui.note |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
224 |
candidates = [f for f in files if _iskwfile(f, mf.linkf, repo._kwt)] |
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
225 |
if candidates: |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
226 |
candidates.sort() |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
227 |
action = expand and 'expanding' or 'shrinking' |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
228 |
for f in candidates: |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
229 |
data, kwfound = repo._wreadkwct(f, expand, ctx, node) |
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
230 |
if kwfound: |
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
231 |
notify(_('overwriting %s %s keywords\n') % (f, action)) |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
232 |
repo.wwrite(f, data, mf.flags(f), overwrite=True) |
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
233 |
repo.dirstate.normal(f) |
275
cb2b11e63906
_overwrite method for kwrepo.commit, kwexpand, kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
274
diff
changeset
|
234 |
|
cb2b11e63906
_overwrite method for kwrepo.commit, kwexpand, kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
274
diff
changeset
|
235 |
def _kwfwrite(ui, repo, expand, *pats, **opts): |
cb2b11e63906
_overwrite method for kwrepo.commit, kwexpand, kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
274
diff
changeset
|
236 |
'''Selects files and passes them to _overwrite.''' |
314
d9f84b36de26
Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net>
parents:
310
diff
changeset
|
237 |
status = _status(ui, repo, *pats, **opts) |
280
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
278
diff
changeset
|
238 |
modified, added, removed, deleted, unknown, ignored, clean = status |
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
278
diff
changeset
|
239 |
if modified or added or removed or deleted: |
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
278
diff
changeset
|
240 |
raise util.Abort(_('outstanding uncommitted changes in given files')) |
209
430837dbe7f4
Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents:
208
diff
changeset
|
241 |
wlock = lock = None |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
242 |
try: |
206
8d16b70359da
Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents:
205
diff
changeset
|
243 |
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
|
244 |
lock = repo.lock() |
314
d9f84b36de26
Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net>
parents:
310
diff
changeset
|
245 |
_overwrite(ui, repo, expand=expand, files=clean) |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
246 |
finally: |
209
430837dbe7f4
Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents:
208
diff
changeset
|
247 |
del wlock, lock |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
248 |
|
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
249 |
def cat(ui, repo, file1, *pats, **opts): |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
250 |
'''output the current or given revision of files expanding keywords |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
251 |
|
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
252 |
Print the specified files as they were at the given revision. |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
253 |
If no revision is given, the parent of the working directory is used, |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
254 |
or tip if no revision is checked out. |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
255 |
|
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
256 |
Output may be to a file, in which case the name of the file is |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
257 |
given using a format string. The formatting rules are the same as |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
258 |
for the export command, with the following additions: |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
259 |
|
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
260 |
%s basename of file being printed |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
261 |
%d dirname of file being printed, or '.' if in repo root |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
262 |
%p root-relative path name of file being printed |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
263 |
''' |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
264 |
try: |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
265 |
repo.file = repo._kwfile |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
266 |
except AttributeError: |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
267 |
pass |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
268 |
commands.cat(ui, repo, file1, *pats, **opts) |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
269 |
|
187
a01a0392f648
kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents:
186
diff
changeset
|
270 |
def demo(ui, repo, *args, **opts): |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
271 |
'''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
|
272 |
|
260
af9ddafeeb96
Unlowercase command help
Christian Ebert <blacktrash@gmx.net>
parents:
258
diff
changeset
|
273 |
Show current, custom, or default keyword template maps |
af9ddafeeb96
Unlowercase command help
Christian Ebert <blacktrash@gmx.net>
parents:
258
diff
changeset
|
274 |
and their expansion. |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
275 |
|
260
af9ddafeeb96
Unlowercase command help
Christian Ebert <blacktrash@gmx.net>
parents:
258
diff
changeset
|
276 |
Extend current configuration by specifying maps as arguments |
af9ddafeeb96
Unlowercase command help
Christian Ebert <blacktrash@gmx.net>
parents:
258
diff
changeset
|
277 |
and optionally by reading from an additional hgrc file. |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
278 |
|
260
af9ddafeeb96
Unlowercase command help
Christian Ebert <blacktrash@gmx.net>
parents:
258
diff
changeset
|
279 |
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
|
280 |
''' |
266
50ce25f8c676
Underscore prefixes only for names at top level, or compatibility wrappers
Christian Ebert <blacktrash@gmx.net>
parents:
265
diff
changeset
|
281 |
def demostatus(stat): |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
282 |
ui.status(_('\n\t%s\n') % stat) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
283 |
|
266
50ce25f8c676
Underscore prefixes only for names at top level, or compatibility wrappers
Christian Ebert <blacktrash@gmx.net>
parents:
265
diff
changeset
|
284 |
def demoitems(section, items): |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
285 |
ui.write('[%s]\n' % section) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
286 |
for k, v in items: |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
287 |
ui.write('%s = %s\n' % (k, v)) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
288 |
|
183
80fa00250c6d
Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents:
182
diff
changeset
|
289 |
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
|
290 |
kwstatus = 'current' |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
291 |
fn = 'demo.txt' |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
292 |
branchname = 'demobranch' |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
293 |
tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
294 |
ui.note(_('creating temporary repo at %s\n') % tmpdir) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
295 |
repo = localrepo.localrepository(ui, path=tmpdir, create=True) |
184
30b3e6a09a9d
Set ui to repo.ui at once where needed for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents:
183
diff
changeset
|
296 |
ui.setconfig('keyword', fn, '') |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
297 |
if args or opts.get('rcfile'): |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
298 |
kwstatus = 'custom' |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
299 |
if opts.get('rcfile'): |
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
300 |
ui.readconfig(opts.get('rcfile')) |
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
301 |
if opts.get('default'): |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
302 |
kwstatus = 'default' |
222
f956a8301c25
Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents:
221
diff
changeset
|
303 |
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
|
304 |
if ui.configitems('keywordmaps'): |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
305 |
# override maps from optional rcfile |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
306 |
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
|
307 |
ui.setconfig('keywordmaps', k, v) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
308 |
elif args: |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
309 |
# simulate hgrc parsing |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
310 |
rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
311 |
fp = repo.opener('hgrc', 'w') |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
312 |
fp.writelines(rcmaps) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
313 |
fp.close() |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
314 |
ui.readconfig(repo.join('hgrc')) |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
315 |
if not opts.get('default'): |
222
f956a8301c25
Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents:
221
diff
changeset
|
316 |
kwmaps = dict(ui.configitems('keywordmaps')) or kwtemplater.templates |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
317 |
reposetup(ui, repo) |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
318 |
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
|
319 |
if k.endswith('keyword'): |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
320 |
extension = '%s = %s' % (k, v) |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
321 |
break |
266
50ce25f8c676
Underscore prefixes only for names at top level, or compatibility wrappers
Christian Ebert <blacktrash@gmx.net>
parents:
265
diff
changeset
|
322 |
demostatus('config using %s keyword template maps' % kwstatus) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
323 |
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
|
324 |
demoitems('keyword', ui.configitems('keyword')) |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
325 |
demoitems('keywordmaps', kwmaps.iteritems()) |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
326 |
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
|
327 |
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
|
328 |
repo.add([fn]) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
329 |
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
|
330 |
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
|
331 |
ui.note(keywords) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
332 |
ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname)) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
333 |
# silence branch command if not verbose |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
334 |
quiet = ui.quiet |
327
06f3c6b3dd93
Simplify temporary ui.quiet setting in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
320
diff
changeset
|
335 |
ui.quiet = not ui.verbose |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
336 |
commands.branch(ui, repo, branchname) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
337 |
ui.quiet = quiet |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
338 |
for name, cmd in ui.configitems('hooks'): |
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
339 |
if name.split('.', 1)[0].find('commit') > -1: |
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
340 |
repo.ui.setconfig('hooks', name, '') |
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
341 |
ui.note(_('unhooked all commit hooks\n')) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
342 |
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
|
343 |
repo.commit(text=msg) |
309
a5f5bbf4a668
Make path format output switches more compact
Christian Ebert <blacktrash@gmx.net>
parents:
308
diff
changeset
|
344 |
format = ui.verbose and ' in %s' % path or '' |
a5f5bbf4a668
Make path format output switches more compact
Christian Ebert <blacktrash@gmx.net>
parents:
308
diff
changeset
|
345 |
demostatus('%s keywords expanded%s' % (kwstatus, format)) |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
346 |
ui.write(repo.wopener(fn).read()) |
183
80fa00250c6d
Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents:
182
diff
changeset
|
347 |
ui.debug(_('\nremoving temporary repo %s\n') % tmpdir) |
251
b37f2f065a9c
Ignore errors when removing temp dir in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
250
diff
changeset
|
348 |
shutil.rmtree(tmpdir, ignore_errors=True) |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
349 |
|
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
350 |
def expand(ui, repo, *pats, **opts): |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
351 |
'''expand keywords in working directory |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
352 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
353 |
Run after (re)enabling keyword expansion. |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
354 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
355 |
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
|
356 |
''' |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
357 |
# 3rd argument sets expansion to True |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
358 |
_kwfwrite(ui, repo, True, *pats, **opts) |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
359 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
360 |
def files(ui, repo, *pats, **opts): |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
361 |
'''print files currently configured for keyword expansion |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
362 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
363 |
Crosscheck which files in working directory are potential targets for |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
364 |
keyword expansion. |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
365 |
That is, files matched by [keyword] config patterns but not symlinks. |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
366 |
''' |
314
d9f84b36de26
Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net>
parents:
310
diff
changeset
|
367 |
status = _status(ui, repo, *pats, **opts) |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
368 |
modified, added, removed, deleted, unknown, ignored, clean = status |
328
f5154819a11b
Just add unknown kwfiles candidates when untracked option is given
Christian Ebert <blacktrash@gmx.net>
parents:
327
diff
changeset
|
369 |
files = modified + added + clean |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
370 |
if opts.get('untracked'): |
328
f5154819a11b
Just add unknown kwfiles candidates when untracked option is given
Christian Ebert <blacktrash@gmx.net>
parents:
327
diff
changeset
|
371 |
files += unknown |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
372 |
files.sort() |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
373 |
kwfiles = [f for f in files if _iskwfile(f, repo._link, repo._kwt)] |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
374 |
cwd = pats and repo.getcwd() or '' |
320
83dad6b67ed9
Compress kwfstats intitialization
Christian Ebert <blacktrash@gmx.net>
parents:
319
diff
changeset
|
375 |
kwfstats = not opts.get('ignore') and (('K', kwfiles),) or () |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
376 |
if opts.get('all') or opts.get('ignore'): |
298
c8afb99bb70f
kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents:
297
diff
changeset
|
377 |
kwfstats += (('I', [f for f in files if f not in kwfiles]),) |
c8afb99bb70f
kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents:
297
diff
changeset
|
378 |
for char, filenames in kwfstats: |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
379 |
format = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n' |
298
c8afb99bb70f
kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents:
297
diff
changeset
|
380 |
for f in filenames: |
c8afb99bb70f
kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents:
297
diff
changeset
|
381 |
ui.write(format % repo.pathto(f, cwd)) |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
382 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
383 |
def shrink(ui, repo, *pats, **opts): |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
384 |
'''revert expanded keywords in working directory |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
385 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
386 |
Run before changing/disabling active keywords |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
387 |
or if you experience problems with "hg import" or "hg merge". |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
388 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
389 |
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
|
390 |
''' |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
391 |
# 3rd argument sets expansion to False |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
392 |
_kwfwrite(ui, repo, False, *pats, **opts) |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
393 |
|
42
ba000e29ecf3
Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents:
41
diff
changeset
|
394 |
|
33
ebb39c6a1476
Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
395 |
def reposetup(ui, repo): |
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
396 |
if not repo.local(): |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
397 |
return |
292
783c1310e20f
Avoid dispatch import, revert to simple argument parser
Christian Ebert <blacktrash@gmx.net>
parents:
290
diff
changeset
|
398 |
|
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
399 |
inc, exc = [], ['.hgtags', '.hg_archival.txt'] |
261
28e64bebc298
Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents:
260
diff
changeset
|
400 |
for pat, opt in ui.configitems('keyword'): |
28e64bebc298
Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents:
260
diff
changeset
|
401 |
if opt != 'ignore': |
28e64bebc298
Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents:
260
diff
changeset
|
402 |
inc.append(pat) |
28e64bebc298
Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents:
260
diff
changeset
|
403 |
else: |
28e64bebc298
Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents:
260
diff
changeset
|
404 |
exc.append(pat) |
28e64bebc298
Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents:
260
diff
changeset
|
405 |
if not inc: |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
406 |
return |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
407 |
|
33
ebb39c6a1476
Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
408 |
class kwrepo(repo.__class__): |
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
409 |
def _kwfile(self, f): |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
410 |
'''Returns filelog expanding keywords on read (for kwcat).''' |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
411 |
if f[0] == '/': |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
412 |
f = f[1:] |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
413 |
if self._kwt.matcher(f): |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
414 |
return kwfilelog(self.sopener, f, self._kwt) |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
415 |
return filelog.filelog(self.sopener, f) |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
416 |
|
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
417 |
def _wreadkwct(self, filename, expand, ctx, node): |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
418 |
'''Reads filename and returns tuple of data with keywords |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
419 |
expanded/shrunk and count of keywords (for _overwrite).''' |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
420 |
data = super(kwrepo, self).wread(filename) |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
421 |
return self._kwt.process(filename, data, expand, ctx, node) |
78
474b415433a1
Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents:
77
diff
changeset
|
422 |
|
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
423 |
def wread(self, filename): |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
424 |
data = super(kwrepo, self).wread(filename) |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
425 |
if self._kwt.matcher(filename): |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
426 |
return self._kwt.shrink(data) |
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
427 |
return data |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
428 |
|
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
429 |
def wwrite(self, filename, data, flags, overwrite=False): |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
430 |
if not overwrite and self._kwt.matcher(filename): |
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
431 |
data = self._kwt.expand(filename, data, None) |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
432 |
super(kwrepo, self).wwrite(filename, data, flags) |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
433 |
|
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
434 |
def wwritedata(self, filename, data): |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
435 |
if self._kwt.matcher(filename): |
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
436 |
data = self._kwt.expand(filename, data, None) |
353
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
437 |
return super(kwrepo, self).wwritedata(filename, data) |
159bf80a4301
Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net>
parents:
351
diff
changeset
|
438 |
|
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
439 |
def commit(self, files=None, text='', user=None, date=None, |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
440 |
match=util.always, force=False, force_editor=False, |
357
7b165e66b81b
Add empty_ok argument to commit
Christian Ebert <blacktrash@gmx.net>
parents:
355
diff
changeset
|
441 |
p1=None, p2=None, extra={}, empty_ok=False): |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
442 |
wlock = lock = None |
297
9e29992343a1
Rearrange commit hook hack
Christian Ebert <blacktrash@gmx.net>
parents:
296
diff
changeset
|
443 |
_p1 = _p2 = None |
230
9fe9a9839387
Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents:
229
diff
changeset
|
444 |
try: |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
445 |
wlock = self.wlock() |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
446 |
lock = self.lock() |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
447 |
# store and postpone commit hooks |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
448 |
commithooks = {} |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
449 |
for name, cmd in ui.configitems('hooks'): |
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
450 |
if name.split('.', 1)[0] == 'commit': |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
451 |
commithooks[name] = cmd |
304
815dc4a04296
Do not run commit hooks if there is no node
Christian Ebert <blacktrash@gmx.net>
parents:
301
diff
changeset
|
452 |
ui.setconfig('hooks', name, None) |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
453 |
if commithooks: |
296
869b16d09eec
Commit hook handling entirely into if-condition
Christian Ebert <blacktrash@gmx.net>
parents:
293
diff
changeset
|
454 |
# store parents for commit hook environment |
869b16d09eec
Commit hook handling entirely into if-condition
Christian Ebert <blacktrash@gmx.net>
parents:
293
diff
changeset
|
455 |
if p1 is None: |
869b16d09eec
Commit hook handling entirely into if-condition
Christian Ebert <blacktrash@gmx.net>
parents:
293
diff
changeset
|
456 |
_p1, _p2 = repo.dirstate.parents() |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
457 |
else: |
296
869b16d09eec
Commit hook handling entirely into if-condition
Christian Ebert <blacktrash@gmx.net>
parents:
293
diff
changeset
|
458 |
_p1, _p2 = p1, p2 or nullid |
297
9e29992343a1
Rearrange commit hook hack
Christian Ebert <blacktrash@gmx.net>
parents:
296
diff
changeset
|
459 |
_p1 = hex(_p1) |
9e29992343a1
Rearrange commit hook hack
Christian Ebert <blacktrash@gmx.net>
parents:
296
diff
changeset
|
460 |
if _p2 == nullid: |
9e29992343a1
Rearrange commit hook hack
Christian Ebert <blacktrash@gmx.net>
parents:
296
diff
changeset
|
461 |
_p2 = '' |
9e29992343a1
Rearrange commit hook hack
Christian Ebert <blacktrash@gmx.net>
parents:
296
diff
changeset
|
462 |
else: |
9e29992343a1
Rearrange commit hook hack
Christian Ebert <blacktrash@gmx.net>
parents:
296
diff
changeset
|
463 |
_p2 = hex(_p2) |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
464 |
|
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
465 |
node = super(kwrepo, |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
466 |
self).commit(files=files, text=text, user=user, |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
467 |
date=date, match=match, force=force, |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
468 |
force_editor=force_editor, |
357
7b165e66b81b
Add empty_ok argument to commit
Christian Ebert <blacktrash@gmx.net>
parents:
355
diff
changeset
|
469 |
p1=p1, p2=p2, extra=extra, |
7b165e66b81b
Add empty_ok argument to commit
Christian Ebert <blacktrash@gmx.net>
parents:
355
diff
changeset
|
470 |
empty_ok=empty_ok) |
304
815dc4a04296
Do not run commit hooks if there is no node
Christian Ebert <blacktrash@gmx.net>
parents:
301
diff
changeset
|
471 |
|
815dc4a04296
Do not run commit hooks if there is no node
Christian Ebert <blacktrash@gmx.net>
parents:
301
diff
changeset
|
472 |
# restore commit hooks |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
473 |
for name, cmd in commithooks.iteritems(): |
304
815dc4a04296
Do not run commit hooks if there is no node
Christian Ebert <blacktrash@gmx.net>
parents:
301
diff
changeset
|
474 |
ui.setconfig('hooks', name, cmd) |
206
8d16b70359da
Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents:
205
diff
changeset
|
475 |
if node is not None: |
314
d9f84b36de26
Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net>
parents:
310
diff
changeset
|
476 |
_overwrite(ui, self, node=node) |
304
815dc4a04296
Do not run commit hooks if there is no node
Christian Ebert <blacktrash@gmx.net>
parents:
301
diff
changeset
|
477 |
repo.hook('commit', node=node, parent1=_p1, parent2=_p2) |
145
1c2cefa97b96
Wrap entire commit in wlock
Christian Ebert <blacktrash@gmx.net>
parents:
144
diff
changeset
|
478 |
return node |
143
3485b0ef99c4
Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
142
diff
changeset
|
479 |
finally: |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
480 |
del wlock, lock |
129
15e8cd7f5295
Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents:
128
diff
changeset
|
481 |
|
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
482 |
kwt = kwrepo._kwt = kwtemplater(ui, repo, inc, exc) |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
483 |
|
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
484 |
def kwpatchfile_init(self, ui, fname, missing=False): |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
485 |
'''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
486 |
rejects or conflicts due to expanded keywords in working dir.''' |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
487 |
_patchfile_init(self, ui, fname, missing=missing) |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
488 |
|
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
489 |
if kwt.matcher(self.fname): |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
490 |
# shrink keywords read from working dir |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
491 |
kwshrunk = kwt.shrink(''.join(self.lines)) |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
492 |
self.lines = kwshrunk.splitlines(True) |
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
493 |
|
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
494 |
repo.__class__ = kwrepo |
354
8e3364294d0c
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net>
parents:
353
diff
changeset
|
495 |
patch.patchfile.__init__ = kwpatchfile_init |
42
ba000e29ecf3
Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents:
41
diff
changeset
|
496 |
|
81
fd5d3a974ea7
Implement self initializing pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents:
80
diff
changeset
|
497 |
|
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
498 |
cmdtable = { |
355
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
499 |
'kwcat': |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
500 |
(cat, commands.table['cat'][1], |
b3caec747375
Implement kwcat command
Christian Ebert <blacktrash@gmx.net>
parents:
354
diff
changeset
|
501 |
_('hg kwcat [OPTION]... FILE...')), |
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
502 |
'kwdemo': |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
503 |
(demo, |
187
a01a0392f648
kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents:
186
diff
changeset
|
504 |
[('d', 'default', None, _('show default keyword template maps')), |
283
071bfbd482b4
Respect Mercurial conventions in kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents:
282
diff
changeset
|
505 |
('f', 'rcfile', [], _('read maps from rcfile'))], |
071bfbd482b4
Respect Mercurial conventions in kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents:
282
diff
changeset
|
506 |
_('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')), |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
507 |
'kwexpand': (expand, commands.walkopts, |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
508 |
_('hg kwexpand [OPTION]... [FILE]...')), |
264
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
509 |
'kwfiles': |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
510 |
(files, |
270
371ce7fe5f13
kwfiles: change option "ignored" to "ignore", add option "untracked"
Christian Ebert <blacktrash@gmx.net>
parents:
269
diff
changeset
|
511 |
[('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
|
512 |
('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
|
513 |
('u', 'untracked', None, _('additionally show untracked files')), |
264
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
514 |
] + commands.walkopts, |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
515 |
_('hg kwfiles [OPTION]... [FILE]...')), |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
516 |
'kwshrink': (shrink, commands.walkopts, |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
517 |
_('hg kwshrink [OPTION]... [FILE]...')), |
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
518 |
} |