author | Christian Ebert <blacktrash@gmx.net> |
Wed, 05 Aug 2009 16:56:36 +0200 | |
changeset 634 | f2fa2ae4a4c9 |
parent 633 | ca4b437a817c |
child 635 | 49307521cf96 |
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 |
# |
631 | 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 |
# |
540
e30c2a251010
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
538
diff
changeset
|
5 |
# This software may be used and distributed according to the terms of the |
e30c2a251010
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
538
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 |
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
525
diff
changeset
|
14 |
# files (like LaTeX packages), that are mostly addressed to an |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
525
diff
changeset
|
15 |
# audience not running a version control system. |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
16 |
# |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
17 |
# For in-depth discussion refer to |
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 |
# |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
24 |
# 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
|
25 |
# 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
|
26 |
# |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
27 |
# 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
|
28 |
|
584
763d20224433
extensions: improve the consistency of synopses
C?dric Duval <cedricduval@free.fr>
parents:
582
diff
changeset
|
29 |
'''expand keywords in tracked files |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
30 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
31 |
This extension expands RCS/CVS-like or self-customized $Keywords$ in |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
32 |
tracked text files selected by your configuration. |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
33 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
34 |
Keywords are only expanded in local repositories and not stored in the |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
35 |
change history. The mechanism can be regarded as a convenience for the |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
36 |
current user or for archive distribution. |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
37 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
38 |
Configuration is done in the [keyword] and [keywordmaps] sections of |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
39 |
hgrc files. |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
40 |
|
624
2b7eb429112e
commands: use minirst parser when displaying help
Martin Geisler <mg@lazybytes.net>
parents:
621
diff
changeset
|
41 |
Example:: |
146
df9de07ce002
Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents:
145
diff
changeset
|
42 |
|
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
43 |
[keyword] |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
44 |
# 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
|
45 |
**.py = |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
46 |
x* = ignore |
146
df9de07ce002
Move config examples into help
Christian Ebert <blacktrash@gmx.net>
parents:
145
diff
changeset
|
47 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
48 |
NOTE: the more specific you are in your filename patterns the less you |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
49 |
lose speed in huge repositories. |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
50 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
51 |
For [keywordmaps] template mapping and expansion demonstration and |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
52 |
control run "hg kwdemo". |
48
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
53 |
|
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
54 |
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
|
55 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
56 |
The default template mappings (view with "hg kwdemo -d") can be |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
57 |
replaced with customized keywords and templates. Again, run "hg |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
58 |
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
|
59 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
60 |
Before changing/disabling active keywords, run "hg kwshrink" to avoid |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
61 |
the risk of inadvertently storing expanded keywords in the change |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
62 |
history. |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
63 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
64 |
To force expansion after enabling it, or a configuration change, run |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
65 |
"hg kwexpand". |
211
110c76a94d1c
help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents:
210
diff
changeset
|
66 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
67 |
Also, when committing with the record extension or using mq's qrecord, |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
68 |
be aware that keywords cannot be updated. Again, run "hg kwexpand" on |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
69 |
the files in question to update keyword expansions after all changes |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
70 |
have been checked in. |
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
71 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
72 |
Expansions spanning more than one line and incremental expansions, |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
73 |
like CVS' $Log$, are not supported. A keyword template map "Log = |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
74 |
{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
|
75 |
''' |
59fedb6b41da
add header and start documentation
Christian Ebert <blacktrash@gmx.net>
parents:
47
diff
changeset
|
76 |
|
500
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
77 |
from mercurial import commands, cmdutil, dispatch, filelog, revlog, extensions |
549
9084fb1593e6
match: change all users of util.matcher to match.match
Matt Mackall <mpm@selenic.com>
parents:
543
diff
changeset
|
78 |
from mercurial import patch, localrepo, templater, templatefilters, util, match |
398
257da73e109f
Switch off expansion for web diffs
Christian Ebert <blacktrash@gmx.net>
parents:
396
diff
changeset
|
79 |
from mercurial.hgweb import webcommands |
534
43d8c042ca20
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
532
diff
changeset
|
80 |
from mercurial.lock import release |
604 | 81 |
from mercurial.node import nullid |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
82 |
from mercurial.i18n import _ |
394
fe13fe09ba2e
keyword: avoid os import by using util.splitpath
Christian Ebert <blacktrash@gmx.net>
parents:
391
diff
changeset
|
83 |
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
|
84 |
|
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
85 |
commands.optionalrepo += ' kwdemo' |
59
94b26168791d
Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net>
parents:
58
diff
changeset
|
86 |
|
374
03fc5e667518
Make nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
373
diff
changeset
|
87 |
# hg commands that do not act on keywords |
463
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
452
diff
changeset
|
88 |
nokwcommands = ('add addremove annotate bundle copy export grep incoming init' |
479
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
89 |
' log outgoing push rename rollback tip verify' |
401
05d0c3e4efdc
Add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
398
diff
changeset
|
90 |
' convert email glog') |
374
03fc5e667518
Make nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
373
diff
changeset
|
91 |
|
347
c912b8c3f3ff
Detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
346
diff
changeset
|
92 |
# hg commands that trigger expansion only when writing to working dir, |
c912b8c3f3ff
Detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
346
diff
changeset
|
93 |
# not when reading filelog, and unexpand when reading from working dir |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
94 |
restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord' |
347
c912b8c3f3ff
Detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
346
diff
changeset
|
95 |
|
93
9f70f953dd3b
Clean keyword arg assignment in kwfilelog.add; rename utc() to utcdate()
Christian Ebert <blacktrash@gmx.net>
parents:
92
diff
changeset
|
96 |
def utcdate(date): |
92
3c7c187e4001
Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents:
90
diff
changeset
|
97 |
'''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
|
98 |
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
|
99 |
|
408
33e5b8a51e47
Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
407
diff
changeset
|
100 |
# make keyword tools accessible |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
101 |
kwtools = {'templater': None, 'hgcmd': '', 'inc': [], 'exc': ['.hg*']} |
385
e93c63004ec2
Monkeypatch dispatch._parse to avoid running it twice
Christian Ebert <blacktrash@gmx.net>
parents:
384
diff
changeset
|
102 |
|
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
103 |
|
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
104 |
class kwtemplater(object): |
92
3c7c187e4001
Init context.filectx only once per file with class kwfilectx
Christian Ebert <blacktrash@gmx.net>
parents:
90
diff
changeset
|
105 |
''' |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
106 |
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
|
107 |
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
|
108 |
''' |
222
f956a8301c25
Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents:
221
diff
changeset
|
109 |
templates = { |
204
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
110 |
'Revision': '{node|short}', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
111 |
'Author': '{author|user}', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
112 |
'Date': '{date|utcdate}', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
113 |
'RCSFile': '{file|basename},v', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
114 |
'Source': '{root}/{file},v', |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
115 |
'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
|
116 |
'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
|
117 |
} |
2d089b691b31
Add grep, init to nokwcommands; make variables, getcmd local
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
118 |
|
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
119 |
def __init__(self, ui, repo): |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
120 |
self.ui = ui |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
121 |
self.repo = repo |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
122 |
self.match = match.match(repo.root, '', [], |
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
123 |
kwtools['inc'], kwtools['exc']) |
416 | 124 |
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
|
125 |
|
222
f956a8301c25
Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents:
221
diff
changeset
|
126 |
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
|
127 |
if kwmaps: # override default templates |
609
fefdf82b2320
Collect kwmaps using a generator expression
Christian Ebert <blacktrash@gmx.net>
parents:
606
diff
changeset
|
128 |
self.templates = dict((k, templater.parsestring(v, False)) |
fefdf82b2320
Collect kwmaps using a generator expression
Christian Ebert <blacktrash@gmx.net>
parents:
606
diff
changeset
|
129 |
for k, v in kwmaps) |
254 | 130 |
escaped = map(re.escape, self.templates.keys()) |
252
001902b60bdd
String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents:
251
diff
changeset
|
131 |
kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped) |
001902b60bdd
String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net>
parents:
251
diff
changeset
|
132 |
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
|
133 |
|
363
263b3b10c55f
templates: move filters to their own module
Matt Mackall <mpm@selenic.com>
parents:
347
diff
changeset
|
134 |
templatefilters.filters['utcdate'] = utcdate |
307
32061d23db14
Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
306
diff
changeset
|
135 |
self.ct = cmdutil.changeset_templater(self.ui, self.repo, |
523
062ce3b9c962
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
522
diff
changeset
|
136 |
False, None, '', False) |
235
baef9dcfb219
Compatible repo.dirstate.normal/update into own function
Christian Ebert <blacktrash@gmx.net>
parents:
234
diff
changeset
|
137 |
|
505
a93358a05b80
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
504
diff
changeset
|
138 |
def substitute(self, data, path, ctx, subfunc): |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
139 |
'''Replaces keywords in data with expanded template.''' |
301
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
140 |
def kwsub(mobj): |
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
141 |
kw = mobj.group(1) |
306
78b80b2511de
Rename kwtemplater.t to kwtemplater.ct
Christian Ebert <blacktrash@gmx.net>
parents:
304
diff
changeset
|
142 |
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
|
143 |
self.ui.pushbuffer() |
505
a93358a05b80
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
504
diff
changeset
|
144 |
self.ct.show(ctx, root=self.repo.root, file=path) |
373
56573f49772c
Split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net>
parents:
372
diff
changeset
|
145 |
ekw = templatefilters.firstline(self.ui.popbuffer()) |
56573f49772c
Split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net>
parents:
372
diff
changeset
|
146 |
return '$%s: %s $' % (kw, ekw) |
301
e92c6762e2be
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net>
parents:
300
diff
changeset
|
147 |
return subfunc(kwsub, data) |
255
c4f37735be9b
Turn off debug while expanding
Christian Ebert <blacktrash@gmx.net>
parents:
254
diff
changeset
|
148 |
|
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
149 |
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
|
150 |
'''Returns data with keywords expanded.''' |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
151 |
if not self.restrict and self.match(path) and not util.binary(data): |
505
a93358a05b80
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
504
diff
changeset
|
152 |
ctx = self.repo.filectx(path, fileid=node).changectx() |
a93358a05b80
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
504
diff
changeset
|
153 |
return self.substitute(data, path, ctx, self.re_kw.sub) |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
154 |
return data |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
155 |
|
471
2c2f35f8501f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
470
diff
changeset
|
156 |
def iskwfile(self, path, flagfunc): |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
157 |
'''Returns true if path matches [keyword] pattern |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
158 |
and is not a symbolic link. |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
159 |
Caveat: localrepository._link fails on Windows.''' |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
160 |
return self.match(path) and not 'l' in flagfunc(path) |
134
f869c65156f7
2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
133
diff
changeset
|
161 |
|
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
162 |
def overwrite(self, node, expand, files): |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
163 |
'''Overwrites selected files expanding/shrinking keywords.''' |
507
51296bd1652f
keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net>
parents:
505
diff
changeset
|
164 |
ctx = self.repo[node] |
51296bd1652f
keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net>
parents:
505
diff
changeset
|
165 |
mf = ctx.manifest() |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
166 |
if node is not None: # commit |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
167 |
files = [f for f in ctx.files() if f in mf] |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
168 |
notify = self.ui.debug |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
169 |
else: # kwexpand/kwshrink |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
170 |
notify = self.ui.note |
471
2c2f35f8501f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
470
diff
changeset
|
171 |
candidates = [f for f in files if self.iskwfile(f, ctx.flags)] |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
172 |
if candidates: |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
173 |
self.restrict = True # do not expand when reading |
532
70220c2a4940
keyword: set overwrite message only once, not for each file
Christian Ebert <blacktrash@gmx.net>
parents:
531
diff
changeset
|
174 |
msg = (expand and _('overwriting %s expanding keywords\n') |
70220c2a4940
keyword: set overwrite message only once, not for each file
Christian Ebert <blacktrash@gmx.net>
parents:
531
diff
changeset
|
175 |
or _('overwriting %s shrinking keywords\n')) |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
176 |
for f in candidates: |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
177 |
fp = self.repo.file(f) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
178 |
data = fp.read(mf[f]) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
179 |
if util.binary(data): |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
180 |
continue |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
181 |
if expand: |
505
a93358a05b80
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
504
diff
changeset
|
182 |
if node is None: |
a93358a05b80
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
504
diff
changeset
|
183 |
ctx = self.repo.filectx(f, fileid=mf[f]).changectx() |
a93358a05b80
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
504
diff
changeset
|
184 |
data, found = self.substitute(data, f, ctx, |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
185 |
self.re_kw.subn) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
186 |
else: |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
187 |
found = self.re_kw.search(data) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
188 |
if found: |
531
f7865fb770fe
keyword, i18n: avoid untranslated strings as message parameters
Wagner Bruna <wbruna@yahoo.com>
parents:
529
diff
changeset
|
189 |
notify(msg % f) |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
190 |
self.repo.wwrite(f, data, mf.flags(f)) |
600
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
191 |
if node is None: |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
192 |
self.repo.dirstate.normal(f) |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
193 |
self.restrict = False |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
194 |
|
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
195 |
def shrinktext(self, text): |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
196 |
'''Unconditionally removes all keyword substitutions from text.''' |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
197 |
return self.re_kw.sub(r'$\1$', text) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
198 |
|
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
199 |
def shrink(self, fname, text): |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
200 |
'''Returns text with all keyword substitutions removed.''' |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
201 |
if self.match(fname) and not util.binary(text): |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
202 |
return self.shrinktext(text) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
203 |
return text |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
204 |
|
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
205 |
def shrinklines(self, fname, lines): |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
206 |
'''Returns lines with keyword substitutions removed.''' |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
207 |
if self.match(fname): |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
208 |
text = ''.join(lines) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
209 |
if not util.binary(text): |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
210 |
return self.shrinktext(text).splitlines(True) |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
211 |
return lines |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
212 |
|
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
213 |
def wread(self, fname, data): |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
214 |
'''If in restricted mode returns data read from wdir with |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
215 |
keyword substitutions removed.''' |
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
216 |
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
|
217 |
|
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
218 |
class kwfilelog(filelog.filelog): |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
219 |
''' |
173
5329863fb64e
filectx does not need filelog; more nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
172
diff
changeset
|
220 |
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
|
221 |
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
|
222 |
''' |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
223 |
def __init__(self, opener, kwt, path): |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
224 |
super(kwfilelog, self).__init__(opener, path) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
225 |
self.kwt = kwt |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
226 |
self.path = path |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
227 |
|
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
228 |
def read(self, node): |
265
1b6b7835e3f9
Count keywords in a customized kwfilelog read method
Christian Ebert <blacktrash@gmx.net>
parents:
264
diff
changeset
|
229 |
'''Expands keywords when reading filelog.''' |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
230 |
data = super(kwfilelog, self).read(node) |
408
33e5b8a51e47
Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
407
diff
changeset
|
231 |
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
|
232 |
|
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
233 |
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
|
234 |
'''Removes keyword substitutions when adding to filelog.''' |
408
33e5b8a51e47
Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
407
diff
changeset
|
235 |
text = self.kwt.shrink(self.path, text) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
236 |
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
|
237 |
|
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
238 |
def cmp(self, node, text): |
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
239 |
'''Removes keyword substitutions for comparison.''' |
408
33e5b8a51e47
Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
407
diff
changeset
|
240 |
text = self.kwt.shrink(self.path, text) |
174
c5f655d5d8b4
Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents:
173
diff
changeset
|
241 |
if self.renamed(node): |
c5f655d5d8b4
Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents:
173
diff
changeset
|
242 |
t2 = super(kwfilelog, self).read(node) |
c5f655d5d8b4
Handle rename and copy properly
Christian Ebert <blacktrash@gmx.net>
parents:
173
diff
changeset
|
243 |
return t2 != text |
248
2c222367dab3
Use revlog.cmp to avoid checking for rename twice
Christian Ebert <blacktrash@gmx.net>
parents:
246
diff
changeset
|
244 |
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
|
245 |
|
474
644b640cb3d0
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
473
diff
changeset
|
246 |
def _status(ui, repo, kwt, unknown, *pats, **opts): |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
247 |
'''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
|
248 |
Returns status of working directory.''' |
408
33e5b8a51e47
Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
407
diff
changeset
|
249 |
if kwt: |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
250 |
match = cmdutil.match(repo, pats, opts) |
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
251 |
return repo.status(match=match, unknown=unknown, clean=True) |
271
35f43e2ce5b6
For overwriting commands use node and manifest to speed up walk
Christian Ebert <blacktrash@gmx.net>
parents:
270
diff
changeset
|
252 |
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
|
253 |
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
|
254 |
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
|
255 |
|
275
cb2b11e63906
_overwrite method for kwrepo.commit, kwexpand, kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
274
diff
changeset
|
256 |
def _kwfwrite(ui, repo, expand, *pats, **opts): |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
257 |
'''Selects files and passes them to kwtemplater.overwrite.''' |
465
2f017ca736ce
(stable) mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
463
diff
changeset
|
258 |
if repo.dirstate.parents()[1] != nullid: |
2f017ca736ce
(stable) mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
463
diff
changeset
|
259 |
raise util.Abort(_('outstanding uncommitted merge')) |
416 | 260 |
kwt = kwtools['templater'] |
474
644b640cb3d0
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
473
diff
changeset
|
261 |
status = _status(ui, repo, kwt, False, *pats, **opts) |
644b640cb3d0
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
473
diff
changeset
|
262 |
modified, added, removed, deleted = status[:4] |
280
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
278
diff
changeset
|
263 |
if modified or added or removed or deleted: |
465
2f017ca736ce
(stable) mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
463
diff
changeset
|
264 |
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
|
265 |
wlock = lock = None |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
266 |
try: |
206
8d16b70359da
Treat wlock the recommended way
Christian Ebert <blacktrash@gmx.net>
parents:
205
diff
changeset
|
267 |
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
|
268 |
lock = repo.lock() |
474
644b640cb3d0
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
473
diff
changeset
|
269 |
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
|
270 |
finally: |
534
43d8c042ca20
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
532
diff
changeset
|
271 |
release(lock, wlock) |
185
bc5cd6cf69bc
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net>
parents:
184
diff
changeset
|
272 |
|
187
a01a0392f648
kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents:
186
diff
changeset
|
273 |
def demo(ui, repo, *args, **opts): |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
274 |
'''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
|
275 |
|
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
525
diff
changeset
|
276 |
Show current, custom, or default keyword template maps and their |
573 | 277 |
expansions. |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
278 |
|
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
279 |
Extend the current configuration by specifying maps as arguments |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
280 |
and using -f/--rcfile to source an external hgrc file. |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
281 |
|
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
282 |
Use -d/--default to disable current configuration. |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
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' |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
290 |
fn = 'demo.txt' |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
291 |
branchname = 'demobranch' |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
292 |
tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
529
7197324dfa4d
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
527
diff
changeset
|
293 |
ui.note(_('creating temporary repository at %s\n') % tmpdir) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
294 |
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
|
295 |
ui.setconfig('keyword', fn, '') |
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
296 |
|
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
297 |
uikwmaps = ui.configitems('keywordmaps') |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
298 |
if args or opts.get('rcfile'): |
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
299 |
ui.status(_('\n\tconfiguration using custom keyword template maps\n')) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
300 |
if uikwmaps: |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
301 |
ui.status(_('\textending current template maps\n')) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
302 |
if opts.get('default') or not uikwmaps: |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
303 |
ui.status(_('\toverriding default template maps\n')) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
304 |
if opts.get('rcfile'): |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
305 |
ui.readconfig(opts.get('rcfile')) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
306 |
if args: |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
307 |
# simulate hgrc parsing |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
308 |
rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args] |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
309 |
fp = repo.opener('hgrc', 'w') |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
310 |
fp.writelines(rcmaps) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
311 |
fp.close() |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
312 |
ui.readconfig(repo.join('hgrc')) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
313 |
kwmaps = dict(ui.configitems('keywordmaps')) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
314 |
elif opts.get('default'): |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
315 |
ui.status(_('\n\tconfiguration using default keyword template maps\n')) |
222
f956a8301c25
Shorten template setup
Christian Ebert <blacktrash@gmx.net>
parents:
221
diff
changeset
|
316 |
kwmaps = kwtemplater.templates |
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
317 |
if uikwmaps: |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
318 |
ui.status(_('\tdisabling current template maps\n')) |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
319 |
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
|
320 |
ui.setconfig('keywordmaps', k, v) |
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
321 |
else: |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
322 |
ui.status(_('\n\tconfiguration using current keyword template maps\n')) |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
323 |
kwmaps = dict(uikwmaps) or kwtemplater.templates |
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
324 |
|
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
325 |
uisetup(ui) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
326 |
reposetup(ui, repo) |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
327 |
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
|
328 |
if k.endswith('keyword'): |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
329 |
extension = '%s = %s' % (k, v) |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
207
diff
changeset
|
330 |
break |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
331 |
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
|
332 |
demoitems('keyword', ui.configitems('keyword')) |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
333 |
demoitems('keywordmaps', kwmaps.iteritems()) |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
334 |
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
|
335 |
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
|
336 |
repo.add([fn]) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
337 |
path = repo.wjoin(fn) |
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
338 |
ui.note(_('\nkeywords written to %s:\n') % path) |
183
80fa00250c6d
Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents:
182
diff
changeset
|
339 |
ui.note(keywords) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
340 |
ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname)) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
341 |
# silence branch command if not verbose |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
342 |
quiet = ui.quiet |
327
06f3c6b3dd93
Simplify temporary ui.quiet setting in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
320
diff
changeset
|
343 |
ui.quiet = not ui.verbose |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
344 |
commands.branch(ui, repo, branchname) |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
345 |
ui.quiet = quiet |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
346 |
for name, cmd in ui.configitems('hooks'): |
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
347 |
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
|
348 |
repo.ui.setconfig('hooks', name, '') |
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
349 |
ui.note(_('unhooked all commit hooks\n')) |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
350 |
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
|
351 |
repo.commit(text=msg) |
633
ca4b437a817c
Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
631
diff
changeset
|
352 |
ui.status(_('\n\tkeywords expanded\n')) |
205
f2d2e36053f9
kwdemo: clear up repo, ui inheritance; show commit log in debug output
Christian Ebert <blacktrash@gmx.net>
parents:
204
diff
changeset
|
353 |
ui.write(repo.wread(fn)) |
529
7197324dfa4d
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
527
diff
changeset
|
354 |
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
|
355 |
shutil.rmtree(tmpdir, ignore_errors=True) |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
356 |
|
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
357 |
def expand(ui, repo, *pats, **opts): |
573 | 358 |
'''expand keywords in the working directory |
285
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 |
Run after (re)enabling keyword expansion. |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
361 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
362 |
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
|
363 |
''' |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
364 |
# 3rd argument sets expansion to True |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
365 |
_kwfwrite(ui, repo, True, *pats, **opts) |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
366 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
367 |
def files(ui, repo, *pats, **opts): |
597
795a95d7dc61
Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
596
diff
changeset
|
368 |
'''show files configured for keyword expansion |
593
23da65f04361
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
590
diff
changeset
|
369 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
370 |
List which files in the working directory are matched by the |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
371 |
[keyword] configuration patterns. |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
372 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
373 |
Useful to prevent inadvertent keyword expansion and to speed up |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
374 |
execution by including only files that are actual candidates for |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
375 |
expansion. |
593
23da65f04361
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
590
diff
changeset
|
376 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
377 |
See "hg help keyword" on how to construct patterns both for |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
378 |
inclusion and exclusion of files. |
597
795a95d7dc61
Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
596
diff
changeset
|
379 |
|
795a95d7dc61
Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
596
diff
changeset
|
380 |
Use -u/--untracked to list untracked files as well. |
596
2de4e2be005c
Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
595
diff
changeset
|
381 |
|
625
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
382 |
With -a/--all and -v/--verbose the codes used to show the status |
b17b1cf1341a
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
624
diff
changeset
|
383 |
of files are:: |
620
04781aad754a
Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
614
diff
changeset
|
384 |
|
04781aad754a
Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
614
diff
changeset
|
385 |
K = keyword expansion candidate |
04781aad754a
Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
614
diff
changeset
|
386 |
k = keyword expansion candidate (untracked) |
04781aad754a
Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
614
diff
changeset
|
387 |
I = ignored |
04781aad754a
Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
614
diff
changeset
|
388 |
i = ignored (untracked) |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
389 |
''' |
416 | 390 |
kwt = kwtools['templater'] |
474
644b640cb3d0
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
473
diff
changeset
|
391 |
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
|
392 |
modified, added, removed, deleted, unknown, ignored, clean = status |
596
2de4e2be005c
Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
595
diff
changeset
|
393 |
files = sorted(modified + added + clean) |
470
2c530e5df1d4
use repo[changeid] to get a changectx
Matt Mackall <mpm@selenic.com>
parents:
469
diff
changeset
|
394 |
wctx = repo[None] |
471
2c2f35f8501f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
470
diff
changeset
|
395 |
kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)] |
596
2de4e2be005c
Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
595
diff
changeset
|
396 |
kwuntracked = [f for f in unknown if kwt.iskwfile(f, wctx.flags)] |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
397 |
cwd = pats and repo.getcwd() or '' |
596
2de4e2be005c
Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
595
diff
changeset
|
398 |
kwfstats = (not opts.get('ignore') and |
2de4e2be005c
Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
595
diff
changeset
|
399 |
(('K', kwfiles), ('k', kwuntracked),) or ()) |
319
2da9ab0bc400
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net>
parents:
318
diff
changeset
|
400 |
if opts.get('all') or opts.get('ignore'): |
596
2de4e2be005c
Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
595
diff
changeset
|
401 |
kwfstats += (('I', [f for f in files if f not in kwfiles]), |
2de4e2be005c
Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
595
diff
changeset
|
402 |
('i', [f for f in unknown if f not in kwuntracked]),) |
298
c8afb99bb70f
kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents:
297
diff
changeset
|
403 |
for char, filenames in kwfstats: |
509
16b690351c0d
Do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents:
507
diff
changeset
|
404 |
fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n' |
298
c8afb99bb70f
kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net>
parents:
297
diff
changeset
|
405 |
for f in filenames: |
509
16b690351c0d
Do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents:
507
diff
changeset
|
406 |
ui.write(fmt % repo.pathto(f, cwd)) |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
407 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
408 |
def shrink(ui, repo, *pats, **opts): |
573 | 409 |
'''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
|
410 |
|
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
525
diff
changeset
|
411 |
Run before changing/disabling active keywords or if you experience |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
525
diff
changeset
|
412 |
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
|
413 |
|
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
414 |
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
|
415 |
''' |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
416 |
# 3rd argument sets expansion to False |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
417 |
_kwfwrite(ui, repo, False, *pats, **opts) |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
418 |
|
42
ba000e29ecf3
Implement near CVS compability with more than one keyword
Christian Ebert <blacktrash@gmx.net>
parents:
41
diff
changeset
|
419 |
|
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
420 |
def uisetup(ui): |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
421 |
'''Collects [keyword] config in kwtools. |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
422 |
Monkeypatches dispatch._parse if needed.''' |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
423 |
|
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
424 |
for pat, opt in ui.configitems('keyword'): |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
425 |
if opt != 'ignore': |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
426 |
kwtools['inc'].append(pat) |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
427 |
else: |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
428 |
kwtools['exc'].append(pat) |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
429 |
|
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
430 |
if kwtools['inc']: |
500
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
431 |
def kwdispatch_parse(orig, ui, args): |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
432 |
'''Monkeypatch dispatch._parse to obtain running hg command.''' |
500
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
433 |
cmd, func, args, options, cmdoptions = orig(ui, args) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
434 |
kwtools['hgcmd'] = cmd |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
435 |
return cmd, func, args, options, cmdoptions |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
436 |
|
500
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
437 |
extensions.wrapfunction(dispatch, '_parse', kwdispatch_parse) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
438 |
|
33
ebb39c6a1476
Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
439 |
def reposetup(ui, repo): |
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
440 |
'''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
|
441 |
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
|
442 |
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
|
443 |
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
|
444 |
keyword substitutions. |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
445 |
Monkeypatches patch and webcommands.''' |
64
4cd7b993c5f8
Imports specific to functions
Christian Ebert <blacktrash@gmx.net>
parents:
63
diff
changeset
|
446 |
|
525
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
447 |
try: |
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
448 |
if (not repo.local() or not kwtools['inc'] |
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
449 |
or kwtools['hgcmd'] in nokwcommands.split() |
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
450 |
or '.hg' in util.splitpath(repo.root) |
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
451 |
or repo._url.startswith('bundle:')): |
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
452 |
return |
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
453 |
except AttributeError: |
6028e8046c14
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
523
diff
changeset
|
454 |
pass |
292
783c1310e20f
Avoid dispatch import, revert to simple argument parser
Christian Ebert <blacktrash@gmx.net>
parents:
290
diff
changeset
|
455 |
|
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
456 |
kwtools['templater'] = kwt = kwtemplater(ui, repo) |
261
28e64bebc298
Make kwfmatcher an ui attribute
Christian Ebert <blacktrash@gmx.net>
parents:
260
diff
changeset
|
457 |
|
33
ebb39c6a1476
Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
458 |
class kwrepo(repo.__class__): |
407
60c993ce6acb
Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
406
diff
changeset
|
459 |
def file(self, f): |
33
ebb39c6a1476
Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
460 |
if f[0] == '/': |
ebb39c6a1476
Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
461 |
f = f[1:] |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
462 |
return kwfilelog(self.sopener, kwt, f) |
78
474b415433a1
Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
Christian Ebert <blacktrash@gmx.net>
parents:
77
diff
changeset
|
463 |
|
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
464 |
def wread(self, filename): |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
465 |
data = super(kwrepo, self).wread(filename) |
408
33e5b8a51e47
Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
407
diff
changeset
|
466 |
return kwt.wread(filename, data) |
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
335
diff
changeset
|
467 |
|
611
c50f56b5f4b8
Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
609
diff
changeset
|
468 |
def commit(self, *args, **opts): |
600
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
469 |
# use custom commitctx for user commands |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
470 |
# other extensions can still wrap repo.commitctx directly |
611
c50f56b5f4b8
Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
609
diff
changeset
|
471 |
self.commitctx = self.kwcommitctx |
c50f56b5f4b8
Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
609
diff
changeset
|
472 |
try: |
c50f56b5f4b8
Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
609
diff
changeset
|
473 |
return super(kwrepo, self).commit(*args, **opts) |
c50f56b5f4b8
Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
609
diff
changeset
|
474 |
finally: |
c50f56b5f4b8
Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
609
diff
changeset
|
475 |
del self.commitctx |
600
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
476 |
|
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
477 |
def kwcommitctx(self, ctx, error=False): |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
478 |
wlock = lock = None |
230
9fe9a9839387
Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net>
parents:
229
diff
changeset
|
479 |
try: |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
480 |
wlock = self.wlock() |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
288
diff
changeset
|
481 |
lock = self.lock() |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
482 |
# store and postpone commit hooks |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
483 |
commithooks = {} |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
484 |
for name, cmd in ui.configitems('hooks'): |
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
485 |
if name.split('.', 1)[0] == 'commit': |
346
2c2b49def9d8
Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net>
parents:
345
diff
changeset
|
486 |
commithooks[name] = cmd |
304
815dc4a04296
Do not run commit hooks if there is no node
Christian Ebert <blacktrash@gmx.net>
parents:
301
diff
changeset
|
487 |
ui.setconfig('hooks', name, None) |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
488 |
if commithooks: |
600
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
489 |
# store parents for commit hooks |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
490 |
p1, p2 = ctx.p1(), ctx.p2() |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
491 |
xp1, xp2 = p1.hex(), p2 and p2.hex() or '' |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
492 |
|
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
493 |
n = super(kwrepo, self).commitctx(ctx, error) |
293
a7d568671575
Postpone commit hooks until keywords are expanded
Christian Ebert <blacktrash@gmx.net>
parents:
292
diff
changeset
|
494 |
|
600
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
495 |
kwt.overwrite(n, True, None) |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
496 |
if commithooks: |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
497 |
for name, cmd in commithooks.iteritems(): |
b40e7861defd
Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
597
diff
changeset
|
498 |
ui.setconfig('hooks', name, cmd) |
611
c50f56b5f4b8
Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
609
diff
changeset
|
499 |
self.hook('commit', node=n, parent1=xp1, parent2=xp2) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
500 |
return n |
143
3485b0ef99c4
Add wlock during overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
142
diff
changeset
|
501 |
finally: |
563
353fad43ad99
(stable) fix import gone wrong in 43d8c042ca20
Christian Ebert <blacktrash@gmx.net>
parents:
556
diff
changeset
|
502 |
release(lock, wlock) |
129
15e8cd7f5295
Wrap commit instead of calling pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents:
128
diff
changeset
|
503 |
|
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
504 |
# monkeypatches |
602 | 505 |
def kwpatchfile_init(orig, self, ui, fname, opener, |
506 |
missing=False, eol=None): |
|
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
507 |
'''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
508 |
rejects or conflicts due to expanded keywords in working dir.''' |
577
0cdbdf79d5e9
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
573
diff
changeset
|
509 |
orig(self, ui, fname, opener, missing, eol) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
510 |
# shrink keywords read from working dir |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
511 |
self.lines = kwt.shrinklines(self.fname, self.lines) |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
512 |
|
502
6fccffd4059a
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
500
diff
changeset
|
513 |
def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
6fccffd4059a
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
500
diff
changeset
|
514 |
opts=None): |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
515 |
'''Monkeypatch patch.diff to avoid expansion except when |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
516 |
comparing against working dir.''' |
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
517 |
if node2 is not None: |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
518 |
kwt.match = util.never |
470
2c530e5df1d4
use repo[changeid] to get a changectx
Matt Mackall <mpm@selenic.com>
parents:
469
diff
changeset
|
519 |
elif node1 is not None and node1 != repo['.'].node(): |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
520 |
kwt.restrict = True |
502
6fccffd4059a
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
500
diff
changeset
|
521 |
return orig(repo, node1, node2, match, changes, opts) |
463
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
452
diff
changeset
|
522 |
|
500
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
523 |
def kwweb_skip(orig, web, req, tmpl): |
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
524 |
'''Wraps webcommands.x turning off keyword expansion.''' |
552
baee5f7bfd32
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
550
diff
changeset
|
525 |
kwt.match = util.never |
500
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
526 |
return orig(web, req, tmpl) |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
527 |
|
157
64dce6787d82
Incorporate changes in self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net>
parents:
98
diff
changeset
|
528 |
repo.__class__ = kwrepo |
445
0c91995647e9
(stable) patches from default in 4b2c266bf059
Christian Ebert <blacktrash@gmx.net>
parents:
431
diff
changeset
|
529 |
|
500
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
530 |
extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init) |
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
531 |
extensions.wrapfunction(patch, 'diff', kw_diff) |
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
532 |
for c in 'annotate changeset rev filediff diff'.split(): |
bc63f54d577a
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
485
diff
changeset
|
533 |
extensions.wrapfunction(webcommands, c, kwweb_skip) |
81
fd5d3a974ea7
Implement self initializing pretxncommit hook
Christian Ebert <blacktrash@gmx.net>
parents:
80
diff
changeset
|
534 |
|
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
535 |
cmdtable = { |
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
536 |
'kwdemo': |
181
8019554adbb2
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net>
parents:
180
diff
changeset
|
537 |
(demo, |
187
a01a0392f648
kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net>
parents:
186
diff
changeset
|
538 |
[('d', 'default', None, _('show default keyword template maps')), |
621
6e73db2016ab
Argument to "kwdemo --rcfile" must be string (bugfix)
Christian Ebert <blacktrash@gmx.net>
parents:
620
diff
changeset
|
539 |
('f', 'rcfile', '', _('read maps from rcfile'))], |
283
071bfbd482b4
Respect Mercurial conventions in kwdemo help
Christian Ebert <blacktrash@gmx.net>
parents:
282
diff
changeset
|
540 |
_('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')), |
285
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
541 |
'kwexpand': (expand, commands.walkopts, |
0aa02d36b3b1
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net>
parents:
284
diff
changeset
|
542 |
_('hg kwexpand [OPTION]... [FILE]...')), |
264
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
543 |
'kwfiles': |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
544 |
(files, |
270
371ce7fe5f13
kwfiles: change option "ignored" to "ignore", add option "untracked"
Christian Ebert <blacktrash@gmx.net>
parents:
269
diff
changeset
|
545 |
[('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
|
546 |
('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
|
547 |
('u', 'untracked', None, _('additionally show untracked files')), |
264
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
548 |
] + commands.walkopts, |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
549 |
_('hg kwfiles [OPTION]... [FILE]...')), |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
550 |
'kwshrink': (shrink, commands.walkopts, |
7c637046c0e2
walkopts for kwexpand, kwshrink, kwfiles commands
Christian Ebert <blacktrash@gmx.net>
parents:
263
diff
changeset
|
551 |
_('hg kwshrink [OPTION]... [FILE]...')), |
178
4a27c306c6a2
Add kwdemo command as online config help
Christian Ebert <blacktrash@gmx.net>
parents:
177
diff
changeset
|
552 |
} |