##// END OF EJS Templates
cmdutil: make node parameter of makefileobj() mandatory (API)...
Yuya Nishihara -
r36221:01280638 default
parent child Browse files
Show More
@@ -1,3158 +1,3152 b''
1 # cmdutil.py - help for command processing in mercurial
1 # cmdutil.py - help for command processing in mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import errno
10 import errno
11 import os
11 import os
12 import re
12 import re
13 import tempfile
13 import tempfile
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 )
21 )
22
22
23 from . import (
23 from . import (
24 bookmarks,
24 bookmarks,
25 changelog,
25 changelog,
26 copies,
26 copies,
27 crecord as crecordmod,
27 crecord as crecordmod,
28 dirstateguard,
28 dirstateguard,
29 encoding,
29 encoding,
30 error,
30 error,
31 formatter,
31 formatter,
32 logcmdutil,
32 logcmdutil,
33 match as matchmod,
33 match as matchmod,
34 merge as mergemod,
34 merge as mergemod,
35 obsolete,
35 obsolete,
36 patch,
36 patch,
37 pathutil,
37 pathutil,
38 pycompat,
38 pycompat,
39 registrar,
39 registrar,
40 revlog,
40 revlog,
41 rewriteutil,
41 rewriteutil,
42 scmutil,
42 scmutil,
43 smartset,
43 smartset,
44 subrepoutil,
44 subrepoutil,
45 templater,
45 templater,
46 util,
46 util,
47 vfs as vfsmod,
47 vfs as vfsmod,
48 )
48 )
49 stringio = util.stringio
49 stringio = util.stringio
50
50
51 # templates of common command options
51 # templates of common command options
52
52
53 dryrunopts = [
53 dryrunopts = [
54 ('n', 'dry-run', None,
54 ('n', 'dry-run', None,
55 _('do not perform actions, just print output')),
55 _('do not perform actions, just print output')),
56 ]
56 ]
57
57
58 remoteopts = [
58 remoteopts = [
59 ('e', 'ssh', '',
59 ('e', 'ssh', '',
60 _('specify ssh command to use'), _('CMD')),
60 _('specify ssh command to use'), _('CMD')),
61 ('', 'remotecmd', '',
61 ('', 'remotecmd', '',
62 _('specify hg command to run on the remote side'), _('CMD')),
62 _('specify hg command to run on the remote side'), _('CMD')),
63 ('', 'insecure', None,
63 ('', 'insecure', None,
64 _('do not verify server certificate (ignoring web.cacerts config)')),
64 _('do not verify server certificate (ignoring web.cacerts config)')),
65 ]
65 ]
66
66
67 walkopts = [
67 walkopts = [
68 ('I', 'include', [],
68 ('I', 'include', [],
69 _('include names matching the given patterns'), _('PATTERN')),
69 _('include names matching the given patterns'), _('PATTERN')),
70 ('X', 'exclude', [],
70 ('X', 'exclude', [],
71 _('exclude names matching the given patterns'), _('PATTERN')),
71 _('exclude names matching the given patterns'), _('PATTERN')),
72 ]
72 ]
73
73
74 commitopts = [
74 commitopts = [
75 ('m', 'message', '',
75 ('m', 'message', '',
76 _('use text as commit message'), _('TEXT')),
76 _('use text as commit message'), _('TEXT')),
77 ('l', 'logfile', '',
77 ('l', 'logfile', '',
78 _('read commit message from file'), _('FILE')),
78 _('read commit message from file'), _('FILE')),
79 ]
79 ]
80
80
81 commitopts2 = [
81 commitopts2 = [
82 ('d', 'date', '',
82 ('d', 'date', '',
83 _('record the specified date as commit date'), _('DATE')),
83 _('record the specified date as commit date'), _('DATE')),
84 ('u', 'user', '',
84 ('u', 'user', '',
85 _('record the specified user as committer'), _('USER')),
85 _('record the specified user as committer'), _('USER')),
86 ]
86 ]
87
87
88 # hidden for now
88 # hidden for now
89 formatteropts = [
89 formatteropts = [
90 ('T', 'template', '',
90 ('T', 'template', '',
91 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
91 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
92 ]
92 ]
93
93
94 templateopts = [
94 templateopts = [
95 ('', 'style', '',
95 ('', 'style', '',
96 _('display using template map file (DEPRECATED)'), _('STYLE')),
96 _('display using template map file (DEPRECATED)'), _('STYLE')),
97 ('T', 'template', '',
97 ('T', 'template', '',
98 _('display with template'), _('TEMPLATE')),
98 _('display with template'), _('TEMPLATE')),
99 ]
99 ]
100
100
101 logopts = [
101 logopts = [
102 ('p', 'patch', None, _('show patch')),
102 ('p', 'patch', None, _('show patch')),
103 ('g', 'git', None, _('use git extended diff format')),
103 ('g', 'git', None, _('use git extended diff format')),
104 ('l', 'limit', '',
104 ('l', 'limit', '',
105 _('limit number of changes displayed'), _('NUM')),
105 _('limit number of changes displayed'), _('NUM')),
106 ('M', 'no-merges', None, _('do not show merges')),
106 ('M', 'no-merges', None, _('do not show merges')),
107 ('', 'stat', None, _('output diffstat-style summary of changes')),
107 ('', 'stat', None, _('output diffstat-style summary of changes')),
108 ('G', 'graph', None, _("show the revision DAG")),
108 ('G', 'graph', None, _("show the revision DAG")),
109 ] + templateopts
109 ] + templateopts
110
110
111 diffopts = [
111 diffopts = [
112 ('a', 'text', None, _('treat all files as text')),
112 ('a', 'text', None, _('treat all files as text')),
113 ('g', 'git', None, _('use git extended diff format')),
113 ('g', 'git', None, _('use git extended diff format')),
114 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
114 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
115 ('', 'nodates', None, _('omit dates from diff headers'))
115 ('', 'nodates', None, _('omit dates from diff headers'))
116 ]
116 ]
117
117
118 diffwsopts = [
118 diffwsopts = [
119 ('w', 'ignore-all-space', None,
119 ('w', 'ignore-all-space', None,
120 _('ignore white space when comparing lines')),
120 _('ignore white space when comparing lines')),
121 ('b', 'ignore-space-change', None,
121 ('b', 'ignore-space-change', None,
122 _('ignore changes in the amount of white space')),
122 _('ignore changes in the amount of white space')),
123 ('B', 'ignore-blank-lines', None,
123 ('B', 'ignore-blank-lines', None,
124 _('ignore changes whose lines are all blank')),
124 _('ignore changes whose lines are all blank')),
125 ('Z', 'ignore-space-at-eol', None,
125 ('Z', 'ignore-space-at-eol', None,
126 _('ignore changes in whitespace at EOL')),
126 _('ignore changes in whitespace at EOL')),
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(r'label', '')
182 label = kw.pop(r'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')
213 testfile = ui.config('experimental', 'crecordtest')
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 opts = pycompat.byteskwargs(opts)
224 opts = pycompat.byteskwargs(opts)
225 if not ui.interactive():
225 if not ui.interactive():
226 if cmdsuggest:
226 if cmdsuggest:
227 msg = _('running non-interactively, use %s instead') % cmdsuggest
227 msg = _('running non-interactively, use %s instead') % cmdsuggest
228 else:
228 else:
229 msg = _('running non-interactively')
229 msg = _('running non-interactively')
230 raise error.Abort(msg)
230 raise error.Abort(msg)
231
231
232 # make sure username is set before going interactive
232 # make sure username is set before going interactive
233 if not opts.get('user'):
233 if not opts.get('user'):
234 ui.username() # raise exception, username not provided
234 ui.username() # raise exception, username not provided
235
235
236 def recordfunc(ui, repo, message, match, opts):
236 def recordfunc(ui, repo, message, match, opts):
237 """This is generic record driver.
237 """This is generic record driver.
238
238
239 Its job is to interactively filter local changes, and
239 Its job is to interactively filter local changes, and
240 accordingly prepare working directory into a state in which the
240 accordingly prepare working directory into a state in which the
241 job can be delegated to a non-interactive commit command such as
241 job can be delegated to a non-interactive commit command such as
242 'commit' or 'qrefresh'.
242 'commit' or 'qrefresh'.
243
243
244 After the actual job is done by non-interactive command, the
244 After the actual job is done by non-interactive command, the
245 working directory is restored to its original state.
245 working directory is restored to its original state.
246
246
247 In the end we'll record interesting changes, and everything else
247 In the end we'll record interesting changes, and everything else
248 will be left in place, so the user can continue working.
248 will be left in place, so the user can continue working.
249 """
249 """
250
250
251 checkunfinished(repo, commit=True)
251 checkunfinished(repo, commit=True)
252 wctx = repo[None]
252 wctx = repo[None]
253 merge = len(wctx.parents()) > 1
253 merge = len(wctx.parents()) > 1
254 if merge:
254 if merge:
255 raise error.Abort(_('cannot partially commit a merge '
255 raise error.Abort(_('cannot partially commit a merge '
256 '(use "hg commit" instead)'))
256 '(use "hg commit" instead)'))
257
257
258 def fail(f, msg):
258 def fail(f, msg):
259 raise error.Abort('%s: %s' % (f, msg))
259 raise error.Abort('%s: %s' % (f, msg))
260
260
261 force = opts.get('force')
261 force = opts.get('force')
262 if not force:
262 if not force:
263 vdirs = []
263 vdirs = []
264 match.explicitdir = vdirs.append
264 match.explicitdir = vdirs.append
265 match.bad = fail
265 match.bad = fail
266
266
267 status = repo.status(match=match)
267 status = repo.status(match=match)
268 if not force:
268 if not force:
269 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
269 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
270 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
270 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
271 diffopts.nodates = True
271 diffopts.nodates = True
272 diffopts.git = True
272 diffopts.git = True
273 diffopts.showfunc = True
273 diffopts.showfunc = True
274 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
274 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
275 originalchunks = patch.parsepatch(originaldiff)
275 originalchunks = patch.parsepatch(originaldiff)
276
276
277 # 1. filter patch, since we are intending to apply subset of it
277 # 1. filter patch, since we are intending to apply subset of it
278 try:
278 try:
279 chunks, newopts = filterfn(ui, originalchunks)
279 chunks, newopts = filterfn(ui, originalchunks)
280 except error.PatchError as err:
280 except error.PatchError as err:
281 raise error.Abort(_('error parsing patch: %s') % err)
281 raise error.Abort(_('error parsing patch: %s') % err)
282 opts.update(newopts)
282 opts.update(newopts)
283
283
284 # We need to keep a backup of files that have been newly added and
284 # We need to keep a backup of files that have been newly added and
285 # modified during the recording process because there is a previous
285 # modified during the recording process because there is a previous
286 # version without the edit in the workdir
286 # version without the edit in the workdir
287 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
287 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
288 contenders = set()
288 contenders = set()
289 for h in chunks:
289 for h in chunks:
290 try:
290 try:
291 contenders.update(set(h.files()))
291 contenders.update(set(h.files()))
292 except AttributeError:
292 except AttributeError:
293 pass
293 pass
294
294
295 changed = status.modified + status.added + status.removed
295 changed = status.modified + status.added + status.removed
296 newfiles = [f for f in changed if f in contenders]
296 newfiles = [f for f in changed if f in contenders]
297 if not newfiles:
297 if not newfiles:
298 ui.status(_('no changes to record\n'))
298 ui.status(_('no changes to record\n'))
299 return 0
299 return 0
300
300
301 modified = set(status.modified)
301 modified = set(status.modified)
302
302
303 # 2. backup changed files, so we can restore them in the end
303 # 2. backup changed files, so we can restore them in the end
304
304
305 if backupall:
305 if backupall:
306 tobackup = changed
306 tobackup = changed
307 else:
307 else:
308 tobackup = [f for f in newfiles if f in modified or f in \
308 tobackup = [f for f in newfiles if f in modified or f in \
309 newlyaddedandmodifiedfiles]
309 newlyaddedandmodifiedfiles]
310 backups = {}
310 backups = {}
311 if tobackup:
311 if tobackup:
312 backupdir = repo.vfs.join('record-backups')
312 backupdir = repo.vfs.join('record-backups')
313 try:
313 try:
314 os.mkdir(backupdir)
314 os.mkdir(backupdir)
315 except OSError as err:
315 except OSError as err:
316 if err.errno != errno.EEXIST:
316 if err.errno != errno.EEXIST:
317 raise
317 raise
318 try:
318 try:
319 # backup continues
319 # backup continues
320 for f in tobackup:
320 for f in tobackup:
321 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
321 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
322 dir=backupdir)
322 dir=backupdir)
323 os.close(fd)
323 os.close(fd)
324 ui.debug('backup %r as %r\n' % (f, tmpname))
324 ui.debug('backup %r as %r\n' % (f, tmpname))
325 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
325 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
326 backups[f] = tmpname
326 backups[f] = tmpname
327
327
328 fp = stringio()
328 fp = stringio()
329 for c in chunks:
329 for c in chunks:
330 fname = c.filename()
330 fname = c.filename()
331 if fname in backups:
331 if fname in backups:
332 c.write(fp)
332 c.write(fp)
333 dopatch = fp.tell()
333 dopatch = fp.tell()
334 fp.seek(0)
334 fp.seek(0)
335
335
336 # 2.5 optionally review / modify patch in text editor
336 # 2.5 optionally review / modify patch in text editor
337 if opts.get('review', False):
337 if opts.get('review', False):
338 patchtext = (crecordmod.diffhelptext
338 patchtext = (crecordmod.diffhelptext
339 + crecordmod.patchhelptext
339 + crecordmod.patchhelptext
340 + fp.read())
340 + fp.read())
341 reviewedpatch = ui.edit(patchtext, "",
341 reviewedpatch = ui.edit(patchtext, "",
342 action="diff",
342 action="diff",
343 repopath=repo.path)
343 repopath=repo.path)
344 fp.truncate(0)
344 fp.truncate(0)
345 fp.write(reviewedpatch)
345 fp.write(reviewedpatch)
346 fp.seek(0)
346 fp.seek(0)
347
347
348 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
348 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
349 # 3a. apply filtered patch to clean repo (clean)
349 # 3a. apply filtered patch to clean repo (clean)
350 if backups:
350 if backups:
351 # Equivalent to hg.revert
351 # Equivalent to hg.revert
352 m = scmutil.matchfiles(repo, backups.keys())
352 m = scmutil.matchfiles(repo, backups.keys())
353 mergemod.update(repo, repo.dirstate.p1(),
353 mergemod.update(repo, repo.dirstate.p1(),
354 False, True, matcher=m)
354 False, True, matcher=m)
355
355
356 # 3b. (apply)
356 # 3b. (apply)
357 if dopatch:
357 if dopatch:
358 try:
358 try:
359 ui.debug('applying patch\n')
359 ui.debug('applying patch\n')
360 ui.debug(fp.getvalue())
360 ui.debug(fp.getvalue())
361 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
361 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
362 except error.PatchError as err:
362 except error.PatchError as err:
363 raise error.Abort(str(err))
363 raise error.Abort(str(err))
364 del fp
364 del fp
365
365
366 # 4. We prepared working directory according to filtered
366 # 4. We prepared working directory according to filtered
367 # patch. Now is the time to delegate the job to
367 # patch. Now is the time to delegate the job to
368 # commit/qrefresh or the like!
368 # commit/qrefresh or the like!
369
369
370 # Make all of the pathnames absolute.
370 # Make all of the pathnames absolute.
371 newfiles = [repo.wjoin(nf) for nf in newfiles]
371 newfiles = [repo.wjoin(nf) for nf in newfiles]
372 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
372 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
373 finally:
373 finally:
374 # 5. finally restore backed-up files
374 # 5. finally restore backed-up files
375 try:
375 try:
376 dirstate = repo.dirstate
376 dirstate = repo.dirstate
377 for realname, tmpname in backups.iteritems():
377 for realname, tmpname in backups.iteritems():
378 ui.debug('restoring %r to %r\n' % (tmpname, realname))
378 ui.debug('restoring %r to %r\n' % (tmpname, realname))
379
379
380 if dirstate[realname] == 'n':
380 if dirstate[realname] == 'n':
381 # without normallookup, restoring timestamp
381 # without normallookup, restoring timestamp
382 # may cause partially committed files
382 # may cause partially committed files
383 # to be treated as unmodified
383 # to be treated as unmodified
384 dirstate.normallookup(realname)
384 dirstate.normallookup(realname)
385
385
386 # copystat=True here and above are a hack to trick any
386 # copystat=True here and above are a hack to trick any
387 # editors that have f open that we haven't modified them.
387 # editors that have f open that we haven't modified them.
388 #
388 #
389 # Also note that this racy as an editor could notice the
389 # Also note that this racy as an editor could notice the
390 # file's mtime before we've finished writing it.
390 # file's mtime before we've finished writing it.
391 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
391 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
392 os.unlink(tmpname)
392 os.unlink(tmpname)
393 if tobackup:
393 if tobackup:
394 os.rmdir(backupdir)
394 os.rmdir(backupdir)
395 except OSError:
395 except OSError:
396 pass
396 pass
397
397
398 def recordinwlock(ui, repo, message, match, opts):
398 def recordinwlock(ui, repo, message, match, opts):
399 with repo.wlock():
399 with repo.wlock():
400 return recordfunc(ui, repo, message, match, opts)
400 return recordfunc(ui, repo, message, match, opts)
401
401
402 return commit(ui, repo, recordinwlock, pats, opts)
402 return commit(ui, repo, recordinwlock, pats, opts)
403
403
404 class dirnode(object):
404 class dirnode(object):
405 """
405 """
406 Represent a directory in user working copy with information required for
406 Represent a directory in user working copy with information required for
407 the purpose of tersing its status.
407 the purpose of tersing its status.
408
408
409 path is the path to the directory
409 path is the path to the directory
410
410
411 statuses is a set of statuses of all files in this directory (this includes
411 statuses is a set of statuses of all files in this directory (this includes
412 all the files in all the subdirectories too)
412 all the files in all the subdirectories too)
413
413
414 files is a list of files which are direct child of this directory
414 files is a list of files which are direct child of this directory
415
415
416 subdirs is a dictionary of sub-directory name as the key and it's own
416 subdirs is a dictionary of sub-directory name as the key and it's own
417 dirnode object as the value
417 dirnode object as the value
418 """
418 """
419
419
420 def __init__(self, dirpath):
420 def __init__(self, dirpath):
421 self.path = dirpath
421 self.path = dirpath
422 self.statuses = set([])
422 self.statuses = set([])
423 self.files = []
423 self.files = []
424 self.subdirs = {}
424 self.subdirs = {}
425
425
426 def _addfileindir(self, filename, status):
426 def _addfileindir(self, filename, status):
427 """Add a file in this directory as a direct child."""
427 """Add a file in this directory as a direct child."""
428 self.files.append((filename, status))
428 self.files.append((filename, status))
429
429
430 def addfile(self, filename, status):
430 def addfile(self, filename, status):
431 """
431 """
432 Add a file to this directory or to its direct parent directory.
432 Add a file to this directory or to its direct parent directory.
433
433
434 If the file is not direct child of this directory, we traverse to the
434 If the file is not direct child of this directory, we traverse to the
435 directory of which this file is a direct child of and add the file
435 directory of which this file is a direct child of and add the file
436 there.
436 there.
437 """
437 """
438
438
439 # the filename contains a path separator, it means it's not the direct
439 # the filename contains a path separator, it means it's not the direct
440 # child of this directory
440 # child of this directory
441 if '/' in filename:
441 if '/' in filename:
442 subdir, filep = filename.split('/', 1)
442 subdir, filep = filename.split('/', 1)
443
443
444 # does the dirnode object for subdir exists
444 # does the dirnode object for subdir exists
445 if subdir not in self.subdirs:
445 if subdir not in self.subdirs:
446 subdirpath = os.path.join(self.path, subdir)
446 subdirpath = os.path.join(self.path, subdir)
447 self.subdirs[subdir] = dirnode(subdirpath)
447 self.subdirs[subdir] = dirnode(subdirpath)
448
448
449 # try adding the file in subdir
449 # try adding the file in subdir
450 self.subdirs[subdir].addfile(filep, status)
450 self.subdirs[subdir].addfile(filep, status)
451
451
452 else:
452 else:
453 self._addfileindir(filename, status)
453 self._addfileindir(filename, status)
454
454
455 if status not in self.statuses:
455 if status not in self.statuses:
456 self.statuses.add(status)
456 self.statuses.add(status)
457
457
458 def iterfilepaths(self):
458 def iterfilepaths(self):
459 """Yield (status, path) for files directly under this directory."""
459 """Yield (status, path) for files directly under this directory."""
460 for f, st in self.files:
460 for f, st in self.files:
461 yield st, os.path.join(self.path, f)
461 yield st, os.path.join(self.path, f)
462
462
463 def tersewalk(self, terseargs):
463 def tersewalk(self, terseargs):
464 """
464 """
465 Yield (status, path) obtained by processing the status of this
465 Yield (status, path) obtained by processing the status of this
466 dirnode.
466 dirnode.
467
467
468 terseargs is the string of arguments passed by the user with `--terse`
468 terseargs is the string of arguments passed by the user with `--terse`
469 flag.
469 flag.
470
470
471 Following are the cases which can happen:
471 Following are the cases which can happen:
472
472
473 1) All the files in the directory (including all the files in its
473 1) All the files in the directory (including all the files in its
474 subdirectories) share the same status and the user has asked us to terse
474 subdirectories) share the same status and the user has asked us to terse
475 that status. -> yield (status, dirpath)
475 that status. -> yield (status, dirpath)
476
476
477 2) Otherwise, we do following:
477 2) Otherwise, we do following:
478
478
479 a) Yield (status, filepath) for all the files which are in this
479 a) Yield (status, filepath) for all the files which are in this
480 directory (only the ones in this directory, not the subdirs)
480 directory (only the ones in this directory, not the subdirs)
481
481
482 b) Recurse the function on all the subdirectories of this
482 b) Recurse the function on all the subdirectories of this
483 directory
483 directory
484 """
484 """
485
485
486 if len(self.statuses) == 1:
486 if len(self.statuses) == 1:
487 onlyst = self.statuses.pop()
487 onlyst = self.statuses.pop()
488
488
489 # Making sure we terse only when the status abbreviation is
489 # Making sure we terse only when the status abbreviation is
490 # passed as terse argument
490 # passed as terse argument
491 if onlyst in terseargs:
491 if onlyst in terseargs:
492 yield onlyst, self.path + pycompat.ossep
492 yield onlyst, self.path + pycompat.ossep
493 return
493 return
494
494
495 # add the files to status list
495 # add the files to status list
496 for st, fpath in self.iterfilepaths():
496 for st, fpath in self.iterfilepaths():
497 yield st, fpath
497 yield st, fpath
498
498
499 #recurse on the subdirs
499 #recurse on the subdirs
500 for dirobj in self.subdirs.values():
500 for dirobj in self.subdirs.values():
501 for st, fpath in dirobj.tersewalk(terseargs):
501 for st, fpath in dirobj.tersewalk(terseargs):
502 yield st, fpath
502 yield st, fpath
503
503
504 def tersedir(statuslist, terseargs):
504 def tersedir(statuslist, terseargs):
505 """
505 """
506 Terse the status if all the files in a directory shares the same status.
506 Terse the status if all the files in a directory shares the same status.
507
507
508 statuslist is scmutil.status() object which contains a list of files for
508 statuslist is scmutil.status() object which contains a list of files for
509 each status.
509 each status.
510 terseargs is string which is passed by the user as the argument to `--terse`
510 terseargs is string which is passed by the user as the argument to `--terse`
511 flag.
511 flag.
512
512
513 The function makes a tree of objects of dirnode class, and at each node it
513 The function makes a tree of objects of dirnode class, and at each node it
514 stores the information required to know whether we can terse a certain
514 stores the information required to know whether we can terse a certain
515 directory or not.
515 directory or not.
516 """
516 """
517 # the order matters here as that is used to produce final list
517 # the order matters here as that is used to produce final list
518 allst = ('m', 'a', 'r', 'd', 'u', 'i', 'c')
518 allst = ('m', 'a', 'r', 'd', 'u', 'i', 'c')
519
519
520 # checking the argument validity
520 # checking the argument validity
521 for s in pycompat.bytestr(terseargs):
521 for s in pycompat.bytestr(terseargs):
522 if s not in allst:
522 if s not in allst:
523 raise error.Abort(_("'%s' not recognized") % s)
523 raise error.Abort(_("'%s' not recognized") % s)
524
524
525 # creating a dirnode object for the root of the repo
525 # creating a dirnode object for the root of the repo
526 rootobj = dirnode('')
526 rootobj = dirnode('')
527 pstatus = ('modified', 'added', 'deleted', 'clean', 'unknown',
527 pstatus = ('modified', 'added', 'deleted', 'clean', 'unknown',
528 'ignored', 'removed')
528 'ignored', 'removed')
529
529
530 tersedict = {}
530 tersedict = {}
531 for attrname in pstatus:
531 for attrname in pstatus:
532 statuschar = attrname[0:1]
532 statuschar = attrname[0:1]
533 for f in getattr(statuslist, attrname):
533 for f in getattr(statuslist, attrname):
534 rootobj.addfile(f, statuschar)
534 rootobj.addfile(f, statuschar)
535 tersedict[statuschar] = []
535 tersedict[statuschar] = []
536
536
537 # we won't be tersing the root dir, so add files in it
537 # we won't be tersing the root dir, so add files in it
538 for st, fpath in rootobj.iterfilepaths():
538 for st, fpath in rootobj.iterfilepaths():
539 tersedict[st].append(fpath)
539 tersedict[st].append(fpath)
540
540
541 # process each sub-directory and build tersedict
541 # process each sub-directory and build tersedict
542 for subdir in rootobj.subdirs.values():
542 for subdir in rootobj.subdirs.values():
543 for st, f in subdir.tersewalk(terseargs):
543 for st, f in subdir.tersewalk(terseargs):
544 tersedict[st].append(f)
544 tersedict[st].append(f)
545
545
546 tersedlist = []
546 tersedlist = []
547 for st in allst:
547 for st in allst:
548 tersedict[st].sort()
548 tersedict[st].sort()
549 tersedlist.append(tersedict[st])
549 tersedlist.append(tersedict[st])
550
550
551 return tersedlist
551 return tersedlist
552
552
553 def _commentlines(raw):
553 def _commentlines(raw):
554 '''Surround lineswith a comment char and a new line'''
554 '''Surround lineswith a comment char and a new line'''
555 lines = raw.splitlines()
555 lines = raw.splitlines()
556 commentedlines = ['# %s' % line for line in lines]
556 commentedlines = ['# %s' % line for line in lines]
557 return '\n'.join(commentedlines) + '\n'
557 return '\n'.join(commentedlines) + '\n'
558
558
559 def _conflictsmsg(repo):
559 def _conflictsmsg(repo):
560 mergestate = mergemod.mergestate.read(repo)
560 mergestate = mergemod.mergestate.read(repo)
561 if not mergestate.active():
561 if not mergestate.active():
562 return
562 return
563
563
564 m = scmutil.match(repo[None])
564 m = scmutil.match(repo[None])
565 unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
565 unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
566 if unresolvedlist:
566 if unresolvedlist:
567 mergeliststr = '\n'.join(
567 mergeliststr = '\n'.join(
568 [' %s' % util.pathto(repo.root, pycompat.getcwd(), path)
568 [' %s' % util.pathto(repo.root, pycompat.getcwd(), path)
569 for path in unresolvedlist])
569 for path in unresolvedlist])
570 msg = _('''Unresolved merge conflicts:
570 msg = _('''Unresolved merge conflicts:
571
571
572 %s
572 %s
573
573
574 To mark files as resolved: hg resolve --mark FILE''') % mergeliststr
574 To mark files as resolved: hg resolve --mark FILE''') % mergeliststr
575 else:
575 else:
576 msg = _('No unresolved merge conflicts.')
576 msg = _('No unresolved merge conflicts.')
577
577
578 return _commentlines(msg)
578 return _commentlines(msg)
579
579
580 def _helpmessage(continuecmd, abortcmd):
580 def _helpmessage(continuecmd, abortcmd):
581 msg = _('To continue: %s\n'
581 msg = _('To continue: %s\n'
582 'To abort: %s') % (continuecmd, abortcmd)
582 'To abort: %s') % (continuecmd, abortcmd)
583 return _commentlines(msg)
583 return _commentlines(msg)
584
584
585 def _rebasemsg():
585 def _rebasemsg():
586 return _helpmessage('hg rebase --continue', 'hg rebase --abort')
586 return _helpmessage('hg rebase --continue', 'hg rebase --abort')
587
587
588 def _histeditmsg():
588 def _histeditmsg():
589 return _helpmessage('hg histedit --continue', 'hg histedit --abort')
589 return _helpmessage('hg histedit --continue', 'hg histedit --abort')
590
590
591 def _unshelvemsg():
591 def _unshelvemsg():
592 return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')
592 return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')
593
593
594 def _updatecleanmsg(dest=None):
594 def _updatecleanmsg(dest=None):
595 warning = _('warning: this will discard uncommitted changes')
595 warning = _('warning: this will discard uncommitted changes')
596 return 'hg update --clean %s (%s)' % (dest or '.', warning)
596 return 'hg update --clean %s (%s)' % (dest or '.', warning)
597
597
598 def _graftmsg():
598 def _graftmsg():
599 # tweakdefaults requires `update` to have a rev hence the `.`
599 # tweakdefaults requires `update` to have a rev hence the `.`
600 return _helpmessage('hg graft --continue', _updatecleanmsg())
600 return _helpmessage('hg graft --continue', _updatecleanmsg())
601
601
602 def _mergemsg():
602 def _mergemsg():
603 # tweakdefaults requires `update` to have a rev hence the `.`
603 # tweakdefaults requires `update` to have a rev hence the `.`
604 return _helpmessage('hg commit', _updatecleanmsg())
604 return _helpmessage('hg commit', _updatecleanmsg())
605
605
606 def _bisectmsg():
606 def _bisectmsg():
607 msg = _('To mark the changeset good: hg bisect --good\n'
607 msg = _('To mark the changeset good: hg bisect --good\n'
608 'To mark the changeset bad: hg bisect --bad\n'
608 'To mark the changeset bad: hg bisect --bad\n'
609 'To abort: hg bisect --reset\n')
609 'To abort: hg bisect --reset\n')
610 return _commentlines(msg)
610 return _commentlines(msg)
611
611
612 def fileexistspredicate(filename):
612 def fileexistspredicate(filename):
613 return lambda repo: repo.vfs.exists(filename)
613 return lambda repo: repo.vfs.exists(filename)
614
614
615 def _mergepredicate(repo):
615 def _mergepredicate(repo):
616 return len(repo[None].parents()) > 1
616 return len(repo[None].parents()) > 1
617
617
618 STATES = (
618 STATES = (
619 # (state, predicate to detect states, helpful message function)
619 # (state, predicate to detect states, helpful message function)
620 ('histedit', fileexistspredicate('histedit-state'), _histeditmsg),
620 ('histedit', fileexistspredicate('histedit-state'), _histeditmsg),
621 ('bisect', fileexistspredicate('bisect.state'), _bisectmsg),
621 ('bisect', fileexistspredicate('bisect.state'), _bisectmsg),
622 ('graft', fileexistspredicate('graftstate'), _graftmsg),
622 ('graft', fileexistspredicate('graftstate'), _graftmsg),
623 ('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg),
623 ('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg),
624 ('rebase', fileexistspredicate('rebasestate'), _rebasemsg),
624 ('rebase', fileexistspredicate('rebasestate'), _rebasemsg),
625 # The merge state is part of a list that will be iterated over.
625 # The merge state is part of a list that will be iterated over.
626 # They need to be last because some of the other unfinished states may also
626 # They need to be last because some of the other unfinished states may also
627 # be in a merge or update state (eg. rebase, histedit, graft, etc).
627 # be in a merge or update state (eg. rebase, histedit, graft, etc).
628 # We want those to have priority.
628 # We want those to have priority.
629 ('merge', _mergepredicate, _mergemsg),
629 ('merge', _mergepredicate, _mergemsg),
630 )
630 )
631
631
632 def _getrepostate(repo):
632 def _getrepostate(repo):
633 # experimental config: commands.status.skipstates
633 # experimental config: commands.status.skipstates
634 skip = set(repo.ui.configlist('commands', 'status.skipstates'))
634 skip = set(repo.ui.configlist('commands', 'status.skipstates'))
635 for state, statedetectionpredicate, msgfn in STATES:
635 for state, statedetectionpredicate, msgfn in STATES:
636 if state in skip:
636 if state in skip:
637 continue
637 continue
638 if statedetectionpredicate(repo):
638 if statedetectionpredicate(repo):
639 return (state, statedetectionpredicate, msgfn)
639 return (state, statedetectionpredicate, msgfn)
640
640
641 def morestatus(repo, fm):
641 def morestatus(repo, fm):
642 statetuple = _getrepostate(repo)
642 statetuple = _getrepostate(repo)
643 label = 'status.morestatus'
643 label = 'status.morestatus'
644 if statetuple:
644 if statetuple:
645 fm.startitem()
645 fm.startitem()
646 state, statedetectionpredicate, helpfulmsg = statetuple
646 state, statedetectionpredicate, helpfulmsg = statetuple
647 statemsg = _('The repository is in an unfinished *%s* state.') % state
647 statemsg = _('The repository is in an unfinished *%s* state.') % state
648 fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label)
648 fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label)
649 conmsg = _conflictsmsg(repo)
649 conmsg = _conflictsmsg(repo)
650 if conmsg:
650 if conmsg:
651 fm.write('conflictsmsg', '%s\n', conmsg, label=label)
651 fm.write('conflictsmsg', '%s\n', conmsg, label=label)
652 if helpfulmsg:
652 if helpfulmsg:
653 helpmsg = helpfulmsg()
653 helpmsg = helpfulmsg()
654 fm.write('helpmsg', '%s\n', helpmsg, label=label)
654 fm.write('helpmsg', '%s\n', helpmsg, label=label)
655
655
656 def findpossible(cmd, table, strict=False):
656 def findpossible(cmd, table, strict=False):
657 """
657 """
658 Return cmd -> (aliases, command table entry)
658 Return cmd -> (aliases, command table entry)
659 for each matching command.
659 for each matching command.
660 Return debug commands (or their aliases) only if no normal command matches.
660 Return debug commands (or their aliases) only if no normal command matches.
661 """
661 """
662 choice = {}
662 choice = {}
663 debugchoice = {}
663 debugchoice = {}
664
664
665 if cmd in table:
665 if cmd in table:
666 # short-circuit exact matches, "log" alias beats "^log|history"
666 # short-circuit exact matches, "log" alias beats "^log|history"
667 keys = [cmd]
667 keys = [cmd]
668 else:
668 else:
669 keys = table.keys()
669 keys = table.keys()
670
670
671 allcmds = []
671 allcmds = []
672 for e in keys:
672 for e in keys:
673 aliases = parsealiases(e)
673 aliases = parsealiases(e)
674 allcmds.extend(aliases)
674 allcmds.extend(aliases)
675 found = None
675 found = None
676 if cmd in aliases:
676 if cmd in aliases:
677 found = cmd
677 found = cmd
678 elif not strict:
678 elif not strict:
679 for a in aliases:
679 for a in aliases:
680 if a.startswith(cmd):
680 if a.startswith(cmd):
681 found = a
681 found = a
682 break
682 break
683 if found is not None:
683 if found is not None:
684 if aliases[0].startswith("debug") or found.startswith("debug"):
684 if aliases[0].startswith("debug") or found.startswith("debug"):
685 debugchoice[found] = (aliases, table[e])
685 debugchoice[found] = (aliases, table[e])
686 else:
686 else:
687 choice[found] = (aliases, table[e])
687 choice[found] = (aliases, table[e])
688
688
689 if not choice and debugchoice:
689 if not choice and debugchoice:
690 choice = debugchoice
690 choice = debugchoice
691
691
692 return choice, allcmds
692 return choice, allcmds
693
693
694 def findcmd(cmd, table, strict=True):
694 def findcmd(cmd, table, strict=True):
695 """Return (aliases, command table entry) for command string."""
695 """Return (aliases, command table entry) for command string."""
696 choice, allcmds = findpossible(cmd, table, strict)
696 choice, allcmds = findpossible(cmd, table, strict)
697
697
698 if cmd in choice:
698 if cmd in choice:
699 return choice[cmd]
699 return choice[cmd]
700
700
701 if len(choice) > 1:
701 if len(choice) > 1:
702 clist = sorted(choice)
702 clist = sorted(choice)
703 raise error.AmbiguousCommand(cmd, clist)
703 raise error.AmbiguousCommand(cmd, clist)
704
704
705 if choice:
705 if choice:
706 return list(choice.values())[0]
706 return list(choice.values())[0]
707
707
708 raise error.UnknownCommand(cmd, allcmds)
708 raise error.UnknownCommand(cmd, allcmds)
709
709
710 def changebranch(ui, repo, revs, label):
710 def changebranch(ui, repo, revs, label):
711 """ Change the branch name of given revs to label """
711 """ Change the branch name of given revs to label """
712
712
713 with repo.wlock(), repo.lock(), repo.transaction('branches'):
713 with repo.wlock(), repo.lock(), repo.transaction('branches'):
714 # abort in case of uncommitted merge or dirty wdir
714 # abort in case of uncommitted merge or dirty wdir
715 bailifchanged(repo)
715 bailifchanged(repo)
716 revs = scmutil.revrange(repo, revs)
716 revs = scmutil.revrange(repo, revs)
717 if not revs:
717 if not revs:
718 raise error.Abort("empty revision set")
718 raise error.Abort("empty revision set")
719 roots = repo.revs('roots(%ld)', revs)
719 roots = repo.revs('roots(%ld)', revs)
720 if len(roots) > 1:
720 if len(roots) > 1:
721 raise error.Abort(_("cannot change branch of non-linear revisions"))
721 raise error.Abort(_("cannot change branch of non-linear revisions"))
722 rewriteutil.precheck(repo, revs, 'change branch of')
722 rewriteutil.precheck(repo, revs, 'change branch of')
723
723
724 root = repo[roots.first()]
724 root = repo[roots.first()]
725 if not root.p1().branch() == label and label in repo.branchmap():
725 if not root.p1().branch() == label and label in repo.branchmap():
726 raise error.Abort(_("a branch of the same name already exists"))
726 raise error.Abort(_("a branch of the same name already exists"))
727
727
728 if repo.revs('merge() and %ld', revs):
728 if repo.revs('merge() and %ld', revs):
729 raise error.Abort(_("cannot change branch of a merge commit"))
729 raise error.Abort(_("cannot change branch of a merge commit"))
730 if repo.revs('obsolete() and %ld', revs):
730 if repo.revs('obsolete() and %ld', revs):
731 raise error.Abort(_("cannot change branch of a obsolete changeset"))
731 raise error.Abort(_("cannot change branch of a obsolete changeset"))
732
732
733 # make sure only topological heads
733 # make sure only topological heads
734 if repo.revs('heads(%ld) - head()', revs):
734 if repo.revs('heads(%ld) - head()', revs):
735 raise error.Abort(_("cannot change branch in middle of a stack"))
735 raise error.Abort(_("cannot change branch in middle of a stack"))
736
736
737 replacements = {}
737 replacements = {}
738 # avoid import cycle mercurial.cmdutil -> mercurial.context ->
738 # avoid import cycle mercurial.cmdutil -> mercurial.context ->
739 # mercurial.subrepo -> mercurial.cmdutil
739 # mercurial.subrepo -> mercurial.cmdutil
740 from . import context
740 from . import context
741 for rev in revs:
741 for rev in revs:
742 ctx = repo[rev]
742 ctx = repo[rev]
743 oldbranch = ctx.branch()
743 oldbranch = ctx.branch()
744 # check if ctx has same branch
744 # check if ctx has same branch
745 if oldbranch == label:
745 if oldbranch == label:
746 continue
746 continue
747
747
748 def filectxfn(repo, newctx, path):
748 def filectxfn(repo, newctx, path):
749 try:
749 try:
750 return ctx[path]
750 return ctx[path]
751 except error.ManifestLookupError:
751 except error.ManifestLookupError:
752 return None
752 return None
753
753
754 ui.debug("changing branch of '%s' from '%s' to '%s'\n"
754 ui.debug("changing branch of '%s' from '%s' to '%s'\n"
755 % (hex(ctx.node()), oldbranch, label))
755 % (hex(ctx.node()), oldbranch, label))
756 extra = ctx.extra()
756 extra = ctx.extra()
757 extra['branch_change'] = hex(ctx.node())
757 extra['branch_change'] = hex(ctx.node())
758 # While changing branch of set of linear commits, make sure that
758 # While changing branch of set of linear commits, make sure that
759 # we base our commits on new parent rather than old parent which
759 # we base our commits on new parent rather than old parent which
760 # was obsoleted while changing the branch
760 # was obsoleted while changing the branch
761 p1 = ctx.p1().node()
761 p1 = ctx.p1().node()
762 p2 = ctx.p2().node()
762 p2 = ctx.p2().node()
763 if p1 in replacements:
763 if p1 in replacements:
764 p1 = replacements[p1][0]
764 p1 = replacements[p1][0]
765 if p2 in replacements:
765 if p2 in replacements:
766 p2 = replacements[p2][0]
766 p2 = replacements[p2][0]
767
767
768 mc = context.memctx(repo, (p1, p2),
768 mc = context.memctx(repo, (p1, p2),
769 ctx.description(),
769 ctx.description(),
770 ctx.files(),
770 ctx.files(),
771 filectxfn,
771 filectxfn,
772 user=ctx.user(),
772 user=ctx.user(),
773 date=ctx.date(),
773 date=ctx.date(),
774 extra=extra,
774 extra=extra,
775 branch=label)
775 branch=label)
776
776
777 commitphase = ctx.phase()
777 commitphase = ctx.phase()
778 overrides = {('phases', 'new-commit'): commitphase}
778 overrides = {('phases', 'new-commit'): commitphase}
779 with repo.ui.configoverride(overrides, 'branch-change'):
779 with repo.ui.configoverride(overrides, 'branch-change'):
780 newnode = repo.commitctx(mc)
780 newnode = repo.commitctx(mc)
781
781
782 replacements[ctx.node()] = (newnode,)
782 replacements[ctx.node()] = (newnode,)
783 ui.debug('new node id is %s\n' % hex(newnode))
783 ui.debug('new node id is %s\n' % hex(newnode))
784
784
785 # create obsmarkers and move bookmarks
785 # create obsmarkers and move bookmarks
786 scmutil.cleanupnodes(repo, replacements, 'branch-change')
786 scmutil.cleanupnodes(repo, replacements, 'branch-change')
787
787
788 # move the working copy too
788 # move the working copy too
789 wctx = repo[None]
789 wctx = repo[None]
790 # in-progress merge is a bit too complex for now.
790 # in-progress merge is a bit too complex for now.
791 if len(wctx.parents()) == 1:
791 if len(wctx.parents()) == 1:
792 newid = replacements.get(wctx.p1().node())
792 newid = replacements.get(wctx.p1().node())
793 if newid is not None:
793 if newid is not None:
794 # avoid import cycle mercurial.cmdutil -> mercurial.hg ->
794 # avoid import cycle mercurial.cmdutil -> mercurial.hg ->
795 # mercurial.cmdutil
795 # mercurial.cmdutil
796 from . import hg
796 from . import hg
797 hg.update(repo, newid[0], quietempty=True)
797 hg.update(repo, newid[0], quietempty=True)
798
798
799 ui.status(_("changed branch on %d changesets\n") % len(replacements))
799 ui.status(_("changed branch on %d changesets\n") % len(replacements))
800
800
801 def findrepo(p):
801 def findrepo(p):
802 while not os.path.isdir(os.path.join(p, ".hg")):
802 while not os.path.isdir(os.path.join(p, ".hg")):
803 oldp, p = p, os.path.dirname(p)
803 oldp, p = p, os.path.dirname(p)
804 if p == oldp:
804 if p == oldp:
805 return None
805 return None
806
806
807 return p
807 return p
808
808
809 def bailifchanged(repo, merge=True, hint=None):
809 def bailifchanged(repo, merge=True, hint=None):
810 """ enforce the precondition that working directory must be clean.
810 """ enforce the precondition that working directory must be clean.
811
811
812 'merge' can be set to false if a pending uncommitted merge should be
812 'merge' can be set to false if a pending uncommitted merge should be
813 ignored (such as when 'update --check' runs).
813 ignored (such as when 'update --check' runs).
814
814
815 'hint' is the usual hint given to Abort exception.
815 'hint' is the usual hint given to Abort exception.
816 """
816 """
817
817
818 if merge and repo.dirstate.p2() != nullid:
818 if merge and repo.dirstate.p2() != nullid:
819 raise error.Abort(_('outstanding uncommitted merge'), hint=hint)
819 raise error.Abort(_('outstanding uncommitted merge'), hint=hint)
820 modified, added, removed, deleted = repo.status()[:4]
820 modified, added, removed, deleted = repo.status()[:4]
821 if modified or added or removed or deleted:
821 if modified or added or removed or deleted:
822 raise error.Abort(_('uncommitted changes'), hint=hint)
822 raise error.Abort(_('uncommitted changes'), hint=hint)
823 ctx = repo[None]
823 ctx = repo[None]
824 for s in sorted(ctx.substate):
824 for s in sorted(ctx.substate):
825 ctx.sub(s).bailifchanged(hint=hint)
825 ctx.sub(s).bailifchanged(hint=hint)
826
826
827 def logmessage(ui, opts):
827 def logmessage(ui, opts):
828 """ get the log message according to -m and -l option """
828 """ get the log message according to -m and -l option """
829 message = opts.get('message')
829 message = opts.get('message')
830 logfile = opts.get('logfile')
830 logfile = opts.get('logfile')
831
831
832 if message and logfile:
832 if message and logfile:
833 raise error.Abort(_('options --message and --logfile are mutually '
833 raise error.Abort(_('options --message and --logfile are mutually '
834 'exclusive'))
834 'exclusive'))
835 if not message and logfile:
835 if not message and logfile:
836 try:
836 try:
837 if isstdiofilename(logfile):
837 if isstdiofilename(logfile):
838 message = ui.fin.read()
838 message = ui.fin.read()
839 else:
839 else:
840 message = '\n'.join(util.readfile(logfile).splitlines())
840 message = '\n'.join(util.readfile(logfile).splitlines())
841 except IOError as inst:
841 except IOError as inst:
842 raise error.Abort(_("can't read commit message '%s': %s") %
842 raise error.Abort(_("can't read commit message '%s': %s") %
843 (logfile, encoding.strtolocal(inst.strerror)))
843 (logfile, encoding.strtolocal(inst.strerror)))
844 return message
844 return message
845
845
846 def mergeeditform(ctxorbool, baseformname):
846 def mergeeditform(ctxorbool, baseformname):
847 """return appropriate editform name (referencing a committemplate)
847 """return appropriate editform name (referencing a committemplate)
848
848
849 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
849 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
850 merging is committed.
850 merging is committed.
851
851
852 This returns baseformname with '.merge' appended if it is a merge,
852 This returns baseformname with '.merge' appended if it is a merge,
853 otherwise '.normal' is appended.
853 otherwise '.normal' is appended.
854 """
854 """
855 if isinstance(ctxorbool, bool):
855 if isinstance(ctxorbool, bool):
856 if ctxorbool:
856 if ctxorbool:
857 return baseformname + ".merge"
857 return baseformname + ".merge"
858 elif 1 < len(ctxorbool.parents()):
858 elif 1 < len(ctxorbool.parents()):
859 return baseformname + ".merge"
859 return baseformname + ".merge"
860
860
861 return baseformname + ".normal"
861 return baseformname + ".normal"
862
862
863 def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
863 def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
864 editform='', **opts):
864 editform='', **opts):
865 """get appropriate commit message editor according to '--edit' option
865 """get appropriate commit message editor according to '--edit' option
866
866
867 'finishdesc' is a function to be called with edited commit message
867 'finishdesc' is a function to be called with edited commit message
868 (= 'description' of the new changeset) just after editing, but
868 (= 'description' of the new changeset) just after editing, but
869 before checking empty-ness. It should return actual text to be
869 before checking empty-ness. It should return actual text to be
870 stored into history. This allows to change description before
870 stored into history. This allows to change description before
871 storing.
871 storing.
872
872
873 'extramsg' is a extra message to be shown in the editor instead of
873 'extramsg' is a extra message to be shown in the editor instead of
874 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
874 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
875 is automatically added.
875 is automatically added.
876
876
877 'editform' is a dot-separated list of names, to distinguish
877 'editform' is a dot-separated list of names, to distinguish
878 the purpose of commit text editing.
878 the purpose of commit text editing.
879
879
880 'getcommiteditor' returns 'commitforceeditor' regardless of
880 'getcommiteditor' returns 'commitforceeditor' regardless of
881 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
881 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
882 they are specific for usage in MQ.
882 they are specific for usage in MQ.
883 """
883 """
884 if edit or finishdesc or extramsg:
884 if edit or finishdesc or extramsg:
885 return lambda r, c, s: commitforceeditor(r, c, s,
885 return lambda r, c, s: commitforceeditor(r, c, s,
886 finishdesc=finishdesc,
886 finishdesc=finishdesc,
887 extramsg=extramsg,
887 extramsg=extramsg,
888 editform=editform)
888 editform=editform)
889 elif editform:
889 elif editform:
890 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
890 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
891 else:
891 else:
892 return commiteditor
892 return commiteditor
893
893
894 def makefilename(repo, pat, node, desc=None,
894 def makefilename(repo, pat, node, desc=None,
895 total=None, seqno=None, revwidth=None, pathname=None):
895 total=None, seqno=None, revwidth=None, pathname=None):
896 node_expander = {
896 expander = {
897 'H': lambda: hex(node),
897 'H': lambda: hex(node),
898 'R': lambda: '%d' % repo.changelog.rev(node),
898 'R': lambda: '%d' % repo.changelog.rev(node),
899 'h': lambda: short(node),
899 'h': lambda: short(node),
900 'm': lambda: re.sub('[^\w]', '_', desc or '')
900 'm': lambda: re.sub('[^\w]', '_', desc or ''),
901 }
901 'r': lambda: ('%d' % repo.changelog.rev(node)).zfill(revwidth or 0),
902 expander = {
903 '%': lambda: '%',
902 '%': lambda: '%',
904 'b': lambda: os.path.basename(repo.root),
903 'b': lambda: os.path.basename(repo.root),
905 }
904 }
906
905
907 try:
906 try:
908 if node:
909 expander.update(node_expander)
910 if node:
911 expander['r'] = (lambda:
912 ('%d' % repo.changelog.rev(node)).zfill(revwidth or 0))
913 if total is not None:
907 if total is not None:
914 expander['N'] = lambda: '%d' % total
908 expander['N'] = lambda: '%d' % total
915 if seqno is not None:
909 if seqno is not None:
916 expander['n'] = lambda: '%d' % seqno
910 expander['n'] = lambda: '%d' % seqno
917 if total is not None and seqno is not None:
911 if total is not None and seqno is not None:
918 expander['n'] = (lambda: ('%d' % seqno).zfill(len('%d' % total)))
912 expander['n'] = (lambda: ('%d' % seqno).zfill(len('%d' % total)))
919 if pathname is not None:
913 if pathname is not None:
920 expander['s'] = lambda: os.path.basename(pathname)
914 expander['s'] = lambda: os.path.basename(pathname)
921 expander['d'] = lambda: os.path.dirname(pathname) or '.'
915 expander['d'] = lambda: os.path.dirname(pathname) or '.'
922 expander['p'] = lambda: pathname
916 expander['p'] = lambda: pathname
923
917
924 newname = []
918 newname = []
925 patlen = len(pat)
919 patlen = len(pat)
926 i = 0
920 i = 0
927 while i < patlen:
921 while i < patlen:
928 c = pat[i:i + 1]
922 c = pat[i:i + 1]
929 if c == '%':
923 if c == '%':
930 i += 1
924 i += 1
931 c = pat[i:i + 1]
925 c = pat[i:i + 1]
932 c = expander[c]()
926 c = expander[c]()
933 newname.append(c)
927 newname.append(c)
934 i += 1
928 i += 1
935 return ''.join(newname)
929 return ''.join(newname)
936 except KeyError as inst:
930 except KeyError as inst:
937 raise error.Abort(_("invalid format spec '%%%s' in output filename") %
931 raise error.Abort(_("invalid format spec '%%%s' in output filename") %
938 inst.args[0])
932 inst.args[0])
939
933
940 def isstdiofilename(pat):
934 def isstdiofilename(pat):
941 """True if the given pat looks like a filename denoting stdin/stdout"""
935 """True if the given pat looks like a filename denoting stdin/stdout"""
942 return not pat or pat == '-'
936 return not pat or pat == '-'
943
937
944 class _unclosablefile(object):
938 class _unclosablefile(object):
945 def __init__(self, fp):
939 def __init__(self, fp):
946 self._fp = fp
940 self._fp = fp
947
941
948 def close(self):
942 def close(self):
949 pass
943 pass
950
944
951 def __iter__(self):
945 def __iter__(self):
952 return iter(self._fp)
946 return iter(self._fp)
953
947
954 def __getattr__(self, attr):
948 def __getattr__(self, attr):
955 return getattr(self._fp, attr)
949 return getattr(self._fp, attr)
956
950
957 def __enter__(self):
951 def __enter__(self):
958 return self
952 return self
959
953
960 def __exit__(self, exc_type, exc_value, exc_tb):
954 def __exit__(self, exc_type, exc_value, exc_tb):
961 pass
955 pass
962
956
963 def makefileobj(repo, pat, node=None, desc=None, total=None,
957 def makefileobj(repo, pat, node, desc=None, total=None,
964 seqno=None, revwidth=None, mode='wb', modemap=None,
958 seqno=None, revwidth=None, mode='wb', modemap=None,
965 pathname=None):
959 pathname=None):
966
960
967 writable = mode not in ('r', 'rb')
961 writable = mode not in ('r', 'rb')
968
962
969 if isstdiofilename(pat):
963 if isstdiofilename(pat):
970 if writable:
964 if writable:
971 fp = repo.ui.fout
965 fp = repo.ui.fout
972 else:
966 else:
973 fp = repo.ui.fin
967 fp = repo.ui.fin
974 return _unclosablefile(fp)
968 return _unclosablefile(fp)
975 fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
969 fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
976 if modemap is not None:
970 if modemap is not None:
977 mode = modemap.get(fn, mode)
971 mode = modemap.get(fn, mode)
978 if mode == 'wb':
972 if mode == 'wb':
979 modemap[fn] = 'ab'
973 modemap[fn] = 'ab'
980 return open(fn, mode)
974 return open(fn, mode)
981
975
982 def openrevlog(repo, cmd, file_, opts):
976 def openrevlog(repo, cmd, file_, opts):
983 """opens the changelog, manifest, a filelog or a given revlog"""
977 """opens the changelog, manifest, a filelog or a given revlog"""
984 cl = opts['changelog']
978 cl = opts['changelog']
985 mf = opts['manifest']
979 mf = opts['manifest']
986 dir = opts['dir']
980 dir = opts['dir']
987 msg = None
981 msg = None
988 if cl and mf:
982 if cl and mf:
989 msg = _('cannot specify --changelog and --manifest at the same time')
983 msg = _('cannot specify --changelog and --manifest at the same time')
990 elif cl and dir:
984 elif cl and dir:
991 msg = _('cannot specify --changelog and --dir at the same time')
985 msg = _('cannot specify --changelog and --dir at the same time')
992 elif cl or mf or dir:
986 elif cl or mf or dir:
993 if file_:
987 if file_:
994 msg = _('cannot specify filename with --changelog or --manifest')
988 msg = _('cannot specify filename with --changelog or --manifest')
995 elif not repo:
989 elif not repo:
996 msg = _('cannot specify --changelog or --manifest or --dir '
990 msg = _('cannot specify --changelog or --manifest or --dir '
997 'without a repository')
991 'without a repository')
998 if msg:
992 if msg:
999 raise error.Abort(msg)
993 raise error.Abort(msg)
1000
994
1001 r = None
995 r = None
1002 if repo:
996 if repo:
1003 if cl:
997 if cl:
1004 r = repo.unfiltered().changelog
998 r = repo.unfiltered().changelog
1005 elif dir:
999 elif dir:
1006 if 'treemanifest' not in repo.requirements:
1000 if 'treemanifest' not in repo.requirements:
1007 raise error.Abort(_("--dir can only be used on repos with "
1001 raise error.Abort(_("--dir can only be used on repos with "
1008 "treemanifest enabled"))
1002 "treemanifest enabled"))
1009 dirlog = repo.manifestlog._revlog.dirlog(dir)
1003 dirlog = repo.manifestlog._revlog.dirlog(dir)
1010 if len(dirlog):
1004 if len(dirlog):
1011 r = dirlog
1005 r = dirlog
1012 elif mf:
1006 elif mf:
1013 r = repo.manifestlog._revlog
1007 r = repo.manifestlog._revlog
1014 elif file_:
1008 elif file_:
1015 filelog = repo.file(file_)
1009 filelog = repo.file(file_)
1016 if len(filelog):
1010 if len(filelog):
1017 r = filelog
1011 r = filelog
1018 if not r:
1012 if not r:
1019 if not file_:
1013 if not file_:
1020 raise error.CommandError(cmd, _('invalid arguments'))
1014 raise error.CommandError(cmd, _('invalid arguments'))
1021 if not os.path.isfile(file_):
1015 if not os.path.isfile(file_):
1022 raise error.Abort(_("revlog '%s' not found") % file_)
1016 raise error.Abort(_("revlog '%s' not found") % file_)
1023 r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
1017 r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
1024 file_[:-2] + ".i")
1018 file_[:-2] + ".i")
1025 return r
1019 return r
1026
1020
1027 def copy(ui, repo, pats, opts, rename=False):
1021 def copy(ui, repo, pats, opts, rename=False):
1028 # called with the repo lock held
1022 # called with the repo lock held
1029 #
1023 #
1030 # hgsep => pathname that uses "/" to separate directories
1024 # hgsep => pathname that uses "/" to separate directories
1031 # ossep => pathname that uses os.sep to separate directories
1025 # ossep => pathname that uses os.sep to separate directories
1032 cwd = repo.getcwd()
1026 cwd = repo.getcwd()
1033 targets = {}
1027 targets = {}
1034 after = opts.get("after")
1028 after = opts.get("after")
1035 dryrun = opts.get("dry_run")
1029 dryrun = opts.get("dry_run")
1036 wctx = repo[None]
1030 wctx = repo[None]
1037
1031
1038 def walkpat(pat):
1032 def walkpat(pat):
1039 srcs = []
1033 srcs = []
1040 if after:
1034 if after:
1041 badstates = '?'
1035 badstates = '?'
1042 else:
1036 else:
1043 badstates = '?r'
1037 badstates = '?r'
1044 m = scmutil.match(wctx, [pat], opts, globbed=True)
1038 m = scmutil.match(wctx, [pat], opts, globbed=True)
1045 for abs in wctx.walk(m):
1039 for abs in wctx.walk(m):
1046 state = repo.dirstate[abs]
1040 state = repo.dirstate[abs]
1047 rel = m.rel(abs)
1041 rel = m.rel(abs)
1048 exact = m.exact(abs)
1042 exact = m.exact(abs)
1049 if state in badstates:
1043 if state in badstates:
1050 if exact and state == '?':
1044 if exact and state == '?':
1051 ui.warn(_('%s: not copying - file is not managed\n') % rel)
1045 ui.warn(_('%s: not copying - file is not managed\n') % rel)
1052 if exact and state == 'r':
1046 if exact and state == 'r':
1053 ui.warn(_('%s: not copying - file has been marked for'
1047 ui.warn(_('%s: not copying - file has been marked for'
1054 ' remove\n') % rel)
1048 ' remove\n') % rel)
1055 continue
1049 continue
1056 # abs: hgsep
1050 # abs: hgsep
1057 # rel: ossep
1051 # rel: ossep
1058 srcs.append((abs, rel, exact))
1052 srcs.append((abs, rel, exact))
1059 return srcs
1053 return srcs
1060
1054
1061 # abssrc: hgsep
1055 # abssrc: hgsep
1062 # relsrc: ossep
1056 # relsrc: ossep
1063 # otarget: ossep
1057 # otarget: ossep
1064 def copyfile(abssrc, relsrc, otarget, exact):
1058 def copyfile(abssrc, relsrc, otarget, exact):
1065 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
1059 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
1066 if '/' in abstarget:
1060 if '/' in abstarget:
1067 # We cannot normalize abstarget itself, this would prevent
1061 # We cannot normalize abstarget itself, this would prevent
1068 # case only renames, like a => A.
1062 # case only renames, like a => A.
1069 abspath, absname = abstarget.rsplit('/', 1)
1063 abspath, absname = abstarget.rsplit('/', 1)
1070 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
1064 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
1071 reltarget = repo.pathto(abstarget, cwd)
1065 reltarget = repo.pathto(abstarget, cwd)
1072 target = repo.wjoin(abstarget)
1066 target = repo.wjoin(abstarget)
1073 src = repo.wjoin(abssrc)
1067 src = repo.wjoin(abssrc)
1074 state = repo.dirstate[abstarget]
1068 state = repo.dirstate[abstarget]
1075
1069
1076 scmutil.checkportable(ui, abstarget)
1070 scmutil.checkportable(ui, abstarget)
1077
1071
1078 # check for collisions
1072 # check for collisions
1079 prevsrc = targets.get(abstarget)
1073 prevsrc = targets.get(abstarget)
1080 if prevsrc is not None:
1074 if prevsrc is not None:
1081 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
1075 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
1082 (reltarget, repo.pathto(abssrc, cwd),
1076 (reltarget, repo.pathto(abssrc, cwd),
1083 repo.pathto(prevsrc, cwd)))
1077 repo.pathto(prevsrc, cwd)))
1084 return
1078 return
1085
1079
1086 # check for overwrites
1080 # check for overwrites
1087 exists = os.path.lexists(target)
1081 exists = os.path.lexists(target)
1088 samefile = False
1082 samefile = False
1089 if exists and abssrc != abstarget:
1083 if exists and abssrc != abstarget:
1090 if (repo.dirstate.normalize(abssrc) ==
1084 if (repo.dirstate.normalize(abssrc) ==
1091 repo.dirstate.normalize(abstarget)):
1085 repo.dirstate.normalize(abstarget)):
1092 if not rename:
1086 if not rename:
1093 ui.warn(_("%s: can't copy - same file\n") % reltarget)
1087 ui.warn(_("%s: can't copy - same file\n") % reltarget)
1094 return
1088 return
1095 exists = False
1089 exists = False
1096 samefile = True
1090 samefile = True
1097
1091
1098 if not after and exists or after and state in 'mn':
1092 if not after and exists or after and state in 'mn':
1099 if not opts['force']:
1093 if not opts['force']:
1100 if state in 'mn':
1094 if state in 'mn':
1101 msg = _('%s: not overwriting - file already committed\n')
1095 msg = _('%s: not overwriting - file already committed\n')
1102 if after:
1096 if after:
1103 flags = '--after --force'
1097 flags = '--after --force'
1104 else:
1098 else:
1105 flags = '--force'
1099 flags = '--force'
1106 if rename:
1100 if rename:
1107 hint = _('(hg rename %s to replace the file by '
1101 hint = _('(hg rename %s to replace the file by '
1108 'recording a rename)\n') % flags
1102 'recording a rename)\n') % flags
1109 else:
1103 else:
1110 hint = _('(hg copy %s to replace the file by '
1104 hint = _('(hg copy %s to replace the file by '
1111 'recording a copy)\n') % flags
1105 'recording a copy)\n') % flags
1112 else:
1106 else:
1113 msg = _('%s: not overwriting - file exists\n')
1107 msg = _('%s: not overwriting - file exists\n')
1114 if rename:
1108 if rename:
1115 hint = _('(hg rename --after to record the rename)\n')
1109 hint = _('(hg rename --after to record the rename)\n')
1116 else:
1110 else:
1117 hint = _('(hg copy --after to record the copy)\n')
1111 hint = _('(hg copy --after to record the copy)\n')
1118 ui.warn(msg % reltarget)
1112 ui.warn(msg % reltarget)
1119 ui.warn(hint)
1113 ui.warn(hint)
1120 return
1114 return
1121
1115
1122 if after:
1116 if after:
1123 if not exists:
1117 if not exists:
1124 if rename:
1118 if rename:
1125 ui.warn(_('%s: not recording move - %s does not exist\n') %
1119 ui.warn(_('%s: not recording move - %s does not exist\n') %
1126 (relsrc, reltarget))
1120 (relsrc, reltarget))
1127 else:
1121 else:
1128 ui.warn(_('%s: not recording copy - %s does not exist\n') %
1122 ui.warn(_('%s: not recording copy - %s does not exist\n') %
1129 (relsrc, reltarget))
1123 (relsrc, reltarget))
1130 return
1124 return
1131 elif not dryrun:
1125 elif not dryrun:
1132 try:
1126 try:
1133 if exists:
1127 if exists:
1134 os.unlink(target)
1128 os.unlink(target)
1135 targetdir = os.path.dirname(target) or '.'
1129 targetdir = os.path.dirname(target) or '.'
1136 if not os.path.isdir(targetdir):
1130 if not os.path.isdir(targetdir):
1137 os.makedirs(targetdir)
1131 os.makedirs(targetdir)
1138 if samefile:
1132 if samefile:
1139 tmp = target + "~hgrename"
1133 tmp = target + "~hgrename"
1140 os.rename(src, tmp)
1134 os.rename(src, tmp)
1141 os.rename(tmp, target)
1135 os.rename(tmp, target)
1142 else:
1136 else:
1143 util.copyfile(src, target)
1137 util.copyfile(src, target)
1144 srcexists = True
1138 srcexists = True
1145 except IOError as inst:
1139 except IOError as inst:
1146 if inst.errno == errno.ENOENT:
1140 if inst.errno == errno.ENOENT:
1147 ui.warn(_('%s: deleted in working directory\n') % relsrc)
1141 ui.warn(_('%s: deleted in working directory\n') % relsrc)
1148 srcexists = False
1142 srcexists = False
1149 else:
1143 else:
1150 ui.warn(_('%s: cannot copy - %s\n') %
1144 ui.warn(_('%s: cannot copy - %s\n') %
1151 (relsrc, encoding.strtolocal(inst.strerror)))
1145 (relsrc, encoding.strtolocal(inst.strerror)))
1152 return True # report a failure
1146 return True # report a failure
1153
1147
1154 if ui.verbose or not exact:
1148 if ui.verbose or not exact:
1155 if rename:
1149 if rename:
1156 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
1150 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
1157 else:
1151 else:
1158 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1152 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1159
1153
1160 targets[abstarget] = abssrc
1154 targets[abstarget] = abssrc
1161
1155
1162 # fix up dirstate
1156 # fix up dirstate
1163 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
1157 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
1164 dryrun=dryrun, cwd=cwd)
1158 dryrun=dryrun, cwd=cwd)
1165 if rename and not dryrun:
1159 if rename and not dryrun:
1166 if not after and srcexists and not samefile:
1160 if not after and srcexists and not samefile:
1167 repo.wvfs.unlinkpath(abssrc)
1161 repo.wvfs.unlinkpath(abssrc)
1168 wctx.forget([abssrc])
1162 wctx.forget([abssrc])
1169
1163
1170 # pat: ossep
1164 # pat: ossep
1171 # dest ossep
1165 # dest ossep
1172 # srcs: list of (hgsep, hgsep, ossep, bool)
1166 # srcs: list of (hgsep, hgsep, ossep, bool)
1173 # return: function that takes hgsep and returns ossep
1167 # return: function that takes hgsep and returns ossep
1174 def targetpathfn(pat, dest, srcs):
1168 def targetpathfn(pat, dest, srcs):
1175 if os.path.isdir(pat):
1169 if os.path.isdir(pat):
1176 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1170 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1177 abspfx = util.localpath(abspfx)
1171 abspfx = util.localpath(abspfx)
1178 if destdirexists:
1172 if destdirexists:
1179 striplen = len(os.path.split(abspfx)[0])
1173 striplen = len(os.path.split(abspfx)[0])
1180 else:
1174 else:
1181 striplen = len(abspfx)
1175 striplen = len(abspfx)
1182 if striplen:
1176 if striplen:
1183 striplen += len(pycompat.ossep)
1177 striplen += len(pycompat.ossep)
1184 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1178 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1185 elif destdirexists:
1179 elif destdirexists:
1186 res = lambda p: os.path.join(dest,
1180 res = lambda p: os.path.join(dest,
1187 os.path.basename(util.localpath(p)))
1181 os.path.basename(util.localpath(p)))
1188 else:
1182 else:
1189 res = lambda p: dest
1183 res = lambda p: dest
1190 return res
1184 return res
1191
1185
1192 # pat: ossep
1186 # pat: ossep
1193 # dest ossep
1187 # dest ossep
1194 # srcs: list of (hgsep, hgsep, ossep, bool)
1188 # srcs: list of (hgsep, hgsep, ossep, bool)
1195 # return: function that takes hgsep and returns ossep
1189 # return: function that takes hgsep and returns ossep
1196 def targetpathafterfn(pat, dest, srcs):
1190 def targetpathafterfn(pat, dest, srcs):
1197 if matchmod.patkind(pat):
1191 if matchmod.patkind(pat):
1198 # a mercurial pattern
1192 # a mercurial pattern
1199 res = lambda p: os.path.join(dest,
1193 res = lambda p: os.path.join(dest,
1200 os.path.basename(util.localpath(p)))
1194 os.path.basename(util.localpath(p)))
1201 else:
1195 else:
1202 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1196 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1203 if len(abspfx) < len(srcs[0][0]):
1197 if len(abspfx) < len(srcs[0][0]):
1204 # A directory. Either the target path contains the last
1198 # A directory. Either the target path contains the last
1205 # component of the source path or it does not.
1199 # component of the source path or it does not.
1206 def evalpath(striplen):
1200 def evalpath(striplen):
1207 score = 0
1201 score = 0
1208 for s in srcs:
1202 for s in srcs:
1209 t = os.path.join(dest, util.localpath(s[0])[striplen:])
1203 t = os.path.join(dest, util.localpath(s[0])[striplen:])
1210 if os.path.lexists(t):
1204 if os.path.lexists(t):
1211 score += 1
1205 score += 1
1212 return score
1206 return score
1213
1207
1214 abspfx = util.localpath(abspfx)
1208 abspfx = util.localpath(abspfx)
1215 striplen = len(abspfx)
1209 striplen = len(abspfx)
1216 if striplen:
1210 if striplen:
1217 striplen += len(pycompat.ossep)
1211 striplen += len(pycompat.ossep)
1218 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1212 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1219 score = evalpath(striplen)
1213 score = evalpath(striplen)
1220 striplen1 = len(os.path.split(abspfx)[0])
1214 striplen1 = len(os.path.split(abspfx)[0])
1221 if striplen1:
1215 if striplen1:
1222 striplen1 += len(pycompat.ossep)
1216 striplen1 += len(pycompat.ossep)
1223 if evalpath(striplen1) > score:
1217 if evalpath(striplen1) > score:
1224 striplen = striplen1
1218 striplen = striplen1
1225 res = lambda p: os.path.join(dest,
1219 res = lambda p: os.path.join(dest,
1226 util.localpath(p)[striplen:])
1220 util.localpath(p)[striplen:])
1227 else:
1221 else:
1228 # a file
1222 # a file
1229 if destdirexists:
1223 if destdirexists:
1230 res = lambda p: os.path.join(dest,
1224 res = lambda p: os.path.join(dest,
1231 os.path.basename(util.localpath(p)))
1225 os.path.basename(util.localpath(p)))
1232 else:
1226 else:
1233 res = lambda p: dest
1227 res = lambda p: dest
1234 return res
1228 return res
1235
1229
1236 pats = scmutil.expandpats(pats)
1230 pats = scmutil.expandpats(pats)
1237 if not pats:
1231 if not pats:
1238 raise error.Abort(_('no source or destination specified'))
1232 raise error.Abort(_('no source or destination specified'))
1239 if len(pats) == 1:
1233 if len(pats) == 1:
1240 raise error.Abort(_('no destination specified'))
1234 raise error.Abort(_('no destination specified'))
1241 dest = pats.pop()
1235 dest = pats.pop()
1242 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
1236 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
1243 if not destdirexists:
1237 if not destdirexists:
1244 if len(pats) > 1 or matchmod.patkind(pats[0]):
1238 if len(pats) > 1 or matchmod.patkind(pats[0]):
1245 raise error.Abort(_('with multiple sources, destination must be an '
1239 raise error.Abort(_('with multiple sources, destination must be an '
1246 'existing directory'))
1240 'existing directory'))
1247 if util.endswithsep(dest):
1241 if util.endswithsep(dest):
1248 raise error.Abort(_('destination %s is not a directory') % dest)
1242 raise error.Abort(_('destination %s is not a directory') % dest)
1249
1243
1250 tfn = targetpathfn
1244 tfn = targetpathfn
1251 if after:
1245 if after:
1252 tfn = targetpathafterfn
1246 tfn = targetpathafterfn
1253 copylist = []
1247 copylist = []
1254 for pat in pats:
1248 for pat in pats:
1255 srcs = walkpat(pat)
1249 srcs = walkpat(pat)
1256 if not srcs:
1250 if not srcs:
1257 continue
1251 continue
1258 copylist.append((tfn(pat, dest, srcs), srcs))
1252 copylist.append((tfn(pat, dest, srcs), srcs))
1259 if not copylist:
1253 if not copylist:
1260 raise error.Abort(_('no files to copy'))
1254 raise error.Abort(_('no files to copy'))
1261
1255
1262 errors = 0
1256 errors = 0
1263 for targetpath, srcs in copylist:
1257 for targetpath, srcs in copylist:
1264 for abssrc, relsrc, exact in srcs:
1258 for abssrc, relsrc, exact in srcs:
1265 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1259 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1266 errors += 1
1260 errors += 1
1267
1261
1268 if errors:
1262 if errors:
1269 ui.warn(_('(consider using --after)\n'))
1263 ui.warn(_('(consider using --after)\n'))
1270
1264
1271 return errors != 0
1265 return errors != 0
1272
1266
1273 ## facility to let extension process additional data into an import patch
1267 ## facility to let extension process additional data into an import patch
1274 # list of identifier to be executed in order
1268 # list of identifier to be executed in order
1275 extrapreimport = [] # run before commit
1269 extrapreimport = [] # run before commit
1276 extrapostimport = [] # run after commit
1270 extrapostimport = [] # run after commit
1277 # mapping from identifier to actual import function
1271 # mapping from identifier to actual import function
1278 #
1272 #
1279 # 'preimport' are run before the commit is made and are provided the following
1273 # 'preimport' are run before the commit is made and are provided the following
1280 # arguments:
1274 # arguments:
1281 # - repo: the localrepository instance,
1275 # - repo: the localrepository instance,
1282 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
1276 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
1283 # - extra: the future extra dictionary of the changeset, please mutate it,
1277 # - extra: the future extra dictionary of the changeset, please mutate it,
1284 # - opts: the import options.
1278 # - opts: the import options.
1285 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1279 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1286 # mutation of in memory commit and more. Feel free to rework the code to get
1280 # mutation of in memory commit and more. Feel free to rework the code to get
1287 # there.
1281 # there.
1288 extrapreimportmap = {}
1282 extrapreimportmap = {}
1289 # 'postimport' are run after the commit is made and are provided the following
1283 # 'postimport' are run after the commit is made and are provided the following
1290 # argument:
1284 # argument:
1291 # - ctx: the changectx created by import.
1285 # - ctx: the changectx created by import.
1292 extrapostimportmap = {}
1286 extrapostimportmap = {}
1293
1287
1294 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
1288 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
1295 """Utility function used by commands.import to import a single patch
1289 """Utility function used by commands.import to import a single patch
1296
1290
1297 This function is explicitly defined here to help the evolve extension to
1291 This function is explicitly defined here to help the evolve extension to
1298 wrap this part of the import logic.
1292 wrap this part of the import logic.
1299
1293
1300 The API is currently a bit ugly because it a simple code translation from
1294 The API is currently a bit ugly because it a simple code translation from
1301 the import command. Feel free to make it better.
1295 the import command. Feel free to make it better.
1302
1296
1303 :hunk: a patch (as a binary string)
1297 :hunk: a patch (as a binary string)
1304 :parents: nodes that will be parent of the created commit
1298 :parents: nodes that will be parent of the created commit
1305 :opts: the full dict of option passed to the import command
1299 :opts: the full dict of option passed to the import command
1306 :msgs: list to save commit message to.
1300 :msgs: list to save commit message to.
1307 (used in case we need to save it when failing)
1301 (used in case we need to save it when failing)
1308 :updatefunc: a function that update a repo to a given node
1302 :updatefunc: a function that update a repo to a given node
1309 updatefunc(<repo>, <node>)
1303 updatefunc(<repo>, <node>)
1310 """
1304 """
1311 # avoid cycle context -> subrepo -> cmdutil
1305 # avoid cycle context -> subrepo -> cmdutil
1312 from . import context
1306 from . import context
1313 extractdata = patch.extract(ui, hunk)
1307 extractdata = patch.extract(ui, hunk)
1314 tmpname = extractdata.get('filename')
1308 tmpname = extractdata.get('filename')
1315 message = extractdata.get('message')
1309 message = extractdata.get('message')
1316 user = opts.get('user') or extractdata.get('user')
1310 user = opts.get('user') or extractdata.get('user')
1317 date = opts.get('date') or extractdata.get('date')
1311 date = opts.get('date') or extractdata.get('date')
1318 branch = extractdata.get('branch')
1312 branch = extractdata.get('branch')
1319 nodeid = extractdata.get('nodeid')
1313 nodeid = extractdata.get('nodeid')
1320 p1 = extractdata.get('p1')
1314 p1 = extractdata.get('p1')
1321 p2 = extractdata.get('p2')
1315 p2 = extractdata.get('p2')
1322
1316
1323 nocommit = opts.get('no_commit')
1317 nocommit = opts.get('no_commit')
1324 importbranch = opts.get('import_branch')
1318 importbranch = opts.get('import_branch')
1325 update = not opts.get('bypass')
1319 update = not opts.get('bypass')
1326 strip = opts["strip"]
1320 strip = opts["strip"]
1327 prefix = opts["prefix"]
1321 prefix = opts["prefix"]
1328 sim = float(opts.get('similarity') or 0)
1322 sim = float(opts.get('similarity') or 0)
1329 if not tmpname:
1323 if not tmpname:
1330 return (None, None, False)
1324 return (None, None, False)
1331
1325
1332 rejects = False
1326 rejects = False
1333
1327
1334 try:
1328 try:
1335 cmdline_message = logmessage(ui, opts)
1329 cmdline_message = logmessage(ui, opts)
1336 if cmdline_message:
1330 if cmdline_message:
1337 # pickup the cmdline msg
1331 # pickup the cmdline msg
1338 message = cmdline_message
1332 message = cmdline_message
1339 elif message:
1333 elif message:
1340 # pickup the patch msg
1334 # pickup the patch msg
1341 message = message.strip()
1335 message = message.strip()
1342 else:
1336 else:
1343 # launch the editor
1337 # launch the editor
1344 message = None
1338 message = None
1345 ui.debug('message:\n%s\n' % message)
1339 ui.debug('message:\n%s\n' % message)
1346
1340
1347 if len(parents) == 1:
1341 if len(parents) == 1:
1348 parents.append(repo[nullid])
1342 parents.append(repo[nullid])
1349 if opts.get('exact'):
1343 if opts.get('exact'):
1350 if not nodeid or not p1:
1344 if not nodeid or not p1:
1351 raise error.Abort(_('not a Mercurial patch'))
1345 raise error.Abort(_('not a Mercurial patch'))
1352 p1 = repo[p1]
1346 p1 = repo[p1]
1353 p2 = repo[p2 or nullid]
1347 p2 = repo[p2 or nullid]
1354 elif p2:
1348 elif p2:
1355 try:
1349 try:
1356 p1 = repo[p1]
1350 p1 = repo[p1]
1357 p2 = repo[p2]
1351 p2 = repo[p2]
1358 # Without any options, consider p2 only if the
1352 # Without any options, consider p2 only if the
1359 # patch is being applied on top of the recorded
1353 # patch is being applied on top of the recorded
1360 # first parent.
1354 # first parent.
1361 if p1 != parents[0]:
1355 if p1 != parents[0]:
1362 p1 = parents[0]
1356 p1 = parents[0]
1363 p2 = repo[nullid]
1357 p2 = repo[nullid]
1364 except error.RepoError:
1358 except error.RepoError:
1365 p1, p2 = parents
1359 p1, p2 = parents
1366 if p2.node() == nullid:
1360 if p2.node() == nullid:
1367 ui.warn(_("warning: import the patch as a normal revision\n"
1361 ui.warn(_("warning: import the patch as a normal revision\n"
1368 "(use --exact to import the patch as a merge)\n"))
1362 "(use --exact to import the patch as a merge)\n"))
1369 else:
1363 else:
1370 p1, p2 = parents
1364 p1, p2 = parents
1371
1365
1372 n = None
1366 n = None
1373 if update:
1367 if update:
1374 if p1 != parents[0]:
1368 if p1 != parents[0]:
1375 updatefunc(repo, p1.node())
1369 updatefunc(repo, p1.node())
1376 if p2 != parents[1]:
1370 if p2 != parents[1]:
1377 repo.setparents(p1.node(), p2.node())
1371 repo.setparents(p1.node(), p2.node())
1378
1372
1379 if opts.get('exact') or importbranch:
1373 if opts.get('exact') or importbranch:
1380 repo.dirstate.setbranch(branch or 'default')
1374 repo.dirstate.setbranch(branch or 'default')
1381
1375
1382 partial = opts.get('partial', False)
1376 partial = opts.get('partial', False)
1383 files = set()
1377 files = set()
1384 try:
1378 try:
1385 patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix,
1379 patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix,
1386 files=files, eolmode=None, similarity=sim / 100.0)
1380 files=files, eolmode=None, similarity=sim / 100.0)
1387 except error.PatchError as e:
1381 except error.PatchError as e:
1388 if not partial:
1382 if not partial:
1389 raise error.Abort(str(e))
1383 raise error.Abort(str(e))
1390 if partial:
1384 if partial:
1391 rejects = True
1385 rejects = True
1392
1386
1393 files = list(files)
1387 files = list(files)
1394 if nocommit:
1388 if nocommit:
1395 if message:
1389 if message:
1396 msgs.append(message)
1390 msgs.append(message)
1397 else:
1391 else:
1398 if opts.get('exact') or p2:
1392 if opts.get('exact') or p2:
1399 # If you got here, you either use --force and know what
1393 # If you got here, you either use --force and know what
1400 # you are doing or used --exact or a merge patch while
1394 # you are doing or used --exact or a merge patch while
1401 # being updated to its first parent.
1395 # being updated to its first parent.
1402 m = None
1396 m = None
1403 else:
1397 else:
1404 m = scmutil.matchfiles(repo, files or [])
1398 m = scmutil.matchfiles(repo, files or [])
1405 editform = mergeeditform(repo[None], 'import.normal')
1399 editform = mergeeditform(repo[None], 'import.normal')
1406 if opts.get('exact'):
1400 if opts.get('exact'):
1407 editor = None
1401 editor = None
1408 else:
1402 else:
1409 editor = getcommiteditor(editform=editform,
1403 editor = getcommiteditor(editform=editform,
1410 **pycompat.strkwargs(opts))
1404 **pycompat.strkwargs(opts))
1411 extra = {}
1405 extra = {}
1412 for idfunc in extrapreimport:
1406 for idfunc in extrapreimport:
1413 extrapreimportmap[idfunc](repo, extractdata, extra, opts)
1407 extrapreimportmap[idfunc](repo, extractdata, extra, opts)
1414 overrides = {}
1408 overrides = {}
1415 if partial:
1409 if partial:
1416 overrides[('ui', 'allowemptycommit')] = True
1410 overrides[('ui', 'allowemptycommit')] = True
1417 with repo.ui.configoverride(overrides, 'import'):
1411 with repo.ui.configoverride(overrides, 'import'):
1418 n = repo.commit(message, user,
1412 n = repo.commit(message, user,
1419 date, match=m,
1413 date, match=m,
1420 editor=editor, extra=extra)
1414 editor=editor, extra=extra)
1421 for idfunc in extrapostimport:
1415 for idfunc in extrapostimport:
1422 extrapostimportmap[idfunc](repo[n])
1416 extrapostimportmap[idfunc](repo[n])
1423 else:
1417 else:
1424 if opts.get('exact') or importbranch:
1418 if opts.get('exact') or importbranch:
1425 branch = branch or 'default'
1419 branch = branch or 'default'
1426 else:
1420 else:
1427 branch = p1.branch()
1421 branch = p1.branch()
1428 store = patch.filestore()
1422 store = patch.filestore()
1429 try:
1423 try:
1430 files = set()
1424 files = set()
1431 try:
1425 try:
1432 patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
1426 patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
1433 files, eolmode=None)
1427 files, eolmode=None)
1434 except error.PatchError as e:
1428 except error.PatchError as e:
1435 raise error.Abort(str(e))
1429 raise error.Abort(str(e))
1436 if opts.get('exact'):
1430 if opts.get('exact'):
1437 editor = None
1431 editor = None
1438 else:
1432 else:
1439 editor = getcommiteditor(editform='import.bypass')
1433 editor = getcommiteditor(editform='import.bypass')
1440 memctx = context.memctx(repo, (p1.node(), p2.node()),
1434 memctx = context.memctx(repo, (p1.node(), p2.node()),
1441 message,
1435 message,
1442 files=files,
1436 files=files,
1443 filectxfn=store,
1437 filectxfn=store,
1444 user=user,
1438 user=user,
1445 date=date,
1439 date=date,
1446 branch=branch,
1440 branch=branch,
1447 editor=editor)
1441 editor=editor)
1448 n = memctx.commit()
1442 n = memctx.commit()
1449 finally:
1443 finally:
1450 store.close()
1444 store.close()
1451 if opts.get('exact') and nocommit:
1445 if opts.get('exact') and nocommit:
1452 # --exact with --no-commit is still useful in that it does merge
1446 # --exact with --no-commit is still useful in that it does merge
1453 # and branch bits
1447 # and branch bits
1454 ui.warn(_("warning: can't check exact import with --no-commit\n"))
1448 ui.warn(_("warning: can't check exact import with --no-commit\n"))
1455 elif opts.get('exact') and hex(n) != nodeid:
1449 elif opts.get('exact') and hex(n) != nodeid:
1456 raise error.Abort(_('patch is damaged or loses information'))
1450 raise error.Abort(_('patch is damaged or loses information'))
1457 msg = _('applied to working directory')
1451 msg = _('applied to working directory')
1458 if n:
1452 if n:
1459 # i18n: refers to a short changeset id
1453 # i18n: refers to a short changeset id
1460 msg = _('created %s') % short(n)
1454 msg = _('created %s') % short(n)
1461 return (msg, n, rejects)
1455 return (msg, n, rejects)
1462 finally:
1456 finally:
1463 os.unlink(tmpname)
1457 os.unlink(tmpname)
1464
1458
1465 # facility to let extensions include additional data in an exported patch
1459 # facility to let extensions include additional data in an exported patch
1466 # list of identifiers to be executed in order
1460 # list of identifiers to be executed in order
1467 extraexport = []
1461 extraexport = []
1468 # mapping from identifier to actual export function
1462 # mapping from identifier to actual export function
1469 # function as to return a string to be added to the header or None
1463 # function as to return a string to be added to the header or None
1470 # it is given two arguments (sequencenumber, changectx)
1464 # it is given two arguments (sequencenumber, changectx)
1471 extraexportmap = {}
1465 extraexportmap = {}
1472
1466
1473 def _exportsingle(repo, ctx, match, switch_parent, rev, seqno, write, diffopts):
1467 def _exportsingle(repo, ctx, match, switch_parent, rev, seqno, write, diffopts):
1474 node = scmutil.binnode(ctx)
1468 node = scmutil.binnode(ctx)
1475 parents = [p.node() for p in ctx.parents() if p]
1469 parents = [p.node() for p in ctx.parents() if p]
1476 branch = ctx.branch()
1470 branch = ctx.branch()
1477 if switch_parent:
1471 if switch_parent:
1478 parents.reverse()
1472 parents.reverse()
1479
1473
1480 if parents:
1474 if parents:
1481 prev = parents[0]
1475 prev = parents[0]
1482 else:
1476 else:
1483 prev = nullid
1477 prev = nullid
1484
1478
1485 write("# HG changeset patch\n")
1479 write("# HG changeset patch\n")
1486 write("# User %s\n" % ctx.user())
1480 write("# User %s\n" % ctx.user())
1487 write("# Date %d %d\n" % ctx.date())
1481 write("# Date %d %d\n" % ctx.date())
1488 write("# %s\n" % util.datestr(ctx.date()))
1482 write("# %s\n" % util.datestr(ctx.date()))
1489 if branch and branch != 'default':
1483 if branch and branch != 'default':
1490 write("# Branch %s\n" % branch)
1484 write("# Branch %s\n" % branch)
1491 write("# Node ID %s\n" % hex(node))
1485 write("# Node ID %s\n" % hex(node))
1492 write("# Parent %s\n" % hex(prev))
1486 write("# Parent %s\n" % hex(prev))
1493 if len(parents) > 1:
1487 if len(parents) > 1:
1494 write("# Parent %s\n" % hex(parents[1]))
1488 write("# Parent %s\n" % hex(parents[1]))
1495
1489
1496 for headerid in extraexport:
1490 for headerid in extraexport:
1497 header = extraexportmap[headerid](seqno, ctx)
1491 header = extraexportmap[headerid](seqno, ctx)
1498 if header is not None:
1492 if header is not None:
1499 write('# %s\n' % header)
1493 write('# %s\n' % header)
1500 write(ctx.description().rstrip())
1494 write(ctx.description().rstrip())
1501 write("\n\n")
1495 write("\n\n")
1502
1496
1503 for chunk, label in patch.diffui(repo, prev, node, match, opts=diffopts):
1497 for chunk, label in patch.diffui(repo, prev, node, match, opts=diffopts):
1504 write(chunk, label=label)
1498 write(chunk, label=label)
1505
1499
1506 def export(repo, revs, fntemplate='hg-%h.patch', fp=None, switch_parent=False,
1500 def export(repo, revs, fntemplate='hg-%h.patch', fp=None, switch_parent=False,
1507 opts=None, match=None):
1501 opts=None, match=None):
1508 '''export changesets as hg patches
1502 '''export changesets as hg patches
1509
1503
1510 Args:
1504 Args:
1511 repo: The repository from which we're exporting revisions.
1505 repo: The repository from which we're exporting revisions.
1512 revs: A list of revisions to export as revision numbers.
1506 revs: A list of revisions to export as revision numbers.
1513 fntemplate: An optional string to use for generating patch file names.
1507 fntemplate: An optional string to use for generating patch file names.
1514 fp: An optional file-like object to which patches should be written.
1508 fp: An optional file-like object to which patches should be written.
1515 switch_parent: If True, show diffs against second parent when not nullid.
1509 switch_parent: If True, show diffs against second parent when not nullid.
1516 Default is false, which always shows diff against p1.
1510 Default is false, which always shows diff against p1.
1517 opts: diff options to use for generating the patch.
1511 opts: diff options to use for generating the patch.
1518 match: If specified, only export changes to files matching this matcher.
1512 match: If specified, only export changes to files matching this matcher.
1519
1513
1520 Returns:
1514 Returns:
1521 Nothing.
1515 Nothing.
1522
1516
1523 Side Effect:
1517 Side Effect:
1524 "HG Changeset Patch" data is emitted to one of the following
1518 "HG Changeset Patch" data is emitted to one of the following
1525 destinations:
1519 destinations:
1526 fp is specified: All revs are written to the specified
1520 fp is specified: All revs are written to the specified
1527 file-like object.
1521 file-like object.
1528 fntemplate specified: Each rev is written to a unique file named using
1522 fntemplate specified: Each rev is written to a unique file named using
1529 the given template.
1523 the given template.
1530 Neither fp nor template specified: All revs written to repo.ui.write()
1524 Neither fp nor template specified: All revs written to repo.ui.write()
1531 '''
1525 '''
1532
1526
1533 total = len(revs)
1527 total = len(revs)
1534 revwidth = max(len(str(rev)) for rev in revs)
1528 revwidth = max(len(str(rev)) for rev in revs)
1535 filemode = {}
1529 filemode = {}
1536
1530
1537 write = None
1531 write = None
1538 dest = '<unnamed>'
1532 dest = '<unnamed>'
1539 if fp:
1533 if fp:
1540 dest = getattr(fp, 'name', dest)
1534 dest = getattr(fp, 'name', dest)
1541 def write(s, **kw):
1535 def write(s, **kw):
1542 fp.write(s)
1536 fp.write(s)
1543 elif not fntemplate:
1537 elif not fntemplate:
1544 write = repo.ui.write
1538 write = repo.ui.write
1545
1539
1546 for seqno, rev in enumerate(revs, 1):
1540 for seqno, rev in enumerate(revs, 1):
1547 ctx = repo[rev]
1541 ctx = repo[rev]
1548 fo = None
1542 fo = None
1549 if not fp and fntemplate:
1543 if not fp and fntemplate:
1550 desc_lines = ctx.description().rstrip().split('\n')
1544 desc_lines = ctx.description().rstrip().split('\n')
1551 desc = desc_lines[0] #Commit always has a first line.
1545 desc = desc_lines[0] #Commit always has a first line.
1552 fo = makefileobj(repo, fntemplate, ctx.node(), desc=desc,
1546 fo = makefileobj(repo, fntemplate, ctx.node(), desc=desc,
1553 total=total, seqno=seqno, revwidth=revwidth,
1547 total=total, seqno=seqno, revwidth=revwidth,
1554 mode='wb', modemap=filemode)
1548 mode='wb', modemap=filemode)
1555 dest = fo.name
1549 dest = fo.name
1556 def write(s, **kw):
1550 def write(s, **kw):
1557 fo.write(s)
1551 fo.write(s)
1558 if not dest.startswith('<'):
1552 if not dest.startswith('<'):
1559 repo.ui.note("%s\n" % dest)
1553 repo.ui.note("%s\n" % dest)
1560 _exportsingle(
1554 _exportsingle(
1561 repo, ctx, match, switch_parent, rev, seqno, write, opts)
1555 repo, ctx, match, switch_parent, rev, seqno, write, opts)
1562 if fo is not None:
1556 if fo is not None:
1563 fo.close()
1557 fo.close()
1564
1558
1565 def showmarker(fm, marker, index=None):
1559 def showmarker(fm, marker, index=None):
1566 """utility function to display obsolescence marker in a readable way
1560 """utility function to display obsolescence marker in a readable way
1567
1561
1568 To be used by debug function."""
1562 To be used by debug function."""
1569 if index is not None:
1563 if index is not None:
1570 fm.write('index', '%i ', index)
1564 fm.write('index', '%i ', index)
1571 fm.write('prednode', '%s ', hex(marker.prednode()))
1565 fm.write('prednode', '%s ', hex(marker.prednode()))
1572 succs = marker.succnodes()
1566 succs = marker.succnodes()
1573 fm.condwrite(succs, 'succnodes', '%s ',
1567 fm.condwrite(succs, 'succnodes', '%s ',
1574 fm.formatlist(map(hex, succs), name='node'))
1568 fm.formatlist(map(hex, succs), name='node'))
1575 fm.write('flag', '%X ', marker.flags())
1569 fm.write('flag', '%X ', marker.flags())
1576 parents = marker.parentnodes()
1570 parents = marker.parentnodes()
1577 if parents is not None:
1571 if parents is not None:
1578 fm.write('parentnodes', '{%s} ',
1572 fm.write('parentnodes', '{%s} ',
1579 fm.formatlist(map(hex, parents), name='node', sep=', '))
1573 fm.formatlist(map(hex, parents), name='node', sep=', '))
1580 fm.write('date', '(%s) ', fm.formatdate(marker.date()))
1574 fm.write('date', '(%s) ', fm.formatdate(marker.date()))
1581 meta = marker.metadata().copy()
1575 meta = marker.metadata().copy()
1582 meta.pop('date', None)
1576 meta.pop('date', None)
1583 smeta = util.rapply(pycompat.maybebytestr, meta)
1577 smeta = util.rapply(pycompat.maybebytestr, meta)
1584 fm.write('metadata', '{%s}', fm.formatdict(smeta, fmt='%r: %r', sep=', '))
1578 fm.write('metadata', '{%s}', fm.formatdict(smeta, fmt='%r: %r', sep=', '))
1585 fm.plain('\n')
1579 fm.plain('\n')
1586
1580
1587 def finddate(ui, repo, date):
1581 def finddate(ui, repo, date):
1588 """Find the tipmost changeset that matches the given date spec"""
1582 """Find the tipmost changeset that matches the given date spec"""
1589
1583
1590 df = util.matchdate(date)
1584 df = util.matchdate(date)
1591 m = scmutil.matchall(repo)
1585 m = scmutil.matchall(repo)
1592 results = {}
1586 results = {}
1593
1587
1594 def prep(ctx, fns):
1588 def prep(ctx, fns):
1595 d = ctx.date()
1589 d = ctx.date()
1596 if df(d[0]):
1590 if df(d[0]):
1597 results[ctx.rev()] = d
1591 results[ctx.rev()] = d
1598
1592
1599 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
1593 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
1600 rev = ctx.rev()
1594 rev = ctx.rev()
1601 if rev in results:
1595 if rev in results:
1602 ui.status(_("found revision %s from %s\n") %
1596 ui.status(_("found revision %s from %s\n") %
1603 (rev, util.datestr(results[rev])))
1597 (rev, util.datestr(results[rev])))
1604 return '%d' % rev
1598 return '%d' % rev
1605
1599
1606 raise error.Abort(_("revision matching date not found"))
1600 raise error.Abort(_("revision matching date not found"))
1607
1601
1608 def increasingwindows(windowsize=8, sizelimit=512):
1602 def increasingwindows(windowsize=8, sizelimit=512):
1609 while True:
1603 while True:
1610 yield windowsize
1604 yield windowsize
1611 if windowsize < sizelimit:
1605 if windowsize < sizelimit:
1612 windowsize *= 2
1606 windowsize *= 2
1613
1607
1614 def _walkrevs(repo, opts):
1608 def _walkrevs(repo, opts):
1615 # Default --rev value depends on --follow but --follow behavior
1609 # Default --rev value depends on --follow but --follow behavior
1616 # depends on revisions resolved from --rev...
1610 # depends on revisions resolved from --rev...
1617 follow = opts.get('follow') or opts.get('follow_first')
1611 follow = opts.get('follow') or opts.get('follow_first')
1618 if opts.get('rev'):
1612 if opts.get('rev'):
1619 revs = scmutil.revrange(repo, opts['rev'])
1613 revs = scmutil.revrange(repo, opts['rev'])
1620 elif follow and repo.dirstate.p1() == nullid:
1614 elif follow and repo.dirstate.p1() == nullid:
1621 revs = smartset.baseset()
1615 revs = smartset.baseset()
1622 elif follow:
1616 elif follow:
1623 revs = repo.revs('reverse(:.)')
1617 revs = repo.revs('reverse(:.)')
1624 else:
1618 else:
1625 revs = smartset.spanset(repo)
1619 revs = smartset.spanset(repo)
1626 revs.reverse()
1620 revs.reverse()
1627 return revs
1621 return revs
1628
1622
1629 class FileWalkError(Exception):
1623 class FileWalkError(Exception):
1630 pass
1624 pass
1631
1625
1632 def walkfilerevs(repo, match, follow, revs, fncache):
1626 def walkfilerevs(repo, match, follow, revs, fncache):
1633 '''Walks the file history for the matched files.
1627 '''Walks the file history for the matched files.
1634
1628
1635 Returns the changeset revs that are involved in the file history.
1629 Returns the changeset revs that are involved in the file history.
1636
1630
1637 Throws FileWalkError if the file history can't be walked using
1631 Throws FileWalkError if the file history can't be walked using
1638 filelogs alone.
1632 filelogs alone.
1639 '''
1633 '''
1640 wanted = set()
1634 wanted = set()
1641 copies = []
1635 copies = []
1642 minrev, maxrev = min(revs), max(revs)
1636 minrev, maxrev = min(revs), max(revs)
1643 def filerevgen(filelog, last):
1637 def filerevgen(filelog, last):
1644 """
1638 """
1645 Only files, no patterns. Check the history of each file.
1639 Only files, no patterns. Check the history of each file.
1646
1640
1647 Examines filelog entries within minrev, maxrev linkrev range
1641 Examines filelog entries within minrev, maxrev linkrev range
1648 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
1642 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
1649 tuples in backwards order
1643 tuples in backwards order
1650 """
1644 """
1651 cl_count = len(repo)
1645 cl_count = len(repo)
1652 revs = []
1646 revs = []
1653 for j in xrange(0, last + 1):
1647 for j in xrange(0, last + 1):
1654 linkrev = filelog.linkrev(j)
1648 linkrev = filelog.linkrev(j)
1655 if linkrev < minrev:
1649 if linkrev < minrev:
1656 continue
1650 continue
1657 # only yield rev for which we have the changelog, it can
1651 # only yield rev for which we have the changelog, it can
1658 # happen while doing "hg log" during a pull or commit
1652 # happen while doing "hg log" during a pull or commit
1659 if linkrev >= cl_count:
1653 if linkrev >= cl_count:
1660 break
1654 break
1661
1655
1662 parentlinkrevs = []
1656 parentlinkrevs = []
1663 for p in filelog.parentrevs(j):
1657 for p in filelog.parentrevs(j):
1664 if p != nullrev:
1658 if p != nullrev:
1665 parentlinkrevs.append(filelog.linkrev(p))
1659 parentlinkrevs.append(filelog.linkrev(p))
1666 n = filelog.node(j)
1660 n = filelog.node(j)
1667 revs.append((linkrev, parentlinkrevs,
1661 revs.append((linkrev, parentlinkrevs,
1668 follow and filelog.renamed(n)))
1662 follow and filelog.renamed(n)))
1669
1663
1670 return reversed(revs)
1664 return reversed(revs)
1671 def iterfiles():
1665 def iterfiles():
1672 pctx = repo['.']
1666 pctx = repo['.']
1673 for filename in match.files():
1667 for filename in match.files():
1674 if follow:
1668 if follow:
1675 if filename not in pctx:
1669 if filename not in pctx:
1676 raise error.Abort(_('cannot follow file not in parent '
1670 raise error.Abort(_('cannot follow file not in parent '
1677 'revision: "%s"') % filename)
1671 'revision: "%s"') % filename)
1678 yield filename, pctx[filename].filenode()
1672 yield filename, pctx[filename].filenode()
1679 else:
1673 else:
1680 yield filename, None
1674 yield filename, None
1681 for filename_node in copies:
1675 for filename_node in copies:
1682 yield filename_node
1676 yield filename_node
1683
1677
1684 for file_, node in iterfiles():
1678 for file_, node in iterfiles():
1685 filelog = repo.file(file_)
1679 filelog = repo.file(file_)
1686 if not len(filelog):
1680 if not len(filelog):
1687 if node is None:
1681 if node is None:
1688 # A zero count may be a directory or deleted file, so
1682 # A zero count may be a directory or deleted file, so
1689 # try to find matching entries on the slow path.
1683 # try to find matching entries on the slow path.
1690 if follow:
1684 if follow:
1691 raise error.Abort(
1685 raise error.Abort(
1692 _('cannot follow nonexistent file: "%s"') % file_)
1686 _('cannot follow nonexistent file: "%s"') % file_)
1693 raise FileWalkError("Cannot walk via filelog")
1687 raise FileWalkError("Cannot walk via filelog")
1694 else:
1688 else:
1695 continue
1689 continue
1696
1690
1697 if node is None:
1691 if node is None:
1698 last = len(filelog) - 1
1692 last = len(filelog) - 1
1699 else:
1693 else:
1700 last = filelog.rev(node)
1694 last = filelog.rev(node)
1701
1695
1702 # keep track of all ancestors of the file
1696 # keep track of all ancestors of the file
1703 ancestors = {filelog.linkrev(last)}
1697 ancestors = {filelog.linkrev(last)}
1704
1698
1705 # iterate from latest to oldest revision
1699 # iterate from latest to oldest revision
1706 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
1700 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
1707 if not follow:
1701 if not follow:
1708 if rev > maxrev:
1702 if rev > maxrev:
1709 continue
1703 continue
1710 else:
1704 else:
1711 # Note that last might not be the first interesting
1705 # Note that last might not be the first interesting
1712 # rev to us:
1706 # rev to us:
1713 # if the file has been changed after maxrev, we'll
1707 # if the file has been changed after maxrev, we'll
1714 # have linkrev(last) > maxrev, and we still need
1708 # have linkrev(last) > maxrev, and we still need
1715 # to explore the file graph
1709 # to explore the file graph
1716 if rev not in ancestors:
1710 if rev not in ancestors:
1717 continue
1711 continue
1718 # XXX insert 1327 fix here
1712 # XXX insert 1327 fix here
1719 if flparentlinkrevs:
1713 if flparentlinkrevs:
1720 ancestors.update(flparentlinkrevs)
1714 ancestors.update(flparentlinkrevs)
1721
1715
1722 fncache.setdefault(rev, []).append(file_)
1716 fncache.setdefault(rev, []).append(file_)
1723 wanted.add(rev)
1717 wanted.add(rev)
1724 if copied:
1718 if copied:
1725 copies.append(copied)
1719 copies.append(copied)
1726
1720
1727 return wanted
1721 return wanted
1728
1722
1729 class _followfilter(object):
1723 class _followfilter(object):
1730 def __init__(self, repo, onlyfirst=False):
1724 def __init__(self, repo, onlyfirst=False):
1731 self.repo = repo
1725 self.repo = repo
1732 self.startrev = nullrev
1726 self.startrev = nullrev
1733 self.roots = set()
1727 self.roots = set()
1734 self.onlyfirst = onlyfirst
1728 self.onlyfirst = onlyfirst
1735
1729
1736 def match(self, rev):
1730 def match(self, rev):
1737 def realparents(rev):
1731 def realparents(rev):
1738 if self.onlyfirst:
1732 if self.onlyfirst:
1739 return self.repo.changelog.parentrevs(rev)[0:1]
1733 return self.repo.changelog.parentrevs(rev)[0:1]
1740 else:
1734 else:
1741 return filter(lambda x: x != nullrev,
1735 return filter(lambda x: x != nullrev,
1742 self.repo.changelog.parentrevs(rev))
1736 self.repo.changelog.parentrevs(rev))
1743
1737
1744 if self.startrev == nullrev:
1738 if self.startrev == nullrev:
1745 self.startrev = rev
1739 self.startrev = rev
1746 return True
1740 return True
1747
1741
1748 if rev > self.startrev:
1742 if rev > self.startrev:
1749 # forward: all descendants
1743 # forward: all descendants
1750 if not self.roots:
1744 if not self.roots:
1751 self.roots.add(self.startrev)
1745 self.roots.add(self.startrev)
1752 for parent in realparents(rev):
1746 for parent in realparents(rev):
1753 if parent in self.roots:
1747 if parent in self.roots:
1754 self.roots.add(rev)
1748 self.roots.add(rev)
1755 return True
1749 return True
1756 else:
1750 else:
1757 # backwards: all parents
1751 # backwards: all parents
1758 if not self.roots:
1752 if not self.roots:
1759 self.roots.update(realparents(self.startrev))
1753 self.roots.update(realparents(self.startrev))
1760 if rev in self.roots:
1754 if rev in self.roots:
1761 self.roots.remove(rev)
1755 self.roots.remove(rev)
1762 self.roots.update(realparents(rev))
1756 self.roots.update(realparents(rev))
1763 return True
1757 return True
1764
1758
1765 return False
1759 return False
1766
1760
1767 def walkchangerevs(repo, match, opts, prepare):
1761 def walkchangerevs(repo, match, opts, prepare):
1768 '''Iterate over files and the revs in which they changed.
1762 '''Iterate over files and the revs in which they changed.
1769
1763
1770 Callers most commonly need to iterate backwards over the history
1764 Callers most commonly need to iterate backwards over the history
1771 in which they are interested. Doing so has awful (quadratic-looking)
1765 in which they are interested. Doing so has awful (quadratic-looking)
1772 performance, so we use iterators in a "windowed" way.
1766 performance, so we use iterators in a "windowed" way.
1773
1767
1774 We walk a window of revisions in the desired order. Within the
1768 We walk a window of revisions in the desired order. Within the
1775 window, we first walk forwards to gather data, then in the desired
1769 window, we first walk forwards to gather data, then in the desired
1776 order (usually backwards) to display it.
1770 order (usually backwards) to display it.
1777
1771
1778 This function returns an iterator yielding contexts. Before
1772 This function returns an iterator yielding contexts. Before
1779 yielding each context, the iterator will first call the prepare
1773 yielding each context, the iterator will first call the prepare
1780 function on each context in the window in forward order.'''
1774 function on each context in the window in forward order.'''
1781
1775
1782 follow = opts.get('follow') or opts.get('follow_first')
1776 follow = opts.get('follow') or opts.get('follow_first')
1783 revs = _walkrevs(repo, opts)
1777 revs = _walkrevs(repo, opts)
1784 if not revs:
1778 if not revs:
1785 return []
1779 return []
1786 wanted = set()
1780 wanted = set()
1787 slowpath = match.anypats() or (not match.always() and opts.get('removed'))
1781 slowpath = match.anypats() or (not match.always() and opts.get('removed'))
1788 fncache = {}
1782 fncache = {}
1789 change = repo.changectx
1783 change = repo.changectx
1790
1784
1791 # First step is to fill wanted, the set of revisions that we want to yield.
1785 # First step is to fill wanted, the set of revisions that we want to yield.
1792 # When it does not induce extra cost, we also fill fncache for revisions in
1786 # When it does not induce extra cost, we also fill fncache for revisions in
1793 # wanted: a cache of filenames that were changed (ctx.files()) and that
1787 # wanted: a cache of filenames that were changed (ctx.files()) and that
1794 # match the file filtering conditions.
1788 # match the file filtering conditions.
1795
1789
1796 if match.always():
1790 if match.always():
1797 # No files, no patterns. Display all revs.
1791 # No files, no patterns. Display all revs.
1798 wanted = revs
1792 wanted = revs
1799 elif not slowpath:
1793 elif not slowpath:
1800 # We only have to read through the filelog to find wanted revisions
1794 # We only have to read through the filelog to find wanted revisions
1801
1795
1802 try:
1796 try:
1803 wanted = walkfilerevs(repo, match, follow, revs, fncache)
1797 wanted = walkfilerevs(repo, match, follow, revs, fncache)
1804 except FileWalkError:
1798 except FileWalkError:
1805 slowpath = True
1799 slowpath = True
1806
1800
1807 # We decided to fall back to the slowpath because at least one
1801 # We decided to fall back to the slowpath because at least one
1808 # of the paths was not a file. Check to see if at least one of them
1802 # of the paths was not a file. Check to see if at least one of them
1809 # existed in history, otherwise simply return
1803 # existed in history, otherwise simply return
1810 for path in match.files():
1804 for path in match.files():
1811 if path == '.' or path in repo.store:
1805 if path == '.' or path in repo.store:
1812 break
1806 break
1813 else:
1807 else:
1814 return []
1808 return []
1815
1809
1816 if slowpath:
1810 if slowpath:
1817 # We have to read the changelog to match filenames against
1811 # We have to read the changelog to match filenames against
1818 # changed files
1812 # changed files
1819
1813
1820 if follow:
1814 if follow:
1821 raise error.Abort(_('can only follow copies/renames for explicit '
1815 raise error.Abort(_('can only follow copies/renames for explicit '
1822 'filenames'))
1816 'filenames'))
1823
1817
1824 # The slow path checks files modified in every changeset.
1818 # The slow path checks files modified in every changeset.
1825 # This is really slow on large repos, so compute the set lazily.
1819 # This is really slow on large repos, so compute the set lazily.
1826 class lazywantedset(object):
1820 class lazywantedset(object):
1827 def __init__(self):
1821 def __init__(self):
1828 self.set = set()
1822 self.set = set()
1829 self.revs = set(revs)
1823 self.revs = set(revs)
1830
1824
1831 # No need to worry about locality here because it will be accessed
1825 # No need to worry about locality here because it will be accessed
1832 # in the same order as the increasing window below.
1826 # in the same order as the increasing window below.
1833 def __contains__(self, value):
1827 def __contains__(self, value):
1834 if value in self.set:
1828 if value in self.set:
1835 return True
1829 return True
1836 elif not value in self.revs:
1830 elif not value in self.revs:
1837 return False
1831 return False
1838 else:
1832 else:
1839 self.revs.discard(value)
1833 self.revs.discard(value)
1840 ctx = change(value)
1834 ctx = change(value)
1841 matches = filter(match, ctx.files())
1835 matches = filter(match, ctx.files())
1842 if matches:
1836 if matches:
1843 fncache[value] = matches
1837 fncache[value] = matches
1844 self.set.add(value)
1838 self.set.add(value)
1845 return True
1839 return True
1846 return False
1840 return False
1847
1841
1848 def discard(self, value):
1842 def discard(self, value):
1849 self.revs.discard(value)
1843 self.revs.discard(value)
1850 self.set.discard(value)
1844 self.set.discard(value)
1851
1845
1852 wanted = lazywantedset()
1846 wanted = lazywantedset()
1853
1847
1854 # it might be worthwhile to do this in the iterator if the rev range
1848 # it might be worthwhile to do this in the iterator if the rev range
1855 # is descending and the prune args are all within that range
1849 # is descending and the prune args are all within that range
1856 for rev in opts.get('prune', ()):
1850 for rev in opts.get('prune', ()):
1857 rev = repo[rev].rev()
1851 rev = repo[rev].rev()
1858 ff = _followfilter(repo)
1852 ff = _followfilter(repo)
1859 stop = min(revs[0], revs[-1])
1853 stop = min(revs[0], revs[-1])
1860 for x in xrange(rev, stop - 1, -1):
1854 for x in xrange(rev, stop - 1, -1):
1861 if ff.match(x):
1855 if ff.match(x):
1862 wanted = wanted - [x]
1856 wanted = wanted - [x]
1863
1857
1864 # Now that wanted is correctly initialized, we can iterate over the
1858 # Now that wanted is correctly initialized, we can iterate over the
1865 # revision range, yielding only revisions in wanted.
1859 # revision range, yielding only revisions in wanted.
1866 def iterate():
1860 def iterate():
1867 if follow and match.always():
1861 if follow and match.always():
1868 ff = _followfilter(repo, onlyfirst=opts.get('follow_first'))
1862 ff = _followfilter(repo, onlyfirst=opts.get('follow_first'))
1869 def want(rev):
1863 def want(rev):
1870 return ff.match(rev) and rev in wanted
1864 return ff.match(rev) and rev in wanted
1871 else:
1865 else:
1872 def want(rev):
1866 def want(rev):
1873 return rev in wanted
1867 return rev in wanted
1874
1868
1875 it = iter(revs)
1869 it = iter(revs)
1876 stopiteration = False
1870 stopiteration = False
1877 for windowsize in increasingwindows():
1871 for windowsize in increasingwindows():
1878 nrevs = []
1872 nrevs = []
1879 for i in xrange(windowsize):
1873 for i in xrange(windowsize):
1880 rev = next(it, None)
1874 rev = next(it, None)
1881 if rev is None:
1875 if rev is None:
1882 stopiteration = True
1876 stopiteration = True
1883 break
1877 break
1884 elif want(rev):
1878 elif want(rev):
1885 nrevs.append(rev)
1879 nrevs.append(rev)
1886 for rev in sorted(nrevs):
1880 for rev in sorted(nrevs):
1887 fns = fncache.get(rev)
1881 fns = fncache.get(rev)
1888 ctx = change(rev)
1882 ctx = change(rev)
1889 if not fns:
1883 if not fns:
1890 def fns_generator():
1884 def fns_generator():
1891 for f in ctx.files():
1885 for f in ctx.files():
1892 if match(f):
1886 if match(f):
1893 yield f
1887 yield f
1894 fns = fns_generator()
1888 fns = fns_generator()
1895 prepare(ctx, fns)
1889 prepare(ctx, fns)
1896 for rev in nrevs:
1890 for rev in nrevs:
1897 yield change(rev)
1891 yield change(rev)
1898
1892
1899 if stopiteration:
1893 if stopiteration:
1900 break
1894 break
1901
1895
1902 return iterate()
1896 return iterate()
1903
1897
1904 def add(ui, repo, match, prefix, explicitonly, **opts):
1898 def add(ui, repo, match, prefix, explicitonly, **opts):
1905 join = lambda f: os.path.join(prefix, f)
1899 join = lambda f: os.path.join(prefix, f)
1906 bad = []
1900 bad = []
1907
1901
1908 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
1902 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
1909 names = []
1903 names = []
1910 wctx = repo[None]
1904 wctx = repo[None]
1911 cca = None
1905 cca = None
1912 abort, warn = scmutil.checkportabilityalert(ui)
1906 abort, warn = scmutil.checkportabilityalert(ui)
1913 if abort or warn:
1907 if abort or warn:
1914 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
1908 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
1915
1909
1916 badmatch = matchmod.badmatch(match, badfn)
1910 badmatch = matchmod.badmatch(match, badfn)
1917 dirstate = repo.dirstate
1911 dirstate = repo.dirstate
1918 # We don't want to just call wctx.walk here, since it would return a lot of
1912 # We don't want to just call wctx.walk here, since it would return a lot of
1919 # clean files, which we aren't interested in and takes time.
1913 # clean files, which we aren't interested in and takes time.
1920 for f in sorted(dirstate.walk(badmatch, subrepos=sorted(wctx.substate),
1914 for f in sorted(dirstate.walk(badmatch, subrepos=sorted(wctx.substate),
1921 unknown=True, ignored=False, full=False)):
1915 unknown=True, ignored=False, full=False)):
1922 exact = match.exact(f)
1916 exact = match.exact(f)
1923 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
1917 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
1924 if cca:
1918 if cca:
1925 cca(f)
1919 cca(f)
1926 names.append(f)
1920 names.append(f)
1927 if ui.verbose or not exact:
1921 if ui.verbose or not exact:
1928 ui.status(_('adding %s\n') % match.rel(f))
1922 ui.status(_('adding %s\n') % match.rel(f))
1929
1923
1930 for subpath in sorted(wctx.substate):
1924 for subpath in sorted(wctx.substate):
1931 sub = wctx.sub(subpath)
1925 sub = wctx.sub(subpath)
1932 try:
1926 try:
1933 submatch = matchmod.subdirmatcher(subpath, match)
1927 submatch = matchmod.subdirmatcher(subpath, match)
1934 if opts.get(r'subrepos'):
1928 if opts.get(r'subrepos'):
1935 bad.extend(sub.add(ui, submatch, prefix, False, **opts))
1929 bad.extend(sub.add(ui, submatch, prefix, False, **opts))
1936 else:
1930 else:
1937 bad.extend(sub.add(ui, submatch, prefix, True, **opts))
1931 bad.extend(sub.add(ui, submatch, prefix, True, **opts))
1938 except error.LookupError:
1932 except error.LookupError:
1939 ui.status(_("skipping missing subrepository: %s\n")
1933 ui.status(_("skipping missing subrepository: %s\n")
1940 % join(subpath))
1934 % join(subpath))
1941
1935
1942 if not opts.get(r'dry_run'):
1936 if not opts.get(r'dry_run'):
1943 rejected = wctx.add(names, prefix)
1937 rejected = wctx.add(names, prefix)
1944 bad.extend(f for f in rejected if f in match.files())
1938 bad.extend(f for f in rejected if f in match.files())
1945 return bad
1939 return bad
1946
1940
1947 def addwebdirpath(repo, serverpath, webconf):
1941 def addwebdirpath(repo, serverpath, webconf):
1948 webconf[serverpath] = repo.root
1942 webconf[serverpath] = repo.root
1949 repo.ui.debug('adding %s = %s\n' % (serverpath, repo.root))
1943 repo.ui.debug('adding %s = %s\n' % (serverpath, repo.root))
1950
1944
1951 for r in repo.revs('filelog("path:.hgsub")'):
1945 for r in repo.revs('filelog("path:.hgsub")'):
1952 ctx = repo[r]
1946 ctx = repo[r]
1953 for subpath in ctx.substate:
1947 for subpath in ctx.substate:
1954 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
1948 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
1955
1949
1956 def forget(ui, repo, match, prefix, explicitonly):
1950 def forget(ui, repo, match, prefix, explicitonly):
1957 join = lambda f: os.path.join(prefix, f)
1951 join = lambda f: os.path.join(prefix, f)
1958 bad = []
1952 bad = []
1959 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
1953 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
1960 wctx = repo[None]
1954 wctx = repo[None]
1961 forgot = []
1955 forgot = []
1962
1956
1963 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
1957 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
1964 forget = sorted(s.modified + s.added + s.deleted + s.clean)
1958 forget = sorted(s.modified + s.added + s.deleted + s.clean)
1965 if explicitonly:
1959 if explicitonly:
1966 forget = [f for f in forget if match.exact(f)]
1960 forget = [f for f in forget if match.exact(f)]
1967
1961
1968 for subpath in sorted(wctx.substate):
1962 for subpath in sorted(wctx.substate):
1969 sub = wctx.sub(subpath)
1963 sub = wctx.sub(subpath)
1970 try:
1964 try:
1971 submatch = matchmod.subdirmatcher(subpath, match)
1965 submatch = matchmod.subdirmatcher(subpath, match)
1972 subbad, subforgot = sub.forget(submatch, prefix)
1966 subbad, subforgot = sub.forget(submatch, prefix)
1973 bad.extend([subpath + '/' + f for f in subbad])
1967 bad.extend([subpath + '/' + f for f in subbad])
1974 forgot.extend([subpath + '/' + f for f in subforgot])
1968 forgot.extend([subpath + '/' + f for f in subforgot])
1975 except error.LookupError:
1969 except error.LookupError:
1976 ui.status(_("skipping missing subrepository: %s\n")
1970 ui.status(_("skipping missing subrepository: %s\n")
1977 % join(subpath))
1971 % join(subpath))
1978
1972
1979 if not explicitonly:
1973 if not explicitonly:
1980 for f in match.files():
1974 for f in match.files():
1981 if f not in repo.dirstate and not repo.wvfs.isdir(f):
1975 if f not in repo.dirstate and not repo.wvfs.isdir(f):
1982 if f not in forgot:
1976 if f not in forgot:
1983 if repo.wvfs.exists(f):
1977 if repo.wvfs.exists(f):
1984 # Don't complain if the exact case match wasn't given.
1978 # Don't complain if the exact case match wasn't given.
1985 # But don't do this until after checking 'forgot', so
1979 # But don't do this until after checking 'forgot', so
1986 # that subrepo files aren't normalized, and this op is
1980 # that subrepo files aren't normalized, and this op is
1987 # purely from data cached by the status walk above.
1981 # purely from data cached by the status walk above.
1988 if repo.dirstate.normalize(f) in repo.dirstate:
1982 if repo.dirstate.normalize(f) in repo.dirstate:
1989 continue
1983 continue
1990 ui.warn(_('not removing %s: '
1984 ui.warn(_('not removing %s: '
1991 'file is already untracked\n')
1985 'file is already untracked\n')
1992 % match.rel(f))
1986 % match.rel(f))
1993 bad.append(f)
1987 bad.append(f)
1994
1988
1995 for f in forget:
1989 for f in forget:
1996 if ui.verbose or not match.exact(f):
1990 if ui.verbose or not match.exact(f):
1997 ui.status(_('removing %s\n') % match.rel(f))
1991 ui.status(_('removing %s\n') % match.rel(f))
1998
1992
1999 rejected = wctx.forget(forget, prefix)
1993 rejected = wctx.forget(forget, prefix)
2000 bad.extend(f for f in rejected if f in match.files())
1994 bad.extend(f for f in rejected if f in match.files())
2001 forgot.extend(f for f in forget if f not in rejected)
1995 forgot.extend(f for f in forget if f not in rejected)
2002 return bad, forgot
1996 return bad, forgot
2003
1997
2004 def files(ui, ctx, m, fm, fmt, subrepos):
1998 def files(ui, ctx, m, fm, fmt, subrepos):
2005 rev = ctx.rev()
1999 rev = ctx.rev()
2006 ret = 1
2000 ret = 1
2007 ds = ctx.repo().dirstate
2001 ds = ctx.repo().dirstate
2008
2002
2009 for f in ctx.matches(m):
2003 for f in ctx.matches(m):
2010 if rev is None and ds[f] == 'r':
2004 if rev is None and ds[f] == 'r':
2011 continue
2005 continue
2012 fm.startitem()
2006 fm.startitem()
2013 if ui.verbose:
2007 if ui.verbose:
2014 fc = ctx[f]
2008 fc = ctx[f]
2015 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
2009 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
2016 fm.data(abspath=f)
2010 fm.data(abspath=f)
2017 fm.write('path', fmt, m.rel(f))
2011 fm.write('path', fmt, m.rel(f))
2018 ret = 0
2012 ret = 0
2019
2013
2020 for subpath in sorted(ctx.substate):
2014 for subpath in sorted(ctx.substate):
2021 submatch = matchmod.subdirmatcher(subpath, m)
2015 submatch = matchmod.subdirmatcher(subpath, m)
2022 if (subrepos or m.exact(subpath) or any(submatch.files())):
2016 if (subrepos or m.exact(subpath) or any(submatch.files())):
2023 sub = ctx.sub(subpath)
2017 sub = ctx.sub(subpath)
2024 try:
2018 try:
2025 recurse = m.exact(subpath) or subrepos
2019 recurse = m.exact(subpath) or subrepos
2026 if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
2020 if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
2027 ret = 0
2021 ret = 0
2028 except error.LookupError:
2022 except error.LookupError:
2029 ui.status(_("skipping missing subrepository: %s\n")
2023 ui.status(_("skipping missing subrepository: %s\n")
2030 % m.abs(subpath))
2024 % m.abs(subpath))
2031
2025
2032 return ret
2026 return ret
2033
2027
2034 def remove(ui, repo, m, prefix, after, force, subrepos, warnings=None):
2028 def remove(ui, repo, m, prefix, after, force, subrepos, warnings=None):
2035 join = lambda f: os.path.join(prefix, f)
2029 join = lambda f: os.path.join(prefix, f)
2036 ret = 0
2030 ret = 0
2037 s = repo.status(match=m, clean=True)
2031 s = repo.status(match=m, clean=True)
2038 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2032 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2039
2033
2040 wctx = repo[None]
2034 wctx = repo[None]
2041
2035
2042 if warnings is None:
2036 if warnings is None:
2043 warnings = []
2037 warnings = []
2044 warn = True
2038 warn = True
2045 else:
2039 else:
2046 warn = False
2040 warn = False
2047
2041
2048 subs = sorted(wctx.substate)
2042 subs = sorted(wctx.substate)
2049 total = len(subs)
2043 total = len(subs)
2050 count = 0
2044 count = 0
2051 for subpath in subs:
2045 for subpath in subs:
2052 count += 1
2046 count += 1
2053 submatch = matchmod.subdirmatcher(subpath, m)
2047 submatch = matchmod.subdirmatcher(subpath, m)
2054 if subrepos or m.exact(subpath) or any(submatch.files()):
2048 if subrepos or m.exact(subpath) or any(submatch.files()):
2055 ui.progress(_('searching'), count, total=total, unit=_('subrepos'))
2049 ui.progress(_('searching'), count, total=total, unit=_('subrepos'))
2056 sub = wctx.sub(subpath)
2050 sub = wctx.sub(subpath)
2057 try:
2051 try:
2058 if sub.removefiles(submatch, prefix, after, force, subrepos,
2052 if sub.removefiles(submatch, prefix, after, force, subrepos,
2059 warnings):
2053 warnings):
2060 ret = 1
2054 ret = 1
2061 except error.LookupError:
2055 except error.LookupError:
2062 warnings.append(_("skipping missing subrepository: %s\n")
2056 warnings.append(_("skipping missing subrepository: %s\n")
2063 % join(subpath))
2057 % join(subpath))
2064 ui.progress(_('searching'), None)
2058 ui.progress(_('searching'), None)
2065
2059
2066 # warn about failure to delete explicit files/dirs
2060 # warn about failure to delete explicit files/dirs
2067 deleteddirs = util.dirs(deleted)
2061 deleteddirs = util.dirs(deleted)
2068 files = m.files()
2062 files = m.files()
2069 total = len(files)
2063 total = len(files)
2070 count = 0
2064 count = 0
2071 for f in files:
2065 for f in files:
2072 def insubrepo():
2066 def insubrepo():
2073 for subpath in wctx.substate:
2067 for subpath in wctx.substate:
2074 if f.startswith(subpath + '/'):
2068 if f.startswith(subpath + '/'):
2075 return True
2069 return True
2076 return False
2070 return False
2077
2071
2078 count += 1
2072 count += 1
2079 ui.progress(_('deleting'), count, total=total, unit=_('files'))
2073 ui.progress(_('deleting'), count, total=total, unit=_('files'))
2080 isdir = f in deleteddirs or wctx.hasdir(f)
2074 isdir = f in deleteddirs or wctx.hasdir(f)
2081 if (f in repo.dirstate or isdir or f == '.'
2075 if (f in repo.dirstate or isdir or f == '.'
2082 or insubrepo() or f in subs):
2076 or insubrepo() or f in subs):
2083 continue
2077 continue
2084
2078
2085 if repo.wvfs.exists(f):
2079 if repo.wvfs.exists(f):
2086 if repo.wvfs.isdir(f):
2080 if repo.wvfs.isdir(f):
2087 warnings.append(_('not removing %s: no tracked files\n')
2081 warnings.append(_('not removing %s: no tracked files\n')
2088 % m.rel(f))
2082 % m.rel(f))
2089 else:
2083 else:
2090 warnings.append(_('not removing %s: file is untracked\n')
2084 warnings.append(_('not removing %s: file is untracked\n')
2091 % m.rel(f))
2085 % m.rel(f))
2092 # missing files will generate a warning elsewhere
2086 # missing files will generate a warning elsewhere
2093 ret = 1
2087 ret = 1
2094 ui.progress(_('deleting'), None)
2088 ui.progress(_('deleting'), None)
2095
2089
2096 if force:
2090 if force:
2097 list = modified + deleted + clean + added
2091 list = modified + deleted + clean + added
2098 elif after:
2092 elif after:
2099 list = deleted
2093 list = deleted
2100 remaining = modified + added + clean
2094 remaining = modified + added + clean
2101 total = len(remaining)
2095 total = len(remaining)
2102 count = 0
2096 count = 0
2103 for f in remaining:
2097 for f in remaining:
2104 count += 1
2098 count += 1
2105 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2099 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2106 if ui.verbose or (f in files):
2100 if ui.verbose or (f in files):
2107 warnings.append(_('not removing %s: file still exists\n')
2101 warnings.append(_('not removing %s: file still exists\n')
2108 % m.rel(f))
2102 % m.rel(f))
2109 ret = 1
2103 ret = 1
2110 ui.progress(_('skipping'), None)
2104 ui.progress(_('skipping'), None)
2111 else:
2105 else:
2112 list = deleted + clean
2106 list = deleted + clean
2113 total = len(modified) + len(added)
2107 total = len(modified) + len(added)
2114 count = 0
2108 count = 0
2115 for f in modified:
2109 for f in modified:
2116 count += 1
2110 count += 1
2117 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2111 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2118 warnings.append(_('not removing %s: file is modified (use -f'
2112 warnings.append(_('not removing %s: file is modified (use -f'
2119 ' to force removal)\n') % m.rel(f))
2113 ' to force removal)\n') % m.rel(f))
2120 ret = 1
2114 ret = 1
2121 for f in added:
2115 for f in added:
2122 count += 1
2116 count += 1
2123 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2117 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2124 warnings.append(_("not removing %s: file has been marked for add"
2118 warnings.append(_("not removing %s: file has been marked for add"
2125 " (use 'hg forget' to undo add)\n") % m.rel(f))
2119 " (use 'hg forget' to undo add)\n") % m.rel(f))
2126 ret = 1
2120 ret = 1
2127 ui.progress(_('skipping'), None)
2121 ui.progress(_('skipping'), None)
2128
2122
2129 list = sorted(list)
2123 list = sorted(list)
2130 total = len(list)
2124 total = len(list)
2131 count = 0
2125 count = 0
2132 for f in list:
2126 for f in list:
2133 count += 1
2127 count += 1
2134 if ui.verbose or not m.exact(f):
2128 if ui.verbose or not m.exact(f):
2135 ui.progress(_('deleting'), count, total=total, unit=_('files'))
2129 ui.progress(_('deleting'), count, total=total, unit=_('files'))
2136 ui.status(_('removing %s\n') % m.rel(f))
2130 ui.status(_('removing %s\n') % m.rel(f))
2137 ui.progress(_('deleting'), None)
2131 ui.progress(_('deleting'), None)
2138
2132
2139 with repo.wlock():
2133 with repo.wlock():
2140 if not after:
2134 if not after:
2141 for f in list:
2135 for f in list:
2142 if f in added:
2136 if f in added:
2143 continue # we never unlink added files on remove
2137 continue # we never unlink added files on remove
2144 repo.wvfs.unlinkpath(f, ignoremissing=True)
2138 repo.wvfs.unlinkpath(f, ignoremissing=True)
2145 repo[None].forget(list)
2139 repo[None].forget(list)
2146
2140
2147 if warn:
2141 if warn:
2148 for warning in warnings:
2142 for warning in warnings:
2149 ui.warn(warning)
2143 ui.warn(warning)
2150
2144
2151 return ret
2145 return ret
2152
2146
2153 def _updatecatformatter(fm, ctx, matcher, path, decode):
2147 def _updatecatformatter(fm, ctx, matcher, path, decode):
2154 """Hook for adding data to the formatter used by ``hg cat``.
2148 """Hook for adding data to the formatter used by ``hg cat``.
2155
2149
2156 Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
2150 Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
2157 this method first."""
2151 this method first."""
2158 data = ctx[path].data()
2152 data = ctx[path].data()
2159 if decode:
2153 if decode:
2160 data = ctx.repo().wwritedata(path, data)
2154 data = ctx.repo().wwritedata(path, data)
2161 fm.startitem()
2155 fm.startitem()
2162 fm.write('data', '%s', data)
2156 fm.write('data', '%s', data)
2163 fm.data(abspath=path, path=matcher.rel(path))
2157 fm.data(abspath=path, path=matcher.rel(path))
2164
2158
2165 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2159 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2166 err = 1
2160 err = 1
2167 opts = pycompat.byteskwargs(opts)
2161 opts = pycompat.byteskwargs(opts)
2168
2162
2169 def write(path):
2163 def write(path):
2170 filename = None
2164 filename = None
2171 if fntemplate:
2165 if fntemplate:
2172 filename = makefilename(repo, fntemplate, ctx.node(),
2166 filename = makefilename(repo, fntemplate, ctx.node(),
2173 pathname=os.path.join(prefix, path))
2167 pathname=os.path.join(prefix, path))
2174 # attempt to create the directory if it does not already exist
2168 # attempt to create the directory if it does not already exist
2175 try:
2169 try:
2176 os.makedirs(os.path.dirname(filename))
2170 os.makedirs(os.path.dirname(filename))
2177 except OSError:
2171 except OSError:
2178 pass
2172 pass
2179 with formatter.maybereopen(basefm, filename, opts) as fm:
2173 with formatter.maybereopen(basefm, filename, opts) as fm:
2180 _updatecatformatter(fm, ctx, matcher, path, opts.get('decode'))
2174 _updatecatformatter(fm, ctx, matcher, path, opts.get('decode'))
2181
2175
2182 # Automation often uses hg cat on single files, so special case it
2176 # Automation often uses hg cat on single files, so special case it
2183 # for performance to avoid the cost of parsing the manifest.
2177 # for performance to avoid the cost of parsing the manifest.
2184 if len(matcher.files()) == 1 and not matcher.anypats():
2178 if len(matcher.files()) == 1 and not matcher.anypats():
2185 file = matcher.files()[0]
2179 file = matcher.files()[0]
2186 mfl = repo.manifestlog
2180 mfl = repo.manifestlog
2187 mfnode = ctx.manifestnode()
2181 mfnode = ctx.manifestnode()
2188 try:
2182 try:
2189 if mfnode and mfl[mfnode].find(file)[0]:
2183 if mfnode and mfl[mfnode].find(file)[0]:
2190 scmutil.fileprefetchhooks(repo, ctx, [file])
2184 scmutil.fileprefetchhooks(repo, ctx, [file])
2191 write(file)
2185 write(file)
2192 return 0
2186 return 0
2193 except KeyError:
2187 except KeyError:
2194 pass
2188 pass
2195
2189
2196 files = [f for f in ctx.walk(matcher)]
2190 files = [f for f in ctx.walk(matcher)]
2197 scmutil.fileprefetchhooks(repo, ctx, files)
2191 scmutil.fileprefetchhooks(repo, ctx, files)
2198
2192
2199 for abs in files:
2193 for abs in files:
2200 write(abs)
2194 write(abs)
2201 err = 0
2195 err = 0
2202
2196
2203 for subpath in sorted(ctx.substate):
2197 for subpath in sorted(ctx.substate):
2204 sub = ctx.sub(subpath)
2198 sub = ctx.sub(subpath)
2205 try:
2199 try:
2206 submatch = matchmod.subdirmatcher(subpath, matcher)
2200 submatch = matchmod.subdirmatcher(subpath, matcher)
2207
2201
2208 if not sub.cat(submatch, basefm, fntemplate,
2202 if not sub.cat(submatch, basefm, fntemplate,
2209 os.path.join(prefix, sub._path),
2203 os.path.join(prefix, sub._path),
2210 **pycompat.strkwargs(opts)):
2204 **pycompat.strkwargs(opts)):
2211 err = 0
2205 err = 0
2212 except error.RepoLookupError:
2206 except error.RepoLookupError:
2213 ui.status(_("skipping missing subrepository: %s\n")
2207 ui.status(_("skipping missing subrepository: %s\n")
2214 % os.path.join(prefix, subpath))
2208 % os.path.join(prefix, subpath))
2215
2209
2216 return err
2210 return err
2217
2211
2218 def commit(ui, repo, commitfunc, pats, opts):
2212 def commit(ui, repo, commitfunc, pats, opts):
2219 '''commit the specified files or all outstanding changes'''
2213 '''commit the specified files or all outstanding changes'''
2220 date = opts.get('date')
2214 date = opts.get('date')
2221 if date:
2215 if date:
2222 opts['date'] = util.parsedate(date)
2216 opts['date'] = util.parsedate(date)
2223 message = logmessage(ui, opts)
2217 message = logmessage(ui, opts)
2224 matcher = scmutil.match(repo[None], pats, opts)
2218 matcher = scmutil.match(repo[None], pats, opts)
2225
2219
2226 dsguard = None
2220 dsguard = None
2227 # extract addremove carefully -- this function can be called from a command
2221 # extract addremove carefully -- this function can be called from a command
2228 # that doesn't support addremove
2222 # that doesn't support addremove
2229 if opts.get('addremove'):
2223 if opts.get('addremove'):
2230 dsguard = dirstateguard.dirstateguard(repo, 'commit')
2224 dsguard = dirstateguard.dirstateguard(repo, 'commit')
2231 with dsguard or util.nullcontextmanager():
2225 with dsguard or util.nullcontextmanager():
2232 if dsguard:
2226 if dsguard:
2233 if scmutil.addremove(repo, matcher, "", opts) != 0:
2227 if scmutil.addremove(repo, matcher, "", opts) != 0:
2234 raise error.Abort(
2228 raise error.Abort(
2235 _("failed to mark all new/missing files as added/removed"))
2229 _("failed to mark all new/missing files as added/removed"))
2236
2230
2237 return commitfunc(ui, repo, message, matcher, opts)
2231 return commitfunc(ui, repo, message, matcher, opts)
2238
2232
2239 def samefile(f, ctx1, ctx2):
2233 def samefile(f, ctx1, ctx2):
2240 if f in ctx1.manifest():
2234 if f in ctx1.manifest():
2241 a = ctx1.filectx(f)
2235 a = ctx1.filectx(f)
2242 if f in ctx2.manifest():
2236 if f in ctx2.manifest():
2243 b = ctx2.filectx(f)
2237 b = ctx2.filectx(f)
2244 return (not a.cmp(b)
2238 return (not a.cmp(b)
2245 and a.flags() == b.flags())
2239 and a.flags() == b.flags())
2246 else:
2240 else:
2247 return False
2241 return False
2248 else:
2242 else:
2249 return f not in ctx2.manifest()
2243 return f not in ctx2.manifest()
2250
2244
2251 def amend(ui, repo, old, extra, pats, opts):
2245 def amend(ui, repo, old, extra, pats, opts):
2252 # avoid cycle context -> subrepo -> cmdutil
2246 # avoid cycle context -> subrepo -> cmdutil
2253 from . import context
2247 from . import context
2254
2248
2255 # amend will reuse the existing user if not specified, but the obsolete
2249 # amend will reuse the existing user if not specified, but the obsolete
2256 # marker creation requires that the current user's name is specified.
2250 # marker creation requires that the current user's name is specified.
2257 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2251 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2258 ui.username() # raise exception if username not set
2252 ui.username() # raise exception if username not set
2259
2253
2260 ui.note(_('amending changeset %s\n') % old)
2254 ui.note(_('amending changeset %s\n') % old)
2261 base = old.p1()
2255 base = old.p1()
2262
2256
2263 with repo.wlock(), repo.lock(), repo.transaction('amend'):
2257 with repo.wlock(), repo.lock(), repo.transaction('amend'):
2264 # Participating changesets:
2258 # Participating changesets:
2265 #
2259 #
2266 # wctx o - workingctx that contains changes from working copy
2260 # wctx o - workingctx that contains changes from working copy
2267 # | to go into amending commit
2261 # | to go into amending commit
2268 # |
2262 # |
2269 # old o - changeset to amend
2263 # old o - changeset to amend
2270 # |
2264 # |
2271 # base o - first parent of the changeset to amend
2265 # base o - first parent of the changeset to amend
2272 wctx = repo[None]
2266 wctx = repo[None]
2273
2267
2274 # Copy to avoid mutating input
2268 # Copy to avoid mutating input
2275 extra = extra.copy()
2269 extra = extra.copy()
2276 # Update extra dict from amended commit (e.g. to preserve graft
2270 # Update extra dict from amended commit (e.g. to preserve graft
2277 # source)
2271 # source)
2278 extra.update(old.extra())
2272 extra.update(old.extra())
2279
2273
2280 # Also update it from the from the wctx
2274 # Also update it from the from the wctx
2281 extra.update(wctx.extra())
2275 extra.update(wctx.extra())
2282
2276
2283 user = opts.get('user') or old.user()
2277 user = opts.get('user') or old.user()
2284 date = opts.get('date') or old.date()
2278 date = opts.get('date') or old.date()
2285
2279
2286 # Parse the date to allow comparison between date and old.date()
2280 # Parse the date to allow comparison between date and old.date()
2287 date = util.parsedate(date)
2281 date = util.parsedate(date)
2288
2282
2289 if len(old.parents()) > 1:
2283 if len(old.parents()) > 1:
2290 # ctx.files() isn't reliable for merges, so fall back to the
2284 # ctx.files() isn't reliable for merges, so fall back to the
2291 # slower repo.status() method
2285 # slower repo.status() method
2292 files = set([fn for st in repo.status(base, old)[:3]
2286 files = set([fn for st in repo.status(base, old)[:3]
2293 for fn in st])
2287 for fn in st])
2294 else:
2288 else:
2295 files = set(old.files())
2289 files = set(old.files())
2296
2290
2297 # add/remove the files to the working copy if the "addremove" option
2291 # add/remove the files to the working copy if the "addremove" option
2298 # was specified.
2292 # was specified.
2299 matcher = scmutil.match(wctx, pats, opts)
2293 matcher = scmutil.match(wctx, pats, opts)
2300 if (opts.get('addremove')
2294 if (opts.get('addremove')
2301 and scmutil.addremove(repo, matcher, "", opts)):
2295 and scmutil.addremove(repo, matcher, "", opts)):
2302 raise error.Abort(
2296 raise error.Abort(
2303 _("failed to mark all new/missing files as added/removed"))
2297 _("failed to mark all new/missing files as added/removed"))
2304
2298
2305 # Check subrepos. This depends on in-place wctx._status update in
2299 # Check subrepos. This depends on in-place wctx._status update in
2306 # subrepo.precommit(). To minimize the risk of this hack, we do
2300 # subrepo.precommit(). To minimize the risk of this hack, we do
2307 # nothing if .hgsub does not exist.
2301 # nothing if .hgsub does not exist.
2308 if '.hgsub' in wctx or '.hgsub' in old:
2302 if '.hgsub' in wctx or '.hgsub' in old:
2309 subs, commitsubs, newsubstate = subrepoutil.precommit(
2303 subs, commitsubs, newsubstate = subrepoutil.precommit(
2310 ui, wctx, wctx._status, matcher)
2304 ui, wctx, wctx._status, matcher)
2311 # amend should abort if commitsubrepos is enabled
2305 # amend should abort if commitsubrepos is enabled
2312 assert not commitsubs
2306 assert not commitsubs
2313 if subs:
2307 if subs:
2314 subrepoutil.writestate(repo, newsubstate)
2308 subrepoutil.writestate(repo, newsubstate)
2315
2309
2316 filestoamend = set(f for f in wctx.files() if matcher(f))
2310 filestoamend = set(f for f in wctx.files() if matcher(f))
2317
2311
2318 changes = (len(filestoamend) > 0)
2312 changes = (len(filestoamend) > 0)
2319 if changes:
2313 if changes:
2320 # Recompute copies (avoid recording a -> b -> a)
2314 # Recompute copies (avoid recording a -> b -> a)
2321 copied = copies.pathcopies(base, wctx, matcher)
2315 copied = copies.pathcopies(base, wctx, matcher)
2322 if old.p2:
2316 if old.p2:
2323 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
2317 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
2324
2318
2325 # Prune files which were reverted by the updates: if old
2319 # Prune files which were reverted by the updates: if old
2326 # introduced file X and the file was renamed in the working
2320 # introduced file X and the file was renamed in the working
2327 # copy, then those two files are the same and
2321 # copy, then those two files are the same and
2328 # we can discard X from our list of files. Likewise if X
2322 # we can discard X from our list of files. Likewise if X
2329 # was removed, it's no longer relevant. If X is missing (aka
2323 # was removed, it's no longer relevant. If X is missing (aka
2330 # deleted), old X must be preserved.
2324 # deleted), old X must be preserved.
2331 files.update(filestoamend)
2325 files.update(filestoamend)
2332 files = [f for f in files if (not samefile(f, wctx, base)
2326 files = [f for f in files if (not samefile(f, wctx, base)
2333 or f in wctx.deleted())]
2327 or f in wctx.deleted())]
2334
2328
2335 def filectxfn(repo, ctx_, path):
2329 def filectxfn(repo, ctx_, path):
2336 try:
2330 try:
2337 # If the file being considered is not amongst the files
2331 # If the file being considered is not amongst the files
2338 # to be amended, we should return the file context from the
2332 # to be amended, we should return the file context from the
2339 # old changeset. This avoids issues when only some files in
2333 # old changeset. This avoids issues when only some files in
2340 # the working copy are being amended but there are also
2334 # the working copy are being amended but there are also
2341 # changes to other files from the old changeset.
2335 # changes to other files from the old changeset.
2342 if path not in filestoamend:
2336 if path not in filestoamend:
2343 return old.filectx(path)
2337 return old.filectx(path)
2344
2338
2345 # Return None for removed files.
2339 # Return None for removed files.
2346 if path in wctx.removed():
2340 if path in wctx.removed():
2347 return None
2341 return None
2348
2342
2349 fctx = wctx[path]
2343 fctx = wctx[path]
2350 flags = fctx.flags()
2344 flags = fctx.flags()
2351 mctx = context.memfilectx(repo, ctx_,
2345 mctx = context.memfilectx(repo, ctx_,
2352 fctx.path(), fctx.data(),
2346 fctx.path(), fctx.data(),
2353 islink='l' in flags,
2347 islink='l' in flags,
2354 isexec='x' in flags,
2348 isexec='x' in flags,
2355 copied=copied.get(path))
2349 copied=copied.get(path))
2356 return mctx
2350 return mctx
2357 except KeyError:
2351 except KeyError:
2358 return None
2352 return None
2359 else:
2353 else:
2360 ui.note(_('copying changeset %s to %s\n') % (old, base))
2354 ui.note(_('copying changeset %s to %s\n') % (old, base))
2361
2355
2362 # Use version of files as in the old cset
2356 # Use version of files as in the old cset
2363 def filectxfn(repo, ctx_, path):
2357 def filectxfn(repo, ctx_, path):
2364 try:
2358 try:
2365 return old.filectx(path)
2359 return old.filectx(path)
2366 except KeyError:
2360 except KeyError:
2367 return None
2361 return None
2368
2362
2369 # See if we got a message from -m or -l, if not, open the editor with
2363 # See if we got a message from -m or -l, if not, open the editor with
2370 # the message of the changeset to amend.
2364 # the message of the changeset to amend.
2371 message = logmessage(ui, opts)
2365 message = logmessage(ui, opts)
2372
2366
2373 editform = mergeeditform(old, 'commit.amend')
2367 editform = mergeeditform(old, 'commit.amend')
2374 editor = getcommiteditor(editform=editform,
2368 editor = getcommiteditor(editform=editform,
2375 **pycompat.strkwargs(opts))
2369 **pycompat.strkwargs(opts))
2376
2370
2377 if not message:
2371 if not message:
2378 editor = getcommiteditor(edit=True, editform=editform)
2372 editor = getcommiteditor(edit=True, editform=editform)
2379 message = old.description()
2373 message = old.description()
2380
2374
2381 pureextra = extra.copy()
2375 pureextra = extra.copy()
2382 extra['amend_source'] = old.hex()
2376 extra['amend_source'] = old.hex()
2383
2377
2384 new = context.memctx(repo,
2378 new = context.memctx(repo,
2385 parents=[base.node(), old.p2().node()],
2379 parents=[base.node(), old.p2().node()],
2386 text=message,
2380 text=message,
2387 files=files,
2381 files=files,
2388 filectxfn=filectxfn,
2382 filectxfn=filectxfn,
2389 user=user,
2383 user=user,
2390 date=date,
2384 date=date,
2391 extra=extra,
2385 extra=extra,
2392 editor=editor)
2386 editor=editor)
2393
2387
2394 newdesc = changelog.stripdesc(new.description())
2388 newdesc = changelog.stripdesc(new.description())
2395 if ((not changes)
2389 if ((not changes)
2396 and newdesc == old.description()
2390 and newdesc == old.description()
2397 and user == old.user()
2391 and user == old.user()
2398 and date == old.date()
2392 and date == old.date()
2399 and pureextra == old.extra()):
2393 and pureextra == old.extra()):
2400 # nothing changed. continuing here would create a new node
2394 # nothing changed. continuing here would create a new node
2401 # anyway because of the amend_source noise.
2395 # anyway because of the amend_source noise.
2402 #
2396 #
2403 # This not what we expect from amend.
2397 # This not what we expect from amend.
2404 return old.node()
2398 return old.node()
2405
2399
2406 if opts.get('secret'):
2400 if opts.get('secret'):
2407 commitphase = 'secret'
2401 commitphase = 'secret'
2408 else:
2402 else:
2409 commitphase = old.phase()
2403 commitphase = old.phase()
2410 overrides = {('phases', 'new-commit'): commitphase}
2404 overrides = {('phases', 'new-commit'): commitphase}
2411 with ui.configoverride(overrides, 'amend'):
2405 with ui.configoverride(overrides, 'amend'):
2412 newid = repo.commitctx(new)
2406 newid = repo.commitctx(new)
2413
2407
2414 # Reroute the working copy parent to the new changeset
2408 # Reroute the working copy parent to the new changeset
2415 repo.setparents(newid, nullid)
2409 repo.setparents(newid, nullid)
2416 mapping = {old.node(): (newid,)}
2410 mapping = {old.node(): (newid,)}
2417 obsmetadata = None
2411 obsmetadata = None
2418 if opts.get('note'):
2412 if opts.get('note'):
2419 obsmetadata = {'note': opts['note']}
2413 obsmetadata = {'note': opts['note']}
2420 scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata)
2414 scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata)
2421
2415
2422 # Fixing the dirstate because localrepo.commitctx does not update
2416 # Fixing the dirstate because localrepo.commitctx does not update
2423 # it. This is rather convenient because we did not need to update
2417 # it. This is rather convenient because we did not need to update
2424 # the dirstate for all the files in the new commit which commitctx
2418 # the dirstate for all the files in the new commit which commitctx
2425 # could have done if it updated the dirstate. Now, we can
2419 # could have done if it updated the dirstate. Now, we can
2426 # selectively update the dirstate only for the amended files.
2420 # selectively update the dirstate only for the amended files.
2427 dirstate = repo.dirstate
2421 dirstate = repo.dirstate
2428
2422
2429 # Update the state of the files which were added and
2423 # Update the state of the files which were added and
2430 # and modified in the amend to "normal" in the dirstate.
2424 # and modified in the amend to "normal" in the dirstate.
2431 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
2425 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
2432 for f in normalfiles:
2426 for f in normalfiles:
2433 dirstate.normal(f)
2427 dirstate.normal(f)
2434
2428
2435 # Update the state of files which were removed in the amend
2429 # Update the state of files which were removed in the amend
2436 # to "removed" in the dirstate.
2430 # to "removed" in the dirstate.
2437 removedfiles = set(wctx.removed()) & filestoamend
2431 removedfiles = set(wctx.removed()) & filestoamend
2438 for f in removedfiles:
2432 for f in removedfiles:
2439 dirstate.drop(f)
2433 dirstate.drop(f)
2440
2434
2441 return newid
2435 return newid
2442
2436
2443 def commiteditor(repo, ctx, subs, editform=''):
2437 def commiteditor(repo, ctx, subs, editform=''):
2444 if ctx.description():
2438 if ctx.description():
2445 return ctx.description()
2439 return ctx.description()
2446 return commitforceeditor(repo, ctx, subs, editform=editform,
2440 return commitforceeditor(repo, ctx, subs, editform=editform,
2447 unchangedmessagedetection=True)
2441 unchangedmessagedetection=True)
2448
2442
2449 def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None,
2443 def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None,
2450 editform='', unchangedmessagedetection=False):
2444 editform='', unchangedmessagedetection=False):
2451 if not extramsg:
2445 if not extramsg:
2452 extramsg = _("Leave message empty to abort commit.")
2446 extramsg = _("Leave message empty to abort commit.")
2453
2447
2454 forms = [e for e in editform.split('.') if e]
2448 forms = [e for e in editform.split('.') if e]
2455 forms.insert(0, 'changeset')
2449 forms.insert(0, 'changeset')
2456 templatetext = None
2450 templatetext = None
2457 while forms:
2451 while forms:
2458 ref = '.'.join(forms)
2452 ref = '.'.join(forms)
2459 if repo.ui.config('committemplate', ref):
2453 if repo.ui.config('committemplate', ref):
2460 templatetext = committext = buildcommittemplate(
2454 templatetext = committext = buildcommittemplate(
2461 repo, ctx, subs, extramsg, ref)
2455 repo, ctx, subs, extramsg, ref)
2462 break
2456 break
2463 forms.pop()
2457 forms.pop()
2464 else:
2458 else:
2465 committext = buildcommittext(repo, ctx, subs, extramsg)
2459 committext = buildcommittext(repo, ctx, subs, extramsg)
2466
2460
2467 # run editor in the repository root
2461 # run editor in the repository root
2468 olddir = pycompat.getcwd()
2462 olddir = pycompat.getcwd()
2469 os.chdir(repo.root)
2463 os.chdir(repo.root)
2470
2464
2471 # make in-memory changes visible to external process
2465 # make in-memory changes visible to external process
2472 tr = repo.currenttransaction()
2466 tr = repo.currenttransaction()
2473 repo.dirstate.write(tr)
2467 repo.dirstate.write(tr)
2474 pending = tr and tr.writepending() and repo.root
2468 pending = tr and tr.writepending() and repo.root
2475
2469
2476 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
2470 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
2477 editform=editform, pending=pending,
2471 editform=editform, pending=pending,
2478 repopath=repo.path, action='commit')
2472 repopath=repo.path, action='commit')
2479 text = editortext
2473 text = editortext
2480
2474
2481 # strip away anything below this special string (used for editors that want
2475 # strip away anything below this special string (used for editors that want
2482 # to display the diff)
2476 # to display the diff)
2483 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
2477 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
2484 if stripbelow:
2478 if stripbelow:
2485 text = text[:stripbelow.start()]
2479 text = text[:stripbelow.start()]
2486
2480
2487 text = re.sub("(?m)^HG:.*(\n|$)", "", text)
2481 text = re.sub("(?m)^HG:.*(\n|$)", "", text)
2488 os.chdir(olddir)
2482 os.chdir(olddir)
2489
2483
2490 if finishdesc:
2484 if finishdesc:
2491 text = finishdesc(text)
2485 text = finishdesc(text)
2492 if not text.strip():
2486 if not text.strip():
2493 raise error.Abort(_("empty commit message"))
2487 raise error.Abort(_("empty commit message"))
2494 if unchangedmessagedetection and editortext == templatetext:
2488 if unchangedmessagedetection and editortext == templatetext:
2495 raise error.Abort(_("commit message unchanged"))
2489 raise error.Abort(_("commit message unchanged"))
2496
2490
2497 return text
2491 return text
2498
2492
2499 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
2493 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
2500 ui = repo.ui
2494 ui = repo.ui
2501 spec = formatter.templatespec(ref, None, None)
2495 spec = formatter.templatespec(ref, None, None)
2502 t = logcmdutil.changesettemplater(ui, repo, spec)
2496 t = logcmdutil.changesettemplater(ui, repo, spec)
2503 t.t.cache.update((k, templater.unquotestring(v))
2497 t.t.cache.update((k, templater.unquotestring(v))
2504 for k, v in repo.ui.configitems('committemplate'))
2498 for k, v in repo.ui.configitems('committemplate'))
2505
2499
2506 if not extramsg:
2500 if not extramsg:
2507 extramsg = '' # ensure that extramsg is string
2501 extramsg = '' # ensure that extramsg is string
2508
2502
2509 ui.pushbuffer()
2503 ui.pushbuffer()
2510 t.show(ctx, extramsg=extramsg)
2504 t.show(ctx, extramsg=extramsg)
2511 return ui.popbuffer()
2505 return ui.popbuffer()
2512
2506
2513 def hgprefix(msg):
2507 def hgprefix(msg):
2514 return "\n".join(["HG: %s" % a for a in msg.split("\n") if a])
2508 return "\n".join(["HG: %s" % a for a in msg.split("\n") if a])
2515
2509
2516 def buildcommittext(repo, ctx, subs, extramsg):
2510 def buildcommittext(repo, ctx, subs, extramsg):
2517 edittext = []
2511 edittext = []
2518 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
2512 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
2519 if ctx.description():
2513 if ctx.description():
2520 edittext.append(ctx.description())
2514 edittext.append(ctx.description())
2521 edittext.append("")
2515 edittext.append("")
2522 edittext.append("") # Empty line between message and comments.
2516 edittext.append("") # Empty line between message and comments.
2523 edittext.append(hgprefix(_("Enter commit message."
2517 edittext.append(hgprefix(_("Enter commit message."
2524 " Lines beginning with 'HG:' are removed.")))
2518 " Lines beginning with 'HG:' are removed.")))
2525 edittext.append(hgprefix(extramsg))
2519 edittext.append(hgprefix(extramsg))
2526 edittext.append("HG: --")
2520 edittext.append("HG: --")
2527 edittext.append(hgprefix(_("user: %s") % ctx.user()))
2521 edittext.append(hgprefix(_("user: %s") % ctx.user()))
2528 if ctx.p2():
2522 if ctx.p2():
2529 edittext.append(hgprefix(_("branch merge")))
2523 edittext.append(hgprefix(_("branch merge")))
2530 if ctx.branch():
2524 if ctx.branch():
2531 edittext.append(hgprefix(_("branch '%s'") % ctx.branch()))
2525 edittext.append(hgprefix(_("branch '%s'") % ctx.branch()))
2532 if bookmarks.isactivewdirparent(repo):
2526 if bookmarks.isactivewdirparent(repo):
2533 edittext.append(hgprefix(_("bookmark '%s'") % repo._activebookmark))
2527 edittext.append(hgprefix(_("bookmark '%s'") % repo._activebookmark))
2534 edittext.extend([hgprefix(_("subrepo %s") % s) for s in subs])
2528 edittext.extend([hgprefix(_("subrepo %s") % s) for s in subs])
2535 edittext.extend([hgprefix(_("added %s") % f) for f in added])
2529 edittext.extend([hgprefix(_("added %s") % f) for f in added])
2536 edittext.extend([hgprefix(_("changed %s") % f) for f in modified])
2530 edittext.extend([hgprefix(_("changed %s") % f) for f in modified])
2537 edittext.extend([hgprefix(_("removed %s") % f) for f in removed])
2531 edittext.extend([hgprefix(_("removed %s") % f) for f in removed])
2538 if not added and not modified and not removed:
2532 if not added and not modified and not removed:
2539 edittext.append(hgprefix(_("no files changed")))
2533 edittext.append(hgprefix(_("no files changed")))
2540 edittext.append("")
2534 edittext.append("")
2541
2535
2542 return "\n".join(edittext)
2536 return "\n".join(edittext)
2543
2537
2544 def commitstatus(repo, node, branch, bheads=None, opts=None):
2538 def commitstatus(repo, node, branch, bheads=None, opts=None):
2545 if opts is None:
2539 if opts is None:
2546 opts = {}
2540 opts = {}
2547 ctx = repo[node]
2541 ctx = repo[node]
2548 parents = ctx.parents()
2542 parents = ctx.parents()
2549
2543
2550 if (not opts.get('amend') and bheads and node not in bheads and not
2544 if (not opts.get('amend') and bheads and node not in bheads and not
2551 [x for x in parents if x.node() in bheads and x.branch() == branch]):
2545 [x for x in parents if x.node() in bheads and x.branch() == branch]):
2552 repo.ui.status(_('created new head\n'))
2546 repo.ui.status(_('created new head\n'))
2553 # The message is not printed for initial roots. For the other
2547 # The message is not printed for initial roots. For the other
2554 # changesets, it is printed in the following situations:
2548 # changesets, it is printed in the following situations:
2555 #
2549 #
2556 # Par column: for the 2 parents with ...
2550 # Par column: for the 2 parents with ...
2557 # N: null or no parent
2551 # N: null or no parent
2558 # B: parent is on another named branch
2552 # B: parent is on another named branch
2559 # C: parent is a regular non head changeset
2553 # C: parent is a regular non head changeset
2560 # H: parent was a branch head of the current branch
2554 # H: parent was a branch head of the current branch
2561 # Msg column: whether we print "created new head" message
2555 # Msg column: whether we print "created new head" message
2562 # In the following, it is assumed that there already exists some
2556 # In the following, it is assumed that there already exists some
2563 # initial branch heads of the current branch, otherwise nothing is
2557 # initial branch heads of the current branch, otherwise nothing is
2564 # printed anyway.
2558 # printed anyway.
2565 #
2559 #
2566 # Par Msg Comment
2560 # Par Msg Comment
2567 # N N y additional topo root
2561 # N N y additional topo root
2568 #
2562 #
2569 # B N y additional branch root
2563 # B N y additional branch root
2570 # C N y additional topo head
2564 # C N y additional topo head
2571 # H N n usual case
2565 # H N n usual case
2572 #
2566 #
2573 # B B y weird additional branch root
2567 # B B y weird additional branch root
2574 # C B y branch merge
2568 # C B y branch merge
2575 # H B n merge with named branch
2569 # H B n merge with named branch
2576 #
2570 #
2577 # C C y additional head from merge
2571 # C C y additional head from merge
2578 # C H n merge with a head
2572 # C H n merge with a head
2579 #
2573 #
2580 # H H n head merge: head count decreases
2574 # H H n head merge: head count decreases
2581
2575
2582 if not opts.get('close_branch'):
2576 if not opts.get('close_branch'):
2583 for r in parents:
2577 for r in parents:
2584 if r.closesbranch() and r.branch() == branch:
2578 if r.closesbranch() and r.branch() == branch:
2585 repo.ui.status(_('reopening closed branch head %d\n') % r)
2579 repo.ui.status(_('reopening closed branch head %d\n') % r)
2586
2580
2587 if repo.ui.debugflag:
2581 if repo.ui.debugflag:
2588 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
2582 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
2589 elif repo.ui.verbose:
2583 elif repo.ui.verbose:
2590 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
2584 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
2591
2585
2592 def postcommitstatus(repo, pats, opts):
2586 def postcommitstatus(repo, pats, opts):
2593 return repo.status(match=scmutil.match(repo[None], pats, opts))
2587 return repo.status(match=scmutil.match(repo[None], pats, opts))
2594
2588
2595 def revert(ui, repo, ctx, parents, *pats, **opts):
2589 def revert(ui, repo, ctx, parents, *pats, **opts):
2596 opts = pycompat.byteskwargs(opts)
2590 opts = pycompat.byteskwargs(opts)
2597 parent, p2 = parents
2591 parent, p2 = parents
2598 node = ctx.node()
2592 node = ctx.node()
2599
2593
2600 mf = ctx.manifest()
2594 mf = ctx.manifest()
2601 if node == p2:
2595 if node == p2:
2602 parent = p2
2596 parent = p2
2603
2597
2604 # need all matching names in dirstate and manifest of target rev,
2598 # need all matching names in dirstate and manifest of target rev,
2605 # so have to walk both. do not print errors if files exist in one
2599 # so have to walk both. do not print errors if files exist in one
2606 # but not other. in both cases, filesets should be evaluated against
2600 # but not other. in both cases, filesets should be evaluated against
2607 # workingctx to get consistent result (issue4497). this means 'set:**'
2601 # workingctx to get consistent result (issue4497). this means 'set:**'
2608 # cannot be used to select missing files from target rev.
2602 # cannot be used to select missing files from target rev.
2609
2603
2610 # `names` is a mapping for all elements in working copy and target revision
2604 # `names` is a mapping for all elements in working copy and target revision
2611 # The mapping is in the form:
2605 # The mapping is in the form:
2612 # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
2606 # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
2613 names = {}
2607 names = {}
2614
2608
2615 with repo.wlock():
2609 with repo.wlock():
2616 ## filling of the `names` mapping
2610 ## filling of the `names` mapping
2617 # walk dirstate to fill `names`
2611 # walk dirstate to fill `names`
2618
2612
2619 interactive = opts.get('interactive', False)
2613 interactive = opts.get('interactive', False)
2620 wctx = repo[None]
2614 wctx = repo[None]
2621 m = scmutil.match(wctx, pats, opts)
2615 m = scmutil.match(wctx, pats, opts)
2622
2616
2623 # we'll need this later
2617 # we'll need this later
2624 targetsubs = sorted(s for s in wctx.substate if m(s))
2618 targetsubs = sorted(s for s in wctx.substate if m(s))
2625
2619
2626 if not m.always():
2620 if not m.always():
2627 matcher = matchmod.badmatch(m, lambda x, y: False)
2621 matcher = matchmod.badmatch(m, lambda x, y: False)
2628 for abs in wctx.walk(matcher):
2622 for abs in wctx.walk(matcher):
2629 names[abs] = m.rel(abs), m.exact(abs)
2623 names[abs] = m.rel(abs), m.exact(abs)
2630
2624
2631 # walk target manifest to fill `names`
2625 # walk target manifest to fill `names`
2632
2626
2633 def badfn(path, msg):
2627 def badfn(path, msg):
2634 if path in names:
2628 if path in names:
2635 return
2629 return
2636 if path in ctx.substate:
2630 if path in ctx.substate:
2637 return
2631 return
2638 path_ = path + '/'
2632 path_ = path + '/'
2639 for f in names:
2633 for f in names:
2640 if f.startswith(path_):
2634 if f.startswith(path_):
2641 return
2635 return
2642 ui.warn("%s: %s\n" % (m.rel(path), msg))
2636 ui.warn("%s: %s\n" % (m.rel(path), msg))
2643
2637
2644 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
2638 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
2645 if abs not in names:
2639 if abs not in names:
2646 names[abs] = m.rel(abs), m.exact(abs)
2640 names[abs] = m.rel(abs), m.exact(abs)
2647
2641
2648 # Find status of all file in `names`.
2642 # Find status of all file in `names`.
2649 m = scmutil.matchfiles(repo, names)
2643 m = scmutil.matchfiles(repo, names)
2650
2644
2651 changes = repo.status(node1=node, match=m,
2645 changes = repo.status(node1=node, match=m,
2652 unknown=True, ignored=True, clean=True)
2646 unknown=True, ignored=True, clean=True)
2653 else:
2647 else:
2654 changes = repo.status(node1=node, match=m)
2648 changes = repo.status(node1=node, match=m)
2655 for kind in changes:
2649 for kind in changes:
2656 for abs in kind:
2650 for abs in kind:
2657 names[abs] = m.rel(abs), m.exact(abs)
2651 names[abs] = m.rel(abs), m.exact(abs)
2658
2652
2659 m = scmutil.matchfiles(repo, names)
2653 m = scmutil.matchfiles(repo, names)
2660
2654
2661 modified = set(changes.modified)
2655 modified = set(changes.modified)
2662 added = set(changes.added)
2656 added = set(changes.added)
2663 removed = set(changes.removed)
2657 removed = set(changes.removed)
2664 _deleted = set(changes.deleted)
2658 _deleted = set(changes.deleted)
2665 unknown = set(changes.unknown)
2659 unknown = set(changes.unknown)
2666 unknown.update(changes.ignored)
2660 unknown.update(changes.ignored)
2667 clean = set(changes.clean)
2661 clean = set(changes.clean)
2668 modadded = set()
2662 modadded = set()
2669
2663
2670 # We need to account for the state of the file in the dirstate,
2664 # We need to account for the state of the file in the dirstate,
2671 # even when we revert against something else than parent. This will
2665 # even when we revert against something else than parent. This will
2672 # slightly alter the behavior of revert (doing back up or not, delete
2666 # slightly alter the behavior of revert (doing back up or not, delete
2673 # or just forget etc).
2667 # or just forget etc).
2674 if parent == node:
2668 if parent == node:
2675 dsmodified = modified
2669 dsmodified = modified
2676 dsadded = added
2670 dsadded = added
2677 dsremoved = removed
2671 dsremoved = removed
2678 # store all local modifications, useful later for rename detection
2672 # store all local modifications, useful later for rename detection
2679 localchanges = dsmodified | dsadded
2673 localchanges = dsmodified | dsadded
2680 modified, added, removed = set(), set(), set()
2674 modified, added, removed = set(), set(), set()
2681 else:
2675 else:
2682 changes = repo.status(node1=parent, match=m)
2676 changes = repo.status(node1=parent, match=m)
2683 dsmodified = set(changes.modified)
2677 dsmodified = set(changes.modified)
2684 dsadded = set(changes.added)
2678 dsadded = set(changes.added)
2685 dsremoved = set(changes.removed)
2679 dsremoved = set(changes.removed)
2686 # store all local modifications, useful later for rename detection
2680 # store all local modifications, useful later for rename detection
2687 localchanges = dsmodified | dsadded
2681 localchanges = dsmodified | dsadded
2688
2682
2689 # only take into account for removes between wc and target
2683 # only take into account for removes between wc and target
2690 clean |= dsremoved - removed
2684 clean |= dsremoved - removed
2691 dsremoved &= removed
2685 dsremoved &= removed
2692 # distinct between dirstate remove and other
2686 # distinct between dirstate remove and other
2693 removed -= dsremoved
2687 removed -= dsremoved
2694
2688
2695 modadded = added & dsmodified
2689 modadded = added & dsmodified
2696 added -= modadded
2690 added -= modadded
2697
2691
2698 # tell newly modified apart.
2692 # tell newly modified apart.
2699 dsmodified &= modified
2693 dsmodified &= modified
2700 dsmodified |= modified & dsadded # dirstate added may need backup
2694 dsmodified |= modified & dsadded # dirstate added may need backup
2701 modified -= dsmodified
2695 modified -= dsmodified
2702
2696
2703 # We need to wait for some post-processing to update this set
2697 # We need to wait for some post-processing to update this set
2704 # before making the distinction. The dirstate will be used for
2698 # before making the distinction. The dirstate will be used for
2705 # that purpose.
2699 # that purpose.
2706 dsadded = added
2700 dsadded = added
2707
2701
2708 # in case of merge, files that are actually added can be reported as
2702 # in case of merge, files that are actually added can be reported as
2709 # modified, we need to post process the result
2703 # modified, we need to post process the result
2710 if p2 != nullid:
2704 if p2 != nullid:
2711 mergeadd = set(dsmodified)
2705 mergeadd = set(dsmodified)
2712 for path in dsmodified:
2706 for path in dsmodified:
2713 if path in mf:
2707 if path in mf:
2714 mergeadd.remove(path)
2708 mergeadd.remove(path)
2715 dsadded |= mergeadd
2709 dsadded |= mergeadd
2716 dsmodified -= mergeadd
2710 dsmodified -= mergeadd
2717
2711
2718 # if f is a rename, update `names` to also revert the source
2712 # if f is a rename, update `names` to also revert the source
2719 cwd = repo.getcwd()
2713 cwd = repo.getcwd()
2720 for f in localchanges:
2714 for f in localchanges:
2721 src = repo.dirstate.copied(f)
2715 src = repo.dirstate.copied(f)
2722 # XXX should we check for rename down to target node?
2716 # XXX should we check for rename down to target node?
2723 if src and src not in names and repo.dirstate[src] == 'r':
2717 if src and src not in names and repo.dirstate[src] == 'r':
2724 dsremoved.add(src)
2718 dsremoved.add(src)
2725 names[src] = (repo.pathto(src, cwd), True)
2719 names[src] = (repo.pathto(src, cwd), True)
2726
2720
2727 # determine the exact nature of the deleted changesets
2721 # determine the exact nature of the deleted changesets
2728 deladded = set(_deleted)
2722 deladded = set(_deleted)
2729 for path in _deleted:
2723 for path in _deleted:
2730 if path in mf:
2724 if path in mf:
2731 deladded.remove(path)
2725 deladded.remove(path)
2732 deleted = _deleted - deladded
2726 deleted = _deleted - deladded
2733
2727
2734 # distinguish between file to forget and the other
2728 # distinguish between file to forget and the other
2735 added = set()
2729 added = set()
2736 for abs in dsadded:
2730 for abs in dsadded:
2737 if repo.dirstate[abs] != 'a':
2731 if repo.dirstate[abs] != 'a':
2738 added.add(abs)
2732 added.add(abs)
2739 dsadded -= added
2733 dsadded -= added
2740
2734
2741 for abs in deladded:
2735 for abs in deladded:
2742 if repo.dirstate[abs] == 'a':
2736 if repo.dirstate[abs] == 'a':
2743 dsadded.add(abs)
2737 dsadded.add(abs)
2744 deladded -= dsadded
2738 deladded -= dsadded
2745
2739
2746 # For files marked as removed, we check if an unknown file is present at
2740 # For files marked as removed, we check if an unknown file is present at
2747 # the same path. If a such file exists it may need to be backed up.
2741 # the same path. If a such file exists it may need to be backed up.
2748 # Making the distinction at this stage helps have simpler backup
2742 # Making the distinction at this stage helps have simpler backup
2749 # logic.
2743 # logic.
2750 removunk = set()
2744 removunk = set()
2751 for abs in removed:
2745 for abs in removed:
2752 target = repo.wjoin(abs)
2746 target = repo.wjoin(abs)
2753 if os.path.lexists(target):
2747 if os.path.lexists(target):
2754 removunk.add(abs)
2748 removunk.add(abs)
2755 removed -= removunk
2749 removed -= removunk
2756
2750
2757 dsremovunk = set()
2751 dsremovunk = set()
2758 for abs in dsremoved:
2752 for abs in dsremoved:
2759 target = repo.wjoin(abs)
2753 target = repo.wjoin(abs)
2760 if os.path.lexists(target):
2754 if os.path.lexists(target):
2761 dsremovunk.add(abs)
2755 dsremovunk.add(abs)
2762 dsremoved -= dsremovunk
2756 dsremoved -= dsremovunk
2763
2757
2764 # action to be actually performed by revert
2758 # action to be actually performed by revert
2765 # (<list of file>, message>) tuple
2759 # (<list of file>, message>) tuple
2766 actions = {'revert': ([], _('reverting %s\n')),
2760 actions = {'revert': ([], _('reverting %s\n')),
2767 'add': ([], _('adding %s\n')),
2761 'add': ([], _('adding %s\n')),
2768 'remove': ([], _('removing %s\n')),
2762 'remove': ([], _('removing %s\n')),
2769 'drop': ([], _('removing %s\n')),
2763 'drop': ([], _('removing %s\n')),
2770 'forget': ([], _('forgetting %s\n')),
2764 'forget': ([], _('forgetting %s\n')),
2771 'undelete': ([], _('undeleting %s\n')),
2765 'undelete': ([], _('undeleting %s\n')),
2772 'noop': (None, _('no changes needed to %s\n')),
2766 'noop': (None, _('no changes needed to %s\n')),
2773 'unknown': (None, _('file not managed: %s\n')),
2767 'unknown': (None, _('file not managed: %s\n')),
2774 }
2768 }
2775
2769
2776 # "constant" that convey the backup strategy.
2770 # "constant" that convey the backup strategy.
2777 # All set to `discard` if `no-backup` is set do avoid checking
2771 # All set to `discard` if `no-backup` is set do avoid checking
2778 # no_backup lower in the code.
2772 # no_backup lower in the code.
2779 # These values are ordered for comparison purposes
2773 # These values are ordered for comparison purposes
2780 backupinteractive = 3 # do backup if interactively modified
2774 backupinteractive = 3 # do backup if interactively modified
2781 backup = 2 # unconditionally do backup
2775 backup = 2 # unconditionally do backup
2782 check = 1 # check if the existing file differs from target
2776 check = 1 # check if the existing file differs from target
2783 discard = 0 # never do backup
2777 discard = 0 # never do backup
2784 if opts.get('no_backup'):
2778 if opts.get('no_backup'):
2785 backupinteractive = backup = check = discard
2779 backupinteractive = backup = check = discard
2786 if interactive:
2780 if interactive:
2787 dsmodifiedbackup = backupinteractive
2781 dsmodifiedbackup = backupinteractive
2788 else:
2782 else:
2789 dsmodifiedbackup = backup
2783 dsmodifiedbackup = backup
2790 tobackup = set()
2784 tobackup = set()
2791
2785
2792 backupanddel = actions['remove']
2786 backupanddel = actions['remove']
2793 if not opts.get('no_backup'):
2787 if not opts.get('no_backup'):
2794 backupanddel = actions['drop']
2788 backupanddel = actions['drop']
2795
2789
2796 disptable = (
2790 disptable = (
2797 # dispatch table:
2791 # dispatch table:
2798 # file state
2792 # file state
2799 # action
2793 # action
2800 # make backup
2794 # make backup
2801
2795
2802 ## Sets that results that will change file on disk
2796 ## Sets that results that will change file on disk
2803 # Modified compared to target, no local change
2797 # Modified compared to target, no local change
2804 (modified, actions['revert'], discard),
2798 (modified, actions['revert'], discard),
2805 # Modified compared to target, but local file is deleted
2799 # Modified compared to target, but local file is deleted
2806 (deleted, actions['revert'], discard),
2800 (deleted, actions['revert'], discard),
2807 # Modified compared to target, local change
2801 # Modified compared to target, local change
2808 (dsmodified, actions['revert'], dsmodifiedbackup),
2802 (dsmodified, actions['revert'], dsmodifiedbackup),
2809 # Added since target
2803 # Added since target
2810 (added, actions['remove'], discard),
2804 (added, actions['remove'], discard),
2811 # Added in working directory
2805 # Added in working directory
2812 (dsadded, actions['forget'], discard),
2806 (dsadded, actions['forget'], discard),
2813 # Added since target, have local modification
2807 # Added since target, have local modification
2814 (modadded, backupanddel, backup),
2808 (modadded, backupanddel, backup),
2815 # Added since target but file is missing in working directory
2809 # Added since target but file is missing in working directory
2816 (deladded, actions['drop'], discard),
2810 (deladded, actions['drop'], discard),
2817 # Removed since target, before working copy parent
2811 # Removed since target, before working copy parent
2818 (removed, actions['add'], discard),
2812 (removed, actions['add'], discard),
2819 # Same as `removed` but an unknown file exists at the same path
2813 # Same as `removed` but an unknown file exists at the same path
2820 (removunk, actions['add'], check),
2814 (removunk, actions['add'], check),
2821 # Removed since targe, marked as such in working copy parent
2815 # Removed since targe, marked as such in working copy parent
2822 (dsremoved, actions['undelete'], discard),
2816 (dsremoved, actions['undelete'], discard),
2823 # Same as `dsremoved` but an unknown file exists at the same path
2817 # Same as `dsremoved` but an unknown file exists at the same path
2824 (dsremovunk, actions['undelete'], check),
2818 (dsremovunk, actions['undelete'], check),
2825 ## the following sets does not result in any file changes
2819 ## the following sets does not result in any file changes
2826 # File with no modification
2820 # File with no modification
2827 (clean, actions['noop'], discard),
2821 (clean, actions['noop'], discard),
2828 # Existing file, not tracked anywhere
2822 # Existing file, not tracked anywhere
2829 (unknown, actions['unknown'], discard),
2823 (unknown, actions['unknown'], discard),
2830 )
2824 )
2831
2825
2832 for abs, (rel, exact) in sorted(names.items()):
2826 for abs, (rel, exact) in sorted(names.items()):
2833 # target file to be touch on disk (relative to cwd)
2827 # target file to be touch on disk (relative to cwd)
2834 target = repo.wjoin(abs)
2828 target = repo.wjoin(abs)
2835 # search the entry in the dispatch table.
2829 # search the entry in the dispatch table.
2836 # if the file is in any of these sets, it was touched in the working
2830 # if the file is in any of these sets, it was touched in the working
2837 # directory parent and we are sure it needs to be reverted.
2831 # directory parent and we are sure it needs to be reverted.
2838 for table, (xlist, msg), dobackup in disptable:
2832 for table, (xlist, msg), dobackup in disptable:
2839 if abs not in table:
2833 if abs not in table:
2840 continue
2834 continue
2841 if xlist is not None:
2835 if xlist is not None:
2842 xlist.append(abs)
2836 xlist.append(abs)
2843 if dobackup:
2837 if dobackup:
2844 # If in interactive mode, don't automatically create
2838 # If in interactive mode, don't automatically create
2845 # .orig files (issue4793)
2839 # .orig files (issue4793)
2846 if dobackup == backupinteractive:
2840 if dobackup == backupinteractive:
2847 tobackup.add(abs)
2841 tobackup.add(abs)
2848 elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])):
2842 elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])):
2849 bakname = scmutil.origpath(ui, repo, rel)
2843 bakname = scmutil.origpath(ui, repo, rel)
2850 ui.note(_('saving current version of %s as %s\n') %
2844 ui.note(_('saving current version of %s as %s\n') %
2851 (rel, bakname))
2845 (rel, bakname))
2852 if not opts.get('dry_run'):
2846 if not opts.get('dry_run'):
2853 if interactive:
2847 if interactive:
2854 util.copyfile(target, bakname)
2848 util.copyfile(target, bakname)
2855 else:
2849 else:
2856 util.rename(target, bakname)
2850 util.rename(target, bakname)
2857 if ui.verbose or not exact:
2851 if ui.verbose or not exact:
2858 if not isinstance(msg, bytes):
2852 if not isinstance(msg, bytes):
2859 msg = msg(abs)
2853 msg = msg(abs)
2860 ui.status(msg % rel)
2854 ui.status(msg % rel)
2861 elif exact:
2855 elif exact:
2862 ui.warn(msg % rel)
2856 ui.warn(msg % rel)
2863 break
2857 break
2864
2858
2865 if not opts.get('dry_run'):
2859 if not opts.get('dry_run'):
2866 needdata = ('revert', 'add', 'undelete')
2860 needdata = ('revert', 'add', 'undelete')
2867 if _revertprefetch is not _revertprefetchstub:
2861 if _revertprefetch is not _revertprefetchstub:
2868 ui.deprecwarn("'cmdutil._revertprefetch' is deprecated, "
2862 ui.deprecwarn("'cmdutil._revertprefetch' is deprecated, "
2869 "add a callback to 'scmutil.fileprefetchhooks'",
2863 "add a callback to 'scmutil.fileprefetchhooks'",
2870 '4.6', stacklevel=1)
2864 '4.6', stacklevel=1)
2871 _revertprefetch(repo, ctx,
2865 _revertprefetch(repo, ctx,
2872 *[actions[name][0] for name in needdata])
2866 *[actions[name][0] for name in needdata])
2873 oplist = [actions[name][0] for name in needdata]
2867 oplist = [actions[name][0] for name in needdata]
2874 prefetch = scmutil.fileprefetchhooks
2868 prefetch = scmutil.fileprefetchhooks
2875 prefetch(repo, ctx, [f for sublist in oplist for f in sublist])
2869 prefetch(repo, ctx, [f for sublist in oplist for f in sublist])
2876 _performrevert(repo, parents, ctx, actions, interactive, tobackup)
2870 _performrevert(repo, parents, ctx, actions, interactive, tobackup)
2877
2871
2878 if targetsubs:
2872 if targetsubs:
2879 # Revert the subrepos on the revert list
2873 # Revert the subrepos on the revert list
2880 for sub in targetsubs:
2874 for sub in targetsubs:
2881 try:
2875 try:
2882 wctx.sub(sub).revert(ctx.substate[sub], *pats,
2876 wctx.sub(sub).revert(ctx.substate[sub], *pats,
2883 **pycompat.strkwargs(opts))
2877 **pycompat.strkwargs(opts))
2884 except KeyError:
2878 except KeyError:
2885 raise error.Abort("subrepository '%s' does not exist in %s!"
2879 raise error.Abort("subrepository '%s' does not exist in %s!"
2886 % (sub, short(ctx.node())))
2880 % (sub, short(ctx.node())))
2887
2881
2888 def _revertprefetchstub(repo, ctx, *files):
2882 def _revertprefetchstub(repo, ctx, *files):
2889 """Stub method for detecting extension wrapping of _revertprefetch(), to
2883 """Stub method for detecting extension wrapping of _revertprefetch(), to
2890 issue a deprecation warning."""
2884 issue a deprecation warning."""
2891
2885
2892 _revertprefetch = _revertprefetchstub
2886 _revertprefetch = _revertprefetchstub
2893
2887
2894 def _performrevert(repo, parents, ctx, actions, interactive=False,
2888 def _performrevert(repo, parents, ctx, actions, interactive=False,
2895 tobackup=None):
2889 tobackup=None):
2896 """function that actually perform all the actions computed for revert
2890 """function that actually perform all the actions computed for revert
2897
2891
2898 This is an independent function to let extension to plug in and react to
2892 This is an independent function to let extension to plug in and react to
2899 the imminent revert.
2893 the imminent revert.
2900
2894
2901 Make sure you have the working directory locked when calling this function.
2895 Make sure you have the working directory locked when calling this function.
2902 """
2896 """
2903 parent, p2 = parents
2897 parent, p2 = parents
2904 node = ctx.node()
2898 node = ctx.node()
2905 excluded_files = []
2899 excluded_files = []
2906
2900
2907 def checkout(f):
2901 def checkout(f):
2908 fc = ctx[f]
2902 fc = ctx[f]
2909 repo.wwrite(f, fc.data(), fc.flags())
2903 repo.wwrite(f, fc.data(), fc.flags())
2910
2904
2911 def doremove(f):
2905 def doremove(f):
2912 try:
2906 try:
2913 repo.wvfs.unlinkpath(f)
2907 repo.wvfs.unlinkpath(f)
2914 except OSError:
2908 except OSError:
2915 pass
2909 pass
2916 repo.dirstate.remove(f)
2910 repo.dirstate.remove(f)
2917
2911
2918 audit_path = pathutil.pathauditor(repo.root, cached=True)
2912 audit_path = pathutil.pathauditor(repo.root, cached=True)
2919 for f in actions['forget'][0]:
2913 for f in actions['forget'][0]:
2920 if interactive:
2914 if interactive:
2921 choice = repo.ui.promptchoice(
2915 choice = repo.ui.promptchoice(
2922 _("forget added file %s (Yn)?$$ &Yes $$ &No") % f)
2916 _("forget added file %s (Yn)?$$ &Yes $$ &No") % f)
2923 if choice == 0:
2917 if choice == 0:
2924 repo.dirstate.drop(f)
2918 repo.dirstate.drop(f)
2925 else:
2919 else:
2926 excluded_files.append(f)
2920 excluded_files.append(f)
2927 else:
2921 else:
2928 repo.dirstate.drop(f)
2922 repo.dirstate.drop(f)
2929 for f in actions['remove'][0]:
2923 for f in actions['remove'][0]:
2930 audit_path(f)
2924 audit_path(f)
2931 if interactive:
2925 if interactive:
2932 choice = repo.ui.promptchoice(
2926 choice = repo.ui.promptchoice(
2933 _("remove added file %s (Yn)?$$ &Yes $$ &No") % f)
2927 _("remove added file %s (Yn)?$$ &Yes $$ &No") % f)
2934 if choice == 0:
2928 if choice == 0:
2935 doremove(f)
2929 doremove(f)
2936 else:
2930 else:
2937 excluded_files.append(f)
2931 excluded_files.append(f)
2938 else:
2932 else:
2939 doremove(f)
2933 doremove(f)
2940 for f in actions['drop'][0]:
2934 for f in actions['drop'][0]:
2941 audit_path(f)
2935 audit_path(f)
2942 repo.dirstate.remove(f)
2936 repo.dirstate.remove(f)
2943
2937
2944 normal = None
2938 normal = None
2945 if node == parent:
2939 if node == parent:
2946 # We're reverting to our parent. If possible, we'd like status
2940 # We're reverting to our parent. If possible, we'd like status
2947 # to report the file as clean. We have to use normallookup for
2941 # to report the file as clean. We have to use normallookup for
2948 # merges to avoid losing information about merged/dirty files.
2942 # merges to avoid losing information about merged/dirty files.
2949 if p2 != nullid:
2943 if p2 != nullid:
2950 normal = repo.dirstate.normallookup
2944 normal = repo.dirstate.normallookup
2951 else:
2945 else:
2952 normal = repo.dirstate.normal
2946 normal = repo.dirstate.normal
2953
2947
2954 newlyaddedandmodifiedfiles = set()
2948 newlyaddedandmodifiedfiles = set()
2955 if interactive:
2949 if interactive:
2956 # Prompt the user for changes to revert
2950 # Prompt the user for changes to revert
2957 torevert = [f for f in actions['revert'][0] if f not in excluded_files]
2951 torevert = [f for f in actions['revert'][0] if f not in excluded_files]
2958 m = scmutil.matchfiles(repo, torevert)
2952 m = scmutil.matchfiles(repo, torevert)
2959 diffopts = patch.difffeatureopts(repo.ui, whitespace=True)
2953 diffopts = patch.difffeatureopts(repo.ui, whitespace=True)
2960 diffopts.nodates = True
2954 diffopts.nodates = True
2961 diffopts.git = True
2955 diffopts.git = True
2962 operation = 'discard'
2956 operation = 'discard'
2963 reversehunks = True
2957 reversehunks = True
2964 if node != parent:
2958 if node != parent:
2965 operation = 'apply'
2959 operation = 'apply'
2966 reversehunks = False
2960 reversehunks = False
2967 if reversehunks:
2961 if reversehunks:
2968 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
2962 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
2969 else:
2963 else:
2970 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
2964 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
2971 originalchunks = patch.parsepatch(diff)
2965 originalchunks = patch.parsepatch(diff)
2972
2966
2973 try:
2967 try:
2974
2968
2975 chunks, opts = recordfilter(repo.ui, originalchunks,
2969 chunks, opts = recordfilter(repo.ui, originalchunks,
2976 operation=operation)
2970 operation=operation)
2977 if reversehunks:
2971 if reversehunks:
2978 chunks = patch.reversehunks(chunks)
2972 chunks = patch.reversehunks(chunks)
2979
2973
2980 except error.PatchError as err:
2974 except error.PatchError as err:
2981 raise error.Abort(_('error parsing patch: %s') % err)
2975 raise error.Abort(_('error parsing patch: %s') % err)
2982
2976
2983 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
2977 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
2984 if tobackup is None:
2978 if tobackup is None:
2985 tobackup = set()
2979 tobackup = set()
2986 # Apply changes
2980 # Apply changes
2987 fp = stringio()
2981 fp = stringio()
2988 for c in chunks:
2982 for c in chunks:
2989 # Create a backup file only if this hunk should be backed up
2983 # Create a backup file only if this hunk should be backed up
2990 if ishunk(c) and c.header.filename() in tobackup:
2984 if ishunk(c) and c.header.filename() in tobackup:
2991 abs = c.header.filename()
2985 abs = c.header.filename()
2992 target = repo.wjoin(abs)
2986 target = repo.wjoin(abs)
2993 bakname = scmutil.origpath(repo.ui, repo, m.rel(abs))
2987 bakname = scmutil.origpath(repo.ui, repo, m.rel(abs))
2994 util.copyfile(target, bakname)
2988 util.copyfile(target, bakname)
2995 tobackup.remove(abs)
2989 tobackup.remove(abs)
2996 c.write(fp)
2990 c.write(fp)
2997 dopatch = fp.tell()
2991 dopatch = fp.tell()
2998 fp.seek(0)
2992 fp.seek(0)
2999 if dopatch:
2993 if dopatch:
3000 try:
2994 try:
3001 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
2995 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3002 except error.PatchError as err:
2996 except error.PatchError as err:
3003 raise error.Abort(str(err))
2997 raise error.Abort(str(err))
3004 del fp
2998 del fp
3005 else:
2999 else:
3006 for f in actions['revert'][0]:
3000 for f in actions['revert'][0]:
3007 checkout(f)
3001 checkout(f)
3008 if normal:
3002 if normal:
3009 normal(f)
3003 normal(f)
3010
3004
3011 for f in actions['add'][0]:
3005 for f in actions['add'][0]:
3012 # Don't checkout modified files, they are already created by the diff
3006 # Don't checkout modified files, they are already created by the diff
3013 if f not in newlyaddedandmodifiedfiles:
3007 if f not in newlyaddedandmodifiedfiles:
3014 checkout(f)
3008 checkout(f)
3015 repo.dirstate.add(f)
3009 repo.dirstate.add(f)
3016
3010
3017 normal = repo.dirstate.normallookup
3011 normal = repo.dirstate.normallookup
3018 if node == parent and p2 == nullid:
3012 if node == parent and p2 == nullid:
3019 normal = repo.dirstate.normal
3013 normal = repo.dirstate.normal
3020 for f in actions['undelete'][0]:
3014 for f in actions['undelete'][0]:
3021 checkout(f)
3015 checkout(f)
3022 normal(f)
3016 normal(f)
3023
3017
3024 copied = copies.pathcopies(repo[parent], ctx)
3018 copied = copies.pathcopies(repo[parent], ctx)
3025
3019
3026 for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]:
3020 for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]:
3027 if f in copied:
3021 if f in copied:
3028 repo.dirstate.copy(copied[f], f)
3022 repo.dirstate.copy(copied[f], f)
3029
3023
3030 class command(registrar.command):
3024 class command(registrar.command):
3031 """deprecated: used registrar.command instead"""
3025 """deprecated: used registrar.command instead"""
3032 def _doregister(self, func, name, *args, **kwargs):
3026 def _doregister(self, func, name, *args, **kwargs):
3033 func._deprecatedregistrar = True # flag for deprecwarn in extensions.py
3027 func._deprecatedregistrar = True # flag for deprecwarn in extensions.py
3034 return super(command, self)._doregister(func, name, *args, **kwargs)
3028 return super(command, self)._doregister(func, name, *args, **kwargs)
3035
3029
3036 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3030 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3037 # commands.outgoing. "missing" is "missing" of the result of
3031 # commands.outgoing. "missing" is "missing" of the result of
3038 # "findcommonoutgoing()"
3032 # "findcommonoutgoing()"
3039 outgoinghooks = util.hooks()
3033 outgoinghooks = util.hooks()
3040
3034
3041 # a list of (ui, repo) functions called by commands.summary
3035 # a list of (ui, repo) functions called by commands.summary
3042 summaryhooks = util.hooks()
3036 summaryhooks = util.hooks()
3043
3037
3044 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3038 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3045 #
3039 #
3046 # functions should return tuple of booleans below, if 'changes' is None:
3040 # functions should return tuple of booleans below, if 'changes' is None:
3047 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3041 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3048 #
3042 #
3049 # otherwise, 'changes' is a tuple of tuples below:
3043 # otherwise, 'changes' is a tuple of tuples below:
3050 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3044 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3051 # - (desturl, destbranch, destpeer, outgoing)
3045 # - (desturl, destbranch, destpeer, outgoing)
3052 summaryremotehooks = util.hooks()
3046 summaryremotehooks = util.hooks()
3053
3047
3054 # A list of state files kept by multistep operations like graft.
3048 # A list of state files kept by multistep operations like graft.
3055 # Since graft cannot be aborted, it is considered 'clearable' by update.
3049 # Since graft cannot be aborted, it is considered 'clearable' by update.
3056 # note: bisect is intentionally excluded
3050 # note: bisect is intentionally excluded
3057 # (state file, clearable, allowcommit, error, hint)
3051 # (state file, clearable, allowcommit, error, hint)
3058 unfinishedstates = [
3052 unfinishedstates = [
3059 ('graftstate', True, False, _('graft in progress'),
3053 ('graftstate', True, False, _('graft in progress'),
3060 _("use 'hg graft --continue' or 'hg update' to abort")),
3054 _("use 'hg graft --continue' or 'hg update' to abort")),
3061 ('updatestate', True, False, _('last update was interrupted'),
3055 ('updatestate', True, False, _('last update was interrupted'),
3062 _("use 'hg update' to get a consistent checkout"))
3056 _("use 'hg update' to get a consistent checkout"))
3063 ]
3057 ]
3064
3058
3065 def checkunfinished(repo, commit=False):
3059 def checkunfinished(repo, commit=False):
3066 '''Look for an unfinished multistep operation, like graft, and abort
3060 '''Look for an unfinished multistep operation, like graft, and abort
3067 if found. It's probably good to check this right before
3061 if found. It's probably good to check this right before
3068 bailifchanged().
3062 bailifchanged().
3069 '''
3063 '''
3070 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3064 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3071 if commit and allowcommit:
3065 if commit and allowcommit:
3072 continue
3066 continue
3073 if repo.vfs.exists(f):
3067 if repo.vfs.exists(f):
3074 raise error.Abort(msg, hint=hint)
3068 raise error.Abort(msg, hint=hint)
3075
3069
3076 def clearunfinished(repo):
3070 def clearunfinished(repo):
3077 '''Check for unfinished operations (as above), and clear the ones
3071 '''Check for unfinished operations (as above), and clear the ones
3078 that are clearable.
3072 that are clearable.
3079 '''
3073 '''
3080 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3074 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3081 if not clearable and repo.vfs.exists(f):
3075 if not clearable and repo.vfs.exists(f):
3082 raise error.Abort(msg, hint=hint)
3076 raise error.Abort(msg, hint=hint)
3083 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3077 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3084 if clearable and repo.vfs.exists(f):
3078 if clearable and repo.vfs.exists(f):
3085 util.unlink(repo.vfs.join(f))
3079 util.unlink(repo.vfs.join(f))
3086
3080
3087 afterresolvedstates = [
3081 afterresolvedstates = [
3088 ('graftstate',
3082 ('graftstate',
3089 _('hg graft --continue')),
3083 _('hg graft --continue')),
3090 ]
3084 ]
3091
3085
3092 def howtocontinue(repo):
3086 def howtocontinue(repo):
3093 '''Check for an unfinished operation and return the command to finish
3087 '''Check for an unfinished operation and return the command to finish
3094 it.
3088 it.
3095
3089
3096 afterresolvedstates tuples define a .hg/{file} and the corresponding
3090 afterresolvedstates tuples define a .hg/{file} and the corresponding
3097 command needed to finish it.
3091 command needed to finish it.
3098
3092
3099 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3093 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3100 a boolean.
3094 a boolean.
3101 '''
3095 '''
3102 contmsg = _("continue: %s")
3096 contmsg = _("continue: %s")
3103 for f, msg in afterresolvedstates:
3097 for f, msg in afterresolvedstates:
3104 if repo.vfs.exists(f):
3098 if repo.vfs.exists(f):
3105 return contmsg % msg, True
3099 return contmsg % msg, True
3106 if repo[None].dirty(missing=True, merge=False, branch=False):
3100 if repo[None].dirty(missing=True, merge=False, branch=False):
3107 return contmsg % _("hg commit"), False
3101 return contmsg % _("hg commit"), False
3108 return None, None
3102 return None, None
3109
3103
3110 def checkafterresolved(repo):
3104 def checkafterresolved(repo):
3111 '''Inform the user about the next action after completing hg resolve
3105 '''Inform the user about the next action after completing hg resolve
3112
3106
3113 If there's a matching afterresolvedstates, howtocontinue will yield
3107 If there's a matching afterresolvedstates, howtocontinue will yield
3114 repo.ui.warn as the reporter.
3108 repo.ui.warn as the reporter.
3115
3109
3116 Otherwise, it will yield repo.ui.note.
3110 Otherwise, it will yield repo.ui.note.
3117 '''
3111 '''
3118 msg, warning = howtocontinue(repo)
3112 msg, warning = howtocontinue(repo)
3119 if msg is not None:
3113 if msg is not None:
3120 if warning:
3114 if warning:
3121 repo.ui.warn("%s\n" % msg)
3115 repo.ui.warn("%s\n" % msg)
3122 else:
3116 else:
3123 repo.ui.note("%s\n" % msg)
3117 repo.ui.note("%s\n" % msg)
3124
3118
3125 def wrongtooltocontinue(repo, task):
3119 def wrongtooltocontinue(repo, task):
3126 '''Raise an abort suggesting how to properly continue if there is an
3120 '''Raise an abort suggesting how to properly continue if there is an
3127 active task.
3121 active task.
3128
3122
3129 Uses howtocontinue() to find the active task.
3123 Uses howtocontinue() to find the active task.
3130
3124
3131 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3125 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3132 a hint.
3126 a hint.
3133 '''
3127 '''
3134 after = howtocontinue(repo)
3128 after = howtocontinue(repo)
3135 hint = None
3129 hint = None
3136 if after[1]:
3130 if after[1]:
3137 hint = after[0]
3131 hint = after[0]
3138 raise error.Abort(_('no %s in progress') % task, hint=hint)
3132 raise error.Abort(_('no %s in progress') % task, hint=hint)
3139
3133
3140 class changeset_printer(logcmdutil.changesetprinter):
3134 class changeset_printer(logcmdutil.changesetprinter):
3141
3135
3142 def __init__(self, ui, *args, **kwargs):
3136 def __init__(self, ui, *args, **kwargs):
3143 msg = ("'cmdutil.changeset_printer' is deprecated, "
3137 msg = ("'cmdutil.changeset_printer' is deprecated, "
3144 "use 'logcmdutil.logcmdutil'")
3138 "use 'logcmdutil.logcmdutil'")
3145 ui.deprecwarn(msg, "4.6")
3139 ui.deprecwarn(msg, "4.6")
3146 super(changeset_printer, self).__init__(ui, *args, **kwargs)
3140 super(changeset_printer, self).__init__(ui, *args, **kwargs)
3147
3141
3148 def displaygraph(ui, *args, **kwargs):
3142 def displaygraph(ui, *args, **kwargs):
3149 msg = ("'cmdutil.displaygraph' is deprecated, "
3143 msg = ("'cmdutil.displaygraph' is deprecated, "
3150 "use 'logcmdutil.displaygraph'")
3144 "use 'logcmdutil.displaygraph'")
3151 ui.deprecwarn(msg, "4.6")
3145 ui.deprecwarn(msg, "4.6")
3152 return logcmdutil.displaygraph(ui, *args, **kwargs)
3146 return logcmdutil.displaygraph(ui, *args, **kwargs)
3153
3147
3154 def show_changeset(ui, *args, **kwargs):
3148 def show_changeset(ui, *args, **kwargs):
3155 msg = ("'cmdutil.show_changeset' is deprecated, "
3149 msg = ("'cmdutil.show_changeset' is deprecated, "
3156 "use 'logcmdutil.changesetdisplayer'")
3150 "use 'logcmdutil.changesetdisplayer'")
3157 ui.deprecwarn(msg, "4.6")
3151 ui.deprecwarn(msg, "4.6")
3158 return logcmdutil.changesetdisplayer(ui, *args, **kwargs)
3152 return logcmdutil.changesetdisplayer(ui, *args, **kwargs)
@@ -1,5607 +1,5607 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for 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 difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
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 from . import (
23 from . import (
24 archival,
24 archival,
25 bookmarks,
25 bookmarks,
26 bundle2,
26 bundle2,
27 changegroup,
27 changegroup,
28 cmdutil,
28 cmdutil,
29 copies,
29 copies,
30 debugcommands as debugcommandsmod,
30 debugcommands as debugcommandsmod,
31 destutil,
31 destutil,
32 dirstateguard,
32 dirstateguard,
33 discovery,
33 discovery,
34 encoding,
34 encoding,
35 error,
35 error,
36 exchange,
36 exchange,
37 extensions,
37 extensions,
38 formatter,
38 formatter,
39 graphmod,
39 graphmod,
40 hbisect,
40 hbisect,
41 help,
41 help,
42 hg,
42 hg,
43 lock as lockmod,
43 lock as lockmod,
44 logcmdutil,
44 logcmdutil,
45 merge as mergemod,
45 merge as mergemod,
46 obsolete,
46 obsolete,
47 obsutil,
47 obsutil,
48 patch,
48 patch,
49 phases,
49 phases,
50 pycompat,
50 pycompat,
51 rcutil,
51 rcutil,
52 registrar,
52 registrar,
53 revsetlang,
53 revsetlang,
54 rewriteutil,
54 rewriteutil,
55 scmutil,
55 scmutil,
56 server,
56 server,
57 streamclone,
57 streamclone,
58 tags as tagsmod,
58 tags as tagsmod,
59 templatekw,
59 templatekw,
60 ui as uimod,
60 ui as uimod,
61 util,
61 util,
62 wireprotoserver,
62 wireprotoserver,
63 )
63 )
64
64
65 release = lockmod.release
65 release = lockmod.release
66
66
67 table = {}
67 table = {}
68 table.update(debugcommandsmod.command._table)
68 table.update(debugcommandsmod.command._table)
69
69
70 command = registrar.command(table)
70 command = registrar.command(table)
71 readonly = registrar.command.readonly
71 readonly = registrar.command.readonly
72
72
73 # common command options
73 # common command options
74
74
75 globalopts = [
75 globalopts = [
76 ('R', 'repository', '',
76 ('R', 'repository', '',
77 _('repository root directory or name of overlay bundle file'),
77 _('repository root directory or name of overlay bundle file'),
78 _('REPO')),
78 _('REPO')),
79 ('', 'cwd', '',
79 ('', 'cwd', '',
80 _('change working directory'), _('DIR')),
80 _('change working directory'), _('DIR')),
81 ('y', 'noninteractive', None,
81 ('y', 'noninteractive', None,
82 _('do not prompt, automatically pick the first choice for all prompts')),
82 _('do not prompt, automatically pick the first choice for all prompts')),
83 ('q', 'quiet', None, _('suppress output')),
83 ('q', 'quiet', None, _('suppress output')),
84 ('v', 'verbose', None, _('enable additional output')),
84 ('v', 'verbose', None, _('enable additional output')),
85 ('', 'color', '',
85 ('', 'color', '',
86 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
86 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
87 # and should not be translated
87 # and should not be translated
88 _("when to colorize (boolean, always, auto, never, or debug)"),
88 _("when to colorize (boolean, always, auto, never, or debug)"),
89 _('TYPE')),
89 _('TYPE')),
90 ('', 'config', [],
90 ('', 'config', [],
91 _('set/override config option (use \'section.name=value\')'),
91 _('set/override config option (use \'section.name=value\')'),
92 _('CONFIG')),
92 _('CONFIG')),
93 ('', 'debug', None, _('enable debugging output')),
93 ('', 'debug', None, _('enable debugging output')),
94 ('', 'debugger', None, _('start debugger')),
94 ('', 'debugger', None, _('start debugger')),
95 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
95 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
96 _('ENCODE')),
96 _('ENCODE')),
97 ('', 'encodingmode', encoding.encodingmode,
97 ('', 'encodingmode', encoding.encodingmode,
98 _('set the charset encoding mode'), _('MODE')),
98 _('set the charset encoding mode'), _('MODE')),
99 ('', 'traceback', None, _('always print a traceback on exception')),
99 ('', 'traceback', None, _('always print a traceback on exception')),
100 ('', 'time', None, _('time how long the command takes')),
100 ('', 'time', None, _('time how long the command takes')),
101 ('', 'profile', None, _('print command execution profile')),
101 ('', 'profile', None, _('print command execution profile')),
102 ('', 'version', None, _('output version information and exit')),
102 ('', 'version', None, _('output version information and exit')),
103 ('h', 'help', None, _('display help and exit')),
103 ('h', 'help', None, _('display help and exit')),
104 ('', 'hidden', False, _('consider hidden changesets')),
104 ('', 'hidden', False, _('consider hidden changesets')),
105 ('', 'pager', 'auto',
105 ('', 'pager', 'auto',
106 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
106 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
107 ]
107 ]
108
108
109 dryrunopts = cmdutil.dryrunopts
109 dryrunopts = cmdutil.dryrunopts
110 remoteopts = cmdutil.remoteopts
110 remoteopts = cmdutil.remoteopts
111 walkopts = cmdutil.walkopts
111 walkopts = cmdutil.walkopts
112 commitopts = cmdutil.commitopts
112 commitopts = cmdutil.commitopts
113 commitopts2 = cmdutil.commitopts2
113 commitopts2 = cmdutil.commitopts2
114 formatteropts = cmdutil.formatteropts
114 formatteropts = cmdutil.formatteropts
115 templateopts = cmdutil.templateopts
115 templateopts = cmdutil.templateopts
116 logopts = cmdutil.logopts
116 logopts = cmdutil.logopts
117 diffopts = cmdutil.diffopts
117 diffopts = cmdutil.diffopts
118 diffwsopts = cmdutil.diffwsopts
118 diffwsopts = cmdutil.diffwsopts
119 diffopts2 = cmdutil.diffopts2
119 diffopts2 = cmdutil.diffopts2
120 mergetoolopts = cmdutil.mergetoolopts
120 mergetoolopts = cmdutil.mergetoolopts
121 similarityopts = cmdutil.similarityopts
121 similarityopts = cmdutil.similarityopts
122 subrepoopts = cmdutil.subrepoopts
122 subrepoopts = cmdutil.subrepoopts
123 debugrevlogopts = cmdutil.debugrevlogopts
123 debugrevlogopts = cmdutil.debugrevlogopts
124
124
125 # Commands start here, listed alphabetically
125 # Commands start here, listed alphabetically
126
126
127 @command('^add',
127 @command('^add',
128 walkopts + subrepoopts + dryrunopts,
128 walkopts + subrepoopts + dryrunopts,
129 _('[OPTION]... [FILE]...'),
129 _('[OPTION]... [FILE]...'),
130 inferrepo=True)
130 inferrepo=True)
131 def add(ui, repo, *pats, **opts):
131 def add(ui, repo, *pats, **opts):
132 """add the specified files on the next commit
132 """add the specified files on the next commit
133
133
134 Schedule files to be version controlled and added to the
134 Schedule files to be version controlled and added to the
135 repository.
135 repository.
136
136
137 The files will be added to the repository at the next commit. To
137 The files will be added to the repository at the next commit. To
138 undo an add before that, see :hg:`forget`.
138 undo an add before that, see :hg:`forget`.
139
139
140 If no names are given, add all files to the repository (except
140 If no names are given, add all files to the repository (except
141 files matching ``.hgignore``).
141 files matching ``.hgignore``).
142
142
143 .. container:: verbose
143 .. container:: verbose
144
144
145 Examples:
145 Examples:
146
146
147 - New (unknown) files are added
147 - New (unknown) files are added
148 automatically by :hg:`add`::
148 automatically by :hg:`add`::
149
149
150 $ ls
150 $ ls
151 foo.c
151 foo.c
152 $ hg status
152 $ hg status
153 ? foo.c
153 ? foo.c
154 $ hg add
154 $ hg add
155 adding foo.c
155 adding foo.c
156 $ hg status
156 $ hg status
157 A foo.c
157 A foo.c
158
158
159 - Specific files to be added can be specified::
159 - Specific files to be added can be specified::
160
160
161 $ ls
161 $ ls
162 bar.c foo.c
162 bar.c foo.c
163 $ hg status
163 $ hg status
164 ? bar.c
164 ? bar.c
165 ? foo.c
165 ? foo.c
166 $ hg add bar.c
166 $ hg add bar.c
167 $ hg status
167 $ hg status
168 A bar.c
168 A bar.c
169 ? foo.c
169 ? foo.c
170
170
171 Returns 0 if all files are successfully added.
171 Returns 0 if all files are successfully added.
172 """
172 """
173
173
174 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
174 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
175 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
175 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
176 return rejected and 1 or 0
176 return rejected and 1 or 0
177
177
178 @command('addremove',
178 @command('addremove',
179 similarityopts + subrepoopts + walkopts + dryrunopts,
179 similarityopts + subrepoopts + walkopts + dryrunopts,
180 _('[OPTION]... [FILE]...'),
180 _('[OPTION]... [FILE]...'),
181 inferrepo=True)
181 inferrepo=True)
182 def addremove(ui, repo, *pats, **opts):
182 def addremove(ui, repo, *pats, **opts):
183 """add all new files, delete all missing files
183 """add all new files, delete all missing files
184
184
185 Add all new files and remove all missing files from the
185 Add all new files and remove all missing files from the
186 repository.
186 repository.
187
187
188 Unless names are given, new files are ignored if they match any of
188 Unless names are given, new files are ignored if they match any of
189 the patterns in ``.hgignore``. As with add, these changes take
189 the patterns in ``.hgignore``. As with add, these changes take
190 effect at the next commit.
190 effect at the next commit.
191
191
192 Use the -s/--similarity option to detect renamed files. This
192 Use the -s/--similarity option to detect renamed files. This
193 option takes a percentage between 0 (disabled) and 100 (files must
193 option takes a percentage between 0 (disabled) and 100 (files must
194 be identical) as its parameter. With a parameter greater than 0,
194 be identical) as its parameter. With a parameter greater than 0,
195 this compares every removed file with every added file and records
195 this compares every removed file with every added file and records
196 those similar enough as renames. Detecting renamed files this way
196 those similar enough as renames. Detecting renamed files this way
197 can be expensive. After using this option, :hg:`status -C` can be
197 can be expensive. After using this option, :hg:`status -C` can be
198 used to check which files were identified as moved or renamed. If
198 used to check which files were identified as moved or renamed. If
199 not specified, -s/--similarity defaults to 100 and only renames of
199 not specified, -s/--similarity defaults to 100 and only renames of
200 identical files are detected.
200 identical files are detected.
201
201
202 .. container:: verbose
202 .. container:: verbose
203
203
204 Examples:
204 Examples:
205
205
206 - A number of files (bar.c and foo.c) are new,
206 - A number of files (bar.c and foo.c) are new,
207 while foobar.c has been removed (without using :hg:`remove`)
207 while foobar.c has been removed (without using :hg:`remove`)
208 from the repository::
208 from the repository::
209
209
210 $ ls
210 $ ls
211 bar.c foo.c
211 bar.c foo.c
212 $ hg status
212 $ hg status
213 ! foobar.c
213 ! foobar.c
214 ? bar.c
214 ? bar.c
215 ? foo.c
215 ? foo.c
216 $ hg addremove
216 $ hg addremove
217 adding bar.c
217 adding bar.c
218 adding foo.c
218 adding foo.c
219 removing foobar.c
219 removing foobar.c
220 $ hg status
220 $ hg status
221 A bar.c
221 A bar.c
222 A foo.c
222 A foo.c
223 R foobar.c
223 R foobar.c
224
224
225 - A file foobar.c was moved to foo.c without using :hg:`rename`.
225 - A file foobar.c was moved to foo.c without using :hg:`rename`.
226 Afterwards, it was edited slightly::
226 Afterwards, it was edited slightly::
227
227
228 $ ls
228 $ ls
229 foo.c
229 foo.c
230 $ hg status
230 $ hg status
231 ! foobar.c
231 ! foobar.c
232 ? foo.c
232 ? foo.c
233 $ hg addremove --similarity 90
233 $ hg addremove --similarity 90
234 removing foobar.c
234 removing foobar.c
235 adding foo.c
235 adding foo.c
236 recording removal of foobar.c as rename to foo.c (94% similar)
236 recording removal of foobar.c as rename to foo.c (94% similar)
237 $ hg status -C
237 $ hg status -C
238 A foo.c
238 A foo.c
239 foobar.c
239 foobar.c
240 R foobar.c
240 R foobar.c
241
241
242 Returns 0 if all files are successfully added.
242 Returns 0 if all files are successfully added.
243 """
243 """
244 opts = pycompat.byteskwargs(opts)
244 opts = pycompat.byteskwargs(opts)
245 try:
245 try:
246 sim = float(opts.get('similarity') or 100)
246 sim = float(opts.get('similarity') or 100)
247 except ValueError:
247 except ValueError:
248 raise error.Abort(_('similarity must be a number'))
248 raise error.Abort(_('similarity must be a number'))
249 if sim < 0 or sim > 100:
249 if sim < 0 or sim > 100:
250 raise error.Abort(_('similarity must be between 0 and 100'))
250 raise error.Abort(_('similarity must be between 0 and 100'))
251 matcher = scmutil.match(repo[None], pats, opts)
251 matcher = scmutil.match(repo[None], pats, opts)
252 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
252 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
253
253
254 @command('^annotate|blame',
254 @command('^annotate|blame',
255 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
255 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
256 ('', 'follow', None,
256 ('', 'follow', None,
257 _('follow copies/renames and list the filename (DEPRECATED)')),
257 _('follow copies/renames and list the filename (DEPRECATED)')),
258 ('', 'no-follow', None, _("don't follow copies and renames")),
258 ('', 'no-follow', None, _("don't follow copies and renames")),
259 ('a', 'text', None, _('treat all files as text')),
259 ('a', 'text', None, _('treat all files as text')),
260 ('u', 'user', None, _('list the author (long with -v)')),
260 ('u', 'user', None, _('list the author (long with -v)')),
261 ('f', 'file', None, _('list the filename')),
261 ('f', 'file', None, _('list the filename')),
262 ('d', 'date', None, _('list the date (short with -q)')),
262 ('d', 'date', None, _('list the date (short with -q)')),
263 ('n', 'number', None, _('list the revision number (default)')),
263 ('n', 'number', None, _('list the revision number (default)')),
264 ('c', 'changeset', None, _('list the changeset')),
264 ('c', 'changeset', None, _('list the changeset')),
265 ('l', 'line-number', None, _('show line number at the first appearance')),
265 ('l', 'line-number', None, _('show line number at the first appearance')),
266 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
266 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
267 ] + diffwsopts + walkopts + formatteropts,
267 ] + diffwsopts + walkopts + formatteropts,
268 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
268 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
269 inferrepo=True)
269 inferrepo=True)
270 def annotate(ui, repo, *pats, **opts):
270 def annotate(ui, repo, *pats, **opts):
271 """show changeset information by line for each file
271 """show changeset information by line for each file
272
272
273 List changes in files, showing the revision id responsible for
273 List changes in files, showing the revision id responsible for
274 each line.
274 each line.
275
275
276 This command is useful for discovering when a change was made and
276 This command is useful for discovering when a change was made and
277 by whom.
277 by whom.
278
278
279 If you include --file, --user, or --date, the revision number is
279 If you include --file, --user, or --date, the revision number is
280 suppressed unless you also include --number.
280 suppressed unless you also include --number.
281
281
282 Without the -a/--text option, annotate will avoid processing files
282 Without the -a/--text option, annotate will avoid processing files
283 it detects as binary. With -a, annotate will annotate the file
283 it detects as binary. With -a, annotate will annotate the file
284 anyway, although the results will probably be neither useful
284 anyway, although the results will probably be neither useful
285 nor desirable.
285 nor desirable.
286
286
287 Returns 0 on success.
287 Returns 0 on success.
288 """
288 """
289 opts = pycompat.byteskwargs(opts)
289 opts = pycompat.byteskwargs(opts)
290 if not pats:
290 if not pats:
291 raise error.Abort(_('at least one filename or pattern is required'))
291 raise error.Abort(_('at least one filename or pattern is required'))
292
292
293 if opts.get('follow'):
293 if opts.get('follow'):
294 # --follow is deprecated and now just an alias for -f/--file
294 # --follow is deprecated and now just an alias for -f/--file
295 # to mimic the behavior of Mercurial before version 1.5
295 # to mimic the behavior of Mercurial before version 1.5
296 opts['file'] = True
296 opts['file'] = True
297
297
298 rev = opts.get('rev')
298 rev = opts.get('rev')
299 if rev:
299 if rev:
300 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
300 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
301 ctx = scmutil.revsingle(repo, rev)
301 ctx = scmutil.revsingle(repo, rev)
302
302
303 rootfm = ui.formatter('annotate', opts)
303 rootfm = ui.formatter('annotate', opts)
304 if ui.quiet:
304 if ui.quiet:
305 datefunc = util.shortdate
305 datefunc = util.shortdate
306 else:
306 else:
307 datefunc = util.datestr
307 datefunc = util.datestr
308 if ctx.rev() is None:
308 if ctx.rev() is None:
309 def hexfn(node):
309 def hexfn(node):
310 if node is None:
310 if node is None:
311 return None
311 return None
312 else:
312 else:
313 return rootfm.hexfunc(node)
313 return rootfm.hexfunc(node)
314 if opts.get('changeset'):
314 if opts.get('changeset'):
315 # omit "+" suffix which is appended to node hex
315 # omit "+" suffix which is appended to node hex
316 def formatrev(rev):
316 def formatrev(rev):
317 if rev is None:
317 if rev is None:
318 return '%d' % ctx.p1().rev()
318 return '%d' % ctx.p1().rev()
319 else:
319 else:
320 return '%d' % rev
320 return '%d' % rev
321 else:
321 else:
322 def formatrev(rev):
322 def formatrev(rev):
323 if rev is None:
323 if rev is None:
324 return '%d+' % ctx.p1().rev()
324 return '%d+' % ctx.p1().rev()
325 else:
325 else:
326 return '%d ' % rev
326 return '%d ' % rev
327 def formathex(hex):
327 def formathex(hex):
328 if hex is None:
328 if hex is None:
329 return '%s+' % rootfm.hexfunc(ctx.p1().node())
329 return '%s+' % rootfm.hexfunc(ctx.p1().node())
330 else:
330 else:
331 return '%s ' % hex
331 return '%s ' % hex
332 else:
332 else:
333 hexfn = rootfm.hexfunc
333 hexfn = rootfm.hexfunc
334 formatrev = formathex = pycompat.bytestr
334 formatrev = formathex = pycompat.bytestr
335
335
336 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
336 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
337 ('number', ' ', lambda x: x.fctx.rev(), formatrev),
337 ('number', ' ', lambda x: x.fctx.rev(), formatrev),
338 ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex),
338 ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex),
339 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
339 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
340 ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
340 ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
341 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
341 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
342 ]
342 ]
343 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
343 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
344
344
345 if (not opts.get('user') and not opts.get('changeset')
345 if (not opts.get('user') and not opts.get('changeset')
346 and not opts.get('date') and not opts.get('file')):
346 and not opts.get('date') and not opts.get('file')):
347 opts['number'] = True
347 opts['number'] = True
348
348
349 linenumber = opts.get('line_number') is not None
349 linenumber = opts.get('line_number') is not None
350 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
350 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
351 raise error.Abort(_('at least one of -n/-c is required for -l'))
351 raise error.Abort(_('at least one of -n/-c is required for -l'))
352
352
353 ui.pager('annotate')
353 ui.pager('annotate')
354
354
355 if rootfm.isplain():
355 if rootfm.isplain():
356 def makefunc(get, fmt):
356 def makefunc(get, fmt):
357 return lambda x: fmt(get(x))
357 return lambda x: fmt(get(x))
358 else:
358 else:
359 def makefunc(get, fmt):
359 def makefunc(get, fmt):
360 return get
360 return get
361 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
361 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
362 if opts.get(op)]
362 if opts.get(op)]
363 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
363 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
364 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
364 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
365 if opts.get(op))
365 if opts.get(op))
366
366
367 def bad(x, y):
367 def bad(x, y):
368 raise error.Abort("%s: %s" % (x, y))
368 raise error.Abort("%s: %s" % (x, y))
369
369
370 m = scmutil.match(ctx, pats, opts, badfn=bad)
370 m = scmutil.match(ctx, pats, opts, badfn=bad)
371
371
372 follow = not opts.get('no_follow')
372 follow = not opts.get('no_follow')
373 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
373 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
374 whitespace=True)
374 whitespace=True)
375 skiprevs = opts.get('skip')
375 skiprevs = opts.get('skip')
376 if skiprevs:
376 if skiprevs:
377 skiprevs = scmutil.revrange(repo, skiprevs)
377 skiprevs = scmutil.revrange(repo, skiprevs)
378
378
379 for abs in ctx.walk(m):
379 for abs in ctx.walk(m):
380 fctx = ctx[abs]
380 fctx = ctx[abs]
381 rootfm.startitem()
381 rootfm.startitem()
382 rootfm.data(abspath=abs, path=m.rel(abs))
382 rootfm.data(abspath=abs, path=m.rel(abs))
383 if not opts.get('text') and fctx.isbinary():
383 if not opts.get('text') and fctx.isbinary():
384 rootfm.plain(_("%s: binary file\n")
384 rootfm.plain(_("%s: binary file\n")
385 % ((pats and m.rel(abs)) or abs))
385 % ((pats and m.rel(abs)) or abs))
386 continue
386 continue
387
387
388 fm = rootfm.nested('lines')
388 fm = rootfm.nested('lines')
389 lines = fctx.annotate(follow=follow, linenumber=linenumber,
389 lines = fctx.annotate(follow=follow, linenumber=linenumber,
390 skiprevs=skiprevs, diffopts=diffopts)
390 skiprevs=skiprevs, diffopts=diffopts)
391 if not lines:
391 if not lines:
392 fm.end()
392 fm.end()
393 continue
393 continue
394 formats = []
394 formats = []
395 pieces = []
395 pieces = []
396
396
397 for f, sep in funcmap:
397 for f, sep in funcmap:
398 l = [f(n) for n, dummy in lines]
398 l = [f(n) for n, dummy in lines]
399 if fm.isplain():
399 if fm.isplain():
400 sizes = [encoding.colwidth(x) for x in l]
400 sizes = [encoding.colwidth(x) for x in l]
401 ml = max(sizes)
401 ml = max(sizes)
402 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
402 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
403 else:
403 else:
404 formats.append(['%s' for x in l])
404 formats.append(['%s' for x in l])
405 pieces.append(l)
405 pieces.append(l)
406
406
407 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
407 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
408 fm.startitem()
408 fm.startitem()
409 fm.write(fields, "".join(f), *p)
409 fm.write(fields, "".join(f), *p)
410 if l[0].skip:
410 if l[0].skip:
411 fmt = "* %s"
411 fmt = "* %s"
412 else:
412 else:
413 fmt = ": %s"
413 fmt = ": %s"
414 fm.write('line', fmt, l[1])
414 fm.write('line', fmt, l[1])
415
415
416 if not lines[-1][1].endswith('\n'):
416 if not lines[-1][1].endswith('\n'):
417 fm.plain('\n')
417 fm.plain('\n')
418 fm.end()
418 fm.end()
419
419
420 rootfm.end()
420 rootfm.end()
421
421
422 @command('archive',
422 @command('archive',
423 [('', 'no-decode', None, _('do not pass files through decoders')),
423 [('', 'no-decode', None, _('do not pass files through decoders')),
424 ('p', 'prefix', '', _('directory prefix for files in archive'),
424 ('p', 'prefix', '', _('directory prefix for files in archive'),
425 _('PREFIX')),
425 _('PREFIX')),
426 ('r', 'rev', '', _('revision to distribute'), _('REV')),
426 ('r', 'rev', '', _('revision to distribute'), _('REV')),
427 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
427 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
428 ] + subrepoopts + walkopts,
428 ] + subrepoopts + walkopts,
429 _('[OPTION]... DEST'))
429 _('[OPTION]... DEST'))
430 def archive(ui, repo, dest, **opts):
430 def archive(ui, repo, dest, **opts):
431 '''create an unversioned archive of a repository revision
431 '''create an unversioned archive of a repository revision
432
432
433 By default, the revision used is the parent of the working
433 By default, the revision used is the parent of the working
434 directory; use -r/--rev to specify a different revision.
434 directory; use -r/--rev to specify a different revision.
435
435
436 The archive type is automatically detected based on file
436 The archive type is automatically detected based on file
437 extension (to override, use -t/--type).
437 extension (to override, use -t/--type).
438
438
439 .. container:: verbose
439 .. container:: verbose
440
440
441 Examples:
441 Examples:
442
442
443 - create a zip file containing the 1.0 release::
443 - create a zip file containing the 1.0 release::
444
444
445 hg archive -r 1.0 project-1.0.zip
445 hg archive -r 1.0 project-1.0.zip
446
446
447 - create a tarball excluding .hg files::
447 - create a tarball excluding .hg files::
448
448
449 hg archive project.tar.gz -X ".hg*"
449 hg archive project.tar.gz -X ".hg*"
450
450
451 Valid types are:
451 Valid types are:
452
452
453 :``files``: a directory full of files (default)
453 :``files``: a directory full of files (default)
454 :``tar``: tar archive, uncompressed
454 :``tar``: tar archive, uncompressed
455 :``tbz2``: tar archive, compressed using bzip2
455 :``tbz2``: tar archive, compressed using bzip2
456 :``tgz``: tar archive, compressed using gzip
456 :``tgz``: tar archive, compressed using gzip
457 :``uzip``: zip archive, uncompressed
457 :``uzip``: zip archive, uncompressed
458 :``zip``: zip archive, compressed using deflate
458 :``zip``: zip archive, compressed using deflate
459
459
460 The exact name of the destination archive or directory is given
460 The exact name of the destination archive or directory is given
461 using a format string; see :hg:`help export` for details.
461 using a format string; see :hg:`help export` for details.
462
462
463 Each member added to an archive file has a directory prefix
463 Each member added to an archive file has a directory prefix
464 prepended. Use -p/--prefix to specify a format string for the
464 prepended. Use -p/--prefix to specify a format string for the
465 prefix. The default is the basename of the archive, with suffixes
465 prefix. The default is the basename of the archive, with suffixes
466 removed.
466 removed.
467
467
468 Returns 0 on success.
468 Returns 0 on success.
469 '''
469 '''
470
470
471 opts = pycompat.byteskwargs(opts)
471 opts = pycompat.byteskwargs(opts)
472 rev = opts.get('rev')
472 rev = opts.get('rev')
473 if rev:
473 if rev:
474 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
474 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
475 ctx = scmutil.revsingle(repo, rev)
475 ctx = scmutil.revsingle(repo, rev)
476 if not ctx:
476 if not ctx:
477 raise error.Abort(_('no working directory: please specify a revision'))
477 raise error.Abort(_('no working directory: please specify a revision'))
478 node = ctx.node()
478 node = ctx.node()
479 dest = cmdutil.makefilename(repo, dest, node)
479 dest = cmdutil.makefilename(repo, dest, node)
480 if os.path.realpath(dest) == repo.root:
480 if os.path.realpath(dest) == repo.root:
481 raise error.Abort(_('repository root cannot be destination'))
481 raise error.Abort(_('repository root cannot be destination'))
482
482
483 kind = opts.get('type') or archival.guesskind(dest) or 'files'
483 kind = opts.get('type') or archival.guesskind(dest) or 'files'
484 prefix = opts.get('prefix')
484 prefix = opts.get('prefix')
485
485
486 if dest == '-':
486 if dest == '-':
487 if kind == 'files':
487 if kind == 'files':
488 raise error.Abort(_('cannot archive plain files to stdout'))
488 raise error.Abort(_('cannot archive plain files to stdout'))
489 dest = cmdutil.makefileobj(repo, dest)
489 dest = cmdutil.makefileobj(repo, dest, node)
490 if not prefix:
490 if not prefix:
491 prefix = os.path.basename(repo.root) + '-%h'
491 prefix = os.path.basename(repo.root) + '-%h'
492
492
493 prefix = cmdutil.makefilename(repo, prefix, node)
493 prefix = cmdutil.makefilename(repo, prefix, node)
494 match = scmutil.match(ctx, [], opts)
494 match = scmutil.match(ctx, [], opts)
495 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
495 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
496 match, prefix, subrepos=opts.get('subrepos'))
496 match, prefix, subrepos=opts.get('subrepos'))
497
497
498 @command('backout',
498 @command('backout',
499 [('', 'merge', None, _('merge with old dirstate parent after backout')),
499 [('', 'merge', None, _('merge with old dirstate parent after backout')),
500 ('', 'commit', None,
500 ('', 'commit', None,
501 _('commit if no conflicts were encountered (DEPRECATED)')),
501 _('commit if no conflicts were encountered (DEPRECATED)')),
502 ('', 'no-commit', None, _('do not commit')),
502 ('', 'no-commit', None, _('do not commit')),
503 ('', 'parent', '',
503 ('', 'parent', '',
504 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
504 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
505 ('r', 'rev', '', _('revision to backout'), _('REV')),
505 ('r', 'rev', '', _('revision to backout'), _('REV')),
506 ('e', 'edit', False, _('invoke editor on commit messages')),
506 ('e', 'edit', False, _('invoke editor on commit messages')),
507 ] + mergetoolopts + walkopts + commitopts + commitopts2,
507 ] + mergetoolopts + walkopts + commitopts + commitopts2,
508 _('[OPTION]... [-r] REV'))
508 _('[OPTION]... [-r] REV'))
509 def backout(ui, repo, node=None, rev=None, **opts):
509 def backout(ui, repo, node=None, rev=None, **opts):
510 '''reverse effect of earlier changeset
510 '''reverse effect of earlier changeset
511
511
512 Prepare a new changeset with the effect of REV undone in the
512 Prepare a new changeset with the effect of REV undone in the
513 current working directory. If no conflicts were encountered,
513 current working directory. If no conflicts were encountered,
514 it will be committed immediately.
514 it will be committed immediately.
515
515
516 If REV is the parent of the working directory, then this new changeset
516 If REV is the parent of the working directory, then this new changeset
517 is committed automatically (unless --no-commit is specified).
517 is committed automatically (unless --no-commit is specified).
518
518
519 .. note::
519 .. note::
520
520
521 :hg:`backout` cannot be used to fix either an unwanted or
521 :hg:`backout` cannot be used to fix either an unwanted or
522 incorrect merge.
522 incorrect merge.
523
523
524 .. container:: verbose
524 .. container:: verbose
525
525
526 Examples:
526 Examples:
527
527
528 - Reverse the effect of the parent of the working directory.
528 - Reverse the effect of the parent of the working directory.
529 This backout will be committed immediately::
529 This backout will be committed immediately::
530
530
531 hg backout -r .
531 hg backout -r .
532
532
533 - Reverse the effect of previous bad revision 23::
533 - Reverse the effect of previous bad revision 23::
534
534
535 hg backout -r 23
535 hg backout -r 23
536
536
537 - Reverse the effect of previous bad revision 23 and
537 - Reverse the effect of previous bad revision 23 and
538 leave changes uncommitted::
538 leave changes uncommitted::
539
539
540 hg backout -r 23 --no-commit
540 hg backout -r 23 --no-commit
541 hg commit -m "Backout revision 23"
541 hg commit -m "Backout revision 23"
542
542
543 By default, the pending changeset will have one parent,
543 By default, the pending changeset will have one parent,
544 maintaining a linear history. With --merge, the pending
544 maintaining a linear history. With --merge, the pending
545 changeset will instead have two parents: the old parent of the
545 changeset will instead have two parents: the old parent of the
546 working directory and a new child of REV that simply undoes REV.
546 working directory and a new child of REV that simply undoes REV.
547
547
548 Before version 1.7, the behavior without --merge was equivalent
548 Before version 1.7, the behavior without --merge was equivalent
549 to specifying --merge followed by :hg:`update --clean .` to
549 to specifying --merge followed by :hg:`update --clean .` to
550 cancel the merge and leave the child of REV as a head to be
550 cancel the merge and leave the child of REV as a head to be
551 merged separately.
551 merged separately.
552
552
553 See :hg:`help dates` for a list of formats valid for -d/--date.
553 See :hg:`help dates` for a list of formats valid for -d/--date.
554
554
555 See :hg:`help revert` for a way to restore files to the state
555 See :hg:`help revert` for a way to restore files to the state
556 of another revision.
556 of another revision.
557
557
558 Returns 0 on success, 1 if nothing to backout or there are unresolved
558 Returns 0 on success, 1 if nothing to backout or there are unresolved
559 files.
559 files.
560 '''
560 '''
561 wlock = lock = None
561 wlock = lock = None
562 try:
562 try:
563 wlock = repo.wlock()
563 wlock = repo.wlock()
564 lock = repo.lock()
564 lock = repo.lock()
565 return _dobackout(ui, repo, node, rev, **opts)
565 return _dobackout(ui, repo, node, rev, **opts)
566 finally:
566 finally:
567 release(lock, wlock)
567 release(lock, wlock)
568
568
569 def _dobackout(ui, repo, node=None, rev=None, **opts):
569 def _dobackout(ui, repo, node=None, rev=None, **opts):
570 opts = pycompat.byteskwargs(opts)
570 opts = pycompat.byteskwargs(opts)
571 if opts.get('commit') and opts.get('no_commit'):
571 if opts.get('commit') and opts.get('no_commit'):
572 raise error.Abort(_("cannot use --commit with --no-commit"))
572 raise error.Abort(_("cannot use --commit with --no-commit"))
573 if opts.get('merge') and opts.get('no_commit'):
573 if opts.get('merge') and opts.get('no_commit'):
574 raise error.Abort(_("cannot use --merge with --no-commit"))
574 raise error.Abort(_("cannot use --merge with --no-commit"))
575
575
576 if rev and node:
576 if rev and node:
577 raise error.Abort(_("please specify just one revision"))
577 raise error.Abort(_("please specify just one revision"))
578
578
579 if not rev:
579 if not rev:
580 rev = node
580 rev = node
581
581
582 if not rev:
582 if not rev:
583 raise error.Abort(_("please specify a revision to backout"))
583 raise error.Abort(_("please specify a revision to backout"))
584
584
585 date = opts.get('date')
585 date = opts.get('date')
586 if date:
586 if date:
587 opts['date'] = util.parsedate(date)
587 opts['date'] = util.parsedate(date)
588
588
589 cmdutil.checkunfinished(repo)
589 cmdutil.checkunfinished(repo)
590 cmdutil.bailifchanged(repo)
590 cmdutil.bailifchanged(repo)
591 node = scmutil.revsingle(repo, rev).node()
591 node = scmutil.revsingle(repo, rev).node()
592
592
593 op1, op2 = repo.dirstate.parents()
593 op1, op2 = repo.dirstate.parents()
594 if not repo.changelog.isancestor(node, op1):
594 if not repo.changelog.isancestor(node, op1):
595 raise error.Abort(_('cannot backout change that is not an ancestor'))
595 raise error.Abort(_('cannot backout change that is not an ancestor'))
596
596
597 p1, p2 = repo.changelog.parents(node)
597 p1, p2 = repo.changelog.parents(node)
598 if p1 == nullid:
598 if p1 == nullid:
599 raise error.Abort(_('cannot backout a change with no parents'))
599 raise error.Abort(_('cannot backout a change with no parents'))
600 if p2 != nullid:
600 if p2 != nullid:
601 if not opts.get('parent'):
601 if not opts.get('parent'):
602 raise error.Abort(_('cannot backout a merge changeset'))
602 raise error.Abort(_('cannot backout a merge changeset'))
603 p = repo.lookup(opts['parent'])
603 p = repo.lookup(opts['parent'])
604 if p not in (p1, p2):
604 if p not in (p1, p2):
605 raise error.Abort(_('%s is not a parent of %s') %
605 raise error.Abort(_('%s is not a parent of %s') %
606 (short(p), short(node)))
606 (short(p), short(node)))
607 parent = p
607 parent = p
608 else:
608 else:
609 if opts.get('parent'):
609 if opts.get('parent'):
610 raise error.Abort(_('cannot use --parent on non-merge changeset'))
610 raise error.Abort(_('cannot use --parent on non-merge changeset'))
611 parent = p1
611 parent = p1
612
612
613 # the backout should appear on the same branch
613 # the backout should appear on the same branch
614 branch = repo.dirstate.branch()
614 branch = repo.dirstate.branch()
615 bheads = repo.branchheads(branch)
615 bheads = repo.branchheads(branch)
616 rctx = scmutil.revsingle(repo, hex(parent))
616 rctx = scmutil.revsingle(repo, hex(parent))
617 if not opts.get('merge') and op1 != node:
617 if not opts.get('merge') and op1 != node:
618 dsguard = dirstateguard.dirstateguard(repo, 'backout')
618 dsguard = dirstateguard.dirstateguard(repo, 'backout')
619 try:
619 try:
620 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
620 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
621 'backout')
621 'backout')
622 stats = mergemod.update(repo, parent, True, True, node, False)
622 stats = mergemod.update(repo, parent, True, True, node, False)
623 repo.setparents(op1, op2)
623 repo.setparents(op1, op2)
624 dsguard.close()
624 dsguard.close()
625 hg._showstats(repo, stats)
625 hg._showstats(repo, stats)
626 if stats[3]:
626 if stats[3]:
627 repo.ui.status(_("use 'hg resolve' to retry unresolved "
627 repo.ui.status(_("use 'hg resolve' to retry unresolved "
628 "file merges\n"))
628 "file merges\n"))
629 return 1
629 return 1
630 finally:
630 finally:
631 ui.setconfig('ui', 'forcemerge', '', '')
631 ui.setconfig('ui', 'forcemerge', '', '')
632 lockmod.release(dsguard)
632 lockmod.release(dsguard)
633 else:
633 else:
634 hg.clean(repo, node, show_stats=False)
634 hg.clean(repo, node, show_stats=False)
635 repo.dirstate.setbranch(branch)
635 repo.dirstate.setbranch(branch)
636 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
636 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
637
637
638 if opts.get('no_commit'):
638 if opts.get('no_commit'):
639 msg = _("changeset %s backed out, "
639 msg = _("changeset %s backed out, "
640 "don't forget to commit.\n")
640 "don't forget to commit.\n")
641 ui.status(msg % short(node))
641 ui.status(msg % short(node))
642 return 0
642 return 0
643
643
644 def commitfunc(ui, repo, message, match, opts):
644 def commitfunc(ui, repo, message, match, opts):
645 editform = 'backout'
645 editform = 'backout'
646 e = cmdutil.getcommiteditor(editform=editform,
646 e = cmdutil.getcommiteditor(editform=editform,
647 **pycompat.strkwargs(opts))
647 **pycompat.strkwargs(opts))
648 if not message:
648 if not message:
649 # we don't translate commit messages
649 # we don't translate commit messages
650 message = "Backed out changeset %s" % short(node)
650 message = "Backed out changeset %s" % short(node)
651 e = cmdutil.getcommiteditor(edit=True, editform=editform)
651 e = cmdutil.getcommiteditor(edit=True, editform=editform)
652 return repo.commit(message, opts.get('user'), opts.get('date'),
652 return repo.commit(message, opts.get('user'), opts.get('date'),
653 match, editor=e)
653 match, editor=e)
654 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
654 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
655 if not newnode:
655 if not newnode:
656 ui.status(_("nothing changed\n"))
656 ui.status(_("nothing changed\n"))
657 return 1
657 return 1
658 cmdutil.commitstatus(repo, newnode, branch, bheads)
658 cmdutil.commitstatus(repo, newnode, branch, bheads)
659
659
660 def nice(node):
660 def nice(node):
661 return '%d:%s' % (repo.changelog.rev(node), short(node))
661 return '%d:%s' % (repo.changelog.rev(node), short(node))
662 ui.status(_('changeset %s backs out changeset %s\n') %
662 ui.status(_('changeset %s backs out changeset %s\n') %
663 (nice(repo.changelog.tip()), nice(node)))
663 (nice(repo.changelog.tip()), nice(node)))
664 if opts.get('merge') and op1 != node:
664 if opts.get('merge') and op1 != node:
665 hg.clean(repo, op1, show_stats=False)
665 hg.clean(repo, op1, show_stats=False)
666 ui.status(_('merging with changeset %s\n')
666 ui.status(_('merging with changeset %s\n')
667 % nice(repo.changelog.tip()))
667 % nice(repo.changelog.tip()))
668 try:
668 try:
669 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
669 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
670 'backout')
670 'backout')
671 return hg.merge(repo, hex(repo.changelog.tip()))
671 return hg.merge(repo, hex(repo.changelog.tip()))
672 finally:
672 finally:
673 ui.setconfig('ui', 'forcemerge', '', '')
673 ui.setconfig('ui', 'forcemerge', '', '')
674 return 0
674 return 0
675
675
676 @command('bisect',
676 @command('bisect',
677 [('r', 'reset', False, _('reset bisect state')),
677 [('r', 'reset', False, _('reset bisect state')),
678 ('g', 'good', False, _('mark changeset good')),
678 ('g', 'good', False, _('mark changeset good')),
679 ('b', 'bad', False, _('mark changeset bad')),
679 ('b', 'bad', False, _('mark changeset bad')),
680 ('s', 'skip', False, _('skip testing changeset')),
680 ('s', 'skip', False, _('skip testing changeset')),
681 ('e', 'extend', False, _('extend the bisect range')),
681 ('e', 'extend', False, _('extend the bisect range')),
682 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
682 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
683 ('U', 'noupdate', False, _('do not update to target'))],
683 ('U', 'noupdate', False, _('do not update to target'))],
684 _("[-gbsr] [-U] [-c CMD] [REV]"))
684 _("[-gbsr] [-U] [-c CMD] [REV]"))
685 def bisect(ui, repo, rev=None, extra=None, command=None,
685 def bisect(ui, repo, rev=None, extra=None, command=None,
686 reset=None, good=None, bad=None, skip=None, extend=None,
686 reset=None, good=None, bad=None, skip=None, extend=None,
687 noupdate=None):
687 noupdate=None):
688 """subdivision search of changesets
688 """subdivision search of changesets
689
689
690 This command helps to find changesets which introduce problems. To
690 This command helps to find changesets which introduce problems. To
691 use, mark the earliest changeset you know exhibits the problem as
691 use, mark the earliest changeset you know exhibits the problem as
692 bad, then mark the latest changeset which is free from the problem
692 bad, then mark the latest changeset which is free from the problem
693 as good. Bisect will update your working directory to a revision
693 as good. Bisect will update your working directory to a revision
694 for testing (unless the -U/--noupdate option is specified). Once
694 for testing (unless the -U/--noupdate option is specified). Once
695 you have performed tests, mark the working directory as good or
695 you have performed tests, mark the working directory as good or
696 bad, and bisect will either update to another candidate changeset
696 bad, and bisect will either update to another candidate changeset
697 or announce that it has found the bad revision.
697 or announce that it has found the bad revision.
698
698
699 As a shortcut, you can also use the revision argument to mark a
699 As a shortcut, you can also use the revision argument to mark a
700 revision as good or bad without checking it out first.
700 revision as good or bad without checking it out first.
701
701
702 If you supply a command, it will be used for automatic bisection.
702 If you supply a command, it will be used for automatic bisection.
703 The environment variable HG_NODE will contain the ID of the
703 The environment variable HG_NODE will contain the ID of the
704 changeset being tested. The exit status of the command will be
704 changeset being tested. The exit status of the command will be
705 used to mark revisions as good or bad: status 0 means good, 125
705 used to mark revisions as good or bad: status 0 means good, 125
706 means to skip the revision, 127 (command not found) will abort the
706 means to skip the revision, 127 (command not found) will abort the
707 bisection, and any other non-zero exit status means the revision
707 bisection, and any other non-zero exit status means the revision
708 is bad.
708 is bad.
709
709
710 .. container:: verbose
710 .. container:: verbose
711
711
712 Some examples:
712 Some examples:
713
713
714 - start a bisection with known bad revision 34, and good revision 12::
714 - start a bisection with known bad revision 34, and good revision 12::
715
715
716 hg bisect --bad 34
716 hg bisect --bad 34
717 hg bisect --good 12
717 hg bisect --good 12
718
718
719 - advance the current bisection by marking current revision as good or
719 - advance the current bisection by marking current revision as good or
720 bad::
720 bad::
721
721
722 hg bisect --good
722 hg bisect --good
723 hg bisect --bad
723 hg bisect --bad
724
724
725 - mark the current revision, or a known revision, to be skipped (e.g. if
725 - mark the current revision, or a known revision, to be skipped (e.g. if
726 that revision is not usable because of another issue)::
726 that revision is not usable because of another issue)::
727
727
728 hg bisect --skip
728 hg bisect --skip
729 hg bisect --skip 23
729 hg bisect --skip 23
730
730
731 - skip all revisions that do not touch directories ``foo`` or ``bar``::
731 - skip all revisions that do not touch directories ``foo`` or ``bar``::
732
732
733 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
733 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
734
734
735 - forget the current bisection::
735 - forget the current bisection::
736
736
737 hg bisect --reset
737 hg bisect --reset
738
738
739 - use 'make && make tests' to automatically find the first broken
739 - use 'make && make tests' to automatically find the first broken
740 revision::
740 revision::
741
741
742 hg bisect --reset
742 hg bisect --reset
743 hg bisect --bad 34
743 hg bisect --bad 34
744 hg bisect --good 12
744 hg bisect --good 12
745 hg bisect --command "make && make tests"
745 hg bisect --command "make && make tests"
746
746
747 - see all changesets whose states are already known in the current
747 - see all changesets whose states are already known in the current
748 bisection::
748 bisection::
749
749
750 hg log -r "bisect(pruned)"
750 hg log -r "bisect(pruned)"
751
751
752 - see the changeset currently being bisected (especially useful
752 - see the changeset currently being bisected (especially useful
753 if running with -U/--noupdate)::
753 if running with -U/--noupdate)::
754
754
755 hg log -r "bisect(current)"
755 hg log -r "bisect(current)"
756
756
757 - see all changesets that took part in the current bisection::
757 - see all changesets that took part in the current bisection::
758
758
759 hg log -r "bisect(range)"
759 hg log -r "bisect(range)"
760
760
761 - you can even get a nice graph::
761 - you can even get a nice graph::
762
762
763 hg log --graph -r "bisect(range)"
763 hg log --graph -r "bisect(range)"
764
764
765 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
765 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
766
766
767 Returns 0 on success.
767 Returns 0 on success.
768 """
768 """
769 # backward compatibility
769 # backward compatibility
770 if rev in "good bad reset init".split():
770 if rev in "good bad reset init".split():
771 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
771 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
772 cmd, rev, extra = rev, extra, None
772 cmd, rev, extra = rev, extra, None
773 if cmd == "good":
773 if cmd == "good":
774 good = True
774 good = True
775 elif cmd == "bad":
775 elif cmd == "bad":
776 bad = True
776 bad = True
777 else:
777 else:
778 reset = True
778 reset = True
779 elif extra:
779 elif extra:
780 raise error.Abort(_('incompatible arguments'))
780 raise error.Abort(_('incompatible arguments'))
781
781
782 incompatibles = {
782 incompatibles = {
783 '--bad': bad,
783 '--bad': bad,
784 '--command': bool(command),
784 '--command': bool(command),
785 '--extend': extend,
785 '--extend': extend,
786 '--good': good,
786 '--good': good,
787 '--reset': reset,
787 '--reset': reset,
788 '--skip': skip,
788 '--skip': skip,
789 }
789 }
790
790
791 enabled = [x for x in incompatibles if incompatibles[x]]
791 enabled = [x for x in incompatibles if incompatibles[x]]
792
792
793 if len(enabled) > 1:
793 if len(enabled) > 1:
794 raise error.Abort(_('%s and %s are incompatible') %
794 raise error.Abort(_('%s and %s are incompatible') %
795 tuple(sorted(enabled)[0:2]))
795 tuple(sorted(enabled)[0:2]))
796
796
797 if reset:
797 if reset:
798 hbisect.resetstate(repo)
798 hbisect.resetstate(repo)
799 return
799 return
800
800
801 state = hbisect.load_state(repo)
801 state = hbisect.load_state(repo)
802
802
803 # update state
803 # update state
804 if good or bad or skip:
804 if good or bad or skip:
805 if rev:
805 if rev:
806 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
806 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
807 else:
807 else:
808 nodes = [repo.lookup('.')]
808 nodes = [repo.lookup('.')]
809 if good:
809 if good:
810 state['good'] += nodes
810 state['good'] += nodes
811 elif bad:
811 elif bad:
812 state['bad'] += nodes
812 state['bad'] += nodes
813 elif skip:
813 elif skip:
814 state['skip'] += nodes
814 state['skip'] += nodes
815 hbisect.save_state(repo, state)
815 hbisect.save_state(repo, state)
816 if not (state['good'] and state['bad']):
816 if not (state['good'] and state['bad']):
817 return
817 return
818
818
819 def mayupdate(repo, node, show_stats=True):
819 def mayupdate(repo, node, show_stats=True):
820 """common used update sequence"""
820 """common used update sequence"""
821 if noupdate:
821 if noupdate:
822 return
822 return
823 cmdutil.checkunfinished(repo)
823 cmdutil.checkunfinished(repo)
824 cmdutil.bailifchanged(repo)
824 cmdutil.bailifchanged(repo)
825 return hg.clean(repo, node, show_stats=show_stats)
825 return hg.clean(repo, node, show_stats=show_stats)
826
826
827 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
827 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
828
828
829 if command:
829 if command:
830 changesets = 1
830 changesets = 1
831 if noupdate:
831 if noupdate:
832 try:
832 try:
833 node = state['current'][0]
833 node = state['current'][0]
834 except LookupError:
834 except LookupError:
835 raise error.Abort(_('current bisect revision is unknown - '
835 raise error.Abort(_('current bisect revision is unknown - '
836 'start a new bisect to fix'))
836 'start a new bisect to fix'))
837 else:
837 else:
838 node, p2 = repo.dirstate.parents()
838 node, p2 = repo.dirstate.parents()
839 if p2 != nullid:
839 if p2 != nullid:
840 raise error.Abort(_('current bisect revision is a merge'))
840 raise error.Abort(_('current bisect revision is a merge'))
841 if rev:
841 if rev:
842 node = repo[scmutil.revsingle(repo, rev, node)].node()
842 node = repo[scmutil.revsingle(repo, rev, node)].node()
843 try:
843 try:
844 while changesets:
844 while changesets:
845 # update state
845 # update state
846 state['current'] = [node]
846 state['current'] = [node]
847 hbisect.save_state(repo, state)
847 hbisect.save_state(repo, state)
848 status = ui.system(command, environ={'HG_NODE': hex(node)},
848 status = ui.system(command, environ={'HG_NODE': hex(node)},
849 blockedtag='bisect_check')
849 blockedtag='bisect_check')
850 if status == 125:
850 if status == 125:
851 transition = "skip"
851 transition = "skip"
852 elif status == 0:
852 elif status == 0:
853 transition = "good"
853 transition = "good"
854 # status < 0 means process was killed
854 # status < 0 means process was killed
855 elif status == 127:
855 elif status == 127:
856 raise error.Abort(_("failed to execute %s") % command)
856 raise error.Abort(_("failed to execute %s") % command)
857 elif status < 0:
857 elif status < 0:
858 raise error.Abort(_("%s killed") % command)
858 raise error.Abort(_("%s killed") % command)
859 else:
859 else:
860 transition = "bad"
860 transition = "bad"
861 state[transition].append(node)
861 state[transition].append(node)
862 ctx = repo[node]
862 ctx = repo[node]
863 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
863 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
864 hbisect.checkstate(state)
864 hbisect.checkstate(state)
865 # bisect
865 # bisect
866 nodes, changesets, bgood = hbisect.bisect(repo, state)
866 nodes, changesets, bgood = hbisect.bisect(repo, state)
867 # update to next check
867 # update to next check
868 node = nodes[0]
868 node = nodes[0]
869 mayupdate(repo, node, show_stats=False)
869 mayupdate(repo, node, show_stats=False)
870 finally:
870 finally:
871 state['current'] = [node]
871 state['current'] = [node]
872 hbisect.save_state(repo, state)
872 hbisect.save_state(repo, state)
873 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
873 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
874 return
874 return
875
875
876 hbisect.checkstate(state)
876 hbisect.checkstate(state)
877
877
878 # actually bisect
878 # actually bisect
879 nodes, changesets, good = hbisect.bisect(repo, state)
879 nodes, changesets, good = hbisect.bisect(repo, state)
880 if extend:
880 if extend:
881 if not changesets:
881 if not changesets:
882 extendnode = hbisect.extendrange(repo, state, nodes, good)
882 extendnode = hbisect.extendrange(repo, state, nodes, good)
883 if extendnode is not None:
883 if extendnode is not None:
884 ui.write(_("Extending search to changeset %d:%s\n")
884 ui.write(_("Extending search to changeset %d:%s\n")
885 % (extendnode.rev(), extendnode))
885 % (extendnode.rev(), extendnode))
886 state['current'] = [extendnode.node()]
886 state['current'] = [extendnode.node()]
887 hbisect.save_state(repo, state)
887 hbisect.save_state(repo, state)
888 return mayupdate(repo, extendnode.node())
888 return mayupdate(repo, extendnode.node())
889 raise error.Abort(_("nothing to extend"))
889 raise error.Abort(_("nothing to extend"))
890
890
891 if changesets == 0:
891 if changesets == 0:
892 hbisect.printresult(ui, repo, state, displayer, nodes, good)
892 hbisect.printresult(ui, repo, state, displayer, nodes, good)
893 else:
893 else:
894 assert len(nodes) == 1 # only a single node can be tested next
894 assert len(nodes) == 1 # only a single node can be tested next
895 node = nodes[0]
895 node = nodes[0]
896 # compute the approximate number of remaining tests
896 # compute the approximate number of remaining tests
897 tests, size = 0, 2
897 tests, size = 0, 2
898 while size <= changesets:
898 while size <= changesets:
899 tests, size = tests + 1, size * 2
899 tests, size = tests + 1, size * 2
900 rev = repo.changelog.rev(node)
900 rev = repo.changelog.rev(node)
901 ui.write(_("Testing changeset %d:%s "
901 ui.write(_("Testing changeset %d:%s "
902 "(%d changesets remaining, ~%d tests)\n")
902 "(%d changesets remaining, ~%d tests)\n")
903 % (rev, short(node), changesets, tests))
903 % (rev, short(node), changesets, tests))
904 state['current'] = [node]
904 state['current'] = [node]
905 hbisect.save_state(repo, state)
905 hbisect.save_state(repo, state)
906 return mayupdate(repo, node)
906 return mayupdate(repo, node)
907
907
908 @command('bookmarks|bookmark',
908 @command('bookmarks|bookmark',
909 [('f', 'force', False, _('force')),
909 [('f', 'force', False, _('force')),
910 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
910 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
911 ('d', 'delete', False, _('delete a given bookmark')),
911 ('d', 'delete', False, _('delete a given bookmark')),
912 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
912 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
913 ('i', 'inactive', False, _('mark a bookmark inactive')),
913 ('i', 'inactive', False, _('mark a bookmark inactive')),
914 ] + formatteropts,
914 ] + formatteropts,
915 _('hg bookmarks [OPTIONS]... [NAME]...'))
915 _('hg bookmarks [OPTIONS]... [NAME]...'))
916 def bookmark(ui, repo, *names, **opts):
916 def bookmark(ui, repo, *names, **opts):
917 '''create a new bookmark or list existing bookmarks
917 '''create a new bookmark or list existing bookmarks
918
918
919 Bookmarks are labels on changesets to help track lines of development.
919 Bookmarks are labels on changesets to help track lines of development.
920 Bookmarks are unversioned and can be moved, renamed and deleted.
920 Bookmarks are unversioned and can be moved, renamed and deleted.
921 Deleting or moving a bookmark has no effect on the associated changesets.
921 Deleting or moving a bookmark has no effect on the associated changesets.
922
922
923 Creating or updating to a bookmark causes it to be marked as 'active'.
923 Creating or updating to a bookmark causes it to be marked as 'active'.
924 The active bookmark is indicated with a '*'.
924 The active bookmark is indicated with a '*'.
925 When a commit is made, the active bookmark will advance to the new commit.
925 When a commit is made, the active bookmark will advance to the new commit.
926 A plain :hg:`update` will also advance an active bookmark, if possible.
926 A plain :hg:`update` will also advance an active bookmark, if possible.
927 Updating away from a bookmark will cause it to be deactivated.
927 Updating away from a bookmark will cause it to be deactivated.
928
928
929 Bookmarks can be pushed and pulled between repositories (see
929 Bookmarks can be pushed and pulled between repositories (see
930 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
930 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
931 diverged, a new 'divergent bookmark' of the form 'name@path' will
931 diverged, a new 'divergent bookmark' of the form 'name@path' will
932 be created. Using :hg:`merge` will resolve the divergence.
932 be created. Using :hg:`merge` will resolve the divergence.
933
933
934 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
934 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
935 the active bookmark's name.
935 the active bookmark's name.
936
936
937 A bookmark named '@' has the special property that :hg:`clone` will
937 A bookmark named '@' has the special property that :hg:`clone` will
938 check it out by default if it exists.
938 check it out by default if it exists.
939
939
940 .. container:: verbose
940 .. container:: verbose
941
941
942 Examples:
942 Examples:
943
943
944 - create an active bookmark for a new line of development::
944 - create an active bookmark for a new line of development::
945
945
946 hg book new-feature
946 hg book new-feature
947
947
948 - create an inactive bookmark as a place marker::
948 - create an inactive bookmark as a place marker::
949
949
950 hg book -i reviewed
950 hg book -i reviewed
951
951
952 - create an inactive bookmark on another changeset::
952 - create an inactive bookmark on another changeset::
953
953
954 hg book -r .^ tested
954 hg book -r .^ tested
955
955
956 - rename bookmark turkey to dinner::
956 - rename bookmark turkey to dinner::
957
957
958 hg book -m turkey dinner
958 hg book -m turkey dinner
959
959
960 - move the '@' bookmark from another branch::
960 - move the '@' bookmark from another branch::
961
961
962 hg book -f @
962 hg book -f @
963 '''
963 '''
964 force = opts.get(r'force')
964 force = opts.get(r'force')
965 rev = opts.get(r'rev')
965 rev = opts.get(r'rev')
966 delete = opts.get(r'delete')
966 delete = opts.get(r'delete')
967 rename = opts.get(r'rename')
967 rename = opts.get(r'rename')
968 inactive = opts.get(r'inactive')
968 inactive = opts.get(r'inactive')
969
969
970 if delete and rename:
970 if delete and rename:
971 raise error.Abort(_("--delete and --rename are incompatible"))
971 raise error.Abort(_("--delete and --rename are incompatible"))
972 if delete and rev:
972 if delete and rev:
973 raise error.Abort(_("--rev is incompatible with --delete"))
973 raise error.Abort(_("--rev is incompatible with --delete"))
974 if rename and rev:
974 if rename and rev:
975 raise error.Abort(_("--rev is incompatible with --rename"))
975 raise error.Abort(_("--rev is incompatible with --rename"))
976 if not names and (delete or rev):
976 if not names and (delete or rev):
977 raise error.Abort(_("bookmark name required"))
977 raise error.Abort(_("bookmark name required"))
978
978
979 if delete or rename or names or inactive:
979 if delete or rename or names or inactive:
980 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
980 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
981 if delete:
981 if delete:
982 names = pycompat.maplist(repo._bookmarks.expandname, names)
982 names = pycompat.maplist(repo._bookmarks.expandname, names)
983 bookmarks.delete(repo, tr, names)
983 bookmarks.delete(repo, tr, names)
984 elif rename:
984 elif rename:
985 if not names:
985 if not names:
986 raise error.Abort(_("new bookmark name required"))
986 raise error.Abort(_("new bookmark name required"))
987 elif len(names) > 1:
987 elif len(names) > 1:
988 raise error.Abort(_("only one new bookmark name allowed"))
988 raise error.Abort(_("only one new bookmark name allowed"))
989 rename = repo._bookmarks.expandname(rename)
989 rename = repo._bookmarks.expandname(rename)
990 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
990 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
991 elif names:
991 elif names:
992 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
992 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
993 elif inactive:
993 elif inactive:
994 if len(repo._bookmarks) == 0:
994 if len(repo._bookmarks) == 0:
995 ui.status(_("no bookmarks set\n"))
995 ui.status(_("no bookmarks set\n"))
996 elif not repo._activebookmark:
996 elif not repo._activebookmark:
997 ui.status(_("no active bookmark\n"))
997 ui.status(_("no active bookmark\n"))
998 else:
998 else:
999 bookmarks.deactivate(repo)
999 bookmarks.deactivate(repo)
1000 else: # show bookmarks
1000 else: # show bookmarks
1001 bookmarks.printbookmarks(ui, repo, **opts)
1001 bookmarks.printbookmarks(ui, repo, **opts)
1002
1002
1003 @command('branch',
1003 @command('branch',
1004 [('f', 'force', None,
1004 [('f', 'force', None,
1005 _('set branch name even if it shadows an existing branch')),
1005 _('set branch name even if it shadows an existing branch')),
1006 ('C', 'clean', None, _('reset branch name to parent branch name')),
1006 ('C', 'clean', None, _('reset branch name to parent branch name')),
1007 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1007 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1008 ],
1008 ],
1009 _('[-fC] [NAME]'))
1009 _('[-fC] [NAME]'))
1010 def branch(ui, repo, label=None, **opts):
1010 def branch(ui, repo, label=None, **opts):
1011 """set or show the current branch name
1011 """set or show the current branch name
1012
1012
1013 .. note::
1013 .. note::
1014
1014
1015 Branch names are permanent and global. Use :hg:`bookmark` to create a
1015 Branch names are permanent and global. Use :hg:`bookmark` to create a
1016 light-weight bookmark instead. See :hg:`help glossary` for more
1016 light-weight bookmark instead. See :hg:`help glossary` for more
1017 information about named branches and bookmarks.
1017 information about named branches and bookmarks.
1018
1018
1019 With no argument, show the current branch name. With one argument,
1019 With no argument, show the current branch name. With one argument,
1020 set the working directory branch name (the branch will not exist
1020 set the working directory branch name (the branch will not exist
1021 in the repository until the next commit). Standard practice
1021 in the repository until the next commit). Standard practice
1022 recommends that primary development take place on the 'default'
1022 recommends that primary development take place on the 'default'
1023 branch.
1023 branch.
1024
1024
1025 Unless -f/--force is specified, branch will not let you set a
1025 Unless -f/--force is specified, branch will not let you set a
1026 branch name that already exists.
1026 branch name that already exists.
1027
1027
1028 Use -C/--clean to reset the working directory branch to that of
1028 Use -C/--clean to reset the working directory branch to that of
1029 the parent of the working directory, negating a previous branch
1029 the parent of the working directory, negating a previous branch
1030 change.
1030 change.
1031
1031
1032 Use the command :hg:`update` to switch to an existing branch. Use
1032 Use the command :hg:`update` to switch to an existing branch. Use
1033 :hg:`commit --close-branch` to mark this branch head as closed.
1033 :hg:`commit --close-branch` to mark this branch head as closed.
1034 When all heads of a branch are closed, the branch will be
1034 When all heads of a branch are closed, the branch will be
1035 considered closed.
1035 considered closed.
1036
1036
1037 Returns 0 on success.
1037 Returns 0 on success.
1038 """
1038 """
1039 opts = pycompat.byteskwargs(opts)
1039 opts = pycompat.byteskwargs(opts)
1040 revs = opts.get('rev')
1040 revs = opts.get('rev')
1041 if label:
1041 if label:
1042 label = label.strip()
1042 label = label.strip()
1043
1043
1044 if not opts.get('clean') and not label:
1044 if not opts.get('clean') and not label:
1045 if revs:
1045 if revs:
1046 raise error.Abort(_("no branch name specified for the revisions"))
1046 raise error.Abort(_("no branch name specified for the revisions"))
1047 ui.write("%s\n" % repo.dirstate.branch())
1047 ui.write("%s\n" % repo.dirstate.branch())
1048 return
1048 return
1049
1049
1050 with repo.wlock():
1050 with repo.wlock():
1051 if opts.get('clean'):
1051 if opts.get('clean'):
1052 label = repo[None].p1().branch()
1052 label = repo[None].p1().branch()
1053 repo.dirstate.setbranch(label)
1053 repo.dirstate.setbranch(label)
1054 ui.status(_('reset working directory to branch %s\n') % label)
1054 ui.status(_('reset working directory to branch %s\n') % label)
1055 elif label:
1055 elif label:
1056
1056
1057 scmutil.checknewlabel(repo, label, 'branch')
1057 scmutil.checknewlabel(repo, label, 'branch')
1058 if revs:
1058 if revs:
1059 return cmdutil.changebranch(ui, repo, revs, label)
1059 return cmdutil.changebranch(ui, repo, revs, label)
1060
1060
1061 if not opts.get('force') and label in repo.branchmap():
1061 if not opts.get('force') and label in repo.branchmap():
1062 if label not in [p.branch() for p in repo[None].parents()]:
1062 if label not in [p.branch() for p in repo[None].parents()]:
1063 raise error.Abort(_('a branch of the same name already'
1063 raise error.Abort(_('a branch of the same name already'
1064 ' exists'),
1064 ' exists'),
1065 # i18n: "it" refers to an existing branch
1065 # i18n: "it" refers to an existing branch
1066 hint=_("use 'hg update' to switch to it"))
1066 hint=_("use 'hg update' to switch to it"))
1067
1067
1068 repo.dirstate.setbranch(label)
1068 repo.dirstate.setbranch(label)
1069 ui.status(_('marked working directory as branch %s\n') % label)
1069 ui.status(_('marked working directory as branch %s\n') % label)
1070
1070
1071 # find any open named branches aside from default
1071 # find any open named branches aside from default
1072 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1072 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1073 if n != "default" and not c]
1073 if n != "default" and not c]
1074 if not others:
1074 if not others:
1075 ui.status(_('(branches are permanent and global, '
1075 ui.status(_('(branches are permanent and global, '
1076 'did you want a bookmark?)\n'))
1076 'did you want a bookmark?)\n'))
1077
1077
1078 @command('branches',
1078 @command('branches',
1079 [('a', 'active', False,
1079 [('a', 'active', False,
1080 _('show only branches that have unmerged heads (DEPRECATED)')),
1080 _('show only branches that have unmerged heads (DEPRECATED)')),
1081 ('c', 'closed', False, _('show normal and closed branches')),
1081 ('c', 'closed', False, _('show normal and closed branches')),
1082 ] + formatteropts,
1082 ] + formatteropts,
1083 _('[-c]'), cmdtype=readonly)
1083 _('[-c]'), cmdtype=readonly)
1084 def branches(ui, repo, active=False, closed=False, **opts):
1084 def branches(ui, repo, active=False, closed=False, **opts):
1085 """list repository named branches
1085 """list repository named branches
1086
1086
1087 List the repository's named branches, indicating which ones are
1087 List the repository's named branches, indicating which ones are
1088 inactive. If -c/--closed is specified, also list branches which have
1088 inactive. If -c/--closed is specified, also list branches which have
1089 been marked closed (see :hg:`commit --close-branch`).
1089 been marked closed (see :hg:`commit --close-branch`).
1090
1090
1091 Use the command :hg:`update` to switch to an existing branch.
1091 Use the command :hg:`update` to switch to an existing branch.
1092
1092
1093 Returns 0.
1093 Returns 0.
1094 """
1094 """
1095
1095
1096 opts = pycompat.byteskwargs(opts)
1096 opts = pycompat.byteskwargs(opts)
1097 ui.pager('branches')
1097 ui.pager('branches')
1098 fm = ui.formatter('branches', opts)
1098 fm = ui.formatter('branches', opts)
1099 hexfunc = fm.hexfunc
1099 hexfunc = fm.hexfunc
1100
1100
1101 allheads = set(repo.heads())
1101 allheads = set(repo.heads())
1102 branches = []
1102 branches = []
1103 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1103 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1104 isactive = False
1104 isactive = False
1105 if not isclosed:
1105 if not isclosed:
1106 openheads = set(repo.branchmap().iteropen(heads))
1106 openheads = set(repo.branchmap().iteropen(heads))
1107 isactive = bool(openheads & allheads)
1107 isactive = bool(openheads & allheads)
1108 branches.append((tag, repo[tip], isactive, not isclosed))
1108 branches.append((tag, repo[tip], isactive, not isclosed))
1109 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1109 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1110 reverse=True)
1110 reverse=True)
1111
1111
1112 for tag, ctx, isactive, isopen in branches:
1112 for tag, ctx, isactive, isopen in branches:
1113 if active and not isactive:
1113 if active and not isactive:
1114 continue
1114 continue
1115 if isactive:
1115 if isactive:
1116 label = 'branches.active'
1116 label = 'branches.active'
1117 notice = ''
1117 notice = ''
1118 elif not isopen:
1118 elif not isopen:
1119 if not closed:
1119 if not closed:
1120 continue
1120 continue
1121 label = 'branches.closed'
1121 label = 'branches.closed'
1122 notice = _(' (closed)')
1122 notice = _(' (closed)')
1123 else:
1123 else:
1124 label = 'branches.inactive'
1124 label = 'branches.inactive'
1125 notice = _(' (inactive)')
1125 notice = _(' (inactive)')
1126 current = (tag == repo.dirstate.branch())
1126 current = (tag == repo.dirstate.branch())
1127 if current:
1127 if current:
1128 label = 'branches.current'
1128 label = 'branches.current'
1129
1129
1130 fm.startitem()
1130 fm.startitem()
1131 fm.write('branch', '%s', tag, label=label)
1131 fm.write('branch', '%s', tag, label=label)
1132 rev = ctx.rev()
1132 rev = ctx.rev()
1133 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1133 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1134 fmt = ' ' * padsize + ' %d:%s'
1134 fmt = ' ' * padsize + ' %d:%s'
1135 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1135 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1136 label='log.changeset changeset.%s' % ctx.phasestr())
1136 label='log.changeset changeset.%s' % ctx.phasestr())
1137 fm.context(ctx=ctx)
1137 fm.context(ctx=ctx)
1138 fm.data(active=isactive, closed=not isopen, current=current)
1138 fm.data(active=isactive, closed=not isopen, current=current)
1139 if not ui.quiet:
1139 if not ui.quiet:
1140 fm.plain(notice)
1140 fm.plain(notice)
1141 fm.plain('\n')
1141 fm.plain('\n')
1142 fm.end()
1142 fm.end()
1143
1143
1144 @command('bundle',
1144 @command('bundle',
1145 [('f', 'force', None, _('run even when the destination is unrelated')),
1145 [('f', 'force', None, _('run even when the destination is unrelated')),
1146 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1146 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1147 _('REV')),
1147 _('REV')),
1148 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1148 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1149 _('BRANCH')),
1149 _('BRANCH')),
1150 ('', 'base', [],
1150 ('', 'base', [],
1151 _('a base changeset assumed to be available at the destination'),
1151 _('a base changeset assumed to be available at the destination'),
1152 _('REV')),
1152 _('REV')),
1153 ('a', 'all', None, _('bundle all changesets in the repository')),
1153 ('a', 'all', None, _('bundle all changesets in the repository')),
1154 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1154 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1155 ] + remoteopts,
1155 ] + remoteopts,
1156 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1156 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1157 def bundle(ui, repo, fname, dest=None, **opts):
1157 def bundle(ui, repo, fname, dest=None, **opts):
1158 """create a bundle file
1158 """create a bundle file
1159
1159
1160 Generate a bundle file containing data to be added to a repository.
1160 Generate a bundle file containing data to be added to a repository.
1161
1161
1162 To create a bundle containing all changesets, use -a/--all
1162 To create a bundle containing all changesets, use -a/--all
1163 (or --base null). Otherwise, hg assumes the destination will have
1163 (or --base null). Otherwise, hg assumes the destination will have
1164 all the nodes you specify with --base parameters. Otherwise, hg
1164 all the nodes you specify with --base parameters. Otherwise, hg
1165 will assume the repository has all the nodes in destination, or
1165 will assume the repository has all the nodes in destination, or
1166 default-push/default if no destination is specified.
1166 default-push/default if no destination is specified.
1167
1167
1168 You can change bundle format with the -t/--type option. See
1168 You can change bundle format with the -t/--type option. See
1169 :hg:`help bundlespec` for documentation on this format. By default,
1169 :hg:`help bundlespec` for documentation on this format. By default,
1170 the most appropriate format is used and compression defaults to
1170 the most appropriate format is used and compression defaults to
1171 bzip2.
1171 bzip2.
1172
1172
1173 The bundle file can then be transferred using conventional means
1173 The bundle file can then be transferred using conventional means
1174 and applied to another repository with the unbundle or pull
1174 and applied to another repository with the unbundle or pull
1175 command. This is useful when direct push and pull are not
1175 command. This is useful when direct push and pull are not
1176 available or when exporting an entire repository is undesirable.
1176 available or when exporting an entire repository is undesirable.
1177
1177
1178 Applying bundles preserves all changeset contents including
1178 Applying bundles preserves all changeset contents including
1179 permissions, copy/rename information, and revision history.
1179 permissions, copy/rename information, and revision history.
1180
1180
1181 Returns 0 on success, 1 if no changes found.
1181 Returns 0 on success, 1 if no changes found.
1182 """
1182 """
1183 opts = pycompat.byteskwargs(opts)
1183 opts = pycompat.byteskwargs(opts)
1184 revs = None
1184 revs = None
1185 if 'rev' in opts:
1185 if 'rev' in opts:
1186 revstrings = opts['rev']
1186 revstrings = opts['rev']
1187 revs = scmutil.revrange(repo, revstrings)
1187 revs = scmutil.revrange(repo, revstrings)
1188 if revstrings and not revs:
1188 if revstrings and not revs:
1189 raise error.Abort(_('no commits to bundle'))
1189 raise error.Abort(_('no commits to bundle'))
1190
1190
1191 bundletype = opts.get('type', 'bzip2').lower()
1191 bundletype = opts.get('type', 'bzip2').lower()
1192 try:
1192 try:
1193 bcompression, cgversion, params = exchange.parsebundlespec(
1193 bcompression, cgversion, params = exchange.parsebundlespec(
1194 repo, bundletype, strict=False)
1194 repo, bundletype, strict=False)
1195 except error.UnsupportedBundleSpecification as e:
1195 except error.UnsupportedBundleSpecification as e:
1196 raise error.Abort(str(e),
1196 raise error.Abort(str(e),
1197 hint=_("see 'hg help bundlespec' for supported "
1197 hint=_("see 'hg help bundlespec' for supported "
1198 "values for --type"))
1198 "values for --type"))
1199
1199
1200 # Packed bundles are a pseudo bundle format for now.
1200 # Packed bundles are a pseudo bundle format for now.
1201 if cgversion == 's1':
1201 if cgversion == 's1':
1202 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1202 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1203 hint=_("use 'hg debugcreatestreamclonebundle'"))
1203 hint=_("use 'hg debugcreatestreamclonebundle'"))
1204
1204
1205 if opts.get('all'):
1205 if opts.get('all'):
1206 if dest:
1206 if dest:
1207 raise error.Abort(_("--all is incompatible with specifying "
1207 raise error.Abort(_("--all is incompatible with specifying "
1208 "a destination"))
1208 "a destination"))
1209 if opts.get('base'):
1209 if opts.get('base'):
1210 ui.warn(_("ignoring --base because --all was specified\n"))
1210 ui.warn(_("ignoring --base because --all was specified\n"))
1211 base = ['null']
1211 base = ['null']
1212 else:
1212 else:
1213 base = scmutil.revrange(repo, opts.get('base'))
1213 base = scmutil.revrange(repo, opts.get('base'))
1214 if cgversion not in changegroup.supportedoutgoingversions(repo):
1214 if cgversion not in changegroup.supportedoutgoingversions(repo):
1215 raise error.Abort(_("repository does not support bundle version %s") %
1215 raise error.Abort(_("repository does not support bundle version %s") %
1216 cgversion)
1216 cgversion)
1217
1217
1218 if base:
1218 if base:
1219 if dest:
1219 if dest:
1220 raise error.Abort(_("--base is incompatible with specifying "
1220 raise error.Abort(_("--base is incompatible with specifying "
1221 "a destination"))
1221 "a destination"))
1222 common = [repo.lookup(rev) for rev in base]
1222 common = [repo.lookup(rev) for rev in base]
1223 heads = [repo.lookup(r) for r in revs] if revs else None
1223 heads = [repo.lookup(r) for r in revs] if revs else None
1224 outgoing = discovery.outgoing(repo, common, heads)
1224 outgoing = discovery.outgoing(repo, common, heads)
1225 else:
1225 else:
1226 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1226 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1227 dest, branches = hg.parseurl(dest, opts.get('branch'))
1227 dest, branches = hg.parseurl(dest, opts.get('branch'))
1228 other = hg.peer(repo, opts, dest)
1228 other = hg.peer(repo, opts, dest)
1229 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1229 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1230 heads = revs and map(repo.lookup, revs) or revs
1230 heads = revs and map(repo.lookup, revs) or revs
1231 outgoing = discovery.findcommonoutgoing(repo, other,
1231 outgoing = discovery.findcommonoutgoing(repo, other,
1232 onlyheads=heads,
1232 onlyheads=heads,
1233 force=opts.get('force'),
1233 force=opts.get('force'),
1234 portable=True)
1234 portable=True)
1235
1235
1236 if not outgoing.missing:
1236 if not outgoing.missing:
1237 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1237 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1238 return 1
1238 return 1
1239
1239
1240 if cgversion == '01': #bundle1
1240 if cgversion == '01': #bundle1
1241 if bcompression is None:
1241 if bcompression is None:
1242 bcompression = 'UN'
1242 bcompression = 'UN'
1243 bversion = 'HG10' + bcompression
1243 bversion = 'HG10' + bcompression
1244 bcompression = None
1244 bcompression = None
1245 elif cgversion in ('02', '03'):
1245 elif cgversion in ('02', '03'):
1246 bversion = 'HG20'
1246 bversion = 'HG20'
1247 else:
1247 else:
1248 raise error.ProgrammingError(
1248 raise error.ProgrammingError(
1249 'bundle: unexpected changegroup version %s' % cgversion)
1249 'bundle: unexpected changegroup version %s' % cgversion)
1250
1250
1251 # TODO compression options should be derived from bundlespec parsing.
1251 # TODO compression options should be derived from bundlespec parsing.
1252 # This is a temporary hack to allow adjusting bundle compression
1252 # This is a temporary hack to allow adjusting bundle compression
1253 # level without a) formalizing the bundlespec changes to declare it
1253 # level without a) formalizing the bundlespec changes to declare it
1254 # b) introducing a command flag.
1254 # b) introducing a command flag.
1255 compopts = {}
1255 compopts = {}
1256 complevel = ui.configint('experimental', 'bundlecomplevel')
1256 complevel = ui.configint('experimental', 'bundlecomplevel')
1257 if complevel is not None:
1257 if complevel is not None:
1258 compopts['level'] = complevel
1258 compopts['level'] = complevel
1259
1259
1260
1260
1261 contentopts = {'cg.version': cgversion}
1261 contentopts = {'cg.version': cgversion}
1262 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1262 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1263 contentopts['obsolescence'] = True
1263 contentopts['obsolescence'] = True
1264 if repo.ui.configbool('experimental', 'bundle-phases'):
1264 if repo.ui.configbool('experimental', 'bundle-phases'):
1265 contentopts['phases'] = True
1265 contentopts['phases'] = True
1266 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1266 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1267 contentopts, compression=bcompression,
1267 contentopts, compression=bcompression,
1268 compopts=compopts)
1268 compopts=compopts)
1269
1269
1270 @command('cat',
1270 @command('cat',
1271 [('o', 'output', '',
1271 [('o', 'output', '',
1272 _('print output to file with formatted name'), _('FORMAT')),
1272 _('print output to file with formatted name'), _('FORMAT')),
1273 ('r', 'rev', '', _('print the given revision'), _('REV')),
1273 ('r', 'rev', '', _('print the given revision'), _('REV')),
1274 ('', 'decode', None, _('apply any matching decode filter')),
1274 ('', 'decode', None, _('apply any matching decode filter')),
1275 ] + walkopts + formatteropts,
1275 ] + walkopts + formatteropts,
1276 _('[OPTION]... FILE...'),
1276 _('[OPTION]... FILE...'),
1277 inferrepo=True, cmdtype=readonly)
1277 inferrepo=True, cmdtype=readonly)
1278 def cat(ui, repo, file1, *pats, **opts):
1278 def cat(ui, repo, file1, *pats, **opts):
1279 """output the current or given revision of files
1279 """output the current or given revision of files
1280
1280
1281 Print the specified files as they were at the given revision. If
1281 Print the specified files as they were at the given revision. If
1282 no revision is given, the parent of the working directory is used.
1282 no revision is given, the parent of the working directory is used.
1283
1283
1284 Output may be to a file, in which case the name of the file is
1284 Output may be to a file, in which case the name of the file is
1285 given using a format string. The formatting rules as follows:
1285 given using a format string. The formatting rules as follows:
1286
1286
1287 :``%%``: literal "%" character
1287 :``%%``: literal "%" character
1288 :``%s``: basename of file being printed
1288 :``%s``: basename of file being printed
1289 :``%d``: dirname of file being printed, or '.' if in repository root
1289 :``%d``: dirname of file being printed, or '.' if in repository root
1290 :``%p``: root-relative path name of file being printed
1290 :``%p``: root-relative path name of file being printed
1291 :``%H``: changeset hash (40 hexadecimal digits)
1291 :``%H``: changeset hash (40 hexadecimal digits)
1292 :``%R``: changeset revision number
1292 :``%R``: changeset revision number
1293 :``%h``: short-form changeset hash (12 hexadecimal digits)
1293 :``%h``: short-form changeset hash (12 hexadecimal digits)
1294 :``%r``: zero-padded changeset revision number
1294 :``%r``: zero-padded changeset revision number
1295 :``%b``: basename of the exporting repository
1295 :``%b``: basename of the exporting repository
1296
1296
1297 Returns 0 on success.
1297 Returns 0 on success.
1298 """
1298 """
1299 opts = pycompat.byteskwargs(opts)
1299 opts = pycompat.byteskwargs(opts)
1300 rev = opts.get('rev')
1300 rev = opts.get('rev')
1301 if rev:
1301 if rev:
1302 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1302 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1303 ctx = scmutil.revsingle(repo, rev)
1303 ctx = scmutil.revsingle(repo, rev)
1304 m = scmutil.match(ctx, (file1,) + pats, opts)
1304 m = scmutil.match(ctx, (file1,) + pats, opts)
1305 fntemplate = opts.pop('output', '')
1305 fntemplate = opts.pop('output', '')
1306 if cmdutil.isstdiofilename(fntemplate):
1306 if cmdutil.isstdiofilename(fntemplate):
1307 fntemplate = ''
1307 fntemplate = ''
1308
1308
1309 if fntemplate:
1309 if fntemplate:
1310 fm = formatter.nullformatter(ui, 'cat')
1310 fm = formatter.nullformatter(ui, 'cat')
1311 else:
1311 else:
1312 ui.pager('cat')
1312 ui.pager('cat')
1313 fm = ui.formatter('cat', opts)
1313 fm = ui.formatter('cat', opts)
1314 with fm:
1314 with fm:
1315 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1315 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1316 **pycompat.strkwargs(opts))
1316 **pycompat.strkwargs(opts))
1317
1317
1318 @command('^clone',
1318 @command('^clone',
1319 [('U', 'noupdate', None, _('the clone will include an empty working '
1319 [('U', 'noupdate', None, _('the clone will include an empty working '
1320 'directory (only a repository)')),
1320 'directory (only a repository)')),
1321 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1321 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1322 _('REV')),
1322 _('REV')),
1323 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1323 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1324 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1324 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1325 ('', 'pull', None, _('use pull protocol to copy metadata')),
1325 ('', 'pull', None, _('use pull protocol to copy metadata')),
1326 ('', 'uncompressed', None,
1326 ('', 'uncompressed', None,
1327 _('an alias to --stream (DEPRECATED)')),
1327 _('an alias to --stream (DEPRECATED)')),
1328 ('', 'stream', None,
1328 ('', 'stream', None,
1329 _('clone with minimal data processing')),
1329 _('clone with minimal data processing')),
1330 ] + remoteopts,
1330 ] + remoteopts,
1331 _('[OPTION]... SOURCE [DEST]'),
1331 _('[OPTION]... SOURCE [DEST]'),
1332 norepo=True)
1332 norepo=True)
1333 def clone(ui, source, dest=None, **opts):
1333 def clone(ui, source, dest=None, **opts):
1334 """make a copy of an existing repository
1334 """make a copy of an existing repository
1335
1335
1336 Create a copy of an existing repository in a new directory.
1336 Create a copy of an existing repository in a new directory.
1337
1337
1338 If no destination directory name is specified, it defaults to the
1338 If no destination directory name is specified, it defaults to the
1339 basename of the source.
1339 basename of the source.
1340
1340
1341 The location of the source is added to the new repository's
1341 The location of the source is added to the new repository's
1342 ``.hg/hgrc`` file, as the default to be used for future pulls.
1342 ``.hg/hgrc`` file, as the default to be used for future pulls.
1343
1343
1344 Only local paths and ``ssh://`` URLs are supported as
1344 Only local paths and ``ssh://`` URLs are supported as
1345 destinations. For ``ssh://`` destinations, no working directory or
1345 destinations. For ``ssh://`` destinations, no working directory or
1346 ``.hg/hgrc`` will be created on the remote side.
1346 ``.hg/hgrc`` will be created on the remote side.
1347
1347
1348 If the source repository has a bookmark called '@' set, that
1348 If the source repository has a bookmark called '@' set, that
1349 revision will be checked out in the new repository by default.
1349 revision will be checked out in the new repository by default.
1350
1350
1351 To check out a particular version, use -u/--update, or
1351 To check out a particular version, use -u/--update, or
1352 -U/--noupdate to create a clone with no working directory.
1352 -U/--noupdate to create a clone with no working directory.
1353
1353
1354 To pull only a subset of changesets, specify one or more revisions
1354 To pull only a subset of changesets, specify one or more revisions
1355 identifiers with -r/--rev or branches with -b/--branch. The
1355 identifiers with -r/--rev or branches with -b/--branch. The
1356 resulting clone will contain only the specified changesets and
1356 resulting clone will contain only the specified changesets and
1357 their ancestors. These options (or 'clone src#rev dest') imply
1357 their ancestors. These options (or 'clone src#rev dest') imply
1358 --pull, even for local source repositories.
1358 --pull, even for local source repositories.
1359
1359
1360 In normal clone mode, the remote normalizes repository data into a common
1360 In normal clone mode, the remote normalizes repository data into a common
1361 exchange format and the receiving end translates this data into its local
1361 exchange format and the receiving end translates this data into its local
1362 storage format. --stream activates a different clone mode that essentially
1362 storage format. --stream activates a different clone mode that essentially
1363 copies repository files from the remote with minimal data processing. This
1363 copies repository files from the remote with minimal data processing. This
1364 significantly reduces the CPU cost of a clone both remotely and locally.
1364 significantly reduces the CPU cost of a clone both remotely and locally.
1365 However, it often increases the transferred data size by 30-40%. This can
1365 However, it often increases the transferred data size by 30-40%. This can
1366 result in substantially faster clones where I/O throughput is plentiful,
1366 result in substantially faster clones where I/O throughput is plentiful,
1367 especially for larger repositories. A side-effect of --stream clones is
1367 especially for larger repositories. A side-effect of --stream clones is
1368 that storage settings and requirements on the remote are applied locally:
1368 that storage settings and requirements on the remote are applied locally:
1369 a modern client may inherit legacy or inefficient storage used by the
1369 a modern client may inherit legacy or inefficient storage used by the
1370 remote or a legacy Mercurial client may not be able to clone from a
1370 remote or a legacy Mercurial client may not be able to clone from a
1371 modern Mercurial remote.
1371 modern Mercurial remote.
1372
1372
1373 .. note::
1373 .. note::
1374
1374
1375 Specifying a tag will include the tagged changeset but not the
1375 Specifying a tag will include the tagged changeset but not the
1376 changeset containing the tag.
1376 changeset containing the tag.
1377
1377
1378 .. container:: verbose
1378 .. container:: verbose
1379
1379
1380 For efficiency, hardlinks are used for cloning whenever the
1380 For efficiency, hardlinks are used for cloning whenever the
1381 source and destination are on the same filesystem (note this
1381 source and destination are on the same filesystem (note this
1382 applies only to the repository data, not to the working
1382 applies only to the repository data, not to the working
1383 directory). Some filesystems, such as AFS, implement hardlinking
1383 directory). Some filesystems, such as AFS, implement hardlinking
1384 incorrectly, but do not report errors. In these cases, use the
1384 incorrectly, but do not report errors. In these cases, use the
1385 --pull option to avoid hardlinking.
1385 --pull option to avoid hardlinking.
1386
1386
1387 Mercurial will update the working directory to the first applicable
1387 Mercurial will update the working directory to the first applicable
1388 revision from this list:
1388 revision from this list:
1389
1389
1390 a) null if -U or the source repository has no changesets
1390 a) null if -U or the source repository has no changesets
1391 b) if -u . and the source repository is local, the first parent of
1391 b) if -u . and the source repository is local, the first parent of
1392 the source repository's working directory
1392 the source repository's working directory
1393 c) the changeset specified with -u (if a branch name, this means the
1393 c) the changeset specified with -u (if a branch name, this means the
1394 latest head of that branch)
1394 latest head of that branch)
1395 d) the changeset specified with -r
1395 d) the changeset specified with -r
1396 e) the tipmost head specified with -b
1396 e) the tipmost head specified with -b
1397 f) the tipmost head specified with the url#branch source syntax
1397 f) the tipmost head specified with the url#branch source syntax
1398 g) the revision marked with the '@' bookmark, if present
1398 g) the revision marked with the '@' bookmark, if present
1399 h) the tipmost head of the default branch
1399 h) the tipmost head of the default branch
1400 i) tip
1400 i) tip
1401
1401
1402 When cloning from servers that support it, Mercurial may fetch
1402 When cloning from servers that support it, Mercurial may fetch
1403 pre-generated data from a server-advertised URL. When this is done,
1403 pre-generated data from a server-advertised URL. When this is done,
1404 hooks operating on incoming changesets and changegroups may fire twice,
1404 hooks operating on incoming changesets and changegroups may fire twice,
1405 once for the bundle fetched from the URL and another for any additional
1405 once for the bundle fetched from the URL and another for any additional
1406 data not fetched from this URL. In addition, if an error occurs, the
1406 data not fetched from this URL. In addition, if an error occurs, the
1407 repository may be rolled back to a partial clone. This behavior may
1407 repository may be rolled back to a partial clone. This behavior may
1408 change in future releases. See :hg:`help -e clonebundles` for more.
1408 change in future releases. See :hg:`help -e clonebundles` for more.
1409
1409
1410 Examples:
1410 Examples:
1411
1411
1412 - clone a remote repository to a new directory named hg/::
1412 - clone a remote repository to a new directory named hg/::
1413
1413
1414 hg clone https://www.mercurial-scm.org/repo/hg/
1414 hg clone https://www.mercurial-scm.org/repo/hg/
1415
1415
1416 - create a lightweight local clone::
1416 - create a lightweight local clone::
1417
1417
1418 hg clone project/ project-feature/
1418 hg clone project/ project-feature/
1419
1419
1420 - clone from an absolute path on an ssh server (note double-slash)::
1420 - clone from an absolute path on an ssh server (note double-slash)::
1421
1421
1422 hg clone ssh://user@server//home/projects/alpha/
1422 hg clone ssh://user@server//home/projects/alpha/
1423
1423
1424 - do a streaming clone while checking out a specified version::
1424 - do a streaming clone while checking out a specified version::
1425
1425
1426 hg clone --stream http://server/repo -u 1.5
1426 hg clone --stream http://server/repo -u 1.5
1427
1427
1428 - create a repository without changesets after a particular revision::
1428 - create a repository without changesets after a particular revision::
1429
1429
1430 hg clone -r 04e544 experimental/ good/
1430 hg clone -r 04e544 experimental/ good/
1431
1431
1432 - clone (and track) a particular named branch::
1432 - clone (and track) a particular named branch::
1433
1433
1434 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1434 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1435
1435
1436 See :hg:`help urls` for details on specifying URLs.
1436 See :hg:`help urls` for details on specifying URLs.
1437
1437
1438 Returns 0 on success.
1438 Returns 0 on success.
1439 """
1439 """
1440 opts = pycompat.byteskwargs(opts)
1440 opts = pycompat.byteskwargs(opts)
1441 if opts.get('noupdate') and opts.get('updaterev'):
1441 if opts.get('noupdate') and opts.get('updaterev'):
1442 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1442 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1443
1443
1444 r = hg.clone(ui, opts, source, dest,
1444 r = hg.clone(ui, opts, source, dest,
1445 pull=opts.get('pull'),
1445 pull=opts.get('pull'),
1446 stream=opts.get('stream') or opts.get('uncompressed'),
1446 stream=opts.get('stream') or opts.get('uncompressed'),
1447 rev=opts.get('rev'),
1447 rev=opts.get('rev'),
1448 update=opts.get('updaterev') or not opts.get('noupdate'),
1448 update=opts.get('updaterev') or not opts.get('noupdate'),
1449 branch=opts.get('branch'),
1449 branch=opts.get('branch'),
1450 shareopts=opts.get('shareopts'))
1450 shareopts=opts.get('shareopts'))
1451
1451
1452 return r is None
1452 return r is None
1453
1453
1454 @command('^commit|ci',
1454 @command('^commit|ci',
1455 [('A', 'addremove', None,
1455 [('A', 'addremove', None,
1456 _('mark new/missing files as added/removed before committing')),
1456 _('mark new/missing files as added/removed before committing')),
1457 ('', 'close-branch', None,
1457 ('', 'close-branch', None,
1458 _('mark a branch head as closed')),
1458 _('mark a branch head as closed')),
1459 ('', 'amend', None, _('amend the parent of the working directory')),
1459 ('', 'amend', None, _('amend the parent of the working directory')),
1460 ('s', 'secret', None, _('use the secret phase for committing')),
1460 ('s', 'secret', None, _('use the secret phase for committing')),
1461 ('e', 'edit', None, _('invoke editor on commit messages')),
1461 ('e', 'edit', None, _('invoke editor on commit messages')),
1462 ('i', 'interactive', None, _('use interactive mode')),
1462 ('i', 'interactive', None, _('use interactive mode')),
1463 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1463 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1464 _('[OPTION]... [FILE]...'),
1464 _('[OPTION]... [FILE]...'),
1465 inferrepo=True)
1465 inferrepo=True)
1466 def commit(ui, repo, *pats, **opts):
1466 def commit(ui, repo, *pats, **opts):
1467 """commit the specified files or all outstanding changes
1467 """commit the specified files or all outstanding changes
1468
1468
1469 Commit changes to the given files into the repository. Unlike a
1469 Commit changes to the given files into the repository. Unlike a
1470 centralized SCM, this operation is a local operation. See
1470 centralized SCM, this operation is a local operation. See
1471 :hg:`push` for a way to actively distribute your changes.
1471 :hg:`push` for a way to actively distribute your changes.
1472
1472
1473 If a list of files is omitted, all changes reported by :hg:`status`
1473 If a list of files is omitted, all changes reported by :hg:`status`
1474 will be committed.
1474 will be committed.
1475
1475
1476 If you are committing the result of a merge, do not provide any
1476 If you are committing the result of a merge, do not provide any
1477 filenames or -I/-X filters.
1477 filenames or -I/-X filters.
1478
1478
1479 If no commit message is specified, Mercurial starts your
1479 If no commit message is specified, Mercurial starts your
1480 configured editor where you can enter a message. In case your
1480 configured editor where you can enter a message. In case your
1481 commit fails, you will find a backup of your message in
1481 commit fails, you will find a backup of your message in
1482 ``.hg/last-message.txt``.
1482 ``.hg/last-message.txt``.
1483
1483
1484 The --close-branch flag can be used to mark the current branch
1484 The --close-branch flag can be used to mark the current branch
1485 head closed. When all heads of a branch are closed, the branch
1485 head closed. When all heads of a branch are closed, the branch
1486 will be considered closed and no longer listed.
1486 will be considered closed and no longer listed.
1487
1487
1488 The --amend flag can be used to amend the parent of the
1488 The --amend flag can be used to amend the parent of the
1489 working directory with a new commit that contains the changes
1489 working directory with a new commit that contains the changes
1490 in the parent in addition to those currently reported by :hg:`status`,
1490 in the parent in addition to those currently reported by :hg:`status`,
1491 if there are any. The old commit is stored in a backup bundle in
1491 if there are any. The old commit is stored in a backup bundle in
1492 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1492 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1493 on how to restore it).
1493 on how to restore it).
1494
1494
1495 Message, user and date are taken from the amended commit unless
1495 Message, user and date are taken from the amended commit unless
1496 specified. When a message isn't specified on the command line,
1496 specified. When a message isn't specified on the command line,
1497 the editor will open with the message of the amended commit.
1497 the editor will open with the message of the amended commit.
1498
1498
1499 It is not possible to amend public changesets (see :hg:`help phases`)
1499 It is not possible to amend public changesets (see :hg:`help phases`)
1500 or changesets that have children.
1500 or changesets that have children.
1501
1501
1502 See :hg:`help dates` for a list of formats valid for -d/--date.
1502 See :hg:`help dates` for a list of formats valid for -d/--date.
1503
1503
1504 Returns 0 on success, 1 if nothing changed.
1504 Returns 0 on success, 1 if nothing changed.
1505
1505
1506 .. container:: verbose
1506 .. container:: verbose
1507
1507
1508 Examples:
1508 Examples:
1509
1509
1510 - commit all files ending in .py::
1510 - commit all files ending in .py::
1511
1511
1512 hg commit --include "set:**.py"
1512 hg commit --include "set:**.py"
1513
1513
1514 - commit all non-binary files::
1514 - commit all non-binary files::
1515
1515
1516 hg commit --exclude "set:binary()"
1516 hg commit --exclude "set:binary()"
1517
1517
1518 - amend the current commit and set the date to now::
1518 - amend the current commit and set the date to now::
1519
1519
1520 hg commit --amend --date now
1520 hg commit --amend --date now
1521 """
1521 """
1522 wlock = lock = None
1522 wlock = lock = None
1523 try:
1523 try:
1524 wlock = repo.wlock()
1524 wlock = repo.wlock()
1525 lock = repo.lock()
1525 lock = repo.lock()
1526 return _docommit(ui, repo, *pats, **opts)
1526 return _docommit(ui, repo, *pats, **opts)
1527 finally:
1527 finally:
1528 release(lock, wlock)
1528 release(lock, wlock)
1529
1529
1530 def _docommit(ui, repo, *pats, **opts):
1530 def _docommit(ui, repo, *pats, **opts):
1531 if opts.get(r'interactive'):
1531 if opts.get(r'interactive'):
1532 opts.pop(r'interactive')
1532 opts.pop(r'interactive')
1533 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1533 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1534 cmdutil.recordfilter, *pats,
1534 cmdutil.recordfilter, *pats,
1535 **opts)
1535 **opts)
1536 # ret can be 0 (no changes to record) or the value returned by
1536 # ret can be 0 (no changes to record) or the value returned by
1537 # commit(), 1 if nothing changed or None on success.
1537 # commit(), 1 if nothing changed or None on success.
1538 return 1 if ret == 0 else ret
1538 return 1 if ret == 0 else ret
1539
1539
1540 opts = pycompat.byteskwargs(opts)
1540 opts = pycompat.byteskwargs(opts)
1541 if opts.get('subrepos'):
1541 if opts.get('subrepos'):
1542 if opts.get('amend'):
1542 if opts.get('amend'):
1543 raise error.Abort(_('cannot amend with --subrepos'))
1543 raise error.Abort(_('cannot amend with --subrepos'))
1544 # Let --subrepos on the command line override config setting.
1544 # Let --subrepos on the command line override config setting.
1545 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1545 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1546
1546
1547 cmdutil.checkunfinished(repo, commit=True)
1547 cmdutil.checkunfinished(repo, commit=True)
1548
1548
1549 branch = repo[None].branch()
1549 branch = repo[None].branch()
1550 bheads = repo.branchheads(branch)
1550 bheads = repo.branchheads(branch)
1551
1551
1552 extra = {}
1552 extra = {}
1553 if opts.get('close_branch'):
1553 if opts.get('close_branch'):
1554 extra['close'] = '1'
1554 extra['close'] = '1'
1555
1555
1556 if not bheads:
1556 if not bheads:
1557 raise error.Abort(_('can only close branch heads'))
1557 raise error.Abort(_('can only close branch heads'))
1558 elif opts.get('amend'):
1558 elif opts.get('amend'):
1559 if repo[None].parents()[0].p1().branch() != branch and \
1559 if repo[None].parents()[0].p1().branch() != branch and \
1560 repo[None].parents()[0].p2().branch() != branch:
1560 repo[None].parents()[0].p2().branch() != branch:
1561 raise error.Abort(_('can only close branch heads'))
1561 raise error.Abort(_('can only close branch heads'))
1562
1562
1563 if opts.get('amend'):
1563 if opts.get('amend'):
1564 if ui.configbool('ui', 'commitsubrepos'):
1564 if ui.configbool('ui', 'commitsubrepos'):
1565 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1565 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1566
1566
1567 old = repo['.']
1567 old = repo['.']
1568 rewriteutil.precheck(repo, [old.rev()], 'amend')
1568 rewriteutil.precheck(repo, [old.rev()], 'amend')
1569
1569
1570 # Currently histedit gets confused if an amend happens while histedit
1570 # Currently histedit gets confused if an amend happens while histedit
1571 # is in progress. Since we have a checkunfinished command, we are
1571 # is in progress. Since we have a checkunfinished command, we are
1572 # temporarily honoring it.
1572 # temporarily honoring it.
1573 #
1573 #
1574 # Note: eventually this guard will be removed. Please do not expect
1574 # Note: eventually this guard will be removed. Please do not expect
1575 # this behavior to remain.
1575 # this behavior to remain.
1576 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1576 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1577 cmdutil.checkunfinished(repo)
1577 cmdutil.checkunfinished(repo)
1578
1578
1579 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1579 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1580 if node == old.node():
1580 if node == old.node():
1581 ui.status(_("nothing changed\n"))
1581 ui.status(_("nothing changed\n"))
1582 return 1
1582 return 1
1583 else:
1583 else:
1584 def commitfunc(ui, repo, message, match, opts):
1584 def commitfunc(ui, repo, message, match, opts):
1585 overrides = {}
1585 overrides = {}
1586 if opts.get('secret'):
1586 if opts.get('secret'):
1587 overrides[('phases', 'new-commit')] = 'secret'
1587 overrides[('phases', 'new-commit')] = 'secret'
1588
1588
1589 baseui = repo.baseui
1589 baseui = repo.baseui
1590 with baseui.configoverride(overrides, 'commit'):
1590 with baseui.configoverride(overrides, 'commit'):
1591 with ui.configoverride(overrides, 'commit'):
1591 with ui.configoverride(overrides, 'commit'):
1592 editform = cmdutil.mergeeditform(repo[None],
1592 editform = cmdutil.mergeeditform(repo[None],
1593 'commit.normal')
1593 'commit.normal')
1594 editor = cmdutil.getcommiteditor(
1594 editor = cmdutil.getcommiteditor(
1595 editform=editform, **pycompat.strkwargs(opts))
1595 editform=editform, **pycompat.strkwargs(opts))
1596 return repo.commit(message,
1596 return repo.commit(message,
1597 opts.get('user'),
1597 opts.get('user'),
1598 opts.get('date'),
1598 opts.get('date'),
1599 match,
1599 match,
1600 editor=editor,
1600 editor=editor,
1601 extra=extra)
1601 extra=extra)
1602
1602
1603 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1603 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1604
1604
1605 if not node:
1605 if not node:
1606 stat = cmdutil.postcommitstatus(repo, pats, opts)
1606 stat = cmdutil.postcommitstatus(repo, pats, opts)
1607 if stat[3]:
1607 if stat[3]:
1608 ui.status(_("nothing changed (%d missing files, see "
1608 ui.status(_("nothing changed (%d missing files, see "
1609 "'hg status')\n") % len(stat[3]))
1609 "'hg status')\n") % len(stat[3]))
1610 else:
1610 else:
1611 ui.status(_("nothing changed\n"))
1611 ui.status(_("nothing changed\n"))
1612 return 1
1612 return 1
1613
1613
1614 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1614 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1615
1615
1616 @command('config|showconfig|debugconfig',
1616 @command('config|showconfig|debugconfig',
1617 [('u', 'untrusted', None, _('show untrusted configuration options')),
1617 [('u', 'untrusted', None, _('show untrusted configuration options')),
1618 ('e', 'edit', None, _('edit user config')),
1618 ('e', 'edit', None, _('edit user config')),
1619 ('l', 'local', None, _('edit repository config')),
1619 ('l', 'local', None, _('edit repository config')),
1620 ('g', 'global', None, _('edit global config'))] + formatteropts,
1620 ('g', 'global', None, _('edit global config'))] + formatteropts,
1621 _('[-u] [NAME]...'),
1621 _('[-u] [NAME]...'),
1622 optionalrepo=True, cmdtype=readonly)
1622 optionalrepo=True, cmdtype=readonly)
1623 def config(ui, repo, *values, **opts):
1623 def config(ui, repo, *values, **opts):
1624 """show combined config settings from all hgrc files
1624 """show combined config settings from all hgrc files
1625
1625
1626 With no arguments, print names and values of all config items.
1626 With no arguments, print names and values of all config items.
1627
1627
1628 With one argument of the form section.name, print just the value
1628 With one argument of the form section.name, print just the value
1629 of that config item.
1629 of that config item.
1630
1630
1631 With multiple arguments, print names and values of all config
1631 With multiple arguments, print names and values of all config
1632 items with matching section names.
1632 items with matching section names.
1633
1633
1634 With --edit, start an editor on the user-level config file. With
1634 With --edit, start an editor on the user-level config file. With
1635 --global, edit the system-wide config file. With --local, edit the
1635 --global, edit the system-wide config file. With --local, edit the
1636 repository-level config file.
1636 repository-level config file.
1637
1637
1638 With --debug, the source (filename and line number) is printed
1638 With --debug, the source (filename and line number) is printed
1639 for each config item.
1639 for each config item.
1640
1640
1641 See :hg:`help config` for more information about config files.
1641 See :hg:`help config` for more information about config files.
1642
1642
1643 Returns 0 on success, 1 if NAME does not exist.
1643 Returns 0 on success, 1 if NAME does not exist.
1644
1644
1645 """
1645 """
1646
1646
1647 opts = pycompat.byteskwargs(opts)
1647 opts = pycompat.byteskwargs(opts)
1648 if opts.get('edit') or opts.get('local') or opts.get('global'):
1648 if opts.get('edit') or opts.get('local') or opts.get('global'):
1649 if opts.get('local') and opts.get('global'):
1649 if opts.get('local') and opts.get('global'):
1650 raise error.Abort(_("can't use --local and --global together"))
1650 raise error.Abort(_("can't use --local and --global together"))
1651
1651
1652 if opts.get('local'):
1652 if opts.get('local'):
1653 if not repo:
1653 if not repo:
1654 raise error.Abort(_("can't use --local outside a repository"))
1654 raise error.Abort(_("can't use --local outside a repository"))
1655 paths = [repo.vfs.join('hgrc')]
1655 paths = [repo.vfs.join('hgrc')]
1656 elif opts.get('global'):
1656 elif opts.get('global'):
1657 paths = rcutil.systemrcpath()
1657 paths = rcutil.systemrcpath()
1658 else:
1658 else:
1659 paths = rcutil.userrcpath()
1659 paths = rcutil.userrcpath()
1660
1660
1661 for f in paths:
1661 for f in paths:
1662 if os.path.exists(f):
1662 if os.path.exists(f):
1663 break
1663 break
1664 else:
1664 else:
1665 if opts.get('global'):
1665 if opts.get('global'):
1666 samplehgrc = uimod.samplehgrcs['global']
1666 samplehgrc = uimod.samplehgrcs['global']
1667 elif opts.get('local'):
1667 elif opts.get('local'):
1668 samplehgrc = uimod.samplehgrcs['local']
1668 samplehgrc = uimod.samplehgrcs['local']
1669 else:
1669 else:
1670 samplehgrc = uimod.samplehgrcs['user']
1670 samplehgrc = uimod.samplehgrcs['user']
1671
1671
1672 f = paths[0]
1672 f = paths[0]
1673 fp = open(f, "wb")
1673 fp = open(f, "wb")
1674 fp.write(util.tonativeeol(samplehgrc))
1674 fp.write(util.tonativeeol(samplehgrc))
1675 fp.close()
1675 fp.close()
1676
1676
1677 editor = ui.geteditor()
1677 editor = ui.geteditor()
1678 ui.system("%s \"%s\"" % (editor, f),
1678 ui.system("%s \"%s\"" % (editor, f),
1679 onerr=error.Abort, errprefix=_("edit failed"),
1679 onerr=error.Abort, errprefix=_("edit failed"),
1680 blockedtag='config_edit')
1680 blockedtag='config_edit')
1681 return
1681 return
1682 ui.pager('config')
1682 ui.pager('config')
1683 fm = ui.formatter('config', opts)
1683 fm = ui.formatter('config', opts)
1684 for t, f in rcutil.rccomponents():
1684 for t, f in rcutil.rccomponents():
1685 if t == 'path':
1685 if t == 'path':
1686 ui.debug('read config from: %s\n' % f)
1686 ui.debug('read config from: %s\n' % f)
1687 elif t == 'items':
1687 elif t == 'items':
1688 for section, name, value, source in f:
1688 for section, name, value, source in f:
1689 ui.debug('set config by: %s\n' % source)
1689 ui.debug('set config by: %s\n' % source)
1690 else:
1690 else:
1691 raise error.ProgrammingError('unknown rctype: %s' % t)
1691 raise error.ProgrammingError('unknown rctype: %s' % t)
1692 untrusted = bool(opts.get('untrusted'))
1692 untrusted = bool(opts.get('untrusted'))
1693 if values:
1693 if values:
1694 sections = [v for v in values if '.' not in v]
1694 sections = [v for v in values if '.' not in v]
1695 items = [v for v in values if '.' in v]
1695 items = [v for v in values if '.' in v]
1696 if len(items) > 1 or items and sections:
1696 if len(items) > 1 or items and sections:
1697 raise error.Abort(_('only one config item permitted'))
1697 raise error.Abort(_('only one config item permitted'))
1698 matched = False
1698 matched = False
1699 for section, name, value in ui.walkconfig(untrusted=untrusted):
1699 for section, name, value in ui.walkconfig(untrusted=untrusted):
1700 source = ui.configsource(section, name, untrusted)
1700 source = ui.configsource(section, name, untrusted)
1701 value = pycompat.bytestr(value)
1701 value = pycompat.bytestr(value)
1702 if fm.isplain():
1702 if fm.isplain():
1703 source = source or 'none'
1703 source = source or 'none'
1704 value = value.replace('\n', '\\n')
1704 value = value.replace('\n', '\\n')
1705 entryname = section + '.' + name
1705 entryname = section + '.' + name
1706 if values:
1706 if values:
1707 for v in values:
1707 for v in values:
1708 if v == section:
1708 if v == section:
1709 fm.startitem()
1709 fm.startitem()
1710 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1710 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1711 fm.write('name value', '%s=%s\n', entryname, value)
1711 fm.write('name value', '%s=%s\n', entryname, value)
1712 matched = True
1712 matched = True
1713 elif v == entryname:
1713 elif v == entryname:
1714 fm.startitem()
1714 fm.startitem()
1715 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1715 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1716 fm.write('value', '%s\n', value)
1716 fm.write('value', '%s\n', value)
1717 fm.data(name=entryname)
1717 fm.data(name=entryname)
1718 matched = True
1718 matched = True
1719 else:
1719 else:
1720 fm.startitem()
1720 fm.startitem()
1721 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1721 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1722 fm.write('name value', '%s=%s\n', entryname, value)
1722 fm.write('name value', '%s=%s\n', entryname, value)
1723 matched = True
1723 matched = True
1724 fm.end()
1724 fm.end()
1725 if matched:
1725 if matched:
1726 return 0
1726 return 0
1727 return 1
1727 return 1
1728
1728
1729 @command('copy|cp',
1729 @command('copy|cp',
1730 [('A', 'after', None, _('record a copy that has already occurred')),
1730 [('A', 'after', None, _('record a copy that has already occurred')),
1731 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1731 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1732 ] + walkopts + dryrunopts,
1732 ] + walkopts + dryrunopts,
1733 _('[OPTION]... [SOURCE]... DEST'))
1733 _('[OPTION]... [SOURCE]... DEST'))
1734 def copy(ui, repo, *pats, **opts):
1734 def copy(ui, repo, *pats, **opts):
1735 """mark files as copied for the next commit
1735 """mark files as copied for the next commit
1736
1736
1737 Mark dest as having copies of source files. If dest is a
1737 Mark dest as having copies of source files. If dest is a
1738 directory, copies are put in that directory. If dest is a file,
1738 directory, copies are put in that directory. If dest is a file,
1739 the source must be a single file.
1739 the source must be a single file.
1740
1740
1741 By default, this command copies the contents of files as they
1741 By default, this command copies the contents of files as they
1742 exist in the working directory. If invoked with -A/--after, the
1742 exist in the working directory. If invoked with -A/--after, the
1743 operation is recorded, but no copying is performed.
1743 operation is recorded, but no copying is performed.
1744
1744
1745 This command takes effect with the next commit. To undo a copy
1745 This command takes effect with the next commit. To undo a copy
1746 before that, see :hg:`revert`.
1746 before that, see :hg:`revert`.
1747
1747
1748 Returns 0 on success, 1 if errors are encountered.
1748 Returns 0 on success, 1 if errors are encountered.
1749 """
1749 """
1750 opts = pycompat.byteskwargs(opts)
1750 opts = pycompat.byteskwargs(opts)
1751 with repo.wlock(False):
1751 with repo.wlock(False):
1752 return cmdutil.copy(ui, repo, pats, opts)
1752 return cmdutil.copy(ui, repo, pats, opts)
1753
1753
1754 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1754 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1755 def debugcommands(ui, cmd='', *args):
1755 def debugcommands(ui, cmd='', *args):
1756 """list all available commands and options"""
1756 """list all available commands and options"""
1757 for cmd, vals in sorted(table.iteritems()):
1757 for cmd, vals in sorted(table.iteritems()):
1758 cmd = cmd.split('|')[0].strip('^')
1758 cmd = cmd.split('|')[0].strip('^')
1759 opts = ', '.join([i[1] for i in vals[1]])
1759 opts = ', '.join([i[1] for i in vals[1]])
1760 ui.write('%s: %s\n' % (cmd, opts))
1760 ui.write('%s: %s\n' % (cmd, opts))
1761
1761
1762 @command('debugcomplete',
1762 @command('debugcomplete',
1763 [('o', 'options', None, _('show the command options'))],
1763 [('o', 'options', None, _('show the command options'))],
1764 _('[-o] CMD'),
1764 _('[-o] CMD'),
1765 norepo=True)
1765 norepo=True)
1766 def debugcomplete(ui, cmd='', **opts):
1766 def debugcomplete(ui, cmd='', **opts):
1767 """returns the completion list associated with the given command"""
1767 """returns the completion list associated with the given command"""
1768
1768
1769 if opts.get(r'options'):
1769 if opts.get(r'options'):
1770 options = []
1770 options = []
1771 otables = [globalopts]
1771 otables = [globalopts]
1772 if cmd:
1772 if cmd:
1773 aliases, entry = cmdutil.findcmd(cmd, table, False)
1773 aliases, entry = cmdutil.findcmd(cmd, table, False)
1774 otables.append(entry[1])
1774 otables.append(entry[1])
1775 for t in otables:
1775 for t in otables:
1776 for o in t:
1776 for o in t:
1777 if "(DEPRECATED)" in o[3]:
1777 if "(DEPRECATED)" in o[3]:
1778 continue
1778 continue
1779 if o[0]:
1779 if o[0]:
1780 options.append('-%s' % o[0])
1780 options.append('-%s' % o[0])
1781 options.append('--%s' % o[1])
1781 options.append('--%s' % o[1])
1782 ui.write("%s\n" % "\n".join(options))
1782 ui.write("%s\n" % "\n".join(options))
1783 return
1783 return
1784
1784
1785 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1785 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1786 if ui.verbose:
1786 if ui.verbose:
1787 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1787 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1788 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1788 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1789
1789
1790 @command('^diff',
1790 @command('^diff',
1791 [('r', 'rev', [], _('revision'), _('REV')),
1791 [('r', 'rev', [], _('revision'), _('REV')),
1792 ('c', 'change', '', _('change made by revision'), _('REV'))
1792 ('c', 'change', '', _('change made by revision'), _('REV'))
1793 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1793 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1794 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1794 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1795 inferrepo=True, cmdtype=readonly)
1795 inferrepo=True, cmdtype=readonly)
1796 def diff(ui, repo, *pats, **opts):
1796 def diff(ui, repo, *pats, **opts):
1797 """diff repository (or selected files)
1797 """diff repository (or selected files)
1798
1798
1799 Show differences between revisions for the specified files.
1799 Show differences between revisions for the specified files.
1800
1800
1801 Differences between files are shown using the unified diff format.
1801 Differences between files are shown using the unified diff format.
1802
1802
1803 .. note::
1803 .. note::
1804
1804
1805 :hg:`diff` may generate unexpected results for merges, as it will
1805 :hg:`diff` may generate unexpected results for merges, as it will
1806 default to comparing against the working directory's first
1806 default to comparing against the working directory's first
1807 parent changeset if no revisions are specified.
1807 parent changeset if no revisions are specified.
1808
1808
1809 When two revision arguments are given, then changes are shown
1809 When two revision arguments are given, then changes are shown
1810 between those revisions. If only one revision is specified then
1810 between those revisions. If only one revision is specified then
1811 that revision is compared to the working directory, and, when no
1811 that revision is compared to the working directory, and, when no
1812 revisions are specified, the working directory files are compared
1812 revisions are specified, the working directory files are compared
1813 to its first parent.
1813 to its first parent.
1814
1814
1815 Alternatively you can specify -c/--change with a revision to see
1815 Alternatively you can specify -c/--change with a revision to see
1816 the changes in that changeset relative to its first parent.
1816 the changes in that changeset relative to its first parent.
1817
1817
1818 Without the -a/--text option, diff will avoid generating diffs of
1818 Without the -a/--text option, diff will avoid generating diffs of
1819 files it detects as binary. With -a, diff will generate a diff
1819 files it detects as binary. With -a, diff will generate a diff
1820 anyway, probably with undesirable results.
1820 anyway, probably with undesirable results.
1821
1821
1822 Use the -g/--git option to generate diffs in the git extended diff
1822 Use the -g/--git option to generate diffs in the git extended diff
1823 format. For more information, read :hg:`help diffs`.
1823 format. For more information, read :hg:`help diffs`.
1824
1824
1825 .. container:: verbose
1825 .. container:: verbose
1826
1826
1827 Examples:
1827 Examples:
1828
1828
1829 - compare a file in the current working directory to its parent::
1829 - compare a file in the current working directory to its parent::
1830
1830
1831 hg diff foo.c
1831 hg diff foo.c
1832
1832
1833 - compare two historical versions of a directory, with rename info::
1833 - compare two historical versions of a directory, with rename info::
1834
1834
1835 hg diff --git -r 1.0:1.2 lib/
1835 hg diff --git -r 1.0:1.2 lib/
1836
1836
1837 - get change stats relative to the last change on some date::
1837 - get change stats relative to the last change on some date::
1838
1838
1839 hg diff --stat -r "date('may 2')"
1839 hg diff --stat -r "date('may 2')"
1840
1840
1841 - diff all newly-added files that contain a keyword::
1841 - diff all newly-added files that contain a keyword::
1842
1842
1843 hg diff "set:added() and grep(GNU)"
1843 hg diff "set:added() and grep(GNU)"
1844
1844
1845 - compare a revision and its parents::
1845 - compare a revision and its parents::
1846
1846
1847 hg diff -c 9353 # compare against first parent
1847 hg diff -c 9353 # compare against first parent
1848 hg diff -r 9353^:9353 # same using revset syntax
1848 hg diff -r 9353^:9353 # same using revset syntax
1849 hg diff -r 9353^2:9353 # compare against the second parent
1849 hg diff -r 9353^2:9353 # compare against the second parent
1850
1850
1851 Returns 0 on success.
1851 Returns 0 on success.
1852 """
1852 """
1853
1853
1854 opts = pycompat.byteskwargs(opts)
1854 opts = pycompat.byteskwargs(opts)
1855 revs = opts.get('rev')
1855 revs = opts.get('rev')
1856 change = opts.get('change')
1856 change = opts.get('change')
1857 stat = opts.get('stat')
1857 stat = opts.get('stat')
1858 reverse = opts.get('reverse')
1858 reverse = opts.get('reverse')
1859
1859
1860 if revs and change:
1860 if revs and change:
1861 msg = _('cannot specify --rev and --change at the same time')
1861 msg = _('cannot specify --rev and --change at the same time')
1862 raise error.Abort(msg)
1862 raise error.Abort(msg)
1863 elif change:
1863 elif change:
1864 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1864 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1865 node2 = scmutil.revsingle(repo, change, None).node()
1865 node2 = scmutil.revsingle(repo, change, None).node()
1866 node1 = repo[node2].p1().node()
1866 node1 = repo[node2].p1().node()
1867 else:
1867 else:
1868 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1868 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1869 node1, node2 = scmutil.revpair(repo, revs)
1869 node1, node2 = scmutil.revpair(repo, revs)
1870
1870
1871 if reverse:
1871 if reverse:
1872 node1, node2 = node2, node1
1872 node1, node2 = node2, node1
1873
1873
1874 diffopts = patch.diffallopts(ui, opts)
1874 diffopts = patch.diffallopts(ui, opts)
1875 m = scmutil.match(repo[node2], pats, opts)
1875 m = scmutil.match(repo[node2], pats, opts)
1876 ui.pager('diff')
1876 ui.pager('diff')
1877 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1877 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1878 listsubrepos=opts.get('subrepos'),
1878 listsubrepos=opts.get('subrepos'),
1879 root=opts.get('root'))
1879 root=opts.get('root'))
1880
1880
1881 @command('^export',
1881 @command('^export',
1882 [('o', 'output', '',
1882 [('o', 'output', '',
1883 _('print output to file with formatted name'), _('FORMAT')),
1883 _('print output to file with formatted name'), _('FORMAT')),
1884 ('', 'switch-parent', None, _('diff against the second parent')),
1884 ('', 'switch-parent', None, _('diff against the second parent')),
1885 ('r', 'rev', [], _('revisions to export'), _('REV')),
1885 ('r', 'rev', [], _('revisions to export'), _('REV')),
1886 ] + diffopts,
1886 ] + diffopts,
1887 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly)
1887 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly)
1888 def export(ui, repo, *changesets, **opts):
1888 def export(ui, repo, *changesets, **opts):
1889 """dump the header and diffs for one or more changesets
1889 """dump the header and diffs for one or more changesets
1890
1890
1891 Print the changeset header and diffs for one or more revisions.
1891 Print the changeset header and diffs for one or more revisions.
1892 If no revision is given, the parent of the working directory is used.
1892 If no revision is given, the parent of the working directory is used.
1893
1893
1894 The information shown in the changeset header is: author, date,
1894 The information shown in the changeset header is: author, date,
1895 branch name (if non-default), changeset hash, parent(s) and commit
1895 branch name (if non-default), changeset hash, parent(s) and commit
1896 comment.
1896 comment.
1897
1897
1898 .. note::
1898 .. note::
1899
1899
1900 :hg:`export` may generate unexpected diff output for merge
1900 :hg:`export` may generate unexpected diff output for merge
1901 changesets, as it will compare the merge changeset against its
1901 changesets, as it will compare the merge changeset against its
1902 first parent only.
1902 first parent only.
1903
1903
1904 Output may be to a file, in which case the name of the file is
1904 Output may be to a file, in which case the name of the file is
1905 given using a format string. The formatting rules are as follows:
1905 given using a format string. The formatting rules are as follows:
1906
1906
1907 :``%%``: literal "%" character
1907 :``%%``: literal "%" character
1908 :``%H``: changeset hash (40 hexadecimal digits)
1908 :``%H``: changeset hash (40 hexadecimal digits)
1909 :``%N``: number of patches being generated
1909 :``%N``: number of patches being generated
1910 :``%R``: changeset revision number
1910 :``%R``: changeset revision number
1911 :``%b``: basename of the exporting repository
1911 :``%b``: basename of the exporting repository
1912 :``%h``: short-form changeset hash (12 hexadecimal digits)
1912 :``%h``: short-form changeset hash (12 hexadecimal digits)
1913 :``%m``: first line of the commit message (only alphanumeric characters)
1913 :``%m``: first line of the commit message (only alphanumeric characters)
1914 :``%n``: zero-padded sequence number, starting at 1
1914 :``%n``: zero-padded sequence number, starting at 1
1915 :``%r``: zero-padded changeset revision number
1915 :``%r``: zero-padded changeset revision number
1916
1916
1917 Without the -a/--text option, export will avoid generating diffs
1917 Without the -a/--text option, export will avoid generating diffs
1918 of files it detects as binary. With -a, export will generate a
1918 of files it detects as binary. With -a, export will generate a
1919 diff anyway, probably with undesirable results.
1919 diff anyway, probably with undesirable results.
1920
1920
1921 Use the -g/--git option to generate diffs in the git extended diff
1921 Use the -g/--git option to generate diffs in the git extended diff
1922 format. See :hg:`help diffs` for more information.
1922 format. See :hg:`help diffs` for more information.
1923
1923
1924 With the --switch-parent option, the diff will be against the
1924 With the --switch-parent option, the diff will be against the
1925 second parent. It can be useful to review a merge.
1925 second parent. It can be useful to review a merge.
1926
1926
1927 .. container:: verbose
1927 .. container:: verbose
1928
1928
1929 Examples:
1929 Examples:
1930
1930
1931 - use export and import to transplant a bugfix to the current
1931 - use export and import to transplant a bugfix to the current
1932 branch::
1932 branch::
1933
1933
1934 hg export -r 9353 | hg import -
1934 hg export -r 9353 | hg import -
1935
1935
1936 - export all the changesets between two revisions to a file with
1936 - export all the changesets between two revisions to a file with
1937 rename information::
1937 rename information::
1938
1938
1939 hg export --git -r 123:150 > changes.txt
1939 hg export --git -r 123:150 > changes.txt
1940
1940
1941 - split outgoing changes into a series of patches with
1941 - split outgoing changes into a series of patches with
1942 descriptive names::
1942 descriptive names::
1943
1943
1944 hg export -r "outgoing()" -o "%n-%m.patch"
1944 hg export -r "outgoing()" -o "%n-%m.patch"
1945
1945
1946 Returns 0 on success.
1946 Returns 0 on success.
1947 """
1947 """
1948 opts = pycompat.byteskwargs(opts)
1948 opts = pycompat.byteskwargs(opts)
1949 changesets += tuple(opts.get('rev', []))
1949 changesets += tuple(opts.get('rev', []))
1950 if not changesets:
1950 if not changesets:
1951 changesets = ['.']
1951 changesets = ['.']
1952 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1952 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1953 revs = scmutil.revrange(repo, changesets)
1953 revs = scmutil.revrange(repo, changesets)
1954 if not revs:
1954 if not revs:
1955 raise error.Abort(_("export requires at least one changeset"))
1955 raise error.Abort(_("export requires at least one changeset"))
1956 if len(revs) > 1:
1956 if len(revs) > 1:
1957 ui.note(_('exporting patches:\n'))
1957 ui.note(_('exporting patches:\n'))
1958 else:
1958 else:
1959 ui.note(_('exporting patch:\n'))
1959 ui.note(_('exporting patch:\n'))
1960 ui.pager('export')
1960 ui.pager('export')
1961 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1961 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1962 switch_parent=opts.get('switch_parent'),
1962 switch_parent=opts.get('switch_parent'),
1963 opts=patch.diffallopts(ui, opts))
1963 opts=patch.diffallopts(ui, opts))
1964
1964
1965 @command('files',
1965 @command('files',
1966 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1966 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1967 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1967 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1968 ] + walkopts + formatteropts + subrepoopts,
1968 ] + walkopts + formatteropts + subrepoopts,
1969 _('[OPTION]... [FILE]...'), cmdtype=readonly)
1969 _('[OPTION]... [FILE]...'), cmdtype=readonly)
1970 def files(ui, repo, *pats, **opts):
1970 def files(ui, repo, *pats, **opts):
1971 """list tracked files
1971 """list tracked files
1972
1972
1973 Print files under Mercurial control in the working directory or
1973 Print files under Mercurial control in the working directory or
1974 specified revision for given files (excluding removed files).
1974 specified revision for given files (excluding removed files).
1975 Files can be specified as filenames or filesets.
1975 Files can be specified as filenames or filesets.
1976
1976
1977 If no files are given to match, this command prints the names
1977 If no files are given to match, this command prints the names
1978 of all files under Mercurial control.
1978 of all files under Mercurial control.
1979
1979
1980 .. container:: verbose
1980 .. container:: verbose
1981
1981
1982 Examples:
1982 Examples:
1983
1983
1984 - list all files under the current directory::
1984 - list all files under the current directory::
1985
1985
1986 hg files .
1986 hg files .
1987
1987
1988 - shows sizes and flags for current revision::
1988 - shows sizes and flags for current revision::
1989
1989
1990 hg files -vr .
1990 hg files -vr .
1991
1991
1992 - list all files named README::
1992 - list all files named README::
1993
1993
1994 hg files -I "**/README"
1994 hg files -I "**/README"
1995
1995
1996 - list all binary files::
1996 - list all binary files::
1997
1997
1998 hg files "set:binary()"
1998 hg files "set:binary()"
1999
1999
2000 - find files containing a regular expression::
2000 - find files containing a regular expression::
2001
2001
2002 hg files "set:grep('bob')"
2002 hg files "set:grep('bob')"
2003
2003
2004 - search tracked file contents with xargs and grep::
2004 - search tracked file contents with xargs and grep::
2005
2005
2006 hg files -0 | xargs -0 grep foo
2006 hg files -0 | xargs -0 grep foo
2007
2007
2008 See :hg:`help patterns` and :hg:`help filesets` for more information
2008 See :hg:`help patterns` and :hg:`help filesets` for more information
2009 on specifying file patterns.
2009 on specifying file patterns.
2010
2010
2011 Returns 0 if a match is found, 1 otherwise.
2011 Returns 0 if a match is found, 1 otherwise.
2012
2012
2013 """
2013 """
2014
2014
2015 opts = pycompat.byteskwargs(opts)
2015 opts = pycompat.byteskwargs(opts)
2016 rev = opts.get('rev')
2016 rev = opts.get('rev')
2017 if rev:
2017 if rev:
2018 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2018 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2019 ctx = scmutil.revsingle(repo, rev, None)
2019 ctx = scmutil.revsingle(repo, rev, None)
2020
2020
2021 end = '\n'
2021 end = '\n'
2022 if opts.get('print0'):
2022 if opts.get('print0'):
2023 end = '\0'
2023 end = '\0'
2024 fmt = '%s' + end
2024 fmt = '%s' + end
2025
2025
2026 m = scmutil.match(ctx, pats, opts)
2026 m = scmutil.match(ctx, pats, opts)
2027 ui.pager('files')
2027 ui.pager('files')
2028 with ui.formatter('files', opts) as fm:
2028 with ui.formatter('files', opts) as fm:
2029 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2029 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2030
2030
2031 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2031 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2032 def forget(ui, repo, *pats, **opts):
2032 def forget(ui, repo, *pats, **opts):
2033 """forget the specified files on the next commit
2033 """forget the specified files on the next commit
2034
2034
2035 Mark the specified files so they will no longer be tracked
2035 Mark the specified files so they will no longer be tracked
2036 after the next commit.
2036 after the next commit.
2037
2037
2038 This only removes files from the current branch, not from the
2038 This only removes files from the current branch, not from the
2039 entire project history, and it does not delete them from the
2039 entire project history, and it does not delete them from the
2040 working directory.
2040 working directory.
2041
2041
2042 To delete the file from the working directory, see :hg:`remove`.
2042 To delete the file from the working directory, see :hg:`remove`.
2043
2043
2044 To undo a forget before the next commit, see :hg:`add`.
2044 To undo a forget before the next commit, see :hg:`add`.
2045
2045
2046 .. container:: verbose
2046 .. container:: verbose
2047
2047
2048 Examples:
2048 Examples:
2049
2049
2050 - forget newly-added binary files::
2050 - forget newly-added binary files::
2051
2051
2052 hg forget "set:added() and binary()"
2052 hg forget "set:added() and binary()"
2053
2053
2054 - forget files that would be excluded by .hgignore::
2054 - forget files that would be excluded by .hgignore::
2055
2055
2056 hg forget "set:hgignore()"
2056 hg forget "set:hgignore()"
2057
2057
2058 Returns 0 on success.
2058 Returns 0 on success.
2059 """
2059 """
2060
2060
2061 opts = pycompat.byteskwargs(opts)
2061 opts = pycompat.byteskwargs(opts)
2062 if not pats:
2062 if not pats:
2063 raise error.Abort(_('no files specified'))
2063 raise error.Abort(_('no files specified'))
2064
2064
2065 m = scmutil.match(repo[None], pats, opts)
2065 m = scmutil.match(repo[None], pats, opts)
2066 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2066 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2067 return rejected and 1 or 0
2067 return rejected and 1 or 0
2068
2068
2069 @command(
2069 @command(
2070 'graft',
2070 'graft',
2071 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2071 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2072 ('c', 'continue', False, _('resume interrupted graft')),
2072 ('c', 'continue', False, _('resume interrupted graft')),
2073 ('e', 'edit', False, _('invoke editor on commit messages')),
2073 ('e', 'edit', False, _('invoke editor on commit messages')),
2074 ('', 'log', None, _('append graft info to log message')),
2074 ('', 'log', None, _('append graft info to log message')),
2075 ('f', 'force', False, _('force graft')),
2075 ('f', 'force', False, _('force graft')),
2076 ('D', 'currentdate', False,
2076 ('D', 'currentdate', False,
2077 _('record the current date as commit date')),
2077 _('record the current date as commit date')),
2078 ('U', 'currentuser', False,
2078 ('U', 'currentuser', False,
2079 _('record the current user as committer'), _('DATE'))]
2079 _('record the current user as committer'), _('DATE'))]
2080 + commitopts2 + mergetoolopts + dryrunopts,
2080 + commitopts2 + mergetoolopts + dryrunopts,
2081 _('[OPTION]... [-r REV]... REV...'))
2081 _('[OPTION]... [-r REV]... REV...'))
2082 def graft(ui, repo, *revs, **opts):
2082 def graft(ui, repo, *revs, **opts):
2083 '''copy changes from other branches onto the current branch
2083 '''copy changes from other branches onto the current branch
2084
2084
2085 This command uses Mercurial's merge logic to copy individual
2085 This command uses Mercurial's merge logic to copy individual
2086 changes from other branches without merging branches in the
2086 changes from other branches without merging branches in the
2087 history graph. This is sometimes known as 'backporting' or
2087 history graph. This is sometimes known as 'backporting' or
2088 'cherry-picking'. By default, graft will copy user, date, and
2088 'cherry-picking'. By default, graft will copy user, date, and
2089 description from the source changesets.
2089 description from the source changesets.
2090
2090
2091 Changesets that are ancestors of the current revision, that have
2091 Changesets that are ancestors of the current revision, that have
2092 already been grafted, or that are merges will be skipped.
2092 already been grafted, or that are merges will be skipped.
2093
2093
2094 If --log is specified, log messages will have a comment appended
2094 If --log is specified, log messages will have a comment appended
2095 of the form::
2095 of the form::
2096
2096
2097 (grafted from CHANGESETHASH)
2097 (grafted from CHANGESETHASH)
2098
2098
2099 If --force is specified, revisions will be grafted even if they
2099 If --force is specified, revisions will be grafted even if they
2100 are already ancestors of, or have been grafted to, the destination.
2100 are already ancestors of, or have been grafted to, the destination.
2101 This is useful when the revisions have since been backed out.
2101 This is useful when the revisions have since been backed out.
2102
2102
2103 If a graft merge results in conflicts, the graft process is
2103 If a graft merge results in conflicts, the graft process is
2104 interrupted so that the current merge can be manually resolved.
2104 interrupted so that the current merge can be manually resolved.
2105 Once all conflicts are addressed, the graft process can be
2105 Once all conflicts are addressed, the graft process can be
2106 continued with the -c/--continue option.
2106 continued with the -c/--continue option.
2107
2107
2108 .. note::
2108 .. note::
2109
2109
2110 The -c/--continue option does not reapply earlier options, except
2110 The -c/--continue option does not reapply earlier options, except
2111 for --force.
2111 for --force.
2112
2112
2113 .. container:: verbose
2113 .. container:: verbose
2114
2114
2115 Examples:
2115 Examples:
2116
2116
2117 - copy a single change to the stable branch and edit its description::
2117 - copy a single change to the stable branch and edit its description::
2118
2118
2119 hg update stable
2119 hg update stable
2120 hg graft --edit 9393
2120 hg graft --edit 9393
2121
2121
2122 - graft a range of changesets with one exception, updating dates::
2122 - graft a range of changesets with one exception, updating dates::
2123
2123
2124 hg graft -D "2085::2093 and not 2091"
2124 hg graft -D "2085::2093 and not 2091"
2125
2125
2126 - continue a graft after resolving conflicts::
2126 - continue a graft after resolving conflicts::
2127
2127
2128 hg graft -c
2128 hg graft -c
2129
2129
2130 - show the source of a grafted changeset::
2130 - show the source of a grafted changeset::
2131
2131
2132 hg log --debug -r .
2132 hg log --debug -r .
2133
2133
2134 - show revisions sorted by date::
2134 - show revisions sorted by date::
2135
2135
2136 hg log -r "sort(all(), date)"
2136 hg log -r "sort(all(), date)"
2137
2137
2138 See :hg:`help revisions` for more about specifying revisions.
2138 See :hg:`help revisions` for more about specifying revisions.
2139
2139
2140 Returns 0 on successful completion.
2140 Returns 0 on successful completion.
2141 '''
2141 '''
2142 with repo.wlock():
2142 with repo.wlock():
2143 return _dograft(ui, repo, *revs, **opts)
2143 return _dograft(ui, repo, *revs, **opts)
2144
2144
2145 def _dograft(ui, repo, *revs, **opts):
2145 def _dograft(ui, repo, *revs, **opts):
2146 opts = pycompat.byteskwargs(opts)
2146 opts = pycompat.byteskwargs(opts)
2147 if revs and opts.get('rev'):
2147 if revs and opts.get('rev'):
2148 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2148 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2149 'revision ordering!\n'))
2149 'revision ordering!\n'))
2150
2150
2151 revs = list(revs)
2151 revs = list(revs)
2152 revs.extend(opts.get('rev'))
2152 revs.extend(opts.get('rev'))
2153
2153
2154 if not opts.get('user') and opts.get('currentuser'):
2154 if not opts.get('user') and opts.get('currentuser'):
2155 opts['user'] = ui.username()
2155 opts['user'] = ui.username()
2156 if not opts.get('date') and opts.get('currentdate'):
2156 if not opts.get('date') and opts.get('currentdate'):
2157 opts['date'] = "%d %d" % util.makedate()
2157 opts['date'] = "%d %d" % util.makedate()
2158
2158
2159 editor = cmdutil.getcommiteditor(editform='graft',
2159 editor = cmdutil.getcommiteditor(editform='graft',
2160 **pycompat.strkwargs(opts))
2160 **pycompat.strkwargs(opts))
2161
2161
2162 cont = False
2162 cont = False
2163 if opts.get('continue'):
2163 if opts.get('continue'):
2164 cont = True
2164 cont = True
2165 if revs:
2165 if revs:
2166 raise error.Abort(_("can't specify --continue and revisions"))
2166 raise error.Abort(_("can't specify --continue and revisions"))
2167 # read in unfinished revisions
2167 # read in unfinished revisions
2168 try:
2168 try:
2169 nodes = repo.vfs.read('graftstate').splitlines()
2169 nodes = repo.vfs.read('graftstate').splitlines()
2170 revs = [repo[node].rev() for node in nodes]
2170 revs = [repo[node].rev() for node in nodes]
2171 except IOError as inst:
2171 except IOError as inst:
2172 if inst.errno != errno.ENOENT:
2172 if inst.errno != errno.ENOENT:
2173 raise
2173 raise
2174 cmdutil.wrongtooltocontinue(repo, _('graft'))
2174 cmdutil.wrongtooltocontinue(repo, _('graft'))
2175 else:
2175 else:
2176 cmdutil.checkunfinished(repo)
2176 cmdutil.checkunfinished(repo)
2177 cmdutil.bailifchanged(repo)
2177 cmdutil.bailifchanged(repo)
2178 if not revs:
2178 if not revs:
2179 raise error.Abort(_('no revisions specified'))
2179 raise error.Abort(_('no revisions specified'))
2180 revs = scmutil.revrange(repo, revs)
2180 revs = scmutil.revrange(repo, revs)
2181
2181
2182 skipped = set()
2182 skipped = set()
2183 # check for merges
2183 # check for merges
2184 for rev in repo.revs('%ld and merge()', revs):
2184 for rev in repo.revs('%ld and merge()', revs):
2185 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2185 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2186 skipped.add(rev)
2186 skipped.add(rev)
2187 revs = [r for r in revs if r not in skipped]
2187 revs = [r for r in revs if r not in skipped]
2188 if not revs:
2188 if not revs:
2189 return -1
2189 return -1
2190
2190
2191 # Don't check in the --continue case, in effect retaining --force across
2191 # Don't check in the --continue case, in effect retaining --force across
2192 # --continues. That's because without --force, any revisions we decided to
2192 # --continues. That's because without --force, any revisions we decided to
2193 # skip would have been filtered out here, so they wouldn't have made their
2193 # skip would have been filtered out here, so they wouldn't have made their
2194 # way to the graftstate. With --force, any revisions we would have otherwise
2194 # way to the graftstate. With --force, any revisions we would have otherwise
2195 # skipped would not have been filtered out, and if they hadn't been applied
2195 # skipped would not have been filtered out, and if they hadn't been applied
2196 # already, they'd have been in the graftstate.
2196 # already, they'd have been in the graftstate.
2197 if not (cont or opts.get('force')):
2197 if not (cont or opts.get('force')):
2198 # check for ancestors of dest branch
2198 # check for ancestors of dest branch
2199 crev = repo['.'].rev()
2199 crev = repo['.'].rev()
2200 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2200 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2201 # XXX make this lazy in the future
2201 # XXX make this lazy in the future
2202 # don't mutate while iterating, create a copy
2202 # don't mutate while iterating, create a copy
2203 for rev in list(revs):
2203 for rev in list(revs):
2204 if rev in ancestors:
2204 if rev in ancestors:
2205 ui.warn(_('skipping ancestor revision %d:%s\n') %
2205 ui.warn(_('skipping ancestor revision %d:%s\n') %
2206 (rev, repo[rev]))
2206 (rev, repo[rev]))
2207 # XXX remove on list is slow
2207 # XXX remove on list is slow
2208 revs.remove(rev)
2208 revs.remove(rev)
2209 if not revs:
2209 if not revs:
2210 return -1
2210 return -1
2211
2211
2212 # analyze revs for earlier grafts
2212 # analyze revs for earlier grafts
2213 ids = {}
2213 ids = {}
2214 for ctx in repo.set("%ld", revs):
2214 for ctx in repo.set("%ld", revs):
2215 ids[ctx.hex()] = ctx.rev()
2215 ids[ctx.hex()] = ctx.rev()
2216 n = ctx.extra().get('source')
2216 n = ctx.extra().get('source')
2217 if n:
2217 if n:
2218 ids[n] = ctx.rev()
2218 ids[n] = ctx.rev()
2219
2219
2220 # check ancestors for earlier grafts
2220 # check ancestors for earlier grafts
2221 ui.debug('scanning for duplicate grafts\n')
2221 ui.debug('scanning for duplicate grafts\n')
2222
2222
2223 # The only changesets we can be sure doesn't contain grafts of any
2223 # The only changesets we can be sure doesn't contain grafts of any
2224 # revs, are the ones that are common ancestors of *all* revs:
2224 # revs, are the ones that are common ancestors of *all* revs:
2225 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2225 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2226 ctx = repo[rev]
2226 ctx = repo[rev]
2227 n = ctx.extra().get('source')
2227 n = ctx.extra().get('source')
2228 if n in ids:
2228 if n in ids:
2229 try:
2229 try:
2230 r = repo[n].rev()
2230 r = repo[n].rev()
2231 except error.RepoLookupError:
2231 except error.RepoLookupError:
2232 r = None
2232 r = None
2233 if r in revs:
2233 if r in revs:
2234 ui.warn(_('skipping revision %d:%s '
2234 ui.warn(_('skipping revision %d:%s '
2235 '(already grafted to %d:%s)\n')
2235 '(already grafted to %d:%s)\n')
2236 % (r, repo[r], rev, ctx))
2236 % (r, repo[r], rev, ctx))
2237 revs.remove(r)
2237 revs.remove(r)
2238 elif ids[n] in revs:
2238 elif ids[n] in revs:
2239 if r is None:
2239 if r is None:
2240 ui.warn(_('skipping already grafted revision %d:%s '
2240 ui.warn(_('skipping already grafted revision %d:%s '
2241 '(%d:%s also has unknown origin %s)\n')
2241 '(%d:%s also has unknown origin %s)\n')
2242 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2242 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2243 else:
2243 else:
2244 ui.warn(_('skipping already grafted revision %d:%s '
2244 ui.warn(_('skipping already grafted revision %d:%s '
2245 '(%d:%s also has origin %d:%s)\n')
2245 '(%d:%s also has origin %d:%s)\n')
2246 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2246 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2247 revs.remove(ids[n])
2247 revs.remove(ids[n])
2248 elif ctx.hex() in ids:
2248 elif ctx.hex() in ids:
2249 r = ids[ctx.hex()]
2249 r = ids[ctx.hex()]
2250 ui.warn(_('skipping already grafted revision %d:%s '
2250 ui.warn(_('skipping already grafted revision %d:%s '
2251 '(was grafted from %d:%s)\n') %
2251 '(was grafted from %d:%s)\n') %
2252 (r, repo[r], rev, ctx))
2252 (r, repo[r], rev, ctx))
2253 revs.remove(r)
2253 revs.remove(r)
2254 if not revs:
2254 if not revs:
2255 return -1
2255 return -1
2256
2256
2257 for pos, ctx in enumerate(repo.set("%ld", revs)):
2257 for pos, ctx in enumerate(repo.set("%ld", revs)):
2258 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2258 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2259 ctx.description().split('\n', 1)[0])
2259 ctx.description().split('\n', 1)[0])
2260 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2260 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2261 if names:
2261 if names:
2262 desc += ' (%s)' % ' '.join(names)
2262 desc += ' (%s)' % ' '.join(names)
2263 ui.status(_('grafting %s\n') % desc)
2263 ui.status(_('grafting %s\n') % desc)
2264 if opts.get('dry_run'):
2264 if opts.get('dry_run'):
2265 continue
2265 continue
2266
2266
2267 source = ctx.extra().get('source')
2267 source = ctx.extra().get('source')
2268 extra = {}
2268 extra = {}
2269 if source:
2269 if source:
2270 extra['source'] = source
2270 extra['source'] = source
2271 extra['intermediate-source'] = ctx.hex()
2271 extra['intermediate-source'] = ctx.hex()
2272 else:
2272 else:
2273 extra['source'] = ctx.hex()
2273 extra['source'] = ctx.hex()
2274 user = ctx.user()
2274 user = ctx.user()
2275 if opts.get('user'):
2275 if opts.get('user'):
2276 user = opts['user']
2276 user = opts['user']
2277 date = ctx.date()
2277 date = ctx.date()
2278 if opts.get('date'):
2278 if opts.get('date'):
2279 date = opts['date']
2279 date = opts['date']
2280 message = ctx.description()
2280 message = ctx.description()
2281 if opts.get('log'):
2281 if opts.get('log'):
2282 message += '\n(grafted from %s)' % ctx.hex()
2282 message += '\n(grafted from %s)' % ctx.hex()
2283
2283
2284 # we don't merge the first commit when continuing
2284 # we don't merge the first commit when continuing
2285 if not cont:
2285 if not cont:
2286 # perform the graft merge with p1(rev) as 'ancestor'
2286 # perform the graft merge with p1(rev) as 'ancestor'
2287 try:
2287 try:
2288 # ui.forcemerge is an internal variable, do not document
2288 # ui.forcemerge is an internal variable, do not document
2289 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2289 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2290 'graft')
2290 'graft')
2291 stats = mergemod.graft(repo, ctx, ctx.p1(),
2291 stats = mergemod.graft(repo, ctx, ctx.p1(),
2292 ['local', 'graft'])
2292 ['local', 'graft'])
2293 finally:
2293 finally:
2294 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2294 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2295 # report any conflicts
2295 # report any conflicts
2296 if stats and stats[3] > 0:
2296 if stats and stats[3] > 0:
2297 # write out state for --continue
2297 # write out state for --continue
2298 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2298 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2299 repo.vfs.write('graftstate', ''.join(nodelines))
2299 repo.vfs.write('graftstate', ''.join(nodelines))
2300 extra = ''
2300 extra = ''
2301 if opts.get('user'):
2301 if opts.get('user'):
2302 extra += ' --user %s' % util.shellquote(opts['user'])
2302 extra += ' --user %s' % util.shellquote(opts['user'])
2303 if opts.get('date'):
2303 if opts.get('date'):
2304 extra += ' --date %s' % util.shellquote(opts['date'])
2304 extra += ' --date %s' % util.shellquote(opts['date'])
2305 if opts.get('log'):
2305 if opts.get('log'):
2306 extra += ' --log'
2306 extra += ' --log'
2307 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2307 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2308 raise error.Abort(
2308 raise error.Abort(
2309 _("unresolved conflicts, can't continue"),
2309 _("unresolved conflicts, can't continue"),
2310 hint=hint)
2310 hint=hint)
2311 else:
2311 else:
2312 cont = False
2312 cont = False
2313
2313
2314 # commit
2314 # commit
2315 node = repo.commit(text=message, user=user,
2315 node = repo.commit(text=message, user=user,
2316 date=date, extra=extra, editor=editor)
2316 date=date, extra=extra, editor=editor)
2317 if node is None:
2317 if node is None:
2318 ui.warn(
2318 ui.warn(
2319 _('note: graft of %d:%s created no changes to commit\n') %
2319 _('note: graft of %d:%s created no changes to commit\n') %
2320 (ctx.rev(), ctx))
2320 (ctx.rev(), ctx))
2321
2321
2322 # remove state when we complete successfully
2322 # remove state when we complete successfully
2323 if not opts.get('dry_run'):
2323 if not opts.get('dry_run'):
2324 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2324 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2325
2325
2326 return 0
2326 return 0
2327
2327
2328 @command('grep',
2328 @command('grep',
2329 [('0', 'print0', None, _('end fields with NUL')),
2329 [('0', 'print0', None, _('end fields with NUL')),
2330 ('', 'all', None, _('print all revisions that match')),
2330 ('', 'all', None, _('print all revisions that match')),
2331 ('a', 'text', None, _('treat all files as text')),
2331 ('a', 'text', None, _('treat all files as text')),
2332 ('f', 'follow', None,
2332 ('f', 'follow', None,
2333 _('follow changeset history,'
2333 _('follow changeset history,'
2334 ' or file history across copies and renames')),
2334 ' or file history across copies and renames')),
2335 ('i', 'ignore-case', None, _('ignore case when matching')),
2335 ('i', 'ignore-case', None, _('ignore case when matching')),
2336 ('l', 'files-with-matches', None,
2336 ('l', 'files-with-matches', None,
2337 _('print only filenames and revisions that match')),
2337 _('print only filenames and revisions that match')),
2338 ('n', 'line-number', None, _('print matching line numbers')),
2338 ('n', 'line-number', None, _('print matching line numbers')),
2339 ('r', 'rev', [],
2339 ('r', 'rev', [],
2340 _('only search files changed within revision range'), _('REV')),
2340 _('only search files changed within revision range'), _('REV')),
2341 ('u', 'user', None, _('list the author (long with -v)')),
2341 ('u', 'user', None, _('list the author (long with -v)')),
2342 ('d', 'date', None, _('list the date (short with -q)')),
2342 ('d', 'date', None, _('list the date (short with -q)')),
2343 ] + formatteropts + walkopts,
2343 ] + formatteropts + walkopts,
2344 _('[OPTION]... PATTERN [FILE]...'),
2344 _('[OPTION]... PATTERN [FILE]...'),
2345 inferrepo=True, cmdtype=readonly)
2345 inferrepo=True, cmdtype=readonly)
2346 def grep(ui, repo, pattern, *pats, **opts):
2346 def grep(ui, repo, pattern, *pats, **opts):
2347 """search revision history for a pattern in specified files
2347 """search revision history for a pattern in specified files
2348
2348
2349 Search revision history for a regular expression in the specified
2349 Search revision history for a regular expression in the specified
2350 files or the entire project.
2350 files or the entire project.
2351
2351
2352 By default, grep prints the most recent revision number for each
2352 By default, grep prints the most recent revision number for each
2353 file in which it finds a match. To get it to print every revision
2353 file in which it finds a match. To get it to print every revision
2354 that contains a change in match status ("-" for a match that becomes
2354 that contains a change in match status ("-" for a match that becomes
2355 a non-match, or "+" for a non-match that becomes a match), use the
2355 a non-match, or "+" for a non-match that becomes a match), use the
2356 --all flag.
2356 --all flag.
2357
2357
2358 PATTERN can be any Python (roughly Perl-compatible) regular
2358 PATTERN can be any Python (roughly Perl-compatible) regular
2359 expression.
2359 expression.
2360
2360
2361 If no FILEs are specified (and -f/--follow isn't set), all files in
2361 If no FILEs are specified (and -f/--follow isn't set), all files in
2362 the repository are searched, including those that don't exist in the
2362 the repository are searched, including those that don't exist in the
2363 current branch or have been deleted in a prior changeset.
2363 current branch or have been deleted in a prior changeset.
2364
2364
2365 Returns 0 if a match is found, 1 otherwise.
2365 Returns 0 if a match is found, 1 otherwise.
2366 """
2366 """
2367 opts = pycompat.byteskwargs(opts)
2367 opts = pycompat.byteskwargs(opts)
2368 reflags = re.M
2368 reflags = re.M
2369 if opts.get('ignore_case'):
2369 if opts.get('ignore_case'):
2370 reflags |= re.I
2370 reflags |= re.I
2371 try:
2371 try:
2372 regexp = util.re.compile(pattern, reflags)
2372 regexp = util.re.compile(pattern, reflags)
2373 except re.error as inst:
2373 except re.error as inst:
2374 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2374 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2375 return 1
2375 return 1
2376 sep, eol = ':', '\n'
2376 sep, eol = ':', '\n'
2377 if opts.get('print0'):
2377 if opts.get('print0'):
2378 sep = eol = '\0'
2378 sep = eol = '\0'
2379
2379
2380 getfile = util.lrucachefunc(repo.file)
2380 getfile = util.lrucachefunc(repo.file)
2381
2381
2382 def matchlines(body):
2382 def matchlines(body):
2383 begin = 0
2383 begin = 0
2384 linenum = 0
2384 linenum = 0
2385 while begin < len(body):
2385 while begin < len(body):
2386 match = regexp.search(body, begin)
2386 match = regexp.search(body, begin)
2387 if not match:
2387 if not match:
2388 break
2388 break
2389 mstart, mend = match.span()
2389 mstart, mend = match.span()
2390 linenum += body.count('\n', begin, mstart) + 1
2390 linenum += body.count('\n', begin, mstart) + 1
2391 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2391 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2392 begin = body.find('\n', mend) + 1 or len(body) + 1
2392 begin = body.find('\n', mend) + 1 or len(body) + 1
2393 lend = begin - 1
2393 lend = begin - 1
2394 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2394 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2395
2395
2396 class linestate(object):
2396 class linestate(object):
2397 def __init__(self, line, linenum, colstart, colend):
2397 def __init__(self, line, linenum, colstart, colend):
2398 self.line = line
2398 self.line = line
2399 self.linenum = linenum
2399 self.linenum = linenum
2400 self.colstart = colstart
2400 self.colstart = colstart
2401 self.colend = colend
2401 self.colend = colend
2402
2402
2403 def __hash__(self):
2403 def __hash__(self):
2404 return hash((self.linenum, self.line))
2404 return hash((self.linenum, self.line))
2405
2405
2406 def __eq__(self, other):
2406 def __eq__(self, other):
2407 return self.line == other.line
2407 return self.line == other.line
2408
2408
2409 def findpos(self):
2409 def findpos(self):
2410 """Iterate all (start, end) indices of matches"""
2410 """Iterate all (start, end) indices of matches"""
2411 yield self.colstart, self.colend
2411 yield self.colstart, self.colend
2412 p = self.colend
2412 p = self.colend
2413 while p < len(self.line):
2413 while p < len(self.line):
2414 m = regexp.search(self.line, p)
2414 m = regexp.search(self.line, p)
2415 if not m:
2415 if not m:
2416 break
2416 break
2417 yield m.span()
2417 yield m.span()
2418 p = m.end()
2418 p = m.end()
2419
2419
2420 matches = {}
2420 matches = {}
2421 copies = {}
2421 copies = {}
2422 def grepbody(fn, rev, body):
2422 def grepbody(fn, rev, body):
2423 matches[rev].setdefault(fn, [])
2423 matches[rev].setdefault(fn, [])
2424 m = matches[rev][fn]
2424 m = matches[rev][fn]
2425 for lnum, cstart, cend, line in matchlines(body):
2425 for lnum, cstart, cend, line in matchlines(body):
2426 s = linestate(line, lnum, cstart, cend)
2426 s = linestate(line, lnum, cstart, cend)
2427 m.append(s)
2427 m.append(s)
2428
2428
2429 def difflinestates(a, b):
2429 def difflinestates(a, b):
2430 sm = difflib.SequenceMatcher(None, a, b)
2430 sm = difflib.SequenceMatcher(None, a, b)
2431 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2431 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2432 if tag == 'insert':
2432 if tag == 'insert':
2433 for i in xrange(blo, bhi):
2433 for i in xrange(blo, bhi):
2434 yield ('+', b[i])
2434 yield ('+', b[i])
2435 elif tag == 'delete':
2435 elif tag == 'delete':
2436 for i in xrange(alo, ahi):
2436 for i in xrange(alo, ahi):
2437 yield ('-', a[i])
2437 yield ('-', a[i])
2438 elif tag == 'replace':
2438 elif tag == 'replace':
2439 for i in xrange(alo, ahi):
2439 for i in xrange(alo, ahi):
2440 yield ('-', a[i])
2440 yield ('-', a[i])
2441 for i in xrange(blo, bhi):
2441 for i in xrange(blo, bhi):
2442 yield ('+', b[i])
2442 yield ('+', b[i])
2443
2443
2444 def display(fm, fn, ctx, pstates, states):
2444 def display(fm, fn, ctx, pstates, states):
2445 rev = ctx.rev()
2445 rev = ctx.rev()
2446 if fm.isplain():
2446 if fm.isplain():
2447 formatuser = ui.shortuser
2447 formatuser = ui.shortuser
2448 else:
2448 else:
2449 formatuser = str
2449 formatuser = str
2450 if ui.quiet:
2450 if ui.quiet:
2451 datefmt = '%Y-%m-%d'
2451 datefmt = '%Y-%m-%d'
2452 else:
2452 else:
2453 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2453 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2454 found = False
2454 found = False
2455 @util.cachefunc
2455 @util.cachefunc
2456 def binary():
2456 def binary():
2457 flog = getfile(fn)
2457 flog = getfile(fn)
2458 return util.binary(flog.read(ctx.filenode(fn)))
2458 return util.binary(flog.read(ctx.filenode(fn)))
2459
2459
2460 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2460 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2461 if opts.get('all'):
2461 if opts.get('all'):
2462 iter = difflinestates(pstates, states)
2462 iter = difflinestates(pstates, states)
2463 else:
2463 else:
2464 iter = [('', l) for l in states]
2464 iter = [('', l) for l in states]
2465 for change, l in iter:
2465 for change, l in iter:
2466 fm.startitem()
2466 fm.startitem()
2467 fm.data(node=fm.hexfunc(ctx.node()))
2467 fm.data(node=fm.hexfunc(ctx.node()))
2468 cols = [
2468 cols = [
2469 ('filename', fn, True),
2469 ('filename', fn, True),
2470 ('rev', rev, True),
2470 ('rev', rev, True),
2471 ('linenumber', l.linenum, opts.get('line_number')),
2471 ('linenumber', l.linenum, opts.get('line_number')),
2472 ]
2472 ]
2473 if opts.get('all'):
2473 if opts.get('all'):
2474 cols.append(('change', change, True))
2474 cols.append(('change', change, True))
2475 cols.extend([
2475 cols.extend([
2476 ('user', formatuser(ctx.user()), opts.get('user')),
2476 ('user', formatuser(ctx.user()), opts.get('user')),
2477 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2477 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2478 ])
2478 ])
2479 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2479 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2480 for name, data, cond in cols:
2480 for name, data, cond in cols:
2481 field = fieldnamemap.get(name, name)
2481 field = fieldnamemap.get(name, name)
2482 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2482 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2483 if cond and name != lastcol:
2483 if cond and name != lastcol:
2484 fm.plain(sep, label='grep.sep')
2484 fm.plain(sep, label='grep.sep')
2485 if not opts.get('files_with_matches'):
2485 if not opts.get('files_with_matches'):
2486 fm.plain(sep, label='grep.sep')
2486 fm.plain(sep, label='grep.sep')
2487 if not opts.get('text') and binary():
2487 if not opts.get('text') and binary():
2488 fm.plain(_(" Binary file matches"))
2488 fm.plain(_(" Binary file matches"))
2489 else:
2489 else:
2490 displaymatches(fm.nested('texts'), l)
2490 displaymatches(fm.nested('texts'), l)
2491 fm.plain(eol)
2491 fm.plain(eol)
2492 found = True
2492 found = True
2493 if opts.get('files_with_matches'):
2493 if opts.get('files_with_matches'):
2494 break
2494 break
2495 return found
2495 return found
2496
2496
2497 def displaymatches(fm, l):
2497 def displaymatches(fm, l):
2498 p = 0
2498 p = 0
2499 for s, e in l.findpos():
2499 for s, e in l.findpos():
2500 if p < s:
2500 if p < s:
2501 fm.startitem()
2501 fm.startitem()
2502 fm.write('text', '%s', l.line[p:s])
2502 fm.write('text', '%s', l.line[p:s])
2503 fm.data(matched=False)
2503 fm.data(matched=False)
2504 fm.startitem()
2504 fm.startitem()
2505 fm.write('text', '%s', l.line[s:e], label='grep.match')
2505 fm.write('text', '%s', l.line[s:e], label='grep.match')
2506 fm.data(matched=True)
2506 fm.data(matched=True)
2507 p = e
2507 p = e
2508 if p < len(l.line):
2508 if p < len(l.line):
2509 fm.startitem()
2509 fm.startitem()
2510 fm.write('text', '%s', l.line[p:])
2510 fm.write('text', '%s', l.line[p:])
2511 fm.data(matched=False)
2511 fm.data(matched=False)
2512 fm.end()
2512 fm.end()
2513
2513
2514 skip = {}
2514 skip = {}
2515 revfiles = {}
2515 revfiles = {}
2516 match = scmutil.match(repo[None], pats, opts)
2516 match = scmutil.match(repo[None], pats, opts)
2517 found = False
2517 found = False
2518 follow = opts.get('follow')
2518 follow = opts.get('follow')
2519
2519
2520 def prep(ctx, fns):
2520 def prep(ctx, fns):
2521 rev = ctx.rev()
2521 rev = ctx.rev()
2522 pctx = ctx.p1()
2522 pctx = ctx.p1()
2523 parent = pctx.rev()
2523 parent = pctx.rev()
2524 matches.setdefault(rev, {})
2524 matches.setdefault(rev, {})
2525 matches.setdefault(parent, {})
2525 matches.setdefault(parent, {})
2526 files = revfiles.setdefault(rev, [])
2526 files = revfiles.setdefault(rev, [])
2527 for fn in fns:
2527 for fn in fns:
2528 flog = getfile(fn)
2528 flog = getfile(fn)
2529 try:
2529 try:
2530 fnode = ctx.filenode(fn)
2530 fnode = ctx.filenode(fn)
2531 except error.LookupError:
2531 except error.LookupError:
2532 continue
2532 continue
2533
2533
2534 copied = flog.renamed(fnode)
2534 copied = flog.renamed(fnode)
2535 copy = follow and copied and copied[0]
2535 copy = follow and copied and copied[0]
2536 if copy:
2536 if copy:
2537 copies.setdefault(rev, {})[fn] = copy
2537 copies.setdefault(rev, {})[fn] = copy
2538 if fn in skip:
2538 if fn in skip:
2539 if copy:
2539 if copy:
2540 skip[copy] = True
2540 skip[copy] = True
2541 continue
2541 continue
2542 files.append(fn)
2542 files.append(fn)
2543
2543
2544 if fn not in matches[rev]:
2544 if fn not in matches[rev]:
2545 grepbody(fn, rev, flog.read(fnode))
2545 grepbody(fn, rev, flog.read(fnode))
2546
2546
2547 pfn = copy or fn
2547 pfn = copy or fn
2548 if pfn not in matches[parent]:
2548 if pfn not in matches[parent]:
2549 try:
2549 try:
2550 fnode = pctx.filenode(pfn)
2550 fnode = pctx.filenode(pfn)
2551 grepbody(pfn, parent, flog.read(fnode))
2551 grepbody(pfn, parent, flog.read(fnode))
2552 except error.LookupError:
2552 except error.LookupError:
2553 pass
2553 pass
2554
2554
2555 ui.pager('grep')
2555 ui.pager('grep')
2556 fm = ui.formatter('grep', opts)
2556 fm = ui.formatter('grep', opts)
2557 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2557 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2558 rev = ctx.rev()
2558 rev = ctx.rev()
2559 parent = ctx.p1().rev()
2559 parent = ctx.p1().rev()
2560 for fn in sorted(revfiles.get(rev, [])):
2560 for fn in sorted(revfiles.get(rev, [])):
2561 states = matches[rev][fn]
2561 states = matches[rev][fn]
2562 copy = copies.get(rev, {}).get(fn)
2562 copy = copies.get(rev, {}).get(fn)
2563 if fn in skip:
2563 if fn in skip:
2564 if copy:
2564 if copy:
2565 skip[copy] = True
2565 skip[copy] = True
2566 continue
2566 continue
2567 pstates = matches.get(parent, {}).get(copy or fn, [])
2567 pstates = matches.get(parent, {}).get(copy or fn, [])
2568 if pstates or states:
2568 if pstates or states:
2569 r = display(fm, fn, ctx, pstates, states)
2569 r = display(fm, fn, ctx, pstates, states)
2570 found = found or r
2570 found = found or r
2571 if r and not opts.get('all'):
2571 if r and not opts.get('all'):
2572 skip[fn] = True
2572 skip[fn] = True
2573 if copy:
2573 if copy:
2574 skip[copy] = True
2574 skip[copy] = True
2575 del matches[rev]
2575 del matches[rev]
2576 del revfiles[rev]
2576 del revfiles[rev]
2577 fm.end()
2577 fm.end()
2578
2578
2579 return not found
2579 return not found
2580
2580
2581 @command('heads',
2581 @command('heads',
2582 [('r', 'rev', '',
2582 [('r', 'rev', '',
2583 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2583 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2584 ('t', 'topo', False, _('show topological heads only')),
2584 ('t', 'topo', False, _('show topological heads only')),
2585 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2585 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2586 ('c', 'closed', False, _('show normal and closed branch heads')),
2586 ('c', 'closed', False, _('show normal and closed branch heads')),
2587 ] + templateopts,
2587 ] + templateopts,
2588 _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly)
2588 _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly)
2589 def heads(ui, repo, *branchrevs, **opts):
2589 def heads(ui, repo, *branchrevs, **opts):
2590 """show branch heads
2590 """show branch heads
2591
2591
2592 With no arguments, show all open branch heads in the repository.
2592 With no arguments, show all open branch heads in the repository.
2593 Branch heads are changesets that have no descendants on the
2593 Branch heads are changesets that have no descendants on the
2594 same branch. They are where development generally takes place and
2594 same branch. They are where development generally takes place and
2595 are the usual targets for update and merge operations.
2595 are the usual targets for update and merge operations.
2596
2596
2597 If one or more REVs are given, only open branch heads on the
2597 If one or more REVs are given, only open branch heads on the
2598 branches associated with the specified changesets are shown. This
2598 branches associated with the specified changesets are shown. This
2599 means that you can use :hg:`heads .` to see the heads on the
2599 means that you can use :hg:`heads .` to see the heads on the
2600 currently checked-out branch.
2600 currently checked-out branch.
2601
2601
2602 If -c/--closed is specified, also show branch heads marked closed
2602 If -c/--closed is specified, also show branch heads marked closed
2603 (see :hg:`commit --close-branch`).
2603 (see :hg:`commit --close-branch`).
2604
2604
2605 If STARTREV is specified, only those heads that are descendants of
2605 If STARTREV is specified, only those heads that are descendants of
2606 STARTREV will be displayed.
2606 STARTREV will be displayed.
2607
2607
2608 If -t/--topo is specified, named branch mechanics will be ignored and only
2608 If -t/--topo is specified, named branch mechanics will be ignored and only
2609 topological heads (changesets with no children) will be shown.
2609 topological heads (changesets with no children) will be shown.
2610
2610
2611 Returns 0 if matching heads are found, 1 if not.
2611 Returns 0 if matching heads are found, 1 if not.
2612 """
2612 """
2613
2613
2614 opts = pycompat.byteskwargs(opts)
2614 opts = pycompat.byteskwargs(opts)
2615 start = None
2615 start = None
2616 rev = opts.get('rev')
2616 rev = opts.get('rev')
2617 if rev:
2617 if rev:
2618 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2618 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2619 start = scmutil.revsingle(repo, rev, None).node()
2619 start = scmutil.revsingle(repo, rev, None).node()
2620
2620
2621 if opts.get('topo'):
2621 if opts.get('topo'):
2622 heads = [repo[h] for h in repo.heads(start)]
2622 heads = [repo[h] for h in repo.heads(start)]
2623 else:
2623 else:
2624 heads = []
2624 heads = []
2625 for branch in repo.branchmap():
2625 for branch in repo.branchmap():
2626 heads += repo.branchheads(branch, start, opts.get('closed'))
2626 heads += repo.branchheads(branch, start, opts.get('closed'))
2627 heads = [repo[h] for h in heads]
2627 heads = [repo[h] for h in heads]
2628
2628
2629 if branchrevs:
2629 if branchrevs:
2630 branches = set(repo[br].branch() for br in branchrevs)
2630 branches = set(repo[br].branch() for br in branchrevs)
2631 heads = [h for h in heads if h.branch() in branches]
2631 heads = [h for h in heads if h.branch() in branches]
2632
2632
2633 if opts.get('active') and branchrevs:
2633 if opts.get('active') and branchrevs:
2634 dagheads = repo.heads(start)
2634 dagheads = repo.heads(start)
2635 heads = [h for h in heads if h.node() in dagheads]
2635 heads = [h for h in heads if h.node() in dagheads]
2636
2636
2637 if branchrevs:
2637 if branchrevs:
2638 haveheads = set(h.branch() for h in heads)
2638 haveheads = set(h.branch() for h in heads)
2639 if branches - haveheads:
2639 if branches - haveheads:
2640 headless = ', '.join(b for b in branches - haveheads)
2640 headless = ', '.join(b for b in branches - haveheads)
2641 msg = _('no open branch heads found on branches %s')
2641 msg = _('no open branch heads found on branches %s')
2642 if opts.get('rev'):
2642 if opts.get('rev'):
2643 msg += _(' (started at %s)') % opts['rev']
2643 msg += _(' (started at %s)') % opts['rev']
2644 ui.warn((msg + '\n') % headless)
2644 ui.warn((msg + '\n') % headless)
2645
2645
2646 if not heads:
2646 if not heads:
2647 return 1
2647 return 1
2648
2648
2649 ui.pager('heads')
2649 ui.pager('heads')
2650 heads = sorted(heads, key=lambda x: -x.rev())
2650 heads = sorted(heads, key=lambda x: -x.rev())
2651 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2651 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2652 for ctx in heads:
2652 for ctx in heads:
2653 displayer.show(ctx)
2653 displayer.show(ctx)
2654 displayer.close()
2654 displayer.close()
2655
2655
2656 @command('help',
2656 @command('help',
2657 [('e', 'extension', None, _('show only help for extensions')),
2657 [('e', 'extension', None, _('show only help for extensions')),
2658 ('c', 'command', None, _('show only help for commands')),
2658 ('c', 'command', None, _('show only help for commands')),
2659 ('k', 'keyword', None, _('show topics matching keyword')),
2659 ('k', 'keyword', None, _('show topics matching keyword')),
2660 ('s', 'system', [], _('show help for specific platform(s)')),
2660 ('s', 'system', [], _('show help for specific platform(s)')),
2661 ],
2661 ],
2662 _('[-ecks] [TOPIC]'),
2662 _('[-ecks] [TOPIC]'),
2663 norepo=True, cmdtype=readonly)
2663 norepo=True, cmdtype=readonly)
2664 def help_(ui, name=None, **opts):
2664 def help_(ui, name=None, **opts):
2665 """show help for a given topic or a help overview
2665 """show help for a given topic or a help overview
2666
2666
2667 With no arguments, print a list of commands with short help messages.
2667 With no arguments, print a list of commands with short help messages.
2668
2668
2669 Given a topic, extension, or command name, print help for that
2669 Given a topic, extension, or command name, print help for that
2670 topic.
2670 topic.
2671
2671
2672 Returns 0 if successful.
2672 Returns 0 if successful.
2673 """
2673 """
2674
2674
2675 keep = opts.get(r'system') or []
2675 keep = opts.get(r'system') or []
2676 if len(keep) == 0:
2676 if len(keep) == 0:
2677 if pycompat.sysplatform.startswith('win'):
2677 if pycompat.sysplatform.startswith('win'):
2678 keep.append('windows')
2678 keep.append('windows')
2679 elif pycompat.sysplatform == 'OpenVMS':
2679 elif pycompat.sysplatform == 'OpenVMS':
2680 keep.append('vms')
2680 keep.append('vms')
2681 elif pycompat.sysplatform == 'plan9':
2681 elif pycompat.sysplatform == 'plan9':
2682 keep.append('plan9')
2682 keep.append('plan9')
2683 else:
2683 else:
2684 keep.append('unix')
2684 keep.append('unix')
2685 keep.append(pycompat.sysplatform.lower())
2685 keep.append(pycompat.sysplatform.lower())
2686 if ui.verbose:
2686 if ui.verbose:
2687 keep.append('verbose')
2687 keep.append('verbose')
2688
2688
2689 commands = sys.modules[__name__]
2689 commands = sys.modules[__name__]
2690 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2690 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2691 ui.pager('help')
2691 ui.pager('help')
2692 ui.write(formatted)
2692 ui.write(formatted)
2693
2693
2694
2694
2695 @command('identify|id',
2695 @command('identify|id',
2696 [('r', 'rev', '',
2696 [('r', 'rev', '',
2697 _('identify the specified revision'), _('REV')),
2697 _('identify the specified revision'), _('REV')),
2698 ('n', 'num', None, _('show local revision number')),
2698 ('n', 'num', None, _('show local revision number')),
2699 ('i', 'id', None, _('show global revision id')),
2699 ('i', 'id', None, _('show global revision id')),
2700 ('b', 'branch', None, _('show branch')),
2700 ('b', 'branch', None, _('show branch')),
2701 ('t', 'tags', None, _('show tags')),
2701 ('t', 'tags', None, _('show tags')),
2702 ('B', 'bookmarks', None, _('show bookmarks')),
2702 ('B', 'bookmarks', None, _('show bookmarks')),
2703 ] + remoteopts + formatteropts,
2703 ] + remoteopts + formatteropts,
2704 _('[-nibtB] [-r REV] [SOURCE]'),
2704 _('[-nibtB] [-r REV] [SOURCE]'),
2705 optionalrepo=True, cmdtype=readonly)
2705 optionalrepo=True, cmdtype=readonly)
2706 def identify(ui, repo, source=None, rev=None,
2706 def identify(ui, repo, source=None, rev=None,
2707 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2707 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2708 """identify the working directory or specified revision
2708 """identify the working directory or specified revision
2709
2709
2710 Print a summary identifying the repository state at REV using one or
2710 Print a summary identifying the repository state at REV using one or
2711 two parent hash identifiers, followed by a "+" if the working
2711 two parent hash identifiers, followed by a "+" if the working
2712 directory has uncommitted changes, the branch name (if not default),
2712 directory has uncommitted changes, the branch name (if not default),
2713 a list of tags, and a list of bookmarks.
2713 a list of tags, and a list of bookmarks.
2714
2714
2715 When REV is not given, print a summary of the current state of the
2715 When REV is not given, print a summary of the current state of the
2716 repository including the working directory. Specify -r. to get information
2716 repository including the working directory. Specify -r. to get information
2717 of the working directory parent without scanning uncommitted changes.
2717 of the working directory parent without scanning uncommitted changes.
2718
2718
2719 Specifying a path to a repository root or Mercurial bundle will
2719 Specifying a path to a repository root or Mercurial bundle will
2720 cause lookup to operate on that repository/bundle.
2720 cause lookup to operate on that repository/bundle.
2721
2721
2722 .. container:: verbose
2722 .. container:: verbose
2723
2723
2724 Examples:
2724 Examples:
2725
2725
2726 - generate a build identifier for the working directory::
2726 - generate a build identifier for the working directory::
2727
2727
2728 hg id --id > build-id.dat
2728 hg id --id > build-id.dat
2729
2729
2730 - find the revision corresponding to a tag::
2730 - find the revision corresponding to a tag::
2731
2731
2732 hg id -n -r 1.3
2732 hg id -n -r 1.3
2733
2733
2734 - check the most recent revision of a remote repository::
2734 - check the most recent revision of a remote repository::
2735
2735
2736 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2736 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2737
2737
2738 See :hg:`log` for generating more information about specific revisions,
2738 See :hg:`log` for generating more information about specific revisions,
2739 including full hash identifiers.
2739 including full hash identifiers.
2740
2740
2741 Returns 0 if successful.
2741 Returns 0 if successful.
2742 """
2742 """
2743
2743
2744 opts = pycompat.byteskwargs(opts)
2744 opts = pycompat.byteskwargs(opts)
2745 if not repo and not source:
2745 if not repo and not source:
2746 raise error.Abort(_("there is no Mercurial repository here "
2746 raise error.Abort(_("there is no Mercurial repository here "
2747 "(.hg not found)"))
2747 "(.hg not found)"))
2748
2748
2749 if ui.debugflag:
2749 if ui.debugflag:
2750 hexfunc = hex
2750 hexfunc = hex
2751 else:
2751 else:
2752 hexfunc = short
2752 hexfunc = short
2753 default = not (num or id or branch or tags or bookmarks)
2753 default = not (num or id or branch or tags or bookmarks)
2754 output = []
2754 output = []
2755 revs = []
2755 revs = []
2756
2756
2757 if source:
2757 if source:
2758 source, branches = hg.parseurl(ui.expandpath(source))
2758 source, branches = hg.parseurl(ui.expandpath(source))
2759 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2759 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2760 repo = peer.local()
2760 repo = peer.local()
2761 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2761 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2762
2762
2763 fm = ui.formatter('identify', opts)
2763 fm = ui.formatter('identify', opts)
2764 fm.startitem()
2764 fm.startitem()
2765
2765
2766 if not repo:
2766 if not repo:
2767 if num or branch or tags:
2767 if num or branch or tags:
2768 raise error.Abort(
2768 raise error.Abort(
2769 _("can't query remote revision number, branch, or tags"))
2769 _("can't query remote revision number, branch, or tags"))
2770 if not rev and revs:
2770 if not rev and revs:
2771 rev = revs[0]
2771 rev = revs[0]
2772 if not rev:
2772 if not rev:
2773 rev = "tip"
2773 rev = "tip"
2774
2774
2775 remoterev = peer.lookup(rev)
2775 remoterev = peer.lookup(rev)
2776 hexrev = hexfunc(remoterev)
2776 hexrev = hexfunc(remoterev)
2777 if default or id:
2777 if default or id:
2778 output = [hexrev]
2778 output = [hexrev]
2779 fm.data(id=hexrev)
2779 fm.data(id=hexrev)
2780
2780
2781 def getbms():
2781 def getbms():
2782 bms = []
2782 bms = []
2783
2783
2784 if 'bookmarks' in peer.listkeys('namespaces'):
2784 if 'bookmarks' in peer.listkeys('namespaces'):
2785 hexremoterev = hex(remoterev)
2785 hexremoterev = hex(remoterev)
2786 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2786 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2787 if bmr == hexremoterev]
2787 if bmr == hexremoterev]
2788
2788
2789 return sorted(bms)
2789 return sorted(bms)
2790
2790
2791 bms = getbms()
2791 bms = getbms()
2792 if bookmarks:
2792 if bookmarks:
2793 output.extend(bms)
2793 output.extend(bms)
2794 elif default and not ui.quiet:
2794 elif default and not ui.quiet:
2795 # multiple bookmarks for a single parent separated by '/'
2795 # multiple bookmarks for a single parent separated by '/'
2796 bm = '/'.join(bms)
2796 bm = '/'.join(bms)
2797 if bm:
2797 if bm:
2798 output.append(bm)
2798 output.append(bm)
2799
2799
2800 fm.data(node=hex(remoterev))
2800 fm.data(node=hex(remoterev))
2801 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2801 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2802 else:
2802 else:
2803 if rev:
2803 if rev:
2804 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2804 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2805 ctx = scmutil.revsingle(repo, rev, None)
2805 ctx = scmutil.revsingle(repo, rev, None)
2806
2806
2807 if ctx.rev() is None:
2807 if ctx.rev() is None:
2808 ctx = repo[None]
2808 ctx = repo[None]
2809 parents = ctx.parents()
2809 parents = ctx.parents()
2810 taglist = []
2810 taglist = []
2811 for p in parents:
2811 for p in parents:
2812 taglist.extend(p.tags())
2812 taglist.extend(p.tags())
2813
2813
2814 dirty = ""
2814 dirty = ""
2815 if ctx.dirty(missing=True, merge=False, branch=False):
2815 if ctx.dirty(missing=True, merge=False, branch=False):
2816 dirty = '+'
2816 dirty = '+'
2817 fm.data(dirty=dirty)
2817 fm.data(dirty=dirty)
2818
2818
2819 hexoutput = [hexfunc(p.node()) for p in parents]
2819 hexoutput = [hexfunc(p.node()) for p in parents]
2820 if default or id:
2820 if default or id:
2821 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2821 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2822 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2822 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2823
2823
2824 if num:
2824 if num:
2825 numoutput = ["%d" % p.rev() for p in parents]
2825 numoutput = ["%d" % p.rev() for p in parents]
2826 output.append("%s%s" % ('+'.join(numoutput), dirty))
2826 output.append("%s%s" % ('+'.join(numoutput), dirty))
2827
2827
2828 fn = fm.nested('parents')
2828 fn = fm.nested('parents')
2829 for p in parents:
2829 for p in parents:
2830 fn.startitem()
2830 fn.startitem()
2831 fn.data(rev=p.rev())
2831 fn.data(rev=p.rev())
2832 fn.data(node=p.hex())
2832 fn.data(node=p.hex())
2833 fn.context(ctx=p)
2833 fn.context(ctx=p)
2834 fn.end()
2834 fn.end()
2835 else:
2835 else:
2836 hexoutput = hexfunc(ctx.node())
2836 hexoutput = hexfunc(ctx.node())
2837 if default or id:
2837 if default or id:
2838 output = [hexoutput]
2838 output = [hexoutput]
2839 fm.data(id=hexoutput)
2839 fm.data(id=hexoutput)
2840
2840
2841 if num:
2841 if num:
2842 output.append(pycompat.bytestr(ctx.rev()))
2842 output.append(pycompat.bytestr(ctx.rev()))
2843 taglist = ctx.tags()
2843 taglist = ctx.tags()
2844
2844
2845 if default and not ui.quiet:
2845 if default and not ui.quiet:
2846 b = ctx.branch()
2846 b = ctx.branch()
2847 if b != 'default':
2847 if b != 'default':
2848 output.append("(%s)" % b)
2848 output.append("(%s)" % b)
2849
2849
2850 # multiple tags for a single parent separated by '/'
2850 # multiple tags for a single parent separated by '/'
2851 t = '/'.join(taglist)
2851 t = '/'.join(taglist)
2852 if t:
2852 if t:
2853 output.append(t)
2853 output.append(t)
2854
2854
2855 # multiple bookmarks for a single parent separated by '/'
2855 # multiple bookmarks for a single parent separated by '/'
2856 bm = '/'.join(ctx.bookmarks())
2856 bm = '/'.join(ctx.bookmarks())
2857 if bm:
2857 if bm:
2858 output.append(bm)
2858 output.append(bm)
2859 else:
2859 else:
2860 if branch:
2860 if branch:
2861 output.append(ctx.branch())
2861 output.append(ctx.branch())
2862
2862
2863 if tags:
2863 if tags:
2864 output.extend(taglist)
2864 output.extend(taglist)
2865
2865
2866 if bookmarks:
2866 if bookmarks:
2867 output.extend(ctx.bookmarks())
2867 output.extend(ctx.bookmarks())
2868
2868
2869 fm.data(node=ctx.hex())
2869 fm.data(node=ctx.hex())
2870 fm.data(branch=ctx.branch())
2870 fm.data(branch=ctx.branch())
2871 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2871 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2872 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2872 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2873 fm.context(ctx=ctx)
2873 fm.context(ctx=ctx)
2874
2874
2875 fm.plain("%s\n" % ' '.join(output))
2875 fm.plain("%s\n" % ' '.join(output))
2876 fm.end()
2876 fm.end()
2877
2877
2878 @command('import|patch',
2878 @command('import|patch',
2879 [('p', 'strip', 1,
2879 [('p', 'strip', 1,
2880 _('directory strip option for patch. This has the same '
2880 _('directory strip option for patch. This has the same '
2881 'meaning as the corresponding patch option'), _('NUM')),
2881 'meaning as the corresponding patch option'), _('NUM')),
2882 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2882 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2883 ('e', 'edit', False, _('invoke editor on commit messages')),
2883 ('e', 'edit', False, _('invoke editor on commit messages')),
2884 ('f', 'force', None,
2884 ('f', 'force', None,
2885 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2885 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2886 ('', 'no-commit', None,
2886 ('', 'no-commit', None,
2887 _("don't commit, just update the working directory")),
2887 _("don't commit, just update the working directory")),
2888 ('', 'bypass', None,
2888 ('', 'bypass', None,
2889 _("apply patch without touching the working directory")),
2889 _("apply patch without touching the working directory")),
2890 ('', 'partial', None,
2890 ('', 'partial', None,
2891 _('commit even if some hunks fail')),
2891 _('commit even if some hunks fail')),
2892 ('', 'exact', None,
2892 ('', 'exact', None,
2893 _('abort if patch would apply lossily')),
2893 _('abort if patch would apply lossily')),
2894 ('', 'prefix', '',
2894 ('', 'prefix', '',
2895 _('apply patch to subdirectory'), _('DIR')),
2895 _('apply patch to subdirectory'), _('DIR')),
2896 ('', 'import-branch', None,
2896 ('', 'import-branch', None,
2897 _('use any branch information in patch (implied by --exact)'))] +
2897 _('use any branch information in patch (implied by --exact)'))] +
2898 commitopts + commitopts2 + similarityopts,
2898 commitopts + commitopts2 + similarityopts,
2899 _('[OPTION]... PATCH...'))
2899 _('[OPTION]... PATCH...'))
2900 def import_(ui, repo, patch1=None, *patches, **opts):
2900 def import_(ui, repo, patch1=None, *patches, **opts):
2901 """import an ordered set of patches
2901 """import an ordered set of patches
2902
2902
2903 Import a list of patches and commit them individually (unless
2903 Import a list of patches and commit them individually (unless
2904 --no-commit is specified).
2904 --no-commit is specified).
2905
2905
2906 To read a patch from standard input (stdin), use "-" as the patch
2906 To read a patch from standard input (stdin), use "-" as the patch
2907 name. If a URL is specified, the patch will be downloaded from
2907 name. If a URL is specified, the patch will be downloaded from
2908 there.
2908 there.
2909
2909
2910 Import first applies changes to the working directory (unless
2910 Import first applies changes to the working directory (unless
2911 --bypass is specified), import will abort if there are outstanding
2911 --bypass is specified), import will abort if there are outstanding
2912 changes.
2912 changes.
2913
2913
2914 Use --bypass to apply and commit patches directly to the
2914 Use --bypass to apply and commit patches directly to the
2915 repository, without affecting the working directory. Without
2915 repository, without affecting the working directory. Without
2916 --exact, patches will be applied on top of the working directory
2916 --exact, patches will be applied on top of the working directory
2917 parent revision.
2917 parent revision.
2918
2918
2919 You can import a patch straight from a mail message. Even patches
2919 You can import a patch straight from a mail message. Even patches
2920 as attachments work (to use the body part, it must have type
2920 as attachments work (to use the body part, it must have type
2921 text/plain or text/x-patch). From and Subject headers of email
2921 text/plain or text/x-patch). From and Subject headers of email
2922 message are used as default committer and commit message. All
2922 message are used as default committer and commit message. All
2923 text/plain body parts before first diff are added to the commit
2923 text/plain body parts before first diff are added to the commit
2924 message.
2924 message.
2925
2925
2926 If the imported patch was generated by :hg:`export`, user and
2926 If the imported patch was generated by :hg:`export`, user and
2927 description from patch override values from message headers and
2927 description from patch override values from message headers and
2928 body. Values given on command line with -m/--message and -u/--user
2928 body. Values given on command line with -m/--message and -u/--user
2929 override these.
2929 override these.
2930
2930
2931 If --exact is specified, import will set the working directory to
2931 If --exact is specified, import will set the working directory to
2932 the parent of each patch before applying it, and will abort if the
2932 the parent of each patch before applying it, and will abort if the
2933 resulting changeset has a different ID than the one recorded in
2933 resulting changeset has a different ID than the one recorded in
2934 the patch. This will guard against various ways that portable
2934 the patch. This will guard against various ways that portable
2935 patch formats and mail systems might fail to transfer Mercurial
2935 patch formats and mail systems might fail to transfer Mercurial
2936 data or metadata. See :hg:`bundle` for lossless transmission.
2936 data or metadata. See :hg:`bundle` for lossless transmission.
2937
2937
2938 Use --partial to ensure a changeset will be created from the patch
2938 Use --partial to ensure a changeset will be created from the patch
2939 even if some hunks fail to apply. Hunks that fail to apply will be
2939 even if some hunks fail to apply. Hunks that fail to apply will be
2940 written to a <target-file>.rej file. Conflicts can then be resolved
2940 written to a <target-file>.rej file. Conflicts can then be resolved
2941 by hand before :hg:`commit --amend` is run to update the created
2941 by hand before :hg:`commit --amend` is run to update the created
2942 changeset. This flag exists to let people import patches that
2942 changeset. This flag exists to let people import patches that
2943 partially apply without losing the associated metadata (author,
2943 partially apply without losing the associated metadata (author,
2944 date, description, ...).
2944 date, description, ...).
2945
2945
2946 .. note::
2946 .. note::
2947
2947
2948 When no hunks apply cleanly, :hg:`import --partial` will create
2948 When no hunks apply cleanly, :hg:`import --partial` will create
2949 an empty changeset, importing only the patch metadata.
2949 an empty changeset, importing only the patch metadata.
2950
2950
2951 With -s/--similarity, hg will attempt to discover renames and
2951 With -s/--similarity, hg will attempt to discover renames and
2952 copies in the patch in the same way as :hg:`addremove`.
2952 copies in the patch in the same way as :hg:`addremove`.
2953
2953
2954 It is possible to use external patch programs to perform the patch
2954 It is possible to use external patch programs to perform the patch
2955 by setting the ``ui.patch`` configuration option. For the default
2955 by setting the ``ui.patch`` configuration option. For the default
2956 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2956 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2957 See :hg:`help config` for more information about configuration
2957 See :hg:`help config` for more information about configuration
2958 files and how to use these options.
2958 files and how to use these options.
2959
2959
2960 See :hg:`help dates` for a list of formats valid for -d/--date.
2960 See :hg:`help dates` for a list of formats valid for -d/--date.
2961
2961
2962 .. container:: verbose
2962 .. container:: verbose
2963
2963
2964 Examples:
2964 Examples:
2965
2965
2966 - import a traditional patch from a website and detect renames::
2966 - import a traditional patch from a website and detect renames::
2967
2967
2968 hg import -s 80 http://example.com/bugfix.patch
2968 hg import -s 80 http://example.com/bugfix.patch
2969
2969
2970 - import a changeset from an hgweb server::
2970 - import a changeset from an hgweb server::
2971
2971
2972 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2972 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2973
2973
2974 - import all the patches in an Unix-style mbox::
2974 - import all the patches in an Unix-style mbox::
2975
2975
2976 hg import incoming-patches.mbox
2976 hg import incoming-patches.mbox
2977
2977
2978 - import patches from stdin::
2978 - import patches from stdin::
2979
2979
2980 hg import -
2980 hg import -
2981
2981
2982 - attempt to exactly restore an exported changeset (not always
2982 - attempt to exactly restore an exported changeset (not always
2983 possible)::
2983 possible)::
2984
2984
2985 hg import --exact proposed-fix.patch
2985 hg import --exact proposed-fix.patch
2986
2986
2987 - use an external tool to apply a patch which is too fuzzy for
2987 - use an external tool to apply a patch which is too fuzzy for
2988 the default internal tool.
2988 the default internal tool.
2989
2989
2990 hg import --config ui.patch="patch --merge" fuzzy.patch
2990 hg import --config ui.patch="patch --merge" fuzzy.patch
2991
2991
2992 - change the default fuzzing from 2 to a less strict 7
2992 - change the default fuzzing from 2 to a less strict 7
2993
2993
2994 hg import --config ui.fuzz=7 fuzz.patch
2994 hg import --config ui.fuzz=7 fuzz.patch
2995
2995
2996 Returns 0 on success, 1 on partial success (see --partial).
2996 Returns 0 on success, 1 on partial success (see --partial).
2997 """
2997 """
2998
2998
2999 opts = pycompat.byteskwargs(opts)
2999 opts = pycompat.byteskwargs(opts)
3000 if not patch1:
3000 if not patch1:
3001 raise error.Abort(_('need at least one patch to import'))
3001 raise error.Abort(_('need at least one patch to import'))
3002
3002
3003 patches = (patch1,) + patches
3003 patches = (patch1,) + patches
3004
3004
3005 date = opts.get('date')
3005 date = opts.get('date')
3006 if date:
3006 if date:
3007 opts['date'] = util.parsedate(date)
3007 opts['date'] = util.parsedate(date)
3008
3008
3009 exact = opts.get('exact')
3009 exact = opts.get('exact')
3010 update = not opts.get('bypass')
3010 update = not opts.get('bypass')
3011 if not update and opts.get('no_commit'):
3011 if not update and opts.get('no_commit'):
3012 raise error.Abort(_('cannot use --no-commit with --bypass'))
3012 raise error.Abort(_('cannot use --no-commit with --bypass'))
3013 try:
3013 try:
3014 sim = float(opts.get('similarity') or 0)
3014 sim = float(opts.get('similarity') or 0)
3015 except ValueError:
3015 except ValueError:
3016 raise error.Abort(_('similarity must be a number'))
3016 raise error.Abort(_('similarity must be a number'))
3017 if sim < 0 or sim > 100:
3017 if sim < 0 or sim > 100:
3018 raise error.Abort(_('similarity must be between 0 and 100'))
3018 raise error.Abort(_('similarity must be between 0 and 100'))
3019 if sim and not update:
3019 if sim and not update:
3020 raise error.Abort(_('cannot use --similarity with --bypass'))
3020 raise error.Abort(_('cannot use --similarity with --bypass'))
3021 if exact:
3021 if exact:
3022 if opts.get('edit'):
3022 if opts.get('edit'):
3023 raise error.Abort(_('cannot use --exact with --edit'))
3023 raise error.Abort(_('cannot use --exact with --edit'))
3024 if opts.get('prefix'):
3024 if opts.get('prefix'):
3025 raise error.Abort(_('cannot use --exact with --prefix'))
3025 raise error.Abort(_('cannot use --exact with --prefix'))
3026
3026
3027 base = opts["base"]
3027 base = opts["base"]
3028 wlock = dsguard = lock = tr = None
3028 wlock = dsguard = lock = tr = None
3029 msgs = []
3029 msgs = []
3030 ret = 0
3030 ret = 0
3031
3031
3032
3032
3033 try:
3033 try:
3034 wlock = repo.wlock()
3034 wlock = repo.wlock()
3035
3035
3036 if update:
3036 if update:
3037 cmdutil.checkunfinished(repo)
3037 cmdutil.checkunfinished(repo)
3038 if (exact or not opts.get('force')):
3038 if (exact or not opts.get('force')):
3039 cmdutil.bailifchanged(repo)
3039 cmdutil.bailifchanged(repo)
3040
3040
3041 if not opts.get('no_commit'):
3041 if not opts.get('no_commit'):
3042 lock = repo.lock()
3042 lock = repo.lock()
3043 tr = repo.transaction('import')
3043 tr = repo.transaction('import')
3044 else:
3044 else:
3045 dsguard = dirstateguard.dirstateguard(repo, 'import')
3045 dsguard = dirstateguard.dirstateguard(repo, 'import')
3046 parents = repo[None].parents()
3046 parents = repo[None].parents()
3047 for patchurl in patches:
3047 for patchurl in patches:
3048 if patchurl == '-':
3048 if patchurl == '-':
3049 ui.status(_('applying patch from stdin\n'))
3049 ui.status(_('applying patch from stdin\n'))
3050 patchfile = ui.fin
3050 patchfile = ui.fin
3051 patchurl = 'stdin' # for error message
3051 patchurl = 'stdin' # for error message
3052 else:
3052 else:
3053 patchurl = os.path.join(base, patchurl)
3053 patchurl = os.path.join(base, patchurl)
3054 ui.status(_('applying %s\n') % patchurl)
3054 ui.status(_('applying %s\n') % patchurl)
3055 patchfile = hg.openpath(ui, patchurl)
3055 patchfile = hg.openpath(ui, patchurl)
3056
3056
3057 haspatch = False
3057 haspatch = False
3058 for hunk in patch.split(patchfile):
3058 for hunk in patch.split(patchfile):
3059 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3059 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3060 parents, opts,
3060 parents, opts,
3061 msgs, hg.clean)
3061 msgs, hg.clean)
3062 if msg:
3062 if msg:
3063 haspatch = True
3063 haspatch = True
3064 ui.note(msg + '\n')
3064 ui.note(msg + '\n')
3065 if update or exact:
3065 if update or exact:
3066 parents = repo[None].parents()
3066 parents = repo[None].parents()
3067 else:
3067 else:
3068 parents = [repo[node]]
3068 parents = [repo[node]]
3069 if rej:
3069 if rej:
3070 ui.write_err(_("patch applied partially\n"))
3070 ui.write_err(_("patch applied partially\n"))
3071 ui.write_err(_("(fix the .rej files and run "
3071 ui.write_err(_("(fix the .rej files and run "
3072 "`hg commit --amend`)\n"))
3072 "`hg commit --amend`)\n"))
3073 ret = 1
3073 ret = 1
3074 break
3074 break
3075
3075
3076 if not haspatch:
3076 if not haspatch:
3077 raise error.Abort(_('%s: no diffs found') % patchurl)
3077 raise error.Abort(_('%s: no diffs found') % patchurl)
3078
3078
3079 if tr:
3079 if tr:
3080 tr.close()
3080 tr.close()
3081 if msgs:
3081 if msgs:
3082 repo.savecommitmessage('\n* * *\n'.join(msgs))
3082 repo.savecommitmessage('\n* * *\n'.join(msgs))
3083 if dsguard:
3083 if dsguard:
3084 dsguard.close()
3084 dsguard.close()
3085 return ret
3085 return ret
3086 finally:
3086 finally:
3087 if tr:
3087 if tr:
3088 tr.release()
3088 tr.release()
3089 release(lock, dsguard, wlock)
3089 release(lock, dsguard, wlock)
3090
3090
3091 @command('incoming|in',
3091 @command('incoming|in',
3092 [('f', 'force', None,
3092 [('f', 'force', None,
3093 _('run even if remote repository is unrelated')),
3093 _('run even if remote repository is unrelated')),
3094 ('n', 'newest-first', None, _('show newest record first')),
3094 ('n', 'newest-first', None, _('show newest record first')),
3095 ('', 'bundle', '',
3095 ('', 'bundle', '',
3096 _('file to store the bundles into'), _('FILE')),
3096 _('file to store the bundles into'), _('FILE')),
3097 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3097 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3098 ('B', 'bookmarks', False, _("compare bookmarks")),
3098 ('B', 'bookmarks', False, _("compare bookmarks")),
3099 ('b', 'branch', [],
3099 ('b', 'branch', [],
3100 _('a specific branch you would like to pull'), _('BRANCH')),
3100 _('a specific branch you would like to pull'), _('BRANCH')),
3101 ] + logopts + remoteopts + subrepoopts,
3101 ] + logopts + remoteopts + subrepoopts,
3102 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3102 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3103 def incoming(ui, repo, source="default", **opts):
3103 def incoming(ui, repo, source="default", **opts):
3104 """show new changesets found in source
3104 """show new changesets found in source
3105
3105
3106 Show new changesets found in the specified path/URL or the default
3106 Show new changesets found in the specified path/URL or the default
3107 pull location. These are the changesets that would have been pulled
3107 pull location. These are the changesets that would have been pulled
3108 by :hg:`pull` at the time you issued this command.
3108 by :hg:`pull` at the time you issued this command.
3109
3109
3110 See pull for valid source format details.
3110 See pull for valid source format details.
3111
3111
3112 .. container:: verbose
3112 .. container:: verbose
3113
3113
3114 With -B/--bookmarks, the result of bookmark comparison between
3114 With -B/--bookmarks, the result of bookmark comparison between
3115 local and remote repositories is displayed. With -v/--verbose,
3115 local and remote repositories is displayed. With -v/--verbose,
3116 status is also displayed for each bookmark like below::
3116 status is also displayed for each bookmark like below::
3117
3117
3118 BM1 01234567890a added
3118 BM1 01234567890a added
3119 BM2 1234567890ab advanced
3119 BM2 1234567890ab advanced
3120 BM3 234567890abc diverged
3120 BM3 234567890abc diverged
3121 BM4 34567890abcd changed
3121 BM4 34567890abcd changed
3122
3122
3123 The action taken locally when pulling depends on the
3123 The action taken locally when pulling depends on the
3124 status of each bookmark:
3124 status of each bookmark:
3125
3125
3126 :``added``: pull will create it
3126 :``added``: pull will create it
3127 :``advanced``: pull will update it
3127 :``advanced``: pull will update it
3128 :``diverged``: pull will create a divergent bookmark
3128 :``diverged``: pull will create a divergent bookmark
3129 :``changed``: result depends on remote changesets
3129 :``changed``: result depends on remote changesets
3130
3130
3131 From the point of view of pulling behavior, bookmark
3131 From the point of view of pulling behavior, bookmark
3132 existing only in the remote repository are treated as ``added``,
3132 existing only in the remote repository are treated as ``added``,
3133 even if it is in fact locally deleted.
3133 even if it is in fact locally deleted.
3134
3134
3135 .. container:: verbose
3135 .. container:: verbose
3136
3136
3137 For remote repository, using --bundle avoids downloading the
3137 For remote repository, using --bundle avoids downloading the
3138 changesets twice if the incoming is followed by a pull.
3138 changesets twice if the incoming is followed by a pull.
3139
3139
3140 Examples:
3140 Examples:
3141
3141
3142 - show incoming changes with patches and full description::
3142 - show incoming changes with patches and full description::
3143
3143
3144 hg incoming -vp
3144 hg incoming -vp
3145
3145
3146 - show incoming changes excluding merges, store a bundle::
3146 - show incoming changes excluding merges, store a bundle::
3147
3147
3148 hg in -vpM --bundle incoming.hg
3148 hg in -vpM --bundle incoming.hg
3149 hg pull incoming.hg
3149 hg pull incoming.hg
3150
3150
3151 - briefly list changes inside a bundle::
3151 - briefly list changes inside a bundle::
3152
3152
3153 hg in changes.hg -T "{desc|firstline}\\n"
3153 hg in changes.hg -T "{desc|firstline}\\n"
3154
3154
3155 Returns 0 if there are incoming changes, 1 otherwise.
3155 Returns 0 if there are incoming changes, 1 otherwise.
3156 """
3156 """
3157 opts = pycompat.byteskwargs(opts)
3157 opts = pycompat.byteskwargs(opts)
3158 if opts.get('graph'):
3158 if opts.get('graph'):
3159 logcmdutil.checkunsupportedgraphflags([], opts)
3159 logcmdutil.checkunsupportedgraphflags([], opts)
3160 def display(other, chlist, displayer):
3160 def display(other, chlist, displayer):
3161 revdag = logcmdutil.graphrevs(other, chlist, opts)
3161 revdag = logcmdutil.graphrevs(other, chlist, opts)
3162 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3162 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3163 graphmod.asciiedges)
3163 graphmod.asciiedges)
3164
3164
3165 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3165 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3166 return 0
3166 return 0
3167
3167
3168 if opts.get('bundle') and opts.get('subrepos'):
3168 if opts.get('bundle') and opts.get('subrepos'):
3169 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3169 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3170
3170
3171 if opts.get('bookmarks'):
3171 if opts.get('bookmarks'):
3172 source, branches = hg.parseurl(ui.expandpath(source),
3172 source, branches = hg.parseurl(ui.expandpath(source),
3173 opts.get('branch'))
3173 opts.get('branch'))
3174 other = hg.peer(repo, opts, source)
3174 other = hg.peer(repo, opts, source)
3175 if 'bookmarks' not in other.listkeys('namespaces'):
3175 if 'bookmarks' not in other.listkeys('namespaces'):
3176 ui.warn(_("remote doesn't support bookmarks\n"))
3176 ui.warn(_("remote doesn't support bookmarks\n"))
3177 return 0
3177 return 0
3178 ui.pager('incoming')
3178 ui.pager('incoming')
3179 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3179 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3180 return bookmarks.incoming(ui, repo, other)
3180 return bookmarks.incoming(ui, repo, other)
3181
3181
3182 repo._subtoppath = ui.expandpath(source)
3182 repo._subtoppath = ui.expandpath(source)
3183 try:
3183 try:
3184 return hg.incoming(ui, repo, source, opts)
3184 return hg.incoming(ui, repo, source, opts)
3185 finally:
3185 finally:
3186 del repo._subtoppath
3186 del repo._subtoppath
3187
3187
3188
3188
3189 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3189 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3190 norepo=True)
3190 norepo=True)
3191 def init(ui, dest=".", **opts):
3191 def init(ui, dest=".", **opts):
3192 """create a new repository in the given directory
3192 """create a new repository in the given directory
3193
3193
3194 Initialize a new repository in the given directory. If the given
3194 Initialize a new repository in the given directory. If the given
3195 directory does not exist, it will be created.
3195 directory does not exist, it will be created.
3196
3196
3197 If no directory is given, the current directory is used.
3197 If no directory is given, the current directory is used.
3198
3198
3199 It is possible to specify an ``ssh://`` URL as the destination.
3199 It is possible to specify an ``ssh://`` URL as the destination.
3200 See :hg:`help urls` for more information.
3200 See :hg:`help urls` for more information.
3201
3201
3202 Returns 0 on success.
3202 Returns 0 on success.
3203 """
3203 """
3204 opts = pycompat.byteskwargs(opts)
3204 opts = pycompat.byteskwargs(opts)
3205 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3205 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3206
3206
3207 @command('locate',
3207 @command('locate',
3208 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3208 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3209 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3209 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3210 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3210 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3211 ] + walkopts,
3211 ] + walkopts,
3212 _('[OPTION]... [PATTERN]...'))
3212 _('[OPTION]... [PATTERN]...'))
3213 def locate(ui, repo, *pats, **opts):
3213 def locate(ui, repo, *pats, **opts):
3214 """locate files matching specific patterns (DEPRECATED)
3214 """locate files matching specific patterns (DEPRECATED)
3215
3215
3216 Print files under Mercurial control in the working directory whose
3216 Print files under Mercurial control in the working directory whose
3217 names match the given patterns.
3217 names match the given patterns.
3218
3218
3219 By default, this command searches all directories in the working
3219 By default, this command searches all directories in the working
3220 directory. To search just the current directory and its
3220 directory. To search just the current directory and its
3221 subdirectories, use "--include .".
3221 subdirectories, use "--include .".
3222
3222
3223 If no patterns are given to match, this command prints the names
3223 If no patterns are given to match, this command prints the names
3224 of all files under Mercurial control in the working directory.
3224 of all files under Mercurial control in the working directory.
3225
3225
3226 If you want to feed the output of this command into the "xargs"
3226 If you want to feed the output of this command into the "xargs"
3227 command, use the -0 option to both this command and "xargs". This
3227 command, use the -0 option to both this command and "xargs". This
3228 will avoid the problem of "xargs" treating single filenames that
3228 will avoid the problem of "xargs" treating single filenames that
3229 contain whitespace as multiple filenames.
3229 contain whitespace as multiple filenames.
3230
3230
3231 See :hg:`help files` for a more versatile command.
3231 See :hg:`help files` for a more versatile command.
3232
3232
3233 Returns 0 if a match is found, 1 otherwise.
3233 Returns 0 if a match is found, 1 otherwise.
3234 """
3234 """
3235 opts = pycompat.byteskwargs(opts)
3235 opts = pycompat.byteskwargs(opts)
3236 if opts.get('print0'):
3236 if opts.get('print0'):
3237 end = '\0'
3237 end = '\0'
3238 else:
3238 else:
3239 end = '\n'
3239 end = '\n'
3240 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3240 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3241
3241
3242 ret = 1
3242 ret = 1
3243 ctx = repo[rev]
3243 ctx = repo[rev]
3244 m = scmutil.match(ctx, pats, opts, default='relglob',
3244 m = scmutil.match(ctx, pats, opts, default='relglob',
3245 badfn=lambda x, y: False)
3245 badfn=lambda x, y: False)
3246
3246
3247 ui.pager('locate')
3247 ui.pager('locate')
3248 for abs in ctx.matches(m):
3248 for abs in ctx.matches(m):
3249 if opts.get('fullpath'):
3249 if opts.get('fullpath'):
3250 ui.write(repo.wjoin(abs), end)
3250 ui.write(repo.wjoin(abs), end)
3251 else:
3251 else:
3252 ui.write(((pats and m.rel(abs)) or abs), end)
3252 ui.write(((pats and m.rel(abs)) or abs), end)
3253 ret = 0
3253 ret = 0
3254
3254
3255 return ret
3255 return ret
3256
3256
3257 @command('^log|history',
3257 @command('^log|history',
3258 [('f', 'follow', None,
3258 [('f', 'follow', None,
3259 _('follow changeset history, or file history across copies and renames')),
3259 _('follow changeset history, or file history across copies and renames')),
3260 ('', 'follow-first', None,
3260 ('', 'follow-first', None,
3261 _('only follow the first parent of merge changesets (DEPRECATED)')),
3261 _('only follow the first parent of merge changesets (DEPRECATED)')),
3262 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3262 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3263 ('C', 'copies', None, _('show copied files')),
3263 ('C', 'copies', None, _('show copied files')),
3264 ('k', 'keyword', [],
3264 ('k', 'keyword', [],
3265 _('do case-insensitive search for a given text'), _('TEXT')),
3265 _('do case-insensitive search for a given text'), _('TEXT')),
3266 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3266 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3267 ('L', 'line-range', [],
3267 ('L', 'line-range', [],
3268 _('follow line range of specified file (EXPERIMENTAL)'),
3268 _('follow line range of specified file (EXPERIMENTAL)'),
3269 _('FILE,RANGE')),
3269 _('FILE,RANGE')),
3270 ('', 'removed', None, _('include revisions where files were removed')),
3270 ('', 'removed', None, _('include revisions where files were removed')),
3271 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3271 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3272 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3272 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3273 ('', 'only-branch', [],
3273 ('', 'only-branch', [],
3274 _('show only changesets within the given named branch (DEPRECATED)'),
3274 _('show only changesets within the given named branch (DEPRECATED)'),
3275 _('BRANCH')),
3275 _('BRANCH')),
3276 ('b', 'branch', [],
3276 ('b', 'branch', [],
3277 _('show changesets within the given named branch'), _('BRANCH')),
3277 _('show changesets within the given named branch'), _('BRANCH')),
3278 ('P', 'prune', [],
3278 ('P', 'prune', [],
3279 _('do not display revision or any of its ancestors'), _('REV')),
3279 _('do not display revision or any of its ancestors'), _('REV')),
3280 ] + logopts + walkopts,
3280 ] + logopts + walkopts,
3281 _('[OPTION]... [FILE]'),
3281 _('[OPTION]... [FILE]'),
3282 inferrepo=True, cmdtype=readonly)
3282 inferrepo=True, cmdtype=readonly)
3283 def log(ui, repo, *pats, **opts):
3283 def log(ui, repo, *pats, **opts):
3284 """show revision history of entire repository or files
3284 """show revision history of entire repository or files
3285
3285
3286 Print the revision history of the specified files or the entire
3286 Print the revision history of the specified files or the entire
3287 project.
3287 project.
3288
3288
3289 If no revision range is specified, the default is ``tip:0`` unless
3289 If no revision range is specified, the default is ``tip:0`` unless
3290 --follow is set, in which case the working directory parent is
3290 --follow is set, in which case the working directory parent is
3291 used as the starting revision.
3291 used as the starting revision.
3292
3292
3293 File history is shown without following rename or copy history of
3293 File history is shown without following rename or copy history of
3294 files. Use -f/--follow with a filename to follow history across
3294 files. Use -f/--follow with a filename to follow history across
3295 renames and copies. --follow without a filename will only show
3295 renames and copies. --follow without a filename will only show
3296 ancestors of the starting revision.
3296 ancestors of the starting revision.
3297
3297
3298 By default this command prints revision number and changeset id,
3298 By default this command prints revision number and changeset id,
3299 tags, non-trivial parents, user, date and time, and a summary for
3299 tags, non-trivial parents, user, date and time, and a summary for
3300 each commit. When the -v/--verbose switch is used, the list of
3300 each commit. When the -v/--verbose switch is used, the list of
3301 changed files and full commit message are shown.
3301 changed files and full commit message are shown.
3302
3302
3303 With --graph the revisions are shown as an ASCII art DAG with the most
3303 With --graph the revisions are shown as an ASCII art DAG with the most
3304 recent changeset at the top.
3304 recent changeset at the top.
3305 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3305 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3306 and '+' represents a fork where the changeset from the lines below is a
3306 and '+' represents a fork where the changeset from the lines below is a
3307 parent of the 'o' merge on the same line.
3307 parent of the 'o' merge on the same line.
3308 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3308 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3309 of a '|' indicates one or more revisions in a path are omitted.
3309 of a '|' indicates one or more revisions in a path are omitted.
3310
3310
3311 .. container:: verbose
3311 .. container:: verbose
3312
3312
3313 Use -L/--line-range FILE,M:N options to follow the history of lines
3313 Use -L/--line-range FILE,M:N options to follow the history of lines
3314 from M to N in FILE. With -p/--patch only diff hunks affecting
3314 from M to N in FILE. With -p/--patch only diff hunks affecting
3315 specified line range will be shown. This option requires --follow;
3315 specified line range will be shown. This option requires --follow;
3316 it can be specified multiple times. Currently, this option is not
3316 it can be specified multiple times. Currently, this option is not
3317 compatible with --graph. This option is experimental.
3317 compatible with --graph. This option is experimental.
3318
3318
3319 .. note::
3319 .. note::
3320
3320
3321 :hg:`log --patch` may generate unexpected diff output for merge
3321 :hg:`log --patch` may generate unexpected diff output for merge
3322 changesets, as it will only compare the merge changeset against
3322 changesets, as it will only compare the merge changeset against
3323 its first parent. Also, only files different from BOTH parents
3323 its first parent. Also, only files different from BOTH parents
3324 will appear in files:.
3324 will appear in files:.
3325
3325
3326 .. note::
3326 .. note::
3327
3327
3328 For performance reasons, :hg:`log FILE` may omit duplicate changes
3328 For performance reasons, :hg:`log FILE` may omit duplicate changes
3329 made on branches and will not show removals or mode changes. To
3329 made on branches and will not show removals or mode changes. To
3330 see all such changes, use the --removed switch.
3330 see all such changes, use the --removed switch.
3331
3331
3332 .. container:: verbose
3332 .. container:: verbose
3333
3333
3334 .. note::
3334 .. note::
3335
3335
3336 The history resulting from -L/--line-range options depends on diff
3336 The history resulting from -L/--line-range options depends on diff
3337 options; for instance if white-spaces are ignored, respective changes
3337 options; for instance if white-spaces are ignored, respective changes
3338 with only white-spaces in specified line range will not be listed.
3338 with only white-spaces in specified line range will not be listed.
3339
3339
3340 .. container:: verbose
3340 .. container:: verbose
3341
3341
3342 Some examples:
3342 Some examples:
3343
3343
3344 - changesets with full descriptions and file lists::
3344 - changesets with full descriptions and file lists::
3345
3345
3346 hg log -v
3346 hg log -v
3347
3347
3348 - changesets ancestral to the working directory::
3348 - changesets ancestral to the working directory::
3349
3349
3350 hg log -f
3350 hg log -f
3351
3351
3352 - last 10 commits on the current branch::
3352 - last 10 commits on the current branch::
3353
3353
3354 hg log -l 10 -b .
3354 hg log -l 10 -b .
3355
3355
3356 - changesets showing all modifications of a file, including removals::
3356 - changesets showing all modifications of a file, including removals::
3357
3357
3358 hg log --removed file.c
3358 hg log --removed file.c
3359
3359
3360 - all changesets that touch a directory, with diffs, excluding merges::
3360 - all changesets that touch a directory, with diffs, excluding merges::
3361
3361
3362 hg log -Mp lib/
3362 hg log -Mp lib/
3363
3363
3364 - all revision numbers that match a keyword::
3364 - all revision numbers that match a keyword::
3365
3365
3366 hg log -k bug --template "{rev}\\n"
3366 hg log -k bug --template "{rev}\\n"
3367
3367
3368 - the full hash identifier of the working directory parent::
3368 - the full hash identifier of the working directory parent::
3369
3369
3370 hg log -r . --template "{node}\\n"
3370 hg log -r . --template "{node}\\n"
3371
3371
3372 - list available log templates::
3372 - list available log templates::
3373
3373
3374 hg log -T list
3374 hg log -T list
3375
3375
3376 - check if a given changeset is included in a tagged release::
3376 - check if a given changeset is included in a tagged release::
3377
3377
3378 hg log -r "a21ccf and ancestor(1.9)"
3378 hg log -r "a21ccf and ancestor(1.9)"
3379
3379
3380 - find all changesets by some user in a date range::
3380 - find all changesets by some user in a date range::
3381
3381
3382 hg log -k alice -d "may 2008 to jul 2008"
3382 hg log -k alice -d "may 2008 to jul 2008"
3383
3383
3384 - summary of all changesets after the last tag::
3384 - summary of all changesets after the last tag::
3385
3385
3386 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3386 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3387
3387
3388 - changesets touching lines 13 to 23 for file.c::
3388 - changesets touching lines 13 to 23 for file.c::
3389
3389
3390 hg log -L file.c,13:23
3390 hg log -L file.c,13:23
3391
3391
3392 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3392 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3393 main.c with patch::
3393 main.c with patch::
3394
3394
3395 hg log -L file.c,13:23 -L main.c,2:6 -p
3395 hg log -L file.c,13:23 -L main.c,2:6 -p
3396
3396
3397 See :hg:`help dates` for a list of formats valid for -d/--date.
3397 See :hg:`help dates` for a list of formats valid for -d/--date.
3398
3398
3399 See :hg:`help revisions` for more about specifying and ordering
3399 See :hg:`help revisions` for more about specifying and ordering
3400 revisions.
3400 revisions.
3401
3401
3402 See :hg:`help templates` for more about pre-packaged styles and
3402 See :hg:`help templates` for more about pre-packaged styles and
3403 specifying custom templates. The default template used by the log
3403 specifying custom templates. The default template used by the log
3404 command can be customized via the ``ui.logtemplate`` configuration
3404 command can be customized via the ``ui.logtemplate`` configuration
3405 setting.
3405 setting.
3406
3406
3407 Returns 0 on success.
3407 Returns 0 on success.
3408
3408
3409 """
3409 """
3410 opts = pycompat.byteskwargs(opts)
3410 opts = pycompat.byteskwargs(opts)
3411 linerange = opts.get('line_range')
3411 linerange = opts.get('line_range')
3412
3412
3413 if linerange and not opts.get('follow'):
3413 if linerange and not opts.get('follow'):
3414 raise error.Abort(_('--line-range requires --follow'))
3414 raise error.Abort(_('--line-range requires --follow'))
3415
3415
3416 if linerange and pats:
3416 if linerange and pats:
3417 # TODO: take pats as patterns with no line-range filter
3417 # TODO: take pats as patterns with no line-range filter
3418 raise error.Abort(
3418 raise error.Abort(
3419 _('FILE arguments are not compatible with --line-range option')
3419 _('FILE arguments are not compatible with --line-range option')
3420 )
3420 )
3421
3421
3422 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3422 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3423 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3423 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3424 if linerange:
3424 if linerange:
3425 # TODO: should follow file history from logcmdutil._initialrevs(),
3425 # TODO: should follow file history from logcmdutil._initialrevs(),
3426 # then filter the result by logcmdutil._makerevset() and --limit
3426 # then filter the result by logcmdutil._makerevset() and --limit
3427 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3427 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3428
3428
3429 getrenamed = None
3429 getrenamed = None
3430 if opts.get('copies'):
3430 if opts.get('copies'):
3431 endrev = None
3431 endrev = None
3432 if opts.get('rev'):
3432 if opts.get('rev'):
3433 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3433 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3434 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3434 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3435
3435
3436 ui.pager('log')
3436 ui.pager('log')
3437 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3437 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3438 buffered=True)
3438 buffered=True)
3439 if opts.get('graph'):
3439 if opts.get('graph'):
3440 displayfn = logcmdutil.displaygraphrevs
3440 displayfn = logcmdutil.displaygraphrevs
3441 else:
3441 else:
3442 displayfn = logcmdutil.displayrevs
3442 displayfn = logcmdutil.displayrevs
3443 displayfn(ui, repo, revs, displayer, getrenamed)
3443 displayfn(ui, repo, revs, displayer, getrenamed)
3444
3444
3445 @command('manifest',
3445 @command('manifest',
3446 [('r', 'rev', '', _('revision to display'), _('REV')),
3446 [('r', 'rev', '', _('revision to display'), _('REV')),
3447 ('', 'all', False, _("list files from all revisions"))]
3447 ('', 'all', False, _("list files from all revisions"))]
3448 + formatteropts,
3448 + formatteropts,
3449 _('[-r REV]'), cmdtype=readonly)
3449 _('[-r REV]'), cmdtype=readonly)
3450 def manifest(ui, repo, node=None, rev=None, **opts):
3450 def manifest(ui, repo, node=None, rev=None, **opts):
3451 """output the current or given revision of the project manifest
3451 """output the current or given revision of the project manifest
3452
3452
3453 Print a list of version controlled files for the given revision.
3453 Print a list of version controlled files for the given revision.
3454 If no revision is given, the first parent of the working directory
3454 If no revision is given, the first parent of the working directory
3455 is used, or the null revision if no revision is checked out.
3455 is used, or the null revision if no revision is checked out.
3456
3456
3457 With -v, print file permissions, symlink and executable bits.
3457 With -v, print file permissions, symlink and executable bits.
3458 With --debug, print file revision hashes.
3458 With --debug, print file revision hashes.
3459
3459
3460 If option --all is specified, the list of all files from all revisions
3460 If option --all is specified, the list of all files from all revisions
3461 is printed. This includes deleted and renamed files.
3461 is printed. This includes deleted and renamed files.
3462
3462
3463 Returns 0 on success.
3463 Returns 0 on success.
3464 """
3464 """
3465 opts = pycompat.byteskwargs(opts)
3465 opts = pycompat.byteskwargs(opts)
3466 fm = ui.formatter('manifest', opts)
3466 fm = ui.formatter('manifest', opts)
3467
3467
3468 if opts.get('all'):
3468 if opts.get('all'):
3469 if rev or node:
3469 if rev or node:
3470 raise error.Abort(_("can't specify a revision with --all"))
3470 raise error.Abort(_("can't specify a revision with --all"))
3471
3471
3472 res = []
3472 res = []
3473 prefix = "data/"
3473 prefix = "data/"
3474 suffix = ".i"
3474 suffix = ".i"
3475 plen = len(prefix)
3475 plen = len(prefix)
3476 slen = len(suffix)
3476 slen = len(suffix)
3477 with repo.lock():
3477 with repo.lock():
3478 for fn, b, size in repo.store.datafiles():
3478 for fn, b, size in repo.store.datafiles():
3479 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3479 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3480 res.append(fn[plen:-slen])
3480 res.append(fn[plen:-slen])
3481 ui.pager('manifest')
3481 ui.pager('manifest')
3482 for f in res:
3482 for f in res:
3483 fm.startitem()
3483 fm.startitem()
3484 fm.write("path", '%s\n', f)
3484 fm.write("path", '%s\n', f)
3485 fm.end()
3485 fm.end()
3486 return
3486 return
3487
3487
3488 if rev and node:
3488 if rev and node:
3489 raise error.Abort(_("please specify just one revision"))
3489 raise error.Abort(_("please specify just one revision"))
3490
3490
3491 if not node:
3491 if not node:
3492 node = rev
3492 node = rev
3493
3493
3494 char = {'l': '@', 'x': '*', '': ''}
3494 char = {'l': '@', 'x': '*', '': ''}
3495 mode = {'l': '644', 'x': '755', '': '644'}
3495 mode = {'l': '644', 'x': '755', '': '644'}
3496 if node:
3496 if node:
3497 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3497 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3498 ctx = scmutil.revsingle(repo, node)
3498 ctx = scmutil.revsingle(repo, node)
3499 mf = ctx.manifest()
3499 mf = ctx.manifest()
3500 ui.pager('manifest')
3500 ui.pager('manifest')
3501 for f in ctx:
3501 for f in ctx:
3502 fm.startitem()
3502 fm.startitem()
3503 fl = ctx[f].flags()
3503 fl = ctx[f].flags()
3504 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3504 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3505 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3505 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3506 fm.write('path', '%s\n', f)
3506 fm.write('path', '%s\n', f)
3507 fm.end()
3507 fm.end()
3508
3508
3509 @command('^merge',
3509 @command('^merge',
3510 [('f', 'force', None,
3510 [('f', 'force', None,
3511 _('force a merge including outstanding changes (DEPRECATED)')),
3511 _('force a merge including outstanding changes (DEPRECATED)')),
3512 ('r', 'rev', '', _('revision to merge'), _('REV')),
3512 ('r', 'rev', '', _('revision to merge'), _('REV')),
3513 ('P', 'preview', None,
3513 ('P', 'preview', None,
3514 _('review revisions to merge (no merge is performed)')),
3514 _('review revisions to merge (no merge is performed)')),
3515 ('', 'abort', None, _('abort the ongoing merge')),
3515 ('', 'abort', None, _('abort the ongoing merge')),
3516 ] + mergetoolopts,
3516 ] + mergetoolopts,
3517 _('[-P] [[-r] REV]'))
3517 _('[-P] [[-r] REV]'))
3518 def merge(ui, repo, node=None, **opts):
3518 def merge(ui, repo, node=None, **opts):
3519 """merge another revision into working directory
3519 """merge another revision into working directory
3520
3520
3521 The current working directory is updated with all changes made in
3521 The current working directory is updated with all changes made in
3522 the requested revision since the last common predecessor revision.
3522 the requested revision since the last common predecessor revision.
3523
3523
3524 Files that changed between either parent are marked as changed for
3524 Files that changed between either parent are marked as changed for
3525 the next commit and a commit must be performed before any further
3525 the next commit and a commit must be performed before any further
3526 updates to the repository are allowed. The next commit will have
3526 updates to the repository are allowed. The next commit will have
3527 two parents.
3527 two parents.
3528
3528
3529 ``--tool`` can be used to specify the merge tool used for file
3529 ``--tool`` can be used to specify the merge tool used for file
3530 merges. It overrides the HGMERGE environment variable and your
3530 merges. It overrides the HGMERGE environment variable and your
3531 configuration files. See :hg:`help merge-tools` for options.
3531 configuration files. See :hg:`help merge-tools` for options.
3532
3532
3533 If no revision is specified, the working directory's parent is a
3533 If no revision is specified, the working directory's parent is a
3534 head revision, and the current branch contains exactly one other
3534 head revision, and the current branch contains exactly one other
3535 head, the other head is merged with by default. Otherwise, an
3535 head, the other head is merged with by default. Otherwise, an
3536 explicit revision with which to merge with must be provided.
3536 explicit revision with which to merge with must be provided.
3537
3537
3538 See :hg:`help resolve` for information on handling file conflicts.
3538 See :hg:`help resolve` for information on handling file conflicts.
3539
3539
3540 To undo an uncommitted merge, use :hg:`merge --abort` which
3540 To undo an uncommitted merge, use :hg:`merge --abort` which
3541 will check out a clean copy of the original merge parent, losing
3541 will check out a clean copy of the original merge parent, losing
3542 all changes.
3542 all changes.
3543
3543
3544 Returns 0 on success, 1 if there are unresolved files.
3544 Returns 0 on success, 1 if there are unresolved files.
3545 """
3545 """
3546
3546
3547 opts = pycompat.byteskwargs(opts)
3547 opts = pycompat.byteskwargs(opts)
3548 abort = opts.get('abort')
3548 abort = opts.get('abort')
3549 if abort and repo.dirstate.p2() == nullid:
3549 if abort and repo.dirstate.p2() == nullid:
3550 cmdutil.wrongtooltocontinue(repo, _('merge'))
3550 cmdutil.wrongtooltocontinue(repo, _('merge'))
3551 if abort:
3551 if abort:
3552 if node:
3552 if node:
3553 raise error.Abort(_("cannot specify a node with --abort"))
3553 raise error.Abort(_("cannot specify a node with --abort"))
3554 if opts.get('rev'):
3554 if opts.get('rev'):
3555 raise error.Abort(_("cannot specify both --rev and --abort"))
3555 raise error.Abort(_("cannot specify both --rev and --abort"))
3556 if opts.get('preview'):
3556 if opts.get('preview'):
3557 raise error.Abort(_("cannot specify --preview with --abort"))
3557 raise error.Abort(_("cannot specify --preview with --abort"))
3558 if opts.get('rev') and node:
3558 if opts.get('rev') and node:
3559 raise error.Abort(_("please specify just one revision"))
3559 raise error.Abort(_("please specify just one revision"))
3560 if not node:
3560 if not node:
3561 node = opts.get('rev')
3561 node = opts.get('rev')
3562
3562
3563 if node:
3563 if node:
3564 node = scmutil.revsingle(repo, node).node()
3564 node = scmutil.revsingle(repo, node).node()
3565
3565
3566 if not node and not abort:
3566 if not node and not abort:
3567 node = repo[destutil.destmerge(repo)].node()
3567 node = repo[destutil.destmerge(repo)].node()
3568
3568
3569 if opts.get('preview'):
3569 if opts.get('preview'):
3570 # find nodes that are ancestors of p2 but not of p1
3570 # find nodes that are ancestors of p2 but not of p1
3571 p1 = repo.lookup('.')
3571 p1 = repo.lookup('.')
3572 p2 = repo.lookup(node)
3572 p2 = repo.lookup(node)
3573 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3573 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3574
3574
3575 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3575 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3576 for node in nodes:
3576 for node in nodes:
3577 displayer.show(repo[node])
3577 displayer.show(repo[node])
3578 displayer.close()
3578 displayer.close()
3579 return 0
3579 return 0
3580
3580
3581 try:
3581 try:
3582 # ui.forcemerge is an internal variable, do not document
3582 # ui.forcemerge is an internal variable, do not document
3583 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3583 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3584 force = opts.get('force')
3584 force = opts.get('force')
3585 labels = ['working copy', 'merge rev']
3585 labels = ['working copy', 'merge rev']
3586 return hg.merge(repo, node, force=force, mergeforce=force,
3586 return hg.merge(repo, node, force=force, mergeforce=force,
3587 labels=labels, abort=abort)
3587 labels=labels, abort=abort)
3588 finally:
3588 finally:
3589 ui.setconfig('ui', 'forcemerge', '', 'merge')
3589 ui.setconfig('ui', 'forcemerge', '', 'merge')
3590
3590
3591 @command('outgoing|out',
3591 @command('outgoing|out',
3592 [('f', 'force', None, _('run even when the destination is unrelated')),
3592 [('f', 'force', None, _('run even when the destination is unrelated')),
3593 ('r', 'rev', [],
3593 ('r', 'rev', [],
3594 _('a changeset intended to be included in the destination'), _('REV')),
3594 _('a changeset intended to be included in the destination'), _('REV')),
3595 ('n', 'newest-first', None, _('show newest record first')),
3595 ('n', 'newest-first', None, _('show newest record first')),
3596 ('B', 'bookmarks', False, _('compare bookmarks')),
3596 ('B', 'bookmarks', False, _('compare bookmarks')),
3597 ('b', 'branch', [], _('a specific branch you would like to push'),
3597 ('b', 'branch', [], _('a specific branch you would like to push'),
3598 _('BRANCH')),
3598 _('BRANCH')),
3599 ] + logopts + remoteopts + subrepoopts,
3599 ] + logopts + remoteopts + subrepoopts,
3600 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3600 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3601 def outgoing(ui, repo, dest=None, **opts):
3601 def outgoing(ui, repo, dest=None, **opts):
3602 """show changesets not found in the destination
3602 """show changesets not found in the destination
3603
3603
3604 Show changesets not found in the specified destination repository
3604 Show changesets not found in the specified destination repository
3605 or the default push location. These are the changesets that would
3605 or the default push location. These are the changesets that would
3606 be pushed if a push was requested.
3606 be pushed if a push was requested.
3607
3607
3608 See pull for details of valid destination formats.
3608 See pull for details of valid destination formats.
3609
3609
3610 .. container:: verbose
3610 .. container:: verbose
3611
3611
3612 With -B/--bookmarks, the result of bookmark comparison between
3612 With -B/--bookmarks, the result of bookmark comparison between
3613 local and remote repositories is displayed. With -v/--verbose,
3613 local and remote repositories is displayed. With -v/--verbose,
3614 status is also displayed for each bookmark like below::
3614 status is also displayed for each bookmark like below::
3615
3615
3616 BM1 01234567890a added
3616 BM1 01234567890a added
3617 BM2 deleted
3617 BM2 deleted
3618 BM3 234567890abc advanced
3618 BM3 234567890abc advanced
3619 BM4 34567890abcd diverged
3619 BM4 34567890abcd diverged
3620 BM5 4567890abcde changed
3620 BM5 4567890abcde changed
3621
3621
3622 The action taken when pushing depends on the
3622 The action taken when pushing depends on the
3623 status of each bookmark:
3623 status of each bookmark:
3624
3624
3625 :``added``: push with ``-B`` will create it
3625 :``added``: push with ``-B`` will create it
3626 :``deleted``: push with ``-B`` will delete it
3626 :``deleted``: push with ``-B`` will delete it
3627 :``advanced``: push will update it
3627 :``advanced``: push will update it
3628 :``diverged``: push with ``-B`` will update it
3628 :``diverged``: push with ``-B`` will update it
3629 :``changed``: push with ``-B`` will update it
3629 :``changed``: push with ``-B`` will update it
3630
3630
3631 From the point of view of pushing behavior, bookmarks
3631 From the point of view of pushing behavior, bookmarks
3632 existing only in the remote repository are treated as
3632 existing only in the remote repository are treated as
3633 ``deleted``, even if it is in fact added remotely.
3633 ``deleted``, even if it is in fact added remotely.
3634
3634
3635 Returns 0 if there are outgoing changes, 1 otherwise.
3635 Returns 0 if there are outgoing changes, 1 otherwise.
3636 """
3636 """
3637 opts = pycompat.byteskwargs(opts)
3637 opts = pycompat.byteskwargs(opts)
3638 if opts.get('graph'):
3638 if opts.get('graph'):
3639 logcmdutil.checkunsupportedgraphflags([], opts)
3639 logcmdutil.checkunsupportedgraphflags([], opts)
3640 o, other = hg._outgoing(ui, repo, dest, opts)
3640 o, other = hg._outgoing(ui, repo, dest, opts)
3641 if not o:
3641 if not o:
3642 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3642 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3643 return
3643 return
3644
3644
3645 revdag = logcmdutil.graphrevs(repo, o, opts)
3645 revdag = logcmdutil.graphrevs(repo, o, opts)
3646 ui.pager('outgoing')
3646 ui.pager('outgoing')
3647 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3647 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3648 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3648 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3649 graphmod.asciiedges)
3649 graphmod.asciiedges)
3650 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3650 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3651 return 0
3651 return 0
3652
3652
3653 if opts.get('bookmarks'):
3653 if opts.get('bookmarks'):
3654 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3654 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3655 dest, branches = hg.parseurl(dest, opts.get('branch'))
3655 dest, branches = hg.parseurl(dest, opts.get('branch'))
3656 other = hg.peer(repo, opts, dest)
3656 other = hg.peer(repo, opts, dest)
3657 if 'bookmarks' not in other.listkeys('namespaces'):
3657 if 'bookmarks' not in other.listkeys('namespaces'):
3658 ui.warn(_("remote doesn't support bookmarks\n"))
3658 ui.warn(_("remote doesn't support bookmarks\n"))
3659 return 0
3659 return 0
3660 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3660 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3661 ui.pager('outgoing')
3661 ui.pager('outgoing')
3662 return bookmarks.outgoing(ui, repo, other)
3662 return bookmarks.outgoing(ui, repo, other)
3663
3663
3664 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3664 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3665 try:
3665 try:
3666 return hg.outgoing(ui, repo, dest, opts)
3666 return hg.outgoing(ui, repo, dest, opts)
3667 finally:
3667 finally:
3668 del repo._subtoppath
3668 del repo._subtoppath
3669
3669
3670 @command('parents',
3670 @command('parents',
3671 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3671 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3672 ] + templateopts,
3672 ] + templateopts,
3673 _('[-r REV] [FILE]'),
3673 _('[-r REV] [FILE]'),
3674 inferrepo=True)
3674 inferrepo=True)
3675 def parents(ui, repo, file_=None, **opts):
3675 def parents(ui, repo, file_=None, **opts):
3676 """show the parents of the working directory or revision (DEPRECATED)
3676 """show the parents of the working directory or revision (DEPRECATED)
3677
3677
3678 Print the working directory's parent revisions. If a revision is
3678 Print the working directory's parent revisions. If a revision is
3679 given via -r/--rev, the parent of that revision will be printed.
3679 given via -r/--rev, the parent of that revision will be printed.
3680 If a file argument is given, the revision in which the file was
3680 If a file argument is given, the revision in which the file was
3681 last changed (before the working directory revision or the
3681 last changed (before the working directory revision or the
3682 argument to --rev if given) is printed.
3682 argument to --rev if given) is printed.
3683
3683
3684 This command is equivalent to::
3684 This command is equivalent to::
3685
3685
3686 hg log -r "p1()+p2()" or
3686 hg log -r "p1()+p2()" or
3687 hg log -r "p1(REV)+p2(REV)" or
3687 hg log -r "p1(REV)+p2(REV)" or
3688 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3688 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3689 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3689 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3690
3690
3691 See :hg:`summary` and :hg:`help revsets` for related information.
3691 See :hg:`summary` and :hg:`help revsets` for related information.
3692
3692
3693 Returns 0 on success.
3693 Returns 0 on success.
3694 """
3694 """
3695
3695
3696 opts = pycompat.byteskwargs(opts)
3696 opts = pycompat.byteskwargs(opts)
3697 rev = opts.get('rev')
3697 rev = opts.get('rev')
3698 if rev:
3698 if rev:
3699 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3699 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3700 ctx = scmutil.revsingle(repo, rev, None)
3700 ctx = scmutil.revsingle(repo, rev, None)
3701
3701
3702 if file_:
3702 if file_:
3703 m = scmutil.match(ctx, (file_,), opts)
3703 m = scmutil.match(ctx, (file_,), opts)
3704 if m.anypats() or len(m.files()) != 1:
3704 if m.anypats() or len(m.files()) != 1:
3705 raise error.Abort(_('can only specify an explicit filename'))
3705 raise error.Abort(_('can only specify an explicit filename'))
3706 file_ = m.files()[0]
3706 file_ = m.files()[0]
3707 filenodes = []
3707 filenodes = []
3708 for cp in ctx.parents():
3708 for cp in ctx.parents():
3709 if not cp:
3709 if not cp:
3710 continue
3710 continue
3711 try:
3711 try:
3712 filenodes.append(cp.filenode(file_))
3712 filenodes.append(cp.filenode(file_))
3713 except error.LookupError:
3713 except error.LookupError:
3714 pass
3714 pass
3715 if not filenodes:
3715 if not filenodes:
3716 raise error.Abort(_("'%s' not found in manifest!") % file_)
3716 raise error.Abort(_("'%s' not found in manifest!") % file_)
3717 p = []
3717 p = []
3718 for fn in filenodes:
3718 for fn in filenodes:
3719 fctx = repo.filectx(file_, fileid=fn)
3719 fctx = repo.filectx(file_, fileid=fn)
3720 p.append(fctx.node())
3720 p.append(fctx.node())
3721 else:
3721 else:
3722 p = [cp.node() for cp in ctx.parents()]
3722 p = [cp.node() for cp in ctx.parents()]
3723
3723
3724 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3724 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3725 for n in p:
3725 for n in p:
3726 if n != nullid:
3726 if n != nullid:
3727 displayer.show(repo[n])
3727 displayer.show(repo[n])
3728 displayer.close()
3728 displayer.close()
3729
3729
3730 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3730 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3731 cmdtype=readonly)
3731 cmdtype=readonly)
3732 def paths(ui, repo, search=None, **opts):
3732 def paths(ui, repo, search=None, **opts):
3733 """show aliases for remote repositories
3733 """show aliases for remote repositories
3734
3734
3735 Show definition of symbolic path name NAME. If no name is given,
3735 Show definition of symbolic path name NAME. If no name is given,
3736 show definition of all available names.
3736 show definition of all available names.
3737
3737
3738 Option -q/--quiet suppresses all output when searching for NAME
3738 Option -q/--quiet suppresses all output when searching for NAME
3739 and shows only the path names when listing all definitions.
3739 and shows only the path names when listing all definitions.
3740
3740
3741 Path names are defined in the [paths] section of your
3741 Path names are defined in the [paths] section of your
3742 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3742 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3743 repository, ``.hg/hgrc`` is used, too.
3743 repository, ``.hg/hgrc`` is used, too.
3744
3744
3745 The path names ``default`` and ``default-push`` have a special
3745 The path names ``default`` and ``default-push`` have a special
3746 meaning. When performing a push or pull operation, they are used
3746 meaning. When performing a push or pull operation, they are used
3747 as fallbacks if no location is specified on the command-line.
3747 as fallbacks if no location is specified on the command-line.
3748 When ``default-push`` is set, it will be used for push and
3748 When ``default-push`` is set, it will be used for push and
3749 ``default`` will be used for pull; otherwise ``default`` is used
3749 ``default`` will be used for pull; otherwise ``default`` is used
3750 as the fallback for both. When cloning a repository, the clone
3750 as the fallback for both. When cloning a repository, the clone
3751 source is written as ``default`` in ``.hg/hgrc``.
3751 source is written as ``default`` in ``.hg/hgrc``.
3752
3752
3753 .. note::
3753 .. note::
3754
3754
3755 ``default`` and ``default-push`` apply to all inbound (e.g.
3755 ``default`` and ``default-push`` apply to all inbound (e.g.
3756 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3756 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3757 and :hg:`bundle`) operations.
3757 and :hg:`bundle`) operations.
3758
3758
3759 See :hg:`help urls` for more information.
3759 See :hg:`help urls` for more information.
3760
3760
3761 Returns 0 on success.
3761 Returns 0 on success.
3762 """
3762 """
3763
3763
3764 opts = pycompat.byteskwargs(opts)
3764 opts = pycompat.byteskwargs(opts)
3765 ui.pager('paths')
3765 ui.pager('paths')
3766 if search:
3766 if search:
3767 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3767 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3768 if name == search]
3768 if name == search]
3769 else:
3769 else:
3770 pathitems = sorted(ui.paths.iteritems())
3770 pathitems = sorted(ui.paths.iteritems())
3771
3771
3772 fm = ui.formatter('paths', opts)
3772 fm = ui.formatter('paths', opts)
3773 if fm.isplain():
3773 if fm.isplain():
3774 hidepassword = util.hidepassword
3774 hidepassword = util.hidepassword
3775 else:
3775 else:
3776 hidepassword = str
3776 hidepassword = str
3777 if ui.quiet:
3777 if ui.quiet:
3778 namefmt = '%s\n'
3778 namefmt = '%s\n'
3779 else:
3779 else:
3780 namefmt = '%s = '
3780 namefmt = '%s = '
3781 showsubopts = not search and not ui.quiet
3781 showsubopts = not search and not ui.quiet
3782
3782
3783 for name, path in pathitems:
3783 for name, path in pathitems:
3784 fm.startitem()
3784 fm.startitem()
3785 fm.condwrite(not search, 'name', namefmt, name)
3785 fm.condwrite(not search, 'name', namefmt, name)
3786 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3786 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3787 for subopt, value in sorted(path.suboptions.items()):
3787 for subopt, value in sorted(path.suboptions.items()):
3788 assert subopt not in ('name', 'url')
3788 assert subopt not in ('name', 'url')
3789 if showsubopts:
3789 if showsubopts:
3790 fm.plain('%s:%s = ' % (name, subopt))
3790 fm.plain('%s:%s = ' % (name, subopt))
3791 fm.condwrite(showsubopts, subopt, '%s\n', value)
3791 fm.condwrite(showsubopts, subopt, '%s\n', value)
3792
3792
3793 fm.end()
3793 fm.end()
3794
3794
3795 if search and not pathitems:
3795 if search and not pathitems:
3796 if not ui.quiet:
3796 if not ui.quiet:
3797 ui.warn(_("not found!\n"))
3797 ui.warn(_("not found!\n"))
3798 return 1
3798 return 1
3799 else:
3799 else:
3800 return 0
3800 return 0
3801
3801
3802 @command('phase',
3802 @command('phase',
3803 [('p', 'public', False, _('set changeset phase to public')),
3803 [('p', 'public', False, _('set changeset phase to public')),
3804 ('d', 'draft', False, _('set changeset phase to draft')),
3804 ('d', 'draft', False, _('set changeset phase to draft')),
3805 ('s', 'secret', False, _('set changeset phase to secret')),
3805 ('s', 'secret', False, _('set changeset phase to secret')),
3806 ('f', 'force', False, _('allow to move boundary backward')),
3806 ('f', 'force', False, _('allow to move boundary backward')),
3807 ('r', 'rev', [], _('target revision'), _('REV')),
3807 ('r', 'rev', [], _('target revision'), _('REV')),
3808 ],
3808 ],
3809 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3809 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3810 def phase(ui, repo, *revs, **opts):
3810 def phase(ui, repo, *revs, **opts):
3811 """set or show the current phase name
3811 """set or show the current phase name
3812
3812
3813 With no argument, show the phase name of the current revision(s).
3813 With no argument, show the phase name of the current revision(s).
3814
3814
3815 With one of -p/--public, -d/--draft or -s/--secret, change the
3815 With one of -p/--public, -d/--draft or -s/--secret, change the
3816 phase value of the specified revisions.
3816 phase value of the specified revisions.
3817
3817
3818 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3818 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3819 lower phase to a higher phase. Phases are ordered as follows::
3819 lower phase to a higher phase. Phases are ordered as follows::
3820
3820
3821 public < draft < secret
3821 public < draft < secret
3822
3822
3823 Returns 0 on success, 1 if some phases could not be changed.
3823 Returns 0 on success, 1 if some phases could not be changed.
3824
3824
3825 (For more information about the phases concept, see :hg:`help phases`.)
3825 (For more information about the phases concept, see :hg:`help phases`.)
3826 """
3826 """
3827 opts = pycompat.byteskwargs(opts)
3827 opts = pycompat.byteskwargs(opts)
3828 # search for a unique phase argument
3828 # search for a unique phase argument
3829 targetphase = None
3829 targetphase = None
3830 for idx, name in enumerate(phases.phasenames):
3830 for idx, name in enumerate(phases.phasenames):
3831 if opts[name]:
3831 if opts[name]:
3832 if targetphase is not None:
3832 if targetphase is not None:
3833 raise error.Abort(_('only one phase can be specified'))
3833 raise error.Abort(_('only one phase can be specified'))
3834 targetphase = idx
3834 targetphase = idx
3835
3835
3836 # look for specified revision
3836 # look for specified revision
3837 revs = list(revs)
3837 revs = list(revs)
3838 revs.extend(opts['rev'])
3838 revs.extend(opts['rev'])
3839 if not revs:
3839 if not revs:
3840 # display both parents as the second parent phase can influence
3840 # display both parents as the second parent phase can influence
3841 # the phase of a merge commit
3841 # the phase of a merge commit
3842 revs = [c.rev() for c in repo[None].parents()]
3842 revs = [c.rev() for c in repo[None].parents()]
3843
3843
3844 revs = scmutil.revrange(repo, revs)
3844 revs = scmutil.revrange(repo, revs)
3845
3845
3846 ret = 0
3846 ret = 0
3847 if targetphase is None:
3847 if targetphase is None:
3848 # display
3848 # display
3849 for r in revs:
3849 for r in revs:
3850 ctx = repo[r]
3850 ctx = repo[r]
3851 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3851 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3852 else:
3852 else:
3853 with repo.lock(), repo.transaction("phase") as tr:
3853 with repo.lock(), repo.transaction("phase") as tr:
3854 # set phase
3854 # set phase
3855 if not revs:
3855 if not revs:
3856 raise error.Abort(_('empty revision set'))
3856 raise error.Abort(_('empty revision set'))
3857 nodes = [repo[r].node() for r in revs]
3857 nodes = [repo[r].node() for r in revs]
3858 # moving revision from public to draft may hide them
3858 # moving revision from public to draft may hide them
3859 # We have to check result on an unfiltered repository
3859 # We have to check result on an unfiltered repository
3860 unfi = repo.unfiltered()
3860 unfi = repo.unfiltered()
3861 getphase = unfi._phasecache.phase
3861 getphase = unfi._phasecache.phase
3862 olddata = [getphase(unfi, r) for r in unfi]
3862 olddata = [getphase(unfi, r) for r in unfi]
3863 phases.advanceboundary(repo, tr, targetphase, nodes)
3863 phases.advanceboundary(repo, tr, targetphase, nodes)
3864 if opts['force']:
3864 if opts['force']:
3865 phases.retractboundary(repo, tr, targetphase, nodes)
3865 phases.retractboundary(repo, tr, targetphase, nodes)
3866 getphase = unfi._phasecache.phase
3866 getphase = unfi._phasecache.phase
3867 newdata = [getphase(unfi, r) for r in unfi]
3867 newdata = [getphase(unfi, r) for r in unfi]
3868 changes = sum(newdata[r] != olddata[r] for r in unfi)
3868 changes = sum(newdata[r] != olddata[r] for r in unfi)
3869 cl = unfi.changelog
3869 cl = unfi.changelog
3870 rejected = [n for n in nodes
3870 rejected = [n for n in nodes
3871 if newdata[cl.rev(n)] < targetphase]
3871 if newdata[cl.rev(n)] < targetphase]
3872 if rejected:
3872 if rejected:
3873 ui.warn(_('cannot move %i changesets to a higher '
3873 ui.warn(_('cannot move %i changesets to a higher '
3874 'phase, use --force\n') % len(rejected))
3874 'phase, use --force\n') % len(rejected))
3875 ret = 1
3875 ret = 1
3876 if changes:
3876 if changes:
3877 msg = _('phase changed for %i changesets\n') % changes
3877 msg = _('phase changed for %i changesets\n') % changes
3878 if ret:
3878 if ret:
3879 ui.status(msg)
3879 ui.status(msg)
3880 else:
3880 else:
3881 ui.note(msg)
3881 ui.note(msg)
3882 else:
3882 else:
3883 ui.warn(_('no phases changed\n'))
3883 ui.warn(_('no phases changed\n'))
3884 return ret
3884 return ret
3885
3885
3886 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3886 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3887 """Run after a changegroup has been added via pull/unbundle
3887 """Run after a changegroup has been added via pull/unbundle
3888
3888
3889 This takes arguments below:
3889 This takes arguments below:
3890
3890
3891 :modheads: change of heads by pull/unbundle
3891 :modheads: change of heads by pull/unbundle
3892 :optupdate: updating working directory is needed or not
3892 :optupdate: updating working directory is needed or not
3893 :checkout: update destination revision (or None to default destination)
3893 :checkout: update destination revision (or None to default destination)
3894 :brev: a name, which might be a bookmark to be activated after updating
3894 :brev: a name, which might be a bookmark to be activated after updating
3895 """
3895 """
3896 if modheads == 0:
3896 if modheads == 0:
3897 return
3897 return
3898 if optupdate:
3898 if optupdate:
3899 try:
3899 try:
3900 return hg.updatetotally(ui, repo, checkout, brev)
3900 return hg.updatetotally(ui, repo, checkout, brev)
3901 except error.UpdateAbort as inst:
3901 except error.UpdateAbort as inst:
3902 msg = _("not updating: %s") % str(inst)
3902 msg = _("not updating: %s") % str(inst)
3903 hint = inst.hint
3903 hint = inst.hint
3904 raise error.UpdateAbort(msg, hint=hint)
3904 raise error.UpdateAbort(msg, hint=hint)
3905 if modheads > 1:
3905 if modheads > 1:
3906 currentbranchheads = len(repo.branchheads())
3906 currentbranchheads = len(repo.branchheads())
3907 if currentbranchheads == modheads:
3907 if currentbranchheads == modheads:
3908 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3908 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3909 elif currentbranchheads > 1:
3909 elif currentbranchheads > 1:
3910 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3910 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3911 "merge)\n"))
3911 "merge)\n"))
3912 else:
3912 else:
3913 ui.status(_("(run 'hg heads' to see heads)\n"))
3913 ui.status(_("(run 'hg heads' to see heads)\n"))
3914 elif not ui.configbool('commands', 'update.requiredest'):
3914 elif not ui.configbool('commands', 'update.requiredest'):
3915 ui.status(_("(run 'hg update' to get a working copy)\n"))
3915 ui.status(_("(run 'hg update' to get a working copy)\n"))
3916
3916
3917 @command('^pull',
3917 @command('^pull',
3918 [('u', 'update', None,
3918 [('u', 'update', None,
3919 _('update to new branch head if new descendants were pulled')),
3919 _('update to new branch head if new descendants were pulled')),
3920 ('f', 'force', None, _('run even when remote repository is unrelated')),
3920 ('f', 'force', None, _('run even when remote repository is unrelated')),
3921 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3921 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3922 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3922 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3923 ('b', 'branch', [], _('a specific branch you would like to pull'),
3923 ('b', 'branch', [], _('a specific branch you would like to pull'),
3924 _('BRANCH')),
3924 _('BRANCH')),
3925 ] + remoteopts,
3925 ] + remoteopts,
3926 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3926 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3927 def pull(ui, repo, source="default", **opts):
3927 def pull(ui, repo, source="default", **opts):
3928 """pull changes from the specified source
3928 """pull changes from the specified source
3929
3929
3930 Pull changes from a remote repository to a local one.
3930 Pull changes from a remote repository to a local one.
3931
3931
3932 This finds all changes from the repository at the specified path
3932 This finds all changes from the repository at the specified path
3933 or URL and adds them to a local repository (the current one unless
3933 or URL and adds them to a local repository (the current one unless
3934 -R is specified). By default, this does not update the copy of the
3934 -R is specified). By default, this does not update the copy of the
3935 project in the working directory.
3935 project in the working directory.
3936
3936
3937 Use :hg:`incoming` if you want to see what would have been added
3937 Use :hg:`incoming` if you want to see what would have been added
3938 by a pull at the time you issued this command. If you then decide
3938 by a pull at the time you issued this command. If you then decide
3939 to add those changes to the repository, you should use :hg:`pull
3939 to add those changes to the repository, you should use :hg:`pull
3940 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3940 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3941
3941
3942 If SOURCE is omitted, the 'default' path will be used.
3942 If SOURCE is omitted, the 'default' path will be used.
3943 See :hg:`help urls` for more information.
3943 See :hg:`help urls` for more information.
3944
3944
3945 Specifying bookmark as ``.`` is equivalent to specifying the active
3945 Specifying bookmark as ``.`` is equivalent to specifying the active
3946 bookmark's name.
3946 bookmark's name.
3947
3947
3948 Returns 0 on success, 1 if an update had unresolved files.
3948 Returns 0 on success, 1 if an update had unresolved files.
3949 """
3949 """
3950
3950
3951 opts = pycompat.byteskwargs(opts)
3951 opts = pycompat.byteskwargs(opts)
3952 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3952 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3953 msg = _('update destination required by configuration')
3953 msg = _('update destination required by configuration')
3954 hint = _('use hg pull followed by hg update DEST')
3954 hint = _('use hg pull followed by hg update DEST')
3955 raise error.Abort(msg, hint=hint)
3955 raise error.Abort(msg, hint=hint)
3956
3956
3957 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3957 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3958 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3958 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3959 other = hg.peer(repo, opts, source)
3959 other = hg.peer(repo, opts, source)
3960 try:
3960 try:
3961 revs, checkout = hg.addbranchrevs(repo, other, branches,
3961 revs, checkout = hg.addbranchrevs(repo, other, branches,
3962 opts.get('rev'))
3962 opts.get('rev'))
3963
3963
3964
3964
3965 pullopargs = {}
3965 pullopargs = {}
3966 if opts.get('bookmark'):
3966 if opts.get('bookmark'):
3967 if not revs:
3967 if not revs:
3968 revs = []
3968 revs = []
3969 # The list of bookmark used here is not the one used to actually
3969 # The list of bookmark used here is not the one used to actually
3970 # update the bookmark name. This can result in the revision pulled
3970 # update the bookmark name. This can result in the revision pulled
3971 # not ending up with the name of the bookmark because of a race
3971 # not ending up with the name of the bookmark because of a race
3972 # condition on the server. (See issue 4689 for details)
3972 # condition on the server. (See issue 4689 for details)
3973 remotebookmarks = other.listkeys('bookmarks')
3973 remotebookmarks = other.listkeys('bookmarks')
3974 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
3974 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
3975 pullopargs['remotebookmarks'] = remotebookmarks
3975 pullopargs['remotebookmarks'] = remotebookmarks
3976 for b in opts['bookmark']:
3976 for b in opts['bookmark']:
3977 b = repo._bookmarks.expandname(b)
3977 b = repo._bookmarks.expandname(b)
3978 if b not in remotebookmarks:
3978 if b not in remotebookmarks:
3979 raise error.Abort(_('remote bookmark %s not found!') % b)
3979 raise error.Abort(_('remote bookmark %s not found!') % b)
3980 revs.append(hex(remotebookmarks[b]))
3980 revs.append(hex(remotebookmarks[b]))
3981
3981
3982 if revs:
3982 if revs:
3983 try:
3983 try:
3984 # When 'rev' is a bookmark name, we cannot guarantee that it
3984 # When 'rev' is a bookmark name, we cannot guarantee that it
3985 # will be updated with that name because of a race condition
3985 # will be updated with that name because of a race condition
3986 # server side. (See issue 4689 for details)
3986 # server side. (See issue 4689 for details)
3987 oldrevs = revs
3987 oldrevs = revs
3988 revs = [] # actually, nodes
3988 revs = [] # actually, nodes
3989 for r in oldrevs:
3989 for r in oldrevs:
3990 node = other.lookup(r)
3990 node = other.lookup(r)
3991 revs.append(node)
3991 revs.append(node)
3992 if r == checkout:
3992 if r == checkout:
3993 checkout = node
3993 checkout = node
3994 except error.CapabilityError:
3994 except error.CapabilityError:
3995 err = _("other repository doesn't support revision lookup, "
3995 err = _("other repository doesn't support revision lookup, "
3996 "so a rev cannot be specified.")
3996 "so a rev cannot be specified.")
3997 raise error.Abort(err)
3997 raise error.Abort(err)
3998
3998
3999 wlock = util.nullcontextmanager()
3999 wlock = util.nullcontextmanager()
4000 if opts.get('update'):
4000 if opts.get('update'):
4001 wlock = repo.wlock()
4001 wlock = repo.wlock()
4002 with wlock:
4002 with wlock:
4003 pullopargs.update(opts.get('opargs', {}))
4003 pullopargs.update(opts.get('opargs', {}))
4004 modheads = exchange.pull(repo, other, heads=revs,
4004 modheads = exchange.pull(repo, other, heads=revs,
4005 force=opts.get('force'),
4005 force=opts.get('force'),
4006 bookmarks=opts.get('bookmark', ()),
4006 bookmarks=opts.get('bookmark', ()),
4007 opargs=pullopargs).cgresult
4007 opargs=pullopargs).cgresult
4008
4008
4009 # brev is a name, which might be a bookmark to be activated at
4009 # brev is a name, which might be a bookmark to be activated at
4010 # the end of the update. In other words, it is an explicit
4010 # the end of the update. In other words, it is an explicit
4011 # destination of the update
4011 # destination of the update
4012 brev = None
4012 brev = None
4013
4013
4014 if checkout:
4014 if checkout:
4015 checkout = str(repo.changelog.rev(checkout))
4015 checkout = str(repo.changelog.rev(checkout))
4016
4016
4017 # order below depends on implementation of
4017 # order below depends on implementation of
4018 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4018 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4019 # because 'checkout' is determined without it.
4019 # because 'checkout' is determined without it.
4020 if opts.get('rev'):
4020 if opts.get('rev'):
4021 brev = opts['rev'][0]
4021 brev = opts['rev'][0]
4022 elif opts.get('branch'):
4022 elif opts.get('branch'):
4023 brev = opts['branch'][0]
4023 brev = opts['branch'][0]
4024 else:
4024 else:
4025 brev = branches[0]
4025 brev = branches[0]
4026 repo._subtoppath = source
4026 repo._subtoppath = source
4027 try:
4027 try:
4028 ret = postincoming(ui, repo, modheads, opts.get('update'),
4028 ret = postincoming(ui, repo, modheads, opts.get('update'),
4029 checkout, brev)
4029 checkout, brev)
4030
4030
4031 finally:
4031 finally:
4032 del repo._subtoppath
4032 del repo._subtoppath
4033
4033
4034 finally:
4034 finally:
4035 other.close()
4035 other.close()
4036 return ret
4036 return ret
4037
4037
4038 @command('^push',
4038 @command('^push',
4039 [('f', 'force', None, _('force push')),
4039 [('f', 'force', None, _('force push')),
4040 ('r', 'rev', [],
4040 ('r', 'rev', [],
4041 _('a changeset intended to be included in the destination'),
4041 _('a changeset intended to be included in the destination'),
4042 _('REV')),
4042 _('REV')),
4043 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4043 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4044 ('b', 'branch', [],
4044 ('b', 'branch', [],
4045 _('a specific branch you would like to push'), _('BRANCH')),
4045 _('a specific branch you would like to push'), _('BRANCH')),
4046 ('', 'new-branch', False, _('allow pushing a new branch')),
4046 ('', 'new-branch', False, _('allow pushing a new branch')),
4047 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4047 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4048 ] + remoteopts,
4048 ] + remoteopts,
4049 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4049 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4050 def push(ui, repo, dest=None, **opts):
4050 def push(ui, repo, dest=None, **opts):
4051 """push changes to the specified destination
4051 """push changes to the specified destination
4052
4052
4053 Push changesets from the local repository to the specified
4053 Push changesets from the local repository to the specified
4054 destination.
4054 destination.
4055
4055
4056 This operation is symmetrical to pull: it is identical to a pull
4056 This operation is symmetrical to pull: it is identical to a pull
4057 in the destination repository from the current one.
4057 in the destination repository from the current one.
4058
4058
4059 By default, push will not allow creation of new heads at the
4059 By default, push will not allow creation of new heads at the
4060 destination, since multiple heads would make it unclear which head
4060 destination, since multiple heads would make it unclear which head
4061 to use. In this situation, it is recommended to pull and merge
4061 to use. In this situation, it is recommended to pull and merge
4062 before pushing.
4062 before pushing.
4063
4063
4064 Use --new-branch if you want to allow push to create a new named
4064 Use --new-branch if you want to allow push to create a new named
4065 branch that is not present at the destination. This allows you to
4065 branch that is not present at the destination. This allows you to
4066 only create a new branch without forcing other changes.
4066 only create a new branch without forcing other changes.
4067
4067
4068 .. note::
4068 .. note::
4069
4069
4070 Extra care should be taken with the -f/--force option,
4070 Extra care should be taken with the -f/--force option,
4071 which will push all new heads on all branches, an action which will
4071 which will push all new heads on all branches, an action which will
4072 almost always cause confusion for collaborators.
4072 almost always cause confusion for collaborators.
4073
4073
4074 If -r/--rev is used, the specified revision and all its ancestors
4074 If -r/--rev is used, the specified revision and all its ancestors
4075 will be pushed to the remote repository.
4075 will be pushed to the remote repository.
4076
4076
4077 If -B/--bookmark is used, the specified bookmarked revision, its
4077 If -B/--bookmark is used, the specified bookmarked revision, its
4078 ancestors, and the bookmark will be pushed to the remote
4078 ancestors, and the bookmark will be pushed to the remote
4079 repository. Specifying ``.`` is equivalent to specifying the active
4079 repository. Specifying ``.`` is equivalent to specifying the active
4080 bookmark's name.
4080 bookmark's name.
4081
4081
4082 Please see :hg:`help urls` for important details about ``ssh://``
4082 Please see :hg:`help urls` for important details about ``ssh://``
4083 URLs. If DESTINATION is omitted, a default path will be used.
4083 URLs. If DESTINATION is omitted, a default path will be used.
4084
4084
4085 .. container:: verbose
4085 .. container:: verbose
4086
4086
4087 The --pushvars option sends strings to the server that become
4087 The --pushvars option sends strings to the server that become
4088 environment variables prepended with ``HG_USERVAR_``. For example,
4088 environment variables prepended with ``HG_USERVAR_``. For example,
4089 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4089 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4090 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4090 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4091
4091
4092 pushvars can provide for user-overridable hooks as well as set debug
4092 pushvars can provide for user-overridable hooks as well as set debug
4093 levels. One example is having a hook that blocks commits containing
4093 levels. One example is having a hook that blocks commits containing
4094 conflict markers, but enables the user to override the hook if the file
4094 conflict markers, but enables the user to override the hook if the file
4095 is using conflict markers for testing purposes or the file format has
4095 is using conflict markers for testing purposes or the file format has
4096 strings that look like conflict markers.
4096 strings that look like conflict markers.
4097
4097
4098 By default, servers will ignore `--pushvars`. To enable it add the
4098 By default, servers will ignore `--pushvars`. To enable it add the
4099 following to your configuration file::
4099 following to your configuration file::
4100
4100
4101 [push]
4101 [push]
4102 pushvars.server = true
4102 pushvars.server = true
4103
4103
4104 Returns 0 if push was successful, 1 if nothing to push.
4104 Returns 0 if push was successful, 1 if nothing to push.
4105 """
4105 """
4106
4106
4107 opts = pycompat.byteskwargs(opts)
4107 opts = pycompat.byteskwargs(opts)
4108 if opts.get('bookmark'):
4108 if opts.get('bookmark'):
4109 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4109 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4110 for b in opts['bookmark']:
4110 for b in opts['bookmark']:
4111 # translate -B options to -r so changesets get pushed
4111 # translate -B options to -r so changesets get pushed
4112 b = repo._bookmarks.expandname(b)
4112 b = repo._bookmarks.expandname(b)
4113 if b in repo._bookmarks:
4113 if b in repo._bookmarks:
4114 opts.setdefault('rev', []).append(b)
4114 opts.setdefault('rev', []).append(b)
4115 else:
4115 else:
4116 # if we try to push a deleted bookmark, translate it to null
4116 # if we try to push a deleted bookmark, translate it to null
4117 # this lets simultaneous -r, -b options continue working
4117 # this lets simultaneous -r, -b options continue working
4118 opts.setdefault('rev', []).append("null")
4118 opts.setdefault('rev', []).append("null")
4119
4119
4120 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4120 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4121 if not path:
4121 if not path:
4122 raise error.Abort(_('default repository not configured!'),
4122 raise error.Abort(_('default repository not configured!'),
4123 hint=_("see 'hg help config.paths'"))
4123 hint=_("see 'hg help config.paths'"))
4124 dest = path.pushloc or path.loc
4124 dest = path.pushloc or path.loc
4125 branches = (path.branch, opts.get('branch') or [])
4125 branches = (path.branch, opts.get('branch') or [])
4126 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4126 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4127 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4127 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4128 other = hg.peer(repo, opts, dest)
4128 other = hg.peer(repo, opts, dest)
4129
4129
4130 if revs:
4130 if revs:
4131 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4131 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4132 if not revs:
4132 if not revs:
4133 raise error.Abort(_("specified revisions evaluate to an empty set"),
4133 raise error.Abort(_("specified revisions evaluate to an empty set"),
4134 hint=_("use different revision arguments"))
4134 hint=_("use different revision arguments"))
4135 elif path.pushrev:
4135 elif path.pushrev:
4136 # It doesn't make any sense to specify ancestor revisions. So limit
4136 # It doesn't make any sense to specify ancestor revisions. So limit
4137 # to DAG heads to make discovery simpler.
4137 # to DAG heads to make discovery simpler.
4138 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4138 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4139 revs = scmutil.revrange(repo, [expr])
4139 revs = scmutil.revrange(repo, [expr])
4140 revs = [repo[rev].node() for rev in revs]
4140 revs = [repo[rev].node() for rev in revs]
4141 if not revs:
4141 if not revs:
4142 raise error.Abort(_('default push revset for path evaluates to an '
4142 raise error.Abort(_('default push revset for path evaluates to an '
4143 'empty set'))
4143 'empty set'))
4144
4144
4145 repo._subtoppath = dest
4145 repo._subtoppath = dest
4146 try:
4146 try:
4147 # push subrepos depth-first for coherent ordering
4147 # push subrepos depth-first for coherent ordering
4148 c = repo['']
4148 c = repo['']
4149 subs = c.substate # only repos that are committed
4149 subs = c.substate # only repos that are committed
4150 for s in sorted(subs):
4150 for s in sorted(subs):
4151 result = c.sub(s).push(opts)
4151 result = c.sub(s).push(opts)
4152 if result == 0:
4152 if result == 0:
4153 return not result
4153 return not result
4154 finally:
4154 finally:
4155 del repo._subtoppath
4155 del repo._subtoppath
4156
4156
4157 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4157 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4158 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4158 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4159
4159
4160 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4160 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4161 newbranch=opts.get('new_branch'),
4161 newbranch=opts.get('new_branch'),
4162 bookmarks=opts.get('bookmark', ()),
4162 bookmarks=opts.get('bookmark', ()),
4163 opargs=opargs)
4163 opargs=opargs)
4164
4164
4165 result = not pushop.cgresult
4165 result = not pushop.cgresult
4166
4166
4167 if pushop.bkresult is not None:
4167 if pushop.bkresult is not None:
4168 if pushop.bkresult == 2:
4168 if pushop.bkresult == 2:
4169 result = 2
4169 result = 2
4170 elif not result and pushop.bkresult:
4170 elif not result and pushop.bkresult:
4171 result = 2
4171 result = 2
4172
4172
4173 return result
4173 return result
4174
4174
4175 @command('recover', [])
4175 @command('recover', [])
4176 def recover(ui, repo):
4176 def recover(ui, repo):
4177 """roll back an interrupted transaction
4177 """roll back an interrupted transaction
4178
4178
4179 Recover from an interrupted commit or pull.
4179 Recover from an interrupted commit or pull.
4180
4180
4181 This command tries to fix the repository status after an
4181 This command tries to fix the repository status after an
4182 interrupted operation. It should only be necessary when Mercurial
4182 interrupted operation. It should only be necessary when Mercurial
4183 suggests it.
4183 suggests it.
4184
4184
4185 Returns 0 if successful, 1 if nothing to recover or verify fails.
4185 Returns 0 if successful, 1 if nothing to recover or verify fails.
4186 """
4186 """
4187 if repo.recover():
4187 if repo.recover():
4188 return hg.verify(repo)
4188 return hg.verify(repo)
4189 return 1
4189 return 1
4190
4190
4191 @command('^remove|rm',
4191 @command('^remove|rm',
4192 [('A', 'after', None, _('record delete for missing files')),
4192 [('A', 'after', None, _('record delete for missing files')),
4193 ('f', 'force', None,
4193 ('f', 'force', None,
4194 _('forget added files, delete modified files')),
4194 _('forget added files, delete modified files')),
4195 ] + subrepoopts + walkopts,
4195 ] + subrepoopts + walkopts,
4196 _('[OPTION]... FILE...'),
4196 _('[OPTION]... FILE...'),
4197 inferrepo=True)
4197 inferrepo=True)
4198 def remove(ui, repo, *pats, **opts):
4198 def remove(ui, repo, *pats, **opts):
4199 """remove the specified files on the next commit
4199 """remove the specified files on the next commit
4200
4200
4201 Schedule the indicated files for removal from the current branch.
4201 Schedule the indicated files for removal from the current branch.
4202
4202
4203 This command schedules the files to be removed at the next commit.
4203 This command schedules the files to be removed at the next commit.
4204 To undo a remove before that, see :hg:`revert`. To undo added
4204 To undo a remove before that, see :hg:`revert`. To undo added
4205 files, see :hg:`forget`.
4205 files, see :hg:`forget`.
4206
4206
4207 .. container:: verbose
4207 .. container:: verbose
4208
4208
4209 -A/--after can be used to remove only files that have already
4209 -A/--after can be used to remove only files that have already
4210 been deleted, -f/--force can be used to force deletion, and -Af
4210 been deleted, -f/--force can be used to force deletion, and -Af
4211 can be used to remove files from the next revision without
4211 can be used to remove files from the next revision without
4212 deleting them from the working directory.
4212 deleting them from the working directory.
4213
4213
4214 The following table details the behavior of remove for different
4214 The following table details the behavior of remove for different
4215 file states (columns) and option combinations (rows). The file
4215 file states (columns) and option combinations (rows). The file
4216 states are Added [A], Clean [C], Modified [M] and Missing [!]
4216 states are Added [A], Clean [C], Modified [M] and Missing [!]
4217 (as reported by :hg:`status`). The actions are Warn, Remove
4217 (as reported by :hg:`status`). The actions are Warn, Remove
4218 (from branch) and Delete (from disk):
4218 (from branch) and Delete (from disk):
4219
4219
4220 ========= == == == ==
4220 ========= == == == ==
4221 opt/state A C M !
4221 opt/state A C M !
4222 ========= == == == ==
4222 ========= == == == ==
4223 none W RD W R
4223 none W RD W R
4224 -f R RD RD R
4224 -f R RD RD R
4225 -A W W W R
4225 -A W W W R
4226 -Af R R R R
4226 -Af R R R R
4227 ========= == == == ==
4227 ========= == == == ==
4228
4228
4229 .. note::
4229 .. note::
4230
4230
4231 :hg:`remove` never deletes files in Added [A] state from the
4231 :hg:`remove` never deletes files in Added [A] state from the
4232 working directory, not even if ``--force`` is specified.
4232 working directory, not even if ``--force`` is specified.
4233
4233
4234 Returns 0 on success, 1 if any warnings encountered.
4234 Returns 0 on success, 1 if any warnings encountered.
4235 """
4235 """
4236
4236
4237 opts = pycompat.byteskwargs(opts)
4237 opts = pycompat.byteskwargs(opts)
4238 after, force = opts.get('after'), opts.get('force')
4238 after, force = opts.get('after'), opts.get('force')
4239 if not pats and not after:
4239 if not pats and not after:
4240 raise error.Abort(_('no files specified'))
4240 raise error.Abort(_('no files specified'))
4241
4241
4242 m = scmutil.match(repo[None], pats, opts)
4242 m = scmutil.match(repo[None], pats, opts)
4243 subrepos = opts.get('subrepos')
4243 subrepos = opts.get('subrepos')
4244 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4244 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4245
4245
4246 @command('rename|move|mv',
4246 @command('rename|move|mv',
4247 [('A', 'after', None, _('record a rename that has already occurred')),
4247 [('A', 'after', None, _('record a rename that has already occurred')),
4248 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4248 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4249 ] + walkopts + dryrunopts,
4249 ] + walkopts + dryrunopts,
4250 _('[OPTION]... SOURCE... DEST'))
4250 _('[OPTION]... SOURCE... DEST'))
4251 def rename(ui, repo, *pats, **opts):
4251 def rename(ui, repo, *pats, **opts):
4252 """rename files; equivalent of copy + remove
4252 """rename files; equivalent of copy + remove
4253
4253
4254 Mark dest as copies of sources; mark sources for deletion. If dest
4254 Mark dest as copies of sources; mark sources for deletion. If dest
4255 is a directory, copies are put in that directory. If dest is a
4255 is a directory, copies are put in that directory. If dest is a
4256 file, there can only be one source.
4256 file, there can only be one source.
4257
4257
4258 By default, this command copies the contents of files as they
4258 By default, this command copies the contents of files as they
4259 exist in the working directory. If invoked with -A/--after, the
4259 exist in the working directory. If invoked with -A/--after, the
4260 operation is recorded, but no copying is performed.
4260 operation is recorded, but no copying is performed.
4261
4261
4262 This command takes effect at the next commit. To undo a rename
4262 This command takes effect at the next commit. To undo a rename
4263 before that, see :hg:`revert`.
4263 before that, see :hg:`revert`.
4264
4264
4265 Returns 0 on success, 1 if errors are encountered.
4265 Returns 0 on success, 1 if errors are encountered.
4266 """
4266 """
4267 opts = pycompat.byteskwargs(opts)
4267 opts = pycompat.byteskwargs(opts)
4268 with repo.wlock(False):
4268 with repo.wlock(False):
4269 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4269 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4270
4270
4271 @command('resolve',
4271 @command('resolve',
4272 [('a', 'all', None, _('select all unresolved files')),
4272 [('a', 'all', None, _('select all unresolved files')),
4273 ('l', 'list', None, _('list state of files needing merge')),
4273 ('l', 'list', None, _('list state of files needing merge')),
4274 ('m', 'mark', None, _('mark files as resolved')),
4274 ('m', 'mark', None, _('mark files as resolved')),
4275 ('u', 'unmark', None, _('mark files as unresolved')),
4275 ('u', 'unmark', None, _('mark files as unresolved')),
4276 ('n', 'no-status', None, _('hide status prefix'))]
4276 ('n', 'no-status', None, _('hide status prefix'))]
4277 + mergetoolopts + walkopts + formatteropts,
4277 + mergetoolopts + walkopts + formatteropts,
4278 _('[OPTION]... [FILE]...'),
4278 _('[OPTION]... [FILE]...'),
4279 inferrepo=True)
4279 inferrepo=True)
4280 def resolve(ui, repo, *pats, **opts):
4280 def resolve(ui, repo, *pats, **opts):
4281 """redo merges or set/view the merge status of files
4281 """redo merges or set/view the merge status of files
4282
4282
4283 Merges with unresolved conflicts are often the result of
4283 Merges with unresolved conflicts are often the result of
4284 non-interactive merging using the ``internal:merge`` configuration
4284 non-interactive merging using the ``internal:merge`` configuration
4285 setting, or a command-line merge tool like ``diff3``. The resolve
4285 setting, or a command-line merge tool like ``diff3``. The resolve
4286 command is used to manage the files involved in a merge, after
4286 command is used to manage the files involved in a merge, after
4287 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4287 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4288 working directory must have two parents). See :hg:`help
4288 working directory must have two parents). See :hg:`help
4289 merge-tools` for information on configuring merge tools.
4289 merge-tools` for information on configuring merge tools.
4290
4290
4291 The resolve command can be used in the following ways:
4291 The resolve command can be used in the following ways:
4292
4292
4293 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4293 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4294 files, discarding any previous merge attempts. Re-merging is not
4294 files, discarding any previous merge attempts. Re-merging is not
4295 performed for files already marked as resolved. Use ``--all/-a``
4295 performed for files already marked as resolved. Use ``--all/-a``
4296 to select all unresolved files. ``--tool`` can be used to specify
4296 to select all unresolved files. ``--tool`` can be used to specify
4297 the merge tool used for the given files. It overrides the HGMERGE
4297 the merge tool used for the given files. It overrides the HGMERGE
4298 environment variable and your configuration files. Previous file
4298 environment variable and your configuration files. Previous file
4299 contents are saved with a ``.orig`` suffix.
4299 contents are saved with a ``.orig`` suffix.
4300
4300
4301 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4301 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4302 (e.g. after having manually fixed-up the files). The default is
4302 (e.g. after having manually fixed-up the files). The default is
4303 to mark all unresolved files.
4303 to mark all unresolved files.
4304
4304
4305 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4305 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4306 default is to mark all resolved files.
4306 default is to mark all resolved files.
4307
4307
4308 - :hg:`resolve -l`: list files which had or still have conflicts.
4308 - :hg:`resolve -l`: list files which had or still have conflicts.
4309 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4309 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4310 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4310 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4311 the list. See :hg:`help filesets` for details.
4311 the list. See :hg:`help filesets` for details.
4312
4312
4313 .. note::
4313 .. note::
4314
4314
4315 Mercurial will not let you commit files with unresolved merge
4315 Mercurial will not let you commit files with unresolved merge
4316 conflicts. You must use :hg:`resolve -m ...` before you can
4316 conflicts. You must use :hg:`resolve -m ...` before you can
4317 commit after a conflicting merge.
4317 commit after a conflicting merge.
4318
4318
4319 Returns 0 on success, 1 if any files fail a resolve attempt.
4319 Returns 0 on success, 1 if any files fail a resolve attempt.
4320 """
4320 """
4321
4321
4322 opts = pycompat.byteskwargs(opts)
4322 opts = pycompat.byteskwargs(opts)
4323 flaglist = 'all mark unmark list no_status'.split()
4323 flaglist = 'all mark unmark list no_status'.split()
4324 all, mark, unmark, show, nostatus = \
4324 all, mark, unmark, show, nostatus = \
4325 [opts.get(o) for o in flaglist]
4325 [opts.get(o) for o in flaglist]
4326
4326
4327 if (show and (mark or unmark)) or (mark and unmark):
4327 if (show and (mark or unmark)) or (mark and unmark):
4328 raise error.Abort(_("too many options specified"))
4328 raise error.Abort(_("too many options specified"))
4329 if pats and all:
4329 if pats and all:
4330 raise error.Abort(_("can't specify --all and patterns"))
4330 raise error.Abort(_("can't specify --all and patterns"))
4331 if not (all or pats or show or mark or unmark):
4331 if not (all or pats or show or mark or unmark):
4332 raise error.Abort(_('no files or directories specified'),
4332 raise error.Abort(_('no files or directories specified'),
4333 hint=('use --all to re-merge all unresolved files'))
4333 hint=('use --all to re-merge all unresolved files'))
4334
4334
4335 if show:
4335 if show:
4336 ui.pager('resolve')
4336 ui.pager('resolve')
4337 fm = ui.formatter('resolve', opts)
4337 fm = ui.formatter('resolve', opts)
4338 ms = mergemod.mergestate.read(repo)
4338 ms = mergemod.mergestate.read(repo)
4339 m = scmutil.match(repo[None], pats, opts)
4339 m = scmutil.match(repo[None], pats, opts)
4340
4340
4341 # Labels and keys based on merge state. Unresolved path conflicts show
4341 # Labels and keys based on merge state. Unresolved path conflicts show
4342 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4342 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4343 # resolved conflicts.
4343 # resolved conflicts.
4344 mergestateinfo = {
4344 mergestateinfo = {
4345 'u': ('resolve.unresolved', 'U'),
4345 'u': ('resolve.unresolved', 'U'),
4346 'r': ('resolve.resolved', 'R'),
4346 'r': ('resolve.resolved', 'R'),
4347 'pu': ('resolve.unresolved', 'P'),
4347 'pu': ('resolve.unresolved', 'P'),
4348 'pr': ('resolve.resolved', 'R'),
4348 'pr': ('resolve.resolved', 'R'),
4349 'd': ('resolve.driverresolved', 'D'),
4349 'd': ('resolve.driverresolved', 'D'),
4350 }
4350 }
4351
4351
4352 for f in ms:
4352 for f in ms:
4353 if not m(f):
4353 if not m(f):
4354 continue
4354 continue
4355
4355
4356 label, key = mergestateinfo[ms[f]]
4356 label, key = mergestateinfo[ms[f]]
4357 fm.startitem()
4357 fm.startitem()
4358 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4358 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4359 fm.write('path', '%s\n', f, label=label)
4359 fm.write('path', '%s\n', f, label=label)
4360 fm.end()
4360 fm.end()
4361 return 0
4361 return 0
4362
4362
4363 with repo.wlock():
4363 with repo.wlock():
4364 ms = mergemod.mergestate.read(repo)
4364 ms = mergemod.mergestate.read(repo)
4365
4365
4366 if not (ms.active() or repo.dirstate.p2() != nullid):
4366 if not (ms.active() or repo.dirstate.p2() != nullid):
4367 raise error.Abort(
4367 raise error.Abort(
4368 _('resolve command not applicable when not merging'))
4368 _('resolve command not applicable when not merging'))
4369
4369
4370 wctx = repo[None]
4370 wctx = repo[None]
4371
4371
4372 if ms.mergedriver and ms.mdstate() == 'u':
4372 if ms.mergedriver and ms.mdstate() == 'u':
4373 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4373 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4374 ms.commit()
4374 ms.commit()
4375 # allow mark and unmark to go through
4375 # allow mark and unmark to go through
4376 if not mark and not unmark and not proceed:
4376 if not mark and not unmark and not proceed:
4377 return 1
4377 return 1
4378
4378
4379 m = scmutil.match(wctx, pats, opts)
4379 m = scmutil.match(wctx, pats, opts)
4380 ret = 0
4380 ret = 0
4381 didwork = False
4381 didwork = False
4382 runconclude = False
4382 runconclude = False
4383
4383
4384 tocomplete = []
4384 tocomplete = []
4385 for f in ms:
4385 for f in ms:
4386 if not m(f):
4386 if not m(f):
4387 continue
4387 continue
4388
4388
4389 didwork = True
4389 didwork = True
4390
4390
4391 # don't let driver-resolved files be marked, and run the conclude
4391 # don't let driver-resolved files be marked, and run the conclude
4392 # step if asked to resolve
4392 # step if asked to resolve
4393 if ms[f] == "d":
4393 if ms[f] == "d":
4394 exact = m.exact(f)
4394 exact = m.exact(f)
4395 if mark:
4395 if mark:
4396 if exact:
4396 if exact:
4397 ui.warn(_('not marking %s as it is driver-resolved\n')
4397 ui.warn(_('not marking %s as it is driver-resolved\n')
4398 % f)
4398 % f)
4399 elif unmark:
4399 elif unmark:
4400 if exact:
4400 if exact:
4401 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4401 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4402 % f)
4402 % f)
4403 else:
4403 else:
4404 runconclude = True
4404 runconclude = True
4405 continue
4405 continue
4406
4406
4407 # path conflicts must be resolved manually
4407 # path conflicts must be resolved manually
4408 if ms[f] in ("pu", "pr"):
4408 if ms[f] in ("pu", "pr"):
4409 if mark:
4409 if mark:
4410 ms.mark(f, "pr")
4410 ms.mark(f, "pr")
4411 elif unmark:
4411 elif unmark:
4412 ms.mark(f, "pu")
4412 ms.mark(f, "pu")
4413 elif ms[f] == "pu":
4413 elif ms[f] == "pu":
4414 ui.warn(_('%s: path conflict must be resolved manually\n')
4414 ui.warn(_('%s: path conflict must be resolved manually\n')
4415 % f)
4415 % f)
4416 continue
4416 continue
4417
4417
4418 if mark:
4418 if mark:
4419 ms.mark(f, "r")
4419 ms.mark(f, "r")
4420 elif unmark:
4420 elif unmark:
4421 ms.mark(f, "u")
4421 ms.mark(f, "u")
4422 else:
4422 else:
4423 # backup pre-resolve (merge uses .orig for its own purposes)
4423 # backup pre-resolve (merge uses .orig for its own purposes)
4424 a = repo.wjoin(f)
4424 a = repo.wjoin(f)
4425 try:
4425 try:
4426 util.copyfile(a, a + ".resolve")
4426 util.copyfile(a, a + ".resolve")
4427 except (IOError, OSError) as inst:
4427 except (IOError, OSError) as inst:
4428 if inst.errno != errno.ENOENT:
4428 if inst.errno != errno.ENOENT:
4429 raise
4429 raise
4430
4430
4431 try:
4431 try:
4432 # preresolve file
4432 # preresolve file
4433 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4433 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4434 'resolve')
4434 'resolve')
4435 complete, r = ms.preresolve(f, wctx)
4435 complete, r = ms.preresolve(f, wctx)
4436 if not complete:
4436 if not complete:
4437 tocomplete.append(f)
4437 tocomplete.append(f)
4438 elif r:
4438 elif r:
4439 ret = 1
4439 ret = 1
4440 finally:
4440 finally:
4441 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4441 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4442 ms.commit()
4442 ms.commit()
4443
4443
4444 # replace filemerge's .orig file with our resolve file, but only
4444 # replace filemerge's .orig file with our resolve file, but only
4445 # for merges that are complete
4445 # for merges that are complete
4446 if complete:
4446 if complete:
4447 try:
4447 try:
4448 util.rename(a + ".resolve",
4448 util.rename(a + ".resolve",
4449 scmutil.origpath(ui, repo, a))
4449 scmutil.origpath(ui, repo, a))
4450 except OSError as inst:
4450 except OSError as inst:
4451 if inst.errno != errno.ENOENT:
4451 if inst.errno != errno.ENOENT:
4452 raise
4452 raise
4453
4453
4454 for f in tocomplete:
4454 for f in tocomplete:
4455 try:
4455 try:
4456 # resolve file
4456 # resolve file
4457 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4457 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4458 'resolve')
4458 'resolve')
4459 r = ms.resolve(f, wctx)
4459 r = ms.resolve(f, wctx)
4460 if r:
4460 if r:
4461 ret = 1
4461 ret = 1
4462 finally:
4462 finally:
4463 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4463 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4464 ms.commit()
4464 ms.commit()
4465
4465
4466 # replace filemerge's .orig file with our resolve file
4466 # replace filemerge's .orig file with our resolve file
4467 a = repo.wjoin(f)
4467 a = repo.wjoin(f)
4468 try:
4468 try:
4469 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4469 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4470 except OSError as inst:
4470 except OSError as inst:
4471 if inst.errno != errno.ENOENT:
4471 if inst.errno != errno.ENOENT:
4472 raise
4472 raise
4473
4473
4474 ms.commit()
4474 ms.commit()
4475 ms.recordactions()
4475 ms.recordactions()
4476
4476
4477 if not didwork and pats:
4477 if not didwork and pats:
4478 hint = None
4478 hint = None
4479 if not any([p for p in pats if p.find(':') >= 0]):
4479 if not any([p for p in pats if p.find(':') >= 0]):
4480 pats = ['path:%s' % p for p in pats]
4480 pats = ['path:%s' % p for p in pats]
4481 m = scmutil.match(wctx, pats, opts)
4481 m = scmutil.match(wctx, pats, opts)
4482 for f in ms:
4482 for f in ms:
4483 if not m(f):
4483 if not m(f):
4484 continue
4484 continue
4485 flags = ''.join(['-%s ' % o[0] for o in flaglist
4485 flags = ''.join(['-%s ' % o[0] for o in flaglist
4486 if opts.get(o)])
4486 if opts.get(o)])
4487 hint = _("(try: hg resolve %s%s)\n") % (
4487 hint = _("(try: hg resolve %s%s)\n") % (
4488 flags,
4488 flags,
4489 ' '.join(pats))
4489 ' '.join(pats))
4490 break
4490 break
4491 ui.warn(_("arguments do not match paths that need resolving\n"))
4491 ui.warn(_("arguments do not match paths that need resolving\n"))
4492 if hint:
4492 if hint:
4493 ui.warn(hint)
4493 ui.warn(hint)
4494 elif ms.mergedriver and ms.mdstate() != 's':
4494 elif ms.mergedriver and ms.mdstate() != 's':
4495 # run conclude step when either a driver-resolved file is requested
4495 # run conclude step when either a driver-resolved file is requested
4496 # or there are no driver-resolved files
4496 # or there are no driver-resolved files
4497 # we can't use 'ret' to determine whether any files are unresolved
4497 # we can't use 'ret' to determine whether any files are unresolved
4498 # because we might not have tried to resolve some
4498 # because we might not have tried to resolve some
4499 if ((runconclude or not list(ms.driverresolved()))
4499 if ((runconclude or not list(ms.driverresolved()))
4500 and not list(ms.unresolved())):
4500 and not list(ms.unresolved())):
4501 proceed = mergemod.driverconclude(repo, ms, wctx)
4501 proceed = mergemod.driverconclude(repo, ms, wctx)
4502 ms.commit()
4502 ms.commit()
4503 if not proceed:
4503 if not proceed:
4504 return 1
4504 return 1
4505
4505
4506 # Nudge users into finishing an unfinished operation
4506 # Nudge users into finishing an unfinished operation
4507 unresolvedf = list(ms.unresolved())
4507 unresolvedf = list(ms.unresolved())
4508 driverresolvedf = list(ms.driverresolved())
4508 driverresolvedf = list(ms.driverresolved())
4509 if not unresolvedf and not driverresolvedf:
4509 if not unresolvedf and not driverresolvedf:
4510 ui.status(_('(no more unresolved files)\n'))
4510 ui.status(_('(no more unresolved files)\n'))
4511 cmdutil.checkafterresolved(repo)
4511 cmdutil.checkafterresolved(repo)
4512 elif not unresolvedf:
4512 elif not unresolvedf:
4513 ui.status(_('(no more unresolved files -- '
4513 ui.status(_('(no more unresolved files -- '
4514 'run "hg resolve --all" to conclude)\n'))
4514 'run "hg resolve --all" to conclude)\n'))
4515
4515
4516 return ret
4516 return ret
4517
4517
4518 @command('revert',
4518 @command('revert',
4519 [('a', 'all', None, _('revert all changes when no arguments given')),
4519 [('a', 'all', None, _('revert all changes when no arguments given')),
4520 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4520 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4521 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4521 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4522 ('C', 'no-backup', None, _('do not save backup copies of files')),
4522 ('C', 'no-backup', None, _('do not save backup copies of files')),
4523 ('i', 'interactive', None, _('interactively select the changes')),
4523 ('i', 'interactive', None, _('interactively select the changes')),
4524 ] + walkopts + dryrunopts,
4524 ] + walkopts + dryrunopts,
4525 _('[OPTION]... [-r REV] [NAME]...'))
4525 _('[OPTION]... [-r REV] [NAME]...'))
4526 def revert(ui, repo, *pats, **opts):
4526 def revert(ui, repo, *pats, **opts):
4527 """restore files to their checkout state
4527 """restore files to their checkout state
4528
4528
4529 .. note::
4529 .. note::
4530
4530
4531 To check out earlier revisions, you should use :hg:`update REV`.
4531 To check out earlier revisions, you should use :hg:`update REV`.
4532 To cancel an uncommitted merge (and lose your changes),
4532 To cancel an uncommitted merge (and lose your changes),
4533 use :hg:`merge --abort`.
4533 use :hg:`merge --abort`.
4534
4534
4535 With no revision specified, revert the specified files or directories
4535 With no revision specified, revert the specified files or directories
4536 to the contents they had in the parent of the working directory.
4536 to the contents they had in the parent of the working directory.
4537 This restores the contents of files to an unmodified
4537 This restores the contents of files to an unmodified
4538 state and unschedules adds, removes, copies, and renames. If the
4538 state and unschedules adds, removes, copies, and renames. If the
4539 working directory has two parents, you must explicitly specify a
4539 working directory has two parents, you must explicitly specify a
4540 revision.
4540 revision.
4541
4541
4542 Using the -r/--rev or -d/--date options, revert the given files or
4542 Using the -r/--rev or -d/--date options, revert the given files or
4543 directories to their states as of a specific revision. Because
4543 directories to their states as of a specific revision. Because
4544 revert does not change the working directory parents, this will
4544 revert does not change the working directory parents, this will
4545 cause these files to appear modified. This can be helpful to "back
4545 cause these files to appear modified. This can be helpful to "back
4546 out" some or all of an earlier change. See :hg:`backout` for a
4546 out" some or all of an earlier change. See :hg:`backout` for a
4547 related method.
4547 related method.
4548
4548
4549 Modified files are saved with a .orig suffix before reverting.
4549 Modified files are saved with a .orig suffix before reverting.
4550 To disable these backups, use --no-backup. It is possible to store
4550 To disable these backups, use --no-backup. It is possible to store
4551 the backup files in a custom directory relative to the root of the
4551 the backup files in a custom directory relative to the root of the
4552 repository by setting the ``ui.origbackuppath`` configuration
4552 repository by setting the ``ui.origbackuppath`` configuration
4553 option.
4553 option.
4554
4554
4555 See :hg:`help dates` for a list of formats valid for -d/--date.
4555 See :hg:`help dates` for a list of formats valid for -d/--date.
4556
4556
4557 See :hg:`help backout` for a way to reverse the effect of an
4557 See :hg:`help backout` for a way to reverse the effect of an
4558 earlier changeset.
4558 earlier changeset.
4559
4559
4560 Returns 0 on success.
4560 Returns 0 on success.
4561 """
4561 """
4562
4562
4563 opts = pycompat.byteskwargs(opts)
4563 opts = pycompat.byteskwargs(opts)
4564 if opts.get("date"):
4564 if opts.get("date"):
4565 if opts.get("rev"):
4565 if opts.get("rev"):
4566 raise error.Abort(_("you can't specify a revision and a date"))
4566 raise error.Abort(_("you can't specify a revision and a date"))
4567 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4567 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4568
4568
4569 parent, p2 = repo.dirstate.parents()
4569 parent, p2 = repo.dirstate.parents()
4570 if not opts.get('rev') and p2 != nullid:
4570 if not opts.get('rev') and p2 != nullid:
4571 # revert after merge is a trap for new users (issue2915)
4571 # revert after merge is a trap for new users (issue2915)
4572 raise error.Abort(_('uncommitted merge with no revision specified'),
4572 raise error.Abort(_('uncommitted merge with no revision specified'),
4573 hint=_("use 'hg update' or see 'hg help revert'"))
4573 hint=_("use 'hg update' or see 'hg help revert'"))
4574
4574
4575 rev = opts.get('rev')
4575 rev = opts.get('rev')
4576 if rev:
4576 if rev:
4577 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4577 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4578 ctx = scmutil.revsingle(repo, rev)
4578 ctx = scmutil.revsingle(repo, rev)
4579
4579
4580 if (not (pats or opts.get('include') or opts.get('exclude') or
4580 if (not (pats or opts.get('include') or opts.get('exclude') or
4581 opts.get('all') or opts.get('interactive'))):
4581 opts.get('all') or opts.get('interactive'))):
4582 msg = _("no files or directories specified")
4582 msg = _("no files or directories specified")
4583 if p2 != nullid:
4583 if p2 != nullid:
4584 hint = _("uncommitted merge, use --all to discard all changes,"
4584 hint = _("uncommitted merge, use --all to discard all changes,"
4585 " or 'hg update -C .' to abort the merge")
4585 " or 'hg update -C .' to abort the merge")
4586 raise error.Abort(msg, hint=hint)
4586 raise error.Abort(msg, hint=hint)
4587 dirty = any(repo.status())
4587 dirty = any(repo.status())
4588 node = ctx.node()
4588 node = ctx.node()
4589 if node != parent:
4589 if node != parent:
4590 if dirty:
4590 if dirty:
4591 hint = _("uncommitted changes, use --all to discard all"
4591 hint = _("uncommitted changes, use --all to discard all"
4592 " changes, or 'hg update %s' to update") % ctx.rev()
4592 " changes, or 'hg update %s' to update") % ctx.rev()
4593 else:
4593 else:
4594 hint = _("use --all to revert all files,"
4594 hint = _("use --all to revert all files,"
4595 " or 'hg update %s' to update") % ctx.rev()
4595 " or 'hg update %s' to update") % ctx.rev()
4596 elif dirty:
4596 elif dirty:
4597 hint = _("uncommitted changes, use --all to discard all changes")
4597 hint = _("uncommitted changes, use --all to discard all changes")
4598 else:
4598 else:
4599 hint = _("use --all to revert all files")
4599 hint = _("use --all to revert all files")
4600 raise error.Abort(msg, hint=hint)
4600 raise error.Abort(msg, hint=hint)
4601
4601
4602 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4602 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4603 **pycompat.strkwargs(opts))
4603 **pycompat.strkwargs(opts))
4604
4604
4605 @command('rollback', dryrunopts +
4605 @command('rollback', dryrunopts +
4606 [('f', 'force', False, _('ignore safety measures'))])
4606 [('f', 'force', False, _('ignore safety measures'))])
4607 def rollback(ui, repo, **opts):
4607 def rollback(ui, repo, **opts):
4608 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4608 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4609
4609
4610 Please use :hg:`commit --amend` instead of rollback to correct
4610 Please use :hg:`commit --amend` instead of rollback to correct
4611 mistakes in the last commit.
4611 mistakes in the last commit.
4612
4612
4613 This command should be used with care. There is only one level of
4613 This command should be used with care. There is only one level of
4614 rollback, and there is no way to undo a rollback. It will also
4614 rollback, and there is no way to undo a rollback. It will also
4615 restore the dirstate at the time of the last transaction, losing
4615 restore the dirstate at the time of the last transaction, losing
4616 any dirstate changes since that time. This command does not alter
4616 any dirstate changes since that time. This command does not alter
4617 the working directory.
4617 the working directory.
4618
4618
4619 Transactions are used to encapsulate the effects of all commands
4619 Transactions are used to encapsulate the effects of all commands
4620 that create new changesets or propagate existing changesets into a
4620 that create new changesets or propagate existing changesets into a
4621 repository.
4621 repository.
4622
4622
4623 .. container:: verbose
4623 .. container:: verbose
4624
4624
4625 For example, the following commands are transactional, and their
4625 For example, the following commands are transactional, and their
4626 effects can be rolled back:
4626 effects can be rolled back:
4627
4627
4628 - commit
4628 - commit
4629 - import
4629 - import
4630 - pull
4630 - pull
4631 - push (with this repository as the destination)
4631 - push (with this repository as the destination)
4632 - unbundle
4632 - unbundle
4633
4633
4634 To avoid permanent data loss, rollback will refuse to rollback a
4634 To avoid permanent data loss, rollback will refuse to rollback a
4635 commit transaction if it isn't checked out. Use --force to
4635 commit transaction if it isn't checked out. Use --force to
4636 override this protection.
4636 override this protection.
4637
4637
4638 The rollback command can be entirely disabled by setting the
4638 The rollback command can be entirely disabled by setting the
4639 ``ui.rollback`` configuration setting to false. If you're here
4639 ``ui.rollback`` configuration setting to false. If you're here
4640 because you want to use rollback and it's disabled, you can
4640 because you want to use rollback and it's disabled, you can
4641 re-enable the command by setting ``ui.rollback`` to true.
4641 re-enable the command by setting ``ui.rollback`` to true.
4642
4642
4643 This command is not intended for use on public repositories. Once
4643 This command is not intended for use on public repositories. Once
4644 changes are visible for pull by other users, rolling a transaction
4644 changes are visible for pull by other users, rolling a transaction
4645 back locally is ineffective (someone else may already have pulled
4645 back locally is ineffective (someone else may already have pulled
4646 the changes). Furthermore, a race is possible with readers of the
4646 the changes). Furthermore, a race is possible with readers of the
4647 repository; for example an in-progress pull from the repository
4647 repository; for example an in-progress pull from the repository
4648 may fail if a rollback is performed.
4648 may fail if a rollback is performed.
4649
4649
4650 Returns 0 on success, 1 if no rollback data is available.
4650 Returns 0 on success, 1 if no rollback data is available.
4651 """
4651 """
4652 if not ui.configbool('ui', 'rollback'):
4652 if not ui.configbool('ui', 'rollback'):
4653 raise error.Abort(_('rollback is disabled because it is unsafe'),
4653 raise error.Abort(_('rollback is disabled because it is unsafe'),
4654 hint=('see `hg help -v rollback` for information'))
4654 hint=('see `hg help -v rollback` for information'))
4655 return repo.rollback(dryrun=opts.get(r'dry_run'),
4655 return repo.rollback(dryrun=opts.get(r'dry_run'),
4656 force=opts.get(r'force'))
4656 force=opts.get(r'force'))
4657
4657
4658 @command('root', [], cmdtype=readonly)
4658 @command('root', [], cmdtype=readonly)
4659 def root(ui, repo):
4659 def root(ui, repo):
4660 """print the root (top) of the current working directory
4660 """print the root (top) of the current working directory
4661
4661
4662 Print the root directory of the current repository.
4662 Print the root directory of the current repository.
4663
4663
4664 Returns 0 on success.
4664 Returns 0 on success.
4665 """
4665 """
4666 ui.write(repo.root + "\n")
4666 ui.write(repo.root + "\n")
4667
4667
4668 @command('^serve',
4668 @command('^serve',
4669 [('A', 'accesslog', '', _('name of access log file to write to'),
4669 [('A', 'accesslog', '', _('name of access log file to write to'),
4670 _('FILE')),
4670 _('FILE')),
4671 ('d', 'daemon', None, _('run server in background')),
4671 ('d', 'daemon', None, _('run server in background')),
4672 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4672 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4673 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4673 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4674 # use string type, then we can check if something was passed
4674 # use string type, then we can check if something was passed
4675 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4675 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4676 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4676 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4677 _('ADDR')),
4677 _('ADDR')),
4678 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4678 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4679 _('PREFIX')),
4679 _('PREFIX')),
4680 ('n', 'name', '',
4680 ('n', 'name', '',
4681 _('name to show in web pages (default: working directory)'), _('NAME')),
4681 _('name to show in web pages (default: working directory)'), _('NAME')),
4682 ('', 'web-conf', '',
4682 ('', 'web-conf', '',
4683 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4683 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4684 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4684 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4685 _('FILE')),
4685 _('FILE')),
4686 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4686 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4687 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4687 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4688 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4688 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4689 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4689 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4690 ('', 'style', '', _('template style to use'), _('STYLE')),
4690 ('', 'style', '', _('template style to use'), _('STYLE')),
4691 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4691 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4692 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4692 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4693 + subrepoopts,
4693 + subrepoopts,
4694 _('[OPTION]...'),
4694 _('[OPTION]...'),
4695 optionalrepo=True)
4695 optionalrepo=True)
4696 def serve(ui, repo, **opts):
4696 def serve(ui, repo, **opts):
4697 """start stand-alone webserver
4697 """start stand-alone webserver
4698
4698
4699 Start a local HTTP repository browser and pull server. You can use
4699 Start a local HTTP repository browser and pull server. You can use
4700 this for ad-hoc sharing and browsing of repositories. It is
4700 this for ad-hoc sharing and browsing of repositories. It is
4701 recommended to use a real web server to serve a repository for
4701 recommended to use a real web server to serve a repository for
4702 longer periods of time.
4702 longer periods of time.
4703
4703
4704 Please note that the server does not implement access control.
4704 Please note that the server does not implement access control.
4705 This means that, by default, anybody can read from the server and
4705 This means that, by default, anybody can read from the server and
4706 nobody can write to it by default. Set the ``web.allow-push``
4706 nobody can write to it by default. Set the ``web.allow-push``
4707 option to ``*`` to allow everybody to push to the server. You
4707 option to ``*`` to allow everybody to push to the server. You
4708 should use a real web server if you need to authenticate users.
4708 should use a real web server if you need to authenticate users.
4709
4709
4710 By default, the server logs accesses to stdout and errors to
4710 By default, the server logs accesses to stdout and errors to
4711 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4711 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4712 files.
4712 files.
4713
4713
4714 To have the server choose a free port number to listen on, specify
4714 To have the server choose a free port number to listen on, specify
4715 a port number of 0; in this case, the server will print the port
4715 a port number of 0; in this case, the server will print the port
4716 number it uses.
4716 number it uses.
4717
4717
4718 Returns 0 on success.
4718 Returns 0 on success.
4719 """
4719 """
4720
4720
4721 opts = pycompat.byteskwargs(opts)
4721 opts = pycompat.byteskwargs(opts)
4722 if opts["stdio"] and opts["cmdserver"]:
4722 if opts["stdio"] and opts["cmdserver"]:
4723 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4723 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4724
4724
4725 if opts["stdio"]:
4725 if opts["stdio"]:
4726 if repo is None:
4726 if repo is None:
4727 raise error.RepoError(_("there is no Mercurial repository here"
4727 raise error.RepoError(_("there is no Mercurial repository here"
4728 " (.hg not found)"))
4728 " (.hg not found)"))
4729 s = wireprotoserver.sshserver(ui, repo)
4729 s = wireprotoserver.sshserver(ui, repo)
4730 s.serve_forever()
4730 s.serve_forever()
4731
4731
4732 service = server.createservice(ui, repo, opts)
4732 service = server.createservice(ui, repo, opts)
4733 return server.runservice(opts, initfn=service.init, runfn=service.run)
4733 return server.runservice(opts, initfn=service.init, runfn=service.run)
4734
4734
4735 @command('^status|st',
4735 @command('^status|st',
4736 [('A', 'all', None, _('show status of all files')),
4736 [('A', 'all', None, _('show status of all files')),
4737 ('m', 'modified', None, _('show only modified files')),
4737 ('m', 'modified', None, _('show only modified files')),
4738 ('a', 'added', None, _('show only added files')),
4738 ('a', 'added', None, _('show only added files')),
4739 ('r', 'removed', None, _('show only removed files')),
4739 ('r', 'removed', None, _('show only removed files')),
4740 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4740 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4741 ('c', 'clean', None, _('show only files without changes')),
4741 ('c', 'clean', None, _('show only files without changes')),
4742 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4742 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4743 ('i', 'ignored', None, _('show only ignored files')),
4743 ('i', 'ignored', None, _('show only ignored files')),
4744 ('n', 'no-status', None, _('hide status prefix')),
4744 ('n', 'no-status', None, _('hide status prefix')),
4745 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4745 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4746 ('C', 'copies', None, _('show source of copied files')),
4746 ('C', 'copies', None, _('show source of copied files')),
4747 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4747 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4748 ('', 'rev', [], _('show difference from revision'), _('REV')),
4748 ('', 'rev', [], _('show difference from revision'), _('REV')),
4749 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4749 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4750 ] + walkopts + subrepoopts + formatteropts,
4750 ] + walkopts + subrepoopts + formatteropts,
4751 _('[OPTION]... [FILE]...'),
4751 _('[OPTION]... [FILE]...'),
4752 inferrepo=True, cmdtype=readonly)
4752 inferrepo=True, cmdtype=readonly)
4753 def status(ui, repo, *pats, **opts):
4753 def status(ui, repo, *pats, **opts):
4754 """show changed files in the working directory
4754 """show changed files in the working directory
4755
4755
4756 Show status of files in the repository. If names are given, only
4756 Show status of files in the repository. If names are given, only
4757 files that match are shown. Files that are clean or ignored or
4757 files that match are shown. Files that are clean or ignored or
4758 the source of a copy/move operation, are not listed unless
4758 the source of a copy/move operation, are not listed unless
4759 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4759 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4760 Unless options described with "show only ..." are given, the
4760 Unless options described with "show only ..." are given, the
4761 options -mardu are used.
4761 options -mardu are used.
4762
4762
4763 Option -q/--quiet hides untracked (unknown and ignored) files
4763 Option -q/--quiet hides untracked (unknown and ignored) files
4764 unless explicitly requested with -u/--unknown or -i/--ignored.
4764 unless explicitly requested with -u/--unknown or -i/--ignored.
4765
4765
4766 .. note::
4766 .. note::
4767
4767
4768 :hg:`status` may appear to disagree with diff if permissions have
4768 :hg:`status` may appear to disagree with diff if permissions have
4769 changed or a merge has occurred. The standard diff format does
4769 changed or a merge has occurred. The standard diff format does
4770 not report permission changes and diff only reports changes
4770 not report permission changes and diff only reports changes
4771 relative to one merge parent.
4771 relative to one merge parent.
4772
4772
4773 If one revision is given, it is used as the base revision.
4773 If one revision is given, it is used as the base revision.
4774 If two revisions are given, the differences between them are
4774 If two revisions are given, the differences between them are
4775 shown. The --change option can also be used as a shortcut to list
4775 shown. The --change option can also be used as a shortcut to list
4776 the changed files of a revision from its first parent.
4776 the changed files of a revision from its first parent.
4777
4777
4778 The codes used to show the status of files are::
4778 The codes used to show the status of files are::
4779
4779
4780 M = modified
4780 M = modified
4781 A = added
4781 A = added
4782 R = removed
4782 R = removed
4783 C = clean
4783 C = clean
4784 ! = missing (deleted by non-hg command, but still tracked)
4784 ! = missing (deleted by non-hg command, but still tracked)
4785 ? = not tracked
4785 ? = not tracked
4786 I = ignored
4786 I = ignored
4787 = origin of the previous file (with --copies)
4787 = origin of the previous file (with --copies)
4788
4788
4789 .. container:: verbose
4789 .. container:: verbose
4790
4790
4791 The -t/--terse option abbreviates the output by showing only the directory
4791 The -t/--terse option abbreviates the output by showing only the directory
4792 name if all the files in it share the same status. The option takes an
4792 name if all the files in it share the same status. The option takes an
4793 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4793 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4794 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4794 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4795 for 'ignored' and 'c' for clean.
4795 for 'ignored' and 'c' for clean.
4796
4796
4797 It abbreviates only those statuses which are passed. Note that clean and
4797 It abbreviates only those statuses which are passed. Note that clean and
4798 ignored files are not displayed with '--terse ic' unless the -c/--clean
4798 ignored files are not displayed with '--terse ic' unless the -c/--clean
4799 and -i/--ignored options are also used.
4799 and -i/--ignored options are also used.
4800
4800
4801 The -v/--verbose option shows information when the repository is in an
4801 The -v/--verbose option shows information when the repository is in an
4802 unfinished merge, shelve, rebase state etc. You can have this behavior
4802 unfinished merge, shelve, rebase state etc. You can have this behavior
4803 turned on by default by enabling the ``commands.status.verbose`` option.
4803 turned on by default by enabling the ``commands.status.verbose`` option.
4804
4804
4805 You can skip displaying some of these states by setting
4805 You can skip displaying some of these states by setting
4806 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4806 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4807 'histedit', 'merge', 'rebase', or 'unshelve'.
4807 'histedit', 'merge', 'rebase', or 'unshelve'.
4808
4808
4809 Examples:
4809 Examples:
4810
4810
4811 - show changes in the working directory relative to a
4811 - show changes in the working directory relative to a
4812 changeset::
4812 changeset::
4813
4813
4814 hg status --rev 9353
4814 hg status --rev 9353
4815
4815
4816 - show changes in the working directory relative to the
4816 - show changes in the working directory relative to the
4817 current directory (see :hg:`help patterns` for more information)::
4817 current directory (see :hg:`help patterns` for more information)::
4818
4818
4819 hg status re:
4819 hg status re:
4820
4820
4821 - show all changes including copies in an existing changeset::
4821 - show all changes including copies in an existing changeset::
4822
4822
4823 hg status --copies --change 9353
4823 hg status --copies --change 9353
4824
4824
4825 - get a NUL separated list of added files, suitable for xargs::
4825 - get a NUL separated list of added files, suitable for xargs::
4826
4826
4827 hg status -an0
4827 hg status -an0
4828
4828
4829 - show more information about the repository status, abbreviating
4829 - show more information about the repository status, abbreviating
4830 added, removed, modified, deleted, and untracked paths::
4830 added, removed, modified, deleted, and untracked paths::
4831
4831
4832 hg status -v -t mardu
4832 hg status -v -t mardu
4833
4833
4834 Returns 0 on success.
4834 Returns 0 on success.
4835
4835
4836 """
4836 """
4837
4837
4838 opts = pycompat.byteskwargs(opts)
4838 opts = pycompat.byteskwargs(opts)
4839 revs = opts.get('rev')
4839 revs = opts.get('rev')
4840 change = opts.get('change')
4840 change = opts.get('change')
4841 terse = opts.get('terse')
4841 terse = opts.get('terse')
4842
4842
4843 if revs and change:
4843 if revs and change:
4844 msg = _('cannot specify --rev and --change at the same time')
4844 msg = _('cannot specify --rev and --change at the same time')
4845 raise error.Abort(msg)
4845 raise error.Abort(msg)
4846 elif revs and terse:
4846 elif revs and terse:
4847 msg = _('cannot use --terse with --rev')
4847 msg = _('cannot use --terse with --rev')
4848 raise error.Abort(msg)
4848 raise error.Abort(msg)
4849 elif change:
4849 elif change:
4850 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4850 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4851 node2 = scmutil.revsingle(repo, change, None).node()
4851 node2 = scmutil.revsingle(repo, change, None).node()
4852 node1 = repo[node2].p1().node()
4852 node1 = repo[node2].p1().node()
4853 else:
4853 else:
4854 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4854 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4855 node1, node2 = scmutil.revpair(repo, revs)
4855 node1, node2 = scmutil.revpair(repo, revs)
4856
4856
4857 if pats or ui.configbool('commands', 'status.relative'):
4857 if pats or ui.configbool('commands', 'status.relative'):
4858 cwd = repo.getcwd()
4858 cwd = repo.getcwd()
4859 else:
4859 else:
4860 cwd = ''
4860 cwd = ''
4861
4861
4862 if opts.get('print0'):
4862 if opts.get('print0'):
4863 end = '\0'
4863 end = '\0'
4864 else:
4864 else:
4865 end = '\n'
4865 end = '\n'
4866 copy = {}
4866 copy = {}
4867 states = 'modified added removed deleted unknown ignored clean'.split()
4867 states = 'modified added removed deleted unknown ignored clean'.split()
4868 show = [k for k in states if opts.get(k)]
4868 show = [k for k in states if opts.get(k)]
4869 if opts.get('all'):
4869 if opts.get('all'):
4870 show += ui.quiet and (states[:4] + ['clean']) or states
4870 show += ui.quiet and (states[:4] + ['clean']) or states
4871
4871
4872 if not show:
4872 if not show:
4873 if ui.quiet:
4873 if ui.quiet:
4874 show = states[:4]
4874 show = states[:4]
4875 else:
4875 else:
4876 show = states[:5]
4876 show = states[:5]
4877
4877
4878 m = scmutil.match(repo[node2], pats, opts)
4878 m = scmutil.match(repo[node2], pats, opts)
4879 if terse:
4879 if terse:
4880 # we need to compute clean and unknown to terse
4880 # we need to compute clean and unknown to terse
4881 stat = repo.status(node1, node2, m,
4881 stat = repo.status(node1, node2, m,
4882 'ignored' in show or 'i' in terse,
4882 'ignored' in show or 'i' in terse,
4883 True, True, opts.get('subrepos'))
4883 True, True, opts.get('subrepos'))
4884
4884
4885 stat = cmdutil.tersedir(stat, terse)
4885 stat = cmdutil.tersedir(stat, terse)
4886 else:
4886 else:
4887 stat = repo.status(node1, node2, m,
4887 stat = repo.status(node1, node2, m,
4888 'ignored' in show, 'clean' in show,
4888 'ignored' in show, 'clean' in show,
4889 'unknown' in show, opts.get('subrepos'))
4889 'unknown' in show, opts.get('subrepos'))
4890
4890
4891 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4891 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4892
4892
4893 if (opts.get('all') or opts.get('copies')
4893 if (opts.get('all') or opts.get('copies')
4894 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4894 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4895 copy = copies.pathcopies(repo[node1], repo[node2], m)
4895 copy = copies.pathcopies(repo[node1], repo[node2], m)
4896
4896
4897 ui.pager('status')
4897 ui.pager('status')
4898 fm = ui.formatter('status', opts)
4898 fm = ui.formatter('status', opts)
4899 fmt = '%s' + end
4899 fmt = '%s' + end
4900 showchar = not opts.get('no_status')
4900 showchar = not opts.get('no_status')
4901
4901
4902 for state, char, files in changestates:
4902 for state, char, files in changestates:
4903 if state in show:
4903 if state in show:
4904 label = 'status.' + state
4904 label = 'status.' + state
4905 for f in files:
4905 for f in files:
4906 fm.startitem()
4906 fm.startitem()
4907 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4907 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4908 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4908 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4909 if f in copy:
4909 if f in copy:
4910 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4910 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4911 label='status.copied')
4911 label='status.copied')
4912
4912
4913 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
4913 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
4914 and not ui.plain()):
4914 and not ui.plain()):
4915 cmdutil.morestatus(repo, fm)
4915 cmdutil.morestatus(repo, fm)
4916 fm.end()
4916 fm.end()
4917
4917
4918 @command('^summary|sum',
4918 @command('^summary|sum',
4919 [('', 'remote', None, _('check for push and pull'))],
4919 [('', 'remote', None, _('check for push and pull'))],
4920 '[--remote]', cmdtype=readonly)
4920 '[--remote]', cmdtype=readonly)
4921 def summary(ui, repo, **opts):
4921 def summary(ui, repo, **opts):
4922 """summarize working directory state
4922 """summarize working directory state
4923
4923
4924 This generates a brief summary of the working directory state,
4924 This generates a brief summary of the working directory state,
4925 including parents, branch, commit status, phase and available updates.
4925 including parents, branch, commit status, phase and available updates.
4926
4926
4927 With the --remote option, this will check the default paths for
4927 With the --remote option, this will check the default paths for
4928 incoming and outgoing changes. This can be time-consuming.
4928 incoming and outgoing changes. This can be time-consuming.
4929
4929
4930 Returns 0 on success.
4930 Returns 0 on success.
4931 """
4931 """
4932
4932
4933 opts = pycompat.byteskwargs(opts)
4933 opts = pycompat.byteskwargs(opts)
4934 ui.pager('summary')
4934 ui.pager('summary')
4935 ctx = repo[None]
4935 ctx = repo[None]
4936 parents = ctx.parents()
4936 parents = ctx.parents()
4937 pnode = parents[0].node()
4937 pnode = parents[0].node()
4938 marks = []
4938 marks = []
4939
4939
4940 ms = None
4940 ms = None
4941 try:
4941 try:
4942 ms = mergemod.mergestate.read(repo)
4942 ms = mergemod.mergestate.read(repo)
4943 except error.UnsupportedMergeRecords as e:
4943 except error.UnsupportedMergeRecords as e:
4944 s = ' '.join(e.recordtypes)
4944 s = ' '.join(e.recordtypes)
4945 ui.warn(
4945 ui.warn(
4946 _('warning: merge state has unsupported record types: %s\n') % s)
4946 _('warning: merge state has unsupported record types: %s\n') % s)
4947 unresolved = []
4947 unresolved = []
4948 else:
4948 else:
4949 unresolved = list(ms.unresolved())
4949 unresolved = list(ms.unresolved())
4950
4950
4951 for p in parents:
4951 for p in parents:
4952 # label with log.changeset (instead of log.parent) since this
4952 # label with log.changeset (instead of log.parent) since this
4953 # shows a working directory parent *changeset*:
4953 # shows a working directory parent *changeset*:
4954 # i18n: column positioning for "hg summary"
4954 # i18n: column positioning for "hg summary"
4955 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4955 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4956 label=logcmdutil.changesetlabels(p))
4956 label=logcmdutil.changesetlabels(p))
4957 ui.write(' '.join(p.tags()), label='log.tag')
4957 ui.write(' '.join(p.tags()), label='log.tag')
4958 if p.bookmarks():
4958 if p.bookmarks():
4959 marks.extend(p.bookmarks())
4959 marks.extend(p.bookmarks())
4960 if p.rev() == -1:
4960 if p.rev() == -1:
4961 if not len(repo):
4961 if not len(repo):
4962 ui.write(_(' (empty repository)'))
4962 ui.write(_(' (empty repository)'))
4963 else:
4963 else:
4964 ui.write(_(' (no revision checked out)'))
4964 ui.write(_(' (no revision checked out)'))
4965 if p.obsolete():
4965 if p.obsolete():
4966 ui.write(_(' (obsolete)'))
4966 ui.write(_(' (obsolete)'))
4967 if p.isunstable():
4967 if p.isunstable():
4968 instabilities = (ui.label(instability, 'trouble.%s' % instability)
4968 instabilities = (ui.label(instability, 'trouble.%s' % instability)
4969 for instability in p.instabilities())
4969 for instability in p.instabilities())
4970 ui.write(' ('
4970 ui.write(' ('
4971 + ', '.join(instabilities)
4971 + ', '.join(instabilities)
4972 + ')')
4972 + ')')
4973 ui.write('\n')
4973 ui.write('\n')
4974 if p.description():
4974 if p.description():
4975 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4975 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4976 label='log.summary')
4976 label='log.summary')
4977
4977
4978 branch = ctx.branch()
4978 branch = ctx.branch()
4979 bheads = repo.branchheads(branch)
4979 bheads = repo.branchheads(branch)
4980 # i18n: column positioning for "hg summary"
4980 # i18n: column positioning for "hg summary"
4981 m = _('branch: %s\n') % branch
4981 m = _('branch: %s\n') % branch
4982 if branch != 'default':
4982 if branch != 'default':
4983 ui.write(m, label='log.branch')
4983 ui.write(m, label='log.branch')
4984 else:
4984 else:
4985 ui.status(m, label='log.branch')
4985 ui.status(m, label='log.branch')
4986
4986
4987 if marks:
4987 if marks:
4988 active = repo._activebookmark
4988 active = repo._activebookmark
4989 # i18n: column positioning for "hg summary"
4989 # i18n: column positioning for "hg summary"
4990 ui.write(_('bookmarks:'), label='log.bookmark')
4990 ui.write(_('bookmarks:'), label='log.bookmark')
4991 if active is not None:
4991 if active is not None:
4992 if active in marks:
4992 if active in marks:
4993 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4993 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4994 marks.remove(active)
4994 marks.remove(active)
4995 else:
4995 else:
4996 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4996 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4997 for m in marks:
4997 for m in marks:
4998 ui.write(' ' + m, label='log.bookmark')
4998 ui.write(' ' + m, label='log.bookmark')
4999 ui.write('\n', label='log.bookmark')
4999 ui.write('\n', label='log.bookmark')
5000
5000
5001 status = repo.status(unknown=True)
5001 status = repo.status(unknown=True)
5002
5002
5003 c = repo.dirstate.copies()
5003 c = repo.dirstate.copies()
5004 copied, renamed = [], []
5004 copied, renamed = [], []
5005 for d, s in c.iteritems():
5005 for d, s in c.iteritems():
5006 if s in status.removed:
5006 if s in status.removed:
5007 status.removed.remove(s)
5007 status.removed.remove(s)
5008 renamed.append(d)
5008 renamed.append(d)
5009 else:
5009 else:
5010 copied.append(d)
5010 copied.append(d)
5011 if d in status.added:
5011 if d in status.added:
5012 status.added.remove(d)
5012 status.added.remove(d)
5013
5013
5014 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5014 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5015
5015
5016 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5016 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5017 (ui.label(_('%d added'), 'status.added'), status.added),
5017 (ui.label(_('%d added'), 'status.added'), status.added),
5018 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5018 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5019 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5019 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5020 (ui.label(_('%d copied'), 'status.copied'), copied),
5020 (ui.label(_('%d copied'), 'status.copied'), copied),
5021 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5021 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5022 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5022 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5023 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5023 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5024 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5024 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5025 t = []
5025 t = []
5026 for l, s in labels:
5026 for l, s in labels:
5027 if s:
5027 if s:
5028 t.append(l % len(s))
5028 t.append(l % len(s))
5029
5029
5030 t = ', '.join(t)
5030 t = ', '.join(t)
5031 cleanworkdir = False
5031 cleanworkdir = False
5032
5032
5033 if repo.vfs.exists('graftstate'):
5033 if repo.vfs.exists('graftstate'):
5034 t += _(' (graft in progress)')
5034 t += _(' (graft in progress)')
5035 if repo.vfs.exists('updatestate'):
5035 if repo.vfs.exists('updatestate'):
5036 t += _(' (interrupted update)')
5036 t += _(' (interrupted update)')
5037 elif len(parents) > 1:
5037 elif len(parents) > 1:
5038 t += _(' (merge)')
5038 t += _(' (merge)')
5039 elif branch != parents[0].branch():
5039 elif branch != parents[0].branch():
5040 t += _(' (new branch)')
5040 t += _(' (new branch)')
5041 elif (parents[0].closesbranch() and
5041 elif (parents[0].closesbranch() and
5042 pnode in repo.branchheads(branch, closed=True)):
5042 pnode in repo.branchheads(branch, closed=True)):
5043 t += _(' (head closed)')
5043 t += _(' (head closed)')
5044 elif not (status.modified or status.added or status.removed or renamed or
5044 elif not (status.modified or status.added or status.removed or renamed or
5045 copied or subs):
5045 copied or subs):
5046 t += _(' (clean)')
5046 t += _(' (clean)')
5047 cleanworkdir = True
5047 cleanworkdir = True
5048 elif pnode not in bheads:
5048 elif pnode not in bheads:
5049 t += _(' (new branch head)')
5049 t += _(' (new branch head)')
5050
5050
5051 if parents:
5051 if parents:
5052 pendingphase = max(p.phase() for p in parents)
5052 pendingphase = max(p.phase() for p in parents)
5053 else:
5053 else:
5054 pendingphase = phases.public
5054 pendingphase = phases.public
5055
5055
5056 if pendingphase > phases.newcommitphase(ui):
5056 if pendingphase > phases.newcommitphase(ui):
5057 t += ' (%s)' % phases.phasenames[pendingphase]
5057 t += ' (%s)' % phases.phasenames[pendingphase]
5058
5058
5059 if cleanworkdir:
5059 if cleanworkdir:
5060 # i18n: column positioning for "hg summary"
5060 # i18n: column positioning for "hg summary"
5061 ui.status(_('commit: %s\n') % t.strip())
5061 ui.status(_('commit: %s\n') % t.strip())
5062 else:
5062 else:
5063 # i18n: column positioning for "hg summary"
5063 # i18n: column positioning for "hg summary"
5064 ui.write(_('commit: %s\n') % t.strip())
5064 ui.write(_('commit: %s\n') % t.strip())
5065
5065
5066 # all ancestors of branch heads - all ancestors of parent = new csets
5066 # all ancestors of branch heads - all ancestors of parent = new csets
5067 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5067 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5068 bheads))
5068 bheads))
5069
5069
5070 if new == 0:
5070 if new == 0:
5071 # i18n: column positioning for "hg summary"
5071 # i18n: column positioning for "hg summary"
5072 ui.status(_('update: (current)\n'))
5072 ui.status(_('update: (current)\n'))
5073 elif pnode not in bheads:
5073 elif pnode not in bheads:
5074 # i18n: column positioning for "hg summary"
5074 # i18n: column positioning for "hg summary"
5075 ui.write(_('update: %d new changesets (update)\n') % new)
5075 ui.write(_('update: %d new changesets (update)\n') % new)
5076 else:
5076 else:
5077 # i18n: column positioning for "hg summary"
5077 # i18n: column positioning for "hg summary"
5078 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5078 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5079 (new, len(bheads)))
5079 (new, len(bheads)))
5080
5080
5081 t = []
5081 t = []
5082 draft = len(repo.revs('draft()'))
5082 draft = len(repo.revs('draft()'))
5083 if draft:
5083 if draft:
5084 t.append(_('%d draft') % draft)
5084 t.append(_('%d draft') % draft)
5085 secret = len(repo.revs('secret()'))
5085 secret = len(repo.revs('secret()'))
5086 if secret:
5086 if secret:
5087 t.append(_('%d secret') % secret)
5087 t.append(_('%d secret') % secret)
5088
5088
5089 if draft or secret:
5089 if draft or secret:
5090 ui.status(_('phases: %s\n') % ', '.join(t))
5090 ui.status(_('phases: %s\n') % ', '.join(t))
5091
5091
5092 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5092 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5093 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5093 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5094 numtrouble = len(repo.revs(trouble + "()"))
5094 numtrouble = len(repo.revs(trouble + "()"))
5095 # We write all the possibilities to ease translation
5095 # We write all the possibilities to ease translation
5096 troublemsg = {
5096 troublemsg = {
5097 "orphan": _("orphan: %d changesets"),
5097 "orphan": _("orphan: %d changesets"),
5098 "contentdivergent": _("content-divergent: %d changesets"),
5098 "contentdivergent": _("content-divergent: %d changesets"),
5099 "phasedivergent": _("phase-divergent: %d changesets"),
5099 "phasedivergent": _("phase-divergent: %d changesets"),
5100 }
5100 }
5101 if numtrouble > 0:
5101 if numtrouble > 0:
5102 ui.status(troublemsg[trouble] % numtrouble + "\n")
5102 ui.status(troublemsg[trouble] % numtrouble + "\n")
5103
5103
5104 cmdutil.summaryhooks(ui, repo)
5104 cmdutil.summaryhooks(ui, repo)
5105
5105
5106 if opts.get('remote'):
5106 if opts.get('remote'):
5107 needsincoming, needsoutgoing = True, True
5107 needsincoming, needsoutgoing = True, True
5108 else:
5108 else:
5109 needsincoming, needsoutgoing = False, False
5109 needsincoming, needsoutgoing = False, False
5110 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5110 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5111 if i:
5111 if i:
5112 needsincoming = True
5112 needsincoming = True
5113 if o:
5113 if o:
5114 needsoutgoing = True
5114 needsoutgoing = True
5115 if not needsincoming and not needsoutgoing:
5115 if not needsincoming and not needsoutgoing:
5116 return
5116 return
5117
5117
5118 def getincoming():
5118 def getincoming():
5119 source, branches = hg.parseurl(ui.expandpath('default'))
5119 source, branches = hg.parseurl(ui.expandpath('default'))
5120 sbranch = branches[0]
5120 sbranch = branches[0]
5121 try:
5121 try:
5122 other = hg.peer(repo, {}, source)
5122 other = hg.peer(repo, {}, source)
5123 except error.RepoError:
5123 except error.RepoError:
5124 if opts.get('remote'):
5124 if opts.get('remote'):
5125 raise
5125 raise
5126 return source, sbranch, None, None, None
5126 return source, sbranch, None, None, None
5127 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5127 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5128 if revs:
5128 if revs:
5129 revs = [other.lookup(rev) for rev in revs]
5129 revs = [other.lookup(rev) for rev in revs]
5130 ui.debug('comparing with %s\n' % util.hidepassword(source))
5130 ui.debug('comparing with %s\n' % util.hidepassword(source))
5131 repo.ui.pushbuffer()
5131 repo.ui.pushbuffer()
5132 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5132 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5133 repo.ui.popbuffer()
5133 repo.ui.popbuffer()
5134 return source, sbranch, other, commoninc, commoninc[1]
5134 return source, sbranch, other, commoninc, commoninc[1]
5135
5135
5136 if needsincoming:
5136 if needsincoming:
5137 source, sbranch, sother, commoninc, incoming = getincoming()
5137 source, sbranch, sother, commoninc, incoming = getincoming()
5138 else:
5138 else:
5139 source = sbranch = sother = commoninc = incoming = None
5139 source = sbranch = sother = commoninc = incoming = None
5140
5140
5141 def getoutgoing():
5141 def getoutgoing():
5142 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5142 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5143 dbranch = branches[0]
5143 dbranch = branches[0]
5144 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5144 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5145 if source != dest:
5145 if source != dest:
5146 try:
5146 try:
5147 dother = hg.peer(repo, {}, dest)
5147 dother = hg.peer(repo, {}, dest)
5148 except error.RepoError:
5148 except error.RepoError:
5149 if opts.get('remote'):
5149 if opts.get('remote'):
5150 raise
5150 raise
5151 return dest, dbranch, None, None
5151 return dest, dbranch, None, None
5152 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5152 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5153 elif sother is None:
5153 elif sother is None:
5154 # there is no explicit destination peer, but source one is invalid
5154 # there is no explicit destination peer, but source one is invalid
5155 return dest, dbranch, None, None
5155 return dest, dbranch, None, None
5156 else:
5156 else:
5157 dother = sother
5157 dother = sother
5158 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5158 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5159 common = None
5159 common = None
5160 else:
5160 else:
5161 common = commoninc
5161 common = commoninc
5162 if revs:
5162 if revs:
5163 revs = [repo.lookup(rev) for rev in revs]
5163 revs = [repo.lookup(rev) for rev in revs]
5164 repo.ui.pushbuffer()
5164 repo.ui.pushbuffer()
5165 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5165 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5166 commoninc=common)
5166 commoninc=common)
5167 repo.ui.popbuffer()
5167 repo.ui.popbuffer()
5168 return dest, dbranch, dother, outgoing
5168 return dest, dbranch, dother, outgoing
5169
5169
5170 if needsoutgoing:
5170 if needsoutgoing:
5171 dest, dbranch, dother, outgoing = getoutgoing()
5171 dest, dbranch, dother, outgoing = getoutgoing()
5172 else:
5172 else:
5173 dest = dbranch = dother = outgoing = None
5173 dest = dbranch = dother = outgoing = None
5174
5174
5175 if opts.get('remote'):
5175 if opts.get('remote'):
5176 t = []
5176 t = []
5177 if incoming:
5177 if incoming:
5178 t.append(_('1 or more incoming'))
5178 t.append(_('1 or more incoming'))
5179 o = outgoing.missing
5179 o = outgoing.missing
5180 if o:
5180 if o:
5181 t.append(_('%d outgoing') % len(o))
5181 t.append(_('%d outgoing') % len(o))
5182 other = dother or sother
5182 other = dother or sother
5183 if 'bookmarks' in other.listkeys('namespaces'):
5183 if 'bookmarks' in other.listkeys('namespaces'):
5184 counts = bookmarks.summary(repo, other)
5184 counts = bookmarks.summary(repo, other)
5185 if counts[0] > 0:
5185 if counts[0] > 0:
5186 t.append(_('%d incoming bookmarks') % counts[0])
5186 t.append(_('%d incoming bookmarks') % counts[0])
5187 if counts[1] > 0:
5187 if counts[1] > 0:
5188 t.append(_('%d outgoing bookmarks') % counts[1])
5188 t.append(_('%d outgoing bookmarks') % counts[1])
5189
5189
5190 if t:
5190 if t:
5191 # i18n: column positioning for "hg summary"
5191 # i18n: column positioning for "hg summary"
5192 ui.write(_('remote: %s\n') % (', '.join(t)))
5192 ui.write(_('remote: %s\n') % (', '.join(t)))
5193 else:
5193 else:
5194 # i18n: column positioning for "hg summary"
5194 # i18n: column positioning for "hg summary"
5195 ui.status(_('remote: (synced)\n'))
5195 ui.status(_('remote: (synced)\n'))
5196
5196
5197 cmdutil.summaryremotehooks(ui, repo, opts,
5197 cmdutil.summaryremotehooks(ui, repo, opts,
5198 ((source, sbranch, sother, commoninc),
5198 ((source, sbranch, sother, commoninc),
5199 (dest, dbranch, dother, outgoing)))
5199 (dest, dbranch, dother, outgoing)))
5200
5200
5201 @command('tag',
5201 @command('tag',
5202 [('f', 'force', None, _('force tag')),
5202 [('f', 'force', None, _('force tag')),
5203 ('l', 'local', None, _('make the tag local')),
5203 ('l', 'local', None, _('make the tag local')),
5204 ('r', 'rev', '', _('revision to tag'), _('REV')),
5204 ('r', 'rev', '', _('revision to tag'), _('REV')),
5205 ('', 'remove', None, _('remove a tag')),
5205 ('', 'remove', None, _('remove a tag')),
5206 # -l/--local is already there, commitopts cannot be used
5206 # -l/--local is already there, commitopts cannot be used
5207 ('e', 'edit', None, _('invoke editor on commit messages')),
5207 ('e', 'edit', None, _('invoke editor on commit messages')),
5208 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5208 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5209 ] + commitopts2,
5209 ] + commitopts2,
5210 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5210 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5211 def tag(ui, repo, name1, *names, **opts):
5211 def tag(ui, repo, name1, *names, **opts):
5212 """add one or more tags for the current or given revision
5212 """add one or more tags for the current or given revision
5213
5213
5214 Name a particular revision using <name>.
5214 Name a particular revision using <name>.
5215
5215
5216 Tags are used to name particular revisions of the repository and are
5216 Tags are used to name particular revisions of the repository and are
5217 very useful to compare different revisions, to go back to significant
5217 very useful to compare different revisions, to go back to significant
5218 earlier versions or to mark branch points as releases, etc. Changing
5218 earlier versions or to mark branch points as releases, etc. Changing
5219 an existing tag is normally disallowed; use -f/--force to override.
5219 an existing tag is normally disallowed; use -f/--force to override.
5220
5220
5221 If no revision is given, the parent of the working directory is
5221 If no revision is given, the parent of the working directory is
5222 used.
5222 used.
5223
5223
5224 To facilitate version control, distribution, and merging of tags,
5224 To facilitate version control, distribution, and merging of tags,
5225 they are stored as a file named ".hgtags" which is managed similarly
5225 they are stored as a file named ".hgtags" which is managed similarly
5226 to other project files and can be hand-edited if necessary. This
5226 to other project files and can be hand-edited if necessary. This
5227 also means that tagging creates a new commit. The file
5227 also means that tagging creates a new commit. The file
5228 ".hg/localtags" is used for local tags (not shared among
5228 ".hg/localtags" is used for local tags (not shared among
5229 repositories).
5229 repositories).
5230
5230
5231 Tag commits are usually made at the head of a branch. If the parent
5231 Tag commits are usually made at the head of a branch. If the parent
5232 of the working directory is not a branch head, :hg:`tag` aborts; use
5232 of the working directory is not a branch head, :hg:`tag` aborts; use
5233 -f/--force to force the tag commit to be based on a non-head
5233 -f/--force to force the tag commit to be based on a non-head
5234 changeset.
5234 changeset.
5235
5235
5236 See :hg:`help dates` for a list of formats valid for -d/--date.
5236 See :hg:`help dates` for a list of formats valid for -d/--date.
5237
5237
5238 Since tag names have priority over branch names during revision
5238 Since tag names have priority over branch names during revision
5239 lookup, using an existing branch name as a tag name is discouraged.
5239 lookup, using an existing branch name as a tag name is discouraged.
5240
5240
5241 Returns 0 on success.
5241 Returns 0 on success.
5242 """
5242 """
5243 opts = pycompat.byteskwargs(opts)
5243 opts = pycompat.byteskwargs(opts)
5244 wlock = lock = None
5244 wlock = lock = None
5245 try:
5245 try:
5246 wlock = repo.wlock()
5246 wlock = repo.wlock()
5247 lock = repo.lock()
5247 lock = repo.lock()
5248 rev_ = "."
5248 rev_ = "."
5249 names = [t.strip() for t in (name1,) + names]
5249 names = [t.strip() for t in (name1,) + names]
5250 if len(names) != len(set(names)):
5250 if len(names) != len(set(names)):
5251 raise error.Abort(_('tag names must be unique'))
5251 raise error.Abort(_('tag names must be unique'))
5252 for n in names:
5252 for n in names:
5253 scmutil.checknewlabel(repo, n, 'tag')
5253 scmutil.checknewlabel(repo, n, 'tag')
5254 if not n:
5254 if not n:
5255 raise error.Abort(_('tag names cannot consist entirely of '
5255 raise error.Abort(_('tag names cannot consist entirely of '
5256 'whitespace'))
5256 'whitespace'))
5257 if opts.get('rev') and opts.get('remove'):
5257 if opts.get('rev') and opts.get('remove'):
5258 raise error.Abort(_("--rev and --remove are incompatible"))
5258 raise error.Abort(_("--rev and --remove are incompatible"))
5259 if opts.get('rev'):
5259 if opts.get('rev'):
5260 rev_ = opts['rev']
5260 rev_ = opts['rev']
5261 message = opts.get('message')
5261 message = opts.get('message')
5262 if opts.get('remove'):
5262 if opts.get('remove'):
5263 if opts.get('local'):
5263 if opts.get('local'):
5264 expectedtype = 'local'
5264 expectedtype = 'local'
5265 else:
5265 else:
5266 expectedtype = 'global'
5266 expectedtype = 'global'
5267
5267
5268 for n in names:
5268 for n in names:
5269 if not repo.tagtype(n):
5269 if not repo.tagtype(n):
5270 raise error.Abort(_("tag '%s' does not exist") % n)
5270 raise error.Abort(_("tag '%s' does not exist") % n)
5271 if repo.tagtype(n) != expectedtype:
5271 if repo.tagtype(n) != expectedtype:
5272 if expectedtype == 'global':
5272 if expectedtype == 'global':
5273 raise error.Abort(_("tag '%s' is not a global tag") % n)
5273 raise error.Abort(_("tag '%s' is not a global tag") % n)
5274 else:
5274 else:
5275 raise error.Abort(_("tag '%s' is not a local tag") % n)
5275 raise error.Abort(_("tag '%s' is not a local tag") % n)
5276 rev_ = 'null'
5276 rev_ = 'null'
5277 if not message:
5277 if not message:
5278 # we don't translate commit messages
5278 # we don't translate commit messages
5279 message = 'Removed tag %s' % ', '.join(names)
5279 message = 'Removed tag %s' % ', '.join(names)
5280 elif not opts.get('force'):
5280 elif not opts.get('force'):
5281 for n in names:
5281 for n in names:
5282 if n in repo.tags():
5282 if n in repo.tags():
5283 raise error.Abort(_("tag '%s' already exists "
5283 raise error.Abort(_("tag '%s' already exists "
5284 "(use -f to force)") % n)
5284 "(use -f to force)") % n)
5285 if not opts.get('local'):
5285 if not opts.get('local'):
5286 p1, p2 = repo.dirstate.parents()
5286 p1, p2 = repo.dirstate.parents()
5287 if p2 != nullid:
5287 if p2 != nullid:
5288 raise error.Abort(_('uncommitted merge'))
5288 raise error.Abort(_('uncommitted merge'))
5289 bheads = repo.branchheads()
5289 bheads = repo.branchheads()
5290 if not opts.get('force') and bheads and p1 not in bheads:
5290 if not opts.get('force') and bheads and p1 not in bheads:
5291 raise error.Abort(_('working directory is not at a branch head '
5291 raise error.Abort(_('working directory is not at a branch head '
5292 '(use -f to force)'))
5292 '(use -f to force)'))
5293 r = scmutil.revsingle(repo, rev_).node()
5293 r = scmutil.revsingle(repo, rev_).node()
5294
5294
5295 if not message:
5295 if not message:
5296 # we don't translate commit messages
5296 # we don't translate commit messages
5297 message = ('Added tag %s for changeset %s' %
5297 message = ('Added tag %s for changeset %s' %
5298 (', '.join(names), short(r)))
5298 (', '.join(names), short(r)))
5299
5299
5300 date = opts.get('date')
5300 date = opts.get('date')
5301 if date:
5301 if date:
5302 date = util.parsedate(date)
5302 date = util.parsedate(date)
5303
5303
5304 if opts.get('remove'):
5304 if opts.get('remove'):
5305 editform = 'tag.remove'
5305 editform = 'tag.remove'
5306 else:
5306 else:
5307 editform = 'tag.add'
5307 editform = 'tag.add'
5308 editor = cmdutil.getcommiteditor(editform=editform,
5308 editor = cmdutil.getcommiteditor(editform=editform,
5309 **pycompat.strkwargs(opts))
5309 **pycompat.strkwargs(opts))
5310
5310
5311 # don't allow tagging the null rev
5311 # don't allow tagging the null rev
5312 if (not opts.get('remove') and
5312 if (not opts.get('remove') and
5313 scmutil.revsingle(repo, rev_).rev() == nullrev):
5313 scmutil.revsingle(repo, rev_).rev() == nullrev):
5314 raise error.Abort(_("cannot tag null revision"))
5314 raise error.Abort(_("cannot tag null revision"))
5315
5315
5316 tagsmod.tag(repo, names, r, message, opts.get('local'),
5316 tagsmod.tag(repo, names, r, message, opts.get('local'),
5317 opts.get('user'), date, editor=editor)
5317 opts.get('user'), date, editor=editor)
5318 finally:
5318 finally:
5319 release(lock, wlock)
5319 release(lock, wlock)
5320
5320
5321 @command('tags', formatteropts, '', cmdtype=readonly)
5321 @command('tags', formatteropts, '', cmdtype=readonly)
5322 def tags(ui, repo, **opts):
5322 def tags(ui, repo, **opts):
5323 """list repository tags
5323 """list repository tags
5324
5324
5325 This lists both regular and local tags. When the -v/--verbose
5325 This lists both regular and local tags. When the -v/--verbose
5326 switch is used, a third column "local" is printed for local tags.
5326 switch is used, a third column "local" is printed for local tags.
5327 When the -q/--quiet switch is used, only the tag name is printed.
5327 When the -q/--quiet switch is used, only the tag name is printed.
5328
5328
5329 Returns 0 on success.
5329 Returns 0 on success.
5330 """
5330 """
5331
5331
5332 opts = pycompat.byteskwargs(opts)
5332 opts = pycompat.byteskwargs(opts)
5333 ui.pager('tags')
5333 ui.pager('tags')
5334 fm = ui.formatter('tags', opts)
5334 fm = ui.formatter('tags', opts)
5335 hexfunc = fm.hexfunc
5335 hexfunc = fm.hexfunc
5336 tagtype = ""
5336 tagtype = ""
5337
5337
5338 for t, n in reversed(repo.tagslist()):
5338 for t, n in reversed(repo.tagslist()):
5339 hn = hexfunc(n)
5339 hn = hexfunc(n)
5340 label = 'tags.normal'
5340 label = 'tags.normal'
5341 tagtype = ''
5341 tagtype = ''
5342 if repo.tagtype(t) == 'local':
5342 if repo.tagtype(t) == 'local':
5343 label = 'tags.local'
5343 label = 'tags.local'
5344 tagtype = 'local'
5344 tagtype = 'local'
5345
5345
5346 fm.startitem()
5346 fm.startitem()
5347 fm.write('tag', '%s', t, label=label)
5347 fm.write('tag', '%s', t, label=label)
5348 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5348 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5349 fm.condwrite(not ui.quiet, 'rev node', fmt,
5349 fm.condwrite(not ui.quiet, 'rev node', fmt,
5350 repo.changelog.rev(n), hn, label=label)
5350 repo.changelog.rev(n), hn, label=label)
5351 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5351 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5352 tagtype, label=label)
5352 tagtype, label=label)
5353 fm.plain('\n')
5353 fm.plain('\n')
5354 fm.end()
5354 fm.end()
5355
5355
5356 @command('tip',
5356 @command('tip',
5357 [('p', 'patch', None, _('show patch')),
5357 [('p', 'patch', None, _('show patch')),
5358 ('g', 'git', None, _('use git extended diff format')),
5358 ('g', 'git', None, _('use git extended diff format')),
5359 ] + templateopts,
5359 ] + templateopts,
5360 _('[-p] [-g]'))
5360 _('[-p] [-g]'))
5361 def tip(ui, repo, **opts):
5361 def tip(ui, repo, **opts):
5362 """show the tip revision (DEPRECATED)
5362 """show the tip revision (DEPRECATED)
5363
5363
5364 The tip revision (usually just called the tip) is the changeset
5364 The tip revision (usually just called the tip) is the changeset
5365 most recently added to the repository (and therefore the most
5365 most recently added to the repository (and therefore the most
5366 recently changed head).
5366 recently changed head).
5367
5367
5368 If you have just made a commit, that commit will be the tip. If
5368 If you have just made a commit, that commit will be the tip. If
5369 you have just pulled changes from another repository, the tip of
5369 you have just pulled changes from another repository, the tip of
5370 that repository becomes the current tip. The "tip" tag is special
5370 that repository becomes the current tip. The "tip" tag is special
5371 and cannot be renamed or assigned to a different changeset.
5371 and cannot be renamed or assigned to a different changeset.
5372
5372
5373 This command is deprecated, please use :hg:`heads` instead.
5373 This command is deprecated, please use :hg:`heads` instead.
5374
5374
5375 Returns 0 on success.
5375 Returns 0 on success.
5376 """
5376 """
5377 opts = pycompat.byteskwargs(opts)
5377 opts = pycompat.byteskwargs(opts)
5378 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5378 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5379 displayer.show(repo['tip'])
5379 displayer.show(repo['tip'])
5380 displayer.close()
5380 displayer.close()
5381
5381
5382 @command('unbundle',
5382 @command('unbundle',
5383 [('u', 'update', None,
5383 [('u', 'update', None,
5384 _('update to new branch head if changesets were unbundled'))],
5384 _('update to new branch head if changesets were unbundled'))],
5385 _('[-u] FILE...'))
5385 _('[-u] FILE...'))
5386 def unbundle(ui, repo, fname1, *fnames, **opts):
5386 def unbundle(ui, repo, fname1, *fnames, **opts):
5387 """apply one or more bundle files
5387 """apply one or more bundle files
5388
5388
5389 Apply one or more bundle files generated by :hg:`bundle`.
5389 Apply one or more bundle files generated by :hg:`bundle`.
5390
5390
5391 Returns 0 on success, 1 if an update has unresolved files.
5391 Returns 0 on success, 1 if an update has unresolved files.
5392 """
5392 """
5393 fnames = (fname1,) + fnames
5393 fnames = (fname1,) + fnames
5394
5394
5395 with repo.lock():
5395 with repo.lock():
5396 for fname in fnames:
5396 for fname in fnames:
5397 f = hg.openpath(ui, fname)
5397 f = hg.openpath(ui, fname)
5398 gen = exchange.readbundle(ui, f, fname)
5398 gen = exchange.readbundle(ui, f, fname)
5399 if isinstance(gen, streamclone.streamcloneapplier):
5399 if isinstance(gen, streamclone.streamcloneapplier):
5400 raise error.Abort(
5400 raise error.Abort(
5401 _('packed bundles cannot be applied with '
5401 _('packed bundles cannot be applied with '
5402 '"hg unbundle"'),
5402 '"hg unbundle"'),
5403 hint=_('use "hg debugapplystreamclonebundle"'))
5403 hint=_('use "hg debugapplystreamclonebundle"'))
5404 url = 'bundle:' + fname
5404 url = 'bundle:' + fname
5405 try:
5405 try:
5406 txnname = 'unbundle'
5406 txnname = 'unbundle'
5407 if not isinstance(gen, bundle2.unbundle20):
5407 if not isinstance(gen, bundle2.unbundle20):
5408 txnname = 'unbundle\n%s' % util.hidepassword(url)
5408 txnname = 'unbundle\n%s' % util.hidepassword(url)
5409 with repo.transaction(txnname) as tr:
5409 with repo.transaction(txnname) as tr:
5410 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5410 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5411 url=url)
5411 url=url)
5412 except error.BundleUnknownFeatureError as exc:
5412 except error.BundleUnknownFeatureError as exc:
5413 raise error.Abort(
5413 raise error.Abort(
5414 _('%s: unknown bundle feature, %s') % (fname, exc),
5414 _('%s: unknown bundle feature, %s') % (fname, exc),
5415 hint=_("see https://mercurial-scm.org/"
5415 hint=_("see https://mercurial-scm.org/"
5416 "wiki/BundleFeature for more "
5416 "wiki/BundleFeature for more "
5417 "information"))
5417 "information"))
5418 modheads = bundle2.combinechangegroupresults(op)
5418 modheads = bundle2.combinechangegroupresults(op)
5419
5419
5420 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5420 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5421
5421
5422 @command('^update|up|checkout|co',
5422 @command('^update|up|checkout|co',
5423 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5423 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5424 ('c', 'check', None, _('require clean working directory')),
5424 ('c', 'check', None, _('require clean working directory')),
5425 ('m', 'merge', None, _('merge uncommitted changes')),
5425 ('m', 'merge', None, _('merge uncommitted changes')),
5426 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5426 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5427 ('r', 'rev', '', _('revision'), _('REV'))
5427 ('r', 'rev', '', _('revision'), _('REV'))
5428 ] + mergetoolopts,
5428 ] + mergetoolopts,
5429 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5429 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5430 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5430 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5431 merge=None, tool=None):
5431 merge=None, tool=None):
5432 """update working directory (or switch revisions)
5432 """update working directory (or switch revisions)
5433
5433
5434 Update the repository's working directory to the specified
5434 Update the repository's working directory to the specified
5435 changeset. If no changeset is specified, update to the tip of the
5435 changeset. If no changeset is specified, update to the tip of the
5436 current named branch and move the active bookmark (see :hg:`help
5436 current named branch and move the active bookmark (see :hg:`help
5437 bookmarks`).
5437 bookmarks`).
5438
5438
5439 Update sets the working directory's parent revision to the specified
5439 Update sets the working directory's parent revision to the specified
5440 changeset (see :hg:`help parents`).
5440 changeset (see :hg:`help parents`).
5441
5441
5442 If the changeset is not a descendant or ancestor of the working
5442 If the changeset is not a descendant or ancestor of the working
5443 directory's parent and there are uncommitted changes, the update is
5443 directory's parent and there are uncommitted changes, the update is
5444 aborted. With the -c/--check option, the working directory is checked
5444 aborted. With the -c/--check option, the working directory is checked
5445 for uncommitted changes; if none are found, the working directory is
5445 for uncommitted changes; if none are found, the working directory is
5446 updated to the specified changeset.
5446 updated to the specified changeset.
5447
5447
5448 .. container:: verbose
5448 .. container:: verbose
5449
5449
5450 The -C/--clean, -c/--check, and -m/--merge options control what
5450 The -C/--clean, -c/--check, and -m/--merge options control what
5451 happens if the working directory contains uncommitted changes.
5451 happens if the working directory contains uncommitted changes.
5452 At most of one of them can be specified.
5452 At most of one of them can be specified.
5453
5453
5454 1. If no option is specified, and if
5454 1. If no option is specified, and if
5455 the requested changeset is an ancestor or descendant of
5455 the requested changeset is an ancestor or descendant of
5456 the working directory's parent, the uncommitted changes
5456 the working directory's parent, the uncommitted changes
5457 are merged into the requested changeset and the merged
5457 are merged into the requested changeset and the merged
5458 result is left uncommitted. If the requested changeset is
5458 result is left uncommitted. If the requested changeset is
5459 not an ancestor or descendant (that is, it is on another
5459 not an ancestor or descendant (that is, it is on another
5460 branch), the update is aborted and the uncommitted changes
5460 branch), the update is aborted and the uncommitted changes
5461 are preserved.
5461 are preserved.
5462
5462
5463 2. With the -m/--merge option, the update is allowed even if the
5463 2. With the -m/--merge option, the update is allowed even if the
5464 requested changeset is not an ancestor or descendant of
5464 requested changeset is not an ancestor or descendant of
5465 the working directory's parent.
5465 the working directory's parent.
5466
5466
5467 3. With the -c/--check option, the update is aborted and the
5467 3. With the -c/--check option, the update is aborted and the
5468 uncommitted changes are preserved.
5468 uncommitted changes are preserved.
5469
5469
5470 4. With the -C/--clean option, uncommitted changes are discarded and
5470 4. With the -C/--clean option, uncommitted changes are discarded and
5471 the working directory is updated to the requested changeset.
5471 the working directory is updated to the requested changeset.
5472
5472
5473 To cancel an uncommitted merge (and lose your changes), use
5473 To cancel an uncommitted merge (and lose your changes), use
5474 :hg:`merge --abort`.
5474 :hg:`merge --abort`.
5475
5475
5476 Use null as the changeset to remove the working directory (like
5476 Use null as the changeset to remove the working directory (like
5477 :hg:`clone -U`).
5477 :hg:`clone -U`).
5478
5478
5479 If you want to revert just one file to an older revision, use
5479 If you want to revert just one file to an older revision, use
5480 :hg:`revert [-r REV] NAME`.
5480 :hg:`revert [-r REV] NAME`.
5481
5481
5482 See :hg:`help dates` for a list of formats valid for -d/--date.
5482 See :hg:`help dates` for a list of formats valid for -d/--date.
5483
5483
5484 Returns 0 on success, 1 if there are unresolved files.
5484 Returns 0 on success, 1 if there are unresolved files.
5485 """
5485 """
5486 if rev and node:
5486 if rev and node:
5487 raise error.Abort(_("please specify just one revision"))
5487 raise error.Abort(_("please specify just one revision"))
5488
5488
5489 if ui.configbool('commands', 'update.requiredest'):
5489 if ui.configbool('commands', 'update.requiredest'):
5490 if not node and not rev and not date:
5490 if not node and not rev and not date:
5491 raise error.Abort(_('you must specify a destination'),
5491 raise error.Abort(_('you must specify a destination'),
5492 hint=_('for example: hg update ".::"'))
5492 hint=_('for example: hg update ".::"'))
5493
5493
5494 if rev is None or rev == '':
5494 if rev is None or rev == '':
5495 rev = node
5495 rev = node
5496
5496
5497 if date and rev is not None:
5497 if date and rev is not None:
5498 raise error.Abort(_("you can't specify a revision and a date"))
5498 raise error.Abort(_("you can't specify a revision and a date"))
5499
5499
5500 if len([x for x in (clean, check, merge) if x]) > 1:
5500 if len([x for x in (clean, check, merge) if x]) > 1:
5501 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5501 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5502 "or -m/--merge"))
5502 "or -m/--merge"))
5503
5503
5504 updatecheck = None
5504 updatecheck = None
5505 if check:
5505 if check:
5506 updatecheck = 'abort'
5506 updatecheck = 'abort'
5507 elif merge:
5507 elif merge:
5508 updatecheck = 'none'
5508 updatecheck = 'none'
5509
5509
5510 with repo.wlock():
5510 with repo.wlock():
5511 cmdutil.clearunfinished(repo)
5511 cmdutil.clearunfinished(repo)
5512
5512
5513 if date:
5513 if date:
5514 rev = cmdutil.finddate(ui, repo, date)
5514 rev = cmdutil.finddate(ui, repo, date)
5515
5515
5516 # if we defined a bookmark, we have to remember the original name
5516 # if we defined a bookmark, we have to remember the original name
5517 brev = rev
5517 brev = rev
5518 if rev:
5518 if rev:
5519 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5519 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5520 ctx = scmutil.revsingle(repo, rev, rev)
5520 ctx = scmutil.revsingle(repo, rev, rev)
5521 rev = ctx.rev()
5521 rev = ctx.rev()
5522 if ctx.hidden():
5522 if ctx.hidden():
5523 ctxstr = ctx.hex()[:12]
5523 ctxstr = ctx.hex()[:12]
5524 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr)
5524 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr)
5525
5525
5526 if ctx.obsolete():
5526 if ctx.obsolete():
5527 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5527 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5528 ui.warn("(%s)\n" % obsfatemsg)
5528 ui.warn("(%s)\n" % obsfatemsg)
5529
5529
5530 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5530 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5531
5531
5532 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5532 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5533 updatecheck=updatecheck)
5533 updatecheck=updatecheck)
5534
5534
5535 @command('verify', [])
5535 @command('verify', [])
5536 def verify(ui, repo):
5536 def verify(ui, repo):
5537 """verify the integrity of the repository
5537 """verify the integrity of the repository
5538
5538
5539 Verify the integrity of the current repository.
5539 Verify the integrity of the current repository.
5540
5540
5541 This will perform an extensive check of the repository's
5541 This will perform an extensive check of the repository's
5542 integrity, validating the hashes and checksums of each entry in
5542 integrity, validating the hashes and checksums of each entry in
5543 the changelog, manifest, and tracked files, as well as the
5543 the changelog, manifest, and tracked files, as well as the
5544 integrity of their crosslinks and indices.
5544 integrity of their crosslinks and indices.
5545
5545
5546 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5546 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5547 for more information about recovery from corruption of the
5547 for more information about recovery from corruption of the
5548 repository.
5548 repository.
5549
5549
5550 Returns 0 on success, 1 if errors are encountered.
5550 Returns 0 on success, 1 if errors are encountered.
5551 """
5551 """
5552 return hg.verify(repo)
5552 return hg.verify(repo)
5553
5553
5554 @command('version', [] + formatteropts, norepo=True, cmdtype=readonly)
5554 @command('version', [] + formatteropts, norepo=True, cmdtype=readonly)
5555 def version_(ui, **opts):
5555 def version_(ui, **opts):
5556 """output version and copyright information"""
5556 """output version and copyright information"""
5557 opts = pycompat.byteskwargs(opts)
5557 opts = pycompat.byteskwargs(opts)
5558 if ui.verbose:
5558 if ui.verbose:
5559 ui.pager('version')
5559 ui.pager('version')
5560 fm = ui.formatter("version", opts)
5560 fm = ui.formatter("version", opts)
5561 fm.startitem()
5561 fm.startitem()
5562 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5562 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5563 util.version())
5563 util.version())
5564 license = _(
5564 license = _(
5565 "(see https://mercurial-scm.org for more information)\n"
5565 "(see https://mercurial-scm.org for more information)\n"
5566 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5566 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5567 "This is free software; see the source for copying conditions. "
5567 "This is free software; see the source for copying conditions. "
5568 "There is NO\nwarranty; "
5568 "There is NO\nwarranty; "
5569 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5569 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5570 )
5570 )
5571 if not ui.quiet:
5571 if not ui.quiet:
5572 fm.plain(license)
5572 fm.plain(license)
5573
5573
5574 if ui.verbose:
5574 if ui.verbose:
5575 fm.plain(_("\nEnabled extensions:\n\n"))
5575 fm.plain(_("\nEnabled extensions:\n\n"))
5576 # format names and versions into columns
5576 # format names and versions into columns
5577 names = []
5577 names = []
5578 vers = []
5578 vers = []
5579 isinternals = []
5579 isinternals = []
5580 for name, module in extensions.extensions():
5580 for name, module in extensions.extensions():
5581 names.append(name)
5581 names.append(name)
5582 vers.append(extensions.moduleversion(module) or None)
5582 vers.append(extensions.moduleversion(module) or None)
5583 isinternals.append(extensions.ismoduleinternal(module))
5583 isinternals.append(extensions.ismoduleinternal(module))
5584 fn = fm.nested("extensions")
5584 fn = fm.nested("extensions")
5585 if names:
5585 if names:
5586 namefmt = " %%-%ds " % max(len(n) for n in names)
5586 namefmt = " %%-%ds " % max(len(n) for n in names)
5587 places = [_("external"), _("internal")]
5587 places = [_("external"), _("internal")]
5588 for n, v, p in zip(names, vers, isinternals):
5588 for n, v, p in zip(names, vers, isinternals):
5589 fn.startitem()
5589 fn.startitem()
5590 fn.condwrite(ui.verbose, "name", namefmt, n)
5590 fn.condwrite(ui.verbose, "name", namefmt, n)
5591 if ui.verbose:
5591 if ui.verbose:
5592 fn.plain("%s " % places[p])
5592 fn.plain("%s " % places[p])
5593 fn.data(bundled=p)
5593 fn.data(bundled=p)
5594 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5594 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5595 if ui.verbose:
5595 if ui.verbose:
5596 fn.plain("\n")
5596 fn.plain("\n")
5597 fn.end()
5597 fn.end()
5598 fm.end()
5598 fm.end()
5599
5599
5600 def loadcmdtable(ui, name, cmdtable):
5600 def loadcmdtable(ui, name, cmdtable):
5601 """Load command functions from specified cmdtable
5601 """Load command functions from specified cmdtable
5602 """
5602 """
5603 overrides = [cmd for cmd in cmdtable if cmd in table]
5603 overrides = [cmd for cmd in cmdtable if cmd in table]
5604 if overrides:
5604 if overrides:
5605 ui.warn(_("extension '%s' overrides commands: %s\n")
5605 ui.warn(_("extension '%s' overrides commands: %s\n")
5606 % (name, " ".join(overrides)))
5606 % (name, " ".join(overrides)))
5607 table.update(cmdtable)
5607 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now