##// END OF EJS Templates
log: pack filematcher and hunksfilter into changesetdiffer object...
Yuya Nishihara -
r36024:29b83c08 default
parent child Browse files
Show More
@@ -1,5622 +1,5618 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(), str),
340 ('file', ' ', lambda x: x.fctx.path(), str),
341 ('line_number', ':', lambda x: x.lineno, str),
341 ('line_number', ':', lambda x: x.lineno, str),
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)
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 raise error.Abort(
3417 raise error.Abort(
3418 _('FILE arguments are not compatible with --line-range option')
3418 _('FILE arguments are not compatible with --line-range option')
3419 )
3419 )
3420
3420
3421 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3421 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3422 revs, filematcher = logcmdutil.getrevs(repo, pats, opts)
3422 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3423 hunksfilter = None
3424
3423
3425 if opts.get('graph'):
3424 if opts.get('graph'):
3426 if linerange:
3425 if linerange:
3427 raise error.Abort(_('graph not supported with line range patterns'))
3426 raise error.Abort(_('graph not supported with line range patterns'))
3428 return logcmdutil.graphlog(ui, repo, revs, filematcher, opts)
3427 return logcmdutil.graphlog(ui, repo, revs, differ, opts)
3429
3428
3430 if linerange:
3429 if linerange:
3431 revs, filematcher, hunksfilter = logcmdutil.getlinerangerevs(
3430 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3432 repo, revs, opts)
3433
3431
3434 getrenamed = None
3432 getrenamed = None
3435 if opts.get('copies'):
3433 if opts.get('copies'):
3436 endrev = None
3434 endrev = None
3437 if opts.get('rev'):
3435 if opts.get('rev'):
3438 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3436 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3439 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3437 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3440
3438
3441 ui.pager('log')
3439 ui.pager('log')
3442 displayer = logcmdutil.changesetdisplayer(ui, repo, opts,
3440 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3443 makefilematcher=filematcher,
3444 makehunksfilter=hunksfilter,
3445 buffered=True)
3441 buffered=True)
3446 for rev in revs:
3442 for rev in revs:
3447 ctx = repo[rev]
3443 ctx = repo[rev]
3448 copies = None
3444 copies = None
3449 if getrenamed is not None and rev:
3445 if getrenamed is not None and rev:
3450 copies = []
3446 copies = []
3451 for fn in ctx.files():
3447 for fn in ctx.files():
3452 rename = getrenamed(fn, rev)
3448 rename = getrenamed(fn, rev)
3453 if rename:
3449 if rename:
3454 copies.append((fn, rename[0]))
3450 copies.append((fn, rename[0]))
3455 displayer.show(ctx, copies=copies)
3451 displayer.show(ctx, copies=copies)
3456 displayer.flush(ctx)
3452 displayer.flush(ctx)
3457
3453
3458 displayer.close()
3454 displayer.close()
3459
3455
3460 @command('manifest',
3456 @command('manifest',
3461 [('r', 'rev', '', _('revision to display'), _('REV')),
3457 [('r', 'rev', '', _('revision to display'), _('REV')),
3462 ('', 'all', False, _("list files from all revisions"))]
3458 ('', 'all', False, _("list files from all revisions"))]
3463 + formatteropts,
3459 + formatteropts,
3464 _('[-r REV]'), cmdtype=readonly)
3460 _('[-r REV]'), cmdtype=readonly)
3465 def manifest(ui, repo, node=None, rev=None, **opts):
3461 def manifest(ui, repo, node=None, rev=None, **opts):
3466 """output the current or given revision of the project manifest
3462 """output the current or given revision of the project manifest
3467
3463
3468 Print a list of version controlled files for the given revision.
3464 Print a list of version controlled files for the given revision.
3469 If no revision is given, the first parent of the working directory
3465 If no revision is given, the first parent of the working directory
3470 is used, or the null revision if no revision is checked out.
3466 is used, or the null revision if no revision is checked out.
3471
3467
3472 With -v, print file permissions, symlink and executable bits.
3468 With -v, print file permissions, symlink and executable bits.
3473 With --debug, print file revision hashes.
3469 With --debug, print file revision hashes.
3474
3470
3475 If option --all is specified, the list of all files from all revisions
3471 If option --all is specified, the list of all files from all revisions
3476 is printed. This includes deleted and renamed files.
3472 is printed. This includes deleted and renamed files.
3477
3473
3478 Returns 0 on success.
3474 Returns 0 on success.
3479 """
3475 """
3480 opts = pycompat.byteskwargs(opts)
3476 opts = pycompat.byteskwargs(opts)
3481 fm = ui.formatter('manifest', opts)
3477 fm = ui.formatter('manifest', opts)
3482
3478
3483 if opts.get('all'):
3479 if opts.get('all'):
3484 if rev or node:
3480 if rev or node:
3485 raise error.Abort(_("can't specify a revision with --all"))
3481 raise error.Abort(_("can't specify a revision with --all"))
3486
3482
3487 res = []
3483 res = []
3488 prefix = "data/"
3484 prefix = "data/"
3489 suffix = ".i"
3485 suffix = ".i"
3490 plen = len(prefix)
3486 plen = len(prefix)
3491 slen = len(suffix)
3487 slen = len(suffix)
3492 with repo.lock():
3488 with repo.lock():
3493 for fn, b, size in repo.store.datafiles():
3489 for fn, b, size in repo.store.datafiles():
3494 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3490 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3495 res.append(fn[plen:-slen])
3491 res.append(fn[plen:-slen])
3496 ui.pager('manifest')
3492 ui.pager('manifest')
3497 for f in res:
3493 for f in res:
3498 fm.startitem()
3494 fm.startitem()
3499 fm.write("path", '%s\n', f)
3495 fm.write("path", '%s\n', f)
3500 fm.end()
3496 fm.end()
3501 return
3497 return
3502
3498
3503 if rev and node:
3499 if rev and node:
3504 raise error.Abort(_("please specify just one revision"))
3500 raise error.Abort(_("please specify just one revision"))
3505
3501
3506 if not node:
3502 if not node:
3507 node = rev
3503 node = rev
3508
3504
3509 char = {'l': '@', 'x': '*', '': ''}
3505 char = {'l': '@', 'x': '*', '': ''}
3510 mode = {'l': '644', 'x': '755', '': '644'}
3506 mode = {'l': '644', 'x': '755', '': '644'}
3511 if node:
3507 if node:
3512 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3508 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3513 ctx = scmutil.revsingle(repo, node)
3509 ctx = scmutil.revsingle(repo, node)
3514 mf = ctx.manifest()
3510 mf = ctx.manifest()
3515 ui.pager('manifest')
3511 ui.pager('manifest')
3516 for f in ctx:
3512 for f in ctx:
3517 fm.startitem()
3513 fm.startitem()
3518 fl = ctx[f].flags()
3514 fl = ctx[f].flags()
3519 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3515 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3520 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3516 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3521 fm.write('path', '%s\n', f)
3517 fm.write('path', '%s\n', f)
3522 fm.end()
3518 fm.end()
3523
3519
3524 @command('^merge',
3520 @command('^merge',
3525 [('f', 'force', None,
3521 [('f', 'force', None,
3526 _('force a merge including outstanding changes (DEPRECATED)')),
3522 _('force a merge including outstanding changes (DEPRECATED)')),
3527 ('r', 'rev', '', _('revision to merge'), _('REV')),
3523 ('r', 'rev', '', _('revision to merge'), _('REV')),
3528 ('P', 'preview', None,
3524 ('P', 'preview', None,
3529 _('review revisions to merge (no merge is performed)')),
3525 _('review revisions to merge (no merge is performed)')),
3530 ('', 'abort', None, _('abort the ongoing merge')),
3526 ('', 'abort', None, _('abort the ongoing merge')),
3531 ] + mergetoolopts,
3527 ] + mergetoolopts,
3532 _('[-P] [[-r] REV]'))
3528 _('[-P] [[-r] REV]'))
3533 def merge(ui, repo, node=None, **opts):
3529 def merge(ui, repo, node=None, **opts):
3534 """merge another revision into working directory
3530 """merge another revision into working directory
3535
3531
3536 The current working directory is updated with all changes made in
3532 The current working directory is updated with all changes made in
3537 the requested revision since the last common predecessor revision.
3533 the requested revision since the last common predecessor revision.
3538
3534
3539 Files that changed between either parent are marked as changed for
3535 Files that changed between either parent are marked as changed for
3540 the next commit and a commit must be performed before any further
3536 the next commit and a commit must be performed before any further
3541 updates to the repository are allowed. The next commit will have
3537 updates to the repository are allowed. The next commit will have
3542 two parents.
3538 two parents.
3543
3539
3544 ``--tool`` can be used to specify the merge tool used for file
3540 ``--tool`` can be used to specify the merge tool used for file
3545 merges. It overrides the HGMERGE environment variable and your
3541 merges. It overrides the HGMERGE environment variable and your
3546 configuration files. See :hg:`help merge-tools` for options.
3542 configuration files. See :hg:`help merge-tools` for options.
3547
3543
3548 If no revision is specified, the working directory's parent is a
3544 If no revision is specified, the working directory's parent is a
3549 head revision, and the current branch contains exactly one other
3545 head revision, and the current branch contains exactly one other
3550 head, the other head is merged with by default. Otherwise, an
3546 head, the other head is merged with by default. Otherwise, an
3551 explicit revision with which to merge with must be provided.
3547 explicit revision with which to merge with must be provided.
3552
3548
3553 See :hg:`help resolve` for information on handling file conflicts.
3549 See :hg:`help resolve` for information on handling file conflicts.
3554
3550
3555 To undo an uncommitted merge, use :hg:`merge --abort` which
3551 To undo an uncommitted merge, use :hg:`merge --abort` which
3556 will check out a clean copy of the original merge parent, losing
3552 will check out a clean copy of the original merge parent, losing
3557 all changes.
3553 all changes.
3558
3554
3559 Returns 0 on success, 1 if there are unresolved files.
3555 Returns 0 on success, 1 if there are unresolved files.
3560 """
3556 """
3561
3557
3562 opts = pycompat.byteskwargs(opts)
3558 opts = pycompat.byteskwargs(opts)
3563 abort = opts.get('abort')
3559 abort = opts.get('abort')
3564 if abort and repo.dirstate.p2() == nullid:
3560 if abort and repo.dirstate.p2() == nullid:
3565 cmdutil.wrongtooltocontinue(repo, _('merge'))
3561 cmdutil.wrongtooltocontinue(repo, _('merge'))
3566 if abort:
3562 if abort:
3567 if node:
3563 if node:
3568 raise error.Abort(_("cannot specify a node with --abort"))
3564 raise error.Abort(_("cannot specify a node with --abort"))
3569 if opts.get('rev'):
3565 if opts.get('rev'):
3570 raise error.Abort(_("cannot specify both --rev and --abort"))
3566 raise error.Abort(_("cannot specify both --rev and --abort"))
3571 if opts.get('preview'):
3567 if opts.get('preview'):
3572 raise error.Abort(_("cannot specify --preview with --abort"))
3568 raise error.Abort(_("cannot specify --preview with --abort"))
3573 if opts.get('rev') and node:
3569 if opts.get('rev') and node:
3574 raise error.Abort(_("please specify just one revision"))
3570 raise error.Abort(_("please specify just one revision"))
3575 if not node:
3571 if not node:
3576 node = opts.get('rev')
3572 node = opts.get('rev')
3577
3573
3578 if node:
3574 if node:
3579 node = scmutil.revsingle(repo, node).node()
3575 node = scmutil.revsingle(repo, node).node()
3580
3576
3581 if not node and not abort:
3577 if not node and not abort:
3582 node = repo[destutil.destmerge(repo)].node()
3578 node = repo[destutil.destmerge(repo)].node()
3583
3579
3584 if opts.get('preview'):
3580 if opts.get('preview'):
3585 # find nodes that are ancestors of p2 but not of p1
3581 # find nodes that are ancestors of p2 but not of p1
3586 p1 = repo.lookup('.')
3582 p1 = repo.lookup('.')
3587 p2 = repo.lookup(node)
3583 p2 = repo.lookup(node)
3588 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3584 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3589
3585
3590 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3586 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3591 for node in nodes:
3587 for node in nodes:
3592 displayer.show(repo[node])
3588 displayer.show(repo[node])
3593 displayer.close()
3589 displayer.close()
3594 return 0
3590 return 0
3595
3591
3596 try:
3592 try:
3597 # ui.forcemerge is an internal variable, do not document
3593 # ui.forcemerge is an internal variable, do not document
3598 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3594 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3599 force = opts.get('force')
3595 force = opts.get('force')
3600 labels = ['working copy', 'merge rev']
3596 labels = ['working copy', 'merge rev']
3601 return hg.merge(repo, node, force=force, mergeforce=force,
3597 return hg.merge(repo, node, force=force, mergeforce=force,
3602 labels=labels, abort=abort)
3598 labels=labels, abort=abort)
3603 finally:
3599 finally:
3604 ui.setconfig('ui', 'forcemerge', '', 'merge')
3600 ui.setconfig('ui', 'forcemerge', '', 'merge')
3605
3601
3606 @command('outgoing|out',
3602 @command('outgoing|out',
3607 [('f', 'force', None, _('run even when the destination is unrelated')),
3603 [('f', 'force', None, _('run even when the destination is unrelated')),
3608 ('r', 'rev', [],
3604 ('r', 'rev', [],
3609 _('a changeset intended to be included in the destination'), _('REV')),
3605 _('a changeset intended to be included in the destination'), _('REV')),
3610 ('n', 'newest-first', None, _('show newest record first')),
3606 ('n', 'newest-first', None, _('show newest record first')),
3611 ('B', 'bookmarks', False, _('compare bookmarks')),
3607 ('B', 'bookmarks', False, _('compare bookmarks')),
3612 ('b', 'branch', [], _('a specific branch you would like to push'),
3608 ('b', 'branch', [], _('a specific branch you would like to push'),
3613 _('BRANCH')),
3609 _('BRANCH')),
3614 ] + logopts + remoteopts + subrepoopts,
3610 ] + logopts + remoteopts + subrepoopts,
3615 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3611 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3616 def outgoing(ui, repo, dest=None, **opts):
3612 def outgoing(ui, repo, dest=None, **opts):
3617 """show changesets not found in the destination
3613 """show changesets not found in the destination
3618
3614
3619 Show changesets not found in the specified destination repository
3615 Show changesets not found in the specified destination repository
3620 or the default push location. These are the changesets that would
3616 or the default push location. These are the changesets that would
3621 be pushed if a push was requested.
3617 be pushed if a push was requested.
3622
3618
3623 See pull for details of valid destination formats.
3619 See pull for details of valid destination formats.
3624
3620
3625 .. container:: verbose
3621 .. container:: verbose
3626
3622
3627 With -B/--bookmarks, the result of bookmark comparison between
3623 With -B/--bookmarks, the result of bookmark comparison between
3628 local and remote repositories is displayed. With -v/--verbose,
3624 local and remote repositories is displayed. With -v/--verbose,
3629 status is also displayed for each bookmark like below::
3625 status is also displayed for each bookmark like below::
3630
3626
3631 BM1 01234567890a added
3627 BM1 01234567890a added
3632 BM2 deleted
3628 BM2 deleted
3633 BM3 234567890abc advanced
3629 BM3 234567890abc advanced
3634 BM4 34567890abcd diverged
3630 BM4 34567890abcd diverged
3635 BM5 4567890abcde changed
3631 BM5 4567890abcde changed
3636
3632
3637 The action taken when pushing depends on the
3633 The action taken when pushing depends on the
3638 status of each bookmark:
3634 status of each bookmark:
3639
3635
3640 :``added``: push with ``-B`` will create it
3636 :``added``: push with ``-B`` will create it
3641 :``deleted``: push with ``-B`` will delete it
3637 :``deleted``: push with ``-B`` will delete it
3642 :``advanced``: push will update it
3638 :``advanced``: push will update it
3643 :``diverged``: push with ``-B`` will update it
3639 :``diverged``: push with ``-B`` will update it
3644 :``changed``: push with ``-B`` will update it
3640 :``changed``: push with ``-B`` will update it
3645
3641
3646 From the point of view of pushing behavior, bookmarks
3642 From the point of view of pushing behavior, bookmarks
3647 existing only in the remote repository are treated as
3643 existing only in the remote repository are treated as
3648 ``deleted``, even if it is in fact added remotely.
3644 ``deleted``, even if it is in fact added remotely.
3649
3645
3650 Returns 0 if there are outgoing changes, 1 otherwise.
3646 Returns 0 if there are outgoing changes, 1 otherwise.
3651 """
3647 """
3652 opts = pycompat.byteskwargs(opts)
3648 opts = pycompat.byteskwargs(opts)
3653 if opts.get('graph'):
3649 if opts.get('graph'):
3654 logcmdutil.checkunsupportedgraphflags([], opts)
3650 logcmdutil.checkunsupportedgraphflags([], opts)
3655 o, other = hg._outgoing(ui, repo, dest, opts)
3651 o, other = hg._outgoing(ui, repo, dest, opts)
3656 if not o:
3652 if not o:
3657 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3653 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3658 return
3654 return
3659
3655
3660 revdag = logcmdutil.graphrevs(repo, o, opts)
3656 revdag = logcmdutil.graphrevs(repo, o, opts)
3661 ui.pager('outgoing')
3657 ui.pager('outgoing')
3662 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3658 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3663 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3659 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3664 graphmod.asciiedges)
3660 graphmod.asciiedges)
3665 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3661 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3666 return 0
3662 return 0
3667
3663
3668 if opts.get('bookmarks'):
3664 if opts.get('bookmarks'):
3669 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3665 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3670 dest, branches = hg.parseurl(dest, opts.get('branch'))
3666 dest, branches = hg.parseurl(dest, opts.get('branch'))
3671 other = hg.peer(repo, opts, dest)
3667 other = hg.peer(repo, opts, dest)
3672 if 'bookmarks' not in other.listkeys('namespaces'):
3668 if 'bookmarks' not in other.listkeys('namespaces'):
3673 ui.warn(_("remote doesn't support bookmarks\n"))
3669 ui.warn(_("remote doesn't support bookmarks\n"))
3674 return 0
3670 return 0
3675 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3671 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3676 ui.pager('outgoing')
3672 ui.pager('outgoing')
3677 return bookmarks.outgoing(ui, repo, other)
3673 return bookmarks.outgoing(ui, repo, other)
3678
3674
3679 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3675 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3680 try:
3676 try:
3681 return hg.outgoing(ui, repo, dest, opts)
3677 return hg.outgoing(ui, repo, dest, opts)
3682 finally:
3678 finally:
3683 del repo._subtoppath
3679 del repo._subtoppath
3684
3680
3685 @command('parents',
3681 @command('parents',
3686 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3682 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3687 ] + templateopts,
3683 ] + templateopts,
3688 _('[-r REV] [FILE]'),
3684 _('[-r REV] [FILE]'),
3689 inferrepo=True)
3685 inferrepo=True)
3690 def parents(ui, repo, file_=None, **opts):
3686 def parents(ui, repo, file_=None, **opts):
3691 """show the parents of the working directory or revision (DEPRECATED)
3687 """show the parents of the working directory or revision (DEPRECATED)
3692
3688
3693 Print the working directory's parent revisions. If a revision is
3689 Print the working directory's parent revisions. If a revision is
3694 given via -r/--rev, the parent of that revision will be printed.
3690 given via -r/--rev, the parent of that revision will be printed.
3695 If a file argument is given, the revision in which the file was
3691 If a file argument is given, the revision in which the file was
3696 last changed (before the working directory revision or the
3692 last changed (before the working directory revision or the
3697 argument to --rev if given) is printed.
3693 argument to --rev if given) is printed.
3698
3694
3699 This command is equivalent to::
3695 This command is equivalent to::
3700
3696
3701 hg log -r "p1()+p2()" or
3697 hg log -r "p1()+p2()" or
3702 hg log -r "p1(REV)+p2(REV)" or
3698 hg log -r "p1(REV)+p2(REV)" or
3703 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3699 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3704 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3700 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3705
3701
3706 See :hg:`summary` and :hg:`help revsets` for related information.
3702 See :hg:`summary` and :hg:`help revsets` for related information.
3707
3703
3708 Returns 0 on success.
3704 Returns 0 on success.
3709 """
3705 """
3710
3706
3711 opts = pycompat.byteskwargs(opts)
3707 opts = pycompat.byteskwargs(opts)
3712 rev = opts.get('rev')
3708 rev = opts.get('rev')
3713 if rev:
3709 if rev:
3714 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3710 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3715 ctx = scmutil.revsingle(repo, rev, None)
3711 ctx = scmutil.revsingle(repo, rev, None)
3716
3712
3717 if file_:
3713 if file_:
3718 m = scmutil.match(ctx, (file_,), opts)
3714 m = scmutil.match(ctx, (file_,), opts)
3719 if m.anypats() or len(m.files()) != 1:
3715 if m.anypats() or len(m.files()) != 1:
3720 raise error.Abort(_('can only specify an explicit filename'))
3716 raise error.Abort(_('can only specify an explicit filename'))
3721 file_ = m.files()[0]
3717 file_ = m.files()[0]
3722 filenodes = []
3718 filenodes = []
3723 for cp in ctx.parents():
3719 for cp in ctx.parents():
3724 if not cp:
3720 if not cp:
3725 continue
3721 continue
3726 try:
3722 try:
3727 filenodes.append(cp.filenode(file_))
3723 filenodes.append(cp.filenode(file_))
3728 except error.LookupError:
3724 except error.LookupError:
3729 pass
3725 pass
3730 if not filenodes:
3726 if not filenodes:
3731 raise error.Abort(_("'%s' not found in manifest!") % file_)
3727 raise error.Abort(_("'%s' not found in manifest!") % file_)
3732 p = []
3728 p = []
3733 for fn in filenodes:
3729 for fn in filenodes:
3734 fctx = repo.filectx(file_, fileid=fn)
3730 fctx = repo.filectx(file_, fileid=fn)
3735 p.append(fctx.node())
3731 p.append(fctx.node())
3736 else:
3732 else:
3737 p = [cp.node() for cp in ctx.parents()]
3733 p = [cp.node() for cp in ctx.parents()]
3738
3734
3739 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3735 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3740 for n in p:
3736 for n in p:
3741 if n != nullid:
3737 if n != nullid:
3742 displayer.show(repo[n])
3738 displayer.show(repo[n])
3743 displayer.close()
3739 displayer.close()
3744
3740
3745 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3741 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3746 cmdtype=readonly)
3742 cmdtype=readonly)
3747 def paths(ui, repo, search=None, **opts):
3743 def paths(ui, repo, search=None, **opts):
3748 """show aliases for remote repositories
3744 """show aliases for remote repositories
3749
3745
3750 Show definition of symbolic path name NAME. If no name is given,
3746 Show definition of symbolic path name NAME. If no name is given,
3751 show definition of all available names.
3747 show definition of all available names.
3752
3748
3753 Option -q/--quiet suppresses all output when searching for NAME
3749 Option -q/--quiet suppresses all output when searching for NAME
3754 and shows only the path names when listing all definitions.
3750 and shows only the path names when listing all definitions.
3755
3751
3756 Path names are defined in the [paths] section of your
3752 Path names are defined in the [paths] section of your
3757 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3753 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3758 repository, ``.hg/hgrc`` is used, too.
3754 repository, ``.hg/hgrc`` is used, too.
3759
3755
3760 The path names ``default`` and ``default-push`` have a special
3756 The path names ``default`` and ``default-push`` have a special
3761 meaning. When performing a push or pull operation, they are used
3757 meaning. When performing a push or pull operation, they are used
3762 as fallbacks if no location is specified on the command-line.
3758 as fallbacks if no location is specified on the command-line.
3763 When ``default-push`` is set, it will be used for push and
3759 When ``default-push`` is set, it will be used for push and
3764 ``default`` will be used for pull; otherwise ``default`` is used
3760 ``default`` will be used for pull; otherwise ``default`` is used
3765 as the fallback for both. When cloning a repository, the clone
3761 as the fallback for both. When cloning a repository, the clone
3766 source is written as ``default`` in ``.hg/hgrc``.
3762 source is written as ``default`` in ``.hg/hgrc``.
3767
3763
3768 .. note::
3764 .. note::
3769
3765
3770 ``default`` and ``default-push`` apply to all inbound (e.g.
3766 ``default`` and ``default-push`` apply to all inbound (e.g.
3771 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3767 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3772 and :hg:`bundle`) operations.
3768 and :hg:`bundle`) operations.
3773
3769
3774 See :hg:`help urls` for more information.
3770 See :hg:`help urls` for more information.
3775
3771
3776 Returns 0 on success.
3772 Returns 0 on success.
3777 """
3773 """
3778
3774
3779 opts = pycompat.byteskwargs(opts)
3775 opts = pycompat.byteskwargs(opts)
3780 ui.pager('paths')
3776 ui.pager('paths')
3781 if search:
3777 if search:
3782 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3778 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3783 if name == search]
3779 if name == search]
3784 else:
3780 else:
3785 pathitems = sorted(ui.paths.iteritems())
3781 pathitems = sorted(ui.paths.iteritems())
3786
3782
3787 fm = ui.formatter('paths', opts)
3783 fm = ui.formatter('paths', opts)
3788 if fm.isplain():
3784 if fm.isplain():
3789 hidepassword = util.hidepassword
3785 hidepassword = util.hidepassword
3790 else:
3786 else:
3791 hidepassword = str
3787 hidepassword = str
3792 if ui.quiet:
3788 if ui.quiet:
3793 namefmt = '%s\n'
3789 namefmt = '%s\n'
3794 else:
3790 else:
3795 namefmt = '%s = '
3791 namefmt = '%s = '
3796 showsubopts = not search and not ui.quiet
3792 showsubopts = not search and not ui.quiet
3797
3793
3798 for name, path in pathitems:
3794 for name, path in pathitems:
3799 fm.startitem()
3795 fm.startitem()
3800 fm.condwrite(not search, 'name', namefmt, name)
3796 fm.condwrite(not search, 'name', namefmt, name)
3801 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3797 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3802 for subopt, value in sorted(path.suboptions.items()):
3798 for subopt, value in sorted(path.suboptions.items()):
3803 assert subopt not in ('name', 'url')
3799 assert subopt not in ('name', 'url')
3804 if showsubopts:
3800 if showsubopts:
3805 fm.plain('%s:%s = ' % (name, subopt))
3801 fm.plain('%s:%s = ' % (name, subopt))
3806 fm.condwrite(showsubopts, subopt, '%s\n', value)
3802 fm.condwrite(showsubopts, subopt, '%s\n', value)
3807
3803
3808 fm.end()
3804 fm.end()
3809
3805
3810 if search and not pathitems:
3806 if search and not pathitems:
3811 if not ui.quiet:
3807 if not ui.quiet:
3812 ui.warn(_("not found!\n"))
3808 ui.warn(_("not found!\n"))
3813 return 1
3809 return 1
3814 else:
3810 else:
3815 return 0
3811 return 0
3816
3812
3817 @command('phase',
3813 @command('phase',
3818 [('p', 'public', False, _('set changeset phase to public')),
3814 [('p', 'public', False, _('set changeset phase to public')),
3819 ('d', 'draft', False, _('set changeset phase to draft')),
3815 ('d', 'draft', False, _('set changeset phase to draft')),
3820 ('s', 'secret', False, _('set changeset phase to secret')),
3816 ('s', 'secret', False, _('set changeset phase to secret')),
3821 ('f', 'force', False, _('allow to move boundary backward')),
3817 ('f', 'force', False, _('allow to move boundary backward')),
3822 ('r', 'rev', [], _('target revision'), _('REV')),
3818 ('r', 'rev', [], _('target revision'), _('REV')),
3823 ],
3819 ],
3824 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3820 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3825 def phase(ui, repo, *revs, **opts):
3821 def phase(ui, repo, *revs, **opts):
3826 """set or show the current phase name
3822 """set or show the current phase name
3827
3823
3828 With no argument, show the phase name of the current revision(s).
3824 With no argument, show the phase name of the current revision(s).
3829
3825
3830 With one of -p/--public, -d/--draft or -s/--secret, change the
3826 With one of -p/--public, -d/--draft or -s/--secret, change the
3831 phase value of the specified revisions.
3827 phase value of the specified revisions.
3832
3828
3833 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3829 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3834 lower phase to a higher phase. Phases are ordered as follows::
3830 lower phase to a higher phase. Phases are ordered as follows::
3835
3831
3836 public < draft < secret
3832 public < draft < secret
3837
3833
3838 Returns 0 on success, 1 if some phases could not be changed.
3834 Returns 0 on success, 1 if some phases could not be changed.
3839
3835
3840 (For more information about the phases concept, see :hg:`help phases`.)
3836 (For more information about the phases concept, see :hg:`help phases`.)
3841 """
3837 """
3842 opts = pycompat.byteskwargs(opts)
3838 opts = pycompat.byteskwargs(opts)
3843 # search for a unique phase argument
3839 # search for a unique phase argument
3844 targetphase = None
3840 targetphase = None
3845 for idx, name in enumerate(phases.phasenames):
3841 for idx, name in enumerate(phases.phasenames):
3846 if opts[name]:
3842 if opts[name]:
3847 if targetphase is not None:
3843 if targetphase is not None:
3848 raise error.Abort(_('only one phase can be specified'))
3844 raise error.Abort(_('only one phase can be specified'))
3849 targetphase = idx
3845 targetphase = idx
3850
3846
3851 # look for specified revision
3847 # look for specified revision
3852 revs = list(revs)
3848 revs = list(revs)
3853 revs.extend(opts['rev'])
3849 revs.extend(opts['rev'])
3854 if not revs:
3850 if not revs:
3855 # display both parents as the second parent phase can influence
3851 # display both parents as the second parent phase can influence
3856 # the phase of a merge commit
3852 # the phase of a merge commit
3857 revs = [c.rev() for c in repo[None].parents()]
3853 revs = [c.rev() for c in repo[None].parents()]
3858
3854
3859 revs = scmutil.revrange(repo, revs)
3855 revs = scmutil.revrange(repo, revs)
3860
3856
3861 ret = 0
3857 ret = 0
3862 if targetphase is None:
3858 if targetphase is None:
3863 # display
3859 # display
3864 for r in revs:
3860 for r in revs:
3865 ctx = repo[r]
3861 ctx = repo[r]
3866 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3862 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3867 else:
3863 else:
3868 with repo.lock(), repo.transaction("phase") as tr:
3864 with repo.lock(), repo.transaction("phase") as tr:
3869 # set phase
3865 # set phase
3870 if not revs:
3866 if not revs:
3871 raise error.Abort(_('empty revision set'))
3867 raise error.Abort(_('empty revision set'))
3872 nodes = [repo[r].node() for r in revs]
3868 nodes = [repo[r].node() for r in revs]
3873 # moving revision from public to draft may hide them
3869 # moving revision from public to draft may hide them
3874 # We have to check result on an unfiltered repository
3870 # We have to check result on an unfiltered repository
3875 unfi = repo.unfiltered()
3871 unfi = repo.unfiltered()
3876 getphase = unfi._phasecache.phase
3872 getphase = unfi._phasecache.phase
3877 olddata = [getphase(unfi, r) for r in unfi]
3873 olddata = [getphase(unfi, r) for r in unfi]
3878 phases.advanceboundary(repo, tr, targetphase, nodes)
3874 phases.advanceboundary(repo, tr, targetphase, nodes)
3879 if opts['force']:
3875 if opts['force']:
3880 phases.retractboundary(repo, tr, targetphase, nodes)
3876 phases.retractboundary(repo, tr, targetphase, nodes)
3881 getphase = unfi._phasecache.phase
3877 getphase = unfi._phasecache.phase
3882 newdata = [getphase(unfi, r) for r in unfi]
3878 newdata = [getphase(unfi, r) for r in unfi]
3883 changes = sum(newdata[r] != olddata[r] for r in unfi)
3879 changes = sum(newdata[r] != olddata[r] for r in unfi)
3884 cl = unfi.changelog
3880 cl = unfi.changelog
3885 rejected = [n for n in nodes
3881 rejected = [n for n in nodes
3886 if newdata[cl.rev(n)] < targetphase]
3882 if newdata[cl.rev(n)] < targetphase]
3887 if rejected:
3883 if rejected:
3888 ui.warn(_('cannot move %i changesets to a higher '
3884 ui.warn(_('cannot move %i changesets to a higher '
3889 'phase, use --force\n') % len(rejected))
3885 'phase, use --force\n') % len(rejected))
3890 ret = 1
3886 ret = 1
3891 if changes:
3887 if changes:
3892 msg = _('phase changed for %i changesets\n') % changes
3888 msg = _('phase changed for %i changesets\n') % changes
3893 if ret:
3889 if ret:
3894 ui.status(msg)
3890 ui.status(msg)
3895 else:
3891 else:
3896 ui.note(msg)
3892 ui.note(msg)
3897 else:
3893 else:
3898 ui.warn(_('no phases changed\n'))
3894 ui.warn(_('no phases changed\n'))
3899 return ret
3895 return ret
3900
3896
3901 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3897 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3902 """Run after a changegroup has been added via pull/unbundle
3898 """Run after a changegroup has been added via pull/unbundle
3903
3899
3904 This takes arguments below:
3900 This takes arguments below:
3905
3901
3906 :modheads: change of heads by pull/unbundle
3902 :modheads: change of heads by pull/unbundle
3907 :optupdate: updating working directory is needed or not
3903 :optupdate: updating working directory is needed or not
3908 :checkout: update destination revision (or None to default destination)
3904 :checkout: update destination revision (or None to default destination)
3909 :brev: a name, which might be a bookmark to be activated after updating
3905 :brev: a name, which might be a bookmark to be activated after updating
3910 """
3906 """
3911 if modheads == 0:
3907 if modheads == 0:
3912 return
3908 return
3913 if optupdate:
3909 if optupdate:
3914 try:
3910 try:
3915 return hg.updatetotally(ui, repo, checkout, brev)
3911 return hg.updatetotally(ui, repo, checkout, brev)
3916 except error.UpdateAbort as inst:
3912 except error.UpdateAbort as inst:
3917 msg = _("not updating: %s") % str(inst)
3913 msg = _("not updating: %s") % str(inst)
3918 hint = inst.hint
3914 hint = inst.hint
3919 raise error.UpdateAbort(msg, hint=hint)
3915 raise error.UpdateAbort(msg, hint=hint)
3920 if modheads > 1:
3916 if modheads > 1:
3921 currentbranchheads = len(repo.branchheads())
3917 currentbranchheads = len(repo.branchheads())
3922 if currentbranchheads == modheads:
3918 if currentbranchheads == modheads:
3923 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3919 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3924 elif currentbranchheads > 1:
3920 elif currentbranchheads > 1:
3925 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3921 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3926 "merge)\n"))
3922 "merge)\n"))
3927 else:
3923 else:
3928 ui.status(_("(run 'hg heads' to see heads)\n"))
3924 ui.status(_("(run 'hg heads' to see heads)\n"))
3929 elif not ui.configbool('commands', 'update.requiredest'):
3925 elif not ui.configbool('commands', 'update.requiredest'):
3930 ui.status(_("(run 'hg update' to get a working copy)\n"))
3926 ui.status(_("(run 'hg update' to get a working copy)\n"))
3931
3927
3932 @command('^pull',
3928 @command('^pull',
3933 [('u', 'update', None,
3929 [('u', 'update', None,
3934 _('update to new branch head if new descendants were pulled')),
3930 _('update to new branch head if new descendants were pulled')),
3935 ('f', 'force', None, _('run even when remote repository is unrelated')),
3931 ('f', 'force', None, _('run even when remote repository is unrelated')),
3936 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3932 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3937 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3933 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3938 ('b', 'branch', [], _('a specific branch you would like to pull'),
3934 ('b', 'branch', [], _('a specific branch you would like to pull'),
3939 _('BRANCH')),
3935 _('BRANCH')),
3940 ] + remoteopts,
3936 ] + remoteopts,
3941 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3937 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3942 def pull(ui, repo, source="default", **opts):
3938 def pull(ui, repo, source="default", **opts):
3943 """pull changes from the specified source
3939 """pull changes from the specified source
3944
3940
3945 Pull changes from a remote repository to a local one.
3941 Pull changes from a remote repository to a local one.
3946
3942
3947 This finds all changes from the repository at the specified path
3943 This finds all changes from the repository at the specified path
3948 or URL and adds them to a local repository (the current one unless
3944 or URL and adds them to a local repository (the current one unless
3949 -R is specified). By default, this does not update the copy of the
3945 -R is specified). By default, this does not update the copy of the
3950 project in the working directory.
3946 project in the working directory.
3951
3947
3952 Use :hg:`incoming` if you want to see what would have been added
3948 Use :hg:`incoming` if you want to see what would have been added
3953 by a pull at the time you issued this command. If you then decide
3949 by a pull at the time you issued this command. If you then decide
3954 to add those changes to the repository, you should use :hg:`pull
3950 to add those changes to the repository, you should use :hg:`pull
3955 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3951 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3956
3952
3957 If SOURCE is omitted, the 'default' path will be used.
3953 If SOURCE is omitted, the 'default' path will be used.
3958 See :hg:`help urls` for more information.
3954 See :hg:`help urls` for more information.
3959
3955
3960 Specifying bookmark as ``.`` is equivalent to specifying the active
3956 Specifying bookmark as ``.`` is equivalent to specifying the active
3961 bookmark's name.
3957 bookmark's name.
3962
3958
3963 Returns 0 on success, 1 if an update had unresolved files.
3959 Returns 0 on success, 1 if an update had unresolved files.
3964 """
3960 """
3965
3961
3966 opts = pycompat.byteskwargs(opts)
3962 opts = pycompat.byteskwargs(opts)
3967 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3963 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3968 msg = _('update destination required by configuration')
3964 msg = _('update destination required by configuration')
3969 hint = _('use hg pull followed by hg update DEST')
3965 hint = _('use hg pull followed by hg update DEST')
3970 raise error.Abort(msg, hint=hint)
3966 raise error.Abort(msg, hint=hint)
3971
3967
3972 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3968 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3973 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3969 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3974 other = hg.peer(repo, opts, source)
3970 other = hg.peer(repo, opts, source)
3975 try:
3971 try:
3976 revs, checkout = hg.addbranchrevs(repo, other, branches,
3972 revs, checkout = hg.addbranchrevs(repo, other, branches,
3977 opts.get('rev'))
3973 opts.get('rev'))
3978
3974
3979
3975
3980 pullopargs = {}
3976 pullopargs = {}
3981 if opts.get('bookmark'):
3977 if opts.get('bookmark'):
3982 if not revs:
3978 if not revs:
3983 revs = []
3979 revs = []
3984 # The list of bookmark used here is not the one used to actually
3980 # The list of bookmark used here is not the one used to actually
3985 # update the bookmark name. This can result in the revision pulled
3981 # update the bookmark name. This can result in the revision pulled
3986 # not ending up with the name of the bookmark because of a race
3982 # not ending up with the name of the bookmark because of a race
3987 # condition on the server. (See issue 4689 for details)
3983 # condition on the server. (See issue 4689 for details)
3988 remotebookmarks = other.listkeys('bookmarks')
3984 remotebookmarks = other.listkeys('bookmarks')
3989 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
3985 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
3990 pullopargs['remotebookmarks'] = remotebookmarks
3986 pullopargs['remotebookmarks'] = remotebookmarks
3991 for b in opts['bookmark']:
3987 for b in opts['bookmark']:
3992 b = repo._bookmarks.expandname(b)
3988 b = repo._bookmarks.expandname(b)
3993 if b not in remotebookmarks:
3989 if b not in remotebookmarks:
3994 raise error.Abort(_('remote bookmark %s not found!') % b)
3990 raise error.Abort(_('remote bookmark %s not found!') % b)
3995 revs.append(hex(remotebookmarks[b]))
3991 revs.append(hex(remotebookmarks[b]))
3996
3992
3997 if revs:
3993 if revs:
3998 try:
3994 try:
3999 # When 'rev' is a bookmark name, we cannot guarantee that it
3995 # When 'rev' is a bookmark name, we cannot guarantee that it
4000 # will be updated with that name because of a race condition
3996 # will be updated with that name because of a race condition
4001 # server side. (See issue 4689 for details)
3997 # server side. (See issue 4689 for details)
4002 oldrevs = revs
3998 oldrevs = revs
4003 revs = [] # actually, nodes
3999 revs = [] # actually, nodes
4004 for r in oldrevs:
4000 for r in oldrevs:
4005 node = other.lookup(r)
4001 node = other.lookup(r)
4006 revs.append(node)
4002 revs.append(node)
4007 if r == checkout:
4003 if r == checkout:
4008 checkout = node
4004 checkout = node
4009 except error.CapabilityError:
4005 except error.CapabilityError:
4010 err = _("other repository doesn't support revision lookup, "
4006 err = _("other repository doesn't support revision lookup, "
4011 "so a rev cannot be specified.")
4007 "so a rev cannot be specified.")
4012 raise error.Abort(err)
4008 raise error.Abort(err)
4013
4009
4014 wlock = util.nullcontextmanager()
4010 wlock = util.nullcontextmanager()
4015 if opts.get('update'):
4011 if opts.get('update'):
4016 wlock = repo.wlock()
4012 wlock = repo.wlock()
4017 with wlock:
4013 with wlock:
4018 pullopargs.update(opts.get('opargs', {}))
4014 pullopargs.update(opts.get('opargs', {}))
4019 modheads = exchange.pull(repo, other, heads=revs,
4015 modheads = exchange.pull(repo, other, heads=revs,
4020 force=opts.get('force'),
4016 force=opts.get('force'),
4021 bookmarks=opts.get('bookmark', ()),
4017 bookmarks=opts.get('bookmark', ()),
4022 opargs=pullopargs).cgresult
4018 opargs=pullopargs).cgresult
4023
4019
4024 # brev is a name, which might be a bookmark to be activated at
4020 # brev is a name, which might be a bookmark to be activated at
4025 # the end of the update. In other words, it is an explicit
4021 # the end of the update. In other words, it is an explicit
4026 # destination of the update
4022 # destination of the update
4027 brev = None
4023 brev = None
4028
4024
4029 if checkout:
4025 if checkout:
4030 checkout = str(repo.changelog.rev(checkout))
4026 checkout = str(repo.changelog.rev(checkout))
4031
4027
4032 # order below depends on implementation of
4028 # order below depends on implementation of
4033 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4029 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4034 # because 'checkout' is determined without it.
4030 # because 'checkout' is determined without it.
4035 if opts.get('rev'):
4031 if opts.get('rev'):
4036 brev = opts['rev'][0]
4032 brev = opts['rev'][0]
4037 elif opts.get('branch'):
4033 elif opts.get('branch'):
4038 brev = opts['branch'][0]
4034 brev = opts['branch'][0]
4039 else:
4035 else:
4040 brev = branches[0]
4036 brev = branches[0]
4041 repo._subtoppath = source
4037 repo._subtoppath = source
4042 try:
4038 try:
4043 ret = postincoming(ui, repo, modheads, opts.get('update'),
4039 ret = postincoming(ui, repo, modheads, opts.get('update'),
4044 checkout, brev)
4040 checkout, brev)
4045
4041
4046 finally:
4042 finally:
4047 del repo._subtoppath
4043 del repo._subtoppath
4048
4044
4049 finally:
4045 finally:
4050 other.close()
4046 other.close()
4051 return ret
4047 return ret
4052
4048
4053 @command('^push',
4049 @command('^push',
4054 [('f', 'force', None, _('force push')),
4050 [('f', 'force', None, _('force push')),
4055 ('r', 'rev', [],
4051 ('r', 'rev', [],
4056 _('a changeset intended to be included in the destination'),
4052 _('a changeset intended to be included in the destination'),
4057 _('REV')),
4053 _('REV')),
4058 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4054 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4059 ('b', 'branch', [],
4055 ('b', 'branch', [],
4060 _('a specific branch you would like to push'), _('BRANCH')),
4056 _('a specific branch you would like to push'), _('BRANCH')),
4061 ('', 'new-branch', False, _('allow pushing a new branch')),
4057 ('', 'new-branch', False, _('allow pushing a new branch')),
4062 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4058 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4063 ] + remoteopts,
4059 ] + remoteopts,
4064 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4060 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4065 def push(ui, repo, dest=None, **opts):
4061 def push(ui, repo, dest=None, **opts):
4066 """push changes to the specified destination
4062 """push changes to the specified destination
4067
4063
4068 Push changesets from the local repository to the specified
4064 Push changesets from the local repository to the specified
4069 destination.
4065 destination.
4070
4066
4071 This operation is symmetrical to pull: it is identical to a pull
4067 This operation is symmetrical to pull: it is identical to a pull
4072 in the destination repository from the current one.
4068 in the destination repository from the current one.
4073
4069
4074 By default, push will not allow creation of new heads at the
4070 By default, push will not allow creation of new heads at the
4075 destination, since multiple heads would make it unclear which head
4071 destination, since multiple heads would make it unclear which head
4076 to use. In this situation, it is recommended to pull and merge
4072 to use. In this situation, it is recommended to pull and merge
4077 before pushing.
4073 before pushing.
4078
4074
4079 Use --new-branch if you want to allow push to create a new named
4075 Use --new-branch if you want to allow push to create a new named
4080 branch that is not present at the destination. This allows you to
4076 branch that is not present at the destination. This allows you to
4081 only create a new branch without forcing other changes.
4077 only create a new branch without forcing other changes.
4082
4078
4083 .. note::
4079 .. note::
4084
4080
4085 Extra care should be taken with the -f/--force option,
4081 Extra care should be taken with the -f/--force option,
4086 which will push all new heads on all branches, an action which will
4082 which will push all new heads on all branches, an action which will
4087 almost always cause confusion for collaborators.
4083 almost always cause confusion for collaborators.
4088
4084
4089 If -r/--rev is used, the specified revision and all its ancestors
4085 If -r/--rev is used, the specified revision and all its ancestors
4090 will be pushed to the remote repository.
4086 will be pushed to the remote repository.
4091
4087
4092 If -B/--bookmark is used, the specified bookmarked revision, its
4088 If -B/--bookmark is used, the specified bookmarked revision, its
4093 ancestors, and the bookmark will be pushed to the remote
4089 ancestors, and the bookmark will be pushed to the remote
4094 repository. Specifying ``.`` is equivalent to specifying the active
4090 repository. Specifying ``.`` is equivalent to specifying the active
4095 bookmark's name.
4091 bookmark's name.
4096
4092
4097 Please see :hg:`help urls` for important details about ``ssh://``
4093 Please see :hg:`help urls` for important details about ``ssh://``
4098 URLs. If DESTINATION is omitted, a default path will be used.
4094 URLs. If DESTINATION is omitted, a default path will be used.
4099
4095
4100 .. container:: verbose
4096 .. container:: verbose
4101
4097
4102 The --pushvars option sends strings to the server that become
4098 The --pushvars option sends strings to the server that become
4103 environment variables prepended with ``HG_USERVAR_``. For example,
4099 environment variables prepended with ``HG_USERVAR_``. For example,
4104 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4100 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4105 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4101 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4106
4102
4107 pushvars can provide for user-overridable hooks as well as set debug
4103 pushvars can provide for user-overridable hooks as well as set debug
4108 levels. One example is having a hook that blocks commits containing
4104 levels. One example is having a hook that blocks commits containing
4109 conflict markers, but enables the user to override the hook if the file
4105 conflict markers, but enables the user to override the hook if the file
4110 is using conflict markers for testing purposes or the file format has
4106 is using conflict markers for testing purposes or the file format has
4111 strings that look like conflict markers.
4107 strings that look like conflict markers.
4112
4108
4113 By default, servers will ignore `--pushvars`. To enable it add the
4109 By default, servers will ignore `--pushvars`. To enable it add the
4114 following to your configuration file::
4110 following to your configuration file::
4115
4111
4116 [push]
4112 [push]
4117 pushvars.server = true
4113 pushvars.server = true
4118
4114
4119 Returns 0 if push was successful, 1 if nothing to push.
4115 Returns 0 if push was successful, 1 if nothing to push.
4120 """
4116 """
4121
4117
4122 opts = pycompat.byteskwargs(opts)
4118 opts = pycompat.byteskwargs(opts)
4123 if opts.get('bookmark'):
4119 if opts.get('bookmark'):
4124 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4120 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4125 for b in opts['bookmark']:
4121 for b in opts['bookmark']:
4126 # translate -B options to -r so changesets get pushed
4122 # translate -B options to -r so changesets get pushed
4127 b = repo._bookmarks.expandname(b)
4123 b = repo._bookmarks.expandname(b)
4128 if b in repo._bookmarks:
4124 if b in repo._bookmarks:
4129 opts.setdefault('rev', []).append(b)
4125 opts.setdefault('rev', []).append(b)
4130 else:
4126 else:
4131 # if we try to push a deleted bookmark, translate it to null
4127 # if we try to push a deleted bookmark, translate it to null
4132 # this lets simultaneous -r, -b options continue working
4128 # this lets simultaneous -r, -b options continue working
4133 opts.setdefault('rev', []).append("null")
4129 opts.setdefault('rev', []).append("null")
4134
4130
4135 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4131 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4136 if not path:
4132 if not path:
4137 raise error.Abort(_('default repository not configured!'),
4133 raise error.Abort(_('default repository not configured!'),
4138 hint=_("see 'hg help config.paths'"))
4134 hint=_("see 'hg help config.paths'"))
4139 dest = path.pushloc or path.loc
4135 dest = path.pushloc or path.loc
4140 branches = (path.branch, opts.get('branch') or [])
4136 branches = (path.branch, opts.get('branch') or [])
4141 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4137 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4142 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4138 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4143 other = hg.peer(repo, opts, dest)
4139 other = hg.peer(repo, opts, dest)
4144
4140
4145 if revs:
4141 if revs:
4146 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4142 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4147 if not revs:
4143 if not revs:
4148 raise error.Abort(_("specified revisions evaluate to an empty set"),
4144 raise error.Abort(_("specified revisions evaluate to an empty set"),
4149 hint=_("use different revision arguments"))
4145 hint=_("use different revision arguments"))
4150 elif path.pushrev:
4146 elif path.pushrev:
4151 # It doesn't make any sense to specify ancestor revisions. So limit
4147 # It doesn't make any sense to specify ancestor revisions. So limit
4152 # to DAG heads to make discovery simpler.
4148 # to DAG heads to make discovery simpler.
4153 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4149 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4154 revs = scmutil.revrange(repo, [expr])
4150 revs = scmutil.revrange(repo, [expr])
4155 revs = [repo[rev].node() for rev in revs]
4151 revs = [repo[rev].node() for rev in revs]
4156 if not revs:
4152 if not revs:
4157 raise error.Abort(_('default push revset for path evaluates to an '
4153 raise error.Abort(_('default push revset for path evaluates to an '
4158 'empty set'))
4154 'empty set'))
4159
4155
4160 repo._subtoppath = dest
4156 repo._subtoppath = dest
4161 try:
4157 try:
4162 # push subrepos depth-first for coherent ordering
4158 # push subrepos depth-first for coherent ordering
4163 c = repo['']
4159 c = repo['']
4164 subs = c.substate # only repos that are committed
4160 subs = c.substate # only repos that are committed
4165 for s in sorted(subs):
4161 for s in sorted(subs):
4166 result = c.sub(s).push(opts)
4162 result = c.sub(s).push(opts)
4167 if result == 0:
4163 if result == 0:
4168 return not result
4164 return not result
4169 finally:
4165 finally:
4170 del repo._subtoppath
4166 del repo._subtoppath
4171
4167
4172 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4168 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4173 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4169 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4174
4170
4175 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4171 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4176 newbranch=opts.get('new_branch'),
4172 newbranch=opts.get('new_branch'),
4177 bookmarks=opts.get('bookmark', ()),
4173 bookmarks=opts.get('bookmark', ()),
4178 opargs=opargs)
4174 opargs=opargs)
4179
4175
4180 result = not pushop.cgresult
4176 result = not pushop.cgresult
4181
4177
4182 if pushop.bkresult is not None:
4178 if pushop.bkresult is not None:
4183 if pushop.bkresult == 2:
4179 if pushop.bkresult == 2:
4184 result = 2
4180 result = 2
4185 elif not result and pushop.bkresult:
4181 elif not result and pushop.bkresult:
4186 result = 2
4182 result = 2
4187
4183
4188 return result
4184 return result
4189
4185
4190 @command('recover', [])
4186 @command('recover', [])
4191 def recover(ui, repo):
4187 def recover(ui, repo):
4192 """roll back an interrupted transaction
4188 """roll back an interrupted transaction
4193
4189
4194 Recover from an interrupted commit or pull.
4190 Recover from an interrupted commit or pull.
4195
4191
4196 This command tries to fix the repository status after an
4192 This command tries to fix the repository status after an
4197 interrupted operation. It should only be necessary when Mercurial
4193 interrupted operation. It should only be necessary when Mercurial
4198 suggests it.
4194 suggests it.
4199
4195
4200 Returns 0 if successful, 1 if nothing to recover or verify fails.
4196 Returns 0 if successful, 1 if nothing to recover or verify fails.
4201 """
4197 """
4202 if repo.recover():
4198 if repo.recover():
4203 return hg.verify(repo)
4199 return hg.verify(repo)
4204 return 1
4200 return 1
4205
4201
4206 @command('^remove|rm',
4202 @command('^remove|rm',
4207 [('A', 'after', None, _('record delete for missing files')),
4203 [('A', 'after', None, _('record delete for missing files')),
4208 ('f', 'force', None,
4204 ('f', 'force', None,
4209 _('forget added files, delete modified files')),
4205 _('forget added files, delete modified files')),
4210 ] + subrepoopts + walkopts,
4206 ] + subrepoopts + walkopts,
4211 _('[OPTION]... FILE...'),
4207 _('[OPTION]... FILE...'),
4212 inferrepo=True)
4208 inferrepo=True)
4213 def remove(ui, repo, *pats, **opts):
4209 def remove(ui, repo, *pats, **opts):
4214 """remove the specified files on the next commit
4210 """remove the specified files on the next commit
4215
4211
4216 Schedule the indicated files for removal from the current branch.
4212 Schedule the indicated files for removal from the current branch.
4217
4213
4218 This command schedules the files to be removed at the next commit.
4214 This command schedules the files to be removed at the next commit.
4219 To undo a remove before that, see :hg:`revert`. To undo added
4215 To undo a remove before that, see :hg:`revert`. To undo added
4220 files, see :hg:`forget`.
4216 files, see :hg:`forget`.
4221
4217
4222 .. container:: verbose
4218 .. container:: verbose
4223
4219
4224 -A/--after can be used to remove only files that have already
4220 -A/--after can be used to remove only files that have already
4225 been deleted, -f/--force can be used to force deletion, and -Af
4221 been deleted, -f/--force can be used to force deletion, and -Af
4226 can be used to remove files from the next revision without
4222 can be used to remove files from the next revision without
4227 deleting them from the working directory.
4223 deleting them from the working directory.
4228
4224
4229 The following table details the behavior of remove for different
4225 The following table details the behavior of remove for different
4230 file states (columns) and option combinations (rows). The file
4226 file states (columns) and option combinations (rows). The file
4231 states are Added [A], Clean [C], Modified [M] and Missing [!]
4227 states are Added [A], Clean [C], Modified [M] and Missing [!]
4232 (as reported by :hg:`status`). The actions are Warn, Remove
4228 (as reported by :hg:`status`). The actions are Warn, Remove
4233 (from branch) and Delete (from disk):
4229 (from branch) and Delete (from disk):
4234
4230
4235 ========= == == == ==
4231 ========= == == == ==
4236 opt/state A C M !
4232 opt/state A C M !
4237 ========= == == == ==
4233 ========= == == == ==
4238 none W RD W R
4234 none W RD W R
4239 -f R RD RD R
4235 -f R RD RD R
4240 -A W W W R
4236 -A W W W R
4241 -Af R R R R
4237 -Af R R R R
4242 ========= == == == ==
4238 ========= == == == ==
4243
4239
4244 .. note::
4240 .. note::
4245
4241
4246 :hg:`remove` never deletes files in Added [A] state from the
4242 :hg:`remove` never deletes files in Added [A] state from the
4247 working directory, not even if ``--force`` is specified.
4243 working directory, not even if ``--force`` is specified.
4248
4244
4249 Returns 0 on success, 1 if any warnings encountered.
4245 Returns 0 on success, 1 if any warnings encountered.
4250 """
4246 """
4251
4247
4252 opts = pycompat.byteskwargs(opts)
4248 opts = pycompat.byteskwargs(opts)
4253 after, force = opts.get('after'), opts.get('force')
4249 after, force = opts.get('after'), opts.get('force')
4254 if not pats and not after:
4250 if not pats and not after:
4255 raise error.Abort(_('no files specified'))
4251 raise error.Abort(_('no files specified'))
4256
4252
4257 m = scmutil.match(repo[None], pats, opts)
4253 m = scmutil.match(repo[None], pats, opts)
4258 subrepos = opts.get('subrepos')
4254 subrepos = opts.get('subrepos')
4259 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4255 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4260
4256
4261 @command('rename|move|mv',
4257 @command('rename|move|mv',
4262 [('A', 'after', None, _('record a rename that has already occurred')),
4258 [('A', 'after', None, _('record a rename that has already occurred')),
4263 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4259 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4264 ] + walkopts + dryrunopts,
4260 ] + walkopts + dryrunopts,
4265 _('[OPTION]... SOURCE... DEST'))
4261 _('[OPTION]... SOURCE... DEST'))
4266 def rename(ui, repo, *pats, **opts):
4262 def rename(ui, repo, *pats, **opts):
4267 """rename files; equivalent of copy + remove
4263 """rename files; equivalent of copy + remove
4268
4264
4269 Mark dest as copies of sources; mark sources for deletion. If dest
4265 Mark dest as copies of sources; mark sources for deletion. If dest
4270 is a directory, copies are put in that directory. If dest is a
4266 is a directory, copies are put in that directory. If dest is a
4271 file, there can only be one source.
4267 file, there can only be one source.
4272
4268
4273 By default, this command copies the contents of files as they
4269 By default, this command copies the contents of files as they
4274 exist in the working directory. If invoked with -A/--after, the
4270 exist in the working directory. If invoked with -A/--after, the
4275 operation is recorded, but no copying is performed.
4271 operation is recorded, but no copying is performed.
4276
4272
4277 This command takes effect at the next commit. To undo a rename
4273 This command takes effect at the next commit. To undo a rename
4278 before that, see :hg:`revert`.
4274 before that, see :hg:`revert`.
4279
4275
4280 Returns 0 on success, 1 if errors are encountered.
4276 Returns 0 on success, 1 if errors are encountered.
4281 """
4277 """
4282 opts = pycompat.byteskwargs(opts)
4278 opts = pycompat.byteskwargs(opts)
4283 with repo.wlock(False):
4279 with repo.wlock(False):
4284 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4280 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4285
4281
4286 @command('resolve',
4282 @command('resolve',
4287 [('a', 'all', None, _('select all unresolved files')),
4283 [('a', 'all', None, _('select all unresolved files')),
4288 ('l', 'list', None, _('list state of files needing merge')),
4284 ('l', 'list', None, _('list state of files needing merge')),
4289 ('m', 'mark', None, _('mark files as resolved')),
4285 ('m', 'mark', None, _('mark files as resolved')),
4290 ('u', 'unmark', None, _('mark files as unresolved')),
4286 ('u', 'unmark', None, _('mark files as unresolved')),
4291 ('n', 'no-status', None, _('hide status prefix'))]
4287 ('n', 'no-status', None, _('hide status prefix'))]
4292 + mergetoolopts + walkopts + formatteropts,
4288 + mergetoolopts + walkopts + formatteropts,
4293 _('[OPTION]... [FILE]...'),
4289 _('[OPTION]... [FILE]...'),
4294 inferrepo=True)
4290 inferrepo=True)
4295 def resolve(ui, repo, *pats, **opts):
4291 def resolve(ui, repo, *pats, **opts):
4296 """redo merges or set/view the merge status of files
4292 """redo merges or set/view the merge status of files
4297
4293
4298 Merges with unresolved conflicts are often the result of
4294 Merges with unresolved conflicts are often the result of
4299 non-interactive merging using the ``internal:merge`` configuration
4295 non-interactive merging using the ``internal:merge`` configuration
4300 setting, or a command-line merge tool like ``diff3``. The resolve
4296 setting, or a command-line merge tool like ``diff3``. The resolve
4301 command is used to manage the files involved in a merge, after
4297 command is used to manage the files involved in a merge, after
4302 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4298 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4303 working directory must have two parents). See :hg:`help
4299 working directory must have two parents). See :hg:`help
4304 merge-tools` for information on configuring merge tools.
4300 merge-tools` for information on configuring merge tools.
4305
4301
4306 The resolve command can be used in the following ways:
4302 The resolve command can be used in the following ways:
4307
4303
4308 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4304 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4309 files, discarding any previous merge attempts. Re-merging is not
4305 files, discarding any previous merge attempts. Re-merging is not
4310 performed for files already marked as resolved. Use ``--all/-a``
4306 performed for files already marked as resolved. Use ``--all/-a``
4311 to select all unresolved files. ``--tool`` can be used to specify
4307 to select all unresolved files. ``--tool`` can be used to specify
4312 the merge tool used for the given files. It overrides the HGMERGE
4308 the merge tool used for the given files. It overrides the HGMERGE
4313 environment variable and your configuration files. Previous file
4309 environment variable and your configuration files. Previous file
4314 contents are saved with a ``.orig`` suffix.
4310 contents are saved with a ``.orig`` suffix.
4315
4311
4316 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4312 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4317 (e.g. after having manually fixed-up the files). The default is
4313 (e.g. after having manually fixed-up the files). The default is
4318 to mark all unresolved files.
4314 to mark all unresolved files.
4319
4315
4320 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4316 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4321 default is to mark all resolved files.
4317 default is to mark all resolved files.
4322
4318
4323 - :hg:`resolve -l`: list files which had or still have conflicts.
4319 - :hg:`resolve -l`: list files which had or still have conflicts.
4324 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4320 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4325 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4321 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4326 the list. See :hg:`help filesets` for details.
4322 the list. See :hg:`help filesets` for details.
4327
4323
4328 .. note::
4324 .. note::
4329
4325
4330 Mercurial will not let you commit files with unresolved merge
4326 Mercurial will not let you commit files with unresolved merge
4331 conflicts. You must use :hg:`resolve -m ...` before you can
4327 conflicts. You must use :hg:`resolve -m ...` before you can
4332 commit after a conflicting merge.
4328 commit after a conflicting merge.
4333
4329
4334 Returns 0 on success, 1 if any files fail a resolve attempt.
4330 Returns 0 on success, 1 if any files fail a resolve attempt.
4335 """
4331 """
4336
4332
4337 opts = pycompat.byteskwargs(opts)
4333 opts = pycompat.byteskwargs(opts)
4338 flaglist = 'all mark unmark list no_status'.split()
4334 flaglist = 'all mark unmark list no_status'.split()
4339 all, mark, unmark, show, nostatus = \
4335 all, mark, unmark, show, nostatus = \
4340 [opts.get(o) for o in flaglist]
4336 [opts.get(o) for o in flaglist]
4341
4337
4342 if (show and (mark or unmark)) or (mark and unmark):
4338 if (show and (mark or unmark)) or (mark and unmark):
4343 raise error.Abort(_("too many options specified"))
4339 raise error.Abort(_("too many options specified"))
4344 if pats and all:
4340 if pats and all:
4345 raise error.Abort(_("can't specify --all and patterns"))
4341 raise error.Abort(_("can't specify --all and patterns"))
4346 if not (all or pats or show or mark or unmark):
4342 if not (all or pats or show or mark or unmark):
4347 raise error.Abort(_('no files or directories specified'),
4343 raise error.Abort(_('no files or directories specified'),
4348 hint=('use --all to re-merge all unresolved files'))
4344 hint=('use --all to re-merge all unresolved files'))
4349
4345
4350 if show:
4346 if show:
4351 ui.pager('resolve')
4347 ui.pager('resolve')
4352 fm = ui.formatter('resolve', opts)
4348 fm = ui.formatter('resolve', opts)
4353 ms = mergemod.mergestate.read(repo)
4349 ms = mergemod.mergestate.read(repo)
4354 m = scmutil.match(repo[None], pats, opts)
4350 m = scmutil.match(repo[None], pats, opts)
4355
4351
4356 # Labels and keys based on merge state. Unresolved path conflicts show
4352 # Labels and keys based on merge state. Unresolved path conflicts show
4357 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4353 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4358 # resolved conflicts.
4354 # resolved conflicts.
4359 mergestateinfo = {
4355 mergestateinfo = {
4360 'u': ('resolve.unresolved', 'U'),
4356 'u': ('resolve.unresolved', 'U'),
4361 'r': ('resolve.resolved', 'R'),
4357 'r': ('resolve.resolved', 'R'),
4362 'pu': ('resolve.unresolved', 'P'),
4358 'pu': ('resolve.unresolved', 'P'),
4363 'pr': ('resolve.resolved', 'R'),
4359 'pr': ('resolve.resolved', 'R'),
4364 'd': ('resolve.driverresolved', 'D'),
4360 'd': ('resolve.driverresolved', 'D'),
4365 }
4361 }
4366
4362
4367 for f in ms:
4363 for f in ms:
4368 if not m(f):
4364 if not m(f):
4369 continue
4365 continue
4370
4366
4371 label, key = mergestateinfo[ms[f]]
4367 label, key = mergestateinfo[ms[f]]
4372 fm.startitem()
4368 fm.startitem()
4373 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4369 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4374 fm.write('path', '%s\n', f, label=label)
4370 fm.write('path', '%s\n', f, label=label)
4375 fm.end()
4371 fm.end()
4376 return 0
4372 return 0
4377
4373
4378 with repo.wlock():
4374 with repo.wlock():
4379 ms = mergemod.mergestate.read(repo)
4375 ms = mergemod.mergestate.read(repo)
4380
4376
4381 if not (ms.active() or repo.dirstate.p2() != nullid):
4377 if not (ms.active() or repo.dirstate.p2() != nullid):
4382 raise error.Abort(
4378 raise error.Abort(
4383 _('resolve command not applicable when not merging'))
4379 _('resolve command not applicable when not merging'))
4384
4380
4385 wctx = repo[None]
4381 wctx = repo[None]
4386
4382
4387 if ms.mergedriver and ms.mdstate() == 'u':
4383 if ms.mergedriver and ms.mdstate() == 'u':
4388 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4384 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4389 ms.commit()
4385 ms.commit()
4390 # allow mark and unmark to go through
4386 # allow mark and unmark to go through
4391 if not mark and not unmark and not proceed:
4387 if not mark and not unmark and not proceed:
4392 return 1
4388 return 1
4393
4389
4394 m = scmutil.match(wctx, pats, opts)
4390 m = scmutil.match(wctx, pats, opts)
4395 ret = 0
4391 ret = 0
4396 didwork = False
4392 didwork = False
4397 runconclude = False
4393 runconclude = False
4398
4394
4399 tocomplete = []
4395 tocomplete = []
4400 for f in ms:
4396 for f in ms:
4401 if not m(f):
4397 if not m(f):
4402 continue
4398 continue
4403
4399
4404 didwork = True
4400 didwork = True
4405
4401
4406 # don't let driver-resolved files be marked, and run the conclude
4402 # don't let driver-resolved files be marked, and run the conclude
4407 # step if asked to resolve
4403 # step if asked to resolve
4408 if ms[f] == "d":
4404 if ms[f] == "d":
4409 exact = m.exact(f)
4405 exact = m.exact(f)
4410 if mark:
4406 if mark:
4411 if exact:
4407 if exact:
4412 ui.warn(_('not marking %s as it is driver-resolved\n')
4408 ui.warn(_('not marking %s as it is driver-resolved\n')
4413 % f)
4409 % f)
4414 elif unmark:
4410 elif unmark:
4415 if exact:
4411 if exact:
4416 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4412 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4417 % f)
4413 % f)
4418 else:
4414 else:
4419 runconclude = True
4415 runconclude = True
4420 continue
4416 continue
4421
4417
4422 # path conflicts must be resolved manually
4418 # path conflicts must be resolved manually
4423 if ms[f] in ("pu", "pr"):
4419 if ms[f] in ("pu", "pr"):
4424 if mark:
4420 if mark:
4425 ms.mark(f, "pr")
4421 ms.mark(f, "pr")
4426 elif unmark:
4422 elif unmark:
4427 ms.mark(f, "pu")
4423 ms.mark(f, "pu")
4428 elif ms[f] == "pu":
4424 elif ms[f] == "pu":
4429 ui.warn(_('%s: path conflict must be resolved manually\n')
4425 ui.warn(_('%s: path conflict must be resolved manually\n')
4430 % f)
4426 % f)
4431 continue
4427 continue
4432
4428
4433 if mark:
4429 if mark:
4434 ms.mark(f, "r")
4430 ms.mark(f, "r")
4435 elif unmark:
4431 elif unmark:
4436 ms.mark(f, "u")
4432 ms.mark(f, "u")
4437 else:
4433 else:
4438 # backup pre-resolve (merge uses .orig for its own purposes)
4434 # backup pre-resolve (merge uses .orig for its own purposes)
4439 a = repo.wjoin(f)
4435 a = repo.wjoin(f)
4440 try:
4436 try:
4441 util.copyfile(a, a + ".resolve")
4437 util.copyfile(a, a + ".resolve")
4442 except (IOError, OSError) as inst:
4438 except (IOError, OSError) as inst:
4443 if inst.errno != errno.ENOENT:
4439 if inst.errno != errno.ENOENT:
4444 raise
4440 raise
4445
4441
4446 try:
4442 try:
4447 # preresolve file
4443 # preresolve file
4448 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4444 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4449 'resolve')
4445 'resolve')
4450 complete, r = ms.preresolve(f, wctx)
4446 complete, r = ms.preresolve(f, wctx)
4451 if not complete:
4447 if not complete:
4452 tocomplete.append(f)
4448 tocomplete.append(f)
4453 elif r:
4449 elif r:
4454 ret = 1
4450 ret = 1
4455 finally:
4451 finally:
4456 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4452 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4457 ms.commit()
4453 ms.commit()
4458
4454
4459 # replace filemerge's .orig file with our resolve file, but only
4455 # replace filemerge's .orig file with our resolve file, but only
4460 # for merges that are complete
4456 # for merges that are complete
4461 if complete:
4457 if complete:
4462 try:
4458 try:
4463 util.rename(a + ".resolve",
4459 util.rename(a + ".resolve",
4464 scmutil.origpath(ui, repo, a))
4460 scmutil.origpath(ui, repo, a))
4465 except OSError as inst:
4461 except OSError as inst:
4466 if inst.errno != errno.ENOENT:
4462 if inst.errno != errno.ENOENT:
4467 raise
4463 raise
4468
4464
4469 for f in tocomplete:
4465 for f in tocomplete:
4470 try:
4466 try:
4471 # resolve file
4467 # resolve file
4472 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4468 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4473 'resolve')
4469 'resolve')
4474 r = ms.resolve(f, wctx)
4470 r = ms.resolve(f, wctx)
4475 if r:
4471 if r:
4476 ret = 1
4472 ret = 1
4477 finally:
4473 finally:
4478 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4474 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4479 ms.commit()
4475 ms.commit()
4480
4476
4481 # replace filemerge's .orig file with our resolve file
4477 # replace filemerge's .orig file with our resolve file
4482 a = repo.wjoin(f)
4478 a = repo.wjoin(f)
4483 try:
4479 try:
4484 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4480 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4485 except OSError as inst:
4481 except OSError as inst:
4486 if inst.errno != errno.ENOENT:
4482 if inst.errno != errno.ENOENT:
4487 raise
4483 raise
4488
4484
4489 ms.commit()
4485 ms.commit()
4490 ms.recordactions()
4486 ms.recordactions()
4491
4487
4492 if not didwork and pats:
4488 if not didwork and pats:
4493 hint = None
4489 hint = None
4494 if not any([p for p in pats if p.find(':') >= 0]):
4490 if not any([p for p in pats if p.find(':') >= 0]):
4495 pats = ['path:%s' % p for p in pats]
4491 pats = ['path:%s' % p for p in pats]
4496 m = scmutil.match(wctx, pats, opts)
4492 m = scmutil.match(wctx, pats, opts)
4497 for f in ms:
4493 for f in ms:
4498 if not m(f):
4494 if not m(f):
4499 continue
4495 continue
4500 flags = ''.join(['-%s ' % o[0] for o in flaglist
4496 flags = ''.join(['-%s ' % o[0] for o in flaglist
4501 if opts.get(o)])
4497 if opts.get(o)])
4502 hint = _("(try: hg resolve %s%s)\n") % (
4498 hint = _("(try: hg resolve %s%s)\n") % (
4503 flags,
4499 flags,
4504 ' '.join(pats))
4500 ' '.join(pats))
4505 break
4501 break
4506 ui.warn(_("arguments do not match paths that need resolving\n"))
4502 ui.warn(_("arguments do not match paths that need resolving\n"))
4507 if hint:
4503 if hint:
4508 ui.warn(hint)
4504 ui.warn(hint)
4509 elif ms.mergedriver and ms.mdstate() != 's':
4505 elif ms.mergedriver and ms.mdstate() != 's':
4510 # run conclude step when either a driver-resolved file is requested
4506 # run conclude step when either a driver-resolved file is requested
4511 # or there are no driver-resolved files
4507 # or there are no driver-resolved files
4512 # we can't use 'ret' to determine whether any files are unresolved
4508 # we can't use 'ret' to determine whether any files are unresolved
4513 # because we might not have tried to resolve some
4509 # because we might not have tried to resolve some
4514 if ((runconclude or not list(ms.driverresolved()))
4510 if ((runconclude or not list(ms.driverresolved()))
4515 and not list(ms.unresolved())):
4511 and not list(ms.unresolved())):
4516 proceed = mergemod.driverconclude(repo, ms, wctx)
4512 proceed = mergemod.driverconclude(repo, ms, wctx)
4517 ms.commit()
4513 ms.commit()
4518 if not proceed:
4514 if not proceed:
4519 return 1
4515 return 1
4520
4516
4521 # Nudge users into finishing an unfinished operation
4517 # Nudge users into finishing an unfinished operation
4522 unresolvedf = list(ms.unresolved())
4518 unresolvedf = list(ms.unresolved())
4523 driverresolvedf = list(ms.driverresolved())
4519 driverresolvedf = list(ms.driverresolved())
4524 if not unresolvedf and not driverresolvedf:
4520 if not unresolvedf and not driverresolvedf:
4525 ui.status(_('(no more unresolved files)\n'))
4521 ui.status(_('(no more unresolved files)\n'))
4526 cmdutil.checkafterresolved(repo)
4522 cmdutil.checkafterresolved(repo)
4527 elif not unresolvedf:
4523 elif not unresolvedf:
4528 ui.status(_('(no more unresolved files -- '
4524 ui.status(_('(no more unresolved files -- '
4529 'run "hg resolve --all" to conclude)\n'))
4525 'run "hg resolve --all" to conclude)\n'))
4530
4526
4531 return ret
4527 return ret
4532
4528
4533 @command('revert',
4529 @command('revert',
4534 [('a', 'all', None, _('revert all changes when no arguments given')),
4530 [('a', 'all', None, _('revert all changes when no arguments given')),
4535 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4531 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4536 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4532 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4537 ('C', 'no-backup', None, _('do not save backup copies of files')),
4533 ('C', 'no-backup', None, _('do not save backup copies of files')),
4538 ('i', 'interactive', None, _('interactively select the changes')),
4534 ('i', 'interactive', None, _('interactively select the changes')),
4539 ] + walkopts + dryrunopts,
4535 ] + walkopts + dryrunopts,
4540 _('[OPTION]... [-r REV] [NAME]...'))
4536 _('[OPTION]... [-r REV] [NAME]...'))
4541 def revert(ui, repo, *pats, **opts):
4537 def revert(ui, repo, *pats, **opts):
4542 """restore files to their checkout state
4538 """restore files to their checkout state
4543
4539
4544 .. note::
4540 .. note::
4545
4541
4546 To check out earlier revisions, you should use :hg:`update REV`.
4542 To check out earlier revisions, you should use :hg:`update REV`.
4547 To cancel an uncommitted merge (and lose your changes),
4543 To cancel an uncommitted merge (and lose your changes),
4548 use :hg:`merge --abort`.
4544 use :hg:`merge --abort`.
4549
4545
4550 With no revision specified, revert the specified files or directories
4546 With no revision specified, revert the specified files or directories
4551 to the contents they had in the parent of the working directory.
4547 to the contents they had in the parent of the working directory.
4552 This restores the contents of files to an unmodified
4548 This restores the contents of files to an unmodified
4553 state and unschedules adds, removes, copies, and renames. If the
4549 state and unschedules adds, removes, copies, and renames. If the
4554 working directory has two parents, you must explicitly specify a
4550 working directory has two parents, you must explicitly specify a
4555 revision.
4551 revision.
4556
4552
4557 Using the -r/--rev or -d/--date options, revert the given files or
4553 Using the -r/--rev or -d/--date options, revert the given files or
4558 directories to their states as of a specific revision. Because
4554 directories to their states as of a specific revision. Because
4559 revert does not change the working directory parents, this will
4555 revert does not change the working directory parents, this will
4560 cause these files to appear modified. This can be helpful to "back
4556 cause these files to appear modified. This can be helpful to "back
4561 out" some or all of an earlier change. See :hg:`backout` for a
4557 out" some or all of an earlier change. See :hg:`backout` for a
4562 related method.
4558 related method.
4563
4559
4564 Modified files are saved with a .orig suffix before reverting.
4560 Modified files are saved with a .orig suffix before reverting.
4565 To disable these backups, use --no-backup. It is possible to store
4561 To disable these backups, use --no-backup. It is possible to store
4566 the backup files in a custom directory relative to the root of the
4562 the backup files in a custom directory relative to the root of the
4567 repository by setting the ``ui.origbackuppath`` configuration
4563 repository by setting the ``ui.origbackuppath`` configuration
4568 option.
4564 option.
4569
4565
4570 See :hg:`help dates` for a list of formats valid for -d/--date.
4566 See :hg:`help dates` for a list of formats valid for -d/--date.
4571
4567
4572 See :hg:`help backout` for a way to reverse the effect of an
4568 See :hg:`help backout` for a way to reverse the effect of an
4573 earlier changeset.
4569 earlier changeset.
4574
4570
4575 Returns 0 on success.
4571 Returns 0 on success.
4576 """
4572 """
4577
4573
4578 opts = pycompat.byteskwargs(opts)
4574 opts = pycompat.byteskwargs(opts)
4579 if opts.get("date"):
4575 if opts.get("date"):
4580 if opts.get("rev"):
4576 if opts.get("rev"):
4581 raise error.Abort(_("you can't specify a revision and a date"))
4577 raise error.Abort(_("you can't specify a revision and a date"))
4582 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4578 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4583
4579
4584 parent, p2 = repo.dirstate.parents()
4580 parent, p2 = repo.dirstate.parents()
4585 if not opts.get('rev') and p2 != nullid:
4581 if not opts.get('rev') and p2 != nullid:
4586 # revert after merge is a trap for new users (issue2915)
4582 # revert after merge is a trap for new users (issue2915)
4587 raise error.Abort(_('uncommitted merge with no revision specified'),
4583 raise error.Abort(_('uncommitted merge with no revision specified'),
4588 hint=_("use 'hg update' or see 'hg help revert'"))
4584 hint=_("use 'hg update' or see 'hg help revert'"))
4589
4585
4590 rev = opts.get('rev')
4586 rev = opts.get('rev')
4591 if rev:
4587 if rev:
4592 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4588 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4593 ctx = scmutil.revsingle(repo, rev)
4589 ctx = scmutil.revsingle(repo, rev)
4594
4590
4595 if (not (pats or opts.get('include') or opts.get('exclude') or
4591 if (not (pats or opts.get('include') or opts.get('exclude') or
4596 opts.get('all') or opts.get('interactive'))):
4592 opts.get('all') or opts.get('interactive'))):
4597 msg = _("no files or directories specified")
4593 msg = _("no files or directories specified")
4598 if p2 != nullid:
4594 if p2 != nullid:
4599 hint = _("uncommitted merge, use --all to discard all changes,"
4595 hint = _("uncommitted merge, use --all to discard all changes,"
4600 " or 'hg update -C .' to abort the merge")
4596 " or 'hg update -C .' to abort the merge")
4601 raise error.Abort(msg, hint=hint)
4597 raise error.Abort(msg, hint=hint)
4602 dirty = any(repo.status())
4598 dirty = any(repo.status())
4603 node = ctx.node()
4599 node = ctx.node()
4604 if node != parent:
4600 if node != parent:
4605 if dirty:
4601 if dirty:
4606 hint = _("uncommitted changes, use --all to discard all"
4602 hint = _("uncommitted changes, use --all to discard all"
4607 " changes, or 'hg update %s' to update") % ctx.rev()
4603 " changes, or 'hg update %s' to update") % ctx.rev()
4608 else:
4604 else:
4609 hint = _("use --all to revert all files,"
4605 hint = _("use --all to revert all files,"
4610 " or 'hg update %s' to update") % ctx.rev()
4606 " or 'hg update %s' to update") % ctx.rev()
4611 elif dirty:
4607 elif dirty:
4612 hint = _("uncommitted changes, use --all to discard all changes")
4608 hint = _("uncommitted changes, use --all to discard all changes")
4613 else:
4609 else:
4614 hint = _("use --all to revert all files")
4610 hint = _("use --all to revert all files")
4615 raise error.Abort(msg, hint=hint)
4611 raise error.Abort(msg, hint=hint)
4616
4612
4617 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4613 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4618 **pycompat.strkwargs(opts))
4614 **pycompat.strkwargs(opts))
4619
4615
4620 @command('rollback', dryrunopts +
4616 @command('rollback', dryrunopts +
4621 [('f', 'force', False, _('ignore safety measures'))])
4617 [('f', 'force', False, _('ignore safety measures'))])
4622 def rollback(ui, repo, **opts):
4618 def rollback(ui, repo, **opts):
4623 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4619 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4624
4620
4625 Please use :hg:`commit --amend` instead of rollback to correct
4621 Please use :hg:`commit --amend` instead of rollback to correct
4626 mistakes in the last commit.
4622 mistakes in the last commit.
4627
4623
4628 This command should be used with care. There is only one level of
4624 This command should be used with care. There is only one level of
4629 rollback, and there is no way to undo a rollback. It will also
4625 rollback, and there is no way to undo a rollback. It will also
4630 restore the dirstate at the time of the last transaction, losing
4626 restore the dirstate at the time of the last transaction, losing
4631 any dirstate changes since that time. This command does not alter
4627 any dirstate changes since that time. This command does not alter
4632 the working directory.
4628 the working directory.
4633
4629
4634 Transactions are used to encapsulate the effects of all commands
4630 Transactions are used to encapsulate the effects of all commands
4635 that create new changesets or propagate existing changesets into a
4631 that create new changesets or propagate existing changesets into a
4636 repository.
4632 repository.
4637
4633
4638 .. container:: verbose
4634 .. container:: verbose
4639
4635
4640 For example, the following commands are transactional, and their
4636 For example, the following commands are transactional, and their
4641 effects can be rolled back:
4637 effects can be rolled back:
4642
4638
4643 - commit
4639 - commit
4644 - import
4640 - import
4645 - pull
4641 - pull
4646 - push (with this repository as the destination)
4642 - push (with this repository as the destination)
4647 - unbundle
4643 - unbundle
4648
4644
4649 To avoid permanent data loss, rollback will refuse to rollback a
4645 To avoid permanent data loss, rollback will refuse to rollback a
4650 commit transaction if it isn't checked out. Use --force to
4646 commit transaction if it isn't checked out. Use --force to
4651 override this protection.
4647 override this protection.
4652
4648
4653 The rollback command can be entirely disabled by setting the
4649 The rollback command can be entirely disabled by setting the
4654 ``ui.rollback`` configuration setting to false. If you're here
4650 ``ui.rollback`` configuration setting to false. If you're here
4655 because you want to use rollback and it's disabled, you can
4651 because you want to use rollback and it's disabled, you can
4656 re-enable the command by setting ``ui.rollback`` to true.
4652 re-enable the command by setting ``ui.rollback`` to true.
4657
4653
4658 This command is not intended for use on public repositories. Once
4654 This command is not intended for use on public repositories. Once
4659 changes are visible for pull by other users, rolling a transaction
4655 changes are visible for pull by other users, rolling a transaction
4660 back locally is ineffective (someone else may already have pulled
4656 back locally is ineffective (someone else may already have pulled
4661 the changes). Furthermore, a race is possible with readers of the
4657 the changes). Furthermore, a race is possible with readers of the
4662 repository; for example an in-progress pull from the repository
4658 repository; for example an in-progress pull from the repository
4663 may fail if a rollback is performed.
4659 may fail if a rollback is performed.
4664
4660
4665 Returns 0 on success, 1 if no rollback data is available.
4661 Returns 0 on success, 1 if no rollback data is available.
4666 """
4662 """
4667 if not ui.configbool('ui', 'rollback'):
4663 if not ui.configbool('ui', 'rollback'):
4668 raise error.Abort(_('rollback is disabled because it is unsafe'),
4664 raise error.Abort(_('rollback is disabled because it is unsafe'),
4669 hint=('see `hg help -v rollback` for information'))
4665 hint=('see `hg help -v rollback` for information'))
4670 return repo.rollback(dryrun=opts.get(r'dry_run'),
4666 return repo.rollback(dryrun=opts.get(r'dry_run'),
4671 force=opts.get(r'force'))
4667 force=opts.get(r'force'))
4672
4668
4673 @command('root', [], cmdtype=readonly)
4669 @command('root', [], cmdtype=readonly)
4674 def root(ui, repo):
4670 def root(ui, repo):
4675 """print the root (top) of the current working directory
4671 """print the root (top) of the current working directory
4676
4672
4677 Print the root directory of the current repository.
4673 Print the root directory of the current repository.
4678
4674
4679 Returns 0 on success.
4675 Returns 0 on success.
4680 """
4676 """
4681 ui.write(repo.root + "\n")
4677 ui.write(repo.root + "\n")
4682
4678
4683 @command('^serve',
4679 @command('^serve',
4684 [('A', 'accesslog', '', _('name of access log file to write to'),
4680 [('A', 'accesslog', '', _('name of access log file to write to'),
4685 _('FILE')),
4681 _('FILE')),
4686 ('d', 'daemon', None, _('run server in background')),
4682 ('d', 'daemon', None, _('run server in background')),
4687 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4683 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4688 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4684 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4689 # use string type, then we can check if something was passed
4685 # use string type, then we can check if something was passed
4690 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4686 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4691 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4687 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4692 _('ADDR')),
4688 _('ADDR')),
4693 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4689 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4694 _('PREFIX')),
4690 _('PREFIX')),
4695 ('n', 'name', '',
4691 ('n', 'name', '',
4696 _('name to show in web pages (default: working directory)'), _('NAME')),
4692 _('name to show in web pages (default: working directory)'), _('NAME')),
4697 ('', 'web-conf', '',
4693 ('', 'web-conf', '',
4698 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4694 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4699 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4695 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4700 _('FILE')),
4696 _('FILE')),
4701 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4697 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4702 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4698 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4703 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4699 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4704 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4700 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4705 ('', 'style', '', _('template style to use'), _('STYLE')),
4701 ('', 'style', '', _('template style to use'), _('STYLE')),
4706 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4702 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4707 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4703 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4708 + subrepoopts,
4704 + subrepoopts,
4709 _('[OPTION]...'),
4705 _('[OPTION]...'),
4710 optionalrepo=True)
4706 optionalrepo=True)
4711 def serve(ui, repo, **opts):
4707 def serve(ui, repo, **opts):
4712 """start stand-alone webserver
4708 """start stand-alone webserver
4713
4709
4714 Start a local HTTP repository browser and pull server. You can use
4710 Start a local HTTP repository browser and pull server. You can use
4715 this for ad-hoc sharing and browsing of repositories. It is
4711 this for ad-hoc sharing and browsing of repositories. It is
4716 recommended to use a real web server to serve a repository for
4712 recommended to use a real web server to serve a repository for
4717 longer periods of time.
4713 longer periods of time.
4718
4714
4719 Please note that the server does not implement access control.
4715 Please note that the server does not implement access control.
4720 This means that, by default, anybody can read from the server and
4716 This means that, by default, anybody can read from the server and
4721 nobody can write to it by default. Set the ``web.allow-push``
4717 nobody can write to it by default. Set the ``web.allow-push``
4722 option to ``*`` to allow everybody to push to the server. You
4718 option to ``*`` to allow everybody to push to the server. You
4723 should use a real web server if you need to authenticate users.
4719 should use a real web server if you need to authenticate users.
4724
4720
4725 By default, the server logs accesses to stdout and errors to
4721 By default, the server logs accesses to stdout and errors to
4726 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4722 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4727 files.
4723 files.
4728
4724
4729 To have the server choose a free port number to listen on, specify
4725 To have the server choose a free port number to listen on, specify
4730 a port number of 0; in this case, the server will print the port
4726 a port number of 0; in this case, the server will print the port
4731 number it uses.
4727 number it uses.
4732
4728
4733 Returns 0 on success.
4729 Returns 0 on success.
4734 """
4730 """
4735
4731
4736 opts = pycompat.byteskwargs(opts)
4732 opts = pycompat.byteskwargs(opts)
4737 if opts["stdio"] and opts["cmdserver"]:
4733 if opts["stdio"] and opts["cmdserver"]:
4738 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4734 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4739
4735
4740 if opts["stdio"]:
4736 if opts["stdio"]:
4741 if repo is None:
4737 if repo is None:
4742 raise error.RepoError(_("there is no Mercurial repository here"
4738 raise error.RepoError(_("there is no Mercurial repository here"
4743 " (.hg not found)"))
4739 " (.hg not found)"))
4744 s = wireprotoserver.sshserver(ui, repo)
4740 s = wireprotoserver.sshserver(ui, repo)
4745 s.serve_forever()
4741 s.serve_forever()
4746
4742
4747 service = server.createservice(ui, repo, opts)
4743 service = server.createservice(ui, repo, opts)
4748 return server.runservice(opts, initfn=service.init, runfn=service.run)
4744 return server.runservice(opts, initfn=service.init, runfn=service.run)
4749
4745
4750 @command('^status|st',
4746 @command('^status|st',
4751 [('A', 'all', None, _('show status of all files')),
4747 [('A', 'all', None, _('show status of all files')),
4752 ('m', 'modified', None, _('show only modified files')),
4748 ('m', 'modified', None, _('show only modified files')),
4753 ('a', 'added', None, _('show only added files')),
4749 ('a', 'added', None, _('show only added files')),
4754 ('r', 'removed', None, _('show only removed files')),
4750 ('r', 'removed', None, _('show only removed files')),
4755 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4751 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4756 ('c', 'clean', None, _('show only files without changes')),
4752 ('c', 'clean', None, _('show only files without changes')),
4757 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4753 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4758 ('i', 'ignored', None, _('show only ignored files')),
4754 ('i', 'ignored', None, _('show only ignored files')),
4759 ('n', 'no-status', None, _('hide status prefix')),
4755 ('n', 'no-status', None, _('hide status prefix')),
4760 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4756 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4761 ('C', 'copies', None, _('show source of copied files')),
4757 ('C', 'copies', None, _('show source of copied files')),
4762 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4758 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4763 ('', 'rev', [], _('show difference from revision'), _('REV')),
4759 ('', 'rev', [], _('show difference from revision'), _('REV')),
4764 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4760 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4765 ] + walkopts + subrepoopts + formatteropts,
4761 ] + walkopts + subrepoopts + formatteropts,
4766 _('[OPTION]... [FILE]...'),
4762 _('[OPTION]... [FILE]...'),
4767 inferrepo=True, cmdtype=readonly)
4763 inferrepo=True, cmdtype=readonly)
4768 def status(ui, repo, *pats, **opts):
4764 def status(ui, repo, *pats, **opts):
4769 """show changed files in the working directory
4765 """show changed files in the working directory
4770
4766
4771 Show status of files in the repository. If names are given, only
4767 Show status of files in the repository. If names are given, only
4772 files that match are shown. Files that are clean or ignored or
4768 files that match are shown. Files that are clean or ignored or
4773 the source of a copy/move operation, are not listed unless
4769 the source of a copy/move operation, are not listed unless
4774 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4770 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4775 Unless options described with "show only ..." are given, the
4771 Unless options described with "show only ..." are given, the
4776 options -mardu are used.
4772 options -mardu are used.
4777
4773
4778 Option -q/--quiet hides untracked (unknown and ignored) files
4774 Option -q/--quiet hides untracked (unknown and ignored) files
4779 unless explicitly requested with -u/--unknown or -i/--ignored.
4775 unless explicitly requested with -u/--unknown or -i/--ignored.
4780
4776
4781 .. note::
4777 .. note::
4782
4778
4783 :hg:`status` may appear to disagree with diff if permissions have
4779 :hg:`status` may appear to disagree with diff if permissions have
4784 changed or a merge has occurred. The standard diff format does
4780 changed or a merge has occurred. The standard diff format does
4785 not report permission changes and diff only reports changes
4781 not report permission changes and diff only reports changes
4786 relative to one merge parent.
4782 relative to one merge parent.
4787
4783
4788 If one revision is given, it is used as the base revision.
4784 If one revision is given, it is used as the base revision.
4789 If two revisions are given, the differences between them are
4785 If two revisions are given, the differences between them are
4790 shown. The --change option can also be used as a shortcut to list
4786 shown. The --change option can also be used as a shortcut to list
4791 the changed files of a revision from its first parent.
4787 the changed files of a revision from its first parent.
4792
4788
4793 The codes used to show the status of files are::
4789 The codes used to show the status of files are::
4794
4790
4795 M = modified
4791 M = modified
4796 A = added
4792 A = added
4797 R = removed
4793 R = removed
4798 C = clean
4794 C = clean
4799 ! = missing (deleted by non-hg command, but still tracked)
4795 ! = missing (deleted by non-hg command, but still tracked)
4800 ? = not tracked
4796 ? = not tracked
4801 I = ignored
4797 I = ignored
4802 = origin of the previous file (with --copies)
4798 = origin of the previous file (with --copies)
4803
4799
4804 .. container:: verbose
4800 .. container:: verbose
4805
4801
4806 The -t/--terse option abbreviates the output by showing only the directory
4802 The -t/--terse option abbreviates the output by showing only the directory
4807 name if all the files in it share the same status. The option takes an
4803 name if all the files in it share the same status. The option takes an
4808 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4804 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4809 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4805 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4810 for 'ignored' and 'c' for clean.
4806 for 'ignored' and 'c' for clean.
4811
4807
4812 It abbreviates only those statuses which are passed. Note that clean and
4808 It abbreviates only those statuses which are passed. Note that clean and
4813 ignored files are not displayed with '--terse ic' unless the -c/--clean
4809 ignored files are not displayed with '--terse ic' unless the -c/--clean
4814 and -i/--ignored options are also used.
4810 and -i/--ignored options are also used.
4815
4811
4816 The -v/--verbose option shows information when the repository is in an
4812 The -v/--verbose option shows information when the repository is in an
4817 unfinished merge, shelve, rebase state etc. You can have this behavior
4813 unfinished merge, shelve, rebase state etc. You can have this behavior
4818 turned on by default by enabling the ``commands.status.verbose`` option.
4814 turned on by default by enabling the ``commands.status.verbose`` option.
4819
4815
4820 You can skip displaying some of these states by setting
4816 You can skip displaying some of these states by setting
4821 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4817 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4822 'histedit', 'merge', 'rebase', or 'unshelve'.
4818 'histedit', 'merge', 'rebase', or 'unshelve'.
4823
4819
4824 Examples:
4820 Examples:
4825
4821
4826 - show changes in the working directory relative to a
4822 - show changes in the working directory relative to a
4827 changeset::
4823 changeset::
4828
4824
4829 hg status --rev 9353
4825 hg status --rev 9353
4830
4826
4831 - show changes in the working directory relative to the
4827 - show changes in the working directory relative to the
4832 current directory (see :hg:`help patterns` for more information)::
4828 current directory (see :hg:`help patterns` for more information)::
4833
4829
4834 hg status re:
4830 hg status re:
4835
4831
4836 - show all changes including copies in an existing changeset::
4832 - show all changes including copies in an existing changeset::
4837
4833
4838 hg status --copies --change 9353
4834 hg status --copies --change 9353
4839
4835
4840 - get a NUL separated list of added files, suitable for xargs::
4836 - get a NUL separated list of added files, suitable for xargs::
4841
4837
4842 hg status -an0
4838 hg status -an0
4843
4839
4844 - show more information about the repository status, abbreviating
4840 - show more information about the repository status, abbreviating
4845 added, removed, modified, deleted, and untracked paths::
4841 added, removed, modified, deleted, and untracked paths::
4846
4842
4847 hg status -v -t mardu
4843 hg status -v -t mardu
4848
4844
4849 Returns 0 on success.
4845 Returns 0 on success.
4850
4846
4851 """
4847 """
4852
4848
4853 opts = pycompat.byteskwargs(opts)
4849 opts = pycompat.byteskwargs(opts)
4854 revs = opts.get('rev')
4850 revs = opts.get('rev')
4855 change = opts.get('change')
4851 change = opts.get('change')
4856 terse = opts.get('terse')
4852 terse = opts.get('terse')
4857
4853
4858 if revs and change:
4854 if revs and change:
4859 msg = _('cannot specify --rev and --change at the same time')
4855 msg = _('cannot specify --rev and --change at the same time')
4860 raise error.Abort(msg)
4856 raise error.Abort(msg)
4861 elif revs and terse:
4857 elif revs and terse:
4862 msg = _('cannot use --terse with --rev')
4858 msg = _('cannot use --terse with --rev')
4863 raise error.Abort(msg)
4859 raise error.Abort(msg)
4864 elif change:
4860 elif change:
4865 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4861 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4866 node2 = scmutil.revsingle(repo, change, None).node()
4862 node2 = scmutil.revsingle(repo, change, None).node()
4867 node1 = repo[node2].p1().node()
4863 node1 = repo[node2].p1().node()
4868 else:
4864 else:
4869 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4865 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4870 node1, node2 = scmutil.revpair(repo, revs)
4866 node1, node2 = scmutil.revpair(repo, revs)
4871
4867
4872 if pats or ui.configbool('commands', 'status.relative'):
4868 if pats or ui.configbool('commands', 'status.relative'):
4873 cwd = repo.getcwd()
4869 cwd = repo.getcwd()
4874 else:
4870 else:
4875 cwd = ''
4871 cwd = ''
4876
4872
4877 if opts.get('print0'):
4873 if opts.get('print0'):
4878 end = '\0'
4874 end = '\0'
4879 else:
4875 else:
4880 end = '\n'
4876 end = '\n'
4881 copy = {}
4877 copy = {}
4882 states = 'modified added removed deleted unknown ignored clean'.split()
4878 states = 'modified added removed deleted unknown ignored clean'.split()
4883 show = [k for k in states if opts.get(k)]
4879 show = [k for k in states if opts.get(k)]
4884 if opts.get('all'):
4880 if opts.get('all'):
4885 show += ui.quiet and (states[:4] + ['clean']) or states
4881 show += ui.quiet and (states[:4] + ['clean']) or states
4886
4882
4887 if not show:
4883 if not show:
4888 if ui.quiet:
4884 if ui.quiet:
4889 show = states[:4]
4885 show = states[:4]
4890 else:
4886 else:
4891 show = states[:5]
4887 show = states[:5]
4892
4888
4893 m = scmutil.match(repo[node2], pats, opts)
4889 m = scmutil.match(repo[node2], pats, opts)
4894 if terse:
4890 if terse:
4895 # we need to compute clean and unknown to terse
4891 # we need to compute clean and unknown to terse
4896 stat = repo.status(node1, node2, m,
4892 stat = repo.status(node1, node2, m,
4897 'ignored' in show or 'i' in terse,
4893 'ignored' in show or 'i' in terse,
4898 True, True, opts.get('subrepos'))
4894 True, True, opts.get('subrepos'))
4899
4895
4900 stat = cmdutil.tersedir(stat, terse)
4896 stat = cmdutil.tersedir(stat, terse)
4901 else:
4897 else:
4902 stat = repo.status(node1, node2, m,
4898 stat = repo.status(node1, node2, m,
4903 'ignored' in show, 'clean' in show,
4899 'ignored' in show, 'clean' in show,
4904 'unknown' in show, opts.get('subrepos'))
4900 'unknown' in show, opts.get('subrepos'))
4905
4901
4906 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4902 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4907
4903
4908 if (opts.get('all') or opts.get('copies')
4904 if (opts.get('all') or opts.get('copies')
4909 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4905 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4910 copy = copies.pathcopies(repo[node1], repo[node2], m)
4906 copy = copies.pathcopies(repo[node1], repo[node2], m)
4911
4907
4912 ui.pager('status')
4908 ui.pager('status')
4913 fm = ui.formatter('status', opts)
4909 fm = ui.formatter('status', opts)
4914 fmt = '%s' + end
4910 fmt = '%s' + end
4915 showchar = not opts.get('no_status')
4911 showchar = not opts.get('no_status')
4916
4912
4917 for state, char, files in changestates:
4913 for state, char, files in changestates:
4918 if state in show:
4914 if state in show:
4919 label = 'status.' + state
4915 label = 'status.' + state
4920 for f in files:
4916 for f in files:
4921 fm.startitem()
4917 fm.startitem()
4922 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4918 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4923 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4919 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4924 if f in copy:
4920 if f in copy:
4925 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4921 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4926 label='status.copied')
4922 label='status.copied')
4927
4923
4928 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
4924 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
4929 and not ui.plain()):
4925 and not ui.plain()):
4930 cmdutil.morestatus(repo, fm)
4926 cmdutil.morestatus(repo, fm)
4931 fm.end()
4927 fm.end()
4932
4928
4933 @command('^summary|sum',
4929 @command('^summary|sum',
4934 [('', 'remote', None, _('check for push and pull'))],
4930 [('', 'remote', None, _('check for push and pull'))],
4935 '[--remote]', cmdtype=readonly)
4931 '[--remote]', cmdtype=readonly)
4936 def summary(ui, repo, **opts):
4932 def summary(ui, repo, **opts):
4937 """summarize working directory state
4933 """summarize working directory state
4938
4934
4939 This generates a brief summary of the working directory state,
4935 This generates a brief summary of the working directory state,
4940 including parents, branch, commit status, phase and available updates.
4936 including parents, branch, commit status, phase and available updates.
4941
4937
4942 With the --remote option, this will check the default paths for
4938 With the --remote option, this will check the default paths for
4943 incoming and outgoing changes. This can be time-consuming.
4939 incoming and outgoing changes. This can be time-consuming.
4944
4940
4945 Returns 0 on success.
4941 Returns 0 on success.
4946 """
4942 """
4947
4943
4948 opts = pycompat.byteskwargs(opts)
4944 opts = pycompat.byteskwargs(opts)
4949 ui.pager('summary')
4945 ui.pager('summary')
4950 ctx = repo[None]
4946 ctx = repo[None]
4951 parents = ctx.parents()
4947 parents = ctx.parents()
4952 pnode = parents[0].node()
4948 pnode = parents[0].node()
4953 marks = []
4949 marks = []
4954
4950
4955 ms = None
4951 ms = None
4956 try:
4952 try:
4957 ms = mergemod.mergestate.read(repo)
4953 ms = mergemod.mergestate.read(repo)
4958 except error.UnsupportedMergeRecords as e:
4954 except error.UnsupportedMergeRecords as e:
4959 s = ' '.join(e.recordtypes)
4955 s = ' '.join(e.recordtypes)
4960 ui.warn(
4956 ui.warn(
4961 _('warning: merge state has unsupported record types: %s\n') % s)
4957 _('warning: merge state has unsupported record types: %s\n') % s)
4962 unresolved = []
4958 unresolved = []
4963 else:
4959 else:
4964 unresolved = list(ms.unresolved())
4960 unresolved = list(ms.unresolved())
4965
4961
4966 for p in parents:
4962 for p in parents:
4967 # label with log.changeset (instead of log.parent) since this
4963 # label with log.changeset (instead of log.parent) since this
4968 # shows a working directory parent *changeset*:
4964 # shows a working directory parent *changeset*:
4969 # i18n: column positioning for "hg summary"
4965 # i18n: column positioning for "hg summary"
4970 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4966 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4971 label=logcmdutil.changesetlabels(p))
4967 label=logcmdutil.changesetlabels(p))
4972 ui.write(' '.join(p.tags()), label='log.tag')
4968 ui.write(' '.join(p.tags()), label='log.tag')
4973 if p.bookmarks():
4969 if p.bookmarks():
4974 marks.extend(p.bookmarks())
4970 marks.extend(p.bookmarks())
4975 if p.rev() == -1:
4971 if p.rev() == -1:
4976 if not len(repo):
4972 if not len(repo):
4977 ui.write(_(' (empty repository)'))
4973 ui.write(_(' (empty repository)'))
4978 else:
4974 else:
4979 ui.write(_(' (no revision checked out)'))
4975 ui.write(_(' (no revision checked out)'))
4980 if p.obsolete():
4976 if p.obsolete():
4981 ui.write(_(' (obsolete)'))
4977 ui.write(_(' (obsolete)'))
4982 if p.isunstable():
4978 if p.isunstable():
4983 instabilities = (ui.label(instability, 'trouble.%s' % instability)
4979 instabilities = (ui.label(instability, 'trouble.%s' % instability)
4984 for instability in p.instabilities())
4980 for instability in p.instabilities())
4985 ui.write(' ('
4981 ui.write(' ('
4986 + ', '.join(instabilities)
4982 + ', '.join(instabilities)
4987 + ')')
4983 + ')')
4988 ui.write('\n')
4984 ui.write('\n')
4989 if p.description():
4985 if p.description():
4990 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4986 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4991 label='log.summary')
4987 label='log.summary')
4992
4988
4993 branch = ctx.branch()
4989 branch = ctx.branch()
4994 bheads = repo.branchheads(branch)
4990 bheads = repo.branchheads(branch)
4995 # i18n: column positioning for "hg summary"
4991 # i18n: column positioning for "hg summary"
4996 m = _('branch: %s\n') % branch
4992 m = _('branch: %s\n') % branch
4997 if branch != 'default':
4993 if branch != 'default':
4998 ui.write(m, label='log.branch')
4994 ui.write(m, label='log.branch')
4999 else:
4995 else:
5000 ui.status(m, label='log.branch')
4996 ui.status(m, label='log.branch')
5001
4997
5002 if marks:
4998 if marks:
5003 active = repo._activebookmark
4999 active = repo._activebookmark
5004 # i18n: column positioning for "hg summary"
5000 # i18n: column positioning for "hg summary"
5005 ui.write(_('bookmarks:'), label='log.bookmark')
5001 ui.write(_('bookmarks:'), label='log.bookmark')
5006 if active is not None:
5002 if active is not None:
5007 if active in marks:
5003 if active in marks:
5008 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5004 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5009 marks.remove(active)
5005 marks.remove(active)
5010 else:
5006 else:
5011 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5007 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5012 for m in marks:
5008 for m in marks:
5013 ui.write(' ' + m, label='log.bookmark')
5009 ui.write(' ' + m, label='log.bookmark')
5014 ui.write('\n', label='log.bookmark')
5010 ui.write('\n', label='log.bookmark')
5015
5011
5016 status = repo.status(unknown=True)
5012 status = repo.status(unknown=True)
5017
5013
5018 c = repo.dirstate.copies()
5014 c = repo.dirstate.copies()
5019 copied, renamed = [], []
5015 copied, renamed = [], []
5020 for d, s in c.iteritems():
5016 for d, s in c.iteritems():
5021 if s in status.removed:
5017 if s in status.removed:
5022 status.removed.remove(s)
5018 status.removed.remove(s)
5023 renamed.append(d)
5019 renamed.append(d)
5024 else:
5020 else:
5025 copied.append(d)
5021 copied.append(d)
5026 if d in status.added:
5022 if d in status.added:
5027 status.added.remove(d)
5023 status.added.remove(d)
5028
5024
5029 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5025 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5030
5026
5031 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5027 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5032 (ui.label(_('%d added'), 'status.added'), status.added),
5028 (ui.label(_('%d added'), 'status.added'), status.added),
5033 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5029 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5034 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5030 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5035 (ui.label(_('%d copied'), 'status.copied'), copied),
5031 (ui.label(_('%d copied'), 'status.copied'), copied),
5036 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5032 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5037 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5033 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5038 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5034 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5039 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5035 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5040 t = []
5036 t = []
5041 for l, s in labels:
5037 for l, s in labels:
5042 if s:
5038 if s:
5043 t.append(l % len(s))
5039 t.append(l % len(s))
5044
5040
5045 t = ', '.join(t)
5041 t = ', '.join(t)
5046 cleanworkdir = False
5042 cleanworkdir = False
5047
5043
5048 if repo.vfs.exists('graftstate'):
5044 if repo.vfs.exists('graftstate'):
5049 t += _(' (graft in progress)')
5045 t += _(' (graft in progress)')
5050 if repo.vfs.exists('updatestate'):
5046 if repo.vfs.exists('updatestate'):
5051 t += _(' (interrupted update)')
5047 t += _(' (interrupted update)')
5052 elif len(parents) > 1:
5048 elif len(parents) > 1:
5053 t += _(' (merge)')
5049 t += _(' (merge)')
5054 elif branch != parents[0].branch():
5050 elif branch != parents[0].branch():
5055 t += _(' (new branch)')
5051 t += _(' (new branch)')
5056 elif (parents[0].closesbranch() and
5052 elif (parents[0].closesbranch() and
5057 pnode in repo.branchheads(branch, closed=True)):
5053 pnode in repo.branchheads(branch, closed=True)):
5058 t += _(' (head closed)')
5054 t += _(' (head closed)')
5059 elif not (status.modified or status.added or status.removed or renamed or
5055 elif not (status.modified or status.added or status.removed or renamed or
5060 copied or subs):
5056 copied or subs):
5061 t += _(' (clean)')
5057 t += _(' (clean)')
5062 cleanworkdir = True
5058 cleanworkdir = True
5063 elif pnode not in bheads:
5059 elif pnode not in bheads:
5064 t += _(' (new branch head)')
5060 t += _(' (new branch head)')
5065
5061
5066 if parents:
5062 if parents:
5067 pendingphase = max(p.phase() for p in parents)
5063 pendingphase = max(p.phase() for p in parents)
5068 else:
5064 else:
5069 pendingphase = phases.public
5065 pendingphase = phases.public
5070
5066
5071 if pendingphase > phases.newcommitphase(ui):
5067 if pendingphase > phases.newcommitphase(ui):
5072 t += ' (%s)' % phases.phasenames[pendingphase]
5068 t += ' (%s)' % phases.phasenames[pendingphase]
5073
5069
5074 if cleanworkdir:
5070 if cleanworkdir:
5075 # i18n: column positioning for "hg summary"
5071 # i18n: column positioning for "hg summary"
5076 ui.status(_('commit: %s\n') % t.strip())
5072 ui.status(_('commit: %s\n') % t.strip())
5077 else:
5073 else:
5078 # i18n: column positioning for "hg summary"
5074 # i18n: column positioning for "hg summary"
5079 ui.write(_('commit: %s\n') % t.strip())
5075 ui.write(_('commit: %s\n') % t.strip())
5080
5076
5081 # all ancestors of branch heads - all ancestors of parent = new csets
5077 # all ancestors of branch heads - all ancestors of parent = new csets
5082 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5078 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5083 bheads))
5079 bheads))
5084
5080
5085 if new == 0:
5081 if new == 0:
5086 # i18n: column positioning for "hg summary"
5082 # i18n: column positioning for "hg summary"
5087 ui.status(_('update: (current)\n'))
5083 ui.status(_('update: (current)\n'))
5088 elif pnode not in bheads:
5084 elif pnode not in bheads:
5089 # i18n: column positioning for "hg summary"
5085 # i18n: column positioning for "hg summary"
5090 ui.write(_('update: %d new changesets (update)\n') % new)
5086 ui.write(_('update: %d new changesets (update)\n') % new)
5091 else:
5087 else:
5092 # i18n: column positioning for "hg summary"
5088 # i18n: column positioning for "hg summary"
5093 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5089 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5094 (new, len(bheads)))
5090 (new, len(bheads)))
5095
5091
5096 t = []
5092 t = []
5097 draft = len(repo.revs('draft()'))
5093 draft = len(repo.revs('draft()'))
5098 if draft:
5094 if draft:
5099 t.append(_('%d draft') % draft)
5095 t.append(_('%d draft') % draft)
5100 secret = len(repo.revs('secret()'))
5096 secret = len(repo.revs('secret()'))
5101 if secret:
5097 if secret:
5102 t.append(_('%d secret') % secret)
5098 t.append(_('%d secret') % secret)
5103
5099
5104 if draft or secret:
5100 if draft or secret:
5105 ui.status(_('phases: %s\n') % ', '.join(t))
5101 ui.status(_('phases: %s\n') % ', '.join(t))
5106
5102
5107 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5103 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5108 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5104 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5109 numtrouble = len(repo.revs(trouble + "()"))
5105 numtrouble = len(repo.revs(trouble + "()"))
5110 # We write all the possibilities to ease translation
5106 # We write all the possibilities to ease translation
5111 troublemsg = {
5107 troublemsg = {
5112 "orphan": _("orphan: %d changesets"),
5108 "orphan": _("orphan: %d changesets"),
5113 "contentdivergent": _("content-divergent: %d changesets"),
5109 "contentdivergent": _("content-divergent: %d changesets"),
5114 "phasedivergent": _("phase-divergent: %d changesets"),
5110 "phasedivergent": _("phase-divergent: %d changesets"),
5115 }
5111 }
5116 if numtrouble > 0:
5112 if numtrouble > 0:
5117 ui.status(troublemsg[trouble] % numtrouble + "\n")
5113 ui.status(troublemsg[trouble] % numtrouble + "\n")
5118
5114
5119 cmdutil.summaryhooks(ui, repo)
5115 cmdutil.summaryhooks(ui, repo)
5120
5116
5121 if opts.get('remote'):
5117 if opts.get('remote'):
5122 needsincoming, needsoutgoing = True, True
5118 needsincoming, needsoutgoing = True, True
5123 else:
5119 else:
5124 needsincoming, needsoutgoing = False, False
5120 needsincoming, needsoutgoing = False, False
5125 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5121 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5126 if i:
5122 if i:
5127 needsincoming = True
5123 needsincoming = True
5128 if o:
5124 if o:
5129 needsoutgoing = True
5125 needsoutgoing = True
5130 if not needsincoming and not needsoutgoing:
5126 if not needsincoming and not needsoutgoing:
5131 return
5127 return
5132
5128
5133 def getincoming():
5129 def getincoming():
5134 source, branches = hg.parseurl(ui.expandpath('default'))
5130 source, branches = hg.parseurl(ui.expandpath('default'))
5135 sbranch = branches[0]
5131 sbranch = branches[0]
5136 try:
5132 try:
5137 other = hg.peer(repo, {}, source)
5133 other = hg.peer(repo, {}, source)
5138 except error.RepoError:
5134 except error.RepoError:
5139 if opts.get('remote'):
5135 if opts.get('remote'):
5140 raise
5136 raise
5141 return source, sbranch, None, None, None
5137 return source, sbranch, None, None, None
5142 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5138 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5143 if revs:
5139 if revs:
5144 revs = [other.lookup(rev) for rev in revs]
5140 revs = [other.lookup(rev) for rev in revs]
5145 ui.debug('comparing with %s\n' % util.hidepassword(source))
5141 ui.debug('comparing with %s\n' % util.hidepassword(source))
5146 repo.ui.pushbuffer()
5142 repo.ui.pushbuffer()
5147 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5143 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5148 repo.ui.popbuffer()
5144 repo.ui.popbuffer()
5149 return source, sbranch, other, commoninc, commoninc[1]
5145 return source, sbranch, other, commoninc, commoninc[1]
5150
5146
5151 if needsincoming:
5147 if needsincoming:
5152 source, sbranch, sother, commoninc, incoming = getincoming()
5148 source, sbranch, sother, commoninc, incoming = getincoming()
5153 else:
5149 else:
5154 source = sbranch = sother = commoninc = incoming = None
5150 source = sbranch = sother = commoninc = incoming = None
5155
5151
5156 def getoutgoing():
5152 def getoutgoing():
5157 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5153 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5158 dbranch = branches[0]
5154 dbranch = branches[0]
5159 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5155 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5160 if source != dest:
5156 if source != dest:
5161 try:
5157 try:
5162 dother = hg.peer(repo, {}, dest)
5158 dother = hg.peer(repo, {}, dest)
5163 except error.RepoError:
5159 except error.RepoError:
5164 if opts.get('remote'):
5160 if opts.get('remote'):
5165 raise
5161 raise
5166 return dest, dbranch, None, None
5162 return dest, dbranch, None, None
5167 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5163 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5168 elif sother is None:
5164 elif sother is None:
5169 # there is no explicit destination peer, but source one is invalid
5165 # there is no explicit destination peer, but source one is invalid
5170 return dest, dbranch, None, None
5166 return dest, dbranch, None, None
5171 else:
5167 else:
5172 dother = sother
5168 dother = sother
5173 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5169 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5174 common = None
5170 common = None
5175 else:
5171 else:
5176 common = commoninc
5172 common = commoninc
5177 if revs:
5173 if revs:
5178 revs = [repo.lookup(rev) for rev in revs]
5174 revs = [repo.lookup(rev) for rev in revs]
5179 repo.ui.pushbuffer()
5175 repo.ui.pushbuffer()
5180 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5176 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5181 commoninc=common)
5177 commoninc=common)
5182 repo.ui.popbuffer()
5178 repo.ui.popbuffer()
5183 return dest, dbranch, dother, outgoing
5179 return dest, dbranch, dother, outgoing
5184
5180
5185 if needsoutgoing:
5181 if needsoutgoing:
5186 dest, dbranch, dother, outgoing = getoutgoing()
5182 dest, dbranch, dother, outgoing = getoutgoing()
5187 else:
5183 else:
5188 dest = dbranch = dother = outgoing = None
5184 dest = dbranch = dother = outgoing = None
5189
5185
5190 if opts.get('remote'):
5186 if opts.get('remote'):
5191 t = []
5187 t = []
5192 if incoming:
5188 if incoming:
5193 t.append(_('1 or more incoming'))
5189 t.append(_('1 or more incoming'))
5194 o = outgoing.missing
5190 o = outgoing.missing
5195 if o:
5191 if o:
5196 t.append(_('%d outgoing') % len(o))
5192 t.append(_('%d outgoing') % len(o))
5197 other = dother or sother
5193 other = dother or sother
5198 if 'bookmarks' in other.listkeys('namespaces'):
5194 if 'bookmarks' in other.listkeys('namespaces'):
5199 counts = bookmarks.summary(repo, other)
5195 counts = bookmarks.summary(repo, other)
5200 if counts[0] > 0:
5196 if counts[0] > 0:
5201 t.append(_('%d incoming bookmarks') % counts[0])
5197 t.append(_('%d incoming bookmarks') % counts[0])
5202 if counts[1] > 0:
5198 if counts[1] > 0:
5203 t.append(_('%d outgoing bookmarks') % counts[1])
5199 t.append(_('%d outgoing bookmarks') % counts[1])
5204
5200
5205 if t:
5201 if t:
5206 # i18n: column positioning for "hg summary"
5202 # i18n: column positioning for "hg summary"
5207 ui.write(_('remote: %s\n') % (', '.join(t)))
5203 ui.write(_('remote: %s\n') % (', '.join(t)))
5208 else:
5204 else:
5209 # i18n: column positioning for "hg summary"
5205 # i18n: column positioning for "hg summary"
5210 ui.status(_('remote: (synced)\n'))
5206 ui.status(_('remote: (synced)\n'))
5211
5207
5212 cmdutil.summaryremotehooks(ui, repo, opts,
5208 cmdutil.summaryremotehooks(ui, repo, opts,
5213 ((source, sbranch, sother, commoninc),
5209 ((source, sbranch, sother, commoninc),
5214 (dest, dbranch, dother, outgoing)))
5210 (dest, dbranch, dother, outgoing)))
5215
5211
5216 @command('tag',
5212 @command('tag',
5217 [('f', 'force', None, _('force tag')),
5213 [('f', 'force', None, _('force tag')),
5218 ('l', 'local', None, _('make the tag local')),
5214 ('l', 'local', None, _('make the tag local')),
5219 ('r', 'rev', '', _('revision to tag'), _('REV')),
5215 ('r', 'rev', '', _('revision to tag'), _('REV')),
5220 ('', 'remove', None, _('remove a tag')),
5216 ('', 'remove', None, _('remove a tag')),
5221 # -l/--local is already there, commitopts cannot be used
5217 # -l/--local is already there, commitopts cannot be used
5222 ('e', 'edit', None, _('invoke editor on commit messages')),
5218 ('e', 'edit', None, _('invoke editor on commit messages')),
5223 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5219 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5224 ] + commitopts2,
5220 ] + commitopts2,
5225 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5221 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5226 def tag(ui, repo, name1, *names, **opts):
5222 def tag(ui, repo, name1, *names, **opts):
5227 """add one or more tags for the current or given revision
5223 """add one or more tags for the current or given revision
5228
5224
5229 Name a particular revision using <name>.
5225 Name a particular revision using <name>.
5230
5226
5231 Tags are used to name particular revisions of the repository and are
5227 Tags are used to name particular revisions of the repository and are
5232 very useful to compare different revisions, to go back to significant
5228 very useful to compare different revisions, to go back to significant
5233 earlier versions or to mark branch points as releases, etc. Changing
5229 earlier versions or to mark branch points as releases, etc. Changing
5234 an existing tag is normally disallowed; use -f/--force to override.
5230 an existing tag is normally disallowed; use -f/--force to override.
5235
5231
5236 If no revision is given, the parent of the working directory is
5232 If no revision is given, the parent of the working directory is
5237 used.
5233 used.
5238
5234
5239 To facilitate version control, distribution, and merging of tags,
5235 To facilitate version control, distribution, and merging of tags,
5240 they are stored as a file named ".hgtags" which is managed similarly
5236 they are stored as a file named ".hgtags" which is managed similarly
5241 to other project files and can be hand-edited if necessary. This
5237 to other project files and can be hand-edited if necessary. This
5242 also means that tagging creates a new commit. The file
5238 also means that tagging creates a new commit. The file
5243 ".hg/localtags" is used for local tags (not shared among
5239 ".hg/localtags" is used for local tags (not shared among
5244 repositories).
5240 repositories).
5245
5241
5246 Tag commits are usually made at the head of a branch. If the parent
5242 Tag commits are usually made at the head of a branch. If the parent
5247 of the working directory is not a branch head, :hg:`tag` aborts; use
5243 of the working directory is not a branch head, :hg:`tag` aborts; use
5248 -f/--force to force the tag commit to be based on a non-head
5244 -f/--force to force the tag commit to be based on a non-head
5249 changeset.
5245 changeset.
5250
5246
5251 See :hg:`help dates` for a list of formats valid for -d/--date.
5247 See :hg:`help dates` for a list of formats valid for -d/--date.
5252
5248
5253 Since tag names have priority over branch names during revision
5249 Since tag names have priority over branch names during revision
5254 lookup, using an existing branch name as a tag name is discouraged.
5250 lookup, using an existing branch name as a tag name is discouraged.
5255
5251
5256 Returns 0 on success.
5252 Returns 0 on success.
5257 """
5253 """
5258 opts = pycompat.byteskwargs(opts)
5254 opts = pycompat.byteskwargs(opts)
5259 wlock = lock = None
5255 wlock = lock = None
5260 try:
5256 try:
5261 wlock = repo.wlock()
5257 wlock = repo.wlock()
5262 lock = repo.lock()
5258 lock = repo.lock()
5263 rev_ = "."
5259 rev_ = "."
5264 names = [t.strip() for t in (name1,) + names]
5260 names = [t.strip() for t in (name1,) + names]
5265 if len(names) != len(set(names)):
5261 if len(names) != len(set(names)):
5266 raise error.Abort(_('tag names must be unique'))
5262 raise error.Abort(_('tag names must be unique'))
5267 for n in names:
5263 for n in names:
5268 scmutil.checknewlabel(repo, n, 'tag')
5264 scmutil.checknewlabel(repo, n, 'tag')
5269 if not n:
5265 if not n:
5270 raise error.Abort(_('tag names cannot consist entirely of '
5266 raise error.Abort(_('tag names cannot consist entirely of '
5271 'whitespace'))
5267 'whitespace'))
5272 if opts.get('rev') and opts.get('remove'):
5268 if opts.get('rev') and opts.get('remove'):
5273 raise error.Abort(_("--rev and --remove are incompatible"))
5269 raise error.Abort(_("--rev and --remove are incompatible"))
5274 if opts.get('rev'):
5270 if opts.get('rev'):
5275 rev_ = opts['rev']
5271 rev_ = opts['rev']
5276 message = opts.get('message')
5272 message = opts.get('message')
5277 if opts.get('remove'):
5273 if opts.get('remove'):
5278 if opts.get('local'):
5274 if opts.get('local'):
5279 expectedtype = 'local'
5275 expectedtype = 'local'
5280 else:
5276 else:
5281 expectedtype = 'global'
5277 expectedtype = 'global'
5282
5278
5283 for n in names:
5279 for n in names:
5284 if not repo.tagtype(n):
5280 if not repo.tagtype(n):
5285 raise error.Abort(_("tag '%s' does not exist") % n)
5281 raise error.Abort(_("tag '%s' does not exist") % n)
5286 if repo.tagtype(n) != expectedtype:
5282 if repo.tagtype(n) != expectedtype:
5287 if expectedtype == 'global':
5283 if expectedtype == 'global':
5288 raise error.Abort(_("tag '%s' is not a global tag") % n)
5284 raise error.Abort(_("tag '%s' is not a global tag") % n)
5289 else:
5285 else:
5290 raise error.Abort(_("tag '%s' is not a local tag") % n)
5286 raise error.Abort(_("tag '%s' is not a local tag") % n)
5291 rev_ = 'null'
5287 rev_ = 'null'
5292 if not message:
5288 if not message:
5293 # we don't translate commit messages
5289 # we don't translate commit messages
5294 message = 'Removed tag %s' % ', '.join(names)
5290 message = 'Removed tag %s' % ', '.join(names)
5295 elif not opts.get('force'):
5291 elif not opts.get('force'):
5296 for n in names:
5292 for n in names:
5297 if n in repo.tags():
5293 if n in repo.tags():
5298 raise error.Abort(_("tag '%s' already exists "
5294 raise error.Abort(_("tag '%s' already exists "
5299 "(use -f to force)") % n)
5295 "(use -f to force)") % n)
5300 if not opts.get('local'):
5296 if not opts.get('local'):
5301 p1, p2 = repo.dirstate.parents()
5297 p1, p2 = repo.dirstate.parents()
5302 if p2 != nullid:
5298 if p2 != nullid:
5303 raise error.Abort(_('uncommitted merge'))
5299 raise error.Abort(_('uncommitted merge'))
5304 bheads = repo.branchheads()
5300 bheads = repo.branchheads()
5305 if not opts.get('force') and bheads and p1 not in bheads:
5301 if not opts.get('force') and bheads and p1 not in bheads:
5306 raise error.Abort(_('working directory is not at a branch head '
5302 raise error.Abort(_('working directory is not at a branch head '
5307 '(use -f to force)'))
5303 '(use -f to force)'))
5308 r = scmutil.revsingle(repo, rev_).node()
5304 r = scmutil.revsingle(repo, rev_).node()
5309
5305
5310 if not message:
5306 if not message:
5311 # we don't translate commit messages
5307 # we don't translate commit messages
5312 message = ('Added tag %s for changeset %s' %
5308 message = ('Added tag %s for changeset %s' %
5313 (', '.join(names), short(r)))
5309 (', '.join(names), short(r)))
5314
5310
5315 date = opts.get('date')
5311 date = opts.get('date')
5316 if date:
5312 if date:
5317 date = util.parsedate(date)
5313 date = util.parsedate(date)
5318
5314
5319 if opts.get('remove'):
5315 if opts.get('remove'):
5320 editform = 'tag.remove'
5316 editform = 'tag.remove'
5321 else:
5317 else:
5322 editform = 'tag.add'
5318 editform = 'tag.add'
5323 editor = cmdutil.getcommiteditor(editform=editform,
5319 editor = cmdutil.getcommiteditor(editform=editform,
5324 **pycompat.strkwargs(opts))
5320 **pycompat.strkwargs(opts))
5325
5321
5326 # don't allow tagging the null rev
5322 # don't allow tagging the null rev
5327 if (not opts.get('remove') and
5323 if (not opts.get('remove') and
5328 scmutil.revsingle(repo, rev_).rev() == nullrev):
5324 scmutil.revsingle(repo, rev_).rev() == nullrev):
5329 raise error.Abort(_("cannot tag null revision"))
5325 raise error.Abort(_("cannot tag null revision"))
5330
5326
5331 tagsmod.tag(repo, names, r, message, opts.get('local'),
5327 tagsmod.tag(repo, names, r, message, opts.get('local'),
5332 opts.get('user'), date, editor=editor)
5328 opts.get('user'), date, editor=editor)
5333 finally:
5329 finally:
5334 release(lock, wlock)
5330 release(lock, wlock)
5335
5331
5336 @command('tags', formatteropts, '', cmdtype=readonly)
5332 @command('tags', formatteropts, '', cmdtype=readonly)
5337 def tags(ui, repo, **opts):
5333 def tags(ui, repo, **opts):
5338 """list repository tags
5334 """list repository tags
5339
5335
5340 This lists both regular and local tags. When the -v/--verbose
5336 This lists both regular and local tags. When the -v/--verbose
5341 switch is used, a third column "local" is printed for local tags.
5337 switch is used, a third column "local" is printed for local tags.
5342 When the -q/--quiet switch is used, only the tag name is printed.
5338 When the -q/--quiet switch is used, only the tag name is printed.
5343
5339
5344 Returns 0 on success.
5340 Returns 0 on success.
5345 """
5341 """
5346
5342
5347 opts = pycompat.byteskwargs(opts)
5343 opts = pycompat.byteskwargs(opts)
5348 ui.pager('tags')
5344 ui.pager('tags')
5349 fm = ui.formatter('tags', opts)
5345 fm = ui.formatter('tags', opts)
5350 hexfunc = fm.hexfunc
5346 hexfunc = fm.hexfunc
5351 tagtype = ""
5347 tagtype = ""
5352
5348
5353 for t, n in reversed(repo.tagslist()):
5349 for t, n in reversed(repo.tagslist()):
5354 hn = hexfunc(n)
5350 hn = hexfunc(n)
5355 label = 'tags.normal'
5351 label = 'tags.normal'
5356 tagtype = ''
5352 tagtype = ''
5357 if repo.tagtype(t) == 'local':
5353 if repo.tagtype(t) == 'local':
5358 label = 'tags.local'
5354 label = 'tags.local'
5359 tagtype = 'local'
5355 tagtype = 'local'
5360
5356
5361 fm.startitem()
5357 fm.startitem()
5362 fm.write('tag', '%s', t, label=label)
5358 fm.write('tag', '%s', t, label=label)
5363 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5359 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5364 fm.condwrite(not ui.quiet, 'rev node', fmt,
5360 fm.condwrite(not ui.quiet, 'rev node', fmt,
5365 repo.changelog.rev(n), hn, label=label)
5361 repo.changelog.rev(n), hn, label=label)
5366 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5362 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5367 tagtype, label=label)
5363 tagtype, label=label)
5368 fm.plain('\n')
5364 fm.plain('\n')
5369 fm.end()
5365 fm.end()
5370
5366
5371 @command('tip',
5367 @command('tip',
5372 [('p', 'patch', None, _('show patch')),
5368 [('p', 'patch', None, _('show patch')),
5373 ('g', 'git', None, _('use git extended diff format')),
5369 ('g', 'git', None, _('use git extended diff format')),
5374 ] + templateopts,
5370 ] + templateopts,
5375 _('[-p] [-g]'))
5371 _('[-p] [-g]'))
5376 def tip(ui, repo, **opts):
5372 def tip(ui, repo, **opts):
5377 """show the tip revision (DEPRECATED)
5373 """show the tip revision (DEPRECATED)
5378
5374
5379 The tip revision (usually just called the tip) is the changeset
5375 The tip revision (usually just called the tip) is the changeset
5380 most recently added to the repository (and therefore the most
5376 most recently added to the repository (and therefore the most
5381 recently changed head).
5377 recently changed head).
5382
5378
5383 If you have just made a commit, that commit will be the tip. If
5379 If you have just made a commit, that commit will be the tip. If
5384 you have just pulled changes from another repository, the tip of
5380 you have just pulled changes from another repository, the tip of
5385 that repository becomes the current tip. The "tip" tag is special
5381 that repository becomes the current tip. The "tip" tag is special
5386 and cannot be renamed or assigned to a different changeset.
5382 and cannot be renamed or assigned to a different changeset.
5387
5383
5388 This command is deprecated, please use :hg:`heads` instead.
5384 This command is deprecated, please use :hg:`heads` instead.
5389
5385
5390 Returns 0 on success.
5386 Returns 0 on success.
5391 """
5387 """
5392 opts = pycompat.byteskwargs(opts)
5388 opts = pycompat.byteskwargs(opts)
5393 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5389 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5394 displayer.show(repo['tip'])
5390 displayer.show(repo['tip'])
5395 displayer.close()
5391 displayer.close()
5396
5392
5397 @command('unbundle',
5393 @command('unbundle',
5398 [('u', 'update', None,
5394 [('u', 'update', None,
5399 _('update to new branch head if changesets were unbundled'))],
5395 _('update to new branch head if changesets were unbundled'))],
5400 _('[-u] FILE...'))
5396 _('[-u] FILE...'))
5401 def unbundle(ui, repo, fname1, *fnames, **opts):
5397 def unbundle(ui, repo, fname1, *fnames, **opts):
5402 """apply one or more bundle files
5398 """apply one or more bundle files
5403
5399
5404 Apply one or more bundle files generated by :hg:`bundle`.
5400 Apply one or more bundle files generated by :hg:`bundle`.
5405
5401
5406 Returns 0 on success, 1 if an update has unresolved files.
5402 Returns 0 on success, 1 if an update has unresolved files.
5407 """
5403 """
5408 fnames = (fname1,) + fnames
5404 fnames = (fname1,) + fnames
5409
5405
5410 with repo.lock():
5406 with repo.lock():
5411 for fname in fnames:
5407 for fname in fnames:
5412 f = hg.openpath(ui, fname)
5408 f = hg.openpath(ui, fname)
5413 gen = exchange.readbundle(ui, f, fname)
5409 gen = exchange.readbundle(ui, f, fname)
5414 if isinstance(gen, streamclone.streamcloneapplier):
5410 if isinstance(gen, streamclone.streamcloneapplier):
5415 raise error.Abort(
5411 raise error.Abort(
5416 _('packed bundles cannot be applied with '
5412 _('packed bundles cannot be applied with '
5417 '"hg unbundle"'),
5413 '"hg unbundle"'),
5418 hint=_('use "hg debugapplystreamclonebundle"'))
5414 hint=_('use "hg debugapplystreamclonebundle"'))
5419 url = 'bundle:' + fname
5415 url = 'bundle:' + fname
5420 try:
5416 try:
5421 txnname = 'unbundle'
5417 txnname = 'unbundle'
5422 if not isinstance(gen, bundle2.unbundle20):
5418 if not isinstance(gen, bundle2.unbundle20):
5423 txnname = 'unbundle\n%s' % util.hidepassword(url)
5419 txnname = 'unbundle\n%s' % util.hidepassword(url)
5424 with repo.transaction(txnname) as tr:
5420 with repo.transaction(txnname) as tr:
5425 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5421 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5426 url=url)
5422 url=url)
5427 except error.BundleUnknownFeatureError as exc:
5423 except error.BundleUnknownFeatureError as exc:
5428 raise error.Abort(
5424 raise error.Abort(
5429 _('%s: unknown bundle feature, %s') % (fname, exc),
5425 _('%s: unknown bundle feature, %s') % (fname, exc),
5430 hint=_("see https://mercurial-scm.org/"
5426 hint=_("see https://mercurial-scm.org/"
5431 "wiki/BundleFeature for more "
5427 "wiki/BundleFeature for more "
5432 "information"))
5428 "information"))
5433 modheads = bundle2.combinechangegroupresults(op)
5429 modheads = bundle2.combinechangegroupresults(op)
5434
5430
5435 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5431 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5436
5432
5437 @command('^update|up|checkout|co',
5433 @command('^update|up|checkout|co',
5438 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5434 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5439 ('c', 'check', None, _('require clean working directory')),
5435 ('c', 'check', None, _('require clean working directory')),
5440 ('m', 'merge', None, _('merge uncommitted changes')),
5436 ('m', 'merge', None, _('merge uncommitted changes')),
5441 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5437 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5442 ('r', 'rev', '', _('revision'), _('REV'))
5438 ('r', 'rev', '', _('revision'), _('REV'))
5443 ] + mergetoolopts,
5439 ] + mergetoolopts,
5444 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5440 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5445 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5441 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5446 merge=None, tool=None):
5442 merge=None, tool=None):
5447 """update working directory (or switch revisions)
5443 """update working directory (or switch revisions)
5448
5444
5449 Update the repository's working directory to the specified
5445 Update the repository's working directory to the specified
5450 changeset. If no changeset is specified, update to the tip of the
5446 changeset. If no changeset is specified, update to the tip of the
5451 current named branch and move the active bookmark (see :hg:`help
5447 current named branch and move the active bookmark (see :hg:`help
5452 bookmarks`).
5448 bookmarks`).
5453
5449
5454 Update sets the working directory's parent revision to the specified
5450 Update sets the working directory's parent revision to the specified
5455 changeset (see :hg:`help parents`).
5451 changeset (see :hg:`help parents`).
5456
5452
5457 If the changeset is not a descendant or ancestor of the working
5453 If the changeset is not a descendant or ancestor of the working
5458 directory's parent and there are uncommitted changes, the update is
5454 directory's parent and there are uncommitted changes, the update is
5459 aborted. With the -c/--check option, the working directory is checked
5455 aborted. With the -c/--check option, the working directory is checked
5460 for uncommitted changes; if none are found, the working directory is
5456 for uncommitted changes; if none are found, the working directory is
5461 updated to the specified changeset.
5457 updated to the specified changeset.
5462
5458
5463 .. container:: verbose
5459 .. container:: verbose
5464
5460
5465 The -C/--clean, -c/--check, and -m/--merge options control what
5461 The -C/--clean, -c/--check, and -m/--merge options control what
5466 happens if the working directory contains uncommitted changes.
5462 happens if the working directory contains uncommitted changes.
5467 At most of one of them can be specified.
5463 At most of one of them can be specified.
5468
5464
5469 1. If no option is specified, and if
5465 1. If no option is specified, and if
5470 the requested changeset is an ancestor or descendant of
5466 the requested changeset is an ancestor or descendant of
5471 the working directory's parent, the uncommitted changes
5467 the working directory's parent, the uncommitted changes
5472 are merged into the requested changeset and the merged
5468 are merged into the requested changeset and the merged
5473 result is left uncommitted. If the requested changeset is
5469 result is left uncommitted. If the requested changeset is
5474 not an ancestor or descendant (that is, it is on another
5470 not an ancestor or descendant (that is, it is on another
5475 branch), the update is aborted and the uncommitted changes
5471 branch), the update is aborted and the uncommitted changes
5476 are preserved.
5472 are preserved.
5477
5473
5478 2. With the -m/--merge option, the update is allowed even if the
5474 2. With the -m/--merge option, the update is allowed even if the
5479 requested changeset is not an ancestor or descendant of
5475 requested changeset is not an ancestor or descendant of
5480 the working directory's parent.
5476 the working directory's parent.
5481
5477
5482 3. With the -c/--check option, the update is aborted and the
5478 3. With the -c/--check option, the update is aborted and the
5483 uncommitted changes are preserved.
5479 uncommitted changes are preserved.
5484
5480
5485 4. With the -C/--clean option, uncommitted changes are discarded and
5481 4. With the -C/--clean option, uncommitted changes are discarded and
5486 the working directory is updated to the requested changeset.
5482 the working directory is updated to the requested changeset.
5487
5483
5488 To cancel an uncommitted merge (and lose your changes), use
5484 To cancel an uncommitted merge (and lose your changes), use
5489 :hg:`merge --abort`.
5485 :hg:`merge --abort`.
5490
5486
5491 Use null as the changeset to remove the working directory (like
5487 Use null as the changeset to remove the working directory (like
5492 :hg:`clone -U`).
5488 :hg:`clone -U`).
5493
5489
5494 If you want to revert just one file to an older revision, use
5490 If you want to revert just one file to an older revision, use
5495 :hg:`revert [-r REV] NAME`.
5491 :hg:`revert [-r REV] NAME`.
5496
5492
5497 See :hg:`help dates` for a list of formats valid for -d/--date.
5493 See :hg:`help dates` for a list of formats valid for -d/--date.
5498
5494
5499 Returns 0 on success, 1 if there are unresolved files.
5495 Returns 0 on success, 1 if there are unresolved files.
5500 """
5496 """
5501 if rev and node:
5497 if rev and node:
5502 raise error.Abort(_("please specify just one revision"))
5498 raise error.Abort(_("please specify just one revision"))
5503
5499
5504 if ui.configbool('commands', 'update.requiredest'):
5500 if ui.configbool('commands', 'update.requiredest'):
5505 if not node and not rev and not date:
5501 if not node and not rev and not date:
5506 raise error.Abort(_('you must specify a destination'),
5502 raise error.Abort(_('you must specify a destination'),
5507 hint=_('for example: hg update ".::"'))
5503 hint=_('for example: hg update ".::"'))
5508
5504
5509 if rev is None or rev == '':
5505 if rev is None or rev == '':
5510 rev = node
5506 rev = node
5511
5507
5512 if date and rev is not None:
5508 if date and rev is not None:
5513 raise error.Abort(_("you can't specify a revision and a date"))
5509 raise error.Abort(_("you can't specify a revision and a date"))
5514
5510
5515 if len([x for x in (clean, check, merge) if x]) > 1:
5511 if len([x for x in (clean, check, merge) if x]) > 1:
5516 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5512 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5517 "or -m/--merge"))
5513 "or -m/--merge"))
5518
5514
5519 updatecheck = None
5515 updatecheck = None
5520 if check:
5516 if check:
5521 updatecheck = 'abort'
5517 updatecheck = 'abort'
5522 elif merge:
5518 elif merge:
5523 updatecheck = 'none'
5519 updatecheck = 'none'
5524
5520
5525 with repo.wlock():
5521 with repo.wlock():
5526 cmdutil.clearunfinished(repo)
5522 cmdutil.clearunfinished(repo)
5527
5523
5528 if date:
5524 if date:
5529 rev = cmdutil.finddate(ui, repo, date)
5525 rev = cmdutil.finddate(ui, repo, date)
5530
5526
5531 # if we defined a bookmark, we have to remember the original name
5527 # if we defined a bookmark, we have to remember the original name
5532 brev = rev
5528 brev = rev
5533 if rev:
5529 if rev:
5534 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5530 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5535 ctx = scmutil.revsingle(repo, rev, rev)
5531 ctx = scmutil.revsingle(repo, rev, rev)
5536 rev = ctx.rev()
5532 rev = ctx.rev()
5537 if ctx.hidden():
5533 if ctx.hidden():
5538 ctxstr = ctx.hex()[:12]
5534 ctxstr = ctx.hex()[:12]
5539 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr)
5535 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr)
5540
5536
5541 if ctx.obsolete():
5537 if ctx.obsolete():
5542 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5538 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5543 ui.warn("(%s)\n" % obsfatemsg)
5539 ui.warn("(%s)\n" % obsfatemsg)
5544
5540
5545 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5541 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5546
5542
5547 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5543 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5548 updatecheck=updatecheck)
5544 updatecheck=updatecheck)
5549
5545
5550 @command('verify', [])
5546 @command('verify', [])
5551 def verify(ui, repo):
5547 def verify(ui, repo):
5552 """verify the integrity of the repository
5548 """verify the integrity of the repository
5553
5549
5554 Verify the integrity of the current repository.
5550 Verify the integrity of the current repository.
5555
5551
5556 This will perform an extensive check of the repository's
5552 This will perform an extensive check of the repository's
5557 integrity, validating the hashes and checksums of each entry in
5553 integrity, validating the hashes and checksums of each entry in
5558 the changelog, manifest, and tracked files, as well as the
5554 the changelog, manifest, and tracked files, as well as the
5559 integrity of their crosslinks and indices.
5555 integrity of their crosslinks and indices.
5560
5556
5561 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5557 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5562 for more information about recovery from corruption of the
5558 for more information about recovery from corruption of the
5563 repository.
5559 repository.
5564
5560
5565 Returns 0 on success, 1 if errors are encountered.
5561 Returns 0 on success, 1 if errors are encountered.
5566 """
5562 """
5567 return hg.verify(repo)
5563 return hg.verify(repo)
5568
5564
5569 @command('version', [] + formatteropts, norepo=True, cmdtype=readonly)
5565 @command('version', [] + formatteropts, norepo=True, cmdtype=readonly)
5570 def version_(ui, **opts):
5566 def version_(ui, **opts):
5571 """output version and copyright information"""
5567 """output version and copyright information"""
5572 opts = pycompat.byteskwargs(opts)
5568 opts = pycompat.byteskwargs(opts)
5573 if ui.verbose:
5569 if ui.verbose:
5574 ui.pager('version')
5570 ui.pager('version')
5575 fm = ui.formatter("version", opts)
5571 fm = ui.formatter("version", opts)
5576 fm.startitem()
5572 fm.startitem()
5577 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5573 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5578 util.version())
5574 util.version())
5579 license = _(
5575 license = _(
5580 "(see https://mercurial-scm.org for more information)\n"
5576 "(see https://mercurial-scm.org for more information)\n"
5581 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5577 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5582 "This is free software; see the source for copying conditions. "
5578 "This is free software; see the source for copying conditions. "
5583 "There is NO\nwarranty; "
5579 "There is NO\nwarranty; "
5584 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5580 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5585 )
5581 )
5586 if not ui.quiet:
5582 if not ui.quiet:
5587 fm.plain(license)
5583 fm.plain(license)
5588
5584
5589 if ui.verbose:
5585 if ui.verbose:
5590 fm.plain(_("\nEnabled extensions:\n\n"))
5586 fm.plain(_("\nEnabled extensions:\n\n"))
5591 # format names and versions into columns
5587 # format names and versions into columns
5592 names = []
5588 names = []
5593 vers = []
5589 vers = []
5594 isinternals = []
5590 isinternals = []
5595 for name, module in extensions.extensions():
5591 for name, module in extensions.extensions():
5596 names.append(name)
5592 names.append(name)
5597 vers.append(extensions.moduleversion(module) or None)
5593 vers.append(extensions.moduleversion(module) or None)
5598 isinternals.append(extensions.ismoduleinternal(module))
5594 isinternals.append(extensions.ismoduleinternal(module))
5599 fn = fm.nested("extensions")
5595 fn = fm.nested("extensions")
5600 if names:
5596 if names:
5601 namefmt = " %%-%ds " % max(len(n) for n in names)
5597 namefmt = " %%-%ds " % max(len(n) for n in names)
5602 places = [_("external"), _("internal")]
5598 places = [_("external"), _("internal")]
5603 for n, v, p in zip(names, vers, isinternals):
5599 for n, v, p in zip(names, vers, isinternals):
5604 fn.startitem()
5600 fn.startitem()
5605 fn.condwrite(ui.verbose, "name", namefmt, n)
5601 fn.condwrite(ui.verbose, "name", namefmt, n)
5606 if ui.verbose:
5602 if ui.verbose:
5607 fn.plain("%s " % places[p])
5603 fn.plain("%s " % places[p])
5608 fn.data(bundled=p)
5604 fn.data(bundled=p)
5609 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5605 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5610 if ui.verbose:
5606 if ui.verbose:
5611 fn.plain("\n")
5607 fn.plain("\n")
5612 fn.end()
5608 fn.end()
5613 fm.end()
5609 fm.end()
5614
5610
5615 def loadcmdtable(ui, name, cmdtable):
5611 def loadcmdtable(ui, name, cmdtable):
5616 """Load command functions from specified cmdtable
5612 """Load command functions from specified cmdtable
5617 """
5613 """
5618 overrides = [cmd for cmd in cmdtable if cmd in table]
5614 overrides = [cmd for cmd in cmdtable if cmd in table]
5619 if overrides:
5615 if overrides:
5620 ui.warn(_("extension '%s' overrides commands: %s\n")
5616 ui.warn(_("extension '%s' overrides commands: %s\n")
5621 % (name, " ".join(overrides)))
5617 % (name, " ".join(overrides)))
5622 table.update(cmdtable)
5618 table.update(cmdtable)
@@ -1,940 +1,933 b''
1 # logcmdutil.py - utility for log-like commands
1 # logcmdutil.py - utility for log-like commands
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 itertools
10 import itertools
11 import os
11 import os
12
12
13 from .i18n import _
13 from .i18n import _
14 from .node import (
14 from .node import (
15 hex,
15 hex,
16 nullid,
16 nullid,
17 )
17 )
18
18
19 from . import (
19 from . import (
20 dagop,
20 dagop,
21 encoding,
21 encoding,
22 error,
22 error,
23 formatter,
23 formatter,
24 graphmod,
24 graphmod,
25 match as matchmod,
25 match as matchmod,
26 mdiff,
26 mdiff,
27 patch,
27 patch,
28 pathutil,
28 pathutil,
29 pycompat,
29 pycompat,
30 revset,
30 revset,
31 revsetlang,
31 revsetlang,
32 scmutil,
32 scmutil,
33 smartset,
33 smartset,
34 templatekw,
34 templatekw,
35 templater,
35 templater,
36 util,
36 util,
37 )
37 )
38
38
39 def getlimit(opts):
39 def getlimit(opts):
40 """get the log limit according to option -l/--limit"""
40 """get the log limit according to option -l/--limit"""
41 limit = opts.get('limit')
41 limit = opts.get('limit')
42 if limit:
42 if limit:
43 try:
43 try:
44 limit = int(limit)
44 limit = int(limit)
45 except ValueError:
45 except ValueError:
46 raise error.Abort(_('limit must be a positive integer'))
46 raise error.Abort(_('limit must be a positive integer'))
47 if limit <= 0:
47 if limit <= 0:
48 raise error.Abort(_('limit must be positive'))
48 raise error.Abort(_('limit must be positive'))
49 else:
49 else:
50 limit = None
50 limit = None
51 return limit
51 return limit
52
52
53 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
53 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
54 changes=None, stat=False, fp=None, prefix='',
54 changes=None, stat=False, fp=None, prefix='',
55 root='', listsubrepos=False, hunksfilterfn=None):
55 root='', listsubrepos=False, hunksfilterfn=None):
56 '''show diff or diffstat.'''
56 '''show diff or diffstat.'''
57 if fp is None:
57 if fp is None:
58 write = ui.write
58 write = ui.write
59 else:
59 else:
60 def write(s, **kw):
60 def write(s, **kw):
61 fp.write(s)
61 fp.write(s)
62
62
63 if root:
63 if root:
64 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
64 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
65 else:
65 else:
66 relroot = ''
66 relroot = ''
67 if relroot != '':
67 if relroot != '':
68 # XXX relative roots currently don't work if the root is within a
68 # XXX relative roots currently don't work if the root is within a
69 # subrepo
69 # subrepo
70 uirelroot = match.uipath(relroot)
70 uirelroot = match.uipath(relroot)
71 relroot += '/'
71 relroot += '/'
72 for matchroot in match.files():
72 for matchroot in match.files():
73 if not matchroot.startswith(relroot):
73 if not matchroot.startswith(relroot):
74 ui.warn(_('warning: %s not inside relative root %s\n') % (
74 ui.warn(_('warning: %s not inside relative root %s\n') % (
75 match.uipath(matchroot), uirelroot))
75 match.uipath(matchroot), uirelroot))
76
76
77 if stat:
77 if stat:
78 diffopts = diffopts.copy(context=0, noprefix=False)
78 diffopts = diffopts.copy(context=0, noprefix=False)
79 width = 80
79 width = 80
80 if not ui.plain():
80 if not ui.plain():
81 width = ui.termwidth()
81 width = ui.termwidth()
82
82
83 chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts,
83 chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts,
84 prefix=prefix, relroot=relroot,
84 prefix=prefix, relroot=relroot,
85 hunksfilterfn=hunksfilterfn)
85 hunksfilterfn=hunksfilterfn)
86
86
87 if fp is not None or ui.canwritewithoutlabels():
87 if fp is not None or ui.canwritewithoutlabels():
88 if stat:
88 if stat:
89 chunks = patch.diffstat(util.iterlines(chunks), width=width)
89 chunks = patch.diffstat(util.iterlines(chunks), width=width)
90 for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
90 for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
91 write(chunk)
91 write(chunk)
92 else:
92 else:
93 if stat:
93 if stat:
94 chunks = patch.diffstatui(util.iterlines(chunks), width=width)
94 chunks = patch.diffstatui(util.iterlines(chunks), width=width)
95 else:
95 else:
96 chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks,
96 chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks,
97 opts=diffopts)
97 opts=diffopts)
98 if ui.canbatchlabeledwrites():
98 if ui.canbatchlabeledwrites():
99 def gen():
99 def gen():
100 for chunk, label in chunks:
100 for chunk, label in chunks:
101 yield ui.label(chunk, label=label)
101 yield ui.label(chunk, label=label)
102 for chunk in util.filechunkiter(util.chunkbuffer(gen())):
102 for chunk in util.filechunkiter(util.chunkbuffer(gen())):
103 write(chunk)
103 write(chunk)
104 else:
104 else:
105 for chunk, label in chunks:
105 for chunk, label in chunks:
106 write(chunk, label=label)
106 write(chunk, label=label)
107
107
108 if listsubrepos:
108 if listsubrepos:
109 ctx1 = repo[node1]
109 ctx1 = repo[node1]
110 ctx2 = repo[node2]
110 ctx2 = repo[node2]
111 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
111 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
112 tempnode2 = node2
112 tempnode2 = node2
113 try:
113 try:
114 if node2 is not None:
114 if node2 is not None:
115 tempnode2 = ctx2.substate[subpath][1]
115 tempnode2 = ctx2.substate[subpath][1]
116 except KeyError:
116 except KeyError:
117 # A subrepo that existed in node1 was deleted between node1 and
117 # A subrepo that existed in node1 was deleted between node1 and
118 # node2 (inclusive). Thus, ctx2's substate won't contain that
118 # node2 (inclusive). Thus, ctx2's substate won't contain that
119 # subpath. The best we can do is to ignore it.
119 # subpath. The best we can do is to ignore it.
120 tempnode2 = None
120 tempnode2 = None
121 submatch = matchmod.subdirmatcher(subpath, match)
121 submatch = matchmod.subdirmatcher(subpath, match)
122 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
122 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
123 stat=stat, fp=fp, prefix=prefix)
123 stat=stat, fp=fp, prefix=prefix)
124
124
125 class changesetdiffer(object):
126 """Generate diff of changeset with pre-configured filtering functions"""
127
128 def _makefilematcher(self, ctx):
129 return scmutil.matchall(ctx.repo())
130
131 def _makehunksfilter(self, ctx):
132 return None
133
134 def showdiff(self, ui, ctx, diffopts, stat=False):
135 repo = ctx.repo()
136 node = ctx.node()
137 prev = ctx.p1().node()
138 diffordiffstat(ui, repo, diffopts, prev, node,
139 match=self._makefilematcher(ctx), stat=stat,
140 hunksfilterfn=self._makehunksfilter(ctx))
141
125 def changesetlabels(ctx):
142 def changesetlabels(ctx):
126 labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
143 labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
127 if ctx.obsolete():
144 if ctx.obsolete():
128 labels.append('changeset.obsolete')
145 labels.append('changeset.obsolete')
129 if ctx.isunstable():
146 if ctx.isunstable():
130 labels.append('changeset.unstable')
147 labels.append('changeset.unstable')
131 for instability in ctx.instabilities():
148 for instability in ctx.instabilities():
132 labels.append('instability.%s' % instability)
149 labels.append('instability.%s' % instability)
133 return ' '.join(labels)
150 return ' '.join(labels)
134
151
135 class changesetprinter(object):
152 class changesetprinter(object):
136 '''show changeset information when templating not requested.'''
153 '''show changeset information when templating not requested.'''
137
154
138 def __init__(self, ui, repo, makefilematcher=None, makehunksfilter=None,
155 def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False):
139 diffopts=None, buffered=False):
140 self.ui = ui
156 self.ui = ui
141 self.repo = repo
157 self.repo = repo
142 self.buffered = buffered
158 self.buffered = buffered
143 self._makefilematcher = makefilematcher or (lambda ctx: None)
159 self._differ = differ or changesetdiffer()
144 self._makehunksfilter = makehunksfilter or (lambda ctx: None)
145 self.diffopts = diffopts or {}
160 self.diffopts = diffopts or {}
146 self.header = {}
161 self.header = {}
147 self.hunk = {}
162 self.hunk = {}
148 self.lastheader = None
163 self.lastheader = None
149 self.footer = None
164 self.footer = None
150 self._columns = templatekw.getlogcolumns()
165 self._columns = templatekw.getlogcolumns()
151
166
152 def flush(self, ctx):
167 def flush(self, ctx):
153 rev = ctx.rev()
168 rev = ctx.rev()
154 if rev in self.header:
169 if rev in self.header:
155 h = self.header[rev]
170 h = self.header[rev]
156 if h != self.lastheader:
171 if h != self.lastheader:
157 self.lastheader = h
172 self.lastheader = h
158 self.ui.write(h)
173 self.ui.write(h)
159 del self.header[rev]
174 del self.header[rev]
160 if rev in self.hunk:
175 if rev in self.hunk:
161 self.ui.write(self.hunk[rev])
176 self.ui.write(self.hunk[rev])
162 del self.hunk[rev]
177 del self.hunk[rev]
163
178
164 def close(self):
179 def close(self):
165 if self.footer:
180 if self.footer:
166 self.ui.write(self.footer)
181 self.ui.write(self.footer)
167
182
168 def show(self, ctx, copies=None, **props):
183 def show(self, ctx, copies=None, **props):
169 props = pycompat.byteskwargs(props)
184 props = pycompat.byteskwargs(props)
170 if self.buffered:
185 if self.buffered:
171 self.ui.pushbuffer(labeled=True)
186 self.ui.pushbuffer(labeled=True)
172 self._show(ctx, copies, props)
187 self._show(ctx, copies, props)
173 self.hunk[ctx.rev()] = self.ui.popbuffer()
188 self.hunk[ctx.rev()] = self.ui.popbuffer()
174 else:
189 else:
175 self._show(ctx, copies, props)
190 self._show(ctx, copies, props)
176
191
177 def _show(self, ctx, copies, props):
192 def _show(self, ctx, copies, props):
178 '''show a single changeset or file revision'''
193 '''show a single changeset or file revision'''
179 changenode = ctx.node()
194 changenode = ctx.node()
180 rev = ctx.rev()
195 rev = ctx.rev()
181
196
182 if self.ui.quiet:
197 if self.ui.quiet:
183 self.ui.write("%s\n" % scmutil.formatchangeid(ctx),
198 self.ui.write("%s\n" % scmutil.formatchangeid(ctx),
184 label='log.node')
199 label='log.node')
185 return
200 return
186
201
187 columns = self._columns
202 columns = self._columns
188 self.ui.write(columns['changeset'] % scmutil.formatchangeid(ctx),
203 self.ui.write(columns['changeset'] % scmutil.formatchangeid(ctx),
189 label=changesetlabels(ctx))
204 label=changesetlabels(ctx))
190
205
191 # branches are shown first before any other names due to backwards
206 # branches are shown first before any other names due to backwards
192 # compatibility
207 # compatibility
193 branch = ctx.branch()
208 branch = ctx.branch()
194 # don't show the default branch name
209 # don't show the default branch name
195 if branch != 'default':
210 if branch != 'default':
196 self.ui.write(columns['branch'] % branch, label='log.branch')
211 self.ui.write(columns['branch'] % branch, label='log.branch')
197
212
198 for nsname, ns in self.repo.names.iteritems():
213 for nsname, ns in self.repo.names.iteritems():
199 # branches has special logic already handled above, so here we just
214 # branches has special logic already handled above, so here we just
200 # skip it
215 # skip it
201 if nsname == 'branches':
216 if nsname == 'branches':
202 continue
217 continue
203 # we will use the templatename as the color name since those two
218 # we will use the templatename as the color name since those two
204 # should be the same
219 # should be the same
205 for name in ns.names(self.repo, changenode):
220 for name in ns.names(self.repo, changenode):
206 self.ui.write(ns.logfmt % name,
221 self.ui.write(ns.logfmt % name,
207 label='log.%s' % ns.colorname)
222 label='log.%s' % ns.colorname)
208 if self.ui.debugflag:
223 if self.ui.debugflag:
209 self.ui.write(columns['phase'] % ctx.phasestr(), label='log.phase')
224 self.ui.write(columns['phase'] % ctx.phasestr(), label='log.phase')
210 for pctx in scmutil.meaningfulparents(self.repo, ctx):
225 for pctx in scmutil.meaningfulparents(self.repo, ctx):
211 label = 'log.parent changeset.%s' % pctx.phasestr()
226 label = 'log.parent changeset.%s' % pctx.phasestr()
212 self.ui.write(columns['parent'] % scmutil.formatchangeid(pctx),
227 self.ui.write(columns['parent'] % scmutil.formatchangeid(pctx),
213 label=label)
228 label=label)
214
229
215 if self.ui.debugflag and rev is not None:
230 if self.ui.debugflag and rev is not None:
216 mnode = ctx.manifestnode()
231 mnode = ctx.manifestnode()
217 mrev = self.repo.manifestlog._revlog.rev(mnode)
232 mrev = self.repo.manifestlog._revlog.rev(mnode)
218 self.ui.write(columns['manifest']
233 self.ui.write(columns['manifest']
219 % scmutil.formatrevnode(self.ui, mrev, mnode),
234 % scmutil.formatrevnode(self.ui, mrev, mnode),
220 label='ui.debug log.manifest')
235 label='ui.debug log.manifest')
221 self.ui.write(columns['user'] % ctx.user(), label='log.user')
236 self.ui.write(columns['user'] % ctx.user(), label='log.user')
222 self.ui.write(columns['date'] % util.datestr(ctx.date()),
237 self.ui.write(columns['date'] % util.datestr(ctx.date()),
223 label='log.date')
238 label='log.date')
224
239
225 if ctx.isunstable():
240 if ctx.isunstable():
226 instabilities = ctx.instabilities()
241 instabilities = ctx.instabilities()
227 self.ui.write(columns['instability'] % ', '.join(instabilities),
242 self.ui.write(columns['instability'] % ', '.join(instabilities),
228 label='log.instability')
243 label='log.instability')
229
244
230 elif ctx.obsolete():
245 elif ctx.obsolete():
231 self._showobsfate(ctx)
246 self._showobsfate(ctx)
232
247
233 self._exthook(ctx)
248 self._exthook(ctx)
234
249
235 if self.ui.debugflag:
250 if self.ui.debugflag:
236 files = ctx.p1().status(ctx)[:3]
251 files = ctx.p1().status(ctx)[:3]
237 for key, value in zip(['files', 'files+', 'files-'], files):
252 for key, value in zip(['files', 'files+', 'files-'], files):
238 if value:
253 if value:
239 self.ui.write(columns[key] % " ".join(value),
254 self.ui.write(columns[key] % " ".join(value),
240 label='ui.debug log.files')
255 label='ui.debug log.files')
241 elif ctx.files() and self.ui.verbose:
256 elif ctx.files() and self.ui.verbose:
242 self.ui.write(columns['files'] % " ".join(ctx.files()),
257 self.ui.write(columns['files'] % " ".join(ctx.files()),
243 label='ui.note log.files')
258 label='ui.note log.files')
244 if copies and self.ui.verbose:
259 if copies and self.ui.verbose:
245 copies = ['%s (%s)' % c for c in copies]
260 copies = ['%s (%s)' % c for c in copies]
246 self.ui.write(columns['copies'] % ' '.join(copies),
261 self.ui.write(columns['copies'] % ' '.join(copies),
247 label='ui.note log.copies')
262 label='ui.note log.copies')
248
263
249 extra = ctx.extra()
264 extra = ctx.extra()
250 if extra and self.ui.debugflag:
265 if extra and self.ui.debugflag:
251 for key, value in sorted(extra.items()):
266 for key, value in sorted(extra.items()):
252 self.ui.write(columns['extra'] % (key, util.escapestr(value)),
267 self.ui.write(columns['extra'] % (key, util.escapestr(value)),
253 label='ui.debug log.extra')
268 label='ui.debug log.extra')
254
269
255 description = ctx.description().strip()
270 description = ctx.description().strip()
256 if description:
271 if description:
257 if self.ui.verbose:
272 if self.ui.verbose:
258 self.ui.write(_("description:\n"),
273 self.ui.write(_("description:\n"),
259 label='ui.note log.description')
274 label='ui.note log.description')
260 self.ui.write(description,
275 self.ui.write(description,
261 label='ui.note log.description')
276 label='ui.note log.description')
262 self.ui.write("\n\n")
277 self.ui.write("\n\n")
263 else:
278 else:
264 self.ui.write(columns['summary'] % description.splitlines()[0],
279 self.ui.write(columns['summary'] % description.splitlines()[0],
265 label='log.summary')
280 label='log.summary')
266 self.ui.write("\n")
281 self.ui.write("\n")
267
282
268 self._showpatch(ctx)
283 self._showpatch(ctx)
269
284
270 def _showobsfate(self, ctx):
285 def _showobsfate(self, ctx):
271 obsfate = templatekw.showobsfate(repo=self.repo, ctx=ctx, ui=self.ui)
286 obsfate = templatekw.showobsfate(repo=self.repo, ctx=ctx, ui=self.ui)
272
287
273 if obsfate:
288 if obsfate:
274 for obsfateline in obsfate:
289 for obsfateline in obsfate:
275 self.ui.write(self._columns['obsolete'] % obsfateline,
290 self.ui.write(self._columns['obsolete'] % obsfateline,
276 label='log.obsfate')
291 label='log.obsfate')
277
292
278 def _exthook(self, ctx):
293 def _exthook(self, ctx):
279 '''empty method used by extension as a hook point
294 '''empty method used by extension as a hook point
280 '''
295 '''
281
296
282 def _showpatch(self, ctx):
297 def _showpatch(self, ctx):
283 matchfn = self._makefilematcher(ctx)
284 hunksfilterfn = self._makehunksfilter(ctx)
285 if not matchfn:
286 return
287 stat = self.diffopts.get('stat')
298 stat = self.diffopts.get('stat')
288 diff = self.diffopts.get('patch')
299 diff = self.diffopts.get('patch')
289 diffopts = patch.diffallopts(self.ui, self.diffopts)
300 diffopts = patch.diffallopts(self.ui, self.diffopts)
290 node = ctx.node()
291 prev = ctx.p1().node()
292 if stat:
301 if stat:
293 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
302 self._differ.showdiff(self.ui, ctx, diffopts, stat=True)
294 match=matchfn, stat=True,
295 hunksfilterfn=hunksfilterfn)
296 if stat and diff:
303 if stat and diff:
297 self.ui.write("\n")
304 self.ui.write("\n")
298 if diff:
305 if diff:
299 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
306 self._differ.showdiff(self.ui, ctx, diffopts, stat=False)
300 match=matchfn, stat=False,
301 hunksfilterfn=hunksfilterfn)
302 if stat or diff:
307 if stat or diff:
303 self.ui.write("\n")
308 self.ui.write("\n")
304
309
305 class jsonchangeset(changesetprinter):
310 class jsonchangeset(changesetprinter):
306 '''format changeset information.'''
311 '''format changeset information.'''
307
312
308 def __init__(self, ui, repo, makefilematcher=None, makehunksfilter=None,
313 def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False):
309 diffopts=None, buffered=False):
314 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
310 changesetprinter.__init__(self, ui, repo, makefilematcher,
311 makehunksfilter, diffopts, buffered)
312 self.cache = {}
315 self.cache = {}
313 self._first = True
316 self._first = True
314
317
315 def close(self):
318 def close(self):
316 if not self._first:
319 if not self._first:
317 self.ui.write("\n]\n")
320 self.ui.write("\n]\n")
318 else:
321 else:
319 self.ui.write("[]\n")
322 self.ui.write("[]\n")
320
323
321 def _show(self, ctx, copies, props):
324 def _show(self, ctx, copies, props):
322 '''show a single changeset or file revision'''
325 '''show a single changeset or file revision'''
323 rev = ctx.rev()
326 rev = ctx.rev()
324 if rev is None:
327 if rev is None:
325 jrev = jnode = 'null'
328 jrev = jnode = 'null'
326 else:
329 else:
327 jrev = '%d' % rev
330 jrev = '%d' % rev
328 jnode = '"%s"' % hex(ctx.node())
331 jnode = '"%s"' % hex(ctx.node())
329 j = encoding.jsonescape
332 j = encoding.jsonescape
330
333
331 if self._first:
334 if self._first:
332 self.ui.write("[\n {")
335 self.ui.write("[\n {")
333 self._first = False
336 self._first = False
334 else:
337 else:
335 self.ui.write(",\n {")
338 self.ui.write(",\n {")
336
339
337 if self.ui.quiet:
340 if self.ui.quiet:
338 self.ui.write(('\n "rev": %s') % jrev)
341 self.ui.write(('\n "rev": %s') % jrev)
339 self.ui.write((',\n "node": %s') % jnode)
342 self.ui.write((',\n "node": %s') % jnode)
340 self.ui.write('\n }')
343 self.ui.write('\n }')
341 return
344 return
342
345
343 self.ui.write(('\n "rev": %s') % jrev)
346 self.ui.write(('\n "rev": %s') % jrev)
344 self.ui.write((',\n "node": %s') % jnode)
347 self.ui.write((',\n "node": %s') % jnode)
345 self.ui.write((',\n "branch": "%s"') % j(ctx.branch()))
348 self.ui.write((',\n "branch": "%s"') % j(ctx.branch()))
346 self.ui.write((',\n "phase": "%s"') % ctx.phasestr())
349 self.ui.write((',\n "phase": "%s"') % ctx.phasestr())
347 self.ui.write((',\n "user": "%s"') % j(ctx.user()))
350 self.ui.write((',\n "user": "%s"') % j(ctx.user()))
348 self.ui.write((',\n "date": [%d, %d]') % ctx.date())
351 self.ui.write((',\n "date": [%d, %d]') % ctx.date())
349 self.ui.write((',\n "desc": "%s"') % j(ctx.description()))
352 self.ui.write((',\n "desc": "%s"') % j(ctx.description()))
350
353
351 self.ui.write((',\n "bookmarks": [%s]') %
354 self.ui.write((',\n "bookmarks": [%s]') %
352 ", ".join('"%s"' % j(b) for b in ctx.bookmarks()))
355 ", ".join('"%s"' % j(b) for b in ctx.bookmarks()))
353 self.ui.write((',\n "tags": [%s]') %
356 self.ui.write((',\n "tags": [%s]') %
354 ", ".join('"%s"' % j(t) for t in ctx.tags()))
357 ", ".join('"%s"' % j(t) for t in ctx.tags()))
355 self.ui.write((',\n "parents": [%s]') %
358 self.ui.write((',\n "parents": [%s]') %
356 ", ".join('"%s"' % c.hex() for c in ctx.parents()))
359 ", ".join('"%s"' % c.hex() for c in ctx.parents()))
357
360
358 if self.ui.debugflag:
361 if self.ui.debugflag:
359 if rev is None:
362 if rev is None:
360 jmanifestnode = 'null'
363 jmanifestnode = 'null'
361 else:
364 else:
362 jmanifestnode = '"%s"' % hex(ctx.manifestnode())
365 jmanifestnode = '"%s"' % hex(ctx.manifestnode())
363 self.ui.write((',\n "manifest": %s') % jmanifestnode)
366 self.ui.write((',\n "manifest": %s') % jmanifestnode)
364
367
365 self.ui.write((',\n "extra": {%s}') %
368 self.ui.write((',\n "extra": {%s}') %
366 ", ".join('"%s": "%s"' % (j(k), j(v))
369 ", ".join('"%s": "%s"' % (j(k), j(v))
367 for k, v in ctx.extra().items()))
370 for k, v in ctx.extra().items()))
368
371
369 files = ctx.p1().status(ctx)
372 files = ctx.p1().status(ctx)
370 self.ui.write((',\n "modified": [%s]') %
373 self.ui.write((',\n "modified": [%s]') %
371 ", ".join('"%s"' % j(f) for f in files[0]))
374 ", ".join('"%s"' % j(f) for f in files[0]))
372 self.ui.write((',\n "added": [%s]') %
375 self.ui.write((',\n "added": [%s]') %
373 ", ".join('"%s"' % j(f) for f in files[1]))
376 ", ".join('"%s"' % j(f) for f in files[1]))
374 self.ui.write((',\n "removed": [%s]') %
377 self.ui.write((',\n "removed": [%s]') %
375 ", ".join('"%s"' % j(f) for f in files[2]))
378 ", ".join('"%s"' % j(f) for f in files[2]))
376
379
377 elif self.ui.verbose:
380 elif self.ui.verbose:
378 self.ui.write((',\n "files": [%s]') %
381 self.ui.write((',\n "files": [%s]') %
379 ", ".join('"%s"' % j(f) for f in ctx.files()))
382 ", ".join('"%s"' % j(f) for f in ctx.files()))
380
383
381 if copies:
384 if copies:
382 self.ui.write((',\n "copies": {%s}') %
385 self.ui.write((',\n "copies": {%s}') %
383 ", ".join('"%s": "%s"' % (j(k), j(v))
386 ", ".join('"%s": "%s"' % (j(k), j(v))
384 for k, v in copies))
387 for k, v in copies))
385
388
386 matchfn = self._makefilematcher(ctx)
387 stat = self.diffopts.get('stat')
389 stat = self.diffopts.get('stat')
388 diff = self.diffopts.get('patch')
390 diff = self.diffopts.get('patch')
389 diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
391 diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
390 node, prev = ctx.node(), ctx.p1().node()
392 if stat:
391 if matchfn and stat:
392 self.ui.pushbuffer()
393 self.ui.pushbuffer()
393 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
394 self._differ.showdiff(self.ui, ctx, diffopts, stat=True)
394 match=matchfn, stat=True)
395 self.ui.write((',\n "diffstat": "%s"')
395 self.ui.write((',\n "diffstat": "%s"')
396 % j(self.ui.popbuffer()))
396 % j(self.ui.popbuffer()))
397 if matchfn and diff:
397 if diff:
398 self.ui.pushbuffer()
398 self.ui.pushbuffer()
399 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
399 self._differ.showdiff(self.ui, ctx, diffopts, stat=False)
400 match=matchfn, stat=False)
401 self.ui.write((',\n "diff": "%s"') % j(self.ui.popbuffer()))
400 self.ui.write((',\n "diff": "%s"') % j(self.ui.popbuffer()))
402
401
403 self.ui.write("\n }")
402 self.ui.write("\n }")
404
403
405 class changesettemplater(changesetprinter):
404 class changesettemplater(changesetprinter):
406 '''format changeset information.
405 '''format changeset information.
407
406
408 Note: there are a variety of convenience functions to build a
407 Note: there are a variety of convenience functions to build a
409 changesettemplater for common cases. See functions such as:
408 changesettemplater for common cases. See functions such as:
410 maketemplater, changesetdisplayer, buildcommittemplate, or other
409 maketemplater, changesetdisplayer, buildcommittemplate, or other
411 functions that use changesest_templater.
410 functions that use changesest_templater.
412 '''
411 '''
413
412
414 # Arguments before "buffered" used to be positional. Consider not
413 # Arguments before "buffered" used to be positional. Consider not
415 # adding/removing arguments before "buffered" to not break callers.
414 # adding/removing arguments before "buffered" to not break callers.
416 def __init__(self, ui, repo, tmplspec, makefilematcher=None,
415 def __init__(self, ui, repo, tmplspec, differ=None, diffopts=None,
417 makehunksfilter=None, diffopts=None, buffered=False):
416 buffered=False):
418 changesetprinter.__init__(self, ui, repo, makefilematcher,
417 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
419 makehunksfilter, diffopts, buffered)
420 tres = formatter.templateresources(ui, repo)
418 tres = formatter.templateresources(ui, repo)
421 self.t = formatter.loadtemplater(ui, tmplspec,
419 self.t = formatter.loadtemplater(ui, tmplspec,
422 defaults=templatekw.keywords,
420 defaults=templatekw.keywords,
423 resources=tres,
421 resources=tres,
424 cache=templatekw.defaulttempl)
422 cache=templatekw.defaulttempl)
425 self._counter = itertools.count()
423 self._counter = itertools.count()
426 self.cache = tres['cache'] # shared with _graphnodeformatter()
424 self.cache = tres['cache'] # shared with _graphnodeformatter()
427
425
428 self._tref = tmplspec.ref
426 self._tref = tmplspec.ref
429 self._parts = {'header': '', 'footer': '',
427 self._parts = {'header': '', 'footer': '',
430 tmplspec.ref: tmplspec.ref,
428 tmplspec.ref: tmplspec.ref,
431 'docheader': '', 'docfooter': '',
429 'docheader': '', 'docfooter': '',
432 'separator': ''}
430 'separator': ''}
433 if tmplspec.mapfile:
431 if tmplspec.mapfile:
434 # find correct templates for current mode, for backward
432 # find correct templates for current mode, for backward
435 # compatibility with 'log -v/-q/--debug' using a mapfile
433 # compatibility with 'log -v/-q/--debug' using a mapfile
436 tmplmodes = [
434 tmplmodes = [
437 (True, ''),
435 (True, ''),
438 (self.ui.verbose, '_verbose'),
436 (self.ui.verbose, '_verbose'),
439 (self.ui.quiet, '_quiet'),
437 (self.ui.quiet, '_quiet'),
440 (self.ui.debugflag, '_debug'),
438 (self.ui.debugflag, '_debug'),
441 ]
439 ]
442 for mode, postfix in tmplmodes:
440 for mode, postfix in tmplmodes:
443 for t in self._parts:
441 for t in self._parts:
444 cur = t + postfix
442 cur = t + postfix
445 if mode and cur in self.t:
443 if mode and cur in self.t:
446 self._parts[t] = cur
444 self._parts[t] = cur
447 else:
445 else:
448 partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
446 partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
449 m = formatter.templatepartsmap(tmplspec, self.t, partnames)
447 m = formatter.templatepartsmap(tmplspec, self.t, partnames)
450 self._parts.update(m)
448 self._parts.update(m)
451
449
452 if self._parts['docheader']:
450 if self._parts['docheader']:
453 self.ui.write(templater.stringify(self.t(self._parts['docheader'])))
451 self.ui.write(templater.stringify(self.t(self._parts['docheader'])))
454
452
455 def close(self):
453 def close(self):
456 if self._parts['docfooter']:
454 if self._parts['docfooter']:
457 if not self.footer:
455 if not self.footer:
458 self.footer = ""
456 self.footer = ""
459 self.footer += templater.stringify(self.t(self._parts['docfooter']))
457 self.footer += templater.stringify(self.t(self._parts['docfooter']))
460 return super(changesettemplater, self).close()
458 return super(changesettemplater, self).close()
461
459
462 def _show(self, ctx, copies, props):
460 def _show(self, ctx, copies, props):
463 '''show a single changeset or file revision'''
461 '''show a single changeset or file revision'''
464 props = props.copy()
462 props = props.copy()
465 props['ctx'] = ctx
463 props['ctx'] = ctx
466 props['index'] = index = next(self._counter)
464 props['index'] = index = next(self._counter)
467 props['revcache'] = {'copies': copies}
465 props['revcache'] = {'copies': copies}
468 props = pycompat.strkwargs(props)
466 props = pycompat.strkwargs(props)
469
467
470 # write separator, which wouldn't work well with the header part below
468 # write separator, which wouldn't work well with the header part below
471 # since there's inherently a conflict between header (across items) and
469 # since there's inherently a conflict between header (across items) and
472 # separator (per item)
470 # separator (per item)
473 if self._parts['separator'] and index > 0:
471 if self._parts['separator'] and index > 0:
474 self.ui.write(templater.stringify(self.t(self._parts['separator'])))
472 self.ui.write(templater.stringify(self.t(self._parts['separator'])))
475
473
476 # write header
474 # write header
477 if self._parts['header']:
475 if self._parts['header']:
478 h = templater.stringify(self.t(self._parts['header'], **props))
476 h = templater.stringify(self.t(self._parts['header'], **props))
479 if self.buffered:
477 if self.buffered:
480 self.header[ctx.rev()] = h
478 self.header[ctx.rev()] = h
481 else:
479 else:
482 if self.lastheader != h:
480 if self.lastheader != h:
483 self.lastheader = h
481 self.lastheader = h
484 self.ui.write(h)
482 self.ui.write(h)
485
483
486 # write changeset metadata, then patch if requested
484 # write changeset metadata, then patch if requested
487 key = self._parts[self._tref]
485 key = self._parts[self._tref]
488 self.ui.write(templater.stringify(self.t(key, **props)))
486 self.ui.write(templater.stringify(self.t(key, **props)))
489 self._showpatch(ctx)
487 self._showpatch(ctx)
490
488
491 if self._parts['footer']:
489 if self._parts['footer']:
492 if not self.footer:
490 if not self.footer:
493 self.footer = templater.stringify(
491 self.footer = templater.stringify(
494 self.t(self._parts['footer'], **props))
492 self.t(self._parts['footer'], **props))
495
493
496 def templatespec(tmpl, mapfile):
494 def templatespec(tmpl, mapfile):
497 if mapfile:
495 if mapfile:
498 return formatter.templatespec('changeset', tmpl, mapfile)
496 return formatter.templatespec('changeset', tmpl, mapfile)
499 else:
497 else:
500 return formatter.templatespec('', tmpl, None)
498 return formatter.templatespec('', tmpl, None)
501
499
502 def _lookuptemplate(ui, tmpl, style):
500 def _lookuptemplate(ui, tmpl, style):
503 """Find the template matching the given template spec or style
501 """Find the template matching the given template spec or style
504
502
505 See formatter.lookuptemplate() for details.
503 See formatter.lookuptemplate() for details.
506 """
504 """
507
505
508 # ui settings
506 # ui settings
509 if not tmpl and not style: # template are stronger than style
507 if not tmpl and not style: # template are stronger than style
510 tmpl = ui.config('ui', 'logtemplate')
508 tmpl = ui.config('ui', 'logtemplate')
511 if tmpl:
509 if tmpl:
512 return templatespec(templater.unquotestring(tmpl), None)
510 return templatespec(templater.unquotestring(tmpl), None)
513 else:
511 else:
514 style = util.expandpath(ui.config('ui', 'style'))
512 style = util.expandpath(ui.config('ui', 'style'))
515
513
516 if not tmpl and style:
514 if not tmpl and style:
517 mapfile = style
515 mapfile = style
518 if not os.path.split(mapfile)[0]:
516 if not os.path.split(mapfile)[0]:
519 mapname = (templater.templatepath('map-cmdline.' + mapfile)
517 mapname = (templater.templatepath('map-cmdline.' + mapfile)
520 or templater.templatepath(mapfile))
518 or templater.templatepath(mapfile))
521 if mapname:
519 if mapname:
522 mapfile = mapname
520 mapfile = mapname
523 return templatespec(None, mapfile)
521 return templatespec(None, mapfile)
524
522
525 if not tmpl:
523 if not tmpl:
526 return templatespec(None, None)
524 return templatespec(None, None)
527
525
528 return formatter.lookuptemplate(ui, 'changeset', tmpl)
526 return formatter.lookuptemplate(ui, 'changeset', tmpl)
529
527
530 def maketemplater(ui, repo, tmpl, buffered=False):
528 def maketemplater(ui, repo, tmpl, buffered=False):
531 """Create a changesettemplater from a literal template 'tmpl'
529 """Create a changesettemplater from a literal template 'tmpl'
532 byte-string."""
530 byte-string."""
533 spec = templatespec(tmpl, None)
531 spec = templatespec(tmpl, None)
534 return changesettemplater(ui, repo, spec, buffered=buffered)
532 return changesettemplater(ui, repo, spec, buffered=buffered)
535
533
536 def changesetdisplayer(ui, repo, opts, makefilematcher=None,
534 def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
537 makehunksfilter=None, buffered=False):
538 """show one changeset using template or regular display.
535 """show one changeset using template or regular display.
539
536
540 Display format will be the first non-empty hit of:
537 Display format will be the first non-empty hit of:
541 1. option 'template'
538 1. option 'template'
542 2. option 'style'
539 2. option 'style'
543 3. [ui] setting 'logtemplate'
540 3. [ui] setting 'logtemplate'
544 4. [ui] setting 'style'
541 4. [ui] setting 'style'
545 If all of these values are either the unset or the empty string,
542 If all of these values are either the unset or the empty string,
546 regular display via changesetprinter() is done.
543 regular display via changesetprinter() is done.
547 """
544 """
548 # options
545 postargs = (differ, opts, buffered)
549 if not makefilematcher and (opts.get('patch') or opts.get('stat')):
550 def makefilematcher(ctx):
551 return scmutil.matchall(repo)
552
553 postargs = (makefilematcher, makehunksfilter, opts, buffered)
554 if opts.get('template') == 'json':
546 if opts.get('template') == 'json':
555 return jsonchangeset(ui, repo, *postargs)
547 return jsonchangeset(ui, repo, *postargs)
556
548
557 spec = _lookuptemplate(ui, opts.get('template'), opts.get('style'))
549 spec = _lookuptemplate(ui, opts.get('template'), opts.get('style'))
558
550
559 if not spec.ref and not spec.tmpl and not spec.mapfile:
551 if not spec.ref and not spec.tmpl and not spec.mapfile:
560 return changesetprinter(ui, repo, *postargs)
552 return changesetprinter(ui, repo, *postargs)
561
553
562 return changesettemplater(ui, repo, spec, *postargs)
554 return changesettemplater(ui, repo, spec, *postargs)
563
555
564 def _makematcher(repo, revs, pats, opts):
556 def _makematcher(repo, revs, pats, opts):
565 """Build matcher and expanded patterns from log options
557 """Build matcher and expanded patterns from log options
566
558
567 If --follow, revs are the revisions to follow from.
559 If --follow, revs are the revisions to follow from.
568
560
569 Returns (match, pats, slowpath) where
561 Returns (match, pats, slowpath) where
570 - match: a matcher built from the given pats and -I/-X opts
562 - match: a matcher built from the given pats and -I/-X opts
571 - pats: patterns used (globs are expanded on Windows)
563 - pats: patterns used (globs are expanded on Windows)
572 - slowpath: True if patterns aren't as simple as scanning filelogs
564 - slowpath: True if patterns aren't as simple as scanning filelogs
573 """
565 """
574 # pats/include/exclude are passed to match.match() directly in
566 # pats/include/exclude are passed to match.match() directly in
575 # _matchfiles() revset but walkchangerevs() builds its matcher with
567 # _matchfiles() revset but walkchangerevs() builds its matcher with
576 # scmutil.match(). The difference is input pats are globbed on
568 # scmutil.match(). The difference is input pats are globbed on
577 # platforms without shell expansion (windows).
569 # platforms without shell expansion (windows).
578 wctx = repo[None]
570 wctx = repo[None]
579 match, pats = scmutil.matchandpats(wctx, pats, opts)
571 match, pats = scmutil.matchandpats(wctx, pats, opts)
580 slowpath = match.anypats() or (not match.always() and opts.get('removed'))
572 slowpath = match.anypats() or (not match.always() and opts.get('removed'))
581 if not slowpath:
573 if not slowpath:
582 follow = opts.get('follow') or opts.get('follow_first')
574 follow = opts.get('follow') or opts.get('follow_first')
583 startctxs = []
575 startctxs = []
584 if follow and opts.get('rev'):
576 if follow and opts.get('rev'):
585 startctxs = [repo[r] for r in revs]
577 startctxs = [repo[r] for r in revs]
586 for f in match.files():
578 for f in match.files():
587 if follow and startctxs:
579 if follow and startctxs:
588 # No idea if the path was a directory at that revision, so
580 # No idea if the path was a directory at that revision, so
589 # take the slow path.
581 # take the slow path.
590 if any(f not in c for c in startctxs):
582 if any(f not in c for c in startctxs):
591 slowpath = True
583 slowpath = True
592 continue
584 continue
593 elif follow and f not in wctx:
585 elif follow and f not in wctx:
594 # If the file exists, it may be a directory, so let it
586 # If the file exists, it may be a directory, so let it
595 # take the slow path.
587 # take the slow path.
596 if os.path.exists(repo.wjoin(f)):
588 if os.path.exists(repo.wjoin(f)):
597 slowpath = True
589 slowpath = True
598 continue
590 continue
599 else:
591 else:
600 raise error.Abort(_('cannot follow file not in parent '
592 raise error.Abort(_('cannot follow file not in parent '
601 'revision: "%s"') % f)
593 'revision: "%s"') % f)
602 filelog = repo.file(f)
594 filelog = repo.file(f)
603 if not filelog:
595 if not filelog:
604 # A zero count may be a directory or deleted file, so
596 # A zero count may be a directory or deleted file, so
605 # try to find matching entries on the slow path.
597 # try to find matching entries on the slow path.
606 if follow:
598 if follow:
607 raise error.Abort(
599 raise error.Abort(
608 _('cannot follow nonexistent file: "%s"') % f)
600 _('cannot follow nonexistent file: "%s"') % f)
609 slowpath = True
601 slowpath = True
610
602
611 # We decided to fall back to the slowpath because at least one
603 # We decided to fall back to the slowpath because at least one
612 # of the paths was not a file. Check to see if at least one of them
604 # of the paths was not a file. Check to see if at least one of them
613 # existed in history - in that case, we'll continue down the
605 # existed in history - in that case, we'll continue down the
614 # slowpath; otherwise, we can turn off the slowpath
606 # slowpath; otherwise, we can turn off the slowpath
615 if slowpath:
607 if slowpath:
616 for path in match.files():
608 for path in match.files():
617 if path == '.' or path in repo.store:
609 if path == '.' or path in repo.store:
618 break
610 break
619 else:
611 else:
620 slowpath = False
612 slowpath = False
621
613
622 return match, pats, slowpath
614 return match, pats, slowpath
623
615
624 def _fileancestors(repo, revs, match, followfirst):
616 def _fileancestors(repo, revs, match, followfirst):
625 fctxs = []
617 fctxs = []
626 for r in revs:
618 for r in revs:
627 ctx = repo[r]
619 ctx = repo[r]
628 fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match))
620 fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match))
629
621
630 # When displaying a revision with --patch --follow FILE, we have
622 # When displaying a revision with --patch --follow FILE, we have
631 # to know which file of the revision must be diffed. With
623 # to know which file of the revision must be diffed. With
632 # --follow, we want the names of the ancestors of FILE in the
624 # --follow, we want the names of the ancestors of FILE in the
633 # revision, stored in "fcache". "fcache" is populated as a side effect
625 # revision, stored in "fcache". "fcache" is populated as a side effect
634 # of the graph traversal.
626 # of the graph traversal.
635 fcache = {}
627 fcache = {}
636 def filematcher(ctx):
628 def filematcher(ctx):
637 return scmutil.matchfiles(repo, fcache.get(ctx.rev(), []))
629 return scmutil.matchfiles(repo, fcache.get(ctx.rev(), []))
638
630
639 def revgen():
631 def revgen():
640 for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst):
632 for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst):
641 fcache[rev] = [c.path() for c in cs]
633 fcache[rev] = [c.path() for c in cs]
642 yield rev
634 yield rev
643 return smartset.generatorset(revgen(), iterasc=False), filematcher
635 return smartset.generatorset(revgen(), iterasc=False), filematcher
644
636
645 def _makenofollowfilematcher(repo, pats, opts):
637 def _makenofollowfilematcher(repo, pats, opts):
646 '''hook for extensions to override the filematcher for non-follow cases'''
638 '''hook for extensions to override the filematcher for non-follow cases'''
647 return None
639 return None
648
640
649 _opt2logrevset = {
641 _opt2logrevset = {
650 'no_merges': ('not merge()', None),
642 'no_merges': ('not merge()', None),
651 'only_merges': ('merge()', None),
643 'only_merges': ('merge()', None),
652 '_matchfiles': (None, '_matchfiles(%ps)'),
644 '_matchfiles': (None, '_matchfiles(%ps)'),
653 'date': ('date(%s)', None),
645 'date': ('date(%s)', None),
654 'branch': ('branch(%s)', '%lr'),
646 'branch': ('branch(%s)', '%lr'),
655 '_patslog': ('filelog(%s)', '%lr'),
647 '_patslog': ('filelog(%s)', '%lr'),
656 'keyword': ('keyword(%s)', '%lr'),
648 'keyword': ('keyword(%s)', '%lr'),
657 'prune': ('ancestors(%s)', 'not %lr'),
649 'prune': ('ancestors(%s)', 'not %lr'),
658 'user': ('user(%s)', '%lr'),
650 'user': ('user(%s)', '%lr'),
659 }
651 }
660
652
661 def _makerevset(repo, match, pats, slowpath, opts):
653 def _makerevset(repo, match, pats, slowpath, opts):
662 """Return a revset string built from log options and file patterns"""
654 """Return a revset string built from log options and file patterns"""
663 opts = dict(opts)
655 opts = dict(opts)
664 # follow or not follow?
656 # follow or not follow?
665 follow = opts.get('follow') or opts.get('follow_first')
657 follow = opts.get('follow') or opts.get('follow_first')
666
658
667 # branch and only_branch are really aliases and must be handled at
659 # branch and only_branch are really aliases and must be handled at
668 # the same time
660 # the same time
669 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
661 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
670 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
662 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
671
663
672 if slowpath:
664 if slowpath:
673 # See walkchangerevs() slow path.
665 # See walkchangerevs() slow path.
674 #
666 #
675 # pats/include/exclude cannot be represented as separate
667 # pats/include/exclude cannot be represented as separate
676 # revset expressions as their filtering logic applies at file
668 # revset expressions as their filtering logic applies at file
677 # level. For instance "-I a -X b" matches a revision touching
669 # level. For instance "-I a -X b" matches a revision touching
678 # "a" and "b" while "file(a) and not file(b)" does
670 # "a" and "b" while "file(a) and not file(b)" does
679 # not. Besides, filesets are evaluated against the working
671 # not. Besides, filesets are evaluated against the working
680 # directory.
672 # directory.
681 matchargs = ['r:', 'd:relpath']
673 matchargs = ['r:', 'd:relpath']
682 for p in pats:
674 for p in pats:
683 matchargs.append('p:' + p)
675 matchargs.append('p:' + p)
684 for p in opts.get('include', []):
676 for p in opts.get('include', []):
685 matchargs.append('i:' + p)
677 matchargs.append('i:' + p)
686 for p in opts.get('exclude', []):
678 for p in opts.get('exclude', []):
687 matchargs.append('x:' + p)
679 matchargs.append('x:' + p)
688 opts['_matchfiles'] = matchargs
680 opts['_matchfiles'] = matchargs
689 elif not follow:
681 elif not follow:
690 opts['_patslog'] = list(pats)
682 opts['_patslog'] = list(pats)
691
683
692 expr = []
684 expr = []
693 for op, val in sorted(opts.iteritems()):
685 for op, val in sorted(opts.iteritems()):
694 if not val:
686 if not val:
695 continue
687 continue
696 if op not in _opt2logrevset:
688 if op not in _opt2logrevset:
697 continue
689 continue
698 revop, listop = _opt2logrevset[op]
690 revop, listop = _opt2logrevset[op]
699 if revop and '%' not in revop:
691 if revop and '%' not in revop:
700 expr.append(revop)
692 expr.append(revop)
701 elif not listop:
693 elif not listop:
702 expr.append(revsetlang.formatspec(revop, val))
694 expr.append(revsetlang.formatspec(revop, val))
703 else:
695 else:
704 if revop:
696 if revop:
705 val = [revsetlang.formatspec(revop, v) for v in val]
697 val = [revsetlang.formatspec(revop, v) for v in val]
706 expr.append(revsetlang.formatspec(listop, val))
698 expr.append(revsetlang.formatspec(listop, val))
707
699
708 if expr:
700 if expr:
709 expr = '(' + ' and '.join(expr) + ')'
701 expr = '(' + ' and '.join(expr) + ')'
710 else:
702 else:
711 expr = None
703 expr = None
712 return expr
704 return expr
713
705
714 def _initialrevs(repo, opts):
706 def _initialrevs(repo, opts):
715 """Return the initial set of revisions to be filtered or followed"""
707 """Return the initial set of revisions to be filtered or followed"""
716 follow = opts.get('follow') or opts.get('follow_first')
708 follow = opts.get('follow') or opts.get('follow_first')
717 if opts.get('rev'):
709 if opts.get('rev'):
718 revs = scmutil.revrange(repo, opts['rev'])
710 revs = scmutil.revrange(repo, opts['rev'])
719 elif follow and repo.dirstate.p1() == nullid:
711 elif follow and repo.dirstate.p1() == nullid:
720 revs = smartset.baseset()
712 revs = smartset.baseset()
721 elif follow:
713 elif follow:
722 revs = repo.revs('.')
714 revs = repo.revs('.')
723 else:
715 else:
724 revs = smartset.spanset(repo)
716 revs = smartset.spanset(repo)
725 revs.reverse()
717 revs.reverse()
726 return revs
718 return revs
727
719
728 def getrevs(repo, pats, opts):
720 def getrevs(repo, pats, opts):
729 """Return (revs, filematcher) where revs is a smartset
721 """Return (revs, differ) where revs is a smartset
730
722
731 filematcher is a callable taking a changectx and returning a match
723 differ is a changesetdiffer with pre-configured file matcher.
732 objects filtering the files to be detailed when displaying the revision.
733 """
724 """
734 follow = opts.get('follow') or opts.get('follow_first')
725 follow = opts.get('follow') or opts.get('follow_first')
735 followfirst = opts.get('follow_first')
726 followfirst = opts.get('follow_first')
736 limit = getlimit(opts)
727 limit = getlimit(opts)
737 revs = _initialrevs(repo, opts)
728 revs = _initialrevs(repo, opts)
738 if not revs:
729 if not revs:
739 return smartset.baseset(), None
730 return smartset.baseset(), None
740 match, pats, slowpath = _makematcher(repo, revs, pats, opts)
731 match, pats, slowpath = _makematcher(repo, revs, pats, opts)
741 filematcher = None
732 filematcher = None
742 if follow:
733 if follow:
743 if slowpath or match.always():
734 if slowpath or match.always():
744 revs = dagop.revancestors(repo, revs, followfirst=followfirst)
735 revs = dagop.revancestors(repo, revs, followfirst=followfirst)
745 else:
736 else:
746 revs, filematcher = _fileancestors(repo, revs, match, followfirst)
737 revs, filematcher = _fileancestors(repo, revs, match, followfirst)
747 revs.reverse()
738 revs.reverse()
748 if filematcher is None:
739 if filematcher is None:
749 filematcher = _makenofollowfilematcher(repo, pats, opts)
740 filematcher = _makenofollowfilematcher(repo, pats, opts)
750 if filematcher is None:
741 if filematcher is None:
751 def filematcher(ctx):
742 def filematcher(ctx):
752 return match
743 return match
753
744
754 expr = _makerevset(repo, match, pats, slowpath, opts)
745 expr = _makerevset(repo, match, pats, slowpath, opts)
755 if opts.get('graph') and opts.get('rev'):
746 if opts.get('graph') and opts.get('rev'):
756 # User-specified revs might be unsorted, but don't sort before
747 # User-specified revs might be unsorted, but don't sort before
757 # _makerevset because it might depend on the order of revs
748 # _makerevset because it might depend on the order of revs
758 if not (revs.isdescending() or revs.istopo()):
749 if not (revs.isdescending() or revs.istopo()):
759 revs.sort(reverse=True)
750 revs.sort(reverse=True)
760 if expr:
751 if expr:
761 matcher = revset.match(None, expr)
752 matcher = revset.match(None, expr)
762 revs = matcher(repo, revs)
753 revs = matcher(repo, revs)
763 if limit is not None:
754 if limit is not None:
764 revs = revs.slice(0, limit)
755 revs = revs.slice(0, limit)
765 return revs, filematcher
756
757 differ = changesetdiffer()
758 differ._makefilematcher = filematcher
759 return revs, differ
766
760
767 def _parselinerangeopt(repo, opts):
761 def _parselinerangeopt(repo, opts):
768 """Parse --line-range log option and return a list of tuples (filename,
762 """Parse --line-range log option and return a list of tuples (filename,
769 (fromline, toline)).
763 (fromline, toline)).
770 """
764 """
771 linerangebyfname = []
765 linerangebyfname = []
772 for pat in opts.get('line_range', []):
766 for pat in opts.get('line_range', []):
773 try:
767 try:
774 pat, linerange = pat.rsplit(',', 1)
768 pat, linerange = pat.rsplit(',', 1)
775 except ValueError:
769 except ValueError:
776 raise error.Abort(_('malformatted line-range pattern %s') % pat)
770 raise error.Abort(_('malformatted line-range pattern %s') % pat)
777 try:
771 try:
778 fromline, toline = map(int, linerange.split(':'))
772 fromline, toline = map(int, linerange.split(':'))
779 except ValueError:
773 except ValueError:
780 raise error.Abort(_("invalid line range for %s") % pat)
774 raise error.Abort(_("invalid line range for %s") % pat)
781 msg = _("line range pattern '%s' must match exactly one file") % pat
775 msg = _("line range pattern '%s' must match exactly one file") % pat
782 fname = scmutil.parsefollowlinespattern(repo, None, pat, msg)
776 fname = scmutil.parsefollowlinespattern(repo, None, pat, msg)
783 linerangebyfname.append(
777 linerangebyfname.append(
784 (fname, util.processlinerange(fromline, toline)))
778 (fname, util.processlinerange(fromline, toline)))
785 return linerangebyfname
779 return linerangebyfname
786
780
787 def getlinerangerevs(repo, userrevs, opts):
781 def getlinerangerevs(repo, userrevs, opts):
788 """Return (revs, filematcher, hunksfilter).
782 """Return (revs, differ).
789
783
790 "revs" are revisions obtained by processing "line-range" log options and
784 "revs" are revisions obtained by processing "line-range" log options and
791 walking block ancestors of each specified file/line-range.
785 walking block ancestors of each specified file/line-range.
792
786
793 "filematcher(ctx) -> match" is a factory function returning a match object
787 "differ" is a changesetdiffer with pre-configured file matcher and hunks
794 for a given revision for file patterns specified in --line-range option.
788 filter.
795
796 "hunksfilter(ctx) -> filterfn(fctx, hunks)" is a factory function
797 returning a hunks filtering function.
798 """
789 """
799 wctx = repo[None]
790 wctx = repo[None]
800
791
801 # Two-levels map of "rev -> file ctx -> [line range]".
792 # Two-levels map of "rev -> file ctx -> [line range]".
802 linerangesbyrev = {}
793 linerangesbyrev = {}
803 for fname, (fromline, toline) in _parselinerangeopt(repo, opts):
794 for fname, (fromline, toline) in _parselinerangeopt(repo, opts):
804 if fname not in wctx:
795 if fname not in wctx:
805 raise error.Abort(_('cannot follow file not in parent '
796 raise error.Abort(_('cannot follow file not in parent '
806 'revision: "%s"') % fname)
797 'revision: "%s"') % fname)
807 fctx = wctx.filectx(fname)
798 fctx = wctx.filectx(fname)
808 for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
799 for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
809 rev = fctx.introrev()
800 rev = fctx.introrev()
810 if rev not in userrevs:
801 if rev not in userrevs:
811 continue
802 continue
812 linerangesbyrev.setdefault(
803 linerangesbyrev.setdefault(
813 rev, {}).setdefault(
804 rev, {}).setdefault(
814 fctx.path(), []).append(linerange)
805 fctx.path(), []).append(linerange)
815
806
816 def nofilterhunksfn(fctx, hunks):
807 def nofilterhunksfn(fctx, hunks):
817 return hunks
808 return hunks
818
809
819 def hunksfilter(ctx):
810 def hunksfilter(ctx):
820 fctxlineranges = linerangesbyrev.get(ctx.rev())
811 fctxlineranges = linerangesbyrev.get(ctx.rev())
821 if fctxlineranges is None:
812 if fctxlineranges is None:
822 return nofilterhunksfn
813 return nofilterhunksfn
823
814
824 def filterfn(fctx, hunks):
815 def filterfn(fctx, hunks):
825 lineranges = fctxlineranges.get(fctx.path())
816 lineranges = fctxlineranges.get(fctx.path())
826 if lineranges is not None:
817 if lineranges is not None:
827 for hr, lines in hunks:
818 for hr, lines in hunks:
828 if hr is None: # binary
819 if hr is None: # binary
829 yield hr, lines
820 yield hr, lines
830 continue
821 continue
831 if any(mdiff.hunkinrange(hr[2:], lr)
822 if any(mdiff.hunkinrange(hr[2:], lr)
832 for lr in lineranges):
823 for lr in lineranges):
833 yield hr, lines
824 yield hr, lines
834 else:
825 else:
835 for hunk in hunks:
826 for hunk in hunks:
836 yield hunk
827 yield hunk
837
828
838 return filterfn
829 return filterfn
839
830
840 def filematcher(ctx):
831 def filematcher(ctx):
841 files = list(linerangesbyrev.get(ctx.rev(), []))
832 files = list(linerangesbyrev.get(ctx.rev(), []))
842 return scmutil.matchfiles(repo, files)
833 return scmutil.matchfiles(repo, files)
843
834
844 revs = sorted(linerangesbyrev, reverse=True)
835 revs = sorted(linerangesbyrev, reverse=True)
845
836
846 return revs, filematcher, hunksfilter
837 differ = changesetdiffer()
838 differ._makefilematcher = filematcher
839 differ._makehunksfilter = hunksfilter
840 return revs, differ
847
841
848 def _graphnodeformatter(ui, displayer):
842 def _graphnodeformatter(ui, displayer):
849 spec = ui.config('ui', 'graphnodetemplate')
843 spec = ui.config('ui', 'graphnodetemplate')
850 if not spec:
844 if not spec:
851 return templatekw.showgraphnode # fast path for "{graphnode}"
845 return templatekw.showgraphnode # fast path for "{graphnode}"
852
846
853 spec = templater.unquotestring(spec)
847 spec = templater.unquotestring(spec)
854 tres = formatter.templateresources(ui)
848 tres = formatter.templateresources(ui)
855 if isinstance(displayer, changesettemplater):
849 if isinstance(displayer, changesettemplater):
856 tres['cache'] = displayer.cache # reuse cache of slow templates
850 tres['cache'] = displayer.cache # reuse cache of slow templates
857 templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords,
851 templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords,
858 resources=tres)
852 resources=tres)
859 def formatnode(repo, ctx):
853 def formatnode(repo, ctx):
860 props = {'ctx': ctx, 'repo': repo, 'revcache': {}}
854 props = {'ctx': ctx, 'repo': repo, 'revcache': {}}
861 return templ.render(props)
855 return templ.render(props)
862 return formatnode
856 return formatnode
863
857
864 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None, props=None):
858 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None, props=None):
865 props = props or {}
859 props = props or {}
866 formatnode = _graphnodeformatter(ui, displayer)
860 formatnode = _graphnodeformatter(ui, displayer)
867 state = graphmod.asciistate()
861 state = graphmod.asciistate()
868 styles = state['styles']
862 styles = state['styles']
869
863
870 # only set graph styling if HGPLAIN is not set.
864 # only set graph styling if HGPLAIN is not set.
871 if ui.plain('graph'):
865 if ui.plain('graph'):
872 # set all edge styles to |, the default pre-3.8 behaviour
866 # set all edge styles to |, the default pre-3.8 behaviour
873 styles.update(dict.fromkeys(styles, '|'))
867 styles.update(dict.fromkeys(styles, '|'))
874 else:
868 else:
875 edgetypes = {
869 edgetypes = {
876 'parent': graphmod.PARENT,
870 'parent': graphmod.PARENT,
877 'grandparent': graphmod.GRANDPARENT,
871 'grandparent': graphmod.GRANDPARENT,
878 'missing': graphmod.MISSINGPARENT
872 'missing': graphmod.MISSINGPARENT
879 }
873 }
880 for name, key in edgetypes.items():
874 for name, key in edgetypes.items():
881 # experimental config: experimental.graphstyle.*
875 # experimental config: experimental.graphstyle.*
882 styles[key] = ui.config('experimental', 'graphstyle.%s' % name,
876 styles[key] = ui.config('experimental', 'graphstyle.%s' % name,
883 styles[key])
877 styles[key])
884 if not styles[key]:
878 if not styles[key]:
885 styles[key] = None
879 styles[key] = None
886
880
887 # experimental config: experimental.graphshorten
881 # experimental config: experimental.graphshorten
888 state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
882 state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
889
883
890 for rev, type, ctx, parents in dag:
884 for rev, type, ctx, parents in dag:
891 char = formatnode(repo, ctx)
885 char = formatnode(repo, ctx)
892 copies = None
886 copies = None
893 if getrenamed and ctx.rev():
887 if getrenamed and ctx.rev():
894 copies = []
888 copies = []
895 for fn in ctx.files():
889 for fn in ctx.files():
896 rename = getrenamed(fn, ctx.rev())
890 rename = getrenamed(fn, ctx.rev())
897 if rename:
891 if rename:
898 copies.append((fn, rename[0]))
892 copies.append((fn, rename[0]))
899 edges = edgefn(type, char, state, rev, parents)
893 edges = edgefn(type, char, state, rev, parents)
900 firstedge = next(edges)
894 firstedge = next(edges)
901 width = firstedge[2]
895 width = firstedge[2]
902 displayer.show(ctx, copies=copies,
896 displayer.show(ctx, copies=copies,
903 _graphwidth=width, **pycompat.strkwargs(props))
897 _graphwidth=width, **pycompat.strkwargs(props))
904 lines = displayer.hunk.pop(rev).split('\n')
898 lines = displayer.hunk.pop(rev).split('\n')
905 if not lines[-1]:
899 if not lines[-1]:
906 del lines[-1]
900 del lines[-1]
907 displayer.flush(ctx)
901 displayer.flush(ctx)
908 for type, char, width, coldata in itertools.chain([firstedge], edges):
902 for type, char, width, coldata in itertools.chain([firstedge], edges):
909 graphmod.ascii(ui, state, type, char, lines, coldata)
903 graphmod.ascii(ui, state, type, char, lines, coldata)
910 lines = []
904 lines = []
911 displayer.close()
905 displayer.close()
912
906
913 def graphlog(ui, repo, revs, filematcher, opts):
907 def graphlog(ui, repo, revs, differ, opts):
914 # Parameters are identical to log command ones
908 # Parameters are identical to log command ones
915 revdag = graphmod.dagwalker(repo, revs)
909 revdag = graphmod.dagwalker(repo, revs)
916
910
917 getrenamed = None
911 getrenamed = None
918 if opts.get('copies'):
912 if opts.get('copies'):
919 endrev = None
913 endrev = None
920 if opts.get('rev'):
914 if opts.get('rev'):
921 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
915 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
922 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
916 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
923
917
924 ui.pager('log')
918 ui.pager('log')
925 displayer = changesetdisplayer(ui, repo, opts, makefilematcher=filematcher,
919 displayer = changesetdisplayer(ui, repo, opts, differ, buffered=True)
926 buffered=True)
927 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed)
920 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed)
928
921
929 def checkunsupportedgraphflags(pats, opts):
922 def checkunsupportedgraphflags(pats, opts):
930 for op in ["newest_first"]:
923 for op in ["newest_first"]:
931 if op in opts and opts[op]:
924 if op in opts and opts[op]:
932 raise error.Abort(_("-G/--graph option is incompatible with --%s")
925 raise error.Abort(_("-G/--graph option is incompatible with --%s")
933 % op.replace("_", "-"))
926 % op.replace("_", "-"))
934
927
935 def graphrevs(repo, nodes, opts):
928 def graphrevs(repo, nodes, opts):
936 limit = getlimit(opts)
929 limit = getlimit(opts)
937 nodes.reverse()
930 nodes.reverse()
938 if limit is not None:
931 if limit is not None:
939 nodes = nodes[:limit]
932 nodes = nodes[:limit]
940 return graphmod.nodes(repo, nodes)
933 return graphmod.nodes(repo, nodes)
General Comments 0
You need to be logged in to leave comments. Login now