mercurial-scm/hg-stable: mercurial/logcmdutil.py annotate

annotate mercurial/logcmdutil.py @ 42336:604c086ddde6

log: add config for making `hg log -G` always topo-sorted I (and everyone else at Google) have an log alias that adds graph mode and templating. I have another one that builds on the first and also restricts the set of revisions to only show those I'm most likely to care about. This second alias also adds topological sorting. I still sometimes use the first one. When I do, it very often bothers me that it's not topologically sorted (branches are interleaved). This patch adds a config option for always using topological sorting with graph log. The revision set is sorted eagerly, which seems like a bad idea, but it doesn't seem to make a big difference in the hg repo (150ms). I initially tried to instead wrap the user's revset in sort(...,topo), but that seemed much harder. Differential Revision: https://phab.mercurial-scm.org/D6331

author	Martin von Zweigbergk <martinvonz@google.com>
date	Wed, 01 May 2019 09:34:47 -0700
parents	1ce46f0ee218
children	b162229ebe0d

rev	line source
35925 7625b4f7db70 cmdutil: split functions of log-like commands to new module (API) Yuya Nishihara <yuya@tcha.org> parents: 35914 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 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10249 diff changeset	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: 31703 diff changeset	10 import itertools
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	11 import os
41657 d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 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,
39812 94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	17 wdirid,
94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 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,
30528 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30515 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,
31043 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30909 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 )
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37075 diff changeset	39 from .utils import (
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37075 diff changeset	40 dateutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37075 diff changeset	41 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37075 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
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	44 def getlimit(opts):
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	45 """get the log limit according to option -l/--limit"""
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	46 limit = opts.get('limit')
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	47 if limit:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	48 try:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	49 limit = int(limit)
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	50 except ValueError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	51 raise error.Abort(_('limit must be a positive integer'))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	52 if limit <= 0:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	53 raise error.Abort(_('limit must be positive'))
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	54 else:
10111 27457d31ae3f cmdutil: replace sys.maxint with None as default value in loglimit Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10061 diff changeset	55 limit = None
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	56 return limit
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	57
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	58 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	59 changes=None, stat=False, fp=None, graphwidth=0,
6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	60 prefix='', root='', listsubrepos=False, hunksfilterfn=None):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	61 '''show diff or diffstat.'''
41623 d683aca738cd diffordiffstat: avoid looking up contexts twice Martin von Zweigbergk <martinvonz@google.com> parents: 41100 diff changeset	62 ctx1 = repo[node1]
d683aca738cd diffordiffstat: avoid looking up contexts twice Martin von Zweigbergk <martinvonz@google.com> parents: 41100 diff changeset	63 ctx2 = repo[node2]
24455 16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	64 if root:
16961d43dc89 diff: rename --relative option to --root Sean Farley <sean@farley.io> parents: 24451 diff changeset	65 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	66 else:
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	67 relroot = ''
41631 74f53d3bd685 patch: accept second matcher that applies only to copy sources (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41630 diff changeset	68 copysourcematch = None
41658 ec37db02fc72 diff: make `hg diff --root=subrepo` work Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	69 def compose(f, g):
ec37db02fc72 diff: make `hg diff --root=subrepo` work Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	70 return lambda x: f(g(x))
41657 d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	71 def pathfn(f):
d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	72 return posixpath.join(prefix, f)
24431 a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	73 if relroot != '':
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	74 # 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	75 # subrepo
41666 df59b1078983 diff: respect ui.relative-paths for warning about path outside --root Martin von Zweigbergk <martinvonz@google.com> parents: 41658 diff changeset	76 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: 41658 diff changeset	77 uirelroot = uipathfn(pathfn(relroot))
24431 a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	78 relroot += '/'
a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	79 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	80 if not matchroot.startswith(relroot):
41666 df59b1078983 diff: respect ui.relative-paths for warning about path outside --root Martin von Zweigbergk <martinvonz@google.com> parents: 41658 diff changeset	81 ui.warn(_('warning: %s not inside relative root %s\n') %
df59b1078983 diff: respect ui.relative-paths for warning about path outside --root Martin von Zweigbergk <martinvonz@google.com> parents: 41658 diff changeset	82 (uipathfn(pathfn(matchroot)), uirelroot))
24431 a0004402776b cmdutil.diffordiffstat: add support for diffs relative to a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 24422 diff changeset	83
41630 035cae1d197f patch: let caller pass in root-filtering matcher (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41623 diff changeset	84 relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path')
035cae1d197f patch: let caller pass in root-filtering matcher (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41623 diff changeset	85 match = matchmod.intersectmatchers(match, relrootmatch)
41631 74f53d3bd685 patch: accept second matcher that applies only to copy sources (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41630 diff changeset	86 copysourcematch = relrootmatch
41630 035cae1d197f patch: let caller pass in root-filtering matcher (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41623 diff changeset	87
41657 d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	88 checkroot = (repo.ui.configbool('devel', 'all-warnings') or
d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	89 repo.ui.configbool('devel', 'check-relroot'))
41658 ec37db02fc72 diff: make `hg diff --root=subrepo` work Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	90 def relrootpathfn(f):
41657 d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	91 if checkroot and not f.startswith(relroot):
d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	92 raise AssertionError(
d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	93 "file %s doesn't start with relroot %s" % (f, relroot))
41658 ec37db02fc72 diff: make `hg diff --root=subrepo` work Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	94 return f[len(relroot):]
ec37db02fc72 diff: make `hg diff --root=subrepo` work Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	95 pathfn = compose(relrootpathfn, pathfn)
41657 d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	96
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	97 if stat:
35007 058c725925e3 diff: disable diff.noprefix option for diffstat (issue5759) Yuya Nishihara <yuya@tcha.org> parents: 34978 diff changeset	98 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	99 width = 80
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	100 if not ui.plain():
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	101 width = ui.termwidth() - graphwidth
41681 db69a763bc89 diff: make --stat respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41666 diff changeset	102 # 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: 41666 diff changeset	103 if not relroot:
db69a763bc89 diff: make --stat respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41666 diff changeset	104 pathfn = compose(scmutil.getuipathfn(repo), pathfn)
36000 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	105
41657 d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	106 chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn,
d4c9eebdd72d patch: replace "prefix" and "relroot" arguments by "pathfn" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41641 diff changeset	107 copysourcematch=copysourcematch,
41631 74f53d3bd685 patch: accept second matcher that applies only to copy sources (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41630 diff changeset	108 hunksfilterfn=hunksfilterfn)
36000 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	109
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	110 if fp is not None or ui.canwritewithoutlabels():
36046 006ff7268c5c diff: remove fp.write() wrapper which drops label argument Yuya Nishihara <yuya@tcha.org> parents: 36045 diff changeset	111 out = fp or ui
36000 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	112 if stat:
36153 c1104fe76e69 py3: preserve chunks as an iterable of bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 36046 diff changeset	113 chunks = [patch.diffstat(util.iterlines(chunks), width=width)]
36000 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	114 for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
36046 006ff7268c5c diff: remove fp.write() wrapper which drops label argument Yuya Nishihara <yuya@tcha.org> parents: 36045 diff changeset	115 out.write(chunk)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	116 else:
36000 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	117 if stat:
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	118 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: 35994 diff changeset	119 else:
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	120 chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks,
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	121 opts=diffopts)
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	122 if ui.canbatchlabeledwrites():
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	123 def gen():
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	124 for chunk, label in chunks:
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	125 yield ui.label(chunk, label=label)
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	126 for chunk in util.filechunkiter(util.chunkbuffer(gen())):
36046 006ff7268c5c diff: remove fp.write() wrapper which drops label argument Yuya Nishihara <yuya@tcha.org> parents: 36045 diff changeset	127 ui.write(chunk)
36000 0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	128 else:
0ff41ced4c12 diff: improve ui.write performance when not coloring on Windows Joerg Sonnenberger <joerg@bec.de> parents: 35994 diff changeset	129 for chunk, label in chunks:
36046 006ff7268c5c diff: remove fp.write() wrapper which drops label argument Yuya Nishihara <yuya@tcha.org> parents: 36045 diff changeset	130 ui.write(chunk, label=label)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	131
42010 db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	132 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	133 tempnode2 = node2
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	134 try:
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	135 if node2 is not None:
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	136 tempnode2 = ctx2.substate[subpath][1]
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	137 except KeyError:
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	138 # 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	139 # 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	140 # 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	141 tempnode2 = None
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	142 submatch = matchmod.subdirmatcher(subpath, match)
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	143 subprefix = repo.wvfs.reljoin(prefix, subpath)
db26dbbee74d diff: support diffing explicit files in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 41996 diff changeset	144 if listsubrepos or match.exact(subpath) or any(submatch.files()):
18006 0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17924 diff changeset	145 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
41641 3d094bfaf885 subrepo: adjust subrepo prefix before calling subrepo.diff() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41631 diff changeset	146 stat=stat, fp=fp, prefix=subprefix)
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	147
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	148 class changesetdiffer(object):
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	149 """Generate diff of changeset with pre-configured filtering functions"""
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	150
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	151 def _makefilematcher(self, ctx):
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	152 return scmutil.matchall(ctx.repo())
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	153
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	154 def _makehunksfilter(self, ctx):
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	155 return None
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	156
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	157 def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False):
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	158 repo = ctx.repo()
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	159 node = ctx.node()
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	160 prev = ctx.p1().node()
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	161 diffordiffstat(ui, repo, diffopts, prev, node,
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	162 match=self._makefilematcher(ctx), stat=stat,
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	163 graphwidth=graphwidth,
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	164 hunksfilterfn=self._makehunksfilter(ctx))
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	165
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	166 def changesetlabels(ctx):
30694 5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30620 diff changeset	167 labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
31703 9b3577796291 cmdutil: add a "changeset.obsolete" label in changeset_printer Denis Laxalde <denis@laxalde.org> parents: 31493 diff changeset	168 if ctx.obsolete():
9b3577796291 cmdutil: add a "changeset.obsolete" label in changeset_printer Denis Laxalde <denis@laxalde.org> parents: 31493 diff changeset	169 labels.append('changeset.obsolete')
33756 52c5ff856b49 context: rename troubled into isunstable Boris Feld <boris.feld@octobus.net> parents: 33752 diff changeset	170 if ctx.isunstable():
33802 3821dfee2cfc label: rename changeset.troubled into changeset.unstable Boris Feld <boris.feld@octobus.net> parents: 33792 diff changeset	171 labels.append('changeset.unstable')
33752 ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33720 diff changeset	172 for instability in ctx.instabilities():
33803 40739aef97f7 label: rename trouble.X into instability.X Boris Feld <boris.feld@octobus.net> parents: 33802 diff changeset	173 labels.append('instability.%s' % instability)
30694 5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30620 diff changeset	174 return ' '.join(labels)
5289fd78017a cmdutil: extract a _changesetlabels function out of changeset_printer._show() Denis Laxalde <denis.laxalde@logilab.fr> parents: 30620 diff changeset	175
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	176 class changesetprinter(object):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	177 '''show changeset information when templating not requested.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	178
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	179 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	180 self.ui = ui
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	181 self.repo = repo
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	182 self.buffered = buffered
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	183 self._differ = differ or changesetdiffer()
37885 e0f30c91dfd8 log: cache diffopts instance Yuya Nishihara <yuya@tcha.org> parents: 37773 diff changeset	184 self._diffopts = patch.diffallopts(ui, diffopts)
37886 3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	185 self._includestat = diffopts and diffopts.get('stat')
3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	186 self._includediff = diffopts and diffopts.get('patch')
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	187 self.header = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	188 self.hunk = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	189 self.lastheader = None
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	190 self.footer = None
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	191 self._columns = templatekw.getlogcolumns()
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	192
25763 60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	193 def flush(self, ctx):
60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	194 rev = ctx.rev()
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	195 if rev in self.header:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	196 h = self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	197 if h != self.lastheader:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	198 self.lastheader = h
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	199 self.ui.write(h)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	200 del self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	201 if rev in self.hunk:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	202 self.ui.write(self.hunk[rev])
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	203 del self.hunk[rev]
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	204
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	205 def close(self):
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	206 if self.footer:
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	207 self.ui.write(self.footer)
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	208
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	209 def show(self, ctx, copies=None, **props):
33112 05906b8e1d23 py3: use pycompat.byteskwargs() to convert kwargs' keys to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 33057 diff changeset	210 props = pycompat.byteskwargs(props)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	211 if self.buffered:
27107 c57ebef70f6f cmdutil: pass labeled=True to pushbuffer() Gregory Szorc <gregory.szorc@gmail.com> parents: 27065 diff changeset	212 self.ui.pushbuffer(labeled=True)
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	213 self._show(ctx, copies, props)
27109 a93d53f79e6e ui: remove labeled argument from popbuffer Gregory Szorc <gregory.szorc@gmail.com> parents: 27107 diff changeset	214 self.hunk[ctx.rev()] = self.ui.popbuffer()
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	215 else:
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	216 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	217
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	218 def _show(self, ctx, copies, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	219 '''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	220 changenode = ctx.node()
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	221 graphwidth = props.get('graphwidth', 0)
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	222
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	223 if self.ui.quiet:
34334 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34296 diff changeset	224 self.ui.write("%s\n" % scmutil.formatchangeid(ctx),
4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34296 diff changeset	225 label='log.node')
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	226 return
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24583 diff changeset	227
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	228 columns = self._columns
c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	229 self.ui.write(columns['changeset'] % scmutil.formatchangeid(ctx),
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	230 label=changesetlabels(ctx))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	231
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	232 # 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	233 # compatibility
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	234 branch = ctx.branch()
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	235 # don't show the default branch name
f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	236 if branch != 'default':
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	237 self.ui.write(columns['branch'] % branch, label='log.branch')
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	238
28904 80be5dbe6e74 cmdutil: avoid recycling variable name "name" in namespaces code Nathaniel Manista <nathaniel@google.com> parents: 28891 diff changeset	239 for nsname, ns in self.repo.names.iteritems():
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	240 # 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	241 # skip it
28904 80be5dbe6e74 cmdutil: avoid recycling variable name "name" in namespaces code Nathaniel Manista <nathaniel@google.com> parents: 28891 diff changeset	242 if nsname == 'branches':
23772 07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	243 continue
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	244 # 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	245 # should be the same
07309e527df7 log: use new namespaces api to display names Sean Farley <sean.michael.farley@gmail.com> parents: 23735 diff changeset	246 for name in ns.names(self.repo, changenode):
23967 448bb32b8ee6 namespace: introduce logfmt to show l10n-ed messages for hg log correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23965 diff changeset	247 self.ui.write(ns.logfmt % name,
448bb32b8ee6 namespace: introduce logfmt to show l10n-ed messages for hg log correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23965 diff changeset	248 label='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	249 if self.ui.debugflag:
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	250 self.ui.write(columns['phase'] % ctx.phasestr(), label='log.phase')
26433 3ad41638b4b4 changeset_printer: move _meaningful_parentrevs() to scmutil Yuya Nishihara <yuya@tcha.org> parents: 26426 diff changeset	251 for pctx in scmutil.meaningfulparents(self.repo, ctx):
24483 870d2eb82f6d changeset_printer: use context objects consistently to show parents Yuya Nishihara <yuya@tcha.org> parents: 24480 diff changeset	252 label = 'log.parent changeset.%s' % pctx.phasestr()
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	253 self.ui.write(columns['parent'] % scmutil.formatchangeid(pctx),
22301 f6371cc62d2a log: use correct phase info for parent field (issue4347) Sean Farley <sean.michael.farley@gmail.com> parents: 22167 diff changeset	254 label=label)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	255
39812 94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	256 if self.ui.debugflag:
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	257 mnode = ctx.manifestnode()
39812 94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	258 if mnode is None:
94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	259 mnode = wdirid
94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	260 mrev = wdirrev
94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	261 else:
94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	262 mrev = self.repo.manifestlog.rev(mnode)
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	263 self.ui.write(columns['manifest']
34334 4647e0a8d3d7 scmutil: extract helper functions that returns human-readable change id Yuya Nishihara <yuya@tcha.org> parents: 34296 diff changeset	264 % scmutil.formatrevnode(self.ui, mrev, mnode),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	265 label='ui.debug log.manifest')
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	266 self.ui.write(columns['user'] % ctx.user(), label='log.user')
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36546 diff changeset	267 self.ui.write(columns['date'] % dateutil.datestr(ctx.date()),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	268 label='log.date')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	269
33756 52c5ff856b49 context: rename troubled into isunstable Boris Feld <boris.feld@octobus.net> parents: 33752 diff changeset	270 if ctx.isunstable():
33752 ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33720 diff changeset	271 instabilities = ctx.instabilities()
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	272 self.ui.write(columns['instability'] % ', '.join(instabilities),
33804 db6b666ce1e6 label: rename log.trouble into log.instability Boris Feld <boris.feld@octobus.net> parents: 33803 diff changeset	273 label='log.instability')
30695 f05ede08dcf7 cmdutil: add support for evolution "troubles" display in changeset_printer Denis Laxalde <denis.laxalde@logilab.fr> parents: 30694 diff changeset	274
34852 d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	275 elif ctx.obsolete():
d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	276 self._showobsfate(ctx)
d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	277
33160 4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33114 diff changeset	278 self._exthook(ctx)
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33114 diff changeset	279
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	280 if self.ui.debugflag:
24485 914caae9a86a changeset_printer: use changectx to get status tuple Yuya Nishihara <yuya@tcha.org> parents: 24484 diff changeset	281 files = ctx.p1().status(ctx)[:3]
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	282 for key, value in zip(['files', 'files+', 'files-'], files):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	283 if value:
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	284 self.ui.write(columns[key] % " ".join(value),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	285 label='ui.debug log.files')
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	286 elif ctx.files() and self.ui.verbose:
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	287 self.ui.write(columns['files'] % " ".join(ctx.files()),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	288 label='ui.note log.files')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	289 if copies and self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	290 copies = ['%s (%s)' % c for c in copies]
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	291 self.ui.write(columns['copies'] % ' '.join(copies),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	292 label='ui.note log.copies')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	293
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	294 extra = ctx.extra()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	295 if extra and self.ui.debugflag:
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	296 for key, value in sorted(extra.items()):
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37075 diff changeset	297 self.ui.write(columns['extra']
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37075 diff changeset	298 % (key, stringutil.escapestr(value)),
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	299 label='ui.debug log.extra')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	300
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	301 description = ctx.description().strip()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	302 if description:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	303 if self.ui.verbose:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	304 self.ui.write(_("description:\n"),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	305 label='ui.note log.description')
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	306 self.ui.write(description,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	307 label='ui.note log.description')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	308 self.ui.write("\n\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	309 else:
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	310 self.ui.write(columns['summary'] % description.splitlines()[0],
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	311 label='log.summary')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	312 self.ui.write("\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	313
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	314 self._showpatch(ctx, graphwidth)
27065 93bcc73df8d5 cmdutil.changeset_printer: pass context into showpatch() Gregory Szorc <gregory.szorc@gmail.com> parents: 26938 diff changeset	315
34852 d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	316 def _showobsfate(self, ctx):
36546 69477bac8926 log: do not invoke templatekw.showobsfate() as a function Yuya Nishihara <yuya@tcha.org> parents: 36542 diff changeset	317 # TODO: do not depend on templater
69477bac8926 log: do not invoke templatekw.showobsfate() as a function Yuya Nishihara <yuya@tcha.org> parents: 36542 diff changeset	318 tres = formatter.templateresources(self.repo.ui, self.repo)
69477bac8926 log: do not invoke templatekw.showobsfate() as a function Yuya Nishihara <yuya@tcha.org> parents: 36542 diff changeset	319 t = formatter.maketemplater(self.repo.ui, '{join(obsfate, "\n")}',
69477bac8926 log: do not invoke templatekw.showobsfate() as a function Yuya Nishihara <yuya@tcha.org> parents: 36542 diff changeset	320 defaults=templatekw.keywords,
69477bac8926 log: do not invoke templatekw.showobsfate() as a function Yuya Nishihara <yuya@tcha.org> parents: 36542 diff changeset	321 resources=tres)
37106 be3f33f5e232 templater: switch 'revcache' based on new mapping items Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	322 obsfate = t.renderdefault({'ctx': ctx}).splitlines()
34852 d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	323
d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	324 if obsfate:
d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	325 for obsfateline in obsfate:
35222 c7b45db8f317 log: translate column labels at once (issue5750) Yuya Nishihara <yuya@tcha.org> parents: 35221 diff changeset	326 self.ui.write(self._columns['obsolete'] % obsfateline,
34852 d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	327 label='log.obsfate')
d45236f3d38e log: add obsfate by default in changeset printer Boris Feld <boris.feld@octobus.net> parents: 34794 diff changeset	328
33160 4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33114 diff changeset	329 def _exthook(self, ctx):
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33114 diff changeset	330 '''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: 33114 diff changeset	331 '''
4ecc6047d45f log: add an extension hook-point in changeset_printer Boris Feld <boris.feld@octobus.net> parents: 33114 diff changeset	332
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	333 def _showpatch(self, ctx, graphwidth=0):
37886 3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	334 if self._includestat:
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	335 self._differ.showdiff(self.ui, ctx, self._diffopts,
6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	336 graphwidth, stat=True)
37886 3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	337 if self._includestat and self._includediff:
36042 d4c210ee894f logcmdutil: unindent diff generator of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 36041 diff changeset	338 self.ui.write("\n")
37886 3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	339 if self._includediff:
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	340 self._differ.showdiff(self.ui, ctx, self._diffopts,
6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	341 graphwidth, stat=False)
37886 3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	342 if self._includestat or self._includediff:
36042 d4c210ee894f logcmdutil: unindent diff generator of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 36041 diff changeset	343 self.ui.write("\n")
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	344
37773 0f084741cd66 logcmdutil: pass formatter to jsonchangeset as argument Yuya Nishihara <yuya@tcha.org> parents: 37772 diff changeset	345 class changesetformatter(changesetprinter):
0f084741cd66 logcmdutil: pass formatter to jsonchangeset as argument Yuya Nishihara <yuya@tcha.org> parents: 37772 diff changeset	346 """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	347
37773 0f084741cd66 logcmdutil: pass formatter to jsonchangeset as argument Yuya Nishihara <yuya@tcha.org> parents: 37772 diff changeset	348 def __init__(self, ui, repo, fm, differ=None, diffopts=None,
0f084741cd66 logcmdutil: pass formatter to jsonchangeset as argument Yuya Nishihara <yuya@tcha.org> parents: 37772 diff changeset	349 buffered=False):
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	350 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
37885 e0f30c91dfd8 log: cache diffopts instance Yuya Nishihara <yuya@tcha.org> parents: 37773 diff changeset	351 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	352 self._fm = fm
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	353
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	354 def close(self):
37772 814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	355 self._fm.end()
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	356
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	357 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	358 '''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	359 fm = self._fm
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	360 fm.startitem()
39721 fa681452b249 log: make changesetformatter pass in changectx to formatter Yuya Nishihara <yuya@tcha.org> parents: 38571 diff changeset	361 fm.context(ctx=ctx)
39811 ba93db1745ba log: have changesetformatter fill in wdir() rev and node (BC) Yuya Nishihara <yuya@tcha.org> parents: 39721 diff changeset	362 fm.data(rev=scmutil.intrev(ctx),
ba93db1745ba log: have changesetformatter fill in wdir() rev and node (BC) Yuya Nishihara <yuya@tcha.org> parents: 39721 diff changeset	363 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	364
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	365 if self.ui.quiet:
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	366 return
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	367
37772 814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	368 fm.data(branch=ctx.branch(),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	369 phase=ctx.phasestr(),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	370 user=ctx.user(),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	371 date=fm.formatdate(ctx.date()),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	372 desc=ctx.description(),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	373 bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	374 tags=fm.formatlist(ctx.tags(), name='tag'),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	375 parents=fm.formatlist([fm.hexfunc(c.node())
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	376 for c in ctx.parents()], name='node'))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	377
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	378 if self.ui.debugflag:
39812 94ca3579e84e log: fill in pseudo rev and node as wdir() manifest identifiers Yuya Nishihara <yuya@tcha.org> parents: 39811 diff changeset	379 fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid),
37772 814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	380 extra=fm.formatdict(ctx.extra()))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	381
23734 f4e6475950f1 cmdutil.jsonchangeset: properly compute added and removed files Gregory Szorc <gregory.szorc@gmail.com> parents: 23501 diff changeset	382 files = ctx.p1().status(ctx)
37772 814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	383 fm.data(modified=fm.formatlist(files[0], name='file'),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	384 added=fm.formatlist(files[1], name='file'),
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	385 removed=fm.formatlist(files[2], name='file'))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	386
bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	387 elif self.ui.verbose:
37772 814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	388 fm.data(files=fm.formatlist(ctx.files(), name='file'))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	389 if copies:
37772 814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	390 fm.data(copies=fm.formatdict(copies,
814151cd8c4a logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter Yuya Nishihara <yuya@tcha.org> parents: 37771 diff changeset	391 key='name', value='source'))
22427 bd15932846a4 cmdutil: add json style to log-like commands Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	392
37886 3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	393 if self._includestat:
36042 d4c210ee894f logcmdutil: unindent diff generator of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 36041 diff changeset	394 self.ui.pushbuffer()
37885 e0f30c91dfd8 log: cache diffopts instance Yuya Nishihara <yuya@tcha.org> parents: 37773 diff changeset	395 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	396 fm.data(diffstat=self.ui.popbuffer())
37886 3fe1c9263024 log: consume --stat/patch options at constructor of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 37885 diff changeset	397 if self._includediff:
36042 d4c210ee894f logcmdutil: unindent diff generator of changesetprinter Yuya Nishihara <yuya@tcha.org> parents: 36041 diff changeset	398 self.ui.pushbuffer()
37885 e0f30c91dfd8 log: cache diffopts instance Yuya Nishihara <yuya@tcha.org> parents: 37773 diff changeset	399 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	400 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	401
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	402 class changesettemplater(changesetprinter):
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35048 diff changeset	403 '''format changeset information.
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35048 diff changeset	404
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35048 diff changeset	405 Note: there are a variety of convenience functions to build a
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	406 changesettemplater for common cases. See functions such as:
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	407 maketemplater, changesetdisplayer, buildcommittemplate, or other
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35048 diff changeset	408 functions that use changesest_templater.
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35048 diff changeset	409 '''
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	410
33057 99c6c9fa9e6d cmdutil: use named arguments for changeset_templater.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 32971 diff changeset	411 # 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: 32971 diff changeset	412 # adding/removing arguments before "buffered" to not break callers.
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	413 def __init__(self, ui, repo, tmplspec, differ=None, diffopts=None,
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	414 buffered=False):
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	415 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
37075 d64ae4fef471 log: do no expect templateresources() returning a dict Yuya Nishihara <yuya@tcha.org> parents: 36992 diff changeset	416 # tres is shared with _graphnodeformatter()
d64ae4fef471 log: do no expect templateresources() returning a dict Yuya Nishihara <yuya@tcha.org> parents: 36992 diff changeset	417 self._tresources = tres = formatter.templateresources(ui, repo)
35487 817a3d20dd01 templater: register keywords to defaults table Yuya Nishihara <yuya@tcha.org> parents: 35473 diff changeset	418 self.t = formatter.loadtemplater(ui, tmplspec,
817a3d20dd01 templater: register keywords to defaults table Yuya Nishihara <yuya@tcha.org> parents: 35473 diff changeset	419 defaults=templatekw.keywords,
817a3d20dd01 templater: register keywords to defaults table Yuya Nishihara <yuya@tcha.org> parents: 35473 diff changeset	420 resources=tres,
32850 11e667a8fcba formatter: factor out function to create templater from literal or map file Yuya Nishihara <yuya@tcha.org> parents: 32849 diff changeset	421 cache=templatekw.defaulttempl)
31807 e6eb86b154c5 templater: provide loop counter as "index" keyword Yuya Nishihara <yuya@tcha.org> parents: 31703 diff changeset	422 self._counter = itertools.count()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	423
32860 97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32858 diff changeset	424 self._tref = tmplspec.ref
97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32858 diff changeset	425 self._parts = {'header': '', 'footer': '',
97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32858 diff changeset	426 tmplspec.ref: tmplspec.ref,
32969 050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32965 diff changeset	427 'docheader': '', 'docfooter': '',
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32965 diff changeset	428 'separator': ''}
32965 3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	429 if tmplspec.mapfile:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	430 # 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: 32964 diff changeset	431 # 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: 32964 diff changeset	432 tmplmodes = [
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	433 (True, ''),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	434 (self.ui.verbose, '_verbose'),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	435 (self.ui.quiet, '_quiet'),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	436 (self.ui.debugflag, '_debug'),
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	437 ]
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	438 for mode, postfix in tmplmodes:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	439 for t in self._parts:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	440 cur = t + postfix
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	441 if mode and cur in self.t:
3f07f12c6e10 changeset_templater: do not enable verbosity postfix for [templates] section Yuya Nishihara <yuya@tcha.org> parents: 32964 diff changeset	442 self._parts[t] = cur
32971 6d79e9109908 changeset_templater: backport parts map of [templates] section from formatter Yuya Nishihara <yuya@tcha.org> parents: 32969 diff changeset	443 else:
6d79e9109908 changeset_templater: backport parts map of [templates] section from formatter Yuya Nishihara <yuya@tcha.org> parents: 32969 diff changeset	444 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: 32969 diff changeset	445 m = formatter.templatepartsmap(tmplspec, self.t, partnames)
6d79e9109908 changeset_templater: backport parts map of [templates] section from formatter Yuya Nishihara <yuya@tcha.org> parents: 32969 diff changeset	446 self._parts.update(m)
26086 3670efdc7088 templater: move verbosity-to-template matcher to constructor Matt Mackall <mpm@selenic.com> parents: 26085 diff changeset	447
26222 3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	448 if self._parts['docheader']:
36992 de117f579431 templater: factor out helper that renders named template as string Yuya Nishihara <yuya@tcha.org> parents: 36991 diff changeset	449 self.ui.write(self.t.render(self._parts['docheader'], {}))
26222 3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	450
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	451 def close(self):
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	452 if self._parts['docfooter']:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	453 if not self.footer:
3095b1027661 templater: add new docheader/footer components for XML (issue4135) Matt Mackall <mpm@selenic.com> parents: 26206 diff changeset	454 self.footer = ""
36992 de117f579431 templater: factor out helper that renders named template as string Yuya Nishihara <yuya@tcha.org> parents: 36991 diff changeset	455 self.footer += self.t.render(self._parts['docfooter'], {})
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	456 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	457
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	458 def _show(self, ctx, copies, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	459 '''show a single changeset or file revision'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	460 props = props.copy()
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	461 props['ctx'] = ctx
32969 050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32965 diff changeset	462 props['index'] = index = next(self._counter)
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	463 props['revcache'] = {'copies': copies}
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	464 graphwidth = props.get('graphwidth', 0)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	465
32969 050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32965 diff changeset	466 # 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: 32965 diff changeset	467 # 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: 32965 diff changeset	468 # separator (per item)
050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32965 diff changeset	469 if self._parts['separator'] and index > 0:
36992 de117f579431 templater: factor out helper that renders named template as string Yuya Nishihara <yuya@tcha.org> parents: 36991 diff changeset	470 self.ui.write(self.t.render(self._parts['separator'], {}))
32969 050efe9a1644 changeset_templater: backport separator template from formatter Yuya Nishihara <yuya@tcha.org> parents: 32965 diff changeset	471
28837 d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	472 # write header
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	473 if self._parts['header']:
36992 de117f579431 templater: factor out helper that renders named template as string Yuya Nishihara <yuya@tcha.org> parents: 36991 diff changeset	474 h = self.t.render(self._parts['header'], props)
28837 d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	475 if self.buffered:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	476 self.header[ctx.rev()] = h
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	477 else:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	478 if self.lastheader != h:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	479 self.lastheader = h
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	480 self.ui.write(h)
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	481
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	482 # write changeset metadata, then patch if requested
32860 97a4d09f5140 changeset_templater: render template specified by templatespec tuple Yuya Nishihara <yuya@tcha.org> parents: 32858 diff changeset	483 key = self._parts[self._tref]
36992 de117f579431 templater: factor out helper that renders named template as string Yuya Nishihara <yuya@tcha.org> parents: 36991 diff changeset	484 self.ui.write(self.t.render(key, props))
41100 6a63ba61e71f log: fix line wrap on diffstat with -G/--graph (issue5800) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40285 diff changeset	485 self._showpatch(ctx, graphwidth)
28837 d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	486
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	487 if self._parts['footer']:
d54a7410307f templater: drop deprecated handling of KeyError from changeset_templater Yuya Nishihara <yuya@tcha.org> parents: 28815 diff changeset	488 if not self.footer:
36992 de117f579431 templater: factor out helper that renders named template as string Yuya Nishihara <yuya@tcha.org> parents: 36991 diff changeset	489 self.footer = self.t.render(self._parts['footer'], props)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	490
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	491 def templatespec(tmpl, mapfile):
40285 96164fb9b913 logcmdutil: add a helpful assertion to catch mistyped templates early Augie Fackler <augie@google.com> parents: 39812 diff changeset	492 if pycompat.ispy3:
96164fb9b913 logcmdutil: add a helpful assertion to catch mistyped templates early Augie Fackler <augie@google.com> parents: 39812 diff changeset	493 assert not isinstance(tmpl, str), 'tmpl must not be a str'
32893 c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32891 diff changeset	494 if mapfile:
c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32891 diff changeset	495 return formatter.templatespec('changeset', tmpl, mapfile)
c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32891 diff changeset	496 else:
c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32891 diff changeset	497 return formatter.templatespec('', tmpl, None)
32856 615ec3f14aa9 formatter: wrap (tmpl, mapfile) by named tuple Yuya Nishihara <yuya@tcha.org> parents: 32855 diff changeset	498
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	499 def _lookuptemplate(ui, tmpl, style):
32853 9d76812f9b0b formatter: document lookuptemplate() Yuya Nishihara <yuya@tcha.org> parents: 32852 diff changeset	500 """Find the template matching the given template spec or style
9d76812f9b0b formatter: document lookuptemplate() Yuya Nishihara <yuya@tcha.org> parents: 32852 diff changeset	501
9d76812f9b0b formatter: document lookuptemplate() Yuya Nishihara <yuya@tcha.org> parents: 32852 diff changeset	502 See formatter.lookuptemplate() for details.
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	503 """
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	504
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	505 # ui settings
22582 4fe5fa49eac8 templater: fix precedence of --style and --template options Yuya Nishihara <yuya@tcha.org> parents: 22303 diff changeset	506 if not tmpl and not style: # template are stronger than style
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	507 tmpl = ui.config('ui', 'logtemplate')
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	508 if tmpl:
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	509 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	510 else:
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33438 diff changeset	511 style = util.expandpath(ui.config('ui', 'style'))
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	512
22582 4fe5fa49eac8 templater: fix precedence of --style and --template options Yuya Nishihara <yuya@tcha.org> parents: 22303 diff changeset	513 if not tmpl and style:
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	514 mapfile = style
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	515 if not os.path.split(mapfile)[0]:
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	516 mapname = (templater.templatepath('map-cmdline.' + mapfile)
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	517 or templater.templatepath(mapfile))
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	518 if mapname:
e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	519 mapfile = mapname
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	520 return templatespec(None, mapfile)
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	521
20668 3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	522 if not tmpl:
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	523 return templatespec(None, None)
20668 3a35ba2681ec templating: make -T much more flexible Matt Mackall <mpm@selenic.com> parents: 20667 diff changeset	524
25511 c2a4dfe2a336 formatter: move most of template option helper to formatter Matt Mackall <mpm@selenic.com> parents: 25439 diff changeset	525 return formatter.lookuptemplate(ui, 'changeset', tmpl)
20666 e3eb480a9391 cmdutil: make helper function to process template args Matt Mackall <mpm@selenic.com> parents: 20604 diff changeset	526
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	527 def maketemplater(ui, repo, tmpl, buffered=False):
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	528 """Create a changesettemplater from a literal template 'tmpl'
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35048 diff changeset	529 byte-string."""
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	530 spec = templatespec(tmpl, None)
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	531 return changesettemplater(ui, repo, spec, buffered=buffered)
32855 50586a0a946f cmdutil: factor out helper to create changeset_templater with literal template Yuya Nishihara <yuya@tcha.org> parents: 32853 diff changeset	532
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	533 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	534 """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	535
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	536 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	537 1. option 'template'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	538 2. option 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	539 3. [ui] setting 'logtemplate'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	540 4. [ui] setting 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	541 If all of these values are either the unset or the empty string,
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	542 regular display via changesetprinter() is done.
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	543 """
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	544 postargs = (differ, opts, buffered)
41996 77ef3498ceb3 template: add CBOR output format Yuya Nishihara <yuya@tcha.org> parents: 41681 diff changeset	545 if opts.get('template') in {'cbor', 'json'}:
37773 0f084741cd66 logcmdutil: pass formatter to jsonchangeset as argument Yuya Nishihara <yuya@tcha.org> parents: 37772 diff changeset	546 fm = ui.formatter('log', opts)
0f084741cd66 logcmdutil: pass formatter to jsonchangeset as argument Yuya Nishihara <yuya@tcha.org> parents: 37772 diff changeset	547 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	548
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	549 spec = _lookuptemplate(ui, opts.get('template'), opts.get('style'))
32857 b425ec7fb7f6 cmdutil: pass templatespec tuple directly to changeset_templater (API) Yuya Nishihara <yuya@tcha.org> parents: 32856 diff changeset	550
32893 c8f2cf18b82e formatter: load templates section like a map file Yuya Nishihara <yuya@tcha.org> parents: 32891 diff changeset	551 if not spec.ref and not spec.tmpl and not spec.mapfile:
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	552 return changesetprinter(ui, repo, *postargs)
34100 08346a8fa65f cleanup: rename "matchfn" to "match" where obviously a matcher Martin von Zweigbergk <martinvonz@google.com> parents: 34098 diff changeset	553
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	554 return changesettemplater(ui, repo, spec, *postargs)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	555
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	556 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	557 """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	558
35687 67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959) Yuya Nishihara <yuya@tcha.org> parents: 35686 diff changeset	559 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	560
35685 659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	561 Returns (match, pats, slowpath) where
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	562 - 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	563 - 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	564 - 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	565 """
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	566 # 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	567 # _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	568 # 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	569 # platforms without shell expansion (windows).
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	570 wctx = repo[None]
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	571 match, pats = scmutil.matchandpats(wctx, pats, opts)
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	572 slowpath = match.anypats() or (not match.always() and opts.get('removed'))
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	573 if not slowpath:
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	574 follow = opts.get('follow') or opts.get('follow_first')
35687 67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959) Yuya Nishihara <yuya@tcha.org> parents: 35686 diff changeset	575 startctxs = []
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959) Yuya Nishihara <yuya@tcha.org> parents: 35686 diff changeset	576 if follow and opts.get('rev'):
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959) Yuya Nishihara <yuya@tcha.org> parents: 35686 diff changeset	577 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	578 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	579 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	580 # 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	581 # 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	582 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	583 slowpath = True
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959) Yuya Nishihara <yuya@tcha.org> parents: 35686 diff changeset	584 continue
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959) Yuya Nishihara <yuya@tcha.org> parents: 35686 diff changeset	585 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	586 # 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	587 # take the slow path.
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	588 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	589 slowpath = True
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	590 continue
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	591 else:
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	592 raise error.Abort(_('cannot follow file not in parent '
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	593 'revision: "%s"') % f)
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	594 filelog = repo.file(f)
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	595 if not filelog:
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	596 # 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	597 # 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	598 if follow:
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	599 raise error.Abort(
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	600 _('cannot follow nonexistent file: "%s"') % f)
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	601 slowpath = True
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	602
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	603 # 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	604 # 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	605 # 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	606 # 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	607 if slowpath:
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	608 for path in match.files():
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	609 if path == '.' or path in repo.store:
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	610 break
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	611 else:
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	612 slowpath = False
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	613
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	614 return match, pats, slowpath
659dfbd852e2 log: extract function that processes log file patterns Yuya Nishihara <yuya@tcha.org> parents: 35684 diff changeset	615
35686 b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	616 def _fileancestors(repo, revs, match, followfirst):
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	617 fctxs = []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	618 for r in revs:
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	619 ctx = repo[r]
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	620 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	621
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	622 # 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	623 # 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	624 # --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	625 # 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	626 # of the graph traversal.
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	627 fcache = {}
36040 f8ad57d24252 log: pass ctx to makefilematcher() and makehunksfilter() functions Yuya Nishihara <yuya@tcha.org> parents: 36000 diff changeset	628 def filematcher(ctx):
f8ad57d24252 log: pass ctx to makefilematcher() and makehunksfilter() functions Yuya Nishihara <yuya@tcha.org> parents: 36000 diff changeset	629 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	630
35690 3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	631 def revgen():
3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	632 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	633 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	634 yield rev
3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	635 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	636
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	637 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	638 '''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	639 return None
d4bc38f6eab7 cmdutil: add a hook for making custom non-follow log file matchers Siddharth Agarwal <sid0@fb.com> parents: 22166 diff changeset	640
35642 e64baf32782a log: make opt2revset table a module constant Yuya Nishihara <yuya@tcha.org> parents: 35548 diff changeset	641 _opt2logrevset = {
e64baf32782a log: make opt2revset table a module constant Yuya Nishihara <yuya@tcha.org> parents: 35548 diff changeset	642 'no_merges': ('not merge()', None),
e64baf32782a log: make opt2revset table a module constant Yuya Nishihara <yuya@tcha.org> parents: 35548 diff changeset	643 'only_merges': ('merge()', None),
35645 b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	644 '_matchfiles': (None, '_matchfiles(%ps)'),
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	645 'date': ('date(%s)', None),
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	646 'branch': ('branch(%s)', '%lr'),
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	647 '_patslog': ('filelog(%s)', '%lr'),
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	648 'keyword': ('keyword(%s)', '%lr'),
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	649 'prune': ('ancestors(%s)', 'not %lr'),
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	650 'user': ('user(%s)', '%lr'),
35642 e64baf32782a log: make opt2revset table a module constant Yuya Nishihara <yuya@tcha.org> parents: 35548 diff changeset	651 }
e64baf32782a log: make opt2revset table a module constant Yuya Nishihara <yuya@tcha.org> parents: 35548 diff changeset	652
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	653 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	654 """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	655 opts = dict(opts)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	656 # follow or not follow?
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	657 follow = opts.get('follow') or opts.get('follow_first')
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	658
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	659 # 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	660 # the same time
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	661 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	662 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17676 diff changeset	663
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	664 if slowpath:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	665 # See walkchangerevs() slow path.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	666 #
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	667 # 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	668 # 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	669 # 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	670 # "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	671 # 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	672 # directory.
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	673 matchargs = ['r:', 'd:relpath']
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	674 for p in pats:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	675 matchargs.append('p:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	676 for p in opts.get('include', []):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	677 matchargs.append('i:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	678 for p in opts.get('exclude', []):
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	679 matchargs.append('x:' + p)
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	680 opts['_matchfiles'] = matchargs
35686 b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	681 elif not follow:
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	682 opts['_patslog'] = list(pats)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	683
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	684 expr = []
23501 424d669118d3 log: fix log revset instability Durham Goode <durham@fb.com> parents: 23500 diff changeset	685 for op, val in sorted(opts.iteritems()):
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	686 if not val:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	687 continue
35642 e64baf32782a log: make opt2revset table a module constant Yuya Nishihara <yuya@tcha.org> parents: 35548 diff changeset	688 if op not in _opt2logrevset:
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	689 continue
35644 7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression Yuya Nishihara <yuya@tcha.org> parents: 35643 diff changeset	690 revop, listop = _opt2logrevset[op]
35645 b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	691 if revop and '%' not in revop:
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	692 expr.append(revop)
35645 b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	693 elif not listop:
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	694 expr.append(revsetlang.formatspec(revop, val))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	695 else:
35645 b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	696 if revop:
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	697 val = [revsetlang.formatspec(revop, v) for v in val]
b6b7855c79aa log: use revsetlang.formatspec() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 35644 diff changeset	698 expr.append(revsetlang.formatspec(listop, val))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	699
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	700 if expr:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	701 expr = '(' + ' and '.join(expr) + ')'
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	702 else:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	703 expr = None
35690 3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	704 return expr
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	705
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	706 def _initialrevs(repo, opts):
35686 b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	707 """Return the initial set of revisions to be filtered or followed"""
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	708 follow = opts.get('follow') or opts.get('follow_first')
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	709 if opts.get('rev'):
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	710 revs = scmutil.revrange(repo, opts['rev'])
24064 c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24063 diff changeset	711 elif follow and repo.dirstate.p1() == nullid:
31043 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30909 diff changeset	712 revs = smartset.baseset()
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	713 elif follow:
35686 b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	714 revs = repo.revs('.')
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	715 else:
31043 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30909 diff changeset	716 revs = smartset.spanset(repo)
24062 f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	717 revs.reverse()
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	718 return revs
f576addb5b77 log: extract common part from getgraphlogrevs() and getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 24061 diff changeset	719
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	720 def getrevs(repo, pats, opts):
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	721 """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	722
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	723 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	724 """
35684 1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35683 diff changeset	725 follow = opts.get('follow') or opts.get('follow_first')
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35683 diff changeset	726 followfirst = opts.get('follow_first')
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	727 limit = getlimit(opts)
572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	728 revs = _initialrevs(repo, opts)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	729 if not revs:
35548 b14c8bcfbad9 log: drop unused expr from return value of getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35547 diff changeset	730 return smartset.baseset(), None
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	731 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	732 filematcher = None
35686 b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	733 if follow:
35688 84d0e99c063a log: replace "not pats" with matcher attribute for consistency Yuya Nishihara <yuya@tcha.org> parents: 35687 diff changeset	734 if slowpath or match.always():
35686 b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	735 revs = dagop.revancestors(repo, revs, followfirst=followfirst)
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs() Yuya Nishihara <yuya@tcha.org> parents: 35685 diff changeset	736 else:
35690 3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	737 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	738 revs.reverse()
35690 3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	739 if filematcher is None:
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	740 filematcher = _makenofollowfilematcher(repo, pats, opts)
35690 3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	741 if filematcher is None:
36040 f8ad57d24252 log: pass ctx to makefilematcher() and makehunksfilter() functions Yuya Nishihara <yuya@tcha.org> parents: 36000 diff changeset	742 def filematcher(ctx):
35690 3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	743 return match
3e394e0558d7 log: build follow-log filematcher at once Yuya Nishihara <yuya@tcha.org> parents: 35689 diff changeset	744
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	745 expr = _makerevset(repo, match, pats, slowpath, opts)
42335 1ce46f0ee218 log: remove an unnecessary "and opts.get('rev')" condition Martin von Zweigbergk <martinvonz@google.com> parents: 42010 diff changeset	746 if opts.get('graph'):
24060 eb1c9700d19d graphlog: move comment and flag denoting revs might be unsorted Yuya Nishihara <yuya@tcha.org> parents: 24059 diff changeset	747 # User-specified revs might be unsorted, but don't sort before
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	748 # _makerevset because it might depend on the order of revs
42336 604c086ddde6 log: add config for making `hg log -G` always topo-sorted Martin von Zweigbergk <martinvonz@google.com> parents: 42335 diff changeset	749 if repo.ui.configbool('experimental', 'log.topo'):
604c086ddde6 log: add config for making `hg log -G` always topo-sorted Martin von Zweigbergk <martinvonz@google.com> parents: 42335 diff changeset	750 if not revs.istopo():
604c086ddde6 log: add config for making `hg log -G` always topo-sorted Martin von Zweigbergk <martinvonz@google.com> parents: 42335 diff changeset	751 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: 42335 diff changeset	752 # TODO: try to iterate the set lazily
604c086ddde6 log: add config for making `hg log -G` always topo-sorted Martin von Zweigbergk <martinvonz@google.com> parents: 42335 diff changeset	753 revs = revset.baseset(list(revs))
604c086ddde6 log: add config for making `hg log -G` always topo-sorted Martin von Zweigbergk <martinvonz@google.com> parents: 42335 diff changeset	754 elif not (revs.isdescending() or revs.istopo()):
29335 631617262e55 graphmod: avoid sorting when already sorted Martijn Pieters <mjpieters@fb.com> parents: 29327 diff changeset	755 revs.sort(reverse=True)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	756 if expr:
35547 b6dbc860570d log: don't expand aliases in revset built from command options Yuya Nishihara <yuya@tcha.org> parents: 35545 diff changeset	757 matcher = revset.match(None, expr)
34037 205c47e30a93 revset: make match function follow given subset if specified (API) Yuya Nishihara <yuya@tcha.org> parents: 34036 diff changeset	758 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	759 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	760 revs = revs.slice(0, limit)
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	761
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	762 differ = changesetdiffer()
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	763 differ._makefilematcher = filematcher
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	764 return revs, differ
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	765
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	766 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	767 """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	768 (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	769 """
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	770 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	771 for pat in opts.get('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	772 try:
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	773 pat, linerange = pat.rsplit(',', 1)
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	774 except ValueError:
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	775 raise error.Abort(_('malformatted line-range pattern %s') % pat)
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	776 try:
34905 5c7dbb730179 log: switch to FROMLINE:TOLINE syntax for -L/--line-range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34904 diff changeset	777 fromline, toline = map(int, linerange.split(':'))
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	778 except ValueError:
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	779 raise error.Abort(_("invalid line range for %s") % pat)
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	780 msg = _("line range pattern '%s' must match exactly one file") % pat
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	781 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	782 linerangebyfname.append(
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	783 (fname, util.processlinerange(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	784 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	785
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	786 def getlinerangerevs(repo, userrevs, opts):
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	787 """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	788
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	789 "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	790 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	791
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	792 "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: 36043 diff changeset	793 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	794 """
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	795 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	796
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	797 # 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	798 linerangesbyrev = {}
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	799 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	800 if fname not in wctx:
0ccfc468423a log: handle removed files with --line-range patterns Denis Laxalde <denis.laxalde@logilab.fr> parents: 34905 diff changeset	801 raise error.Abort(_('cannot follow file not in parent '
0ccfc468423a log: handle removed files with --line-range patterns Denis Laxalde <denis.laxalde@logilab.fr> parents: 34905 diff changeset	802 'revision: "%s"') % fname)
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	803 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	804 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	805 rev = fctx.introrev()
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	806 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	807 continue
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	808 linerangesbyrev.setdefault(
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	809 rev, {}).setdefault(
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	810 fctx.path(), []).append(linerange)
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	811
36043 dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	812 def nofilterhunksfn(fctx, hunks):
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	813 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	814
36043 dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	815 def hunksfilter(ctx):
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	816 fctxlineranges = linerangesbyrev.get(ctx.rev())
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	817 if fctxlineranges is None:
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	818 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	819
36043 dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	820 def filterfn(fctx, hunks):
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	821 lineranges = fctxlineranges.get(fctx.path())
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	822 if lineranges is not None:
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	823 for hr, lines in hunks:
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	824 if hr is None: # binary
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	825 yield hr, lines
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	826 continue
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	827 if any(mdiff.hunkinrange(hr[2:], lr)
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	828 for lr in lineranges):
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	829 yield hr, lines
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	830 else:
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	831 for hunk in hunks:
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	832 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	833
36043 dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	834 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	835
36043 dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	836 def filematcher(ctx):
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	837 files = list(linerangesbyrev.get(ctx.rev(), []))
dd77e36eabb6 logcmdutil: create hunksfilter and filematcher even if no diff option given Yuya Nishihara <yuya@tcha.org> parents: 36042 diff changeset	838 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	839
84c6b9384d6a log: add -L/--line-range option to follow file history by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 34856 diff changeset	840 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	841
36045 29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	842 differ = changesetdiffer()
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	843 differ._makefilematcher = filematcher
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	844 differ._makehunksfilter = hunksfilter
29b83c08afe0 log: pack filematcher and hunksfilter into changesetdiffer object Yuya Nishihara <yuya@tcha.org> parents: 36043 diff changeset	845 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	846
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	847 def _graphnodeformatter(ui, displayer):
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	848 spec = ui.config('ui', 'graphnodetemplate')
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	849 if not spec:
36542 6ad140dc4269 templatekw: extract non-templatekw function as getgraphnode() Yuya Nishihara <yuya@tcha.org> parents: 36471 diff changeset	850 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	851
32045 3eceeede26e9 graphlog: optionally strip quotes from graphnode template (BC) Yuya Nishihara <yuya@tcha.org> parents: 32005 diff changeset	852 spec = templater.unquotestring(spec)
35926 b0014780c7fc logcmdutil: rename classes and functions to conform to our coding style (API) Yuya Nishihara <yuya@tcha.org> parents: 35925 diff changeset	853 if isinstance(displayer, changesettemplater):
36985 255f635c3204 templater: convert resources to a table of callables for future extension Yuya Nishihara <yuya@tcha.org> parents: 36926 diff changeset	854 # reuse cache of slow templates
37075 d64ae4fef471 log: do no expect templateresources() returning a dict Yuya Nishihara <yuya@tcha.org> parents: 36992 diff changeset	855 tres = displayer._tresources
d64ae4fef471 log: do no expect templateresources() returning a dict Yuya Nishihara <yuya@tcha.org> parents: 36992 diff changeset	856 else:
d64ae4fef471 log: do no expect templateresources() returning a dict Yuya Nishihara <yuya@tcha.org> parents: 36992 diff changeset	857 tres = formatter.templateresources(ui)
35487 817a3d20dd01 templater: register keywords to defaults table Yuya Nishihara <yuya@tcha.org> parents: 35473 diff changeset	858 templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords,
817a3d20dd01 templater: register keywords to defaults table Yuya Nishihara <yuya@tcha.org> parents: 35473 diff changeset	859 resources=tres)
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	860 def formatnode(repo, ctx):
37106 be3f33f5e232 templater: switch 'revcache' based on new mapping items Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	861 props = {'ctx': ctx, 'repo': repo}
36991 317382151ac3 templater: rename .render(mapping) to .renderdefault(mapping) (API) Yuya Nishihara <yuya@tcha.org> parents: 36985 diff changeset	862 return templ.renderdefault(props)
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	863 return formatnode
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	864
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	865 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None, props=None):
34201 e9898ad31115 cmdutil: allow extra properties to be added to each context Gregory Szorc <gregory.szorc@gmail.com> parents: 34136 diff changeset	866 props = props or {}
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	867 formatnode = _graphnodeformatter(ui, displayer)
28375 97cb1aeaca78 graphmod: refactor state handling Martijn Pieters <mjpieters@fb.com> parents: 28322 diff changeset	868 state = graphmod.asciistate()
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28570 diff changeset	869 styles = state['styles']
28999 790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	870
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	871 # only set graph styling if HGPLAIN is not set.
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	872 if ui.plain('graph'):
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	873 # set all edge styles to \|, the default pre-3.8 behaviour
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	874 styles.update(dict.fromkeys(styles, '\|'))
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	875 else:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	876 edgetypes = {
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	877 'parent': graphmod.PARENT,
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	878 'grandparent': graphmod.GRANDPARENT,
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	879 'missing': graphmod.MISSINGPARENT
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	880 }
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	881 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	882 # experimental config: experimental.graphstyle.*
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	883 styles[key] = ui.config('experimental', 'graphstyle.%s' % name,
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	884 styles[key])
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	885 if not styles[key]:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	886 styles[key] = None
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	887
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	888 # experimental config: experimental.graphshorten
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212) Martijn Pieters <mjpieters@fb.com> parents: 28955 diff changeset	889 state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
28891 ac30adb260ea graphmod: shorten graph santiagopim <santiagopim@gmail.com> parents: 28861 diff changeset	890
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	891 for rev, type, ctx, parents in dag:
27216 8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option Yuya Nishihara <yuya@tcha.org> parents: 27214 diff changeset	892 char = formatnode(repo, ctx)
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	893 copies = None
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	894 if getrenamed and ctx.rev():
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	895 copies = []
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	896 for fn in ctx.files():
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	897 rename = getrenamed(fn, ctx.rev())
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	898 if rename:
38200 ec37df9042f9 templatekw: make getrenamed() return only filename, not nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 37886 diff changeset	899 copies.append((fn, rename))
33879 6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33877 diff changeset	900 edges = edgefn(type, char, state, rev, parents)
6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33877 diff changeset	901 firstedge = next(edges)
6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33877 diff changeset	902 width = firstedge[2]
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	903 displayer.show(ctx, copies=copies,
36471 27cd83152d31 templatekw: simply override {graphwidth} function by mapping variable Yuya Nishihara <yuya@tcha.org> parents: 36236 diff changeset	904 graphwidth=width, **pycompat.strkwargs(props))
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	905 lines = displayer.hunk.pop(rev).split('\n')
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	906 if not lines[-1]:
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	907 del lines[-1]
25763 60c791592aa7 changeset_printer: change flush() to accept ctx instead of rev Yuya Nishihara <yuya@tcha.org> parents: 25762 diff changeset	908 displayer.flush(ctx)
33879 6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33877 diff changeset	909 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	910 graphmod.ascii(ui, state, type, char, lines, coldata)
33879 6f6c87888b22 log: add a "graphwidth" template variable Danny Hooper <hooper@google.com> parents: 33877 diff changeset	911 lines = []
17180 ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	912 displayer.close()
ae0629161090 graphlog: extract revset/support functions into cmdutil Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	913
36236 7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	914 def displaygraphrevs(ui, repo, revs, displayer, getrenamed):
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 17180 diff changeset	915 revdag = graphmod.dagwalker(repo, revs)
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 36040 diff changeset	916 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	917
36236 7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	918 def displayrevs(ui, repo, revs, displayer, getrenamed):
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	919 for rev in revs:
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	920 ctx = repo[rev]
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	921 copies = None
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	922 if getrenamed is not None and rev:
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	923 copies = []
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	924 for fn in ctx.files():
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	925 rename = getrenamed(fn, rev)
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	926 if rename:
38200 ec37df9042f9 templatekw: make getrenamed() return only filename, not nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 37886 diff changeset	927 copies.append((fn, rename))
36236 7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	928 displayer.show(ctx, copies=copies)
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	929 displayer.flush(ctx)
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	930 displayer.close()
7bc10d3f68b4 log: factor out function to feed revisions to displayer Yuya Nishihara <yuya@tcha.org> parents: 36234 diff changeset	931
17182 cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	932 def checkunsupportedgraphflags(pats, opts):
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	933 for op in ["newest_first"]:
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	934 if op in opts and opts[op]:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26579 diff changeset	935 raise error.Abort(_("-G/--graph option is incompatible with --%s")
17182 cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	936 % op.replace("_", "-"))
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	937
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	938 def graphrevs(repo, nodes, opts):
35927 572f36e9a780 logcmdutil: drop redundant "log" from function names (API) Yuya Nishihara <yuya@tcha.org> parents: 35926 diff changeset	939 limit = getlimit(opts)
17182 cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	940 nodes.reverse()
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	941 if limit is not None:
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	942 nodes = nodes[:limit]
cdf1532d89c6 incoming/outgoing: handle --graph in core Patrick Mezard <patrick@mezard.eu> parents: 17181 diff changeset	943 return graphmod.nodes(repo, nodes)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/logcmdutil.py @ 42336:604c086ddde6