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