##// END OF EJS Templates
commands: add value for cmdtype argument for read only commands...
Pulkit Goyal -
r35105:4b288d11 default
parent child Browse files
Show More
@@ -1,5587 +1,5590
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 merge as mergemod,
44 merge as mergemod,
45 obsolete,
45 obsolete,
46 patch,
46 patch,
47 phases,
47 phases,
48 pycompat,
48 pycompat,
49 rcutil,
49 rcutil,
50 registrar,
50 registrar,
51 revsetlang,
51 revsetlang,
52 scmutil,
52 scmutil,
53 server,
53 server,
54 sshserver,
54 sshserver,
55 streamclone,
55 streamclone,
56 tags as tagsmod,
56 tags as tagsmod,
57 templatekw,
57 templatekw,
58 ui as uimod,
58 ui as uimod,
59 util,
59 util,
60 )
60 )
61
61
62 release = lockmod.release
62 release = lockmod.release
63
63
64 table = {}
64 table = {}
65 table.update(debugcommandsmod.command._table)
65 table.update(debugcommandsmod.command._table)
66
66
67 command = registrar.command(table)
67 command = registrar.command(table)
68 readonly = registrar.command.readonly
68
69
69 # common command options
70 # common command options
70
71
71 globalopts = [
72 globalopts = [
72 ('R', 'repository', '',
73 ('R', 'repository', '',
73 _('repository root directory or name of overlay bundle file'),
74 _('repository root directory or name of overlay bundle file'),
74 _('REPO')),
75 _('REPO')),
75 ('', 'cwd', '',
76 ('', 'cwd', '',
76 _('change working directory'), _('DIR')),
77 _('change working directory'), _('DIR')),
77 ('y', 'noninteractive', None,
78 ('y', 'noninteractive', None,
78 _('do not prompt, automatically pick the first choice for all prompts')),
79 _('do not prompt, automatically pick the first choice for all prompts')),
79 ('q', 'quiet', None, _('suppress output')),
80 ('q', 'quiet', None, _('suppress output')),
80 ('v', 'verbose', None, _('enable additional output')),
81 ('v', 'verbose', None, _('enable additional output')),
81 ('', 'color', '',
82 ('', 'color', '',
82 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
83 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
83 # and should not be translated
84 # and should not be translated
84 _("when to colorize (boolean, always, auto, never, or debug)"),
85 _("when to colorize (boolean, always, auto, never, or debug)"),
85 _('TYPE')),
86 _('TYPE')),
86 ('', 'config', [],
87 ('', 'config', [],
87 _('set/override config option (use \'section.name=value\')'),
88 _('set/override config option (use \'section.name=value\')'),
88 _('CONFIG')),
89 _('CONFIG')),
89 ('', 'debug', None, _('enable debugging output')),
90 ('', 'debug', None, _('enable debugging output')),
90 ('', 'debugger', None, _('start debugger')),
91 ('', 'debugger', None, _('start debugger')),
91 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
92 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
92 _('ENCODE')),
93 _('ENCODE')),
93 ('', 'encodingmode', encoding.encodingmode,
94 ('', 'encodingmode', encoding.encodingmode,
94 _('set the charset encoding mode'), _('MODE')),
95 _('set the charset encoding mode'), _('MODE')),
95 ('', 'traceback', None, _('always print a traceback on exception')),
96 ('', 'traceback', None, _('always print a traceback on exception')),
96 ('', 'time', None, _('time how long the command takes')),
97 ('', 'time', None, _('time how long the command takes')),
97 ('', 'profile', None, _('print command execution profile')),
98 ('', 'profile', None, _('print command execution profile')),
98 ('', 'version', None, _('output version information and exit')),
99 ('', 'version', None, _('output version information and exit')),
99 ('h', 'help', None, _('display help and exit')),
100 ('h', 'help', None, _('display help and exit')),
100 ('', 'hidden', False, _('consider hidden changesets')),
101 ('', 'hidden', False, _('consider hidden changesets')),
101 ('', 'pager', 'auto',
102 ('', 'pager', 'auto',
102 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
103 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
103 ]
104 ]
104
105
105 dryrunopts = cmdutil.dryrunopts
106 dryrunopts = cmdutil.dryrunopts
106 remoteopts = cmdutil.remoteopts
107 remoteopts = cmdutil.remoteopts
107 walkopts = cmdutil.walkopts
108 walkopts = cmdutil.walkopts
108 commitopts = cmdutil.commitopts
109 commitopts = cmdutil.commitopts
109 commitopts2 = cmdutil.commitopts2
110 commitopts2 = cmdutil.commitopts2
110 formatteropts = cmdutil.formatteropts
111 formatteropts = cmdutil.formatteropts
111 templateopts = cmdutil.templateopts
112 templateopts = cmdutil.templateopts
112 logopts = cmdutil.logopts
113 logopts = cmdutil.logopts
113 diffopts = cmdutil.diffopts
114 diffopts = cmdutil.diffopts
114 diffwsopts = cmdutil.diffwsopts
115 diffwsopts = cmdutil.diffwsopts
115 diffopts2 = cmdutil.diffopts2
116 diffopts2 = cmdutil.diffopts2
116 mergetoolopts = cmdutil.mergetoolopts
117 mergetoolopts = cmdutil.mergetoolopts
117 similarityopts = cmdutil.similarityopts
118 similarityopts = cmdutil.similarityopts
118 subrepoopts = cmdutil.subrepoopts
119 subrepoopts = cmdutil.subrepoopts
119 debugrevlogopts = cmdutil.debugrevlogopts
120 debugrevlogopts = cmdutil.debugrevlogopts
120
121
121 # Commands start here, listed alphabetically
122 # Commands start here, listed alphabetically
122
123
123 @command('^add',
124 @command('^add',
124 walkopts + subrepoopts + dryrunopts,
125 walkopts + subrepoopts + dryrunopts,
125 _('[OPTION]... [FILE]...'),
126 _('[OPTION]... [FILE]...'),
126 inferrepo=True)
127 inferrepo=True)
127 def add(ui, repo, *pats, **opts):
128 def add(ui, repo, *pats, **opts):
128 """add the specified files on the next commit
129 """add the specified files on the next commit
129
130
130 Schedule files to be version controlled and added to the
131 Schedule files to be version controlled and added to the
131 repository.
132 repository.
132
133
133 The files will be added to the repository at the next commit. To
134 The files will be added to the repository at the next commit. To
134 undo an add before that, see :hg:`forget`.
135 undo an add before that, see :hg:`forget`.
135
136
136 If no names are given, add all files to the repository (except
137 If no names are given, add all files to the repository (except
137 files matching ``.hgignore``).
138 files matching ``.hgignore``).
138
139
139 .. container:: verbose
140 .. container:: verbose
140
141
141 Examples:
142 Examples:
142
143
143 - New (unknown) files are added
144 - New (unknown) files are added
144 automatically by :hg:`add`::
145 automatically by :hg:`add`::
145
146
146 $ ls
147 $ ls
147 foo.c
148 foo.c
148 $ hg status
149 $ hg status
149 ? foo.c
150 ? foo.c
150 $ hg add
151 $ hg add
151 adding foo.c
152 adding foo.c
152 $ hg status
153 $ hg status
153 A foo.c
154 A foo.c
154
155
155 - Specific files to be added can be specified::
156 - Specific files to be added can be specified::
156
157
157 $ ls
158 $ ls
158 bar.c foo.c
159 bar.c foo.c
159 $ hg status
160 $ hg status
160 ? bar.c
161 ? bar.c
161 ? foo.c
162 ? foo.c
162 $ hg add bar.c
163 $ hg add bar.c
163 $ hg status
164 $ hg status
164 A bar.c
165 A bar.c
165 ? foo.c
166 ? foo.c
166
167
167 Returns 0 if all files are successfully added.
168 Returns 0 if all files are successfully added.
168 """
169 """
169
170
170 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
171 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
171 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
172 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
172 return rejected and 1 or 0
173 return rejected and 1 or 0
173
174
174 @command('addremove',
175 @command('addremove',
175 similarityopts + subrepoopts + walkopts + dryrunopts,
176 similarityopts + subrepoopts + walkopts + dryrunopts,
176 _('[OPTION]... [FILE]...'),
177 _('[OPTION]... [FILE]...'),
177 inferrepo=True)
178 inferrepo=True)
178 def addremove(ui, repo, *pats, **opts):
179 def addremove(ui, repo, *pats, **opts):
179 """add all new files, delete all missing files
180 """add all new files, delete all missing files
180
181
181 Add all new files and remove all missing files from the
182 Add all new files and remove all missing files from the
182 repository.
183 repository.
183
184
184 Unless names are given, new files are ignored if they match any of
185 Unless names are given, new files are ignored if they match any of
185 the patterns in ``.hgignore``. As with add, these changes take
186 the patterns in ``.hgignore``. As with add, these changes take
186 effect at the next commit.
187 effect at the next commit.
187
188
188 Use the -s/--similarity option to detect renamed files. This
189 Use the -s/--similarity option to detect renamed files. This
189 option takes a percentage between 0 (disabled) and 100 (files must
190 option takes a percentage between 0 (disabled) and 100 (files must
190 be identical) as its parameter. With a parameter greater than 0,
191 be identical) as its parameter. With a parameter greater than 0,
191 this compares every removed file with every added file and records
192 this compares every removed file with every added file and records
192 those similar enough as renames. Detecting renamed files this way
193 those similar enough as renames. Detecting renamed files this way
193 can be expensive. After using this option, :hg:`status -C` can be
194 can be expensive. After using this option, :hg:`status -C` can be
194 used to check which files were identified as moved or renamed. If
195 used to check which files were identified as moved or renamed. If
195 not specified, -s/--similarity defaults to 100 and only renames of
196 not specified, -s/--similarity defaults to 100 and only renames of
196 identical files are detected.
197 identical files are detected.
197
198
198 .. container:: verbose
199 .. container:: verbose
199
200
200 Examples:
201 Examples:
201
202
202 - A number of files (bar.c and foo.c) are new,
203 - A number of files (bar.c and foo.c) are new,
203 while foobar.c has been removed (without using :hg:`remove`)
204 while foobar.c has been removed (without using :hg:`remove`)
204 from the repository::
205 from the repository::
205
206
206 $ ls
207 $ ls
207 bar.c foo.c
208 bar.c foo.c
208 $ hg status
209 $ hg status
209 ! foobar.c
210 ! foobar.c
210 ? bar.c
211 ? bar.c
211 ? foo.c
212 ? foo.c
212 $ hg addremove
213 $ hg addremove
213 adding bar.c
214 adding bar.c
214 adding foo.c
215 adding foo.c
215 removing foobar.c
216 removing foobar.c
216 $ hg status
217 $ hg status
217 A bar.c
218 A bar.c
218 A foo.c
219 A foo.c
219 R foobar.c
220 R foobar.c
220
221
221 - A file foobar.c was moved to foo.c without using :hg:`rename`.
222 - A file foobar.c was moved to foo.c without using :hg:`rename`.
222 Afterwards, it was edited slightly::
223 Afterwards, it was edited slightly::
223
224
224 $ ls
225 $ ls
225 foo.c
226 foo.c
226 $ hg status
227 $ hg status
227 ! foobar.c
228 ! foobar.c
228 ? foo.c
229 ? foo.c
229 $ hg addremove --similarity 90
230 $ hg addremove --similarity 90
230 removing foobar.c
231 removing foobar.c
231 adding foo.c
232 adding foo.c
232 recording removal of foobar.c as rename to foo.c (94% similar)
233 recording removal of foobar.c as rename to foo.c (94% similar)
233 $ hg status -C
234 $ hg status -C
234 A foo.c
235 A foo.c
235 foobar.c
236 foobar.c
236 R foobar.c
237 R foobar.c
237
238
238 Returns 0 if all files are successfully added.
239 Returns 0 if all files are successfully added.
239 """
240 """
240 opts = pycompat.byteskwargs(opts)
241 opts = pycompat.byteskwargs(opts)
241 try:
242 try:
242 sim = float(opts.get('similarity') or 100)
243 sim = float(opts.get('similarity') or 100)
243 except ValueError:
244 except ValueError:
244 raise error.Abort(_('similarity must be a number'))
245 raise error.Abort(_('similarity must be a number'))
245 if sim < 0 or sim > 100:
246 if sim < 0 or sim > 100:
246 raise error.Abort(_('similarity must be between 0 and 100'))
247 raise error.Abort(_('similarity must be between 0 and 100'))
247 matcher = scmutil.match(repo[None], pats, opts)
248 matcher = scmutil.match(repo[None], pats, opts)
248 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
249 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
249
250
250 @command('^annotate|blame',
251 @command('^annotate|blame',
251 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
252 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
252 ('', 'follow', None,
253 ('', 'follow', None,
253 _('follow copies/renames and list the filename (DEPRECATED)')),
254 _('follow copies/renames and list the filename (DEPRECATED)')),
254 ('', 'no-follow', None, _("don't follow copies and renames")),
255 ('', 'no-follow', None, _("don't follow copies and renames")),
255 ('a', 'text', None, _('treat all files as text')),
256 ('a', 'text', None, _('treat all files as text')),
256 ('u', 'user', None, _('list the author (long with -v)')),
257 ('u', 'user', None, _('list the author (long with -v)')),
257 ('f', 'file', None, _('list the filename')),
258 ('f', 'file', None, _('list the filename')),
258 ('d', 'date', None, _('list the date (short with -q)')),
259 ('d', 'date', None, _('list the date (short with -q)')),
259 ('n', 'number', None, _('list the revision number (default)')),
260 ('n', 'number', None, _('list the revision number (default)')),
260 ('c', 'changeset', None, _('list the changeset')),
261 ('c', 'changeset', None, _('list the changeset')),
261 ('l', 'line-number', None, _('show line number at the first appearance')),
262 ('l', 'line-number', None, _('show line number at the first appearance')),
262 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
263 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
263 ] + diffwsopts + walkopts + formatteropts,
264 ] + diffwsopts + walkopts + formatteropts,
264 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
265 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
265 inferrepo=True)
266 inferrepo=True)
266 def annotate(ui, repo, *pats, **opts):
267 def annotate(ui, repo, *pats, **opts):
267 """show changeset information by line for each file
268 """show changeset information by line for each file
268
269
269 List changes in files, showing the revision id responsible for
270 List changes in files, showing the revision id responsible for
270 each line.
271 each line.
271
272
272 This command is useful for discovering when a change was made and
273 This command is useful for discovering when a change was made and
273 by whom.
274 by whom.
274
275
275 If you include --file, --user, or --date, the revision number is
276 If you include --file, --user, or --date, the revision number is
276 suppressed unless you also include --number.
277 suppressed unless you also include --number.
277
278
278 Without the -a/--text option, annotate will avoid processing files
279 Without the -a/--text option, annotate will avoid processing files
279 it detects as binary. With -a, annotate will annotate the file
280 it detects as binary. With -a, annotate will annotate the file
280 anyway, although the results will probably be neither useful
281 anyway, although the results will probably be neither useful
281 nor desirable.
282 nor desirable.
282
283
283 Returns 0 on success.
284 Returns 0 on success.
284 """
285 """
285 opts = pycompat.byteskwargs(opts)
286 opts = pycompat.byteskwargs(opts)
286 if not pats:
287 if not pats:
287 raise error.Abort(_('at least one filename or pattern is required'))
288 raise error.Abort(_('at least one filename or pattern is required'))
288
289
289 if opts.get('follow'):
290 if opts.get('follow'):
290 # --follow is deprecated and now just an alias for -f/--file
291 # --follow is deprecated and now just an alias for -f/--file
291 # to mimic the behavior of Mercurial before version 1.5
292 # to mimic the behavior of Mercurial before version 1.5
292 opts['file'] = True
293 opts['file'] = True
293
294
294 ctx = scmutil.revsingle(repo, opts.get('rev'))
295 ctx = scmutil.revsingle(repo, opts.get('rev'))
295
296
296 rootfm = ui.formatter('annotate', opts)
297 rootfm = ui.formatter('annotate', opts)
297 if ui.quiet:
298 if ui.quiet:
298 datefunc = util.shortdate
299 datefunc = util.shortdate
299 else:
300 else:
300 datefunc = util.datestr
301 datefunc = util.datestr
301 if ctx.rev() is None:
302 if ctx.rev() is None:
302 def hexfn(node):
303 def hexfn(node):
303 if node is None:
304 if node is None:
304 return None
305 return None
305 else:
306 else:
306 return rootfm.hexfunc(node)
307 return rootfm.hexfunc(node)
307 if opts.get('changeset'):
308 if opts.get('changeset'):
308 # omit "+" suffix which is appended to node hex
309 # omit "+" suffix which is appended to node hex
309 def formatrev(rev):
310 def formatrev(rev):
310 if rev is None:
311 if rev is None:
311 return '%d' % ctx.p1().rev()
312 return '%d' % ctx.p1().rev()
312 else:
313 else:
313 return '%d' % rev
314 return '%d' % rev
314 else:
315 else:
315 def formatrev(rev):
316 def formatrev(rev):
316 if rev is None:
317 if rev is None:
317 return '%d+' % ctx.p1().rev()
318 return '%d+' % ctx.p1().rev()
318 else:
319 else:
319 return '%d ' % rev
320 return '%d ' % rev
320 def formathex(hex):
321 def formathex(hex):
321 if hex is None:
322 if hex is None:
322 return '%s+' % rootfm.hexfunc(ctx.p1().node())
323 return '%s+' % rootfm.hexfunc(ctx.p1().node())
323 else:
324 else:
324 return '%s ' % hex
325 return '%s ' % hex
325 else:
326 else:
326 hexfn = rootfm.hexfunc
327 hexfn = rootfm.hexfunc
327 formatrev = formathex = pycompat.bytestr
328 formatrev = formathex = pycompat.bytestr
328
329
329 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
330 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
330 ('number', ' ', lambda x: x.fctx.rev(), formatrev),
331 ('number', ' ', lambda x: x.fctx.rev(), formatrev),
331 ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex),
332 ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex),
332 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
333 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
333 ('file', ' ', lambda x: x.fctx.path(), str),
334 ('file', ' ', lambda x: x.fctx.path(), str),
334 ('line_number', ':', lambda x: x.lineno, str),
335 ('line_number', ':', lambda x: x.lineno, str),
335 ]
336 ]
336 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
337 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
337
338
338 if (not opts.get('user') and not opts.get('changeset')
339 if (not opts.get('user') and not opts.get('changeset')
339 and not opts.get('date') and not opts.get('file')):
340 and not opts.get('date') and not opts.get('file')):
340 opts['number'] = True
341 opts['number'] = True
341
342
342 linenumber = opts.get('line_number') is not None
343 linenumber = opts.get('line_number') is not None
343 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
344 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
344 raise error.Abort(_('at least one of -n/-c is required for -l'))
345 raise error.Abort(_('at least one of -n/-c is required for -l'))
345
346
346 ui.pager('annotate')
347 ui.pager('annotate')
347
348
348 if rootfm.isplain():
349 if rootfm.isplain():
349 def makefunc(get, fmt):
350 def makefunc(get, fmt):
350 return lambda x: fmt(get(x))
351 return lambda x: fmt(get(x))
351 else:
352 else:
352 def makefunc(get, fmt):
353 def makefunc(get, fmt):
353 return get
354 return get
354 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
355 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
355 if opts.get(op)]
356 if opts.get(op)]
356 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
357 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
357 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
358 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
358 if opts.get(op))
359 if opts.get(op))
359
360
360 def bad(x, y):
361 def bad(x, y):
361 raise error.Abort("%s: %s" % (x, y))
362 raise error.Abort("%s: %s" % (x, y))
362
363
363 m = scmutil.match(ctx, pats, opts, badfn=bad)
364 m = scmutil.match(ctx, pats, opts, badfn=bad)
364
365
365 follow = not opts.get('no_follow')
366 follow = not opts.get('no_follow')
366 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
367 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
367 whitespace=True)
368 whitespace=True)
368 skiprevs = opts.get('skip')
369 skiprevs = opts.get('skip')
369 if skiprevs:
370 if skiprevs:
370 skiprevs = scmutil.revrange(repo, skiprevs)
371 skiprevs = scmutil.revrange(repo, skiprevs)
371
372
372 for abs in ctx.walk(m):
373 for abs in ctx.walk(m):
373 fctx = ctx[abs]
374 fctx = ctx[abs]
374 rootfm.startitem()
375 rootfm.startitem()
375 rootfm.data(abspath=abs, path=m.rel(abs))
376 rootfm.data(abspath=abs, path=m.rel(abs))
376 if not opts.get('text') and fctx.isbinary():
377 if not opts.get('text') and fctx.isbinary():
377 rootfm.plain(_("%s: binary file\n")
378 rootfm.plain(_("%s: binary file\n")
378 % ((pats and m.rel(abs)) or abs))
379 % ((pats and m.rel(abs)) or abs))
379 continue
380 continue
380
381
381 fm = rootfm.nested('lines')
382 fm = rootfm.nested('lines')
382 lines = fctx.annotate(follow=follow, linenumber=linenumber,
383 lines = fctx.annotate(follow=follow, linenumber=linenumber,
383 skiprevs=skiprevs, diffopts=diffopts)
384 skiprevs=skiprevs, diffopts=diffopts)
384 if not lines:
385 if not lines:
385 fm.end()
386 fm.end()
386 continue
387 continue
387 formats = []
388 formats = []
388 pieces = []
389 pieces = []
389
390
390 for f, sep in funcmap:
391 for f, sep in funcmap:
391 l = [f(n) for n, dummy in lines]
392 l = [f(n) for n, dummy in lines]
392 if fm.isplain():
393 if fm.isplain():
393 sizes = [encoding.colwidth(x) for x in l]
394 sizes = [encoding.colwidth(x) for x in l]
394 ml = max(sizes)
395 ml = max(sizes)
395 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
396 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
396 else:
397 else:
397 formats.append(['%s' for x in l])
398 formats.append(['%s' for x in l])
398 pieces.append(l)
399 pieces.append(l)
399
400
400 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
401 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
401 fm.startitem()
402 fm.startitem()
402 fm.write(fields, "".join(f), *p)
403 fm.write(fields, "".join(f), *p)
403 if l[0].skip:
404 if l[0].skip:
404 fmt = "* %s"
405 fmt = "* %s"
405 else:
406 else:
406 fmt = ": %s"
407 fmt = ": %s"
407 fm.write('line', fmt, l[1])
408 fm.write('line', fmt, l[1])
408
409
409 if not lines[-1][1].endswith('\n'):
410 if not lines[-1][1].endswith('\n'):
410 fm.plain('\n')
411 fm.plain('\n')
411 fm.end()
412 fm.end()
412
413
413 rootfm.end()
414 rootfm.end()
414
415
415 @command('archive',
416 @command('archive',
416 [('', 'no-decode', None, _('do not pass files through decoders')),
417 [('', 'no-decode', None, _('do not pass files through decoders')),
417 ('p', 'prefix', '', _('directory prefix for files in archive'),
418 ('p', 'prefix', '', _('directory prefix for files in archive'),
418 _('PREFIX')),
419 _('PREFIX')),
419 ('r', 'rev', '', _('revision to distribute'), _('REV')),
420 ('r', 'rev', '', _('revision to distribute'), _('REV')),
420 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
421 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
421 ] + subrepoopts + walkopts,
422 ] + subrepoopts + walkopts,
422 _('[OPTION]... DEST'))
423 _('[OPTION]... DEST'))
423 def archive(ui, repo, dest, **opts):
424 def archive(ui, repo, dest, **opts):
424 '''create an unversioned archive of a repository revision
425 '''create an unversioned archive of a repository revision
425
426
426 By default, the revision used is the parent of the working
427 By default, the revision used is the parent of the working
427 directory; use -r/--rev to specify a different revision.
428 directory; use -r/--rev to specify a different revision.
428
429
429 The archive type is automatically detected based on file
430 The archive type is automatically detected based on file
430 extension (to override, use -t/--type).
431 extension (to override, use -t/--type).
431
432
432 .. container:: verbose
433 .. container:: verbose
433
434
434 Examples:
435 Examples:
435
436
436 - create a zip file containing the 1.0 release::
437 - create a zip file containing the 1.0 release::
437
438
438 hg archive -r 1.0 project-1.0.zip
439 hg archive -r 1.0 project-1.0.zip
439
440
440 - create a tarball excluding .hg files::
441 - create a tarball excluding .hg files::
441
442
442 hg archive project.tar.gz -X ".hg*"
443 hg archive project.tar.gz -X ".hg*"
443
444
444 Valid types are:
445 Valid types are:
445
446
446 :``files``: a directory full of files (default)
447 :``files``: a directory full of files (default)
447 :``tar``: tar archive, uncompressed
448 :``tar``: tar archive, uncompressed
448 :``tbz2``: tar archive, compressed using bzip2
449 :``tbz2``: tar archive, compressed using bzip2
449 :``tgz``: tar archive, compressed using gzip
450 :``tgz``: tar archive, compressed using gzip
450 :``uzip``: zip archive, uncompressed
451 :``uzip``: zip archive, uncompressed
451 :``zip``: zip archive, compressed using deflate
452 :``zip``: zip archive, compressed using deflate
452
453
453 The exact name of the destination archive or directory is given
454 The exact name of the destination archive or directory is given
454 using a format string; see :hg:`help export` for details.
455 using a format string; see :hg:`help export` for details.
455
456
456 Each member added to an archive file has a directory prefix
457 Each member added to an archive file has a directory prefix
457 prepended. Use -p/--prefix to specify a format string for the
458 prepended. Use -p/--prefix to specify a format string for the
458 prefix. The default is the basename of the archive, with suffixes
459 prefix. The default is the basename of the archive, with suffixes
459 removed.
460 removed.
460
461
461 Returns 0 on success.
462 Returns 0 on success.
462 '''
463 '''
463
464
464 opts = pycompat.byteskwargs(opts)
465 opts = pycompat.byteskwargs(opts)
465 ctx = scmutil.revsingle(repo, opts.get('rev'))
466 ctx = scmutil.revsingle(repo, opts.get('rev'))
466 if not ctx:
467 if not ctx:
467 raise error.Abort(_('no working directory: please specify a revision'))
468 raise error.Abort(_('no working directory: please specify a revision'))
468 node = ctx.node()
469 node = ctx.node()
469 dest = cmdutil.makefilename(repo, dest, node)
470 dest = cmdutil.makefilename(repo, dest, node)
470 if os.path.realpath(dest) == repo.root:
471 if os.path.realpath(dest) == repo.root:
471 raise error.Abort(_('repository root cannot be destination'))
472 raise error.Abort(_('repository root cannot be destination'))
472
473
473 kind = opts.get('type') or archival.guesskind(dest) or 'files'
474 kind = opts.get('type') or archival.guesskind(dest) or 'files'
474 prefix = opts.get('prefix')
475 prefix = opts.get('prefix')
475
476
476 if dest == '-':
477 if dest == '-':
477 if kind == 'files':
478 if kind == 'files':
478 raise error.Abort(_('cannot archive plain files to stdout'))
479 raise error.Abort(_('cannot archive plain files to stdout'))
479 dest = cmdutil.makefileobj(repo, dest)
480 dest = cmdutil.makefileobj(repo, dest)
480 if not prefix:
481 if not prefix:
481 prefix = os.path.basename(repo.root) + '-%h'
482 prefix = os.path.basename(repo.root) + '-%h'
482
483
483 prefix = cmdutil.makefilename(repo, prefix, node)
484 prefix = cmdutil.makefilename(repo, prefix, node)
484 match = scmutil.match(ctx, [], opts)
485 match = scmutil.match(ctx, [], opts)
485 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
486 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
486 match, prefix, subrepos=opts.get('subrepos'))
487 match, prefix, subrepos=opts.get('subrepos'))
487
488
488 @command('backout',
489 @command('backout',
489 [('', 'merge', None, _('merge with old dirstate parent after backout')),
490 [('', 'merge', None, _('merge with old dirstate parent after backout')),
490 ('', 'commit', None,
491 ('', 'commit', None,
491 _('commit if no conflicts were encountered (DEPRECATED)')),
492 _('commit if no conflicts were encountered (DEPRECATED)')),
492 ('', 'no-commit', None, _('do not commit')),
493 ('', 'no-commit', None, _('do not commit')),
493 ('', 'parent', '',
494 ('', 'parent', '',
494 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
495 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
495 ('r', 'rev', '', _('revision to backout'), _('REV')),
496 ('r', 'rev', '', _('revision to backout'), _('REV')),
496 ('e', 'edit', False, _('invoke editor on commit messages')),
497 ('e', 'edit', False, _('invoke editor on commit messages')),
497 ] + mergetoolopts + walkopts + commitopts + commitopts2,
498 ] + mergetoolopts + walkopts + commitopts + commitopts2,
498 _('[OPTION]... [-r] REV'))
499 _('[OPTION]... [-r] REV'))
499 def backout(ui, repo, node=None, rev=None, **opts):
500 def backout(ui, repo, node=None, rev=None, **opts):
500 '''reverse effect of earlier changeset
501 '''reverse effect of earlier changeset
501
502
502 Prepare a new changeset with the effect of REV undone in the
503 Prepare a new changeset with the effect of REV undone in the
503 current working directory. If no conflicts were encountered,
504 current working directory. If no conflicts were encountered,
504 it will be committed immediately.
505 it will be committed immediately.
505
506
506 If REV is the parent of the working directory, then this new changeset
507 If REV is the parent of the working directory, then this new changeset
507 is committed automatically (unless --no-commit is specified).
508 is committed automatically (unless --no-commit is specified).
508
509
509 .. note::
510 .. note::
510
511
511 :hg:`backout` cannot be used to fix either an unwanted or
512 :hg:`backout` cannot be used to fix either an unwanted or
512 incorrect merge.
513 incorrect merge.
513
514
514 .. container:: verbose
515 .. container:: verbose
515
516
516 Examples:
517 Examples:
517
518
518 - Reverse the effect of the parent of the working directory.
519 - Reverse the effect of the parent of the working directory.
519 This backout will be committed immediately::
520 This backout will be committed immediately::
520
521
521 hg backout -r .
522 hg backout -r .
522
523
523 - Reverse the effect of previous bad revision 23::
524 - Reverse the effect of previous bad revision 23::
524
525
525 hg backout -r 23
526 hg backout -r 23
526
527
527 - Reverse the effect of previous bad revision 23 and
528 - Reverse the effect of previous bad revision 23 and
528 leave changes uncommitted::
529 leave changes uncommitted::
529
530
530 hg backout -r 23 --no-commit
531 hg backout -r 23 --no-commit
531 hg commit -m "Backout revision 23"
532 hg commit -m "Backout revision 23"
532
533
533 By default, the pending changeset will have one parent,
534 By default, the pending changeset will have one parent,
534 maintaining a linear history. With --merge, the pending
535 maintaining a linear history. With --merge, the pending
535 changeset will instead have two parents: the old parent of the
536 changeset will instead have two parents: the old parent of the
536 working directory and a new child of REV that simply undoes REV.
537 working directory and a new child of REV that simply undoes REV.
537
538
538 Before version 1.7, the behavior without --merge was equivalent
539 Before version 1.7, the behavior without --merge was equivalent
539 to specifying --merge followed by :hg:`update --clean .` to
540 to specifying --merge followed by :hg:`update --clean .` to
540 cancel the merge and leave the child of REV as a head to be
541 cancel the merge and leave the child of REV as a head to be
541 merged separately.
542 merged separately.
542
543
543 See :hg:`help dates` for a list of formats valid for -d/--date.
544 See :hg:`help dates` for a list of formats valid for -d/--date.
544
545
545 See :hg:`help revert` for a way to restore files to the state
546 See :hg:`help revert` for a way to restore files to the state
546 of another revision.
547 of another revision.
547
548
548 Returns 0 on success, 1 if nothing to backout or there are unresolved
549 Returns 0 on success, 1 if nothing to backout or there are unresolved
549 files.
550 files.
550 '''
551 '''
551 wlock = lock = None
552 wlock = lock = None
552 try:
553 try:
553 wlock = repo.wlock()
554 wlock = repo.wlock()
554 lock = repo.lock()
555 lock = repo.lock()
555 return _dobackout(ui, repo, node, rev, **opts)
556 return _dobackout(ui, repo, node, rev, **opts)
556 finally:
557 finally:
557 release(lock, wlock)
558 release(lock, wlock)
558
559
559 def _dobackout(ui, repo, node=None, rev=None, **opts):
560 def _dobackout(ui, repo, node=None, rev=None, **opts):
560 opts = pycompat.byteskwargs(opts)
561 opts = pycompat.byteskwargs(opts)
561 if opts.get('commit') and opts.get('no_commit'):
562 if opts.get('commit') and opts.get('no_commit'):
562 raise error.Abort(_("cannot use --commit with --no-commit"))
563 raise error.Abort(_("cannot use --commit with --no-commit"))
563 if opts.get('merge') and opts.get('no_commit'):
564 if opts.get('merge') and opts.get('no_commit'):
564 raise error.Abort(_("cannot use --merge with --no-commit"))
565 raise error.Abort(_("cannot use --merge with --no-commit"))
565
566
566 if rev and node:
567 if rev and node:
567 raise error.Abort(_("please specify just one revision"))
568 raise error.Abort(_("please specify just one revision"))
568
569
569 if not rev:
570 if not rev:
570 rev = node
571 rev = node
571
572
572 if not rev:
573 if not rev:
573 raise error.Abort(_("please specify a revision to backout"))
574 raise error.Abort(_("please specify a revision to backout"))
574
575
575 date = opts.get('date')
576 date = opts.get('date')
576 if date:
577 if date:
577 opts['date'] = util.parsedate(date)
578 opts['date'] = util.parsedate(date)
578
579
579 cmdutil.checkunfinished(repo)
580 cmdutil.checkunfinished(repo)
580 cmdutil.bailifchanged(repo)
581 cmdutil.bailifchanged(repo)
581 node = scmutil.revsingle(repo, rev).node()
582 node = scmutil.revsingle(repo, rev).node()
582
583
583 op1, op2 = repo.dirstate.parents()
584 op1, op2 = repo.dirstate.parents()
584 if not repo.changelog.isancestor(node, op1):
585 if not repo.changelog.isancestor(node, op1):
585 raise error.Abort(_('cannot backout change that is not an ancestor'))
586 raise error.Abort(_('cannot backout change that is not an ancestor'))
586
587
587 p1, p2 = repo.changelog.parents(node)
588 p1, p2 = repo.changelog.parents(node)
588 if p1 == nullid:
589 if p1 == nullid:
589 raise error.Abort(_('cannot backout a change with no parents'))
590 raise error.Abort(_('cannot backout a change with no parents'))
590 if p2 != nullid:
591 if p2 != nullid:
591 if not opts.get('parent'):
592 if not opts.get('parent'):
592 raise error.Abort(_('cannot backout a merge changeset'))
593 raise error.Abort(_('cannot backout a merge changeset'))
593 p = repo.lookup(opts['parent'])
594 p = repo.lookup(opts['parent'])
594 if p not in (p1, p2):
595 if p not in (p1, p2):
595 raise error.Abort(_('%s is not a parent of %s') %
596 raise error.Abort(_('%s is not a parent of %s') %
596 (short(p), short(node)))
597 (short(p), short(node)))
597 parent = p
598 parent = p
598 else:
599 else:
599 if opts.get('parent'):
600 if opts.get('parent'):
600 raise error.Abort(_('cannot use --parent on non-merge changeset'))
601 raise error.Abort(_('cannot use --parent on non-merge changeset'))
601 parent = p1
602 parent = p1
602
603
603 # the backout should appear on the same branch
604 # the backout should appear on the same branch
604 branch = repo.dirstate.branch()
605 branch = repo.dirstate.branch()
605 bheads = repo.branchheads(branch)
606 bheads = repo.branchheads(branch)
606 rctx = scmutil.revsingle(repo, hex(parent))
607 rctx = scmutil.revsingle(repo, hex(parent))
607 if not opts.get('merge') and op1 != node:
608 if not opts.get('merge') and op1 != node:
608 dsguard = dirstateguard.dirstateguard(repo, 'backout')
609 dsguard = dirstateguard.dirstateguard(repo, 'backout')
609 try:
610 try:
610 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
611 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
611 'backout')
612 'backout')
612 stats = mergemod.update(repo, parent, True, True, node, False)
613 stats = mergemod.update(repo, parent, True, True, node, False)
613 repo.setparents(op1, op2)
614 repo.setparents(op1, op2)
614 dsguard.close()
615 dsguard.close()
615 hg._showstats(repo, stats)
616 hg._showstats(repo, stats)
616 if stats[3]:
617 if stats[3]:
617 repo.ui.status(_("use 'hg resolve' to retry unresolved "
618 repo.ui.status(_("use 'hg resolve' to retry unresolved "
618 "file merges\n"))
619 "file merges\n"))
619 return 1
620 return 1
620 finally:
621 finally:
621 ui.setconfig('ui', 'forcemerge', '', '')
622 ui.setconfig('ui', 'forcemerge', '', '')
622 lockmod.release(dsguard)
623 lockmod.release(dsguard)
623 else:
624 else:
624 hg.clean(repo, node, show_stats=False)
625 hg.clean(repo, node, show_stats=False)
625 repo.dirstate.setbranch(branch)
626 repo.dirstate.setbranch(branch)
626 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
627 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
627
628
628 if opts.get('no_commit'):
629 if opts.get('no_commit'):
629 msg = _("changeset %s backed out, "
630 msg = _("changeset %s backed out, "
630 "don't forget to commit.\n")
631 "don't forget to commit.\n")
631 ui.status(msg % short(node))
632 ui.status(msg % short(node))
632 return 0
633 return 0
633
634
634 def commitfunc(ui, repo, message, match, opts):
635 def commitfunc(ui, repo, message, match, opts):
635 editform = 'backout'
636 editform = 'backout'
636 e = cmdutil.getcommiteditor(editform=editform,
637 e = cmdutil.getcommiteditor(editform=editform,
637 **pycompat.strkwargs(opts))
638 **pycompat.strkwargs(opts))
638 if not message:
639 if not message:
639 # we don't translate commit messages
640 # we don't translate commit messages
640 message = "Backed out changeset %s" % short(node)
641 message = "Backed out changeset %s" % short(node)
641 e = cmdutil.getcommiteditor(edit=True, editform=editform)
642 e = cmdutil.getcommiteditor(edit=True, editform=editform)
642 return repo.commit(message, opts.get('user'), opts.get('date'),
643 return repo.commit(message, opts.get('user'), opts.get('date'),
643 match, editor=e)
644 match, editor=e)
644 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
645 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
645 if not newnode:
646 if not newnode:
646 ui.status(_("nothing changed\n"))
647 ui.status(_("nothing changed\n"))
647 return 1
648 return 1
648 cmdutil.commitstatus(repo, newnode, branch, bheads)
649 cmdutil.commitstatus(repo, newnode, branch, bheads)
649
650
650 def nice(node):
651 def nice(node):
651 return '%d:%s' % (repo.changelog.rev(node), short(node))
652 return '%d:%s' % (repo.changelog.rev(node), short(node))
652 ui.status(_('changeset %s backs out changeset %s\n') %
653 ui.status(_('changeset %s backs out changeset %s\n') %
653 (nice(repo.changelog.tip()), nice(node)))
654 (nice(repo.changelog.tip()), nice(node)))
654 if opts.get('merge') and op1 != node:
655 if opts.get('merge') and op1 != node:
655 hg.clean(repo, op1, show_stats=False)
656 hg.clean(repo, op1, show_stats=False)
656 ui.status(_('merging with changeset %s\n')
657 ui.status(_('merging with changeset %s\n')
657 % nice(repo.changelog.tip()))
658 % nice(repo.changelog.tip()))
658 try:
659 try:
659 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
660 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
660 'backout')
661 'backout')
661 return hg.merge(repo, hex(repo.changelog.tip()))
662 return hg.merge(repo, hex(repo.changelog.tip()))
662 finally:
663 finally:
663 ui.setconfig('ui', 'forcemerge', '', '')
664 ui.setconfig('ui', 'forcemerge', '', '')
664 return 0
665 return 0
665
666
666 @command('bisect',
667 @command('bisect',
667 [('r', 'reset', False, _('reset bisect state')),
668 [('r', 'reset', False, _('reset bisect state')),
668 ('g', 'good', False, _('mark changeset good')),
669 ('g', 'good', False, _('mark changeset good')),
669 ('b', 'bad', False, _('mark changeset bad')),
670 ('b', 'bad', False, _('mark changeset bad')),
670 ('s', 'skip', False, _('skip testing changeset')),
671 ('s', 'skip', False, _('skip testing changeset')),
671 ('e', 'extend', False, _('extend the bisect range')),
672 ('e', 'extend', False, _('extend the bisect range')),
672 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
673 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
673 ('U', 'noupdate', False, _('do not update to target'))],
674 ('U', 'noupdate', False, _('do not update to target'))],
674 _("[-gbsr] [-U] [-c CMD] [REV]"))
675 _("[-gbsr] [-U] [-c CMD] [REV]"))
675 def bisect(ui, repo, rev=None, extra=None, command=None,
676 def bisect(ui, repo, rev=None, extra=None, command=None,
676 reset=None, good=None, bad=None, skip=None, extend=None,
677 reset=None, good=None, bad=None, skip=None, extend=None,
677 noupdate=None):
678 noupdate=None):
678 """subdivision search of changesets
679 """subdivision search of changesets
679
680
680 This command helps to find changesets which introduce problems. To
681 This command helps to find changesets which introduce problems. To
681 use, mark the earliest changeset you know exhibits the problem as
682 use, mark the earliest changeset you know exhibits the problem as
682 bad, then mark the latest changeset which is free from the problem
683 bad, then mark the latest changeset which is free from the problem
683 as good. Bisect will update your working directory to a revision
684 as good. Bisect will update your working directory to a revision
684 for testing (unless the -U/--noupdate option is specified). Once
685 for testing (unless the -U/--noupdate option is specified). Once
685 you have performed tests, mark the working directory as good or
686 you have performed tests, mark the working directory as good or
686 bad, and bisect will either update to another candidate changeset
687 bad, and bisect will either update to another candidate changeset
687 or announce that it has found the bad revision.
688 or announce that it has found the bad revision.
688
689
689 As a shortcut, you can also use the revision argument to mark a
690 As a shortcut, you can also use the revision argument to mark a
690 revision as good or bad without checking it out first.
691 revision as good or bad without checking it out first.
691
692
692 If you supply a command, it will be used for automatic bisection.
693 If you supply a command, it will be used for automatic bisection.
693 The environment variable HG_NODE will contain the ID of the
694 The environment variable HG_NODE will contain the ID of the
694 changeset being tested. The exit status of the command will be
695 changeset being tested. The exit status of the command will be
695 used to mark revisions as good or bad: status 0 means good, 125
696 used to mark revisions as good or bad: status 0 means good, 125
696 means to skip the revision, 127 (command not found) will abort the
697 means to skip the revision, 127 (command not found) will abort the
697 bisection, and any other non-zero exit status means the revision
698 bisection, and any other non-zero exit status means the revision
698 is bad.
699 is bad.
699
700
700 .. container:: verbose
701 .. container:: verbose
701
702
702 Some examples:
703 Some examples:
703
704
704 - start a bisection with known bad revision 34, and good revision 12::
705 - start a bisection with known bad revision 34, and good revision 12::
705
706
706 hg bisect --bad 34
707 hg bisect --bad 34
707 hg bisect --good 12
708 hg bisect --good 12
708
709
709 - advance the current bisection by marking current revision as good or
710 - advance the current bisection by marking current revision as good or
710 bad::
711 bad::
711
712
712 hg bisect --good
713 hg bisect --good
713 hg bisect --bad
714 hg bisect --bad
714
715
715 - mark the current revision, or a known revision, to be skipped (e.g. if
716 - mark the current revision, or a known revision, to be skipped (e.g. if
716 that revision is not usable because of another issue)::
717 that revision is not usable because of another issue)::
717
718
718 hg bisect --skip
719 hg bisect --skip
719 hg bisect --skip 23
720 hg bisect --skip 23
720
721
721 - skip all revisions that do not touch directories ``foo`` or ``bar``::
722 - skip all revisions that do not touch directories ``foo`` or ``bar``::
722
723
723 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
724 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
724
725
725 - forget the current bisection::
726 - forget the current bisection::
726
727
727 hg bisect --reset
728 hg bisect --reset
728
729
729 - use 'make && make tests' to automatically find the first broken
730 - use 'make && make tests' to automatically find the first broken
730 revision::
731 revision::
731
732
732 hg bisect --reset
733 hg bisect --reset
733 hg bisect --bad 34
734 hg bisect --bad 34
734 hg bisect --good 12
735 hg bisect --good 12
735 hg bisect --command "make && make tests"
736 hg bisect --command "make && make tests"
736
737
737 - see all changesets whose states are already known in the current
738 - see all changesets whose states are already known in the current
738 bisection::
739 bisection::
739
740
740 hg log -r "bisect(pruned)"
741 hg log -r "bisect(pruned)"
741
742
742 - see the changeset currently being bisected (especially useful
743 - see the changeset currently being bisected (especially useful
743 if running with -U/--noupdate)::
744 if running with -U/--noupdate)::
744
745
745 hg log -r "bisect(current)"
746 hg log -r "bisect(current)"
746
747
747 - see all changesets that took part in the current bisection::
748 - see all changesets that took part in the current bisection::
748
749
749 hg log -r "bisect(range)"
750 hg log -r "bisect(range)"
750
751
751 - you can even get a nice graph::
752 - you can even get a nice graph::
752
753
753 hg log --graph -r "bisect(range)"
754 hg log --graph -r "bisect(range)"
754
755
755 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
756 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
756
757
757 Returns 0 on success.
758 Returns 0 on success.
758 """
759 """
759 # backward compatibility
760 # backward compatibility
760 if rev in "good bad reset init".split():
761 if rev in "good bad reset init".split():
761 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
762 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
762 cmd, rev, extra = rev, extra, None
763 cmd, rev, extra = rev, extra, None
763 if cmd == "good":
764 if cmd == "good":
764 good = True
765 good = True
765 elif cmd == "bad":
766 elif cmd == "bad":
766 bad = True
767 bad = True
767 else:
768 else:
768 reset = True
769 reset = True
769 elif extra:
770 elif extra:
770 raise error.Abort(_('incompatible arguments'))
771 raise error.Abort(_('incompatible arguments'))
771
772
772 incompatibles = {
773 incompatibles = {
773 '--bad': bad,
774 '--bad': bad,
774 '--command': bool(command),
775 '--command': bool(command),
775 '--extend': extend,
776 '--extend': extend,
776 '--good': good,
777 '--good': good,
777 '--reset': reset,
778 '--reset': reset,
778 '--skip': skip,
779 '--skip': skip,
779 }
780 }
780
781
781 enabled = [x for x in incompatibles if incompatibles[x]]
782 enabled = [x for x in incompatibles if incompatibles[x]]
782
783
783 if len(enabled) > 1:
784 if len(enabled) > 1:
784 raise error.Abort(_('%s and %s are incompatible') %
785 raise error.Abort(_('%s and %s are incompatible') %
785 tuple(sorted(enabled)[0:2]))
786 tuple(sorted(enabled)[0:2]))
786
787
787 if reset:
788 if reset:
788 hbisect.resetstate(repo)
789 hbisect.resetstate(repo)
789 return
790 return
790
791
791 state = hbisect.load_state(repo)
792 state = hbisect.load_state(repo)
792
793
793 # update state
794 # update state
794 if good or bad or skip:
795 if good or bad or skip:
795 if rev:
796 if rev:
796 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
797 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
797 else:
798 else:
798 nodes = [repo.lookup('.')]
799 nodes = [repo.lookup('.')]
799 if good:
800 if good:
800 state['good'] += nodes
801 state['good'] += nodes
801 elif bad:
802 elif bad:
802 state['bad'] += nodes
803 state['bad'] += nodes
803 elif skip:
804 elif skip:
804 state['skip'] += nodes
805 state['skip'] += nodes
805 hbisect.save_state(repo, state)
806 hbisect.save_state(repo, state)
806 if not (state['good'] and state['bad']):
807 if not (state['good'] and state['bad']):
807 return
808 return
808
809
809 def mayupdate(repo, node, show_stats=True):
810 def mayupdate(repo, node, show_stats=True):
810 """common used update sequence"""
811 """common used update sequence"""
811 if noupdate:
812 if noupdate:
812 return
813 return
813 cmdutil.checkunfinished(repo)
814 cmdutil.checkunfinished(repo)
814 cmdutil.bailifchanged(repo)
815 cmdutil.bailifchanged(repo)
815 return hg.clean(repo, node, show_stats=show_stats)
816 return hg.clean(repo, node, show_stats=show_stats)
816
817
817 displayer = cmdutil.show_changeset(ui, repo, {})
818 displayer = cmdutil.show_changeset(ui, repo, {})
818
819
819 if command:
820 if command:
820 changesets = 1
821 changesets = 1
821 if noupdate:
822 if noupdate:
822 try:
823 try:
823 node = state['current'][0]
824 node = state['current'][0]
824 except LookupError:
825 except LookupError:
825 raise error.Abort(_('current bisect revision is unknown - '
826 raise error.Abort(_('current bisect revision is unknown - '
826 'start a new bisect to fix'))
827 'start a new bisect to fix'))
827 else:
828 else:
828 node, p2 = repo.dirstate.parents()
829 node, p2 = repo.dirstate.parents()
829 if p2 != nullid:
830 if p2 != nullid:
830 raise error.Abort(_('current bisect revision is a merge'))
831 raise error.Abort(_('current bisect revision is a merge'))
831 if rev:
832 if rev:
832 node = repo[scmutil.revsingle(repo, rev, node)].node()
833 node = repo[scmutil.revsingle(repo, rev, node)].node()
833 try:
834 try:
834 while changesets:
835 while changesets:
835 # update state
836 # update state
836 state['current'] = [node]
837 state['current'] = [node]
837 hbisect.save_state(repo, state)
838 hbisect.save_state(repo, state)
838 status = ui.system(command, environ={'HG_NODE': hex(node)},
839 status = ui.system(command, environ={'HG_NODE': hex(node)},
839 blockedtag='bisect_check')
840 blockedtag='bisect_check')
840 if status == 125:
841 if status == 125:
841 transition = "skip"
842 transition = "skip"
842 elif status == 0:
843 elif status == 0:
843 transition = "good"
844 transition = "good"
844 # status < 0 means process was killed
845 # status < 0 means process was killed
845 elif status == 127:
846 elif status == 127:
846 raise error.Abort(_("failed to execute %s") % command)
847 raise error.Abort(_("failed to execute %s") % command)
847 elif status < 0:
848 elif status < 0:
848 raise error.Abort(_("%s killed") % command)
849 raise error.Abort(_("%s killed") % command)
849 else:
850 else:
850 transition = "bad"
851 transition = "bad"
851 state[transition].append(node)
852 state[transition].append(node)
852 ctx = repo[node]
853 ctx = repo[node]
853 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
854 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
854 hbisect.checkstate(state)
855 hbisect.checkstate(state)
855 # bisect
856 # bisect
856 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
857 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
857 # update to next check
858 # update to next check
858 node = nodes[0]
859 node = nodes[0]
859 mayupdate(repo, node, show_stats=False)
860 mayupdate(repo, node, show_stats=False)
860 finally:
861 finally:
861 state['current'] = [node]
862 state['current'] = [node]
862 hbisect.save_state(repo, state)
863 hbisect.save_state(repo, state)
863 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
864 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
864 return
865 return
865
866
866 hbisect.checkstate(state)
867 hbisect.checkstate(state)
867
868
868 # actually bisect
869 # actually bisect
869 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
870 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
870 if extend:
871 if extend:
871 if not changesets:
872 if not changesets:
872 extendnode = hbisect.extendrange(repo, state, nodes, good)
873 extendnode = hbisect.extendrange(repo, state, nodes, good)
873 if extendnode is not None:
874 if extendnode is not None:
874 ui.write(_("Extending search to changeset %d:%s\n")
875 ui.write(_("Extending search to changeset %d:%s\n")
875 % (extendnode.rev(), extendnode))
876 % (extendnode.rev(), extendnode))
876 state['current'] = [extendnode.node()]
877 state['current'] = [extendnode.node()]
877 hbisect.save_state(repo, state)
878 hbisect.save_state(repo, state)
878 return mayupdate(repo, extendnode.node())
879 return mayupdate(repo, extendnode.node())
879 raise error.Abort(_("nothing to extend"))
880 raise error.Abort(_("nothing to extend"))
880
881
881 if changesets == 0:
882 if changesets == 0:
882 hbisect.printresult(ui, repo, state, displayer, nodes, good)
883 hbisect.printresult(ui, repo, state, displayer, nodes, good)
883 else:
884 else:
884 assert len(nodes) == 1 # only a single node can be tested next
885 assert len(nodes) == 1 # only a single node can be tested next
885 node = nodes[0]
886 node = nodes[0]
886 # compute the approximate number of remaining tests
887 # compute the approximate number of remaining tests
887 tests, size = 0, 2
888 tests, size = 0, 2
888 while size <= changesets:
889 while size <= changesets:
889 tests, size = tests + 1, size * 2
890 tests, size = tests + 1, size * 2
890 rev = repo.changelog.rev(node)
891 rev = repo.changelog.rev(node)
891 ui.write(_("Testing changeset %d:%s "
892 ui.write(_("Testing changeset %d:%s "
892 "(%d changesets remaining, ~%d tests)\n")
893 "(%d changesets remaining, ~%d tests)\n")
893 % (rev, short(node), changesets, tests))
894 % (rev, short(node), changesets, tests))
894 state['current'] = [node]
895 state['current'] = [node]
895 hbisect.save_state(repo, state)
896 hbisect.save_state(repo, state)
896 return mayupdate(repo, node)
897 return mayupdate(repo, node)
897
898
898 @command('bookmarks|bookmark',
899 @command('bookmarks|bookmark',
899 [('f', 'force', False, _('force')),
900 [('f', 'force', False, _('force')),
900 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
901 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
901 ('d', 'delete', False, _('delete a given bookmark')),
902 ('d', 'delete', False, _('delete a given bookmark')),
902 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
903 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
903 ('i', 'inactive', False, _('mark a bookmark inactive')),
904 ('i', 'inactive', False, _('mark a bookmark inactive')),
904 ] + formatteropts,
905 ] + formatteropts,
905 _('hg bookmarks [OPTIONS]... [NAME]...'))
906 _('hg bookmarks [OPTIONS]... [NAME]...'))
906 def bookmark(ui, repo, *names, **opts):
907 def bookmark(ui, repo, *names, **opts):
907 '''create a new bookmark or list existing bookmarks
908 '''create a new bookmark or list existing bookmarks
908
909
909 Bookmarks are labels on changesets to help track lines of development.
910 Bookmarks are labels on changesets to help track lines of development.
910 Bookmarks are unversioned and can be moved, renamed and deleted.
911 Bookmarks are unversioned and can be moved, renamed and deleted.
911 Deleting or moving a bookmark has no effect on the associated changesets.
912 Deleting or moving a bookmark has no effect on the associated changesets.
912
913
913 Creating or updating to a bookmark causes it to be marked as 'active'.
914 Creating or updating to a bookmark causes it to be marked as 'active'.
914 The active bookmark is indicated with a '*'.
915 The active bookmark is indicated with a '*'.
915 When a commit is made, the active bookmark will advance to the new commit.
916 When a commit is made, the active bookmark will advance to the new commit.
916 A plain :hg:`update` will also advance an active bookmark, if possible.
917 A plain :hg:`update` will also advance an active bookmark, if possible.
917 Updating away from a bookmark will cause it to be deactivated.
918 Updating away from a bookmark will cause it to be deactivated.
918
919
919 Bookmarks can be pushed and pulled between repositories (see
920 Bookmarks can be pushed and pulled between repositories (see
920 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
921 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
921 diverged, a new 'divergent bookmark' of the form 'name@path' will
922 diverged, a new 'divergent bookmark' of the form 'name@path' will
922 be created. Using :hg:`merge` will resolve the divergence.
923 be created. Using :hg:`merge` will resolve the divergence.
923
924
924 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
925 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
925 the active bookmark's name.
926 the active bookmark's name.
926
927
927 A bookmark named '@' has the special property that :hg:`clone` will
928 A bookmark named '@' has the special property that :hg:`clone` will
928 check it out by default if it exists.
929 check it out by default if it exists.
929
930
930 .. container:: verbose
931 .. container:: verbose
931
932
932 Examples:
933 Examples:
933
934
934 - create an active bookmark for a new line of development::
935 - create an active bookmark for a new line of development::
935
936
936 hg book new-feature
937 hg book new-feature
937
938
938 - create an inactive bookmark as a place marker::
939 - create an inactive bookmark as a place marker::
939
940
940 hg book -i reviewed
941 hg book -i reviewed
941
942
942 - create an inactive bookmark on another changeset::
943 - create an inactive bookmark on another changeset::
943
944
944 hg book -r .^ tested
945 hg book -r .^ tested
945
946
946 - rename bookmark turkey to dinner::
947 - rename bookmark turkey to dinner::
947
948
948 hg book -m turkey dinner
949 hg book -m turkey dinner
949
950
950 - move the '@' bookmark from another branch::
951 - move the '@' bookmark from another branch::
951
952
952 hg book -f @
953 hg book -f @
953 '''
954 '''
954 force = opts.get(r'force')
955 force = opts.get(r'force')
955 rev = opts.get(r'rev')
956 rev = opts.get(r'rev')
956 delete = opts.get(r'delete')
957 delete = opts.get(r'delete')
957 rename = opts.get(r'rename')
958 rename = opts.get(r'rename')
958 inactive = opts.get(r'inactive')
959 inactive = opts.get(r'inactive')
959
960
960 if delete and rename:
961 if delete and rename:
961 raise error.Abort(_("--delete and --rename are incompatible"))
962 raise error.Abort(_("--delete and --rename are incompatible"))
962 if delete and rev:
963 if delete and rev:
963 raise error.Abort(_("--rev is incompatible with --delete"))
964 raise error.Abort(_("--rev is incompatible with --delete"))
964 if rename and rev:
965 if rename and rev:
965 raise error.Abort(_("--rev is incompatible with --rename"))
966 raise error.Abort(_("--rev is incompatible with --rename"))
966 if not names and (delete or rev):
967 if not names and (delete or rev):
967 raise error.Abort(_("bookmark name required"))
968 raise error.Abort(_("bookmark name required"))
968
969
969 if delete or rename or names or inactive:
970 if delete or rename or names or inactive:
970 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
971 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
971 if delete:
972 if delete:
972 names = pycompat.maplist(repo._bookmarks.expandname, names)
973 names = pycompat.maplist(repo._bookmarks.expandname, names)
973 bookmarks.delete(repo, tr, names)
974 bookmarks.delete(repo, tr, names)
974 elif rename:
975 elif rename:
975 if not names:
976 if not names:
976 raise error.Abort(_("new bookmark name required"))
977 raise error.Abort(_("new bookmark name required"))
977 elif len(names) > 1:
978 elif len(names) > 1:
978 raise error.Abort(_("only one new bookmark name allowed"))
979 raise error.Abort(_("only one new bookmark name allowed"))
979 rename = repo._bookmarks.expandname(rename)
980 rename = repo._bookmarks.expandname(rename)
980 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
981 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
981 elif names:
982 elif names:
982 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
983 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
983 elif inactive:
984 elif inactive:
984 if len(repo._bookmarks) == 0:
985 if len(repo._bookmarks) == 0:
985 ui.status(_("no bookmarks set\n"))
986 ui.status(_("no bookmarks set\n"))
986 elif not repo._activebookmark:
987 elif not repo._activebookmark:
987 ui.status(_("no active bookmark\n"))
988 ui.status(_("no active bookmark\n"))
988 else:
989 else:
989 bookmarks.deactivate(repo)
990 bookmarks.deactivate(repo)
990 else: # show bookmarks
991 else: # show bookmarks
991 bookmarks.printbookmarks(ui, repo, **opts)
992 bookmarks.printbookmarks(ui, repo, **opts)
992
993
993 @command('branch',
994 @command('branch',
994 [('f', 'force', None,
995 [('f', 'force', None,
995 _('set branch name even if it shadows an existing branch')),
996 _('set branch name even if it shadows an existing branch')),
996 ('C', 'clean', None, _('reset branch name to parent branch name'))],
997 ('C', 'clean', None, _('reset branch name to parent branch name'))],
997 _('[-fC] [NAME]'))
998 _('[-fC] [NAME]'))
998 def branch(ui, repo, label=None, **opts):
999 def branch(ui, repo, label=None, **opts):
999 """set or show the current branch name
1000 """set or show the current branch name
1000
1001
1001 .. note::
1002 .. note::
1002
1003
1003 Branch names are permanent and global. Use :hg:`bookmark` to create a
1004 Branch names are permanent and global. Use :hg:`bookmark` to create a
1004 light-weight bookmark instead. See :hg:`help glossary` for more
1005 light-weight bookmark instead. See :hg:`help glossary` for more
1005 information about named branches and bookmarks.
1006 information about named branches and bookmarks.
1006
1007
1007 With no argument, show the current branch name. With one argument,
1008 With no argument, show the current branch name. With one argument,
1008 set the working directory branch name (the branch will not exist
1009 set the working directory branch name (the branch will not exist
1009 in the repository until the next commit). Standard practice
1010 in the repository until the next commit). Standard practice
1010 recommends that primary development take place on the 'default'
1011 recommends that primary development take place on the 'default'
1011 branch.
1012 branch.
1012
1013
1013 Unless -f/--force is specified, branch will not let you set a
1014 Unless -f/--force is specified, branch will not let you set a
1014 branch name that already exists.
1015 branch name that already exists.
1015
1016
1016 Use -C/--clean to reset the working directory branch to that of
1017 Use -C/--clean to reset the working directory branch to that of
1017 the parent of the working directory, negating a previous branch
1018 the parent of the working directory, negating a previous branch
1018 change.
1019 change.
1019
1020
1020 Use the command :hg:`update` to switch to an existing branch. Use
1021 Use the command :hg:`update` to switch to an existing branch. Use
1021 :hg:`commit --close-branch` to mark this branch head as closed.
1022 :hg:`commit --close-branch` to mark this branch head as closed.
1022 When all heads of a branch are closed, the branch will be
1023 When all heads of a branch are closed, the branch will be
1023 considered closed.
1024 considered closed.
1024
1025
1025 Returns 0 on success.
1026 Returns 0 on success.
1026 """
1027 """
1027 opts = pycompat.byteskwargs(opts)
1028 opts = pycompat.byteskwargs(opts)
1028 if label:
1029 if label:
1029 label = label.strip()
1030 label = label.strip()
1030
1031
1031 if not opts.get('clean') and not label:
1032 if not opts.get('clean') and not label:
1032 ui.write("%s\n" % repo.dirstate.branch())
1033 ui.write("%s\n" % repo.dirstate.branch())
1033 return
1034 return
1034
1035
1035 with repo.wlock():
1036 with repo.wlock():
1036 if opts.get('clean'):
1037 if opts.get('clean'):
1037 label = repo[None].p1().branch()
1038 label = repo[None].p1().branch()
1038 repo.dirstate.setbranch(label)
1039 repo.dirstate.setbranch(label)
1039 ui.status(_('reset working directory to branch %s\n') % label)
1040 ui.status(_('reset working directory to branch %s\n') % label)
1040 elif label:
1041 elif label:
1041 if not opts.get('force') and label in repo.branchmap():
1042 if not opts.get('force') and label in repo.branchmap():
1042 if label not in [p.branch() for p in repo[None].parents()]:
1043 if label not in [p.branch() for p in repo[None].parents()]:
1043 raise error.Abort(_('a branch of the same name already'
1044 raise error.Abort(_('a branch of the same name already'
1044 ' exists'),
1045 ' exists'),
1045 # i18n: "it" refers to an existing branch
1046 # i18n: "it" refers to an existing branch
1046 hint=_("use 'hg update' to switch to it"))
1047 hint=_("use 'hg update' to switch to it"))
1047 scmutil.checknewlabel(repo, label, 'branch')
1048 scmutil.checknewlabel(repo, label, 'branch')
1048 repo.dirstate.setbranch(label)
1049 repo.dirstate.setbranch(label)
1049 ui.status(_('marked working directory as branch %s\n') % label)
1050 ui.status(_('marked working directory as branch %s\n') % label)
1050
1051
1051 # find any open named branches aside from default
1052 # find any open named branches aside from default
1052 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1053 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1053 if n != "default" and not c]
1054 if n != "default" and not c]
1054 if not others:
1055 if not others:
1055 ui.status(_('(branches are permanent and global, '
1056 ui.status(_('(branches are permanent and global, '
1056 'did you want a bookmark?)\n'))
1057 'did you want a bookmark?)\n'))
1057
1058
1058 @command('branches',
1059 @command('branches',
1059 [('a', 'active', False,
1060 [('a', 'active', False,
1060 _('show only branches that have unmerged heads (DEPRECATED)')),
1061 _('show only branches that have unmerged heads (DEPRECATED)')),
1061 ('c', 'closed', False, _('show normal and closed branches')),
1062 ('c', 'closed', False, _('show normal and closed branches')),
1062 ] + formatteropts,
1063 ] + formatteropts,
1063 _('[-c]'))
1064 _('[-c]'), cmdtype=readonly)
1064 def branches(ui, repo, active=False, closed=False, **opts):
1065 def branches(ui, repo, active=False, closed=False, **opts):
1065 """list repository named branches
1066 """list repository named branches
1066
1067
1067 List the repository's named branches, indicating which ones are
1068 List the repository's named branches, indicating which ones are
1068 inactive. If -c/--closed is specified, also list branches which have
1069 inactive. If -c/--closed is specified, also list branches which have
1069 been marked closed (see :hg:`commit --close-branch`).
1070 been marked closed (see :hg:`commit --close-branch`).
1070
1071
1071 Use the command :hg:`update` to switch to an existing branch.
1072 Use the command :hg:`update` to switch to an existing branch.
1072
1073
1073 Returns 0.
1074 Returns 0.
1074 """
1075 """
1075
1076
1076 opts = pycompat.byteskwargs(opts)
1077 opts = pycompat.byteskwargs(opts)
1077 ui.pager('branches')
1078 ui.pager('branches')
1078 fm = ui.formatter('branches', opts)
1079 fm = ui.formatter('branches', opts)
1079 hexfunc = fm.hexfunc
1080 hexfunc = fm.hexfunc
1080
1081
1081 allheads = set(repo.heads())
1082 allheads = set(repo.heads())
1082 branches = []
1083 branches = []
1083 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1084 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1084 isactive = False
1085 isactive = False
1085 if not isclosed:
1086 if not isclosed:
1086 openheads = set(repo.branchmap().iteropen(heads))
1087 openheads = set(repo.branchmap().iteropen(heads))
1087 isactive = bool(openheads & allheads)
1088 isactive = bool(openheads & allheads)
1088 branches.append((tag, repo[tip], isactive, not isclosed))
1089 branches.append((tag, repo[tip], isactive, not isclosed))
1089 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1090 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1090 reverse=True)
1091 reverse=True)
1091
1092
1092 for tag, ctx, isactive, isopen in branches:
1093 for tag, ctx, isactive, isopen in branches:
1093 if active and not isactive:
1094 if active and not isactive:
1094 continue
1095 continue
1095 if isactive:
1096 if isactive:
1096 label = 'branches.active'
1097 label = 'branches.active'
1097 notice = ''
1098 notice = ''
1098 elif not isopen:
1099 elif not isopen:
1099 if not closed:
1100 if not closed:
1100 continue
1101 continue
1101 label = 'branches.closed'
1102 label = 'branches.closed'
1102 notice = _(' (closed)')
1103 notice = _(' (closed)')
1103 else:
1104 else:
1104 label = 'branches.inactive'
1105 label = 'branches.inactive'
1105 notice = _(' (inactive)')
1106 notice = _(' (inactive)')
1106 current = (tag == repo.dirstate.branch())
1107 current = (tag == repo.dirstate.branch())
1107 if current:
1108 if current:
1108 label = 'branches.current'
1109 label = 'branches.current'
1109
1110
1110 fm.startitem()
1111 fm.startitem()
1111 fm.write('branch', '%s', tag, label=label)
1112 fm.write('branch', '%s', tag, label=label)
1112 rev = ctx.rev()
1113 rev = ctx.rev()
1113 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1114 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1114 fmt = ' ' * padsize + ' %d:%s'
1115 fmt = ' ' * padsize + ' %d:%s'
1115 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1116 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1116 label='log.changeset changeset.%s' % ctx.phasestr())
1117 label='log.changeset changeset.%s' % ctx.phasestr())
1117 fm.context(ctx=ctx)
1118 fm.context(ctx=ctx)
1118 fm.data(active=isactive, closed=not isopen, current=current)
1119 fm.data(active=isactive, closed=not isopen, current=current)
1119 if not ui.quiet:
1120 if not ui.quiet:
1120 fm.plain(notice)
1121 fm.plain(notice)
1121 fm.plain('\n')
1122 fm.plain('\n')
1122 fm.end()
1123 fm.end()
1123
1124
1124 @command('bundle',
1125 @command('bundle',
1125 [('f', 'force', None, _('run even when the destination is unrelated')),
1126 [('f', 'force', None, _('run even when the destination is unrelated')),
1126 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1127 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1127 _('REV')),
1128 _('REV')),
1128 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1129 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1129 _('BRANCH')),
1130 _('BRANCH')),
1130 ('', 'base', [],
1131 ('', 'base', [],
1131 _('a base changeset assumed to be available at the destination'),
1132 _('a base changeset assumed to be available at the destination'),
1132 _('REV')),
1133 _('REV')),
1133 ('a', 'all', None, _('bundle all changesets in the repository')),
1134 ('a', 'all', None, _('bundle all changesets in the repository')),
1134 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1135 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1135 ] + remoteopts,
1136 ] + remoteopts,
1136 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1137 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1137 def bundle(ui, repo, fname, dest=None, **opts):
1138 def bundle(ui, repo, fname, dest=None, **opts):
1138 """create a bundle file
1139 """create a bundle file
1139
1140
1140 Generate a bundle file containing data to be added to a repository.
1141 Generate a bundle file containing data to be added to a repository.
1141
1142
1142 To create a bundle containing all changesets, use -a/--all
1143 To create a bundle containing all changesets, use -a/--all
1143 (or --base null). Otherwise, hg assumes the destination will have
1144 (or --base null). Otherwise, hg assumes the destination will have
1144 all the nodes you specify with --base parameters. Otherwise, hg
1145 all the nodes you specify with --base parameters. Otherwise, hg
1145 will assume the repository has all the nodes in destination, or
1146 will assume the repository has all the nodes in destination, or
1146 default-push/default if no destination is specified.
1147 default-push/default if no destination is specified.
1147
1148
1148 You can change bundle format with the -t/--type option. See
1149 You can change bundle format with the -t/--type option. See
1149 :hg:`help bundlespec` for documentation on this format. By default,
1150 :hg:`help bundlespec` for documentation on this format. By default,
1150 the most appropriate format is used and compression defaults to
1151 the most appropriate format is used and compression defaults to
1151 bzip2.
1152 bzip2.
1152
1153
1153 The bundle file can then be transferred using conventional means
1154 The bundle file can then be transferred using conventional means
1154 and applied to another repository with the unbundle or pull
1155 and applied to another repository with the unbundle or pull
1155 command. This is useful when direct push and pull are not
1156 command. This is useful when direct push and pull are not
1156 available or when exporting an entire repository is undesirable.
1157 available or when exporting an entire repository is undesirable.
1157
1158
1158 Applying bundles preserves all changeset contents including
1159 Applying bundles preserves all changeset contents including
1159 permissions, copy/rename information, and revision history.
1160 permissions, copy/rename information, and revision history.
1160
1161
1161 Returns 0 on success, 1 if no changes found.
1162 Returns 0 on success, 1 if no changes found.
1162 """
1163 """
1163 opts = pycompat.byteskwargs(opts)
1164 opts = pycompat.byteskwargs(opts)
1164 revs = None
1165 revs = None
1165 if 'rev' in opts:
1166 if 'rev' in opts:
1166 revstrings = opts['rev']
1167 revstrings = opts['rev']
1167 revs = scmutil.revrange(repo, revstrings)
1168 revs = scmutil.revrange(repo, revstrings)
1168 if revstrings and not revs:
1169 if revstrings and not revs:
1169 raise error.Abort(_('no commits to bundle'))
1170 raise error.Abort(_('no commits to bundle'))
1170
1171
1171 bundletype = opts.get('type', 'bzip2').lower()
1172 bundletype = opts.get('type', 'bzip2').lower()
1172 try:
1173 try:
1173 bcompression, cgversion, params = exchange.parsebundlespec(
1174 bcompression, cgversion, params = exchange.parsebundlespec(
1174 repo, bundletype, strict=False)
1175 repo, bundletype, strict=False)
1175 except error.UnsupportedBundleSpecification as e:
1176 except error.UnsupportedBundleSpecification as e:
1176 raise error.Abort(str(e),
1177 raise error.Abort(str(e),
1177 hint=_("see 'hg help bundlespec' for supported "
1178 hint=_("see 'hg help bundlespec' for supported "
1178 "values for --type"))
1179 "values for --type"))
1179
1180
1180 # Packed bundles are a pseudo bundle format for now.
1181 # Packed bundles are a pseudo bundle format for now.
1181 if cgversion == 's1':
1182 if cgversion == 's1':
1182 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1183 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1183 hint=_("use 'hg debugcreatestreamclonebundle'"))
1184 hint=_("use 'hg debugcreatestreamclonebundle'"))
1184
1185
1185 if opts.get('all'):
1186 if opts.get('all'):
1186 if dest:
1187 if dest:
1187 raise error.Abort(_("--all is incompatible with specifying "
1188 raise error.Abort(_("--all is incompatible with specifying "
1188 "a destination"))
1189 "a destination"))
1189 if opts.get('base'):
1190 if opts.get('base'):
1190 ui.warn(_("ignoring --base because --all was specified\n"))
1191 ui.warn(_("ignoring --base because --all was specified\n"))
1191 base = ['null']
1192 base = ['null']
1192 else:
1193 else:
1193 base = scmutil.revrange(repo, opts.get('base'))
1194 base = scmutil.revrange(repo, opts.get('base'))
1194 if cgversion not in changegroup.supportedoutgoingversions(repo):
1195 if cgversion not in changegroup.supportedoutgoingversions(repo):
1195 raise error.Abort(_("repository does not support bundle version %s") %
1196 raise error.Abort(_("repository does not support bundle version %s") %
1196 cgversion)
1197 cgversion)
1197
1198
1198 if base:
1199 if base:
1199 if dest:
1200 if dest:
1200 raise error.Abort(_("--base is incompatible with specifying "
1201 raise error.Abort(_("--base is incompatible with specifying "
1201 "a destination"))
1202 "a destination"))
1202 common = [repo.lookup(rev) for rev in base]
1203 common = [repo.lookup(rev) for rev in base]
1203 heads = revs and map(repo.lookup, revs) or None
1204 heads = revs and map(repo.lookup, revs) or None
1204 outgoing = discovery.outgoing(repo, common, heads)
1205 outgoing = discovery.outgoing(repo, common, heads)
1205 else:
1206 else:
1206 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1207 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1207 dest, branches = hg.parseurl(dest, opts.get('branch'))
1208 dest, branches = hg.parseurl(dest, opts.get('branch'))
1208 other = hg.peer(repo, opts, dest)
1209 other = hg.peer(repo, opts, dest)
1209 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1210 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1210 heads = revs and map(repo.lookup, revs) or revs
1211 heads = revs and map(repo.lookup, revs) or revs
1211 outgoing = discovery.findcommonoutgoing(repo, other,
1212 outgoing = discovery.findcommonoutgoing(repo, other,
1212 onlyheads=heads,
1213 onlyheads=heads,
1213 force=opts.get('force'),
1214 force=opts.get('force'),
1214 portable=True)
1215 portable=True)
1215
1216
1216 if not outgoing.missing:
1217 if not outgoing.missing:
1217 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1218 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1218 return 1
1219 return 1
1219
1220
1220 if cgversion == '01': #bundle1
1221 if cgversion == '01': #bundle1
1221 if bcompression is None:
1222 if bcompression is None:
1222 bcompression = 'UN'
1223 bcompression = 'UN'
1223 bversion = 'HG10' + bcompression
1224 bversion = 'HG10' + bcompression
1224 bcompression = None
1225 bcompression = None
1225 elif cgversion in ('02', '03'):
1226 elif cgversion in ('02', '03'):
1226 bversion = 'HG20'
1227 bversion = 'HG20'
1227 else:
1228 else:
1228 raise error.ProgrammingError(
1229 raise error.ProgrammingError(
1229 'bundle: unexpected changegroup version %s' % cgversion)
1230 'bundle: unexpected changegroup version %s' % cgversion)
1230
1231
1231 # TODO compression options should be derived from bundlespec parsing.
1232 # TODO compression options should be derived from bundlespec parsing.
1232 # This is a temporary hack to allow adjusting bundle compression
1233 # This is a temporary hack to allow adjusting bundle compression
1233 # level without a) formalizing the bundlespec changes to declare it
1234 # level without a) formalizing the bundlespec changes to declare it
1234 # b) introducing a command flag.
1235 # b) introducing a command flag.
1235 compopts = {}
1236 compopts = {}
1236 complevel = ui.configint('experimental', 'bundlecomplevel')
1237 complevel = ui.configint('experimental', 'bundlecomplevel')
1237 if complevel is not None:
1238 if complevel is not None:
1238 compopts['level'] = complevel
1239 compopts['level'] = complevel
1239
1240
1240
1241
1241 contentopts = {'cg.version': cgversion}
1242 contentopts = {'cg.version': cgversion}
1242 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1243 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1243 contentopts['obsolescence'] = True
1244 contentopts['obsolescence'] = True
1244 if repo.ui.configbool('experimental', 'bundle-phases'):
1245 if repo.ui.configbool('experimental', 'bundle-phases'):
1245 contentopts['phases'] = True
1246 contentopts['phases'] = True
1246 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1247 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1247 contentopts, compression=bcompression,
1248 contentopts, compression=bcompression,
1248 compopts=compopts)
1249 compopts=compopts)
1249
1250
1250 @command('cat',
1251 @command('cat',
1251 [('o', 'output', '',
1252 [('o', 'output', '',
1252 _('print output to file with formatted name'), _('FORMAT')),
1253 _('print output to file with formatted name'), _('FORMAT')),
1253 ('r', 'rev', '', _('print the given revision'), _('REV')),
1254 ('r', 'rev', '', _('print the given revision'), _('REV')),
1254 ('', 'decode', None, _('apply any matching decode filter')),
1255 ('', 'decode', None, _('apply any matching decode filter')),
1255 ] + walkopts + formatteropts,
1256 ] + walkopts + formatteropts,
1256 _('[OPTION]... FILE...'),
1257 _('[OPTION]... FILE...'),
1257 inferrepo=True)
1258 inferrepo=True, cmdtype=readonly)
1258 def cat(ui, repo, file1, *pats, **opts):
1259 def cat(ui, repo, file1, *pats, **opts):
1259 """output the current or given revision of files
1260 """output the current or given revision of files
1260
1261
1261 Print the specified files as they were at the given revision. If
1262 Print the specified files as they were at the given revision. If
1262 no revision is given, the parent of the working directory is used.
1263 no revision is given, the parent of the working directory is used.
1263
1264
1264 Output may be to a file, in which case the name of the file is
1265 Output may be to a file, in which case the name of the file is
1265 given using a format string. The formatting rules as follows:
1266 given using a format string. The formatting rules as follows:
1266
1267
1267 :``%%``: literal "%" character
1268 :``%%``: literal "%" character
1268 :``%s``: basename of file being printed
1269 :``%s``: basename of file being printed
1269 :``%d``: dirname of file being printed, or '.' if in repository root
1270 :``%d``: dirname of file being printed, or '.' if in repository root
1270 :``%p``: root-relative path name of file being printed
1271 :``%p``: root-relative path name of file being printed
1271 :``%H``: changeset hash (40 hexadecimal digits)
1272 :``%H``: changeset hash (40 hexadecimal digits)
1272 :``%R``: changeset revision number
1273 :``%R``: changeset revision number
1273 :``%h``: short-form changeset hash (12 hexadecimal digits)
1274 :``%h``: short-form changeset hash (12 hexadecimal digits)
1274 :``%r``: zero-padded changeset revision number
1275 :``%r``: zero-padded changeset revision number
1275 :``%b``: basename of the exporting repository
1276 :``%b``: basename of the exporting repository
1276
1277
1277 Returns 0 on success.
1278 Returns 0 on success.
1278 """
1279 """
1279 ctx = scmutil.revsingle(repo, opts.get('rev'))
1280 ctx = scmutil.revsingle(repo, opts.get('rev'))
1280 m = scmutil.match(ctx, (file1,) + pats, opts)
1281 m = scmutil.match(ctx, (file1,) + pats, opts)
1281 fntemplate = opts.pop('output', '')
1282 fntemplate = opts.pop('output', '')
1282 if cmdutil.isstdiofilename(fntemplate):
1283 if cmdutil.isstdiofilename(fntemplate):
1283 fntemplate = ''
1284 fntemplate = ''
1284
1285
1285 if fntemplate:
1286 if fntemplate:
1286 fm = formatter.nullformatter(ui, 'cat')
1287 fm = formatter.nullformatter(ui, 'cat')
1287 else:
1288 else:
1288 ui.pager('cat')
1289 ui.pager('cat')
1289 fm = ui.formatter('cat', opts)
1290 fm = ui.formatter('cat', opts)
1290 with fm:
1291 with fm:
1291 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts)
1292 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts)
1292
1293
1293 @command('^clone',
1294 @command('^clone',
1294 [('U', 'noupdate', None, _('the clone will include an empty working '
1295 [('U', 'noupdate', None, _('the clone will include an empty working '
1295 'directory (only a repository)')),
1296 'directory (only a repository)')),
1296 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1297 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1297 _('REV')),
1298 _('REV')),
1298 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1299 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1299 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1300 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1300 ('', 'pull', None, _('use pull protocol to copy metadata')),
1301 ('', 'pull', None, _('use pull protocol to copy metadata')),
1301 ('', 'uncompressed', None,
1302 ('', 'uncompressed', None,
1302 _('an alias to --stream (DEPRECATED)')),
1303 _('an alias to --stream (DEPRECATED)')),
1303 ('', 'stream', None,
1304 ('', 'stream', None,
1304 _('clone with minimal data processing')),
1305 _('clone with minimal data processing')),
1305 ] + remoteopts,
1306 ] + remoteopts,
1306 _('[OPTION]... SOURCE [DEST]'),
1307 _('[OPTION]... SOURCE [DEST]'),
1307 norepo=True)
1308 norepo=True)
1308 def clone(ui, source, dest=None, **opts):
1309 def clone(ui, source, dest=None, **opts):
1309 """make a copy of an existing repository
1310 """make a copy of an existing repository
1310
1311
1311 Create a copy of an existing repository in a new directory.
1312 Create a copy of an existing repository in a new directory.
1312
1313
1313 If no destination directory name is specified, it defaults to the
1314 If no destination directory name is specified, it defaults to the
1314 basename of the source.
1315 basename of the source.
1315
1316
1316 The location of the source is added to the new repository's
1317 The location of the source is added to the new repository's
1317 ``.hg/hgrc`` file, as the default to be used for future pulls.
1318 ``.hg/hgrc`` file, as the default to be used for future pulls.
1318
1319
1319 Only local paths and ``ssh://`` URLs are supported as
1320 Only local paths and ``ssh://`` URLs are supported as
1320 destinations. For ``ssh://`` destinations, no working directory or
1321 destinations. For ``ssh://`` destinations, no working directory or
1321 ``.hg/hgrc`` will be created on the remote side.
1322 ``.hg/hgrc`` will be created on the remote side.
1322
1323
1323 If the source repository has a bookmark called '@' set, that
1324 If the source repository has a bookmark called '@' set, that
1324 revision will be checked out in the new repository by default.
1325 revision will be checked out in the new repository by default.
1325
1326
1326 To check out a particular version, use -u/--update, or
1327 To check out a particular version, use -u/--update, or
1327 -U/--noupdate to create a clone with no working directory.
1328 -U/--noupdate to create a clone with no working directory.
1328
1329
1329 To pull only a subset of changesets, specify one or more revisions
1330 To pull only a subset of changesets, specify one or more revisions
1330 identifiers with -r/--rev or branches with -b/--branch. The
1331 identifiers with -r/--rev or branches with -b/--branch. The
1331 resulting clone will contain only the specified changesets and
1332 resulting clone will contain only the specified changesets and
1332 their ancestors. These options (or 'clone src#rev dest') imply
1333 their ancestors. These options (or 'clone src#rev dest') imply
1333 --pull, even for local source repositories.
1334 --pull, even for local source repositories.
1334
1335
1335 In normal clone mode, the remote normalizes repository data into a common
1336 In normal clone mode, the remote normalizes repository data into a common
1336 exchange format and the receiving end translates this data into its local
1337 exchange format and the receiving end translates this data into its local
1337 storage format. --stream activates a different clone mode that essentially
1338 storage format. --stream activates a different clone mode that essentially
1338 copies repository files from the remote with minimal data processing. This
1339 copies repository files from the remote with minimal data processing. This
1339 significantly reduces the CPU cost of a clone both remotely and locally.
1340 significantly reduces the CPU cost of a clone both remotely and locally.
1340 However, it often increases the transferred data size by 30-40%. This can
1341 However, it often increases the transferred data size by 30-40%. This can
1341 result in substantially faster clones where I/O throughput is plentiful,
1342 result in substantially faster clones where I/O throughput is plentiful,
1342 especially for larger repositories. A side-effect of --stream clones is
1343 especially for larger repositories. A side-effect of --stream clones is
1343 that storage settings and requirements on the remote are applied locally:
1344 that storage settings and requirements on the remote are applied locally:
1344 a modern client may inherit legacy or inefficient storage used by the
1345 a modern client may inherit legacy or inefficient storage used by the
1345 remote or a legacy Mercurial client may not be able to clone from a
1346 remote or a legacy Mercurial client may not be able to clone from a
1346 modern Mercurial remote.
1347 modern Mercurial remote.
1347
1348
1348 .. note::
1349 .. note::
1349
1350
1350 Specifying a tag will include the tagged changeset but not the
1351 Specifying a tag will include the tagged changeset but not the
1351 changeset containing the tag.
1352 changeset containing the tag.
1352
1353
1353 .. container:: verbose
1354 .. container:: verbose
1354
1355
1355 For efficiency, hardlinks are used for cloning whenever the
1356 For efficiency, hardlinks are used for cloning whenever the
1356 source and destination are on the same filesystem (note this
1357 source and destination are on the same filesystem (note this
1357 applies only to the repository data, not to the working
1358 applies only to the repository data, not to the working
1358 directory). Some filesystems, such as AFS, implement hardlinking
1359 directory). Some filesystems, such as AFS, implement hardlinking
1359 incorrectly, but do not report errors. In these cases, use the
1360 incorrectly, but do not report errors. In these cases, use the
1360 --pull option to avoid hardlinking.
1361 --pull option to avoid hardlinking.
1361
1362
1362 Mercurial will update the working directory to the first applicable
1363 Mercurial will update the working directory to the first applicable
1363 revision from this list:
1364 revision from this list:
1364
1365
1365 a) null if -U or the source repository has no changesets
1366 a) null if -U or the source repository has no changesets
1366 b) if -u . and the source repository is local, the first parent of
1367 b) if -u . and the source repository is local, the first parent of
1367 the source repository's working directory
1368 the source repository's working directory
1368 c) the changeset specified with -u (if a branch name, this means the
1369 c) the changeset specified with -u (if a branch name, this means the
1369 latest head of that branch)
1370 latest head of that branch)
1370 d) the changeset specified with -r
1371 d) the changeset specified with -r
1371 e) the tipmost head specified with -b
1372 e) the tipmost head specified with -b
1372 f) the tipmost head specified with the url#branch source syntax
1373 f) the tipmost head specified with the url#branch source syntax
1373 g) the revision marked with the '@' bookmark, if present
1374 g) the revision marked with the '@' bookmark, if present
1374 h) the tipmost head of the default branch
1375 h) the tipmost head of the default branch
1375 i) tip
1376 i) tip
1376
1377
1377 When cloning from servers that support it, Mercurial may fetch
1378 When cloning from servers that support it, Mercurial may fetch
1378 pre-generated data from a server-advertised URL. When this is done,
1379 pre-generated data from a server-advertised URL. When this is done,
1379 hooks operating on incoming changesets and changegroups may fire twice,
1380 hooks operating on incoming changesets and changegroups may fire twice,
1380 once for the bundle fetched from the URL and another for any additional
1381 once for the bundle fetched from the URL and another for any additional
1381 data not fetched from this URL. In addition, if an error occurs, the
1382 data not fetched from this URL. In addition, if an error occurs, the
1382 repository may be rolled back to a partial clone. This behavior may
1383 repository may be rolled back to a partial clone. This behavior may
1383 change in future releases. See :hg:`help -e clonebundles` for more.
1384 change in future releases. See :hg:`help -e clonebundles` for more.
1384
1385
1385 Examples:
1386 Examples:
1386
1387
1387 - clone a remote repository to a new directory named hg/::
1388 - clone a remote repository to a new directory named hg/::
1388
1389
1389 hg clone https://www.mercurial-scm.org/repo/hg/
1390 hg clone https://www.mercurial-scm.org/repo/hg/
1390
1391
1391 - create a lightweight local clone::
1392 - create a lightweight local clone::
1392
1393
1393 hg clone project/ project-feature/
1394 hg clone project/ project-feature/
1394
1395
1395 - clone from an absolute path on an ssh server (note double-slash)::
1396 - clone from an absolute path on an ssh server (note double-slash)::
1396
1397
1397 hg clone ssh://user@server//home/projects/alpha/
1398 hg clone ssh://user@server//home/projects/alpha/
1398
1399
1399 - do a streaming clone while checking out a specified version::
1400 - do a streaming clone while checking out a specified version::
1400
1401
1401 hg clone --stream http://server/repo -u 1.5
1402 hg clone --stream http://server/repo -u 1.5
1402
1403
1403 - create a repository without changesets after a particular revision::
1404 - create a repository without changesets after a particular revision::
1404
1405
1405 hg clone -r 04e544 experimental/ good/
1406 hg clone -r 04e544 experimental/ good/
1406
1407
1407 - clone (and track) a particular named branch::
1408 - clone (and track) a particular named branch::
1408
1409
1409 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1410 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1410
1411
1411 See :hg:`help urls` for details on specifying URLs.
1412 See :hg:`help urls` for details on specifying URLs.
1412
1413
1413 Returns 0 on success.
1414 Returns 0 on success.
1414 """
1415 """
1415 opts = pycompat.byteskwargs(opts)
1416 opts = pycompat.byteskwargs(opts)
1416 if opts.get('noupdate') and opts.get('updaterev'):
1417 if opts.get('noupdate') and opts.get('updaterev'):
1417 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1418 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1418
1419
1419 r = hg.clone(ui, opts, source, dest,
1420 r = hg.clone(ui, opts, source, dest,
1420 pull=opts.get('pull'),
1421 pull=opts.get('pull'),
1421 stream=opts.get('stream') or opts.get('uncompressed'),
1422 stream=opts.get('stream') or opts.get('uncompressed'),
1422 rev=opts.get('rev'),
1423 rev=opts.get('rev'),
1423 update=opts.get('updaterev') or not opts.get('noupdate'),
1424 update=opts.get('updaterev') or not opts.get('noupdate'),
1424 branch=opts.get('branch'),
1425 branch=opts.get('branch'),
1425 shareopts=opts.get('shareopts'))
1426 shareopts=opts.get('shareopts'))
1426
1427
1427 return r is None
1428 return r is None
1428
1429
1429 @command('^commit|ci',
1430 @command('^commit|ci',
1430 [('A', 'addremove', None,
1431 [('A', 'addremove', None,
1431 _('mark new/missing files as added/removed before committing')),
1432 _('mark new/missing files as added/removed before committing')),
1432 ('', 'close-branch', None,
1433 ('', 'close-branch', None,
1433 _('mark a branch head as closed')),
1434 _('mark a branch head as closed')),
1434 ('', 'amend', None, _('amend the parent of the working directory')),
1435 ('', 'amend', None, _('amend the parent of the working directory')),
1435 ('s', 'secret', None, _('use the secret phase for committing')),
1436 ('s', 'secret', None, _('use the secret phase for committing')),
1436 ('e', 'edit', None, _('invoke editor on commit messages')),
1437 ('e', 'edit', None, _('invoke editor on commit messages')),
1437 ('i', 'interactive', None, _('use interactive mode')),
1438 ('i', 'interactive', None, _('use interactive mode')),
1438 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1439 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1439 _('[OPTION]... [FILE]...'),
1440 _('[OPTION]... [FILE]...'),
1440 inferrepo=True)
1441 inferrepo=True)
1441 def commit(ui, repo, *pats, **opts):
1442 def commit(ui, repo, *pats, **opts):
1442 """commit the specified files or all outstanding changes
1443 """commit the specified files or all outstanding changes
1443
1444
1444 Commit changes to the given files into the repository. Unlike a
1445 Commit changes to the given files into the repository. Unlike a
1445 centralized SCM, this operation is a local operation. See
1446 centralized SCM, this operation is a local operation. See
1446 :hg:`push` for a way to actively distribute your changes.
1447 :hg:`push` for a way to actively distribute your changes.
1447
1448
1448 If a list of files is omitted, all changes reported by :hg:`status`
1449 If a list of files is omitted, all changes reported by :hg:`status`
1449 will be committed.
1450 will be committed.
1450
1451
1451 If you are committing the result of a merge, do not provide any
1452 If you are committing the result of a merge, do not provide any
1452 filenames or -I/-X filters.
1453 filenames or -I/-X filters.
1453
1454
1454 If no commit message is specified, Mercurial starts your
1455 If no commit message is specified, Mercurial starts your
1455 configured editor where you can enter a message. In case your
1456 configured editor where you can enter a message. In case your
1456 commit fails, you will find a backup of your message in
1457 commit fails, you will find a backup of your message in
1457 ``.hg/last-message.txt``.
1458 ``.hg/last-message.txt``.
1458
1459
1459 The --close-branch flag can be used to mark the current branch
1460 The --close-branch flag can be used to mark the current branch
1460 head closed. When all heads of a branch are closed, the branch
1461 head closed. When all heads of a branch are closed, the branch
1461 will be considered closed and no longer listed.
1462 will be considered closed and no longer listed.
1462
1463
1463 The --amend flag can be used to amend the parent of the
1464 The --amend flag can be used to amend the parent of the
1464 working directory with a new commit that contains the changes
1465 working directory with a new commit that contains the changes
1465 in the parent in addition to those currently reported by :hg:`status`,
1466 in the parent in addition to those currently reported by :hg:`status`,
1466 if there are any. The old commit is stored in a backup bundle in
1467 if there are any. The old commit is stored in a backup bundle in
1467 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1468 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1468 on how to restore it).
1469 on how to restore it).
1469
1470
1470 Message, user and date are taken from the amended commit unless
1471 Message, user and date are taken from the amended commit unless
1471 specified. When a message isn't specified on the command line,
1472 specified. When a message isn't specified on the command line,
1472 the editor will open with the message of the amended commit.
1473 the editor will open with the message of the amended commit.
1473
1474
1474 It is not possible to amend public changesets (see :hg:`help phases`)
1475 It is not possible to amend public changesets (see :hg:`help phases`)
1475 or changesets that have children.
1476 or changesets that have children.
1476
1477
1477 See :hg:`help dates` for a list of formats valid for -d/--date.
1478 See :hg:`help dates` for a list of formats valid for -d/--date.
1478
1479
1479 Returns 0 on success, 1 if nothing changed.
1480 Returns 0 on success, 1 if nothing changed.
1480
1481
1481 .. container:: verbose
1482 .. container:: verbose
1482
1483
1483 Examples:
1484 Examples:
1484
1485
1485 - commit all files ending in .py::
1486 - commit all files ending in .py::
1486
1487
1487 hg commit --include "set:**.py"
1488 hg commit --include "set:**.py"
1488
1489
1489 - commit all non-binary files::
1490 - commit all non-binary files::
1490
1491
1491 hg commit --exclude "set:binary()"
1492 hg commit --exclude "set:binary()"
1492
1493
1493 - amend the current commit and set the date to now::
1494 - amend the current commit and set the date to now::
1494
1495
1495 hg commit --amend --date now
1496 hg commit --amend --date now
1496 """
1497 """
1497 wlock = lock = None
1498 wlock = lock = None
1498 try:
1499 try:
1499 wlock = repo.wlock()
1500 wlock = repo.wlock()
1500 lock = repo.lock()
1501 lock = repo.lock()
1501 return _docommit(ui, repo, *pats, **opts)
1502 return _docommit(ui, repo, *pats, **opts)
1502 finally:
1503 finally:
1503 release(lock, wlock)
1504 release(lock, wlock)
1504
1505
1505 def _docommit(ui, repo, *pats, **opts):
1506 def _docommit(ui, repo, *pats, **opts):
1506 if opts.get(r'interactive'):
1507 if opts.get(r'interactive'):
1507 opts.pop(r'interactive')
1508 opts.pop(r'interactive')
1508 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1509 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1509 cmdutil.recordfilter, *pats,
1510 cmdutil.recordfilter, *pats,
1510 **opts)
1511 **opts)
1511 # ret can be 0 (no changes to record) or the value returned by
1512 # ret can be 0 (no changes to record) or the value returned by
1512 # commit(), 1 if nothing changed or None on success.
1513 # commit(), 1 if nothing changed or None on success.
1513 return 1 if ret == 0 else ret
1514 return 1 if ret == 0 else ret
1514
1515
1515 opts = pycompat.byteskwargs(opts)
1516 opts = pycompat.byteskwargs(opts)
1516 if opts.get('subrepos'):
1517 if opts.get('subrepos'):
1517 if opts.get('amend'):
1518 if opts.get('amend'):
1518 raise error.Abort(_('cannot amend with --subrepos'))
1519 raise error.Abort(_('cannot amend with --subrepos'))
1519 # Let --subrepos on the command line override config setting.
1520 # Let --subrepos on the command line override config setting.
1520 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1521 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1521
1522
1522 cmdutil.checkunfinished(repo, commit=True)
1523 cmdutil.checkunfinished(repo, commit=True)
1523
1524
1524 branch = repo[None].branch()
1525 branch = repo[None].branch()
1525 bheads = repo.branchheads(branch)
1526 bheads = repo.branchheads(branch)
1526
1527
1527 extra = {}
1528 extra = {}
1528 if opts.get('close_branch'):
1529 if opts.get('close_branch'):
1529 extra['close'] = 1
1530 extra['close'] = 1
1530
1531
1531 if not bheads:
1532 if not bheads:
1532 raise error.Abort(_('can only close branch heads'))
1533 raise error.Abort(_('can only close branch heads'))
1533 elif opts.get('amend'):
1534 elif opts.get('amend'):
1534 if repo[None].parents()[0].p1().branch() != branch and \
1535 if repo[None].parents()[0].p1().branch() != branch and \
1535 repo[None].parents()[0].p2().branch() != branch:
1536 repo[None].parents()[0].p2().branch() != branch:
1536 raise error.Abort(_('can only close branch heads'))
1537 raise error.Abort(_('can only close branch heads'))
1537
1538
1538 if opts.get('amend'):
1539 if opts.get('amend'):
1539 if ui.configbool('ui', 'commitsubrepos'):
1540 if ui.configbool('ui', 'commitsubrepos'):
1540 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1541 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1541
1542
1542 old = repo['.']
1543 old = repo['.']
1543 if not old.mutable():
1544 if not old.mutable():
1544 raise error.Abort(_('cannot amend public changesets'))
1545 raise error.Abort(_('cannot amend public changesets'))
1545 if len(repo[None].parents()) > 1:
1546 if len(repo[None].parents()) > 1:
1546 raise error.Abort(_('cannot amend while merging'))
1547 raise error.Abort(_('cannot amend while merging'))
1547 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1548 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1548 if not allowunstable and old.children():
1549 if not allowunstable and old.children():
1549 raise error.Abort(_('cannot amend changeset with children'))
1550 raise error.Abort(_('cannot amend changeset with children'))
1550
1551
1551 # Currently histedit gets confused if an amend happens while histedit
1552 # Currently histedit gets confused if an amend happens while histedit
1552 # is in progress. Since we have a checkunfinished command, we are
1553 # is in progress. Since we have a checkunfinished command, we are
1553 # temporarily honoring it.
1554 # temporarily honoring it.
1554 #
1555 #
1555 # Note: eventually this guard will be removed. Please do not expect
1556 # Note: eventually this guard will be removed. Please do not expect
1556 # this behavior to remain.
1557 # this behavior to remain.
1557 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1558 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1558 cmdutil.checkunfinished(repo)
1559 cmdutil.checkunfinished(repo)
1559
1560
1560 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1561 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1561 if node == old.node():
1562 if node == old.node():
1562 ui.status(_("nothing changed\n"))
1563 ui.status(_("nothing changed\n"))
1563 return 1
1564 return 1
1564 else:
1565 else:
1565 def commitfunc(ui, repo, message, match, opts):
1566 def commitfunc(ui, repo, message, match, opts):
1566 overrides = {}
1567 overrides = {}
1567 if opts.get('secret'):
1568 if opts.get('secret'):
1568 overrides[('phases', 'new-commit')] = 'secret'
1569 overrides[('phases', 'new-commit')] = 'secret'
1569
1570
1570 baseui = repo.baseui
1571 baseui = repo.baseui
1571 with baseui.configoverride(overrides, 'commit'):
1572 with baseui.configoverride(overrides, 'commit'):
1572 with ui.configoverride(overrides, 'commit'):
1573 with ui.configoverride(overrides, 'commit'):
1573 editform = cmdutil.mergeeditform(repo[None],
1574 editform = cmdutil.mergeeditform(repo[None],
1574 'commit.normal')
1575 'commit.normal')
1575 editor = cmdutil.getcommiteditor(
1576 editor = cmdutil.getcommiteditor(
1576 editform=editform, **pycompat.strkwargs(opts))
1577 editform=editform, **pycompat.strkwargs(opts))
1577 return repo.commit(message,
1578 return repo.commit(message,
1578 opts.get('user'),
1579 opts.get('user'),
1579 opts.get('date'),
1580 opts.get('date'),
1580 match,
1581 match,
1581 editor=editor,
1582 editor=editor,
1582 extra=extra)
1583 extra=extra)
1583
1584
1584 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1585 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1585
1586
1586 if not node:
1587 if not node:
1587 stat = cmdutil.postcommitstatus(repo, pats, opts)
1588 stat = cmdutil.postcommitstatus(repo, pats, opts)
1588 if stat[3]:
1589 if stat[3]:
1589 ui.status(_("nothing changed (%d missing files, see "
1590 ui.status(_("nothing changed (%d missing files, see "
1590 "'hg status')\n") % len(stat[3]))
1591 "'hg status')\n") % len(stat[3]))
1591 else:
1592 else:
1592 ui.status(_("nothing changed\n"))
1593 ui.status(_("nothing changed\n"))
1593 return 1
1594 return 1
1594
1595
1595 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1596 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1596
1597
1597 @command('config|showconfig|debugconfig',
1598 @command('config|showconfig|debugconfig',
1598 [('u', 'untrusted', None, _('show untrusted configuration options')),
1599 [('u', 'untrusted', None, _('show untrusted configuration options')),
1599 ('e', 'edit', None, _('edit user config')),
1600 ('e', 'edit', None, _('edit user config')),
1600 ('l', 'local', None, _('edit repository config')),
1601 ('l', 'local', None, _('edit repository config')),
1601 ('g', 'global', None, _('edit global config'))] + formatteropts,
1602 ('g', 'global', None, _('edit global config'))] + formatteropts,
1602 _('[-u] [NAME]...'),
1603 _('[-u] [NAME]...'),
1603 optionalrepo=True)
1604 optionalrepo=True, cmdtype=readonly)
1604 def config(ui, repo, *values, **opts):
1605 def config(ui, repo, *values, **opts):
1605 """show combined config settings from all hgrc files
1606 """show combined config settings from all hgrc files
1606
1607
1607 With no arguments, print names and values of all config items.
1608 With no arguments, print names and values of all config items.
1608
1609
1609 With one argument of the form section.name, print just the value
1610 With one argument of the form section.name, print just the value
1610 of that config item.
1611 of that config item.
1611
1612
1612 With multiple arguments, print names and values of all config
1613 With multiple arguments, print names and values of all config
1613 items with matching section names.
1614 items with matching section names.
1614
1615
1615 With --edit, start an editor on the user-level config file. With
1616 With --edit, start an editor on the user-level config file. With
1616 --global, edit the system-wide config file. With --local, edit the
1617 --global, edit the system-wide config file. With --local, edit the
1617 repository-level config file.
1618 repository-level config file.
1618
1619
1619 With --debug, the source (filename and line number) is printed
1620 With --debug, the source (filename and line number) is printed
1620 for each config item.
1621 for each config item.
1621
1622
1622 See :hg:`help config` for more information about config files.
1623 See :hg:`help config` for more information about config files.
1623
1624
1624 Returns 0 on success, 1 if NAME does not exist.
1625 Returns 0 on success, 1 if NAME does not exist.
1625
1626
1626 """
1627 """
1627
1628
1628 opts = pycompat.byteskwargs(opts)
1629 opts = pycompat.byteskwargs(opts)
1629 if opts.get('edit') or opts.get('local') or opts.get('global'):
1630 if opts.get('edit') or opts.get('local') or opts.get('global'):
1630 if opts.get('local') and opts.get('global'):
1631 if opts.get('local') and opts.get('global'):
1631 raise error.Abort(_("can't use --local and --global together"))
1632 raise error.Abort(_("can't use --local and --global together"))
1632
1633
1633 if opts.get('local'):
1634 if opts.get('local'):
1634 if not repo:
1635 if not repo:
1635 raise error.Abort(_("can't use --local outside a repository"))
1636 raise error.Abort(_("can't use --local outside a repository"))
1636 paths = [repo.vfs.join('hgrc')]
1637 paths = [repo.vfs.join('hgrc')]
1637 elif opts.get('global'):
1638 elif opts.get('global'):
1638 paths = rcutil.systemrcpath()
1639 paths = rcutil.systemrcpath()
1639 else:
1640 else:
1640 paths = rcutil.userrcpath()
1641 paths = rcutil.userrcpath()
1641
1642
1642 for f in paths:
1643 for f in paths:
1643 if os.path.exists(f):
1644 if os.path.exists(f):
1644 break
1645 break
1645 else:
1646 else:
1646 if opts.get('global'):
1647 if opts.get('global'):
1647 samplehgrc = uimod.samplehgrcs['global']
1648 samplehgrc = uimod.samplehgrcs['global']
1648 elif opts.get('local'):
1649 elif opts.get('local'):
1649 samplehgrc = uimod.samplehgrcs['local']
1650 samplehgrc = uimod.samplehgrcs['local']
1650 else:
1651 else:
1651 samplehgrc = uimod.samplehgrcs['user']
1652 samplehgrc = uimod.samplehgrcs['user']
1652
1653
1653 f = paths[0]
1654 f = paths[0]
1654 fp = open(f, "wb")
1655 fp = open(f, "wb")
1655 fp.write(util.tonativeeol(samplehgrc))
1656 fp.write(util.tonativeeol(samplehgrc))
1656 fp.close()
1657 fp.close()
1657
1658
1658 editor = ui.geteditor()
1659 editor = ui.geteditor()
1659 ui.system("%s \"%s\"" % (editor, f),
1660 ui.system("%s \"%s\"" % (editor, f),
1660 onerr=error.Abort, errprefix=_("edit failed"),
1661 onerr=error.Abort, errprefix=_("edit failed"),
1661 blockedtag='config_edit')
1662 blockedtag='config_edit')
1662 return
1663 return
1663 ui.pager('config')
1664 ui.pager('config')
1664 fm = ui.formatter('config', opts)
1665 fm = ui.formatter('config', opts)
1665 for t, f in rcutil.rccomponents():
1666 for t, f in rcutil.rccomponents():
1666 if t == 'path':
1667 if t == 'path':
1667 ui.debug('read config from: %s\n' % f)
1668 ui.debug('read config from: %s\n' % f)
1668 elif t == 'items':
1669 elif t == 'items':
1669 for section, name, value, source in f:
1670 for section, name, value, source in f:
1670 ui.debug('set config by: %s\n' % source)
1671 ui.debug('set config by: %s\n' % source)
1671 else:
1672 else:
1672 raise error.ProgrammingError('unknown rctype: %s' % t)
1673 raise error.ProgrammingError('unknown rctype: %s' % t)
1673 untrusted = bool(opts.get('untrusted'))
1674 untrusted = bool(opts.get('untrusted'))
1674 if values:
1675 if values:
1675 sections = [v for v in values if '.' not in v]
1676 sections = [v for v in values if '.' not in v]
1676 items = [v for v in values if '.' in v]
1677 items = [v for v in values if '.' in v]
1677 if len(items) > 1 or items and sections:
1678 if len(items) > 1 or items and sections:
1678 raise error.Abort(_('only one config item permitted'))
1679 raise error.Abort(_('only one config item permitted'))
1679 matched = False
1680 matched = False
1680 for section, name, value in ui.walkconfig(untrusted=untrusted):
1681 for section, name, value in ui.walkconfig(untrusted=untrusted):
1681 source = ui.configsource(section, name, untrusted)
1682 source = ui.configsource(section, name, untrusted)
1682 value = pycompat.bytestr(value)
1683 value = pycompat.bytestr(value)
1683 if fm.isplain():
1684 if fm.isplain():
1684 source = source or 'none'
1685 source = source or 'none'
1685 value = value.replace('\n', '\\n')
1686 value = value.replace('\n', '\\n')
1686 entryname = section + '.' + name
1687 entryname = section + '.' + name
1687 if values:
1688 if values:
1688 for v in values:
1689 for v in values:
1689 if v == section:
1690 if v == section:
1690 fm.startitem()
1691 fm.startitem()
1691 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1692 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1692 fm.write('name value', '%s=%s\n', entryname, value)
1693 fm.write('name value', '%s=%s\n', entryname, value)
1693 matched = True
1694 matched = True
1694 elif v == entryname:
1695 elif v == entryname:
1695 fm.startitem()
1696 fm.startitem()
1696 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1697 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1697 fm.write('value', '%s\n', value)
1698 fm.write('value', '%s\n', value)
1698 fm.data(name=entryname)
1699 fm.data(name=entryname)
1699 matched = True
1700 matched = True
1700 else:
1701 else:
1701 fm.startitem()
1702 fm.startitem()
1702 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1703 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1703 fm.write('name value', '%s=%s\n', entryname, value)
1704 fm.write('name value', '%s=%s\n', entryname, value)
1704 matched = True
1705 matched = True
1705 fm.end()
1706 fm.end()
1706 if matched:
1707 if matched:
1707 return 0
1708 return 0
1708 return 1
1709 return 1
1709
1710
1710 @command('copy|cp',
1711 @command('copy|cp',
1711 [('A', 'after', None, _('record a copy that has already occurred')),
1712 [('A', 'after', None, _('record a copy that has already occurred')),
1712 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1713 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1713 ] + walkopts + dryrunopts,
1714 ] + walkopts + dryrunopts,
1714 _('[OPTION]... [SOURCE]... DEST'))
1715 _('[OPTION]... [SOURCE]... DEST'))
1715 def copy(ui, repo, *pats, **opts):
1716 def copy(ui, repo, *pats, **opts):
1716 """mark files as copied for the next commit
1717 """mark files as copied for the next commit
1717
1718
1718 Mark dest as having copies of source files. If dest is a
1719 Mark dest as having copies of source files. If dest is a
1719 directory, copies are put in that directory. If dest is a file,
1720 directory, copies are put in that directory. If dest is a file,
1720 the source must be a single file.
1721 the source must be a single file.
1721
1722
1722 By default, this command copies the contents of files as they
1723 By default, this command copies the contents of files as they
1723 exist in the working directory. If invoked with -A/--after, the
1724 exist in the working directory. If invoked with -A/--after, the
1724 operation is recorded, but no copying is performed.
1725 operation is recorded, but no copying is performed.
1725
1726
1726 This command takes effect with the next commit. To undo a copy
1727 This command takes effect with the next commit. To undo a copy
1727 before that, see :hg:`revert`.
1728 before that, see :hg:`revert`.
1728
1729
1729 Returns 0 on success, 1 if errors are encountered.
1730 Returns 0 on success, 1 if errors are encountered.
1730 """
1731 """
1731 opts = pycompat.byteskwargs(opts)
1732 opts = pycompat.byteskwargs(opts)
1732 with repo.wlock(False):
1733 with repo.wlock(False):
1733 return cmdutil.copy(ui, repo, pats, opts)
1734 return cmdutil.copy(ui, repo, pats, opts)
1734
1735
1735 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1736 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1736 def debugcommands(ui, cmd='', *args):
1737 def debugcommands(ui, cmd='', *args):
1737 """list all available commands and options"""
1738 """list all available commands and options"""
1738 for cmd, vals in sorted(table.iteritems()):
1739 for cmd, vals in sorted(table.iteritems()):
1739 cmd = cmd.split('|')[0].strip('^')
1740 cmd = cmd.split('|')[0].strip('^')
1740 opts = ', '.join([i[1] for i in vals[1]])
1741 opts = ', '.join([i[1] for i in vals[1]])
1741 ui.write('%s: %s\n' % (cmd, opts))
1742 ui.write('%s: %s\n' % (cmd, opts))
1742
1743
1743 @command('debugcomplete',
1744 @command('debugcomplete',
1744 [('o', 'options', None, _('show the command options'))],
1745 [('o', 'options', None, _('show the command options'))],
1745 _('[-o] CMD'),
1746 _('[-o] CMD'),
1746 norepo=True)
1747 norepo=True)
1747 def debugcomplete(ui, cmd='', **opts):
1748 def debugcomplete(ui, cmd='', **opts):
1748 """returns the completion list associated with the given command"""
1749 """returns the completion list associated with the given command"""
1749
1750
1750 if opts.get('options'):
1751 if opts.get('options'):
1751 options = []
1752 options = []
1752 otables = [globalopts]
1753 otables = [globalopts]
1753 if cmd:
1754 if cmd:
1754 aliases, entry = cmdutil.findcmd(cmd, table, False)
1755 aliases, entry = cmdutil.findcmd(cmd, table, False)
1755 otables.append(entry[1])
1756 otables.append(entry[1])
1756 for t in otables:
1757 for t in otables:
1757 for o in t:
1758 for o in t:
1758 if "(DEPRECATED)" in o[3]:
1759 if "(DEPRECATED)" in o[3]:
1759 continue
1760 continue
1760 if o[0]:
1761 if o[0]:
1761 options.append('-%s' % o[0])
1762 options.append('-%s' % o[0])
1762 options.append('--%s' % o[1])
1763 options.append('--%s' % o[1])
1763 ui.write("%s\n" % "\n".join(options))
1764 ui.write("%s\n" % "\n".join(options))
1764 return
1765 return
1765
1766
1766 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1767 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1767 if ui.verbose:
1768 if ui.verbose:
1768 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1769 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1769 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1770 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1770
1771
1771 @command('^diff',
1772 @command('^diff',
1772 [('r', 'rev', [], _('revision'), _('REV')),
1773 [('r', 'rev', [], _('revision'), _('REV')),
1773 ('c', 'change', '', _('change made by revision'), _('REV'))
1774 ('c', 'change', '', _('change made by revision'), _('REV'))
1774 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1775 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1775 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1776 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1776 inferrepo=True)
1777 inferrepo=True, cmdtype=readonly)
1777 def diff(ui, repo, *pats, **opts):
1778 def diff(ui, repo, *pats, **opts):
1778 """diff repository (or selected files)
1779 """diff repository (or selected files)
1779
1780
1780 Show differences between revisions for the specified files.
1781 Show differences between revisions for the specified files.
1781
1782
1782 Differences between files are shown using the unified diff format.
1783 Differences between files are shown using the unified diff format.
1783
1784
1784 .. note::
1785 .. note::
1785
1786
1786 :hg:`diff` may generate unexpected results for merges, as it will
1787 :hg:`diff` may generate unexpected results for merges, as it will
1787 default to comparing against the working directory's first
1788 default to comparing against the working directory's first
1788 parent changeset if no revisions are specified.
1789 parent changeset if no revisions are specified.
1789
1790
1790 When two revision arguments are given, then changes are shown
1791 When two revision arguments are given, then changes are shown
1791 between those revisions. If only one revision is specified then
1792 between those revisions. If only one revision is specified then
1792 that revision is compared to the working directory, and, when no
1793 that revision is compared to the working directory, and, when no
1793 revisions are specified, the working directory files are compared
1794 revisions are specified, the working directory files are compared
1794 to its first parent.
1795 to its first parent.
1795
1796
1796 Alternatively you can specify -c/--change with a revision to see
1797 Alternatively you can specify -c/--change with a revision to see
1797 the changes in that changeset relative to its first parent.
1798 the changes in that changeset relative to its first parent.
1798
1799
1799 Without the -a/--text option, diff will avoid generating diffs of
1800 Without the -a/--text option, diff will avoid generating diffs of
1800 files it detects as binary. With -a, diff will generate a diff
1801 files it detects as binary. With -a, diff will generate a diff
1801 anyway, probably with undesirable results.
1802 anyway, probably with undesirable results.
1802
1803
1803 Use the -g/--git option to generate diffs in the git extended diff
1804 Use the -g/--git option to generate diffs in the git extended diff
1804 format. For more information, read :hg:`help diffs`.
1805 format. For more information, read :hg:`help diffs`.
1805
1806
1806 .. container:: verbose
1807 .. container:: verbose
1807
1808
1808 Examples:
1809 Examples:
1809
1810
1810 - compare a file in the current working directory to its parent::
1811 - compare a file in the current working directory to its parent::
1811
1812
1812 hg diff foo.c
1813 hg diff foo.c
1813
1814
1814 - compare two historical versions of a directory, with rename info::
1815 - compare two historical versions of a directory, with rename info::
1815
1816
1816 hg diff --git -r 1.0:1.2 lib/
1817 hg diff --git -r 1.0:1.2 lib/
1817
1818
1818 - get change stats relative to the last change on some date::
1819 - get change stats relative to the last change on some date::
1819
1820
1820 hg diff --stat -r "date('may 2')"
1821 hg diff --stat -r "date('may 2')"
1821
1822
1822 - diff all newly-added files that contain a keyword::
1823 - diff all newly-added files that contain a keyword::
1823
1824
1824 hg diff "set:added() and grep(GNU)"
1825 hg diff "set:added() and grep(GNU)"
1825
1826
1826 - compare a revision and its parents::
1827 - compare a revision and its parents::
1827
1828
1828 hg diff -c 9353 # compare against first parent
1829 hg diff -c 9353 # compare against first parent
1829 hg diff -r 9353^:9353 # same using revset syntax
1830 hg diff -r 9353^:9353 # same using revset syntax
1830 hg diff -r 9353^2:9353 # compare against the second parent
1831 hg diff -r 9353^2:9353 # compare against the second parent
1831
1832
1832 Returns 0 on success.
1833 Returns 0 on success.
1833 """
1834 """
1834
1835
1835 opts = pycompat.byteskwargs(opts)
1836 opts = pycompat.byteskwargs(opts)
1836 revs = opts.get('rev')
1837 revs = opts.get('rev')
1837 change = opts.get('change')
1838 change = opts.get('change')
1838 stat = opts.get('stat')
1839 stat = opts.get('stat')
1839 reverse = opts.get('reverse')
1840 reverse = opts.get('reverse')
1840
1841
1841 if revs and change:
1842 if revs and change:
1842 msg = _('cannot specify --rev and --change at the same time')
1843 msg = _('cannot specify --rev and --change at the same time')
1843 raise error.Abort(msg)
1844 raise error.Abort(msg)
1844 elif change:
1845 elif change:
1845 node2 = scmutil.revsingle(repo, change, None).node()
1846 node2 = scmutil.revsingle(repo, change, None).node()
1846 node1 = repo[node2].p1().node()
1847 node1 = repo[node2].p1().node()
1847 else:
1848 else:
1848 node1, node2 = scmutil.revpair(repo, revs)
1849 node1, node2 = scmutil.revpair(repo, revs)
1849
1850
1850 if reverse:
1851 if reverse:
1851 node1, node2 = node2, node1
1852 node1, node2 = node2, node1
1852
1853
1853 diffopts = patch.diffallopts(ui, opts)
1854 diffopts = patch.diffallopts(ui, opts)
1854 m = scmutil.match(repo[node2], pats, opts)
1855 m = scmutil.match(repo[node2], pats, opts)
1855 ui.pager('diff')
1856 ui.pager('diff')
1856 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1857 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1857 listsubrepos=opts.get('subrepos'),
1858 listsubrepos=opts.get('subrepos'),
1858 root=opts.get('root'))
1859 root=opts.get('root'))
1859
1860
1860 @command('^export',
1861 @command('^export',
1861 [('o', 'output', '',
1862 [('o', 'output', '',
1862 _('print output to file with formatted name'), _('FORMAT')),
1863 _('print output to file with formatted name'), _('FORMAT')),
1863 ('', 'switch-parent', None, _('diff against the second parent')),
1864 ('', 'switch-parent', None, _('diff against the second parent')),
1864 ('r', 'rev', [], _('revisions to export'), _('REV')),
1865 ('r', 'rev', [], _('revisions to export'), _('REV')),
1865 ] + diffopts,
1866 ] + diffopts,
1866 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1867 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly)
1867 def export(ui, repo, *changesets, **opts):
1868 def export(ui, repo, *changesets, **opts):
1868 """dump the header and diffs for one or more changesets
1869 """dump the header and diffs for one or more changesets
1869
1870
1870 Print the changeset header and diffs for one or more revisions.
1871 Print the changeset header and diffs for one or more revisions.
1871 If no revision is given, the parent of the working directory is used.
1872 If no revision is given, the parent of the working directory is used.
1872
1873
1873 The information shown in the changeset header is: author, date,
1874 The information shown in the changeset header is: author, date,
1874 branch name (if non-default), changeset hash, parent(s) and commit
1875 branch name (if non-default), changeset hash, parent(s) and commit
1875 comment.
1876 comment.
1876
1877
1877 .. note::
1878 .. note::
1878
1879
1879 :hg:`export` may generate unexpected diff output for merge
1880 :hg:`export` may generate unexpected diff output for merge
1880 changesets, as it will compare the merge changeset against its
1881 changesets, as it will compare the merge changeset against its
1881 first parent only.
1882 first parent only.
1882
1883
1883 Output may be to a file, in which case the name of the file is
1884 Output may be to a file, in which case the name of the file is
1884 given using a format string. The formatting rules are as follows:
1885 given using a format string. The formatting rules are as follows:
1885
1886
1886 :``%%``: literal "%" character
1887 :``%%``: literal "%" character
1887 :``%H``: changeset hash (40 hexadecimal digits)
1888 :``%H``: changeset hash (40 hexadecimal digits)
1888 :``%N``: number of patches being generated
1889 :``%N``: number of patches being generated
1889 :``%R``: changeset revision number
1890 :``%R``: changeset revision number
1890 :``%b``: basename of the exporting repository
1891 :``%b``: basename of the exporting repository
1891 :``%h``: short-form changeset hash (12 hexadecimal digits)
1892 :``%h``: short-form changeset hash (12 hexadecimal digits)
1892 :``%m``: first line of the commit message (only alphanumeric characters)
1893 :``%m``: first line of the commit message (only alphanumeric characters)
1893 :``%n``: zero-padded sequence number, starting at 1
1894 :``%n``: zero-padded sequence number, starting at 1
1894 :``%r``: zero-padded changeset revision number
1895 :``%r``: zero-padded changeset revision number
1895
1896
1896 Without the -a/--text option, export will avoid generating diffs
1897 Without the -a/--text option, export will avoid generating diffs
1897 of files it detects as binary. With -a, export will generate a
1898 of files it detects as binary. With -a, export will generate a
1898 diff anyway, probably with undesirable results.
1899 diff anyway, probably with undesirable results.
1899
1900
1900 Use the -g/--git option to generate diffs in the git extended diff
1901 Use the -g/--git option to generate diffs in the git extended diff
1901 format. See :hg:`help diffs` for more information.
1902 format. See :hg:`help diffs` for more information.
1902
1903
1903 With the --switch-parent option, the diff will be against the
1904 With the --switch-parent option, the diff will be against the
1904 second parent. It can be useful to review a merge.
1905 second parent. It can be useful to review a merge.
1905
1906
1906 .. container:: verbose
1907 .. container:: verbose
1907
1908
1908 Examples:
1909 Examples:
1909
1910
1910 - use export and import to transplant a bugfix to the current
1911 - use export and import to transplant a bugfix to the current
1911 branch::
1912 branch::
1912
1913
1913 hg export -r 9353 | hg import -
1914 hg export -r 9353 | hg import -
1914
1915
1915 - export all the changesets between two revisions to a file with
1916 - export all the changesets between two revisions to a file with
1916 rename information::
1917 rename information::
1917
1918
1918 hg export --git -r 123:150 > changes.txt
1919 hg export --git -r 123:150 > changes.txt
1919
1920
1920 - split outgoing changes into a series of patches with
1921 - split outgoing changes into a series of patches with
1921 descriptive names::
1922 descriptive names::
1922
1923
1923 hg export -r "outgoing()" -o "%n-%m.patch"
1924 hg export -r "outgoing()" -o "%n-%m.patch"
1924
1925
1925 Returns 0 on success.
1926 Returns 0 on success.
1926 """
1927 """
1927 opts = pycompat.byteskwargs(opts)
1928 opts = pycompat.byteskwargs(opts)
1928 changesets += tuple(opts.get('rev', []))
1929 changesets += tuple(opts.get('rev', []))
1929 if not changesets:
1930 if not changesets:
1930 changesets = ['.']
1931 changesets = ['.']
1931 revs = scmutil.revrange(repo, changesets)
1932 revs = scmutil.revrange(repo, changesets)
1932 if not revs:
1933 if not revs:
1933 raise error.Abort(_("export requires at least one changeset"))
1934 raise error.Abort(_("export requires at least one changeset"))
1934 if len(revs) > 1:
1935 if len(revs) > 1:
1935 ui.note(_('exporting patches:\n'))
1936 ui.note(_('exporting patches:\n'))
1936 else:
1937 else:
1937 ui.note(_('exporting patch:\n'))
1938 ui.note(_('exporting patch:\n'))
1938 ui.pager('export')
1939 ui.pager('export')
1939 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1940 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1940 switch_parent=opts.get('switch_parent'),
1941 switch_parent=opts.get('switch_parent'),
1941 opts=patch.diffallopts(ui, opts))
1942 opts=patch.diffallopts(ui, opts))
1942
1943
1943 @command('files',
1944 @command('files',
1944 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1945 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1945 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1946 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1946 ] + walkopts + formatteropts + subrepoopts,
1947 ] + walkopts + formatteropts + subrepoopts,
1947 _('[OPTION]... [FILE]...'))
1948 _('[OPTION]... [FILE]...'), cmdtype=readonly)
1948 def files(ui, repo, *pats, **opts):
1949 def files(ui, repo, *pats, **opts):
1949 """list tracked files
1950 """list tracked files
1950
1951
1951 Print files under Mercurial control in the working directory or
1952 Print files under Mercurial control in the working directory or
1952 specified revision for given files (excluding removed files).
1953 specified revision for given files (excluding removed files).
1953 Files can be specified as filenames or filesets.
1954 Files can be specified as filenames or filesets.
1954
1955
1955 If no files are given to match, this command prints the names
1956 If no files are given to match, this command prints the names
1956 of all files under Mercurial control.
1957 of all files under Mercurial control.
1957
1958
1958 .. container:: verbose
1959 .. container:: verbose
1959
1960
1960 Examples:
1961 Examples:
1961
1962
1962 - list all files under the current directory::
1963 - list all files under the current directory::
1963
1964
1964 hg files .
1965 hg files .
1965
1966
1966 - shows sizes and flags for current revision::
1967 - shows sizes and flags for current revision::
1967
1968
1968 hg files -vr .
1969 hg files -vr .
1969
1970
1970 - list all files named README::
1971 - list all files named README::
1971
1972
1972 hg files -I "**/README"
1973 hg files -I "**/README"
1973
1974
1974 - list all binary files::
1975 - list all binary files::
1975
1976
1976 hg files "set:binary()"
1977 hg files "set:binary()"
1977
1978
1978 - find files containing a regular expression::
1979 - find files containing a regular expression::
1979
1980
1980 hg files "set:grep('bob')"
1981 hg files "set:grep('bob')"
1981
1982
1982 - search tracked file contents with xargs and grep::
1983 - search tracked file contents with xargs and grep::
1983
1984
1984 hg files -0 | xargs -0 grep foo
1985 hg files -0 | xargs -0 grep foo
1985
1986
1986 See :hg:`help patterns` and :hg:`help filesets` for more information
1987 See :hg:`help patterns` and :hg:`help filesets` for more information
1987 on specifying file patterns.
1988 on specifying file patterns.
1988
1989
1989 Returns 0 if a match is found, 1 otherwise.
1990 Returns 0 if a match is found, 1 otherwise.
1990
1991
1991 """
1992 """
1992
1993
1993 opts = pycompat.byteskwargs(opts)
1994 opts = pycompat.byteskwargs(opts)
1994 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1995 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1995
1996
1996 end = '\n'
1997 end = '\n'
1997 if opts.get('print0'):
1998 if opts.get('print0'):
1998 end = '\0'
1999 end = '\0'
1999 fmt = '%s' + end
2000 fmt = '%s' + end
2000
2001
2001 m = scmutil.match(ctx, pats, opts)
2002 m = scmutil.match(ctx, pats, opts)
2002 ui.pager('files')
2003 ui.pager('files')
2003 with ui.formatter('files', opts) as fm:
2004 with ui.formatter('files', opts) as fm:
2004 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2005 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2005
2006
2006 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2007 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2007 def forget(ui, repo, *pats, **opts):
2008 def forget(ui, repo, *pats, **opts):
2008 """forget the specified files on the next commit
2009 """forget the specified files on the next commit
2009
2010
2010 Mark the specified files so they will no longer be tracked
2011 Mark the specified files so they will no longer be tracked
2011 after the next commit.
2012 after the next commit.
2012
2013
2013 This only removes files from the current branch, not from the
2014 This only removes files from the current branch, not from the
2014 entire project history, and it does not delete them from the
2015 entire project history, and it does not delete them from the
2015 working directory.
2016 working directory.
2016
2017
2017 To delete the file from the working directory, see :hg:`remove`.
2018 To delete the file from the working directory, see :hg:`remove`.
2018
2019
2019 To undo a forget before the next commit, see :hg:`add`.
2020 To undo a forget before the next commit, see :hg:`add`.
2020
2021
2021 .. container:: verbose
2022 .. container:: verbose
2022
2023
2023 Examples:
2024 Examples:
2024
2025
2025 - forget newly-added binary files::
2026 - forget newly-added binary files::
2026
2027
2027 hg forget "set:added() and binary()"
2028 hg forget "set:added() and binary()"
2028
2029
2029 - forget files that would be excluded by .hgignore::
2030 - forget files that would be excluded by .hgignore::
2030
2031
2031 hg forget "set:hgignore()"
2032 hg forget "set:hgignore()"
2032
2033
2033 Returns 0 on success.
2034 Returns 0 on success.
2034 """
2035 """
2035
2036
2036 opts = pycompat.byteskwargs(opts)
2037 opts = pycompat.byteskwargs(opts)
2037 if not pats:
2038 if not pats:
2038 raise error.Abort(_('no files specified'))
2039 raise error.Abort(_('no files specified'))
2039
2040
2040 m = scmutil.match(repo[None], pats, opts)
2041 m = scmutil.match(repo[None], pats, opts)
2041 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2042 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2042 return rejected and 1 or 0
2043 return rejected and 1 or 0
2043
2044
2044 @command(
2045 @command(
2045 'graft',
2046 'graft',
2046 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2047 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2047 ('c', 'continue', False, _('resume interrupted graft')),
2048 ('c', 'continue', False, _('resume interrupted graft')),
2048 ('e', 'edit', False, _('invoke editor on commit messages')),
2049 ('e', 'edit', False, _('invoke editor on commit messages')),
2049 ('', 'log', None, _('append graft info to log message')),
2050 ('', 'log', None, _('append graft info to log message')),
2050 ('f', 'force', False, _('force graft')),
2051 ('f', 'force', False, _('force graft')),
2051 ('D', 'currentdate', False,
2052 ('D', 'currentdate', False,
2052 _('record the current date as commit date')),
2053 _('record the current date as commit date')),
2053 ('U', 'currentuser', False,
2054 ('U', 'currentuser', False,
2054 _('record the current user as committer'), _('DATE'))]
2055 _('record the current user as committer'), _('DATE'))]
2055 + commitopts2 + mergetoolopts + dryrunopts,
2056 + commitopts2 + mergetoolopts + dryrunopts,
2056 _('[OPTION]... [-r REV]... REV...'))
2057 _('[OPTION]... [-r REV]... REV...'))
2057 def graft(ui, repo, *revs, **opts):
2058 def graft(ui, repo, *revs, **opts):
2058 '''copy changes from other branches onto the current branch
2059 '''copy changes from other branches onto the current branch
2059
2060
2060 This command uses Mercurial's merge logic to copy individual
2061 This command uses Mercurial's merge logic to copy individual
2061 changes from other branches without merging branches in the
2062 changes from other branches without merging branches in the
2062 history graph. This is sometimes known as 'backporting' or
2063 history graph. This is sometimes known as 'backporting' or
2063 'cherry-picking'. By default, graft will copy user, date, and
2064 'cherry-picking'. By default, graft will copy user, date, and
2064 description from the source changesets.
2065 description from the source changesets.
2065
2066
2066 Changesets that are ancestors of the current revision, that have
2067 Changesets that are ancestors of the current revision, that have
2067 already been grafted, or that are merges will be skipped.
2068 already been grafted, or that are merges will be skipped.
2068
2069
2069 If --log is specified, log messages will have a comment appended
2070 If --log is specified, log messages will have a comment appended
2070 of the form::
2071 of the form::
2071
2072
2072 (grafted from CHANGESETHASH)
2073 (grafted from CHANGESETHASH)
2073
2074
2074 If --force is specified, revisions will be grafted even if they
2075 If --force is specified, revisions will be grafted even if they
2075 are already ancestors of, or have been grafted to, the destination.
2076 are already ancestors of, or have been grafted to, the destination.
2076 This is useful when the revisions have since been backed out.
2077 This is useful when the revisions have since been backed out.
2077
2078
2078 If a graft merge results in conflicts, the graft process is
2079 If a graft merge results in conflicts, the graft process is
2079 interrupted so that the current merge can be manually resolved.
2080 interrupted so that the current merge can be manually resolved.
2080 Once all conflicts are addressed, the graft process can be
2081 Once all conflicts are addressed, the graft process can be
2081 continued with the -c/--continue option.
2082 continued with the -c/--continue option.
2082
2083
2083 .. note::
2084 .. note::
2084
2085
2085 The -c/--continue option does not reapply earlier options, except
2086 The -c/--continue option does not reapply earlier options, except
2086 for --force.
2087 for --force.
2087
2088
2088 .. container:: verbose
2089 .. container:: verbose
2089
2090
2090 Examples:
2091 Examples:
2091
2092
2092 - copy a single change to the stable branch and edit its description::
2093 - copy a single change to the stable branch and edit its description::
2093
2094
2094 hg update stable
2095 hg update stable
2095 hg graft --edit 9393
2096 hg graft --edit 9393
2096
2097
2097 - graft a range of changesets with one exception, updating dates::
2098 - graft a range of changesets with one exception, updating dates::
2098
2099
2099 hg graft -D "2085::2093 and not 2091"
2100 hg graft -D "2085::2093 and not 2091"
2100
2101
2101 - continue a graft after resolving conflicts::
2102 - continue a graft after resolving conflicts::
2102
2103
2103 hg graft -c
2104 hg graft -c
2104
2105
2105 - show the source of a grafted changeset::
2106 - show the source of a grafted changeset::
2106
2107
2107 hg log --debug -r .
2108 hg log --debug -r .
2108
2109
2109 - show revisions sorted by date::
2110 - show revisions sorted by date::
2110
2111
2111 hg log -r "sort(all(), date)"
2112 hg log -r "sort(all(), date)"
2112
2113
2113 See :hg:`help revisions` for more about specifying revisions.
2114 See :hg:`help revisions` for more about specifying revisions.
2114
2115
2115 Returns 0 on successful completion.
2116 Returns 0 on successful completion.
2116 '''
2117 '''
2117 with repo.wlock():
2118 with repo.wlock():
2118 return _dograft(ui, repo, *revs, **opts)
2119 return _dograft(ui, repo, *revs, **opts)
2119
2120
2120 def _dograft(ui, repo, *revs, **opts):
2121 def _dograft(ui, repo, *revs, **opts):
2121 opts = pycompat.byteskwargs(opts)
2122 opts = pycompat.byteskwargs(opts)
2122 if revs and opts.get('rev'):
2123 if revs and opts.get('rev'):
2123 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2124 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2124 'revision ordering!\n'))
2125 'revision ordering!\n'))
2125
2126
2126 revs = list(revs)
2127 revs = list(revs)
2127 revs.extend(opts.get('rev'))
2128 revs.extend(opts.get('rev'))
2128
2129
2129 if not opts.get('user') and opts.get('currentuser'):
2130 if not opts.get('user') and opts.get('currentuser'):
2130 opts['user'] = ui.username()
2131 opts['user'] = ui.username()
2131 if not opts.get('date') and opts.get('currentdate'):
2132 if not opts.get('date') and opts.get('currentdate'):
2132 opts['date'] = "%d %d" % util.makedate()
2133 opts['date'] = "%d %d" % util.makedate()
2133
2134
2134 editor = cmdutil.getcommiteditor(editform='graft',
2135 editor = cmdutil.getcommiteditor(editform='graft',
2135 **pycompat.strkwargs(opts))
2136 **pycompat.strkwargs(opts))
2136
2137
2137 cont = False
2138 cont = False
2138 if opts.get('continue'):
2139 if opts.get('continue'):
2139 cont = True
2140 cont = True
2140 if revs:
2141 if revs:
2141 raise error.Abort(_("can't specify --continue and revisions"))
2142 raise error.Abort(_("can't specify --continue and revisions"))
2142 # read in unfinished revisions
2143 # read in unfinished revisions
2143 try:
2144 try:
2144 nodes = repo.vfs.read('graftstate').splitlines()
2145 nodes = repo.vfs.read('graftstate').splitlines()
2145 revs = [repo[node].rev() for node in nodes]
2146 revs = [repo[node].rev() for node in nodes]
2146 except IOError as inst:
2147 except IOError as inst:
2147 if inst.errno != errno.ENOENT:
2148 if inst.errno != errno.ENOENT:
2148 raise
2149 raise
2149 cmdutil.wrongtooltocontinue(repo, _('graft'))
2150 cmdutil.wrongtooltocontinue(repo, _('graft'))
2150 else:
2151 else:
2151 cmdutil.checkunfinished(repo)
2152 cmdutil.checkunfinished(repo)
2152 cmdutil.bailifchanged(repo)
2153 cmdutil.bailifchanged(repo)
2153 if not revs:
2154 if not revs:
2154 raise error.Abort(_('no revisions specified'))
2155 raise error.Abort(_('no revisions specified'))
2155 revs = scmutil.revrange(repo, revs)
2156 revs = scmutil.revrange(repo, revs)
2156
2157
2157 skipped = set()
2158 skipped = set()
2158 # check for merges
2159 # check for merges
2159 for rev in repo.revs('%ld and merge()', revs):
2160 for rev in repo.revs('%ld and merge()', revs):
2160 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2161 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2161 skipped.add(rev)
2162 skipped.add(rev)
2162 revs = [r for r in revs if r not in skipped]
2163 revs = [r for r in revs if r not in skipped]
2163 if not revs:
2164 if not revs:
2164 return -1
2165 return -1
2165
2166
2166 # Don't check in the --continue case, in effect retaining --force across
2167 # Don't check in the --continue case, in effect retaining --force across
2167 # --continues. That's because without --force, any revisions we decided to
2168 # --continues. That's because without --force, any revisions we decided to
2168 # skip would have been filtered out here, so they wouldn't have made their
2169 # skip would have been filtered out here, so they wouldn't have made their
2169 # way to the graftstate. With --force, any revisions we would have otherwise
2170 # way to the graftstate. With --force, any revisions we would have otherwise
2170 # skipped would not have been filtered out, and if they hadn't been applied
2171 # skipped would not have been filtered out, and if they hadn't been applied
2171 # already, they'd have been in the graftstate.
2172 # already, they'd have been in the graftstate.
2172 if not (cont or opts.get('force')):
2173 if not (cont or opts.get('force')):
2173 # check for ancestors of dest branch
2174 # check for ancestors of dest branch
2174 crev = repo['.'].rev()
2175 crev = repo['.'].rev()
2175 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2176 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2176 # XXX make this lazy in the future
2177 # XXX make this lazy in the future
2177 # don't mutate while iterating, create a copy
2178 # don't mutate while iterating, create a copy
2178 for rev in list(revs):
2179 for rev in list(revs):
2179 if rev in ancestors:
2180 if rev in ancestors:
2180 ui.warn(_('skipping ancestor revision %d:%s\n') %
2181 ui.warn(_('skipping ancestor revision %d:%s\n') %
2181 (rev, repo[rev]))
2182 (rev, repo[rev]))
2182 # XXX remove on list is slow
2183 # XXX remove on list is slow
2183 revs.remove(rev)
2184 revs.remove(rev)
2184 if not revs:
2185 if not revs:
2185 return -1
2186 return -1
2186
2187
2187 # analyze revs for earlier grafts
2188 # analyze revs for earlier grafts
2188 ids = {}
2189 ids = {}
2189 for ctx in repo.set("%ld", revs):
2190 for ctx in repo.set("%ld", revs):
2190 ids[ctx.hex()] = ctx.rev()
2191 ids[ctx.hex()] = ctx.rev()
2191 n = ctx.extra().get('source')
2192 n = ctx.extra().get('source')
2192 if n:
2193 if n:
2193 ids[n] = ctx.rev()
2194 ids[n] = ctx.rev()
2194
2195
2195 # check ancestors for earlier grafts
2196 # check ancestors for earlier grafts
2196 ui.debug('scanning for duplicate grafts\n')
2197 ui.debug('scanning for duplicate grafts\n')
2197
2198
2198 # The only changesets we can be sure doesn't contain grafts of any
2199 # The only changesets we can be sure doesn't contain grafts of any
2199 # revs, are the ones that are common ancestors of *all* revs:
2200 # revs, are the ones that are common ancestors of *all* revs:
2200 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2201 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2201 ctx = repo[rev]
2202 ctx = repo[rev]
2202 n = ctx.extra().get('source')
2203 n = ctx.extra().get('source')
2203 if n in ids:
2204 if n in ids:
2204 try:
2205 try:
2205 r = repo[n].rev()
2206 r = repo[n].rev()
2206 except error.RepoLookupError:
2207 except error.RepoLookupError:
2207 r = None
2208 r = None
2208 if r in revs:
2209 if r in revs:
2209 ui.warn(_('skipping revision %d:%s '
2210 ui.warn(_('skipping revision %d:%s '
2210 '(already grafted to %d:%s)\n')
2211 '(already grafted to %d:%s)\n')
2211 % (r, repo[r], rev, ctx))
2212 % (r, repo[r], rev, ctx))
2212 revs.remove(r)
2213 revs.remove(r)
2213 elif ids[n] in revs:
2214 elif ids[n] in revs:
2214 if r is None:
2215 if r is None:
2215 ui.warn(_('skipping already grafted revision %d:%s '
2216 ui.warn(_('skipping already grafted revision %d:%s '
2216 '(%d:%s also has unknown origin %s)\n')
2217 '(%d:%s also has unknown origin %s)\n')
2217 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2218 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2218 else:
2219 else:
2219 ui.warn(_('skipping already grafted revision %d:%s '
2220 ui.warn(_('skipping already grafted revision %d:%s '
2220 '(%d:%s also has origin %d:%s)\n')
2221 '(%d:%s also has origin %d:%s)\n')
2221 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2222 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2222 revs.remove(ids[n])
2223 revs.remove(ids[n])
2223 elif ctx.hex() in ids:
2224 elif ctx.hex() in ids:
2224 r = ids[ctx.hex()]
2225 r = ids[ctx.hex()]
2225 ui.warn(_('skipping already grafted revision %d:%s '
2226 ui.warn(_('skipping already grafted revision %d:%s '
2226 '(was grafted from %d:%s)\n') %
2227 '(was grafted from %d:%s)\n') %
2227 (r, repo[r], rev, ctx))
2228 (r, repo[r], rev, ctx))
2228 revs.remove(r)
2229 revs.remove(r)
2229 if not revs:
2230 if not revs:
2230 return -1
2231 return -1
2231
2232
2232 for pos, ctx in enumerate(repo.set("%ld", revs)):
2233 for pos, ctx in enumerate(repo.set("%ld", revs)):
2233 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2234 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2234 ctx.description().split('\n', 1)[0])
2235 ctx.description().split('\n', 1)[0])
2235 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2236 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2236 if names:
2237 if names:
2237 desc += ' (%s)' % ' '.join(names)
2238 desc += ' (%s)' % ' '.join(names)
2238 ui.status(_('grafting %s\n') % desc)
2239 ui.status(_('grafting %s\n') % desc)
2239 if opts.get('dry_run'):
2240 if opts.get('dry_run'):
2240 continue
2241 continue
2241
2242
2242 source = ctx.extra().get('source')
2243 source = ctx.extra().get('source')
2243 extra = {}
2244 extra = {}
2244 if source:
2245 if source:
2245 extra['source'] = source
2246 extra['source'] = source
2246 extra['intermediate-source'] = ctx.hex()
2247 extra['intermediate-source'] = ctx.hex()
2247 else:
2248 else:
2248 extra['source'] = ctx.hex()
2249 extra['source'] = ctx.hex()
2249 user = ctx.user()
2250 user = ctx.user()
2250 if opts.get('user'):
2251 if opts.get('user'):
2251 user = opts['user']
2252 user = opts['user']
2252 date = ctx.date()
2253 date = ctx.date()
2253 if opts.get('date'):
2254 if opts.get('date'):
2254 date = opts['date']
2255 date = opts['date']
2255 message = ctx.description()
2256 message = ctx.description()
2256 if opts.get('log'):
2257 if opts.get('log'):
2257 message += '\n(grafted from %s)' % ctx.hex()
2258 message += '\n(grafted from %s)' % ctx.hex()
2258
2259
2259 # we don't merge the first commit when continuing
2260 # we don't merge the first commit when continuing
2260 if not cont:
2261 if not cont:
2261 # perform the graft merge with p1(rev) as 'ancestor'
2262 # perform the graft merge with p1(rev) as 'ancestor'
2262 try:
2263 try:
2263 # ui.forcemerge is an internal variable, do not document
2264 # ui.forcemerge is an internal variable, do not document
2264 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2265 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2265 'graft')
2266 'graft')
2266 stats = mergemod.graft(repo, ctx, ctx.p1(),
2267 stats = mergemod.graft(repo, ctx, ctx.p1(),
2267 ['local', 'graft'])
2268 ['local', 'graft'])
2268 finally:
2269 finally:
2269 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2270 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2270 # report any conflicts
2271 # report any conflicts
2271 if stats and stats[3] > 0:
2272 if stats and stats[3] > 0:
2272 # write out state for --continue
2273 # write out state for --continue
2273 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2274 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2274 repo.vfs.write('graftstate', ''.join(nodelines))
2275 repo.vfs.write('graftstate', ''.join(nodelines))
2275 extra = ''
2276 extra = ''
2276 if opts.get('user'):
2277 if opts.get('user'):
2277 extra += ' --user %s' % util.shellquote(opts['user'])
2278 extra += ' --user %s' % util.shellquote(opts['user'])
2278 if opts.get('date'):
2279 if opts.get('date'):
2279 extra += ' --date %s' % util.shellquote(opts['date'])
2280 extra += ' --date %s' % util.shellquote(opts['date'])
2280 if opts.get('log'):
2281 if opts.get('log'):
2281 extra += ' --log'
2282 extra += ' --log'
2282 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2283 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2283 raise error.Abort(
2284 raise error.Abort(
2284 _("unresolved conflicts, can't continue"),
2285 _("unresolved conflicts, can't continue"),
2285 hint=hint)
2286 hint=hint)
2286 else:
2287 else:
2287 cont = False
2288 cont = False
2288
2289
2289 # commit
2290 # commit
2290 node = repo.commit(text=message, user=user,
2291 node = repo.commit(text=message, user=user,
2291 date=date, extra=extra, editor=editor)
2292 date=date, extra=extra, editor=editor)
2292 if node is None:
2293 if node is None:
2293 ui.warn(
2294 ui.warn(
2294 _('note: graft of %d:%s created no changes to commit\n') %
2295 _('note: graft of %d:%s created no changes to commit\n') %
2295 (ctx.rev(), ctx))
2296 (ctx.rev(), ctx))
2296
2297
2297 # remove state when we complete successfully
2298 # remove state when we complete successfully
2298 if not opts.get('dry_run'):
2299 if not opts.get('dry_run'):
2299 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2300 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2300
2301
2301 return 0
2302 return 0
2302
2303
2303 @command('grep',
2304 @command('grep',
2304 [('0', 'print0', None, _('end fields with NUL')),
2305 [('0', 'print0', None, _('end fields with NUL')),
2305 ('', 'all', None, _('print all revisions that match')),
2306 ('', 'all', None, _('print all revisions that match')),
2306 ('a', 'text', None, _('treat all files as text')),
2307 ('a', 'text', None, _('treat all files as text')),
2307 ('f', 'follow', None,
2308 ('f', 'follow', None,
2308 _('follow changeset history,'
2309 _('follow changeset history,'
2309 ' or file history across copies and renames')),
2310 ' or file history across copies and renames')),
2310 ('i', 'ignore-case', None, _('ignore case when matching')),
2311 ('i', 'ignore-case', None, _('ignore case when matching')),
2311 ('l', 'files-with-matches', None,
2312 ('l', 'files-with-matches', None,
2312 _('print only filenames and revisions that match')),
2313 _('print only filenames and revisions that match')),
2313 ('n', 'line-number', None, _('print matching line numbers')),
2314 ('n', 'line-number', None, _('print matching line numbers')),
2314 ('r', 'rev', [],
2315 ('r', 'rev', [],
2315 _('only search files changed within revision range'), _('REV')),
2316 _('only search files changed within revision range'), _('REV')),
2316 ('u', 'user', None, _('list the author (long with -v)')),
2317 ('u', 'user', None, _('list the author (long with -v)')),
2317 ('d', 'date', None, _('list the date (short with -q)')),
2318 ('d', 'date', None, _('list the date (short with -q)')),
2318 ] + formatteropts + walkopts,
2319 ] + formatteropts + walkopts,
2319 _('[OPTION]... PATTERN [FILE]...'),
2320 _('[OPTION]... PATTERN [FILE]...'),
2320 inferrepo=True)
2321 inferrepo=True, cmdtype=readonly)
2321 def grep(ui, repo, pattern, *pats, **opts):
2322 def grep(ui, repo, pattern, *pats, **opts):
2322 """search revision history for a pattern in specified files
2323 """search revision history for a pattern in specified files
2323
2324
2324 Search revision history for a regular expression in the specified
2325 Search revision history for a regular expression in the specified
2325 files or the entire project.
2326 files or the entire project.
2326
2327
2327 By default, grep prints the most recent revision number for each
2328 By default, grep prints the most recent revision number for each
2328 file in which it finds a match. To get it to print every revision
2329 file in which it finds a match. To get it to print every revision
2329 that contains a change in match status ("-" for a match that becomes
2330 that contains a change in match status ("-" for a match that becomes
2330 a non-match, or "+" for a non-match that becomes a match), use the
2331 a non-match, or "+" for a non-match that becomes a match), use the
2331 --all flag.
2332 --all flag.
2332
2333
2333 PATTERN can be any Python (roughly Perl-compatible) regular
2334 PATTERN can be any Python (roughly Perl-compatible) regular
2334 expression.
2335 expression.
2335
2336
2336 If no FILEs are specified (and -f/--follow isn't set), all files in
2337 If no FILEs are specified (and -f/--follow isn't set), all files in
2337 the repository are searched, including those that don't exist in the
2338 the repository are searched, including those that don't exist in the
2338 current branch or have been deleted in a prior changeset.
2339 current branch or have been deleted in a prior changeset.
2339
2340
2340 Returns 0 if a match is found, 1 otherwise.
2341 Returns 0 if a match is found, 1 otherwise.
2341 """
2342 """
2342 opts = pycompat.byteskwargs(opts)
2343 opts = pycompat.byteskwargs(opts)
2343 reflags = re.M
2344 reflags = re.M
2344 if opts.get('ignore_case'):
2345 if opts.get('ignore_case'):
2345 reflags |= re.I
2346 reflags |= re.I
2346 try:
2347 try:
2347 regexp = util.re.compile(pattern, reflags)
2348 regexp = util.re.compile(pattern, reflags)
2348 except re.error as inst:
2349 except re.error as inst:
2349 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2350 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2350 return 1
2351 return 1
2351 sep, eol = ':', '\n'
2352 sep, eol = ':', '\n'
2352 if opts.get('print0'):
2353 if opts.get('print0'):
2353 sep = eol = '\0'
2354 sep = eol = '\0'
2354
2355
2355 getfile = util.lrucachefunc(repo.file)
2356 getfile = util.lrucachefunc(repo.file)
2356
2357
2357 def matchlines(body):
2358 def matchlines(body):
2358 begin = 0
2359 begin = 0
2359 linenum = 0
2360 linenum = 0
2360 while begin < len(body):
2361 while begin < len(body):
2361 match = regexp.search(body, begin)
2362 match = regexp.search(body, begin)
2362 if not match:
2363 if not match:
2363 break
2364 break
2364 mstart, mend = match.span()
2365 mstart, mend = match.span()
2365 linenum += body.count('\n', begin, mstart) + 1
2366 linenum += body.count('\n', begin, mstart) + 1
2366 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2367 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2367 begin = body.find('\n', mend) + 1 or len(body) + 1
2368 begin = body.find('\n', mend) + 1 or len(body) + 1
2368 lend = begin - 1
2369 lend = begin - 1
2369 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2370 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2370
2371
2371 class linestate(object):
2372 class linestate(object):
2372 def __init__(self, line, linenum, colstart, colend):
2373 def __init__(self, line, linenum, colstart, colend):
2373 self.line = line
2374 self.line = line
2374 self.linenum = linenum
2375 self.linenum = linenum
2375 self.colstart = colstart
2376 self.colstart = colstart
2376 self.colend = colend
2377 self.colend = colend
2377
2378
2378 def __hash__(self):
2379 def __hash__(self):
2379 return hash((self.linenum, self.line))
2380 return hash((self.linenum, self.line))
2380
2381
2381 def __eq__(self, other):
2382 def __eq__(self, other):
2382 return self.line == other.line
2383 return self.line == other.line
2383
2384
2384 def findpos(self):
2385 def findpos(self):
2385 """Iterate all (start, end) indices of matches"""
2386 """Iterate all (start, end) indices of matches"""
2386 yield self.colstart, self.colend
2387 yield self.colstart, self.colend
2387 p = self.colend
2388 p = self.colend
2388 while p < len(self.line):
2389 while p < len(self.line):
2389 m = regexp.search(self.line, p)
2390 m = regexp.search(self.line, p)
2390 if not m:
2391 if not m:
2391 break
2392 break
2392 yield m.span()
2393 yield m.span()
2393 p = m.end()
2394 p = m.end()
2394
2395
2395 matches = {}
2396 matches = {}
2396 copies = {}
2397 copies = {}
2397 def grepbody(fn, rev, body):
2398 def grepbody(fn, rev, body):
2398 matches[rev].setdefault(fn, [])
2399 matches[rev].setdefault(fn, [])
2399 m = matches[rev][fn]
2400 m = matches[rev][fn]
2400 for lnum, cstart, cend, line in matchlines(body):
2401 for lnum, cstart, cend, line in matchlines(body):
2401 s = linestate(line, lnum, cstart, cend)
2402 s = linestate(line, lnum, cstart, cend)
2402 m.append(s)
2403 m.append(s)
2403
2404
2404 def difflinestates(a, b):
2405 def difflinestates(a, b):
2405 sm = difflib.SequenceMatcher(None, a, b)
2406 sm = difflib.SequenceMatcher(None, a, b)
2406 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2407 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2407 if tag == 'insert':
2408 if tag == 'insert':
2408 for i in xrange(blo, bhi):
2409 for i in xrange(blo, bhi):
2409 yield ('+', b[i])
2410 yield ('+', b[i])
2410 elif tag == 'delete':
2411 elif tag == 'delete':
2411 for i in xrange(alo, ahi):
2412 for i in xrange(alo, ahi):
2412 yield ('-', a[i])
2413 yield ('-', a[i])
2413 elif tag == 'replace':
2414 elif tag == 'replace':
2414 for i in xrange(alo, ahi):
2415 for i in xrange(alo, ahi):
2415 yield ('-', a[i])
2416 yield ('-', a[i])
2416 for i in xrange(blo, bhi):
2417 for i in xrange(blo, bhi):
2417 yield ('+', b[i])
2418 yield ('+', b[i])
2418
2419
2419 def display(fm, fn, ctx, pstates, states):
2420 def display(fm, fn, ctx, pstates, states):
2420 rev = ctx.rev()
2421 rev = ctx.rev()
2421 if fm.isplain():
2422 if fm.isplain():
2422 formatuser = ui.shortuser
2423 formatuser = ui.shortuser
2423 else:
2424 else:
2424 formatuser = str
2425 formatuser = str
2425 if ui.quiet:
2426 if ui.quiet:
2426 datefmt = '%Y-%m-%d'
2427 datefmt = '%Y-%m-%d'
2427 else:
2428 else:
2428 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2429 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2429 found = False
2430 found = False
2430 @util.cachefunc
2431 @util.cachefunc
2431 def binary():
2432 def binary():
2432 flog = getfile(fn)
2433 flog = getfile(fn)
2433 return util.binary(flog.read(ctx.filenode(fn)))
2434 return util.binary(flog.read(ctx.filenode(fn)))
2434
2435
2435 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2436 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2436 if opts.get('all'):
2437 if opts.get('all'):
2437 iter = difflinestates(pstates, states)
2438 iter = difflinestates(pstates, states)
2438 else:
2439 else:
2439 iter = [('', l) for l in states]
2440 iter = [('', l) for l in states]
2440 for change, l in iter:
2441 for change, l in iter:
2441 fm.startitem()
2442 fm.startitem()
2442 fm.data(node=fm.hexfunc(ctx.node()))
2443 fm.data(node=fm.hexfunc(ctx.node()))
2443 cols = [
2444 cols = [
2444 ('filename', fn, True),
2445 ('filename', fn, True),
2445 ('rev', rev, True),
2446 ('rev', rev, True),
2446 ('linenumber', l.linenum, opts.get('line_number')),
2447 ('linenumber', l.linenum, opts.get('line_number')),
2447 ]
2448 ]
2448 if opts.get('all'):
2449 if opts.get('all'):
2449 cols.append(('change', change, True))
2450 cols.append(('change', change, True))
2450 cols.extend([
2451 cols.extend([
2451 ('user', formatuser(ctx.user()), opts.get('user')),
2452 ('user', formatuser(ctx.user()), opts.get('user')),
2452 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2453 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2453 ])
2454 ])
2454 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2455 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2455 for name, data, cond in cols:
2456 for name, data, cond in cols:
2456 field = fieldnamemap.get(name, name)
2457 field = fieldnamemap.get(name, name)
2457 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2458 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2458 if cond and name != lastcol:
2459 if cond and name != lastcol:
2459 fm.plain(sep, label='grep.sep')
2460 fm.plain(sep, label='grep.sep')
2460 if not opts.get('files_with_matches'):
2461 if not opts.get('files_with_matches'):
2461 fm.plain(sep, label='grep.sep')
2462 fm.plain(sep, label='grep.sep')
2462 if not opts.get('text') and binary():
2463 if not opts.get('text') and binary():
2463 fm.plain(_(" Binary file matches"))
2464 fm.plain(_(" Binary file matches"))
2464 else:
2465 else:
2465 displaymatches(fm.nested('texts'), l)
2466 displaymatches(fm.nested('texts'), l)
2466 fm.plain(eol)
2467 fm.plain(eol)
2467 found = True
2468 found = True
2468 if opts.get('files_with_matches'):
2469 if opts.get('files_with_matches'):
2469 break
2470 break
2470 return found
2471 return found
2471
2472
2472 def displaymatches(fm, l):
2473 def displaymatches(fm, l):
2473 p = 0
2474 p = 0
2474 for s, e in l.findpos():
2475 for s, e in l.findpos():
2475 if p < s:
2476 if p < s:
2476 fm.startitem()
2477 fm.startitem()
2477 fm.write('text', '%s', l.line[p:s])
2478 fm.write('text', '%s', l.line[p:s])
2478 fm.data(matched=False)
2479 fm.data(matched=False)
2479 fm.startitem()
2480 fm.startitem()
2480 fm.write('text', '%s', l.line[s:e], label='grep.match')
2481 fm.write('text', '%s', l.line[s:e], label='grep.match')
2481 fm.data(matched=True)
2482 fm.data(matched=True)
2482 p = e
2483 p = e
2483 if p < len(l.line):
2484 if p < len(l.line):
2484 fm.startitem()
2485 fm.startitem()
2485 fm.write('text', '%s', l.line[p:])
2486 fm.write('text', '%s', l.line[p:])
2486 fm.data(matched=False)
2487 fm.data(matched=False)
2487 fm.end()
2488 fm.end()
2488
2489
2489 skip = {}
2490 skip = {}
2490 revfiles = {}
2491 revfiles = {}
2491 match = scmutil.match(repo[None], pats, opts)
2492 match = scmutil.match(repo[None], pats, opts)
2492 found = False
2493 found = False
2493 follow = opts.get('follow')
2494 follow = opts.get('follow')
2494
2495
2495 def prep(ctx, fns):
2496 def prep(ctx, fns):
2496 rev = ctx.rev()
2497 rev = ctx.rev()
2497 pctx = ctx.p1()
2498 pctx = ctx.p1()
2498 parent = pctx.rev()
2499 parent = pctx.rev()
2499 matches.setdefault(rev, {})
2500 matches.setdefault(rev, {})
2500 matches.setdefault(parent, {})
2501 matches.setdefault(parent, {})
2501 files = revfiles.setdefault(rev, [])
2502 files = revfiles.setdefault(rev, [])
2502 for fn in fns:
2503 for fn in fns:
2503 flog = getfile(fn)
2504 flog = getfile(fn)
2504 try:
2505 try:
2505 fnode = ctx.filenode(fn)
2506 fnode = ctx.filenode(fn)
2506 except error.LookupError:
2507 except error.LookupError:
2507 continue
2508 continue
2508
2509
2509 copied = flog.renamed(fnode)
2510 copied = flog.renamed(fnode)
2510 copy = follow and copied and copied[0]
2511 copy = follow and copied and copied[0]
2511 if copy:
2512 if copy:
2512 copies.setdefault(rev, {})[fn] = copy
2513 copies.setdefault(rev, {})[fn] = copy
2513 if fn in skip:
2514 if fn in skip:
2514 if copy:
2515 if copy:
2515 skip[copy] = True
2516 skip[copy] = True
2516 continue
2517 continue
2517 files.append(fn)
2518 files.append(fn)
2518
2519
2519 if fn not in matches[rev]:
2520 if fn not in matches[rev]:
2520 grepbody(fn, rev, flog.read(fnode))
2521 grepbody(fn, rev, flog.read(fnode))
2521
2522
2522 pfn = copy or fn
2523 pfn = copy or fn
2523 if pfn not in matches[parent]:
2524 if pfn not in matches[parent]:
2524 try:
2525 try:
2525 fnode = pctx.filenode(pfn)
2526 fnode = pctx.filenode(pfn)
2526 grepbody(pfn, parent, flog.read(fnode))
2527 grepbody(pfn, parent, flog.read(fnode))
2527 except error.LookupError:
2528 except error.LookupError:
2528 pass
2529 pass
2529
2530
2530 ui.pager('grep')
2531 ui.pager('grep')
2531 fm = ui.formatter('grep', opts)
2532 fm = ui.formatter('grep', opts)
2532 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2533 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2533 rev = ctx.rev()
2534 rev = ctx.rev()
2534 parent = ctx.p1().rev()
2535 parent = ctx.p1().rev()
2535 for fn in sorted(revfiles.get(rev, [])):
2536 for fn in sorted(revfiles.get(rev, [])):
2536 states = matches[rev][fn]
2537 states = matches[rev][fn]
2537 copy = copies.get(rev, {}).get(fn)
2538 copy = copies.get(rev, {}).get(fn)
2538 if fn in skip:
2539 if fn in skip:
2539 if copy:
2540 if copy:
2540 skip[copy] = True
2541 skip[copy] = True
2541 continue
2542 continue
2542 pstates = matches.get(parent, {}).get(copy or fn, [])
2543 pstates = matches.get(parent, {}).get(copy or fn, [])
2543 if pstates or states:
2544 if pstates or states:
2544 r = display(fm, fn, ctx, pstates, states)
2545 r = display(fm, fn, ctx, pstates, states)
2545 found = found or r
2546 found = found or r
2546 if r and not opts.get('all'):
2547 if r and not opts.get('all'):
2547 skip[fn] = True
2548 skip[fn] = True
2548 if copy:
2549 if copy:
2549 skip[copy] = True
2550 skip[copy] = True
2550 del matches[rev]
2551 del matches[rev]
2551 del revfiles[rev]
2552 del revfiles[rev]
2552 fm.end()
2553 fm.end()
2553
2554
2554 return not found
2555 return not found
2555
2556
2556 @command('heads',
2557 @command('heads',
2557 [('r', 'rev', '',
2558 [('r', 'rev', '',
2558 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2559 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2559 ('t', 'topo', False, _('show topological heads only')),
2560 ('t', 'topo', False, _('show topological heads only')),
2560 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2561 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2561 ('c', 'closed', False, _('show normal and closed branch heads')),
2562 ('c', 'closed', False, _('show normal and closed branch heads')),
2562 ] + templateopts,
2563 ] + templateopts,
2563 _('[-ct] [-r STARTREV] [REV]...'))
2564 _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly)
2564 def heads(ui, repo, *branchrevs, **opts):
2565 def heads(ui, repo, *branchrevs, **opts):
2565 """show branch heads
2566 """show branch heads
2566
2567
2567 With no arguments, show all open branch heads in the repository.
2568 With no arguments, show all open branch heads in the repository.
2568 Branch heads are changesets that have no descendants on the
2569 Branch heads are changesets that have no descendants on the
2569 same branch. They are where development generally takes place and
2570 same branch. They are where development generally takes place and
2570 are the usual targets for update and merge operations.
2571 are the usual targets for update and merge operations.
2571
2572
2572 If one or more REVs are given, only open branch heads on the
2573 If one or more REVs are given, only open branch heads on the
2573 branches associated with the specified changesets are shown. This
2574 branches associated with the specified changesets are shown. This
2574 means that you can use :hg:`heads .` to see the heads on the
2575 means that you can use :hg:`heads .` to see the heads on the
2575 currently checked-out branch.
2576 currently checked-out branch.
2576
2577
2577 If -c/--closed is specified, also show branch heads marked closed
2578 If -c/--closed is specified, also show branch heads marked closed
2578 (see :hg:`commit --close-branch`).
2579 (see :hg:`commit --close-branch`).
2579
2580
2580 If STARTREV is specified, only those heads that are descendants of
2581 If STARTREV is specified, only those heads that are descendants of
2581 STARTREV will be displayed.
2582 STARTREV will be displayed.
2582
2583
2583 If -t/--topo is specified, named branch mechanics will be ignored and only
2584 If -t/--topo is specified, named branch mechanics will be ignored and only
2584 topological heads (changesets with no children) will be shown.
2585 topological heads (changesets with no children) will be shown.
2585
2586
2586 Returns 0 if matching heads are found, 1 if not.
2587 Returns 0 if matching heads are found, 1 if not.
2587 """
2588 """
2588
2589
2589 opts = pycompat.byteskwargs(opts)
2590 opts = pycompat.byteskwargs(opts)
2590 start = None
2591 start = None
2591 if 'rev' in opts:
2592 if 'rev' in opts:
2592 start = scmutil.revsingle(repo, opts['rev'], None).node()
2593 start = scmutil.revsingle(repo, opts['rev'], None).node()
2593
2594
2594 if opts.get('topo'):
2595 if opts.get('topo'):
2595 heads = [repo[h] for h in repo.heads(start)]
2596 heads = [repo[h] for h in repo.heads(start)]
2596 else:
2597 else:
2597 heads = []
2598 heads = []
2598 for branch in repo.branchmap():
2599 for branch in repo.branchmap():
2599 heads += repo.branchheads(branch, start, opts.get('closed'))
2600 heads += repo.branchheads(branch, start, opts.get('closed'))
2600 heads = [repo[h] for h in heads]
2601 heads = [repo[h] for h in heads]
2601
2602
2602 if branchrevs:
2603 if branchrevs:
2603 branches = set(repo[br].branch() for br in branchrevs)
2604 branches = set(repo[br].branch() for br in branchrevs)
2604 heads = [h for h in heads if h.branch() in branches]
2605 heads = [h for h in heads if h.branch() in branches]
2605
2606
2606 if opts.get('active') and branchrevs:
2607 if opts.get('active') and branchrevs:
2607 dagheads = repo.heads(start)
2608 dagheads = repo.heads(start)
2608 heads = [h for h in heads if h.node() in dagheads]
2609 heads = [h for h in heads if h.node() in dagheads]
2609
2610
2610 if branchrevs:
2611 if branchrevs:
2611 haveheads = set(h.branch() for h in heads)
2612 haveheads = set(h.branch() for h in heads)
2612 if branches - haveheads:
2613 if branches - haveheads:
2613 headless = ', '.join(b for b in branches - haveheads)
2614 headless = ', '.join(b for b in branches - haveheads)
2614 msg = _('no open branch heads found on branches %s')
2615 msg = _('no open branch heads found on branches %s')
2615 if opts.get('rev'):
2616 if opts.get('rev'):
2616 msg += _(' (started at %s)') % opts['rev']
2617 msg += _(' (started at %s)') % opts['rev']
2617 ui.warn((msg + '\n') % headless)
2618 ui.warn((msg + '\n') % headless)
2618
2619
2619 if not heads:
2620 if not heads:
2620 return 1
2621 return 1
2621
2622
2622 ui.pager('heads')
2623 ui.pager('heads')
2623 heads = sorted(heads, key=lambda x: -x.rev())
2624 heads = sorted(heads, key=lambda x: -x.rev())
2624 displayer = cmdutil.show_changeset(ui, repo, opts)
2625 displayer = cmdutil.show_changeset(ui, repo, opts)
2625 for ctx in heads:
2626 for ctx in heads:
2626 displayer.show(ctx)
2627 displayer.show(ctx)
2627 displayer.close()
2628 displayer.close()
2628
2629
2629 @command('help',
2630 @command('help',
2630 [('e', 'extension', None, _('show only help for extensions')),
2631 [('e', 'extension', None, _('show only help for extensions')),
2631 ('c', 'command', None, _('show only help for commands')),
2632 ('c', 'command', None, _('show only help for commands')),
2632 ('k', 'keyword', None, _('show topics matching keyword')),
2633 ('k', 'keyword', None, _('show topics matching keyword')),
2633 ('s', 'system', [], _('show help for specific platform(s)')),
2634 ('s', 'system', [], _('show help for specific platform(s)')),
2634 ],
2635 ],
2635 _('[-ecks] [TOPIC]'),
2636 _('[-ecks] [TOPIC]'),
2636 norepo=True)
2637 norepo=True, cmdtype=readonly)
2637 def help_(ui, name=None, **opts):
2638 def help_(ui, name=None, **opts):
2638 """show help for a given topic or a help overview
2639 """show help for a given topic or a help overview
2639
2640
2640 With no arguments, print a list of commands with short help messages.
2641 With no arguments, print a list of commands with short help messages.
2641
2642
2642 Given a topic, extension, or command name, print help for that
2643 Given a topic, extension, or command name, print help for that
2643 topic.
2644 topic.
2644
2645
2645 Returns 0 if successful.
2646 Returns 0 if successful.
2646 """
2647 """
2647
2648
2648 keep = opts.get(r'system') or []
2649 keep = opts.get(r'system') or []
2649 if len(keep) == 0:
2650 if len(keep) == 0:
2650 if pycompat.sysplatform.startswith('win'):
2651 if pycompat.sysplatform.startswith('win'):
2651 keep.append('windows')
2652 keep.append('windows')
2652 elif pycompat.sysplatform == 'OpenVMS':
2653 elif pycompat.sysplatform == 'OpenVMS':
2653 keep.append('vms')
2654 keep.append('vms')
2654 elif pycompat.sysplatform == 'plan9':
2655 elif pycompat.sysplatform == 'plan9':
2655 keep.append('plan9')
2656 keep.append('plan9')
2656 else:
2657 else:
2657 keep.append('unix')
2658 keep.append('unix')
2658 keep.append(pycompat.sysplatform.lower())
2659 keep.append(pycompat.sysplatform.lower())
2659 if ui.verbose:
2660 if ui.verbose:
2660 keep.append('verbose')
2661 keep.append('verbose')
2661
2662
2662 commands = sys.modules[__name__]
2663 commands = sys.modules[__name__]
2663 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2664 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2664 ui.pager('help')
2665 ui.pager('help')
2665 ui.write(formatted)
2666 ui.write(formatted)
2666
2667
2667
2668
2668 @command('identify|id',
2669 @command('identify|id',
2669 [('r', 'rev', '',
2670 [('r', 'rev', '',
2670 _('identify the specified revision'), _('REV')),
2671 _('identify the specified revision'), _('REV')),
2671 ('n', 'num', None, _('show local revision number')),
2672 ('n', 'num', None, _('show local revision number')),
2672 ('i', 'id', None, _('show global revision id')),
2673 ('i', 'id', None, _('show global revision id')),
2673 ('b', 'branch', None, _('show branch')),
2674 ('b', 'branch', None, _('show branch')),
2674 ('t', 'tags', None, _('show tags')),
2675 ('t', 'tags', None, _('show tags')),
2675 ('B', 'bookmarks', None, _('show bookmarks')),
2676 ('B', 'bookmarks', None, _('show bookmarks')),
2676 ] + remoteopts + formatteropts,
2677 ] + remoteopts + formatteropts,
2677 _('[-nibtB] [-r REV] [SOURCE]'),
2678 _('[-nibtB] [-r REV] [SOURCE]'),
2678 optionalrepo=True)
2679 optionalrepo=True, cmdtype=readonly)
2679 def identify(ui, repo, source=None, rev=None,
2680 def identify(ui, repo, source=None, rev=None,
2680 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2681 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2681 """identify the working directory or specified revision
2682 """identify the working directory or specified revision
2682
2683
2683 Print a summary identifying the repository state at REV using one or
2684 Print a summary identifying the repository state at REV using one or
2684 two parent hash identifiers, followed by a "+" if the working
2685 two parent hash identifiers, followed by a "+" if the working
2685 directory has uncommitted changes, the branch name (if not default),
2686 directory has uncommitted changes, the branch name (if not default),
2686 a list of tags, and a list of bookmarks.
2687 a list of tags, and a list of bookmarks.
2687
2688
2688 When REV is not given, print a summary of the current state of the
2689 When REV is not given, print a summary of the current state of the
2689 repository.
2690 repository.
2690
2691
2691 Specifying a path to a repository root or Mercurial bundle will
2692 Specifying a path to a repository root or Mercurial bundle will
2692 cause lookup to operate on that repository/bundle.
2693 cause lookup to operate on that repository/bundle.
2693
2694
2694 .. container:: verbose
2695 .. container:: verbose
2695
2696
2696 Examples:
2697 Examples:
2697
2698
2698 - generate a build identifier for the working directory::
2699 - generate a build identifier for the working directory::
2699
2700
2700 hg id --id > build-id.dat
2701 hg id --id > build-id.dat
2701
2702
2702 - find the revision corresponding to a tag::
2703 - find the revision corresponding to a tag::
2703
2704
2704 hg id -n -r 1.3
2705 hg id -n -r 1.3
2705
2706
2706 - check the most recent revision of a remote repository::
2707 - check the most recent revision of a remote repository::
2707
2708
2708 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2709 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2709
2710
2710 See :hg:`log` for generating more information about specific revisions,
2711 See :hg:`log` for generating more information about specific revisions,
2711 including full hash identifiers.
2712 including full hash identifiers.
2712
2713
2713 Returns 0 if successful.
2714 Returns 0 if successful.
2714 """
2715 """
2715
2716
2716 opts = pycompat.byteskwargs(opts)
2717 opts = pycompat.byteskwargs(opts)
2717 if not repo and not source:
2718 if not repo and not source:
2718 raise error.Abort(_("there is no Mercurial repository here "
2719 raise error.Abort(_("there is no Mercurial repository here "
2719 "(.hg not found)"))
2720 "(.hg not found)"))
2720
2721
2721 if ui.debugflag:
2722 if ui.debugflag:
2722 hexfunc = hex
2723 hexfunc = hex
2723 else:
2724 else:
2724 hexfunc = short
2725 hexfunc = short
2725 default = not (num or id or branch or tags or bookmarks)
2726 default = not (num or id or branch or tags or bookmarks)
2726 output = []
2727 output = []
2727 revs = []
2728 revs = []
2728
2729
2729 if source:
2730 if source:
2730 source, branches = hg.parseurl(ui.expandpath(source))
2731 source, branches = hg.parseurl(ui.expandpath(source))
2731 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2732 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2732 repo = peer.local()
2733 repo = peer.local()
2733 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2734 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2734
2735
2735 fm = ui.formatter('identify', opts)
2736 fm = ui.formatter('identify', opts)
2736 fm.startitem()
2737 fm.startitem()
2737
2738
2738 if not repo:
2739 if not repo:
2739 if num or branch or tags:
2740 if num or branch or tags:
2740 raise error.Abort(
2741 raise error.Abort(
2741 _("can't query remote revision number, branch, or tags"))
2742 _("can't query remote revision number, branch, or tags"))
2742 if not rev and revs:
2743 if not rev and revs:
2743 rev = revs[0]
2744 rev = revs[0]
2744 if not rev:
2745 if not rev:
2745 rev = "tip"
2746 rev = "tip"
2746
2747
2747 remoterev = peer.lookup(rev)
2748 remoterev = peer.lookup(rev)
2748 hexrev = hexfunc(remoterev)
2749 hexrev = hexfunc(remoterev)
2749 if default or id:
2750 if default or id:
2750 output = [hexrev]
2751 output = [hexrev]
2751 fm.data(id=hexrev)
2752 fm.data(id=hexrev)
2752
2753
2753 def getbms():
2754 def getbms():
2754 bms = []
2755 bms = []
2755
2756
2756 if 'bookmarks' in peer.listkeys('namespaces'):
2757 if 'bookmarks' in peer.listkeys('namespaces'):
2757 hexremoterev = hex(remoterev)
2758 hexremoterev = hex(remoterev)
2758 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2759 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2759 if bmr == hexremoterev]
2760 if bmr == hexremoterev]
2760
2761
2761 return sorted(bms)
2762 return sorted(bms)
2762
2763
2763 bms = getbms()
2764 bms = getbms()
2764 if bookmarks:
2765 if bookmarks:
2765 output.extend(bms)
2766 output.extend(bms)
2766 elif default and not ui.quiet:
2767 elif default and not ui.quiet:
2767 # multiple bookmarks for a single parent separated by '/'
2768 # multiple bookmarks for a single parent separated by '/'
2768 bm = '/'.join(bms)
2769 bm = '/'.join(bms)
2769 if bm:
2770 if bm:
2770 output.append(bm)
2771 output.append(bm)
2771
2772
2772 fm.data(node=hex(remoterev))
2773 fm.data(node=hex(remoterev))
2773 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2774 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2774 else:
2775 else:
2775 ctx = scmutil.revsingle(repo, rev, None)
2776 ctx = scmutil.revsingle(repo, rev, None)
2776
2777
2777 if ctx.rev() is None:
2778 if ctx.rev() is None:
2778 ctx = repo[None]
2779 ctx = repo[None]
2779 parents = ctx.parents()
2780 parents = ctx.parents()
2780 taglist = []
2781 taglist = []
2781 for p in parents:
2782 for p in parents:
2782 taglist.extend(p.tags())
2783 taglist.extend(p.tags())
2783
2784
2784 dirty = ""
2785 dirty = ""
2785 if ctx.dirty(missing=True, merge=False, branch=False):
2786 if ctx.dirty(missing=True, merge=False, branch=False):
2786 dirty = '+'
2787 dirty = '+'
2787 fm.data(dirty=dirty)
2788 fm.data(dirty=dirty)
2788
2789
2789 hexoutput = [hexfunc(p.node()) for p in parents]
2790 hexoutput = [hexfunc(p.node()) for p in parents]
2790 if default or id:
2791 if default or id:
2791 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2792 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2792 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2793 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2793
2794
2794 if num:
2795 if num:
2795 numoutput = ["%d" % p.rev() for p in parents]
2796 numoutput = ["%d" % p.rev() for p in parents]
2796 output.append("%s%s" % ('+'.join(numoutput), dirty))
2797 output.append("%s%s" % ('+'.join(numoutput), dirty))
2797
2798
2798 fn = fm.nested('parents')
2799 fn = fm.nested('parents')
2799 for p in parents:
2800 for p in parents:
2800 fn.startitem()
2801 fn.startitem()
2801 fn.data(rev=p.rev())
2802 fn.data(rev=p.rev())
2802 fn.data(node=p.hex())
2803 fn.data(node=p.hex())
2803 fn.context(ctx=p)
2804 fn.context(ctx=p)
2804 fn.end()
2805 fn.end()
2805 else:
2806 else:
2806 hexoutput = hexfunc(ctx.node())
2807 hexoutput = hexfunc(ctx.node())
2807 if default or id:
2808 if default or id:
2808 output = [hexoutput]
2809 output = [hexoutput]
2809 fm.data(id=hexoutput)
2810 fm.data(id=hexoutput)
2810
2811
2811 if num:
2812 if num:
2812 output.append(pycompat.bytestr(ctx.rev()))
2813 output.append(pycompat.bytestr(ctx.rev()))
2813 taglist = ctx.tags()
2814 taglist = ctx.tags()
2814
2815
2815 if default and not ui.quiet:
2816 if default and not ui.quiet:
2816 b = ctx.branch()
2817 b = ctx.branch()
2817 if b != 'default':
2818 if b != 'default':
2818 output.append("(%s)" % b)
2819 output.append("(%s)" % b)
2819
2820
2820 # multiple tags for a single parent separated by '/'
2821 # multiple tags for a single parent separated by '/'
2821 t = '/'.join(taglist)
2822 t = '/'.join(taglist)
2822 if t:
2823 if t:
2823 output.append(t)
2824 output.append(t)
2824
2825
2825 # multiple bookmarks for a single parent separated by '/'
2826 # multiple bookmarks for a single parent separated by '/'
2826 bm = '/'.join(ctx.bookmarks())
2827 bm = '/'.join(ctx.bookmarks())
2827 if bm:
2828 if bm:
2828 output.append(bm)
2829 output.append(bm)
2829 else:
2830 else:
2830 if branch:
2831 if branch:
2831 output.append(ctx.branch())
2832 output.append(ctx.branch())
2832
2833
2833 if tags:
2834 if tags:
2834 output.extend(taglist)
2835 output.extend(taglist)
2835
2836
2836 if bookmarks:
2837 if bookmarks:
2837 output.extend(ctx.bookmarks())
2838 output.extend(ctx.bookmarks())
2838
2839
2839 fm.data(node=ctx.hex())
2840 fm.data(node=ctx.hex())
2840 fm.data(branch=ctx.branch())
2841 fm.data(branch=ctx.branch())
2841 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2842 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2842 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2843 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2843 fm.context(ctx=ctx)
2844 fm.context(ctx=ctx)
2844
2845
2845 fm.plain("%s\n" % ' '.join(output))
2846 fm.plain("%s\n" % ' '.join(output))
2846 fm.end()
2847 fm.end()
2847
2848
2848 @command('import|patch',
2849 @command('import|patch',
2849 [('p', 'strip', 1,
2850 [('p', 'strip', 1,
2850 _('directory strip option for patch. This has the same '
2851 _('directory strip option for patch. This has the same '
2851 'meaning as the corresponding patch option'), _('NUM')),
2852 'meaning as the corresponding patch option'), _('NUM')),
2852 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2853 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2853 ('e', 'edit', False, _('invoke editor on commit messages')),
2854 ('e', 'edit', False, _('invoke editor on commit messages')),
2854 ('f', 'force', None,
2855 ('f', 'force', None,
2855 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2856 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2856 ('', 'no-commit', None,
2857 ('', 'no-commit', None,
2857 _("don't commit, just update the working directory")),
2858 _("don't commit, just update the working directory")),
2858 ('', 'bypass', None,
2859 ('', 'bypass', None,
2859 _("apply patch without touching the working directory")),
2860 _("apply patch without touching the working directory")),
2860 ('', 'partial', None,
2861 ('', 'partial', None,
2861 _('commit even if some hunks fail')),
2862 _('commit even if some hunks fail')),
2862 ('', 'exact', None,
2863 ('', 'exact', None,
2863 _('abort if patch would apply lossily')),
2864 _('abort if patch would apply lossily')),
2864 ('', 'prefix', '',
2865 ('', 'prefix', '',
2865 _('apply patch to subdirectory'), _('DIR')),
2866 _('apply patch to subdirectory'), _('DIR')),
2866 ('', 'import-branch', None,
2867 ('', 'import-branch', None,
2867 _('use any branch information in patch (implied by --exact)'))] +
2868 _('use any branch information in patch (implied by --exact)'))] +
2868 commitopts + commitopts2 + similarityopts,
2869 commitopts + commitopts2 + similarityopts,
2869 _('[OPTION]... PATCH...'))
2870 _('[OPTION]... PATCH...'))
2870 def import_(ui, repo, patch1=None, *patches, **opts):
2871 def import_(ui, repo, patch1=None, *patches, **opts):
2871 """import an ordered set of patches
2872 """import an ordered set of patches
2872
2873
2873 Import a list of patches and commit them individually (unless
2874 Import a list of patches and commit them individually (unless
2874 --no-commit is specified).
2875 --no-commit is specified).
2875
2876
2876 To read a patch from standard input (stdin), use "-" as the patch
2877 To read a patch from standard input (stdin), use "-" as the patch
2877 name. If a URL is specified, the patch will be downloaded from
2878 name. If a URL is specified, the patch will be downloaded from
2878 there.
2879 there.
2879
2880
2880 Import first applies changes to the working directory (unless
2881 Import first applies changes to the working directory (unless
2881 --bypass is specified), import will abort if there are outstanding
2882 --bypass is specified), import will abort if there are outstanding
2882 changes.
2883 changes.
2883
2884
2884 Use --bypass to apply and commit patches directly to the
2885 Use --bypass to apply and commit patches directly to the
2885 repository, without affecting the working directory. Without
2886 repository, without affecting the working directory. Without
2886 --exact, patches will be applied on top of the working directory
2887 --exact, patches will be applied on top of the working directory
2887 parent revision.
2888 parent revision.
2888
2889
2889 You can import a patch straight from a mail message. Even patches
2890 You can import a patch straight from a mail message. Even patches
2890 as attachments work (to use the body part, it must have type
2891 as attachments work (to use the body part, it must have type
2891 text/plain or text/x-patch). From and Subject headers of email
2892 text/plain or text/x-patch). From and Subject headers of email
2892 message are used as default committer and commit message. All
2893 message are used as default committer and commit message. All
2893 text/plain body parts before first diff are added to the commit
2894 text/plain body parts before first diff are added to the commit
2894 message.
2895 message.
2895
2896
2896 If the imported patch was generated by :hg:`export`, user and
2897 If the imported patch was generated by :hg:`export`, user and
2897 description from patch override values from message headers and
2898 description from patch override values from message headers and
2898 body. Values given on command line with -m/--message and -u/--user
2899 body. Values given on command line with -m/--message and -u/--user
2899 override these.
2900 override these.
2900
2901
2901 If --exact is specified, import will set the working directory to
2902 If --exact is specified, import will set the working directory to
2902 the parent of each patch before applying it, and will abort if the
2903 the parent of each patch before applying it, and will abort if the
2903 resulting changeset has a different ID than the one recorded in
2904 resulting changeset has a different ID than the one recorded in
2904 the patch. This will guard against various ways that portable
2905 the patch. This will guard against various ways that portable
2905 patch formats and mail systems might fail to transfer Mercurial
2906 patch formats and mail systems might fail to transfer Mercurial
2906 data or metadata. See :hg:`bundle` for lossless transmission.
2907 data or metadata. See :hg:`bundle` for lossless transmission.
2907
2908
2908 Use --partial to ensure a changeset will be created from the patch
2909 Use --partial to ensure a changeset will be created from the patch
2909 even if some hunks fail to apply. Hunks that fail to apply will be
2910 even if some hunks fail to apply. Hunks that fail to apply will be
2910 written to a <target-file>.rej file. Conflicts can then be resolved
2911 written to a <target-file>.rej file. Conflicts can then be resolved
2911 by hand before :hg:`commit --amend` is run to update the created
2912 by hand before :hg:`commit --amend` is run to update the created
2912 changeset. This flag exists to let people import patches that
2913 changeset. This flag exists to let people import patches that
2913 partially apply without losing the associated metadata (author,
2914 partially apply without losing the associated metadata (author,
2914 date, description, ...).
2915 date, description, ...).
2915
2916
2916 .. note::
2917 .. note::
2917
2918
2918 When no hunks apply cleanly, :hg:`import --partial` will create
2919 When no hunks apply cleanly, :hg:`import --partial` will create
2919 an empty changeset, importing only the patch metadata.
2920 an empty changeset, importing only the patch metadata.
2920
2921
2921 With -s/--similarity, hg will attempt to discover renames and
2922 With -s/--similarity, hg will attempt to discover renames and
2922 copies in the patch in the same way as :hg:`addremove`.
2923 copies in the patch in the same way as :hg:`addremove`.
2923
2924
2924 It is possible to use external patch programs to perform the patch
2925 It is possible to use external patch programs to perform the patch
2925 by setting the ``ui.patch`` configuration option. For the default
2926 by setting the ``ui.patch`` configuration option. For the default
2926 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2927 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2927 See :hg:`help config` for more information about configuration
2928 See :hg:`help config` for more information about configuration
2928 files and how to use these options.
2929 files and how to use these options.
2929
2930
2930 See :hg:`help dates` for a list of formats valid for -d/--date.
2931 See :hg:`help dates` for a list of formats valid for -d/--date.
2931
2932
2932 .. container:: verbose
2933 .. container:: verbose
2933
2934
2934 Examples:
2935 Examples:
2935
2936
2936 - import a traditional patch from a website and detect renames::
2937 - import a traditional patch from a website and detect renames::
2937
2938
2938 hg import -s 80 http://example.com/bugfix.patch
2939 hg import -s 80 http://example.com/bugfix.patch
2939
2940
2940 - import a changeset from an hgweb server::
2941 - import a changeset from an hgweb server::
2941
2942
2942 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2943 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2943
2944
2944 - import all the patches in an Unix-style mbox::
2945 - import all the patches in an Unix-style mbox::
2945
2946
2946 hg import incoming-patches.mbox
2947 hg import incoming-patches.mbox
2947
2948
2948 - import patches from stdin::
2949 - import patches from stdin::
2949
2950
2950 hg import -
2951 hg import -
2951
2952
2952 - attempt to exactly restore an exported changeset (not always
2953 - attempt to exactly restore an exported changeset (not always
2953 possible)::
2954 possible)::
2954
2955
2955 hg import --exact proposed-fix.patch
2956 hg import --exact proposed-fix.patch
2956
2957
2957 - use an external tool to apply a patch which is too fuzzy for
2958 - use an external tool to apply a patch which is too fuzzy for
2958 the default internal tool.
2959 the default internal tool.
2959
2960
2960 hg import --config ui.patch="patch --merge" fuzzy.patch
2961 hg import --config ui.patch="patch --merge" fuzzy.patch
2961
2962
2962 - change the default fuzzing from 2 to a less strict 7
2963 - change the default fuzzing from 2 to a less strict 7
2963
2964
2964 hg import --config ui.fuzz=7 fuzz.patch
2965 hg import --config ui.fuzz=7 fuzz.patch
2965
2966
2966 Returns 0 on success, 1 on partial success (see --partial).
2967 Returns 0 on success, 1 on partial success (see --partial).
2967 """
2968 """
2968
2969
2969 opts = pycompat.byteskwargs(opts)
2970 opts = pycompat.byteskwargs(opts)
2970 if not patch1:
2971 if not patch1:
2971 raise error.Abort(_('need at least one patch to import'))
2972 raise error.Abort(_('need at least one patch to import'))
2972
2973
2973 patches = (patch1,) + patches
2974 patches = (patch1,) + patches
2974
2975
2975 date = opts.get('date')
2976 date = opts.get('date')
2976 if date:
2977 if date:
2977 opts['date'] = util.parsedate(date)
2978 opts['date'] = util.parsedate(date)
2978
2979
2979 exact = opts.get('exact')
2980 exact = opts.get('exact')
2980 update = not opts.get('bypass')
2981 update = not opts.get('bypass')
2981 if not update and opts.get('no_commit'):
2982 if not update and opts.get('no_commit'):
2982 raise error.Abort(_('cannot use --no-commit with --bypass'))
2983 raise error.Abort(_('cannot use --no-commit with --bypass'))
2983 try:
2984 try:
2984 sim = float(opts.get('similarity') or 0)
2985 sim = float(opts.get('similarity') or 0)
2985 except ValueError:
2986 except ValueError:
2986 raise error.Abort(_('similarity must be a number'))
2987 raise error.Abort(_('similarity must be a number'))
2987 if sim < 0 or sim > 100:
2988 if sim < 0 or sim > 100:
2988 raise error.Abort(_('similarity must be between 0 and 100'))
2989 raise error.Abort(_('similarity must be between 0 and 100'))
2989 if sim and not update:
2990 if sim and not update:
2990 raise error.Abort(_('cannot use --similarity with --bypass'))
2991 raise error.Abort(_('cannot use --similarity with --bypass'))
2991 if exact:
2992 if exact:
2992 if opts.get('edit'):
2993 if opts.get('edit'):
2993 raise error.Abort(_('cannot use --exact with --edit'))
2994 raise error.Abort(_('cannot use --exact with --edit'))
2994 if opts.get('prefix'):
2995 if opts.get('prefix'):
2995 raise error.Abort(_('cannot use --exact with --prefix'))
2996 raise error.Abort(_('cannot use --exact with --prefix'))
2996
2997
2997 base = opts["base"]
2998 base = opts["base"]
2998 wlock = dsguard = lock = tr = None
2999 wlock = dsguard = lock = tr = None
2999 msgs = []
3000 msgs = []
3000 ret = 0
3001 ret = 0
3001
3002
3002
3003
3003 try:
3004 try:
3004 wlock = repo.wlock()
3005 wlock = repo.wlock()
3005
3006
3006 if update:
3007 if update:
3007 cmdutil.checkunfinished(repo)
3008 cmdutil.checkunfinished(repo)
3008 if (exact or not opts.get('force')):
3009 if (exact or not opts.get('force')):
3009 cmdutil.bailifchanged(repo)
3010 cmdutil.bailifchanged(repo)
3010
3011
3011 if not opts.get('no_commit'):
3012 if not opts.get('no_commit'):
3012 lock = repo.lock()
3013 lock = repo.lock()
3013 tr = repo.transaction('import')
3014 tr = repo.transaction('import')
3014 else:
3015 else:
3015 dsguard = dirstateguard.dirstateguard(repo, 'import')
3016 dsguard = dirstateguard.dirstateguard(repo, 'import')
3016 parents = repo[None].parents()
3017 parents = repo[None].parents()
3017 for patchurl in patches:
3018 for patchurl in patches:
3018 if patchurl == '-':
3019 if patchurl == '-':
3019 ui.status(_('applying patch from stdin\n'))
3020 ui.status(_('applying patch from stdin\n'))
3020 patchfile = ui.fin
3021 patchfile = ui.fin
3021 patchurl = 'stdin' # for error message
3022 patchurl = 'stdin' # for error message
3022 else:
3023 else:
3023 patchurl = os.path.join(base, patchurl)
3024 patchurl = os.path.join(base, patchurl)
3024 ui.status(_('applying %s\n') % patchurl)
3025 ui.status(_('applying %s\n') % patchurl)
3025 patchfile = hg.openpath(ui, patchurl)
3026 patchfile = hg.openpath(ui, patchurl)
3026
3027
3027 haspatch = False
3028 haspatch = False
3028 for hunk in patch.split(patchfile):
3029 for hunk in patch.split(patchfile):
3029 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3030 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3030 parents, opts,
3031 parents, opts,
3031 msgs, hg.clean)
3032 msgs, hg.clean)
3032 if msg:
3033 if msg:
3033 haspatch = True
3034 haspatch = True
3034 ui.note(msg + '\n')
3035 ui.note(msg + '\n')
3035 if update or exact:
3036 if update or exact:
3036 parents = repo[None].parents()
3037 parents = repo[None].parents()
3037 else:
3038 else:
3038 parents = [repo[node]]
3039 parents = [repo[node]]
3039 if rej:
3040 if rej:
3040 ui.write_err(_("patch applied partially\n"))
3041 ui.write_err(_("patch applied partially\n"))
3041 ui.write_err(_("(fix the .rej files and run "
3042 ui.write_err(_("(fix the .rej files and run "
3042 "`hg commit --amend`)\n"))
3043 "`hg commit --amend`)\n"))
3043 ret = 1
3044 ret = 1
3044 break
3045 break
3045
3046
3046 if not haspatch:
3047 if not haspatch:
3047 raise error.Abort(_('%s: no diffs found') % patchurl)
3048 raise error.Abort(_('%s: no diffs found') % patchurl)
3048
3049
3049 if tr:
3050 if tr:
3050 tr.close()
3051 tr.close()
3051 if msgs:
3052 if msgs:
3052 repo.savecommitmessage('\n* * *\n'.join(msgs))
3053 repo.savecommitmessage('\n* * *\n'.join(msgs))
3053 if dsguard:
3054 if dsguard:
3054 dsguard.close()
3055 dsguard.close()
3055 return ret
3056 return ret
3056 finally:
3057 finally:
3057 if tr:
3058 if tr:
3058 tr.release()
3059 tr.release()
3059 release(lock, dsguard, wlock)
3060 release(lock, dsguard, wlock)
3060
3061
3061 @command('incoming|in',
3062 @command('incoming|in',
3062 [('f', 'force', None,
3063 [('f', 'force', None,
3063 _('run even if remote repository is unrelated')),
3064 _('run even if remote repository is unrelated')),
3064 ('n', 'newest-first', None, _('show newest record first')),
3065 ('n', 'newest-first', None, _('show newest record first')),
3065 ('', 'bundle', '',
3066 ('', 'bundle', '',
3066 _('file to store the bundles into'), _('FILE')),
3067 _('file to store the bundles into'), _('FILE')),
3067 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3068 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3068 ('B', 'bookmarks', False, _("compare bookmarks")),
3069 ('B', 'bookmarks', False, _("compare bookmarks")),
3069 ('b', 'branch', [],
3070 ('b', 'branch', [],
3070 _('a specific branch you would like to pull'), _('BRANCH')),
3071 _('a specific branch you would like to pull'), _('BRANCH')),
3071 ] + logopts + remoteopts + subrepoopts,
3072 ] + logopts + remoteopts + subrepoopts,
3072 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3073 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3073 def incoming(ui, repo, source="default", **opts):
3074 def incoming(ui, repo, source="default", **opts):
3074 """show new changesets found in source
3075 """show new changesets found in source
3075
3076
3076 Show new changesets found in the specified path/URL or the default
3077 Show new changesets found in the specified path/URL or the default
3077 pull location. These are the changesets that would have been pulled
3078 pull location. These are the changesets that would have been pulled
3078 by :hg:`pull` at the time you issued this command.
3079 by :hg:`pull` at the time you issued this command.
3079
3080
3080 See pull for valid source format details.
3081 See pull for valid source format details.
3081
3082
3082 .. container:: verbose
3083 .. container:: verbose
3083
3084
3084 With -B/--bookmarks, the result of bookmark comparison between
3085 With -B/--bookmarks, the result of bookmark comparison between
3085 local and remote repositories is displayed. With -v/--verbose,
3086 local and remote repositories is displayed. With -v/--verbose,
3086 status is also displayed for each bookmark like below::
3087 status is also displayed for each bookmark like below::
3087
3088
3088 BM1 01234567890a added
3089 BM1 01234567890a added
3089 BM2 1234567890ab advanced
3090 BM2 1234567890ab advanced
3090 BM3 234567890abc diverged
3091 BM3 234567890abc diverged
3091 BM4 34567890abcd changed
3092 BM4 34567890abcd changed
3092
3093
3093 The action taken locally when pulling depends on the
3094 The action taken locally when pulling depends on the
3094 status of each bookmark:
3095 status of each bookmark:
3095
3096
3096 :``added``: pull will create it
3097 :``added``: pull will create it
3097 :``advanced``: pull will update it
3098 :``advanced``: pull will update it
3098 :``diverged``: pull will create a divergent bookmark
3099 :``diverged``: pull will create a divergent bookmark
3099 :``changed``: result depends on remote changesets
3100 :``changed``: result depends on remote changesets
3100
3101
3101 From the point of view of pulling behavior, bookmark
3102 From the point of view of pulling behavior, bookmark
3102 existing only in the remote repository are treated as ``added``,
3103 existing only in the remote repository are treated as ``added``,
3103 even if it is in fact locally deleted.
3104 even if it is in fact locally deleted.
3104
3105
3105 .. container:: verbose
3106 .. container:: verbose
3106
3107
3107 For remote repository, using --bundle avoids downloading the
3108 For remote repository, using --bundle avoids downloading the
3108 changesets twice if the incoming is followed by a pull.
3109 changesets twice if the incoming is followed by a pull.
3109
3110
3110 Examples:
3111 Examples:
3111
3112
3112 - show incoming changes with patches and full description::
3113 - show incoming changes with patches and full description::
3113
3114
3114 hg incoming -vp
3115 hg incoming -vp
3115
3116
3116 - show incoming changes excluding merges, store a bundle::
3117 - show incoming changes excluding merges, store a bundle::
3117
3118
3118 hg in -vpM --bundle incoming.hg
3119 hg in -vpM --bundle incoming.hg
3119 hg pull incoming.hg
3120 hg pull incoming.hg
3120
3121
3121 - briefly list changes inside a bundle::
3122 - briefly list changes inside a bundle::
3122
3123
3123 hg in changes.hg -T "{desc|firstline}\\n"
3124 hg in changes.hg -T "{desc|firstline}\\n"
3124
3125
3125 Returns 0 if there are incoming changes, 1 otherwise.
3126 Returns 0 if there are incoming changes, 1 otherwise.
3126 """
3127 """
3127 opts = pycompat.byteskwargs(opts)
3128 opts = pycompat.byteskwargs(opts)
3128 if opts.get('graph'):
3129 if opts.get('graph'):
3129 cmdutil.checkunsupportedgraphflags([], opts)
3130 cmdutil.checkunsupportedgraphflags([], opts)
3130 def display(other, chlist, displayer):
3131 def display(other, chlist, displayer):
3131 revdag = cmdutil.graphrevs(other, chlist, opts)
3132 revdag = cmdutil.graphrevs(other, chlist, opts)
3132 cmdutil.displaygraph(ui, repo, revdag, displayer,
3133 cmdutil.displaygraph(ui, repo, revdag, displayer,
3133 graphmod.asciiedges)
3134 graphmod.asciiedges)
3134
3135
3135 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3136 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3136 return 0
3137 return 0
3137
3138
3138 if opts.get('bundle') and opts.get('subrepos'):
3139 if opts.get('bundle') and opts.get('subrepos'):
3139 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3140 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3140
3141
3141 if opts.get('bookmarks'):
3142 if opts.get('bookmarks'):
3142 source, branches = hg.parseurl(ui.expandpath(source),
3143 source, branches = hg.parseurl(ui.expandpath(source),
3143 opts.get('branch'))
3144 opts.get('branch'))
3144 other = hg.peer(repo, opts, source)
3145 other = hg.peer(repo, opts, source)
3145 if 'bookmarks' not in other.listkeys('namespaces'):
3146 if 'bookmarks' not in other.listkeys('namespaces'):
3146 ui.warn(_("remote doesn't support bookmarks\n"))
3147 ui.warn(_("remote doesn't support bookmarks\n"))
3147 return 0
3148 return 0
3148 ui.pager('incoming')
3149 ui.pager('incoming')
3149 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3150 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3150 return bookmarks.incoming(ui, repo, other)
3151 return bookmarks.incoming(ui, repo, other)
3151
3152
3152 repo._subtoppath = ui.expandpath(source)
3153 repo._subtoppath = ui.expandpath(source)
3153 try:
3154 try:
3154 return hg.incoming(ui, repo, source, opts)
3155 return hg.incoming(ui, repo, source, opts)
3155 finally:
3156 finally:
3156 del repo._subtoppath
3157 del repo._subtoppath
3157
3158
3158
3159
3159 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3160 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3160 norepo=True)
3161 norepo=True)
3161 def init(ui, dest=".", **opts):
3162 def init(ui, dest=".", **opts):
3162 """create a new repository in the given directory
3163 """create a new repository in the given directory
3163
3164
3164 Initialize a new repository in the given directory. If the given
3165 Initialize a new repository in the given directory. If the given
3165 directory does not exist, it will be created.
3166 directory does not exist, it will be created.
3166
3167
3167 If no directory is given, the current directory is used.
3168 If no directory is given, the current directory is used.
3168
3169
3169 It is possible to specify an ``ssh://`` URL as the destination.
3170 It is possible to specify an ``ssh://`` URL as the destination.
3170 See :hg:`help urls` for more information.
3171 See :hg:`help urls` for more information.
3171
3172
3172 Returns 0 on success.
3173 Returns 0 on success.
3173 """
3174 """
3174 opts = pycompat.byteskwargs(opts)
3175 opts = pycompat.byteskwargs(opts)
3175 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3176 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3176
3177
3177 @command('locate',
3178 @command('locate',
3178 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3179 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3179 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3180 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3180 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3181 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3181 ] + walkopts,
3182 ] + walkopts,
3182 _('[OPTION]... [PATTERN]...'))
3183 _('[OPTION]... [PATTERN]...'))
3183 def locate(ui, repo, *pats, **opts):
3184 def locate(ui, repo, *pats, **opts):
3184 """locate files matching specific patterns (DEPRECATED)
3185 """locate files matching specific patterns (DEPRECATED)
3185
3186
3186 Print files under Mercurial control in the working directory whose
3187 Print files under Mercurial control in the working directory whose
3187 names match the given patterns.
3188 names match the given patterns.
3188
3189
3189 By default, this command searches all directories in the working
3190 By default, this command searches all directories in the working
3190 directory. To search just the current directory and its
3191 directory. To search just the current directory and its
3191 subdirectories, use "--include .".
3192 subdirectories, use "--include .".
3192
3193
3193 If no patterns are given to match, this command prints the names
3194 If no patterns are given to match, this command prints the names
3194 of all files under Mercurial control in the working directory.
3195 of all files under Mercurial control in the working directory.
3195
3196
3196 If you want to feed the output of this command into the "xargs"
3197 If you want to feed the output of this command into the "xargs"
3197 command, use the -0 option to both this command and "xargs". This
3198 command, use the -0 option to both this command and "xargs". This
3198 will avoid the problem of "xargs" treating single filenames that
3199 will avoid the problem of "xargs" treating single filenames that
3199 contain whitespace as multiple filenames.
3200 contain whitespace as multiple filenames.
3200
3201
3201 See :hg:`help files` for a more versatile command.
3202 See :hg:`help files` for a more versatile command.
3202
3203
3203 Returns 0 if a match is found, 1 otherwise.
3204 Returns 0 if a match is found, 1 otherwise.
3204 """
3205 """
3205 opts = pycompat.byteskwargs(opts)
3206 opts = pycompat.byteskwargs(opts)
3206 if opts.get('print0'):
3207 if opts.get('print0'):
3207 end = '\0'
3208 end = '\0'
3208 else:
3209 else:
3209 end = '\n'
3210 end = '\n'
3210 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3211 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3211
3212
3212 ret = 1
3213 ret = 1
3213 ctx = repo[rev]
3214 ctx = repo[rev]
3214 m = scmutil.match(ctx, pats, opts, default='relglob',
3215 m = scmutil.match(ctx, pats, opts, default='relglob',
3215 badfn=lambda x, y: False)
3216 badfn=lambda x, y: False)
3216
3217
3217 ui.pager('locate')
3218 ui.pager('locate')
3218 for abs in ctx.matches(m):
3219 for abs in ctx.matches(m):
3219 if opts.get('fullpath'):
3220 if opts.get('fullpath'):
3220 ui.write(repo.wjoin(abs), end)
3221 ui.write(repo.wjoin(abs), end)
3221 else:
3222 else:
3222 ui.write(((pats and m.rel(abs)) or abs), end)
3223 ui.write(((pats and m.rel(abs)) or abs), end)
3223 ret = 0
3224 ret = 0
3224
3225
3225 return ret
3226 return ret
3226
3227
3227 @command('^log|history',
3228 @command('^log|history',
3228 [('f', 'follow', None,
3229 [('f', 'follow', None,
3229 _('follow changeset history, or file history across copies and renames')),
3230 _('follow changeset history, or file history across copies and renames')),
3230 ('', 'follow-first', None,
3231 ('', 'follow-first', None,
3231 _('only follow the first parent of merge changesets (DEPRECATED)')),
3232 _('only follow the first parent of merge changesets (DEPRECATED)')),
3232 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3233 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3233 ('C', 'copies', None, _('show copied files')),
3234 ('C', 'copies', None, _('show copied files')),
3234 ('k', 'keyword', [],
3235 ('k', 'keyword', [],
3235 _('do case-insensitive search for a given text'), _('TEXT')),
3236 _('do case-insensitive search for a given text'), _('TEXT')),
3236 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3237 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3237 ('L', 'line-range', [],
3238 ('L', 'line-range', [],
3238 _('follow line range of specified file (EXPERIMENTAL)'),
3239 _('follow line range of specified file (EXPERIMENTAL)'),
3239 _('FILE,RANGE')),
3240 _('FILE,RANGE')),
3240 ('', 'removed', None, _('include revisions where files were removed')),
3241 ('', 'removed', None, _('include revisions where files were removed')),
3241 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3242 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3242 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3243 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3243 ('', 'only-branch', [],
3244 ('', 'only-branch', [],
3244 _('show only changesets within the given named branch (DEPRECATED)'),
3245 _('show only changesets within the given named branch (DEPRECATED)'),
3245 _('BRANCH')),
3246 _('BRANCH')),
3246 ('b', 'branch', [],
3247 ('b', 'branch', [],
3247 _('show changesets within the given named branch'), _('BRANCH')),
3248 _('show changesets within the given named branch'), _('BRANCH')),
3248 ('P', 'prune', [],
3249 ('P', 'prune', [],
3249 _('do not display revision or any of its ancestors'), _('REV')),
3250 _('do not display revision or any of its ancestors'), _('REV')),
3250 ] + logopts + walkopts,
3251 ] + logopts + walkopts,
3251 _('[OPTION]... [FILE]'),
3252 _('[OPTION]... [FILE]'),
3252 inferrepo=True)
3253 inferrepo=True, cmdtype=readonly)
3253 def log(ui, repo, *pats, **opts):
3254 def log(ui, repo, *pats, **opts):
3254 """show revision history of entire repository or files
3255 """show revision history of entire repository or files
3255
3256
3256 Print the revision history of the specified files or the entire
3257 Print the revision history of the specified files or the entire
3257 project.
3258 project.
3258
3259
3259 If no revision range is specified, the default is ``tip:0`` unless
3260 If no revision range is specified, the default is ``tip:0`` unless
3260 --follow is set, in which case the working directory parent is
3261 --follow is set, in which case the working directory parent is
3261 used as the starting revision.
3262 used as the starting revision.
3262
3263
3263 File history is shown without following rename or copy history of
3264 File history is shown without following rename or copy history of
3264 files. Use -f/--follow with a filename to follow history across
3265 files. Use -f/--follow with a filename to follow history across
3265 renames and copies. --follow without a filename will only show
3266 renames and copies. --follow without a filename will only show
3266 ancestors or descendants of the starting revision.
3267 ancestors or descendants of the starting revision.
3267
3268
3268 By default this command prints revision number and changeset id,
3269 By default this command prints revision number and changeset id,
3269 tags, non-trivial parents, user, date and time, and a summary for
3270 tags, non-trivial parents, user, date and time, and a summary for
3270 each commit. When the -v/--verbose switch is used, the list of
3271 each commit. When the -v/--verbose switch is used, the list of
3271 changed files and full commit message are shown.
3272 changed files and full commit message are shown.
3272
3273
3273 With --graph the revisions are shown as an ASCII art DAG with the most
3274 With --graph the revisions are shown as an ASCII art DAG with the most
3274 recent changeset at the top.
3275 recent changeset at the top.
3275 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3276 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3276 and '+' represents a fork where the changeset from the lines below is a
3277 and '+' represents a fork where the changeset from the lines below is a
3277 parent of the 'o' merge on the same line.
3278 parent of the 'o' merge on the same line.
3278 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3279 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3279 of a '|' indicates one or more revisions in a path are omitted.
3280 of a '|' indicates one or more revisions in a path are omitted.
3280
3281
3281 .. container:: verbose
3282 .. container:: verbose
3282
3283
3283 Use -L/--line-range FILE,M:N options to follow the history of lines
3284 Use -L/--line-range FILE,M:N options to follow the history of lines
3284 from M to N in FILE. With -p/--patch only diff hunks affecting
3285 from M to N in FILE. With -p/--patch only diff hunks affecting
3285 specified line range will be shown. This option requires --follow;
3286 specified line range will be shown. This option requires --follow;
3286 it can be specified multiple times. Currently, this option is not
3287 it can be specified multiple times. Currently, this option is not
3287 compatible with --graph. This option is experimental.
3288 compatible with --graph. This option is experimental.
3288
3289
3289 .. note::
3290 .. note::
3290
3291
3291 :hg:`log --patch` may generate unexpected diff output for merge
3292 :hg:`log --patch` may generate unexpected diff output for merge
3292 changesets, as it will only compare the merge changeset against
3293 changesets, as it will only compare the merge changeset against
3293 its first parent. Also, only files different from BOTH parents
3294 its first parent. Also, only files different from BOTH parents
3294 will appear in files:.
3295 will appear in files:.
3295
3296
3296 .. note::
3297 .. note::
3297
3298
3298 For performance reasons, :hg:`log FILE` may omit duplicate changes
3299 For performance reasons, :hg:`log FILE` may omit duplicate changes
3299 made on branches and will not show removals or mode changes. To
3300 made on branches and will not show removals or mode changes. To
3300 see all such changes, use the --removed switch.
3301 see all such changes, use the --removed switch.
3301
3302
3302 .. container:: verbose
3303 .. container:: verbose
3303
3304
3304 .. note::
3305 .. note::
3305
3306
3306 The history resulting from -L/--line-range options depends on diff
3307 The history resulting from -L/--line-range options depends on diff
3307 options; for instance if white-spaces are ignored, respective changes
3308 options; for instance if white-spaces are ignored, respective changes
3308 with only white-spaces in specified line range will not be listed.
3309 with only white-spaces in specified line range will not be listed.
3309
3310
3310 .. container:: verbose
3311 .. container:: verbose
3311
3312
3312 Some examples:
3313 Some examples:
3313
3314
3314 - changesets with full descriptions and file lists::
3315 - changesets with full descriptions and file lists::
3315
3316
3316 hg log -v
3317 hg log -v
3317
3318
3318 - changesets ancestral to the working directory::
3319 - changesets ancestral to the working directory::
3319
3320
3320 hg log -f
3321 hg log -f
3321
3322
3322 - last 10 commits on the current branch::
3323 - last 10 commits on the current branch::
3323
3324
3324 hg log -l 10 -b .
3325 hg log -l 10 -b .
3325
3326
3326 - changesets showing all modifications of a file, including removals::
3327 - changesets showing all modifications of a file, including removals::
3327
3328
3328 hg log --removed file.c
3329 hg log --removed file.c
3329
3330
3330 - all changesets that touch a directory, with diffs, excluding merges::
3331 - all changesets that touch a directory, with diffs, excluding merges::
3331
3332
3332 hg log -Mp lib/
3333 hg log -Mp lib/
3333
3334
3334 - all revision numbers that match a keyword::
3335 - all revision numbers that match a keyword::
3335
3336
3336 hg log -k bug --template "{rev}\\n"
3337 hg log -k bug --template "{rev}\\n"
3337
3338
3338 - the full hash identifier of the working directory parent::
3339 - the full hash identifier of the working directory parent::
3339
3340
3340 hg log -r . --template "{node}\\n"
3341 hg log -r . --template "{node}\\n"
3341
3342
3342 - list available log templates::
3343 - list available log templates::
3343
3344
3344 hg log -T list
3345 hg log -T list
3345
3346
3346 - check if a given changeset is included in a tagged release::
3347 - check if a given changeset is included in a tagged release::
3347
3348
3348 hg log -r "a21ccf and ancestor(1.9)"
3349 hg log -r "a21ccf and ancestor(1.9)"
3349
3350
3350 - find all changesets by some user in a date range::
3351 - find all changesets by some user in a date range::
3351
3352
3352 hg log -k alice -d "may 2008 to jul 2008"
3353 hg log -k alice -d "may 2008 to jul 2008"
3353
3354
3354 - summary of all changesets after the last tag::
3355 - summary of all changesets after the last tag::
3355
3356
3356 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3357 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3357
3358
3358 - changesets touching lines 13 to 23 for file.c::
3359 - changesets touching lines 13 to 23 for file.c::
3359
3360
3360 hg log -L file.c,13:23
3361 hg log -L file.c,13:23
3361
3362
3362 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3363 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3363 main.c with patch::
3364 main.c with patch::
3364
3365
3365 hg log -L file.c,13:23 -L main.c,2:6 -p
3366 hg log -L file.c,13:23 -L main.c,2:6 -p
3366
3367
3367 See :hg:`help dates` for a list of formats valid for -d/--date.
3368 See :hg:`help dates` for a list of formats valid for -d/--date.
3368
3369
3369 See :hg:`help revisions` for more about specifying and ordering
3370 See :hg:`help revisions` for more about specifying and ordering
3370 revisions.
3371 revisions.
3371
3372
3372 See :hg:`help templates` for more about pre-packaged styles and
3373 See :hg:`help templates` for more about pre-packaged styles and
3373 specifying custom templates. The default template used by the log
3374 specifying custom templates. The default template used by the log
3374 command can be customized via the ``ui.logtemplate`` configuration
3375 command can be customized via the ``ui.logtemplate`` configuration
3375 setting.
3376 setting.
3376
3377
3377 Returns 0 on success.
3378 Returns 0 on success.
3378
3379
3379 """
3380 """
3380 opts = pycompat.byteskwargs(opts)
3381 opts = pycompat.byteskwargs(opts)
3381 linerange = opts.get('line_range')
3382 linerange = opts.get('line_range')
3382
3383
3383 if linerange and not opts.get('follow'):
3384 if linerange and not opts.get('follow'):
3384 raise error.Abort(_('--line-range requires --follow'))
3385 raise error.Abort(_('--line-range requires --follow'))
3385
3386
3386 if linerange and pats:
3387 if linerange and pats:
3387 raise error.Abort(
3388 raise error.Abort(
3388 _('FILE arguments are not compatible with --line-range option')
3389 _('FILE arguments are not compatible with --line-range option')
3389 )
3390 )
3390
3391
3391 if opts.get('follow') and opts.get('rev'):
3392 if opts.get('follow') and opts.get('rev'):
3392 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3393 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3393 del opts['follow']
3394 del opts['follow']
3394
3395
3395 if opts.get('graph'):
3396 if opts.get('graph'):
3396 if linerange:
3397 if linerange:
3397 raise error.Abort(_('graph not supported with line range patterns'))
3398 raise error.Abort(_('graph not supported with line range patterns'))
3398 return cmdutil.graphlog(ui, repo, pats, opts)
3399 return cmdutil.graphlog(ui, repo, pats, opts)
3399
3400
3400 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3401 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3401 hunksfilter = None
3402 hunksfilter = None
3402
3403
3403 if linerange:
3404 if linerange:
3404 revs, lrfilematcher, hunksfilter = cmdutil.getloglinerangerevs(
3405 revs, lrfilematcher, hunksfilter = cmdutil.getloglinerangerevs(
3405 repo, revs, opts)
3406 repo, revs, opts)
3406
3407
3407 if filematcher is not None and lrfilematcher is not None:
3408 if filematcher is not None and lrfilematcher is not None:
3408 basefilematcher = filematcher
3409 basefilematcher = filematcher
3409
3410
3410 def filematcher(rev):
3411 def filematcher(rev):
3411 files = (basefilematcher(rev).files()
3412 files = (basefilematcher(rev).files()
3412 + lrfilematcher(rev).files())
3413 + lrfilematcher(rev).files())
3413 return scmutil.matchfiles(repo, files)
3414 return scmutil.matchfiles(repo, files)
3414
3415
3415 elif filematcher is None:
3416 elif filematcher is None:
3416 filematcher = lrfilematcher
3417 filematcher = lrfilematcher
3417
3418
3418 limit = cmdutil.loglimit(opts)
3419 limit = cmdutil.loglimit(opts)
3419 count = 0
3420 count = 0
3420
3421
3421 getrenamed = None
3422 getrenamed = None
3422 if opts.get('copies'):
3423 if opts.get('copies'):
3423 endrev = None
3424 endrev = None
3424 if opts.get('rev'):
3425 if opts.get('rev'):
3425 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3426 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3426 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3427 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3427
3428
3428 ui.pager('log')
3429 ui.pager('log')
3429 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3430 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3430 for rev in revs:
3431 for rev in revs:
3431 if count == limit:
3432 if count == limit:
3432 break
3433 break
3433 ctx = repo[rev]
3434 ctx = repo[rev]
3434 copies = None
3435 copies = None
3435 if getrenamed is not None and rev:
3436 if getrenamed is not None and rev:
3436 copies = []
3437 copies = []
3437 for fn in ctx.files():
3438 for fn in ctx.files():
3438 rename = getrenamed(fn, rev)
3439 rename = getrenamed(fn, rev)
3439 if rename:
3440 if rename:
3440 copies.append((fn, rename[0]))
3441 copies.append((fn, rename[0]))
3441 if filematcher:
3442 if filematcher:
3442 revmatchfn = filematcher(ctx.rev())
3443 revmatchfn = filematcher(ctx.rev())
3443 else:
3444 else:
3444 revmatchfn = None
3445 revmatchfn = None
3445 if hunksfilter:
3446 if hunksfilter:
3446 revhunksfilter = hunksfilter(rev)
3447 revhunksfilter = hunksfilter(rev)
3447 else:
3448 else:
3448 revhunksfilter = None
3449 revhunksfilter = None
3449 displayer.show(ctx, copies=copies, matchfn=revmatchfn,
3450 displayer.show(ctx, copies=copies, matchfn=revmatchfn,
3450 hunksfilterfn=revhunksfilter)
3451 hunksfilterfn=revhunksfilter)
3451 if displayer.flush(ctx):
3452 if displayer.flush(ctx):
3452 count += 1
3453 count += 1
3453
3454
3454 displayer.close()
3455 displayer.close()
3455
3456
3456 @command('manifest',
3457 @command('manifest',
3457 [('r', 'rev', '', _('revision to display'), _('REV')),
3458 [('r', 'rev', '', _('revision to display'), _('REV')),
3458 ('', 'all', False, _("list files from all revisions"))]
3459 ('', 'all', False, _("list files from all revisions"))]
3459 + formatteropts,
3460 + formatteropts,
3460 _('[-r REV]'))
3461 _('[-r REV]'), cmdtype=readonly)
3461 def manifest(ui, repo, node=None, rev=None, **opts):
3462 def manifest(ui, repo, node=None, rev=None, **opts):
3462 """output the current or given revision of the project manifest
3463 """output the current or given revision of the project manifest
3463
3464
3464 Print a list of version controlled files for the given revision.
3465 Print a list of version controlled files for the given revision.
3465 If no revision is given, the first parent of the working directory
3466 If no revision is given, the first parent of the working directory
3466 is used, or the null revision if no revision is checked out.
3467 is used, or the null revision if no revision is checked out.
3467
3468
3468 With -v, print file permissions, symlink and executable bits.
3469 With -v, print file permissions, symlink and executable bits.
3469 With --debug, print file revision hashes.
3470 With --debug, print file revision hashes.
3470
3471
3471 If option --all is specified, the list of all files from all revisions
3472 If option --all is specified, the list of all files from all revisions
3472 is printed. This includes deleted and renamed files.
3473 is printed. This includes deleted and renamed files.
3473
3474
3474 Returns 0 on success.
3475 Returns 0 on success.
3475 """
3476 """
3476 opts = pycompat.byteskwargs(opts)
3477 opts = pycompat.byteskwargs(opts)
3477 fm = ui.formatter('manifest', opts)
3478 fm = ui.formatter('manifest', opts)
3478
3479
3479 if opts.get('all'):
3480 if opts.get('all'):
3480 if rev or node:
3481 if rev or node:
3481 raise error.Abort(_("can't specify a revision with --all"))
3482 raise error.Abort(_("can't specify a revision with --all"))
3482
3483
3483 res = []
3484 res = []
3484 prefix = "data/"
3485 prefix = "data/"
3485 suffix = ".i"
3486 suffix = ".i"
3486 plen = len(prefix)
3487 plen = len(prefix)
3487 slen = len(suffix)
3488 slen = len(suffix)
3488 with repo.lock():
3489 with repo.lock():
3489 for fn, b, size in repo.store.datafiles():
3490 for fn, b, size in repo.store.datafiles():
3490 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3491 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3491 res.append(fn[plen:-slen])
3492 res.append(fn[plen:-slen])
3492 ui.pager('manifest')
3493 ui.pager('manifest')
3493 for f in res:
3494 for f in res:
3494 fm.startitem()
3495 fm.startitem()
3495 fm.write("path", '%s\n', f)
3496 fm.write("path", '%s\n', f)
3496 fm.end()
3497 fm.end()
3497 return
3498 return
3498
3499
3499 if rev and node:
3500 if rev and node:
3500 raise error.Abort(_("please specify just one revision"))
3501 raise error.Abort(_("please specify just one revision"))
3501
3502
3502 if not node:
3503 if not node:
3503 node = rev
3504 node = rev
3504
3505
3505 char = {'l': '@', 'x': '*', '': ''}
3506 char = {'l': '@', 'x': '*', '': ''}
3506 mode = {'l': '644', 'x': '755', '': '644'}
3507 mode = {'l': '644', 'x': '755', '': '644'}
3507 ctx = scmutil.revsingle(repo, node)
3508 ctx = scmutil.revsingle(repo, node)
3508 mf = ctx.manifest()
3509 mf = ctx.manifest()
3509 ui.pager('manifest')
3510 ui.pager('manifest')
3510 for f in ctx:
3511 for f in ctx:
3511 fm.startitem()
3512 fm.startitem()
3512 fl = ctx[f].flags()
3513 fl = ctx[f].flags()
3513 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3514 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3514 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3515 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3515 fm.write('path', '%s\n', f)
3516 fm.write('path', '%s\n', f)
3516 fm.end()
3517 fm.end()
3517
3518
3518 @command('^merge',
3519 @command('^merge',
3519 [('f', 'force', None,
3520 [('f', 'force', None,
3520 _('force a merge including outstanding changes (DEPRECATED)')),
3521 _('force a merge including outstanding changes (DEPRECATED)')),
3521 ('r', 'rev', '', _('revision to merge'), _('REV')),
3522 ('r', 'rev', '', _('revision to merge'), _('REV')),
3522 ('P', 'preview', None,
3523 ('P', 'preview', None,
3523 _('review revisions to merge (no merge is performed)'))
3524 _('review revisions to merge (no merge is performed)'))
3524 ] + mergetoolopts,
3525 ] + mergetoolopts,
3525 _('[-P] [[-r] REV]'))
3526 _('[-P] [[-r] REV]'))
3526 def merge(ui, repo, node=None, **opts):
3527 def merge(ui, repo, node=None, **opts):
3527 """merge another revision into working directory
3528 """merge another revision into working directory
3528
3529
3529 The current working directory is updated with all changes made in
3530 The current working directory is updated with all changes made in
3530 the requested revision since the last common predecessor revision.
3531 the requested revision since the last common predecessor revision.
3531
3532
3532 Files that changed between either parent are marked as changed for
3533 Files that changed between either parent are marked as changed for
3533 the next commit and a commit must be performed before any further
3534 the next commit and a commit must be performed before any further
3534 updates to the repository are allowed. The next commit will have
3535 updates to the repository are allowed. The next commit will have
3535 two parents.
3536 two parents.
3536
3537
3537 ``--tool`` can be used to specify the merge tool used for file
3538 ``--tool`` can be used to specify the merge tool used for file
3538 merges. It overrides the HGMERGE environment variable and your
3539 merges. It overrides the HGMERGE environment variable and your
3539 configuration files. See :hg:`help merge-tools` for options.
3540 configuration files. See :hg:`help merge-tools` for options.
3540
3541
3541 If no revision is specified, the working directory's parent is a
3542 If no revision is specified, the working directory's parent is a
3542 head revision, and the current branch contains exactly one other
3543 head revision, and the current branch contains exactly one other
3543 head, the other head is merged with by default. Otherwise, an
3544 head, the other head is merged with by default. Otherwise, an
3544 explicit revision with which to merge with must be provided.
3545 explicit revision with which to merge with must be provided.
3545
3546
3546 See :hg:`help resolve` for information on handling file conflicts.
3547 See :hg:`help resolve` for information on handling file conflicts.
3547
3548
3548 To undo an uncommitted merge, use :hg:`update --clean .` which
3549 To undo an uncommitted merge, use :hg:`update --clean .` which
3549 will check out a clean copy of the original merge parent, losing
3550 will check out a clean copy of the original merge parent, losing
3550 all changes.
3551 all changes.
3551
3552
3552 Returns 0 on success, 1 if there are unresolved files.
3553 Returns 0 on success, 1 if there are unresolved files.
3553 """
3554 """
3554
3555
3555 opts = pycompat.byteskwargs(opts)
3556 opts = pycompat.byteskwargs(opts)
3556 if opts.get('rev') and node:
3557 if opts.get('rev') and node:
3557 raise error.Abort(_("please specify just one revision"))
3558 raise error.Abort(_("please specify just one revision"))
3558 if not node:
3559 if not node:
3559 node = opts.get('rev')
3560 node = opts.get('rev')
3560
3561
3561 if node:
3562 if node:
3562 node = scmutil.revsingle(repo, node).node()
3563 node = scmutil.revsingle(repo, node).node()
3563
3564
3564 if not node:
3565 if not node:
3565 node = repo[destutil.destmerge(repo)].node()
3566 node = repo[destutil.destmerge(repo)].node()
3566
3567
3567 if opts.get('preview'):
3568 if opts.get('preview'):
3568 # find nodes that are ancestors of p2 but not of p1
3569 # find nodes that are ancestors of p2 but not of p1
3569 p1 = repo.lookup('.')
3570 p1 = repo.lookup('.')
3570 p2 = repo.lookup(node)
3571 p2 = repo.lookup(node)
3571 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3572 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3572
3573
3573 displayer = cmdutil.show_changeset(ui, repo, opts)
3574 displayer = cmdutil.show_changeset(ui, repo, opts)
3574 for node in nodes:
3575 for node in nodes:
3575 displayer.show(repo[node])
3576 displayer.show(repo[node])
3576 displayer.close()
3577 displayer.close()
3577 return 0
3578 return 0
3578
3579
3579 try:
3580 try:
3580 # ui.forcemerge is an internal variable, do not document
3581 # ui.forcemerge is an internal variable, do not document
3581 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3582 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3582 force = opts.get('force')
3583 force = opts.get('force')
3583 labels = ['working copy', 'merge rev']
3584 labels = ['working copy', 'merge rev']
3584 return hg.merge(repo, node, force=force, mergeforce=force,
3585 return hg.merge(repo, node, force=force, mergeforce=force,
3585 labels=labels)
3586 labels=labels)
3586 finally:
3587 finally:
3587 ui.setconfig('ui', 'forcemerge', '', 'merge')
3588 ui.setconfig('ui', 'forcemerge', '', 'merge')
3588
3589
3589 @command('outgoing|out',
3590 @command('outgoing|out',
3590 [('f', 'force', None, _('run even when the destination is unrelated')),
3591 [('f', 'force', None, _('run even when the destination is unrelated')),
3591 ('r', 'rev', [],
3592 ('r', 'rev', [],
3592 _('a changeset intended to be included in the destination'), _('REV')),
3593 _('a changeset intended to be included in the destination'), _('REV')),
3593 ('n', 'newest-first', None, _('show newest record first')),
3594 ('n', 'newest-first', None, _('show newest record first')),
3594 ('B', 'bookmarks', False, _('compare bookmarks')),
3595 ('B', 'bookmarks', False, _('compare bookmarks')),
3595 ('b', 'branch', [], _('a specific branch you would like to push'),
3596 ('b', 'branch', [], _('a specific branch you would like to push'),
3596 _('BRANCH')),
3597 _('BRANCH')),
3597 ] + logopts + remoteopts + subrepoopts,
3598 ] + logopts + remoteopts + subrepoopts,
3598 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3599 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3599 def outgoing(ui, repo, dest=None, **opts):
3600 def outgoing(ui, repo, dest=None, **opts):
3600 """show changesets not found in the destination
3601 """show changesets not found in the destination
3601
3602
3602 Show changesets not found in the specified destination repository
3603 Show changesets not found in the specified destination repository
3603 or the default push location. These are the changesets that would
3604 or the default push location. These are the changesets that would
3604 be pushed if a push was requested.
3605 be pushed if a push was requested.
3605
3606
3606 See pull for details of valid destination formats.
3607 See pull for details of valid destination formats.
3607
3608
3608 .. container:: verbose
3609 .. container:: verbose
3609
3610
3610 With -B/--bookmarks, the result of bookmark comparison between
3611 With -B/--bookmarks, the result of bookmark comparison between
3611 local and remote repositories is displayed. With -v/--verbose,
3612 local and remote repositories is displayed. With -v/--verbose,
3612 status is also displayed for each bookmark like below::
3613 status is also displayed for each bookmark like below::
3613
3614
3614 BM1 01234567890a added
3615 BM1 01234567890a added
3615 BM2 deleted
3616 BM2 deleted
3616 BM3 234567890abc advanced
3617 BM3 234567890abc advanced
3617 BM4 34567890abcd diverged
3618 BM4 34567890abcd diverged
3618 BM5 4567890abcde changed
3619 BM5 4567890abcde changed
3619
3620
3620 The action taken when pushing depends on the
3621 The action taken when pushing depends on the
3621 status of each bookmark:
3622 status of each bookmark:
3622
3623
3623 :``added``: push with ``-B`` will create it
3624 :``added``: push with ``-B`` will create it
3624 :``deleted``: push with ``-B`` will delete it
3625 :``deleted``: push with ``-B`` will delete it
3625 :``advanced``: push will update it
3626 :``advanced``: push will update it
3626 :``diverged``: push with ``-B`` will update it
3627 :``diverged``: push with ``-B`` will update it
3627 :``changed``: push with ``-B`` will update it
3628 :``changed``: push with ``-B`` will update it
3628
3629
3629 From the point of view of pushing behavior, bookmarks
3630 From the point of view of pushing behavior, bookmarks
3630 existing only in the remote repository are treated as
3631 existing only in the remote repository are treated as
3631 ``deleted``, even if it is in fact added remotely.
3632 ``deleted``, even if it is in fact added remotely.
3632
3633
3633 Returns 0 if there are outgoing changes, 1 otherwise.
3634 Returns 0 if there are outgoing changes, 1 otherwise.
3634 """
3635 """
3635 opts = pycompat.byteskwargs(opts)
3636 opts = pycompat.byteskwargs(opts)
3636 if opts.get('graph'):
3637 if opts.get('graph'):
3637 cmdutil.checkunsupportedgraphflags([], opts)
3638 cmdutil.checkunsupportedgraphflags([], opts)
3638 o, other = hg._outgoing(ui, repo, dest, opts)
3639 o, other = hg._outgoing(ui, repo, dest, opts)
3639 if not o:
3640 if not o:
3640 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3641 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3641 return
3642 return
3642
3643
3643 revdag = cmdutil.graphrevs(repo, o, opts)
3644 revdag = cmdutil.graphrevs(repo, o, opts)
3644 ui.pager('outgoing')
3645 ui.pager('outgoing')
3645 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3646 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3646 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3647 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3647 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3648 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3648 return 0
3649 return 0
3649
3650
3650 if opts.get('bookmarks'):
3651 if opts.get('bookmarks'):
3651 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3652 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3652 dest, branches = hg.parseurl(dest, opts.get('branch'))
3653 dest, branches = hg.parseurl(dest, opts.get('branch'))
3653 other = hg.peer(repo, opts, dest)
3654 other = hg.peer(repo, opts, dest)
3654 if 'bookmarks' not in other.listkeys('namespaces'):
3655 if 'bookmarks' not in other.listkeys('namespaces'):
3655 ui.warn(_("remote doesn't support bookmarks\n"))
3656 ui.warn(_("remote doesn't support bookmarks\n"))
3656 return 0
3657 return 0
3657 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3658 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3658 ui.pager('outgoing')
3659 ui.pager('outgoing')
3659 return bookmarks.outgoing(ui, repo, other)
3660 return bookmarks.outgoing(ui, repo, other)
3660
3661
3661 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3662 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3662 try:
3663 try:
3663 return hg.outgoing(ui, repo, dest, opts)
3664 return hg.outgoing(ui, repo, dest, opts)
3664 finally:
3665 finally:
3665 del repo._subtoppath
3666 del repo._subtoppath
3666
3667
3667 @command('parents',
3668 @command('parents',
3668 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3669 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3669 ] + templateopts,
3670 ] + templateopts,
3670 _('[-r REV] [FILE]'),
3671 _('[-r REV] [FILE]'),
3671 inferrepo=True)
3672 inferrepo=True)
3672 def parents(ui, repo, file_=None, **opts):
3673 def parents(ui, repo, file_=None, **opts):
3673 """show the parents of the working directory or revision (DEPRECATED)
3674 """show the parents of the working directory or revision (DEPRECATED)
3674
3675
3675 Print the working directory's parent revisions. If a revision is
3676 Print the working directory's parent revisions. If a revision is
3676 given via -r/--rev, the parent of that revision will be printed.
3677 given via -r/--rev, the parent of that revision will be printed.
3677 If a file argument is given, the revision in which the file was
3678 If a file argument is given, the revision in which the file was
3678 last changed (before the working directory revision or the
3679 last changed (before the working directory revision or the
3679 argument to --rev if given) is printed.
3680 argument to --rev if given) is printed.
3680
3681
3681 This command is equivalent to::
3682 This command is equivalent to::
3682
3683
3683 hg log -r "p1()+p2()" or
3684 hg log -r "p1()+p2()" or
3684 hg log -r "p1(REV)+p2(REV)" or
3685 hg log -r "p1(REV)+p2(REV)" or
3685 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3686 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3686 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3687 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3687
3688
3688 See :hg:`summary` and :hg:`help revsets` for related information.
3689 See :hg:`summary` and :hg:`help revsets` for related information.
3689
3690
3690 Returns 0 on success.
3691 Returns 0 on success.
3691 """
3692 """
3692
3693
3693 opts = pycompat.byteskwargs(opts)
3694 opts = pycompat.byteskwargs(opts)
3694 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3695 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3695
3696
3696 if file_:
3697 if file_:
3697 m = scmutil.match(ctx, (file_,), opts)
3698 m = scmutil.match(ctx, (file_,), opts)
3698 if m.anypats() or len(m.files()) != 1:
3699 if m.anypats() or len(m.files()) != 1:
3699 raise error.Abort(_('can only specify an explicit filename'))
3700 raise error.Abort(_('can only specify an explicit filename'))
3700 file_ = m.files()[0]
3701 file_ = m.files()[0]
3701 filenodes = []
3702 filenodes = []
3702 for cp in ctx.parents():
3703 for cp in ctx.parents():
3703 if not cp:
3704 if not cp:
3704 continue
3705 continue
3705 try:
3706 try:
3706 filenodes.append(cp.filenode(file_))
3707 filenodes.append(cp.filenode(file_))
3707 except error.LookupError:
3708 except error.LookupError:
3708 pass
3709 pass
3709 if not filenodes:
3710 if not filenodes:
3710 raise error.Abort(_("'%s' not found in manifest!") % file_)
3711 raise error.Abort(_("'%s' not found in manifest!") % file_)
3711 p = []
3712 p = []
3712 for fn in filenodes:
3713 for fn in filenodes:
3713 fctx = repo.filectx(file_, fileid=fn)
3714 fctx = repo.filectx(file_, fileid=fn)
3714 p.append(fctx.node())
3715 p.append(fctx.node())
3715 else:
3716 else:
3716 p = [cp.node() for cp in ctx.parents()]
3717 p = [cp.node() for cp in ctx.parents()]
3717
3718
3718 displayer = cmdutil.show_changeset(ui, repo, opts)
3719 displayer = cmdutil.show_changeset(ui, repo, opts)
3719 for n in p:
3720 for n in p:
3720 if n != nullid:
3721 if n != nullid:
3721 displayer.show(repo[n])
3722 displayer.show(repo[n])
3722 displayer.close()
3723 displayer.close()
3723
3724
3724 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3725 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3726 cmdtype=readonly)
3725 def paths(ui, repo, search=None, **opts):
3727 def paths(ui, repo, search=None, **opts):
3726 """show aliases for remote repositories
3728 """show aliases for remote repositories
3727
3729
3728 Show definition of symbolic path name NAME. If no name is given,
3730 Show definition of symbolic path name NAME. If no name is given,
3729 show definition of all available names.
3731 show definition of all available names.
3730
3732
3731 Option -q/--quiet suppresses all output when searching for NAME
3733 Option -q/--quiet suppresses all output when searching for NAME
3732 and shows only the path names when listing all definitions.
3734 and shows only the path names when listing all definitions.
3733
3735
3734 Path names are defined in the [paths] section of your
3736 Path names are defined in the [paths] section of your
3735 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3737 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3736 repository, ``.hg/hgrc`` is used, too.
3738 repository, ``.hg/hgrc`` is used, too.
3737
3739
3738 The path names ``default`` and ``default-push`` have a special
3740 The path names ``default`` and ``default-push`` have a special
3739 meaning. When performing a push or pull operation, they are used
3741 meaning. When performing a push or pull operation, they are used
3740 as fallbacks if no location is specified on the command-line.
3742 as fallbacks if no location is specified on the command-line.
3741 When ``default-push`` is set, it will be used for push and
3743 When ``default-push`` is set, it will be used for push and
3742 ``default`` will be used for pull; otherwise ``default`` is used
3744 ``default`` will be used for pull; otherwise ``default`` is used
3743 as the fallback for both. When cloning a repository, the clone
3745 as the fallback for both. When cloning a repository, the clone
3744 source is written as ``default`` in ``.hg/hgrc``.
3746 source is written as ``default`` in ``.hg/hgrc``.
3745
3747
3746 .. note::
3748 .. note::
3747
3749
3748 ``default`` and ``default-push`` apply to all inbound (e.g.
3750 ``default`` and ``default-push`` apply to all inbound (e.g.
3749 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3751 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3750 and :hg:`bundle`) operations.
3752 and :hg:`bundle`) operations.
3751
3753
3752 See :hg:`help urls` for more information.
3754 See :hg:`help urls` for more information.
3753
3755
3754 Returns 0 on success.
3756 Returns 0 on success.
3755 """
3757 """
3756
3758
3757 opts = pycompat.byteskwargs(opts)
3759 opts = pycompat.byteskwargs(opts)
3758 ui.pager('paths')
3760 ui.pager('paths')
3759 if search:
3761 if search:
3760 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3762 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3761 if name == search]
3763 if name == search]
3762 else:
3764 else:
3763 pathitems = sorted(ui.paths.iteritems())
3765 pathitems = sorted(ui.paths.iteritems())
3764
3766
3765 fm = ui.formatter('paths', opts)
3767 fm = ui.formatter('paths', opts)
3766 if fm.isplain():
3768 if fm.isplain():
3767 hidepassword = util.hidepassword
3769 hidepassword = util.hidepassword
3768 else:
3770 else:
3769 hidepassword = str
3771 hidepassword = str
3770 if ui.quiet:
3772 if ui.quiet:
3771 namefmt = '%s\n'
3773 namefmt = '%s\n'
3772 else:
3774 else:
3773 namefmt = '%s = '
3775 namefmt = '%s = '
3774 showsubopts = not search and not ui.quiet
3776 showsubopts = not search and not ui.quiet
3775
3777
3776 for name, path in pathitems:
3778 for name, path in pathitems:
3777 fm.startitem()
3779 fm.startitem()
3778 fm.condwrite(not search, 'name', namefmt, name)
3780 fm.condwrite(not search, 'name', namefmt, name)
3779 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3781 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3780 for subopt, value in sorted(path.suboptions.items()):
3782 for subopt, value in sorted(path.suboptions.items()):
3781 assert subopt not in ('name', 'url')
3783 assert subopt not in ('name', 'url')
3782 if showsubopts:
3784 if showsubopts:
3783 fm.plain('%s:%s = ' % (name, subopt))
3785 fm.plain('%s:%s = ' % (name, subopt))
3784 fm.condwrite(showsubopts, subopt, '%s\n', value)
3786 fm.condwrite(showsubopts, subopt, '%s\n', value)
3785
3787
3786 fm.end()
3788 fm.end()
3787
3789
3788 if search and not pathitems:
3790 if search and not pathitems:
3789 if not ui.quiet:
3791 if not ui.quiet:
3790 ui.warn(_("not found!\n"))
3792 ui.warn(_("not found!\n"))
3791 return 1
3793 return 1
3792 else:
3794 else:
3793 return 0
3795 return 0
3794
3796
3795 @command('phase',
3797 @command('phase',
3796 [('p', 'public', False, _('set changeset phase to public')),
3798 [('p', 'public', False, _('set changeset phase to public')),
3797 ('d', 'draft', False, _('set changeset phase to draft')),
3799 ('d', 'draft', False, _('set changeset phase to draft')),
3798 ('s', 'secret', False, _('set changeset phase to secret')),
3800 ('s', 'secret', False, _('set changeset phase to secret')),
3799 ('f', 'force', False, _('allow to move boundary backward')),
3801 ('f', 'force', False, _('allow to move boundary backward')),
3800 ('r', 'rev', [], _('target revision'), _('REV')),
3802 ('r', 'rev', [], _('target revision'), _('REV')),
3801 ],
3803 ],
3802 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3804 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3803 def phase(ui, repo, *revs, **opts):
3805 def phase(ui, repo, *revs, **opts):
3804 """set or show the current phase name
3806 """set or show the current phase name
3805
3807
3806 With no argument, show the phase name of the current revision(s).
3808 With no argument, show the phase name of the current revision(s).
3807
3809
3808 With one of -p/--public, -d/--draft or -s/--secret, change the
3810 With one of -p/--public, -d/--draft or -s/--secret, change the
3809 phase value of the specified revisions.
3811 phase value of the specified revisions.
3810
3812
3811 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3813 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3812 lower phase to a higher phase. Phases are ordered as follows::
3814 lower phase to a higher phase. Phases are ordered as follows::
3813
3815
3814 public < draft < secret
3816 public < draft < secret
3815
3817
3816 Returns 0 on success, 1 if some phases could not be changed.
3818 Returns 0 on success, 1 if some phases could not be changed.
3817
3819
3818 (For more information about the phases concept, see :hg:`help phases`.)
3820 (For more information about the phases concept, see :hg:`help phases`.)
3819 """
3821 """
3820 opts = pycompat.byteskwargs(opts)
3822 opts = pycompat.byteskwargs(opts)
3821 # search for a unique phase argument
3823 # search for a unique phase argument
3822 targetphase = None
3824 targetphase = None
3823 for idx, name in enumerate(phases.phasenames):
3825 for idx, name in enumerate(phases.phasenames):
3824 if opts[name]:
3826 if opts[name]:
3825 if targetphase is not None:
3827 if targetphase is not None:
3826 raise error.Abort(_('only one phase can be specified'))
3828 raise error.Abort(_('only one phase can be specified'))
3827 targetphase = idx
3829 targetphase = idx
3828
3830
3829 # look for specified revision
3831 # look for specified revision
3830 revs = list(revs)
3832 revs = list(revs)
3831 revs.extend(opts['rev'])
3833 revs.extend(opts['rev'])
3832 if not revs:
3834 if not revs:
3833 # display both parents as the second parent phase can influence
3835 # display both parents as the second parent phase can influence
3834 # the phase of a merge commit
3836 # the phase of a merge commit
3835 revs = [c.rev() for c in repo[None].parents()]
3837 revs = [c.rev() for c in repo[None].parents()]
3836
3838
3837 revs = scmutil.revrange(repo, revs)
3839 revs = scmutil.revrange(repo, revs)
3838
3840
3839 lock = None
3841 lock = None
3840 ret = 0
3842 ret = 0
3841 if targetphase is None:
3843 if targetphase is None:
3842 # display
3844 # display
3843 for r in revs:
3845 for r in revs:
3844 ctx = repo[r]
3846 ctx = repo[r]
3845 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3847 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3846 else:
3848 else:
3847 tr = None
3849 tr = None
3848 lock = repo.lock()
3850 lock = repo.lock()
3849 try:
3851 try:
3850 tr = repo.transaction("phase")
3852 tr = repo.transaction("phase")
3851 # set phase
3853 # set phase
3852 if not revs:
3854 if not revs:
3853 raise error.Abort(_('empty revision set'))
3855 raise error.Abort(_('empty revision set'))
3854 nodes = [repo[r].node() for r in revs]
3856 nodes = [repo[r].node() for r in revs]
3855 # moving revision from public to draft may hide them
3857 # moving revision from public to draft may hide them
3856 # We have to check result on an unfiltered repository
3858 # We have to check result on an unfiltered repository
3857 unfi = repo.unfiltered()
3859 unfi = repo.unfiltered()
3858 getphase = unfi._phasecache.phase
3860 getphase = unfi._phasecache.phase
3859 olddata = [getphase(unfi, r) for r in unfi]
3861 olddata = [getphase(unfi, r) for r in unfi]
3860 phases.advanceboundary(repo, tr, targetphase, nodes)
3862 phases.advanceboundary(repo, tr, targetphase, nodes)
3861 if opts['force']:
3863 if opts['force']:
3862 phases.retractboundary(repo, tr, targetphase, nodes)
3864 phases.retractboundary(repo, tr, targetphase, nodes)
3863 tr.close()
3865 tr.close()
3864 finally:
3866 finally:
3865 if tr is not None:
3867 if tr is not None:
3866 tr.release()
3868 tr.release()
3867 lock.release()
3869 lock.release()
3868 getphase = unfi._phasecache.phase
3870 getphase = unfi._phasecache.phase
3869 newdata = [getphase(unfi, r) for r in unfi]
3871 newdata = [getphase(unfi, r) for r in unfi]
3870 changes = sum(newdata[r] != olddata[r] for r in unfi)
3872 changes = sum(newdata[r] != olddata[r] for r in unfi)
3871 cl = unfi.changelog
3873 cl = unfi.changelog
3872 rejected = [n for n in nodes
3874 rejected = [n for n in nodes
3873 if newdata[cl.rev(n)] < targetphase]
3875 if newdata[cl.rev(n)] < targetphase]
3874 if rejected:
3876 if rejected:
3875 ui.warn(_('cannot move %i changesets to a higher '
3877 ui.warn(_('cannot move %i changesets to a higher '
3876 'phase, use --force\n') % len(rejected))
3878 'phase, use --force\n') % len(rejected))
3877 ret = 1
3879 ret = 1
3878 if changes:
3880 if changes:
3879 msg = _('phase changed for %i changesets\n') % changes
3881 msg = _('phase changed for %i changesets\n') % changes
3880 if ret:
3882 if ret:
3881 ui.status(msg)
3883 ui.status(msg)
3882 else:
3884 else:
3883 ui.note(msg)
3885 ui.note(msg)
3884 else:
3886 else:
3885 ui.warn(_('no phases changed\n'))
3887 ui.warn(_('no phases changed\n'))
3886 return ret
3888 return ret
3887
3889
3888 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3890 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3889 """Run after a changegroup has been added via pull/unbundle
3891 """Run after a changegroup has been added via pull/unbundle
3890
3892
3891 This takes arguments below:
3893 This takes arguments below:
3892
3894
3893 :modheads: change of heads by pull/unbundle
3895 :modheads: change of heads by pull/unbundle
3894 :optupdate: updating working directory is needed or not
3896 :optupdate: updating working directory is needed or not
3895 :checkout: update destination revision (or None to default destination)
3897 :checkout: update destination revision (or None to default destination)
3896 :brev: a name, which might be a bookmark to be activated after updating
3898 :brev: a name, which might be a bookmark to be activated after updating
3897 """
3899 """
3898 if modheads == 0:
3900 if modheads == 0:
3899 return
3901 return
3900 if optupdate:
3902 if optupdate:
3901 try:
3903 try:
3902 return hg.updatetotally(ui, repo, checkout, brev)
3904 return hg.updatetotally(ui, repo, checkout, brev)
3903 except error.UpdateAbort as inst:
3905 except error.UpdateAbort as inst:
3904 msg = _("not updating: %s") % str(inst)
3906 msg = _("not updating: %s") % str(inst)
3905 hint = inst.hint
3907 hint = inst.hint
3906 raise error.UpdateAbort(msg, hint=hint)
3908 raise error.UpdateAbort(msg, hint=hint)
3907 if modheads > 1:
3909 if modheads > 1:
3908 currentbranchheads = len(repo.branchheads())
3910 currentbranchheads = len(repo.branchheads())
3909 if currentbranchheads == modheads:
3911 if currentbranchheads == modheads:
3910 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3912 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3911 elif currentbranchheads > 1:
3913 elif currentbranchheads > 1:
3912 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3914 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3913 "merge)\n"))
3915 "merge)\n"))
3914 else:
3916 else:
3915 ui.status(_("(run 'hg heads' to see heads)\n"))
3917 ui.status(_("(run 'hg heads' to see heads)\n"))
3916 elif not ui.configbool('commands', 'update.requiredest'):
3918 elif not ui.configbool('commands', 'update.requiredest'):
3917 ui.status(_("(run 'hg update' to get a working copy)\n"))
3919 ui.status(_("(run 'hg update' to get a working copy)\n"))
3918
3920
3919 @command('^pull',
3921 @command('^pull',
3920 [('u', 'update', None,
3922 [('u', 'update', None,
3921 _('update to new branch head if new descendants were pulled')),
3923 _('update to new branch head if new descendants were pulled')),
3922 ('f', 'force', None, _('run even when remote repository is unrelated')),
3924 ('f', 'force', None, _('run even when remote repository is unrelated')),
3923 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3925 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3924 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3926 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3925 ('b', 'branch', [], _('a specific branch you would like to pull'),
3927 ('b', 'branch', [], _('a specific branch you would like to pull'),
3926 _('BRANCH')),
3928 _('BRANCH')),
3927 ] + remoteopts,
3929 ] + remoteopts,
3928 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3930 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3929 def pull(ui, repo, source="default", **opts):
3931 def pull(ui, repo, source="default", **opts):
3930 """pull changes from the specified source
3932 """pull changes from the specified source
3931
3933
3932 Pull changes from a remote repository to a local one.
3934 Pull changes from a remote repository to a local one.
3933
3935
3934 This finds all changes from the repository at the specified path
3936 This finds all changes from the repository at the specified path
3935 or URL and adds them to a local repository (the current one unless
3937 or URL and adds them to a local repository (the current one unless
3936 -R is specified). By default, this does not update the copy of the
3938 -R is specified). By default, this does not update the copy of the
3937 project in the working directory.
3939 project in the working directory.
3938
3940
3939 Use :hg:`incoming` if you want to see what would have been added
3941 Use :hg:`incoming` if you want to see what would have been added
3940 by a pull at the time you issued this command. If you then decide
3942 by a pull at the time you issued this command. If you then decide
3941 to add those changes to the repository, you should use :hg:`pull
3943 to add those changes to the repository, you should use :hg:`pull
3942 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3944 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3943
3945
3944 If SOURCE is omitted, the 'default' path will be used.
3946 If SOURCE is omitted, the 'default' path will be used.
3945 See :hg:`help urls` for more information.
3947 See :hg:`help urls` for more information.
3946
3948
3947 Specifying bookmark as ``.`` is equivalent to specifying the active
3949 Specifying bookmark as ``.`` is equivalent to specifying the active
3948 bookmark's name.
3950 bookmark's name.
3949
3951
3950 Returns 0 on success, 1 if an update had unresolved files.
3952 Returns 0 on success, 1 if an update had unresolved files.
3951 """
3953 """
3952
3954
3953 opts = pycompat.byteskwargs(opts)
3955 opts = pycompat.byteskwargs(opts)
3954 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3956 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3955 msg = _('update destination required by configuration')
3957 msg = _('update destination required by configuration')
3956 hint = _('use hg pull followed by hg update DEST')
3958 hint = _('use hg pull followed by hg update DEST')
3957 raise error.Abort(msg, hint=hint)
3959 raise error.Abort(msg, hint=hint)
3958
3960
3959 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3961 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3960 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3962 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3961 other = hg.peer(repo, opts, source)
3963 other = hg.peer(repo, opts, source)
3962 try:
3964 try:
3963 revs, checkout = hg.addbranchrevs(repo, other, branches,
3965 revs, checkout = hg.addbranchrevs(repo, other, branches,
3964 opts.get('rev'))
3966 opts.get('rev'))
3965
3967
3966
3968
3967 pullopargs = {}
3969 pullopargs = {}
3968 if opts.get('bookmark'):
3970 if opts.get('bookmark'):
3969 if not revs:
3971 if not revs:
3970 revs = []
3972 revs = []
3971 # The list of bookmark used here is not the one used to actually
3973 # The list of bookmark used here is not the one used to actually
3972 # update the bookmark name. This can result in the revision pulled
3974 # update the bookmark name. This can result in the revision pulled
3973 # not ending up with the name of the bookmark because of a race
3975 # not ending up with the name of the bookmark because of a race
3974 # condition on the server. (See issue 4689 for details)
3976 # condition on the server. (See issue 4689 for details)
3975 remotebookmarks = other.listkeys('bookmarks')
3977 remotebookmarks = other.listkeys('bookmarks')
3976 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
3978 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
3977 pullopargs['remotebookmarks'] = remotebookmarks
3979 pullopargs['remotebookmarks'] = remotebookmarks
3978 for b in opts['bookmark']:
3980 for b in opts['bookmark']:
3979 b = repo._bookmarks.expandname(b)
3981 b = repo._bookmarks.expandname(b)
3980 if b not in remotebookmarks:
3982 if b not in remotebookmarks:
3981 raise error.Abort(_('remote bookmark %s not found!') % b)
3983 raise error.Abort(_('remote bookmark %s not found!') % b)
3982 revs.append(hex(remotebookmarks[b]))
3984 revs.append(hex(remotebookmarks[b]))
3983
3985
3984 if revs:
3986 if revs:
3985 try:
3987 try:
3986 # When 'rev' is a bookmark name, we cannot guarantee that it
3988 # When 'rev' is a bookmark name, we cannot guarantee that it
3987 # will be updated with that name because of a race condition
3989 # will be updated with that name because of a race condition
3988 # server side. (See issue 4689 for details)
3990 # server side. (See issue 4689 for details)
3989 oldrevs = revs
3991 oldrevs = revs
3990 revs = [] # actually, nodes
3992 revs = [] # actually, nodes
3991 for r in oldrevs:
3993 for r in oldrevs:
3992 node = other.lookup(r)
3994 node = other.lookup(r)
3993 revs.append(node)
3995 revs.append(node)
3994 if r == checkout:
3996 if r == checkout:
3995 checkout = node
3997 checkout = node
3996 except error.CapabilityError:
3998 except error.CapabilityError:
3997 err = _("other repository doesn't support revision lookup, "
3999 err = _("other repository doesn't support revision lookup, "
3998 "so a rev cannot be specified.")
4000 "so a rev cannot be specified.")
3999 raise error.Abort(err)
4001 raise error.Abort(err)
4000
4002
4001 pullopargs.update(opts.get('opargs', {}))
4003 pullopargs.update(opts.get('opargs', {}))
4002 modheads = exchange.pull(repo, other, heads=revs,
4004 modheads = exchange.pull(repo, other, heads=revs,
4003 force=opts.get('force'),
4005 force=opts.get('force'),
4004 bookmarks=opts.get('bookmark', ()),
4006 bookmarks=opts.get('bookmark', ()),
4005 opargs=pullopargs).cgresult
4007 opargs=pullopargs).cgresult
4006
4008
4007 # brev is a name, which might be a bookmark to be activated at
4009 # brev is a name, which might be a bookmark to be activated at
4008 # the end of the update. In other words, it is an explicit
4010 # the end of the update. In other words, it is an explicit
4009 # destination of the update
4011 # destination of the update
4010 brev = None
4012 brev = None
4011
4013
4012 if checkout:
4014 if checkout:
4013 checkout = str(repo.changelog.rev(checkout))
4015 checkout = str(repo.changelog.rev(checkout))
4014
4016
4015 # order below depends on implementation of
4017 # order below depends on implementation of
4016 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4018 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4017 # because 'checkout' is determined without it.
4019 # because 'checkout' is determined without it.
4018 if opts.get('rev'):
4020 if opts.get('rev'):
4019 brev = opts['rev'][0]
4021 brev = opts['rev'][0]
4020 elif opts.get('branch'):
4022 elif opts.get('branch'):
4021 brev = opts['branch'][0]
4023 brev = opts['branch'][0]
4022 else:
4024 else:
4023 brev = branches[0]
4025 brev = branches[0]
4024 repo._subtoppath = source
4026 repo._subtoppath = source
4025 try:
4027 try:
4026 ret = postincoming(ui, repo, modheads, opts.get('update'),
4028 ret = postincoming(ui, repo, modheads, opts.get('update'),
4027 checkout, brev)
4029 checkout, brev)
4028
4030
4029 finally:
4031 finally:
4030 del repo._subtoppath
4032 del repo._subtoppath
4031
4033
4032 finally:
4034 finally:
4033 other.close()
4035 other.close()
4034 return ret
4036 return ret
4035
4037
4036 @command('^push',
4038 @command('^push',
4037 [('f', 'force', None, _('force push')),
4039 [('f', 'force', None, _('force push')),
4038 ('r', 'rev', [],
4040 ('r', 'rev', [],
4039 _('a changeset intended to be included in the destination'),
4041 _('a changeset intended to be included in the destination'),
4040 _('REV')),
4042 _('REV')),
4041 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4043 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4042 ('b', 'branch', [],
4044 ('b', 'branch', [],
4043 _('a specific branch you would like to push'), _('BRANCH')),
4045 _('a specific branch you would like to push'), _('BRANCH')),
4044 ('', 'new-branch', False, _('allow pushing a new branch')),
4046 ('', 'new-branch', False, _('allow pushing a new branch')),
4045 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4047 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4046 ] + remoteopts,
4048 ] + remoteopts,
4047 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4049 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4048 def push(ui, repo, dest=None, **opts):
4050 def push(ui, repo, dest=None, **opts):
4049 """push changes to the specified destination
4051 """push changes to the specified destination
4050
4052
4051 Push changesets from the local repository to the specified
4053 Push changesets from the local repository to the specified
4052 destination.
4054 destination.
4053
4055
4054 This operation is symmetrical to pull: it is identical to a pull
4056 This operation is symmetrical to pull: it is identical to a pull
4055 in the destination repository from the current one.
4057 in the destination repository from the current one.
4056
4058
4057 By default, push will not allow creation of new heads at the
4059 By default, push will not allow creation of new heads at the
4058 destination, since multiple heads would make it unclear which head
4060 destination, since multiple heads would make it unclear which head
4059 to use. In this situation, it is recommended to pull and merge
4061 to use. In this situation, it is recommended to pull and merge
4060 before pushing.
4062 before pushing.
4061
4063
4062 Use --new-branch if you want to allow push to create a new named
4064 Use --new-branch if you want to allow push to create a new named
4063 branch that is not present at the destination. This allows you to
4065 branch that is not present at the destination. This allows you to
4064 only create a new branch without forcing other changes.
4066 only create a new branch without forcing other changes.
4065
4067
4066 .. note::
4068 .. note::
4067
4069
4068 Extra care should be taken with the -f/--force option,
4070 Extra care should be taken with the -f/--force option,
4069 which will push all new heads on all branches, an action which will
4071 which will push all new heads on all branches, an action which will
4070 almost always cause confusion for collaborators.
4072 almost always cause confusion for collaborators.
4071
4073
4072 If -r/--rev is used, the specified revision and all its ancestors
4074 If -r/--rev is used, the specified revision and all its ancestors
4073 will be pushed to the remote repository.
4075 will be pushed to the remote repository.
4074
4076
4075 If -B/--bookmark is used, the specified bookmarked revision, its
4077 If -B/--bookmark is used, the specified bookmarked revision, its
4076 ancestors, and the bookmark will be pushed to the remote
4078 ancestors, and the bookmark will be pushed to the remote
4077 repository. Specifying ``.`` is equivalent to specifying the active
4079 repository. Specifying ``.`` is equivalent to specifying the active
4078 bookmark's name.
4080 bookmark's name.
4079
4081
4080 Please see :hg:`help urls` for important details about ``ssh://``
4082 Please see :hg:`help urls` for important details about ``ssh://``
4081 URLs. If DESTINATION is omitted, a default path will be used.
4083 URLs. If DESTINATION is omitted, a default path will be used.
4082
4084
4083 .. container:: verbose
4085 .. container:: verbose
4084
4086
4085 The --pushvars option sends strings to the server that become
4087 The --pushvars option sends strings to the server that become
4086 environment variables prepended with ``HG_USERVAR_``. For example,
4088 environment variables prepended with ``HG_USERVAR_``. For example,
4087 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4089 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4088 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4090 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4089
4091
4090 pushvars can provide for user-overridable hooks as well as set debug
4092 pushvars can provide for user-overridable hooks as well as set debug
4091 levels. One example is having a hook that blocks commits containing
4093 levels. One example is having a hook that blocks commits containing
4092 conflict markers, but enables the user to override the hook if the file
4094 conflict markers, but enables the user to override the hook if the file
4093 is using conflict markers for testing purposes or the file format has
4095 is using conflict markers for testing purposes or the file format has
4094 strings that look like conflict markers.
4096 strings that look like conflict markers.
4095
4097
4096 By default, servers will ignore `--pushvars`. To enable it add the
4098 By default, servers will ignore `--pushvars`. To enable it add the
4097 following to your configuration file::
4099 following to your configuration file::
4098
4100
4099 [push]
4101 [push]
4100 pushvars.server = true
4102 pushvars.server = true
4101
4103
4102 Returns 0 if push was successful, 1 if nothing to push.
4104 Returns 0 if push was successful, 1 if nothing to push.
4103 """
4105 """
4104
4106
4105 opts = pycompat.byteskwargs(opts)
4107 opts = pycompat.byteskwargs(opts)
4106 if opts.get('bookmark'):
4108 if opts.get('bookmark'):
4107 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4109 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4108 for b in opts['bookmark']:
4110 for b in opts['bookmark']:
4109 # translate -B options to -r so changesets get pushed
4111 # translate -B options to -r so changesets get pushed
4110 b = repo._bookmarks.expandname(b)
4112 b = repo._bookmarks.expandname(b)
4111 if b in repo._bookmarks:
4113 if b in repo._bookmarks:
4112 opts.setdefault('rev', []).append(b)
4114 opts.setdefault('rev', []).append(b)
4113 else:
4115 else:
4114 # if we try to push a deleted bookmark, translate it to null
4116 # if we try to push a deleted bookmark, translate it to null
4115 # this lets simultaneous -r, -b options continue working
4117 # this lets simultaneous -r, -b options continue working
4116 opts.setdefault('rev', []).append("null")
4118 opts.setdefault('rev', []).append("null")
4117
4119
4118 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4120 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4119 if not path:
4121 if not path:
4120 raise error.Abort(_('default repository not configured!'),
4122 raise error.Abort(_('default repository not configured!'),
4121 hint=_("see 'hg help config.paths'"))
4123 hint=_("see 'hg help config.paths'"))
4122 dest = path.pushloc or path.loc
4124 dest = path.pushloc or path.loc
4123 branches = (path.branch, opts.get('branch') or [])
4125 branches = (path.branch, opts.get('branch') or [])
4124 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4126 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4125 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4127 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4126 other = hg.peer(repo, opts, dest)
4128 other = hg.peer(repo, opts, dest)
4127
4129
4128 if revs:
4130 if revs:
4129 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4131 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4130 if not revs:
4132 if not revs:
4131 raise error.Abort(_("specified revisions evaluate to an empty set"),
4133 raise error.Abort(_("specified revisions evaluate to an empty set"),
4132 hint=_("use different revision arguments"))
4134 hint=_("use different revision arguments"))
4133 elif path.pushrev:
4135 elif path.pushrev:
4134 # It doesn't make any sense to specify ancestor revisions. So limit
4136 # It doesn't make any sense to specify ancestor revisions. So limit
4135 # to DAG heads to make discovery simpler.
4137 # to DAG heads to make discovery simpler.
4136 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4138 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4137 revs = scmutil.revrange(repo, [expr])
4139 revs = scmutil.revrange(repo, [expr])
4138 revs = [repo[rev].node() for rev in revs]
4140 revs = [repo[rev].node() for rev in revs]
4139 if not revs:
4141 if not revs:
4140 raise error.Abort(_('default push revset for path evaluates to an '
4142 raise error.Abort(_('default push revset for path evaluates to an '
4141 'empty set'))
4143 'empty set'))
4142
4144
4143 repo._subtoppath = dest
4145 repo._subtoppath = dest
4144 try:
4146 try:
4145 # push subrepos depth-first for coherent ordering
4147 # push subrepos depth-first for coherent ordering
4146 c = repo['']
4148 c = repo['']
4147 subs = c.substate # only repos that are committed
4149 subs = c.substate # only repos that are committed
4148 for s in sorted(subs):
4150 for s in sorted(subs):
4149 result = c.sub(s).push(opts)
4151 result = c.sub(s).push(opts)
4150 if result == 0:
4152 if result == 0:
4151 return not result
4153 return not result
4152 finally:
4154 finally:
4153 del repo._subtoppath
4155 del repo._subtoppath
4154
4156
4155 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4157 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4156 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4158 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4157
4159
4158 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4160 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4159 newbranch=opts.get('new_branch'),
4161 newbranch=opts.get('new_branch'),
4160 bookmarks=opts.get('bookmark', ()),
4162 bookmarks=opts.get('bookmark', ()),
4161 opargs=opargs)
4163 opargs=opargs)
4162
4164
4163 result = not pushop.cgresult
4165 result = not pushop.cgresult
4164
4166
4165 if pushop.bkresult is not None:
4167 if pushop.bkresult is not None:
4166 if pushop.bkresult == 2:
4168 if pushop.bkresult == 2:
4167 result = 2
4169 result = 2
4168 elif not result and pushop.bkresult:
4170 elif not result and pushop.bkresult:
4169 result = 2
4171 result = 2
4170
4172
4171 return result
4173 return result
4172
4174
4173 @command('recover', [])
4175 @command('recover', [])
4174 def recover(ui, repo):
4176 def recover(ui, repo):
4175 """roll back an interrupted transaction
4177 """roll back an interrupted transaction
4176
4178
4177 Recover from an interrupted commit or pull.
4179 Recover from an interrupted commit or pull.
4178
4180
4179 This command tries to fix the repository status after an
4181 This command tries to fix the repository status after an
4180 interrupted operation. It should only be necessary when Mercurial
4182 interrupted operation. It should only be necessary when Mercurial
4181 suggests it.
4183 suggests it.
4182
4184
4183 Returns 0 if successful, 1 if nothing to recover or verify fails.
4185 Returns 0 if successful, 1 if nothing to recover or verify fails.
4184 """
4186 """
4185 if repo.recover():
4187 if repo.recover():
4186 return hg.verify(repo)
4188 return hg.verify(repo)
4187 return 1
4189 return 1
4188
4190
4189 @command('^remove|rm',
4191 @command('^remove|rm',
4190 [('A', 'after', None, _('record delete for missing files')),
4192 [('A', 'after', None, _('record delete for missing files')),
4191 ('f', 'force', None,
4193 ('f', 'force', None,
4192 _('forget added files, delete modified files')),
4194 _('forget added files, delete modified files')),
4193 ] + subrepoopts + walkopts,
4195 ] + subrepoopts + walkopts,
4194 _('[OPTION]... FILE...'),
4196 _('[OPTION]... FILE...'),
4195 inferrepo=True)
4197 inferrepo=True)
4196 def remove(ui, repo, *pats, **opts):
4198 def remove(ui, repo, *pats, **opts):
4197 """remove the specified files on the next commit
4199 """remove the specified files on the next commit
4198
4200
4199 Schedule the indicated files for removal from the current branch.
4201 Schedule the indicated files for removal from the current branch.
4200
4202
4201 This command schedules the files to be removed at the next commit.
4203 This command schedules the files to be removed at the next commit.
4202 To undo a remove before that, see :hg:`revert`. To undo added
4204 To undo a remove before that, see :hg:`revert`. To undo added
4203 files, see :hg:`forget`.
4205 files, see :hg:`forget`.
4204
4206
4205 .. container:: verbose
4207 .. container:: verbose
4206
4208
4207 -A/--after can be used to remove only files that have already
4209 -A/--after can be used to remove only files that have already
4208 been deleted, -f/--force can be used to force deletion, and -Af
4210 been deleted, -f/--force can be used to force deletion, and -Af
4209 can be used to remove files from the next revision without
4211 can be used to remove files from the next revision without
4210 deleting them from the working directory.
4212 deleting them from the working directory.
4211
4213
4212 The following table details the behavior of remove for different
4214 The following table details the behavior of remove for different
4213 file states (columns) and option combinations (rows). The file
4215 file states (columns) and option combinations (rows). The file
4214 states are Added [A], Clean [C], Modified [M] and Missing [!]
4216 states are Added [A], Clean [C], Modified [M] and Missing [!]
4215 (as reported by :hg:`status`). The actions are Warn, Remove
4217 (as reported by :hg:`status`). The actions are Warn, Remove
4216 (from branch) and Delete (from disk):
4218 (from branch) and Delete (from disk):
4217
4219
4218 ========= == == == ==
4220 ========= == == == ==
4219 opt/state A C M !
4221 opt/state A C M !
4220 ========= == == == ==
4222 ========= == == == ==
4221 none W RD W R
4223 none W RD W R
4222 -f R RD RD R
4224 -f R RD RD R
4223 -A W W W R
4225 -A W W W R
4224 -Af R R R R
4226 -Af R R R R
4225 ========= == == == ==
4227 ========= == == == ==
4226
4228
4227 .. note::
4229 .. note::
4228
4230
4229 :hg:`remove` never deletes files in Added [A] state from the
4231 :hg:`remove` never deletes files in Added [A] state from the
4230 working directory, not even if ``--force`` is specified.
4232 working directory, not even if ``--force`` is specified.
4231
4233
4232 Returns 0 on success, 1 if any warnings encountered.
4234 Returns 0 on success, 1 if any warnings encountered.
4233 """
4235 """
4234
4236
4235 opts = pycompat.byteskwargs(opts)
4237 opts = pycompat.byteskwargs(opts)
4236 after, force = opts.get('after'), opts.get('force')
4238 after, force = opts.get('after'), opts.get('force')
4237 if not pats and not after:
4239 if not pats and not after:
4238 raise error.Abort(_('no files specified'))
4240 raise error.Abort(_('no files specified'))
4239
4241
4240 m = scmutil.match(repo[None], pats, opts)
4242 m = scmutil.match(repo[None], pats, opts)
4241 subrepos = opts.get('subrepos')
4243 subrepos = opts.get('subrepos')
4242 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4244 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4243
4245
4244 @command('rename|move|mv',
4246 @command('rename|move|mv',
4245 [('A', 'after', None, _('record a rename that has already occurred')),
4247 [('A', 'after', None, _('record a rename that has already occurred')),
4246 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4248 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4247 ] + walkopts + dryrunopts,
4249 ] + walkopts + dryrunopts,
4248 _('[OPTION]... SOURCE... DEST'))
4250 _('[OPTION]... SOURCE... DEST'))
4249 def rename(ui, repo, *pats, **opts):
4251 def rename(ui, repo, *pats, **opts):
4250 """rename files; equivalent of copy + remove
4252 """rename files; equivalent of copy + remove
4251
4253
4252 Mark dest as copies of sources; mark sources for deletion. If dest
4254 Mark dest as copies of sources; mark sources for deletion. If dest
4253 is a directory, copies are put in that directory. If dest is a
4255 is a directory, copies are put in that directory. If dest is a
4254 file, there can only be one source.
4256 file, there can only be one source.
4255
4257
4256 By default, this command copies the contents of files as they
4258 By default, this command copies the contents of files as they
4257 exist in the working directory. If invoked with -A/--after, the
4259 exist in the working directory. If invoked with -A/--after, the
4258 operation is recorded, but no copying is performed.
4260 operation is recorded, but no copying is performed.
4259
4261
4260 This command takes effect at the next commit. To undo a rename
4262 This command takes effect at the next commit. To undo a rename
4261 before that, see :hg:`revert`.
4263 before that, see :hg:`revert`.
4262
4264
4263 Returns 0 on success, 1 if errors are encountered.
4265 Returns 0 on success, 1 if errors are encountered.
4264 """
4266 """
4265 opts = pycompat.byteskwargs(opts)
4267 opts = pycompat.byteskwargs(opts)
4266 with repo.wlock(False):
4268 with repo.wlock(False):
4267 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4269 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4268
4270
4269 @command('resolve',
4271 @command('resolve',
4270 [('a', 'all', None, _('select all unresolved files')),
4272 [('a', 'all', None, _('select all unresolved files')),
4271 ('l', 'list', None, _('list state of files needing merge')),
4273 ('l', 'list', None, _('list state of files needing merge')),
4272 ('m', 'mark', None, _('mark files as resolved')),
4274 ('m', 'mark', None, _('mark files as resolved')),
4273 ('u', 'unmark', None, _('mark files as unresolved')),
4275 ('u', 'unmark', None, _('mark files as unresolved')),
4274 ('n', 'no-status', None, _('hide status prefix'))]
4276 ('n', 'no-status', None, _('hide status prefix'))]
4275 + mergetoolopts + walkopts + formatteropts,
4277 + mergetoolopts + walkopts + formatteropts,
4276 _('[OPTION]... [FILE]...'),
4278 _('[OPTION]... [FILE]...'),
4277 inferrepo=True)
4279 inferrepo=True)
4278 def resolve(ui, repo, *pats, **opts):
4280 def resolve(ui, repo, *pats, **opts):
4279 """redo merges or set/view the merge status of files
4281 """redo merges or set/view the merge status of files
4280
4282
4281 Merges with unresolved conflicts are often the result of
4283 Merges with unresolved conflicts are often the result of
4282 non-interactive merging using the ``internal:merge`` configuration
4284 non-interactive merging using the ``internal:merge`` configuration
4283 setting, or a command-line merge tool like ``diff3``. The resolve
4285 setting, or a command-line merge tool like ``diff3``. The resolve
4284 command is used to manage the files involved in a merge, after
4286 command is used to manage the files involved in a merge, after
4285 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4287 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4286 working directory must have two parents). See :hg:`help
4288 working directory must have two parents). See :hg:`help
4287 merge-tools` for information on configuring merge tools.
4289 merge-tools` for information on configuring merge tools.
4288
4290
4289 The resolve command can be used in the following ways:
4291 The resolve command can be used in the following ways:
4290
4292
4291 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4293 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4292 files, discarding any previous merge attempts. Re-merging is not
4294 files, discarding any previous merge attempts. Re-merging is not
4293 performed for files already marked as resolved. Use ``--all/-a``
4295 performed for files already marked as resolved. Use ``--all/-a``
4294 to select all unresolved files. ``--tool`` can be used to specify
4296 to select all unresolved files. ``--tool`` can be used to specify
4295 the merge tool used for the given files. It overrides the HGMERGE
4297 the merge tool used for the given files. It overrides the HGMERGE
4296 environment variable and your configuration files. Previous file
4298 environment variable and your configuration files. Previous file
4297 contents are saved with a ``.orig`` suffix.
4299 contents are saved with a ``.orig`` suffix.
4298
4300
4299 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4301 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4300 (e.g. after having manually fixed-up the files). The default is
4302 (e.g. after having manually fixed-up the files). The default is
4301 to mark all unresolved files.
4303 to mark all unresolved files.
4302
4304
4303 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4305 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4304 default is to mark all resolved files.
4306 default is to mark all resolved files.
4305
4307
4306 - :hg:`resolve -l`: list files which had or still have conflicts.
4308 - :hg:`resolve -l`: list files which had or still have conflicts.
4307 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4309 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4308 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4310 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4309 the list. See :hg:`help filesets` for details.
4311 the list. See :hg:`help filesets` for details.
4310
4312
4311 .. note::
4313 .. note::
4312
4314
4313 Mercurial will not let you commit files with unresolved merge
4315 Mercurial will not let you commit files with unresolved merge
4314 conflicts. You must use :hg:`resolve -m ...` before you can
4316 conflicts. You must use :hg:`resolve -m ...` before you can
4315 commit after a conflicting merge.
4317 commit after a conflicting merge.
4316
4318
4317 Returns 0 on success, 1 if any files fail a resolve attempt.
4319 Returns 0 on success, 1 if any files fail a resolve attempt.
4318 """
4320 """
4319
4321
4320 opts = pycompat.byteskwargs(opts)
4322 opts = pycompat.byteskwargs(opts)
4321 flaglist = 'all mark unmark list no_status'.split()
4323 flaglist = 'all mark unmark list no_status'.split()
4322 all, mark, unmark, show, nostatus = \
4324 all, mark, unmark, show, nostatus = \
4323 [opts.get(o) for o in flaglist]
4325 [opts.get(o) for o in flaglist]
4324
4326
4325 if (show and (mark or unmark)) or (mark and unmark):
4327 if (show and (mark or unmark)) or (mark and unmark):
4326 raise error.Abort(_("too many options specified"))
4328 raise error.Abort(_("too many options specified"))
4327 if pats and all:
4329 if pats and all:
4328 raise error.Abort(_("can't specify --all and patterns"))
4330 raise error.Abort(_("can't specify --all and patterns"))
4329 if not (all or pats or show or mark or unmark):
4331 if not (all or pats or show or mark or unmark):
4330 raise error.Abort(_('no files or directories specified'),
4332 raise error.Abort(_('no files or directories specified'),
4331 hint=('use --all to re-merge all unresolved files'))
4333 hint=('use --all to re-merge all unresolved files'))
4332
4334
4333 if show:
4335 if show:
4334 ui.pager('resolve')
4336 ui.pager('resolve')
4335 fm = ui.formatter('resolve', opts)
4337 fm = ui.formatter('resolve', opts)
4336 ms = mergemod.mergestate.read(repo)
4338 ms = mergemod.mergestate.read(repo)
4337 m = scmutil.match(repo[None], pats, opts)
4339 m = scmutil.match(repo[None], pats, opts)
4338
4340
4339 # Labels and keys based on merge state. Unresolved path conflicts show
4341 # Labels and keys based on merge state. Unresolved path conflicts show
4340 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4342 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4341 # resolved conflicts.
4343 # resolved conflicts.
4342 mergestateinfo = {
4344 mergestateinfo = {
4343 'u': ('resolve.unresolved', 'U'),
4345 'u': ('resolve.unresolved', 'U'),
4344 'r': ('resolve.resolved', 'R'),
4346 'r': ('resolve.resolved', 'R'),
4345 'pu': ('resolve.unresolved', 'P'),
4347 'pu': ('resolve.unresolved', 'P'),
4346 'pr': ('resolve.resolved', 'R'),
4348 'pr': ('resolve.resolved', 'R'),
4347 'd': ('resolve.driverresolved', 'D'),
4349 'd': ('resolve.driverresolved', 'D'),
4348 }
4350 }
4349
4351
4350 for f in ms:
4352 for f in ms:
4351 if not m(f):
4353 if not m(f):
4352 continue
4354 continue
4353
4355
4354 label, key = mergestateinfo[ms[f]]
4356 label, key = mergestateinfo[ms[f]]
4355 fm.startitem()
4357 fm.startitem()
4356 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4358 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4357 fm.write('path', '%s\n', f, label=label)
4359 fm.write('path', '%s\n', f, label=label)
4358 fm.end()
4360 fm.end()
4359 return 0
4361 return 0
4360
4362
4361 with repo.wlock():
4363 with repo.wlock():
4362 ms = mergemod.mergestate.read(repo)
4364 ms = mergemod.mergestate.read(repo)
4363
4365
4364 if not (ms.active() or repo.dirstate.p2() != nullid):
4366 if not (ms.active() or repo.dirstate.p2() != nullid):
4365 raise error.Abort(
4367 raise error.Abort(
4366 _('resolve command not applicable when not merging'))
4368 _('resolve command not applicable when not merging'))
4367
4369
4368 wctx = repo[None]
4370 wctx = repo[None]
4369
4371
4370 if ms.mergedriver and ms.mdstate() == 'u':
4372 if ms.mergedriver and ms.mdstate() == 'u':
4371 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4373 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4372 ms.commit()
4374 ms.commit()
4373 # allow mark and unmark to go through
4375 # allow mark and unmark to go through
4374 if not mark and not unmark and not proceed:
4376 if not mark and not unmark and not proceed:
4375 return 1
4377 return 1
4376
4378
4377 m = scmutil.match(wctx, pats, opts)
4379 m = scmutil.match(wctx, pats, opts)
4378 ret = 0
4380 ret = 0
4379 didwork = False
4381 didwork = False
4380 runconclude = False
4382 runconclude = False
4381
4383
4382 tocomplete = []
4384 tocomplete = []
4383 for f in ms:
4385 for f in ms:
4384 if not m(f):
4386 if not m(f):
4385 continue
4387 continue
4386
4388
4387 didwork = True
4389 didwork = True
4388
4390
4389 # don't let driver-resolved files be marked, and run the conclude
4391 # don't let driver-resolved files be marked, and run the conclude
4390 # step if asked to resolve
4392 # step if asked to resolve
4391 if ms[f] == "d":
4393 if ms[f] == "d":
4392 exact = m.exact(f)
4394 exact = m.exact(f)
4393 if mark:
4395 if mark:
4394 if exact:
4396 if exact:
4395 ui.warn(_('not marking %s as it is driver-resolved\n')
4397 ui.warn(_('not marking %s as it is driver-resolved\n')
4396 % f)
4398 % f)
4397 elif unmark:
4399 elif unmark:
4398 if exact:
4400 if exact:
4399 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4401 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4400 % f)
4402 % f)
4401 else:
4403 else:
4402 runconclude = True
4404 runconclude = True
4403 continue
4405 continue
4404
4406
4405 # path conflicts must be resolved manually
4407 # path conflicts must be resolved manually
4406 if ms[f] in ("pu", "pr"):
4408 if ms[f] in ("pu", "pr"):
4407 if mark:
4409 if mark:
4408 ms.mark(f, "pr")
4410 ms.mark(f, "pr")
4409 elif unmark:
4411 elif unmark:
4410 ms.mark(f, "pu")
4412 ms.mark(f, "pu")
4411 elif ms[f] == "pu":
4413 elif ms[f] == "pu":
4412 ui.warn(_('%s: path conflict must be resolved manually\n')
4414 ui.warn(_('%s: path conflict must be resolved manually\n')
4413 % f)
4415 % f)
4414 continue
4416 continue
4415
4417
4416 if mark:
4418 if mark:
4417 ms.mark(f, "r")
4419 ms.mark(f, "r")
4418 elif unmark:
4420 elif unmark:
4419 ms.mark(f, "u")
4421 ms.mark(f, "u")
4420 else:
4422 else:
4421 # backup pre-resolve (merge uses .orig for its own purposes)
4423 # backup pre-resolve (merge uses .orig for its own purposes)
4422 a = repo.wjoin(f)
4424 a = repo.wjoin(f)
4423 try:
4425 try:
4424 util.copyfile(a, a + ".resolve")
4426 util.copyfile(a, a + ".resolve")
4425 except (IOError, OSError) as inst:
4427 except (IOError, OSError) as inst:
4426 if inst.errno != errno.ENOENT:
4428 if inst.errno != errno.ENOENT:
4427 raise
4429 raise
4428
4430
4429 try:
4431 try:
4430 # preresolve file
4432 # preresolve file
4431 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4433 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4432 'resolve')
4434 'resolve')
4433 complete, r = ms.preresolve(f, wctx)
4435 complete, r = ms.preresolve(f, wctx)
4434 if not complete:
4436 if not complete:
4435 tocomplete.append(f)
4437 tocomplete.append(f)
4436 elif r:
4438 elif r:
4437 ret = 1
4439 ret = 1
4438 finally:
4440 finally:
4439 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4441 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4440 ms.commit()
4442 ms.commit()
4441
4443
4442 # replace filemerge's .orig file with our resolve file, but only
4444 # replace filemerge's .orig file with our resolve file, but only
4443 # for merges that are complete
4445 # for merges that are complete
4444 if complete:
4446 if complete:
4445 try:
4447 try:
4446 util.rename(a + ".resolve",
4448 util.rename(a + ".resolve",
4447 scmutil.origpath(ui, repo, a))
4449 scmutil.origpath(ui, repo, a))
4448 except OSError as inst:
4450 except OSError as inst:
4449 if inst.errno != errno.ENOENT:
4451 if inst.errno != errno.ENOENT:
4450 raise
4452 raise
4451
4453
4452 for f in tocomplete:
4454 for f in tocomplete:
4453 try:
4455 try:
4454 # resolve file
4456 # resolve file
4455 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4457 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4456 'resolve')
4458 'resolve')
4457 r = ms.resolve(f, wctx)
4459 r = ms.resolve(f, wctx)
4458 if r:
4460 if r:
4459 ret = 1
4461 ret = 1
4460 finally:
4462 finally:
4461 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4463 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4462 ms.commit()
4464 ms.commit()
4463
4465
4464 # replace filemerge's .orig file with our resolve file
4466 # replace filemerge's .orig file with our resolve file
4465 a = repo.wjoin(f)
4467 a = repo.wjoin(f)
4466 try:
4468 try:
4467 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4469 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4468 except OSError as inst:
4470 except OSError as inst:
4469 if inst.errno != errno.ENOENT:
4471 if inst.errno != errno.ENOENT:
4470 raise
4472 raise
4471
4473
4472 ms.commit()
4474 ms.commit()
4473 ms.recordactions()
4475 ms.recordactions()
4474
4476
4475 if not didwork and pats:
4477 if not didwork and pats:
4476 hint = None
4478 hint = None
4477 if not any([p for p in pats if p.find(':') >= 0]):
4479 if not any([p for p in pats if p.find(':') >= 0]):
4478 pats = ['path:%s' % p for p in pats]
4480 pats = ['path:%s' % p for p in pats]
4479 m = scmutil.match(wctx, pats, opts)
4481 m = scmutil.match(wctx, pats, opts)
4480 for f in ms:
4482 for f in ms:
4481 if not m(f):
4483 if not m(f):
4482 continue
4484 continue
4483 flags = ''.join(['-%s ' % o[0] for o in flaglist
4485 flags = ''.join(['-%s ' % o[0] for o in flaglist
4484 if opts.get(o)])
4486 if opts.get(o)])
4485 hint = _("(try: hg resolve %s%s)\n") % (
4487 hint = _("(try: hg resolve %s%s)\n") % (
4486 flags,
4488 flags,
4487 ' '.join(pats))
4489 ' '.join(pats))
4488 break
4490 break
4489 ui.warn(_("arguments do not match paths that need resolving\n"))
4491 ui.warn(_("arguments do not match paths that need resolving\n"))
4490 if hint:
4492 if hint:
4491 ui.warn(hint)
4493 ui.warn(hint)
4492 elif ms.mergedriver and ms.mdstate() != 's':
4494 elif ms.mergedriver and ms.mdstate() != 's':
4493 # run conclude step when either a driver-resolved file is requested
4495 # run conclude step when either a driver-resolved file is requested
4494 # or there are no driver-resolved files
4496 # or there are no driver-resolved files
4495 # we can't use 'ret' to determine whether any files are unresolved
4497 # we can't use 'ret' to determine whether any files are unresolved
4496 # because we might not have tried to resolve some
4498 # because we might not have tried to resolve some
4497 if ((runconclude or not list(ms.driverresolved()))
4499 if ((runconclude or not list(ms.driverresolved()))
4498 and not list(ms.unresolved())):
4500 and not list(ms.unresolved())):
4499 proceed = mergemod.driverconclude(repo, ms, wctx)
4501 proceed = mergemod.driverconclude(repo, ms, wctx)
4500 ms.commit()
4502 ms.commit()
4501 if not proceed:
4503 if not proceed:
4502 return 1
4504 return 1
4503
4505
4504 # Nudge users into finishing an unfinished operation
4506 # Nudge users into finishing an unfinished operation
4505 unresolvedf = list(ms.unresolved())
4507 unresolvedf = list(ms.unresolved())
4506 driverresolvedf = list(ms.driverresolved())
4508 driverresolvedf = list(ms.driverresolved())
4507 if not unresolvedf and not driverresolvedf:
4509 if not unresolvedf and not driverresolvedf:
4508 ui.status(_('(no more unresolved files)\n'))
4510 ui.status(_('(no more unresolved files)\n'))
4509 cmdutil.checkafterresolved(repo)
4511 cmdutil.checkafterresolved(repo)
4510 elif not unresolvedf:
4512 elif not unresolvedf:
4511 ui.status(_('(no more unresolved files -- '
4513 ui.status(_('(no more unresolved files -- '
4512 'run "hg resolve --all" to conclude)\n'))
4514 'run "hg resolve --all" to conclude)\n'))
4513
4515
4514 return ret
4516 return ret
4515
4517
4516 @command('revert',
4518 @command('revert',
4517 [('a', 'all', None, _('revert all changes when no arguments given')),
4519 [('a', 'all', None, _('revert all changes when no arguments given')),
4518 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4520 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4519 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4521 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4520 ('C', 'no-backup', None, _('do not save backup copies of files')),
4522 ('C', 'no-backup', None, _('do not save backup copies of files')),
4521 ('i', 'interactive', None, _('interactively select the changes')),
4523 ('i', 'interactive', None, _('interactively select the changes')),
4522 ] + walkopts + dryrunopts,
4524 ] + walkopts + dryrunopts,
4523 _('[OPTION]... [-r REV] [NAME]...'))
4525 _('[OPTION]... [-r REV] [NAME]...'))
4524 def revert(ui, repo, *pats, **opts):
4526 def revert(ui, repo, *pats, **opts):
4525 """restore files to their checkout state
4527 """restore files to their checkout state
4526
4528
4527 .. note::
4529 .. note::
4528
4530
4529 To check out earlier revisions, you should use :hg:`update REV`.
4531 To check out earlier revisions, you should use :hg:`update REV`.
4530 To cancel an uncommitted merge (and lose your changes),
4532 To cancel an uncommitted merge (and lose your changes),
4531 use :hg:`update --clean .`.
4533 use :hg:`update --clean .`.
4532
4534
4533 With no revision specified, revert the specified files or directories
4535 With no revision specified, revert the specified files or directories
4534 to the contents they had in the parent of the working directory.
4536 to the contents they had in the parent of the working directory.
4535 This restores the contents of files to an unmodified
4537 This restores the contents of files to an unmodified
4536 state and unschedules adds, removes, copies, and renames. If the
4538 state and unschedules adds, removes, copies, and renames. If the
4537 working directory has two parents, you must explicitly specify a
4539 working directory has two parents, you must explicitly specify a
4538 revision.
4540 revision.
4539
4541
4540 Using the -r/--rev or -d/--date options, revert the given files or
4542 Using the -r/--rev or -d/--date options, revert the given files or
4541 directories to their states as of a specific revision. Because
4543 directories to their states as of a specific revision. Because
4542 revert does not change the working directory parents, this will
4544 revert does not change the working directory parents, this will
4543 cause these files to appear modified. This can be helpful to "back
4545 cause these files to appear modified. This can be helpful to "back
4544 out" some or all of an earlier change. See :hg:`backout` for a
4546 out" some or all of an earlier change. See :hg:`backout` for a
4545 related method.
4547 related method.
4546
4548
4547 Modified files are saved with a .orig suffix before reverting.
4549 Modified files are saved with a .orig suffix before reverting.
4548 To disable these backups, use --no-backup. It is possible to store
4550 To disable these backups, use --no-backup. It is possible to store
4549 the backup files in a custom directory relative to the root of the
4551 the backup files in a custom directory relative to the root of the
4550 repository by setting the ``ui.origbackuppath`` configuration
4552 repository by setting the ``ui.origbackuppath`` configuration
4551 option.
4553 option.
4552
4554
4553 See :hg:`help dates` for a list of formats valid for -d/--date.
4555 See :hg:`help dates` for a list of formats valid for -d/--date.
4554
4556
4555 See :hg:`help backout` for a way to reverse the effect of an
4557 See :hg:`help backout` for a way to reverse the effect of an
4556 earlier changeset.
4558 earlier changeset.
4557
4559
4558 Returns 0 on success.
4560 Returns 0 on success.
4559 """
4561 """
4560
4562
4561 if opts.get("date"):
4563 if opts.get("date"):
4562 if opts.get("rev"):
4564 if opts.get("rev"):
4563 raise error.Abort(_("you can't specify a revision and a date"))
4565 raise error.Abort(_("you can't specify a revision and a date"))
4564 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4566 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4565
4567
4566 parent, p2 = repo.dirstate.parents()
4568 parent, p2 = repo.dirstate.parents()
4567 if not opts.get('rev') and p2 != nullid:
4569 if not opts.get('rev') and p2 != nullid:
4568 # revert after merge is a trap for new users (issue2915)
4570 # revert after merge is a trap for new users (issue2915)
4569 raise error.Abort(_('uncommitted merge with no revision specified'),
4571 raise error.Abort(_('uncommitted merge with no revision specified'),
4570 hint=_("use 'hg update' or see 'hg help revert'"))
4572 hint=_("use 'hg update' or see 'hg help revert'"))
4571
4573
4572 ctx = scmutil.revsingle(repo, opts.get('rev'))
4574 ctx = scmutil.revsingle(repo, opts.get('rev'))
4573
4575
4574 if (not (pats or opts.get('include') or opts.get('exclude') or
4576 if (not (pats or opts.get('include') or opts.get('exclude') or
4575 opts.get('all') or opts.get('interactive'))):
4577 opts.get('all') or opts.get('interactive'))):
4576 msg = _("no files or directories specified")
4578 msg = _("no files or directories specified")
4577 if p2 != nullid:
4579 if p2 != nullid:
4578 hint = _("uncommitted merge, use --all to discard all changes,"
4580 hint = _("uncommitted merge, use --all to discard all changes,"
4579 " or 'hg update -C .' to abort the merge")
4581 " or 'hg update -C .' to abort the merge")
4580 raise error.Abort(msg, hint=hint)
4582 raise error.Abort(msg, hint=hint)
4581 dirty = any(repo.status())
4583 dirty = any(repo.status())
4582 node = ctx.node()
4584 node = ctx.node()
4583 if node != parent:
4585 if node != parent:
4584 if dirty:
4586 if dirty:
4585 hint = _("uncommitted changes, use --all to discard all"
4587 hint = _("uncommitted changes, use --all to discard all"
4586 " changes, or 'hg update %s' to update") % ctx.rev()
4588 " changes, or 'hg update %s' to update") % ctx.rev()
4587 else:
4589 else:
4588 hint = _("use --all to revert all files,"
4590 hint = _("use --all to revert all files,"
4589 " or 'hg update %s' to update") % ctx.rev()
4591 " or 'hg update %s' to update") % ctx.rev()
4590 elif dirty:
4592 elif dirty:
4591 hint = _("uncommitted changes, use --all to discard all changes")
4593 hint = _("uncommitted changes, use --all to discard all changes")
4592 else:
4594 else:
4593 hint = _("use --all to revert all files")
4595 hint = _("use --all to revert all files")
4594 raise error.Abort(msg, hint=hint)
4596 raise error.Abort(msg, hint=hint)
4595
4597
4596 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4598 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4597
4599
4598 @command('rollback', dryrunopts +
4600 @command('rollback', dryrunopts +
4599 [('f', 'force', False, _('ignore safety measures'))])
4601 [('f', 'force', False, _('ignore safety measures'))])
4600 def rollback(ui, repo, **opts):
4602 def rollback(ui, repo, **opts):
4601 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4603 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4602
4604
4603 Please use :hg:`commit --amend` instead of rollback to correct
4605 Please use :hg:`commit --amend` instead of rollback to correct
4604 mistakes in the last commit.
4606 mistakes in the last commit.
4605
4607
4606 This command should be used with care. There is only one level of
4608 This command should be used with care. There is only one level of
4607 rollback, and there is no way to undo a rollback. It will also
4609 rollback, and there is no way to undo a rollback. It will also
4608 restore the dirstate at the time of the last transaction, losing
4610 restore the dirstate at the time of the last transaction, losing
4609 any dirstate changes since that time. This command does not alter
4611 any dirstate changes since that time. This command does not alter
4610 the working directory.
4612 the working directory.
4611
4613
4612 Transactions are used to encapsulate the effects of all commands
4614 Transactions are used to encapsulate the effects of all commands
4613 that create new changesets or propagate existing changesets into a
4615 that create new changesets or propagate existing changesets into a
4614 repository.
4616 repository.
4615
4617
4616 .. container:: verbose
4618 .. container:: verbose
4617
4619
4618 For example, the following commands are transactional, and their
4620 For example, the following commands are transactional, and their
4619 effects can be rolled back:
4621 effects can be rolled back:
4620
4622
4621 - commit
4623 - commit
4622 - import
4624 - import
4623 - pull
4625 - pull
4624 - push (with this repository as the destination)
4626 - push (with this repository as the destination)
4625 - unbundle
4627 - unbundle
4626
4628
4627 To avoid permanent data loss, rollback will refuse to rollback a
4629 To avoid permanent data loss, rollback will refuse to rollback a
4628 commit transaction if it isn't checked out. Use --force to
4630 commit transaction if it isn't checked out. Use --force to
4629 override this protection.
4631 override this protection.
4630
4632
4631 The rollback command can be entirely disabled by setting the
4633 The rollback command can be entirely disabled by setting the
4632 ``ui.rollback`` configuration setting to false. If you're here
4634 ``ui.rollback`` configuration setting to false. If you're here
4633 because you want to use rollback and it's disabled, you can
4635 because you want to use rollback and it's disabled, you can
4634 re-enable the command by setting ``ui.rollback`` to true.
4636 re-enable the command by setting ``ui.rollback`` to true.
4635
4637
4636 This command is not intended for use on public repositories. Once
4638 This command is not intended for use on public repositories. Once
4637 changes are visible for pull by other users, rolling a transaction
4639 changes are visible for pull by other users, rolling a transaction
4638 back locally is ineffective (someone else may already have pulled
4640 back locally is ineffective (someone else may already have pulled
4639 the changes). Furthermore, a race is possible with readers of the
4641 the changes). Furthermore, a race is possible with readers of the
4640 repository; for example an in-progress pull from the repository
4642 repository; for example an in-progress pull from the repository
4641 may fail if a rollback is performed.
4643 may fail if a rollback is performed.
4642
4644
4643 Returns 0 on success, 1 if no rollback data is available.
4645 Returns 0 on success, 1 if no rollback data is available.
4644 """
4646 """
4645 if not ui.configbool('ui', 'rollback'):
4647 if not ui.configbool('ui', 'rollback'):
4646 raise error.Abort(_('rollback is disabled because it is unsafe'),
4648 raise error.Abort(_('rollback is disabled because it is unsafe'),
4647 hint=('see `hg help -v rollback` for information'))
4649 hint=('see `hg help -v rollback` for information'))
4648 return repo.rollback(dryrun=opts.get(r'dry_run'),
4650 return repo.rollback(dryrun=opts.get(r'dry_run'),
4649 force=opts.get(r'force'))
4651 force=opts.get(r'force'))
4650
4652
4651 @command('root', [])
4653 @command('root', [], cmdtype=readonly)
4652 def root(ui, repo):
4654 def root(ui, repo):
4653 """print the root (top) of the current working directory
4655 """print the root (top) of the current working directory
4654
4656
4655 Print the root directory of the current repository.
4657 Print the root directory of the current repository.
4656
4658
4657 Returns 0 on success.
4659 Returns 0 on success.
4658 """
4660 """
4659 ui.write(repo.root + "\n")
4661 ui.write(repo.root + "\n")
4660
4662
4661 @command('^serve',
4663 @command('^serve',
4662 [('A', 'accesslog', '', _('name of access log file to write to'),
4664 [('A', 'accesslog', '', _('name of access log file to write to'),
4663 _('FILE')),
4665 _('FILE')),
4664 ('d', 'daemon', None, _('run server in background')),
4666 ('d', 'daemon', None, _('run server in background')),
4665 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4667 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4666 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4668 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4667 # use string type, then we can check if something was passed
4669 # use string type, then we can check if something was passed
4668 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4670 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4669 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4671 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4670 _('ADDR')),
4672 _('ADDR')),
4671 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4673 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4672 _('PREFIX')),
4674 _('PREFIX')),
4673 ('n', 'name', '',
4675 ('n', 'name', '',
4674 _('name to show in web pages (default: working directory)'), _('NAME')),
4676 _('name to show in web pages (default: working directory)'), _('NAME')),
4675 ('', 'web-conf', '',
4677 ('', 'web-conf', '',
4676 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4678 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4677 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4679 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4678 _('FILE')),
4680 _('FILE')),
4679 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4681 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4680 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4682 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4681 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4683 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4682 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4684 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4683 ('', 'style', '', _('template style to use'), _('STYLE')),
4685 ('', 'style', '', _('template style to use'), _('STYLE')),
4684 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4686 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4685 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4687 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4686 + subrepoopts,
4688 + subrepoopts,
4687 _('[OPTION]...'),
4689 _('[OPTION]...'),
4688 optionalrepo=True)
4690 optionalrepo=True)
4689 def serve(ui, repo, **opts):
4691 def serve(ui, repo, **opts):
4690 """start stand-alone webserver
4692 """start stand-alone webserver
4691
4693
4692 Start a local HTTP repository browser and pull server. You can use
4694 Start a local HTTP repository browser and pull server. You can use
4693 this for ad-hoc sharing and browsing of repositories. It is
4695 this for ad-hoc sharing and browsing of repositories. It is
4694 recommended to use a real web server to serve a repository for
4696 recommended to use a real web server to serve a repository for
4695 longer periods of time.
4697 longer periods of time.
4696
4698
4697 Please note that the server does not implement access control.
4699 Please note that the server does not implement access control.
4698 This means that, by default, anybody can read from the server and
4700 This means that, by default, anybody can read from the server and
4699 nobody can write to it by default. Set the ``web.allow-push``
4701 nobody can write to it by default. Set the ``web.allow-push``
4700 option to ``*`` to allow everybody to push to the server. You
4702 option to ``*`` to allow everybody to push to the server. You
4701 should use a real web server if you need to authenticate users.
4703 should use a real web server if you need to authenticate users.
4702
4704
4703 By default, the server logs accesses to stdout and errors to
4705 By default, the server logs accesses to stdout and errors to
4704 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4706 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4705 files.
4707 files.
4706
4708
4707 To have the server choose a free port number to listen on, specify
4709 To have the server choose a free port number to listen on, specify
4708 a port number of 0; in this case, the server will print the port
4710 a port number of 0; in this case, the server will print the port
4709 number it uses.
4711 number it uses.
4710
4712
4711 Returns 0 on success.
4713 Returns 0 on success.
4712 """
4714 """
4713
4715
4714 opts = pycompat.byteskwargs(opts)
4716 opts = pycompat.byteskwargs(opts)
4715 if opts["stdio"] and opts["cmdserver"]:
4717 if opts["stdio"] and opts["cmdserver"]:
4716 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4718 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4717
4719
4718 if opts["stdio"]:
4720 if opts["stdio"]:
4719 if repo is None:
4721 if repo is None:
4720 raise error.RepoError(_("there is no Mercurial repository here"
4722 raise error.RepoError(_("there is no Mercurial repository here"
4721 " (.hg not found)"))
4723 " (.hg not found)"))
4722 s = sshserver.sshserver(ui, repo)
4724 s = sshserver.sshserver(ui, repo)
4723 s.serve_forever()
4725 s.serve_forever()
4724
4726
4725 service = server.createservice(ui, repo, opts)
4727 service = server.createservice(ui, repo, opts)
4726 return server.runservice(opts, initfn=service.init, runfn=service.run)
4728 return server.runservice(opts, initfn=service.init, runfn=service.run)
4727
4729
4728 @command('^status|st',
4730 @command('^status|st',
4729 [('A', 'all', None, _('show status of all files')),
4731 [('A', 'all', None, _('show status of all files')),
4730 ('m', 'modified', None, _('show only modified files')),
4732 ('m', 'modified', None, _('show only modified files')),
4731 ('a', 'added', None, _('show only added files')),
4733 ('a', 'added', None, _('show only added files')),
4732 ('r', 'removed', None, _('show only removed files')),
4734 ('r', 'removed', None, _('show only removed files')),
4733 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4735 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4734 ('c', 'clean', None, _('show only files without changes')),
4736 ('c', 'clean', None, _('show only files without changes')),
4735 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4737 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4736 ('i', 'ignored', None, _('show only ignored files')),
4738 ('i', 'ignored', None, _('show only ignored files')),
4737 ('n', 'no-status', None, _('hide status prefix')),
4739 ('n', 'no-status', None, _('hide status prefix')),
4738 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4740 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4739 ('C', 'copies', None, _('show source of copied files')),
4741 ('C', 'copies', None, _('show source of copied files')),
4740 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4742 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4741 ('', 'rev', [], _('show difference from revision'), _('REV')),
4743 ('', 'rev', [], _('show difference from revision'), _('REV')),
4742 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4744 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4743 ] + walkopts + subrepoopts + formatteropts,
4745 ] + walkopts + subrepoopts + formatteropts,
4744 _('[OPTION]... [FILE]...'),
4746 _('[OPTION]... [FILE]...'),
4745 inferrepo=True)
4747 inferrepo=True, cmdtype=readonly)
4746 def status(ui, repo, *pats, **opts):
4748 def status(ui, repo, *pats, **opts):
4747 """show changed files in the working directory
4749 """show changed files in the working directory
4748
4750
4749 Show status of files in the repository. If names are given, only
4751 Show status of files in the repository. If names are given, only
4750 files that match are shown. Files that are clean or ignored or
4752 files that match are shown. Files that are clean or ignored or
4751 the source of a copy/move operation, are not listed unless
4753 the source of a copy/move operation, are not listed unless
4752 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4754 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4753 Unless options described with "show only ..." are given, the
4755 Unless options described with "show only ..." are given, the
4754 options -mardu are used.
4756 options -mardu are used.
4755
4757
4756 Option -q/--quiet hides untracked (unknown and ignored) files
4758 Option -q/--quiet hides untracked (unknown and ignored) files
4757 unless explicitly requested with -u/--unknown or -i/--ignored.
4759 unless explicitly requested with -u/--unknown or -i/--ignored.
4758
4760
4759 .. note::
4761 .. note::
4760
4762
4761 :hg:`status` may appear to disagree with diff if permissions have
4763 :hg:`status` may appear to disagree with diff if permissions have
4762 changed or a merge has occurred. The standard diff format does
4764 changed or a merge has occurred. The standard diff format does
4763 not report permission changes and diff only reports changes
4765 not report permission changes and diff only reports changes
4764 relative to one merge parent.
4766 relative to one merge parent.
4765
4767
4766 If one revision is given, it is used as the base revision.
4768 If one revision is given, it is used as the base revision.
4767 If two revisions are given, the differences between them are
4769 If two revisions are given, the differences between them are
4768 shown. The --change option can also be used as a shortcut to list
4770 shown. The --change option can also be used as a shortcut to list
4769 the changed files of a revision from its first parent.
4771 the changed files of a revision from its first parent.
4770
4772
4771 The codes used to show the status of files are::
4773 The codes used to show the status of files are::
4772
4774
4773 M = modified
4775 M = modified
4774 A = added
4776 A = added
4775 R = removed
4777 R = removed
4776 C = clean
4778 C = clean
4777 ! = missing (deleted by non-hg command, but still tracked)
4779 ! = missing (deleted by non-hg command, but still tracked)
4778 ? = not tracked
4780 ? = not tracked
4779 I = ignored
4781 I = ignored
4780 = origin of the previous file (with --copies)
4782 = origin of the previous file (with --copies)
4781
4783
4782 .. container:: verbose
4784 .. container:: verbose
4783
4785
4784 The -t/--terse option abbreviates the output by showing only the directory
4786 The -t/--terse option abbreviates the output by showing only the directory
4785 name if all the files in it share the same status. The option takes an
4787 name if all the files in it share the same status. The option takes an
4786 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4788 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4787 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4789 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4788 for 'ignored' and 'c' for clean.
4790 for 'ignored' and 'c' for clean.
4789
4791
4790 It abbreviates only those statuses which are passed. Note that clean and
4792 It abbreviates only those statuses which are passed. Note that clean and
4791 ignored files are not displayed with '--terse ic' unless the -c/--clean
4793 ignored files are not displayed with '--terse ic' unless the -c/--clean
4792 and -i/--ignored options are also used.
4794 and -i/--ignored options are also used.
4793
4795
4794 The -v/--verbose option shows information when the repository is in an
4796 The -v/--verbose option shows information when the repository is in an
4795 unfinished merge, shelve, rebase state etc. You can have this behavior
4797 unfinished merge, shelve, rebase state etc. You can have this behavior
4796 turned on by default by enabling the ``commands.status.verbose`` option.
4798 turned on by default by enabling the ``commands.status.verbose`` option.
4797
4799
4798 You can skip displaying some of these states by setting
4800 You can skip displaying some of these states by setting
4799 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4801 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4800 'histedit', 'merge', 'rebase', or 'unshelve'.
4802 'histedit', 'merge', 'rebase', or 'unshelve'.
4801
4803
4802 Examples:
4804 Examples:
4803
4805
4804 - show changes in the working directory relative to a
4806 - show changes in the working directory relative to a
4805 changeset::
4807 changeset::
4806
4808
4807 hg status --rev 9353
4809 hg status --rev 9353
4808
4810
4809 - show changes in the working directory relative to the
4811 - show changes in the working directory relative to the
4810 current directory (see :hg:`help patterns` for more information)::
4812 current directory (see :hg:`help patterns` for more information)::
4811
4813
4812 hg status re:
4814 hg status re:
4813
4815
4814 - show all changes including copies in an existing changeset::
4816 - show all changes including copies in an existing changeset::
4815
4817
4816 hg status --copies --change 9353
4818 hg status --copies --change 9353
4817
4819
4818 - get a NUL separated list of added files, suitable for xargs::
4820 - get a NUL separated list of added files, suitable for xargs::
4819
4821
4820 hg status -an0
4822 hg status -an0
4821
4823
4822 - show more information about the repository status, abbreviating
4824 - show more information about the repository status, abbreviating
4823 added, removed, modified, deleted, and untracked paths::
4825 added, removed, modified, deleted, and untracked paths::
4824
4826
4825 hg status -v -t mardu
4827 hg status -v -t mardu
4826
4828
4827 Returns 0 on success.
4829 Returns 0 on success.
4828
4830
4829 """
4831 """
4830
4832
4831 opts = pycompat.byteskwargs(opts)
4833 opts = pycompat.byteskwargs(opts)
4832 revs = opts.get('rev')
4834 revs = opts.get('rev')
4833 change = opts.get('change')
4835 change = opts.get('change')
4834 terse = opts.get('terse')
4836 terse = opts.get('terse')
4835
4837
4836 if revs and change:
4838 if revs and change:
4837 msg = _('cannot specify --rev and --change at the same time')
4839 msg = _('cannot specify --rev and --change at the same time')
4838 raise error.Abort(msg)
4840 raise error.Abort(msg)
4839 elif revs and terse:
4841 elif revs and terse:
4840 msg = _('cannot use --terse with --rev')
4842 msg = _('cannot use --terse with --rev')
4841 raise error.Abort(msg)
4843 raise error.Abort(msg)
4842 elif change:
4844 elif change:
4843 node2 = scmutil.revsingle(repo, change, None).node()
4845 node2 = scmutil.revsingle(repo, change, None).node()
4844 node1 = repo[node2].p1().node()
4846 node1 = repo[node2].p1().node()
4845 else:
4847 else:
4846 node1, node2 = scmutil.revpair(repo, revs)
4848 node1, node2 = scmutil.revpair(repo, revs)
4847
4849
4848 if pats or ui.configbool('commands', 'status.relative'):
4850 if pats or ui.configbool('commands', 'status.relative'):
4849 cwd = repo.getcwd()
4851 cwd = repo.getcwd()
4850 else:
4852 else:
4851 cwd = ''
4853 cwd = ''
4852
4854
4853 if opts.get('print0'):
4855 if opts.get('print0'):
4854 end = '\0'
4856 end = '\0'
4855 else:
4857 else:
4856 end = '\n'
4858 end = '\n'
4857 copy = {}
4859 copy = {}
4858 states = 'modified added removed deleted unknown ignored clean'.split()
4860 states = 'modified added removed deleted unknown ignored clean'.split()
4859 show = [k for k in states if opts.get(k)]
4861 show = [k for k in states if opts.get(k)]
4860 if opts.get('all'):
4862 if opts.get('all'):
4861 show += ui.quiet and (states[:4] + ['clean']) or states
4863 show += ui.quiet and (states[:4] + ['clean']) or states
4862
4864
4863 if not show:
4865 if not show:
4864 if ui.quiet:
4866 if ui.quiet:
4865 show = states[:4]
4867 show = states[:4]
4866 else:
4868 else:
4867 show = states[:5]
4869 show = states[:5]
4868
4870
4869 m = scmutil.match(repo[node2], pats, opts)
4871 m = scmutil.match(repo[node2], pats, opts)
4870 if terse:
4872 if terse:
4871 # we need to compute clean and unknown to terse
4873 # we need to compute clean and unknown to terse
4872 stat = repo.status(node1, node2, m,
4874 stat = repo.status(node1, node2, m,
4873 'ignored' in show or 'i' in terse,
4875 'ignored' in show or 'i' in terse,
4874 True, True, opts.get('subrepos'))
4876 True, True, opts.get('subrepos'))
4875
4877
4876 stat = cmdutil.tersedir(stat, terse)
4878 stat = cmdutil.tersedir(stat, terse)
4877 else:
4879 else:
4878 stat = repo.status(node1, node2, m,
4880 stat = repo.status(node1, node2, m,
4879 'ignored' in show, 'clean' in show,
4881 'ignored' in show, 'clean' in show,
4880 'unknown' in show, opts.get('subrepos'))
4882 'unknown' in show, opts.get('subrepos'))
4881
4883
4882 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4884 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4883
4885
4884 if (opts.get('all') or opts.get('copies')
4886 if (opts.get('all') or opts.get('copies')
4885 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4887 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4886 copy = copies.pathcopies(repo[node1], repo[node2], m)
4888 copy = copies.pathcopies(repo[node1], repo[node2], m)
4887
4889
4888 ui.pager('status')
4890 ui.pager('status')
4889 fm = ui.formatter('status', opts)
4891 fm = ui.formatter('status', opts)
4890 fmt = '%s' + end
4892 fmt = '%s' + end
4891 showchar = not opts.get('no_status')
4893 showchar = not opts.get('no_status')
4892
4894
4893 for state, char, files in changestates:
4895 for state, char, files in changestates:
4894 if state in show:
4896 if state in show:
4895 label = 'status.' + state
4897 label = 'status.' + state
4896 for f in files:
4898 for f in files:
4897 fm.startitem()
4899 fm.startitem()
4898 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4900 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4899 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4901 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4900 if f in copy:
4902 if f in copy:
4901 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4903 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4902 label='status.copied')
4904 label='status.copied')
4903
4905
4904 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
4906 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
4905 and not ui.plain()):
4907 and not ui.plain()):
4906 cmdutil.morestatus(repo, fm)
4908 cmdutil.morestatus(repo, fm)
4907 fm.end()
4909 fm.end()
4908
4910
4909 @command('^summary|sum',
4911 @command('^summary|sum',
4910 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4912 [('', 'remote', None, _('check for push and pull'))],
4913 '[--remote]', cmdtype=readonly)
4911 def summary(ui, repo, **opts):
4914 def summary(ui, repo, **opts):
4912 """summarize working directory state
4915 """summarize working directory state
4913
4916
4914 This generates a brief summary of the working directory state,
4917 This generates a brief summary of the working directory state,
4915 including parents, branch, commit status, phase and available updates.
4918 including parents, branch, commit status, phase and available updates.
4916
4919
4917 With the --remote option, this will check the default paths for
4920 With the --remote option, this will check the default paths for
4918 incoming and outgoing changes. This can be time-consuming.
4921 incoming and outgoing changes. This can be time-consuming.
4919
4922
4920 Returns 0 on success.
4923 Returns 0 on success.
4921 """
4924 """
4922
4925
4923 opts = pycompat.byteskwargs(opts)
4926 opts = pycompat.byteskwargs(opts)
4924 ui.pager('summary')
4927 ui.pager('summary')
4925 ctx = repo[None]
4928 ctx = repo[None]
4926 parents = ctx.parents()
4929 parents = ctx.parents()
4927 pnode = parents[0].node()
4930 pnode = parents[0].node()
4928 marks = []
4931 marks = []
4929
4932
4930 ms = None
4933 ms = None
4931 try:
4934 try:
4932 ms = mergemod.mergestate.read(repo)
4935 ms = mergemod.mergestate.read(repo)
4933 except error.UnsupportedMergeRecords as e:
4936 except error.UnsupportedMergeRecords as e:
4934 s = ' '.join(e.recordtypes)
4937 s = ' '.join(e.recordtypes)
4935 ui.warn(
4938 ui.warn(
4936 _('warning: merge state has unsupported record types: %s\n') % s)
4939 _('warning: merge state has unsupported record types: %s\n') % s)
4937 unresolved = []
4940 unresolved = []
4938 else:
4941 else:
4939 unresolved = list(ms.unresolved())
4942 unresolved = list(ms.unresolved())
4940
4943
4941 for p in parents:
4944 for p in parents:
4942 # label with log.changeset (instead of log.parent) since this
4945 # label with log.changeset (instead of log.parent) since this
4943 # shows a working directory parent *changeset*:
4946 # shows a working directory parent *changeset*:
4944 # i18n: column positioning for "hg summary"
4947 # i18n: column positioning for "hg summary"
4945 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4948 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4946 label=cmdutil._changesetlabels(p))
4949 label=cmdutil._changesetlabels(p))
4947 ui.write(' '.join(p.tags()), label='log.tag')
4950 ui.write(' '.join(p.tags()), label='log.tag')
4948 if p.bookmarks():
4951 if p.bookmarks():
4949 marks.extend(p.bookmarks())
4952 marks.extend(p.bookmarks())
4950 if p.rev() == -1:
4953 if p.rev() == -1:
4951 if not len(repo):
4954 if not len(repo):
4952 ui.write(_(' (empty repository)'))
4955 ui.write(_(' (empty repository)'))
4953 else:
4956 else:
4954 ui.write(_(' (no revision checked out)'))
4957 ui.write(_(' (no revision checked out)'))
4955 if p.obsolete():
4958 if p.obsolete():
4956 ui.write(_(' (obsolete)'))
4959 ui.write(_(' (obsolete)'))
4957 if p.isunstable():
4960 if p.isunstable():
4958 instabilities = (ui.label(instability, 'trouble.%s' % instability)
4961 instabilities = (ui.label(instability, 'trouble.%s' % instability)
4959 for instability in p.instabilities())
4962 for instability in p.instabilities())
4960 ui.write(' ('
4963 ui.write(' ('
4961 + ', '.join(instabilities)
4964 + ', '.join(instabilities)
4962 + ')')
4965 + ')')
4963 ui.write('\n')
4966 ui.write('\n')
4964 if p.description():
4967 if p.description():
4965 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4968 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4966 label='log.summary')
4969 label='log.summary')
4967
4970
4968 branch = ctx.branch()
4971 branch = ctx.branch()
4969 bheads = repo.branchheads(branch)
4972 bheads = repo.branchheads(branch)
4970 # i18n: column positioning for "hg summary"
4973 # i18n: column positioning for "hg summary"
4971 m = _('branch: %s\n') % branch
4974 m = _('branch: %s\n') % branch
4972 if branch != 'default':
4975 if branch != 'default':
4973 ui.write(m, label='log.branch')
4976 ui.write(m, label='log.branch')
4974 else:
4977 else:
4975 ui.status(m, label='log.branch')
4978 ui.status(m, label='log.branch')
4976
4979
4977 if marks:
4980 if marks:
4978 active = repo._activebookmark
4981 active = repo._activebookmark
4979 # i18n: column positioning for "hg summary"
4982 # i18n: column positioning for "hg summary"
4980 ui.write(_('bookmarks:'), label='log.bookmark')
4983 ui.write(_('bookmarks:'), label='log.bookmark')
4981 if active is not None:
4984 if active is not None:
4982 if active in marks:
4985 if active in marks:
4983 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4986 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4984 marks.remove(active)
4987 marks.remove(active)
4985 else:
4988 else:
4986 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4989 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4987 for m in marks:
4990 for m in marks:
4988 ui.write(' ' + m, label='log.bookmark')
4991 ui.write(' ' + m, label='log.bookmark')
4989 ui.write('\n', label='log.bookmark')
4992 ui.write('\n', label='log.bookmark')
4990
4993
4991 status = repo.status(unknown=True)
4994 status = repo.status(unknown=True)
4992
4995
4993 c = repo.dirstate.copies()
4996 c = repo.dirstate.copies()
4994 copied, renamed = [], []
4997 copied, renamed = [], []
4995 for d, s in c.iteritems():
4998 for d, s in c.iteritems():
4996 if s in status.removed:
4999 if s in status.removed:
4997 status.removed.remove(s)
5000 status.removed.remove(s)
4998 renamed.append(d)
5001 renamed.append(d)
4999 else:
5002 else:
5000 copied.append(d)
5003 copied.append(d)
5001 if d in status.added:
5004 if d in status.added:
5002 status.added.remove(d)
5005 status.added.remove(d)
5003
5006
5004 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5007 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5005
5008
5006 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5009 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5007 (ui.label(_('%d added'), 'status.added'), status.added),
5010 (ui.label(_('%d added'), 'status.added'), status.added),
5008 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5011 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5009 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5012 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5010 (ui.label(_('%d copied'), 'status.copied'), copied),
5013 (ui.label(_('%d copied'), 'status.copied'), copied),
5011 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5014 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5012 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5015 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5013 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5016 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5014 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5017 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5015 t = []
5018 t = []
5016 for l, s in labels:
5019 for l, s in labels:
5017 if s:
5020 if s:
5018 t.append(l % len(s))
5021 t.append(l % len(s))
5019
5022
5020 t = ', '.join(t)
5023 t = ', '.join(t)
5021 cleanworkdir = False
5024 cleanworkdir = False
5022
5025
5023 if repo.vfs.exists('graftstate'):
5026 if repo.vfs.exists('graftstate'):
5024 t += _(' (graft in progress)')
5027 t += _(' (graft in progress)')
5025 if repo.vfs.exists('updatestate'):
5028 if repo.vfs.exists('updatestate'):
5026 t += _(' (interrupted update)')
5029 t += _(' (interrupted update)')
5027 elif len(parents) > 1:
5030 elif len(parents) > 1:
5028 t += _(' (merge)')
5031 t += _(' (merge)')
5029 elif branch != parents[0].branch():
5032 elif branch != parents[0].branch():
5030 t += _(' (new branch)')
5033 t += _(' (new branch)')
5031 elif (parents[0].closesbranch() and
5034 elif (parents[0].closesbranch() and
5032 pnode in repo.branchheads(branch, closed=True)):
5035 pnode in repo.branchheads(branch, closed=True)):
5033 t += _(' (head closed)')
5036 t += _(' (head closed)')
5034 elif not (status.modified or status.added or status.removed or renamed or
5037 elif not (status.modified or status.added or status.removed or renamed or
5035 copied or subs):
5038 copied or subs):
5036 t += _(' (clean)')
5039 t += _(' (clean)')
5037 cleanworkdir = True
5040 cleanworkdir = True
5038 elif pnode not in bheads:
5041 elif pnode not in bheads:
5039 t += _(' (new branch head)')
5042 t += _(' (new branch head)')
5040
5043
5041 if parents:
5044 if parents:
5042 pendingphase = max(p.phase() for p in parents)
5045 pendingphase = max(p.phase() for p in parents)
5043 else:
5046 else:
5044 pendingphase = phases.public
5047 pendingphase = phases.public
5045
5048
5046 if pendingphase > phases.newcommitphase(ui):
5049 if pendingphase > phases.newcommitphase(ui):
5047 t += ' (%s)' % phases.phasenames[pendingphase]
5050 t += ' (%s)' % phases.phasenames[pendingphase]
5048
5051
5049 if cleanworkdir:
5052 if cleanworkdir:
5050 # i18n: column positioning for "hg summary"
5053 # i18n: column positioning for "hg summary"
5051 ui.status(_('commit: %s\n') % t.strip())
5054 ui.status(_('commit: %s\n') % t.strip())
5052 else:
5055 else:
5053 # i18n: column positioning for "hg summary"
5056 # i18n: column positioning for "hg summary"
5054 ui.write(_('commit: %s\n') % t.strip())
5057 ui.write(_('commit: %s\n') % t.strip())
5055
5058
5056 # all ancestors of branch heads - all ancestors of parent = new csets
5059 # all ancestors of branch heads - all ancestors of parent = new csets
5057 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5060 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5058 bheads))
5061 bheads))
5059
5062
5060 if new == 0:
5063 if new == 0:
5061 # i18n: column positioning for "hg summary"
5064 # i18n: column positioning for "hg summary"
5062 ui.status(_('update: (current)\n'))
5065 ui.status(_('update: (current)\n'))
5063 elif pnode not in bheads:
5066 elif pnode not in bheads:
5064 # i18n: column positioning for "hg summary"
5067 # i18n: column positioning for "hg summary"
5065 ui.write(_('update: %d new changesets (update)\n') % new)
5068 ui.write(_('update: %d new changesets (update)\n') % new)
5066 else:
5069 else:
5067 # i18n: column positioning for "hg summary"
5070 # i18n: column positioning for "hg summary"
5068 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5071 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5069 (new, len(bheads)))
5072 (new, len(bheads)))
5070
5073
5071 t = []
5074 t = []
5072 draft = len(repo.revs('draft()'))
5075 draft = len(repo.revs('draft()'))
5073 if draft:
5076 if draft:
5074 t.append(_('%d draft') % draft)
5077 t.append(_('%d draft') % draft)
5075 secret = len(repo.revs('secret()'))
5078 secret = len(repo.revs('secret()'))
5076 if secret:
5079 if secret:
5077 t.append(_('%d secret') % secret)
5080 t.append(_('%d secret') % secret)
5078
5081
5079 if draft or secret:
5082 if draft or secret:
5080 ui.status(_('phases: %s\n') % ', '.join(t))
5083 ui.status(_('phases: %s\n') % ', '.join(t))
5081
5084
5082 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5085 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5083 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5086 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5084 numtrouble = len(repo.revs(trouble + "()"))
5087 numtrouble = len(repo.revs(trouble + "()"))
5085 # We write all the possibilities to ease translation
5088 # We write all the possibilities to ease translation
5086 troublemsg = {
5089 troublemsg = {
5087 "orphan": _("orphan: %d changesets"),
5090 "orphan": _("orphan: %d changesets"),
5088 "contentdivergent": _("content-divergent: %d changesets"),
5091 "contentdivergent": _("content-divergent: %d changesets"),
5089 "phasedivergent": _("phase-divergent: %d changesets"),
5092 "phasedivergent": _("phase-divergent: %d changesets"),
5090 }
5093 }
5091 if numtrouble > 0:
5094 if numtrouble > 0:
5092 ui.status(troublemsg[trouble] % numtrouble + "\n")
5095 ui.status(troublemsg[trouble] % numtrouble + "\n")
5093
5096
5094 cmdutil.summaryhooks(ui, repo)
5097 cmdutil.summaryhooks(ui, repo)
5095
5098
5096 if opts.get('remote'):
5099 if opts.get('remote'):
5097 needsincoming, needsoutgoing = True, True
5100 needsincoming, needsoutgoing = True, True
5098 else:
5101 else:
5099 needsincoming, needsoutgoing = False, False
5102 needsincoming, needsoutgoing = False, False
5100 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5103 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5101 if i:
5104 if i:
5102 needsincoming = True
5105 needsincoming = True
5103 if o:
5106 if o:
5104 needsoutgoing = True
5107 needsoutgoing = True
5105 if not needsincoming and not needsoutgoing:
5108 if not needsincoming and not needsoutgoing:
5106 return
5109 return
5107
5110
5108 def getincoming():
5111 def getincoming():
5109 source, branches = hg.parseurl(ui.expandpath('default'))
5112 source, branches = hg.parseurl(ui.expandpath('default'))
5110 sbranch = branches[0]
5113 sbranch = branches[0]
5111 try:
5114 try:
5112 other = hg.peer(repo, {}, source)
5115 other = hg.peer(repo, {}, source)
5113 except error.RepoError:
5116 except error.RepoError:
5114 if opts.get('remote'):
5117 if opts.get('remote'):
5115 raise
5118 raise
5116 return source, sbranch, None, None, None
5119 return source, sbranch, None, None, None
5117 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5120 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5118 if revs:
5121 if revs:
5119 revs = [other.lookup(rev) for rev in revs]
5122 revs = [other.lookup(rev) for rev in revs]
5120 ui.debug('comparing with %s\n' % util.hidepassword(source))
5123 ui.debug('comparing with %s\n' % util.hidepassword(source))
5121 repo.ui.pushbuffer()
5124 repo.ui.pushbuffer()
5122 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5125 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5123 repo.ui.popbuffer()
5126 repo.ui.popbuffer()
5124 return source, sbranch, other, commoninc, commoninc[1]
5127 return source, sbranch, other, commoninc, commoninc[1]
5125
5128
5126 if needsincoming:
5129 if needsincoming:
5127 source, sbranch, sother, commoninc, incoming = getincoming()
5130 source, sbranch, sother, commoninc, incoming = getincoming()
5128 else:
5131 else:
5129 source = sbranch = sother = commoninc = incoming = None
5132 source = sbranch = sother = commoninc = incoming = None
5130
5133
5131 def getoutgoing():
5134 def getoutgoing():
5132 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5135 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5133 dbranch = branches[0]
5136 dbranch = branches[0]
5134 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5137 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5135 if source != dest:
5138 if source != dest:
5136 try:
5139 try:
5137 dother = hg.peer(repo, {}, dest)
5140 dother = hg.peer(repo, {}, dest)
5138 except error.RepoError:
5141 except error.RepoError:
5139 if opts.get('remote'):
5142 if opts.get('remote'):
5140 raise
5143 raise
5141 return dest, dbranch, None, None
5144 return dest, dbranch, None, None
5142 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5145 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5143 elif sother is None:
5146 elif sother is None:
5144 # there is no explicit destination peer, but source one is invalid
5147 # there is no explicit destination peer, but source one is invalid
5145 return dest, dbranch, None, None
5148 return dest, dbranch, None, None
5146 else:
5149 else:
5147 dother = sother
5150 dother = sother
5148 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5151 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5149 common = None
5152 common = None
5150 else:
5153 else:
5151 common = commoninc
5154 common = commoninc
5152 if revs:
5155 if revs:
5153 revs = [repo.lookup(rev) for rev in revs]
5156 revs = [repo.lookup(rev) for rev in revs]
5154 repo.ui.pushbuffer()
5157 repo.ui.pushbuffer()
5155 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5158 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5156 commoninc=common)
5159 commoninc=common)
5157 repo.ui.popbuffer()
5160 repo.ui.popbuffer()
5158 return dest, dbranch, dother, outgoing
5161 return dest, dbranch, dother, outgoing
5159
5162
5160 if needsoutgoing:
5163 if needsoutgoing:
5161 dest, dbranch, dother, outgoing = getoutgoing()
5164 dest, dbranch, dother, outgoing = getoutgoing()
5162 else:
5165 else:
5163 dest = dbranch = dother = outgoing = None
5166 dest = dbranch = dother = outgoing = None
5164
5167
5165 if opts.get('remote'):
5168 if opts.get('remote'):
5166 t = []
5169 t = []
5167 if incoming:
5170 if incoming:
5168 t.append(_('1 or more incoming'))
5171 t.append(_('1 or more incoming'))
5169 o = outgoing.missing
5172 o = outgoing.missing
5170 if o:
5173 if o:
5171 t.append(_('%d outgoing') % len(o))
5174 t.append(_('%d outgoing') % len(o))
5172 other = dother or sother
5175 other = dother or sother
5173 if 'bookmarks' in other.listkeys('namespaces'):
5176 if 'bookmarks' in other.listkeys('namespaces'):
5174 counts = bookmarks.summary(repo, other)
5177 counts = bookmarks.summary(repo, other)
5175 if counts[0] > 0:
5178 if counts[0] > 0:
5176 t.append(_('%d incoming bookmarks') % counts[0])
5179 t.append(_('%d incoming bookmarks') % counts[0])
5177 if counts[1] > 0:
5180 if counts[1] > 0:
5178 t.append(_('%d outgoing bookmarks') % counts[1])
5181 t.append(_('%d outgoing bookmarks') % counts[1])
5179
5182
5180 if t:
5183 if t:
5181 # i18n: column positioning for "hg summary"
5184 # i18n: column positioning for "hg summary"
5182 ui.write(_('remote: %s\n') % (', '.join(t)))
5185 ui.write(_('remote: %s\n') % (', '.join(t)))
5183 else:
5186 else:
5184 # i18n: column positioning for "hg summary"
5187 # i18n: column positioning for "hg summary"
5185 ui.status(_('remote: (synced)\n'))
5188 ui.status(_('remote: (synced)\n'))
5186
5189
5187 cmdutil.summaryremotehooks(ui, repo, opts,
5190 cmdutil.summaryremotehooks(ui, repo, opts,
5188 ((source, sbranch, sother, commoninc),
5191 ((source, sbranch, sother, commoninc),
5189 (dest, dbranch, dother, outgoing)))
5192 (dest, dbranch, dother, outgoing)))
5190
5193
5191 @command('tag',
5194 @command('tag',
5192 [('f', 'force', None, _('force tag')),
5195 [('f', 'force', None, _('force tag')),
5193 ('l', 'local', None, _('make the tag local')),
5196 ('l', 'local', None, _('make the tag local')),
5194 ('r', 'rev', '', _('revision to tag'), _('REV')),
5197 ('r', 'rev', '', _('revision to tag'), _('REV')),
5195 ('', 'remove', None, _('remove a tag')),
5198 ('', 'remove', None, _('remove a tag')),
5196 # -l/--local is already there, commitopts cannot be used
5199 # -l/--local is already there, commitopts cannot be used
5197 ('e', 'edit', None, _('invoke editor on commit messages')),
5200 ('e', 'edit', None, _('invoke editor on commit messages')),
5198 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5201 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5199 ] + commitopts2,
5202 ] + commitopts2,
5200 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5203 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5201 def tag(ui, repo, name1, *names, **opts):
5204 def tag(ui, repo, name1, *names, **opts):
5202 """add one or more tags for the current or given revision
5205 """add one or more tags for the current or given revision
5203
5206
5204 Name a particular revision using <name>.
5207 Name a particular revision using <name>.
5205
5208
5206 Tags are used to name particular revisions of the repository and are
5209 Tags are used to name particular revisions of the repository and are
5207 very useful to compare different revisions, to go back to significant
5210 very useful to compare different revisions, to go back to significant
5208 earlier versions or to mark branch points as releases, etc. Changing
5211 earlier versions or to mark branch points as releases, etc. Changing
5209 an existing tag is normally disallowed; use -f/--force to override.
5212 an existing tag is normally disallowed; use -f/--force to override.
5210
5213
5211 If no revision is given, the parent of the working directory is
5214 If no revision is given, the parent of the working directory is
5212 used.
5215 used.
5213
5216
5214 To facilitate version control, distribution, and merging of tags,
5217 To facilitate version control, distribution, and merging of tags,
5215 they are stored as a file named ".hgtags" which is managed similarly
5218 they are stored as a file named ".hgtags" which is managed similarly
5216 to other project files and can be hand-edited if necessary. This
5219 to other project files and can be hand-edited if necessary. This
5217 also means that tagging creates a new commit. The file
5220 also means that tagging creates a new commit. The file
5218 ".hg/localtags" is used for local tags (not shared among
5221 ".hg/localtags" is used for local tags (not shared among
5219 repositories).
5222 repositories).
5220
5223
5221 Tag commits are usually made at the head of a branch. If the parent
5224 Tag commits are usually made at the head of a branch. If the parent
5222 of the working directory is not a branch head, :hg:`tag` aborts; use
5225 of the working directory is not a branch head, :hg:`tag` aborts; use
5223 -f/--force to force the tag commit to be based on a non-head
5226 -f/--force to force the tag commit to be based on a non-head
5224 changeset.
5227 changeset.
5225
5228
5226 See :hg:`help dates` for a list of formats valid for -d/--date.
5229 See :hg:`help dates` for a list of formats valid for -d/--date.
5227
5230
5228 Since tag names have priority over branch names during revision
5231 Since tag names have priority over branch names during revision
5229 lookup, using an existing branch name as a tag name is discouraged.
5232 lookup, using an existing branch name as a tag name is discouraged.
5230
5233
5231 Returns 0 on success.
5234 Returns 0 on success.
5232 """
5235 """
5233 opts = pycompat.byteskwargs(opts)
5236 opts = pycompat.byteskwargs(opts)
5234 wlock = lock = None
5237 wlock = lock = None
5235 try:
5238 try:
5236 wlock = repo.wlock()
5239 wlock = repo.wlock()
5237 lock = repo.lock()
5240 lock = repo.lock()
5238 rev_ = "."
5241 rev_ = "."
5239 names = [t.strip() for t in (name1,) + names]
5242 names = [t.strip() for t in (name1,) + names]
5240 if len(names) != len(set(names)):
5243 if len(names) != len(set(names)):
5241 raise error.Abort(_('tag names must be unique'))
5244 raise error.Abort(_('tag names must be unique'))
5242 for n in names:
5245 for n in names:
5243 scmutil.checknewlabel(repo, n, 'tag')
5246 scmutil.checknewlabel(repo, n, 'tag')
5244 if not n:
5247 if not n:
5245 raise error.Abort(_('tag names cannot consist entirely of '
5248 raise error.Abort(_('tag names cannot consist entirely of '
5246 'whitespace'))
5249 'whitespace'))
5247 if opts.get('rev') and opts.get('remove'):
5250 if opts.get('rev') and opts.get('remove'):
5248 raise error.Abort(_("--rev and --remove are incompatible"))
5251 raise error.Abort(_("--rev and --remove are incompatible"))
5249 if opts.get('rev'):
5252 if opts.get('rev'):
5250 rev_ = opts['rev']
5253 rev_ = opts['rev']
5251 message = opts.get('message')
5254 message = opts.get('message')
5252 if opts.get('remove'):
5255 if opts.get('remove'):
5253 if opts.get('local'):
5256 if opts.get('local'):
5254 expectedtype = 'local'
5257 expectedtype = 'local'
5255 else:
5258 else:
5256 expectedtype = 'global'
5259 expectedtype = 'global'
5257
5260
5258 for n in names:
5261 for n in names:
5259 if not repo.tagtype(n):
5262 if not repo.tagtype(n):
5260 raise error.Abort(_("tag '%s' does not exist") % n)
5263 raise error.Abort(_("tag '%s' does not exist") % n)
5261 if repo.tagtype(n) != expectedtype:
5264 if repo.tagtype(n) != expectedtype:
5262 if expectedtype == 'global':
5265 if expectedtype == 'global':
5263 raise error.Abort(_("tag '%s' is not a global tag") % n)
5266 raise error.Abort(_("tag '%s' is not a global tag") % n)
5264 else:
5267 else:
5265 raise error.Abort(_("tag '%s' is not a local tag") % n)
5268 raise error.Abort(_("tag '%s' is not a local tag") % n)
5266 rev_ = 'null'
5269 rev_ = 'null'
5267 if not message:
5270 if not message:
5268 # we don't translate commit messages
5271 # we don't translate commit messages
5269 message = 'Removed tag %s' % ', '.join(names)
5272 message = 'Removed tag %s' % ', '.join(names)
5270 elif not opts.get('force'):
5273 elif not opts.get('force'):
5271 for n in names:
5274 for n in names:
5272 if n in repo.tags():
5275 if n in repo.tags():
5273 raise error.Abort(_("tag '%s' already exists "
5276 raise error.Abort(_("tag '%s' already exists "
5274 "(use -f to force)") % n)
5277 "(use -f to force)") % n)
5275 if not opts.get('local'):
5278 if not opts.get('local'):
5276 p1, p2 = repo.dirstate.parents()
5279 p1, p2 = repo.dirstate.parents()
5277 if p2 != nullid:
5280 if p2 != nullid:
5278 raise error.Abort(_('uncommitted merge'))
5281 raise error.Abort(_('uncommitted merge'))
5279 bheads = repo.branchheads()
5282 bheads = repo.branchheads()
5280 if not opts.get('force') and bheads and p1 not in bheads:
5283 if not opts.get('force') and bheads and p1 not in bheads:
5281 raise error.Abort(_('working directory is not at a branch head '
5284 raise error.Abort(_('working directory is not at a branch head '
5282 '(use -f to force)'))
5285 '(use -f to force)'))
5283 r = scmutil.revsingle(repo, rev_).node()
5286 r = scmutil.revsingle(repo, rev_).node()
5284
5287
5285 if not message:
5288 if not message:
5286 # we don't translate commit messages
5289 # we don't translate commit messages
5287 message = ('Added tag %s for changeset %s' %
5290 message = ('Added tag %s for changeset %s' %
5288 (', '.join(names), short(r)))
5291 (', '.join(names), short(r)))
5289
5292
5290 date = opts.get('date')
5293 date = opts.get('date')
5291 if date:
5294 if date:
5292 date = util.parsedate(date)
5295 date = util.parsedate(date)
5293
5296
5294 if opts.get('remove'):
5297 if opts.get('remove'):
5295 editform = 'tag.remove'
5298 editform = 'tag.remove'
5296 else:
5299 else:
5297 editform = 'tag.add'
5300 editform = 'tag.add'
5298 editor = cmdutil.getcommiteditor(editform=editform,
5301 editor = cmdutil.getcommiteditor(editform=editform,
5299 **pycompat.strkwargs(opts))
5302 **pycompat.strkwargs(opts))
5300
5303
5301 # don't allow tagging the null rev
5304 # don't allow tagging the null rev
5302 if (not opts.get('remove') and
5305 if (not opts.get('remove') and
5303 scmutil.revsingle(repo, rev_).rev() == nullrev):
5306 scmutil.revsingle(repo, rev_).rev() == nullrev):
5304 raise error.Abort(_("cannot tag null revision"))
5307 raise error.Abort(_("cannot tag null revision"))
5305
5308
5306 tagsmod.tag(repo, names, r, message, opts.get('local'),
5309 tagsmod.tag(repo, names, r, message, opts.get('local'),
5307 opts.get('user'), date, editor=editor)
5310 opts.get('user'), date, editor=editor)
5308 finally:
5311 finally:
5309 release(lock, wlock)
5312 release(lock, wlock)
5310
5313
5311 @command('tags', formatteropts, '')
5314 @command('tags', formatteropts, '', cmdtype=readonly)
5312 def tags(ui, repo, **opts):
5315 def tags(ui, repo, **opts):
5313 """list repository tags
5316 """list repository tags
5314
5317
5315 This lists both regular and local tags. When the -v/--verbose
5318 This lists both regular and local tags. When the -v/--verbose
5316 switch is used, a third column "local" is printed for local tags.
5319 switch is used, a third column "local" is printed for local tags.
5317 When the -q/--quiet switch is used, only the tag name is printed.
5320 When the -q/--quiet switch is used, only the tag name is printed.
5318
5321
5319 Returns 0 on success.
5322 Returns 0 on success.
5320 """
5323 """
5321
5324
5322 opts = pycompat.byteskwargs(opts)
5325 opts = pycompat.byteskwargs(opts)
5323 ui.pager('tags')
5326 ui.pager('tags')
5324 fm = ui.formatter('tags', opts)
5327 fm = ui.formatter('tags', opts)
5325 hexfunc = fm.hexfunc
5328 hexfunc = fm.hexfunc
5326 tagtype = ""
5329 tagtype = ""
5327
5330
5328 for t, n in reversed(repo.tagslist()):
5331 for t, n in reversed(repo.tagslist()):
5329 hn = hexfunc(n)
5332 hn = hexfunc(n)
5330 label = 'tags.normal'
5333 label = 'tags.normal'
5331 tagtype = ''
5334 tagtype = ''
5332 if repo.tagtype(t) == 'local':
5335 if repo.tagtype(t) == 'local':
5333 label = 'tags.local'
5336 label = 'tags.local'
5334 tagtype = 'local'
5337 tagtype = 'local'
5335
5338
5336 fm.startitem()
5339 fm.startitem()
5337 fm.write('tag', '%s', t, label=label)
5340 fm.write('tag', '%s', t, label=label)
5338 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5341 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5339 fm.condwrite(not ui.quiet, 'rev node', fmt,
5342 fm.condwrite(not ui.quiet, 'rev node', fmt,
5340 repo.changelog.rev(n), hn, label=label)
5343 repo.changelog.rev(n), hn, label=label)
5341 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5344 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5342 tagtype, label=label)
5345 tagtype, label=label)
5343 fm.plain('\n')
5346 fm.plain('\n')
5344 fm.end()
5347 fm.end()
5345
5348
5346 @command('tip',
5349 @command('tip',
5347 [('p', 'patch', None, _('show patch')),
5350 [('p', 'patch', None, _('show patch')),
5348 ('g', 'git', None, _('use git extended diff format')),
5351 ('g', 'git', None, _('use git extended diff format')),
5349 ] + templateopts,
5352 ] + templateopts,
5350 _('[-p] [-g]'))
5353 _('[-p] [-g]'))
5351 def tip(ui, repo, **opts):
5354 def tip(ui, repo, **opts):
5352 """show the tip revision (DEPRECATED)
5355 """show the tip revision (DEPRECATED)
5353
5356
5354 The tip revision (usually just called the tip) is the changeset
5357 The tip revision (usually just called the tip) is the changeset
5355 most recently added to the repository (and therefore the most
5358 most recently added to the repository (and therefore the most
5356 recently changed head).
5359 recently changed head).
5357
5360
5358 If you have just made a commit, that commit will be the tip. If
5361 If you have just made a commit, that commit will be the tip. If
5359 you have just pulled changes from another repository, the tip of
5362 you have just pulled changes from another repository, the tip of
5360 that repository becomes the current tip. The "tip" tag is special
5363 that repository becomes the current tip. The "tip" tag is special
5361 and cannot be renamed or assigned to a different changeset.
5364 and cannot be renamed or assigned to a different changeset.
5362
5365
5363 This command is deprecated, please use :hg:`heads` instead.
5366 This command is deprecated, please use :hg:`heads` instead.
5364
5367
5365 Returns 0 on success.
5368 Returns 0 on success.
5366 """
5369 """
5367 opts = pycompat.byteskwargs(opts)
5370 opts = pycompat.byteskwargs(opts)
5368 displayer = cmdutil.show_changeset(ui, repo, opts)
5371 displayer = cmdutil.show_changeset(ui, repo, opts)
5369 displayer.show(repo['tip'])
5372 displayer.show(repo['tip'])
5370 displayer.close()
5373 displayer.close()
5371
5374
5372 @command('unbundle',
5375 @command('unbundle',
5373 [('u', 'update', None,
5376 [('u', 'update', None,
5374 _('update to new branch head if changesets were unbundled'))],
5377 _('update to new branch head if changesets were unbundled'))],
5375 _('[-u] FILE...'))
5378 _('[-u] FILE...'))
5376 def unbundle(ui, repo, fname1, *fnames, **opts):
5379 def unbundle(ui, repo, fname1, *fnames, **opts):
5377 """apply one or more bundle files
5380 """apply one or more bundle files
5378
5381
5379 Apply one or more bundle files generated by :hg:`bundle`.
5382 Apply one or more bundle files generated by :hg:`bundle`.
5380
5383
5381 Returns 0 on success, 1 if an update has unresolved files.
5384 Returns 0 on success, 1 if an update has unresolved files.
5382 """
5385 """
5383 fnames = (fname1,) + fnames
5386 fnames = (fname1,) + fnames
5384
5387
5385 with repo.lock():
5388 with repo.lock():
5386 for fname in fnames:
5389 for fname in fnames:
5387 f = hg.openpath(ui, fname)
5390 f = hg.openpath(ui, fname)
5388 gen = exchange.readbundle(ui, f, fname)
5391 gen = exchange.readbundle(ui, f, fname)
5389 if isinstance(gen, streamclone.streamcloneapplier):
5392 if isinstance(gen, streamclone.streamcloneapplier):
5390 raise error.Abort(
5393 raise error.Abort(
5391 _('packed bundles cannot be applied with '
5394 _('packed bundles cannot be applied with '
5392 '"hg unbundle"'),
5395 '"hg unbundle"'),
5393 hint=_('use "hg debugapplystreamclonebundle"'))
5396 hint=_('use "hg debugapplystreamclonebundle"'))
5394 url = 'bundle:' + fname
5397 url = 'bundle:' + fname
5395 try:
5398 try:
5396 txnname = 'unbundle'
5399 txnname = 'unbundle'
5397 if not isinstance(gen, bundle2.unbundle20):
5400 if not isinstance(gen, bundle2.unbundle20):
5398 txnname = 'unbundle\n%s' % util.hidepassword(url)
5401 txnname = 'unbundle\n%s' % util.hidepassword(url)
5399 with repo.transaction(txnname) as tr:
5402 with repo.transaction(txnname) as tr:
5400 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5403 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5401 url=url)
5404 url=url)
5402 except error.BundleUnknownFeatureError as exc:
5405 except error.BundleUnknownFeatureError as exc:
5403 raise error.Abort(
5406 raise error.Abort(
5404 _('%s: unknown bundle feature, %s') % (fname, exc),
5407 _('%s: unknown bundle feature, %s') % (fname, exc),
5405 hint=_("see https://mercurial-scm.org/"
5408 hint=_("see https://mercurial-scm.org/"
5406 "wiki/BundleFeature for more "
5409 "wiki/BundleFeature for more "
5407 "information"))
5410 "information"))
5408 modheads = bundle2.combinechangegroupresults(op)
5411 modheads = bundle2.combinechangegroupresults(op)
5409
5412
5410 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5413 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5411
5414
5412 @command('^update|up|checkout|co',
5415 @command('^update|up|checkout|co',
5413 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5416 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5414 ('c', 'check', None, _('require clean working directory')),
5417 ('c', 'check', None, _('require clean working directory')),
5415 ('m', 'merge', None, _('merge uncommitted changes')),
5418 ('m', 'merge', None, _('merge uncommitted changes')),
5416 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5419 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5417 ('r', 'rev', '', _('revision'), _('REV'))
5420 ('r', 'rev', '', _('revision'), _('REV'))
5418 ] + mergetoolopts,
5421 ] + mergetoolopts,
5419 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5422 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5420 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5423 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5421 merge=None, tool=None):
5424 merge=None, tool=None):
5422 """update working directory (or switch revisions)
5425 """update working directory (or switch revisions)
5423
5426
5424 Update the repository's working directory to the specified
5427 Update the repository's working directory to the specified
5425 changeset. If no changeset is specified, update to the tip of the
5428 changeset. If no changeset is specified, update to the tip of the
5426 current named branch and move the active bookmark (see :hg:`help
5429 current named branch and move the active bookmark (see :hg:`help
5427 bookmarks`).
5430 bookmarks`).
5428
5431
5429 Update sets the working directory's parent revision to the specified
5432 Update sets the working directory's parent revision to the specified
5430 changeset (see :hg:`help parents`).
5433 changeset (see :hg:`help parents`).
5431
5434
5432 If the changeset is not a descendant or ancestor of the working
5435 If the changeset is not a descendant or ancestor of the working
5433 directory's parent and there are uncommitted changes, the update is
5436 directory's parent and there are uncommitted changes, the update is
5434 aborted. With the -c/--check option, the working directory is checked
5437 aborted. With the -c/--check option, the working directory is checked
5435 for uncommitted changes; if none are found, the working directory is
5438 for uncommitted changes; if none are found, the working directory is
5436 updated to the specified changeset.
5439 updated to the specified changeset.
5437
5440
5438 .. container:: verbose
5441 .. container:: verbose
5439
5442
5440 The -C/--clean, -c/--check, and -m/--merge options control what
5443 The -C/--clean, -c/--check, and -m/--merge options control what
5441 happens if the working directory contains uncommitted changes.
5444 happens if the working directory contains uncommitted changes.
5442 At most of one of them can be specified.
5445 At most of one of them can be specified.
5443
5446
5444 1. If no option is specified, and if
5447 1. If no option is specified, and if
5445 the requested changeset is an ancestor or descendant of
5448 the requested changeset is an ancestor or descendant of
5446 the working directory's parent, the uncommitted changes
5449 the working directory's parent, the uncommitted changes
5447 are merged into the requested changeset and the merged
5450 are merged into the requested changeset and the merged
5448 result is left uncommitted. If the requested changeset is
5451 result is left uncommitted. If the requested changeset is
5449 not an ancestor or descendant (that is, it is on another
5452 not an ancestor or descendant (that is, it is on another
5450 branch), the update is aborted and the uncommitted changes
5453 branch), the update is aborted and the uncommitted changes
5451 are preserved.
5454 are preserved.
5452
5455
5453 2. With the -m/--merge option, the update is allowed even if the
5456 2. With the -m/--merge option, the update is allowed even if the
5454 requested changeset is not an ancestor or descendant of
5457 requested changeset is not an ancestor or descendant of
5455 the working directory's parent.
5458 the working directory's parent.
5456
5459
5457 3. With the -c/--check option, the update is aborted and the
5460 3. With the -c/--check option, the update is aborted and the
5458 uncommitted changes are preserved.
5461 uncommitted changes are preserved.
5459
5462
5460 4. With the -C/--clean option, uncommitted changes are discarded and
5463 4. With the -C/--clean option, uncommitted changes are discarded and
5461 the working directory is updated to the requested changeset.
5464 the working directory is updated to the requested changeset.
5462
5465
5463 To cancel an uncommitted merge (and lose your changes), use
5466 To cancel an uncommitted merge (and lose your changes), use
5464 :hg:`update --clean .`.
5467 :hg:`update --clean .`.
5465
5468
5466 Use null as the changeset to remove the working directory (like
5469 Use null as the changeset to remove the working directory (like
5467 :hg:`clone -U`).
5470 :hg:`clone -U`).
5468
5471
5469 If you want to revert just one file to an older revision, use
5472 If you want to revert just one file to an older revision, use
5470 :hg:`revert [-r REV] NAME`.
5473 :hg:`revert [-r REV] NAME`.
5471
5474
5472 See :hg:`help dates` for a list of formats valid for -d/--date.
5475 See :hg:`help dates` for a list of formats valid for -d/--date.
5473
5476
5474 Returns 0 on success, 1 if there are unresolved files.
5477 Returns 0 on success, 1 if there are unresolved files.
5475 """
5478 """
5476 if rev and node:
5479 if rev and node:
5477 raise error.Abort(_("please specify just one revision"))
5480 raise error.Abort(_("please specify just one revision"))
5478
5481
5479 if ui.configbool('commands', 'update.requiredest'):
5482 if ui.configbool('commands', 'update.requiredest'):
5480 if not node and not rev and not date:
5483 if not node and not rev and not date:
5481 raise error.Abort(_('you must specify a destination'),
5484 raise error.Abort(_('you must specify a destination'),
5482 hint=_('for example: hg update ".::"'))
5485 hint=_('for example: hg update ".::"'))
5483
5486
5484 if rev is None or rev == '':
5487 if rev is None or rev == '':
5485 rev = node
5488 rev = node
5486
5489
5487 if date and rev is not None:
5490 if date and rev is not None:
5488 raise error.Abort(_("you can't specify a revision and a date"))
5491 raise error.Abort(_("you can't specify a revision and a date"))
5489
5492
5490 if len([x for x in (clean, check, merge) if x]) > 1:
5493 if len([x for x in (clean, check, merge) if x]) > 1:
5491 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5494 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5492 "or -m/--merge"))
5495 "or -m/--merge"))
5493
5496
5494 updatecheck = None
5497 updatecheck = None
5495 if check:
5498 if check:
5496 updatecheck = 'abort'
5499 updatecheck = 'abort'
5497 elif merge:
5500 elif merge:
5498 updatecheck = 'none'
5501 updatecheck = 'none'
5499
5502
5500 with repo.wlock():
5503 with repo.wlock():
5501 cmdutil.clearunfinished(repo)
5504 cmdutil.clearunfinished(repo)
5502
5505
5503 if date:
5506 if date:
5504 rev = cmdutil.finddate(ui, repo, date)
5507 rev = cmdutil.finddate(ui, repo, date)
5505
5508
5506 # if we defined a bookmark, we have to remember the original name
5509 # if we defined a bookmark, we have to remember the original name
5507 brev = rev
5510 brev = rev
5508 rev = scmutil.revsingle(repo, rev, rev).rev()
5511 rev = scmutil.revsingle(repo, rev, rev).rev()
5509
5512
5510 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5513 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5511
5514
5512 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5515 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5513 updatecheck=updatecheck)
5516 updatecheck=updatecheck)
5514
5517
5515 @command('verify', [])
5518 @command('verify', [])
5516 def verify(ui, repo):
5519 def verify(ui, repo):
5517 """verify the integrity of the repository
5520 """verify the integrity of the repository
5518
5521
5519 Verify the integrity of the current repository.
5522 Verify the integrity of the current repository.
5520
5523
5521 This will perform an extensive check of the repository's
5524 This will perform an extensive check of the repository's
5522 integrity, validating the hashes and checksums of each entry in
5525 integrity, validating the hashes and checksums of each entry in
5523 the changelog, manifest, and tracked files, as well as the
5526 the changelog, manifest, and tracked files, as well as the
5524 integrity of their crosslinks and indices.
5527 integrity of their crosslinks and indices.
5525
5528
5526 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5529 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5527 for more information about recovery from corruption of the
5530 for more information about recovery from corruption of the
5528 repository.
5531 repository.
5529
5532
5530 Returns 0 on success, 1 if errors are encountered.
5533 Returns 0 on success, 1 if errors are encountered.
5531 """
5534 """
5532 return hg.verify(repo)
5535 return hg.verify(repo)
5533
5536
5534 @command('version', [] + formatteropts, norepo=True)
5537 @command('version', [] + formatteropts, norepo=True, cmdtype=readonly)
5535 def version_(ui, **opts):
5538 def version_(ui, **opts):
5536 """output version and copyright information"""
5539 """output version and copyright information"""
5537 opts = pycompat.byteskwargs(opts)
5540 opts = pycompat.byteskwargs(opts)
5538 if ui.verbose:
5541 if ui.verbose:
5539 ui.pager('version')
5542 ui.pager('version')
5540 fm = ui.formatter("version", opts)
5543 fm = ui.formatter("version", opts)
5541 fm.startitem()
5544 fm.startitem()
5542 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5545 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5543 util.version())
5546 util.version())
5544 license = _(
5547 license = _(
5545 "(see https://mercurial-scm.org for more information)\n"
5548 "(see https://mercurial-scm.org for more information)\n"
5546 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5549 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5547 "This is free software; see the source for copying conditions. "
5550 "This is free software; see the source for copying conditions. "
5548 "There is NO\nwarranty; "
5551 "There is NO\nwarranty; "
5549 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5552 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5550 )
5553 )
5551 if not ui.quiet:
5554 if not ui.quiet:
5552 fm.plain(license)
5555 fm.plain(license)
5553
5556
5554 if ui.verbose:
5557 if ui.verbose:
5555 fm.plain(_("\nEnabled extensions:\n\n"))
5558 fm.plain(_("\nEnabled extensions:\n\n"))
5556 # format names and versions into columns
5559 # format names and versions into columns
5557 names = []
5560 names = []
5558 vers = []
5561 vers = []
5559 isinternals = []
5562 isinternals = []
5560 for name, module in extensions.extensions():
5563 for name, module in extensions.extensions():
5561 names.append(name)
5564 names.append(name)
5562 vers.append(extensions.moduleversion(module) or None)
5565 vers.append(extensions.moduleversion(module) or None)
5563 isinternals.append(extensions.ismoduleinternal(module))
5566 isinternals.append(extensions.ismoduleinternal(module))
5564 fn = fm.nested("extensions")
5567 fn = fm.nested("extensions")
5565 if names:
5568 if names:
5566 namefmt = " %%-%ds " % max(len(n) for n in names)
5569 namefmt = " %%-%ds " % max(len(n) for n in names)
5567 places = [_("external"), _("internal")]
5570 places = [_("external"), _("internal")]
5568 for n, v, p in zip(names, vers, isinternals):
5571 for n, v, p in zip(names, vers, isinternals):
5569 fn.startitem()
5572 fn.startitem()
5570 fn.condwrite(ui.verbose, "name", namefmt, n)
5573 fn.condwrite(ui.verbose, "name", namefmt, n)
5571 if ui.verbose:
5574 if ui.verbose:
5572 fn.plain("%s " % places[p])
5575 fn.plain("%s " % places[p])
5573 fn.data(bundled=p)
5576 fn.data(bundled=p)
5574 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5577 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5575 if ui.verbose:
5578 if ui.verbose:
5576 fn.plain("\n")
5579 fn.plain("\n")
5577 fn.end()
5580 fn.end()
5578 fm.end()
5581 fm.end()
5579
5582
5580 def loadcmdtable(ui, name, cmdtable):
5583 def loadcmdtable(ui, name, cmdtable):
5581 """Load command functions from specified cmdtable
5584 """Load command functions from specified cmdtable
5582 """
5585 """
5583 overrides = [cmd for cmd in cmdtable if cmd in table]
5586 overrides = [cmd for cmd in cmdtable if cmd in table]
5584 if overrides:
5587 if overrides:
5585 ui.warn(_("extension '%s' overrides commands: %s\n")
5588 ui.warn(_("extension '%s' overrides commands: %s\n")
5586 % (name, " ".join(overrides)))
5589 % (name, " ".join(overrides)))
5587 table.update(cmdtable)
5590 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now