Mercurial > hg
annotate hgext/keyword.py @ 9218:d3db87d68337
zeroconf: use reST syntax for literal blocks
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 23 Jul 2009 00:26:42 +0200 |
parents | 8c719222ddd7 |
children | 3f650f6aa130 |
rev | line source |
---|---|
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1 # keyword.py - $Keyword$ expansion for Mercurial |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
2 # |
5831
4a40b7066525
keyword: fix some doc strings; update copyright
Christian Ebert <blacktrash@gmx.net>
parents:
5825
diff
changeset
|
3 # Copyright 2007, 2008 Christian Ebert <blacktrash@gmx.net> |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
4 # |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
6 # GNU General Public License version 2, incorporated herein by reference. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
7 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
8 # $Id$ |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
9 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
10 # Keyword expansion hack against the grain of a DSCM |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
11 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
12 # There are many good reasons why this is not needed in a distributed |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
13 # SCM, still it may be useful in very small projects based on single |
7993
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
14 # files (like LaTeX packages), that are mostly addressed to an |
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
15 # audience not running a version control system. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
16 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
17 # For in-depth discussion refer to |
8936
1de6e7e1bb9f
change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8894
diff
changeset
|
18 # <http://mercurial.selenic.com/wiki/KeywordPlan>. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
19 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
20 # Keyword expansion is based on Mercurial's changeset template mappings. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
21 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
22 # Binary files are not touched. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
23 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
24 # Files to act upon/ignore are specified in the [keyword] section. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
25 # Customized keyword template mappings in the [keywordmaps] section. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
26 # |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
27 # Run "hg help keyword" and "hg kwdemo" to get info on configuration. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
28 |
8894
868670dbc237
extensions: improve the consistency of synopses
Cédric Duval <cedricduval@free.fr>
parents:
8866
diff
changeset
|
29 '''expand keywords in tracked files |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
30 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
31 This extension expands RCS/CVS-like or self-customized $Keywords$ in tracked |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
32 text files selected by your configuration. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
33 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
34 Keywords are only expanded in local repositories and not stored in the change |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
35 history. The mechanism can be regarded as a convenience for the current user |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
36 or for archive distribution. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
37 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
38 Configuration is done in the [keyword] and [keywordmaps] sections of hgrc |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
39 files. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
40 |
9157
9261667e9b82
commands: use minirst parser when displaying help
Martin Geisler <mg@lazybytes.net>
parents:
9106
diff
changeset
|
41 Example:: |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
42 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
43 [keyword] |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
44 # expand keywords in every python file except those matching "x*" |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
45 **.py = |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
46 x* = ignore |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
47 |
9106
7705d184faa1
keyword: use all caps for 'note:' in help string
Martin Geisler <mg@lazybytes.net>
parents:
9102
diff
changeset
|
48 NOTE: the more specific you are in your filename patterns the less you lose |
7705d184faa1
keyword: use all caps for 'note:' in help string
Martin Geisler <mg@lazybytes.net>
parents:
9102
diff
changeset
|
49 speed in huge repositories. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
50 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
51 For [keywordmaps] template mapping and expansion demonstration and control run |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
52 "hg kwdemo". |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
53 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
54 An additional date template filter {date|utcdate} is provided. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
55 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
56 The default template mappings (view with "hg kwdemo -d") can be replaced with |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
57 customized keywords and templates. Again, run "hg kwdemo" to control the |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
58 results of your config changes. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
59 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
60 Before changing/disabling active keywords, run "hg kwshrink" to avoid the risk |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
61 of inadvertently storing expanded keywords in the change history. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
62 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
63 To force expansion after enabling it, or a configuration change, run "hg |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
64 kwexpand". |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
65 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
66 Also, when committing with the record extension or using mq's qrecord, be |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
67 aware that keywords cannot be updated. Again, run "hg kwexpand" on the files |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
68 in question to update keyword expansions after all changes have been checked |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
69 in. |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
70 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
71 Expansions spanning more than one line and incremental expansions, like CVS' |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
72 $Log$, are not supported. A keyword template map "Log = {desc}" expands to the |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
73 first line of the changeset description. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
74 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
75 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
76 from mercurial import commands, cmdutil, dispatch, filelog, revlog, extensions |
8566
744d6322b05b
match: change all users of util.matcher to match.match
Matt Mackall <mpm@selenic.com>
parents:
8407
diff
changeset
|
77 from mercurial import patch, localrepo, templater, templatefilters, util, match |
6072
e521ec1ad985
keyword: no expansion in web diffs
Christian Ebert <blacktrash@gmx.net>
parents:
6071
diff
changeset
|
78 from mercurial.hgweb import webcommands |
8112
6ee71f78497c
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
8098
diff
changeset
|
79 from mercurial.lock import release |
9027
8c441691d414
keyword: remove unused import
Christian Ebert <blacktrash@gmx.net>
parents:
9013
diff
changeset
|
80 from mercurial.node import nullid |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
81 from mercurial.i18n import _ |
6069
212bfb5c50e1
keyword: avoid os import by using util.splitpath
Christian Ebert <blacktrash@gmx.net>
parents:
6060
diff
changeset
|
82 import re, shutil, tempfile, time |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
83 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
84 commands.optionalrepo += ' kwdemo' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
85 |
6024
3121f0feefb4
keyword: nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
6023
diff
changeset
|
86 # hg commands that do not act on keywords |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6603
diff
changeset
|
87 nokwcommands = ('add addremove annotate bundle copy export grep incoming init' |
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6762
diff
changeset
|
88 ' log outgoing push rename rollback tip verify' |
6082
875b745996e8
keyword: add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
6081
diff
changeset
|
89 ' convert email glog') |
6024
3121f0feefb4
keyword: nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
6023
diff
changeset
|
90 |
5961
ed4d55c2366f
keyword: detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
5946
diff
changeset
|
91 # hg commands that trigger expansion only when writing to working dir, |
ed4d55c2366f
keyword: detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
5946
diff
changeset
|
92 # not when reading filelog, and unexpand when reading from working dir |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
93 restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord' |
5961
ed4d55c2366f
keyword: detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
5946
diff
changeset
|
94 |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
95 def utcdate(date): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
96 '''Returns hgdate in cvs-like UTC format.''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
97 return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0])) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
98 |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
99 # make keyword tools accessible |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
100 kwtools = {'templater': None, 'hgcmd': '', 'inc': [], 'exc': ['.hg*']} |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
101 |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
102 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
103 class kwtemplater(object): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
104 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
105 Sets up keyword templates, corresponding keyword regex, and |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
106 provides keyword substitution functions. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
107 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
108 templates = { |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
109 'Revision': '{node|short}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
110 'Author': '{author|user}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
111 'Date': '{date|utcdate}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
112 'RCSFile': '{file|basename},v', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
113 'Source': '{root}/{file},v', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
114 'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
115 'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
116 } |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
117 |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
118 def __init__(self, ui, repo): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
119 self.ui = ui |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
120 self.repo = repo |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
121 self.match = match.match(repo.root, '', [], |
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
122 kwtools['inc'], kwtools['exc']) |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
123 self.restrict = kwtools['hgcmd'] in restricted.split() |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
124 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
125 kwmaps = self.ui.configitems('keywordmaps') |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
126 if kwmaps: # override default templates |
9081
d8e8447a4b7b
keyword: collect kwmaps using a generator expression
Christian Ebert <blacktrash@gmx.net>
parents:
9066
diff
changeset
|
127 self.templates = dict((k, templater.parsestring(v, False)) |
d8e8447a4b7b
keyword: collect kwmaps using a generator expression
Christian Ebert <blacktrash@gmx.net>
parents:
9066
diff
changeset
|
128 for k, v in kwmaps) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
129 escaped = map(re.escape, self.templates.keys()) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
130 kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
131 self.re_kw = re.compile(kwpat) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
132 |
5976
9f1e6ab76069
templates: move filters to their own module
Matt Mackall <mpm@selenic.com>
parents:
5961
diff
changeset
|
133 templatefilters.filters['utcdate'] = utcdate |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
134 self.ct = cmdutil.changeset_templater(self.ui, self.repo, |
7762
fece056bf240
add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents:
7534
diff
changeset
|
135 False, None, '', False) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
136 |
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
137 def substitute(self, data, path, ctx, subfunc): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
138 '''Replaces keywords in data with expanded template.''' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
139 def kwsub(mobj): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
140 kw = mobj.group(1) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
141 self.ct.use_template(self.templates[kw]) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
142 self.ui.pushbuffer() |
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
143 self.ct.show(ctx, root=self.repo.root, file=path) |
6023
ee7df90d1daa
keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net>
parents:
6022
diff
changeset
|
144 ekw = templatefilters.firstline(self.ui.popbuffer()) |
ee7df90d1daa
keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net>
parents:
6022
diff
changeset
|
145 return '$%s: %s $' % (kw, ekw) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
146 return subfunc(kwsub, data) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
147 |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
148 def expand(self, path, node, data): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
149 '''Returns data with keywords expanded.''' |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
150 if not self.restrict and self.match(path) and not util.binary(data): |
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
151 ctx = self.repo.filectx(path, fileid=node).changectx() |
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
152 return self.substitute(data, path, ctx, self.re_kw.sub) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
153 return data |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
154 |
6749
51b0e799352f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
6747
diff
changeset
|
155 def iskwfile(self, path, flagfunc): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
156 '''Returns true if path matches [keyword] pattern |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
157 and is not a symbolic link. |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
158 Caveat: localrepository._link fails on Windows.''' |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
159 return self.match(path) and not 'l' in flagfunc(path) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
160 |
6505
7ae26bb2d5cc
keyword: make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net>
parents:
6504
diff
changeset
|
161 def overwrite(self, node, expand, files): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
162 '''Overwrites selected files expanding/shrinking keywords.''' |
7378
8dde275680d8
keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net>
parents:
7375
diff
changeset
|
163 ctx = self.repo[node] |
8dde275680d8
keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net>
parents:
7375
diff
changeset
|
164 mf = ctx.manifest() |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
165 if node is not None: # commit |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
166 files = [f for f in ctx.files() if f in mf] |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
167 notify = self.ui.debug |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
168 else: # kwexpand/kwshrink |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
169 notify = self.ui.note |
6749
51b0e799352f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
6747
diff
changeset
|
170 candidates = [f for f in files if self.iskwfile(f, ctx.flags)] |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
171 if candidates: |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
172 self.restrict = True # do not expand when reading |
8098
6a6ce1df98d2
keyword: set overwrite message only once, not for each file
Christian Ebert <blacktrash@gmx.net>
parents:
8089
diff
changeset
|
173 msg = (expand and _('overwriting %s expanding keywords\n') |
6a6ce1df98d2
keyword: set overwrite message only once, not for each file
Christian Ebert <blacktrash@gmx.net>
parents:
8089
diff
changeset
|
174 or _('overwriting %s shrinking keywords\n')) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
175 for f in candidates: |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
176 fp = self.repo.file(f) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
177 data = fp.read(mf[f]) |
6508
4b2c266bf059
Get rid of reimplementations of util.binary
Bryan O'Sullivan <bos@serpentine.com>
parents:
6506
diff
changeset
|
178 if util.binary(data): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
179 continue |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
180 if expand: |
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
181 if node is None: |
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
182 ctx = self.repo.filectx(f, fileid=mf[f]).changectx() |
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
183 data, found = self.substitute(data, f, ctx, |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
184 self.re_kw.subn) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
185 else: |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
186 found = self.re_kw.search(data) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
187 if found: |
8089
67efe5e3b0fb
keyword, i18n: avoid untranslated strings as message parameters
Wagner Bruna <wbruna@yahoo.com>
parents:
8027
diff
changeset
|
188 notify(msg % f) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
189 self.repo.wwrite(f, data, mf.flags(f)) |
8996
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
190 if node is None: |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
191 self.repo.dirstate.normal(f) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
192 self.restrict = False |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
193 |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
194 def shrinktext(self, text): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
195 '''Unconditionally removes all keyword substitutions from text.''' |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
196 return self.re_kw.sub(r'$\1$', text) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
197 |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
198 def shrink(self, fname, text): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
199 '''Returns text with all keyword substitutions removed.''' |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
200 if self.match(fname) and not util.binary(text): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
201 return self.shrinktext(text) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
202 return text |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
203 |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
204 def shrinklines(self, fname, lines): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
205 '''Returns lines with keyword substitutions removed.''' |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
206 if self.match(fname): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
207 text = ''.join(lines) |
6508
4b2c266bf059
Get rid of reimplementations of util.binary
Bryan O'Sullivan <bos@serpentine.com>
parents:
6506
diff
changeset
|
208 if not util.binary(text): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
209 return self.shrinktext(text).splitlines(True) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
210 return lines |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
211 |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
212 def wread(self, fname, data): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
213 '''If in restricted mode returns data read from wdir with |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
214 keyword substitutions removed.''' |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
215 return self.restrict and self.shrink(fname, data) or data |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
216 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
217 class kwfilelog(filelog.filelog): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
218 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
219 Subclass of filelog to hook into its read, add, cmp methods. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
220 Keywords are "stored" unexpanded, and processed on reading. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
221 ''' |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
222 def __init__(self, opener, kwt, path): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
223 super(kwfilelog, self).__init__(opener, path) |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
224 self.kwt = kwt |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
225 self.path = path |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
226 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
227 def read(self, node): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
228 '''Expands keywords when reading filelog.''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
229 data = super(kwfilelog, self).read(node) |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
230 return self.kwt.expand(self.path, node, data) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
231 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
232 def add(self, text, meta, tr, link, p1=None, p2=None): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
233 '''Removes keyword substitutions when adding to filelog.''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
234 text = self.kwt.shrink(self.path, text) |
6504
1be53f931c9c
keyword: compact setting of optional arguments
Christian Ebert <blacktrash@gmx.net>
parents:
6503
diff
changeset
|
235 return super(kwfilelog, self).add(text, meta, tr, link, p1, p2) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
236 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
237 def cmp(self, node, text): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
238 '''Removes keyword substitutions for comparison.''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
239 text = self.kwt.shrink(self.path, text) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
240 if self.renamed(node): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
241 t2 = super(kwfilelog, self).read(node) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
242 return t2 != text |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
243 return revlog.revlog.cmp(self, node, text) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
244 |
6760
4faaa0535ea7
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
6753
diff
changeset
|
245 def _status(ui, repo, kwt, unknown, *pats, **opts): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
246 '''Bails out if [keyword] configuration is not active. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
247 Returns status of working directory.''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
248 if kwt: |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
249 match = cmdutil.match(repo, pats, opts) |
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
250 return repo.status(match=match, unknown=unknown, clean=True) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
251 if ui.configitems('keyword'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
252 raise util.Abort(_('[keyword] patterns cannot match')) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
253 raise util.Abort(_('no [keyword] patterns configured')) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
254 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
255 def _kwfwrite(ui, repo, expand, *pats, **opts): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
256 '''Selects files and passes them to kwtemplater.overwrite.''' |
6672
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
257 if repo.dirstate.parents()[1] != nullid: |
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
258 raise util.Abort(_('outstanding uncommitted merge')) |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
259 kwt = kwtools['templater'] |
6760
4faaa0535ea7
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
6753
diff
changeset
|
260 status = _status(ui, repo, kwt, False, *pats, **opts) |
4faaa0535ea7
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
6753
diff
changeset
|
261 modified, added, removed, deleted = status[:4] |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
262 if modified or added or removed or deleted: |
6672
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
263 raise util.Abort(_('outstanding uncommitted changes')) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
264 wlock = lock = None |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
265 try: |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
266 wlock = repo.wlock() |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
267 lock = repo.lock() |
6760
4faaa0535ea7
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
6753
diff
changeset
|
268 kwt.overwrite(None, expand, status[6]) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
269 finally: |
8112
6ee71f78497c
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
8098
diff
changeset
|
270 release(lock, wlock) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
271 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
272 def demo(ui, repo, *args, **opts): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
273 '''print [keywordmaps] configuration and an expansion example |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
274 |
7993
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
275 Show current, custom, or default keyword template maps and their |
8763 | 276 expansions. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
277 |
7993
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
278 Extend current configuration by specifying maps as arguments and |
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
279 optionally by reading from an additional hgrc file. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
280 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
281 Override current keyword template maps with "default" option. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
282 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
283 def demoitems(section, items): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
284 ui.write('[%s]\n' % section) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
285 for k, v in items: |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
286 ui.write('%s = %s\n' % (k, v)) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
287 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
288 msg = 'hg keyword config and expansion example' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
289 kwstatus = 'current' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
290 fn = 'demo.txt' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
291 branchname = 'demobranch' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
292 tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
8027
9c7ca86fc658
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
7993
diff
changeset
|
293 ui.note(_('creating temporary repository at %s\n') % tmpdir) |
6504
1be53f931c9c
keyword: compact setting of optional arguments
Christian Ebert <blacktrash@gmx.net>
parents:
6503
diff
changeset
|
294 repo = localrepo.localrepository(ui, tmpdir, True) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
295 ui.setconfig('keyword', fn, '') |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
296 if args or opts.get('rcfile'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
297 kwstatus = 'custom' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
298 if opts.get('rcfile'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
299 ui.readconfig(opts.get('rcfile')) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
300 if opts.get('default'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
301 kwstatus = 'default' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
302 kwmaps = kwtemplater.templates |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
303 if ui.configitems('keywordmaps'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
304 # override maps from optional rcfile |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
305 for k, v in kwmaps.iteritems(): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
306 ui.setconfig('keywordmaps', k, v) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
307 elif args: |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
308 # simulate hgrc parsing |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
309 rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args] |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
310 fp = repo.opener('hgrc', 'w') |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
311 fp.writelines(rcmaps) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
312 fp.close() |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
313 ui.readconfig(repo.join('hgrc')) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
314 if not opts.get('default'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
315 kwmaps = dict(ui.configitems('keywordmaps')) or kwtemplater.templates |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
316 uisetup(ui) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
317 reposetup(ui, repo) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
318 for k, v in ui.configitems('extensions'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
319 if k.endswith('keyword'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
320 extension = '%s = %s' % (k, v) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
321 break |
8939
bc9ac7a29a73
keyword: make kwdemo more translation friendly
Christian Ebert <blacktrash@gmx.net>
parents:
8936
diff
changeset
|
322 ui.status(_('\n\tconfig using %s keyword template maps\n') % kwstatus) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
323 ui.write('[extensions]\n%s\n' % extension) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
324 demoitems('keyword', ui.configitems('keyword')) |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
325 demoitems('keywordmaps', kwmaps.iteritems()) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
326 keywords = '$' + '$\n$'.join(kwmaps.keys()) + '$\n' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
327 repo.wopener(fn, 'w').write(keywords) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
328 repo.add([fn]) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
329 path = repo.wjoin(fn) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
330 ui.note(_('\n%s keywords written to %s:\n') % (kwstatus, path)) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
331 ui.note(keywords) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
332 ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname)) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
333 # silence branch command if not verbose |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
334 quiet = ui.quiet |
5825
2b67acc404f6
keyword: clean up quiet setting in kwdemo and adding of untracked kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
5824
diff
changeset
|
335 ui.quiet = not ui.verbose |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
336 commands.branch(ui, repo, branchname) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
337 ui.quiet = quiet |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
338 for name, cmd in ui.configitems('hooks'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
339 if name.split('.', 1)[0].find('commit') > -1: |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
340 repo.ui.setconfig('hooks', name, '') |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
341 ui.note(_('unhooked all commit hooks\n')) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
342 ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg)) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
343 repo.commit(text=msg) |
7417
d3f1d316b72b
keyword: do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents:
7391
diff
changeset
|
344 fmt = ui.verbose and ' in %s' % path or '' |
8939
bc9ac7a29a73
keyword: make kwdemo more translation friendly
Christian Ebert <blacktrash@gmx.net>
parents:
8936
diff
changeset
|
345 ui.status(_('\n\t%s keywords expanded%s\n') % (kwstatus, fmt)) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
346 ui.write(repo.wread(fn)) |
8027
9c7ca86fc658
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
7993
diff
changeset
|
347 ui.debug(_('\nremoving temporary repository %s\n') % tmpdir) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
348 shutil.rmtree(tmpdir, ignore_errors=True) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
349 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
350 def expand(ui, repo, *pats, **opts): |
8763 | 351 '''expand keywords in the working directory |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
352 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
353 Run after (re)enabling keyword expansion. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
354 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
355 kwexpand refuses to run if given files contain local changes. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
356 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
357 # 3rd argument sets expansion to True |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
358 _kwfwrite(ui, repo, True, *pats, **opts) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
359 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
360 def files(ui, repo, *pats, **opts): |
8957
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8956
diff
changeset
|
361 '''show files configured for keyword expansion |
8950
be6b57b2bdb8
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8939
diff
changeset
|
362 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
363 List which files in the working directory are matched by the [keyword] |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
364 configuration patterns. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
365 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
366 Useful to prevent inadvertent keyword expansion and to speed up execution |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
367 by including only files that are actual candidates for expansion. |
8950
be6b57b2bdb8
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8939
diff
changeset
|
368 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
369 See "hg help keyword" on how to construct patterns both for inclusion and |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
370 exclusion of files. |
8957
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8956
diff
changeset
|
371 |
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8956
diff
changeset
|
372 Use -u/--untracked to list untracked files as well. |
8956
4b8d8f194e29
keyword: lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
373 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
9027
diff
changeset
|
374 With -a/--all and -v/--verbose the codes used to show the status of files |
9195
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
375 are:: |
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
376 |
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
377 K = keyword expansion candidate |
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
378 k = keyword expansion candidate (untracked) |
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
379 I = ignored |
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
380 i = ignored (untracked) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
381 ''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
382 kwt = kwtools['templater'] |
6760
4faaa0535ea7
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
6753
diff
changeset
|
383 status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
384 modified, added, removed, deleted, unknown, ignored, clean = status |
8956
4b8d8f194e29
keyword: lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
385 files = sorted(modified + added + clean) |
6747
f6c00b17387c
use repo[changeid] to get a changectx
Matt Mackall <mpm@selenic.com>
parents:
6743
diff
changeset
|
386 wctx = repo[None] |
6749
51b0e799352f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
6747
diff
changeset
|
387 kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)] |
8956
4b8d8f194e29
keyword: lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
388 kwuntracked = [f for f in unknown if kwt.iskwfile(f, wctx.flags)] |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
389 cwd = pats and repo.getcwd() or '' |
8956
4b8d8f194e29
keyword: lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
390 kwfstats = (not opts.get('ignore') and |
4b8d8f194e29
keyword: lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
391 (('K', kwfiles), ('k', kwuntracked),) or ()) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
392 if opts.get('all') or opts.get('ignore'): |
8956
4b8d8f194e29
keyword: lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
393 kwfstats += (('I', [f for f in files if f not in kwfiles]), |
4b8d8f194e29
keyword: lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
394 ('i', [f for f in unknown if f not in kwuntracked]),) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
395 for char, filenames in kwfstats: |
7417
d3f1d316b72b
keyword: do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents:
7391
diff
changeset
|
396 fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
397 for f in filenames: |
7417
d3f1d316b72b
keyword: do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents:
7391
diff
changeset
|
398 ui.write(fmt % repo.pathto(f, cwd)) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
399 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
400 def shrink(ui, repo, *pats, **opts): |
8763 | 401 '''revert expanded keywords in the working directory |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
402 |
7993
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
403 Run before changing/disabling active keywords or if you experience |
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
404 problems with "hg import" or "hg merge". |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
405 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
406 kwshrink refuses to run if given files contain local changes. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
407 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
408 # 3rd argument sets expansion to False |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
409 _kwfwrite(ui, repo, False, *pats, **opts) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
410 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
411 |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
412 def uisetup(ui): |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
413 '''Collects [keyword] config in kwtools. |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
414 Monkeypatches dispatch._parse if needed.''' |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
415 |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
416 for pat, opt in ui.configitems('keyword'): |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
417 if opt != 'ignore': |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
418 kwtools['inc'].append(pat) |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
419 else: |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
420 kwtools['exc'].append(pat) |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
421 |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
422 if kwtools['inc']: |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
423 def kwdispatch_parse(orig, ui, args): |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
424 '''Monkeypatch dispatch._parse to obtain running hg command.''' |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
425 cmd, func, args, options, cmdoptions = orig(ui, args) |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
426 kwtools['hgcmd'] = cmd |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
427 return cmd, func, args, options, cmdoptions |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
428 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
429 extensions.wrapfunction(dispatch, '_parse', kwdispatch_parse) |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
430 |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
431 def reposetup(ui, repo): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
432 '''Sets up repo as kwrepo for keyword substitution. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
433 Overrides file method to return kwfilelog instead of filelog |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
434 if file matches user configuration. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
435 Wraps commit to overwrite configured files with updated |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
436 keyword substitutions. |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
437 Monkeypatches patch and webcommands.''' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
438 |
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
439 try: |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
440 if (not repo.local() or not kwtools['inc'] |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
441 or kwtools['hgcmd'] in nokwcommands.split() |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
442 or '.hg' in util.splitpath(repo.root) |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
443 or repo._url.startswith('bundle:')): |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
444 return |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
445 except AttributeError: |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
446 pass |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
447 |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
448 kwtools['templater'] = kwt = kwtemplater(ui, repo) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
449 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
450 class kwrepo(repo.__class__): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
451 def file(self, f): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
452 if f[0] == '/': |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
453 f = f[1:] |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
454 return kwfilelog(self.sopener, kwt, f) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
455 |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
456 def wread(self, filename): |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
457 data = super(kwrepo, self).wread(filename) |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
458 return kwt.wread(filename, data) |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
459 |
9096
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
460 def commit(self, *args, **opts): |
8996
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
461 # use custom commitctx for user commands |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
462 # other extensions can still wrap repo.commitctx directly |
9096
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
463 self.commitctx = self.kwcommitctx |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
464 try: |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
465 return super(kwrepo, self).commit(*args, **opts) |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
466 finally: |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
467 del self.commitctx |
8996
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
468 |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
469 def kwcommitctx(self, ctx, error=False): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
470 wlock = lock = None |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
471 try: |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
472 wlock = self.wlock() |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
473 lock = self.lock() |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
474 # store and postpone commit hooks |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
475 commithooks = {} |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
476 for name, cmd in ui.configitems('hooks'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
477 if name.split('.', 1)[0] == 'commit': |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
478 commithooks[name] = cmd |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
479 ui.setconfig('hooks', name, None) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
480 if commithooks: |
8996
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
481 # store parents for commit hooks |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
482 p1, p2 = ctx.p1(), ctx.p2() |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
483 xp1, xp2 = p1.hex(), p2 and p2.hex() or '' |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
484 |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
485 n = super(kwrepo, self).commitctx(ctx, error) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
486 |
8996
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
487 kwt.overwrite(n, True, None) |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
488 if commithooks: |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
489 for name, cmd in commithooks.iteritems(): |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
490 ui.setconfig('hooks', name, cmd) |
9096
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
491 self.hook('commit', node=n, parent1=xp1, parent2=xp2) |
6504
1be53f931c9c
keyword: compact setting of optional arguments
Christian Ebert <blacktrash@gmx.net>
parents:
6503
diff
changeset
|
492 return n |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
493 finally: |
8112
6ee71f78497c
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
8098
diff
changeset
|
494 release(lock, wlock) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
495 |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
496 # monkeypatches |
9013
21b29f4c7c9f
keyword: break overlong line
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
497 def kwpatchfile_init(orig, self, ui, fname, opener, |
21b29f4c7c9f
keyword: break overlong line
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
498 missing=False, eol=None): |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
499 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
500 rejects or conflicts due to expanded keywords in working dir.''' |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8763
diff
changeset
|
501 orig(self, ui, fname, opener, missing, eol) |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
502 # shrink keywords read from working dir |
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
503 self.lines = kwt.shrinklines(self.fname, self.lines) |
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
504 |
7308
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7216
diff
changeset
|
505 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7216
diff
changeset
|
506 opts=None): |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
507 '''Monkeypatch patch.diff to avoid expansion except when |
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
508 comparing against working dir.''' |
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
509 if node2 is not None: |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
510 kwt.match = util.never |
6747
f6c00b17387c
use repo[changeid] to get a changectx
Matt Mackall <mpm@selenic.com>
parents:
6743
diff
changeset
|
511 elif node1 is not None and node1 != repo['.'].node(): |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
512 kwt.restrict = True |
7308
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7216
diff
changeset
|
513 return orig(repo, node1, node2, match, changes, opts) |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6603
diff
changeset
|
514 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
515 def kwweb_skip(orig, web, req, tmpl): |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
516 '''Wraps webcommands.x turning off keyword expansion.''' |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
517 kwt.match = util.never |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
518 return orig(web, req, tmpl) |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
519 |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
520 repo.__class__ = kwrepo |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
521 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
522 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init) |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
523 extensions.wrapfunction(patch, 'diff', kw_diff) |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
524 for c in 'annotate changeset rev filediff diff'.split(): |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
525 extensions.wrapfunction(webcommands, c, kwweb_skip) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
526 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
527 cmdtable = { |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
528 'kwdemo': |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
529 (demo, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
530 [('d', 'default', None, _('show default keyword template maps')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
531 ('f', 'rcfile', [], _('read maps from rcfile'))], |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
532 _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
533 'kwexpand': (expand, commands.walkopts, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
534 _('hg kwexpand [OPTION]... [FILE]...')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
535 'kwfiles': |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
536 (files, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
537 [('a', 'all', None, _('show keyword status flags of all files')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
538 ('i', 'ignore', None, _('show files excluded from expansion')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
539 ('u', 'untracked', None, _('additionally show untracked files')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
540 ] + commands.walkopts, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
541 _('hg kwfiles [OPTION]... [FILE]...')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
542 'kwshrink': (shrink, commands.walkopts, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
543 _('hg kwshrink [OPTION]... [FILE]...')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
544 } |