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