Mercurial > hg
annotate mercurial/logcmdutil.py @ 45043:be58fb1eaa73
procutil: make stdout line-buffered on Windows if connected to TTY
Windows doesn’t support line buffering. Previously, we worked around that by
setting the stream unbuffered. Instead, we can use our own line buffering we
already use on Python 3.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Sat, 04 Jul 2020 11:41:39 +0200 |
parents | 3b7aabd02e11 |
children | dfb67cd1da7f 4ebc5f325bed |
rev | line source |
---|---|
35885
7625b4f7db70
cmdutil: split functions of log-like commands to new module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35874
diff
changeset
|
1 # logcmdutil.py - utility for log-like commands |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 # |
4635
63b9d2deed48
Updated copyright notices and add "and others" to "hg version"
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 # |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8210
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. |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
8 from __future__ import absolute_import |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
9 |
31807
e6eb86b154c5
templater: provide loop counter as "index" keyword
Yuya Nishihara <yuya@tcha.org>
parents:
31698
diff
changeset
|
10 import itertools |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
11 import os |
41646
d4c9eebdd72d
patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41630
diff
changeset
|
12 import posixpath |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
13 |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
14 from .i18n import _ |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
15 from .node import ( |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
16 nullid, |
39796
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
17 wdirid, |
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
18 wdirrev, |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
19 ) |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
20 |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
21 from . import ( |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
22 dagop, |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
23 error, |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
24 formatter, |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
25 graphmod, |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
26 match as matchmod, |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
27 mdiff, |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
28 patch, |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
29 pathutil, |
30519
20a42325fdef
py3: use pycompat.getcwd() instead of os.getcwd()
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30506
diff
changeset
|
30 pycompat, |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
31 revset, |
35644
7a0a90d63a8c
log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents:
35643
diff
changeset
|
32 revsetlang, |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
33 scmutil, |
31023
aea06029919e
revset: import set classes directly from smartset module
Yuya Nishihara <yuya@tcha.org>
parents:
30877
diff
changeset
|
34 smartset, |
28322
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
35 templatekw, |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
36 templater, |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
37 util, |
ebd0e86bdf89
cmdutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28313
diff
changeset
|
38 ) |
37084
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
37072
diff
changeset
|
39 from .utils import ( |
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
37072
diff
changeset
|
40 dateutil, |
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
37072
diff
changeset
|
41 stringutil, |
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
37072
diff
changeset
|
42 ) |
21405
dcf20f244c2a
cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21241
diff
changeset
|
43 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
44 |
43773
7b14d649af1b
typing: consolidate "if not globals():" trick
Yuya Nishihara <yuya@tcha.org>
parents:
43701
diff
changeset
|
45 if pycompat.TYPE_CHECKING: |
43701
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
46 from typing import ( |
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
47 Any, |
43774
064c9a4ced4a
typing: fix return type of logcmdutil.getrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
43773
diff
changeset
|
48 Optional, |
43701
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
49 Tuple, |
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
50 ) |
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
51 |
43774
064c9a4ced4a
typing: fix return type of logcmdutil.getrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
43773
diff
changeset
|
52 for t in (Any, Optional, Tuple): |
43701
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
53 assert t |
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
54 |
c9301ac73b95
logcmdutil: add a type annotation
Augie Fackler <augie@google.com>
parents:
43648
diff
changeset
|
55 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
56 def getlimit(opts): |
6190
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
57 """get the log limit according to option -l/--limit""" |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
58 limit = opts.get(b'limit') |
6190
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
59 if limit: |
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
60 try: |
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
61 limit = int(limit) |
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
62 except ValueError: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
63 raise error.Abort(_(b'limit must be a positive integer')) |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
64 if limit <= 0: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
65 raise error.Abort(_(b'limit must be positive')) |
6190
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
66 else: |
10111
27457d31ae3f
cmdutil: replace sys.maxint with None as default value in loglimit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10061
diff
changeset
|
67 limit = None |
6190
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
68 return limit |
a79d9408806f
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6145
diff
changeset
|
69 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
70 |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
71 def diffordiffstat( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
72 ui, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
73 repo, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
74 diffopts, |
44823
3b7aabd02e11
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
Augie Fackler <augie@google.com>
parents:
44345
diff
changeset
|
75 ctx1, |
3b7aabd02e11
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
Augie Fackler <augie@google.com>
parents:
44345
diff
changeset
|
76 ctx2, |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
77 match, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
78 changes=None, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
79 stat=False, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
80 fp=None, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
81 graphwidth=0, |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
82 prefix=b'', |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
83 root=b'', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
84 listsubrepos=False, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
85 hunksfilterfn=None, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
86 ): |
11050
5d35f7d93514
commands: refactor diff --stat and qdiff --stat
Yuya Nishihara <yuya@tcha.org>
parents:
11017
diff
changeset
|
87 '''show diff or diffstat.''' |
24455
16961d43dc89
diff: rename --relative option to --root
Sean Farley <sean@farley.io>
parents:
24451
diff
changeset
|
88 if root: |
16961d43dc89
diff: rename --relative option to --root
Sean Farley <sean@farley.io>
parents:
24451
diff
changeset
|
89 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) |
24431
a0004402776b
cmdutil.diffordiffstat: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24422
diff
changeset
|
90 else: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
91 relroot = b'' |
41620
74f53d3bd685
patch: accept second matcher that applies only to copy sources (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41619
diff
changeset
|
92 copysourcematch = None |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
93 |
41647
ec37db02fc72
diff: make `hg diff --root=subrepo` work
Martin von Zweigbergk <martinvonz@google.com>
parents:
41646
diff
changeset
|
94 def compose(f, g): |
ec37db02fc72
diff: make `hg diff --root=subrepo` work
Martin von Zweigbergk <martinvonz@google.com>
parents:
41646
diff
changeset
|
95 return lambda x: f(g(x)) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
96 |
41646
d4c9eebdd72d
patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41630
diff
changeset
|
97 def pathfn(f): |
d4c9eebdd72d
patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41630
diff
changeset
|
98 return posixpath.join(prefix, f) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
99 |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
100 if relroot != b'': |
24431
a0004402776b
cmdutil.diffordiffstat: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24422
diff
changeset
|
101 # XXX relative roots currently don't work if the root is within a |
a0004402776b
cmdutil.diffordiffstat: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24422
diff
changeset
|
102 # subrepo |
41655
df59b1078983
diff: respect ui.relative-paths for warning about path outside --root
Martin von Zweigbergk <martinvonz@google.com>
parents:
41647
diff
changeset
|
103 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) |
df59b1078983
diff: respect ui.relative-paths for warning about path outside --root
Martin von Zweigbergk <martinvonz@google.com>
parents:
41647
diff
changeset
|
104 uirelroot = uipathfn(pathfn(relroot)) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
105 relroot += b'/' |
24431
a0004402776b
cmdutil.diffordiffstat: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24422
diff
changeset
|
106 for matchroot in match.files(): |
a0004402776b
cmdutil.diffordiffstat: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24422
diff
changeset
|
107 if not matchroot.startswith(relroot): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
108 ui.warn( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
109 _(b'warning: %s not inside relative root %s\n') |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
110 % (uipathfn(pathfn(matchroot)), uirelroot) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
111 ) |
24431
a0004402776b
cmdutil.diffordiffstat: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24422
diff
changeset
|
112 |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
113 relrootmatch = scmutil.match(ctx2, pats=[relroot], default=b'path') |
41619
035cae1d197f
patch: let caller pass in root-filtering matcher (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41610
diff
changeset
|
114 match = matchmod.intersectmatchers(match, relrootmatch) |
41620
74f53d3bd685
patch: accept second matcher that applies only to copy sources (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41619
diff
changeset
|
115 copysourcematch = relrootmatch |
41619
035cae1d197f
patch: let caller pass in root-filtering matcher (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41610
diff
changeset
|
116 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
117 checkroot = repo.ui.configbool( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
118 b'devel', b'all-warnings' |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
119 ) or repo.ui.configbool(b'devel', b'check-relroot') |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
120 |
41647
ec37db02fc72
diff: make `hg diff --root=subrepo` work
Martin von Zweigbergk <martinvonz@google.com>
parents:
41646
diff
changeset
|
121 def relrootpathfn(f): |
41646
d4c9eebdd72d
patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41630
diff
changeset
|
122 if checkroot and not f.startswith(relroot): |
d4c9eebdd72d
patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41630
diff
changeset
|
123 raise AssertionError( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
124 b"file %s doesn't start with relroot %s" % (f, relroot) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
125 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
126 return f[len(relroot) :] |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
127 |
41647
ec37db02fc72
diff: make `hg diff --root=subrepo` work
Martin von Zweigbergk <martinvonz@google.com>
parents:
41646
diff
changeset
|
128 pathfn = compose(relrootpathfn, pathfn) |
41646
d4c9eebdd72d
patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41630
diff
changeset
|
129 |
11050
5d35f7d93514
commands: refactor diff --stat and qdiff --stat
Yuya Nishihara <yuya@tcha.org>
parents:
11017
diff
changeset
|
130 if stat: |
35430
058c725925e3
diff: disable diff.noprefix option for diffstat (issue5759)
Yuya Nishihara <yuya@tcha.org>
parents:
35026
diff
changeset
|
131 diffopts = diffopts.copy(context=0, noprefix=False) |
11050
5d35f7d93514
commands: refactor diff --stat and qdiff --stat
Yuya Nishihara <yuya@tcha.org>
parents:
11017
diff
changeset
|
132 width = 80 |
5d35f7d93514
commands: refactor diff --stat and qdiff --stat
Yuya Nishihara <yuya@tcha.org>
parents:
11017
diff
changeset
|
133 if not ui.plain(): |
41097
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
40285
diff
changeset
|
134 width = ui.termwidth() - graphwidth |
41670
db69a763bc89
diff: make --stat respect ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
41655
diff
changeset
|
135 # If an explicit --root was given, don't respect ui.relative-paths |
db69a763bc89
diff: make --stat respect ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
41655
diff
changeset
|
136 if not relroot: |
db69a763bc89
diff: make --stat respect ui.relative-paths
Martin von Zweigbergk <martinvonz@google.com>
parents:
41655
diff
changeset
|
137 pathfn = compose(scmutil.getuipathfn(repo), pathfn) |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
138 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
139 chunks = ctx2.diff( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
140 ctx1, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
141 match, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
142 changes, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
143 opts=diffopts, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
144 pathfn=pathfn, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
145 copysourcematch=copysourcematch, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
146 hunksfilterfn=hunksfilterfn, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
147 ) |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
148 |
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
149 if fp is not None or ui.canwritewithoutlabels(): |
36008
006ff7268c5c
diff: remove fp.write() wrapper which drops label argument
Yuya Nishihara <yuya@tcha.org>
parents:
36007
diff
changeset
|
150 out = fp or ui |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
151 if stat: |
36115
c1104fe76e69
py3: preserve chunks as an iterable of bytes
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36008
diff
changeset
|
152 chunks = [patch.diffstat(util.iterlines(chunks), width=width)] |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
153 for chunk in util.filechunkiter(util.chunkbuffer(chunks)): |
36008
006ff7268c5c
diff: remove fp.write() wrapper which drops label argument
Yuya Nishihara <yuya@tcha.org>
parents:
36007
diff
changeset
|
154 out.write(chunk) |
11050
5d35f7d93514
commands: refactor diff --stat and qdiff --stat
Yuya Nishihara <yuya@tcha.org>
parents:
11017
diff
changeset
|
155 else: |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
156 if stat: |
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
157 chunks = patch.diffstatui(util.iterlines(chunks), width=width) |
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
158 else: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
159 chunks = patch.difflabel( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
160 lambda chunks, **kwargs: chunks, chunks, opts=diffopts |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
161 ) |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
162 if ui.canbatchlabeledwrites(): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
163 |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
164 def gen(): |
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
165 for chunk, label in chunks: |
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
166 yield ui.label(chunk, label=label) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
167 |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
168 for chunk in util.filechunkiter(util.chunkbuffer(gen())): |
36008
006ff7268c5c
diff: remove fp.write() wrapper which drops label argument
Yuya Nishihara <yuya@tcha.org>
parents:
36007
diff
changeset
|
169 ui.write(chunk) |
35961
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
170 else: |
0ff41ced4c12
diff: improve ui.write performance when not coloring on Windows
Joerg Sonnenberger <joerg@bec.de>
parents:
35955
diff
changeset
|
171 for chunk, label in chunks: |
36008
006ff7268c5c
diff: remove fp.write() wrapper which drops label argument
Yuya Nishihara <yuya@tcha.org>
parents:
36007
diff
changeset
|
172 ui.write(chunk, label=label) |
11050
5d35f7d93514
commands: refactor diff --stat and qdiff --stat
Yuya Nishihara <yuya@tcha.org>
parents:
11017
diff
changeset
|
173 |
44823
3b7aabd02e11
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
Augie Fackler <augie@google.com>
parents:
44345
diff
changeset
|
174 node2 = ctx2.node() |
42010
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
175 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
176 tempnode2 = node2 |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
177 try: |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
178 if node2 is not None: |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
179 tempnode2 = ctx2.substate[subpath][1] |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
180 except KeyError: |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
181 # A subrepo that existed in node1 was deleted between node1 and |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
182 # node2 (inclusive). Thus, ctx2's substate won't contain that |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
183 # subpath. The best we can do is to ignore it. |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
184 tempnode2 = None |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
185 submatch = matchmod.subdirmatcher(subpath, match) |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
186 subprefix = repo.wvfs.reljoin(prefix, subpath) |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41996
diff
changeset
|
187 if listsubrepos or match.exact(subpath) or any(submatch.files()): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
188 sub.diff( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
189 ui, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
190 diffopts, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
191 tempnode2, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
192 submatch, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
193 changes=changes, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
194 stat=stat, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
195 fp=fp, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
196 prefix=subprefix, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
197 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
198 |
12167
d2c5b0927c28
diff: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net>
parents:
12164
diff
changeset
|
199 |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
200 class changesetdiffer(object): |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
201 """Generate diff of changeset with pre-configured filtering functions""" |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
202 |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
203 def _makefilematcher(self, ctx): |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
204 return scmutil.matchall(ctx.repo()) |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
205 |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
206 def _makehunksfilter(self, ctx): |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
207 return None |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
208 |
41097
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
40285
diff
changeset
|
209 def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
210 diffordiffstat( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
211 ui, |
44823
3b7aabd02e11
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
Augie Fackler <augie@google.com>
parents:
44345
diff
changeset
|
212 ctx.repo(), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
213 diffopts, |
44823
3b7aabd02e11
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
Augie Fackler <augie@google.com>
parents:
44345
diff
changeset
|
214 ctx.p1(), |
3b7aabd02e11
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
Augie Fackler <augie@google.com>
parents:
44345
diff
changeset
|
215 ctx, |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
216 match=self._makefilematcher(ctx), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
217 stat=stat, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
218 graphwidth=graphwidth, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
219 hunksfilterfn=self._makehunksfilter(ctx), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
220 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
221 |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
222 |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
223 def changesetlabels(ctx): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
224 labels = [b'log.changeset', b'changeset.%s' % ctx.phasestr()] |
31698
9b3577796291
cmdutil: add a "changeset.obsolete" label in changeset_printer
Denis Laxalde <denis@laxalde.org>
parents:
31486
diff
changeset
|
225 if ctx.obsolete(): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
226 labels.append(b'changeset.obsolete') |
33730
52c5ff856b49
context: rename troubled into isunstable
Boris Feld <boris.feld@octobus.net>
parents:
33726
diff
changeset
|
227 if ctx.isunstable(): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
228 labels.append(b'changeset.unstable') |
33726
ab0c55c2ad9a
context: rename troubles into instabilities
Boris Feld <boris.feld@octobus.net>
parents:
33694
diff
changeset
|
229 for instability in ctx.instabilities(): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
230 labels.append(b'instability.%s' % instability) |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
231 return b' '.join(labels) |
30694
5289fd78017a
cmdutil: extract a _changesetlabels function out of changeset_printer._show()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30615
diff
changeset
|
232 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
233 |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
234 class changesetprinter(object): |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
235 '''show changeset information when templating not requested.''' |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
236 |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
237 def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False): |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
238 self.ui = ui |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
239 self.repo = repo |
3645
b984dcb1df71
Refactor log ui buffering and patch display
Matt Mackall <mpm@selenic.com>
parents:
3643
diff
changeset
|
240 self.buffered = buffered |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
241 self._differ = differ or changesetdiffer() |
37837
e0f30c91dfd8
log: cache diffopts instance
Yuya Nishihara <yuya@tcha.org>
parents:
37773
diff
changeset
|
242 self._diffopts = patch.diffallopts(ui, diffopts) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
243 self._includestat = diffopts and diffopts.get(b'stat') |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
244 self._includediff = diffopts and diffopts.get(b'patch') |
3738
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
245 self.header = {} |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
246 self.hunk = {} |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
247 self.lastheader = None |
10152
56284451a22c
Added support for templatevar "footer" to cmdutil.py
Robert Bachmann <rbachm@gmail.com>
parents:
10111
diff
changeset
|
248 self.footer = None |
35212
c7b45db8f317
log: translate column labels at once (issue5750)
Yuya Nishihara <yuya@tcha.org>
parents:
35211
diff
changeset
|
249 self._columns = templatekw.getlogcolumns() |
3645
b984dcb1df71
Refactor log ui buffering and patch display
Matt Mackall <mpm@selenic.com>
parents:
3643
diff
changeset
|
250 |
25763
60c791592aa7
changeset_printer: change flush() to accept ctx instead of rev
Yuya Nishihara <yuya@tcha.org>
parents:
25762
diff
changeset
|
251 def flush(self, ctx): |
60c791592aa7
changeset_printer: change flush() to accept ctx instead of rev
Yuya Nishihara <yuya@tcha.org>
parents:
25762
diff
changeset
|
252 rev = ctx.rev() |
3738
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
253 if rev in self.header: |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
254 h = self.header[rev] |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
255 if h != self.lastheader: |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
256 self.lastheader = h |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
257 self.ui.write(h) |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
258 del self.header[rev] |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
259 if rev in self.hunk: |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
260 self.ui.write(self.hunk[rev]) |
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
261 del self.hunk[rev] |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
262 |
10152
56284451a22c
Added support for templatevar "footer" to cmdutil.py
Robert Bachmann <rbachm@gmail.com>
parents:
10111
diff
changeset
|
263 def close(self): |
56284451a22c
Added support for templatevar "footer" to cmdutil.py
Robert Bachmann <rbachm@gmail.com>
parents:
10111
diff
changeset
|
264 if self.footer: |
56284451a22c
Added support for templatevar "footer" to cmdutil.py
Robert Bachmann <rbachm@gmail.com>
parents:
10111
diff
changeset
|
265 self.ui.write(self.footer) |
56284451a22c
Added support for templatevar "footer" to cmdutil.py
Robert Bachmann <rbachm@gmail.com>
parents:
10111
diff
changeset
|
266 |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
267 def show(self, ctx, copies=None, **props): |
33100
05906b8e1d23
py3: use pycompat.byteskwargs() to convert kwargs' keys to bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33045
diff
changeset
|
268 props = pycompat.byteskwargs(props) |
3738
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
269 if self.buffered: |
27107
c57ebef70f6f
cmdutil: pass labeled=True to pushbuffer()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27065
diff
changeset
|
270 self.ui.pushbuffer(labeled=True) |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
271 self._show(ctx, copies, props) |
27109
a93d53f79e6e
ui: remove labeled argument from popbuffer
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27107
diff
changeset
|
272 self.hunk[ctx.rev()] = self.ui.popbuffer() |
3738
cb48cd27d3f4
use ui buffering in changeset printer
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
273 else: |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
274 self._show(ctx, copies, props) |
34856
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34852
diff
changeset
|
275 |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
276 def _show(self, ctx, copies, props): |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
277 '''show a single changeset or file revision''' |
7369
87158be081b8
cmdutil: use change contexts for cset-printer and cset-templater
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7361
diff
changeset
|
278 changenode = ctx.node() |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
279 graphwidth = props.get(b'graphwidth', 0) |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24583
diff
changeset
|
280 |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24583
diff
changeset
|
281 if self.ui.quiet: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
282 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
283 b"%s\n" % scmutil.formatchangeid(ctx), label=b'log.node' |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
284 ) |
24584
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24583
diff
changeset
|
285 return |
5a40b5d45396
changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents:
24583
diff
changeset
|
286 |
35212
c7b45db8f317
log: translate column labels at once (issue5750)
Yuya Nishihara <yuya@tcha.org>
parents:
35211
diff
changeset
|
287 columns = self._columns |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
288 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
289 columns[b'changeset'] % scmutil.formatchangeid(ctx), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
290 label=changesetlabels(ctx), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
291 ) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
292 |
23772
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
293 # branches are shown first before any other names due to backwards |
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
294 # compatibility |
9637
64425c5a9257
cmdutil: minor refactoring of changeset_printer._show
Adrian Buehlmann <adrian@cadifra.com>
parents:
9547
diff
changeset
|
295 branch = ctx.branch() |
4176
f9bbcebcacea
"default" is the default branch name
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4055
diff
changeset
|
296 # don't show the default branch name |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
297 if branch != b'default': |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
298 self.ui.write(columns[b'branch'] % branch, label=b'log.branch') |
23772
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
299 |
43106
d783f945a701
py3: finish porting iteritems() to pycompat and remove source transformer
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43102
diff
changeset
|
300 for nsname, ns in pycompat.iteritems(self.repo.names): |
23772
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
301 # branches has special logic already handled above, so here we just |
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
302 # skip it |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
303 if nsname == b'branches': |
23772
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
304 continue |
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
305 # we will use the templatename as the color name since those two |
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
306 # should be the same |
07309e527df7
log: use new namespaces api to display names
Sean Farley <sean.michael.farley@gmail.com>
parents:
23735
diff
changeset
|
307 for name in ns.names(self.repo, changenode): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
308 self.ui.write(ns.logfmt % name, label=b'log.%s' % ns.colorname) |
22765
55dcc7fb731c
log: do not hide the public phase in debug mode (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22764
diff
changeset
|
309 if self.ui.debugflag: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
310 self.ui.write( |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
311 columns[b'phase'] % ctx.phasestr(), label=b'log.phase' |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
312 ) |
26433
3ad41638b4b4
changeset_printer: move _meaningful_parentrevs() to scmutil
Yuya Nishihara <yuya@tcha.org>
parents:
26426
diff
changeset
|
313 for pctx in scmutil.meaningfulparents(self.repo, ctx): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
314 label = b'log.parent changeset.%s' % pctx.phasestr() |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
315 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
316 columns[b'parent'] % scmutil.formatchangeid(pctx), label=label |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
317 ) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
318 |
39796
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
319 if self.ui.debugflag: |
9547
f57640bf10d4
cmdutil: changeset_printer: use methods of filectx/changectx.
Greg Ward <greg-hg@gerg.ca>
parents:
9536
diff
changeset
|
320 mnode = ctx.manifestnode() |
39796
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
321 if mnode is None: |
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
322 mnode = wdirid |
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
323 mrev = wdirrev |
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
324 else: |
94ca3579e84e
log: fill in pseudo rev and node as wdir() manifest identifiers
Yuya Nishihara <yuya@tcha.org>
parents:
39795
diff
changeset
|
325 mrev = self.repo.manifestlog.rev(mnode) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
326 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
327 columns[b'manifest'] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
328 % scmutil.formatrevnode(self.ui, mrev, mnode), |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
329 label=b'ui.debug log.manifest', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
330 ) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
331 self.ui.write(columns[b'user'] % ctx.user(), label=b'log.user') |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
332 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
333 columns[b'date'] % dateutil.datestr(ctx.date()), label=b'log.date' |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
334 ) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
335 |
33730
52c5ff856b49
context: rename troubled into isunstable
Boris Feld <boris.feld@octobus.net>
parents:
33726
diff
changeset
|
336 if ctx.isunstable(): |
33726
ab0c55c2ad9a
context: rename troubles into instabilities
Boris Feld <boris.feld@octobus.net>
parents:
33694
diff
changeset
|
337 instabilities = ctx.instabilities() |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
338 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
339 columns[b'instability'] % b', '.join(instabilities), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
340 label=b'log.instability', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
341 ) |
30695
f05ede08dcf7
cmdutil: add support for evolution "troubles" display in changeset_printer
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30694
diff
changeset
|
342 |
34852
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
343 elif ctx.obsolete(): |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
344 self._showobsfate(ctx) |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
345 |
33154
4ecc6047d45f
log: add an extension hook-point in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
33102
diff
changeset
|
346 self._exthook(ctx) |
4ecc6047d45f
log: add an extension hook-point in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
33102
diff
changeset
|
347 |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
348 if self.ui.debugflag: |
43648
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
349 files = ctx.p1().status(ctx) |
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
350 for key, value in zip( |
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
351 [b'files', b'files+', b'files-'], |
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
352 [files.modified, files.added, files.removed], |
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
353 ): |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
354 if value: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
355 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
356 columns[key] % b" ".join(value), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
357 label=b'ui.debug log.files', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
358 ) |
9547
f57640bf10d4
cmdutil: changeset_printer: use methods of filectx/changectx.
Greg Ward <greg-hg@gerg.ca>
parents:
9536
diff
changeset
|
359 elif ctx.files() and self.ui.verbose: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
360 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
361 columns[b'files'] % b" ".join(ctx.files()), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
362 label=b'ui.note log.files', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
363 ) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
364 if copies and self.ui.verbose: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
365 copies = [b'%s (%s)' % c for c in copies] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
366 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
367 columns[b'copies'] % b' '.join(copies), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
368 label=b'ui.note log.copies', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
369 ) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
370 |
9637
64425c5a9257
cmdutil: minor refactoring of changeset_printer._show
Adrian Buehlmann <adrian@cadifra.com>
parents:
9547
diff
changeset
|
371 extra = ctx.extra() |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
372 if extra and self.ui.debugflag: |
8209
a1a5a57efe90
replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents:
8189
diff
changeset
|
373 for key, value in sorted(extra.items()): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
374 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
375 columns[b'extra'] % (key, stringutil.escapestr(value)), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
376 label=b'ui.debug log.extra', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
377 ) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
378 |
9547
f57640bf10d4
cmdutil: changeset_printer: use methods of filectx/changectx.
Greg Ward <greg-hg@gerg.ca>
parents:
9536
diff
changeset
|
379 description = ctx.description().strip() |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
380 if description: |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
381 if self.ui.verbose: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
382 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
383 _(b"description:\n"), label=b'ui.note log.description' |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
384 ) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
385 self.ui.write(description, label=b'ui.note log.description') |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
386 self.ui.write(b"\n\n") |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
387 else: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
388 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
389 columns[b'summary'] % description.splitlines()[0], |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
390 label=b'log.summary', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
391 ) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
392 self.ui.write(b"\n") |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
393 |
41097
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
40285
diff
changeset
|
394 self._showpatch(ctx, graphwidth) |
27065
93bcc73df8d5
cmdutil.changeset_printer: pass context into showpatch()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26938
diff
changeset
|
395 |
34852
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
396 def _showobsfate(self, ctx): |
36517
69477bac8926
log: do not invoke templatekw.showobsfate() as a function
Yuya Nishihara <yuya@tcha.org>
parents:
36513
diff
changeset
|
397 # TODO: do not depend on templater |
69477bac8926
log: do not invoke templatekw.showobsfate() as a function
Yuya Nishihara <yuya@tcha.org>
parents:
36513
diff
changeset
|
398 tres = formatter.templateresources(self.repo.ui, self.repo) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
399 t = formatter.maketemplater( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
400 self.repo.ui, |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
401 b'{join(obsfate, "\n")}', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
402 defaults=templatekw.keywords, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
403 resources=tres, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
404 ) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
405 obsfate = t.renderdefault({b'ctx': ctx}).splitlines() |
34852
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
406 |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
407 if obsfate: |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
408 for obsfateline in obsfate: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
409 self.ui.write( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
410 self._columns[b'obsolete'] % obsfateline, |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
411 label=b'log.obsfate', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
412 ) |
34852
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34794
diff
changeset
|
413 |
33154
4ecc6047d45f
log: add an extension hook-point in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
33102
diff
changeset
|
414 def _exthook(self, ctx): |
4ecc6047d45f
log: add an extension hook-point in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
33102
diff
changeset
|
415 '''empty method used by extension as a hook point |
4ecc6047d45f
log: add an extension hook-point in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
33102
diff
changeset
|
416 ''' |
4ecc6047d45f
log: add an extension hook-point in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
33102
diff
changeset
|
417 |
41097
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
40285
diff
changeset
|
418 def _showpatch(self, ctx, graphwidth=0): |
37838
3fe1c9263024
log: consume --stat/patch options at constructor of changesetprinter
Yuya Nishihara <yuya@tcha.org>
parents:
37837
diff
changeset
|
419 if self._includestat: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
420 self._differ.showdiff( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
421 self.ui, ctx, self._diffopts, graphwidth, stat=True |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
422 ) |
37838
3fe1c9263024
log: consume --stat/patch options at constructor of changesetprinter
Yuya Nishihara <yuya@tcha.org>
parents:
37837
diff
changeset
|
423 if self._includestat and self._includediff: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
424 self.ui.write(b"\n") |
37838
3fe1c9263024
log: consume --stat/patch options at constructor of changesetprinter
Yuya Nishihara <yuya@tcha.org>
parents:
37837
diff
changeset
|
425 if self._includediff: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
426 self._differ.showdiff( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
427 self.ui, ctx, self._diffopts, graphwidth, stat=False |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
428 ) |
37838
3fe1c9263024
log: consume --stat/patch options at constructor of changesetprinter
Yuya Nishihara <yuya@tcha.org>
parents:
37837
diff
changeset
|
429 if self._includestat or self._includediff: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
430 self.ui.write(b"\n") |
3645
b984dcb1df71
Refactor log ui buffering and patch display
Matt Mackall <mpm@selenic.com>
parents:
3643
diff
changeset
|
431 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
432 |
37773
0f084741cd66
logcmdutil: pass formatter to jsonchangeset as argument
Yuya Nishihara <yuya@tcha.org>
parents:
37772
diff
changeset
|
433 class changesetformatter(changesetprinter): |
0f084741cd66
logcmdutil: pass formatter to jsonchangeset as argument
Yuya Nishihara <yuya@tcha.org>
parents:
37772
diff
changeset
|
434 """Format changeset information by generic formatter""" |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
435 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
436 def __init__( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
437 self, ui, repo, fm, differ=None, diffopts=None, buffered=False |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
438 ): |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
439 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered) |
37837
e0f30c91dfd8
log: cache diffopts instance
Yuya Nishihara <yuya@tcha.org>
parents:
37773
diff
changeset
|
440 self._diffopts = patch.difffeatureopts(ui, diffopts, git=True) |
37773
0f084741cd66
logcmdutil: pass formatter to jsonchangeset as argument
Yuya Nishihara <yuya@tcha.org>
parents:
37772
diff
changeset
|
441 self._fm = fm |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
442 |
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
443 def close(self): |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
37771
diff
changeset
|
444 self._fm.end() |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
445 |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
446 def _show(self, ctx, copies, props): |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
447 '''show a single changeset or file revision''' |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
37771
diff
changeset
|
448 fm = self._fm |
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
37771
diff
changeset
|
449 fm.startitem() |
39705
fa681452b249
log: make changesetformatter pass in changectx to formatter
Yuya Nishihara <yuya@tcha.org>
parents:
38570
diff
changeset
|
450 fm.context(ctx=ctx) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
451 fm.data(rev=scmutil.intrev(ctx), node=fm.hexfunc(scmutil.binnode(ctx))) |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
452 |
43102
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
453 datahint = fm.datahint() |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
454 if self.ui.quiet and not datahint: |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
455 return |
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
456 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
457 fm.data( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
458 branch=ctx.branch(), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
459 phase=ctx.phasestr(), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
460 user=ctx.user(), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
461 date=fm.formatdate(ctx.date()), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
462 desc=ctx.description(), |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
463 bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
464 tags=fm.formatlist(ctx.tags(), name=b'tag'), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
465 parents=fm.formatlist( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
466 [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node' |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
467 ), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
468 ) |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
469 |
43102
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
470 if self.ui.debugflag or b'manifest' in datahint: |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
471 fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid)) |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
472 if self.ui.debugflag or b'extra' in datahint: |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
473 fm.data(extra=fm.formatdict(ctx.extra())) |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
474 |
43102
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
475 if ( |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
476 self.ui.debugflag |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
477 or b'modified' in datahint |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
478 or b'added' in datahint |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
479 or b'removed' in datahint |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
480 ): |
23734
f4e6475950f1
cmdutil.jsonchangeset: properly compute added and removed files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
23501
diff
changeset
|
481 files = ctx.p1().status(ctx) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
482 fm.data( |
43648
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
483 modified=fm.formatlist(files.modified, name=b'file'), |
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
484 added=fm.formatlist(files.added, name=b'file'), |
4093fc1777c2
logcmdutil: use field names instead of field numbers on scmutil.status
Augie Fackler <augie@google.com>
parents:
43630
diff
changeset
|
485 removed=fm.formatlist(files.removed, name=b'file'), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
486 ) |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
487 |
43102
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
488 verbose = not self.ui.debugflag and self.ui.verbose |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
489 if verbose or b'files' in datahint: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
490 fm.data(files=fm.formatlist(ctx.files(), name=b'file')) |
43102
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
491 if verbose and copies or b'copies' in datahint: |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
492 fm.data( |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
493 copies=fm.formatdict(copies or {}, key=b'name', value=b'source') |
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
494 ) |
22427
bd15932846a4
cmdutil: add json style to log-like commands
Matt Mackall <mpm@selenic.com>
parents:
22405
diff
changeset
|
495 |
43102
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
496 if self._includestat or b'diffstat' in datahint: |
36004
d4c210ee894f
logcmdutil: unindent diff generator of changesetprinter
Yuya Nishihara <yuya@tcha.org>
parents:
36003
diff
changeset
|
497 self.ui.pushbuffer() |
37837
e0f30c91dfd8
log: cache diffopts instance
Yuya Nishihara <yuya@tcha.org>
parents:
37773
diff
changeset
|
498 self._differ.showdiff(self.ui, ctx, self._diffopts, stat=True) |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
37771
diff
changeset
|
499 fm.data(diffstat=self.ui.popbuffer()) |
43102
829088e87032
log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)
Yuya Nishihara <yuya@tcha.org>
parents:
43100
diff
changeset
|
500 if self._includediff or b'diff' in datahint: |
36004
d4c210ee894f
logcmdutil: unindent diff generator of changesetprinter
Yuya Nishihara <yuya@tcha.org>
parents:
36003
diff
changeset
|
501 self.ui.pushbuffer() |
37837
e0f30c91dfd8
log: cache diffopts instance
Yuya Nishihara <yuya@tcha.org>
parents:
37773
diff
changeset
|
502 self._differ.showdiff(self.ui, ctx, self._diffopts, stat=False) |
37772
814151cd8c4a
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter
Yuya Nishihara <yuya@tcha.org>
parents:
37771
diff
changeset
|
503 fm.data(diff=self.ui.popbuffer()) |
4825
3cf94964c56b
hg log: Move filtering implicit parents to own method and use it in templater.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4824
diff
changeset
|
504 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
505 |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
506 class changesettemplater(changesetprinter): |
35107
b22a0d9e0a83
docs: add args/returns docs for some cmdutil, context, and registrar functions
rlevasseur@google.com
parents:
35007
diff
changeset
|
507 '''format changeset information. |
b22a0d9e0a83
docs: add args/returns docs for some cmdutil, context, and registrar functions
rlevasseur@google.com
parents:
35007
diff
changeset
|
508 |
b22a0d9e0a83
docs: add args/returns docs for some cmdutil, context, and registrar functions
rlevasseur@google.com
parents:
35007
diff
changeset
|
509 Note: there are a variety of convenience functions to build a |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
510 changesettemplater for common cases. See functions such as: |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
511 maketemplater, changesetdisplayer, buildcommittemplate, or other |
35107
b22a0d9e0a83
docs: add args/returns docs for some cmdutil, context, and registrar functions
rlevasseur@google.com
parents:
35007
diff
changeset
|
512 functions that use changesest_templater. |
b22a0d9e0a83
docs: add args/returns docs for some cmdutil, context, and registrar functions
rlevasseur@google.com
parents:
35007
diff
changeset
|
513 ''' |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
514 |
33045
99c6c9fa9e6d
cmdutil: use named arguments for changeset_templater.__init__
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32953
diff
changeset
|
515 # Arguments before "buffered" used to be positional. Consider not |
99c6c9fa9e6d
cmdutil: use named arguments for changeset_templater.__init__
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32953
diff
changeset
|
516 # adding/removing arguments before "buffered" to not break callers. |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
517 def __init__( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
518 self, ui, repo, tmplspec, differ=None, diffopts=None, buffered=False |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
519 ): |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
520 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered) |
37072
d64ae4fef471
log: do no expect templateresources() returning a dict
Yuya Nishihara <yuya@tcha.org>
parents:
36989
diff
changeset
|
521 # tres is shared with _graphnodeformatter() |
d64ae4fef471
log: do no expect templateresources() returning a dict
Yuya Nishihara <yuya@tcha.org>
parents:
36989
diff
changeset
|
522 self._tresources = tres = formatter.templateresources(ui, repo) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
523 self.t = formatter.loadtemplater( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
524 ui, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
525 tmplspec, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
526 defaults=templatekw.keywords, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
527 resources=tres, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
528 cache=templatekw.defaulttempl, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
529 ) |
31807
e6eb86b154c5
templater: provide loop counter as "index" keyword
Yuya Nishihara <yuya@tcha.org>
parents:
31698
diff
changeset
|
530 self._counter = itertools.count() |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
531 |
32842
97a4d09f5140
changeset_templater: render template specified by templatespec tuple
Yuya Nishihara <yuya@tcha.org>
parents:
32840
diff
changeset
|
532 self._tref = tmplspec.ref |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
533 self._parts = { |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
534 b'header': b'', |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
535 b'footer': b'', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
536 tmplspec.ref: tmplspec.ref, |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
537 b'docheader': b'', |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
538 b'docfooter': b'', |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
539 b'separator': b'', |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
540 } |
32947
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
541 if tmplspec.mapfile: |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
542 # find correct templates for current mode, for backward |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
543 # compatibility with 'log -v/-q/--debug' using a mapfile |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
544 tmplmodes = [ |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
545 (True, b''), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
546 (self.ui.verbose, b'_verbose'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
547 (self.ui.quiet, b'_quiet'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
548 (self.ui.debugflag, b'_debug'), |
32947
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
549 ] |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
550 for mode, postfix in tmplmodes: |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
551 for t in self._parts: |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
552 cur = t + postfix |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
553 if mode and cur in self.t: |
3f07f12c6e10
changeset_templater: do not enable verbosity postfix for [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32946
diff
changeset
|
554 self._parts[t] = cur |
32953
6d79e9109908
changeset_templater: backport parts map of [templates] section from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32951
diff
changeset
|
555 else: |
6d79e9109908
changeset_templater: backport parts map of [templates] section from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32951
diff
changeset
|
556 partnames = [p for p in self._parts.keys() if p != tmplspec.ref] |
6d79e9109908
changeset_templater: backport parts map of [templates] section from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32951
diff
changeset
|
557 m = formatter.templatepartsmap(tmplspec, self.t, partnames) |
6d79e9109908
changeset_templater: backport parts map of [templates] section from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32951
diff
changeset
|
558 self._parts.update(m) |
26086
3670efdc7088
templater: move verbosity-to-template matcher to constructor
Matt Mackall <mpm@selenic.com>
parents:
26085
diff
changeset
|
559 |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
560 if self._parts[b'docheader']: |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
561 self.ui.write(self.t.render(self._parts[b'docheader'], {})) |
26222
3095b1027661
templater: add new docheader/footer components for XML (issue4135)
Matt Mackall <mpm@selenic.com>
parents:
26206
diff
changeset
|
562 |
3095b1027661
templater: add new docheader/footer components for XML (issue4135)
Matt Mackall <mpm@selenic.com>
parents:
26206
diff
changeset
|
563 def close(self): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
564 if self._parts[b'docfooter']: |
26222
3095b1027661
templater: add new docheader/footer components for XML (issue4135)
Matt Mackall <mpm@selenic.com>
parents:
26206
diff
changeset
|
565 if not self.footer: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
566 self.footer = b"" |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
567 self.footer += self.t.render(self._parts[b'docfooter'], {}) |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
568 return super(changesettemplater, self).close() |
26222
3095b1027661
templater: add new docheader/footer components for XML (issue4135)
Matt Mackall <mpm@selenic.com>
parents:
26206
diff
changeset
|
569 |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
570 def _show(self, ctx, copies, props): |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
571 '''show a single changeset or file revision''' |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
572 props = props.copy() |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
573 props[b'ctx'] = ctx |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
574 props[b'index'] = index = next(self._counter) |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
575 props[b'revcache'] = {b'copies': copies} |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
576 graphwidth = props.get(b'graphwidth', 0) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
577 |
32951
050efe9a1644
changeset_templater: backport separator template from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32947
diff
changeset
|
578 # write separator, which wouldn't work well with the header part below |
050efe9a1644
changeset_templater: backport separator template from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32947
diff
changeset
|
579 # since there's inherently a conflict between header (across items) and |
050efe9a1644
changeset_templater: backport separator template from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32947
diff
changeset
|
580 # separator (per item) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
581 if self._parts[b'separator'] and index > 0: |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
582 self.ui.write(self.t.render(self._parts[b'separator'], {})) |
32951
050efe9a1644
changeset_templater: backport separator template from formatter
Yuya Nishihara <yuya@tcha.org>
parents:
32947
diff
changeset
|
583 |
28837
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
584 # write header |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
585 if self._parts[b'header']: |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
586 h = self.t.render(self._parts[b'header'], props) |
28837
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
587 if self.buffered: |
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
588 self.header[ctx.rev()] = h |
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
589 else: |
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
590 if self.lastheader != h: |
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
591 self.lastheader = h |
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
592 self.ui.write(h) |
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
593 |
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
594 # write changeset metadata, then patch if requested |
32842
97a4d09f5140
changeset_templater: render template specified by templatespec tuple
Yuya Nishihara <yuya@tcha.org>
parents:
32840
diff
changeset
|
595 key = self._parts[self._tref] |
36989
de117f579431
templater: factor out helper that renders named template as string
Yuya Nishihara <yuya@tcha.org>
parents:
36988
diff
changeset
|
596 self.ui.write(self.t.render(key, props)) |
43830
6331a6fc3304
logcmdutil: call _exthook() in changesettemplater
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
43793
diff
changeset
|
597 self._exthook(ctx) |
41097
6a63ba61e71f
log: fix line wrap on diffstat with -G/--graph (issue5800)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
40285
diff
changeset
|
598 self._showpatch(ctx, graphwidth) |
28837
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
599 |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
600 if self._parts[b'footer']: |
28837
d54a7410307f
templater: drop deprecated handling of KeyError from changeset_templater
Yuya Nishihara <yuya@tcha.org>
parents:
28815
diff
changeset
|
601 if not self.footer: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
602 self.footer = self.t.render(self._parts[b'footer'], props) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
603 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
604 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
605 def templatespec(tmpl, mapfile): |
40285
96164fb9b913
logcmdutil: add a helpful assertion to catch mistyped templates early
Augie Fackler <augie@google.com>
parents:
39796
diff
changeset
|
606 if pycompat.ispy3: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
607 assert not isinstance(tmpl, str), b'tmpl must not be a str' |
32875
c8f2cf18b82e
formatter: load templates section like a map file
Yuya Nishihara <yuya@tcha.org>
parents:
32873
diff
changeset
|
608 if mapfile: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
609 return formatter.templatespec(b'changeset', tmpl, mapfile) |
32875
c8f2cf18b82e
formatter: load templates section like a map file
Yuya Nishihara <yuya@tcha.org>
parents:
32873
diff
changeset
|
610 else: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
611 return formatter.templatespec(b'', tmpl, None) |
32838
615ec3f14aa9
formatter: wrap (tmpl, mapfile) by named tuple
Yuya Nishihara <yuya@tcha.org>
parents:
32837
diff
changeset
|
612 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
613 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
614 def _lookuptemplate(ui, tmpl, style): |
32835
9d76812f9b0b
formatter: document lookuptemplate()
Yuya Nishihara <yuya@tcha.org>
parents:
32834
diff
changeset
|
615 """Find the template matching the given template spec or style |
9d76812f9b0b
formatter: document lookuptemplate()
Yuya Nishihara <yuya@tcha.org>
parents:
32834
diff
changeset
|
616 |
9d76812f9b0b
formatter: document lookuptemplate()
Yuya Nishihara <yuya@tcha.org>
parents:
32834
diff
changeset
|
617 See formatter.lookuptemplate() for details. |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
618 """ |
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
619 |
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
620 # ui settings |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
621 if not tmpl and not style: # template are stronger than style |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
622 tmpl = ui.config(b'ui', b'logtemplate') |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
623 if tmpl: |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
624 return templatespec(templater.unquotestring(tmpl), None) |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
625 else: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
626 style = util.expandpath(ui.config(b'ui', b'style')) |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
627 |
22582
4fe5fa49eac8
templater: fix precedence of --style and --template options
Yuya Nishihara <yuya@tcha.org>
parents:
22303
diff
changeset
|
628 if not tmpl and style: |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
629 mapfile = style |
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
630 if not os.path.split(mapfile)[0]: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
631 mapname = templater.templatepath( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
632 b'map-cmdline.' + mapfile |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
633 ) or templater.templatepath(mapfile) |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
634 if mapname: |
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
635 mapfile = mapname |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
636 return templatespec(None, mapfile) |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
637 |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
638 return formatter.lookuptemplate(ui, b'changeset', tmpl) |
20666
e3eb480a9391
cmdutil: make helper function to process template args
Matt Mackall <mpm@selenic.com>
parents:
20604
diff
changeset
|
639 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
640 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
641 def maketemplater(ui, repo, tmpl, buffered=False): |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
642 """Create a changesettemplater from a literal template 'tmpl' |
35107
b22a0d9e0a83
docs: add args/returns docs for some cmdutil, context, and registrar functions
rlevasseur@google.com
parents:
35007
diff
changeset
|
643 byte-string.""" |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
644 spec = templatespec(tmpl, None) |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
645 return changesettemplater(ui, repo, spec, buffered=buffered) |
32837
50586a0a946f
cmdutil: factor out helper to create changeset_templater with literal template
Yuya Nishihara <yuya@tcha.org>
parents:
32835
diff
changeset
|
646 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
647 |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
648 def changesetdisplayer(ui, repo, opts, differ=None, buffered=False): |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
649 """show one changeset using template or regular display. |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
650 |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
651 Display format will be the first non-empty hit of: |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
652 1. option 'template' |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
653 2. option 'style' |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
654 3. [ui] setting 'logtemplate' |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
655 4. [ui] setting 'style' |
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
656 If all of these values are either the unset or the empty string, |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
657 regular display via changesetprinter() is done. |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
658 """ |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
659 postargs = (differ, opts, buffered) |
43100
90b9a7e06c2c
formatter: parse name of built-in formatter templates in standard way
Yuya Nishihara <yuya@tcha.org>
parents:
43077
diff
changeset
|
660 spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style')) |
90b9a7e06c2c
formatter: parse name of built-in formatter templates in standard way
Yuya Nishihara <yuya@tcha.org>
parents:
43077
diff
changeset
|
661 |
90b9a7e06c2c
formatter: parse name of built-in formatter templates in standard way
Yuya Nishihara <yuya@tcha.org>
parents:
43077
diff
changeset
|
662 # machine-readable formats have slightly different keyword set than |
90b9a7e06c2c
formatter: parse name of built-in formatter templates in standard way
Yuya Nishihara <yuya@tcha.org>
parents:
43077
diff
changeset
|
663 # plain templates, which are handled by changesetformatter. |
90b9a7e06c2c
formatter: parse name of built-in formatter templates in standard way
Yuya Nishihara <yuya@tcha.org>
parents:
43077
diff
changeset
|
664 # note that {b'pickle', b'debug'} can also be added to the list if needed. |
90b9a7e06c2c
formatter: parse name of built-in formatter templates in standard way
Yuya Nishihara <yuya@tcha.org>
parents:
43077
diff
changeset
|
665 if spec.ref in {b'cbor', b'json'}: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
666 fm = ui.formatter(b'log', opts) |
37773
0f084741cd66
logcmdutil: pass formatter to jsonchangeset as argument
Yuya Nishihara <yuya@tcha.org>
parents:
37772
diff
changeset
|
667 return changesetformatter(ui, repo, fm, *postargs) |
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3827
diff
changeset
|
668 |
32875
c8f2cf18b82e
formatter: load templates section like a map file
Yuya Nishihara <yuya@tcha.org>
parents:
32873
diff
changeset
|
669 if not spec.ref and not spec.tmpl and not spec.mapfile: |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
670 return changesetprinter(ui, repo, *postargs) |
34083
08346a8fa65f
cleanup: rename "matchfn" to "match" where obviously a matcher
Martin von Zweigbergk <martinvonz@google.com>
parents:
34081
diff
changeset
|
671 |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
672 return changesettemplater(ui, repo, spec, *postargs) |
3643
b4ad640a3bcf
templates: move changeset templating bits to cmdutils
Matt Mackall <mpm@selenic.com>
parents:
3531
diff
changeset
|
673 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
674 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
675 def _makematcher(repo, revs, pats, opts): |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
676 """Build matcher and expanded patterns from log options |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
677 |
35687
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
678 If --follow, revs are the revisions to follow from. |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
679 |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
680 Returns (match, pats, slowpath) where |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
681 - match: a matcher built from the given pats and -I/-X opts |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
682 - pats: patterns used (globs are expanded on Windows) |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
683 - slowpath: True if patterns aren't as simple as scanning filelogs |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
684 """ |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
685 # pats/include/exclude are passed to match.match() directly in |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
686 # _matchfiles() revset but walkchangerevs() builds its matcher with |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
687 # scmutil.match(). The difference is input pats are globbed on |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
688 # platforms without shell expansion (windows). |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
689 wctx = repo[None] |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
690 match, pats = scmutil.matchandpats(wctx, pats, opts) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
691 slowpath = match.anypats() or (not match.always() and opts.get(b'removed')) |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
692 if not slowpath: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
693 follow = opts.get(b'follow') or opts.get(b'follow_first') |
35687
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
694 startctxs = [] |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
695 if follow and opts.get(b'rev'): |
35687
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
696 startctxs = [repo[r] for r in revs] |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
697 for f in match.files(): |
35687
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
698 if follow and startctxs: |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
699 # No idea if the path was a directory at that revision, so |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
700 # take the slow path. |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
701 if any(f not in c for c in startctxs): |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
702 slowpath = True |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
703 continue |
67893a516272
log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents:
35686
diff
changeset
|
704 elif follow and f not in wctx: |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
705 # If the file exists, it may be a directory, so let it |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
706 # take the slow path. |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
707 if os.path.exists(repo.wjoin(f)): |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
708 slowpath = True |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
709 continue |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
710 else: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
711 raise error.Abort( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
712 _( |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
713 b'cannot follow file not in parent ' |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
714 b'revision: "%s"' |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
715 ) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
716 % f |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
717 ) |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
718 filelog = repo.file(f) |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
719 if not filelog: |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
720 # A zero count may be a directory or deleted file, so |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
721 # try to find matching entries on the slow path. |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
722 if follow: |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
723 raise error.Abort( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
724 _(b'cannot follow nonexistent file: "%s"') % f |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
725 ) |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
726 slowpath = True |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
727 |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
728 # We decided to fall back to the slowpath because at least one |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
729 # of the paths was not a file. Check to see if at least one of them |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
730 # existed in history - in that case, we'll continue down the |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
731 # slowpath; otherwise, we can turn off the slowpath |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
732 if slowpath: |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
733 for path in match.files(): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
734 if path == b'.' or path in repo.store: |
35685
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
735 break |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
736 else: |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
737 slowpath = False |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
738 |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
739 return match, pats, slowpath |
659dfbd852e2
log: extract function that processes log file patterns
Yuya Nishihara <yuya@tcha.org>
parents:
35684
diff
changeset
|
740 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
741 |
35686
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
742 def _fileancestors(repo, revs, match, followfirst): |
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
743 fctxs = [] |
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
744 for r in revs: |
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
745 ctx = repo[r] |
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
746 fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match)) |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
747 |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
748 # When displaying a revision with --patch --follow FILE, we have |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
749 # to know which file of the revision must be diffed. With |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
750 # --follow, we want the names of the ancestors of FILE in the |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
751 # revision, stored in "fcache". "fcache" is populated as a side effect |
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
752 # of the graph traversal. |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
753 fcache = {} |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
754 |
36002
f8ad57d24252
log: pass ctx to makefilematcher() and makehunksfilter() functions
Yuya Nishihara <yuya@tcha.org>
parents:
35961
diff
changeset
|
755 def filematcher(ctx): |
f8ad57d24252
log: pass ctx to makefilematcher() and makehunksfilter() functions
Yuya Nishihara <yuya@tcha.org>
parents:
35961
diff
changeset
|
756 return scmutil.matchfiles(repo, fcache.get(ctx.rev(), [])) |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
757 |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
758 def revgen(): |
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
759 for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst): |
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
760 fcache[rev] = [c.path() for c in cs] |
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
761 yield rev |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
762 |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
763 return smartset.generatorset(revgen(), iterasc=False), filematcher |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
764 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
765 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
766 def _makenofollowfilematcher(repo, pats, opts): |
22167
d4bc38f6eab7
cmdutil: add a hook for making custom non-follow log file matchers
Siddharth Agarwal <sid0@fb.com>
parents:
22166
diff
changeset
|
767 '''hook for extensions to override the filematcher for non-follow cases''' |
d4bc38f6eab7
cmdutil: add a hook for making custom non-follow log file matchers
Siddharth Agarwal <sid0@fb.com>
parents:
22166
diff
changeset
|
768 return None |
d4bc38f6eab7
cmdutil: add a hook for making custom non-follow log file matchers
Siddharth Agarwal <sid0@fb.com>
parents:
22166
diff
changeset
|
769 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
770 |
35642
e64baf32782a
log: make opt2revset table a module constant
Yuya Nishihara <yuya@tcha.org>
parents:
35548
diff
changeset
|
771 _opt2logrevset = { |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
772 b'no_merges': (b'not merge()', None), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
773 b'only_merges': (b'merge()', None), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
774 b'_matchfiles': (None, b'_matchfiles(%ps)'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
775 b'date': (b'date(%s)', None), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
776 b'branch': (b'branch(%s)', b'%lr'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
777 b'_patslog': (b'filelog(%s)', b'%lr'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
778 b'keyword': (b'keyword(%s)', b'%lr'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
779 b'prune': (b'ancestors(%s)', b'not %lr'), |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
780 b'user': (b'user(%s)', b'%lr'), |
35642
e64baf32782a
log: make opt2revset table a module constant
Yuya Nishihara <yuya@tcha.org>
parents:
35548
diff
changeset
|
781 } |
e64baf32782a
log: make opt2revset table a module constant
Yuya Nishihara <yuya@tcha.org>
parents:
35548
diff
changeset
|
782 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
783 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
784 def _makerevset(repo, match, pats, slowpath, opts): |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
785 """Return a revset string built from log options and file patterns""" |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
786 opts = dict(opts) |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
787 # follow or not follow? |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
788 follow = opts.get(b'follow') or opts.get(b'follow_first') |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
789 |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
790 # branch and only_branch are really aliases and must be handled at |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
791 # the same time |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
792 opts[b'branch'] = opts.get(b'branch', []) + opts.get(b'only_branch', []) |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
793 opts[b'branch'] = [repo.lookupbranch(b) for b in opts[b'branch']] |
17746
6d218e47cf9b
log: speed up hg log for untracked files (issue1340)
smuralid
parents:
17676
diff
changeset
|
794 |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
795 if slowpath: |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
796 # See walkchangerevs() slow path. |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
797 # |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
798 # pats/include/exclude cannot be represented as separate |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
799 # revset expressions as their filtering logic applies at file |
35743
3c2a6246fd63
log: fix typo in comment about _matchfiles()
Yuya Nishihara <yuya@tcha.org>
parents:
35690
diff
changeset
|
800 # level. For instance "-I a -X b" matches a revision touching |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
801 # "a" and "b" while "file(a) and not file(b)" does |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
802 # not. Besides, filesets are evaluated against the working |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
803 # directory. |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
804 matchargs = [b'r:', b'd:relpath'] |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
805 for p in pats: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
806 matchargs.append(b'p:' + p) |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
807 for p in opts.get(b'include', []): |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
808 matchargs.append(b'i:' + p) |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
809 for p in opts.get(b'exclude', []): |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
810 matchargs.append(b'x:' + p) |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
811 opts[b'_matchfiles'] = matchargs |
35686
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
812 elif not follow: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
813 opts[b'_patslog'] = list(pats) |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
814 |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
815 expr = [] |
43106
d783f945a701
py3: finish porting iteritems() to pycompat and remove source transformer
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43102
diff
changeset
|
816 for op, val in sorted(pycompat.iteritems(opts)): |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
817 if not val: |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
818 continue |
35642
e64baf32782a
log: make opt2revset table a module constant
Yuya Nishihara <yuya@tcha.org>
parents:
35548
diff
changeset
|
819 if op not in _opt2logrevset: |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
820 continue |
35644
7a0a90d63a8c
log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents:
35643
diff
changeset
|
821 revop, listop = _opt2logrevset[op] |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
822 if revop and b'%' not in revop: |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
823 expr.append(revop) |
35645
b6b7855c79aa
log: use revsetlang.formatspec() thoroughly
Yuya Nishihara <yuya@tcha.org>
parents:
35644
diff
changeset
|
824 elif not listop: |
b6b7855c79aa
log: use revsetlang.formatspec() thoroughly
Yuya Nishihara <yuya@tcha.org>
parents:
35644
diff
changeset
|
825 expr.append(revsetlang.formatspec(revop, val)) |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
826 else: |
35645
b6b7855c79aa
log: use revsetlang.formatspec() thoroughly
Yuya Nishihara <yuya@tcha.org>
parents:
35644
diff
changeset
|
827 if revop: |
b6b7855c79aa
log: use revsetlang.formatspec() thoroughly
Yuya Nishihara <yuya@tcha.org>
parents:
35644
diff
changeset
|
828 val = [revsetlang.formatspec(revop, v) for v in val] |
b6b7855c79aa
log: use revsetlang.formatspec() thoroughly
Yuya Nishihara <yuya@tcha.org>
parents:
35644
diff
changeset
|
829 expr.append(revsetlang.formatspec(listop, val)) |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
830 |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
831 if expr: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
832 expr = b'(' + b' and '.join(expr) + b')' |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
833 else: |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
834 expr = None |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
835 return expr |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
836 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
837 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
838 def _initialrevs(repo, opts): |
35686
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
839 """Return the initial set of revisions to be filtered or followed""" |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
840 follow = opts.get(b'follow') or opts.get(b'follow_first') |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
841 if opts.get(b'rev'): |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
842 revs = scmutil.revrange(repo, opts[b'rev']) |
24064
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24063
diff
changeset
|
843 elif follow and repo.dirstate.p1() == nullid: |
31023
aea06029919e
revset: import set classes directly from smartset module
Yuya Nishihara <yuya@tcha.org>
parents:
30877
diff
changeset
|
844 revs = smartset.baseset() |
24062
f576addb5b77
log: extract common part from getgraphlogrevs() and getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
24061
diff
changeset
|
845 elif follow: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
846 revs = repo.revs(b'.') |
24062
f576addb5b77
log: extract common part from getgraphlogrevs() and getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
24061
diff
changeset
|
847 else: |
31023
aea06029919e
revset: import set classes directly from smartset module
Yuya Nishihara <yuya@tcha.org>
parents:
30877
diff
changeset
|
848 revs = smartset.spanset(repo) |
24062
f576addb5b77
log: extract common part from getgraphlogrevs() and getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
24061
diff
changeset
|
849 revs.reverse() |
f576addb5b77
log: extract common part from getgraphlogrevs() and getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
24061
diff
changeset
|
850 return revs |
f576addb5b77
log: extract common part from getgraphlogrevs() and getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
24061
diff
changeset
|
851 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
852 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
853 def getrevs(repo, pats, opts): |
43774
064c9a4ced4a
typing: fix return type of logcmdutil.getrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
43773
diff
changeset
|
854 # type: (Any, Any, Any) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]] |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
855 """Return (revs, differ) where revs is a smartset |
35548
b14c8bcfbad9
log: drop unused expr from return value of getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35547
diff
changeset
|
856 |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
857 differ is a changesetdiffer with pre-configured file matcher. |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
858 """ |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
859 follow = opts.get(b'follow') or opts.get(b'follow_first') |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
860 followfirst = opts.get(b'follow_first') |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
861 limit = getlimit(opts) |
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
862 revs = _initialrevs(repo, opts) |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
863 if not revs: |
35548
b14c8bcfbad9
log: drop unused expr from return value of getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35547
diff
changeset
|
864 return smartset.baseset(), None |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
865 match, pats, slowpath = _makematcher(repo, revs, pats, opts) |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
866 filematcher = None |
35686
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
867 if follow: |
35688
84d0e99c063a
log: replace "not pats" with matcher attribute for consistency
Yuya Nishihara <yuya@tcha.org>
parents:
35687
diff
changeset
|
868 if slowpath or match.always(): |
35686
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
869 revs = dagop.revancestors(repo, revs, followfirst=followfirst) |
b25fa5da4ca2
log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35685
diff
changeset
|
870 else: |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
871 revs, filematcher = _fileancestors(repo, revs, match, followfirst) |
35684
1c929b4942a3
log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents:
35683
diff
changeset
|
872 revs.reverse() |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
873 if filematcher is None: |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
874 filematcher = _makenofollowfilematcher(repo, pats, opts) |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
875 if filematcher is None: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
876 |
36002
f8ad57d24252
log: pass ctx to makefilematcher() and makehunksfilter() functions
Yuya Nishihara <yuya@tcha.org>
parents:
35961
diff
changeset
|
877 def filematcher(ctx): |
35690
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
878 return match |
3e394e0558d7
log: build follow-log filematcher at once
Yuya Nishihara <yuya@tcha.org>
parents:
35689
diff
changeset
|
879 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
880 expr = _makerevset(repo, match, pats, slowpath, opts) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
881 if opts.get(b'graph'): |
24060
eb1c9700d19d
graphlog: move comment and flag denoting revs might be unsorted
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
882 # User-specified revs might be unsorted, but don't sort before |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
883 # _makerevset because it might depend on the order of revs |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
884 if repo.ui.configbool(b'experimental', b'log.topo'): |
42309
604c086ddde6
log: add config for making `hg log -G` always topo-sorted
Martin von Zweigbergk <martinvonz@google.com>
parents:
42308
diff
changeset
|
885 if not revs.istopo(): |
604c086ddde6
log: add config for making `hg log -G` always topo-sorted
Martin von Zweigbergk <martinvonz@google.com>
parents:
42308
diff
changeset
|
886 revs = dagop.toposort(revs, repo.changelog.parentrevs) |
604c086ddde6
log: add config for making `hg log -G` always topo-sorted
Martin von Zweigbergk <martinvonz@google.com>
parents:
42308
diff
changeset
|
887 # TODO: try to iterate the set lazily |
42319
b162229ebe0d
log: flag topo-sorted set as such
Yuya Nishihara <yuya@tcha.org>
parents:
42309
diff
changeset
|
888 revs = revset.baseset(list(revs), istopo=True) |
42309
604c086ddde6
log: add config for making `hg log -G` always topo-sorted
Martin von Zweigbergk <martinvonz@google.com>
parents:
42308
diff
changeset
|
889 elif not (revs.isdescending() or revs.istopo()): |
29335
631617262e55
graphmod: avoid sorting when already sorted
Martijn Pieters <mjpieters@fb.com>
parents:
29327
diff
changeset
|
890 revs.sort(reverse=True) |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
891 if expr: |
35547
b6dbc860570d
log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents:
35545
diff
changeset
|
892 matcher = revset.match(None, expr) |
34019
205c47e30a93
revset: make match function follow given subset if specified (API)
Yuya Nishihara <yuya@tcha.org>
parents:
34018
diff
changeset
|
893 revs = matcher(repo, revs) |
18243
b3b1b8e127e5
log: use "hidden" filtering instead of manual check at display time
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18235
diff
changeset
|
894 if limit is not None: |
35544
8494944940e5
log: use smartset.slice() to limit number of revisions to be displayed
Yuya Nishihara <yuya@tcha.org>
parents:
35543
diff
changeset
|
895 revs = revs.slice(0, limit) |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
896 |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
897 differ = changesetdiffer() |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
898 differ._makefilematcher = filematcher |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
899 return revs, differ |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
900 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
901 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
902 def _parselinerangeopt(repo, opts): |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
903 """Parse --line-range log option and return a list of tuples (filename, |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
904 (fromline, toline)). |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
905 """ |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
906 linerangebyfname = [] |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
907 for pat in opts.get(b'line_range', []): |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
908 try: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
909 pat, linerange = pat.rsplit(b',', 1) |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
910 except ValueError: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
911 raise error.Abort(_(b'malformatted line-range pattern %s') % pat) |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
912 try: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
913 fromline, toline = map(int, linerange.split(b':')) |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
914 except ValueError: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
915 raise error.Abort(_(b"invalid line range for %s") % pat) |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
916 msg = _(b"line range pattern '%s' must match exactly one file") % pat |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
917 fname = scmutil.parsefollowlinespattern(repo, None, pat, msg) |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
918 linerangebyfname.append( |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
919 (fname, util.processlinerange(fromline, toline)) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
920 ) |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
921 return linerangebyfname |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
922 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
923 |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
924 def getlinerangerevs(repo, userrevs, opts): |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
925 """Return (revs, differ). |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
926 |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
927 "revs" are revisions obtained by processing "line-range" log options and |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
928 walking block ancestors of each specified file/line-range. |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
929 |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
930 "differ" is a changesetdiffer with pre-configured file matcher and hunks |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
931 filter. |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
932 """ |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
933 wctx = repo[None] |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
934 |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
935 # Two-levels map of "rev -> file ctx -> [line range]". |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
936 linerangesbyrev = {} |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
937 for fname, (fromline, toline) in _parselinerangeopt(repo, opts): |
34907
0ccfc468423a
log: handle removed files with --line-range patterns
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34905
diff
changeset
|
938 if fname not in wctx: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
939 raise error.Abort( |
43117
8ff1ecfadcd1
cleanup: join string literals that are already on one line
Martin von Zweigbergk <martinvonz@google.com>
parents:
43106
diff
changeset
|
940 _(b'cannot follow file not in parent revision: "%s"') % fname |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
941 ) |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
942 fctx = wctx.filectx(fname) |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
943 for fctx, linerange in dagop.blockancestors(fctx, fromline, toline): |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
944 rev = fctx.introrev() |
43740
d1b9d2c6ec96
log: map None rev to wdirrev when filtering revisions with --line-range
Denis Laxalde <denis@laxalde.org>
parents:
43117
diff
changeset
|
945 if rev is None: |
d1b9d2c6ec96
log: map None rev to wdirrev when filtering revisions with --line-range
Denis Laxalde <denis@laxalde.org>
parents:
43117
diff
changeset
|
946 rev = wdirrev |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
947 if rev not in userrevs: |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
948 continue |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
949 linerangesbyrev.setdefault(rev, {}).setdefault( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
950 fctx.path(), [] |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
951 ).append(linerange) |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
952 |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
953 def nofilterhunksfn(fctx, hunks): |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
954 return hunks |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
955 |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
956 def hunksfilter(ctx): |
43740
d1b9d2c6ec96
log: map None rev to wdirrev when filtering revisions with --line-range
Denis Laxalde <denis@laxalde.org>
parents:
43117
diff
changeset
|
957 fctxlineranges = linerangesbyrev.get(scmutil.intrev(ctx)) |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
958 if fctxlineranges is None: |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
959 return nofilterhunksfn |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
960 |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
961 def filterfn(fctx, hunks): |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
962 lineranges = fctxlineranges.get(fctx.path()) |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
963 if lineranges is not None: |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
964 for hr, lines in hunks: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
965 if hr is None: # binary |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
966 yield hr, lines |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
967 continue |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
968 if any(mdiff.hunkinrange(hr[2:], lr) for lr in lineranges): |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
969 yield hr, lines |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
970 else: |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
971 for hunk in hunks: |
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
972 yield hunk |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
973 |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
974 return filterfn |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
975 |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
976 def filematcher(ctx): |
43740
d1b9d2c6ec96
log: map None rev to wdirrev when filtering revisions with --line-range
Denis Laxalde <denis@laxalde.org>
parents:
43117
diff
changeset
|
977 files = list(linerangesbyrev.get(scmutil.intrev(ctx), [])) |
36005
dd77e36eabb6
logcmdutil: create hunksfilter and filematcher even if no diff option given
Yuya Nishihara <yuya@tcha.org>
parents:
36004
diff
changeset
|
978 return scmutil.matchfiles(repo, files) |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
979 |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
980 revs = sorted(linerangesbyrev, reverse=True) |
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
981 |
36007
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
982 differ = changesetdiffer() |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
983 differ._makefilematcher = filematcher |
29b83c08afe0
log: pack filematcher and hunksfilter into changesetdiffer object
Yuya Nishihara <yuya@tcha.org>
parents:
36005
diff
changeset
|
984 differ._makehunksfilter = hunksfilter |
43630
af9c73f26371
logcmdutil: let getlinerangerevs() return "revs" as a smartset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
43117
diff
changeset
|
985 return smartset.baseset(revs), differ |
34857
84c6b9384d6a
log: add -L/--line-range option to follow file history by line range
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
986 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
987 |
27216
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
27214
diff
changeset
|
988 def _graphnodeformatter(ui, displayer): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
989 spec = ui.config(b'ui', b'graphnodetemplate') |
27216
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
27214
diff
changeset
|
990 if not spec: |
36513
6ad140dc4269
templatekw: extract non-templatekw function as getgraphnode()
Yuya Nishihara <yuya@tcha.org>
parents:
36441
diff
changeset
|
991 return templatekw.getgraphnode # fast path for "{graphnode}" |
27216
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
27214
diff
changeset
|
992 |
32045
3eceeede26e9
graphlog: optionally strip quotes from graphnode template (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32005
diff
changeset
|
993 spec = templater.unquotestring(spec) |
35886
b0014780c7fc
logcmdutil: rename classes and functions to conform to our coding style (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35885
diff
changeset
|
994 if isinstance(displayer, changesettemplater): |
36982
255f635c3204
templater: convert resources to a table of callables for future extension
Yuya Nishihara <yuya@tcha.org>
parents:
36920
diff
changeset
|
995 # reuse cache of slow templates |
37072
d64ae4fef471
log: do no expect templateresources() returning a dict
Yuya Nishihara <yuya@tcha.org>
parents:
36989
diff
changeset
|
996 tres = displayer._tresources |
d64ae4fef471
log: do no expect templateresources() returning a dict
Yuya Nishihara <yuya@tcha.org>
parents:
36989
diff
changeset
|
997 else: |
d64ae4fef471
log: do no expect templateresources() returning a dict
Yuya Nishihara <yuya@tcha.org>
parents:
36989
diff
changeset
|
998 tres = formatter.templateresources(ui) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
999 templ = formatter.maketemplater( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1000 ui, spec, defaults=templatekw.keywords, resources=tres |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1001 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1002 |
44345
14d0e89520a2
graphlog: use '%' for other context in merge conflict
Martin von Zweigbergk <martinvonz@google.com>
parents:
43830
diff
changeset
|
1003 def formatnode(repo, ctx, cache): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1004 props = {b'ctx': ctx, b'repo': repo} |
36988
317382151ac3
templater: rename .render(mapping) to .renderdefault(mapping) (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36982
diff
changeset
|
1005 return templ.renderdefault(props) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1006 |
27216
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
27214
diff
changeset
|
1007 return formatnode |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
27214
diff
changeset
|
1008 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1009 |
42504
a68350a7fc55
log: pass getcopies() function instead of getrenamed() to displayer (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
42502
diff
changeset
|
1010 def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None): |
34189
e9898ad31115
cmdutil: allow extra properties to be added to each context
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34121
diff
changeset
|
1011 props = props or {} |
27216
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
27214
diff
changeset
|
1012 formatnode = _graphnodeformatter(ui, displayer) |
28375
97cb1aeaca78
graphmod: refactor state handling
Martijn Pieters <mjpieters@fb.com>
parents:
28322
diff
changeset
|
1013 state = graphmod.asciistate() |
43776
faa8a59f4a06
graphlog: change state dict to attr struct
Yuya Nishihara <yuya@tcha.org>
parents:
43774
diff
changeset
|
1014 styles = state.styles |
28999
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1015 |
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1016 # only set graph styling if HGPLAIN is not set. |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1017 if ui.plain(b'graph'): |
28999
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1018 # set all edge styles to |, the default pre-3.8 behaviour |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1019 styles.update(dict.fromkeys(styles, b'|')) |
28999
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1020 else: |
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1021 edgetypes = { |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1022 b'parent': graphmod.PARENT, |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1023 b'grandparent': graphmod.GRANDPARENT, |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1024 b'missing': graphmod.MISSINGPARENT, |
28999
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1025 } |
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1026 for name, key in edgetypes.items(): |
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1027 # experimental config: experimental.graphstyle.* |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1028 styles[key] = ui.config( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1029 b'experimental', b'graphstyle.%s' % name, styles[key] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1030 ) |
28999
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1031 if not styles[key]: |
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1032 styles[key] = None |
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1033 |
790c076cd4a2
graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents:
28955
diff
changeset
|
1034 # experimental config: experimental.graphshorten |
43776
faa8a59f4a06
graphlog: change state dict to attr struct
Yuya Nishihara <yuya@tcha.org>
parents:
43774
diff
changeset
|
1035 state.graphshorten = ui.configbool(b'experimental', b'graphshorten') |
28891
ac30adb260ea
graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents:
28861
diff
changeset
|
1036 |
44345
14d0e89520a2
graphlog: use '%' for other context in merge conflict
Martin von Zweigbergk <martinvonz@google.com>
parents:
43830
diff
changeset
|
1037 formatnode_cache = {} |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
1038 for rev, type, ctx, parents in dag: |
44345
14d0e89520a2
graphlog: use '%' for other context in merge conflict
Martin von Zweigbergk <martinvonz@google.com>
parents:
43830
diff
changeset
|
1039 char = formatnode(repo, ctx, formatnode_cache) |
42504
a68350a7fc55
log: pass getcopies() function instead of getrenamed() to displayer (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
42502
diff
changeset
|
1040 copies = getcopies(ctx) if getcopies else None |
33858
6f6c87888b22
log: add a "graphwidth" template variable
Danny Hooper <hooper@google.com>
parents:
33856
diff
changeset
|
1041 edges = edgefn(type, char, state, rev, parents) |
6f6c87888b22
log: add a "graphwidth" template variable
Danny Hooper <hooper@google.com>
parents:
33856
diff
changeset
|
1042 firstedge = next(edges) |
6f6c87888b22
log: add a "graphwidth" template variable
Danny Hooper <hooper@google.com>
parents:
33856
diff
changeset
|
1043 width = firstedge[2] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1044 displayer.show( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1045 ctx, copies=copies, graphwidth=width, **pycompat.strkwargs(props) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1046 ) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1047 lines = displayer.hunk.pop(rev).split(b'\n') |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
1048 if not lines[-1]: |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
1049 del lines[-1] |
25763
60c791592aa7
changeset_printer: change flush() to accept ctx instead of rev
Yuya Nishihara <yuya@tcha.org>
parents:
25762
diff
changeset
|
1050 displayer.flush(ctx) |
33858
6f6c87888b22
log: add a "graphwidth" template variable
Danny Hooper <hooper@google.com>
parents:
33856
diff
changeset
|
1051 for type, char, width, coldata in itertools.chain([firstedge], edges): |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
1052 graphmod.ascii(ui, state, type, char, lines, coldata) |
33858
6f6c87888b22
log: add a "graphwidth" template variable
Danny Hooper <hooper@google.com>
parents:
33856
diff
changeset
|
1053 lines = [] |
17180
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
1054 displayer.close() |
ae0629161090
graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents:
17059
diff
changeset
|
1055 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1056 |
36198
7bc10d3f68b4
log: factor out function to feed revisions to displayer
Yuya Nishihara <yuya@tcha.org>
parents:
36196
diff
changeset
|
1057 def displaygraphrevs(ui, repo, revs, displayer, getrenamed): |
17181
6f71167292f2
log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents:
17180
diff
changeset
|
1058 revdag = graphmod.dagwalker(repo, revs) |
36003
fcde8946c553
logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
Yuya Nishihara <yuya@tcha.org>
parents:
36002
diff
changeset
|
1059 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) |
17181
6f71167292f2
log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents:
17180
diff
changeset
|
1060 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1061 |
42504
a68350a7fc55
log: pass getcopies() function instead of getrenamed() to displayer (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
42502
diff
changeset
|
1062 def displayrevs(ui, repo, revs, displayer, getcopies): |
36198
7bc10d3f68b4
log: factor out function to feed revisions to displayer
Yuya Nishihara <yuya@tcha.org>
parents:
36196
diff
changeset
|
1063 for rev in revs: |
7bc10d3f68b4
log: factor out function to feed revisions to displayer
Yuya Nishihara <yuya@tcha.org>
parents:
36196
diff
changeset
|
1064 ctx = repo[rev] |
42504
a68350a7fc55
log: pass getcopies() function instead of getrenamed() to displayer (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
42502
diff
changeset
|
1065 copies = getcopies(ctx) if getcopies else None |
36198
7bc10d3f68b4
log: factor out function to feed revisions to displayer
Yuya Nishihara <yuya@tcha.org>
parents:
36196
diff
changeset
|
1066 displayer.show(ctx, copies=copies) |
7bc10d3f68b4
log: factor out function to feed revisions to displayer
Yuya Nishihara <yuya@tcha.org>
parents:
36196
diff
changeset
|
1067 displayer.flush(ctx) |
7bc10d3f68b4
log: factor out function to feed revisions to displayer
Yuya Nishihara <yuya@tcha.org>
parents:
36196
diff
changeset
|
1068 displayer.close() |
7bc10d3f68b4
log: factor out function to feed revisions to displayer
Yuya Nishihara <yuya@tcha.org>
parents:
36196
diff
changeset
|
1069 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1070 |
17182
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1071 def checkunsupportedgraphflags(pats, opts): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1072 for op in [b"newest_first"]: |
17182
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1073 if op in opts and opts[op]: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1074 raise error.Abort( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1075 _(b"-G/--graph option is incompatible with --%s") |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1076 % op.replace(b"_", b"-") |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1077 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42504
diff
changeset
|
1078 |
17182
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1079 |
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1080 def graphrevs(repo, nodes, opts): |
35887
572f36e9a780
logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35886
diff
changeset
|
1081 limit = getlimit(opts) |
17182
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1082 nodes.reverse() |
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1083 if limit is not None: |
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1084 nodes = nodes[:limit] |
cdf1532d89c6
incoming/outgoing: handle --graph in core
Patrick Mezard <patrick@mezard.eu>
parents:
17181
diff
changeset
|
1085 return graphmod.nodes(repo, nodes) |