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