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

annotate mercurial/cmdutil.py @ 10111:27457d31ae3f

cmdutil: replace sys.maxint with None as default value in loglimit Semantically, it is better to use None over any other value when there is "no value". Using maxint in this context is quite hackish, and is not forward compatible.

author	Nicolas Dumazet <nicdumz.commits@gmail.com>
date	Mon, 14 Dec 2009 00:32:29 +0900
parents	9e2ab10728a2
children	56284451a22c

rev	line source
2957 6e062d9b188f fix comment. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2885 diff changeset	1 # cmdutil.py - help for command processing in mercurial
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	6 # GNU General Public License version 2, incorporated herein by reference.
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	7
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6190 diff changeset	8 from node import hex, nullid, nullrev, short
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
8731 f037187a6f68 cleanup: removed unused imports Henri Wiechers <hwiechers@gmail.com> parents: 8709 diff changeset	10 import os, sys, errno, re, glob
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	11 import mdiff, bdiff, util, templater, patch, error, encoding, templatekw
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	12 import match as _match
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	13
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	14 revrangesep = ':'
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	15
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	16 def findpossible(cmd, table, strict=False):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	17 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	18 Return cmd -> (aliases, command table entry)
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	19 for each matching command.
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	20 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	21 """
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	22 choice = {}
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	23 debugchoice = {}
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	24 for e in table.keys():
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	25 aliases = e.lstrip("^").split("\|")
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	26 found = None
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	27 if cmd in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	28 found = cmd
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	29 elif not strict:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	30 for a in aliases:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	31 if a.startswith(cmd):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	32 found = a
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	33 break
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	34 if found is not None:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	35 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	36 debugchoice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	37 else:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 5177 diff changeset	38 choice[found] = (aliases, table[e])
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	39
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	40 if not choice and debugchoice:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	41 choice = debugchoice
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	42
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	43 return choice
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	44
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	45 def findcmd(cmd, table, strict=True):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	46 """Return (aliases, command table entry) for command string."""
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7121 diff changeset	47 choice = findpossible(cmd, table, strict)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	48
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5843 diff changeset	49 if cmd in choice:
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	50 return choice[cmd]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	51
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	52 if len(choice) > 1:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	53 clist = choice.keys()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	54 clist.sort()
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7404 diff changeset	55 raise error.AmbiguousCommand(cmd, clist)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	56
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	57 if choice:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	58 return choice.values()[0]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	59
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7404 diff changeset	60 raise error.UnknownCommand(cmd)
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	61
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	62 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	63 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	64 raise util.Abort(_('outstanding uncommitted merge'))
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	65 modified, added, removed, deleted = repo.status()[:4]
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	66 if modified or added or removed or deleted:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	67 raise util.Abort(_("outstanding uncommitted changes"))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	68
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	69 def logmessage(opts):
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	70 """ get the log message according to -m and -l option """
7667 bd5c37d792e6 cmdutil.logmessage: options should be optional Alexander Solovyov <piranha@piranha.org.ua> parents: 7643 diff changeset	71 message = opts.get('message')
bd5c37d792e6 cmdutil.logmessage: options should be optional Alexander Solovyov <piranha@piranha.org.ua> parents: 7643 diff changeset	72 logfile = opts.get('logfile')
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	73
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	74 if message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	75 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	76 'exclusive'))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	77 if not message and logfile:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	78 try:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	79 if logfile == '-':
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	80 message = sys.stdin.read()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	81 else:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	82 message = open(logfile).read()
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	83 except IOError, inst:
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	84 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	85 (logfile, inst.strerror))
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	86 return message
0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	87
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	88 def loglimit(opts):
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	89 """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	90 limit = opts.get('limit')
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	91 if limit:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	92 try:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	93 limit = int(limit)
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	94 except ValueError:
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	95 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	96 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	97 else:
10111 27457d31ae3f cmdutil: replace sys.maxint with None as default value in loglimit Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10061 diff changeset	98 limit = None
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	99 return limit
a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6145 diff changeset	100
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	101 def remoteui(src, opts):
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	102 'build a remote ui from ui or repo and opts'
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	103 if hasattr(src, 'baseui'): # looks like a repository
8798 92fc57c9f9d1 remoteui: properly create dst with copy() Matt Mackall <mpm@selenic.com> parents: 8789 diff changeset	104 dst = src.baseui.copy() # drop repo-specific config
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	105 src = src.ui # copy target options from repo
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8188 diff changeset	106 else: # assume it's a global ui object
8798 92fc57c9f9d1 remoteui: properly create dst with copy() Matt Mackall <mpm@selenic.com> parents: 8789 diff changeset	107 dst = src.copy() # keep all global options
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	108
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	109 # copy ssh-specific options
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	110 for o in 'ssh', 'remotecmd':
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	111 v = opts.get(o) or src.config('ui', o)
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	112 if v:
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	113 dst.setconfig("ui", o, v)
10025 fb45c1e4396f cmdutil: copy auth section in remoteui Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9896 diff changeset	114
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	115 # copy bundle-specific options
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	116 r = src.config('bundle', 'mainreporoot')
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	117 if r:
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	118 dst.setconfig('bundle', 'mainreporoot', r)
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	119
10025 fb45c1e4396f cmdutil: copy auth section in remoteui Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9896 diff changeset	120 # copy auth section settings
fb45c1e4396f cmdutil: copy auth section in remoteui Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9896 diff changeset	121 for key, val in src.configitems('auth'):
fb45c1e4396f cmdutil: copy auth section in remoteui Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9896 diff changeset	122 dst.setconfig('auth', key, val)
fb45c1e4396f cmdutil: copy auth section in remoteui Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9896 diff changeset	123
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	124 return dst
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	125
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3673 diff changeset	126 def revpair(repo, revs):
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	127 '''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	128 be None, meaning use working dir.'''
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	129
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	130 def revfix(repo, val, defval):
3825 000d122071b5 fix hg diff -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3814 diff changeset	131 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	132 val = defval
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	133 return repo.lookup(val)
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	134
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	135 if not revs:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	136 return repo.dirstate.parents()[0], None
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	137 end = None
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	138 if len(revs) == 1:
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	139 if revrangesep in revs[0]:
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	140 start, end = revs[0].split(revrangesep, 1)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	141 start = revfix(repo, start, 0)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	142 end = revfix(repo, end, len(repo) - 1)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	143 else:
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	144 start = revfix(repo, revs[0], None)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	145 elif len(revs) == 2:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	146 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	147 raise util.Abort(_('too many revisions specified'))
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	148 start = revfix(repo, revs[0], None)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	149 end = revfix(repo, revs[1], None)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	150 else:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	151 raise util.Abort(_('too many revisions specified'))
3525 cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	152 return start, end
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	153
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3673 diff changeset	154 def revrange(repo, revs):
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	155 """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	156
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	157 def revfix(repo, val, defval):
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3707 diff changeset	158 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	159 return defval
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	160 return repo.changelog.rev(repo.lookup(val))
cf0f8d9256c7 simplify revrange and revpair Matt Mackall <mpm@selenic.com> parents: 3524 diff changeset	161
8368 52e6117a9940 cmdutil: replace pseudo-set by real set Martin Geisler <mg@lazybytes.net> parents: 8360 diff changeset	162 seen, l = set(), []
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	163 for spec in revs:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	164 if revrangesep in spec:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	165 start, end = spec.split(revrangesep, 1)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	166 start = revfix(repo, start, 0)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	167 end = revfix(repo, end, len(repo) - 1)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	168 step = start > end and -1 or 1
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	169 for rev in xrange(start, end+step, step):
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	170 if rev in seen:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	171 continue
8368 52e6117a9940 cmdutil: replace pseudo-set by real set Martin Geisler <mg@lazybytes.net> parents: 8360 diff changeset	172 seen.add(rev)
3526 68341c06bc61 Make revrange return a list of ints so that callers don't have to convert Matt Mackall <mpm@selenic.com> parents: 3525 diff changeset	173 l.append(rev)
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	174 else:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	175 rev = revfix(repo, spec, None)
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	176 if rev in seen:
eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	177 continue
8368 52e6117a9940 cmdutil: replace pseudo-set by real set Martin Geisler <mg@lazybytes.net> parents: 8360 diff changeset	178 seen.add(rev)
3526 68341c06bc61 Make revrange return a list of ints so that callers don't have to convert Matt Mackall <mpm@selenic.com> parents: 3525 diff changeset	179 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	180
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	181 return l
3090 eeaf9bcdfa25 Move revision parsing into cmdutil. Brendan Cully <brendan@kublai.com> parents: 3072 diff changeset	182
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	183 def make_filename(repo, pat, node,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	184 total=None, seqno=None, revwidth=None, pathname=None):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	185 node_expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	186 'H': lambda: hex(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	187 'R': lambda: str(repo.changelog.rev(node)),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	188 'h': lambda: short(node),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	189 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	190 expander = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	191 '%': lambda: '%',
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	192 'b': lambda: os.path.basename(repo.root),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	193 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	194
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	195 try:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	196 if node:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	197 expander.update(node_expander)
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	198 if node:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	199 expander['r'] = (lambda:
4836 0e2d0a78f81a archive: make the %r escape work. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4825 diff changeset	200 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	201 if total is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	202 expander['N'] = lambda: str(total)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	203 if seqno is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	204 expander['n'] = lambda: str(seqno)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	205 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	206 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	207 if pathname is not None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	208 expander['s'] = lambda: os.path.basename(pathname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	209 expander['d'] = lambda: os.path.dirname(pathname) or '.'
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	210 expander['p'] = lambda: pathname
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	211
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	212 newname = []
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	213 patlen = len(pat)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	214 i = 0
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	215 while i < patlen:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	216 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	217 if c == '%':
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	218 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	219 c = pat[i]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	220 c = expander[c]()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	221 newname.append(c)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	222 i += 1
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	223 return ''.join(newname)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	224 except KeyError, inst:
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8731 diff changeset	225 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 2958 diff changeset	226 inst.args[0])
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	227
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	228 def make_file(repo, pat, node=None,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	229 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	230
eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	231 writable = 'w' in mode or 'a' in mode
eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	232
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	233 if not pat or pat == '-':
7319 eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	234 return writable and sys.stdout or sys.stdin
eae1767cc6a8 export: fixed silent output file overwriting Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7308 diff changeset	235 if hasattr(pat, 'write') and writable:
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	236 return pat
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	237 if hasattr(pat, 'read') and 'r' in mode:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	238 return pat
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	239 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	240 pathname),
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	241 mode)
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	242
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	243 def expandpats(pats):
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	244 if not util.expandglobs:
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	245 return list(pats)
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	246 ret = []
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	247 for p in pats:
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	248 kind, name = _match._patsplit(p, None)
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	249 if kind is None:
9118 78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	250 try:
78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	251 globbed = glob.glob(name)
78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	252 except re.error:
78e54b9f3a62 cmdutil: fall back to filename if glob expand has errors Steve Borho <steve@borho.org> parents: 8994 diff changeset	253 globbed = [name]
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	254 if globbed:
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	255 ret.extend(globbed)
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	256 continue
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	257 ret.append(p)
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	258 return ret
573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	259
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	260 def match(repo, pats=[], opts={}, globbed=False, default='relpath'):
6575 e08e0367ba15 walk: kill util.cmdmatcher and _matcher Matt Mackall <mpm@selenic.com> parents: 6566 diff changeset	261 if not globbed and default == 'relpath':
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	262 pats = expandpats(pats or [])
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	263 m = _match.match(repo.root, repo.getcwd(), pats,
0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	264 opts.get('include'), opts.get('exclude'), default)
6578 f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	265 def badfn(f, msg):
f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	266 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	267 m.bad = badfn
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	268 return m
2882 cf98cd70d2c4 move walk and matchpats from commands to cmdutil. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2874 diff changeset	269
6597 371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	270 def matchall(repo):
371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	271 return _match.always(repo.root, repo.getcwd())
371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	272
371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	273 def matchfiles(repo, files):
371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	274 return _match.exact(repo.root, repo.getcwd(), files)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	275
8989 85b81cac9613 addremove: pass unknown and deleted to findrenames directly again Matt Mackall <mpm@selenic.com> parents: 8988 diff changeset	276 def findrenames(repo, added, removed, threshold):
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	277 '''find renamed files -- yields (before, after, score) tuples'''
9925 9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	278 copies = {}
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6739 diff changeset	279 ctx = repo['.']
9925 9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	280 for r in removed:
9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	281 if r not in ctx:
9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	282 continue
9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	283 fctx = ctx.filectx(r)
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	284
9926 4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	285 def score(text):
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	286 if not len(text):
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	287 return 0.0
9927 2ae4d0865629 findrenames: speedup exact match Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9926 diff changeset	288 if not fctx.cmp(text):
2ae4d0865629 findrenames: speedup exact match Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9926 diff changeset	289 return 1.0
2ae4d0865629 findrenames: speedup exact match Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9926 diff changeset	290 if threshold == 1.0:
2ae4d0865629 findrenames: speedup exact match Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9926 diff changeset	291 return 0.0
2ae4d0865629 findrenames: speedup exact match Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9926 diff changeset	292 orig = fctx.data()
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	293 # bdiff.blocks() returns blocks of matching lines
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	294 # count the number of bytes in each
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	295 equal = 0
9926 4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	296 alines = mdiff.splitnewlines(text)
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	297 matches = bdiff.blocks(text, orig)
9928 a92539567ef3 findrenames: improve coding-style Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9927 diff changeset	298 for x1, x2, y1, y2 in matches:
4135 6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	299 for line in alines[x1:x2]:
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	300 equal += len(line)
6cb6cfe43c5d Avoid some false positives for addremove -s Erling Ellingsen <erlingalf@gmail.com> parents: 4059 diff changeset	301
9926 4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	302 lengths = len(text) + len(orig)
9928 a92539567ef3 findrenames: improve coding-style Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9927 diff changeset	303 return equal * 2.0 / lengths
9926 4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	304
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	305 for a in added:
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	306 bestscore = copies.get(a, (None, threshold))[1]
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	307 myscore = score(repo.wread(a))
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	308 if myscore >= bestscore:
4b044b81cb54 findrenames: refactor the score computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9925 diff changeset	309 copies[a] = (r, myscore)
9928 a92539567ef3 findrenames: improve coding-style Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9927 diff changeset	310
9925 9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	311 for dest, v in copies.iteritems():
9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	312 source, score = v
9dfe34bf42c7 findrenames: first loop over the removed files, it's faster Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9896 diff changeset	313 yield source, dest, score
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	314
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	315 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	316 if dry_run is None:
c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	317 dry_run = opts.get('dry_run')
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	318 if similarity is None:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	319 similarity = float(opts.get('similarity') or 0)
8990 627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	320 # we'd use status here, except handling of symlinks and ignore is tricky
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	321 added, unknown, deleted, removed = [], [], [], []
6651 7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	322 audit_path = util.path_auditor(repo.root)
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	323 m = match(repo, pats, opts)
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	324 for abs in repo.walk(m):
4522 591322269fed Use absolute paths in addremove. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4478 diff changeset	325 target = repo.wjoin(abs)
6651 7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	326 good = True
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	327 try:
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	328 audit_path(abs)
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	329 except:
7f0dd352fb4d addremove: correctly handle intermediate symlinks Maxim Dounin <mdounin@mdounin.ru> parents: 6566 diff changeset	330 good = False
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	331 rel = m.rel(abs)
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	332 exact = m.exact(abs)
6656 2cbe0f72c379 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 6603 6651 diff changeset	333 if good and abs not in repo.dirstate:
8988 1247751d9bf8 addremove: normalize some variable names Matt Mackall <mpm@selenic.com> parents: 8987 diff changeset	334 unknown.append(abs)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	335 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	336 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
8990 627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	337 elif repo.dirstate[abs] != 'r' and (not good or not util.lexists(target)
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5248 diff changeset	338 or (os.path.isdir(target) and not os.path.islink(target))):
8988 1247751d9bf8 addremove: normalize some variable names Matt Mackall <mpm@selenic.com> parents: 8987 diff changeset	339 deleted.append(abs)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	340 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	341 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
8990 627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	342 # for finding renames
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	343 elif repo.dirstate[abs] == 'r':
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	344 removed.append(abs)
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	345 elif repo.dirstate[abs] == 'a':
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	346 added.append(abs)
2883 c2932ad5476a move commands.addremove_lock to cmdutil.addremove Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2882 diff changeset	347 if not dry_run:
8988 1247751d9bf8 addremove: normalize some variable names Matt Mackall <mpm@selenic.com> parents: 8987 diff changeset	348 repo.remove(deleted)
1247751d9bf8 addremove: normalize some variable names Matt Mackall <mpm@selenic.com> parents: 8987 diff changeset	349 repo.add(unknown)
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	350 if similarity > 0:
8990 627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	351 for old, new, score in findrenames(repo, added + unknown,
627399330c7d addremove: build lists of already added and removed files too (issue1696) Matt Mackall <mpm@selenic.com> parents: 8989 diff changeset	352 removed + deleted, similarity):
8941 37a9d551346c addremove: drop some silly variable assignments Matt Mackall <mpm@selenic.com> parents: 8798 diff changeset	353 if repo.ui.verbose or not m.exact(old) or not m.exact(new):
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	354 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	355 '(%d%% similar)\n') %
8941 37a9d551346c addremove: drop some silly variable assignments Matt Mackall <mpm@selenic.com> parents: 8798 diff changeset	356 (m.rel(old), m.rel(new), score * 100))
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2957 diff changeset	357 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	358 repo.copy(old, new)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	359
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	360 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	361 # called with the repo lock held
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	362 #
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	363 # hgsep => pathname that uses "/" to separate directories
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	364 # 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	365 cwd = repo.getcwd()
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	366 targets = {}
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	367 after = opts.get("after")
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	368 dryrun = opts.get("dry_run")
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	369
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	370 def walkpat(pat):
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	371 srcs = []
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	372 m = match(repo, [pat], opts, globbed=True)
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	373 for abs in repo.walk(m):
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	374 state = repo.dirstate[abs]
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	375 rel = m.rel(abs)
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6582 diff changeset	376 exact = m.exact(abs)
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	377 if state in '?r':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	378 if exact and state == '?':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	379 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	380 if exact and state == 'r':
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	381 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	382 ' remove\n') % rel)
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	383 continue
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	384 # abs: hgsep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	385 # rel: ossep
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	386 srcs.append((abs, rel, exact))
e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	387 return srcs
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	388
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	389 # abssrc: hgsep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	390 # relsrc: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	391 # otarget: ossep
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	392 def copyfile(abssrc, relsrc, otarget, exact):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	393 abstarget = util.canonpath(repo.root, cwd, otarget)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	394 reltarget = repo.pathto(abstarget, cwd)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	395 target = repo.wjoin(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	396 src = repo.wjoin(abssrc)
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	397 state = repo.dirstate[abstarget]
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	398
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	399 # check for collisions
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	400 prevsrc = targets.get(abstarget)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	401 if prevsrc is not None:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	402 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	403 (reltarget, repo.pathto(abssrc, cwd),
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	404 repo.pathto(prevsrc, cwd)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	405 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	406
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	407 # check for overwrites
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	408 exists = os.path.exists(target)
8117 2b30d8488819 remove unnecessary outer parenthesis in if-statements Martin Geisler <mg@lazybytes.net> parents: 8013 diff changeset	409 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	410 if not opts['force']:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	411 ui.warn(_('%s: not overwriting - file exists\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	412 reltarget)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	413 return
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	414
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	415 if after:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	416 if not exists:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	417 return
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	418 elif not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	419 try:
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	420 if exists:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	421 os.unlink(target)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	422 targetdir = os.path.dirname(target) or '.'
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	423 if not os.path.isdir(targetdir):
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	424 os.makedirs(targetdir)
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	425 util.copyfile(src, target)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	426 except IOError, inst:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	427 if inst.errno == errno.ENOENT:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	428 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	429 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	430 ui.warn(_('%s: cannot copy - %s\n') %
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	431 (relsrc, inst.strerror))
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	432 return True # report a failure
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	433
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	434 if ui.verbose or not exact:
7894 caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	435 if rename:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	436 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	437 else:
caef5fdf1375 cmdutil: fix untranslatable string in copy Martin Geisler <mg@daimi.au.dk> parents: 7879 diff changeset	438 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	439
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	440 targets[abstarget] = abssrc
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	441
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	442 # fix up dirstate
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	443 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	444 if abstarget == origsrc: # copying back a copy?
5608 784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	445 if state not in 'mn' and not dryrun:
784eadabd985 copy: simplify inner copy Matt Mackall <mpm@selenic.com> parents: 5607 diff changeset	446 repo.dirstate.normallookup(abstarget)
5604 4b7b21acede0 copy: fix copying back with -A (issue836) Matt Mackall <mpm@selenic.com> parents: 5589 diff changeset	447 else:
7121 b801d6e5dc83 rename: handle renaming to a target marked removed Matt Mackall <mpm@selenic.com> parents: 6980 diff changeset	448 if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	449 if not ui.quiet:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	450 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	451 "data will be stored for %s.\n")
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	452 % (repo.pathto(origsrc, cwd), reltarget))
7121 b801d6e5dc83 rename: handle renaming to a target marked removed Matt Mackall <mpm@selenic.com> parents: 6980 diff changeset	453 if repo.dirstate[abstarget] in '?r' and not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	454 repo.add([abstarget])
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	455 elif not dryrun:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	456 repo.copy(origsrc, abstarget)
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	457
2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	458 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	459 repo.remove([abssrc], not after)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	460
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	461 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	462 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	463 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	464 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	465 def targetpathfn(pat, dest, srcs):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	466 if os.path.isdir(pat):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	467 abspfx = util.canonpath(repo.root, cwd, pat)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	468 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	469 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	470 striplen = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	471 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	472 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	473 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	474 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	475 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	476 elif destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	477 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	478 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	479 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	480 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	481 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	482
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	483 # pat: ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	484 # dest ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	485 # srcs: list of (hgsep, hgsep, ossep, bool)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	486 # return: function that takes hgsep and returns ossep
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	487 def targetpathafterfn(pat, dest, srcs):
8568 4fa1618bf495 match: refactor patkind Matt Mackall <mpm@selenic.com> parents: 8535 diff changeset	488 if _match.patkind(pat):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	489 # a mercurial pattern
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	490 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	491 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	492 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	493 abspfx = util.canonpath(repo.root, cwd, pat)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	494 if len(abspfx) < len(srcs[0][0]):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	495 # 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	496 # 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	497 def evalpath(striplen):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	498 score = 0
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	499 for s in srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	500 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	501 if os.path.exists(t):
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	502 score += 1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	503 return score
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	504
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	505 abspfx = util.localpath(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	506 striplen = len(abspfx)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	507 if striplen:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	508 striplen += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	509 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	510 score = evalpath(striplen)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	511 striplen1 = len(os.path.split(abspfx)[0])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	512 if striplen1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	513 striplen1 += len(os.sep)
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	514 if evalpath(striplen1) > score:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	515 striplen = striplen1
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	516 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	517 util.localpath(p)[striplen:])
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	518 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	519 # a file
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	520 if destdirexists:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	521 res = lambda p: os.path.join(dest,
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	522 os.path.basename(util.localpath(p)))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	523 else:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	524 res = lambda p: dest
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	525 return res
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	526
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	527
8614 573734e7e6d0 cmdutils: Take over glob expansion duties from util Matt Mackall <mpm@selenic.com> parents: 8568 diff changeset	528 pats = expandpats(pats)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	529 if not pats:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	530 raise util.Abort(_('no source or destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	531 if len(pats) == 1:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	532 raise util.Abort(_('no destination specified'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	533 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	534 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	535 if not destdirexists:
8568 4fa1618bf495 match: refactor patkind Matt Mackall <mpm@selenic.com> parents: 8535 diff changeset	536 if len(pats) > 1 or _match.patkind(pats[0]):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	537 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	538 '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	539 if util.endswithsep(dest):
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	540 raise util.Abort(_('destination %s is not a directory') % dest)
5607 e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	541
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	542 tfn = targetpathfn
e9bae5c80ab4 copy: minor cleanups Matt Mackall <mpm@selenic.com> parents: 5606 diff changeset	543 if after:
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	544 tfn = targetpathafterfn
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	545 copylist = []
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	546 for pat in pats:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	547 srcs = walkpat(pat)
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	548 if not srcs:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	549 continue
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	550 copylist.append((tfn(pat, dest, srcs), srcs))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	551 if not copylist:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	552 raise util.Abort(_('no files to copy'))
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	553
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	554 errors = 0
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	555 for targetpath, srcs in copylist:
5605 e7a9ad999308 copy: refactor okaytocopy into walkpat Matt Mackall <mpm@selenic.com> parents: 5604 diff changeset	556 for abssrc, relsrc, exact in srcs:
5606 447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	557 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
447ea621e50e copy: propagate errors properly Matt Mackall <mpm@selenic.com> parents: 5605 diff changeset	558 errors += 1
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	559
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	560 if errors:
9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	561 ui.warn(_('(consider using --after)\n'))
5609 a783d3627144 copy: move rename logic Matt Mackall <mpm@selenic.com> parents: 5608 diff changeset	562
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5609 diff changeset	563 return errors
5589 9981b6b19ecf move commands.docopy to cmdutil.copy Matt Mackall <mpm@selenic.com> parents: 5550 diff changeset	564
9513 ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	565 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
10012 2bfe1a23dafa cmdutil: service: add appendpid parameter to append pids to pid file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9975 diff changeset	566 runargs=None, appendpid=False):
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	567 '''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	568
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	569 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	570 rfd, wfd = os.pipe()
9513 ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	571 if not runargs:
ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	572 runargs = sys.argv[:]
ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	573 runargs.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	574 # 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	575 # changed directory.
9513 ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	576 for i in xrange(1,len(runargs)):
ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	577 if runargs[i].startswith('--cwd='):
ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	578 del runargs[i]
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	579 break
9513 ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	580 elif runargs[i].startswith('--cwd'):
ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	581 del runargs[i:i+2]
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	582 break
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	583 pid = os.spawnvp(os.P_NOWAIT \| getattr(os, 'P_DETACH', 0),
9513 ae88c721f916 cmdutil: service: add an optional runargs argument to pass the command to run Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9367 diff changeset	584 runargs[0], runargs)
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	585 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	586 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	587 if parentfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	588 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	589 else:
9896 2c2f7593ffc4 cmdutil.service: do not _exit(0) in the parent process Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9668 diff changeset	590 return
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	591
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	592 if initfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	593 initfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	594
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	595 if opts['pid_file']:
10012 2bfe1a23dafa cmdutil: service: add appendpid parameter to append pids to pid file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9975 diff changeset	596 mode = appendpid and 'a' or 'w'
2bfe1a23dafa cmdutil: service: add appendpid parameter to append pids to pid file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9975 diff changeset	597 fp = open(opts['pid_file'], mode)
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	598 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	599 fp.close()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	600
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	601 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	602 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	603 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	604 try:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	605 os.setsid()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	606 except AttributeError:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	607 pass
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	608 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	609 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	610 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	611 sys.stderr.flush()
8789 e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	612
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	613 nullfd = os.open(util.nulldev, os.O_RDWR)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	614 logfilefd = nullfd
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	615 if logfile:
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	616 logfilefd = os.open(logfile, os.O_RDWR \| os.O_CREAT \| os.O_APPEND)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	617 os.dup2(nullfd, 0)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	618 os.dup2(logfilefd, 1)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	619 os.dup2(logfilefd, 2)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	620 if nullfd not in (0, 1, 2):
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	621 os.close(nullfd)
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	622 if logfile and logfilefd not in (0, 1, 2):
e0ed17984a48 cmdutil: service: logfile option to redirect stdout & stderr in a file Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8778 diff changeset	623 os.close(logfilefd)
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	624
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	625 if runfn:
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	626 return runfn()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4355 diff changeset	627
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	628 class changeset_printer(object):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	629 '''show changeset information when templating not requested.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	630
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	631 def __init__(self, ui, repo, patch, diffopts, buffered):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	632 self.ui = ui
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	633 self.repo = repo
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	634 self.buffered = buffered
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	635 self.patch = patch
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	636 self.diffopts = diffopts
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	637 self.header = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	638 self.hunk = {}
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	639 self.lastheader = None
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	640
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	641 def flush(self, rev):
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	642 if rev in self.header:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	643 h = self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	644 if h != self.lastheader:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	645 self.lastheader = h
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	646 self.ui.write(h)
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	647 del self.header[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	648 if rev in self.hunk:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	649 self.ui.write(self.hunk[rev])
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	650 del self.hunk[rev]
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	651 return 1
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	652 return 0
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	653
10060 f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10058 diff changeset	654 def show(self, ctx, copies=None, **props):
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	655 if self.buffered:
cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	656 self.ui.pushbuffer()
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	657 self._show(ctx, copies, props)
87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	658 self.hunk[ctx.rev()] = self.ui.popbuffer()
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	659 else:
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	660 self._show(ctx, copies, props)
3738 cb48cd27d3f4 use ui buffering in changeset printer Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	661
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	662 def _show(self, ctx, copies, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	663 '''show a single changeset or file revision'''
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	664 changenode = ctx.node()
87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	665 rev = ctx.rev()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	666
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	667 if self.ui.quiet:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	668 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	669 return
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	670
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	671 log = self.repo.changelog
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	672 date = util.datestr(ctx.date())
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	673
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	674 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	675
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	676 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	677 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	678
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	679 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	680
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	681 branch = ctx.branch()
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4055 diff changeset	682 # 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	683 if branch != 'default':
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7894 diff changeset	684 branch = encoding.tolocal(branch)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	685 self.ui.write(_("branch: %s\n") % branch)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	686 for tag in self.repo.nodetags(changenode):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	687 self.ui.write(_("tag: %s\n") % tag)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	688 for parent in parents:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	689 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	690
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	691 if self.ui.debugflag:
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	692 mnode = ctx.manifestnode()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	693 self.ui.write(_("manifest: %d:%s\n") %
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	694 (self.repo.manifest.rev(mnode), hex(mnode)))
f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	695 self.ui.write(_("user: %s\n") % ctx.user())
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	696 self.ui.write(_("date: %s\n") % date)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	697
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	698 if self.ui.debugflag:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	699 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	700 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	701 files):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	702 if value:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	703 self.ui.write("%-12s %s\n" % (key, " ".join(value)))
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	704 elif ctx.files() and self.ui.verbose:
f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	705 self.ui.write(_("files: %s\n") % " ".join(ctx.files()))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	706 if copies and self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	707 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	708 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	709
9637 64425c5a9257 cmdutil: minor refactoring of changeset_printer._show Adrian Buehlmann <adrian@cadifra.com> parents: 9547 diff changeset	710 extra = ctx.extra()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	711 if extra and self.ui.debugflag:
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	712 for key, value in sorted(extra.items()):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	713 self.ui.write(_("extra: %s=%s\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	714 % (key, value.encode('string_escape')))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	715
9547 f57640bf10d4 cmdutil: changeset_printer: use methods of filectx/changectx. Greg Ward <greg-hg@gerg.ca> parents: 9536 diff changeset	716 description = ctx.description().strip()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	717 if description:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	718 if self.ui.verbose:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	719 self.ui.write(_("description:\n"))
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	720 self.ui.write(description)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	721 self.ui.write("\n\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	722 else:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	723 self.ui.write(_("summary: %s\n") %
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	724 description.splitlines()[0])
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	725 self.ui.write("\n")
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	726
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	727 self.showpatch(changenode)
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	728
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	729 def showpatch(self, node):
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	730 if self.patch:
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	731 prev = self.repo.changelog.parents(node)[0]
7308 b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7280 diff changeset	732 chunks = patch.diff(self.repo, prev, node, match=self.patch,
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	733 opts=patch.diffopts(self.ui, self.diffopts))
7308 b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7280 diff changeset	734 for chunk in chunks:
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7280 diff changeset	735 self.ui.write(chunk)
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	736 self.ui.write("\n")
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	737
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	738 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	739 """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	740
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	741 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	742 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	743 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	744 """
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	745 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	746 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	747 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	748 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	749 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	750 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	751 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	752
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	753
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	754 class changeset_templater(changeset_printer):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	755 '''format changeset information.'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	756
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	757 def __init__(self, ui, repo, patch, diffopts, mapfile, buffered):
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7667 diff changeset	758 changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	759 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
10061 9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	760 defaulttempl = {
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	761 'parent': '{rev}:{node\|formatnode} ',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	762 'manifest': '{rev}:{node\|formatnode}',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	763 'file_copy': '{name} ({source})',
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	764 'extra': '{key}={value\|stringescape}'
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	765 }
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	766 # filecopy is preserved for compatibility reasons
9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	767 defaulttempl['filecopy'] = defaulttempl['file_copy']
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	768 self.t = templater.templater(mapfile, {'formatnode': formatnode},
10061 9e2ab10728a2 Make {file_copies} usable as a --template key Patrick Mezard <pmezard@gmail.com> parents: 10060 diff changeset	769 cache=defaulttempl)
10057 babc00a82c5e cmdutil: extract latest tags closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10056 diff changeset	770 self.cache = {}
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	771
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	772 def use_template(self, t):
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	773 '''set template string to use'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	774 self.t.cache['changeset'] = t
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	775
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	776 def _meaningful_parentrevs(self, ctx):
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	777 """Return list of meaningful (or all if debug) parentrevs for rev.
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	778 """
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	779 parents = ctx.parents()
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	780 if len(parents) > 1:
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	781 return parents
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	782 if self.ui.debugflag:
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	783 return [parents[0], self.repo['null']]
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	784 if parents[0].rev() >= ctx.rev() - 1:
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	785 return []
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	786 return parents
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	787
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	788 def _show(self, ctx, copies, props):
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	789 '''show a single changeset or file revision'''
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	790
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	791 showlist = templatekw.showlist
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	792
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	793 # showparents() behaviour depends on ui trace level which
c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	794 # causes unexpected behaviours at templating level and makes
c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	795 # it harder to extract it in a standalone function. Its
c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	796 # behaviour cannot be changed so leave it here for now.
10055 e400a511e63a cmdutil: extract repo dependent closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10054 diff changeset	797 def showparents(repo, ctx, templ, **args):
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	798 parents = [[('rev', p.rev()), ('node', p.hex())]
8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	799 for p in self._meaningful_parentrevs(ctx)]
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	800 return showlist(templ, 'parent', parents, **args)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	801
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	802 props = props.copy()
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	803 props.update(templatekw.keywords)
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	804 props['parents'] = showparents
10053 5c5c6295533d cmdutil: replace showlist() closure with a function Patrick Mezard <pmezard@gmail.com> parents: 10026 diff changeset	805 props['templ'] = self.t
10054 1a85861f59af cmdutil: extract ctx dependent closures into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10053 diff changeset	806 props['ctx'] = ctx
10055 e400a511e63a cmdutil: extract repo dependent closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10054 diff changeset	807 props['repo'] = self.repo
10058 c829563b3118 cmdutil: extract file copies closure into templatekw Patrick Mezard <pmezard@gmail.com> parents: 10057 diff changeset	808 props['revcache'] = {'copies': copies}
10057 babc00a82c5e cmdutil: extract latest tags closures in templatekw Patrick Mezard <pmezard@gmail.com> parents: 10056 diff changeset	809 props['cache'] = self.cache
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	810
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	811 # find correct templates for current mode
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	812
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	813 tmplmodes = [
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	814 (True, None),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	815 (self.ui.verbose, 'verbose'),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	816 (self.ui.quiet, 'quiet'),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	817 (self.ui.debugflag, 'debug'),
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	818 ]
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	819
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	820 types = {'header': '', 'changeset': 'changeset'}
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	821 for mode, postfix in tmplmodes:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	822 for type in types:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	823 cur = postfix and ('%s_%s' % (type, postfix)) or type
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	824 if mode and cur in self.t:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	825 types[type] = cur
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	826
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	827 try:
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	828
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	829 # write header
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	830 if types['header']:
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	831 h = templater.stringify(self.t(types['header'], **props))
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	832 if self.buffered:
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	833 self.header[ctx.rev()] = h
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	834 else:
b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	835 self.ui.write(h)
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	836
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	837 # write changeset metadata, then patch if requested
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	838 key = types['changeset']
3645 b984dcb1df71 Refactor log ui buffering and patch display Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	839 self.ui.write(templater.stringify(self.t(key, **props)))
7878 8c09952cd39a templater: use contexts consistently throughout changeset_templater Alexander Solovyov <piranha@piranha.org.ua> parents: 7807 diff changeset	840 self.showpatch(ctx.node())
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	841
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	842 except KeyError, inst:
8013 9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	843 msg = _("%s: no key named '%s'")
9ec25db32b4e cmdutil: prevent code repetition by abstraction in changeset_templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7967 diff changeset	844 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	845 except SyntaxError, inst:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	846 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	847
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	848 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	849 """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	850
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	851 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	852 1. option 'template'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	853 2. option 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	854 3. [ui] setting 'logtemplate'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	855 4. [ui] setting 'style'
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	856 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	857 regular display via changeset_printer() is done.
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	858 """
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	859 # options
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	860 patch = False
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	861 if opts.get('patch'):
6597 371415a2b959 match: use helpers for cmdutil Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	862 patch = matchfn or matchall(repo)
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3827 diff changeset	863
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	864 tmpl = opts.get('template')
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	865 style = None
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	866 if tmpl:
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	867 tmpl = templater.parsestring(tmpl, quoted=False)
b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	868 else:
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	869 style = opts.get('style')
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	870
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	871 # ui settings
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	872 if not (tmpl or style):
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	873 tmpl = ui.config('ui', 'logtemplate')
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	874 if tmpl:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	875 tmpl = templater.parsestring(tmpl)
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	876 else:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	877 style = ui.config('ui', 'style')
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	878
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	879 if not (tmpl or style):
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	880 return changeset_printer(ui, repo, patch, opts, buffered)
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	881
7967 c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	882 mapfile = None
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	883 if style and not tmpl:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	884 mapfile = style
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	885 if not os.path.split(mapfile)[0]:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	886 mapname = (templater.templatepath('map-cmdline.' + mapfile)
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	887 or templater.templatepath(mapfile))
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	888 if mapname: mapfile = mapname
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	889
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	890 try:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	891 t = changeset_templater(ui, repo, patch, opts, mapfile, buffered)
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	892 except SyntaxError, inst:
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	893 raise util.Abort(inst.args[0])
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	894 if tmpl: t.use_template(tmpl)
c03f42159afa cmdutil: refactor handling of templating in show_changeset() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	895 return t
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3531 diff changeset	896
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	897 def finddate(ui, repo, date):
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	898 """Find the tipmost changeset that matches the given date spec"""
9667 8743f2e1bc54 merge changes from mpm Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9666 9665 diff changeset	899
5836 c5c9a022bd9a Tweak finddate to pass date directly. mark.williamson@cl.cam.ac.uk parents: 5829 diff changeset	900 df = util.matchdate(date)
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	901 m = matchall(repo)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	902 results = {}
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	903
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	904 def prep(ctx, fns):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	905 d = ctx.date()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	906 if df(d[0]):
9668 2c24471d478c cmdutil: fix bug in finddate() implementation Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9667 diff changeset	907 results[ctx.rev()] = d
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	908
9667 8743f2e1bc54 merge changes from mpm Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9666 9665 diff changeset	909 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	910 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	911 if rev in results:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	912 ui.status(_("Found revision %s from %s\n") %
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	913 (rev, util.datestr(results[rev])))
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	914 return str(rev)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	915
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3738 diff changeset	916 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	917
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	918 def walkchangerevs(repo, match, opts, prepare):
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	919 '''Iterate over files and the revs in which they changed.
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	920
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	921 Callers most commonly need to iterate backwards over the history
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7779 diff changeset	922 in which they are interested. Doing so has awful (quadratic-looking)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	923 performance, so we use iterators in a "windowed" way.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	924
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	925 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	926 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	927 order (usually backwards) to display it.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	928
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	929 This function returns an iterator yielding contexts. Before
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	930 yielding each context, the iterator will first call the prepare
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	931 function on each context in the window in forward order.'''
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	932
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	933 def increasing_windows(start, end, windowsize=8, sizelimit=512):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	934 if start < end:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	935 while start < end:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	936 yield start, min(windowsize, end-start)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	937 start += windowsize
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	938 if windowsize < sizelimit:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	939 windowsize *= 2
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	940 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	941 while start > end:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	942 yield start, min(windowsize, start-end-1)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	943 start -= windowsize
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	944 if windowsize < sizelimit:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	945 windowsize *= 2
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	946
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	947 follow = opts.get('follow') or opts.get('follow_first')
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	948
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	949 if not len(repo):
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	950 return []
3650 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 if follow:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6739 diff changeset	953 defrange = '%s:0' % repo['.'].rev()
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	954 else:
6145 154f8be6272b cmdutil.walkchangerevs: use '-1:0' instead ot 'tip:0' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6139 diff changeset	955 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	956 revs = revrange(repo, opts['rev'] or [defrange])
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	957 wanted = set()
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	958 slowpath = match.anypats() or (match.files() and opts.get('removed'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	959 fncache = {}
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	960 change = util.cachefunc(repo.changectx)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	961
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	962 if not slowpath and not match.files():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	963 # No files, no patterns. Display all revs.
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	964 wanted = set(revs)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	965 copies = []
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	966
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	967 if not slowpath:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	968 # Only files, no patterns. Check the history of each file.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	969 def filerevgen(filelog, node):
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	970 cl_count = len(repo)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	971 if node is None:
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	972 last = len(filelog) - 1
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	973 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	974 last = filelog.rev(node)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	975 for i, window in increasing_windows(last, nullrev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	976 revs = []
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	977 for j in xrange(i - window, i + 1):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	978 n = filelog.node(j)
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7319 diff changeset	979 revs.append((filelog.linkrev(j),
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	980 follow and filelog.renamed(n)))
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8209 diff changeset	981 for rev in reversed(revs):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	982 # 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	983 # happen while doing "hg log" during a pull or commit
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	984 if rev[0] < cl_count:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	985 yield rev
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	986 def iterfiles():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	987 for filename in match.files():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	988 yield filename, None
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	989 for filename_node in copies:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	990 yield filename_node
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	991 minrev, maxrev = min(revs), max(revs)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	992 for file_, node in iterfiles():
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	993 filelog = repo.file(file_)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	994 if not len(filelog):
6536 dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	995 if node is None:
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	996 # 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	997 # try to find matching entries on the slow path.
7404 07cb58b8c843 Improved error message for log --follow Brendan Cully <brendan@kublai.com> parents: 7369 diff changeset	998 if follow:
07cb58b8c843 Improved error message for log --follow Brendan Cully <brendan@kublai.com> parents: 7369 diff changeset	999 raise util.Abort(_('cannot follow nonexistent file: "%s"') % file_)
6536 dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1000 slowpath = True
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1001 break
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1002 else:
dfdef3d560a8 cmdutil: handle and warn about missing copy revisions Patrick Mezard <pmezard@gmail.com> parents: 6258 diff changeset	1003 continue
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1004 for rev, copied in filerevgen(filelog, node):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1005 if rev <= maxrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1006 if rev < minrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1007 break
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1008 fncache.setdefault(rev, [])
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1009 fncache[rev].append(file_)
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1010 wanted.add(rev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1011 if follow and copied:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1012 copies.append(copied)
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1013 if slowpath:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1014 if follow:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1015 raise util.Abort(_('can only follow copies/renames for explicit '
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8731 diff changeset	1016 'filenames'))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1017
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1018 # The slow path checks files modified in every changeset.
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1019 def changerevgen():
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1020 for i, window in increasing_windows(len(repo) - 1, nullrev):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1021 for j in xrange(i - window, i + 1):
9367 1ef630452e0b cmdutil: use context objects for walkchangerevs() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9118 diff changeset	1022 yield change(j)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1023
9367 1ef630452e0b cmdutil: use context objects for walkchangerevs() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9118 diff changeset	1024 for ctx in changerevgen():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1025 matches = filter(match, ctx.files())
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1026 if matches:
9367 1ef630452e0b cmdutil: use context objects for walkchangerevs() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9118 diff changeset	1027 fncache[ctx.rev()] = matches
1ef630452e0b cmdutil: use context objects for walkchangerevs() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9118 diff changeset	1028 wanted.add(ctx.rev())
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1029
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	1030 class followfilter(object):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1031 def __init__(self, onlyfirst=False):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1032 self.startrev = nullrev
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1033 self.roots = set()
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1034 self.onlyfirst = onlyfirst
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1035
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1036 def match(self, rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1037 def realparents(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1038 if self.onlyfirst:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1039 return repo.changelog.parentrevs(rev)[0:1]
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1040 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1041 return filter(lambda x: x != nullrev,
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1042 repo.changelog.parentrevs(rev))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1043
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1044 if self.startrev == nullrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1045 self.startrev = rev
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1046 return True
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 if rev > self.startrev:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1049 # forward: all descendants
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1050 if not self.roots:
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1051 self.roots.add(self.startrev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1052 for parent in realparents(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1053 if parent in self.roots:
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1054 self.roots.add(rev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1055 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1056 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1057 # backwards: all parents
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1058 if not self.roots:
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1059 self.roots.update(realparents(self.startrev))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1060 if rev in self.roots:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1061 self.roots.remove(rev)
10024 2b630e4c8f2f log --follow: use a set instead of a list Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10012 diff changeset	1062 self.roots.update(realparents(rev))
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1063 return True
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1064
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1065 return False
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 # 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	1068 # 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	1069 for rev in opts.get('prune', ()):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1070 rev = repo.changelog.rev(repo.lookup(rev))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1071 ff = followfilter()
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1072 stop = min(revs[0], revs[-1])
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1073 for x in xrange(rev, stop-1, -1):
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1074 if ff.match(x):
08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8119 diff changeset	1075 wanted.discard(x)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1076
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1077 def iterate():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1078 if follow and not match.files():
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1079 ff = followfilter(onlyfirst=opts.get('follow_first'))
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1080 def want(rev):
8119 af44d0b953c6 cmdutil: return boolean result directly in want function Martin Geisler <mg@lazybytes.net> parents: 8117 diff changeset	1081 return ff.match(rev) and rev in wanted
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1082 else:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1083 def want(rev):
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1084 return rev in wanted
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1085
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1086 for i, window in increasing_windows(0, len(revs)):
9664 2a4a0dc4fb85 walkchangerevs: reset cache between windows Matt Mackall <mpm@selenic.com> parents: 9662 diff changeset	1087 change = util.cachefunc(repo.changectx)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1088 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1089 for rev in sorted(nrevs):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1090 fns = fncache.get(rev)
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	1091 ctx = change(rev)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1092 if not fns:
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1093 def fns_generator():
9654 96fe91be9c1e walkchangerevs: yield contexts Matt Mackall <mpm@selenic.com> parents: 9653 diff changeset	1094 for f in ctx.files():
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1095 if match(f):
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1096 yield f
731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1097 fns = fns_generator()
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1098 prepare(ctx, fns)
3650 731e739b8659 move walkchangerevs to cmdutils Matt Mackall <mpm@selenic.com> parents: 3649 diff changeset	1099 for rev in nrevs:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1100 yield change(rev)
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	1101 return iterate()
5034 c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1102
c0417a319e39 commands: move commit to cmdutil as wrapper for commit-like functions Bryan O'Sullivan <bos@serpentine.com> parents: 4965 diff changeset	1103 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	1104 '''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	1105 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	1106 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6112 diff changeset	1107 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	1108 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	1109
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1110 # 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	1111 # that doesn't support addremove
784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1112 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	1113 addremove(repo, pats, opts)
5829 784073457a0f cmdutil.commit: extract 'addremove' from opts carefully Kirill Smelkov <kirr@mns.spb.ru> parents: 5797 diff changeset	1114
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	1115 return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1116
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1117 def commiteditor(repo, ctx, subs):
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1118 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1119 return ctx.description()
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1120 return commitforceeditor(repo, ctx, subs)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1121
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1122 def commitforceeditor(repo, ctx, subs):
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1123 edittext = []
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	1124 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1125 if ctx.description():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1126 edittext.append(ctx.description())
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1127 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1128 edittext.append("") # Empty line between message and comments.
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1129 edittext.append(_("HG: Enter commit message."
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1130 " Lines beginning with 'HG:' are removed."))
8535 5b6a6ed4f185 cmdutil: mark string for translation Martin Geisler <mg@lazybytes.net> parents: 8497 diff changeset	1131 edittext.append(_("HG: Leave message empty to abort commit."))
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1132 edittext.append("HG: --")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1133 edittext.append(_("HG: user: %s") % ctx.user())
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1134 if ctx.p2():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1135 edittext.append(_("HG: branch merge"))
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1136 if ctx.branch():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1137 edittext.append(_("HG: branch '%s'")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1138 % encoding.tolocal(ctx.branch()))
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8990 diff changeset	1139 edittext.extend([_("HG: subrepo %s") % s for s in subs])
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1140 edittext.extend([_("HG: added %s") % f for f in added])
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	1141 edittext.extend([_("HG: changed %s") % f for f in modified])
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1142 edittext.extend([_("HG: removed %s") % f for f in removed])
8707 0550dfe4fca1 commit: editor reads file lists from provided context Matt Mackall <mpm@selenic.com> parents: 8680 diff changeset	1143 if not added and not modified and not removed:
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1144 edittext.append(_("HG: no files changed"))
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1145 edittext.append("")
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1146 # run editor in the repository root
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1147 olddir = os.getcwd()
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1148 os.chdir(repo.root)
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1149 text = repo.ui.edit("\n".join(edittext), ctx.user())
8409 e84a8482c6f2 editor: move HG: filtering from ui to commiteditor Matt Mackall <mpm@selenic.com> parents: 8407 diff changeset	1150 text = re.sub("(?m)^HG:.*\n", "", text)
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1151 os.chdir(olddir)
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1152
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1153 if not text.strip():
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1154 raise util.Abort(_("empty commit message"))
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1155
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8390 diff changeset	1156 return text

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/cmdutil.py @ 10111:27457d31ae3f