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