mercurial-scm/hg: mercurial/cmdutil.py annotate

annotate mercurial/cmdutil.py @ 12866:eddc20306ab6 stable

encoding: default ambiguous character to narrow The current implementation of colwidth was treating 'A'mbiguous characters as wide, which was incorrect in a non-East Asian context. As per http://unicode.org/reports/tr11/#Recommendations, we should instead default to 'narrow' if we don't know better. As character width is dependent on the particular font used and we have no idea what fonts are in use, this recommendation applies. This introduces HGENCODINGAMBIGUOUS to get the old behavior back.

author	Matt Mackall <mpm@selenic.com>
date	Wed, 27 Oct 2010 15:35:21 -0500
parents	642afc8f50e7
children	bb7bf43b72fb

rev	line source
2957 6e062d9b188f fix comment. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2885 diff changeset	1 # cmdutil.py - help for command processing in mercurial
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
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6190 diff changeset	8 from node import hex, nullid, nullrev, short
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
10463 5ddde896a19d remove unused imports Brodie Rao <me+hg@dackz.net> parents: 10402 diff changeset	10 import os, sys, errno, re, glob, tempfile
11231 1107888a1ad1 cmdutil: cleanup imports Alexander Solovyov <piranha@piranha.org.ua> parents: 11223 diff changeset	11 import util, templater, patch, error, encoding, templatekw
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	12 import match as matchmod
12176 ecab10820983 subrepos: add function for iterating over ctx subrepos Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	13 import similar, revset, subrepo
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	14
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	15 revrangesep = ':'
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	16
10401 6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	17 def parsealiases(cmd):
6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	18 return cmd.lstrip("^").split("\|")
6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	19
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	20 def findpossible(cmd, table, strict=False):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	21 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	22 Return cmd -> (aliases, command table entry)
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	23 for each matching command.
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	24 Return debug commands (or their aliases) only if no normal command matches.
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	25 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	26 choice = {}
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	27 debugchoice = {}
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	28 for e in table.keys():
10401 6252852b4332 mq: add -Q option to all commands not in norepo Brendan Cully <brendan@kublai.com> parents: 10344 diff changeset	29 aliases = parsealiases(e)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	30 found = None
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	31 if cmd in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	32 found = cmd
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	33 elif not strict:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	34 for a in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	35 if a.startswith(cmd):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	36 found = a
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	37 break
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	38 if found is not None:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	39 if aliases[0].startswith("debug") or found.startswith("debug"):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	40 debugchoice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	41 else:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	42 choice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	43
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	44 if not choice and debugchoice:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	45 choice = debugchoice
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	46
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	47 return choice
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	48
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	49 def findcmd(cmd, table, strict=True):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	50 """Return (aliases, command table entry) for command string."""
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	51 choice = findpossible(cmd, table, strict)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	52
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5843 diff changeset	53 if cmd in choice:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	54 return choice[cmd]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	55
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	56 if len(choice) > 1:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	57 clist = choice.keys()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	58 clist.sort()
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7404 diff changeset	59 raise error.AmbiguousCommand(cmd, clist)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	60
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	61 if choice:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	62 return choice.values()[0]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	63
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7404 diff changeset	64 raise error.UnknownCommand(cmd)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	65
10402 d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	66 def findrepo(p):
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	67 while not os.path.isdir(os.path.join(p, ".hg")):
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	68 oldp, p = p, os.path.dirname(p)
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	69 if p == oldp:
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	70 return None
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	71
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	72 return p
d216fa04e48a mq: make init -Q do what qinit -c did Brendan Cully <brendan@kublai.com> parents: 10401 diff changeset	73
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	74 def bail_if_changed(repo):
5716 be367cbafe70 cmdutil: make bail_if_changed bail on uncommitted merge Matt Mackall <mpm@selenic.com> parents: 5610 diff changeset	75 if repo.dirstate.parents()[1] != nullid:
be367cbafe70 cmdutil: make bail_if_changed bail on uncommitted merge Matt Mackall <mpm@selenic.com> parents: 5610 diff changeset	76 raise util.Abort(_('outstanding uncommitted merge'))
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	77 modified, added, removed, deleted = repo.status()[:4]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	78 if modified or added or removed or deleted:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	79 raise util.Abort(_("outstanding uncommitted changes"))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	80
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	81 def logmessage(opts):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	82 """ get the log message according to -m and -l option """
7667 bd5c37d792e6 cmdutil.logmessage: options should be optional Alexander Solovyov <piranha@piranha.org.ua> parents: 7643 diff changeset	83 message = opts.get('message')
bd5c37d792e6 cmdutil.logmessage: options should be optional Alexander Solovyov <piranha@piranha.org.ua> parents: 7643 diff changeset	84 logfile = opts.get('logfile')
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	85
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	86 if message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	87 raise util.Abort(_('options --message and --logfile are mutually '
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	88 'exclusive'))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	89 if not message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	90 try:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	91 if logfile == '-':
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	92 message = sys.stdin.read()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	93 else:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	94 message = open(logfile).read()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	95 except IOError, inst:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	96 raise util.Abort(_("can't read commit message '%s': %s") %
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	97 (logfile, inst.strerror))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	98 return message
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	99
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	100 def loglimit(opts):
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	101 """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	102 limit = opts.get('limit')
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	103 if limit:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	104 try:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	105 limit = int(limit)
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	106 except ValueError:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	107 raise util.Abort(_('limit must be a positive integer'))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	108 if limit <= 0:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	109 raise util.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	110 else:
10111 27457d31ae3f cmdutil: replace sys.maxint with None as default value in loglimit Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10061 diff changeset	111 limit = None
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	112 return limit
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	113
12619 7178f6fedb9d cat: fix cat without -r, broken by 0ae35296fbf4 Brodie Rao <brodie@bitheap.org> parents: 12618 diff changeset	114 def revsingle(repo, revspec, default='.'):
12618 0ae35296fbf4 revsets: introduce revsingle helper Matt Mackall <mpm@selenic.com> parents: 12617 diff changeset	115 if not revspec:
0ae35296fbf4 revsets: introduce revsingle helper Matt Mackall <mpm@selenic.com> parents: 12617 diff changeset	116 return repo[default]
0ae35296fbf4 revsets: introduce revsingle helper Matt Mackall <mpm@selenic.com> parents: 12617 diff changeset	117
0ae35296fbf4 revsets: introduce revsingle helper Matt Mackall <mpm@selenic.com> parents: 12617 diff changeset	118 l = revrange(repo, [revspec])
0ae35296fbf4 revsets: introduce revsingle helper Matt Mackall <mpm@selenic.com> parents: 12617 diff changeset	119 if len(l) < 1:
12774 642afc8f50e7 cmdutil: mark string for i18n Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12689 diff changeset	120 raise util.Abort(_('empty revision set'))
12618 0ae35296fbf4 revsets: introduce revsingle helper Matt Mackall <mpm@selenic.com> parents: 12617 diff changeset	121 return repo[l[-1]]
0ae35296fbf4 revsets: introduce revsingle helper Matt Mackall <mpm@selenic.com> parents: 12617 diff changeset	122
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3673 diff changeset	123 def revpair(repo, revs):
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	124 if not revs:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	125 return repo.dirstate.parents()[0], None
12617 2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	126
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	127 l = revrange(repo, revs)
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	128
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	129 if len(l) == 0:
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	130 return repo.dirstate.parents()[0], None
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	131
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	132 if len(l) == 1:
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	133 return repo.lookup(l[0]), None
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	134
2063d36b406e revsets: make revpair revsets-aware Matt Mackall <mpm@selenic.com> parents: 12357 diff changeset	135 return repo.lookup(l[0]), repo.lookup(l[-1])
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	136
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3673 diff changeset	137 def revrange(repo, revs):
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	138 """Yield revision as strings from a list of revision specifications."""
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	139
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	140 def revfix(repo, val, defval):
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3707 diff changeset	141 if not val and val != 0 and defval is not None:
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	142 return defval
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	143 return repo.changelog.rev(repo.lookup(val))
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	144
8368 52e6117a9940 cmdutil: replace pseudo-set by real set Martin Geisler <mg@lazybytes.net> parents: 8360 diff changeset	145 seen, l = set(), []
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	146 for spec in revs:
11405 bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	147 # attempt to parse old-style ranges first to deal with
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	148 # things like old-tag which contain query metacharacters
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	149 try:
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	150 if revrangesep in spec:
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	151 start, end = spec.split(revrangesep, 1)
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	152 start = revfix(repo, start, 0)
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	153 end = revfix(repo, end, len(repo) - 1)
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	154 step = start > end and -1 or 1
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	155 for rev in xrange(start, end + step, step):
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	156 if rev in seen:
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	157 continue
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	158 seen.add(rev)
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	159 l.append(rev)
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	160 continue
11410 38d4c9b953fe revrange: fix up empty query again Matt Mackall <mpm@selenic.com> parents: 11405 diff changeset	161 elif spec and spec in repo: # single unquoted rev
11405 bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	162 rev = revfix(repo, spec, None)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	163 if rev in seen:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	164 continue
8368 52e6117a9940 cmdutil: replace pseudo-set by real set Martin Geisler <mg@lazybytes.net> parents: 8360 diff changeset	165 seen.add(rev)
3526 68341c06bc61 Make revrange return a list of ints so that callers don't have to convert Matt Mackall <mpm@selenic.com> parents: 3525 diff changeset	166 l.append(rev)
11410 38d4c9b953fe revrange: fix up empty query again Matt Mackall <mpm@selenic.com> parents: 11405 diff changeset	167 continue
11405 bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	168 except error.RepoLookupError:
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	169 pass
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	170
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	171 # fall through to new-style queries if old-style fails
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	172 m = revset.match(spec)
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	173 for r in m(repo, range(len(repo))):
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	174 if r not in seen:
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	175 l.append(r)
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	176 seen.update(l)
3526 68341c06bc61 Make revrange return a list of ints so that callers don't have to convert Matt Mackall <mpm@selenic.com> parents: 3525 diff changeset	177
68341c06bc61 Make revrange return a list of ints so that callers don't have to convert Matt Mackall <mpm@selenic.com> parents: 3525 diff changeset	178 return l
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	179
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	180 def make_filename(repo, pat, node,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	181 total=None, seqno=None, revwidth=None, pathname=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	182 node_expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	183 'H': lambda: hex(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	184 'R': lambda: str(repo.changelog.rev(node)),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	185 'h': lambda: short(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	186 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	187 expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	188 '%': lambda: '%',
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	189 'b': lambda: os.path.basename(repo.root),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	190 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	191
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	192 try:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	193 if node:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	194 expander.update(node_expander)
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	195 if node:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	196 expander['r'] = (lambda:
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	197 str(repo.changelog.rev(node)).zfill(revwidth or 0))
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	198 if total is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	199 expander['N'] = lambda: str(total)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	200 if seqno is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	201 expander['n'] = lambda: str(seqno)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	202 if total is not None and seqno is not None:
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3657 diff changeset	203 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	204 if pathname is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	205 expander['s'] = lambda: os.path.basename(pathname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	206 expander['d'] = lambda: os.path.dirname(pathname) or '.'
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	207 expander['p'] = lambda: pathname
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	208
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	209 newname = []
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	210 patlen = len(pat)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	211 i = 0
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	212 while i < patlen:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	213 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	214 if c == '%':
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	215 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	216 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	217 c = expander[c]()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	218 newname.append(c)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	219 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	220 return ''.join(newname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	221 except KeyError, inst:
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8731 diff changeset	222 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 2958 diff changeset	223 inst.args[0])
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	224
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	225 def make_file(repo, pat, node=None,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	226 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	227
eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	228 writable = 'w' in mode or 'a' in mode
eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	229
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	230 if not pat or pat == '-':
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	231 return writable and sys.stdout or sys.stdin
eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	232 if hasattr(pat, 'write') and writable:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	233 return pat
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	234 if hasattr(pat, 'read') and 'r' in mode:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	235 return pat
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	236 return open(make_filename(repo, pat, node, total, seqno, revwidth,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	237 pathname),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	238 mode)
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	239
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	240 def expandpats(pats):
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	241 if not util.expandglobs:
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	242 return list(pats)
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	243 ret = []
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	244 for p in pats:
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	245 kind, name = matchmod._patsplit(p, None)
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	246 if kind is None:
9118 78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	247 try:
78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	248 globbed = glob.glob(name)
78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	249 except re.error:
78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	250 globbed = [name]
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	251 if globbed:
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	252 ret.extend(globbed)
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	253 continue
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	254 ret.append(p)
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	255 return ret
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	256
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	257 def match(repo, pats=[], opts={}, globbed=False, default='relpath'):
6575 e08e0367ba15 walk: kill util.cmdmatcher and _matcher Matt Mackall <mpm@selenic.com> parents: 6566 diff changeset	258 if not globbed and default == 'relpath':
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	259 pats = expandpats(pats or [])
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	260 m = matchmod.match(repo.root, repo.getcwd(), pats,
12164 1849b6147831 cmdutil: use repo.auditor when constructing match object Martin Geisler <mg@lazybytes.net> parents: 12085 diff changeset	261 opts.get('include'), opts.get('exclude'), default,
1849b6147831 cmdutil: use repo.auditor when constructing match object Martin Geisler <mg@lazybytes.net> parents: 12085 diff changeset	262 auditor=repo.auditor)
6578 f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	263 def badfn(f, msg):
f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	264 repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	265 m.bad = badfn
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	266 return m
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	267
6597 371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	268 def matchall(repo):
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	269 return matchmod.always(repo.root, repo.getcwd())
6597 371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	270
371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	271 def matchfiles(repo, files):
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	272 return matchmod.exact(repo.root, repo.getcwd(), files)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	273
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	274 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	275 if dry_run is None:
c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	276 dry_run = opts.get('dry_run')
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	277 if similarity is None:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	278 similarity = float(opts.get('similarity') or 0)
8990 627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	279 # we'd use status here, except handling of symlinks and ignore is tricky
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	280 added, unknown, deleted, removed = [], [], [], []
6651 7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	281 audit_path = util.path_auditor(repo.root)
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	282 m = match(repo, pats, opts)
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	283 for abs in repo.walk(m):
4522 591322269fed Use absolute paths in addremove. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4478 diff changeset	284 target = repo.wjoin(abs)
6651 7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	285 good = True
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	286 try:
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	287 audit_path(abs)
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	288 except:
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	289 good = False
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	290 rel = m.rel(abs)
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	291 exact = m.exact(abs)
6656 2cbe0f72c379 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6603 6651 diff changeset	292 if good and abs not in repo.dirstate:
8988 1247751d9bf8 addremove: normalize some variable names Matt Mackall <mpm@selenic.com> parents: 8987 diff changeset	293 unknown.append(abs)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	294 if repo.ui.verbose or not exact:
c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	295 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
12032 ad787252fed6 util: remove lexists, Python 2.4 introduced os.path.lexists Martin Geisler <mg@lazybytes.net> parents: 11958 diff changeset	296 elif repo.dirstate[abs] != 'r' and (not good or not os.path.lexists(target)
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5248 diff changeset	297 or (os.path.isdir(target) and not os.path.islink(target))):
8988 1247751d9bf8 addremove: normalize some variable names Matt Mackall <mpm@selenic.com> parents: 8987 diff changeset	298 deleted.append(abs)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	299 if repo.ui.verbose or not exact:
c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	300 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
8990 627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	301 # for finding renames
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	302 elif repo.dirstate[abs] == 'r':
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	303 removed.append(abs)
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	304 elif repo.dirstate[abs] == 'a':
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	305 added.append(abs)
10606 5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	306 copies = {}
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	307 if similarity > 0:
11059 ef4aa90b1e58 Move 'findrenames' code into its own file. David Greenaway <hg-dev@davidgreenaway.com> parents: 11050 diff changeset	308 for old, new, score in similar.findrenames(repo,
ef4aa90b1e58 Move 'findrenames' code into its own file. David Greenaway <hg-dev@davidgreenaway.com> parents: 11050 diff changeset	309 added + unknown, removed + deleted, similarity):
8941 37a9d551346c addremove: drop some silly variable assignments Matt Mackall <mpm@selenic.com> parents: 8798 diff changeset	310 if repo.ui.verbose or not m.exact(old) or not m.exact(new):
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	311 repo.ui.status(_('recording removal of %s as rename to %s '
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	312 '(%d%% similar)\n') %
8941 37a9d551346c addremove: drop some silly variable assignments Matt Mackall <mpm@selenic.com> parents: 8798 diff changeset	313 (m.rel(old), m.rel(new), score * 100))
10606 5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	314 copies[new] = old
5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	315
5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	316 if not dry_run:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	317 wctx = repo[None]
10606 5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	318 wlock = repo.wlock()
5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	319 try:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	320 wctx.remove(deleted)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	321 wctx.add(unknown)
10606 5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	322 for new, old in copies.iteritems():
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	323 wctx.copy(old, new)
10606 5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	324 finally:
5868dd69fb03 addremove: atomically update the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10463 diff changeset	325 wlock.release()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	326
12266 00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	327 def updatedir(ui, repo, patches, similarity=0):
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	328 '''Update dirstate after patch application according to metadata'''
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	329 if not patches:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	330 return
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	331 copies = []
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	332 removes = set()
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	333 cfiles = patches.keys()
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	334 cwd = repo.getcwd()
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	335 if cwd:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	336 cfiles = [util.pathto(repo.root, cwd, f) for f in patches.keys()]
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	337 for f in patches:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	338 gp = patches[f]
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	339 if not gp:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	340 continue
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	341 if gp.op == 'RENAME':
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	342 copies.append((gp.oldpath, gp.path))
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	343 removes.add(gp.oldpath)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	344 elif gp.op == 'COPY':
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	345 copies.append((gp.oldpath, gp.path))
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	346 elif gp.op == 'DELETE':
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	347 removes.add(gp.path)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	348
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	349 wctx = repo[None]
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	350 for src, dst in copies:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	351 wctx.copy(src, dst)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	352 if (not similarity) and removes:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	353 wctx.remove(sorted(removes), True)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	354
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	355 for f in patches:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	356 gp = patches[f]
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	357 if gp and gp.mode:
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	358 islink, isexec = gp.mode
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	359 dst = repo.wjoin(gp.path)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	360 # patch won't create empty files
12357 cb59654c2c7a Restore lexists() changes lost in e0ee3e822a9a merge Patrick Mezard <pmezard@gmail.com> parents: 12345 diff changeset	361 if gp.op == 'ADD' and not os.path.lexists(dst):
12266 00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	362 flags = (isexec and 'x' or '') + (islink and 'l' or '')
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	363 repo.wwrite(gp.path, '', flags)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	364 util.set_flags(dst, islink, isexec)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	365 addremove(repo, cfiles, similarity=similarity)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	366 files = patches.keys()
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	367 files.extend([r for r in removes if r not in files])
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	368 return sorted(files)
00658492e2aa patch: break import cycle with cmdutil Martin Geisler <mg@lazybytes.net> parents: 12209 diff changeset	369
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	370 def copy(ui, repo, pats, opts, rename=False):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	371 # called with the repo lock held
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	372 #
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	373 # hgsep => pathname that uses "/" to separate directories
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	374 # ossep => pathname that uses os.sep to separate directories
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	375 cwd = repo.getcwd()
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	376 targets = {}
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	377 after = opts.get("after")
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	378 dryrun = opts.get("dry_run")
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	379 wctx = repo[None]
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	380
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	381 def walkpat(pat):
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	382 srcs = []
11223 0d09f2244805 rename: make --after work if source is already in R state Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11177 diff changeset	383 badstates = after and '?' or '?r'
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	384 m = match(repo, [pat], opts, globbed=True)
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	385 for abs in repo.walk(m):
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	386 state = repo.dirstate[abs]
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	387 rel = m.rel(abs)
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	388 exact = m.exact(abs)
11223 0d09f2244805 rename: make --after work if source is already in R state Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11177 diff changeset	389 if state in badstates:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	390 if exact and state == '?':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	391 ui.warn(_('%s: not copying - file is not managed\n') % rel)
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	392 if exact and state == 'r':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	393 ui.warn(_('%s: not copying - file has been marked for'
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	394 ' remove\n') % rel)
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	395 continue
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	396 # abs: hgsep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	397 # rel: ossep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	398 srcs.append((abs, rel, exact))
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	399 return srcs
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	400
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	401 # abssrc: hgsep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	402 # relsrc: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	403 # otarget: ossep
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	404 def copyfile(abssrc, relsrc, otarget, exact):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	405 abstarget = util.canonpath(repo.root, cwd, otarget)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	406 reltarget = repo.pathto(abstarget, cwd)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	407 target = repo.wjoin(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	408 src = repo.wjoin(abssrc)
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	409 state = repo.dirstate[abstarget]
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	410
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	411 # check for collisions
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	412 prevsrc = targets.get(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	413 if prevsrc is not None:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	414 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	415 (reltarget, repo.pathto(abssrc, cwd),
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	416 repo.pathto(prevsrc, cwd)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	417 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	418
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	419 # check for overwrites
12342 70236d6fd844 rename: do not overwrite existing broken symlinks Patrick Mezard <pmezard@gmail.com> parents: 11950 diff changeset	420 exists = os.path.lexists(target)
8117 2b30d8488819 remove unnecessary outer parenthesis in if-statements Martin Geisler <mg@lazybytes.net> parents: 8013 diff changeset	421 if not after and exists or after and state in 'mn':
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	422 if not opts['force']:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	423 ui.warn(_('%s: not overwriting - file exists\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	424 reltarget)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	425 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	426
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	427 if after:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	428 if not exists:
11152 e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	429 if rename:
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	430 ui.warn(_('%s: not recording move - %s does not exist\n') %
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	431 (relsrc, reltarget))
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	432 else:
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	433 ui.warn(_('%s: not recording copy - %s does not exist\n') %
e8d10d085f47 cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Steve Losh <steve@stevelosh.com> parents: 11061 diff changeset	434 (relsrc, reltarget))
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	435 return
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	436 elif not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	437 try:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	438 if exists:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	439 os.unlink(target)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	440 targetdir = os.path.dirname(target) or '.'
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	441 if not os.path.isdir(targetdir):
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	442 os.makedirs(targetdir)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	443 util.copyfile(src, target)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	444 except IOError, inst:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	445 if inst.errno == errno.ENOENT:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	446 ui.warn(_('%s: deleted in working copy\n') % relsrc)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	447 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	448 ui.warn(_('%s: cannot copy - %s\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	449 (relsrc, inst.strerror))
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	450 return True # report a failure
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	451
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	452 if ui.verbose or not exact:
7894 caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	453 if rename:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	454 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	455 else:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	456 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	457
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	458 targets[abstarget] = abssrc
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	459
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	460 # fix up dirstate
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	461 origsrc = repo.dirstate.copied(abssrc) or abssrc
5604 4b7b21acede0 copy: fix copying back with -A (issue836) Matt Mackall <mpm@selenic.com> parents: 5589 diff changeset	462 if abstarget == origsrc: # copying back a copy?
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	463 if state not in 'mn' and not dryrun:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	464 repo.dirstate.normallookup(abstarget)
5604 4b7b21acede0 copy: fix copying back with -A (issue836) Matt Mackall <mpm@selenic.com> parents: 5589 diff changeset	465 else:
7121 b801d6e5dc83 rename: handle renaming to a target marked removed Matt Mackall <mpm@selenic.com> parents: 6980 diff changeset	466 if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	467 if not ui.quiet:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	468 ui.warn(_("%s has not been committed yet, so no copy "
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	469 "data will be stored for %s.\n")
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	470 % (repo.pathto(origsrc, cwd), reltarget))
7121 b801d6e5dc83 rename: handle renaming to a target marked removed Matt Mackall <mpm@selenic.com> parents: 6980 diff changeset	471 if repo.dirstate[abstarget] in '?r' and not dryrun:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	472 wctx.add([abstarget])
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	473 elif not dryrun:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	474 wctx.copy(origsrc, abstarget)
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	475
2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	476 if rename and not dryrun:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11290 diff changeset	477 wctx.remove([abssrc], not after)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	478
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	479 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	480 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	481 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	482 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	483 def targetpathfn(pat, dest, srcs):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	484 if os.path.isdir(pat):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	485 abspfx = util.canonpath(repo.root, cwd, pat)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	486 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	487 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	488 striplen = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	489 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	490 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	491 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	492 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	493 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	494 elif destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	495 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	496 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	497 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	498 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	499 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	500
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	501 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	502 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	503 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	504 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	505 def targetpathafterfn(pat, dest, srcs):
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	506 if matchmod.patkind(pat):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	507 # a mercurial pattern
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	508 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	509 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	510 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	511 abspfx = util.canonpath(repo.root, cwd, pat)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	512 if len(abspfx) < len(srcs[0][0]):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	513 # A directory. Either the target path contains the last
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	514 # component of the source path or it does not.
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	515 def evalpath(striplen):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	516 score = 0
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	517 for s in srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	518 t = os.path.join(dest, util.localpath(s[0])[striplen:])
12357 cb59654c2c7a Restore lexists() changes lost in e0ee3e822a9a merge Patrick Mezard <pmezard@gmail.com> parents: 12345 diff changeset	519 if os.path.lexists(t):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	520 score += 1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	521 return score
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	522
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	523 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	524 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	525 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	526 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	527 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	528 score = evalpath(striplen)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	529 striplen1 = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	530 if striplen1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	531 striplen1 += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	532 if evalpath(striplen1) > score:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	533 striplen = striplen1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	534 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	535 util.localpath(p)[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	536 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	537 # a file
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	538 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	539 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	540 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	541 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	542 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	543 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	544
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	545
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	546 pats = expandpats(pats)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	547 if not pats:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	548 raise util.Abort(_('no source or destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	549 if len(pats) == 1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	550 raise util.Abort(_('no destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	551 dest = pats.pop()
6258 c24f4b3f156b Fix issue995 (copy --after and symlinks pointing to a directory) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	552 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	553 if not destdirexists:
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 12032 diff changeset	554 if len(pats) > 1 or matchmod.patkind(pats[0]):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	555 raise util.Abort(_('with multiple sources, destination must be an '
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	556 'existing directory'))
5843 83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5836 diff changeset	557 if util.endswithsep(dest):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	558 raise util.Abort(_('destination %s is not a directory') % dest)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	559
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	560 tfn = targetpathfn
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	561 if after:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	562 tfn = targetpathafterfn
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	563 copylist = []
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	564 for pat in pats:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	565 srcs = walkpat(pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	566 if not srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	567 continue
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	568 copylist.append((tfn(pat, dest, srcs), srcs))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	569 if not copylist:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	570 raise util.Abort(_('no files to copy'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	571
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	572 errors = 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	573 for targetpath, srcs in copylist:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	574 for abssrc, relsrc, exact in srcs:
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	575 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	576 errors += 1
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	577
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	578 if errors:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	579 ui.warn(_('(consider using --after)\n'))
5609 a783d3627144 copy: move rename logic Matt Mackall <mpm@selenic.com> parents: 5608 diff changeset	580
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11152 diff changeset	581 return errors != 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	582
9513 ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	583 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
10012 2bfe1a23dafa cmdutil: service: add appendpid parameter to append pids to pid file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9975 diff changeset	584 runargs=None, appendpid=False):
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	585 '''Run a command as a service.'''
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	586
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	587 if opts['daemon'] and not opts['daemon_pipefds']:
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	588 # Signal child process startup with file removal
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	589 lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	590 os.close(lockfd)
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	591 try:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	592 if not runargs:
10239 8e4be44a676f Find right hg command for detached process Patrick Mezard <pmezard@gmail.com> parents: 10238 diff changeset	593 runargs = util.hgcmd() + sys.argv[1:]
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	594 runargs.append('--daemon-pipefds=%s' % lockpath)
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	595 # Don't pass --cwd to the child process, because we've already
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	596 # changed directory.
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	597 for i in xrange(1, len(runargs)):
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	598 if runargs[i].startswith('--cwd='):
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	599 del runargs[i]
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	600 break
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	601 elif runargs[i].startswith('--cwd'):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	602 del runargs[i:i + 2]
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	603 break
10344 9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	604 def condfn():
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	605 return not os.path.exists(lockpath)
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	606 pid = util.rundetached(runargs, condfn)
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	607 if pid < 0:
9501cde4c034 util: make spawndetached() handle subprocess early terminations Patrick Mezard <pmezard@gmail.com> parents: 10282 diff changeset	608 raise util.Abort(_('child process failed to start'))
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	609 finally:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	610 try:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	611 os.unlink(lockpath)
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	612 except OSError, e:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	613 if e.errno != errno.ENOENT:
e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	614 raise
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	615 if parentfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	616 return parentfn(pid)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	617 else:
9896 2c2f7593ffc4 cmdutil.service: do not _exit(0) in the parent process Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9668 diff changeset	618 return
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	619
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	620 if initfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	621 initfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	622
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	623 if opts['pid_file']:
10012 2bfe1a23dafa cmdutil: service: add appendpid parameter to append pids to pid file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9975 diff changeset	624 mode = appendpid and 'a' or 'w'
2bfe1a23dafa cmdutil: service: add appendpid parameter to append pids to pid file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9975 diff changeset	625 fp = open(opts['pid_file'], mode)
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	626 fp.write(str(os.getpid()) + '\n')
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	627 fp.close()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	628
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	629 if opts['daemon_pipefds']:
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	630 lockpath = opts['daemon_pipefds']
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	631 try:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	632 os.setsid()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	633 except AttributeError:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	634 pass
10238 e22695b4472f cmdutil: replace unix pipe handshake with file lock Patrick Mezard <pmezard@gmail.com> parents: 10237 diff changeset	635 os.unlink(lockpath)
10240 3af4b39afe2a cmdutil: hide child window created by win32 spawndetached() Patrick Mezard <pmezard@gmail.com> parents: 10239 diff changeset	636 util.hidewindow()
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	637 sys.stdout.flush()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	638 sys.stderr.flush()
8789 e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	639
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	640 nullfd = os.open(util.nulldev, os.O_RDWR)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	641 logfilefd = nullfd
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	642 if logfile:
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	643 logfilefd = os.open(logfile, os.O_RDWR \| os.O_CREAT \| os.O_APPEND)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	644 os.dup2(nullfd, 0)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	645 os.dup2(logfilefd, 1)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	646 os.dup2(logfilefd, 2)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	647 if nullfd not in (0, 1, 2):
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	648 os.close(nullfd)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	649 if logfile and logfilefd not in (0, 1, 2):
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	650 os.close(logfilefd)
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	651
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	652 if runfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	653 return runfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	654
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	655 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	656 opts=None):
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	657 '''export changesets as hg patches.'''
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	658
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	659 total = len(revs)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	660 revwidth = max([len(str(rev)) for rev in revs])
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	661
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	662 def single(rev, seqno, fp):
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	663 ctx = repo[rev]
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	664 node = ctx.node()
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	665 parents = [p.node() for p in ctx.parents() if p]
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	666 branch = ctx.branch()
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	667 if switch_parent:
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	668 parents.reverse()
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	669 prev = (parents and parents[0]) or nullid
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	670
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	671 if not fp:
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	672 fp = make_file(repo, template, node, total=total, seqno=seqno,
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	673 revwidth=revwidth, mode='ab')
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	674 if fp != sys.stdout and hasattr(fp, 'name'):
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	675 repo.ui.note("%s\n" % fp.name)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	676
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	677 fp.write("# HG changeset patch\n")
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	678 fp.write("# User %s\n" % ctx.user())
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	679 fp.write("# Date %d %d\n" % ctx.date())
11821 15aa42aaae4c cmdutil: remove unnecessary parenthesis Martin Geisler <mg@aragost.com> parents: 11635 diff changeset	680 if branch and branch != 'default':
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	681 fp.write("# Branch %s\n" % branch)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	682 fp.write("# Node ID %s\n" % hex(node))
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	683 fp.write("# Parent %s\n" % hex(prev))
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	684 if len(parents) > 1:
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	685 fp.write("# Parent %s\n" % hex(parents[1]))
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	686 fp.write(ctx.description().rstrip())
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	687 fp.write("\n\n")
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	688
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	689 for chunk in patch.diff(repo, prev, node, opts=opts):
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	690 fp.write(chunk)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	691
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	692 for seqno, rev in enumerate(revs):
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	693 single(rev, seqno + 1, fp)
e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10608 diff changeset	694
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	695 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	696 changes=None, stat=False, fp=None, prefix='',
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	697 listsubrepos=False):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	698 '''show diff or diffstat.'''
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	699 if fp is None:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	700 write = ui.write
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	701 else:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	702 def write(s, **kw):
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	703 fp.write(s)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	704
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	705 if stat:
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	706 diffopts = diffopts.copy(context=0)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	707 width = 80
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	708 if not ui.plain():
12689 c52c629ce19e termwidth: move to ui.ui from util Augie Fackler <durin42@gmail.com> parents: 12619 diff changeset	709 width = ui.termwidth()
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	710 chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	711 prefix=prefix)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	712 for chunk, label in patch.diffstatui(util.iterlines(chunks),
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	713 width=width,
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	714 git=diffopts.git):
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	715 write(chunk, label=label)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	716 else:
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	717 for chunk, label in patch.diffui(repo, node1, node2, match,
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	718 changes, diffopts, prefix=prefix):
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	719 write(chunk, label=label)
5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11017 diff changeset	720
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	721 if listsubrepos:
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	722 ctx1 = repo[node1]
12175 c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	723 ctx2 = repo[node2]
12176 ecab10820983 subrepos: add function for iterating over ctx subrepos Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	724 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	725 if node2 is not None:
12209 affec9fb56ef subrepos: handle diff nodeids in subrepos, not before Patrick Mezard <pmezard@gmail.com> parents: 12176 diff changeset	726 node2 = ctx2.substate[subpath][1]
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	727 submatch = matchmod.narrowmatcher(subpath, match)
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	728 sub.diff(diffopts, node2, submatch, changes=changes,
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	729 stat=stat, fp=fp, prefix=prefix)
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12164 diff changeset	730
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	731 class changeset_printer(object):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	732 '''show changeset information when templating not requested.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	733
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	734 def __init__(self, ui, repo, patch, diffopts, buffered):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	735 self.ui = ui
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	736 self.repo = repo
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	737 self.buffered = buffered
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	738 self.patch = patch
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	739 self.diffopts = diffopts
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	740 self.header = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	741 self.hunk = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	742 self.lastheader = None
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	743 self.footer = None
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	744
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	745 def flush(self, rev):
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	746 if rev in self.header:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	747 h = self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	748 if h != self.lastheader:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	749 self.lastheader = h
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	750 self.ui.write(h)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	751 del self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	752 if rev in self.hunk:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	753 self.ui.write(self.hunk[rev])
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	754 del self.hunk[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	755 return 1
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	756 return 0
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	757
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	758 def close(self):
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	759 if self.footer:
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	760 self.ui.write(self.footer)
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	761
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	762 def show(self, ctx, copies=None, matchfn=None, **props):
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	763 if self.buffered:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	764 self.ui.pushbuffer()
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	765 self._show(ctx, copies, matchfn, props)
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	766 self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	767 else:
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	768 self._show(ctx, copies, matchfn, props)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	769
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	770 def _show(self, ctx, copies, matchfn, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	771 '''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	772 changenode = ctx.node()
87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	773 rev = ctx.rev()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	774
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	775 if self.ui.quiet:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	776 self.ui.write("%d:%s\n" % (rev, short(changenode)),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	777 label='log.node')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	778 return
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	779
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	780 log = self.repo.changelog
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	781 date = util.datestr(ctx.date())
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	782
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	783 hexfunc = self.ui.debugflag and hex or short
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	784
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	785 parents = [(p, hexfunc(log.node(p)))
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	786 for p in self._meaningful_parentrevs(log, rev)]
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	787
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	788 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	789 label='log.changeset')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	790
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	791 branch = ctx.branch()
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	792 # 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	793 if branch != 'default':
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7894 diff changeset	794 branch = encoding.tolocal(branch)
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	795 self.ui.write(_("branch: %s\n") % branch,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	796 label='log.branch')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	797 for tag in self.repo.nodetags(changenode):
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	798 self.ui.write(_("tag: %s\n") % tag,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	799 label='log.tag')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	800 for parent in parents:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	801 self.ui.write(_("parent: %d:%s\n") % parent,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	802 label='log.parent')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	803
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	804 if self.ui.debugflag:
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	805 mnode = ctx.manifestnode()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	806 self.ui.write(_("manifest: %d:%s\n") %
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	807 (self.repo.manifest.rev(mnode), hex(mnode)),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	808 label='ui.debug log.manifest')
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	809 self.ui.write(_("user: %s\n") % ctx.user(),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	810 label='log.user')
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	811 self.ui.write(_("date: %s\n") % date,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	812 label='log.date')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	813
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	814 if self.ui.debugflag:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	815 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	816 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	817 files):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	818 if value:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	819 self.ui.write("%-12s %s\n" % (key, " ".join(value)),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	820 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	821 elif ctx.files() and self.ui.verbose:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	822 self.ui.write(_("files: %s\n") % " ".join(ctx.files()),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	823 label='ui.note log.files')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	824 if copies and self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	825 copies = ['%s (%s)' % c for c in copies]
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	826 self.ui.write(_("copies: %s\n") % ' '.join(copies),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	827 label='ui.note log.copies')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	828
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	829 extra = ctx.extra()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	830 if extra and self.ui.debugflag:
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	831 for key, value in sorted(extra.items()):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	832 self.ui.write(_("extra: %s=%s\n")
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	833 % (key, value.encode('string_escape')),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	834 label='ui.debug log.extra')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	835
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	836 description = ctx.description().strip()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	837 if description:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	838 if self.ui.verbose:
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	839 self.ui.write(_("description:\n"),
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	840 label='ui.note log.description')
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	841 self.ui.write(description,
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	842 label='ui.note log.description')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	843 self.ui.write("\n\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	844 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	845 self.ui.write(_("summary: %s\n") %
10819 36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	846 description.splitlines()[0],
36c6a667d733 cmdutil: make use of output labeling in changeset_printer Brodie Rao <brodie@bitheap.org> parents: 10724 diff changeset	847 label='log.summary')
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	848 self.ui.write("\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	849
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	850 self.showpatch(changenode, matchfn)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	851
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	852 def showpatch(self, node, matchfn):
f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	853 if not matchfn:
f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	854 matchfn = self.patch
f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	855 if matchfn:
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11059 diff changeset	856 stat = self.diffopts.get('stat')
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	857 diff = self.diffopts.get('patch')
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11059 diff changeset	858 diffopts = patch.diffopts(self.ui, self.diffopts)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	859 prev = self.repo.changelog.parents(node)[0]
11950 d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	860 if stat:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	861 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	862 match=matchfn, stat=True)
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	863 if diff:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	864 if stat:
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	865 self.ui.write("\n")
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	866 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
d157e040ac4c log: fix the bug 'hg log --stat -p == hg log --stat' Alecs King <alecsk@gmail.com> parents: 11488 diff changeset	867 match=matchfn, stat=False)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	868 self.ui.write("\n")
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	869
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	870 def _meaningful_parentrevs(self, log, rev):
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	871 """Return list of meaningful (or all if debug) parentrevs for rev.
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	872
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	873 For merges (two non-nullrev revisions) both parents are meaningful.
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	874 Otherwise the first parent revision is considered meaningful if it
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	875 is not the preceding revision.
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	876 """
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	877 parents = log.parentrevs(rev)
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	878 if not self.ui.debugflag and parents[1] == nullrev:
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	879 if parents[0] >= rev - 1:
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	880 parents = []
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	881 else:
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	882 parents = [parents[0]]
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	883 return parents
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	884
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	885
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	886 class changeset_templater(changeset_printer):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	887 '''format changeset information.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	888
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	889 def __init__(self, ui, repo, patch, diffopts, mapfile, buffered):
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	890 changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	891 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
10061 9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	892 defaulttempl = {
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	893 'parent': '{rev}:{node\|formatnode} ',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	894 'manifest': '{rev}:{node\|formatnode}',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	895 'file_copy': '{name} ({source})',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	896 'extra': '{key}={value\|stringescape}'
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	897 }
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	898 # filecopy is preserved for compatibility reasons
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	899 defaulttempl['filecopy'] = defaulttempl['file_copy']
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	900 self.t = templater.templater(mapfile, {'formatnode': formatnode},
10061 9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	901 cache=defaulttempl)
10057 babc00a82c5e cmdutil: extract latest tags closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10056 diff changeset	902 self.cache = {}
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	903
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	904 def use_template(self, t):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	905 '''set template string to use'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	906 self.t.cache['changeset'] = t
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	907
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	908 def _meaningful_parentrevs(self, ctx):
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	909 """Return list of meaningful (or all if debug) parentrevs for rev.
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	910 """
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	911 parents = ctx.parents()
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	912 if len(parents) > 1:
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	913 return parents
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	914 if self.ui.debugflag:
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	915 return [parents[0], self.repo['null']]
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	916 if parents[0].rev() >= ctx.rev() - 1:
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	917 return []
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	918 return parents
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	919
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	920 def _show(self, ctx, copies, matchfn, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	921 '''show a single changeset or file revision'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	922
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	923 showlist = templatekw.showlist
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	924
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	925 # showparents() behaviour depends on ui trace level which
c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	926 # causes unexpected behaviours at templating level and makes
c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	927 # it harder to extract it in a standalone function. Its
c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	928 # behaviour cannot be changed so leave it here for now.
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	929 def showparents(**args):
10260 fe699ca08a45 templatekw: fix extras, manifest and showlist args (issue1989) Patrick Mezard <pmezard@gmail.com> parents: 10250 diff changeset	930 ctx = args['ctx']
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	931 parents = [[('rev', p.rev()), ('node', p.hex())]
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	932 for p in self._meaningful_parentrevs(ctx)]
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	933 return showlist('parent', parents, **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	934
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	935 props = props.copy()
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	936 props.update(templatekw.keywords)
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	937 props['parents'] = showparents
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	938 props['templ'] = self.t
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	939 props['ctx'] = ctx
10055 e400a511e63a cmdutil: extract repo dependent closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10054 diff changeset	940 props['repo'] = self.repo
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	941 props['revcache'] = {'copies': copies}
10057 babc00a82c5e cmdutil: extract latest tags closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10056 diff changeset	942 props['cache'] = self.cache
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	943
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	944 # find correct templates for current mode
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	945
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	946 tmplmodes = [
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	947 (True, None),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	948 (self.ui.verbose, 'verbose'),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	949 (self.ui.quiet, 'quiet'),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	950 (self.ui.debugflag, 'debug'),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	951 ]
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	952
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	953 types = {'header': '', 'footer':'', 'changeset': 'changeset'}
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	954 for mode, postfix in tmplmodes:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	955 for type in types:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	956 cur = postfix and ('%s_%s' % (type, postfix)) or type
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	957 if mode and cur in self.t:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	958 types[type] = cur
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	959
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	960 try:
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	961
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	962 # write header
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	963 if types['header']:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	964 h = templater.stringify(self.t(types['header'], **props))
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	965 if self.buffered:
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	966 self.header[ctx.rev()] = h
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	967 else:
11465 ace5bd98bee3 heads: fix templating of headers again (issue2130) Simon Howkins <simonh@symbian.org> parents: 11441 diff changeset	968 if self.lastheader != h:
ace5bd98bee3 heads: fix templating of headers again (issue2130) Simon Howkins <simonh@symbian.org> parents: 11441 diff changeset	969 self.lastheader = h
11441 d74fe370ab04 cmdutil: only output style header once in non-buffered mode (issue2130) Simon Howkins <simonh@symbian.org> parents: 11410 diff changeset	970 self.ui.write(h)
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	971
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	972 # write changeset metadata, then patch if requested
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	973 key = types['changeset']
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	974 self.ui.write(templater.stringify(self.t(key, **props)))
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	975 self.showpatch(ctx.node(), matchfn)
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	976
10160 48653dea23dd Bugfix and test for hg log XML output Robert Bachmann <rbachm@gmail.com> parents: 10152 diff changeset	977 if types['footer']:
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	978 if not self.footer:
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	979 self.footer = templater.stringify(self.t(types['footer'],
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	980 **props))
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	981
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	982 except KeyError, inst:
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	983 msg = _("%s: no key named '%s'")
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	984 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	985 except SyntaxError, inst:
10829 56fffc9c8928 cmdutil: do not translate trivial string Martin Geisler <mg@lazybytes.net> parents: 10819 diff changeset	986 raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0]))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	987
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	988 def show_changeset(ui, repo, opts, buffered=False):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	989 """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	990
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	991 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	992 1. option 'template'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	993 2. option 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	994 3. [ui] setting 'logtemplate'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	995 4. [ui] setting 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	996 If all of these values are either the unset or the empty string,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	997 regular display via changeset_printer() is done.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	998 """
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	999 # options
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	1000 patch = False
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11059 diff changeset	1001 if opts.get('patch') or opts.get('stat'):
11488 f786fc4b8764 log: follow filenames through renames (issue647) Mads Kiilerich <mads@kiilerich.com> parents: 11465 diff changeset	1002 patch = matchall(repo)
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	1003
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1004 tmpl = opts.get('template')
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1005 style = None
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1006 if tmpl:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1007 tmpl = templater.parsestring(tmpl, quoted=False)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1008 else:
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1009 style = opts.get('style')
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1010
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1011 # ui settings
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1012 if not (tmpl or style):
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1013 tmpl = ui.config('ui', 'logtemplate')
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1014 if tmpl:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1015 tmpl = templater.parsestring(tmpl)
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1016 else:
10249 8ebb34b0f6f7 cmdutil: expand style paths (issue1948) Patrick Mezard <pmezard@gmail.com> parents: 10025 diff changeset	1017 style = util.expandpath(ui.config('ui', 'style', ''))
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1018
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1019 if not (tmpl or style):
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1020 return changeset_printer(ui, repo, patch, opts, buffered)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1021
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1022 mapfile = None
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1023 if style and not tmpl:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1024 mapfile = style
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1025 if not os.path.split(mapfile)[0]:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1026 mapname = (templater.templatepath('map-cmdline.' + mapfile)
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1027 or templater.templatepath(mapfile))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1028 if mapname:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1029 mapfile = mapname
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1030
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1031 try:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1032 t = changeset_templater(ui, repo, patch, opts, mapfile, buffered)
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1033 except SyntaxError, inst:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1034 raise util.Abort(inst.args[0])
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1035 if tmpl:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1036 t.use_template(tmpl)
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	1037 return t
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	1038
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1039 def finddate(ui, repo, date):
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1040 """Find the tipmost changeset that matches the given date spec"""
9667 8743f2e1bc54 merge changes from mpm Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9666 9665 diff changeset	1041
5836 c5c9a022bd9a Tweak finddate to pass date directly. mark.williamson@cl.cam.ac.uk parents: 5829 diff changeset	1042 df = util.matchdate(date)
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1043 m = matchall(repo)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1044 results = {}
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1045
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1046 def prep(ctx, fns):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1047 d = ctx.date()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1048 if df(d[0]):
9668 2c24471d478c cmdutil: fix bug in finddate() implementation Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9667 diff changeset	1049 results[ctx.rev()] = d
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1050
9667 8743f2e1bc54 merge changes from mpm Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9666 9665 diff changeset	1051 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1052 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1053 if rev in results:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1054 ui.status(_("Found revision %s from %s\n") %
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1055 (rev, util.datestr(results[rev])))
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1056 return str(rev)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1057
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1058 raise util.Abort(_("revision matching date not found"))
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	1059
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	1060 def walkchangerevs(repo, match, opts, prepare):
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	1061 '''Iterate over files and the revs in which they changed.
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1062
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1063 Callers most commonly need to iterate backwards over the history
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	1064 in which they are interested. Doing so has awful (quadratic-looking)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1065 performance, so we use iterators in a "windowed" way.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1066
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1067 We walk a window of revisions in the desired order. Within the
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1068 window, we first walk forwards to gather data, then in the desired
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1069 order (usually backwards) to display it.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1070
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1071 This function returns an iterator yielding contexts. Before
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1072 yielding each context, the iterator will first call the prepare
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1073 function on each context in the window in forward order.'''
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1074
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1075 def increasing_windows(start, end, windowsize=8, sizelimit=512):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1076 if start < end:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1077 while start < end:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1078 yield start, min(windowsize, end - start)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1079 start += windowsize
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1080 if windowsize < sizelimit:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1081 windowsize *= 2
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1082 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1083 while start > end:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1084 yield start, min(windowsize, start - end - 1)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1085 start -= windowsize
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1086 if windowsize < sizelimit:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1087 windowsize *= 2
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1088
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1089 follow = opts.get('follow') or opts.get('follow_first')
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1090
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1091 if not len(repo):
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1092 return []
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1093
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1094 if follow:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6739 diff changeset	1095 defrange = '%s:0' % repo['.'].rev()
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1096 else:
6145 154f8be6272b cmdutil.walkchangerevs: use '-1:0' instead ot 'tip:0' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6139 diff changeset	1097 defrange = '-1:0'
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3673 diff changeset	1098 revs = revrange(repo, opts['rev'] or [defrange])
11281 b724b8467b82 walkchangerevs: allow empty query sets Matt Mackall <mpm@selenic.com> parents: 11277 diff changeset	1099 if not revs:
b724b8467b82 walkchangerevs: allow empty query sets Matt Mackall <mpm@selenic.com> parents: 11277 diff changeset	1100 return []
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1101 wanted = set()
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1102 slowpath = match.anypats() or (match.files() and opts.get('removed'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1103 fncache = {}
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1104 change = util.cachefunc(repo.changectx)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1105
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1106 # First step is to fill wanted, the set of revisions that we want to yield.
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1107 # When it does not induce extra cost, we also fill fncache for revisions in
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1108 # wanted: a cache of filenames that were changed (ctx.files()) and that
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1109 # match the file filtering conditions.
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1110
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1111 if not slowpath and not match.files():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1112 # No files, no patterns. Display all revs.
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1113 wanted = set(revs)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1114 copies = []
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	1115
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1116 if not slowpath:
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1117 # We only have to read through the filelog to find wanted revisions
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1118
11607 cc784ad8b3da log: refactor: test for ranges inside filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11606 diff changeset	1119 minrev, maxrev = min(revs), max(revs)
11606 326ab8727a93 log: refactor: compute the value of last outside of filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11488 diff changeset	1120 def filerevgen(filelog, last):
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1121 """
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1122 Only files, no patterns. Check the history of each file.
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1123
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1124 Examines filelog entries within minrev, maxrev linkrev range
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1125 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1126 tuples in backwards order
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1127 """
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1128 cl_count = len(repo)
11608 183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1129 revs = []
11634 09147c065711 cmdutils: fix code style Martin Geisler <mg@aragost.com> parents: 11632 diff changeset	1130 for j in xrange(0, last + 1):
11608 183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1131 linkrev = filelog.linkrev(j)
183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1132 if linkrev < minrev:
183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1133 continue
183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1134 # only yield rev for which we have the changelog, it can
183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1135 # happen while doing "hg log" during a pull or commit
183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1136 if linkrev > maxrev or linkrev >= cl_count:
183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1137 break
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1138
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1139 parentlinkrevs = []
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1140 for p in filelog.parentrevs(j):
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1141 if p != nullrev:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1142 parentlinkrevs.append(filelog.linkrev(p))
11608 183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1143 n = filelog.node(j)
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1144 revs.append((linkrev, parentlinkrevs,
11608 183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1145 follow and filelog.renamed(n)))
183e63112698 log: remove increasing windows usage in fastpath Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11607 diff changeset	1146
11901 a80577bfea29 cmdutil: code simplification Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1147 return reversed(revs)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1148 def iterfiles():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1149 for filename in match.files():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1150 yield filename, None
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1151 for filename_node in copies:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1152 yield filename_node
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1153 for file_, node in iterfiles():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1154 filelog = repo.file(file_)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1155 if not len(filelog):
6536 dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1156 if node is None:
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1157 # A zero count may be a directory or deleted file, so
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1158 # try to find matching entries on the slow path.
7404 07cb58b8c843 Improved error message for log --follow Brendan Cully <brendan@kublai.com> parents: 7369 diff changeset	1159 if follow:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1160 raise util.Abort(
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1161 _('cannot follow nonexistent file: "%s"') % file_)
6536 dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1162 slowpath = True
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1163 break
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1164 else:
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1165 continue
11606 326ab8727a93 log: refactor: compute the value of last outside of filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11488 diff changeset	1166
326ab8727a93 log: refactor: compute the value of last outside of filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11488 diff changeset	1167 if node is None:
326ab8727a93 log: refactor: compute the value of last outside of filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11488 diff changeset	1168 last = len(filelog) - 1
326ab8727a93 log: refactor: compute the value of last outside of filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11488 diff changeset	1169 else:
326ab8727a93 log: refactor: compute the value of last outside of filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11488 diff changeset	1170 last = filelog.rev(node)
326ab8727a93 log: refactor: compute the value of last outside of filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11488 diff changeset	1171
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1172
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1173 # keep track of all ancestors of the file
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1174 ancestors = set([filelog.linkrev(last)])
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1175
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1176 # iterate from latest to oldest revision
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1177 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1178 if rev not in ancestors:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1179 continue
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1180 # XXX insert 1327 fix here
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1181 if flparentlinkrevs:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1182 ancestors.update(flparentlinkrevs)
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11821 diff changeset	1183
11901 a80577bfea29 cmdutil: code simplification Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1184 fncache.setdefault(rev, []).append(file_)
11607 cc784ad8b3da log: refactor: test for ranges inside filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11606 diff changeset	1185 wanted.add(rev)
cc784ad8b3da log: refactor: test for ranges inside filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11606 diff changeset	1186 if copied:
cc784ad8b3da log: refactor: test for ranges inside filerevgen Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11606 diff changeset	1187 copies.append(copied)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1188 if slowpath:
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1189 # We have to read the changelog to match filenames against
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1190 # changed files
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1191
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1192 if follow:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1193 raise util.Abort(_('can only follow copies/renames for explicit '
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8731 diff changeset	1194 'filenames'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1195
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1196 # The slow path checks files modified in every changeset.
11631 dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11613 diff changeset	1197 for i in sorted(revs):
11609 890ad9d6a169 log: slowpath: do not read the full changelog Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11608 diff changeset	1198 ctx = change(i)
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1199 matches = filter(match, ctx.files())
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1200 if matches:
11609 890ad9d6a169 log: slowpath: do not read the full changelog Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11608 diff changeset	1201 fncache[i] = matches
890ad9d6a169 log: slowpath: do not read the full changelog Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11608 diff changeset	1202 wanted.add(i)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1203
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	1204 class followfilter(object):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1205 def __init__(self, onlyfirst=False):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1206 self.startrev = nullrev
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1207 self.roots = set()
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1208 self.onlyfirst = onlyfirst
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1209
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1210 def match(self, rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1211 def realparents(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1212 if self.onlyfirst:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1213 return repo.changelog.parentrevs(rev)[0:1]
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1214 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1215 return filter(lambda x: x != nullrev,
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1216 repo.changelog.parentrevs(rev))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1217
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1218 if self.startrev == nullrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1219 self.startrev = rev
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1220 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1221
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1222 if rev > self.startrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1223 # forward: all descendants
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1224 if not self.roots:
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1225 self.roots.add(self.startrev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1226 for parent in realparents(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1227 if parent in self.roots:
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1228 self.roots.add(rev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1229 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1230 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1231 # backwards: all parents
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1232 if not self.roots:
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1233 self.roots.update(realparents(self.startrev))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1234 if rev in self.roots:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1235 self.roots.remove(rev)
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1236 self.roots.update(realparents(rev))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1237 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1238
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1239 return False
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1240
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1241 # it might be worthwhile to do this in the iterator if the rev range
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1242 # is descending and the prune args are all within that range
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1243 for rev in opts.get('prune', ()):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1244 rev = repo.changelog.rev(repo.lookup(rev))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1245 ff = followfilter()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1246 stop = min(revs[0], revs[-1])
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1247 for x in xrange(rev, stop - 1, -1):
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1248 if ff.match(x):
08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1249 wanted.discard(x)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1250
11632 f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1251 # Now that wanted is correctly initialized, we can iterate over the
f418d2570920 log: document the different phases in walkchangerevs Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1252 # revision range, yielding only revisions in wanted.
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1253 def iterate():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1254 if follow and not match.files():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1255 ff = followfilter(onlyfirst=opts.get('follow_first'))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1256 def want(rev):
8119 af44d0b953c6 cmdutil: return boolean result directly in want function Martin Geisler <mg@lazybytes.net> parents: 8117 diff changeset	1257 return ff.match(rev) and rev in wanted
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1258 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1259 def want(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1260 return rev in wanted
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1261
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1262 for i, window in increasing_windows(0, len(revs)):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1263 nrevs = [rev for rev in revs[i:i + window] if want(rev)]
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1264 for rev in sorted(nrevs):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1265 fns = fncache.get(rev)
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	1266 ctx = change(rev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1267 if not fns:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1268 def fns_generator():
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	1269 for f in ctx.files():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1270 if match(f):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1271 yield f
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1272 fns = fns_generator()
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1273 prepare(ctx, fns)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1274 for rev in nrevs:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1275 yield change(rev)
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1276 return iterate()
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1277
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1278 def add(ui, repo, match, dryrun, listsubrepos, prefix):
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1279 join = lambda f: os.path.join(prefix, f)
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1280 bad = []
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1281 oldbad = match.bad
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1282 match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1283 names = []
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1284 wctx = repo[None]
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1285 for f in repo.walk(match):
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1286 exact = match.exact(f)
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1287 if exact or f not in repo.dirstate:
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1288 names.append(f)
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1289 if ui.verbose or not exact:
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1290 ui.status(_('adding %s\n') % match.rel(join(f)))
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1291
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1292 if listsubrepos:
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1293 for subpath in wctx.substate:
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1294 sub = wctx.sub(subpath)
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1295 try:
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1296 submatch = matchmod.narrowmatcher(subpath, match)
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1297 bad.extend(sub.add(ui, submatch, dryrun, prefix))
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1298 except error.LookupError:
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1299 ui.status(_("skipping missing subrepository: %s\n")
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1300 % join(subpath))
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1301
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1302 if not dryrun:
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12269 diff changeset	1303 rejected = wctx.add(names, prefix)
12269 877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1304 bad.extend(f for f in rejected if f in match.files())
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1305 return bad
877236cdd437 add: move main part to cmdutil to make it easier to reuse Martin Geisler <mg@lazybytes.net> parents: 12266 diff changeset	1306
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1307 def commit(ui, repo, commitfunc, pats, opts):
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1308 '''commit the specified files or all outstanding changes'''
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	1309 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	1310 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	1311 opts['date'] = util.parsedate(date)
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1312 message = logmessage(opts)
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1313
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1314 # extract addremove carefully -- this function can be called from a command
784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1315 # that doesn't support addremove
784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1316 if opts.get('addremove'):
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1317 addremove(repo, pats, opts)
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1318
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	1319 return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1320
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1321 def commiteditor(repo, ctx, subs):
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1322 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1323 return ctx.description()
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1324 return commitforceeditor(repo, ctx, subs)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1325
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1326 def commitforceeditor(repo, ctx, subs):
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1327 edittext = []
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	1328 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1329 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1330 edittext.append(ctx.description())
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1331 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1332 edittext.append("") # Empty line between message and comments.
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1333 edittext.append(_("HG: Enter commit message."
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1334 " Lines beginning with 'HG:' are removed."))
8535 5b6a6ed4f185 cmdutil: mark string for translation Martin Geisler <mg@lazybytes.net> parents: 8497 diff changeset	1335 edittext.append(_("HG: Leave message empty to abort commit."))
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1336 edittext.append("HG: --")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1337 edittext.append(_("HG: user: %s") % ctx.user())
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1338 if ctx.p2():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1339 edittext.append(_("HG: branch merge"))
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1340 if ctx.branch():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1341 edittext.append(_("HG: branch '%s'")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1342 % encoding.tolocal(ctx.branch()))
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1343 edittext.extend([_("HG: subrepo %s") % s for s in subs])
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1344 edittext.extend([_("HG: added %s") % f for f in added])
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	1345 edittext.extend([_("HG: changed %s") % f for f in modified])
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1346 edittext.extend([_("HG: removed %s") % f for f in removed])
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	1347 if not added and not modified and not removed:
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1348 edittext.append(_("HG: no files changed"))
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1349 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1350 # run editor in the repository root
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1351 olddir = os.getcwd()
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1352 os.chdir(repo.root)
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1353 text = repo.ui.edit("\n".join(edittext), ctx.user())
8409 e84a8482c6f2 editor: move HG: filtering from ui to commiteditor Matt Mackall <mpm@selenic.com> parents: 8407 diff changeset	1354 text = re.sub("(?m)^HG:.*\n", "", text)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1355 os.chdir(olddir)
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1356
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1357 if not text.strip():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1358 raise util.Abort(_("empty commit message"))
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1359
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1360 return text

Mercurial > public > mercurial-scm > hg

annotate mercurial/cmdutil.py @ 12866:eddc20306ab6 stable