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

annotate mercurial/cmdutil.py @ 6578:f242d3684f83

walk: begin refactoring badmatch handling

author	Matt Mackall <mpm@selenic.com>
date	Mon, 12 May 2008 11:37:07 -0500
parents	569761919450
children	0159b7a36184

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 #
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
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 _
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	10 import os, sys, bisect, stat
6576 69f3e9ac7c56 walk: introduce match objects Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	11 import mdiff, bdiff, util, templater, templatefilters, patch, errno, match
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	12
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	13 revrangesep = ':'
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	14
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	15 class UnknownCommand(Exception):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	16 """Exception raised if command is not in the command table."""
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	17 class AmbiguousCommand(Exception):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	18 """Exception raised if command shortcut matches more than one command."""
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	19
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	20 def findpossible(ui, cmd, table):
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():
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	29 aliases = e.lstrip("^").split("\|")
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
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	33 elif not ui.config("ui", "strict"):
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
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	49 def findcmd(ui, cmd, table):
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."""
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	51 choice = findpossible(ui, cmd, table)
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()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	59 raise AmbiguousCommand(cmd, clist)
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
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	64 raise UnknownCommand(cmd)
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	65
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	66 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	67 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	68 raise util.Abort(_('outstanding uncommitted merge'))
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	69 modified, added, removed, deleted = repo.status()[:4]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	70 if modified or added or removed or deleted:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	71 raise util.Abort(_("outstanding uncommitted changes"))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	72
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	73 def logmessage(opts):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	74 """ get the log message according to -m and -l option """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	75 message = opts['message']
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	76 logfile = opts['logfile']
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	77
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	78 if message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	79 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	80 'exclusive'))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	81 if not message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	82 try:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	83 if logfile == '-':
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	84 message = sys.stdin.read()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	85 else:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	86 message = open(logfile).read()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	87 except IOError, inst:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	88 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	89 (logfile, inst.strerror))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	90 return message
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	91
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	92 def loglimit(opts):
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	93 """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	94 limit = opts.get('limit')
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	95 if limit:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	96 try:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	97 limit = int(limit)
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	98 except ValueError:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	99 raise util.Abort(_('limit must be a positive integer'))
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	100 if limit <= 0: raise util.Abort(_('limit must be positive'))
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	101 else:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	102 limit = sys.maxint
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	103 return limit
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	104
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	105 def setremoteconfig(ui, opts):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	106 "copy remote options to ui tree"
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	107 if opts.get('ssh'):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	108 ui.setconfig("ui", "ssh", opts['ssh'])
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	109 if opts.get('remotecmd'):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	110 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	111
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3673 diff changeset	112 def revpair(repo, revs):
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	113 '''return pair of nodes, given list of revisions. second item can
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	114 be None, meaning use working dir.'''
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	115
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	116 def revfix(repo, val, defval):
3825 000d122071b5 fix hg diff -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3814 diff changeset	117 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	118 val = defval
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	119 return repo.lookup(val)
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	120
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	121 if not revs:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	122 return repo.dirstate.parents()[0], None
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	123 end = None
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	124 if len(revs) == 1:
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	125 if revrangesep in revs[0]:
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	126 start, end = revs[0].split(revrangesep, 1)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	127 start = revfix(repo, start, 0)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	128 end = revfix(repo, end, repo.changelog.count() - 1)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	129 else:
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	130 start = revfix(repo, revs[0], None)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	131 elif len(revs) == 2:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	132 if revrangesep in revs[0] or revrangesep in revs[1]:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	133 raise util.Abort(_('too many revisions specified'))
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	134 start = revfix(repo, revs[0], None)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	135 end = revfix(repo, revs[1], None)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	136 else:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	137 raise util.Abort(_('too many revisions specified'))
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	138 return start, end
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	139
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3673 diff changeset	140 def revrange(repo, revs):
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	141 """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	142
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	143 def revfix(repo, val, defval):
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3707 diff changeset	144 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	145 return defval
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	146 return repo.changelog.rev(repo.lookup(val))
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	147
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	148 seen, l = {}, []
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	149 for spec in revs:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	150 if revrangesep in spec:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	151 start, end = spec.split(revrangesep, 1)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	152 start = revfix(repo, start, 0)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	153 end = revfix(repo, end, repo.changelog.count() - 1)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	154 step = start > end and -1 or 1
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	155 for rev in xrange(start, end+step, step):
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	156 if rev in seen:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	157 continue
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	158 seen[rev] = 1
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	159 l.append(rev)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	160 else:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	161 rev = revfix(repo, spec, None)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	162 if rev in seen:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	163 continue
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	164 seen[rev] = 1
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	165 l.append(rev)
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
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	167 return l
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	168
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	169 def make_filename(repo, pat, node,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	170 total=None, seqno=None, revwidth=None, pathname=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	171 node_expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	172 'H': lambda: hex(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	173 'R': lambda: str(repo.changelog.rev(node)),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	174 'h': lambda: short(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	175 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	176 expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	177 '%': lambda: '%',
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	178 'b': lambda: os.path.basename(repo.root),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	179 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	180
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	181 try:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	182 if node:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	183 expander.update(node_expander)
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	184 if node:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	185 expander['r'] = (lambda:
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	186 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	187 if total is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	188 expander['N'] = lambda: str(total)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	189 if seqno is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	190 expander['n'] = lambda: str(seqno)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	191 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	192 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	193 if pathname is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	194 expander['s'] = lambda: os.path.basename(pathname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	195 expander['d'] = lambda: os.path.dirname(pathname) or '.'
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	196 expander['p'] = lambda: pathname
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	197
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	198 newname = []
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	199 patlen = len(pat)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	200 i = 0
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	201 while i < patlen:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	202 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	203 if c == '%':
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	204 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	205 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	206 c = expander[c]()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	207 newname.append(c)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	208 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	209 return ''.join(newname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	210 except KeyError, inst:
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 2958 diff changeset	211 raise util.Abort(_("invalid format spec '%%%s' in output file name") %
bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 2958 diff changeset	212 inst.args[0])
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	213
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	214 def make_file(repo, pat, node=None,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	215 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	216 if not pat or pat == '-':
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	217 return 'w' in mode and sys.stdout or sys.stdin
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	218 if hasattr(pat, 'write') and 'w' in mode:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	219 return pat
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	220 if hasattr(pat, 'read') and 'r' in mode:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	221 return pat
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	222 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	223 pathname),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	224 mode)
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	225
6575 e08e0367ba15 walk: kill util.cmdmatcher and _matcher Matt Mackall <mpm@selenic.com> parents: 6566 diff changeset	226 def matchpats(repo, pats=[], opts={}, globbed=False, default='relpath'):
e08e0367ba15 walk: kill util.cmdmatcher and _matcher Matt Mackall <mpm@selenic.com> parents: 6566 diff changeset	227 if not globbed and default == 'relpath':
e08e0367ba15 walk: kill util.cmdmatcher and _matcher Matt Mackall <mpm@selenic.com> parents: 6566 diff changeset	228 pats = util.expand_glob(pats or [])
6576 69f3e9ac7c56 walk: introduce match objects Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	229 m = match.match(repo.root, repo.getcwd(), pats, opts.get('include'),
69f3e9ac7c56 walk: introduce match objects Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	230 opts.get('exclude'), default)
6578 f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	231 def badfn(f, msg):
f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	232 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	233 return False
f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	234 m.bad = badfn
6576 69f3e9ac7c56 walk: introduce match objects Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	235 return m.files(), m, m.anypats()
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	236
4197 492d0d5b6976 remove unused "head" hack from util._matcher Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4195 diff changeset	237 def walk(repo, pats=[], opts={}, node=None, badmatch=None, globbed=False,
6575 e08e0367ba15 walk: kill util.cmdmatcher and _matcher Matt Mackall <mpm@selenic.com> parents: 6566 diff changeset	238 default='relpath'):
6576 69f3e9ac7c56 walk: introduce match objects Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	239 dummy, m, dummy = matchpats(repo, pats, opts, globbed, default)
6578 f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	240 if badmatch:
f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	241 m.bad = badmatch
f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	242 for src, fn in repo.walk(node, m):
6576 69f3e9ac7c56 walk: introduce match objects Matt Mackall <mpm@selenic.com> parents: 6575 diff changeset	243 yield src, fn, m.rel(fn), m.exact(fn)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	244
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	245 def findrenames(repo, added=None, removed=None, threshold=0.5):
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	246 '''find renamed files -- yields (before, after, score) tuples'''
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	247 if added is None or removed is None:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	248 added, removed = repo.status()[1:3]
3971 68a0fa81ad28 cmdutil.py: use contexts in findrenames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3891 diff changeset	249 ctx = repo.changectx()
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	250 for a in added:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	251 aa = repo.wread(a)
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	252 bestname, bestscore = None, threshold
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	253 for r in removed:
3971 68a0fa81ad28 cmdutil.py: use contexts in findrenames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3891 diff changeset	254 rr = ctx.filectx(r).data()
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	255
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	256 # bdiff.blocks() returns blocks of matching lines
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	257 # count the number of bytes in each
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	258 equal = 0
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	259 alines = mdiff.splitnewlines(aa)
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	260 matches = bdiff.blocks(aa, rr)
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	261 for x1,x2,y1,y2 in matches:
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	262 for line in alines[x1:x2]:
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	263 equal += len(line)
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	264
4472 736e49292809 addremove: comparing two empty files caused ZeroDivisionError Thomas Arendsen Hein <thomas@intevation.de> parents: 4380 diff changeset	265 lengths = len(aa) + len(rr)
736e49292809 addremove: comparing two empty files caused ZeroDivisionError Thomas Arendsen Hein <thomas@intevation.de> parents: 4380 diff changeset	266 if lengths:
736e49292809 addremove: comparing two empty files caused ZeroDivisionError Thomas Arendsen Hein <thomas@intevation.de> parents: 4380 diff changeset	267 myscore = equal*2.0 / lengths
736e49292809 addremove: comparing two empty files caused ZeroDivisionError Thomas Arendsen Hein <thomas@intevation.de> parents: 4380 diff changeset	268 if myscore >= bestscore:
736e49292809 addremove: comparing two empty files caused ZeroDivisionError Thomas Arendsen Hein <thomas@intevation.de> parents: 4380 diff changeset	269 bestname, bestscore = r, myscore
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	270 if bestname:
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	271 yield bestname, a, bestscore
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	272
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	273 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	274 if dry_run is None:
c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	275 dry_run = opts.get('dry_run')
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	276 if similarity is None:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	277 similarity = float(opts.get('similarity') or 0)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	278 add, remove = [], []
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	279 mapping = {}
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	280 for src, abs, rel, exact in walk(repo, pats, opts):
4522 591322269fed Use absolute paths in addremove. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4478 diff changeset	281 target = repo.wjoin(abs)
4906 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4836 diff changeset	282 if src == 'f' and abs not in repo.dirstate:
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	283 add.append(abs)
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	284 mapping[abs] = rel, exact
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	285 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	286 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5248 diff changeset	287 if repo.dirstate[abs] != 'r' and (not util.lexists(target)
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5248 diff changeset	288 or (os.path.isdir(target) and not os.path.islink(target))):
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	289 remove.append(abs)
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	290 mapping[abs] = rel, exact
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	291 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	292 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	293 if not dry_run:
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5248 diff changeset	294 repo.remove(remove)
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	295 repo.add(add)
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	296 if similarity > 0:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	297 for old, new, score in findrenames(repo, add, remove, similarity):
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	298 oldrel, oldexact = mapping[old]
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	299 newrel, newexact = mapping[new]
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	300 if repo.ui.verbose or not oldexact or not newexact:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	301 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	302 '(%d%% similar)\n') %
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	303 (oldrel, newrel, score * 100))
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	304 if not dry_run:
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	305 repo.copy(old, new)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	306
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	307 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	308 # called with the repo lock held
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	309 #
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	310 # hgsep => pathname that uses "/" to separate directories
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	311 # 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	312 cwd = repo.getcwd()
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	313 targets = {}
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	314 after = opts.get("after")
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	315 dryrun = opts.get("dry_run")
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	316
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	317 def walkpat(pat):
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	318 srcs = []
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	319 for tag, abs, rel, exact in walk(repo, [pat], opts, globbed=True):
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	320 state = repo.dirstate[abs]
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	321 if state in '?r':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	322 if exact and state == '?':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	323 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	324 if exact and state == 'r':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	325 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	326 ' remove\n') % rel)
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	327 continue
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	328 # abs: hgsep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	329 # rel: ossep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	330 srcs.append((abs, rel, exact))
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	331 return srcs
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	332
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	333 # abssrc: hgsep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	334 # relsrc: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	335 # otarget: ossep
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	336 def copyfile(abssrc, relsrc, otarget, exact):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	337 abstarget = util.canonpath(repo.root, cwd, otarget)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	338 reltarget = repo.pathto(abstarget, cwd)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	339 target = repo.wjoin(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	340 src = repo.wjoin(abssrc)
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	341 state = repo.dirstate[abstarget]
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	342
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	343 # check for collisions
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	344 prevsrc = targets.get(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	345 if prevsrc is not None:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	346 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	347 (reltarget, repo.pathto(abssrc, cwd),
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	348 repo.pathto(prevsrc, cwd)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	349 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	350
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	351 # check for overwrites
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	352 exists = os.path.exists(target)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	353 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	354 if not opts['force']:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	355 ui.warn(_('%s: not overwriting - file exists\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	356 reltarget)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	357 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	358
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	359 if after:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	360 if not exists:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	361 return
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	362 elif not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	363 try:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	364 if exists:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	365 os.unlink(target)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	366 targetdir = os.path.dirname(target) or '.'
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	367 if not os.path.isdir(targetdir):
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	368 os.makedirs(targetdir)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	369 util.copyfile(src, target)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	370 except IOError, inst:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	371 if inst.errno == errno.ENOENT:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	372 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	373 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	374 ui.warn(_('%s: cannot copy - %s\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	375 (relsrc, inst.strerror))
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	376 return True # report a failure
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	377
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	378 if ui.verbose or not exact:
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	379 action = rename and "moving" or "copying"
2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	380 ui.status(_('%s %s to %s\n') % (action, relsrc, reltarget))
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	381
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	382 targets[abstarget] = abssrc
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	383
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	384 # fix up dirstate
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	385 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	386 if abstarget == origsrc: # copying back a copy?
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	387 if state not in 'mn' and not dryrun:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	388 repo.dirstate.normallookup(abstarget)
5604 4b7b21acede0 copy: fix copying back with -A (issue836) Matt Mackall <mpm@selenic.com> parents: 5589 diff changeset	389 else:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	390 if repo.dirstate[origsrc] == 'a':
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	391 if not ui.quiet:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	392 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	393 "data will be stored for %s.\n")
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	394 % (repo.pathto(origsrc, cwd), reltarget))
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	395 if abstarget not in repo.dirstate and not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	396 repo.add([abstarget])
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	397 elif not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	398 repo.copy(origsrc, abstarget)
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	399
2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	400 if rename and not dryrun:
6566 30d3d531e11a rename --after: do not unlink source file (issue910) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6553 diff changeset	401 repo.remove([abssrc], not after)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	402
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	403 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	404 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	405 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	406 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	407 def targetpathfn(pat, dest, srcs):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	408 if os.path.isdir(pat):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	409 abspfx = util.canonpath(repo.root, cwd, pat)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	410 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	411 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	412 striplen = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	413 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	414 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	415 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	416 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	417 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	418 elif destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	419 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	420 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	421 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	422 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	423 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	424
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	425 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	426 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	427 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	428 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	429 def targetpathafterfn(pat, dest, srcs):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	430 if util.patkind(pat, None)[0]:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	431 # a mercurial pattern
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	432 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	433 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	434 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	435 abspfx = util.canonpath(repo.root, cwd, pat)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	436 if len(abspfx) < len(srcs[0][0]):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	437 # 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	438 # 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	439 def evalpath(striplen):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	440 score = 0
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	441 for s in srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	442 t = os.path.join(dest, util.localpath(s[0])[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	443 if os.path.exists(t):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	444 score += 1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	445 return score
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	446
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	447 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	448 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	449 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	450 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	451 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	452 score = evalpath(striplen)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	453 striplen1 = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	454 if striplen1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	455 striplen1 += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	456 if evalpath(striplen1) > score:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	457 striplen = striplen1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	458 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	459 util.localpath(p)[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	460 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	461 # a file
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	462 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	463 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	464 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	465 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	466 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	467 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	468
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	469
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	470 pats = util.expand_glob(pats)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	471 if not pats:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	472 raise util.Abort(_('no source or destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	473 if len(pats) == 1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	474 raise util.Abort(_('no destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	475 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	476 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	477 if not destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	478 if len(pats) > 1 or util.patkind(pats[0], None)[0]:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	479 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	480 '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	481 if util.endswithsep(dest):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	482 raise util.Abort(_('destination %s is not a directory') % dest)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	483
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	484 tfn = targetpathfn
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	485 if after:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	486 tfn = targetpathafterfn
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	487 copylist = []
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	488 for pat in pats:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	489 srcs = walkpat(pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	490 if not srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	491 continue
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	492 copylist.append((tfn(pat, dest, srcs), srcs))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	493 if not copylist:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	494 raise util.Abort(_('no files to copy'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	495
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	496 errors = 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	497 for targetpath, srcs in copylist:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	498 for abssrc, relsrc, exact in srcs:
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	499 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	500 errors += 1
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	501
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	502 if errors:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	503 ui.warn(_('(consider using --after)\n'))
5609 a783d3627144 copy: move rename logic Matt Mackall <mpm@selenic.com> parents: 5608 diff changeset	504
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	505 return errors
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	506
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	507 def service(opts, parentfn=None, initfn=None, runfn=None):
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	508 '''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	509
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	510 if opts['daemon'] and not opts['daemon_pipefds']:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	511 rfd, wfd = os.pipe()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	512 args = sys.argv[:]
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	513 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
5797 7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	514 # Don't pass --cwd to the child process, because we've already
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	515 # changed directory.
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	516 for i in xrange(1,len(args)):
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	517 if args[i].startswith('--cwd='):
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	518 del args[i]
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	519 break
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	520 elif args[i].startswith('--cwd'):
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	521 del args[i:i+2]
7b7f03c7dfa5 serve: Don't change directory in the child if invoked with -d and --cwd Bryan O'Sullivan <bos@serpentine.com> parents: 5760 diff changeset	522 break
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	523 pid = os.spawnvp(os.P_NOWAIT \| getattr(os, 'P_DETACH', 0),
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	524 args[0], args)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	525 os.close(wfd)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	526 os.read(rfd, 1)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	527 if parentfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	528 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	529 else:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	530 os._exit(0)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	531
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	532 if initfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	533 initfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	534
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	535 if opts['pid_file']:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	536 fp = open(opts['pid_file'], 'w')
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	537 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	538 fp.close()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	539
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	540 if opts['daemon_pipefds']:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	541 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	542 os.close(rfd)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	543 try:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	544 os.setsid()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	545 except AttributeError:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	546 pass
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	547 os.write(wfd, 'y')
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	548 os.close(wfd)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	549 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	550 sys.stderr.flush()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	551 fd = os.open(util.nulldev, os.O_RDWR)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	552 if fd != 0: os.dup2(fd, 0)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	553 if fd != 1: os.dup2(fd, 1)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	554 if fd != 2: os.dup2(fd, 2)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	555 if fd not in (0, 1, 2): os.close(fd)
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	556
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	557 if runfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	558 return runfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	559
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	560 class changeset_printer(object):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	561 '''show changeset information when templating not requested.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	562
3876 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3838 diff changeset	563 def __init__(self, ui, repo, patch, buffered):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	564 self.ui = ui
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	565 self.repo = repo
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	566 self.buffered = buffered
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	567 self.patch = patch
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	568 self.header = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	569 self.hunk = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	570 self.lastheader = None
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	571
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	572 def flush(self, rev):
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	573 if rev in self.header:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	574 h = self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	575 if h != self.lastheader:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	576 self.lastheader = h
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	577 self.ui.write(h)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	578 del self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	579 if rev in self.hunk:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	580 self.ui.write(self.hunk[rev])
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	581 del self.hunk[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	582 return 1
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	583 return 0
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	584
4351 3380eb6d7c32 fix 'hg <not-log> -v --template foo' with revisions without copies Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	585 def show(self, rev=0, changenode=None, copies=(), **props):
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	586 if self.buffered:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	587 self.ui.pushbuffer()
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	588 self._show(rev, changenode, copies, props)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	589 self.hunk[rev] = self.ui.popbuffer()
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	590 else:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	591 self._show(rev, changenode, copies, props)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	592
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	593 def _show(self, rev, changenode, copies, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	594 '''show a single changeset or file revision'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	595 log = self.repo.changelog
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	596 if changenode is None:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	597 changenode = log.node(rev)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	598 elif not rev:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	599 rev = log.rev(changenode)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	600
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	601 if self.ui.quiet:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	602 self.ui.write("%d:%s\n" % (rev, short(changenode)))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	603 return
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	604
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	605 changes = log.read(changenode)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	606 date = util.datestr(changes[2])
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	607 extra = changes[5]
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	608 branch = extra.get("branch")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	609
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	610 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	611
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	612 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	613 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	614
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	615 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	616
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	617 # 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	618 if branch != 'default':
3827 3674ca805a5b log: convert branch names to the local encoding Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3825 diff changeset	619 branch = util.tolocal(branch)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	620 self.ui.write(_("branch: %s\n") % branch)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	621 for tag in self.repo.nodetags(changenode):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	622 self.ui.write(_("tag: %s\n") % tag)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	623 for parent in parents:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	624 self.ui.write(_("parent: %d:%s\n") % parent)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	625
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	626 if self.ui.debugflag:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	627 self.ui.write(_("manifest: %d:%s\n") %
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	628 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	629 self.ui.write(_("user: %s\n") % changes[1])
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	630 self.ui.write(_("date: %s\n") % date)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	631
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	632 if self.ui.debugflag:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	633 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	634 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	635 files):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	636 if value:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	637 self.ui.write("%-12s %s\n" % (key, " ".join(value)))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	638 elif changes[3] and self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	639 self.ui.write(_("files: %s\n") % " ".join(changes[3]))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	640 if copies and self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	641 copies = ['%s (%s)' % c for c in copies]
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	642 self.ui.write(_("copies: %s\n") % ' '.join(copies))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	643
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	644 if extra and self.ui.debugflag:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	645 extraitems = extra.items()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	646 extraitems.sort()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	647 for key, value in extraitems:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	648 self.ui.write(_("extra: %s=%s\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	649 % (key, value.encode('string_escape')))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	650
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	651 description = changes[4].strip()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	652 if description:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	653 if self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	654 self.ui.write(_("description:\n"))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	655 self.ui.write(description)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	656 self.ui.write("\n\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	657 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	658 self.ui.write(_("summary: %s\n") %
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	659 description.splitlines()[0])
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	660 self.ui.write("\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	661
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	662 self.showpatch(changenode)
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	663
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	664 def showpatch(self, node):
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	665 if self.patch:
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	666 prev = self.repo.changelog.parents(node)[0]
4714 a741293793f6 Make changeset_printer respect ui diffopts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4686 diff changeset	667 patch.diff(self.repo, prev, node, match=self.patch, fp=self.ui,
a741293793f6 Make changeset_printer respect ui diffopts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4686 diff changeset	668 opts=patch.diffopts(self.ui))
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	669 self.ui.write("\n")
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	670
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	671 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	672 """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	673
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	674 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	675 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	676 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	677 """
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	678 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	679 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	680 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	681 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	682 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	683 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	684 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	685
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	686
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	687 class changeset_templater(changeset_printer):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	688 '''format changeset information.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	689
3876 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3838 diff changeset	690 def __init__(self, ui, repo, patch, mapfile, buffered):
1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3838 diff changeset	691 changeset_printer.__init__(self, ui, repo, patch, buffered)
5976 9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5915 diff changeset	692 filters = templatefilters.filters.copy()
4352 051fb8c2567c command line templates: add formatnode filter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4351 diff changeset	693 filters['formatnode'] = (ui.debugflag and (lambda x: x)
051fb8c2567c command line templates: add formatnode filter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4351 diff changeset	694 or (lambda x: x[:12]))
051fb8c2567c command line templates: add formatnode filter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4351 diff changeset	695 self.t = templater.templater(mapfile, filters,
051fb8c2567c command line templates: add formatnode filter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4351 diff changeset	696 cache={
051fb8c2567c command line templates: add formatnode filter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4351 diff changeset	697 'parent': '{rev}:{node\|formatnode} ',
051fb8c2567c command line templates: add formatnode filter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4351 diff changeset	698 'manifest': '{rev}:{node\|formatnode}',
051fb8c2567c command line templates: add formatnode filter Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4351 diff changeset	699 'filecopy': '{name} ({source})'})
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	700
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	701 def use_template(self, t):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	702 '''set template string to use'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	703 self.t.cache['changeset'] = t
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	704
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	705 def _show(self, rev, changenode, copies, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	706 '''show a single changeset or file revision'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	707 log = self.repo.changelog
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	708 if changenode is None:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	709 changenode = log.node(rev)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	710 elif not rev:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	711 rev = log.rev(changenode)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	712
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	713 changes = log.read(changenode)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	714
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	715 def showlist(name, values, plural=None, **args):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	716 '''expand set of values.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	717 name is name of key in template map.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	718 values is list of strings or dicts.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	719 plural is plural of name, if not simply name + 's'.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	720
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	721 expansion works like this, given name 'foo'.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	722
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	723 if values is empty, expand 'no_foos'.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	724
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	725 if 'foo' not in template map, return values as a string,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	726 joined by space.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	727
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	728 expand 'start_foos'.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	729
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	730 for each value, expand 'foo'. if 'last_foo' in template
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	731 map, expand it instead of 'foo' for last key.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	732
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	733 expand 'end_foos'.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	734 '''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	735 if plural: names = plural
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	736 else: names = name + 's'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	737 if not values:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	738 noname = 'no_' + names
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	739 if noname in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	740 yield self.t(noname, **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	741 return
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	742 if name not in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	743 if isinstance(values[0], str):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	744 yield ' '.join(values)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	745 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	746 for v in values:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	747 yield dict(v, **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	748 return
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	749 startname = 'start_' + names
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	750 if startname in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	751 yield self.t(startname, **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	752 vargs = args.copy()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	753 def one(v, tag=name):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	754 try:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	755 vargs.update(v)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	756 except (AttributeError, ValueError):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	757 try:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	758 for a, b in v:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	759 vargs[a] = b
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	760 except ValueError:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	761 vargs[name] = v
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	762 return self.t(tag, **vargs)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	763 lastname = 'last_' + name
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	764 if lastname in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	765 last = values.pop()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	766 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	767 last = None
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	768 for v in values:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	769 yield one(v)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	770 if last is not None:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	771 yield one(last, tag=lastname)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	772 endname = 'end_' + names
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	773 if endname in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	774 yield self.t(endname, **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	775
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	776 def showbranches(**args):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	777 branch = changes[5].get("branch")
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	778 if branch != 'default':
3827 3674ca805a5b log: convert branch names to the local encoding Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3825 diff changeset	779 branch = util.tolocal(branch)
3648 2801a3efc7c3 changeset templater: convert some unnecessary yields to returns Matt Mackall <mpm@selenic.com> parents: 3645 diff changeset	780 return showlist('branch', [branch], plural='branches', **args)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	781
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	782 def showparents(**args):
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	783 parents = [[('rev', p), ('node', hex(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	784 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	785 return showlist('parent', parents, **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	786
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	787 def showtags(**args):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	788 return showlist('tag', self.repo.nodetags(changenode), **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	789
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	790 def showextras(**args):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	791 extras = changes[5].items()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	792 extras.sort()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	793 for key, value in extras:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	794 args = args.copy()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	795 args.update(dict(key=key, value=value))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	796 yield self.t('extra', **args)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	797
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	798 def showcopies(**args):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	799 c = [{'name': x[0], 'source': x[1]} for x in copies]
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	800 return showlist('file_copy', c, plural='file_copies', **args)
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5716 diff changeset	801
5545 5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	802 files = []
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	803 def getfiles():
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5716 diff changeset	804 if not files:
5545 5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	805 files[:] = self.repo.status(
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	806 log.parents(changenode)[0], changenode)[:3]
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	807 return files
5550 db6633f11d59 cmdutil: make "files" list all files, add "file_mods" for modified files Patrick Mezard <pmezard@gmail.com> parents: 5545 diff changeset	808 def showfiles(**args):
db6633f11d59 cmdutil: make "files" list all files, add "file_mods" for modified files Patrick Mezard <pmezard@gmail.com> parents: 5545 diff changeset	809 return showlist('file', changes[3], **args)
db6633f11d59 cmdutil: make "files" list all files, add "file_mods" for modified files Patrick Mezard <pmezard@gmail.com> parents: 5545 diff changeset	810 def showmods(**args):
db6633f11d59 cmdutil: make "files" list all files, add "file_mods" for modified files Patrick Mezard <pmezard@gmail.com> parents: 5545 diff changeset	811 return showlist('file_mod', getfiles()[0], **args)
5545 5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	812 def showadds(**args):
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	813 return showlist('file_add', getfiles()[1], **args)
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	814 def showdels(**args):
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	815 return showlist('file_del', getfiles()[2], **args)
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	816 def showmanifest(**args):
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	817 args = args.copy()
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	818 args.update(dict(rev=self.repo.manifest.rev(changes[0]),
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	819 node=hex(changes[0])))
5a124ce4602a cmdutil: always expose "files_add", "files_del" and "manifest" templater properties Patrick Mezard <pmezard@gmail.com> parents: 5487 diff changeset	820 return self.t('manifest', **args)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	821
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	822 defprops = {
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	823 'author': changes[1],
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	824 'branches': showbranches,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	825 'date': changes[2],
4824 f3f84d5cd268 Strip whitespace from changeset description in changeset_templater. Thomas Arendsen Hein <thomas@intevation.de> parents: 4734 diff changeset	826 'desc': changes[4].strip(),
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	827 'file_adds': showadds,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	828 'file_dels': showdels,
5550 db6633f11d59 cmdutil: make "files" list all files, add "file_mods" for modified files Patrick Mezard <pmezard@gmail.com> parents: 5545 diff changeset	829 'file_mods': showmods,
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	830 'files': showfiles,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	831 'file_copies': showcopies,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	832 'manifest': showmanifest,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	833 'node': hex(changenode),
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	834 'parents': showparents,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	835 'rev': rev,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	836 'tags': showtags,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	837 'extras': showextras,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	838 }
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	839 props = props.copy()
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	840 props.update(defprops)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	841
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	842 try:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	843 if self.ui.debugflag and 'header_debug' in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	844 key = 'header_debug'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	845 elif self.ui.quiet and 'header_quiet' in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	846 key = 'header_quiet'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	847 elif self.ui.verbose and 'header_verbose' in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	848 key = 'header_verbose'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	849 elif 'header' in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	850 key = 'header'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	851 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	852 key = ''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	853 if key:
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	854 h = templater.stringify(self.t(key, **props))
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	855 if self.buffered:
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	856 self.header[rev] = h
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	857 else:
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	858 self.ui.write(h)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	859 if self.ui.debugflag and 'changeset_debug' in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	860 key = 'changeset_debug'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	861 elif self.ui.quiet and 'changeset_quiet' in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	862 key = 'changeset_quiet'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	863 elif self.ui.verbose and 'changeset_verbose' in self.t:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	864 key = 'changeset_verbose'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	865 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	866 key = 'changeset'
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	867 self.ui.write(templater.stringify(self.t(key, **props)))
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	868 self.showpatch(changenode)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	869 except KeyError, inst:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	870 raise util.Abort(_("%s: no key named '%s'") % (self.t.mapfile,
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	871 inst.args[0]))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	872 except SyntaxError, inst:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	873 raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	874
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	875 def show_changeset(ui, repo, opts, buffered=False, matchfn=False):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	876 """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	877
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	878 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	879 1. option 'template'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	880 2. option 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	881 3. [ui] setting 'logtemplate'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	882 4. [ui] setting 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	883 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	884 regular display via changeset_printer() is done.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	885 """
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	886 # options
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	887 patch = False
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	888 if opts.get('patch'):
3838 dec4eba7ccad Use util.always instead of creating a new lambda function in show_changeset Thomas Arendsen Hein <thomas@intevation.de> parents: 3837 diff changeset	889 patch = matchfn or util.always
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	890
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	891 tmpl = opts.get('template')
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	892 mapfile = None
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	893 if tmpl:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	894 tmpl = templater.parsestring(tmpl, quoted=False)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	895 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	896 mapfile = opts.get('style')
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	897 # ui settings
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	898 if not mapfile:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	899 tmpl = ui.config('ui', 'logtemplate')
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	900 if tmpl:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	901 tmpl = templater.parsestring(tmpl)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	902 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	903 mapfile = ui.config('ui', 'style')
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	904
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	905 if tmpl or mapfile:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	906 if mapfile:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	907 if not os.path.split(mapfile)[0]:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	908 mapname = (templater.templatepath('map-cmdline.' + mapfile)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	909 or templater.templatepath(mapfile))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	910 if mapname: mapfile = mapname
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	911 try:
3876 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3838 diff changeset	912 t = changeset_templater(ui, repo, patch, mapfile, buffered)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	913 except SyntaxError, inst:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	914 raise util.Abort(inst.args[0])
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	915 if tmpl: t.use_template(tmpl)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	916 return t
3876 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3838 diff changeset	917 return changeset_printer(ui, repo, patch, buffered)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	918
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	919 def finddate(ui, repo, date):
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	920 """Find the tipmost changeset that matches the given date spec"""
5836 c5c9a022bd9a Tweak finddate to pass date directly. mark.williamson@cl.cam.ac.uk parents: 5829 diff changeset	921 df = util.matchdate(date)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	922 get = util.cachefunc(lambda r: repo.changectx(r).changeset())
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	923 changeiter, matchfn = walkchangerevs(ui, repo, [], get, {'rev':None})
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	924 results = {}
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	925 for st, rev, fns in changeiter:
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	926 if st == 'add':
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	927 d = get(rev)[2]
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	928 if df(d[0]):
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	929 results[rev] = d
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	930 elif st == 'iter':
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	931 if rev in results:
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	932 ui.status("Found revision %s from %s\n" %
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	933 (rev, util.datestr(results[rev])))
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	934 return str(rev)
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	935
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	936 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	937
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	938 def walkchangerevs(ui, repo, pats, change, opts):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	939 '''Iterate over files and the revs they changed in.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	940
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	941 Callers most commonly need to iterate backwards over the history
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	942 it is interested in. Doing so has awful (quadratic-looking)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	943 performance, so we use iterators in a "windowed" way.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	944
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	945 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	946 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	947 order (usually backwards) to display it.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	948
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	949 This function returns an (iterator, matchfn) tuple. The iterator
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	950 yields 3-tuples. They will be of one of the following forms:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	951
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	952 "window", incrementing, lastrev: stepping through a window,
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	953 positive if walking forwards through revs, last rev in the
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	954 sequence iterated over - use to reset state for the current window
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	955
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	956 "add", rev, fns: out-of-order traversal of the given file names
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	957 fns, which changed during revision rev - use to gather data for
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	958 possible display
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	959
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	960 "iter", rev, None: in-order traversal of the revs earlier iterated
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	961 over with "add" - use to display data'''
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	962
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	963 def increasing_windows(start, end, windowsize=8, sizelimit=512):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	964 if start < end:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	965 while start < end:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	966 yield start, min(windowsize, end-start)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	967 start += windowsize
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	968 if windowsize < sizelimit:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	969 windowsize *= 2
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	970 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	971 while start > end:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	972 yield start, min(windowsize, start-end-1)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	973 start -= windowsize
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	974 if windowsize < sizelimit:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	975 windowsize *= 2
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	976
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	977 files, matchfn, anypats = matchpats(repo, pats, opts)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	978 follow = opts.get('follow') or opts.get('follow_first')
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	979
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	980 if repo.changelog.count() == 0:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	981 return [], matchfn
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	982
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	983 if follow:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	984 defrange = '%s:0' % repo.changectx().rev()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	985 else:
6145 154f8be6272b cmdutil.walkchangerevs: use '-1:0' instead ot 'tip:0' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6139 diff changeset	986 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	987 revs = revrange(repo, opts['rev'] or [defrange])
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	988 wanted = {}
3657 4d988b7412f2 add log --removed Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	989 slowpath = anypats or opts.get('removed')
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	990 fncache = {}
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	991
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	992 if not slowpath and not files:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	993 # No files, no patterns. Display all revs.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	994 wanted = dict.fromkeys(revs)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	995 copies = []
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	996 if not slowpath:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	997 # Only files, no patterns. Check the history of each file.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	998 def filerevgen(filelog, node):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	999 cl_count = repo.changelog.count()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1000 if node is None:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1001 last = filelog.count() - 1
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1002 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1003 last = filelog.rev(node)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1004 for i, window in increasing_windows(last, nullrev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1005 revs = []
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1006 for j in xrange(i - window, i + 1):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1007 n = filelog.node(j)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1008 revs.append((filelog.linkrev(n),
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1009 follow and filelog.renamed(n)))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1010 revs.reverse()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1011 for rev in revs:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1012 # only yield rev for which we have the changelog, it can
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1013 # happen while doing "hg log" during a pull or commit
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1014 if rev[0] < cl_count:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1015 yield rev
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1016 def iterfiles():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1017 for filename in files:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1018 yield filename, None
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1019 for filename_node in copies:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1020 yield filename_node
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1021 minrev, maxrev = min(revs), max(revs)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1022 for file_, node in iterfiles():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1023 filelog = repo.file(file_)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1024 if filelog.count() == 0:
6536 dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1025 if node is None:
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1026 # 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	1027 # try to find matching entries on the slow path.
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1028 slowpath = True
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1029 break
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1030 else:
6553 0bb76d168437 remove trailing spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6536 diff changeset	1031 ui.warn(_('%s:%s copy source revision cannot be found!\n')
6536 dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1032 % (file_, short(node)))
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1033 continue
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1034 for rev, copied in filerevgen(filelog, node):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1035 if rev <= maxrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1036 if rev < minrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1037 break
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1038 fncache.setdefault(rev, [])
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1039 fncache[rev].append(file_)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1040 wanted[rev] = 1
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1041 if follow and copied:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1042 copies.append(copied)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1043 if slowpath:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1044 if follow:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1045 raise util.Abort(_('can only follow copies/renames for explicit '
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1046 'file names'))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1047
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1048 # The slow path checks files modified in every changeset.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1049 def changerevgen():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1050 for i, window in increasing_windows(repo.changelog.count()-1,
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1051 nullrev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1052 for j in xrange(i - window, i + 1):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1053 yield j, change(j)[3]
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1054
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1055 for rev, changefiles in changerevgen():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1056 matches = filter(matchfn, changefiles)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1057 if matches:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1058 fncache[rev] = matches
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1059 wanted[rev] = 1
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1060
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1061 class followfilter:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1062 def __init__(self, onlyfirst=False):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1063 self.startrev = nullrev
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1064 self.roots = []
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1065 self.onlyfirst = onlyfirst
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 def match(self, rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1068 def realparents(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1069 if self.onlyfirst:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1070 return repo.changelog.parentrevs(rev)[0:1]
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1071 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1072 return filter(lambda x: x != nullrev,
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1073 repo.changelog.parentrevs(rev))
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 if self.startrev == nullrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1076 self.startrev = rev
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1077 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1078
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1079 if rev > self.startrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1080 # forward: all descendants
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1081 if not self.roots:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1082 self.roots.append(self.startrev)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1083 for parent in realparents(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1084 if parent in self.roots:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1085 self.roots.append(rev)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1086 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1087 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1088 # backwards: all parents
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1089 if not self.roots:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1090 self.roots.extend(realparents(self.startrev))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1091 if rev in self.roots:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1092 self.roots.remove(rev)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1093 self.roots.extend(realparents(rev))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1094 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1095
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1096 return False
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1097
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1098 # 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	1099 # 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	1100 for rev in opts.get('prune', ()):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1101 rev = repo.changelog.rev(repo.lookup(rev))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1102 ff = followfilter()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1103 stop = min(revs[0], revs[-1])
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1104 for x in xrange(rev, stop-1, -1):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1105 if ff.match(x) and x in wanted:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1106 del wanted[x]
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1107
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1108 def iterate():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1109 if follow and not files:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1110 ff = followfilter(onlyfirst=opts.get('follow_first'))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1111 def want(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1112 if ff.match(rev) and rev in wanted:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1113 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1114 return False
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1115 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1116 def want(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1117 return rev in wanted
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1118
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1119 for i, window in increasing_windows(0, len(revs)):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1120 yield 'window', revs[0] < revs[-1], revs[-1]
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1121 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1122 srevs = list(nrevs)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1123 srevs.sort()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1124 for rev in srevs:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1125 fns = fncache.get(rev)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1126 if not fns:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1127 def fns_generator():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1128 for f in change(rev)[3]:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1129 if matchfn(f):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1130 yield f
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1131 fns = fns_generator()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1132 yield 'add', rev, fns
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1133 for rev in nrevs:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1134 yield 'iter', rev, None
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1135 return iterate(), matchfn
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1136
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1137 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	1138 '''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	1139 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	1140 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	1141 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	1142 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	1143
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1144 # 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	1145 # that doesn't support addremove
784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1146 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	1147 addremove(repo, pats, opts)
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1148
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1149 fns, match, anypats = matchpats(repo, pats, opts)
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1150 if pats:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1151 status = repo.status(files=fns, match=match)
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1152 modified, added, removed, deleted, unknown = status[:5]
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1153 files = modified + added + removed
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1154 slist = None
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1155 for f in fns:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1156 if f == '.':
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1157 continue
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1158 if f not in files:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1159 rf = repo.wjoin(f)
6112 5ffa962783c4 cmdutil.commit: use relative paths in the error messages Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5976 diff changeset	1160 rel = repo.pathto(f)
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1161 try:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1162 mode = os.lstat(rf)[stat.ST_MODE]
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1163 except OSError:
6112 5ffa962783c4 cmdutil.commit: use relative paths in the error messages Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5976 diff changeset	1164 raise util.Abort(_("file %s not found!") % rel)
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1165 if stat.S_ISDIR(mode):
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1166 name = f + '/'
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1167 if slist is None:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1168 slist = list(files)
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1169 slist.sort()
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1170 i = bisect.bisect(slist, name)
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1171 if i >= len(slist) or not slist[i].startswith(name):
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1172 raise util.Abort(_("no match under directory %s!")
6112 5ffa962783c4 cmdutil.commit: use relative paths in the error messages Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5976 diff changeset	1173 % rel)
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1174 elif not (stat.S_ISREG(mode) or stat.S_ISLNK(mode)):
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1175 raise util.Abort(_("can't commit %s: "
6112 5ffa962783c4 cmdutil.commit: use relative paths in the error messages Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5976 diff changeset	1176 "unsupported file type!") % rel)
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1177 elif f not in repo.dirstate:
6112 5ffa962783c4 cmdutil.commit: use relative paths in the error messages Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5976 diff changeset	1178 raise util.Abort(_("file %s not tracked!") % rel)
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1179 else:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1180 files = []
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1181 try:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1182 return commitfunc(ui, repo, files, message, match, opts)
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1183 except ValueError, inst:
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1184 raise util.Abort(str(inst))

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/cmdutil.py @ 6578:f242d3684f83