##// END OF EJS Templates
getgraphlogrevs: return an empty baseset instead of a empty list...
Lucas Moscovicz -
r20759:74139960 default
parent child Browse files
Show More
@@ -1,2360 +1,2360 b''
1 # cmdutil.py - help for command processing in mercurial
1 # cmdutil.py - help for command processing in mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from node import hex, nullid, nullrev, short
8 from node import hex, nullid, nullrev, short
9 from i18n import _
9 from i18n import _
10 import os, sys, errno, re, tempfile
10 import os, sys, errno, re, tempfile
11 import util, scmutil, templater, patch, error, templatekw, revlog, copies
11 import util, scmutil, templater, patch, error, templatekw, revlog, copies
12 import match as matchmod
12 import match as matchmod
13 import context, repair, graphmod, revset, phases, obsolete, pathutil
13 import context, repair, graphmod, revset, phases, obsolete, pathutil
14 import changelog
14 import changelog
15 import bookmarks
15 import bookmarks
16 import lock as lockmod
16 import lock as lockmod
17
17
18 def parsealiases(cmd):
18 def parsealiases(cmd):
19 return cmd.lstrip("^").split("|")
19 return cmd.lstrip("^").split("|")
20
20
21 def findpossible(cmd, table, strict=False):
21 def findpossible(cmd, table, strict=False):
22 """
22 """
23 Return cmd -> (aliases, command table entry)
23 Return cmd -> (aliases, command table entry)
24 for each matching command.
24 for each matching command.
25 Return debug commands (or their aliases) only if no normal command matches.
25 Return debug commands (or their aliases) only if no normal command matches.
26 """
26 """
27 choice = {}
27 choice = {}
28 debugchoice = {}
28 debugchoice = {}
29
29
30 if cmd in table:
30 if cmd in table:
31 # short-circuit exact matches, "log" alias beats "^log|history"
31 # short-circuit exact matches, "log" alias beats "^log|history"
32 keys = [cmd]
32 keys = [cmd]
33 else:
33 else:
34 keys = table.keys()
34 keys = table.keys()
35
35
36 for e in keys:
36 for e in keys:
37 aliases = parsealiases(e)
37 aliases = parsealiases(e)
38 found = None
38 found = None
39 if cmd in aliases:
39 if cmd in aliases:
40 found = cmd
40 found = cmd
41 elif not strict:
41 elif not strict:
42 for a in aliases:
42 for a in aliases:
43 if a.startswith(cmd):
43 if a.startswith(cmd):
44 found = a
44 found = a
45 break
45 break
46 if found is not None:
46 if found is not None:
47 if aliases[0].startswith("debug") or found.startswith("debug"):
47 if aliases[0].startswith("debug") or found.startswith("debug"):
48 debugchoice[found] = (aliases, table[e])
48 debugchoice[found] = (aliases, table[e])
49 else:
49 else:
50 choice[found] = (aliases, table[e])
50 choice[found] = (aliases, table[e])
51
51
52 if not choice and debugchoice:
52 if not choice and debugchoice:
53 choice = debugchoice
53 choice = debugchoice
54
54
55 return choice
55 return choice
56
56
57 def findcmd(cmd, table, strict=True):
57 def findcmd(cmd, table, strict=True):
58 """Return (aliases, command table entry) for command string."""
58 """Return (aliases, command table entry) for command string."""
59 choice = findpossible(cmd, table, strict)
59 choice = findpossible(cmd, table, strict)
60
60
61 if cmd in choice:
61 if cmd in choice:
62 return choice[cmd]
62 return choice[cmd]
63
63
64 if len(choice) > 1:
64 if len(choice) > 1:
65 clist = choice.keys()
65 clist = choice.keys()
66 clist.sort()
66 clist.sort()
67 raise error.AmbiguousCommand(cmd, clist)
67 raise error.AmbiguousCommand(cmd, clist)
68
68
69 if choice:
69 if choice:
70 return choice.values()[0]
70 return choice.values()[0]
71
71
72 raise error.UnknownCommand(cmd)
72 raise error.UnknownCommand(cmd)
73
73
74 def findrepo(p):
74 def findrepo(p):
75 while not os.path.isdir(os.path.join(p, ".hg")):
75 while not os.path.isdir(os.path.join(p, ".hg")):
76 oldp, p = p, os.path.dirname(p)
76 oldp, p = p, os.path.dirname(p)
77 if p == oldp:
77 if p == oldp:
78 return None
78 return None
79
79
80 return p
80 return p
81
81
82 def bailifchanged(repo):
82 def bailifchanged(repo):
83 if repo.dirstate.p2() != nullid:
83 if repo.dirstate.p2() != nullid:
84 raise util.Abort(_('outstanding uncommitted merge'))
84 raise util.Abort(_('outstanding uncommitted merge'))
85 modified, added, removed, deleted = repo.status()[:4]
85 modified, added, removed, deleted = repo.status()[:4]
86 if modified or added or removed or deleted:
86 if modified or added or removed or deleted:
87 raise util.Abort(_('uncommitted changes'))
87 raise util.Abort(_('uncommitted changes'))
88 ctx = repo[None]
88 ctx = repo[None]
89 for s in sorted(ctx.substate):
89 for s in sorted(ctx.substate):
90 if ctx.sub(s).dirty():
90 if ctx.sub(s).dirty():
91 raise util.Abort(_("uncommitted changes in subrepo %s") % s)
91 raise util.Abort(_("uncommitted changes in subrepo %s") % s)
92
92
93 def logmessage(ui, opts):
93 def logmessage(ui, opts):
94 """ get the log message according to -m and -l option """
94 """ get the log message according to -m and -l option """
95 message = opts.get('message')
95 message = opts.get('message')
96 logfile = opts.get('logfile')
96 logfile = opts.get('logfile')
97
97
98 if message and logfile:
98 if message and logfile:
99 raise util.Abort(_('options --message and --logfile are mutually '
99 raise util.Abort(_('options --message and --logfile are mutually '
100 'exclusive'))
100 'exclusive'))
101 if not message and logfile:
101 if not message and logfile:
102 try:
102 try:
103 if logfile == '-':
103 if logfile == '-':
104 message = ui.fin.read()
104 message = ui.fin.read()
105 else:
105 else:
106 message = '\n'.join(util.readfile(logfile).splitlines())
106 message = '\n'.join(util.readfile(logfile).splitlines())
107 except IOError, inst:
107 except IOError, inst:
108 raise util.Abort(_("can't read commit message '%s': %s") %
108 raise util.Abort(_("can't read commit message '%s': %s") %
109 (logfile, inst.strerror))
109 (logfile, inst.strerror))
110 return message
110 return message
111
111
112 def loglimit(opts):
112 def loglimit(opts):
113 """get the log limit according to option -l/--limit"""
113 """get the log limit according to option -l/--limit"""
114 limit = opts.get('limit')
114 limit = opts.get('limit')
115 if limit:
115 if limit:
116 try:
116 try:
117 limit = int(limit)
117 limit = int(limit)
118 except ValueError:
118 except ValueError:
119 raise util.Abort(_('limit must be a positive integer'))
119 raise util.Abort(_('limit must be a positive integer'))
120 if limit <= 0:
120 if limit <= 0:
121 raise util.Abort(_('limit must be positive'))
121 raise util.Abort(_('limit must be positive'))
122 else:
122 else:
123 limit = None
123 limit = None
124 return limit
124 return limit
125
125
126 def makefilename(repo, pat, node, desc=None,
126 def makefilename(repo, pat, node, desc=None,
127 total=None, seqno=None, revwidth=None, pathname=None):
127 total=None, seqno=None, revwidth=None, pathname=None):
128 node_expander = {
128 node_expander = {
129 'H': lambda: hex(node),
129 'H': lambda: hex(node),
130 'R': lambda: str(repo.changelog.rev(node)),
130 'R': lambda: str(repo.changelog.rev(node)),
131 'h': lambda: short(node),
131 'h': lambda: short(node),
132 'm': lambda: re.sub('[^\w]', '_', str(desc))
132 'm': lambda: re.sub('[^\w]', '_', str(desc))
133 }
133 }
134 expander = {
134 expander = {
135 '%': lambda: '%',
135 '%': lambda: '%',
136 'b': lambda: os.path.basename(repo.root),
136 'b': lambda: os.path.basename(repo.root),
137 }
137 }
138
138
139 try:
139 try:
140 if node:
140 if node:
141 expander.update(node_expander)
141 expander.update(node_expander)
142 if node:
142 if node:
143 expander['r'] = (lambda:
143 expander['r'] = (lambda:
144 str(repo.changelog.rev(node)).zfill(revwidth or 0))
144 str(repo.changelog.rev(node)).zfill(revwidth or 0))
145 if total is not None:
145 if total is not None:
146 expander['N'] = lambda: str(total)
146 expander['N'] = lambda: str(total)
147 if seqno is not None:
147 if seqno is not None:
148 expander['n'] = lambda: str(seqno)
148 expander['n'] = lambda: str(seqno)
149 if total is not None and seqno is not None:
149 if total is not None and seqno is not None:
150 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
150 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
151 if pathname is not None:
151 if pathname is not None:
152 expander['s'] = lambda: os.path.basename(pathname)
152 expander['s'] = lambda: os.path.basename(pathname)
153 expander['d'] = lambda: os.path.dirname(pathname) or '.'
153 expander['d'] = lambda: os.path.dirname(pathname) or '.'
154 expander['p'] = lambda: pathname
154 expander['p'] = lambda: pathname
155
155
156 newname = []
156 newname = []
157 patlen = len(pat)
157 patlen = len(pat)
158 i = 0
158 i = 0
159 while i < patlen:
159 while i < patlen:
160 c = pat[i]
160 c = pat[i]
161 if c == '%':
161 if c == '%':
162 i += 1
162 i += 1
163 c = pat[i]
163 c = pat[i]
164 c = expander[c]()
164 c = expander[c]()
165 newname.append(c)
165 newname.append(c)
166 i += 1
166 i += 1
167 return ''.join(newname)
167 return ''.join(newname)
168 except KeyError, inst:
168 except KeyError, inst:
169 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
169 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
170 inst.args[0])
170 inst.args[0])
171
171
172 def makefileobj(repo, pat, node=None, desc=None, total=None,
172 def makefileobj(repo, pat, node=None, desc=None, total=None,
173 seqno=None, revwidth=None, mode='wb', modemap=None,
173 seqno=None, revwidth=None, mode='wb', modemap=None,
174 pathname=None):
174 pathname=None):
175
175
176 writable = mode not in ('r', 'rb')
176 writable = mode not in ('r', 'rb')
177
177
178 if not pat or pat == '-':
178 if not pat or pat == '-':
179 fp = writable and repo.ui.fout or repo.ui.fin
179 fp = writable and repo.ui.fout or repo.ui.fin
180 if util.safehasattr(fp, 'fileno'):
180 if util.safehasattr(fp, 'fileno'):
181 return os.fdopen(os.dup(fp.fileno()), mode)
181 return os.fdopen(os.dup(fp.fileno()), mode)
182 else:
182 else:
183 # if this fp can't be duped properly, return
183 # if this fp can't be duped properly, return
184 # a dummy object that can be closed
184 # a dummy object that can be closed
185 class wrappedfileobj(object):
185 class wrappedfileobj(object):
186 noop = lambda x: None
186 noop = lambda x: None
187 def __init__(self, f):
187 def __init__(self, f):
188 self.f = f
188 self.f = f
189 def __getattr__(self, attr):
189 def __getattr__(self, attr):
190 if attr == 'close':
190 if attr == 'close':
191 return self.noop
191 return self.noop
192 else:
192 else:
193 return getattr(self.f, attr)
193 return getattr(self.f, attr)
194
194
195 return wrappedfileobj(fp)
195 return wrappedfileobj(fp)
196 if util.safehasattr(pat, 'write') and writable:
196 if util.safehasattr(pat, 'write') and writable:
197 return pat
197 return pat
198 if util.safehasattr(pat, 'read') and 'r' in mode:
198 if util.safehasattr(pat, 'read') and 'r' in mode:
199 return pat
199 return pat
200 fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
200 fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
201 if modemap is not None:
201 if modemap is not None:
202 mode = modemap.get(fn, mode)
202 mode = modemap.get(fn, mode)
203 if mode == 'wb':
203 if mode == 'wb':
204 modemap[fn] = 'ab'
204 modemap[fn] = 'ab'
205 return open(fn, mode)
205 return open(fn, mode)
206
206
207 def openrevlog(repo, cmd, file_, opts):
207 def openrevlog(repo, cmd, file_, opts):
208 """opens the changelog, manifest, a filelog or a given revlog"""
208 """opens the changelog, manifest, a filelog or a given revlog"""
209 cl = opts['changelog']
209 cl = opts['changelog']
210 mf = opts['manifest']
210 mf = opts['manifest']
211 msg = None
211 msg = None
212 if cl and mf:
212 if cl and mf:
213 msg = _('cannot specify --changelog and --manifest at the same time')
213 msg = _('cannot specify --changelog and --manifest at the same time')
214 elif cl or mf:
214 elif cl or mf:
215 if file_:
215 if file_:
216 msg = _('cannot specify filename with --changelog or --manifest')
216 msg = _('cannot specify filename with --changelog or --manifest')
217 elif not repo:
217 elif not repo:
218 msg = _('cannot specify --changelog or --manifest '
218 msg = _('cannot specify --changelog or --manifest '
219 'without a repository')
219 'without a repository')
220 if msg:
220 if msg:
221 raise util.Abort(msg)
221 raise util.Abort(msg)
222
222
223 r = None
223 r = None
224 if repo:
224 if repo:
225 if cl:
225 if cl:
226 r = repo.changelog
226 r = repo.changelog
227 elif mf:
227 elif mf:
228 r = repo.manifest
228 r = repo.manifest
229 elif file_:
229 elif file_:
230 filelog = repo.file(file_)
230 filelog = repo.file(file_)
231 if len(filelog):
231 if len(filelog):
232 r = filelog
232 r = filelog
233 if not r:
233 if not r:
234 if not file_:
234 if not file_:
235 raise error.CommandError(cmd, _('invalid arguments'))
235 raise error.CommandError(cmd, _('invalid arguments'))
236 if not os.path.isfile(file_):
236 if not os.path.isfile(file_):
237 raise util.Abort(_("revlog '%s' not found") % file_)
237 raise util.Abort(_("revlog '%s' not found") % file_)
238 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False),
238 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False),
239 file_[:-2] + ".i")
239 file_[:-2] + ".i")
240 return r
240 return r
241
241
242 def copy(ui, repo, pats, opts, rename=False):
242 def copy(ui, repo, pats, opts, rename=False):
243 # called with the repo lock held
243 # called with the repo lock held
244 #
244 #
245 # hgsep => pathname that uses "/" to separate directories
245 # hgsep => pathname that uses "/" to separate directories
246 # ossep => pathname that uses os.sep to separate directories
246 # ossep => pathname that uses os.sep to separate directories
247 cwd = repo.getcwd()
247 cwd = repo.getcwd()
248 targets = {}
248 targets = {}
249 after = opts.get("after")
249 after = opts.get("after")
250 dryrun = opts.get("dry_run")
250 dryrun = opts.get("dry_run")
251 wctx = repo[None]
251 wctx = repo[None]
252
252
253 def walkpat(pat):
253 def walkpat(pat):
254 srcs = []
254 srcs = []
255 badstates = after and '?' or '?r'
255 badstates = after and '?' or '?r'
256 m = scmutil.match(repo[None], [pat], opts, globbed=True)
256 m = scmutil.match(repo[None], [pat], opts, globbed=True)
257 for abs in repo.walk(m):
257 for abs in repo.walk(m):
258 state = repo.dirstate[abs]
258 state = repo.dirstate[abs]
259 rel = m.rel(abs)
259 rel = m.rel(abs)
260 exact = m.exact(abs)
260 exact = m.exact(abs)
261 if state in badstates:
261 if state in badstates:
262 if exact and state == '?':
262 if exact and state == '?':
263 ui.warn(_('%s: not copying - file is not managed\n') % rel)
263 ui.warn(_('%s: not copying - file is not managed\n') % rel)
264 if exact and state == 'r':
264 if exact and state == 'r':
265 ui.warn(_('%s: not copying - file has been marked for'
265 ui.warn(_('%s: not copying - file has been marked for'
266 ' remove\n') % rel)
266 ' remove\n') % rel)
267 continue
267 continue
268 # abs: hgsep
268 # abs: hgsep
269 # rel: ossep
269 # rel: ossep
270 srcs.append((abs, rel, exact))
270 srcs.append((abs, rel, exact))
271 return srcs
271 return srcs
272
272
273 # abssrc: hgsep
273 # abssrc: hgsep
274 # relsrc: ossep
274 # relsrc: ossep
275 # otarget: ossep
275 # otarget: ossep
276 def copyfile(abssrc, relsrc, otarget, exact):
276 def copyfile(abssrc, relsrc, otarget, exact):
277 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
277 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
278 if '/' in abstarget:
278 if '/' in abstarget:
279 # We cannot normalize abstarget itself, this would prevent
279 # We cannot normalize abstarget itself, this would prevent
280 # case only renames, like a => A.
280 # case only renames, like a => A.
281 abspath, absname = abstarget.rsplit('/', 1)
281 abspath, absname = abstarget.rsplit('/', 1)
282 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
282 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
283 reltarget = repo.pathto(abstarget, cwd)
283 reltarget = repo.pathto(abstarget, cwd)
284 target = repo.wjoin(abstarget)
284 target = repo.wjoin(abstarget)
285 src = repo.wjoin(abssrc)
285 src = repo.wjoin(abssrc)
286 state = repo.dirstate[abstarget]
286 state = repo.dirstate[abstarget]
287
287
288 scmutil.checkportable(ui, abstarget)
288 scmutil.checkportable(ui, abstarget)
289
289
290 # check for collisions
290 # check for collisions
291 prevsrc = targets.get(abstarget)
291 prevsrc = targets.get(abstarget)
292 if prevsrc is not None:
292 if prevsrc is not None:
293 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
293 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
294 (reltarget, repo.pathto(abssrc, cwd),
294 (reltarget, repo.pathto(abssrc, cwd),
295 repo.pathto(prevsrc, cwd)))
295 repo.pathto(prevsrc, cwd)))
296 return
296 return
297
297
298 # check for overwrites
298 # check for overwrites
299 exists = os.path.lexists(target)
299 exists = os.path.lexists(target)
300 samefile = False
300 samefile = False
301 if exists and abssrc != abstarget:
301 if exists and abssrc != abstarget:
302 if (repo.dirstate.normalize(abssrc) ==
302 if (repo.dirstate.normalize(abssrc) ==
303 repo.dirstate.normalize(abstarget)):
303 repo.dirstate.normalize(abstarget)):
304 if not rename:
304 if not rename:
305 ui.warn(_("%s: can't copy - same file\n") % reltarget)
305 ui.warn(_("%s: can't copy - same file\n") % reltarget)
306 return
306 return
307 exists = False
307 exists = False
308 samefile = True
308 samefile = True
309
309
310 if not after and exists or after and state in 'mn':
310 if not after and exists or after and state in 'mn':
311 if not opts['force']:
311 if not opts['force']:
312 ui.warn(_('%s: not overwriting - file exists\n') %
312 ui.warn(_('%s: not overwriting - file exists\n') %
313 reltarget)
313 reltarget)
314 return
314 return
315
315
316 if after:
316 if after:
317 if not exists:
317 if not exists:
318 if rename:
318 if rename:
319 ui.warn(_('%s: not recording move - %s does not exist\n') %
319 ui.warn(_('%s: not recording move - %s does not exist\n') %
320 (relsrc, reltarget))
320 (relsrc, reltarget))
321 else:
321 else:
322 ui.warn(_('%s: not recording copy - %s does not exist\n') %
322 ui.warn(_('%s: not recording copy - %s does not exist\n') %
323 (relsrc, reltarget))
323 (relsrc, reltarget))
324 return
324 return
325 elif not dryrun:
325 elif not dryrun:
326 try:
326 try:
327 if exists:
327 if exists:
328 os.unlink(target)
328 os.unlink(target)
329 targetdir = os.path.dirname(target) or '.'
329 targetdir = os.path.dirname(target) or '.'
330 if not os.path.isdir(targetdir):
330 if not os.path.isdir(targetdir):
331 os.makedirs(targetdir)
331 os.makedirs(targetdir)
332 if samefile:
332 if samefile:
333 tmp = target + "~hgrename"
333 tmp = target + "~hgrename"
334 os.rename(src, tmp)
334 os.rename(src, tmp)
335 os.rename(tmp, target)
335 os.rename(tmp, target)
336 else:
336 else:
337 util.copyfile(src, target)
337 util.copyfile(src, target)
338 srcexists = True
338 srcexists = True
339 except IOError, inst:
339 except IOError, inst:
340 if inst.errno == errno.ENOENT:
340 if inst.errno == errno.ENOENT:
341 ui.warn(_('%s: deleted in working copy\n') % relsrc)
341 ui.warn(_('%s: deleted in working copy\n') % relsrc)
342 srcexists = False
342 srcexists = False
343 else:
343 else:
344 ui.warn(_('%s: cannot copy - %s\n') %
344 ui.warn(_('%s: cannot copy - %s\n') %
345 (relsrc, inst.strerror))
345 (relsrc, inst.strerror))
346 return True # report a failure
346 return True # report a failure
347
347
348 if ui.verbose or not exact:
348 if ui.verbose or not exact:
349 if rename:
349 if rename:
350 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
350 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
351 else:
351 else:
352 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
352 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
353
353
354 targets[abstarget] = abssrc
354 targets[abstarget] = abssrc
355
355
356 # fix up dirstate
356 # fix up dirstate
357 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
357 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
358 dryrun=dryrun, cwd=cwd)
358 dryrun=dryrun, cwd=cwd)
359 if rename and not dryrun:
359 if rename and not dryrun:
360 if not after and srcexists and not samefile:
360 if not after and srcexists and not samefile:
361 util.unlinkpath(repo.wjoin(abssrc))
361 util.unlinkpath(repo.wjoin(abssrc))
362 wctx.forget([abssrc])
362 wctx.forget([abssrc])
363
363
364 # pat: ossep
364 # pat: ossep
365 # dest ossep
365 # dest ossep
366 # srcs: list of (hgsep, hgsep, ossep, bool)
366 # srcs: list of (hgsep, hgsep, ossep, bool)
367 # return: function that takes hgsep and returns ossep
367 # return: function that takes hgsep and returns ossep
368 def targetpathfn(pat, dest, srcs):
368 def targetpathfn(pat, dest, srcs):
369 if os.path.isdir(pat):
369 if os.path.isdir(pat):
370 abspfx = pathutil.canonpath(repo.root, cwd, pat)
370 abspfx = pathutil.canonpath(repo.root, cwd, pat)
371 abspfx = util.localpath(abspfx)
371 abspfx = util.localpath(abspfx)
372 if destdirexists:
372 if destdirexists:
373 striplen = len(os.path.split(abspfx)[0])
373 striplen = len(os.path.split(abspfx)[0])
374 else:
374 else:
375 striplen = len(abspfx)
375 striplen = len(abspfx)
376 if striplen:
376 if striplen:
377 striplen += len(os.sep)
377 striplen += len(os.sep)
378 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
378 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
379 elif destdirexists:
379 elif destdirexists:
380 res = lambda p: os.path.join(dest,
380 res = lambda p: os.path.join(dest,
381 os.path.basename(util.localpath(p)))
381 os.path.basename(util.localpath(p)))
382 else:
382 else:
383 res = lambda p: dest
383 res = lambda p: dest
384 return res
384 return res
385
385
386 # pat: ossep
386 # pat: ossep
387 # dest ossep
387 # dest ossep
388 # srcs: list of (hgsep, hgsep, ossep, bool)
388 # srcs: list of (hgsep, hgsep, ossep, bool)
389 # return: function that takes hgsep and returns ossep
389 # return: function that takes hgsep and returns ossep
390 def targetpathafterfn(pat, dest, srcs):
390 def targetpathafterfn(pat, dest, srcs):
391 if matchmod.patkind(pat):
391 if matchmod.patkind(pat):
392 # a mercurial pattern
392 # a mercurial pattern
393 res = lambda p: os.path.join(dest,
393 res = lambda p: os.path.join(dest,
394 os.path.basename(util.localpath(p)))
394 os.path.basename(util.localpath(p)))
395 else:
395 else:
396 abspfx = pathutil.canonpath(repo.root, cwd, pat)
396 abspfx = pathutil.canonpath(repo.root, cwd, pat)
397 if len(abspfx) < len(srcs[0][0]):
397 if len(abspfx) < len(srcs[0][0]):
398 # A directory. Either the target path contains the last
398 # A directory. Either the target path contains the last
399 # component of the source path or it does not.
399 # component of the source path or it does not.
400 def evalpath(striplen):
400 def evalpath(striplen):
401 score = 0
401 score = 0
402 for s in srcs:
402 for s in srcs:
403 t = os.path.join(dest, util.localpath(s[0])[striplen:])
403 t = os.path.join(dest, util.localpath(s[0])[striplen:])
404 if os.path.lexists(t):
404 if os.path.lexists(t):
405 score += 1
405 score += 1
406 return score
406 return score
407
407
408 abspfx = util.localpath(abspfx)
408 abspfx = util.localpath(abspfx)
409 striplen = len(abspfx)
409 striplen = len(abspfx)
410 if striplen:
410 if striplen:
411 striplen += len(os.sep)
411 striplen += len(os.sep)
412 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
412 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
413 score = evalpath(striplen)
413 score = evalpath(striplen)
414 striplen1 = len(os.path.split(abspfx)[0])
414 striplen1 = len(os.path.split(abspfx)[0])
415 if striplen1:
415 if striplen1:
416 striplen1 += len(os.sep)
416 striplen1 += len(os.sep)
417 if evalpath(striplen1) > score:
417 if evalpath(striplen1) > score:
418 striplen = striplen1
418 striplen = striplen1
419 res = lambda p: os.path.join(dest,
419 res = lambda p: os.path.join(dest,
420 util.localpath(p)[striplen:])
420 util.localpath(p)[striplen:])
421 else:
421 else:
422 # a file
422 # a file
423 if destdirexists:
423 if destdirexists:
424 res = lambda p: os.path.join(dest,
424 res = lambda p: os.path.join(dest,
425 os.path.basename(util.localpath(p)))
425 os.path.basename(util.localpath(p)))
426 else:
426 else:
427 res = lambda p: dest
427 res = lambda p: dest
428 return res
428 return res
429
429
430
430
431 pats = scmutil.expandpats(pats)
431 pats = scmutil.expandpats(pats)
432 if not pats:
432 if not pats:
433 raise util.Abort(_('no source or destination specified'))
433 raise util.Abort(_('no source or destination specified'))
434 if len(pats) == 1:
434 if len(pats) == 1:
435 raise util.Abort(_('no destination specified'))
435 raise util.Abort(_('no destination specified'))
436 dest = pats.pop()
436 dest = pats.pop()
437 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
437 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
438 if not destdirexists:
438 if not destdirexists:
439 if len(pats) > 1 or matchmod.patkind(pats[0]):
439 if len(pats) > 1 or matchmod.patkind(pats[0]):
440 raise util.Abort(_('with multiple sources, destination must be an '
440 raise util.Abort(_('with multiple sources, destination must be an '
441 'existing directory'))
441 'existing directory'))
442 if util.endswithsep(dest):
442 if util.endswithsep(dest):
443 raise util.Abort(_('destination %s is not a directory') % dest)
443 raise util.Abort(_('destination %s is not a directory') % dest)
444
444
445 tfn = targetpathfn
445 tfn = targetpathfn
446 if after:
446 if after:
447 tfn = targetpathafterfn
447 tfn = targetpathafterfn
448 copylist = []
448 copylist = []
449 for pat in pats:
449 for pat in pats:
450 srcs = walkpat(pat)
450 srcs = walkpat(pat)
451 if not srcs:
451 if not srcs:
452 continue
452 continue
453 copylist.append((tfn(pat, dest, srcs), srcs))
453 copylist.append((tfn(pat, dest, srcs), srcs))
454 if not copylist:
454 if not copylist:
455 raise util.Abort(_('no files to copy'))
455 raise util.Abort(_('no files to copy'))
456
456
457 errors = 0
457 errors = 0
458 for targetpath, srcs in copylist:
458 for targetpath, srcs in copylist:
459 for abssrc, relsrc, exact in srcs:
459 for abssrc, relsrc, exact in srcs:
460 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
460 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
461 errors += 1
461 errors += 1
462
462
463 if errors:
463 if errors:
464 ui.warn(_('(consider using --after)\n'))
464 ui.warn(_('(consider using --after)\n'))
465
465
466 return errors != 0
466 return errors != 0
467
467
468 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
468 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
469 runargs=None, appendpid=False):
469 runargs=None, appendpid=False):
470 '''Run a command as a service.'''
470 '''Run a command as a service.'''
471
471
472 def writepid(pid):
472 def writepid(pid):
473 if opts['pid_file']:
473 if opts['pid_file']:
474 mode = appendpid and 'a' or 'w'
474 mode = appendpid and 'a' or 'w'
475 fp = open(opts['pid_file'], mode)
475 fp = open(opts['pid_file'], mode)
476 fp.write(str(pid) + '\n')
476 fp.write(str(pid) + '\n')
477 fp.close()
477 fp.close()
478
478
479 if opts['daemon'] and not opts['daemon_pipefds']:
479 if opts['daemon'] and not opts['daemon_pipefds']:
480 # Signal child process startup with file removal
480 # Signal child process startup with file removal
481 lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
481 lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
482 os.close(lockfd)
482 os.close(lockfd)
483 try:
483 try:
484 if not runargs:
484 if not runargs:
485 runargs = util.hgcmd() + sys.argv[1:]
485 runargs = util.hgcmd() + sys.argv[1:]
486 runargs.append('--daemon-pipefds=%s' % lockpath)
486 runargs.append('--daemon-pipefds=%s' % lockpath)
487 # Don't pass --cwd to the child process, because we've already
487 # Don't pass --cwd to the child process, because we've already
488 # changed directory.
488 # changed directory.
489 for i in xrange(1, len(runargs)):
489 for i in xrange(1, len(runargs)):
490 if runargs[i].startswith('--cwd='):
490 if runargs[i].startswith('--cwd='):
491 del runargs[i]
491 del runargs[i]
492 break
492 break
493 elif runargs[i].startswith('--cwd'):
493 elif runargs[i].startswith('--cwd'):
494 del runargs[i:i + 2]
494 del runargs[i:i + 2]
495 break
495 break
496 def condfn():
496 def condfn():
497 return not os.path.exists(lockpath)
497 return not os.path.exists(lockpath)
498 pid = util.rundetached(runargs, condfn)
498 pid = util.rundetached(runargs, condfn)
499 if pid < 0:
499 if pid < 0:
500 raise util.Abort(_('child process failed to start'))
500 raise util.Abort(_('child process failed to start'))
501 writepid(pid)
501 writepid(pid)
502 finally:
502 finally:
503 try:
503 try:
504 os.unlink(lockpath)
504 os.unlink(lockpath)
505 except OSError, e:
505 except OSError, e:
506 if e.errno != errno.ENOENT:
506 if e.errno != errno.ENOENT:
507 raise
507 raise
508 if parentfn:
508 if parentfn:
509 return parentfn(pid)
509 return parentfn(pid)
510 else:
510 else:
511 return
511 return
512
512
513 if initfn:
513 if initfn:
514 initfn()
514 initfn()
515
515
516 if not opts['daemon']:
516 if not opts['daemon']:
517 writepid(os.getpid())
517 writepid(os.getpid())
518
518
519 if opts['daemon_pipefds']:
519 if opts['daemon_pipefds']:
520 lockpath = opts['daemon_pipefds']
520 lockpath = opts['daemon_pipefds']
521 try:
521 try:
522 os.setsid()
522 os.setsid()
523 except AttributeError:
523 except AttributeError:
524 pass
524 pass
525 os.unlink(lockpath)
525 os.unlink(lockpath)
526 util.hidewindow()
526 util.hidewindow()
527 sys.stdout.flush()
527 sys.stdout.flush()
528 sys.stderr.flush()
528 sys.stderr.flush()
529
529
530 nullfd = os.open(os.devnull, os.O_RDWR)
530 nullfd = os.open(os.devnull, os.O_RDWR)
531 logfilefd = nullfd
531 logfilefd = nullfd
532 if logfile:
532 if logfile:
533 logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
533 logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
534 os.dup2(nullfd, 0)
534 os.dup2(nullfd, 0)
535 os.dup2(logfilefd, 1)
535 os.dup2(logfilefd, 1)
536 os.dup2(logfilefd, 2)
536 os.dup2(logfilefd, 2)
537 if nullfd not in (0, 1, 2):
537 if nullfd not in (0, 1, 2):
538 os.close(nullfd)
538 os.close(nullfd)
539 if logfile and logfilefd not in (0, 1, 2):
539 if logfile and logfilefd not in (0, 1, 2):
540 os.close(logfilefd)
540 os.close(logfilefd)
541
541
542 if runfn:
542 if runfn:
543 return runfn()
543 return runfn()
544
544
545 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
545 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
546 """Utility function used by commands.import to import a single patch
546 """Utility function used by commands.import to import a single patch
547
547
548 This function is explicitly defined here to help the evolve extension to
548 This function is explicitly defined here to help the evolve extension to
549 wrap this part of the import logic.
549 wrap this part of the import logic.
550
550
551 The API is currently a bit ugly because it a simple code translation from
551 The API is currently a bit ugly because it a simple code translation from
552 the import command. Feel free to make it better.
552 the import command. Feel free to make it better.
553
553
554 :hunk: a patch (as a binary string)
554 :hunk: a patch (as a binary string)
555 :parents: nodes that will be parent of the created commit
555 :parents: nodes that will be parent of the created commit
556 :opts: the full dict of option passed to the import command
556 :opts: the full dict of option passed to the import command
557 :msgs: list to save commit message to.
557 :msgs: list to save commit message to.
558 (used in case we need to save it when failing)
558 (used in case we need to save it when failing)
559 :updatefunc: a function that update a repo to a given node
559 :updatefunc: a function that update a repo to a given node
560 updatefunc(<repo>, <node>)
560 updatefunc(<repo>, <node>)
561 """
561 """
562 tmpname, message, user, date, branch, nodeid, p1, p2 = \
562 tmpname, message, user, date, branch, nodeid, p1, p2 = \
563 patch.extract(ui, hunk)
563 patch.extract(ui, hunk)
564
564
565 editor = commiteditor
565 editor = commiteditor
566 if opts.get('edit'):
566 if opts.get('edit'):
567 editor = commitforceeditor
567 editor = commitforceeditor
568 update = not opts.get('bypass')
568 update = not opts.get('bypass')
569 strip = opts["strip"]
569 strip = opts["strip"]
570 sim = float(opts.get('similarity') or 0)
570 sim = float(opts.get('similarity') or 0)
571 if not tmpname:
571 if not tmpname:
572 return (None, None)
572 return (None, None)
573 msg = _('applied to working directory')
573 msg = _('applied to working directory')
574
574
575 try:
575 try:
576 cmdline_message = logmessage(ui, opts)
576 cmdline_message = logmessage(ui, opts)
577 if cmdline_message:
577 if cmdline_message:
578 # pickup the cmdline msg
578 # pickup the cmdline msg
579 message = cmdline_message
579 message = cmdline_message
580 elif message:
580 elif message:
581 # pickup the patch msg
581 # pickup the patch msg
582 message = message.strip()
582 message = message.strip()
583 else:
583 else:
584 # launch the editor
584 # launch the editor
585 message = None
585 message = None
586 ui.debug('message:\n%s\n' % message)
586 ui.debug('message:\n%s\n' % message)
587
587
588 if len(parents) == 1:
588 if len(parents) == 1:
589 parents.append(repo[nullid])
589 parents.append(repo[nullid])
590 if opts.get('exact'):
590 if opts.get('exact'):
591 if not nodeid or not p1:
591 if not nodeid or not p1:
592 raise util.Abort(_('not a Mercurial patch'))
592 raise util.Abort(_('not a Mercurial patch'))
593 p1 = repo[p1]
593 p1 = repo[p1]
594 p2 = repo[p2 or nullid]
594 p2 = repo[p2 or nullid]
595 elif p2:
595 elif p2:
596 try:
596 try:
597 p1 = repo[p1]
597 p1 = repo[p1]
598 p2 = repo[p2]
598 p2 = repo[p2]
599 # Without any options, consider p2 only if the
599 # Without any options, consider p2 only if the
600 # patch is being applied on top of the recorded
600 # patch is being applied on top of the recorded
601 # first parent.
601 # first parent.
602 if p1 != parents[0]:
602 if p1 != parents[0]:
603 p1 = parents[0]
603 p1 = parents[0]
604 p2 = repo[nullid]
604 p2 = repo[nullid]
605 except error.RepoError:
605 except error.RepoError:
606 p1, p2 = parents
606 p1, p2 = parents
607 else:
607 else:
608 p1, p2 = parents
608 p1, p2 = parents
609
609
610 n = None
610 n = None
611 if update:
611 if update:
612 if p1 != parents[0]:
612 if p1 != parents[0]:
613 updatefunc(repo, p1.node())
613 updatefunc(repo, p1.node())
614 if p2 != parents[1]:
614 if p2 != parents[1]:
615 repo.setparents(p1.node(), p2.node())
615 repo.setparents(p1.node(), p2.node())
616
616
617 if opts.get('exact') or opts.get('import_branch'):
617 if opts.get('exact') or opts.get('import_branch'):
618 repo.dirstate.setbranch(branch or 'default')
618 repo.dirstate.setbranch(branch or 'default')
619
619
620 files = set()
620 files = set()
621 patch.patch(ui, repo, tmpname, strip=strip, files=files,
621 patch.patch(ui, repo, tmpname, strip=strip, files=files,
622 eolmode=None, similarity=sim / 100.0)
622 eolmode=None, similarity=sim / 100.0)
623 files = list(files)
623 files = list(files)
624 if opts.get('no_commit'):
624 if opts.get('no_commit'):
625 if message:
625 if message:
626 msgs.append(message)
626 msgs.append(message)
627 else:
627 else:
628 if opts.get('exact') or p2:
628 if opts.get('exact') or p2:
629 # If you got here, you either use --force and know what
629 # If you got here, you either use --force and know what
630 # you are doing or used --exact or a merge patch while
630 # you are doing or used --exact or a merge patch while
631 # being updated to its first parent.
631 # being updated to its first parent.
632 m = None
632 m = None
633 else:
633 else:
634 m = scmutil.matchfiles(repo, files or [])
634 m = scmutil.matchfiles(repo, files or [])
635 n = repo.commit(message, opts.get('user') or user,
635 n = repo.commit(message, opts.get('user') or user,
636 opts.get('date') or date, match=m,
636 opts.get('date') or date, match=m,
637 editor=editor)
637 editor=editor)
638 else:
638 else:
639 if opts.get('exact') or opts.get('import_branch'):
639 if opts.get('exact') or opts.get('import_branch'):
640 branch = branch or 'default'
640 branch = branch or 'default'
641 else:
641 else:
642 branch = p1.branch()
642 branch = p1.branch()
643 store = patch.filestore()
643 store = patch.filestore()
644 try:
644 try:
645 files = set()
645 files = set()
646 try:
646 try:
647 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
647 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
648 files, eolmode=None)
648 files, eolmode=None)
649 except patch.PatchError, e:
649 except patch.PatchError, e:
650 raise util.Abort(str(e))
650 raise util.Abort(str(e))
651 memctx = context.makememctx(repo, (p1.node(), p2.node()),
651 memctx = context.makememctx(repo, (p1.node(), p2.node()),
652 message,
652 message,
653 opts.get('user') or user,
653 opts.get('user') or user,
654 opts.get('date') or date,
654 opts.get('date') or date,
655 branch, files, store,
655 branch, files, store,
656 editor=commiteditor)
656 editor=commiteditor)
657 repo.savecommitmessage(memctx.description())
657 repo.savecommitmessage(memctx.description())
658 n = memctx.commit()
658 n = memctx.commit()
659 finally:
659 finally:
660 store.close()
660 store.close()
661 if opts.get('exact') and hex(n) != nodeid:
661 if opts.get('exact') and hex(n) != nodeid:
662 raise util.Abort(_('patch is damaged or loses information'))
662 raise util.Abort(_('patch is damaged or loses information'))
663 if n:
663 if n:
664 # i18n: refers to a short changeset id
664 # i18n: refers to a short changeset id
665 msg = _('created %s') % short(n)
665 msg = _('created %s') % short(n)
666 return (msg, n)
666 return (msg, n)
667 finally:
667 finally:
668 os.unlink(tmpname)
668 os.unlink(tmpname)
669
669
670 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
670 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
671 opts=None):
671 opts=None):
672 '''export changesets as hg patches.'''
672 '''export changesets as hg patches.'''
673
673
674 total = len(revs)
674 total = len(revs)
675 revwidth = max([len(str(rev)) for rev in revs])
675 revwidth = max([len(str(rev)) for rev in revs])
676 filemode = {}
676 filemode = {}
677
677
678 def single(rev, seqno, fp):
678 def single(rev, seqno, fp):
679 ctx = repo[rev]
679 ctx = repo[rev]
680 node = ctx.node()
680 node = ctx.node()
681 parents = [p.node() for p in ctx.parents() if p]
681 parents = [p.node() for p in ctx.parents() if p]
682 branch = ctx.branch()
682 branch = ctx.branch()
683 if switch_parent:
683 if switch_parent:
684 parents.reverse()
684 parents.reverse()
685 prev = (parents and parents[0]) or nullid
685 prev = (parents and parents[0]) or nullid
686
686
687 shouldclose = False
687 shouldclose = False
688 if not fp and len(template) > 0:
688 if not fp and len(template) > 0:
689 desc_lines = ctx.description().rstrip().split('\n')
689 desc_lines = ctx.description().rstrip().split('\n')
690 desc = desc_lines[0] #Commit always has a first line.
690 desc = desc_lines[0] #Commit always has a first line.
691 fp = makefileobj(repo, template, node, desc=desc, total=total,
691 fp = makefileobj(repo, template, node, desc=desc, total=total,
692 seqno=seqno, revwidth=revwidth, mode='wb',
692 seqno=seqno, revwidth=revwidth, mode='wb',
693 modemap=filemode)
693 modemap=filemode)
694 if fp != template:
694 if fp != template:
695 shouldclose = True
695 shouldclose = True
696 if fp and fp != sys.stdout and util.safehasattr(fp, 'name'):
696 if fp and fp != sys.stdout and util.safehasattr(fp, 'name'):
697 repo.ui.note("%s\n" % fp.name)
697 repo.ui.note("%s\n" % fp.name)
698
698
699 if not fp:
699 if not fp:
700 write = repo.ui.write
700 write = repo.ui.write
701 else:
701 else:
702 def write(s, **kw):
702 def write(s, **kw):
703 fp.write(s)
703 fp.write(s)
704
704
705
705
706 write("# HG changeset patch\n")
706 write("# HG changeset patch\n")
707 write("# User %s\n" % ctx.user())
707 write("# User %s\n" % ctx.user())
708 write("# Date %d %d\n" % ctx.date())
708 write("# Date %d %d\n" % ctx.date())
709 write("# %s\n" % util.datestr(ctx.date()))
709 write("# %s\n" % util.datestr(ctx.date()))
710 if branch and branch != 'default':
710 if branch and branch != 'default':
711 write("# Branch %s\n" % branch)
711 write("# Branch %s\n" % branch)
712 write("# Node ID %s\n" % hex(node))
712 write("# Node ID %s\n" % hex(node))
713 write("# Parent %s\n" % hex(prev))
713 write("# Parent %s\n" % hex(prev))
714 if len(parents) > 1:
714 if len(parents) > 1:
715 write("# Parent %s\n" % hex(parents[1]))
715 write("# Parent %s\n" % hex(parents[1]))
716 write(ctx.description().rstrip())
716 write(ctx.description().rstrip())
717 write("\n\n")
717 write("\n\n")
718
718
719 for chunk, label in patch.diffui(repo, prev, node, opts=opts):
719 for chunk, label in patch.diffui(repo, prev, node, opts=opts):
720 write(chunk, label=label)
720 write(chunk, label=label)
721
721
722 if shouldclose:
722 if shouldclose:
723 fp.close()
723 fp.close()
724
724
725 for seqno, rev in enumerate(revs):
725 for seqno, rev in enumerate(revs):
726 single(rev, seqno + 1, fp)
726 single(rev, seqno + 1, fp)
727
727
728 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
728 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
729 changes=None, stat=False, fp=None, prefix='',
729 changes=None, stat=False, fp=None, prefix='',
730 listsubrepos=False):
730 listsubrepos=False):
731 '''show diff or diffstat.'''
731 '''show diff or diffstat.'''
732 if fp is None:
732 if fp is None:
733 write = ui.write
733 write = ui.write
734 else:
734 else:
735 def write(s, **kw):
735 def write(s, **kw):
736 fp.write(s)
736 fp.write(s)
737
737
738 if stat:
738 if stat:
739 diffopts = diffopts.copy(context=0)
739 diffopts = diffopts.copy(context=0)
740 width = 80
740 width = 80
741 if not ui.plain():
741 if not ui.plain():
742 width = ui.termwidth()
742 width = ui.termwidth()
743 chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
743 chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
744 prefix=prefix)
744 prefix=prefix)
745 for chunk, label in patch.diffstatui(util.iterlines(chunks),
745 for chunk, label in patch.diffstatui(util.iterlines(chunks),
746 width=width,
746 width=width,
747 git=diffopts.git):
747 git=diffopts.git):
748 write(chunk, label=label)
748 write(chunk, label=label)
749 else:
749 else:
750 for chunk, label in patch.diffui(repo, node1, node2, match,
750 for chunk, label in patch.diffui(repo, node1, node2, match,
751 changes, diffopts, prefix=prefix):
751 changes, diffopts, prefix=prefix):
752 write(chunk, label=label)
752 write(chunk, label=label)
753
753
754 if listsubrepos:
754 if listsubrepos:
755 ctx1 = repo[node1]
755 ctx1 = repo[node1]
756 ctx2 = repo[node2]
756 ctx2 = repo[node2]
757 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
757 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
758 tempnode2 = node2
758 tempnode2 = node2
759 try:
759 try:
760 if node2 is not None:
760 if node2 is not None:
761 tempnode2 = ctx2.substate[subpath][1]
761 tempnode2 = ctx2.substate[subpath][1]
762 except KeyError:
762 except KeyError:
763 # A subrepo that existed in node1 was deleted between node1 and
763 # A subrepo that existed in node1 was deleted between node1 and
764 # node2 (inclusive). Thus, ctx2's substate won't contain that
764 # node2 (inclusive). Thus, ctx2's substate won't contain that
765 # subpath. The best we can do is to ignore it.
765 # subpath. The best we can do is to ignore it.
766 tempnode2 = None
766 tempnode2 = None
767 submatch = matchmod.narrowmatcher(subpath, match)
767 submatch = matchmod.narrowmatcher(subpath, match)
768 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
768 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
769 stat=stat, fp=fp, prefix=prefix)
769 stat=stat, fp=fp, prefix=prefix)
770
770
771 class changeset_printer(object):
771 class changeset_printer(object):
772 '''show changeset information when templating not requested.'''
772 '''show changeset information when templating not requested.'''
773
773
774 def __init__(self, ui, repo, patch, diffopts, buffered):
774 def __init__(self, ui, repo, patch, diffopts, buffered):
775 self.ui = ui
775 self.ui = ui
776 self.repo = repo
776 self.repo = repo
777 self.buffered = buffered
777 self.buffered = buffered
778 self.patch = patch
778 self.patch = patch
779 self.diffopts = diffopts
779 self.diffopts = diffopts
780 self.header = {}
780 self.header = {}
781 self.hunk = {}
781 self.hunk = {}
782 self.lastheader = None
782 self.lastheader = None
783 self.footer = None
783 self.footer = None
784
784
785 def flush(self, rev):
785 def flush(self, rev):
786 if rev in self.header:
786 if rev in self.header:
787 h = self.header[rev]
787 h = self.header[rev]
788 if h != self.lastheader:
788 if h != self.lastheader:
789 self.lastheader = h
789 self.lastheader = h
790 self.ui.write(h)
790 self.ui.write(h)
791 del self.header[rev]
791 del self.header[rev]
792 if rev in self.hunk:
792 if rev in self.hunk:
793 self.ui.write(self.hunk[rev])
793 self.ui.write(self.hunk[rev])
794 del self.hunk[rev]
794 del self.hunk[rev]
795 return 1
795 return 1
796 return 0
796 return 0
797
797
798 def close(self):
798 def close(self):
799 if self.footer:
799 if self.footer:
800 self.ui.write(self.footer)
800 self.ui.write(self.footer)
801
801
802 def show(self, ctx, copies=None, matchfn=None, **props):
802 def show(self, ctx, copies=None, matchfn=None, **props):
803 if self.buffered:
803 if self.buffered:
804 self.ui.pushbuffer()
804 self.ui.pushbuffer()
805 self._show(ctx, copies, matchfn, props)
805 self._show(ctx, copies, matchfn, props)
806 self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
806 self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
807 else:
807 else:
808 self._show(ctx, copies, matchfn, props)
808 self._show(ctx, copies, matchfn, props)
809
809
810 def _show(self, ctx, copies, matchfn, props):
810 def _show(self, ctx, copies, matchfn, props):
811 '''show a single changeset or file revision'''
811 '''show a single changeset or file revision'''
812 changenode = ctx.node()
812 changenode = ctx.node()
813 rev = ctx.rev()
813 rev = ctx.rev()
814
814
815 if self.ui.quiet:
815 if self.ui.quiet:
816 self.ui.write("%d:%s\n" % (rev, short(changenode)),
816 self.ui.write("%d:%s\n" % (rev, short(changenode)),
817 label='log.node')
817 label='log.node')
818 return
818 return
819
819
820 log = self.repo.changelog
820 log = self.repo.changelog
821 date = util.datestr(ctx.date())
821 date = util.datestr(ctx.date())
822
822
823 hexfunc = self.ui.debugflag and hex or short
823 hexfunc = self.ui.debugflag and hex or short
824
824
825 parents = [(p, hexfunc(log.node(p)))
825 parents = [(p, hexfunc(log.node(p)))
826 for p in self._meaningful_parentrevs(log, rev)]
826 for p in self._meaningful_parentrevs(log, rev)]
827
827
828 # i18n: column positioning for "hg log"
828 # i18n: column positioning for "hg log"
829 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)),
829 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)),
830 label='log.changeset changeset.%s' % ctx.phasestr())
830 label='log.changeset changeset.%s' % ctx.phasestr())
831
831
832 branch = ctx.branch()
832 branch = ctx.branch()
833 # don't show the default branch name
833 # don't show the default branch name
834 if branch != 'default':
834 if branch != 'default':
835 # i18n: column positioning for "hg log"
835 # i18n: column positioning for "hg log"
836 self.ui.write(_("branch: %s\n") % branch,
836 self.ui.write(_("branch: %s\n") % branch,
837 label='log.branch')
837 label='log.branch')
838 for bookmark in self.repo.nodebookmarks(changenode):
838 for bookmark in self.repo.nodebookmarks(changenode):
839 # i18n: column positioning for "hg log"
839 # i18n: column positioning for "hg log"
840 self.ui.write(_("bookmark: %s\n") % bookmark,
840 self.ui.write(_("bookmark: %s\n") % bookmark,
841 label='log.bookmark')
841 label='log.bookmark')
842 for tag in self.repo.nodetags(changenode):
842 for tag in self.repo.nodetags(changenode):
843 # i18n: column positioning for "hg log"
843 # i18n: column positioning for "hg log"
844 self.ui.write(_("tag: %s\n") % tag,
844 self.ui.write(_("tag: %s\n") % tag,
845 label='log.tag')
845 label='log.tag')
846 if self.ui.debugflag and ctx.phase():
846 if self.ui.debugflag and ctx.phase():
847 # i18n: column positioning for "hg log"
847 # i18n: column positioning for "hg log"
848 self.ui.write(_("phase: %s\n") % _(ctx.phasestr()),
848 self.ui.write(_("phase: %s\n") % _(ctx.phasestr()),
849 label='log.phase')
849 label='log.phase')
850 for parent in parents:
850 for parent in parents:
851 # i18n: column positioning for "hg log"
851 # i18n: column positioning for "hg log"
852 self.ui.write(_("parent: %d:%s\n") % parent,
852 self.ui.write(_("parent: %d:%s\n") % parent,
853 label='log.parent changeset.%s' % ctx.phasestr())
853 label='log.parent changeset.%s' % ctx.phasestr())
854
854
855 if self.ui.debugflag:
855 if self.ui.debugflag:
856 mnode = ctx.manifestnode()
856 mnode = ctx.manifestnode()
857 # i18n: column positioning for "hg log"
857 # i18n: column positioning for "hg log"
858 self.ui.write(_("manifest: %d:%s\n") %
858 self.ui.write(_("manifest: %d:%s\n") %
859 (self.repo.manifest.rev(mnode), hex(mnode)),
859 (self.repo.manifest.rev(mnode), hex(mnode)),
860 label='ui.debug log.manifest')
860 label='ui.debug log.manifest')
861 # i18n: column positioning for "hg log"
861 # i18n: column positioning for "hg log"
862 self.ui.write(_("user: %s\n") % ctx.user(),
862 self.ui.write(_("user: %s\n") % ctx.user(),
863 label='log.user')
863 label='log.user')
864 # i18n: column positioning for "hg log"
864 # i18n: column positioning for "hg log"
865 self.ui.write(_("date: %s\n") % date,
865 self.ui.write(_("date: %s\n") % date,
866 label='log.date')
866 label='log.date')
867
867
868 if self.ui.debugflag:
868 if self.ui.debugflag:
869 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
869 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
870 for key, value in zip([# i18n: column positioning for "hg log"
870 for key, value in zip([# i18n: column positioning for "hg log"
871 _("files:"),
871 _("files:"),
872 # i18n: column positioning for "hg log"
872 # i18n: column positioning for "hg log"
873 _("files+:"),
873 _("files+:"),
874 # i18n: column positioning for "hg log"
874 # i18n: column positioning for "hg log"
875 _("files-:")], files):
875 _("files-:")], files):
876 if value:
876 if value:
877 self.ui.write("%-12s %s\n" % (key, " ".join(value)),
877 self.ui.write("%-12s %s\n" % (key, " ".join(value)),
878 label='ui.debug log.files')
878 label='ui.debug log.files')
879 elif ctx.files() and self.ui.verbose:
879 elif ctx.files() and self.ui.verbose:
880 # i18n: column positioning for "hg log"
880 # i18n: column positioning for "hg log"
881 self.ui.write(_("files: %s\n") % " ".join(ctx.files()),
881 self.ui.write(_("files: %s\n") % " ".join(ctx.files()),
882 label='ui.note log.files')
882 label='ui.note log.files')
883 if copies and self.ui.verbose:
883 if copies and self.ui.verbose:
884 copies = ['%s (%s)' % c for c in copies]
884 copies = ['%s (%s)' % c for c in copies]
885 # i18n: column positioning for "hg log"
885 # i18n: column positioning for "hg log"
886 self.ui.write(_("copies: %s\n") % ' '.join(copies),
886 self.ui.write(_("copies: %s\n") % ' '.join(copies),
887 label='ui.note log.copies')
887 label='ui.note log.copies')
888
888
889 extra = ctx.extra()
889 extra = ctx.extra()
890 if extra and self.ui.debugflag:
890 if extra and self.ui.debugflag:
891 for key, value in sorted(extra.items()):
891 for key, value in sorted(extra.items()):
892 # i18n: column positioning for "hg log"
892 # i18n: column positioning for "hg log"
893 self.ui.write(_("extra: %s=%s\n")
893 self.ui.write(_("extra: %s=%s\n")
894 % (key, value.encode('string_escape')),
894 % (key, value.encode('string_escape')),
895 label='ui.debug log.extra')
895 label='ui.debug log.extra')
896
896
897 description = ctx.description().strip()
897 description = ctx.description().strip()
898 if description:
898 if description:
899 if self.ui.verbose:
899 if self.ui.verbose:
900 self.ui.write(_("description:\n"),
900 self.ui.write(_("description:\n"),
901 label='ui.note log.description')
901 label='ui.note log.description')
902 self.ui.write(description,
902 self.ui.write(description,
903 label='ui.note log.description')
903 label='ui.note log.description')
904 self.ui.write("\n\n")
904 self.ui.write("\n\n")
905 else:
905 else:
906 # i18n: column positioning for "hg log"
906 # i18n: column positioning for "hg log"
907 self.ui.write(_("summary: %s\n") %
907 self.ui.write(_("summary: %s\n") %
908 description.splitlines()[0],
908 description.splitlines()[0],
909 label='log.summary')
909 label='log.summary')
910 self.ui.write("\n")
910 self.ui.write("\n")
911
911
912 self.showpatch(changenode, matchfn)
912 self.showpatch(changenode, matchfn)
913
913
914 def showpatch(self, node, matchfn):
914 def showpatch(self, node, matchfn):
915 if not matchfn:
915 if not matchfn:
916 matchfn = self.patch
916 matchfn = self.patch
917 if matchfn:
917 if matchfn:
918 stat = self.diffopts.get('stat')
918 stat = self.diffopts.get('stat')
919 diff = self.diffopts.get('patch')
919 diff = self.diffopts.get('patch')
920 diffopts = patch.diffopts(self.ui, self.diffopts)
920 diffopts = patch.diffopts(self.ui, self.diffopts)
921 prev = self.repo.changelog.parents(node)[0]
921 prev = self.repo.changelog.parents(node)[0]
922 if stat:
922 if stat:
923 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
923 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
924 match=matchfn, stat=True)
924 match=matchfn, stat=True)
925 if diff:
925 if diff:
926 if stat:
926 if stat:
927 self.ui.write("\n")
927 self.ui.write("\n")
928 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
928 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
929 match=matchfn, stat=False)
929 match=matchfn, stat=False)
930 self.ui.write("\n")
930 self.ui.write("\n")
931
931
932 def _meaningful_parentrevs(self, log, rev):
932 def _meaningful_parentrevs(self, log, rev):
933 """Return list of meaningful (or all if debug) parentrevs for rev.
933 """Return list of meaningful (or all if debug) parentrevs for rev.
934
934
935 For merges (two non-nullrev revisions) both parents are meaningful.
935 For merges (two non-nullrev revisions) both parents are meaningful.
936 Otherwise the first parent revision is considered meaningful if it
936 Otherwise the first parent revision is considered meaningful if it
937 is not the preceding revision.
937 is not the preceding revision.
938 """
938 """
939 parents = log.parentrevs(rev)
939 parents = log.parentrevs(rev)
940 if not self.ui.debugflag and parents[1] == nullrev:
940 if not self.ui.debugflag and parents[1] == nullrev:
941 if parents[0] >= rev - 1:
941 if parents[0] >= rev - 1:
942 parents = []
942 parents = []
943 else:
943 else:
944 parents = [parents[0]]
944 parents = [parents[0]]
945 return parents
945 return parents
946
946
947
947
948 class changeset_templater(changeset_printer):
948 class changeset_templater(changeset_printer):
949 '''format changeset information.'''
949 '''format changeset information.'''
950
950
951 def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered):
951 def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered):
952 changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
952 changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
953 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
953 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
954 defaulttempl = {
954 defaulttempl = {
955 'parent': '{rev}:{node|formatnode} ',
955 'parent': '{rev}:{node|formatnode} ',
956 'manifest': '{rev}:{node|formatnode}',
956 'manifest': '{rev}:{node|formatnode}',
957 'file_copy': '{name} ({source})',
957 'file_copy': '{name} ({source})',
958 'extra': '{key}={value|stringescape}'
958 'extra': '{key}={value|stringescape}'
959 }
959 }
960 # filecopy is preserved for compatibility reasons
960 # filecopy is preserved for compatibility reasons
961 defaulttempl['filecopy'] = defaulttempl['file_copy']
961 defaulttempl['filecopy'] = defaulttempl['file_copy']
962 self.t = templater.templater(mapfile, {'formatnode': formatnode},
962 self.t = templater.templater(mapfile, {'formatnode': formatnode},
963 cache=defaulttempl)
963 cache=defaulttempl)
964 if tmpl:
964 if tmpl:
965 self.t.cache['changeset'] = tmpl
965 self.t.cache['changeset'] = tmpl
966
966
967 self.cache = {}
967 self.cache = {}
968
968
969 def _meaningful_parentrevs(self, ctx):
969 def _meaningful_parentrevs(self, ctx):
970 """Return list of meaningful (or all if debug) parentrevs for rev.
970 """Return list of meaningful (or all if debug) parentrevs for rev.
971 """
971 """
972 parents = ctx.parents()
972 parents = ctx.parents()
973 if len(parents) > 1:
973 if len(parents) > 1:
974 return parents
974 return parents
975 if self.ui.debugflag:
975 if self.ui.debugflag:
976 return [parents[0], self.repo['null']]
976 return [parents[0], self.repo['null']]
977 if parents[0].rev() >= ctx.rev() - 1:
977 if parents[0].rev() >= ctx.rev() - 1:
978 return []
978 return []
979 return parents
979 return parents
980
980
981 def _show(self, ctx, copies, matchfn, props):
981 def _show(self, ctx, copies, matchfn, props):
982 '''show a single changeset or file revision'''
982 '''show a single changeset or file revision'''
983
983
984 showlist = templatekw.showlist
984 showlist = templatekw.showlist
985
985
986 # showparents() behaviour depends on ui trace level which
986 # showparents() behaviour depends on ui trace level which
987 # causes unexpected behaviours at templating level and makes
987 # causes unexpected behaviours at templating level and makes
988 # it harder to extract it in a standalone function. Its
988 # it harder to extract it in a standalone function. Its
989 # behaviour cannot be changed so leave it here for now.
989 # behaviour cannot be changed so leave it here for now.
990 def showparents(**args):
990 def showparents(**args):
991 ctx = args['ctx']
991 ctx = args['ctx']
992 parents = [[('rev', p.rev()), ('node', p.hex())]
992 parents = [[('rev', p.rev()), ('node', p.hex())]
993 for p in self._meaningful_parentrevs(ctx)]
993 for p in self._meaningful_parentrevs(ctx)]
994 return showlist('parent', parents, **args)
994 return showlist('parent', parents, **args)
995
995
996 props = props.copy()
996 props = props.copy()
997 props.update(templatekw.keywords)
997 props.update(templatekw.keywords)
998 props['parents'] = showparents
998 props['parents'] = showparents
999 props['templ'] = self.t
999 props['templ'] = self.t
1000 props['ctx'] = ctx
1000 props['ctx'] = ctx
1001 props['repo'] = self.repo
1001 props['repo'] = self.repo
1002 props['revcache'] = {'copies': copies}
1002 props['revcache'] = {'copies': copies}
1003 props['cache'] = self.cache
1003 props['cache'] = self.cache
1004
1004
1005 # find correct templates for current mode
1005 # find correct templates for current mode
1006
1006
1007 tmplmodes = [
1007 tmplmodes = [
1008 (True, None),
1008 (True, None),
1009 (self.ui.verbose, 'verbose'),
1009 (self.ui.verbose, 'verbose'),
1010 (self.ui.quiet, 'quiet'),
1010 (self.ui.quiet, 'quiet'),
1011 (self.ui.debugflag, 'debug'),
1011 (self.ui.debugflag, 'debug'),
1012 ]
1012 ]
1013
1013
1014 types = {'header': '', 'footer':'', 'changeset': 'changeset'}
1014 types = {'header': '', 'footer':'', 'changeset': 'changeset'}
1015 for mode, postfix in tmplmodes:
1015 for mode, postfix in tmplmodes:
1016 for type in types:
1016 for type in types:
1017 cur = postfix and ('%s_%s' % (type, postfix)) or type
1017 cur = postfix and ('%s_%s' % (type, postfix)) or type
1018 if mode and cur in self.t:
1018 if mode and cur in self.t:
1019 types[type] = cur
1019 types[type] = cur
1020
1020
1021 try:
1021 try:
1022
1022
1023 # write header
1023 # write header
1024 if types['header']:
1024 if types['header']:
1025 h = templater.stringify(self.t(types['header'], **props))
1025 h = templater.stringify(self.t(types['header'], **props))
1026 if self.buffered:
1026 if self.buffered:
1027 self.header[ctx.rev()] = h
1027 self.header[ctx.rev()] = h
1028 else:
1028 else:
1029 if self.lastheader != h:
1029 if self.lastheader != h:
1030 self.lastheader = h
1030 self.lastheader = h
1031 self.ui.write(h)
1031 self.ui.write(h)
1032
1032
1033 # write changeset metadata, then patch if requested
1033 # write changeset metadata, then patch if requested
1034 key = types['changeset']
1034 key = types['changeset']
1035 self.ui.write(templater.stringify(self.t(key, **props)))
1035 self.ui.write(templater.stringify(self.t(key, **props)))
1036 self.showpatch(ctx.node(), matchfn)
1036 self.showpatch(ctx.node(), matchfn)
1037
1037
1038 if types['footer']:
1038 if types['footer']:
1039 if not self.footer:
1039 if not self.footer:
1040 self.footer = templater.stringify(self.t(types['footer'],
1040 self.footer = templater.stringify(self.t(types['footer'],
1041 **props))
1041 **props))
1042
1042
1043 except KeyError, inst:
1043 except KeyError, inst:
1044 msg = _("%s: no key named '%s'")
1044 msg = _("%s: no key named '%s'")
1045 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
1045 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
1046 except SyntaxError, inst:
1046 except SyntaxError, inst:
1047 raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0]))
1047 raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0]))
1048
1048
1049 def gettemplate(ui, tmpl, style):
1049 def gettemplate(ui, tmpl, style):
1050 """
1050 """
1051 Find the template matching the given template spec or style.
1051 Find the template matching the given template spec or style.
1052 """
1052 """
1053
1053
1054 # ui settings
1054 # ui settings
1055 if not tmpl and not style:
1055 if not tmpl and not style:
1056 tmpl = ui.config('ui', 'logtemplate')
1056 tmpl = ui.config('ui', 'logtemplate')
1057 if tmpl:
1057 if tmpl:
1058 try:
1058 try:
1059 tmpl = templater.parsestring(tmpl)
1059 tmpl = templater.parsestring(tmpl)
1060 except SyntaxError:
1060 except SyntaxError:
1061 tmpl = templater.parsestring(tmpl, quoted=False)
1061 tmpl = templater.parsestring(tmpl, quoted=False)
1062 return tmpl, None
1062 return tmpl, None
1063 else:
1063 else:
1064 style = util.expandpath(ui.config('ui', 'style', ''))
1064 style = util.expandpath(ui.config('ui', 'style', ''))
1065
1065
1066 if style:
1066 if style:
1067 mapfile = style
1067 mapfile = style
1068 if not os.path.split(mapfile)[0]:
1068 if not os.path.split(mapfile)[0]:
1069 mapname = (templater.templatepath('map-cmdline.' + mapfile)
1069 mapname = (templater.templatepath('map-cmdline.' + mapfile)
1070 or templater.templatepath(mapfile))
1070 or templater.templatepath(mapfile))
1071 if mapname:
1071 if mapname:
1072 mapfile = mapname
1072 mapfile = mapname
1073 return None, mapfile
1073 return None, mapfile
1074
1074
1075 if not tmpl:
1075 if not tmpl:
1076 return None, None
1076 return None, None
1077
1077
1078 # looks like a literal template?
1078 # looks like a literal template?
1079 if '{' in tmpl:
1079 if '{' in tmpl:
1080 return tmpl, None
1080 return tmpl, None
1081
1081
1082 # perhaps a stock style?
1082 # perhaps a stock style?
1083 if not os.path.split(tmpl)[0]:
1083 if not os.path.split(tmpl)[0]:
1084 mapname = (templater.templatepath('map-cmdline.' + tmpl)
1084 mapname = (templater.templatepath('map-cmdline.' + tmpl)
1085 or templater.templatepath(tmpl))
1085 or templater.templatepath(tmpl))
1086 if mapname and os.path.isfile(mapname):
1086 if mapname and os.path.isfile(mapname):
1087 return None, mapname
1087 return None, mapname
1088
1088
1089 # perhaps it's a reference to [templates]
1089 # perhaps it's a reference to [templates]
1090 t = ui.config('templates', tmpl)
1090 t = ui.config('templates', tmpl)
1091 if t:
1091 if t:
1092 try:
1092 try:
1093 tmpl = templater.parsestring(t)
1093 tmpl = templater.parsestring(t)
1094 except SyntaxError:
1094 except SyntaxError:
1095 tmpl = templater.parsestring(t, quoted=False)
1095 tmpl = templater.parsestring(t, quoted=False)
1096 return tmpl, None
1096 return tmpl, None
1097
1097
1098 # perhaps it's a path to a map or a template
1098 # perhaps it's a path to a map or a template
1099 if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl):
1099 if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl):
1100 # is it a mapfile for a style?
1100 # is it a mapfile for a style?
1101 if os.path.basename(tmpl).startswith("map-"):
1101 if os.path.basename(tmpl).startswith("map-"):
1102 return None, os.path.realpath(tmpl)
1102 return None, os.path.realpath(tmpl)
1103 tmpl = open(tmpl).read()
1103 tmpl = open(tmpl).read()
1104 return tmpl, None
1104 return tmpl, None
1105
1105
1106 # constant string?
1106 # constant string?
1107 return tmpl, None
1107 return tmpl, None
1108
1108
1109 def show_changeset(ui, repo, opts, buffered=False):
1109 def show_changeset(ui, repo, opts, buffered=False):
1110 """show one changeset using template or regular display.
1110 """show one changeset using template or regular display.
1111
1111
1112 Display format will be the first non-empty hit of:
1112 Display format will be the first non-empty hit of:
1113 1. option 'template'
1113 1. option 'template'
1114 2. option 'style'
1114 2. option 'style'
1115 3. [ui] setting 'logtemplate'
1115 3. [ui] setting 'logtemplate'
1116 4. [ui] setting 'style'
1116 4. [ui] setting 'style'
1117 If all of these values are either the unset or the empty string,
1117 If all of these values are either the unset or the empty string,
1118 regular display via changeset_printer() is done.
1118 regular display via changeset_printer() is done.
1119 """
1119 """
1120 # options
1120 # options
1121 patch = None
1121 patch = None
1122 if opts.get('patch') or opts.get('stat'):
1122 if opts.get('patch') or opts.get('stat'):
1123 patch = scmutil.matchall(repo)
1123 patch = scmutil.matchall(repo)
1124
1124
1125 tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style'))
1125 tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style'))
1126
1126
1127 if not tmpl and not mapfile:
1127 if not tmpl and not mapfile:
1128 return changeset_printer(ui, repo, patch, opts, buffered)
1128 return changeset_printer(ui, repo, patch, opts, buffered)
1129
1129
1130 try:
1130 try:
1131 t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered)
1131 t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered)
1132 except SyntaxError, inst:
1132 except SyntaxError, inst:
1133 raise util.Abort(inst.args[0])
1133 raise util.Abort(inst.args[0])
1134 return t
1134 return t
1135
1135
1136 def showmarker(ui, marker):
1136 def showmarker(ui, marker):
1137 """utility function to display obsolescence marker in a readable way
1137 """utility function to display obsolescence marker in a readable way
1138
1138
1139 To be used by debug function."""
1139 To be used by debug function."""
1140 ui.write(hex(marker.precnode()))
1140 ui.write(hex(marker.precnode()))
1141 for repl in marker.succnodes():
1141 for repl in marker.succnodes():
1142 ui.write(' ')
1142 ui.write(' ')
1143 ui.write(hex(repl))
1143 ui.write(hex(repl))
1144 ui.write(' %X ' % marker._data[2])
1144 ui.write(' %X ' % marker._data[2])
1145 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
1145 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
1146 sorted(marker.metadata().items()))))
1146 sorted(marker.metadata().items()))))
1147 ui.write('\n')
1147 ui.write('\n')
1148
1148
1149 def finddate(ui, repo, date):
1149 def finddate(ui, repo, date):
1150 """Find the tipmost changeset that matches the given date spec"""
1150 """Find the tipmost changeset that matches the given date spec"""
1151
1151
1152 df = util.matchdate(date)
1152 df = util.matchdate(date)
1153 m = scmutil.matchall(repo)
1153 m = scmutil.matchall(repo)
1154 results = {}
1154 results = {}
1155
1155
1156 def prep(ctx, fns):
1156 def prep(ctx, fns):
1157 d = ctx.date()
1157 d = ctx.date()
1158 if df(d[0]):
1158 if df(d[0]):
1159 results[ctx.rev()] = d
1159 results[ctx.rev()] = d
1160
1160
1161 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
1161 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
1162 rev = ctx.rev()
1162 rev = ctx.rev()
1163 if rev in results:
1163 if rev in results:
1164 ui.status(_("found revision %s from %s\n") %
1164 ui.status(_("found revision %s from %s\n") %
1165 (rev, util.datestr(results[rev])))
1165 (rev, util.datestr(results[rev])))
1166 return str(rev)
1166 return str(rev)
1167
1167
1168 raise util.Abort(_("revision matching date not found"))
1168 raise util.Abort(_("revision matching date not found"))
1169
1169
1170 def increasingwindows(windowsize=8, sizelimit=512):
1170 def increasingwindows(windowsize=8, sizelimit=512):
1171 while True:
1171 while True:
1172 yield windowsize
1172 yield windowsize
1173 if windowsize < sizelimit:
1173 if windowsize < sizelimit:
1174 windowsize *= 2
1174 windowsize *= 2
1175
1175
1176 class FileWalkError(Exception):
1176 class FileWalkError(Exception):
1177 pass
1177 pass
1178
1178
1179 def walkfilerevs(repo, match, follow, revs, fncache):
1179 def walkfilerevs(repo, match, follow, revs, fncache):
1180 '''Walks the file history for the matched files.
1180 '''Walks the file history for the matched files.
1181
1181
1182 Returns the changeset revs that are involved in the file history.
1182 Returns the changeset revs that are involved in the file history.
1183
1183
1184 Throws FileWalkError if the file history can't be walked using
1184 Throws FileWalkError if the file history can't be walked using
1185 filelogs alone.
1185 filelogs alone.
1186 '''
1186 '''
1187 wanted = set()
1187 wanted = set()
1188 copies = []
1188 copies = []
1189 minrev, maxrev = min(revs), max(revs)
1189 minrev, maxrev = min(revs), max(revs)
1190 def filerevgen(filelog, last):
1190 def filerevgen(filelog, last):
1191 """
1191 """
1192 Only files, no patterns. Check the history of each file.
1192 Only files, no patterns. Check the history of each file.
1193
1193
1194 Examines filelog entries within minrev, maxrev linkrev range
1194 Examines filelog entries within minrev, maxrev linkrev range
1195 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
1195 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
1196 tuples in backwards order
1196 tuples in backwards order
1197 """
1197 """
1198 cl_count = len(repo)
1198 cl_count = len(repo)
1199 revs = []
1199 revs = []
1200 for j in xrange(0, last + 1):
1200 for j in xrange(0, last + 1):
1201 linkrev = filelog.linkrev(j)
1201 linkrev = filelog.linkrev(j)
1202 if linkrev < minrev:
1202 if linkrev < minrev:
1203 continue
1203 continue
1204 # only yield rev for which we have the changelog, it can
1204 # only yield rev for which we have the changelog, it can
1205 # happen while doing "hg log" during a pull or commit
1205 # happen while doing "hg log" during a pull or commit
1206 if linkrev >= cl_count:
1206 if linkrev >= cl_count:
1207 break
1207 break
1208
1208
1209 parentlinkrevs = []
1209 parentlinkrevs = []
1210 for p in filelog.parentrevs(j):
1210 for p in filelog.parentrevs(j):
1211 if p != nullrev:
1211 if p != nullrev:
1212 parentlinkrevs.append(filelog.linkrev(p))
1212 parentlinkrevs.append(filelog.linkrev(p))
1213 n = filelog.node(j)
1213 n = filelog.node(j)
1214 revs.append((linkrev, parentlinkrevs,
1214 revs.append((linkrev, parentlinkrevs,
1215 follow and filelog.renamed(n)))
1215 follow and filelog.renamed(n)))
1216
1216
1217 return reversed(revs)
1217 return reversed(revs)
1218 def iterfiles():
1218 def iterfiles():
1219 pctx = repo['.']
1219 pctx = repo['.']
1220 for filename in match.files():
1220 for filename in match.files():
1221 if follow:
1221 if follow:
1222 if filename not in pctx:
1222 if filename not in pctx:
1223 raise util.Abort(_('cannot follow file not in parent '
1223 raise util.Abort(_('cannot follow file not in parent '
1224 'revision: "%s"') % filename)
1224 'revision: "%s"') % filename)
1225 yield filename, pctx[filename].filenode()
1225 yield filename, pctx[filename].filenode()
1226 else:
1226 else:
1227 yield filename, None
1227 yield filename, None
1228 for filename_node in copies:
1228 for filename_node in copies:
1229 yield filename_node
1229 yield filename_node
1230
1230
1231 for file_, node in iterfiles():
1231 for file_, node in iterfiles():
1232 filelog = repo.file(file_)
1232 filelog = repo.file(file_)
1233 if not len(filelog):
1233 if not len(filelog):
1234 if node is None:
1234 if node is None:
1235 # A zero count may be a directory or deleted file, so
1235 # A zero count may be a directory or deleted file, so
1236 # try to find matching entries on the slow path.
1236 # try to find matching entries on the slow path.
1237 if follow:
1237 if follow:
1238 raise util.Abort(
1238 raise util.Abort(
1239 _('cannot follow nonexistent file: "%s"') % file_)
1239 _('cannot follow nonexistent file: "%s"') % file_)
1240 raise FileWalkError("Cannot walk via filelog")
1240 raise FileWalkError("Cannot walk via filelog")
1241 else:
1241 else:
1242 continue
1242 continue
1243
1243
1244 if node is None:
1244 if node is None:
1245 last = len(filelog) - 1
1245 last = len(filelog) - 1
1246 else:
1246 else:
1247 last = filelog.rev(node)
1247 last = filelog.rev(node)
1248
1248
1249
1249
1250 # keep track of all ancestors of the file
1250 # keep track of all ancestors of the file
1251 ancestors = set([filelog.linkrev(last)])
1251 ancestors = set([filelog.linkrev(last)])
1252
1252
1253 # iterate from latest to oldest revision
1253 # iterate from latest to oldest revision
1254 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
1254 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
1255 if not follow:
1255 if not follow:
1256 if rev > maxrev:
1256 if rev > maxrev:
1257 continue
1257 continue
1258 else:
1258 else:
1259 # Note that last might not be the first interesting
1259 # Note that last might not be the first interesting
1260 # rev to us:
1260 # rev to us:
1261 # if the file has been changed after maxrev, we'll
1261 # if the file has been changed after maxrev, we'll
1262 # have linkrev(last) > maxrev, and we still need
1262 # have linkrev(last) > maxrev, and we still need
1263 # to explore the file graph
1263 # to explore the file graph
1264 if rev not in ancestors:
1264 if rev not in ancestors:
1265 continue
1265 continue
1266 # XXX insert 1327 fix here
1266 # XXX insert 1327 fix here
1267 if flparentlinkrevs:
1267 if flparentlinkrevs:
1268 ancestors.update(flparentlinkrevs)
1268 ancestors.update(flparentlinkrevs)
1269
1269
1270 fncache.setdefault(rev, []).append(file_)
1270 fncache.setdefault(rev, []).append(file_)
1271 wanted.add(rev)
1271 wanted.add(rev)
1272 if copied:
1272 if copied:
1273 copies.append(copied)
1273 copies.append(copied)
1274
1274
1275 return wanted
1275 return wanted
1276
1276
1277 def walkchangerevs(repo, match, opts, prepare):
1277 def walkchangerevs(repo, match, opts, prepare):
1278 '''Iterate over files and the revs in which they changed.
1278 '''Iterate over files and the revs in which they changed.
1279
1279
1280 Callers most commonly need to iterate backwards over the history
1280 Callers most commonly need to iterate backwards over the history
1281 in which they are interested. Doing so has awful (quadratic-looking)
1281 in which they are interested. Doing so has awful (quadratic-looking)
1282 performance, so we use iterators in a "windowed" way.
1282 performance, so we use iterators in a "windowed" way.
1283
1283
1284 We walk a window of revisions in the desired order. Within the
1284 We walk a window of revisions in the desired order. Within the
1285 window, we first walk forwards to gather data, then in the desired
1285 window, we first walk forwards to gather data, then in the desired
1286 order (usually backwards) to display it.
1286 order (usually backwards) to display it.
1287
1287
1288 This function returns an iterator yielding contexts. Before
1288 This function returns an iterator yielding contexts. Before
1289 yielding each context, the iterator will first call the prepare
1289 yielding each context, the iterator will first call the prepare
1290 function on each context in the window in forward order.'''
1290 function on each context in the window in forward order.'''
1291
1291
1292 follow = opts.get('follow') or opts.get('follow_first')
1292 follow = opts.get('follow') or opts.get('follow_first')
1293
1293
1294 if opts.get('rev'):
1294 if opts.get('rev'):
1295 revs = scmutil.revrange(repo, opts.get('rev'))
1295 revs = scmutil.revrange(repo, opts.get('rev'))
1296 elif follow:
1296 elif follow:
1297 revs = repo.revs('reverse(:.)')
1297 revs = repo.revs('reverse(:.)')
1298 else:
1298 else:
1299 revs = revset.spanset(repo)
1299 revs = revset.spanset(repo)
1300 revs.reverse()
1300 revs.reverse()
1301 if not revs:
1301 if not revs:
1302 return []
1302 return []
1303 wanted = set()
1303 wanted = set()
1304 slowpath = match.anypats() or (match.files() and opts.get('removed'))
1304 slowpath = match.anypats() or (match.files() and opts.get('removed'))
1305 fncache = {}
1305 fncache = {}
1306 change = repo.changectx
1306 change = repo.changectx
1307
1307
1308 # First step is to fill wanted, the set of revisions that we want to yield.
1308 # First step is to fill wanted, the set of revisions that we want to yield.
1309 # When it does not induce extra cost, we also fill fncache for revisions in
1309 # When it does not induce extra cost, we also fill fncache for revisions in
1310 # wanted: a cache of filenames that were changed (ctx.files()) and that
1310 # wanted: a cache of filenames that were changed (ctx.files()) and that
1311 # match the file filtering conditions.
1311 # match the file filtering conditions.
1312
1312
1313 if not slowpath and not match.files():
1313 if not slowpath and not match.files():
1314 # No files, no patterns. Display all revs.
1314 # No files, no patterns. Display all revs.
1315 wanted = revs
1315 wanted = revs
1316
1316
1317 if not slowpath and match.files():
1317 if not slowpath and match.files():
1318 # We only have to read through the filelog to find wanted revisions
1318 # We only have to read through the filelog to find wanted revisions
1319
1319
1320 try:
1320 try:
1321 wanted = walkfilerevs(repo, match, follow, revs, fncache)
1321 wanted = walkfilerevs(repo, match, follow, revs, fncache)
1322 except FileWalkError:
1322 except FileWalkError:
1323 slowpath = True
1323 slowpath = True
1324
1324
1325 # We decided to fall back to the slowpath because at least one
1325 # We decided to fall back to the slowpath because at least one
1326 # of the paths was not a file. Check to see if at least one of them
1326 # of the paths was not a file. Check to see if at least one of them
1327 # existed in history, otherwise simply return
1327 # existed in history, otherwise simply return
1328 for path in match.files():
1328 for path in match.files():
1329 if path == '.' or path in repo.store:
1329 if path == '.' or path in repo.store:
1330 break
1330 break
1331 else:
1331 else:
1332 return []
1332 return []
1333
1333
1334 if slowpath:
1334 if slowpath:
1335 # We have to read the changelog to match filenames against
1335 # We have to read the changelog to match filenames against
1336 # changed files
1336 # changed files
1337
1337
1338 if follow:
1338 if follow:
1339 raise util.Abort(_('can only follow copies/renames for explicit '
1339 raise util.Abort(_('can only follow copies/renames for explicit '
1340 'filenames'))
1340 'filenames'))
1341
1341
1342 # The slow path checks files modified in every changeset.
1342 # The slow path checks files modified in every changeset.
1343 # This is really slow on large repos, so compute the set lazily.
1343 # This is really slow on large repos, so compute the set lazily.
1344 class lazywantedset(object):
1344 class lazywantedset(object):
1345 def __init__(self):
1345 def __init__(self):
1346 self.set = set()
1346 self.set = set()
1347 self.revs = set(revs)
1347 self.revs = set(revs)
1348
1348
1349 # No need to worry about locality here because it will be accessed
1349 # No need to worry about locality here because it will be accessed
1350 # in the same order as the increasing window below.
1350 # in the same order as the increasing window below.
1351 def __contains__(self, value):
1351 def __contains__(self, value):
1352 if value in self.set:
1352 if value in self.set:
1353 return True
1353 return True
1354 elif not value in self.revs:
1354 elif not value in self.revs:
1355 return False
1355 return False
1356 else:
1356 else:
1357 self.revs.discard(value)
1357 self.revs.discard(value)
1358 ctx = change(value)
1358 ctx = change(value)
1359 matches = filter(match, ctx.files())
1359 matches = filter(match, ctx.files())
1360 if matches:
1360 if matches:
1361 fncache[value] = matches
1361 fncache[value] = matches
1362 self.set.add(value)
1362 self.set.add(value)
1363 return True
1363 return True
1364 return False
1364 return False
1365
1365
1366 def discard(self, value):
1366 def discard(self, value):
1367 self.revs.discard(value)
1367 self.revs.discard(value)
1368 self.set.discard(value)
1368 self.set.discard(value)
1369
1369
1370 wanted = lazywantedset()
1370 wanted = lazywantedset()
1371
1371
1372 class followfilter(object):
1372 class followfilter(object):
1373 def __init__(self, onlyfirst=False):
1373 def __init__(self, onlyfirst=False):
1374 self.startrev = nullrev
1374 self.startrev = nullrev
1375 self.roots = set()
1375 self.roots = set()
1376 self.onlyfirst = onlyfirst
1376 self.onlyfirst = onlyfirst
1377
1377
1378 def match(self, rev):
1378 def match(self, rev):
1379 def realparents(rev):
1379 def realparents(rev):
1380 if self.onlyfirst:
1380 if self.onlyfirst:
1381 return repo.changelog.parentrevs(rev)[0:1]
1381 return repo.changelog.parentrevs(rev)[0:1]
1382 else:
1382 else:
1383 return filter(lambda x: x != nullrev,
1383 return filter(lambda x: x != nullrev,
1384 repo.changelog.parentrevs(rev))
1384 repo.changelog.parentrevs(rev))
1385
1385
1386 if self.startrev == nullrev:
1386 if self.startrev == nullrev:
1387 self.startrev = rev
1387 self.startrev = rev
1388 return True
1388 return True
1389
1389
1390 if rev > self.startrev:
1390 if rev > self.startrev:
1391 # forward: all descendants
1391 # forward: all descendants
1392 if not self.roots:
1392 if not self.roots:
1393 self.roots.add(self.startrev)
1393 self.roots.add(self.startrev)
1394 for parent in realparents(rev):
1394 for parent in realparents(rev):
1395 if parent in self.roots:
1395 if parent in self.roots:
1396 self.roots.add(rev)
1396 self.roots.add(rev)
1397 return True
1397 return True
1398 else:
1398 else:
1399 # backwards: all parents
1399 # backwards: all parents
1400 if not self.roots:
1400 if not self.roots:
1401 self.roots.update(realparents(self.startrev))
1401 self.roots.update(realparents(self.startrev))
1402 if rev in self.roots:
1402 if rev in self.roots:
1403 self.roots.remove(rev)
1403 self.roots.remove(rev)
1404 self.roots.update(realparents(rev))
1404 self.roots.update(realparents(rev))
1405 return True
1405 return True
1406
1406
1407 return False
1407 return False
1408
1408
1409 # it might be worthwhile to do this in the iterator if the rev range
1409 # it might be worthwhile to do this in the iterator if the rev range
1410 # is descending and the prune args are all within that range
1410 # is descending and the prune args are all within that range
1411 for rev in opts.get('prune', ()):
1411 for rev in opts.get('prune', ()):
1412 rev = repo[rev].rev()
1412 rev = repo[rev].rev()
1413 ff = followfilter()
1413 ff = followfilter()
1414 stop = min(revs[0], revs[-1])
1414 stop = min(revs[0], revs[-1])
1415 for x in xrange(rev, stop - 1, -1):
1415 for x in xrange(rev, stop - 1, -1):
1416 if ff.match(x):
1416 if ff.match(x):
1417 wanted = wanted - [x]
1417 wanted = wanted - [x]
1418
1418
1419 # Now that wanted is correctly initialized, we can iterate over the
1419 # Now that wanted is correctly initialized, we can iterate over the
1420 # revision range, yielding only revisions in wanted.
1420 # revision range, yielding only revisions in wanted.
1421 def iterate():
1421 def iterate():
1422 if follow and not match.files():
1422 if follow and not match.files():
1423 ff = followfilter(onlyfirst=opts.get('follow_first'))
1423 ff = followfilter(onlyfirst=opts.get('follow_first'))
1424 def want(rev):
1424 def want(rev):
1425 return ff.match(rev) and rev in wanted
1425 return ff.match(rev) and rev in wanted
1426 else:
1426 else:
1427 def want(rev):
1427 def want(rev):
1428 return rev in wanted
1428 return rev in wanted
1429
1429
1430 it = iter(revs)
1430 it = iter(revs)
1431 stopiteration = False
1431 stopiteration = False
1432 for windowsize in increasingwindows():
1432 for windowsize in increasingwindows():
1433 nrevs = []
1433 nrevs = []
1434 for i in xrange(windowsize):
1434 for i in xrange(windowsize):
1435 try:
1435 try:
1436 rev = it.next()
1436 rev = it.next()
1437 if want(rev):
1437 if want(rev):
1438 nrevs.append(rev)
1438 nrevs.append(rev)
1439 except (StopIteration):
1439 except (StopIteration):
1440 stopiteration = True
1440 stopiteration = True
1441 break
1441 break
1442 for rev in sorted(nrevs):
1442 for rev in sorted(nrevs):
1443 fns = fncache.get(rev)
1443 fns = fncache.get(rev)
1444 ctx = change(rev)
1444 ctx = change(rev)
1445 if not fns:
1445 if not fns:
1446 def fns_generator():
1446 def fns_generator():
1447 for f in ctx.files():
1447 for f in ctx.files():
1448 if match(f):
1448 if match(f):
1449 yield f
1449 yield f
1450 fns = fns_generator()
1450 fns = fns_generator()
1451 prepare(ctx, fns)
1451 prepare(ctx, fns)
1452 for rev in nrevs:
1452 for rev in nrevs:
1453 yield change(rev)
1453 yield change(rev)
1454
1454
1455 if stopiteration:
1455 if stopiteration:
1456 break
1456 break
1457
1457
1458 return iterate()
1458 return iterate()
1459
1459
1460 def _makegraphfilematcher(repo, pats, followfirst):
1460 def _makegraphfilematcher(repo, pats, followfirst):
1461 # When displaying a revision with --patch --follow FILE, we have
1461 # When displaying a revision with --patch --follow FILE, we have
1462 # to know which file of the revision must be diffed. With
1462 # to know which file of the revision must be diffed. With
1463 # --follow, we want the names of the ancestors of FILE in the
1463 # --follow, we want the names of the ancestors of FILE in the
1464 # revision, stored in "fcache". "fcache" is populated by
1464 # revision, stored in "fcache". "fcache" is populated by
1465 # reproducing the graph traversal already done by --follow revset
1465 # reproducing the graph traversal already done by --follow revset
1466 # and relating linkrevs to file names (which is not "correct" but
1466 # and relating linkrevs to file names (which is not "correct" but
1467 # good enough).
1467 # good enough).
1468 fcache = {}
1468 fcache = {}
1469 fcacheready = [False]
1469 fcacheready = [False]
1470 pctx = repo['.']
1470 pctx = repo['.']
1471 wctx = repo[None]
1471 wctx = repo[None]
1472
1472
1473 def populate():
1473 def populate():
1474 for fn in pats:
1474 for fn in pats:
1475 for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)):
1475 for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)):
1476 for c in i:
1476 for c in i:
1477 fcache.setdefault(c.linkrev(), set()).add(c.path())
1477 fcache.setdefault(c.linkrev(), set()).add(c.path())
1478
1478
1479 def filematcher(rev):
1479 def filematcher(rev):
1480 if not fcacheready[0]:
1480 if not fcacheready[0]:
1481 # Lazy initialization
1481 # Lazy initialization
1482 fcacheready[0] = True
1482 fcacheready[0] = True
1483 populate()
1483 populate()
1484 return scmutil.match(wctx, fcache.get(rev, []), default='path')
1484 return scmutil.match(wctx, fcache.get(rev, []), default='path')
1485
1485
1486 return filematcher
1486 return filematcher
1487
1487
1488 def _makegraphlogrevset(repo, pats, opts, revs):
1488 def _makegraphlogrevset(repo, pats, opts, revs):
1489 """Return (expr, filematcher) where expr is a revset string built
1489 """Return (expr, filematcher) where expr is a revset string built
1490 from log options and file patterns or None. If --stat or --patch
1490 from log options and file patterns or None. If --stat or --patch
1491 are not passed filematcher is None. Otherwise it is a callable
1491 are not passed filematcher is None. Otherwise it is a callable
1492 taking a revision number and returning a match objects filtering
1492 taking a revision number and returning a match objects filtering
1493 the files to be detailed when displaying the revision.
1493 the files to be detailed when displaying the revision.
1494 """
1494 """
1495 opt2revset = {
1495 opt2revset = {
1496 'no_merges': ('not merge()', None),
1496 'no_merges': ('not merge()', None),
1497 'only_merges': ('merge()', None),
1497 'only_merges': ('merge()', None),
1498 '_ancestors': ('ancestors(%(val)s)', None),
1498 '_ancestors': ('ancestors(%(val)s)', None),
1499 '_fancestors': ('_firstancestors(%(val)s)', None),
1499 '_fancestors': ('_firstancestors(%(val)s)', None),
1500 '_descendants': ('descendants(%(val)s)', None),
1500 '_descendants': ('descendants(%(val)s)', None),
1501 '_fdescendants': ('_firstdescendants(%(val)s)', None),
1501 '_fdescendants': ('_firstdescendants(%(val)s)', None),
1502 '_matchfiles': ('_matchfiles(%(val)s)', None),
1502 '_matchfiles': ('_matchfiles(%(val)s)', None),
1503 'date': ('date(%(val)r)', None),
1503 'date': ('date(%(val)r)', None),
1504 'branch': ('branch(%(val)r)', ' or '),
1504 'branch': ('branch(%(val)r)', ' or '),
1505 '_patslog': ('filelog(%(val)r)', ' or '),
1505 '_patslog': ('filelog(%(val)r)', ' or '),
1506 '_patsfollow': ('follow(%(val)r)', ' or '),
1506 '_patsfollow': ('follow(%(val)r)', ' or '),
1507 '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
1507 '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
1508 'keyword': ('keyword(%(val)r)', ' or '),
1508 'keyword': ('keyword(%(val)r)', ' or '),
1509 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '),
1509 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '),
1510 'user': ('user(%(val)r)', ' or '),
1510 'user': ('user(%(val)r)', ' or '),
1511 }
1511 }
1512
1512
1513 opts = dict(opts)
1513 opts = dict(opts)
1514 # follow or not follow?
1514 # follow or not follow?
1515 follow = opts.get('follow') or opts.get('follow_first')
1515 follow = opts.get('follow') or opts.get('follow_first')
1516 followfirst = opts.get('follow_first') and 1 or 0
1516 followfirst = opts.get('follow_first') and 1 or 0
1517 # --follow with FILE behaviour depends on revs...
1517 # --follow with FILE behaviour depends on revs...
1518 it = iter(revs)
1518 it = iter(revs)
1519 startrev = it.next()
1519 startrev = it.next()
1520 try:
1520 try:
1521 followdescendants = startrev < it.next()
1521 followdescendants = startrev < it.next()
1522 except (StopIteration):
1522 except (StopIteration):
1523 followdescendants = False
1523 followdescendants = False
1524
1524
1525 # branch and only_branch are really aliases and must be handled at
1525 # branch and only_branch are really aliases and must be handled at
1526 # the same time
1526 # the same time
1527 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
1527 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
1528 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
1528 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
1529 # pats/include/exclude are passed to match.match() directly in
1529 # pats/include/exclude are passed to match.match() directly in
1530 # _matchfiles() revset but walkchangerevs() builds its matcher with
1530 # _matchfiles() revset but walkchangerevs() builds its matcher with
1531 # scmutil.match(). The difference is input pats are globbed on
1531 # scmutil.match(). The difference is input pats are globbed on
1532 # platforms without shell expansion (windows).
1532 # platforms without shell expansion (windows).
1533 pctx = repo[None]
1533 pctx = repo[None]
1534 match, pats = scmutil.matchandpats(pctx, pats, opts)
1534 match, pats = scmutil.matchandpats(pctx, pats, opts)
1535 slowpath = match.anypats() or (match.files() and opts.get('removed'))
1535 slowpath = match.anypats() or (match.files() and opts.get('removed'))
1536 if not slowpath:
1536 if not slowpath:
1537 for f in match.files():
1537 for f in match.files():
1538 if follow and f not in pctx:
1538 if follow and f not in pctx:
1539 raise util.Abort(_('cannot follow file not in parent '
1539 raise util.Abort(_('cannot follow file not in parent '
1540 'revision: "%s"') % f)
1540 'revision: "%s"') % f)
1541 filelog = repo.file(f)
1541 filelog = repo.file(f)
1542 if not filelog:
1542 if not filelog:
1543 # A zero count may be a directory or deleted file, so
1543 # A zero count may be a directory or deleted file, so
1544 # try to find matching entries on the slow path.
1544 # try to find matching entries on the slow path.
1545 if follow:
1545 if follow:
1546 raise util.Abort(
1546 raise util.Abort(
1547 _('cannot follow nonexistent file: "%s"') % f)
1547 _('cannot follow nonexistent file: "%s"') % f)
1548 slowpath = True
1548 slowpath = True
1549
1549
1550 # We decided to fall back to the slowpath because at least one
1550 # We decided to fall back to the slowpath because at least one
1551 # of the paths was not a file. Check to see if at least one of them
1551 # of the paths was not a file. Check to see if at least one of them
1552 # existed in history - in that case, we'll continue down the
1552 # existed in history - in that case, we'll continue down the
1553 # slowpath; otherwise, we can turn off the slowpath
1553 # slowpath; otherwise, we can turn off the slowpath
1554 if slowpath:
1554 if slowpath:
1555 for path in match.files():
1555 for path in match.files():
1556 if path == '.' or path in repo.store:
1556 if path == '.' or path in repo.store:
1557 break
1557 break
1558 else:
1558 else:
1559 slowpath = False
1559 slowpath = False
1560
1560
1561 if slowpath:
1561 if slowpath:
1562 # See walkchangerevs() slow path.
1562 # See walkchangerevs() slow path.
1563 #
1563 #
1564 if follow:
1564 if follow:
1565 raise util.Abort(_('can only follow copies/renames for explicit '
1565 raise util.Abort(_('can only follow copies/renames for explicit '
1566 'filenames'))
1566 'filenames'))
1567 # pats/include/exclude cannot be represented as separate
1567 # pats/include/exclude cannot be represented as separate
1568 # revset expressions as their filtering logic applies at file
1568 # revset expressions as their filtering logic applies at file
1569 # level. For instance "-I a -X a" matches a revision touching
1569 # level. For instance "-I a -X a" matches a revision touching
1570 # "a" and "b" while "file(a) and not file(b)" does
1570 # "a" and "b" while "file(a) and not file(b)" does
1571 # not. Besides, filesets are evaluated against the working
1571 # not. Besides, filesets are evaluated against the working
1572 # directory.
1572 # directory.
1573 matchargs = ['r:', 'd:relpath']
1573 matchargs = ['r:', 'd:relpath']
1574 for p in pats:
1574 for p in pats:
1575 matchargs.append('p:' + p)
1575 matchargs.append('p:' + p)
1576 for p in opts.get('include', []):
1576 for p in opts.get('include', []):
1577 matchargs.append('i:' + p)
1577 matchargs.append('i:' + p)
1578 for p in opts.get('exclude', []):
1578 for p in opts.get('exclude', []):
1579 matchargs.append('x:' + p)
1579 matchargs.append('x:' + p)
1580 matchargs = ','.join(('%r' % p) for p in matchargs)
1580 matchargs = ','.join(('%r' % p) for p in matchargs)
1581 opts['_matchfiles'] = matchargs
1581 opts['_matchfiles'] = matchargs
1582 else:
1582 else:
1583 if follow:
1583 if follow:
1584 fpats = ('_patsfollow', '_patsfollowfirst')
1584 fpats = ('_patsfollow', '_patsfollowfirst')
1585 fnopats = (('_ancestors', '_fancestors'),
1585 fnopats = (('_ancestors', '_fancestors'),
1586 ('_descendants', '_fdescendants'))
1586 ('_descendants', '_fdescendants'))
1587 if pats:
1587 if pats:
1588 # follow() revset interprets its file argument as a
1588 # follow() revset interprets its file argument as a
1589 # manifest entry, so use match.files(), not pats.
1589 # manifest entry, so use match.files(), not pats.
1590 opts[fpats[followfirst]] = list(match.files())
1590 opts[fpats[followfirst]] = list(match.files())
1591 else:
1591 else:
1592 opts[fnopats[followdescendants][followfirst]] = str(startrev)
1592 opts[fnopats[followdescendants][followfirst]] = str(startrev)
1593 else:
1593 else:
1594 opts['_patslog'] = list(pats)
1594 opts['_patslog'] = list(pats)
1595
1595
1596 filematcher = None
1596 filematcher = None
1597 if opts.get('patch') or opts.get('stat'):
1597 if opts.get('patch') or opts.get('stat'):
1598 if follow:
1598 if follow:
1599 filematcher = _makegraphfilematcher(repo, pats, followfirst)
1599 filematcher = _makegraphfilematcher(repo, pats, followfirst)
1600 else:
1600 else:
1601 filematcher = lambda rev: match
1601 filematcher = lambda rev: match
1602
1602
1603 expr = []
1603 expr = []
1604 for op, val in opts.iteritems():
1604 for op, val in opts.iteritems():
1605 if not val:
1605 if not val:
1606 continue
1606 continue
1607 if op not in opt2revset:
1607 if op not in opt2revset:
1608 continue
1608 continue
1609 revop, andor = opt2revset[op]
1609 revop, andor = opt2revset[op]
1610 if '%(val)' not in revop:
1610 if '%(val)' not in revop:
1611 expr.append(revop)
1611 expr.append(revop)
1612 else:
1612 else:
1613 if not isinstance(val, list):
1613 if not isinstance(val, list):
1614 e = revop % {'val': val}
1614 e = revop % {'val': val}
1615 else:
1615 else:
1616 e = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
1616 e = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
1617 expr.append(e)
1617 expr.append(e)
1618
1618
1619 if expr:
1619 if expr:
1620 expr = '(' + ' and '.join(expr) + ')'
1620 expr = '(' + ' and '.join(expr) + ')'
1621 else:
1621 else:
1622 expr = None
1622 expr = None
1623 return expr, filematcher
1623 return expr, filematcher
1624
1624
1625 def getgraphlogrevs(repo, pats, opts):
1625 def getgraphlogrevs(repo, pats, opts):
1626 """Return (revs, expr, filematcher) where revs is an iterable of
1626 """Return (revs, expr, filematcher) where revs is an iterable of
1627 revision numbers, expr is a revset string built from log options
1627 revision numbers, expr is a revset string built from log options
1628 and file patterns or None, and used to filter 'revs'. If --stat or
1628 and file patterns or None, and used to filter 'revs'. If --stat or
1629 --patch are not passed filematcher is None. Otherwise it is a
1629 --patch are not passed filematcher is None. Otherwise it is a
1630 callable taking a revision number and returning a match objects
1630 callable taking a revision number and returning a match objects
1631 filtering the files to be detailed when displaying the revision.
1631 filtering the files to be detailed when displaying the revision.
1632 """
1632 """
1633 if not len(repo):
1633 if not len(repo):
1634 return [], None, None
1634 return [], None, None
1635 limit = loglimit(opts)
1635 limit = loglimit(opts)
1636 # Default --rev value depends on --follow but --follow behaviour
1636 # Default --rev value depends on --follow but --follow behaviour
1637 # depends on revisions resolved from --rev...
1637 # depends on revisions resolved from --rev...
1638 follow = opts.get('follow') or opts.get('follow_first')
1638 follow = opts.get('follow') or opts.get('follow_first')
1639 possiblyunsorted = False # whether revs might need sorting
1639 possiblyunsorted = False # whether revs might need sorting
1640 if opts.get('rev'):
1640 if opts.get('rev'):
1641 revs = scmutil.revrange(repo, opts['rev'])
1641 revs = scmutil.revrange(repo, opts['rev'])
1642 # Don't sort here because _makegraphlogrevset might depend on the
1642 # Don't sort here because _makegraphlogrevset might depend on the
1643 # order of revs
1643 # order of revs
1644 possiblyunsorted = True
1644 possiblyunsorted = True
1645 else:
1645 else:
1646 if follow and len(repo) > 0:
1646 if follow and len(repo) > 0:
1647 revs = repo.revs('reverse(:.)')
1647 revs = repo.revs('reverse(:.)')
1648 else:
1648 else:
1649 revs = revset.spanset(repo)
1649 revs = revset.spanset(repo)
1650 revs.reverse()
1650 revs.reverse()
1651 if not revs:
1651 if not revs:
1652 return [], None, None
1652 return revset.baseset(), None, None
1653 expr, filematcher = _makegraphlogrevset(repo, pats, opts, revs)
1653 expr, filematcher = _makegraphlogrevset(repo, pats, opts, revs)
1654 if possiblyunsorted:
1654 if possiblyunsorted:
1655 revs.sort(reverse=True)
1655 revs.sort(reverse=True)
1656 if expr:
1656 if expr:
1657 # Revset matchers often operate faster on revisions in changelog
1657 # Revset matchers often operate faster on revisions in changelog
1658 # order, because most filters deal with the changelog.
1658 # order, because most filters deal with the changelog.
1659 revs.reverse()
1659 revs.reverse()
1660 matcher = revset.match(repo.ui, expr)
1660 matcher = revset.match(repo.ui, expr)
1661 # Revset matches can reorder revisions. "A or B" typically returns
1661 # Revset matches can reorder revisions. "A or B" typically returns
1662 # returns the revision matching A then the revision matching B. Sort
1662 # returns the revision matching A then the revision matching B. Sort
1663 # again to fix that.
1663 # again to fix that.
1664 revs = matcher(repo, revs)
1664 revs = matcher(repo, revs)
1665 revs.sort(reverse=True)
1665 revs.sort(reverse=True)
1666 if limit is not None:
1666 if limit is not None:
1667 limitedrevs = revset.baseset()
1667 limitedrevs = revset.baseset()
1668 for idx, rev in enumerate(revs):
1668 for idx, rev in enumerate(revs):
1669 if idx >= limit:
1669 if idx >= limit:
1670 break
1670 break
1671 limitedrevs.append(rev)
1671 limitedrevs.append(rev)
1672 revs = limitedrevs
1672 revs = limitedrevs
1673
1673
1674 return revs, expr, filematcher
1674 return revs, expr, filematcher
1675
1675
1676 def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None,
1676 def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None,
1677 filematcher=None):
1677 filematcher=None):
1678 seen, state = [], graphmod.asciistate()
1678 seen, state = [], graphmod.asciistate()
1679 for rev, type, ctx, parents in dag:
1679 for rev, type, ctx, parents in dag:
1680 char = 'o'
1680 char = 'o'
1681 if ctx.node() in showparents:
1681 if ctx.node() in showparents:
1682 char = '@'
1682 char = '@'
1683 elif ctx.obsolete():
1683 elif ctx.obsolete():
1684 char = 'x'
1684 char = 'x'
1685 copies = None
1685 copies = None
1686 if getrenamed and ctx.rev():
1686 if getrenamed and ctx.rev():
1687 copies = []
1687 copies = []
1688 for fn in ctx.files():
1688 for fn in ctx.files():
1689 rename = getrenamed(fn, ctx.rev())
1689 rename = getrenamed(fn, ctx.rev())
1690 if rename:
1690 if rename:
1691 copies.append((fn, rename[0]))
1691 copies.append((fn, rename[0]))
1692 revmatchfn = None
1692 revmatchfn = None
1693 if filematcher is not None:
1693 if filematcher is not None:
1694 revmatchfn = filematcher(ctx.rev())
1694 revmatchfn = filematcher(ctx.rev())
1695 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
1695 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
1696 lines = displayer.hunk.pop(rev).split('\n')
1696 lines = displayer.hunk.pop(rev).split('\n')
1697 if not lines[-1]:
1697 if not lines[-1]:
1698 del lines[-1]
1698 del lines[-1]
1699 displayer.flush(rev)
1699 displayer.flush(rev)
1700 edges = edgefn(type, char, lines, seen, rev, parents)
1700 edges = edgefn(type, char, lines, seen, rev, parents)
1701 for type, char, lines, coldata in edges:
1701 for type, char, lines, coldata in edges:
1702 graphmod.ascii(ui, state, type, char, lines, coldata)
1702 graphmod.ascii(ui, state, type, char, lines, coldata)
1703 displayer.close()
1703 displayer.close()
1704
1704
1705 def graphlog(ui, repo, *pats, **opts):
1705 def graphlog(ui, repo, *pats, **opts):
1706 # Parameters are identical to log command ones
1706 # Parameters are identical to log command ones
1707 revs, expr, filematcher = getgraphlogrevs(repo, pats, opts)
1707 revs, expr, filematcher = getgraphlogrevs(repo, pats, opts)
1708 revdag = graphmod.dagwalker(repo, revs)
1708 revdag = graphmod.dagwalker(repo, revs)
1709
1709
1710 getrenamed = None
1710 getrenamed = None
1711 if opts.get('copies'):
1711 if opts.get('copies'):
1712 endrev = None
1712 endrev = None
1713 if opts.get('rev'):
1713 if opts.get('rev'):
1714 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
1714 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
1715 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
1715 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
1716 displayer = show_changeset(ui, repo, opts, buffered=True)
1716 displayer = show_changeset(ui, repo, opts, buffered=True)
1717 showparents = [ctx.node() for ctx in repo[None].parents()]
1717 showparents = [ctx.node() for ctx in repo[None].parents()]
1718 displaygraph(ui, revdag, displayer, showparents,
1718 displaygraph(ui, revdag, displayer, showparents,
1719 graphmod.asciiedges, getrenamed, filematcher)
1719 graphmod.asciiedges, getrenamed, filematcher)
1720
1720
1721 def checkunsupportedgraphflags(pats, opts):
1721 def checkunsupportedgraphflags(pats, opts):
1722 for op in ["newest_first"]:
1722 for op in ["newest_first"]:
1723 if op in opts and opts[op]:
1723 if op in opts and opts[op]:
1724 raise util.Abort(_("-G/--graph option is incompatible with --%s")
1724 raise util.Abort(_("-G/--graph option is incompatible with --%s")
1725 % op.replace("_", "-"))
1725 % op.replace("_", "-"))
1726
1726
1727 def graphrevs(repo, nodes, opts):
1727 def graphrevs(repo, nodes, opts):
1728 limit = loglimit(opts)
1728 limit = loglimit(opts)
1729 nodes.reverse()
1729 nodes.reverse()
1730 if limit is not None:
1730 if limit is not None:
1731 nodes = nodes[:limit]
1731 nodes = nodes[:limit]
1732 return graphmod.nodes(repo, nodes)
1732 return graphmod.nodes(repo, nodes)
1733
1733
1734 def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly):
1734 def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly):
1735 join = lambda f: os.path.join(prefix, f)
1735 join = lambda f: os.path.join(prefix, f)
1736 bad = []
1736 bad = []
1737 oldbad = match.bad
1737 oldbad = match.bad
1738 match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
1738 match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
1739 names = []
1739 names = []
1740 wctx = repo[None]
1740 wctx = repo[None]
1741 cca = None
1741 cca = None
1742 abort, warn = scmutil.checkportabilityalert(ui)
1742 abort, warn = scmutil.checkportabilityalert(ui)
1743 if abort or warn:
1743 if abort or warn:
1744 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
1744 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
1745 for f in repo.walk(match):
1745 for f in repo.walk(match):
1746 exact = match.exact(f)
1746 exact = match.exact(f)
1747 if exact or not explicitonly and f not in repo.dirstate:
1747 if exact or not explicitonly and f not in repo.dirstate:
1748 if cca:
1748 if cca:
1749 cca(f)
1749 cca(f)
1750 names.append(f)
1750 names.append(f)
1751 if ui.verbose or not exact:
1751 if ui.verbose or not exact:
1752 ui.status(_('adding %s\n') % match.rel(join(f)))
1752 ui.status(_('adding %s\n') % match.rel(join(f)))
1753
1753
1754 for subpath in sorted(wctx.substate):
1754 for subpath in sorted(wctx.substate):
1755 sub = wctx.sub(subpath)
1755 sub = wctx.sub(subpath)
1756 try:
1756 try:
1757 submatch = matchmod.narrowmatcher(subpath, match)
1757 submatch = matchmod.narrowmatcher(subpath, match)
1758 if listsubrepos:
1758 if listsubrepos:
1759 bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix,
1759 bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix,
1760 False))
1760 False))
1761 else:
1761 else:
1762 bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix,
1762 bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix,
1763 True))
1763 True))
1764 except error.LookupError:
1764 except error.LookupError:
1765 ui.status(_("skipping missing subrepository: %s\n")
1765 ui.status(_("skipping missing subrepository: %s\n")
1766 % join(subpath))
1766 % join(subpath))
1767
1767
1768 if not dryrun:
1768 if not dryrun:
1769 rejected = wctx.add(names, prefix)
1769 rejected = wctx.add(names, prefix)
1770 bad.extend(f for f in rejected if f in match.files())
1770 bad.extend(f for f in rejected if f in match.files())
1771 return bad
1771 return bad
1772
1772
1773 def forget(ui, repo, match, prefix, explicitonly):
1773 def forget(ui, repo, match, prefix, explicitonly):
1774 join = lambda f: os.path.join(prefix, f)
1774 join = lambda f: os.path.join(prefix, f)
1775 bad = []
1775 bad = []
1776 oldbad = match.bad
1776 oldbad = match.bad
1777 match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
1777 match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
1778 wctx = repo[None]
1778 wctx = repo[None]
1779 forgot = []
1779 forgot = []
1780 s = repo.status(match=match, clean=True)
1780 s = repo.status(match=match, clean=True)
1781 forget = sorted(s[0] + s[1] + s[3] + s[6])
1781 forget = sorted(s[0] + s[1] + s[3] + s[6])
1782 if explicitonly:
1782 if explicitonly:
1783 forget = [f for f in forget if match.exact(f)]
1783 forget = [f for f in forget if match.exact(f)]
1784
1784
1785 for subpath in sorted(wctx.substate):
1785 for subpath in sorted(wctx.substate):
1786 sub = wctx.sub(subpath)
1786 sub = wctx.sub(subpath)
1787 try:
1787 try:
1788 submatch = matchmod.narrowmatcher(subpath, match)
1788 submatch = matchmod.narrowmatcher(subpath, match)
1789 subbad, subforgot = sub.forget(ui, submatch, prefix)
1789 subbad, subforgot = sub.forget(ui, submatch, prefix)
1790 bad.extend([subpath + '/' + f for f in subbad])
1790 bad.extend([subpath + '/' + f for f in subbad])
1791 forgot.extend([subpath + '/' + f for f in subforgot])
1791 forgot.extend([subpath + '/' + f for f in subforgot])
1792 except error.LookupError:
1792 except error.LookupError:
1793 ui.status(_("skipping missing subrepository: %s\n")
1793 ui.status(_("skipping missing subrepository: %s\n")
1794 % join(subpath))
1794 % join(subpath))
1795
1795
1796 if not explicitonly:
1796 if not explicitonly:
1797 for f in match.files():
1797 for f in match.files():
1798 if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))):
1798 if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))):
1799 if f not in forgot:
1799 if f not in forgot:
1800 if os.path.exists(match.rel(join(f))):
1800 if os.path.exists(match.rel(join(f))):
1801 ui.warn(_('not removing %s: '
1801 ui.warn(_('not removing %s: '
1802 'file is already untracked\n')
1802 'file is already untracked\n')
1803 % match.rel(join(f)))
1803 % match.rel(join(f)))
1804 bad.append(f)
1804 bad.append(f)
1805
1805
1806 for f in forget:
1806 for f in forget:
1807 if ui.verbose or not match.exact(f):
1807 if ui.verbose or not match.exact(f):
1808 ui.status(_('removing %s\n') % match.rel(join(f)))
1808 ui.status(_('removing %s\n') % match.rel(join(f)))
1809
1809
1810 rejected = wctx.forget(forget, prefix)
1810 rejected = wctx.forget(forget, prefix)
1811 bad.extend(f for f in rejected if f in match.files())
1811 bad.extend(f for f in rejected if f in match.files())
1812 forgot.extend(forget)
1812 forgot.extend(forget)
1813 return bad, forgot
1813 return bad, forgot
1814
1814
1815 def duplicatecopies(repo, rev, fromrev):
1815 def duplicatecopies(repo, rev, fromrev):
1816 '''reproduce copies from fromrev to rev in the dirstate'''
1816 '''reproduce copies from fromrev to rev in the dirstate'''
1817 for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems():
1817 for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems():
1818 # copies.pathcopies returns backward renames, so dst might not
1818 # copies.pathcopies returns backward renames, so dst might not
1819 # actually be in the dirstate
1819 # actually be in the dirstate
1820 if repo.dirstate[dst] in "nma":
1820 if repo.dirstate[dst] in "nma":
1821 repo.dirstate.copy(src, dst)
1821 repo.dirstate.copy(src, dst)
1822
1822
1823 def commit(ui, repo, commitfunc, pats, opts):
1823 def commit(ui, repo, commitfunc, pats, opts):
1824 '''commit the specified files or all outstanding changes'''
1824 '''commit the specified files or all outstanding changes'''
1825 date = opts.get('date')
1825 date = opts.get('date')
1826 if date:
1826 if date:
1827 opts['date'] = util.parsedate(date)
1827 opts['date'] = util.parsedate(date)
1828 message = logmessage(ui, opts)
1828 message = logmessage(ui, opts)
1829
1829
1830 # extract addremove carefully -- this function can be called from a command
1830 # extract addremove carefully -- this function can be called from a command
1831 # that doesn't support addremove
1831 # that doesn't support addremove
1832 if opts.get('addremove'):
1832 if opts.get('addremove'):
1833 scmutil.addremove(repo, pats, opts)
1833 scmutil.addremove(repo, pats, opts)
1834
1834
1835 return commitfunc(ui, repo, message,
1835 return commitfunc(ui, repo, message,
1836 scmutil.match(repo[None], pats, opts), opts)
1836 scmutil.match(repo[None], pats, opts), opts)
1837
1837
1838 def amend(ui, repo, commitfunc, old, extra, pats, opts):
1838 def amend(ui, repo, commitfunc, old, extra, pats, opts):
1839 ui.note(_('amending changeset %s\n') % old)
1839 ui.note(_('amending changeset %s\n') % old)
1840 base = old.p1()
1840 base = old.p1()
1841
1841
1842 wlock = lock = newid = None
1842 wlock = lock = newid = None
1843 try:
1843 try:
1844 wlock = repo.wlock()
1844 wlock = repo.wlock()
1845 lock = repo.lock()
1845 lock = repo.lock()
1846 tr = repo.transaction('amend')
1846 tr = repo.transaction('amend')
1847 try:
1847 try:
1848 # See if we got a message from -m or -l, if not, open the editor
1848 # See if we got a message from -m or -l, if not, open the editor
1849 # with the message of the changeset to amend
1849 # with the message of the changeset to amend
1850 message = logmessage(ui, opts)
1850 message = logmessage(ui, opts)
1851 # ensure logfile does not conflict with later enforcement of the
1851 # ensure logfile does not conflict with later enforcement of the
1852 # message. potential logfile content has been processed by
1852 # message. potential logfile content has been processed by
1853 # `logmessage` anyway.
1853 # `logmessage` anyway.
1854 opts.pop('logfile')
1854 opts.pop('logfile')
1855 # First, do a regular commit to record all changes in the working
1855 # First, do a regular commit to record all changes in the working
1856 # directory (if there are any)
1856 # directory (if there are any)
1857 ui.callhooks = False
1857 ui.callhooks = False
1858 currentbookmark = repo._bookmarkcurrent
1858 currentbookmark = repo._bookmarkcurrent
1859 try:
1859 try:
1860 repo._bookmarkcurrent = None
1860 repo._bookmarkcurrent = None
1861 opts['message'] = 'temporary amend commit for %s' % old
1861 opts['message'] = 'temporary amend commit for %s' % old
1862 node = commit(ui, repo, commitfunc, pats, opts)
1862 node = commit(ui, repo, commitfunc, pats, opts)
1863 finally:
1863 finally:
1864 repo._bookmarkcurrent = currentbookmark
1864 repo._bookmarkcurrent = currentbookmark
1865 ui.callhooks = True
1865 ui.callhooks = True
1866 ctx = repo[node]
1866 ctx = repo[node]
1867
1867
1868 # Participating changesets:
1868 # Participating changesets:
1869 #
1869 #
1870 # node/ctx o - new (intermediate) commit that contains changes
1870 # node/ctx o - new (intermediate) commit that contains changes
1871 # | from working dir to go into amending commit
1871 # | from working dir to go into amending commit
1872 # | (or a workingctx if there were no changes)
1872 # | (or a workingctx if there were no changes)
1873 # |
1873 # |
1874 # old o - changeset to amend
1874 # old o - changeset to amend
1875 # |
1875 # |
1876 # base o - parent of amending changeset
1876 # base o - parent of amending changeset
1877
1877
1878 # Update extra dict from amended commit (e.g. to preserve graft
1878 # Update extra dict from amended commit (e.g. to preserve graft
1879 # source)
1879 # source)
1880 extra.update(old.extra())
1880 extra.update(old.extra())
1881
1881
1882 # Also update it from the intermediate commit or from the wctx
1882 # Also update it from the intermediate commit or from the wctx
1883 extra.update(ctx.extra())
1883 extra.update(ctx.extra())
1884
1884
1885 if len(old.parents()) > 1:
1885 if len(old.parents()) > 1:
1886 # ctx.files() isn't reliable for merges, so fall back to the
1886 # ctx.files() isn't reliable for merges, so fall back to the
1887 # slower repo.status() method
1887 # slower repo.status() method
1888 files = set([fn for st in repo.status(base, old)[:3]
1888 files = set([fn for st in repo.status(base, old)[:3]
1889 for fn in st])
1889 for fn in st])
1890 else:
1890 else:
1891 files = set(old.files())
1891 files = set(old.files())
1892
1892
1893 # Second, we use either the commit we just did, or if there were no
1893 # Second, we use either the commit we just did, or if there were no
1894 # changes the parent of the working directory as the version of the
1894 # changes the parent of the working directory as the version of the
1895 # files in the final amend commit
1895 # files in the final amend commit
1896 if node:
1896 if node:
1897 ui.note(_('copying changeset %s to %s\n') % (ctx, base))
1897 ui.note(_('copying changeset %s to %s\n') % (ctx, base))
1898
1898
1899 user = ctx.user()
1899 user = ctx.user()
1900 date = ctx.date()
1900 date = ctx.date()
1901 # Recompute copies (avoid recording a -> b -> a)
1901 # Recompute copies (avoid recording a -> b -> a)
1902 copied = copies.pathcopies(base, ctx)
1902 copied = copies.pathcopies(base, ctx)
1903
1903
1904 # Prune files which were reverted by the updates: if old
1904 # Prune files which were reverted by the updates: if old
1905 # introduced file X and our intermediate commit, node,
1905 # introduced file X and our intermediate commit, node,
1906 # renamed that file, then those two files are the same and
1906 # renamed that file, then those two files are the same and
1907 # we can discard X from our list of files. Likewise if X
1907 # we can discard X from our list of files. Likewise if X
1908 # was deleted, it's no longer relevant
1908 # was deleted, it's no longer relevant
1909 files.update(ctx.files())
1909 files.update(ctx.files())
1910
1910
1911 def samefile(f):
1911 def samefile(f):
1912 if f in ctx.manifest():
1912 if f in ctx.manifest():
1913 a = ctx.filectx(f)
1913 a = ctx.filectx(f)
1914 if f in base.manifest():
1914 if f in base.manifest():
1915 b = base.filectx(f)
1915 b = base.filectx(f)
1916 return (not a.cmp(b)
1916 return (not a.cmp(b)
1917 and a.flags() == b.flags())
1917 and a.flags() == b.flags())
1918 else:
1918 else:
1919 return False
1919 return False
1920 else:
1920 else:
1921 return f not in base.manifest()
1921 return f not in base.manifest()
1922 files = [f for f in files if not samefile(f)]
1922 files = [f for f in files if not samefile(f)]
1923
1923
1924 def filectxfn(repo, ctx_, path):
1924 def filectxfn(repo, ctx_, path):
1925 try:
1925 try:
1926 fctx = ctx[path]
1926 fctx = ctx[path]
1927 flags = fctx.flags()
1927 flags = fctx.flags()
1928 mctx = context.memfilectx(fctx.path(), fctx.data(),
1928 mctx = context.memfilectx(fctx.path(), fctx.data(),
1929 islink='l' in flags,
1929 islink='l' in flags,
1930 isexec='x' in flags,
1930 isexec='x' in flags,
1931 copied=copied.get(path))
1931 copied=copied.get(path))
1932 return mctx
1932 return mctx
1933 except KeyError:
1933 except KeyError:
1934 raise IOError
1934 raise IOError
1935 else:
1935 else:
1936 ui.note(_('copying changeset %s to %s\n') % (old, base))
1936 ui.note(_('copying changeset %s to %s\n') % (old, base))
1937
1937
1938 # Use version of files as in the old cset
1938 # Use version of files as in the old cset
1939 def filectxfn(repo, ctx_, path):
1939 def filectxfn(repo, ctx_, path):
1940 try:
1940 try:
1941 return old.filectx(path)
1941 return old.filectx(path)
1942 except KeyError:
1942 except KeyError:
1943 raise IOError
1943 raise IOError
1944
1944
1945 user = opts.get('user') or old.user()
1945 user = opts.get('user') or old.user()
1946 date = opts.get('date') or old.date()
1946 date = opts.get('date') or old.date()
1947 editmsg = False
1947 editmsg = False
1948 if not message:
1948 if not message:
1949 editmsg = True
1949 editmsg = True
1950 message = old.description()
1950 message = old.description()
1951
1951
1952 pureextra = extra.copy()
1952 pureextra = extra.copy()
1953 extra['amend_source'] = old.hex()
1953 extra['amend_source'] = old.hex()
1954
1954
1955 new = context.memctx(repo,
1955 new = context.memctx(repo,
1956 parents=[base.node(), old.p2().node()],
1956 parents=[base.node(), old.p2().node()],
1957 text=message,
1957 text=message,
1958 files=files,
1958 files=files,
1959 filectxfn=filectxfn,
1959 filectxfn=filectxfn,
1960 user=user,
1960 user=user,
1961 date=date,
1961 date=date,
1962 extra=extra)
1962 extra=extra)
1963 if editmsg:
1963 if editmsg:
1964 new._text = commitforceeditor(repo, new, [])
1964 new._text = commitforceeditor(repo, new, [])
1965
1965
1966 newdesc = changelog.stripdesc(new.description())
1966 newdesc = changelog.stripdesc(new.description())
1967 if ((not node)
1967 if ((not node)
1968 and newdesc == old.description()
1968 and newdesc == old.description()
1969 and user == old.user()
1969 and user == old.user()
1970 and date == old.date()
1970 and date == old.date()
1971 and pureextra == old.extra()):
1971 and pureextra == old.extra()):
1972 # nothing changed. continuing here would create a new node
1972 # nothing changed. continuing here would create a new node
1973 # anyway because of the amend_source noise.
1973 # anyway because of the amend_source noise.
1974 #
1974 #
1975 # This not what we expect from amend.
1975 # This not what we expect from amend.
1976 return old.node()
1976 return old.node()
1977
1977
1978 ph = repo.ui.config('phases', 'new-commit', phases.draft)
1978 ph = repo.ui.config('phases', 'new-commit', phases.draft)
1979 try:
1979 try:
1980 if opts.get('secret'):
1980 if opts.get('secret'):
1981 commitphase = 'secret'
1981 commitphase = 'secret'
1982 else:
1982 else:
1983 commitphase = old.phase()
1983 commitphase = old.phase()
1984 repo.ui.setconfig('phases', 'new-commit', commitphase)
1984 repo.ui.setconfig('phases', 'new-commit', commitphase)
1985 newid = repo.commitctx(new)
1985 newid = repo.commitctx(new)
1986 finally:
1986 finally:
1987 repo.ui.setconfig('phases', 'new-commit', ph)
1987 repo.ui.setconfig('phases', 'new-commit', ph)
1988 if newid != old.node():
1988 if newid != old.node():
1989 # Reroute the working copy parent to the new changeset
1989 # Reroute the working copy parent to the new changeset
1990 repo.setparents(newid, nullid)
1990 repo.setparents(newid, nullid)
1991
1991
1992 # Move bookmarks from old parent to amend commit
1992 # Move bookmarks from old parent to amend commit
1993 bms = repo.nodebookmarks(old.node())
1993 bms = repo.nodebookmarks(old.node())
1994 if bms:
1994 if bms:
1995 marks = repo._bookmarks
1995 marks = repo._bookmarks
1996 for bm in bms:
1996 for bm in bms:
1997 marks[bm] = newid
1997 marks[bm] = newid
1998 marks.write()
1998 marks.write()
1999 #commit the whole amend process
1999 #commit the whole amend process
2000 if obsolete._enabled and newid != old.node():
2000 if obsolete._enabled and newid != old.node():
2001 # mark the new changeset as successor of the rewritten one
2001 # mark the new changeset as successor of the rewritten one
2002 new = repo[newid]
2002 new = repo[newid]
2003 obs = [(old, (new,))]
2003 obs = [(old, (new,))]
2004 if node:
2004 if node:
2005 obs.append((ctx, ()))
2005 obs.append((ctx, ()))
2006
2006
2007 obsolete.createmarkers(repo, obs)
2007 obsolete.createmarkers(repo, obs)
2008 tr.close()
2008 tr.close()
2009 finally:
2009 finally:
2010 tr.release()
2010 tr.release()
2011 if (not obsolete._enabled) and newid != old.node():
2011 if (not obsolete._enabled) and newid != old.node():
2012 # Strip the intermediate commit (if there was one) and the amended
2012 # Strip the intermediate commit (if there was one) and the amended
2013 # commit
2013 # commit
2014 if node:
2014 if node:
2015 ui.note(_('stripping intermediate changeset %s\n') % ctx)
2015 ui.note(_('stripping intermediate changeset %s\n') % ctx)
2016 ui.note(_('stripping amended changeset %s\n') % old)
2016 ui.note(_('stripping amended changeset %s\n') % old)
2017 repair.strip(ui, repo, old.node(), topic='amend-backup')
2017 repair.strip(ui, repo, old.node(), topic='amend-backup')
2018 finally:
2018 finally:
2019 if newid is None:
2019 if newid is None:
2020 repo.dirstate.invalidate()
2020 repo.dirstate.invalidate()
2021 lockmod.release(lock, wlock)
2021 lockmod.release(lock, wlock)
2022 return newid
2022 return newid
2023
2023
2024 def commiteditor(repo, ctx, subs):
2024 def commiteditor(repo, ctx, subs):
2025 if ctx.description():
2025 if ctx.description():
2026 return ctx.description()
2026 return ctx.description()
2027 return commitforceeditor(repo, ctx, subs)
2027 return commitforceeditor(repo, ctx, subs)
2028
2028
2029 def commitforceeditor(repo, ctx, subs):
2029 def commitforceeditor(repo, ctx, subs):
2030 edittext = []
2030 edittext = []
2031 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
2031 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
2032 if ctx.description():
2032 if ctx.description():
2033 edittext.append(ctx.description())
2033 edittext.append(ctx.description())
2034 edittext.append("")
2034 edittext.append("")
2035 edittext.append("") # Empty line between message and comments.
2035 edittext.append("") # Empty line between message and comments.
2036 edittext.append(_("HG: Enter commit message."
2036 edittext.append(_("HG: Enter commit message."
2037 " Lines beginning with 'HG:' are removed."))
2037 " Lines beginning with 'HG:' are removed."))
2038 edittext.append(_("HG: Leave message empty to abort commit."))
2038 edittext.append(_("HG: Leave message empty to abort commit."))
2039 edittext.append("HG: --")
2039 edittext.append("HG: --")
2040 edittext.append(_("HG: user: %s") % ctx.user())
2040 edittext.append(_("HG: user: %s") % ctx.user())
2041 if ctx.p2():
2041 if ctx.p2():
2042 edittext.append(_("HG: branch merge"))
2042 edittext.append(_("HG: branch merge"))
2043 if ctx.branch():
2043 if ctx.branch():
2044 edittext.append(_("HG: branch '%s'") % ctx.branch())
2044 edittext.append(_("HG: branch '%s'") % ctx.branch())
2045 if bookmarks.iscurrent(repo):
2045 if bookmarks.iscurrent(repo):
2046 edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent)
2046 edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent)
2047 edittext.extend([_("HG: subrepo %s") % s for s in subs])
2047 edittext.extend([_("HG: subrepo %s") % s for s in subs])
2048 edittext.extend([_("HG: added %s") % f for f in added])
2048 edittext.extend([_("HG: added %s") % f for f in added])
2049 edittext.extend([_("HG: changed %s") % f for f in modified])
2049 edittext.extend([_("HG: changed %s") % f for f in modified])
2050 edittext.extend([_("HG: removed %s") % f for f in removed])
2050 edittext.extend([_("HG: removed %s") % f for f in removed])
2051 if not added and not modified and not removed:
2051 if not added and not modified and not removed:
2052 edittext.append(_("HG: no files changed"))
2052 edittext.append(_("HG: no files changed"))
2053 edittext.append("")
2053 edittext.append("")
2054 # run editor in the repository root
2054 # run editor in the repository root
2055 olddir = os.getcwd()
2055 olddir = os.getcwd()
2056 os.chdir(repo.root)
2056 os.chdir(repo.root)
2057 text = repo.ui.edit("\n".join(edittext), ctx.user(), ctx.extra())
2057 text = repo.ui.edit("\n".join(edittext), ctx.user(), ctx.extra())
2058 text = re.sub("(?m)^HG:.*(\n|$)", "", text)
2058 text = re.sub("(?m)^HG:.*(\n|$)", "", text)
2059 os.chdir(olddir)
2059 os.chdir(olddir)
2060
2060
2061 if not text.strip():
2061 if not text.strip():
2062 raise util.Abort(_("empty commit message"))
2062 raise util.Abort(_("empty commit message"))
2063
2063
2064 return text
2064 return text
2065
2065
2066 def commitstatus(repo, node, branch, bheads=None, opts={}):
2066 def commitstatus(repo, node, branch, bheads=None, opts={}):
2067 ctx = repo[node]
2067 ctx = repo[node]
2068 parents = ctx.parents()
2068 parents = ctx.parents()
2069
2069
2070 if (not opts.get('amend') and bheads and node not in bheads and not
2070 if (not opts.get('amend') and bheads and node not in bheads and not
2071 [x for x in parents if x.node() in bheads and x.branch() == branch]):
2071 [x for x in parents if x.node() in bheads and x.branch() == branch]):
2072 repo.ui.status(_('created new head\n'))
2072 repo.ui.status(_('created new head\n'))
2073 # The message is not printed for initial roots. For the other
2073 # The message is not printed for initial roots. For the other
2074 # changesets, it is printed in the following situations:
2074 # changesets, it is printed in the following situations:
2075 #
2075 #
2076 # Par column: for the 2 parents with ...
2076 # Par column: for the 2 parents with ...
2077 # N: null or no parent
2077 # N: null or no parent
2078 # B: parent is on another named branch
2078 # B: parent is on another named branch
2079 # C: parent is a regular non head changeset
2079 # C: parent is a regular non head changeset
2080 # H: parent was a branch head of the current branch
2080 # H: parent was a branch head of the current branch
2081 # Msg column: whether we print "created new head" message
2081 # Msg column: whether we print "created new head" message
2082 # In the following, it is assumed that there already exists some
2082 # In the following, it is assumed that there already exists some
2083 # initial branch heads of the current branch, otherwise nothing is
2083 # initial branch heads of the current branch, otherwise nothing is
2084 # printed anyway.
2084 # printed anyway.
2085 #
2085 #
2086 # Par Msg Comment
2086 # Par Msg Comment
2087 # N N y additional topo root
2087 # N N y additional topo root
2088 #
2088 #
2089 # B N y additional branch root
2089 # B N y additional branch root
2090 # C N y additional topo head
2090 # C N y additional topo head
2091 # H N n usual case
2091 # H N n usual case
2092 #
2092 #
2093 # B B y weird additional branch root
2093 # B B y weird additional branch root
2094 # C B y branch merge
2094 # C B y branch merge
2095 # H B n merge with named branch
2095 # H B n merge with named branch
2096 #
2096 #
2097 # C C y additional head from merge
2097 # C C y additional head from merge
2098 # C H n merge with a head
2098 # C H n merge with a head
2099 #
2099 #
2100 # H H n head merge: head count decreases
2100 # H H n head merge: head count decreases
2101
2101
2102 if not opts.get('close_branch'):
2102 if not opts.get('close_branch'):
2103 for r in parents:
2103 for r in parents:
2104 if r.closesbranch() and r.branch() == branch:
2104 if r.closesbranch() and r.branch() == branch:
2105 repo.ui.status(_('reopening closed branch head %d\n') % r)
2105 repo.ui.status(_('reopening closed branch head %d\n') % r)
2106
2106
2107 if repo.ui.debugflag:
2107 if repo.ui.debugflag:
2108 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
2108 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
2109 elif repo.ui.verbose:
2109 elif repo.ui.verbose:
2110 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
2110 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
2111
2111
2112 def revert(ui, repo, ctx, parents, *pats, **opts):
2112 def revert(ui, repo, ctx, parents, *pats, **opts):
2113 parent, p2 = parents
2113 parent, p2 = parents
2114 node = ctx.node()
2114 node = ctx.node()
2115
2115
2116 mf = ctx.manifest()
2116 mf = ctx.manifest()
2117 if node == parent:
2117 if node == parent:
2118 pmf = mf
2118 pmf = mf
2119 else:
2119 else:
2120 pmf = None
2120 pmf = None
2121
2121
2122 # need all matching names in dirstate and manifest of target rev,
2122 # need all matching names in dirstate and manifest of target rev,
2123 # so have to walk both. do not print errors if files exist in one
2123 # so have to walk both. do not print errors if files exist in one
2124 # but not other.
2124 # but not other.
2125
2125
2126 names = {}
2126 names = {}
2127
2127
2128 wlock = repo.wlock()
2128 wlock = repo.wlock()
2129 try:
2129 try:
2130 # walk dirstate.
2130 # walk dirstate.
2131
2131
2132 m = scmutil.match(repo[None], pats, opts)
2132 m = scmutil.match(repo[None], pats, opts)
2133 m.bad = lambda x, y: False
2133 m.bad = lambda x, y: False
2134 for abs in repo.walk(m):
2134 for abs in repo.walk(m):
2135 names[abs] = m.rel(abs), m.exact(abs)
2135 names[abs] = m.rel(abs), m.exact(abs)
2136
2136
2137 # walk target manifest.
2137 # walk target manifest.
2138
2138
2139 def badfn(path, msg):
2139 def badfn(path, msg):
2140 if path in names:
2140 if path in names:
2141 return
2141 return
2142 if path in ctx.substate:
2142 if path in ctx.substate:
2143 return
2143 return
2144 path_ = path + '/'
2144 path_ = path + '/'
2145 for f in names:
2145 for f in names:
2146 if f.startswith(path_):
2146 if f.startswith(path_):
2147 return
2147 return
2148 ui.warn("%s: %s\n" % (m.rel(path), msg))
2148 ui.warn("%s: %s\n" % (m.rel(path), msg))
2149
2149
2150 m = scmutil.match(ctx, pats, opts)
2150 m = scmutil.match(ctx, pats, opts)
2151 m.bad = badfn
2151 m.bad = badfn
2152 for abs in ctx.walk(m):
2152 for abs in ctx.walk(m):
2153 if abs not in names:
2153 if abs not in names:
2154 names[abs] = m.rel(abs), m.exact(abs)
2154 names[abs] = m.rel(abs), m.exact(abs)
2155
2155
2156 # get the list of subrepos that must be reverted
2156 # get the list of subrepos that must be reverted
2157 targetsubs = sorted(s for s in ctx.substate if m(s))
2157 targetsubs = sorted(s for s in ctx.substate if m(s))
2158 m = scmutil.matchfiles(repo, names)
2158 m = scmutil.matchfiles(repo, names)
2159 changes = repo.status(match=m)[:4]
2159 changes = repo.status(match=m)[:4]
2160 modified, added, removed, deleted = map(set, changes)
2160 modified, added, removed, deleted = map(set, changes)
2161
2161
2162 # if f is a rename, also revert the source
2162 # if f is a rename, also revert the source
2163 cwd = repo.getcwd()
2163 cwd = repo.getcwd()
2164 for f in added:
2164 for f in added:
2165 src = repo.dirstate.copied(f)
2165 src = repo.dirstate.copied(f)
2166 if src and src not in names and repo.dirstate[src] == 'r':
2166 if src and src not in names and repo.dirstate[src] == 'r':
2167 removed.add(src)
2167 removed.add(src)
2168 names[src] = (repo.pathto(src, cwd), True)
2168 names[src] = (repo.pathto(src, cwd), True)
2169
2169
2170 def removeforget(abs):
2170 def removeforget(abs):
2171 if repo.dirstate[abs] == 'a':
2171 if repo.dirstate[abs] == 'a':
2172 return _('forgetting %s\n')
2172 return _('forgetting %s\n')
2173 return _('removing %s\n')
2173 return _('removing %s\n')
2174
2174
2175 revert = ([], _('reverting %s\n'))
2175 revert = ([], _('reverting %s\n'))
2176 add = ([], _('adding %s\n'))
2176 add = ([], _('adding %s\n'))
2177 remove = ([], removeforget)
2177 remove = ([], removeforget)
2178 undelete = ([], _('undeleting %s\n'))
2178 undelete = ([], _('undeleting %s\n'))
2179
2179
2180 disptable = (
2180 disptable = (
2181 # dispatch table:
2181 # dispatch table:
2182 # file state
2182 # file state
2183 # action if in target manifest
2183 # action if in target manifest
2184 # action if not in target manifest
2184 # action if not in target manifest
2185 # make backup if in target manifest
2185 # make backup if in target manifest
2186 # make backup if not in target manifest
2186 # make backup if not in target manifest
2187 (modified, revert, remove, True, True),
2187 (modified, revert, remove, True, True),
2188 (added, revert, remove, True, False),
2188 (added, revert, remove, True, False),
2189 (removed, undelete, None, True, False),
2189 (removed, undelete, None, True, False),
2190 (deleted, revert, remove, False, False),
2190 (deleted, revert, remove, False, False),
2191 )
2191 )
2192
2192
2193 for abs, (rel, exact) in sorted(names.items()):
2193 for abs, (rel, exact) in sorted(names.items()):
2194 mfentry = mf.get(abs)
2194 mfentry = mf.get(abs)
2195 target = repo.wjoin(abs)
2195 target = repo.wjoin(abs)
2196 def handle(xlist, dobackup):
2196 def handle(xlist, dobackup):
2197 xlist[0].append(abs)
2197 xlist[0].append(abs)
2198 if (dobackup and not opts.get('no_backup') and
2198 if (dobackup and not opts.get('no_backup') and
2199 os.path.lexists(target) and
2199 os.path.lexists(target) and
2200 abs in ctx and repo[None][abs].cmp(ctx[abs])):
2200 abs in ctx and repo[None][abs].cmp(ctx[abs])):
2201 bakname = "%s.orig" % rel
2201 bakname = "%s.orig" % rel
2202 ui.note(_('saving current version of %s as %s\n') %
2202 ui.note(_('saving current version of %s as %s\n') %
2203 (rel, bakname))
2203 (rel, bakname))
2204 if not opts.get('dry_run'):
2204 if not opts.get('dry_run'):
2205 util.rename(target, bakname)
2205 util.rename(target, bakname)
2206 if ui.verbose or not exact:
2206 if ui.verbose or not exact:
2207 msg = xlist[1]
2207 msg = xlist[1]
2208 if not isinstance(msg, basestring):
2208 if not isinstance(msg, basestring):
2209 msg = msg(abs)
2209 msg = msg(abs)
2210 ui.status(msg % rel)
2210 ui.status(msg % rel)
2211 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2211 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2212 if abs not in table:
2212 if abs not in table:
2213 continue
2213 continue
2214 # file has changed in dirstate
2214 # file has changed in dirstate
2215 if mfentry:
2215 if mfentry:
2216 handle(hitlist, backuphit)
2216 handle(hitlist, backuphit)
2217 elif misslist is not None:
2217 elif misslist is not None:
2218 handle(misslist, backupmiss)
2218 handle(misslist, backupmiss)
2219 break
2219 break
2220 else:
2220 else:
2221 if abs not in repo.dirstate:
2221 if abs not in repo.dirstate:
2222 if mfentry:
2222 if mfentry:
2223 handle(add, True)
2223 handle(add, True)
2224 elif exact:
2224 elif exact:
2225 ui.warn(_('file not managed: %s\n') % rel)
2225 ui.warn(_('file not managed: %s\n') % rel)
2226 continue
2226 continue
2227 # file has not changed in dirstate
2227 # file has not changed in dirstate
2228 if node == parent:
2228 if node == parent:
2229 if exact:
2229 if exact:
2230 ui.warn(_('no changes needed to %s\n') % rel)
2230 ui.warn(_('no changes needed to %s\n') % rel)
2231 continue
2231 continue
2232 if pmf is None:
2232 if pmf is None:
2233 # only need parent manifest in this unlikely case,
2233 # only need parent manifest in this unlikely case,
2234 # so do not read by default
2234 # so do not read by default
2235 pmf = repo[parent].manifest()
2235 pmf = repo[parent].manifest()
2236 if abs in pmf and mfentry:
2236 if abs in pmf and mfentry:
2237 # if version of file is same in parent and target
2237 # if version of file is same in parent and target
2238 # manifests, do nothing
2238 # manifests, do nothing
2239 if (pmf[abs] != mfentry or
2239 if (pmf[abs] != mfentry or
2240 pmf.flags(abs) != mf.flags(abs)):
2240 pmf.flags(abs) != mf.flags(abs)):
2241 handle(revert, False)
2241 handle(revert, False)
2242 else:
2242 else:
2243 handle(remove, False)
2243 handle(remove, False)
2244 if not opts.get('dry_run'):
2244 if not opts.get('dry_run'):
2245 _performrevert(repo, parents, ctx, revert, add, remove, undelete)
2245 _performrevert(repo, parents, ctx, revert, add, remove, undelete)
2246
2246
2247 if targetsubs:
2247 if targetsubs:
2248 # Revert the subrepos on the revert list
2248 # Revert the subrepos on the revert list
2249 for sub in targetsubs:
2249 for sub in targetsubs:
2250 ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts)
2250 ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts)
2251 finally:
2251 finally:
2252 wlock.release()
2252 wlock.release()
2253
2253
2254 def _performrevert(repo, parents, ctx, revert, add, remove, undelete):
2254 def _performrevert(repo, parents, ctx, revert, add, remove, undelete):
2255 """function that actually perform all the action computed for revert
2255 """function that actually perform all the action computed for revert
2256
2256
2257 This is an independent function to let extension to plug in and react to
2257 This is an independent function to let extension to plug in and react to
2258 the imminent revert.
2258 the imminent revert.
2259
2259
2260 Make sure you have the working directory locked when caling this function.
2260 Make sure you have the working directory locked when caling this function.
2261 """
2261 """
2262 parent, p2 = parents
2262 parent, p2 = parents
2263 node = ctx.node()
2263 node = ctx.node()
2264 def checkout(f):
2264 def checkout(f):
2265 fc = ctx[f]
2265 fc = ctx[f]
2266 repo.wwrite(f, fc.data(), fc.flags())
2266 repo.wwrite(f, fc.data(), fc.flags())
2267
2267
2268 audit_path = pathutil.pathauditor(repo.root)
2268 audit_path = pathutil.pathauditor(repo.root)
2269 for f in remove[0]:
2269 for f in remove[0]:
2270 if repo.dirstate[f] == 'a':
2270 if repo.dirstate[f] == 'a':
2271 repo.dirstate.drop(f)
2271 repo.dirstate.drop(f)
2272 continue
2272 continue
2273 audit_path(f)
2273 audit_path(f)
2274 try:
2274 try:
2275 util.unlinkpath(repo.wjoin(f))
2275 util.unlinkpath(repo.wjoin(f))
2276 except OSError:
2276 except OSError:
2277 pass
2277 pass
2278 repo.dirstate.remove(f)
2278 repo.dirstate.remove(f)
2279
2279
2280 normal = None
2280 normal = None
2281 if node == parent:
2281 if node == parent:
2282 # We're reverting to our parent. If possible, we'd like status
2282 # We're reverting to our parent. If possible, we'd like status
2283 # to report the file as clean. We have to use normallookup for
2283 # to report the file as clean. We have to use normallookup for
2284 # merges to avoid losing information about merged/dirty files.
2284 # merges to avoid losing information about merged/dirty files.
2285 if p2 != nullid:
2285 if p2 != nullid:
2286 normal = repo.dirstate.normallookup
2286 normal = repo.dirstate.normallookup
2287 else:
2287 else:
2288 normal = repo.dirstate.normal
2288 normal = repo.dirstate.normal
2289 for f in revert[0]:
2289 for f in revert[0]:
2290 checkout(f)
2290 checkout(f)
2291 if normal:
2291 if normal:
2292 normal(f)
2292 normal(f)
2293
2293
2294 for f in add[0]:
2294 for f in add[0]:
2295 checkout(f)
2295 checkout(f)
2296 repo.dirstate.add(f)
2296 repo.dirstate.add(f)
2297
2297
2298 normal = repo.dirstate.normallookup
2298 normal = repo.dirstate.normallookup
2299 if node == parent and p2 == nullid:
2299 if node == parent and p2 == nullid:
2300 normal = repo.dirstate.normal
2300 normal = repo.dirstate.normal
2301 for f in undelete[0]:
2301 for f in undelete[0]:
2302 checkout(f)
2302 checkout(f)
2303 normal(f)
2303 normal(f)
2304
2304
2305 copied = copies.pathcopies(repo[parent], ctx)
2305 copied = copies.pathcopies(repo[parent], ctx)
2306
2306
2307 for f in add[0] + undelete[0] + revert[0]:
2307 for f in add[0] + undelete[0] + revert[0]:
2308 if f in copied:
2308 if f in copied:
2309 repo.dirstate.copy(copied[f], f)
2309 repo.dirstate.copy(copied[f], f)
2310
2310
2311 def command(table):
2311 def command(table):
2312 '''returns a function object bound to table which can be used as
2312 '''returns a function object bound to table which can be used as
2313 a decorator for populating table as a command table'''
2313 a decorator for populating table as a command table'''
2314
2314
2315 def cmd(name, options=(), synopsis=None):
2315 def cmd(name, options=(), synopsis=None):
2316 def decorator(func):
2316 def decorator(func):
2317 if synopsis:
2317 if synopsis:
2318 table[name] = func, list(options), synopsis
2318 table[name] = func, list(options), synopsis
2319 else:
2319 else:
2320 table[name] = func, list(options)
2320 table[name] = func, list(options)
2321 return func
2321 return func
2322 return decorator
2322 return decorator
2323
2323
2324 return cmd
2324 return cmd
2325
2325
2326 # a list of (ui, repo) functions called by commands.summary
2326 # a list of (ui, repo) functions called by commands.summary
2327 summaryhooks = util.hooks()
2327 summaryhooks = util.hooks()
2328
2328
2329 # A list of state files kept by multistep operations like graft.
2329 # A list of state files kept by multistep operations like graft.
2330 # Since graft cannot be aborted, it is considered 'clearable' by update.
2330 # Since graft cannot be aborted, it is considered 'clearable' by update.
2331 # note: bisect is intentionally excluded
2331 # note: bisect is intentionally excluded
2332 # (state file, clearable, allowcommit, error, hint)
2332 # (state file, clearable, allowcommit, error, hint)
2333 unfinishedstates = [
2333 unfinishedstates = [
2334 ('graftstate', True, False, _('graft in progress'),
2334 ('graftstate', True, False, _('graft in progress'),
2335 _("use 'hg graft --continue' or 'hg update' to abort")),
2335 _("use 'hg graft --continue' or 'hg update' to abort")),
2336 ('updatestate', True, False, _('last update was interrupted'),
2336 ('updatestate', True, False, _('last update was interrupted'),
2337 _("use 'hg update' to get a consistent checkout"))
2337 _("use 'hg update' to get a consistent checkout"))
2338 ]
2338 ]
2339
2339
2340 def checkunfinished(repo, commit=False):
2340 def checkunfinished(repo, commit=False):
2341 '''Look for an unfinished multistep operation, like graft, and abort
2341 '''Look for an unfinished multistep operation, like graft, and abort
2342 if found. It's probably good to check this right before
2342 if found. It's probably good to check this right before
2343 bailifchanged().
2343 bailifchanged().
2344 '''
2344 '''
2345 for f, clearable, allowcommit, msg, hint in unfinishedstates:
2345 for f, clearable, allowcommit, msg, hint in unfinishedstates:
2346 if commit and allowcommit:
2346 if commit and allowcommit:
2347 continue
2347 continue
2348 if repo.vfs.exists(f):
2348 if repo.vfs.exists(f):
2349 raise util.Abort(msg, hint=hint)
2349 raise util.Abort(msg, hint=hint)
2350
2350
2351 def clearunfinished(repo):
2351 def clearunfinished(repo):
2352 '''Check for unfinished operations (as above), and clear the ones
2352 '''Check for unfinished operations (as above), and clear the ones
2353 that are clearable.
2353 that are clearable.
2354 '''
2354 '''
2355 for f, clearable, allowcommit, msg, hint in unfinishedstates:
2355 for f, clearable, allowcommit, msg, hint in unfinishedstates:
2356 if not clearable and repo.vfs.exists(f):
2356 if not clearable and repo.vfs.exists(f):
2357 raise util.Abort(msg, hint=hint)
2357 raise util.Abort(msg, hint=hint)
2358 for f, clearable, allowcommit, msg, hint in unfinishedstates:
2358 for f, clearable, allowcommit, msg, hint in unfinishedstates:
2359 if clearable and repo.vfs.exists(f):
2359 if clearable and repo.vfs.exists(f):
2360 util.unlink(repo.join(f))
2360 util.unlink(repo.join(f))
General Comments 0
You need to be logged in to leave comments. Login now