author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
Sun, 07 Feb 2010 17:12:41 +0100 | |
changeset 10677 | f2558a8228be |
parent 10653 | 4f559a469972 |
child 10711 | 2df044888693 |
permissions | -rw-r--r-- |
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 |
# |
10653
4f559a469972
keyword: update copyright
Christian Ebert <blacktrash@gmx.net>
parents:
10652
diff
changeset
|
3 |
# Copyright 2007-2010 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 |
10263 | 6 |
# GNU General Public License version 2 or any later version. |
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 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
31 |
This extension expands RCS/CVS-like or self-customized $Keywords$ in |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
32 |
tracked 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 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
34 |
Keywords are only expanded in local repositories and not stored in the |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
35 |
change history. The mechanism can be regarded as a convenience for the |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
36 |
current user 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 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
38 |
Configuration is done in the [keyword] and [keywordmaps] sections of |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
39 |
hgrc 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 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
48 |
NOTE: the more specific you are in your filename patterns the less you |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
49 |
lose 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 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
51 |
For [keywordmaps] template mapping and expansion demonstration and |
9307
2715506d54e4
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net>
parents:
9305
diff
changeset
|
52 |
control run "hg kwdemo". See "hg help templates" for a list of |
2715506d54e4
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net>
parents:
9305
diff
changeset
|
53 |
available templates and filters. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
54 |
|
9307
2715506d54e4
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net>
parents:
9305
diff
changeset
|
55 |
An additional date template filter {date|utcdate} is provided. It |
2715506d54e4
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net>
parents:
9305
diff
changeset
|
56 |
returns a date like "2006/09/18 15:13:13". |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
57 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
58 |
The default template mappings (view with "hg kwdemo -d") can be |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
59 |
replaced with customized keywords and templates. Again, run "hg |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
60 |
kwdemo" to control the 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
|
61 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
62 |
Before changing/disabling active keywords, run "hg kwshrink" to avoid |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
63 |
the risk of inadvertently storing expanded keywords in the change |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
64 |
history. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
65 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
66 |
To force expansion after enabling it, or a configuration change, run |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
67 |
"hg kwexpand". |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
68 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
69 |
Also, when committing with the record extension or using mq's qrecord, |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
70 |
be aware that keywords cannot be updated. Again, run "hg kwexpand" on |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
71 |
the files in question to update keyword expansions after all changes |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
72 |
have been checked in. |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
73 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
74 |
Expansions spanning more than one line and incremental expansions, |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
75 |
like CVS' $Log$, are not supported. A keyword template map "Log = |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
76 |
{desc}" expands to the 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
|
77 |
''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
78 |
|
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
79 |
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
|
80 |
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
|
81 |
from mercurial.hgweb import webcommands |
9027
8c441691d414
keyword: remove unused import
Christian Ebert <blacktrash@gmx.net>
parents:
9013
diff
changeset
|
82 |
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
|
83 |
from mercurial.i18n import _ |
9308
6fdd39f52f7f
keyword: use util.datestr for utcdate filter, expose through variable
Christian Ebert <blacktrash@gmx.net>
parents:
9307
diff
changeset
|
84 |
import re, shutil, tempfile |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
85 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
86 |
commands.optionalrepo += ' kwdemo' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
87 |
|
6024
3121f0feefb4
keyword: nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
6023
diff
changeset
|
88 |
# hg commands that do not act on keywords |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6603
diff
changeset
|
89 |
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
|
90 |
' log outgoing push rename rollback tip verify' |
6082
875b745996e8
keyword: add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
6081
diff
changeset
|
91 |
' convert email glog') |
6024
3121f0feefb4
keyword: nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
6023
diff
changeset
|
92 |
|
5961
ed4d55c2366f
keyword: detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
5946
diff
changeset
|
93 |
# 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
|
94 |
# not when reading filelog, and unexpand when reading from working dir |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
10116
diff
changeset
|
95 |
restricted = ('merge record resolve qfold qimport qnew qpush qrefresh qrecord' |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
10116
diff
changeset
|
96 |
' transplant') |
5961
ed4d55c2366f
keyword: detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
5946
diff
changeset
|
97 |
|
9308
6fdd39f52f7f
keyword: use util.datestr for utcdate filter, expose through variable
Christian Ebert <blacktrash@gmx.net>
parents:
9307
diff
changeset
|
98 |
# provide cvs-like UTC date filter |
10332
f64160f28b3f
keyword: fix utcdate filter
Christian Ebert <blacktrash@gmx.net>
parents:
10264
diff
changeset
|
99 |
utcdate = lambda x: util.datestr((x[0], 0), '%Y/%m/%d %H:%M:%S') |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
100 |
|
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
101 |
# make keyword tools accessible |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
102 |
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
|
103 |
|
5815
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 |
class kwtemplater(object): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
106 |
''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
107 |
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
|
108 |
provides keyword substitution functions. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
109 |
''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
110 |
templates = { |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
111 |
'Revision': '{node|short}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
112 |
'Author': '{author|user}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
113 |
'Date': '{date|utcdate}', |
9943
f8d779791161
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net>
parents:
9942
diff
changeset
|
114 |
'RCSfile': '{file|basename},v', |
9950
af5f99d8195e
keyword: clarify object of backwards compatibility
timeless
parents:
9943
diff
changeset
|
115 |
'RCSFile': '{file|basename},v', # kept for backwards compatibility |
af5f99d8195e
keyword: clarify object of backwards compatibility
timeless
parents:
9943
diff
changeset
|
116 |
# with hg-keyword |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
117 |
'Source': '{root}/{file},v', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
118 |
'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
|
119 |
'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
|
120 |
} |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
121 |
|
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
122 |
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
|
123 |
self.ui = ui |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
124 |
self.repo = repo |
8638
c6483eec6092
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net>
parents:
8567
diff
changeset
|
125 |
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
|
126 |
kwtools['inc'], kwtools['exc']) |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
127 |
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
|
128 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
129 |
kwmaps = self.ui.configitems('keywordmaps') |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
130 |
if kwmaps: # override default templates |
9081
d8e8447a4b7b
keyword: collect kwmaps using a generator expression
Christian Ebert <blacktrash@gmx.net>
parents:
9066
diff
changeset
|
131 |
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
|
132 |
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
|
133 |
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
|
134 |
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
|
135 |
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
|
136 |
|
5976
9f1e6ab76069
templates: move filters to their own module
Matt Mackall <mpm@selenic.com>
parents:
5961
diff
changeset
|
137 |
templatefilters.filters['utcdate'] = utcdate |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
138 |
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
|
139 |
False, None, '', False) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
140 |
|
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
141 |
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
|
142 |
'''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
|
143 |
def kwsub(mobj): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
144 |
kw = mobj.group(1) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
145 |
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
|
146 |
self.ui.pushbuffer() |
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
147 |
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
|
148 |
ekw = templatefilters.firstline(self.ui.popbuffer()) |
ee7df90d1daa
keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net>
parents:
6022
diff
changeset
|
149 |
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
|
150 |
return subfunc(kwsub, data) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
151 |
|
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
152 |
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
|
153 |
'''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
|
154 |
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
|
155 |
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
|
156 |
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
|
157 |
return data |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
158 |
|
6749
51b0e799352f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
6747
diff
changeset
|
159 |
def iskwfile(self, path, flagfunc): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
160 |
'''Returns true if path matches [keyword] pattern |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
161 |
and is not a symbolic link. |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
162 |
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
|
163 |
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
|
164 |
|
6505
7ae26bb2d5cc
keyword: make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net>
parents:
6504
diff
changeset
|
165 |
def overwrite(self, node, expand, files): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
166 |
'''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
|
167 |
ctx = self.repo[node] |
8dde275680d8
keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net>
parents:
7375
diff
changeset
|
168 |
mf = ctx.manifest() |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
169 |
if node is not None: # commit |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
170 |
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
|
171 |
notify = self.ui.debug |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
172 |
else: # kwexpand/kwshrink |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
173 |
notify = self.ui.note |
6749
51b0e799352f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
6747
diff
changeset
|
174 |
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
|
175 |
if candidates: |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
176 |
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
|
177 |
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
|
178 |
or _('overwriting %s shrinking keywords\n')) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
179 |
for f in candidates: |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
180 |
fp = self.repo.file(f) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
181 |
data = fp.read(mf[f]) |
6508
4b2c266bf059
Get rid of reimplementations of util.binary
Bryan O'Sullivan <bos@serpentine.com>
parents:
6506
diff
changeset
|
182 |
if util.binary(data): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
183 |
continue |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
184 |
if expand: |
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
185 |
if node is None: |
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
186 |
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
|
187 |
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
|
188 |
self.re_kw.subn) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
189 |
else: |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
190 |
found = self.re_kw.search(data) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
191 |
if found: |
8089
67efe5e3b0fb
keyword, i18n: avoid untranslated strings as message parameters
Wagner Bruna <wbruna@yahoo.com>
parents:
8027
diff
changeset
|
192 |
notify(msg % f) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
193 |
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
|
194 |
if node is None: |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
195 |
self.repo.dirstate.normal(f) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
196 |
self.restrict = False |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
197 |
|
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
198 |
def shrinktext(self, text): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
199 |
'''Unconditionally removes all keyword substitutions from text.''' |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
200 |
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
|
201 |
|
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
202 |
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
|
203 |
'''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
|
204 |
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
|
205 |
return self.shrinktext(text) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
206 |
return text |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
207 |
|
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
208 |
def shrinklines(self, fname, lines): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
209 |
'''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
|
210 |
if self.match(fname): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
211 |
text = ''.join(lines) |
6508
4b2c266bf059
Get rid of reimplementations of util.binary
Bryan O'Sullivan <bos@serpentine.com>
parents:
6506
diff
changeset
|
212 |
if not util.binary(text): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
213 |
return self.shrinktext(text).splitlines(True) |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
214 |
return lines |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
215 |
|
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
216 |
def wread(self, fname, data): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
217 |
'''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
|
218 |
keyword substitutions removed.''' |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
219 |
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
|
220 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
221 |
class kwfilelog(filelog.filelog): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
222 |
''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
223 |
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
|
224 |
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
|
225 |
''' |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
226 |
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
|
227 |
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
|
228 |
self.kwt = kwt |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
229 |
self.path = path |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
230 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
231 |
def read(self, node): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
232 |
'''Expands keywords when reading filelog.''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
233 |
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
|
234 |
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
|
235 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
236 |
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
|
237 |
'''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
|
238 |
text = self.kwt.shrink(self.path, text) |
6504
1be53f931c9c
keyword: compact setting of optional arguments
Christian Ebert <blacktrash@gmx.net>
parents:
6503
diff
changeset
|
239 |
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
|
240 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
241 |
def cmp(self, node, text): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
242 |
'''Removes keyword substitutions for comparison.''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
243 |
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
|
244 |
if self.renamed(node): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
245 |
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
|
246 |
return t2 != text |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
247 |
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
|
248 |
|
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
249 |
def _status(ui, repo, kwt, *pats, **opts): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
250 |
'''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
|
251 |
Returns status of working directory.''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
252 |
if kwt: |
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
253 |
return repo.status(match=cmdutil.match(repo, pats, opts), clean=True, |
10652
e7f840e4ac7d
keyword: remove deprecated options
Christian Ebert <blacktrash@gmx.net>
parents:
10604
diff
changeset
|
254 |
unknown=opts.get('unknown') or opts.get('all')) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
255 |
if ui.configitems('keyword'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
256 |
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
|
257 |
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
|
258 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
259 |
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
|
260 |
'''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
|
261 |
if repo.dirstate.parents()[1] != nullid: |
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
262 |
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
|
263 |
kwt = kwtools['templater'] |
10604
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
264 |
wlock = repo.wlock() |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
265 |
try: |
10604
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
266 |
status = _status(ui, repo, kwt, *pats, **opts) |
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
267 |
modified, added, removed, deleted, unknown, ignored, clean = status |
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
268 |
if modified or added or removed or deleted: |
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
269 |
raise util.Abort(_('outstanding uncommitted changes')) |
10603
f511df3a4357
keyword: use status' names instead of index
Christian Ebert <blacktrash@gmx.net>
parents:
10499
diff
changeset
|
270 |
kwt.overwrite(None, expand, clean) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
271 |
finally: |
10604
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
272 |
wlock.release() |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
273 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
274 |
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
|
275 |
'''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
|
276 |
|
7993
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
277 |
Show current, custom, or default keyword template maps and their |
8763 | 278 |
expansions. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
279 |
|
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
280 |
Extend the current configuration by specifying maps as arguments |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
281 |
and using -f/--rcfile to source an external hgrc file. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
282 |
|
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
283 |
Use -d/--default to disable current configuration. |
9307
2715506d54e4
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net>
parents:
9305
diff
changeset
|
284 |
|
2715506d54e4
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net>
parents:
9305
diff
changeset
|
285 |
See "hg help templates" for information on templates and filters. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
286 |
''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
287 |
def demoitems(section, items): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
288 |
ui.write('[%s]\n' % section) |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9494
diff
changeset
|
289 |
for k, v in sorted(items): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
290 |
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
|
291 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
292 |
fn = 'demo.txt' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
293 |
branchname = 'demobranch' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
294 |
tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
8027
9c7ca86fc658
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
7993
diff
changeset
|
295 |
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
|
296 |
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
|
297 |
ui.setconfig('keyword', fn, '') |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
298 |
|
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
299 |
uikwmaps = ui.configitems('keywordmaps') |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
300 |
if args or opts.get('rcfile'): |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
301 |
ui.status(_('\n\tconfiguration using custom keyword template maps\n')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
302 |
if uikwmaps: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
303 |
ui.status(_('\textending current template maps\n')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
304 |
if opts.get('default') or not uikwmaps: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
305 |
ui.status(_('\toverriding default template maps\n')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
306 |
if opts.get('rcfile'): |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
307 |
ui.readconfig(opts.get('rcfile')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
308 |
if args: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
309 |
# simulate hgrc parsing |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
310 |
rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args] |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
311 |
fp = repo.opener('hgrc', 'w') |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
312 |
fp.writelines(rcmaps) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
313 |
fp.close() |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
314 |
ui.readconfig(repo.join('hgrc')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
315 |
kwmaps = dict(ui.configitems('keywordmaps')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
316 |
elif opts.get('default'): |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
317 |
ui.status(_('\n\tconfiguration using default keyword template maps\n')) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
318 |
kwmaps = kwtemplater.templates |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
319 |
if uikwmaps: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
320 |
ui.status(_('\tdisabling current template maps\n')) |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
321 |
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
|
322 |
ui.setconfig('keywordmaps', k, v) |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
323 |
else: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
324 |
ui.status(_('\n\tconfiguration using current keyword template maps\n')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
325 |
kwmaps = dict(uikwmaps) or kwtemplater.templates |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
326 |
|
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
327 |
uisetup(ui) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
328 |
reposetup(ui, repo) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
329 |
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
|
330 |
if k.endswith('keyword'): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
331 |
extension = '%s = %s' % (k, v) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
332 |
break |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
333 |
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
|
334 |
demoitems('keyword', ui.configitems('keyword')) |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
335 |
demoitems('keywordmaps', kwmaps.iteritems()) |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9494
diff
changeset
|
336 |
keywords = '$' + '$\n$'.join(sorted(kwmaps.keys())) + '$\n' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
337 |
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
|
338 |
repo.add([fn]) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
339 |
path = repo.wjoin(fn) |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
340 |
ui.note(_('\nkeywords written to %s:\n') % path) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
341 |
ui.note(keywords) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
342 |
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
|
343 |
# 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
|
344 |
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
|
345 |
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
|
346 |
commands.branch(ui, repo, branchname) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
347 |
ui.quiet = quiet |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
348 |
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
|
349 |
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
|
350 |
repo.ui.setconfig('hooks', name, '') |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
351 |
ui.note(_('unhooked all commit hooks\n')) |
10499
4401b0dfee88
keyword: mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net>
parents:
10495
diff
changeset
|
352 |
msg = _('hg keyword configuration and expansion example') |
4401b0dfee88
keyword: mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net>
parents:
10495
diff
changeset
|
353 |
ui.note("hg -R '%s' ci -m '%s'\n" % (tmpdir, msg)) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
354 |
repo.commit(text=msg) |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
355 |
ui.status(_('\n\tkeywords expanded\n')) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
356 |
ui.write(repo.wread(fn)) |
9467
4c041f1ee1b4
do not attempt to translate ui.debug output
Martin Geisler <mg@lazybytes.net>
parents:
9308
diff
changeset
|
357 |
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
|
358 |
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
|
359 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
360 |
def expand(ui, repo, *pats, **opts): |
8763 | 361 |
'''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
|
362 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
363 |
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
|
364 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
365 |
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
|
366 |
''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
367 |
# 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
|
368 |
_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
|
369 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
370 |
def files(ui, repo, *pats, **opts): |
8957
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8956
diff
changeset
|
371 |
'''show files configured for keyword expansion |
8950
be6b57b2bdb8
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8939
diff
changeset
|
372 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
373 |
List which files in the working directory are matched by the |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
374 |
[keyword] configuration patterns. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
375 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
376 |
Useful to prevent inadvertent keyword expansion and to speed up |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
377 |
execution by including only files that are actual candidates for |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
378 |
expansion. |
8950
be6b57b2bdb8
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8939
diff
changeset
|
379 |
|
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
380 |
See "hg help keyword" on how to construct patterns both for |
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
381 |
inclusion and exclusion of files. |
8957
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8956
diff
changeset
|
382 |
|
9494
bdd8a41ea6f6
keyword: uppercase short option for kwfiles --all, like hg status -A
Christian Ebert <blacktrash@gmx.net>
parents:
9493
diff
changeset
|
383 |
With -A/--all and -v/--verbose the codes used to show the status |
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
384 |
of files are:: |
9195
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
385 |
|
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
386 |
K = keyword expansion candidate |
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
387 |
k = keyword expansion candidate (not tracked) |
9195
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
388 |
I = ignored |
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
389 |
i = ignored (not tracked) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
390 |
''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
391 |
kwt = kwtools['templater'] |
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
392 |
status = _status(ui, repo, kwt, *pats, **opts) |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
393 |
cwd = pats and repo.getcwd() or '' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
394 |
modified, added, removed, deleted, unknown, ignored, clean = status |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
395 |
files = [] |
10652
e7f840e4ac7d
keyword: remove deprecated options
Christian Ebert <blacktrash@gmx.net>
parents:
10604
diff
changeset
|
396 |
if not opts.get('unknown') or opts.get('all'): |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
397 |
files = sorted(modified + added + clean) |
6747
f6c00b17387c
use repo[changeid] to get a changectx
Matt Mackall <mpm@selenic.com>
parents:
6743
diff
changeset
|
398 |
wctx = repo[None] |
6749
51b0e799352f
manifest: remove execf/linkf methods
Matt Mackall <mpm@selenic.com>
parents:
6747
diff
changeset
|
399 |
kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)] |
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
400 |
kwunknown = [f for f in unknown if kwt.iskwfile(f, wctx.flags)] |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
401 |
if not opts.get('ignore') or opts.get('all'): |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
402 |
showfiles = kwfiles, kwunknown |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
403 |
else: |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
404 |
showfiles = [], [] |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
405 |
if opts.get('all') or opts.get('ignore'): |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
406 |
showfiles += ([f for f in files if f not in kwfiles], |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
407 |
[f for f in unknown if f not in kwunknown]) |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
408 |
for char, filenames in zip('KkIi', showfiles): |
7417
d3f1d316b72b
keyword: do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents:
7391
diff
changeset
|
409 |
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
|
410 |
for f in filenames: |
7417
d3f1d316b72b
keyword: do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net>
parents:
7391
diff
changeset
|
411 |
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
|
412 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
413 |
def shrink(ui, repo, *pats, **opts): |
8763 | 414 |
'''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
|
415 |
|
7993
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
416 |
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
|
417 |
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
|
418 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
419 |
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
|
420 |
''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
421 |
# 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
|
422 |
_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
|
423 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
424 |
|
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
425 |
def uisetup(ui): |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
426 |
'''Collects [keyword] config in kwtools. |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
427 |
Monkeypatches dispatch._parse if needed.''' |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
428 |
|
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
429 |
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
|
430 |
if opt != 'ignore': |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
431 |
kwtools['inc'].append(pat) |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
432 |
else: |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
433 |
kwtools['exc'].append(pat) |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
434 |
|
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
435 |
if kwtools['inc']: |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
436 |
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
|
437 |
'''Monkeypatch dispatch._parse to obtain running hg command.''' |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
438 |
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
|
439 |
kwtools['hgcmd'] = cmd |
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
440 |
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
|
441 |
|
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
442 |
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
|
443 |
|
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
444 |
def reposetup(ui, repo): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
445 |
'''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
|
446 |
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
|
447 |
if file matches user configuration. |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
448 |
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
|
449 |
keyword substitutions. |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
450 |
Monkeypatches patch and webcommands.''' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
451 |
|
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
452 |
try: |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
453 |
if (not repo.local() or not kwtools['inc'] |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
454 |
or kwtools['hgcmd'] in nokwcommands.split() |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
455 |
or '.hg' in util.splitpath(repo.root) |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
456 |
or repo._url.startswith('bundle:')): |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
457 |
return |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
458 |
except AttributeError: |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
459 |
pass |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
460 |
|
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
461 |
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
|
462 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
463 |
class kwrepo(repo.__class__): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
464 |
def file(self, f): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
465 |
if f[0] == '/': |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
466 |
f = f[1:] |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
467 |
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
|
468 |
|
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
469 |
def wread(self, filename): |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
470 |
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
|
471 |
return kwt.wread(filename, data) |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
472 |
|
9096
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
473 |
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
|
474 |
# 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
|
475 |
# 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
|
476 |
self.commitctx = self.kwcommitctx |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
477 |
try: |
10495
2c2d2f1354b4
keyword: do not postpone commit hooks
Christian Ebert <blacktrash@gmx.net>
parents:
10492
diff
changeset
|
478 |
return super(kwrepo, self).commit(*args, **opts) |
9096
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
479 |
finally: |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
480 |
del self.commitctx |
8996
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
481 |
|
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
482 |
def kwcommitctx(self, ctx, error=False): |
10604
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
483 |
n = super(kwrepo, self).commitctx(ctx, error) |
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
484 |
# no lock needed, only called from repo.commit() which already locks |
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
485 |
kwt.overwrite(n, True, None) |
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
486 |
return n |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
487 |
|
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
488 |
# monkeypatches |
9013
21b29f4c7c9f
keyword: break overlong line
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
489 |
def kwpatchfile_init(orig, self, ui, fname, opener, |
21b29f4c7c9f
keyword: break overlong line
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
490 |
missing=False, eol=None): |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
491 |
'''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
|
492 |
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
|
493 |
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
|
494 |
# 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
|
495 |
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
|
496 |
|
7308
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7216
diff
changeset
|
497 |
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
|
498 |
opts=None): |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
499 |
'''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
|
500 |
comparing against working dir.''' |
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
501 |
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
|
502 |
kwt.match = util.never |
6747
f6c00b17387c
use repo[changeid] to get a changectx
Matt Mackall <mpm@selenic.com>
parents:
6743
diff
changeset
|
503 |
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
|
504 |
kwt.restrict = True |
7308
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7216
diff
changeset
|
505 |
return orig(repo, node1, node2, match, changes, opts) |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6603
diff
changeset
|
506 |
|
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
507 |
def kwweb_skip(orig, web, req, tmpl): |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
508 |
'''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
|
509 |
kwt.match = util.never |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
510 |
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
|
511 |
|
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
512 |
repo.__class__ = kwrepo |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
513 |
|
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
514 |
extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init) |
10116
4b514a70ea72
keyword: do not monkeypatch diff when in restricted mode
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
515 |
if not kwt.restrict: |
4b514a70ea72
keyword: do not monkeypatch diff when in restricted mode
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
516 |
extensions.wrapfunction(patch, 'diff', kw_diff) |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
517 |
for c in 'annotate changeset rev filediff diff'.split(): |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
6933
diff
changeset
|
518 |
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
|
519 |
|
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
520 |
cmdtable = { |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
521 |
'kwdemo': |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
522 |
(demo, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
523 |
[('d', 'default', None, _('show default keyword template maps')), |
9190
3ef6c14a1e8e
keyword: argument to "kwdemo --rcfile" must be string (bugfix)
Christian Ebert <blacktrash@gmx.net>
parents:
9096
diff
changeset
|
524 |
('f', 'rcfile', '', _('read maps from rcfile'))], |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
525 |
_('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
|
526 |
'kwexpand': (expand, commands.walkopts, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
527 |
_('hg kwexpand [OPTION]... [FILE]...')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
528 |
'kwfiles': |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
529 |
(files, |
9494
bdd8a41ea6f6
keyword: uppercase short option for kwfiles --all, like hg status -A
Christian Ebert <blacktrash@gmx.net>
parents:
9493
diff
changeset
|
530 |
[('A', 'all', None, _('show keyword status flags of all files')), |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
531 |
('i', 'ignore', None, _('show files excluded from expansion')), |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
532 |
('u', 'unknown', None, _('only show unknown (not tracked) files')), |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
533 |
] + commands.walkopts, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
534 |
_('hg kwfiles [OPTION]... [FILE]...')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
535 |
'kwshrink': (shrink, commands.walkopts, |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
536 |
_('hg kwshrink [OPTION]... [FILE]...')), |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
537 |
} |