##// END OF EJS Templates
keyword: intentionally ignore check-code warning about unwrapped ui message
Christian Ebert -
r16741:77c9a78e default
parent child Browse files
Show More
@@ -1,702 +1,702
1 # keyword.py - $Keyword$ expansion for Mercurial
1 # keyword.py - $Keyword$ expansion for Mercurial
2 #
2 #
3 # Copyright 2007-2010 Christian Ebert <blacktrash@gmx.net>
3 # Copyright 2007-2010 Christian Ebert <blacktrash@gmx.net>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7 #
7 #
8 # $Id$
8 # $Id$
9 #
9 #
10 # Keyword expansion hack against the grain of a DSCM
10 # Keyword expansion hack against the grain of a DSCM
11 #
11 #
12 # There are many good reasons why this is not needed in a distributed
12 # There are many good reasons why this is not needed in a distributed
13 # SCM, still it may be useful in very small projects based on single
13 # SCM, still it may be useful in very small projects based on single
14 # files (like LaTeX packages), that are mostly addressed to an
14 # files (like LaTeX packages), that are mostly addressed to an
15 # audience not running a version control system.
15 # audience not running a version control system.
16 #
16 #
17 # For in-depth discussion refer to
17 # For in-depth discussion refer to
18 # <http://mercurial.selenic.com/wiki/KeywordPlan>.
18 # <http://mercurial.selenic.com/wiki/KeywordPlan>.
19 #
19 #
20 # Keyword expansion is based on Mercurial's changeset template mappings.
20 # Keyword expansion is based on Mercurial's changeset template mappings.
21 #
21 #
22 # Binary files are not touched.
22 # Binary files are not touched.
23 #
23 #
24 # Files to act upon/ignore are specified in the [keyword] section.
24 # Files to act upon/ignore are specified in the [keyword] section.
25 # Customized keyword template mappings in the [keywordmaps] section.
25 # Customized keyword template mappings in the [keywordmaps] section.
26 #
26 #
27 # Run "hg help keyword" and "hg kwdemo" to get info on configuration.
27 # Run "hg help keyword" and "hg kwdemo" to get info on configuration.
28
28
29 '''expand keywords in tracked files
29 '''expand keywords in tracked files
30
30
31 This extension expands RCS/CVS-like or self-customized $Keywords$ in
31 This extension expands RCS/CVS-like or self-customized $Keywords$ in
32 tracked text files selected by your configuration.
32 tracked text files selected by your configuration.
33
33
34 Keywords are only expanded in local repositories and not stored in the
34 Keywords are only expanded in local repositories and not stored in the
35 change history. The mechanism can be regarded as a convenience for the
35 change history. The mechanism can be regarded as a convenience for the
36 current user or for archive distribution.
36 current user or for archive distribution.
37
37
38 Keywords expand to the changeset data pertaining to the latest change
38 Keywords expand to the changeset data pertaining to the latest change
39 relative to the working directory parent of each file.
39 relative to the working directory parent of each file.
40
40
41 Configuration is done in the [keyword], [keywordset] and [keywordmaps]
41 Configuration is done in the [keyword], [keywordset] and [keywordmaps]
42 sections of hgrc files.
42 sections of hgrc files.
43
43
44 Example::
44 Example::
45
45
46 [keyword]
46 [keyword]
47 # expand keywords in every python file except those matching "x*"
47 # expand keywords in every python file except those matching "x*"
48 **.py =
48 **.py =
49 x* = ignore
49 x* = ignore
50
50
51 [keywordset]
51 [keywordset]
52 # prefer svn- over cvs-like default keywordmaps
52 # prefer svn- over cvs-like default keywordmaps
53 svn = True
53 svn = True
54
54
55 .. note::
55 .. note::
56 The more specific you are in your filename patterns the less you
56 The more specific you are in your filename patterns the less you
57 lose speed in huge repositories.
57 lose speed in huge repositories.
58
58
59 For [keywordmaps] template mapping and expansion demonstration and
59 For [keywordmaps] template mapping and expansion demonstration and
60 control run :hg:`kwdemo`. See :hg:`help templates` for a list of
60 control run :hg:`kwdemo`. See :hg:`help templates` for a list of
61 available templates and filters.
61 available templates and filters.
62
62
63 Three additional date template filters are provided:
63 Three additional date template filters are provided:
64
64
65 :``utcdate``: "2006/09/18 15:13:13"
65 :``utcdate``: "2006/09/18 15:13:13"
66 :``svnutcdate``: "2006-09-18 15:13:13Z"
66 :``svnutcdate``: "2006-09-18 15:13:13Z"
67 :``svnisodate``: "2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)"
67 :``svnisodate``: "2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)"
68
68
69 The default template mappings (view with :hg:`kwdemo -d`) can be
69 The default template mappings (view with :hg:`kwdemo -d`) can be
70 replaced with customized keywords and templates. Again, run
70 replaced with customized keywords and templates. Again, run
71 :hg:`kwdemo` to control the results of your configuration changes.
71 :hg:`kwdemo` to control the results of your configuration changes.
72
72
73 Before changing/disabling active keywords, you must run :hg:`kwshrink`
73 Before changing/disabling active keywords, you must run :hg:`kwshrink`
74 to avoid storing expanded keywords in the change history.
74 to avoid storing expanded keywords in the change history.
75
75
76 To force expansion after enabling it, or a configuration change, run
76 To force expansion after enabling it, or a configuration change, run
77 :hg:`kwexpand`.
77 :hg:`kwexpand`.
78
78
79 Expansions spanning more than one line and incremental expansions,
79 Expansions spanning more than one line and incremental expansions,
80 like CVS' $Log$, are not supported. A keyword template map "Log =
80 like CVS' $Log$, are not supported. A keyword template map "Log =
81 {desc}" expands to the first line of the changeset description.
81 {desc}" expands to the first line of the changeset description.
82 '''
82 '''
83
83
84 from mercurial import commands, context, cmdutil, dispatch, filelog, extensions
84 from mercurial import commands, context, cmdutil, dispatch, filelog, extensions
85 from mercurial import localrepo, match, patch, templatefilters, templater, util
85 from mercurial import localrepo, match, patch, templatefilters, templater, util
86 from mercurial import scmutil
86 from mercurial import scmutil
87 from mercurial.hgweb import webcommands
87 from mercurial.hgweb import webcommands
88 from mercurial.i18n import _
88 from mercurial.i18n import _
89 import os, re, shutil, tempfile
89 import os, re, shutil, tempfile
90
90
91 commands.optionalrepo += ' kwdemo'
91 commands.optionalrepo += ' kwdemo'
92
92
93 cmdtable = {}
93 cmdtable = {}
94 command = cmdutil.command(cmdtable)
94 command = cmdutil.command(cmdtable)
95
95
96 # hg commands that do not act on keywords
96 # hg commands that do not act on keywords
97 nokwcommands = ('add addremove annotate bundle export grep incoming init log'
97 nokwcommands = ('add addremove annotate bundle export grep incoming init log'
98 ' outgoing push tip verify convert email glog')
98 ' outgoing push tip verify convert email glog')
99
99
100 # hg commands that trigger expansion only when writing to working dir,
100 # hg commands that trigger expansion only when writing to working dir,
101 # not when reading filelog, and unexpand when reading from working dir
101 # not when reading filelog, and unexpand when reading from working dir
102 restricted = 'merge kwexpand kwshrink record qrecord resolve transplant'
102 restricted = 'merge kwexpand kwshrink record qrecord resolve transplant'
103
103
104 # names of extensions using dorecord
104 # names of extensions using dorecord
105 recordextensions = 'record'
105 recordextensions = 'record'
106
106
107 colortable = {
107 colortable = {
108 'kwfiles.enabled': 'green bold',
108 'kwfiles.enabled': 'green bold',
109 'kwfiles.deleted': 'cyan bold underline',
109 'kwfiles.deleted': 'cyan bold underline',
110 'kwfiles.enabledunknown': 'green',
110 'kwfiles.enabledunknown': 'green',
111 'kwfiles.ignored': 'bold',
111 'kwfiles.ignored': 'bold',
112 'kwfiles.ignoredunknown': 'none'
112 'kwfiles.ignoredunknown': 'none'
113 }
113 }
114
114
115 # date like in cvs' $Date
115 # date like in cvs' $Date
116 def utcdate(text):
116 def utcdate(text):
117 ''':utcdate: Date. Returns a UTC-date in this format: "2009/08/18 11:00:13".
117 ''':utcdate: Date. Returns a UTC-date in this format: "2009/08/18 11:00:13".
118 '''
118 '''
119 return util.datestr((text[0], 0), '%Y/%m/%d %H:%M:%S')
119 return util.datestr((text[0], 0), '%Y/%m/%d %H:%M:%S')
120 # date like in svn's $Date
120 # date like in svn's $Date
121 def svnisodate(text):
121 def svnisodate(text):
122 ''':svnisodate: Date. Returns a date in this format: "2009-08-18 13:00:13
122 ''':svnisodate: Date. Returns a date in this format: "2009-08-18 13:00:13
123 +0200 (Tue, 18 Aug 2009)".
123 +0200 (Tue, 18 Aug 2009)".
124 '''
124 '''
125 return util.datestr(text, '%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')
125 return util.datestr(text, '%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')
126 # date like in svn's $Id
126 # date like in svn's $Id
127 def svnutcdate(text):
127 def svnutcdate(text):
128 ''':svnutcdate: Date. Returns a UTC-date in this format: "2009-08-18
128 ''':svnutcdate: Date. Returns a UTC-date in this format: "2009-08-18
129 11:00:13Z".
129 11:00:13Z".
130 '''
130 '''
131 return util.datestr((text[0], 0), '%Y-%m-%d %H:%M:%SZ')
131 return util.datestr((text[0], 0), '%Y-%m-%d %H:%M:%SZ')
132
132
133 templatefilters.filters.update({'utcdate': utcdate,
133 templatefilters.filters.update({'utcdate': utcdate,
134 'svnisodate': svnisodate,
134 'svnisodate': svnisodate,
135 'svnutcdate': svnutcdate})
135 'svnutcdate': svnutcdate})
136
136
137 # make keyword tools accessible
137 # make keyword tools accessible
138 kwtools = {'templater': None, 'hgcmd': ''}
138 kwtools = {'templater': None, 'hgcmd': ''}
139
139
140 def _defaultkwmaps(ui):
140 def _defaultkwmaps(ui):
141 '''Returns default keywordmaps according to keywordset configuration.'''
141 '''Returns default keywordmaps according to keywordset configuration.'''
142 templates = {
142 templates = {
143 'Revision': '{node|short}',
143 'Revision': '{node|short}',
144 'Author': '{author|user}',
144 'Author': '{author|user}',
145 }
145 }
146 kwsets = ({
146 kwsets = ({
147 'Date': '{date|utcdate}',
147 'Date': '{date|utcdate}',
148 'RCSfile': '{file|basename},v',
148 'RCSfile': '{file|basename},v',
149 'RCSFile': '{file|basename},v', # kept for backwards compatibility
149 'RCSFile': '{file|basename},v', # kept for backwards compatibility
150 # with hg-keyword
150 # with hg-keyword
151 'Source': '{root}/{file},v',
151 'Source': '{root}/{file},v',
152 'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
152 'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
153 'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
153 'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
154 }, {
154 }, {
155 'Date': '{date|svnisodate}',
155 'Date': '{date|svnisodate}',
156 'Id': '{file|basename},v {node|short} {date|svnutcdate} {author|user}',
156 'Id': '{file|basename},v {node|short} {date|svnutcdate} {author|user}',
157 'LastChangedRevision': '{node|short}',
157 'LastChangedRevision': '{node|short}',
158 'LastChangedBy': '{author|user}',
158 'LastChangedBy': '{author|user}',
159 'LastChangedDate': '{date|svnisodate}',
159 'LastChangedDate': '{date|svnisodate}',
160 })
160 })
161 templates.update(kwsets[ui.configbool('keywordset', 'svn')])
161 templates.update(kwsets[ui.configbool('keywordset', 'svn')])
162 return templates
162 return templates
163
163
164 def _shrinktext(text, subfunc):
164 def _shrinktext(text, subfunc):
165 '''Helper for keyword expansion removal in text.
165 '''Helper for keyword expansion removal in text.
166 Depending on subfunc also returns number of substitutions.'''
166 Depending on subfunc also returns number of substitutions.'''
167 return subfunc(r'$\1$', text)
167 return subfunc(r'$\1$', text)
168
168
169 def _preselect(wstatus, changed):
169 def _preselect(wstatus, changed):
170 '''Retrieves modfied and added files from a working directory state
170 '''Retrieves modfied and added files from a working directory state
171 and returns the subset of each contained in given changed files
171 and returns the subset of each contained in given changed files
172 retrieved from a change context.'''
172 retrieved from a change context.'''
173 modified, added = wstatus[:2]
173 modified, added = wstatus[:2]
174 modified = [f for f in modified if f in changed]
174 modified = [f for f in modified if f in changed]
175 added = [f for f in added if f in changed]
175 added = [f for f in added if f in changed]
176 return modified, added
176 return modified, added
177
177
178
178
179 class kwtemplater(object):
179 class kwtemplater(object):
180 '''
180 '''
181 Sets up keyword templates, corresponding keyword regex, and
181 Sets up keyword templates, corresponding keyword regex, and
182 provides keyword substitution functions.
182 provides keyword substitution functions.
183 '''
183 '''
184
184
185 def __init__(self, ui, repo, inc, exc):
185 def __init__(self, ui, repo, inc, exc):
186 self.ui = ui
186 self.ui = ui
187 self.repo = repo
187 self.repo = repo
188 self.match = match.match(repo.root, '', [], inc, exc)
188 self.match = match.match(repo.root, '', [], inc, exc)
189 self.restrict = kwtools['hgcmd'] in restricted.split()
189 self.restrict = kwtools['hgcmd'] in restricted.split()
190 self.record = False
190 self.record = False
191
191
192 kwmaps = self.ui.configitems('keywordmaps')
192 kwmaps = self.ui.configitems('keywordmaps')
193 if kwmaps: # override default templates
193 if kwmaps: # override default templates
194 self.templates = dict((k, templater.parsestring(v, False))
194 self.templates = dict((k, templater.parsestring(v, False))
195 for k, v in kwmaps)
195 for k, v in kwmaps)
196 else:
196 else:
197 self.templates = _defaultkwmaps(self.ui)
197 self.templates = _defaultkwmaps(self.ui)
198
198
199 @util.propertycache
199 @util.propertycache
200 def escape(self):
200 def escape(self):
201 '''Returns bar-separated and escaped keywords.'''
201 '''Returns bar-separated and escaped keywords.'''
202 return '|'.join(map(re.escape, self.templates.keys()))
202 return '|'.join(map(re.escape, self.templates.keys()))
203
203
204 @util.propertycache
204 @util.propertycache
205 def rekw(self):
205 def rekw(self):
206 '''Returns regex for unexpanded keywords.'''
206 '''Returns regex for unexpanded keywords.'''
207 return re.compile(r'\$(%s)\$' % self.escape)
207 return re.compile(r'\$(%s)\$' % self.escape)
208
208
209 @util.propertycache
209 @util.propertycache
210 def rekwexp(self):
210 def rekwexp(self):
211 '''Returns regex for expanded keywords.'''
211 '''Returns regex for expanded keywords.'''
212 return re.compile(r'\$(%s): [^$\n\r]*? \$' % self.escape)
212 return re.compile(r'\$(%s): [^$\n\r]*? \$' % self.escape)
213
213
214 def substitute(self, data, path, ctx, subfunc):
214 def substitute(self, data, path, ctx, subfunc):
215 '''Replaces keywords in data with expanded template.'''
215 '''Replaces keywords in data with expanded template.'''
216 def kwsub(mobj):
216 def kwsub(mobj):
217 kw = mobj.group(1)
217 kw = mobj.group(1)
218 ct = cmdutil.changeset_templater(self.ui, self.repo,
218 ct = cmdutil.changeset_templater(self.ui, self.repo,
219 False, None, '', False)
219 False, None, '', False)
220 ct.use_template(self.templates[kw])
220 ct.use_template(self.templates[kw])
221 self.ui.pushbuffer()
221 self.ui.pushbuffer()
222 ct.show(ctx, root=self.repo.root, file=path)
222 ct.show(ctx, root=self.repo.root, file=path)
223 ekw = templatefilters.firstline(self.ui.popbuffer())
223 ekw = templatefilters.firstline(self.ui.popbuffer())
224 return '$%s: %s $' % (kw, ekw)
224 return '$%s: %s $' % (kw, ekw)
225 return subfunc(kwsub, data)
225 return subfunc(kwsub, data)
226
226
227 def linkctx(self, path, fileid):
227 def linkctx(self, path, fileid):
228 '''Similar to filelog.linkrev, but returns a changectx.'''
228 '''Similar to filelog.linkrev, but returns a changectx.'''
229 return self.repo.filectx(path, fileid=fileid).changectx()
229 return self.repo.filectx(path, fileid=fileid).changectx()
230
230
231 def expand(self, path, node, data):
231 def expand(self, path, node, data):
232 '''Returns data with keywords expanded.'''
232 '''Returns data with keywords expanded.'''
233 if not self.restrict and self.match(path) and not util.binary(data):
233 if not self.restrict and self.match(path) and not util.binary(data):
234 ctx = self.linkctx(path, node)
234 ctx = self.linkctx(path, node)
235 return self.substitute(data, path, ctx, self.rekw.sub)
235 return self.substitute(data, path, ctx, self.rekw.sub)
236 return data
236 return data
237
237
238 def iskwfile(self, cand, ctx):
238 def iskwfile(self, cand, ctx):
239 '''Returns subset of candidates which are configured for keyword
239 '''Returns subset of candidates which are configured for keyword
240 expansion but are not symbolic links.'''
240 expansion but are not symbolic links.'''
241 return [f for f in cand if self.match(f) and 'l' not in ctx.flags(f)]
241 return [f for f in cand if self.match(f) and 'l' not in ctx.flags(f)]
242
242
243 def overwrite(self, ctx, candidates, lookup, expand, rekw=False):
243 def overwrite(self, ctx, candidates, lookup, expand, rekw=False):
244 '''Overwrites selected files expanding/shrinking keywords.'''
244 '''Overwrites selected files expanding/shrinking keywords.'''
245 if self.restrict or lookup or self.record: # exclude kw_copy
245 if self.restrict or lookup or self.record: # exclude kw_copy
246 candidates = self.iskwfile(candidates, ctx)
246 candidates = self.iskwfile(candidates, ctx)
247 if not candidates:
247 if not candidates:
248 return
248 return
249 kwcmd = self.restrict and lookup # kwexpand/kwshrink
249 kwcmd = self.restrict and lookup # kwexpand/kwshrink
250 if self.restrict or expand and lookup:
250 if self.restrict or expand and lookup:
251 mf = ctx.manifest()
251 mf = ctx.manifest()
252 if self.restrict or rekw:
252 if self.restrict or rekw:
253 re_kw = self.rekw
253 re_kw = self.rekw
254 else:
254 else:
255 re_kw = self.rekwexp
255 re_kw = self.rekwexp
256 if expand:
256 if expand:
257 msg = _('overwriting %s expanding keywords\n')
257 msg = _('overwriting %s expanding keywords\n')
258 else:
258 else:
259 msg = _('overwriting %s shrinking keywords\n')
259 msg = _('overwriting %s shrinking keywords\n')
260 for f in candidates:
260 for f in candidates:
261 if self.restrict:
261 if self.restrict:
262 data = self.repo.file(f).read(mf[f])
262 data = self.repo.file(f).read(mf[f])
263 else:
263 else:
264 data = self.repo.wread(f)
264 data = self.repo.wread(f)
265 if util.binary(data):
265 if util.binary(data):
266 continue
266 continue
267 if expand:
267 if expand:
268 if lookup:
268 if lookup:
269 ctx = self.linkctx(f, mf[f])
269 ctx = self.linkctx(f, mf[f])
270 data, found = self.substitute(data, f, ctx, re_kw.subn)
270 data, found = self.substitute(data, f, ctx, re_kw.subn)
271 elif self.restrict:
271 elif self.restrict:
272 found = re_kw.search(data)
272 found = re_kw.search(data)
273 else:
273 else:
274 data, found = _shrinktext(data, re_kw.subn)
274 data, found = _shrinktext(data, re_kw.subn)
275 if found:
275 if found:
276 self.ui.note(msg % f)
276 self.ui.note(msg % f)
277 fp = self.repo.wopener(f, "wb", atomictemp=True)
277 fp = self.repo.wopener(f, "wb", atomictemp=True)
278 fp.write(data)
278 fp.write(data)
279 fp.close()
279 fp.close()
280 if kwcmd:
280 if kwcmd:
281 self.repo.dirstate.normal(f)
281 self.repo.dirstate.normal(f)
282 elif self.record:
282 elif self.record:
283 self.repo.dirstate.normallookup(f)
283 self.repo.dirstate.normallookup(f)
284
284
285 def shrink(self, fname, text):
285 def shrink(self, fname, text):
286 '''Returns text with all keyword substitutions removed.'''
286 '''Returns text with all keyword substitutions removed.'''
287 if self.match(fname) and not util.binary(text):
287 if self.match(fname) and not util.binary(text):
288 return _shrinktext(text, self.rekwexp.sub)
288 return _shrinktext(text, self.rekwexp.sub)
289 return text
289 return text
290
290
291 def shrinklines(self, fname, lines):
291 def shrinklines(self, fname, lines):
292 '''Returns lines with keyword substitutions removed.'''
292 '''Returns lines with keyword substitutions removed.'''
293 if self.match(fname):
293 if self.match(fname):
294 text = ''.join(lines)
294 text = ''.join(lines)
295 if not util.binary(text):
295 if not util.binary(text):
296 return _shrinktext(text, self.rekwexp.sub).splitlines(True)
296 return _shrinktext(text, self.rekwexp.sub).splitlines(True)
297 return lines
297 return lines
298
298
299 def wread(self, fname, data):
299 def wread(self, fname, data):
300 '''If in restricted mode returns data read from wdir with
300 '''If in restricted mode returns data read from wdir with
301 keyword substitutions removed.'''
301 keyword substitutions removed.'''
302 if self.restrict:
302 if self.restrict:
303 return self.shrink(fname, data)
303 return self.shrink(fname, data)
304 return data
304 return data
305
305
306 class kwfilelog(filelog.filelog):
306 class kwfilelog(filelog.filelog):
307 '''
307 '''
308 Subclass of filelog to hook into its read, add, cmp methods.
308 Subclass of filelog to hook into its read, add, cmp methods.
309 Keywords are "stored" unexpanded, and processed on reading.
309 Keywords are "stored" unexpanded, and processed on reading.
310 '''
310 '''
311 def __init__(self, opener, kwt, path):
311 def __init__(self, opener, kwt, path):
312 super(kwfilelog, self).__init__(opener, path)
312 super(kwfilelog, self).__init__(opener, path)
313 self.kwt = kwt
313 self.kwt = kwt
314 self.path = path
314 self.path = path
315
315
316 def read(self, node):
316 def read(self, node):
317 '''Expands keywords when reading filelog.'''
317 '''Expands keywords when reading filelog.'''
318 data = super(kwfilelog, self).read(node)
318 data = super(kwfilelog, self).read(node)
319 if self.renamed(node):
319 if self.renamed(node):
320 return data
320 return data
321 return self.kwt.expand(self.path, node, data)
321 return self.kwt.expand(self.path, node, data)
322
322
323 def add(self, text, meta, tr, link, p1=None, p2=None):
323 def add(self, text, meta, tr, link, p1=None, p2=None):
324 '''Removes keyword substitutions when adding to filelog.'''
324 '''Removes keyword substitutions when adding to filelog.'''
325 text = self.kwt.shrink(self.path, text)
325 text = self.kwt.shrink(self.path, text)
326 return super(kwfilelog, self).add(text, meta, tr, link, p1, p2)
326 return super(kwfilelog, self).add(text, meta, tr, link, p1, p2)
327
327
328 def cmp(self, node, text):
328 def cmp(self, node, text):
329 '''Removes keyword substitutions for comparison.'''
329 '''Removes keyword substitutions for comparison.'''
330 text = self.kwt.shrink(self.path, text)
330 text = self.kwt.shrink(self.path, text)
331 return super(kwfilelog, self).cmp(node, text)
331 return super(kwfilelog, self).cmp(node, text)
332
332
333 def _status(ui, repo, wctx, kwt, *pats, **opts):
333 def _status(ui, repo, wctx, kwt, *pats, **opts):
334 '''Bails out if [keyword] configuration is not active.
334 '''Bails out if [keyword] configuration is not active.
335 Returns status of working directory.'''
335 Returns status of working directory.'''
336 if kwt:
336 if kwt:
337 return repo.status(match=scmutil.match(wctx, pats, opts), clean=True,
337 return repo.status(match=scmutil.match(wctx, pats, opts), clean=True,
338 unknown=opts.get('unknown') or opts.get('all'))
338 unknown=opts.get('unknown') or opts.get('all'))
339 if ui.configitems('keyword'):
339 if ui.configitems('keyword'):
340 raise util.Abort(_('[keyword] patterns cannot match'))
340 raise util.Abort(_('[keyword] patterns cannot match'))
341 raise util.Abort(_('no [keyword] patterns configured'))
341 raise util.Abort(_('no [keyword] patterns configured'))
342
342
343 def _kwfwrite(ui, repo, expand, *pats, **opts):
343 def _kwfwrite(ui, repo, expand, *pats, **opts):
344 '''Selects files and passes them to kwtemplater.overwrite.'''
344 '''Selects files and passes them to kwtemplater.overwrite.'''
345 wctx = repo[None]
345 wctx = repo[None]
346 if len(wctx.parents()) > 1:
346 if len(wctx.parents()) > 1:
347 raise util.Abort(_('outstanding uncommitted merge'))
347 raise util.Abort(_('outstanding uncommitted merge'))
348 kwt = kwtools['templater']
348 kwt = kwtools['templater']
349 wlock = repo.wlock()
349 wlock = repo.wlock()
350 try:
350 try:
351 status = _status(ui, repo, wctx, kwt, *pats, **opts)
351 status = _status(ui, repo, wctx, kwt, *pats, **opts)
352 modified, added, removed, deleted, unknown, ignored, clean = status
352 modified, added, removed, deleted, unknown, ignored, clean = status
353 if modified or added or removed or deleted:
353 if modified or added or removed or deleted:
354 raise util.Abort(_('outstanding uncommitted changes'))
354 raise util.Abort(_('outstanding uncommitted changes'))
355 kwt.overwrite(wctx, clean, True, expand)
355 kwt.overwrite(wctx, clean, True, expand)
356 finally:
356 finally:
357 wlock.release()
357 wlock.release()
358
358
359 @command('kwdemo',
359 @command('kwdemo',
360 [('d', 'default', None, _('show default keyword template maps')),
360 [('d', 'default', None, _('show default keyword template maps')),
361 ('f', 'rcfile', '',
361 ('f', 'rcfile', '',
362 _('read maps from rcfile'), _('FILE'))],
362 _('read maps from rcfile'), _('FILE'))],
363 _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...'))
363 _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...'))
364 def demo(ui, repo, *args, **opts):
364 def demo(ui, repo, *args, **opts):
365 '''print [keywordmaps] configuration and an expansion example
365 '''print [keywordmaps] configuration and an expansion example
366
366
367 Show current, custom, or default keyword template maps and their
367 Show current, custom, or default keyword template maps and their
368 expansions.
368 expansions.
369
369
370 Extend the current configuration by specifying maps as arguments
370 Extend the current configuration by specifying maps as arguments
371 and using -f/--rcfile to source an external hgrc file.
371 and using -f/--rcfile to source an external hgrc file.
372
372
373 Use -d/--default to disable current configuration.
373 Use -d/--default to disable current configuration.
374
374
375 See :hg:`help templates` for information on templates and filters.
375 See :hg:`help templates` for information on templates and filters.
376 '''
376 '''
377 def demoitems(section, items):
377 def demoitems(section, items):
378 ui.write('[%s]\n' % section)
378 ui.write('[%s]\n' % section)
379 for k, v in sorted(items):
379 for k, v in sorted(items):
380 ui.write('%s = %s\n' % (k, v))
380 ui.write('%s = %s\n' % (k, v))
381
381
382 fn = 'demo.txt'
382 fn = 'demo.txt'
383 tmpdir = tempfile.mkdtemp('', 'kwdemo.')
383 tmpdir = tempfile.mkdtemp('', 'kwdemo.')
384 ui.note(_('creating temporary repository at %s\n') % tmpdir)
384 ui.note(_('creating temporary repository at %s\n') % tmpdir)
385 repo = localrepo.localrepository(ui, tmpdir, True)
385 repo = localrepo.localrepository(ui, tmpdir, True)
386 ui.setconfig('keyword', fn, '')
386 ui.setconfig('keyword', fn, '')
387 svn = ui.configbool('keywordset', 'svn')
387 svn = ui.configbool('keywordset', 'svn')
388 # explicitly set keywordset for demo output
388 # explicitly set keywordset for demo output
389 ui.setconfig('keywordset', 'svn', svn)
389 ui.setconfig('keywordset', 'svn', svn)
390
390
391 uikwmaps = ui.configitems('keywordmaps')
391 uikwmaps = ui.configitems('keywordmaps')
392 if args or opts.get('rcfile'):
392 if args or opts.get('rcfile'):
393 ui.status(_('\n\tconfiguration using custom keyword template maps\n'))
393 ui.status(_('\n\tconfiguration using custom keyword template maps\n'))
394 if uikwmaps:
394 if uikwmaps:
395 ui.status(_('\textending current template maps\n'))
395 ui.status(_('\textending current template maps\n'))
396 if opts.get('default') or not uikwmaps:
396 if opts.get('default') or not uikwmaps:
397 if svn:
397 if svn:
398 ui.status(_('\toverriding default svn keywordset\n'))
398 ui.status(_('\toverriding default svn keywordset\n'))
399 else:
399 else:
400 ui.status(_('\toverriding default cvs keywordset\n'))
400 ui.status(_('\toverriding default cvs keywordset\n'))
401 if opts.get('rcfile'):
401 if opts.get('rcfile'):
402 ui.readconfig(opts.get('rcfile'))
402 ui.readconfig(opts.get('rcfile'))
403 if args:
403 if args:
404 # simulate hgrc parsing
404 # simulate hgrc parsing
405 rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
405 rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
406 fp = repo.opener('hgrc', 'w')
406 fp = repo.opener('hgrc', 'w')
407 fp.writelines(rcmaps)
407 fp.writelines(rcmaps)
408 fp.close()
408 fp.close()
409 ui.readconfig(repo.join('hgrc'))
409 ui.readconfig(repo.join('hgrc'))
410 kwmaps = dict(ui.configitems('keywordmaps'))
410 kwmaps = dict(ui.configitems('keywordmaps'))
411 elif opts.get('default'):
411 elif opts.get('default'):
412 if svn:
412 if svn:
413 ui.status(_('\n\tconfiguration using default svn keywordset\n'))
413 ui.status(_('\n\tconfiguration using default svn keywordset\n'))
414 else:
414 else:
415 ui.status(_('\n\tconfiguration using default cvs keywordset\n'))
415 ui.status(_('\n\tconfiguration using default cvs keywordset\n'))
416 kwmaps = _defaultkwmaps(ui)
416 kwmaps = _defaultkwmaps(ui)
417 if uikwmaps:
417 if uikwmaps:
418 ui.status(_('\tdisabling current template maps\n'))
418 ui.status(_('\tdisabling current template maps\n'))
419 for k, v in kwmaps.iteritems():
419 for k, v in kwmaps.iteritems():
420 ui.setconfig('keywordmaps', k, v)
420 ui.setconfig('keywordmaps', k, v)
421 else:
421 else:
422 ui.status(_('\n\tconfiguration using current keyword template maps\n'))
422 ui.status(_('\n\tconfiguration using current keyword template maps\n'))
423 if uikwmaps:
423 if uikwmaps:
424 kwmaps = dict(uikwmaps)
424 kwmaps = dict(uikwmaps)
425 else:
425 else:
426 kwmaps = _defaultkwmaps(ui)
426 kwmaps = _defaultkwmaps(ui)
427
427
428 uisetup(ui)
428 uisetup(ui)
429 reposetup(ui, repo)
429 reposetup(ui, repo)
430 ui.write('[extensions]\nkeyword =\n')
430 ui.write('[extensions]\nkeyword =\n')
431 demoitems('keyword', ui.configitems('keyword'))
431 demoitems('keyword', ui.configitems('keyword'))
432 demoitems('keywordset', ui.configitems('keywordset'))
432 demoitems('keywordset', ui.configitems('keywordset'))
433 demoitems('keywordmaps', kwmaps.iteritems())
433 demoitems('keywordmaps', kwmaps.iteritems())
434 keywords = '$' + '$\n$'.join(sorted(kwmaps.keys())) + '$\n'
434 keywords = '$' + '$\n$'.join(sorted(kwmaps.keys())) + '$\n'
435 repo.wopener.write(fn, keywords)
435 repo.wopener.write(fn, keywords)
436 repo[None].add([fn])
436 repo[None].add([fn])
437 ui.note(_('\nkeywords written to %s:\n') % fn)
437 ui.note(_('\nkeywords written to %s:\n') % fn)
438 ui.note(keywords)
438 ui.note(keywords)
439 repo.dirstate.setbranch('demobranch')
439 repo.dirstate.setbranch('demobranch')
440 for name, cmd in ui.configitems('hooks'):
440 for name, cmd in ui.configitems('hooks'):
441 if name.split('.', 1)[0].find('commit') > -1:
441 if name.split('.', 1)[0].find('commit') > -1:
442 repo.ui.setconfig('hooks', name, '')
442 repo.ui.setconfig('hooks', name, '')
443 msg = _('hg keyword configuration and expansion example')
443 msg = _('hg keyword configuration and expansion example')
444 ui.note("hg ci -m '%s'\n" % msg)
444 ui.note("hg ci -m '%s'\n" % msg) # check-code-ignore
445 repo.commit(text=msg)
445 repo.commit(text=msg)
446 ui.status(_('\n\tkeywords expanded\n'))
446 ui.status(_('\n\tkeywords expanded\n'))
447 ui.write(repo.wread(fn))
447 ui.write(repo.wread(fn))
448 shutil.rmtree(tmpdir, ignore_errors=True)
448 shutil.rmtree(tmpdir, ignore_errors=True)
449
449
450 @command('kwexpand', commands.walkopts, _('hg kwexpand [OPTION]... [FILE]...'))
450 @command('kwexpand', commands.walkopts, _('hg kwexpand [OPTION]... [FILE]...'))
451 def expand(ui, repo, *pats, **opts):
451 def expand(ui, repo, *pats, **opts):
452 '''expand keywords in the working directory
452 '''expand keywords in the working directory
453
453
454 Run after (re)enabling keyword expansion.
454 Run after (re)enabling keyword expansion.
455
455
456 kwexpand refuses to run if given files contain local changes.
456 kwexpand refuses to run if given files contain local changes.
457 '''
457 '''
458 # 3rd argument sets expansion to True
458 # 3rd argument sets expansion to True
459 _kwfwrite(ui, repo, True, *pats, **opts)
459 _kwfwrite(ui, repo, True, *pats, **opts)
460
460
461 @command('kwfiles',
461 @command('kwfiles',
462 [('A', 'all', None, _('show keyword status flags of all files')),
462 [('A', 'all', None, _('show keyword status flags of all files')),
463 ('i', 'ignore', None, _('show files excluded from expansion')),
463 ('i', 'ignore', None, _('show files excluded from expansion')),
464 ('u', 'unknown', None, _('only show unknown (not tracked) files')),
464 ('u', 'unknown', None, _('only show unknown (not tracked) files')),
465 ] + commands.walkopts,
465 ] + commands.walkopts,
466 _('hg kwfiles [OPTION]... [FILE]...'))
466 _('hg kwfiles [OPTION]... [FILE]...'))
467 def files(ui, repo, *pats, **opts):
467 def files(ui, repo, *pats, **opts):
468 '''show files configured for keyword expansion
468 '''show files configured for keyword expansion
469
469
470 List which files in the working directory are matched by the
470 List which files in the working directory are matched by the
471 [keyword] configuration patterns.
471 [keyword] configuration patterns.
472
472
473 Useful to prevent inadvertent keyword expansion and to speed up
473 Useful to prevent inadvertent keyword expansion and to speed up
474 execution by including only files that are actual candidates for
474 execution by including only files that are actual candidates for
475 expansion.
475 expansion.
476
476
477 See :hg:`help keyword` on how to construct patterns both for
477 See :hg:`help keyword` on how to construct patterns both for
478 inclusion and exclusion of files.
478 inclusion and exclusion of files.
479
479
480 With -A/--all and -v/--verbose the codes used to show the status
480 With -A/--all and -v/--verbose the codes used to show the status
481 of files are::
481 of files are::
482
482
483 K = keyword expansion candidate
483 K = keyword expansion candidate
484 k = keyword expansion candidate (not tracked)
484 k = keyword expansion candidate (not tracked)
485 I = ignored
485 I = ignored
486 i = ignored (not tracked)
486 i = ignored (not tracked)
487 '''
487 '''
488 kwt = kwtools['templater']
488 kwt = kwtools['templater']
489 wctx = repo[None]
489 wctx = repo[None]
490 status = _status(ui, repo, wctx, kwt, *pats, **opts)
490 status = _status(ui, repo, wctx, kwt, *pats, **opts)
491 cwd = pats and repo.getcwd() or ''
491 cwd = pats and repo.getcwd() or ''
492 modified, added, removed, deleted, unknown, ignored, clean = status
492 modified, added, removed, deleted, unknown, ignored, clean = status
493 files = []
493 files = []
494 if not opts.get('unknown') or opts.get('all'):
494 if not opts.get('unknown') or opts.get('all'):
495 files = sorted(modified + added + clean)
495 files = sorted(modified + added + clean)
496 kwfiles = kwt.iskwfile(files, wctx)
496 kwfiles = kwt.iskwfile(files, wctx)
497 kwdeleted = kwt.iskwfile(deleted, wctx)
497 kwdeleted = kwt.iskwfile(deleted, wctx)
498 kwunknown = kwt.iskwfile(unknown, wctx)
498 kwunknown = kwt.iskwfile(unknown, wctx)
499 if not opts.get('ignore') or opts.get('all'):
499 if not opts.get('ignore') or opts.get('all'):
500 showfiles = kwfiles, kwdeleted, kwunknown
500 showfiles = kwfiles, kwdeleted, kwunknown
501 else:
501 else:
502 showfiles = [], [], []
502 showfiles = [], [], []
503 if opts.get('all') or opts.get('ignore'):
503 if opts.get('all') or opts.get('ignore'):
504 showfiles += ([f for f in files if f not in kwfiles],
504 showfiles += ([f for f in files if f not in kwfiles],
505 [f for f in unknown if f not in kwunknown])
505 [f for f in unknown if f not in kwunknown])
506 kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split()
506 kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split()
507 kwstates = zip('K!kIi', showfiles, kwlabels)
507 kwstates = zip('K!kIi', showfiles, kwlabels)
508 for char, filenames, kwstate in kwstates:
508 for char, filenames, kwstate in kwstates:
509 fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
509 fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
510 for f in filenames:
510 for f in filenames:
511 ui.write(fmt % repo.pathto(f, cwd), label='kwfiles.' + kwstate)
511 ui.write(fmt % repo.pathto(f, cwd), label='kwfiles.' + kwstate)
512
512
513 @command('kwshrink', commands.walkopts, _('hg kwshrink [OPTION]... [FILE]...'))
513 @command('kwshrink', commands.walkopts, _('hg kwshrink [OPTION]... [FILE]...'))
514 def shrink(ui, repo, *pats, **opts):
514 def shrink(ui, repo, *pats, **opts):
515 '''revert expanded keywords in the working directory
515 '''revert expanded keywords in the working directory
516
516
517 Must be run before changing/disabling active keywords.
517 Must be run before changing/disabling active keywords.
518
518
519 kwshrink refuses to run if given files contain local changes.
519 kwshrink refuses to run if given files contain local changes.
520 '''
520 '''
521 # 3rd argument sets expansion to False
521 # 3rd argument sets expansion to False
522 _kwfwrite(ui, repo, False, *pats, **opts)
522 _kwfwrite(ui, repo, False, *pats, **opts)
523
523
524
524
525 def uisetup(ui):
525 def uisetup(ui):
526 ''' Monkeypatches dispatch._parse to retrieve user command.'''
526 ''' Monkeypatches dispatch._parse to retrieve user command.'''
527
527
528 def kwdispatch_parse(orig, ui, args):
528 def kwdispatch_parse(orig, ui, args):
529 '''Monkeypatch dispatch._parse to obtain running hg command.'''
529 '''Monkeypatch dispatch._parse to obtain running hg command.'''
530 cmd, func, args, options, cmdoptions = orig(ui, args)
530 cmd, func, args, options, cmdoptions = orig(ui, args)
531 kwtools['hgcmd'] = cmd
531 kwtools['hgcmd'] = cmd
532 return cmd, func, args, options, cmdoptions
532 return cmd, func, args, options, cmdoptions
533
533
534 extensions.wrapfunction(dispatch, '_parse', kwdispatch_parse)
534 extensions.wrapfunction(dispatch, '_parse', kwdispatch_parse)
535
535
536 def reposetup(ui, repo):
536 def reposetup(ui, repo):
537 '''Sets up repo as kwrepo for keyword substitution.
537 '''Sets up repo as kwrepo for keyword substitution.
538 Overrides file method to return kwfilelog instead of filelog
538 Overrides file method to return kwfilelog instead of filelog
539 if file matches user configuration.
539 if file matches user configuration.
540 Wraps commit to overwrite configured files with updated
540 Wraps commit to overwrite configured files with updated
541 keyword substitutions.
541 keyword substitutions.
542 Monkeypatches patch and webcommands.'''
542 Monkeypatches patch and webcommands.'''
543
543
544 try:
544 try:
545 if (not repo.local() or kwtools['hgcmd'] in nokwcommands.split()
545 if (not repo.local() or kwtools['hgcmd'] in nokwcommands.split()
546 or '.hg' in util.splitpath(repo.root)
546 or '.hg' in util.splitpath(repo.root)
547 or repo._url.startswith('bundle:')):
547 or repo._url.startswith('bundle:')):
548 return
548 return
549 except AttributeError:
549 except AttributeError:
550 pass
550 pass
551
551
552 inc, exc = [], ['.hg*']
552 inc, exc = [], ['.hg*']
553 for pat, opt in ui.configitems('keyword'):
553 for pat, opt in ui.configitems('keyword'):
554 if opt != 'ignore':
554 if opt != 'ignore':
555 inc.append(pat)
555 inc.append(pat)
556 else:
556 else:
557 exc.append(pat)
557 exc.append(pat)
558 if not inc:
558 if not inc:
559 return
559 return
560
560
561 kwtools['templater'] = kwt = kwtemplater(ui, repo, inc, exc)
561 kwtools['templater'] = kwt = kwtemplater(ui, repo, inc, exc)
562
562
563 class kwrepo(repo.__class__):
563 class kwrepo(repo.__class__):
564 def file(self, f):
564 def file(self, f):
565 if f[0] == '/':
565 if f[0] == '/':
566 f = f[1:]
566 f = f[1:]
567 return kwfilelog(self.sopener, kwt, f)
567 return kwfilelog(self.sopener, kwt, f)
568
568
569 def wread(self, filename):
569 def wread(self, filename):
570 data = super(kwrepo, self).wread(filename)
570 data = super(kwrepo, self).wread(filename)
571 return kwt.wread(filename, data)
571 return kwt.wread(filename, data)
572
572
573 def commit(self, *args, **opts):
573 def commit(self, *args, **opts):
574 # use custom commitctx for user commands
574 # use custom commitctx for user commands
575 # other extensions can still wrap repo.commitctx directly
575 # other extensions can still wrap repo.commitctx directly
576 self.commitctx = self.kwcommitctx
576 self.commitctx = self.kwcommitctx
577 try:
577 try:
578 return super(kwrepo, self).commit(*args, **opts)
578 return super(kwrepo, self).commit(*args, **opts)
579 finally:
579 finally:
580 del self.commitctx
580 del self.commitctx
581
581
582 def kwcommitctx(self, ctx, error=False):
582 def kwcommitctx(self, ctx, error=False):
583 n = super(kwrepo, self).commitctx(ctx, error)
583 n = super(kwrepo, self).commitctx(ctx, error)
584 # no lock needed, only called from repo.commit() which already locks
584 # no lock needed, only called from repo.commit() which already locks
585 if not kwt.record:
585 if not kwt.record:
586 restrict = kwt.restrict
586 restrict = kwt.restrict
587 kwt.restrict = True
587 kwt.restrict = True
588 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()),
588 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()),
589 False, True)
589 False, True)
590 kwt.restrict = restrict
590 kwt.restrict = restrict
591 return n
591 return n
592
592
593 def rollback(self, dryrun=False, force=False):
593 def rollback(self, dryrun=False, force=False):
594 wlock = self.wlock()
594 wlock = self.wlock()
595 try:
595 try:
596 if not dryrun:
596 if not dryrun:
597 changed = self['.'].files()
597 changed = self['.'].files()
598 ret = super(kwrepo, self).rollback(dryrun, force)
598 ret = super(kwrepo, self).rollback(dryrun, force)
599 if not dryrun:
599 if not dryrun:
600 ctx = self['.']
600 ctx = self['.']
601 modified, added = _preselect(self[None].status(), changed)
601 modified, added = _preselect(self[None].status(), changed)
602 kwt.overwrite(ctx, modified, True, True)
602 kwt.overwrite(ctx, modified, True, True)
603 kwt.overwrite(ctx, added, True, False)
603 kwt.overwrite(ctx, added, True, False)
604 return ret
604 return ret
605 finally:
605 finally:
606 wlock.release()
606 wlock.release()
607
607
608 # monkeypatches
608 # monkeypatches
609 def kwpatchfile_init(orig, self, ui, gp, backend, store, eolmode=None):
609 def kwpatchfile_init(orig, self, ui, gp, backend, store, eolmode=None):
610 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
610 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
611 rejects or conflicts due to expanded keywords in working dir.'''
611 rejects or conflicts due to expanded keywords in working dir.'''
612 orig(self, ui, gp, backend, store, eolmode)
612 orig(self, ui, gp, backend, store, eolmode)
613 # shrink keywords read from working dir
613 # shrink keywords read from working dir
614 self.lines = kwt.shrinklines(self.fname, self.lines)
614 self.lines = kwt.shrinklines(self.fname, self.lines)
615
615
616 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
616 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
617 opts=None, prefix=''):
617 opts=None, prefix=''):
618 '''Monkeypatch patch.diff to avoid expansion.'''
618 '''Monkeypatch patch.diff to avoid expansion.'''
619 kwt.restrict = True
619 kwt.restrict = True
620 return orig(repo, node1, node2, match, changes, opts, prefix)
620 return orig(repo, node1, node2, match, changes, opts, prefix)
621
621
622 def kwweb_skip(orig, web, req, tmpl):
622 def kwweb_skip(orig, web, req, tmpl):
623 '''Wraps webcommands.x turning off keyword expansion.'''
623 '''Wraps webcommands.x turning off keyword expansion.'''
624 kwt.match = util.never
624 kwt.match = util.never
625 return orig(web, req, tmpl)
625 return orig(web, req, tmpl)
626
626
627 def kw_copy(orig, ui, repo, pats, opts, rename=False):
627 def kw_copy(orig, ui, repo, pats, opts, rename=False):
628 '''Wraps cmdutil.copy so that copy/rename destinations do not
628 '''Wraps cmdutil.copy so that copy/rename destinations do not
629 contain expanded keywords.
629 contain expanded keywords.
630 Note that the source of a regular file destination may also be a
630 Note that the source of a regular file destination may also be a
631 symlink:
631 symlink:
632 hg cp sym x -> x is symlink
632 hg cp sym x -> x is symlink
633 cp sym x; hg cp -A sym x -> x is file (maybe expanded keywords)
633 cp sym x; hg cp -A sym x -> x is file (maybe expanded keywords)
634 For the latter we have to follow the symlink to find out whether its
634 For the latter we have to follow the symlink to find out whether its
635 target is configured for expansion and we therefore must unexpand the
635 target is configured for expansion and we therefore must unexpand the
636 keywords in the destination.'''
636 keywords in the destination.'''
637 orig(ui, repo, pats, opts, rename)
637 orig(ui, repo, pats, opts, rename)
638 if opts.get('dry_run'):
638 if opts.get('dry_run'):
639 return
639 return
640 wctx = repo[None]
640 wctx = repo[None]
641 cwd = repo.getcwd()
641 cwd = repo.getcwd()
642
642
643 def haskwsource(dest):
643 def haskwsource(dest):
644 '''Returns true if dest is a regular file and configured for
644 '''Returns true if dest is a regular file and configured for
645 expansion or a symlink which points to a file configured for
645 expansion or a symlink which points to a file configured for
646 expansion. '''
646 expansion. '''
647 source = repo.dirstate.copied(dest)
647 source = repo.dirstate.copied(dest)
648 if 'l' in wctx.flags(source):
648 if 'l' in wctx.flags(source):
649 source = scmutil.canonpath(repo.root, cwd,
649 source = scmutil.canonpath(repo.root, cwd,
650 os.path.realpath(source))
650 os.path.realpath(source))
651 return kwt.match(source)
651 return kwt.match(source)
652
652
653 candidates = [f for f in repo.dirstate.copies() if
653 candidates = [f for f in repo.dirstate.copies() if
654 'l' not in wctx.flags(f) and haskwsource(f)]
654 'l' not in wctx.flags(f) and haskwsource(f)]
655 kwt.overwrite(wctx, candidates, False, False)
655 kwt.overwrite(wctx, candidates, False, False)
656
656
657 def kw_dorecord(orig, ui, repo, commitfunc, *pats, **opts):
657 def kw_dorecord(orig, ui, repo, commitfunc, *pats, **opts):
658 '''Wraps record.dorecord expanding keywords after recording.'''
658 '''Wraps record.dorecord expanding keywords after recording.'''
659 wlock = repo.wlock()
659 wlock = repo.wlock()
660 try:
660 try:
661 # record returns 0 even when nothing has changed
661 # record returns 0 even when nothing has changed
662 # therefore compare nodes before and after
662 # therefore compare nodes before and after
663 kwt.record = True
663 kwt.record = True
664 ctx = repo['.']
664 ctx = repo['.']
665 wstatus = repo[None].status()
665 wstatus = repo[None].status()
666 ret = orig(ui, repo, commitfunc, *pats, **opts)
666 ret = orig(ui, repo, commitfunc, *pats, **opts)
667 recctx = repo['.']
667 recctx = repo['.']
668 if ctx != recctx:
668 if ctx != recctx:
669 modified, added = _preselect(wstatus, recctx.files())
669 modified, added = _preselect(wstatus, recctx.files())
670 kwt.restrict = False
670 kwt.restrict = False
671 kwt.overwrite(recctx, modified, False, True)
671 kwt.overwrite(recctx, modified, False, True)
672 kwt.overwrite(recctx, added, False, True, True)
672 kwt.overwrite(recctx, added, False, True, True)
673 kwt.restrict = True
673 kwt.restrict = True
674 return ret
674 return ret
675 finally:
675 finally:
676 wlock.release()
676 wlock.release()
677
677
678 def kwfilectx_cmp(orig, self, fctx):
678 def kwfilectx_cmp(orig, self, fctx):
679 # keyword affects data size, comparing wdir and filelog size does
679 # keyword affects data size, comparing wdir and filelog size does
680 # not make sense
680 # not make sense
681 if (fctx._filerev is None and
681 if (fctx._filerev is None and
682 (self._repo._encodefilterpats or
682 (self._repo._encodefilterpats or
683 kwt.match(fctx.path()) and 'l' not in fctx.flags() or
683 kwt.match(fctx.path()) and 'l' not in fctx.flags() or
684 self.size() - 4 == fctx.size()) or
684 self.size() - 4 == fctx.size()) or
685 self.size() == fctx.size()):
685 self.size() == fctx.size()):
686 return self._filelog.cmp(self._filenode, fctx.data())
686 return self._filelog.cmp(self._filenode, fctx.data())
687 return True
687 return True
688
688
689 extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp)
689 extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp)
690 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
690 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
691 extensions.wrapfunction(patch, 'diff', kw_diff)
691 extensions.wrapfunction(patch, 'diff', kw_diff)
692 extensions.wrapfunction(cmdutil, 'copy', kw_copy)
692 extensions.wrapfunction(cmdutil, 'copy', kw_copy)
693 for c in 'annotate changeset rev filediff diff'.split():
693 for c in 'annotate changeset rev filediff diff'.split():
694 extensions.wrapfunction(webcommands, c, kwweb_skip)
694 extensions.wrapfunction(webcommands, c, kwweb_skip)
695 for name in recordextensions.split():
695 for name in recordextensions.split():
696 try:
696 try:
697 record = extensions.find(name)
697 record = extensions.find(name)
698 extensions.wrapfunction(record, 'dorecord', kw_dorecord)
698 extensions.wrapfunction(record, 'dorecord', kw_dorecord)
699 except KeyError:
699 except KeyError:
700 pass
700 pass
701
701
702 repo.__class__ = kwrepo
702 repo.__class__ = kwrepo
@@ -1,186 +1,183
1 $ check_code="$TESTDIR"/../contrib/check-code.py
1 $ check_code="$TESTDIR"/../contrib/check-code.py
2 $ cd "$TESTDIR"/..
2 $ cd "$TESTDIR"/..
3 $ if hg identify -q > /dev/null; then :
3 $ if hg identify -q > /dev/null; then :
4 > else
4 > else
5 > echo "skipped: not a Mercurial working dir" >&2
5 > echo "skipped: not a Mercurial working dir" >&2
6 > exit 80
6 > exit 80
7 > fi
7 > fi
8 $ hg manifest | xargs "$check_code" || echo 'FAILURE IS NOT AN OPTION!!!'
8 $ hg manifest | xargs "$check_code" || echo 'FAILURE IS NOT AN OPTION!!!'
9
9
10 $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 || true
10 $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 || true
11 hgext/convert/cvsps.py:0:
11 hgext/convert/cvsps.py:0:
12 > ui.write('Ancestors: %s\n' % (','.join(r)))
12 > ui.write('Ancestors: %s\n' % (','.join(r)))
13 warning: unwrapped ui message
13 warning: unwrapped ui message
14 hgext/convert/cvsps.py:0:
14 hgext/convert/cvsps.py:0:
15 > ui.write('Parent: %d\n' % cs.parents[0].id)
15 > ui.write('Parent: %d\n' % cs.parents[0].id)
16 warning: unwrapped ui message
16 warning: unwrapped ui message
17 hgext/convert/cvsps.py:0:
17 hgext/convert/cvsps.py:0:
18 > ui.write('Parents: %s\n' %
18 > ui.write('Parents: %s\n' %
19 warning: unwrapped ui message
19 warning: unwrapped ui message
20 hgext/convert/cvsps.py:0:
20 hgext/convert/cvsps.py:0:
21 > ui.write('Branchpoints: %s \n' % ', '.join(branchpoints))
21 > ui.write('Branchpoints: %s \n' % ', '.join(branchpoints))
22 warning: unwrapped ui message
22 warning: unwrapped ui message
23 hgext/convert/cvsps.py:0:
23 hgext/convert/cvsps.py:0:
24 > ui.write('Author: %s\n' % cs.author)
24 > ui.write('Author: %s\n' % cs.author)
25 warning: unwrapped ui message
25 warning: unwrapped ui message
26 hgext/convert/cvsps.py:0:
26 hgext/convert/cvsps.py:0:
27 > ui.write('Branch: %s\n' % (cs.branch or 'HEAD'))
27 > ui.write('Branch: %s\n' % (cs.branch or 'HEAD'))
28 warning: unwrapped ui message
28 warning: unwrapped ui message
29 hgext/convert/cvsps.py:0:
29 hgext/convert/cvsps.py:0:
30 > ui.write('Date: %s\n' % util.datestr(cs.date,
30 > ui.write('Date: %s\n' % util.datestr(cs.date,
31 warning: unwrapped ui message
31 warning: unwrapped ui message
32 hgext/convert/cvsps.py:0:
32 hgext/convert/cvsps.py:0:
33 > ui.write('Log:\n')
33 > ui.write('Log:\n')
34 warning: unwrapped ui message
34 warning: unwrapped ui message
35 hgext/convert/cvsps.py:0:
35 hgext/convert/cvsps.py:0:
36 > ui.write('Members: \n')
36 > ui.write('Members: \n')
37 warning: unwrapped ui message
37 warning: unwrapped ui message
38 hgext/convert/cvsps.py:0:
38 hgext/convert/cvsps.py:0:
39 > ui.write('PatchSet %d \n' % cs.id)
39 > ui.write('PatchSet %d \n' % cs.id)
40 warning: unwrapped ui message
40 warning: unwrapped ui message
41 hgext/convert/cvsps.py:0:
41 hgext/convert/cvsps.py:0:
42 > ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
42 > ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
43 warning: unwrapped ui message
43 warning: unwrapped ui message
44 hgext/hgk.py:0:
44 hgext/hgk.py:0:
45 > ui.write("parent %s\n" % p)
45 > ui.write("parent %s\n" % p)
46 warning: unwrapped ui message
46 warning: unwrapped ui message
47 hgext/hgk.py:0:
47 hgext/hgk.py:0:
48 > ui.write('k=%s\nv=%s\n' % (name, value))
48 > ui.write('k=%s\nv=%s\n' % (name, value))
49 warning: unwrapped ui message
49 warning: unwrapped ui message
50 hgext/hgk.py:0:
50 hgext/hgk.py:0:
51 > ui.write("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1]))
51 > ui.write("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1]))
52 warning: unwrapped ui message
52 warning: unwrapped ui message
53 hgext/hgk.py:0:
53 hgext/hgk.py:0:
54 > ui.write("branch %s\n\n" % ctx.branch())
54 > ui.write("branch %s\n\n" % ctx.branch())
55 warning: unwrapped ui message
55 warning: unwrapped ui message
56 hgext/hgk.py:0:
56 hgext/hgk.py:0:
57 > ui.write("committer %s %s %s\n" % (committer, int(date[0]), date[1]))
57 > ui.write("committer %s %s %s\n" % (committer, int(date[0]), date[1]))
58 warning: unwrapped ui message
58 warning: unwrapped ui message
59 hgext/hgk.py:0:
59 hgext/hgk.py:0:
60 > ui.write("revision %d\n" % ctx.rev())
60 > ui.write("revision %d\n" % ctx.rev())
61 warning: unwrapped ui message
61 warning: unwrapped ui message
62 hgext/hgk.py:0:
62 hgext/hgk.py:0:
63 > ui.write("tree %s\n" % short(ctx.changeset()[0]))
63 > ui.write("tree %s\n" % short(ctx.changeset()[0]))
64 warning: unwrapped ui message
64 warning: unwrapped ui message
65 hgext/keyword.py:0:
66 > ui.note("hg ci -m '%s'\n" % msg)
67 warning: unwrapped ui message
68 hgext/mq.py:0:
65 hgext/mq.py:0:
69 > ui.write("mq: %s\n" % ', '.join(m))
66 > ui.write("mq: %s\n" % ', '.join(m))
70 warning: unwrapped ui message
67 warning: unwrapped ui message
71 hgext/patchbomb.py:0:
68 hgext/patchbomb.py:0:
72 > ui.write('Subject: %s\n' % subj)
69 > ui.write('Subject: %s\n' % subj)
73 warning: unwrapped ui message
70 warning: unwrapped ui message
74 hgext/patchbomb.py:0:
71 hgext/patchbomb.py:0:
75 > ui.write('From: %s\n' % sender)
72 > ui.write('From: %s\n' % sender)
76 warning: unwrapped ui message
73 warning: unwrapped ui message
77 mercurial/commands.py:0:
74 mercurial/commands.py:0:
78 > ui.note('branch %s\n' % data)
75 > ui.note('branch %s\n' % data)
79 warning: unwrapped ui message
76 warning: unwrapped ui message
80 mercurial/commands.py:0:
77 mercurial/commands.py:0:
81 > ui.note('node %s\n' % str(data))
78 > ui.note('node %s\n' % str(data))
82 warning: unwrapped ui message
79 warning: unwrapped ui message
83 mercurial/commands.py:0:
80 mercurial/commands.py:0:
84 > ui.note('tag %s\n' % name)
81 > ui.note('tag %s\n' % name)
85 warning: unwrapped ui message
82 warning: unwrapped ui message
86 mercurial/commands.py:0:
83 mercurial/commands.py:0:
87 > ui.write("unpruned common: %s\n" % " ".join([short(n)
84 > ui.write("unpruned common: %s\n" % " ".join([short(n)
88 warning: unwrapped ui message
85 warning: unwrapped ui message
89 mercurial/commands.py:0:
86 mercurial/commands.py:0:
90 > ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
87 > ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
91 warning: unwrapped ui message
88 warning: unwrapped ui message
92 mercurial/commands.py:0:
89 mercurial/commands.py:0:
93 > ui.write("local is subset\n")
90 > ui.write("local is subset\n")
94 warning: unwrapped ui message
91 warning: unwrapped ui message
95 mercurial/commands.py:0:
92 mercurial/commands.py:0:
96 > ui.write("remote is subset\n")
93 > ui.write("remote is subset\n")
97 warning: unwrapped ui message
94 warning: unwrapped ui message
98 mercurial/commands.py:0:
95 mercurial/commands.py:0:
99 > ui.write('deltas against other : ' + fmt % pcfmt(numother,
96 > ui.write('deltas against other : ' + fmt % pcfmt(numother,
100 warning: unwrapped ui message
97 warning: unwrapped ui message
101 mercurial/commands.py:0:
98 mercurial/commands.py:0:
102 > ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
99 > ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
103 warning: unwrapped ui message
100 warning: unwrapped ui message
104 mercurial/commands.py:0:
101 mercurial/commands.py:0:
105 > ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
102 > ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
106 warning: unwrapped ui message
103 warning: unwrapped ui message
107 mercurial/commands.py:0:
104 mercurial/commands.py:0:
108 > ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
105 > ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
109 warning: unwrapped ui message
106 warning: unwrapped ui message
110 mercurial/commands.py:0:
107 mercurial/commands.py:0:
111 > ui.write("match: %s\n" % m(d[0]))
108 > ui.write("match: %s\n" % m(d[0]))
112 warning: unwrapped ui message
109 warning: unwrapped ui message
113 mercurial/commands.py:0:
110 mercurial/commands.py:0:
114 > ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
111 > ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
115 warning: unwrapped ui message
112 warning: unwrapped ui message
116 mercurial/commands.py:0:
113 mercurial/commands.py:0:
117 > ui.write('path %s\n' % k)
114 > ui.write('path %s\n' % k)
118 warning: unwrapped ui message
115 warning: unwrapped ui message
119 mercurial/commands.py:0:
116 mercurial/commands.py:0:
120 > ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
117 > ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
121 warning: unwrapped ui message
118 warning: unwrapped ui message
122 mercurial/commands.py:0:
119 mercurial/commands.py:0:
123 > ui.write("digraph G {\n")
120 > ui.write("digraph G {\n")
124 warning: unwrapped ui message
121 warning: unwrapped ui message
125 mercurial/commands.py:0:
122 mercurial/commands.py:0:
126 > ui.write("internal: %s %s\n" % d)
123 > ui.write("internal: %s %s\n" % d)
127 warning: unwrapped ui message
124 warning: unwrapped ui message
128 mercurial/commands.py:0:
125 mercurial/commands.py:0:
129 > ui.write("standard: %s\n" % util.datestr(d))
126 > ui.write("standard: %s\n" % util.datestr(d))
130 warning: unwrapped ui message
127 warning: unwrapped ui message
131 mercurial/commands.py:0:
128 mercurial/commands.py:0:
132 > ui.write('avg chain length : ' + fmt % avgchainlen)
129 > ui.write('avg chain length : ' + fmt % avgchainlen)
133 warning: unwrapped ui message
130 warning: unwrapped ui message
134 mercurial/commands.py:0:
131 mercurial/commands.py:0:
135 > ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
132 > ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
136 warning: unwrapped ui message
133 warning: unwrapped ui message
137 mercurial/commands.py:0:
134 mercurial/commands.py:0:
138 > ui.write('compression ratio : ' + fmt % compratio)
135 > ui.write('compression ratio : ' + fmt % compratio)
139 warning: unwrapped ui message
136 warning: unwrapped ui message
140 mercurial/commands.py:0:
137 mercurial/commands.py:0:
141 > ui.write('delta size (min/max/avg) : %d / %d / %d\n'
138 > ui.write('delta size (min/max/avg) : %d / %d / %d\n'
142 warning: unwrapped ui message
139 warning: unwrapped ui message
143 mercurial/commands.py:0:
140 mercurial/commands.py:0:
144 > ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
141 > ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
145 warning: unwrapped ui message
142 warning: unwrapped ui message
146 mercurial/commands.py:0:
143 mercurial/commands.py:0:
147 > ui.write('flags : %s\n' % ', '.join(flags))
144 > ui.write('flags : %s\n' % ', '.join(flags))
148 warning: unwrapped ui message
145 warning: unwrapped ui message
149 mercurial/commands.py:0:
146 mercurial/commands.py:0:
150 > ui.write('format : %d\n' % format)
147 > ui.write('format : %d\n' % format)
151 warning: unwrapped ui message
148 warning: unwrapped ui message
152 mercurial/commands.py:0:
149 mercurial/commands.py:0:
153 > ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
150 > ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
154 warning: unwrapped ui message
151 warning: unwrapped ui message
155 mercurial/commands.py:0:
152 mercurial/commands.py:0:
156 > ui.write('revision size : ' + fmt2 % totalsize)
153 > ui.write('revision size : ' + fmt2 % totalsize)
157 warning: unwrapped ui message
154 warning: unwrapped ui message
158 mercurial/commands.py:0:
155 mercurial/commands.py:0:
159 > ui.write('revisions : ' + fmt2 % numrevs)
156 > ui.write('revisions : ' + fmt2 % numrevs)
160 warning: unwrapped ui message
157 warning: unwrapped ui message
161 warning: unwrapped ui message
158 warning: unwrapped ui message
162 mercurial/commands.py:0:
159 mercurial/commands.py:0:
163 > ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
160 > ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
164 warning: unwrapped ui message
161 warning: unwrapped ui message
165 tests/autodiff.py:0:
162 tests/autodiff.py:0:
166 > ui.write('data lost for: %s\n' % fn)
163 > ui.write('data lost for: %s\n' % fn)
167 warning: unwrapped ui message
164 warning: unwrapped ui message
168 tests/test-convert-mtn.t:0:
165 tests/test-convert-mtn.t:0:
169 > > function get_passphrase(keypair_id)
166 > > function get_passphrase(keypair_id)
170 don't use 'function', use old style
167 don't use 'function', use old style
171 tests/test-import-git.t:0:
168 tests/test-import-git.t:0:
172 > > Mc\${NkU|\`?^000jF3jhEB
169 > > Mc\${NkU|\`?^000jF3jhEB
173 ^ must be quoted
170 ^ must be quoted
174 tests/test-import.t:0:
171 tests/test-import.t:0:
175 > > diff -Naur proj-orig/foo proj-new/foo
172 > > diff -Naur proj-orig/foo proj-new/foo
176 don't use 'diff -N'
173 don't use 'diff -N'
177 don't use 'diff -N'
174 don't use 'diff -N'
178 tests/test-schemes.t:0:
175 tests/test-schemes.t:0:
179 > > z = file:\$PWD/
176 > > z = file:\$PWD/
180 don't use $PWD, use `pwd`
177 don't use $PWD, use `pwd`
181 tests/test-ui-color.py:0:
178 tests/test-ui-color.py:0:
182 > testui.warn('warning\n')
179 > testui.warn('warning\n')
183 warning: unwrapped ui message
180 warning: unwrapped ui message
184 tests/test-ui-color.py:0:
181 tests/test-ui-color.py:0:
185 > testui.write('buffered\n')
182 > testui.write('buffered\n')
186 warning: unwrapped ui message
183 warning: unwrapped ui message
General Comments 0
You need to be logged in to leave comments. Login now