Mercurial > hg
annotate hgext/keyword.py @ 36382:b4d1c09b754b
py3: add missing b'' in test-arbitraryfilectx.t
# skip-blame as just b'' prefix
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 23 Feb 2018 18:12:20 +0530 |
parents | c8e2d6ed1f9e |
children | c6061cadb400 |
rev | line source |
---|---|
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1 # keyword.py - $Keyword$ expansion for Mercurial |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
2 # |
23723
fd62b3e750af
keyword: update copyright year
Christian Ebert <blacktrash@gmx.net>
parents:
23722
diff
changeset
|
3 # Copyright 2007-2015 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 # |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17057
diff
changeset
|
10 # Keyword expansion hack against the grain of a Distributed SCM |
5815
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 |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
25186
diff
changeset
|
18 # <https://mercurial-scm.org/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 # |
29969
862ab1cdb218
keyword: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
29841
diff
changeset
|
27 # Run 'hg help keyword' and 'hg kwdemo' to get info on configuration. |
5815
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 |
12203
0f6164806283
keyword: explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net>
parents:
11678
diff
changeset
|
38 Keywords expand to the changeset data pertaining to the latest change |
0f6164806283
keyword: explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net>
parents:
11678
diff
changeset
|
39 relative to the working directory parent of each file. |
0f6164806283
keyword: explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net>
parents:
11678
diff
changeset
|
40 |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
41 Configuration is done in the [keyword], [keywordset] and [keywordmaps] |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
42 sections of hgrc files. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
43 |
9157
9261667e9b82
commands: use minirst parser when displaying help
Martin Geisler <mg@lazybytes.net>
parents:
9106
diff
changeset
|
44 Example:: |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
45 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
46 [keyword] |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
47 # 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
|
48 **.py = |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
49 x* = ignore |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
50 |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
51 [keywordset] |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
52 # prefer svn- over cvs-like default keywordmaps |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
53 svn = True |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
54 |
12390
aff4afdcfd2b
Use more note admonitions in help texts
Christian Ebert <blacktrash@gmx.net>
parents:
12207
diff
changeset
|
55 .. note:: |
19997
de16c673455b
documentation: add an extra newline after note directive
Simon Heimberg <simohe@besonet.ch>
parents:
18825
diff
changeset
|
56 |
12390
aff4afdcfd2b
Use more note admonitions in help texts
Christian Ebert <blacktrash@gmx.net>
parents:
12207
diff
changeset
|
57 The more specific you are in your filename patterns the less you |
aff4afdcfd2b
Use more note admonitions in help texts
Christian Ebert <blacktrash@gmx.net>
parents:
12207
diff
changeset
|
58 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
|
59 |
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
60 For [keywordmaps] template mapping and expansion demonstration and |
10973
49a07f441496
Use hg role in help strings
Martin Geisler <mg@aragost.com>
parents:
10967
diff
changeset
|
61 control run :hg:`kwdemo`. See :hg:`help templates` for a list of |
9307
2715506d54e4
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net>
parents:
9305
diff
changeset
|
62 available templates and filters. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
63 |
13885
5d115ea4030b
keyword: convert a verbatim block to a field list
Martin Geisler <mg@aragost.com>
parents:
13634
diff
changeset
|
64 Three additional date template filters are provided: |
11213
3d61813a300e
keyword: add 2 svn-like date filters
Christian Ebert <blacktrash@gmx.net>
parents:
11193
diff
changeset
|
65 |
13885
5d115ea4030b
keyword: convert a verbatim block to a field list
Martin Geisler <mg@aragost.com>
parents:
13634
diff
changeset
|
66 :``utcdate``: "2006/09/18 15:13:13" |
5d115ea4030b
keyword: convert a verbatim block to a field list
Martin Geisler <mg@aragost.com>
parents:
13634
diff
changeset
|
67 :``svnutcdate``: "2006-09-18 15:13:13Z" |
5d115ea4030b
keyword: convert a verbatim block to a field list
Martin Geisler <mg@aragost.com>
parents:
13634
diff
changeset
|
68 :``svnisodate``: "2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)" |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
69 |
10973
49a07f441496
Use hg role in help strings
Martin Geisler <mg@aragost.com>
parents:
10967
diff
changeset
|
70 The default template mappings (view with :hg:`kwdemo -d`) can be |
49a07f441496
Use hg role in help strings
Martin Geisler <mg@aragost.com>
parents:
10967
diff
changeset
|
71 replaced with customized keywords and templates. Again, run |
13025
99210fb3bc0a
keyword: s/config/configuration/ in help
Christian Ebert <blacktrash@gmx.net>
parents:
12844
diff
changeset
|
72 :hg:`kwdemo` to control the results of your configuration changes. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
73 |
13270
1e0d631b843b
keyword: update documentation for kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
13079
diff
changeset
|
74 Before changing/disabling active keywords, you must run :hg:`kwshrink` |
1e0d631b843b
keyword: update documentation for kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
13079
diff
changeset
|
75 to avoid storing expanded keywords in the change history. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
76 |
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
77 To force expansion after enabling it, or a configuration change, run |
10973
49a07f441496
Use hg role in help strings
Martin Geisler <mg@aragost.com>
parents:
10967
diff
changeset
|
78 :hg:`kwexpand`. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
79 |
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
80 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
|
81 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
|
82 {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
|
83 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
84 |
28321
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
85 |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
86 from __future__ import absolute_import |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
87 |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
88 import os |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
89 import re |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
90 import tempfile |
33067
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
91 import weakref |
28321
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
92 |
29205
a0939666b836
py3: move up symbol imports to enforce import-checker rules
Yuya Nishihara <yuya@tcha.org>
parents:
29055
diff
changeset
|
93 from mercurial.i18n import _ |
6072
e521ec1ad985
keyword: no expansion in web diffs
Christian Ebert <blacktrash@gmx.net>
parents:
6071
diff
changeset
|
94 from mercurial.hgweb import webcommands |
28321
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
95 |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
96 from mercurial import ( |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
97 cmdutil, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
98 context, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
99 dispatch, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
100 error, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
101 extensions, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
102 filelog, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
103 localrepo, |
35888
c8e2d6ed1f9e
cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35001
diff
changeset
|
104 logcmdutil, |
28321
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
105 match, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
106 patch, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
107 pathutil, |
35001
3fbc30f7b9f0
py3: handle keyword arguments in hgext/keyword.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34500
diff
changeset
|
108 pycompat, |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
109 registrar, |
28321
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
110 scmutil, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
111 templatefilters, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
112 util, |
a7b453b47726
keyword: use absolute_import
Christian Ebert <blacktrash@gmx.net>
parents:
27819
diff
changeset
|
113 ) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
114 |
14300
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
115 cmdtable = {} |
32337
46ba2cdda476
registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
31331
diff
changeset
|
116 command = registrar.command(cmdtable) |
29841
d5883fd055c6
extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents:
29634
diff
changeset
|
117 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
25186
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
24987
diff
changeset
|
118 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
24987
diff
changeset
|
119 # be specifying the version(s) of Mercurial they are tested with, or |
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
24987
diff
changeset
|
120 # leave the attribute unspecified. |
29841
d5883fd055c6
extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents:
29634
diff
changeset
|
121 testedwith = 'ships-with-hg-core' |
14300
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
122 |
6024
3121f0feefb4
keyword: nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
6023
diff
changeset
|
123 # hg commands that do not act on keywords |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12625
diff
changeset
|
124 nokwcommands = ('add addremove annotate bundle export grep incoming init log' |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12625
diff
changeset
|
125 ' outgoing push tip verify convert email glog') |
6024
3121f0feefb4
keyword: nokwcommands, restricted string variables at top level
Christian Ebert <blacktrash@gmx.net>
parents:
6023
diff
changeset
|
126 |
33065
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
127 # webcommands that do not act on keywords |
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
128 nokwwebcommands = ('annotate changeset rev filediff diff comparison') |
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
129 |
5961
ed4d55c2366f
keyword: detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
5946
diff
changeset
|
130 # 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
|
131 # not when reading filelog, and unexpand when reading from working dir |
21703
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20790
diff
changeset
|
132 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant' |
21708
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
133 ' unshelve rebase graft backout histedit fetch') |
5961
ed4d55c2366f
keyword: detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net>
parents:
5946
diff
changeset
|
134 |
11168
6d0d945f9e52
keyword: support extensions using dorecord, e.g. crecord
Christian Ebert <blacktrash@gmx.net>
parents:
11096
diff
changeset
|
135 # names of extensions using dorecord |
6d0d945f9e52
keyword: support extensions using dorecord, e.g. crecord
Christian Ebert <blacktrash@gmx.net>
parents:
11096
diff
changeset
|
136 recordextensions = 'record' |
11045
eb67196d20fa
keyword: support (q)record
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
137 |
13078
69405131c968
keyword: colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
13072
diff
changeset
|
138 colortable = { |
69405131c968
keyword: colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
13072
diff
changeset
|
139 'kwfiles.enabled': 'green bold', |
13079
f3a2bb1e4255
keyword: make kwfiles show deleted files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
13078
diff
changeset
|
140 'kwfiles.deleted': 'cyan bold underline', |
13078
69405131c968
keyword: colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
13072
diff
changeset
|
141 'kwfiles.enabledunknown': 'green', |
69405131c968
keyword: colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
13072
diff
changeset
|
142 'kwfiles.ignored': 'bold', |
69405131c968
keyword: colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
13072
diff
changeset
|
143 'kwfiles.ignoredunknown': 'none' |
69405131c968
keyword: colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
13072
diff
changeset
|
144 } |
69405131c968
keyword: colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
13072
diff
changeset
|
145 |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
146 templatefilter = registrar.templatefilter() |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
147 |
34500
6c705bf6a8ff
configitems: register the 'keywordset.svn' config
Boris Feld <boris.feld@octobus.net>
parents:
34086
diff
changeset
|
148 configtable = {} |
6c705bf6a8ff
configitems: register the 'keywordset.svn' config
Boris Feld <boris.feld@octobus.net>
parents:
34086
diff
changeset
|
149 configitem = registrar.configitem(configtable) |
6c705bf6a8ff
configitems: register the 'keywordset.svn' config
Boris Feld <boris.feld@octobus.net>
parents:
34086
diff
changeset
|
150 |
6c705bf6a8ff
configitems: register the 'keywordset.svn' config
Boris Feld <boris.feld@octobus.net>
parents:
34086
diff
changeset
|
151 configitem('keywordset', 'svn', |
6c705bf6a8ff
configitems: register the 'keywordset.svn' config
Boris Feld <boris.feld@octobus.net>
parents:
34086
diff
changeset
|
152 default=False, |
6c705bf6a8ff
configitems: register the 'keywordset.svn' config
Boris Feld <boris.feld@octobus.net>
parents:
34086
diff
changeset
|
153 ) |
11213
3d61813a300e
keyword: add 2 svn-like date filters
Christian Ebert <blacktrash@gmx.net>
parents:
11193
diff
changeset
|
154 # date like in cvs' $Date |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
155 @templatefilter('utcdate') |
13592
ad2ee188f4a5
templates: document missing keywords or filters
Patrick Mezard <pmezard@gmail.com>
parents:
13299
diff
changeset
|
156 def utcdate(text): |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
157 '''Date. Returns a UTC-date in this format: "2009/08/18 11:00:13". |
13633
20d13244f192
keyword: docstrings for additional date filters
Christian Ebert <blacktrash@gmx.net>
parents:
13592
diff
changeset
|
158 ''' |
17755
bededd3f0735
templatefilters: avoid traceback caused by bogus date input (issue3344)
Christian Ebert <blacktrash@gmx.net>
parents:
17424
diff
changeset
|
159 return util.datestr((util.parsedate(text)[0], 0), '%Y/%m/%d %H:%M:%S') |
11213
3d61813a300e
keyword: add 2 svn-like date filters
Christian Ebert <blacktrash@gmx.net>
parents:
11193
diff
changeset
|
160 # date like in svn's $Date |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
161 @templatefilter('svnisodate') |
13592
ad2ee188f4a5
templates: document missing keywords or filters
Patrick Mezard <pmezard@gmail.com>
parents:
13299
diff
changeset
|
162 def svnisodate(text): |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
163 '''Date. Returns a date in this format: "2009-08-18 13:00:13 |
13633
20d13244f192
keyword: docstrings for additional date filters
Christian Ebert <blacktrash@gmx.net>
parents:
13592
diff
changeset
|
164 +0200 (Tue, 18 Aug 2009)". |
20d13244f192
keyword: docstrings for additional date filters
Christian Ebert <blacktrash@gmx.net>
parents:
13592
diff
changeset
|
165 ''' |
13592
ad2ee188f4a5
templates: document missing keywords or filters
Patrick Mezard <pmezard@gmail.com>
parents:
13299
diff
changeset
|
166 return util.datestr(text, '%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)') |
11213
3d61813a300e
keyword: add 2 svn-like date filters
Christian Ebert <blacktrash@gmx.net>
parents:
11193
diff
changeset
|
167 # date like in svn's $Id |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
168 @templatefilter('svnutcdate') |
13592
ad2ee188f4a5
templates: document missing keywords or filters
Patrick Mezard <pmezard@gmail.com>
parents:
13299
diff
changeset
|
169 def svnutcdate(text): |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28458
diff
changeset
|
170 '''Date. Returns a UTC-date in this format: "2009-08-18 |
13633
20d13244f192
keyword: docstrings for additional date filters
Christian Ebert <blacktrash@gmx.net>
parents:
13592
diff
changeset
|
171 11:00:13Z". |
20d13244f192
keyword: docstrings for additional date filters
Christian Ebert <blacktrash@gmx.net>
parents:
13592
diff
changeset
|
172 ''' |
17755
bededd3f0735
templatefilters: avoid traceback caused by bogus date input (issue3344)
Christian Ebert <blacktrash@gmx.net>
parents:
17424
diff
changeset
|
173 return util.datestr((util.parsedate(text)[0], 0), '%Y-%m-%d %H:%M:%SZ') |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
174 |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
175 # make keyword tools accessible |
33070
735218be6122
keyword: use _keywordkwt of repository instead of kwtools['templater']
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33069
diff
changeset
|
176 kwtools = {'hgcmd': ''} |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
177 |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
178 def _defaultkwmaps(ui): |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
179 '''Returns default keywordmaps according to keywordset configuration.''' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
180 templates = { |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
181 'Revision': '{node|short}', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
182 'Author': '{author|user}', |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
183 } |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
184 kwsets = ({ |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
185 'Date': '{date|utcdate}', |
9943
f8d779791161
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net>
parents:
9942
diff
changeset
|
186 'RCSfile': '{file|basename},v', |
9950
af5f99d8195e
keyword: clarify object of backwards compatibility
timeless
parents:
9943
diff
changeset
|
187 'RCSFile': '{file|basename},v', # kept for backwards compatibility |
af5f99d8195e
keyword: clarify object of backwards compatibility
timeless
parents:
9943
diff
changeset
|
188 # with hg-keyword |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
189 'Source': '{root}/{file},v', |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
190 '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
|
191 'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}', |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
192 }, { |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
193 'Date': '{date|svnisodate}', |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
194 'Id': '{file|basename},v {node|short} {date|svnutcdate} {author|user}', |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
195 'LastChangedRevision': '{node|short}', |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
196 'LastChangedBy': '{author|user}', |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
197 'LastChangedDate': '{date|svnisodate}', |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
198 }) |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
199 templates.update(kwsets[ui.configbool('keywordset', 'svn')]) |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
200 return templates |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
201 |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
202 def _shrinktext(text, subfunc): |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
203 '''Helper for keyword expansion removal in text. |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
204 Depending on subfunc also returns number of substitutions.''' |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
205 return subfunc(r'$\1$', text) |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
206 |
12723
eaa09d25e7c6
keyword: code cleanup
Christian Ebert <blacktrash@gmx.net>
parents:
12709
diff
changeset
|
207 def _preselect(wstatus, changed): |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17057
diff
changeset
|
208 '''Retrieves modified and added files from a working directory state |
12723
eaa09d25e7c6
keyword: code cleanup
Christian Ebert <blacktrash@gmx.net>
parents:
12709
diff
changeset
|
209 and returns the subset of each contained in given changed files |
eaa09d25e7c6
keyword: code cleanup
Christian Ebert <blacktrash@gmx.net>
parents:
12709
diff
changeset
|
210 retrieved from a change context.''' |
22918
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
211 modified = [f for f in wstatus.modified if f in changed] |
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
212 added = [f for f in wstatus.added if f in changed] |
12723
eaa09d25e7c6
keyword: code cleanup
Christian Ebert <blacktrash@gmx.net>
parents:
12709
diff
changeset
|
213 return modified, added |
eaa09d25e7c6
keyword: code cleanup
Christian Ebert <blacktrash@gmx.net>
parents:
12709
diff
changeset
|
214 |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
215 |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
216 class kwtemplater(object): |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
217 ''' |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
218 Sets up keyword templates, corresponding keyword regex, and |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
219 provides keyword substitution functions. |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
220 ''' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
221 |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
222 def __init__(self, ui, repo, inc, exc): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
223 self.ui = ui |
33067
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
224 self._repo = weakref.ref(repo) |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
225 self.match = match.match(repo.root, '', [], inc, exc) |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
226 self.restrict = kwtools['hgcmd'] in restricted.split() |
16809
6b704fa2bea1
keyword: rename kwt.record attribute to kwt.postcommit
Christian Ebert <blacktrash@gmx.net>
parents:
16743
diff
changeset
|
227 self.postcommit = False |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
228 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
229 kwmaps = self.ui.configitems('keywordmaps') |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
230 if kwmaps: # override default templates |
24987
fd7287f0b43c
templater: remove noop calls of parsestring(s, quoted=False) (API)
Yuya Nishihara <yuya@tcha.org>
parents:
24905
diff
changeset
|
231 self.templates = dict(kwmaps) |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
232 else: |
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
233 self.templates = _defaultkwmaps(self.ui) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
234 |
33067
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
235 @property |
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
236 def repo(self): |
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
237 return self._repo() |
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
238 |
12926
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
239 @util.propertycache |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
240 def escape(self): |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
241 '''Returns bar-separated and escaped keywords.''' |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
242 return '|'.join(map(re.escape, self.templates.keys())) |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
243 |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
244 @util.propertycache |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
245 def rekw(self): |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
246 '''Returns regex for unexpanded keywords.''' |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
247 return re.compile(r'\$(%s)\$' % self.escape) |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
248 |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
249 @util.propertycache |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
250 def rekwexp(self): |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
251 '''Returns regex for expanded keywords.''' |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
252 return re.compile(r'\$(%s): [^$\n\r]*? \$' % self.escape) |
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
253 |
7375
9f1370130a45
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7369
diff
changeset
|
254 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
|
255 '''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
|
256 def kwsub(mobj): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
257 kw = mobj.group(1) |
35888
c8e2d6ed1f9e
cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35001
diff
changeset
|
258 ct = logcmdutil.maketemplater(self.ui, self.repo, |
32837
50586a0a946f
cmdutil: factor out helper to create changeset_templater with literal template
Yuya Nishihara <yuya@tcha.org>
parents:
32375
diff
changeset
|
259 self.templates[kw]) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
260 self.ui.pushbuffer() |
10894
26cf11f9f322
keyword: make the templater a local variable
Christian Ebert <blacktrash@gmx.net>
parents:
10844
diff
changeset
|
261 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
|
262 ekw = templatefilters.firstline(self.ui.popbuffer()) |
ee7df90d1daa
keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net>
parents:
6022
diff
changeset
|
263 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
|
264 return subfunc(kwsub, data) |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
265 |
12920
1fab4970354e
keyword: function to look up changectx for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
12844
diff
changeset
|
266 def linkctx(self, path, fileid): |
1fab4970354e
keyword: function to look up changectx for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
12844
diff
changeset
|
267 '''Similar to filelog.linkrev, but returns a changectx.''' |
1fab4970354e
keyword: function to look up changectx for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
12844
diff
changeset
|
268 return self.repo.filectx(path, fileid=fileid).changectx() |
1fab4970354e
keyword: function to look up changectx for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
12844
diff
changeset
|
269 |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
270 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
|
271 '''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
|
272 if not self.restrict and self.match(path) and not util.binary(data): |
12920
1fab4970354e
keyword: function to look up changectx for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
12844
diff
changeset
|
273 ctx = self.linkctx(path, node) |
12926
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
274 return self.substitute(data, path, ctx, self.rekw.sub) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
275 return data |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
276 |
12627
7d9162892899
keyword: make iskwfile() a weeding method in lieu of a boolean
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
277 def iskwfile(self, cand, ctx): |
7d9162892899
keyword: make iskwfile() a weeding method in lieu of a boolean
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
278 '''Returns subset of candidates which are configured for keyword |
15324
0890842c41d1
keyword: correct grammar in iskwfile docstring
Christian Ebert <blacktrash@gmx.net>
parents:
15183
diff
changeset
|
279 expansion but are not symbolic links.''' |
16686
67964cda8701
cleanup: "not x in y" -> "x not in y"
Brodie Rao <brodie@sf.io>
parents:
15871
diff
changeset
|
280 return [f for f in cand if self.match(f) and 'l' not in ctx.flags(f)] |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
281 |
12685
a247751652ba
keyword: enforce subn method via boolean switch
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
282 def overwrite(self, ctx, candidates, lookup, expand, rekw=False): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
283 '''Overwrites selected files expanding/shrinking keywords.''' |
16809
6b704fa2bea1
keyword: rename kwt.record attribute to kwt.postcommit
Christian Ebert <blacktrash@gmx.net>
parents:
16743
diff
changeset
|
284 if self.restrict or lookup or self.postcommit: # exclude kw_copy |
12627
7d9162892899
keyword: make iskwfile() a weeding method in lieu of a boolean
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
285 candidates = self.iskwfile(candidates, ctx) |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
286 if not candidates: |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
287 return |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12732
diff
changeset
|
288 kwcmd = self.restrict and lookup # kwexpand/kwshrink |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
289 if self.restrict or expand and lookup: |
11350
5ea28187707e
keyword: postpone manifest calculation in kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
11321
diff
changeset
|
290 mf = ctx.manifest() |
15030
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
291 if self.restrict or rekw: |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
292 re_kw = self.rekw |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
293 else: |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
294 re_kw = self.rekwexp |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
295 if expand: |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
296 msg = _('overwriting %s expanding keywords\n') |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
297 else: |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
298 msg = _('overwriting %s shrinking keywords\n') |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
299 for f in candidates: |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
300 if self.restrict: |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
301 data = self.repo.file(f).read(mf[f]) |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
302 else: |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
303 data = self.repo.wread(f) |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
304 if util.binary(data): |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
305 continue |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
306 if expand: |
23622
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
307 parents = ctx.parents() |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
308 if lookup: |
15083
6e069366e27c
keyword: use wopener(..., atomictemp=True) to overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
15072
diff
changeset
|
309 ctx = self.linkctx(f, mf[f]) |
23622
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
310 elif self.restrict and len(parents) > 1: |
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
311 # merge commit |
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
312 # in case of conflict f is in modified state during |
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
313 # merge, even if f does not differ from f in parent |
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
314 for p in parents: |
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
315 if f in p and not p[f].cmp(ctx[f]): |
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
316 ctx = p[f].changectx() |
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23079
diff
changeset
|
317 break |
15083
6e069366e27c
keyword: use wopener(..., atomictemp=True) to overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
15072
diff
changeset
|
318 data, found = self.substitute(data, f, ctx, re_kw.subn) |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
319 elif self.restrict: |
12926
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
320 found = re_kw.search(data) |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
321 else: |
12926
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
322 data, found = _shrinktext(data, re_kw.subn) |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
323 if found: |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
324 self.ui.note(msg % f) |
23879
b88278a308c6
localrepo: remove all external users of localrepo.wopener
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
23878
diff
changeset
|
325 fp = self.repo.wvfs(f, "wb", atomictemp=True) |
15083
6e069366e27c
keyword: use wopener(..., atomictemp=True) to overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
15072
diff
changeset
|
326 fp.write(data) |
6e069366e27c
keyword: use wopener(..., atomictemp=True) to overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
15072
diff
changeset
|
327 fp.close() |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12732
diff
changeset
|
328 if kwcmd: |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
329 self.repo.dirstate.normal(f) |
16809
6b704fa2bea1
keyword: rename kwt.record attribute to kwt.postcommit
Christian Ebert <blacktrash@gmx.net>
parents:
16743
diff
changeset
|
330 elif self.postcommit: |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
331 self.repo.dirstate.normallookup(f) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
332 |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
333 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
|
334 '''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
|
335 if self.match(fname) and not util.binary(text): |
12926
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
336 return _shrinktext(text, self.rekwexp.sub) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
337 return text |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
338 |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
339 def shrinklines(self, fname, lines): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
340 '''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
|
341 if self.match(fname): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
342 text = ''.join(lines) |
6508
4b2c266bf059
Get rid of reimplementations of util.binary
Bryan O'Sullivan <bos@serpentine.com>
parents:
6506
diff
changeset
|
343 if not util.binary(text): |
12926
edbe32efc89f
keyword: turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net>
parents:
12920
diff
changeset
|
344 return _shrinktext(text, self.rekwexp.sub).splitlines(True) |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
345 return lines |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
346 |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
347 def wread(self, fname, data): |
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
348 '''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
|
349 keyword substitutions removed.''' |
15030
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
350 if self.restrict: |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
351 return self.shrink(fname, data) |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
352 return data |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
353 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
354 class kwfilelog(filelog.filelog): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
355 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
356 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
|
357 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
|
358 ''' |
6503
4572beeacff1
keyword: privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net>
parents:
6502
diff
changeset
|
359 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
|
360 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
|
361 self.kwt = kwt |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
362 self.path = path |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
363 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
364 def read(self, node): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
365 '''Expands keywords when reading filelog.''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
366 data = super(kwfilelog, self).read(node) |
12628
799cec3ba3b1
keyword: disable expansion in kwfilelog.read() if file renamed in node
Christian Ebert <blacktrash@gmx.net>
parents:
12627
diff
changeset
|
367 if self.renamed(node): |
799cec3ba3b1
keyword: disable expansion in kwfilelog.read() if file renamed in node
Christian Ebert <blacktrash@gmx.net>
parents:
12627
diff
changeset
|
368 return data |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
369 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
|
370 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
371 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
|
372 '''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
|
373 text = self.kwt.shrink(self.path, text) |
6504
1be53f931c9c
keyword: compact setting of optional arguments
Christian Ebert <blacktrash@gmx.net>
parents:
6503
diff
changeset
|
374 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
|
375 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
376 def cmp(self, node, text): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
377 '''Removes keyword substitutions for comparison.''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
378 text = self.kwt.shrink(self.path, text) |
12628
799cec3ba3b1
keyword: disable expansion in kwfilelog.read() if file renamed in node
Christian Ebert <blacktrash@gmx.net>
parents:
12627
diff
changeset
|
379 return super(kwfilelog, self).cmp(node, text) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
380 |
14835
ec4d4114e7fe
keyword: reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net>
parents:
14671
diff
changeset
|
381 def _status(ui, repo, wctx, kwt, *pats, **opts): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
382 '''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
|
383 Returns status of working directory.''' |
6115
8121e9d7bfd2
keyword: make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net>
parents:
6114
diff
changeset
|
384 if kwt: |
35001
3fbc30f7b9f0
py3: handle keyword arguments in hgext/keyword.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34500
diff
changeset
|
385 opts = pycompat.byteskwargs(opts) |
14835
ec4d4114e7fe
keyword: reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net>
parents:
14671
diff
changeset
|
386 return repo.status(match=scmutil.match(wctx, pats, opts), clean=True, |
10652
e7f840e4ac7d
keyword: remove deprecated options
Christian Ebert <blacktrash@gmx.net>
parents:
10604
diff
changeset
|
387 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
|
388 if ui.configitems('keyword'): |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26463
diff
changeset
|
389 raise error.Abort(_('[keyword] patterns cannot match')) |
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26463
diff
changeset
|
390 raise error.Abort(_('no [keyword] patterns configured')) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
391 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
392 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
|
393 '''Selects files and passes them to kwtemplater.overwrite.''' |
11320
e4274f9f97c8
keyword: pass context to kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
11303
diff
changeset
|
394 wctx = repo[None] |
e4274f9f97c8
keyword: pass context to kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
11303
diff
changeset
|
395 if len(wctx.parents()) > 1: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26463
diff
changeset
|
396 raise error.Abort(_('outstanding uncommitted merge')) |
33070
735218be6122
keyword: use _keywordkwt of repository instead of kwtools['templater']
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33069
diff
changeset
|
397 kwt = getattr(repo, '_keywordkwt', None) |
27815
16cfbbc69800
with: use context manager for wlock in _kwfwrite
Bryan O'Sullivan <bryano@fb.com>
parents:
26587
diff
changeset
|
398 with repo.wlock(): |
14835
ec4d4114e7fe
keyword: reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net>
parents:
14671
diff
changeset
|
399 status = _status(ui, repo, wctx, kwt, *pats, **opts) |
22918
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
400 if status.modified or status.added or status.removed or status.deleted: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26463
diff
changeset
|
401 raise error.Abort(_('outstanding uncommitted changes')) |
22918
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
402 kwt.overwrite(wctx, status.clean, True, expand) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
403 |
14300
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
404 @command('kwdemo', |
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
405 [('d', 'default', None, _('show default keyword template maps')), |
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
406 ('f', 'rcfile', '', |
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
407 _('read maps from rcfile'), _('FILE'))], |
21776
c4633e287c56
keyword: define optionalrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21708
diff
changeset
|
408 _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...'), |
c4633e287c56
keyword: define optionalrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21708
diff
changeset
|
409 optionalrepo=True) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
410 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
|
411 '''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
|
412 |
7993
b83a11536fc6
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7853
diff
changeset
|
413 Show current, custom, or default keyword template maps and their |
8763 | 414 expansions. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
415 |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
416 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
|
417 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
|
418 |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
419 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
|
420 |
11193
687c7d395f20
Use our custom hg reStructuredText role some more
Martin Geisler <mg@aragost.com>
parents:
11168
diff
changeset
|
421 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
|
422 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
423 def demoitems(section, items): |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
424 ui.write('[%s]\n' % section) |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9494
diff
changeset
|
425 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
|
426 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
|
427 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
428 fn = 'demo.txt' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
429 tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
8027
9c7ca86fc658
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
7993
diff
changeset
|
430 ui.note(_('creating temporary repository at %s\n') % tmpdir) |
29634
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
29397
diff
changeset
|
431 if repo is None: |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
29397
diff
changeset
|
432 baseui = ui |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
29397
diff
changeset
|
433 else: |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
29397
diff
changeset
|
434 baseui = repo.baseui |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
29397
diff
changeset
|
435 repo = localrepo.localrepository(baseui, tmpdir, True) |
20790
49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents:
20668
diff
changeset
|
436 ui.setconfig('keyword', fn, '', 'keyword') |
13298
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
437 svn = ui.configbool('keywordset', 'svn') |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
438 # explicitly set keywordset for demo output |
20790
49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents:
20668
diff
changeset
|
439 ui.setconfig('keywordset', 'svn', svn, 'keyword') |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
440 |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
441 uikwmaps = ui.configitems('keywordmaps') |
35001
3fbc30f7b9f0
py3: handle keyword arguments in hgext/keyword.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34500
diff
changeset
|
442 if args or opts.get(r'rcfile'): |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
443 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
|
444 if uikwmaps: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
445 ui.status(_('\textending current template maps\n')) |
35001
3fbc30f7b9f0
py3: handle keyword arguments in hgext/keyword.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34500
diff
changeset
|
446 if opts.get(r'default') or not uikwmaps: |
13298
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
447 if svn: |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
448 ui.status(_('\toverriding default svn keywordset\n')) |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
449 else: |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
450 ui.status(_('\toverriding default cvs keywordset\n')) |
35001
3fbc30f7b9f0
py3: handle keyword arguments in hgext/keyword.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34500
diff
changeset
|
451 if opts.get(r'rcfile'): |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
452 ui.readconfig(opts.get('rcfile')) |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
453 if args: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
454 # simulate hgrc parsing |
28458
311472301ef3
keyword: compact writing of temporary kwdemo hgrc
Christian Ebert <blacktrash@gmx.net>
parents:
28321
diff
changeset
|
455 rcmaps = '[keywordmaps]\n%s\n' % '\n'.join(args) |
311472301ef3
keyword: compact writing of temporary kwdemo hgrc
Christian Ebert <blacktrash@gmx.net>
parents:
28321
diff
changeset
|
456 repo.vfs.write('hgrc', rcmaps) |
31331
1d7e8eb8788b
keyword: directly use repo.vfs.join
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30326
diff
changeset
|
457 ui.readconfig(repo.vfs.join('hgrc')) |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
458 kwmaps = dict(ui.configitems('keywordmaps')) |
35001
3fbc30f7b9f0
py3: handle keyword arguments in hgext/keyword.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34500
diff
changeset
|
459 elif opts.get(r'default'): |
13298
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
460 if svn: |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
461 ui.status(_('\n\tconfiguration using default svn keywordset\n')) |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
462 else: |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
463 ui.status(_('\n\tconfiguration using default cvs keywordset\n')) |
11214
b05ec0cc063e
keyword: offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net>
parents:
11213
diff
changeset
|
464 kwmaps = _defaultkwmaps(ui) |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
465 if uikwmaps: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
466 ui.status(_('\tdisabling current template maps\n')) |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
467 for k, v in kwmaps.iteritems(): |
20790
49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents:
20668
diff
changeset
|
468 ui.setconfig('keywordmaps', k, v, 'keyword') |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
469 else: |
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
470 ui.status(_('\n\tconfiguration using current keyword template maps\n')) |
15030
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
471 if uikwmaps: |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
472 kwmaps = dict(uikwmaps) |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
473 else: |
261482576c1e
keyword: avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net>
parents:
14835
diff
changeset
|
474 kwmaps = _defaultkwmaps(ui) |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
475 |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
476 uisetup(ui) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
477 reposetup(ui, repo) |
29397
844f72885fb9
check-code: detect "missing _() in ui message" more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29205
diff
changeset
|
478 ui.write(('[extensions]\nkeyword =\n')) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
479 demoitems('keyword', ui.configitems('keyword')) |
13298
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13270
diff
changeset
|
480 demoitems('keywordset', ui.configitems('keywordset')) |
5946
ee0dc0f3804b
keyword: improve use of dicts
Christian Ebert <blacktrash@gmx.net>
parents:
5945
diff
changeset
|
481 demoitems('keywordmaps', kwmaps.iteritems()) |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9494
diff
changeset
|
482 keywords = '$' + '$\n$'.join(sorted(kwmaps.keys())) + '$\n' |
23879
b88278a308c6
localrepo: remove all external users of localrepo.wopener
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
23878
diff
changeset
|
483 repo.wvfs.write(fn, keywords) |
11303
a1aad8333864
move working dir/dirstate methods from localrepo to workingctx
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
11296
diff
changeset
|
484 repo[None].add([fn]) |
10713
b9c3f8e88e4f
keyword: make kwdemo less verbose
Christian Ebert <blacktrash@gmx.net>
parents:
10712
diff
changeset
|
485 ui.note(_('\nkeywords written to %s:\n') % fn) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
486 ui.note(keywords) |
27816
98391f38ceb8
with: use context manager for wlock in keyword demo
Bryan O'Sullivan <bryano@fb.com>
parents:
27815
diff
changeset
|
487 with repo.wlock(): |
20113
7ad2ae7792ad
keyword: wlock while setting branch in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
20033
diff
changeset
|
488 repo.dirstate.setbranch('demobranch') |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
489 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
|
490 if name.split('.', 1)[0].find('commit') > -1: |
20790
49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Mads Kiilerich <madski@unity3d.com>
parents:
20668
diff
changeset
|
491 repo.ui.setconfig('hooks', name, '', 'keyword') |
10499
4401b0dfee88
keyword: mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net>
parents:
10495
diff
changeset
|
492 msg = _('hg keyword configuration and expansion example') |
20240
60c4d76b79b5
cleanup: Remove the only ever used skip-check-code pragma
Simon Heimberg <simohe@besonet.ch>
parents:
20113
diff
changeset
|
493 ui.note(("hg ci -m '%s'\n" % msg)) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
494 repo.commit(text=msg) |
9281
2a4131b264c3
keyword: refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net>
parents:
9264
diff
changeset
|
495 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
|
496 ui.write(repo.wread(fn)) |
24905
4ecbd88cde9a
keyword: use wvfs.rmtree to remove kwdemo directory
Christian Ebert <blacktrash@gmx.net>
parents:
24370
diff
changeset
|
497 repo.wvfs.rmtree(repo.root) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
498 |
21784
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
499 @command('kwexpand', |
32375
04baab18d60a
commands: move templates of common command options to cmdutil (API)
Yuya Nishihara <yuya@tcha.org>
parents:
32337
diff
changeset
|
500 cmdutil.walkopts, |
21784
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
501 _('hg kwexpand [OPTION]... [FILE]...'), |
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
502 inferrepo=True) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
503 def expand(ui, repo, *pats, **opts): |
8763 | 504 '''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
|
505 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
506 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
|
507 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
508 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
|
509 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
510 # 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
|
511 _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
|
512 |
14300
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
513 @command('kwfiles', |
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
514 [('A', 'all', None, _('show keyword status flags of all files')), |
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
515 ('i', 'ignore', None, _('show files excluded from expansion')), |
1b8e421d8e42
keyword: use cmdutil.command decorator
Martin Geisler <mg@aragost.com>
parents:
14168
diff
changeset
|
516 ('u', 'unknown', None, _('only show unknown (not tracked) files')), |
32375
04baab18d60a
commands: move templates of common command options to cmdutil (API)
Yuya Nishihara <yuya@tcha.org>
parents:
32337
diff
changeset
|
517 ] + cmdutil.walkopts, |
21784
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
518 _('hg kwfiles [OPTION]... [FILE]...'), |
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
519 inferrepo=True) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
520 def files(ui, repo, *pats, **opts): |
8957
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8956
diff
changeset
|
521 '''show files configured for keyword expansion |
8950
be6b57b2bdb8
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8939
diff
changeset
|
522 |
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
523 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
|
524 [keyword] configuration patterns. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
525 |
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
526 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
|
527 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
|
528 expansion. |
8950
be6b57b2bdb8
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8939
diff
changeset
|
529 |
10973
49a07f441496
Use hg role in help strings
Martin Geisler <mg@aragost.com>
parents:
10967
diff
changeset
|
530 See :hg:`help keyword` on how to construct patterns both for |
9264
9abddf8c29c7
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net>
parents:
9219
diff
changeset
|
531 inclusion and exclusion of files. |
8957
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8956
diff
changeset
|
532 |
9494
bdd8a41ea6f6
keyword: uppercase short option for kwfiles --all, like hg status -A
Christian Ebert <blacktrash@gmx.net>
parents:
9493
diff
changeset
|
533 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
|
534 of files are:: |
9195
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
535 |
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
536 K = keyword expansion candidate |
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
537 k = keyword expansion candidate (not tracked) |
9195
8c719222ddd7
keyword: reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net>
parents:
9157
diff
changeset
|
538 I = ignored |
9491
12e340b9f1bf
keyword: kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net>
parents:
9467
diff
changeset
|
539 i = ignored (not tracked) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
540 ''' |
33070
735218be6122
keyword: use _keywordkwt of repository instead of kwtools['templater']
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33069
diff
changeset
|
541 kwt = getattr(repo, '_keywordkwt', None) |
14835
ec4d4114e7fe
keyword: reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net>
parents:
14671
diff
changeset
|
542 wctx = repo[None] |
ec4d4114e7fe
keyword: reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net>
parents:
14671
diff
changeset
|
543 status = _status(ui, repo, wctx, kwt, *pats, **opts) |
24306
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24272
diff
changeset
|
544 if pats: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24272
diff
changeset
|
545 cwd = repo.getcwd() |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24272
diff
changeset
|
546 else: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24272
diff
changeset
|
547 cwd = '' |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
548 files = [] |
35001
3fbc30f7b9f0
py3: handle keyword arguments in hgext/keyword.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34500
diff
changeset
|
549 opts = pycompat.byteskwargs(opts) |
10652
e7f840e4ac7d
keyword: remove deprecated options
Christian Ebert <blacktrash@gmx.net>
parents:
10604
diff
changeset
|
550 if not opts.get('unknown') or opts.get('all'): |
22918
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
551 files = sorted(status.modified + status.added + status.clean) |
12627
7d9162892899
keyword: make iskwfile() a weeding method in lieu of a boolean
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
552 kwfiles = kwt.iskwfile(files, wctx) |
22918
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
553 kwdeleted = kwt.iskwfile(status.deleted, wctx) |
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
554 kwunknown = kwt.iskwfile(status.unknown, wctx) |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
555 if not opts.get('ignore') or opts.get('all'): |
13079
f3a2bb1e4255
keyword: make kwfiles show deleted files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
13078
diff
changeset
|
556 showfiles = kwfiles, kwdeleted, kwunknown |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9492
diff
changeset
|
557 else: |
13079
f3a2bb1e4255
keyword: make kwfiles show deleted files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
13078
diff
changeset
|
558 showfiles = [], [], [] |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
559 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
|
560 showfiles += ([f for f in files if f not in kwfiles], |
22918
31f34a213384
keyword: access status fields by name rather than index
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
21982
diff
changeset
|
561 [f for f in status.unknown if f not in kwunknown]) |
13079
f3a2bb1e4255
keyword: make kwfiles show deleted files configured for expansion
Christian Ebert <blacktrash@gmx.net>
parents:
13078
diff
changeset
|
562 kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split() |
17057
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
563 kwstates = zip(kwlabels, 'K!kIi', showfiles) |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
564 fm = ui.formatter('kwfiles', opts) |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
565 fmt = '%.0s%s\n' |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
566 if opts.get('all') or ui.verbose: |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
567 fmt = '%s %s\n' |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
568 for kwstate, char, filenames in kwstates: |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
569 label = 'kwfiles.' + kwstate |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
570 for f in filenames: |
17057
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
571 fm.startitem() |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
572 fm.write('kwstatus path', fmt, char, |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
573 repo.pathto(f, cwd), label=label) |
9720c55d605b
keyword: use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net>
parents:
16812
diff
changeset
|
574 fm.end() |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
575 |
21784
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
576 @command('kwshrink', |
32375
04baab18d60a
commands: move templates of common command options to cmdutil (API)
Yuya Nishihara <yuya@tcha.org>
parents:
32337
diff
changeset
|
577 cmdutil.walkopts, |
21784
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
578 _('hg kwshrink [OPTION]... [FILE]...'), |
44efd5b9ce45
keyword: define inferrepo in command decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21776
diff
changeset
|
579 inferrepo=True) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
580 def shrink(ui, repo, *pats, **opts): |
8763 | 581 '''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
|
582 |
13270
1e0d631b843b
keyword: update documentation for kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
13079
diff
changeset
|
583 Must be run before changing/disabling active keywords. |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
584 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
585 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
|
586 ''' |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
587 # 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
|
588 _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
|
589 |
33071
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
590 # monkeypatches |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
591 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
592 def kwpatchfile_init(orig, self, ui, gp, backend, store, eolmode=None): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
593 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
594 rejects or conflicts due to expanded keywords in working dir.''' |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
595 orig(self, ui, gp, backend, store, eolmode) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
596 kwt = getattr(getattr(backend, 'repo', None), '_keywordkwt', None) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
597 if kwt: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
598 # shrink keywords read from working dir |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
599 self.lines = kwt.shrinklines(self.fname, self.lines) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
600 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
601 def kwdiff(orig, repo, *args, **kwargs): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
602 '''Monkeypatch patch.diff to avoid expansion.''' |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
603 kwt = getattr(repo, '_keywordkwt', None) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
604 if kwt: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
605 restrict = kwt.restrict |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
606 kwt.restrict = True |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
607 try: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
608 for chunk in orig(repo, *args, **kwargs): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
609 yield chunk |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
610 finally: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
611 if kwt: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
612 kwt.restrict = restrict |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
613 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
614 def kwweb_skip(orig, web, req, tmpl): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
615 '''Wraps webcommands.x turning off keyword expansion.''' |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
616 kwt = getattr(web.repo, '_keywordkwt', None) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
617 if kwt: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
618 origmatch = kwt.match |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
619 kwt.match = util.never |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
620 try: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
621 for chunk in orig(web, req, tmpl): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
622 yield chunk |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
623 finally: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
624 if kwt: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
625 kwt.match = origmatch |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
626 |
34086
a39dce4a76b8
cmdutil: remove redundant commitfunc parameter in amend (API)
Saurabh Singh <singhsrb@fb.com>
parents:
33071
diff
changeset
|
627 def kw_amend(orig, ui, repo, old, extra, pats, opts): |
33071
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
628 '''Wraps cmdutil.amend expanding keywords after amend.''' |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
629 kwt = getattr(repo, '_keywordkwt', None) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
630 if kwt is None: |
34086
a39dce4a76b8
cmdutil: remove redundant commitfunc parameter in amend (API)
Saurabh Singh <singhsrb@fb.com>
parents:
33071
diff
changeset
|
631 return orig(ui, repo, old, extra, pats, opts) |
33071
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
632 with repo.wlock(): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
633 kwt.postcommit = True |
34086
a39dce4a76b8
cmdutil: remove redundant commitfunc parameter in amend (API)
Saurabh Singh <singhsrb@fb.com>
parents:
33071
diff
changeset
|
634 newid = orig(ui, repo, old, extra, pats, opts) |
33071
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
635 if newid != old.node(): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
636 ctx = repo[newid] |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
637 kwt.restrict = True |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
638 kwt.overwrite(ctx, ctx.files(), False, True) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
639 kwt.restrict = False |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
640 return newid |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
641 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
642 def kw_copy(orig, ui, repo, pats, opts, rename=False): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
643 '''Wraps cmdutil.copy so that copy/rename destinations do not |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
644 contain expanded keywords. |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
645 Note that the source of a regular file destination may also be a |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
646 symlink: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
647 hg cp sym x -> x is symlink |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
648 cp sym x; hg cp -A sym x -> x is file (maybe expanded keywords) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
649 For the latter we have to follow the symlink to find out whether its |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
650 target is configured for expansion and we therefore must unexpand the |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
651 keywords in the destination.''' |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
652 kwt = getattr(repo, '_keywordkwt', None) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
653 if kwt is None: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
654 return orig(ui, repo, pats, opts, rename) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
655 with repo.wlock(): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
656 orig(ui, repo, pats, opts, rename) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
657 if opts.get('dry_run'): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
658 return |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
659 wctx = repo[None] |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
660 cwd = repo.getcwd() |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
661 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
662 def haskwsource(dest): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
663 '''Returns true if dest is a regular file and configured for |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
664 expansion or a symlink which points to a file configured for |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
665 expansion. ''' |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
666 source = repo.dirstate.copied(dest) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
667 if 'l' in wctx.flags(source): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
668 source = pathutil.canonpath(repo.root, cwd, |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
669 os.path.realpath(source)) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
670 return kwt.match(source) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
671 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
672 candidates = [f for f in repo.dirstate.copies() if |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
673 'l' not in wctx.flags(f) and haskwsource(f)] |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
674 kwt.overwrite(wctx, candidates, False, False) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
675 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
676 def kw_dorecord(orig, ui, repo, commitfunc, *pats, **opts): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
677 '''Wraps record.dorecord expanding keywords after recording.''' |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
678 kwt = getattr(repo, '_keywordkwt', None) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
679 if kwt is None: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
680 return orig(ui, repo, commitfunc, *pats, **opts) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
681 with repo.wlock(): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
682 # record returns 0 even when nothing has changed |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
683 # therefore compare nodes before and after |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
684 kwt.postcommit = True |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
685 ctx = repo['.'] |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
686 wstatus = ctx.status() |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
687 ret = orig(ui, repo, commitfunc, *pats, **opts) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
688 recctx = repo['.'] |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
689 if ctx != recctx: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
690 modified, added = _preselect(wstatus, recctx.files()) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
691 kwt.restrict = False |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
692 kwt.overwrite(recctx, modified, False, True) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
693 kwt.overwrite(recctx, added, False, True, True) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
694 kwt.restrict = True |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
695 return ret |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
696 |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
697 def kwfilectx_cmp(orig, self, fctx): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
698 if fctx._customcmp: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
699 return fctx.cmp(self) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
700 kwt = getattr(self._repo, '_keywordkwt', None) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
701 if kwt is None: |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
702 return orig(self, fctx) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
703 # keyword affects data size, comparing wdir and filelog size does |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
704 # not make sense |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
705 if (fctx._filenode is None and |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
706 (self._repo._encodefilterpats or |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
707 kwt.match(fctx.path()) and 'l' not in fctx.flags() or |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
708 self.size() - 4 == fctx.size()) or |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
709 self.size() == fctx.size()): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
710 return self._filelog.cmp(self._filenode, fctx.data()) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
711 return True |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
712 |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
713 def uisetup(ui): |
33071
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
714 ''' Monkeypatches dispatch._parse to retrieve user command. |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
715 Overrides file method to return kwfilelog instead of filelog |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
716 if file matches user configuration. |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
717 Wraps commit to overwrite configured files with updated |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
718 keyword substitutions. |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
719 Monkeypatches patch and webcommands.''' |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
720 |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
721 def kwdispatch_parse(orig, ui, args): |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
722 '''Monkeypatch dispatch._parse to obtain running hg command.''' |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
723 cmd, func, args, options, cmdoptions = orig(ui, args) |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
724 kwtools['hgcmd'] = cmd |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
725 return cmd, func, args, options, cmdoptions |
6502
ba8a0338baf7
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net>
parents:
6416
diff
changeset
|
726 |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
727 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
|
728 |
33071
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
729 extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
730 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
731 extensions.wrapfunction(patch, 'diff', kwdiff) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
732 extensions.wrapfunction(cmdutil, 'amend', kw_amend) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
733 extensions.wrapfunction(cmdutil, 'copy', kw_copy) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
734 extensions.wrapfunction(cmdutil, 'dorecord', kw_dorecord) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
735 for c in nokwwebcommands.split(): |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
736 extensions.wrapfunction(webcommands, c, kwweb_skip) |
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
737 |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
738 def reposetup(ui, repo): |
33071
279c072a5c49
keyword: wrap functions only once at loading keyword extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33070
diff
changeset
|
739 '''Sets up repo as kwrepo for keyword substitution.''' |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
740 |
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
741 try: |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
742 if (not repo.local() or kwtools['hgcmd'] in nokwcommands.split() |
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
743 or '.hg' in util.splitpath(repo.root) |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
744 or repo._url.startswith('bundle:')): |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
745 return |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
746 except AttributeError: |
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7762
diff
changeset
|
747 pass |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
748 |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
749 inc, exc = [], ['.hg*'] |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
750 for pat, opt in ui.configitems('keyword'): |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
751 if opt != 'ignore': |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
752 inc.append(pat) |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
753 else: |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
754 exc.append(pat) |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
755 if not inc: |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
756 return |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11350
diff
changeset
|
757 |
33070
735218be6122
keyword: use _keywordkwt of repository instead of kwtools['templater']
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33069
diff
changeset
|
758 kwt = kwtemplater(ui, repo, inc, exc) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
759 |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
760 class kwrepo(repo.__class__): |
6114
ee83510fe567
keyword: move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net>
parents:
6092
diff
changeset
|
761 def file(self, f): |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
762 if f[0] == '/': |
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
763 f = f[1:] |
23878
37a92908a382
localrepo: remove all external users of localrepo.sopener
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
23877
diff
changeset
|
764 return kwfilelog(self.svfs, kwt, f) |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
765 |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
766 def wread(self, filename): |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
767 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
|
768 return kwt.wread(filename, data) |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5831
diff
changeset
|
769 |
9096
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
770 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
|
771 # 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
|
772 # 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
|
773 self.commitctx = self.kwcommitctx |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
774 try: |
10495
2c2d2f1354b4
keyword: do not postpone commit hooks
Christian Ebert <blacktrash@gmx.net>
parents:
10492
diff
changeset
|
775 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
|
776 finally: |
47bc92755b95
keyword: eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net>
parents:
8996
diff
changeset
|
777 del self.commitctx |
8996
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
778 |
23e941d7f507
keyword: make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net>
parents:
8957
diff
changeset
|
779 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
|
780 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
|
781 # no lock needed, only called from repo.commit() which already locks |
16809
6b704fa2bea1
keyword: rename kwt.record attribute to kwt.postcommit
Christian Ebert <blacktrash@gmx.net>
parents:
16743
diff
changeset
|
782 if not kwt.postcommit: |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
783 restrict = kwt.restrict |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
784 kwt.restrict = True |
11320
e4274f9f97c8
keyword: pass context to kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net>
parents:
11303
diff
changeset
|
785 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()), |
12625
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
786 False, True) |
d87f3ff904ba
keyword: refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net>
parents:
12605
diff
changeset
|
787 kwt.restrict = restrict |
10604
9a36d159595f
keyword: remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net>
parents:
10603
diff
changeset
|
788 return n |
5815
0637d97a8cb4
Add extension for filewise RCS-keyword expansion in working dir
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
789 |
15183
59e8bc22506e
rollback: avoid unsafe rollback when not at tip (issue2998)
Greg Ward <greg@gerg.ca>
parents:
15083
diff
changeset
|
790 def rollback(self, dryrun=False, force=False): |
32935
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
791 with self.wlock(): |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
792 origrestrict = kwt.restrict |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
793 try: |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
794 if not dryrun: |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
795 changed = self['.'].files() |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
796 ret = super(kwrepo, self).rollback(dryrun, force) |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
797 if not dryrun: |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
798 ctx = self['.'] |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
799 modified, added = _preselect(ctx.status(), changed) |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
800 kwt.restrict = False |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
801 kwt.overwrite(ctx, modified, True, True) |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
802 kwt.overwrite(ctx, added, True, False) |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
803 return ret |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
804 finally: |
69d1c3ea0d6f
keyword: use context manager for rollback locking
Christian Ebert <blacktrash@gmx.net>
parents:
32837
diff
changeset
|
805 kwt.restrict = origrestrict |
12498
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12497
diff
changeset
|
806 |
33067
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
807 repo.__class__ = kwrepo |
5a51db8bf41b
keyword: make wrapped repository and kwtemplater refer to each other
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
808 repo._keywordkwt = kwt |