##// END OF EJS Templates
grep: enable passing wdir as a revision...
Sangeet Kumar Mishra -
r38217:16f93a3b default
parent child Browse files
Show More
@@ -1,5723 +1,5733 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 )
22 )
23 from . import (
23 from . import (
24 archival,
24 archival,
25 bookmarks,
25 bookmarks,
26 bundle2,
26 bundle2,
27 changegroup,
27 changegroup,
28 cmdutil,
28 cmdutil,
29 copies,
29 copies,
30 debugcommands as debugcommandsmod,
30 debugcommands as debugcommandsmod,
31 destutil,
31 destutil,
32 dirstateguard,
32 dirstateguard,
33 discovery,
33 discovery,
34 encoding,
34 encoding,
35 error,
35 error,
36 exchange,
36 exchange,
37 extensions,
37 extensions,
38 formatter,
38 formatter,
39 graphmod,
39 graphmod,
40 hbisect,
40 hbisect,
41 help,
41 help,
42 hg,
42 hg,
43 lock as lockmod,
43 lock as lockmod,
44 logcmdutil,
44 logcmdutil,
45 merge as mergemod,
45 merge as mergemod,
46 obsolete,
46 obsolete,
47 obsutil,
47 obsutil,
48 patch,
48 patch,
49 phases,
49 phases,
50 pycompat,
50 pycompat,
51 rcutil,
51 rcutil,
52 registrar,
52 registrar,
53 revsetlang,
53 revsetlang,
54 rewriteutil,
54 rewriteutil,
55 scmutil,
55 scmutil,
56 server,
56 server,
57 state as statemod,
57 state as statemod,
58 streamclone,
58 streamclone,
59 tags as tagsmod,
59 tags as tagsmod,
60 templatekw,
60 templatekw,
61 ui as uimod,
61 ui as uimod,
62 util,
62 util,
63 wireprotoserver,
63 wireprotoserver,
64 )
64 )
65 from .utils import (
65 from .utils import (
66 dateutil,
66 dateutil,
67 stringutil,
67 stringutil,
68 )
68 )
69
69
70 release = lockmod.release
70 release = lockmod.release
71
71
72 table = {}
72 table = {}
73 table.update(debugcommandsmod.command._table)
73 table.update(debugcommandsmod.command._table)
74
74
75 command = registrar.command(table)
75 command = registrar.command(table)
76 INTENT_READONLY = registrar.INTENT_READONLY
76 INTENT_READONLY = registrar.INTENT_READONLY
77
77
78 # common command options
78 # common command options
79
79
80 globalopts = [
80 globalopts = [
81 ('R', 'repository', '',
81 ('R', 'repository', '',
82 _('repository root directory or name of overlay bundle file'),
82 _('repository root directory or name of overlay bundle file'),
83 _('REPO')),
83 _('REPO')),
84 ('', 'cwd', '',
84 ('', 'cwd', '',
85 _('change working directory'), _('DIR')),
85 _('change working directory'), _('DIR')),
86 ('y', 'noninteractive', None,
86 ('y', 'noninteractive', None,
87 _('do not prompt, automatically pick the first choice for all prompts')),
87 _('do not prompt, automatically pick the first choice for all prompts')),
88 ('q', 'quiet', None, _('suppress output')),
88 ('q', 'quiet', None, _('suppress output')),
89 ('v', 'verbose', None, _('enable additional output')),
89 ('v', 'verbose', None, _('enable additional output')),
90 ('', 'color', '',
90 ('', 'color', '',
91 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
91 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
92 # and should not be translated
92 # and should not be translated
93 _("when to colorize (boolean, always, auto, never, or debug)"),
93 _("when to colorize (boolean, always, auto, never, or debug)"),
94 _('TYPE')),
94 _('TYPE')),
95 ('', 'config', [],
95 ('', 'config', [],
96 _('set/override config option (use \'section.name=value\')'),
96 _('set/override config option (use \'section.name=value\')'),
97 _('CONFIG')),
97 _('CONFIG')),
98 ('', 'debug', None, _('enable debugging output')),
98 ('', 'debug', None, _('enable debugging output')),
99 ('', 'debugger', None, _('start debugger')),
99 ('', 'debugger', None, _('start debugger')),
100 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
100 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
101 _('ENCODE')),
101 _('ENCODE')),
102 ('', 'encodingmode', encoding.encodingmode,
102 ('', 'encodingmode', encoding.encodingmode,
103 _('set the charset encoding mode'), _('MODE')),
103 _('set the charset encoding mode'), _('MODE')),
104 ('', 'traceback', None, _('always print a traceback on exception')),
104 ('', 'traceback', None, _('always print a traceback on exception')),
105 ('', 'time', None, _('time how long the command takes')),
105 ('', 'time', None, _('time how long the command takes')),
106 ('', 'profile', None, _('print command execution profile')),
106 ('', 'profile', None, _('print command execution profile')),
107 ('', 'version', None, _('output version information and exit')),
107 ('', 'version', None, _('output version information and exit')),
108 ('h', 'help', None, _('display help and exit')),
108 ('h', 'help', None, _('display help and exit')),
109 ('', 'hidden', False, _('consider hidden changesets')),
109 ('', 'hidden', False, _('consider hidden changesets')),
110 ('', 'pager', 'auto',
110 ('', 'pager', 'auto',
111 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
111 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
112 ]
112 ]
113
113
114 dryrunopts = cmdutil.dryrunopts
114 dryrunopts = cmdutil.dryrunopts
115 remoteopts = cmdutil.remoteopts
115 remoteopts = cmdutil.remoteopts
116 walkopts = cmdutil.walkopts
116 walkopts = cmdutil.walkopts
117 commitopts = cmdutil.commitopts
117 commitopts = cmdutil.commitopts
118 commitopts2 = cmdutil.commitopts2
118 commitopts2 = cmdutil.commitopts2
119 formatteropts = cmdutil.formatteropts
119 formatteropts = cmdutil.formatteropts
120 templateopts = cmdutil.templateopts
120 templateopts = cmdutil.templateopts
121 logopts = cmdutil.logopts
121 logopts = cmdutil.logopts
122 diffopts = cmdutil.diffopts
122 diffopts = cmdutil.diffopts
123 diffwsopts = cmdutil.diffwsopts
123 diffwsopts = cmdutil.diffwsopts
124 diffopts2 = cmdutil.diffopts2
124 diffopts2 = cmdutil.diffopts2
125 mergetoolopts = cmdutil.mergetoolopts
125 mergetoolopts = cmdutil.mergetoolopts
126 similarityopts = cmdutil.similarityopts
126 similarityopts = cmdutil.similarityopts
127 subrepoopts = cmdutil.subrepoopts
127 subrepoopts = cmdutil.subrepoopts
128 debugrevlogopts = cmdutil.debugrevlogopts
128 debugrevlogopts = cmdutil.debugrevlogopts
129
129
130 # Commands start here, listed alphabetically
130 # Commands start here, listed alphabetically
131
131
132 @command('^add',
132 @command('^add',
133 walkopts + subrepoopts + dryrunopts,
133 walkopts + subrepoopts + dryrunopts,
134 _('[OPTION]... [FILE]...'),
134 _('[OPTION]... [FILE]...'),
135 inferrepo=True)
135 inferrepo=True)
136 def add(ui, repo, *pats, **opts):
136 def add(ui, repo, *pats, **opts):
137 """add the specified files on the next commit
137 """add the specified files on the next commit
138
138
139 Schedule files to be version controlled and added to the
139 Schedule files to be version controlled and added to the
140 repository.
140 repository.
141
141
142 The files will be added to the repository at the next commit. To
142 The files will be added to the repository at the next commit. To
143 undo an add before that, see :hg:`forget`.
143 undo an add before that, see :hg:`forget`.
144
144
145 If no names are given, add all files to the repository (except
145 If no names are given, add all files to the repository (except
146 files matching ``.hgignore``).
146 files matching ``.hgignore``).
147
147
148 .. container:: verbose
148 .. container:: verbose
149
149
150 Examples:
150 Examples:
151
151
152 - New (unknown) files are added
152 - New (unknown) files are added
153 automatically by :hg:`add`::
153 automatically by :hg:`add`::
154
154
155 $ ls
155 $ ls
156 foo.c
156 foo.c
157 $ hg status
157 $ hg status
158 ? foo.c
158 ? foo.c
159 $ hg add
159 $ hg add
160 adding foo.c
160 adding foo.c
161 $ hg status
161 $ hg status
162 A foo.c
162 A foo.c
163
163
164 - Specific files to be added can be specified::
164 - Specific files to be added can be specified::
165
165
166 $ ls
166 $ ls
167 bar.c foo.c
167 bar.c foo.c
168 $ hg status
168 $ hg status
169 ? bar.c
169 ? bar.c
170 ? foo.c
170 ? foo.c
171 $ hg add bar.c
171 $ hg add bar.c
172 $ hg status
172 $ hg status
173 A bar.c
173 A bar.c
174 ? foo.c
174 ? foo.c
175
175
176 Returns 0 if all files are successfully added.
176 Returns 0 if all files are successfully added.
177 """
177 """
178
178
179 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
179 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
180 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
180 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
181 return rejected and 1 or 0
181 return rejected and 1 or 0
182
182
183 @command('addremove',
183 @command('addremove',
184 similarityopts + subrepoopts + walkopts + dryrunopts,
184 similarityopts + subrepoopts + walkopts + dryrunopts,
185 _('[OPTION]... [FILE]...'),
185 _('[OPTION]... [FILE]...'),
186 inferrepo=True)
186 inferrepo=True)
187 def addremove(ui, repo, *pats, **opts):
187 def addremove(ui, repo, *pats, **opts):
188 """add all new files, delete all missing files
188 """add all new files, delete all missing files
189
189
190 Add all new files and remove all missing files from the
190 Add all new files and remove all missing files from the
191 repository.
191 repository.
192
192
193 Unless names are given, new files are ignored if they match any of
193 Unless names are given, new files are ignored if they match any of
194 the patterns in ``.hgignore``. As with add, these changes take
194 the patterns in ``.hgignore``. As with add, these changes take
195 effect at the next commit.
195 effect at the next commit.
196
196
197 Use the -s/--similarity option to detect renamed files. This
197 Use the -s/--similarity option to detect renamed files. This
198 option takes a percentage between 0 (disabled) and 100 (files must
198 option takes a percentage between 0 (disabled) and 100 (files must
199 be identical) as its parameter. With a parameter greater than 0,
199 be identical) as its parameter. With a parameter greater than 0,
200 this compares every removed file with every added file and records
200 this compares every removed file with every added file and records
201 those similar enough as renames. Detecting renamed files this way
201 those similar enough as renames. Detecting renamed files this way
202 can be expensive. After using this option, :hg:`status -C` can be
202 can be expensive. After using this option, :hg:`status -C` can be
203 used to check which files were identified as moved or renamed. If
203 used to check which files were identified as moved or renamed. If
204 not specified, -s/--similarity defaults to 100 and only renames of
204 not specified, -s/--similarity defaults to 100 and only renames of
205 identical files are detected.
205 identical files are detected.
206
206
207 .. container:: verbose
207 .. container:: verbose
208
208
209 Examples:
209 Examples:
210
210
211 - A number of files (bar.c and foo.c) are new,
211 - A number of files (bar.c and foo.c) are new,
212 while foobar.c has been removed (without using :hg:`remove`)
212 while foobar.c has been removed (without using :hg:`remove`)
213 from the repository::
213 from the repository::
214
214
215 $ ls
215 $ ls
216 bar.c foo.c
216 bar.c foo.c
217 $ hg status
217 $ hg status
218 ! foobar.c
218 ! foobar.c
219 ? bar.c
219 ? bar.c
220 ? foo.c
220 ? foo.c
221 $ hg addremove
221 $ hg addremove
222 adding bar.c
222 adding bar.c
223 adding foo.c
223 adding foo.c
224 removing foobar.c
224 removing foobar.c
225 $ hg status
225 $ hg status
226 A bar.c
226 A bar.c
227 A foo.c
227 A foo.c
228 R foobar.c
228 R foobar.c
229
229
230 - A file foobar.c was moved to foo.c without using :hg:`rename`.
230 - A file foobar.c was moved to foo.c without using :hg:`rename`.
231 Afterwards, it was edited slightly::
231 Afterwards, it was edited slightly::
232
232
233 $ ls
233 $ ls
234 foo.c
234 foo.c
235 $ hg status
235 $ hg status
236 ! foobar.c
236 ! foobar.c
237 ? foo.c
237 ? foo.c
238 $ hg addremove --similarity 90
238 $ hg addremove --similarity 90
239 removing foobar.c
239 removing foobar.c
240 adding foo.c
240 adding foo.c
241 recording removal of foobar.c as rename to foo.c (94% similar)
241 recording removal of foobar.c as rename to foo.c (94% similar)
242 $ hg status -C
242 $ hg status -C
243 A foo.c
243 A foo.c
244 foobar.c
244 foobar.c
245 R foobar.c
245 R foobar.c
246
246
247 Returns 0 if all files are successfully added.
247 Returns 0 if all files are successfully added.
248 """
248 """
249 opts = pycompat.byteskwargs(opts)
249 opts = pycompat.byteskwargs(opts)
250 if not opts.get('similarity'):
250 if not opts.get('similarity'):
251 opts['similarity'] = '100'
251 opts['similarity'] = '100'
252 matcher = scmutil.match(repo[None], pats, opts)
252 matcher = scmutil.match(repo[None], pats, opts)
253 return scmutil.addremove(repo, matcher, "", opts)
253 return scmutil.addremove(repo, matcher, "", opts)
254
254
255 @command('^annotate|blame',
255 @command('^annotate|blame',
256 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
256 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
257 ('', 'follow', None,
257 ('', 'follow', None,
258 _('follow copies/renames and list the filename (DEPRECATED)')),
258 _('follow copies/renames and list the filename (DEPRECATED)')),
259 ('', 'no-follow', None, _("don't follow copies and renames")),
259 ('', 'no-follow', None, _("don't follow copies and renames")),
260 ('a', 'text', None, _('treat all files as text')),
260 ('a', 'text', None, _('treat all files as text')),
261 ('u', 'user', None, _('list the author (long with -v)')),
261 ('u', 'user', None, _('list the author (long with -v)')),
262 ('f', 'file', None, _('list the filename')),
262 ('f', 'file', None, _('list the filename')),
263 ('d', 'date', None, _('list the date (short with -q)')),
263 ('d', 'date', None, _('list the date (short with -q)')),
264 ('n', 'number', None, _('list the revision number (default)')),
264 ('n', 'number', None, _('list the revision number (default)')),
265 ('c', 'changeset', None, _('list the changeset')),
265 ('c', 'changeset', None, _('list the changeset')),
266 ('l', 'line-number', None, _('show line number at the first appearance')),
266 ('l', 'line-number', None, _('show line number at the first appearance')),
267 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
267 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
268 ] + diffwsopts + walkopts + formatteropts,
268 ] + diffwsopts + walkopts + formatteropts,
269 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
269 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
270 inferrepo=True)
270 inferrepo=True)
271 def annotate(ui, repo, *pats, **opts):
271 def annotate(ui, repo, *pats, **opts):
272 """show changeset information by line for each file
272 """show changeset information by line for each file
273
273
274 List changes in files, showing the revision id responsible for
274 List changes in files, showing the revision id responsible for
275 each line.
275 each line.
276
276
277 This command is useful for discovering when a change was made and
277 This command is useful for discovering when a change was made and
278 by whom.
278 by whom.
279
279
280 If you include --file, --user, or --date, the revision number is
280 If you include --file, --user, or --date, the revision number is
281 suppressed unless you also include --number.
281 suppressed unless you also include --number.
282
282
283 Without the -a/--text option, annotate will avoid processing files
283 Without the -a/--text option, annotate will avoid processing files
284 it detects as binary. With -a, annotate will annotate the file
284 it detects as binary. With -a, annotate will annotate the file
285 anyway, although the results will probably be neither useful
285 anyway, although the results will probably be neither useful
286 nor desirable.
286 nor desirable.
287
287
288 Returns 0 on success.
288 Returns 0 on success.
289 """
289 """
290 opts = pycompat.byteskwargs(opts)
290 opts = pycompat.byteskwargs(opts)
291 if not pats:
291 if not pats:
292 raise error.Abort(_('at least one filename or pattern is required'))
292 raise error.Abort(_('at least one filename or pattern is required'))
293
293
294 if opts.get('follow'):
294 if opts.get('follow'):
295 # --follow is deprecated and now just an alias for -f/--file
295 # --follow is deprecated and now just an alias for -f/--file
296 # to mimic the behavior of Mercurial before version 1.5
296 # to mimic the behavior of Mercurial before version 1.5
297 opts['file'] = True
297 opts['file'] = True
298
298
299 rev = opts.get('rev')
299 rev = opts.get('rev')
300 if rev:
300 if rev:
301 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
301 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
302 ctx = scmutil.revsingle(repo, rev)
302 ctx = scmutil.revsingle(repo, rev)
303
303
304 rootfm = ui.formatter('annotate', opts)
304 rootfm = ui.formatter('annotate', opts)
305 if ui.quiet:
305 if ui.quiet:
306 datefunc = dateutil.shortdate
306 datefunc = dateutil.shortdate
307 else:
307 else:
308 datefunc = dateutil.datestr
308 datefunc = dateutil.datestr
309 if ctx.rev() is None:
309 if ctx.rev() is None:
310 def hexfn(node):
310 def hexfn(node):
311 if node is None:
311 if node is None:
312 return None
312 return None
313 else:
313 else:
314 return rootfm.hexfunc(node)
314 return rootfm.hexfunc(node)
315 if opts.get('changeset'):
315 if opts.get('changeset'):
316 # omit "+" suffix which is appended to node hex
316 # omit "+" suffix which is appended to node hex
317 def formatrev(rev):
317 def formatrev(rev):
318 if rev is None:
318 if rev is None:
319 return '%d' % ctx.p1().rev()
319 return '%d' % ctx.p1().rev()
320 else:
320 else:
321 return '%d' % rev
321 return '%d' % rev
322 else:
322 else:
323 def formatrev(rev):
323 def formatrev(rev):
324 if rev is None:
324 if rev is None:
325 return '%d+' % ctx.p1().rev()
325 return '%d+' % ctx.p1().rev()
326 else:
326 else:
327 return '%d ' % rev
327 return '%d ' % rev
328 def formathex(hex):
328 def formathex(hex):
329 if hex is None:
329 if hex is None:
330 return '%s+' % rootfm.hexfunc(ctx.p1().node())
330 return '%s+' % rootfm.hexfunc(ctx.p1().node())
331 else:
331 else:
332 return '%s ' % hex
332 return '%s ' % hex
333 else:
333 else:
334 hexfn = rootfm.hexfunc
334 hexfn = rootfm.hexfunc
335 formatrev = formathex = pycompat.bytestr
335 formatrev = formathex = pycompat.bytestr
336
336
337 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
337 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
338 ('number', ' ', lambda x: x.fctx.rev(), formatrev),
338 ('number', ' ', lambda x: x.fctx.rev(), formatrev),
339 ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex),
339 ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex),
340 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
340 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
341 ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
341 ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
342 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
342 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
343 ]
343 ]
344 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
344 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
345
345
346 if (not opts.get('user') and not opts.get('changeset')
346 if (not opts.get('user') and not opts.get('changeset')
347 and not opts.get('date') and not opts.get('file')):
347 and not opts.get('date') and not opts.get('file')):
348 opts['number'] = True
348 opts['number'] = True
349
349
350 linenumber = opts.get('line_number') is not None
350 linenumber = opts.get('line_number') is not None
351 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
351 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
352 raise error.Abort(_('at least one of -n/-c is required for -l'))
352 raise error.Abort(_('at least one of -n/-c is required for -l'))
353
353
354 ui.pager('annotate')
354 ui.pager('annotate')
355
355
356 if rootfm.isplain():
356 if rootfm.isplain():
357 def makefunc(get, fmt):
357 def makefunc(get, fmt):
358 return lambda x: fmt(get(x))
358 return lambda x: fmt(get(x))
359 else:
359 else:
360 def makefunc(get, fmt):
360 def makefunc(get, fmt):
361 return get
361 return get
362 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
362 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
363 if opts.get(op)]
363 if opts.get(op)]
364 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
364 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
365 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
365 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
366 if opts.get(op))
366 if opts.get(op))
367
367
368 def bad(x, y):
368 def bad(x, y):
369 raise error.Abort("%s: %s" % (x, y))
369 raise error.Abort("%s: %s" % (x, y))
370
370
371 m = scmutil.match(ctx, pats, opts, badfn=bad)
371 m = scmutil.match(ctx, pats, opts, badfn=bad)
372
372
373 follow = not opts.get('no_follow')
373 follow = not opts.get('no_follow')
374 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
374 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
375 whitespace=True)
375 whitespace=True)
376 skiprevs = opts.get('skip')
376 skiprevs = opts.get('skip')
377 if skiprevs:
377 if skiprevs:
378 skiprevs = scmutil.revrange(repo, skiprevs)
378 skiprevs = scmutil.revrange(repo, skiprevs)
379
379
380 for abs in ctx.walk(m):
380 for abs in ctx.walk(m):
381 fctx = ctx[abs]
381 fctx = ctx[abs]
382 rootfm.startitem()
382 rootfm.startitem()
383 rootfm.data(abspath=abs, path=m.rel(abs))
383 rootfm.data(abspath=abs, path=m.rel(abs))
384 if not opts.get('text') and fctx.isbinary():
384 if not opts.get('text') and fctx.isbinary():
385 rootfm.plain(_("%s: binary file\n")
385 rootfm.plain(_("%s: binary file\n")
386 % ((pats and m.rel(abs)) or abs))
386 % ((pats and m.rel(abs)) or abs))
387 continue
387 continue
388
388
389 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
389 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
390 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
390 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
391 diffopts=diffopts)
391 diffopts=diffopts)
392 if not lines:
392 if not lines:
393 fm.end()
393 fm.end()
394 continue
394 continue
395 formats = []
395 formats = []
396 pieces = []
396 pieces = []
397
397
398 for f, sep in funcmap:
398 for f, sep in funcmap:
399 l = [f(n) for n in lines]
399 l = [f(n) for n in lines]
400 if fm.isplain():
400 if fm.isplain():
401 sizes = [encoding.colwidth(x) for x in l]
401 sizes = [encoding.colwidth(x) for x in l]
402 ml = max(sizes)
402 ml = max(sizes)
403 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
403 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
404 else:
404 else:
405 formats.append(['%s' for x in l])
405 formats.append(['%s' for x in l])
406 pieces.append(l)
406 pieces.append(l)
407
407
408 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
408 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
409 fm.startitem()
409 fm.startitem()
410 fm.context(fctx=n.fctx)
410 fm.context(fctx=n.fctx)
411 fm.write(fields, "".join(f), *p)
411 fm.write(fields, "".join(f), *p)
412 if n.skip:
412 if n.skip:
413 fmt = "* %s"
413 fmt = "* %s"
414 else:
414 else:
415 fmt = ": %s"
415 fmt = ": %s"
416 fm.write('line', fmt, n.text)
416 fm.write('line', fmt, n.text)
417
417
418 if not lines[-1].text.endswith('\n'):
418 if not lines[-1].text.endswith('\n'):
419 fm.plain('\n')
419 fm.plain('\n')
420 fm.end()
420 fm.end()
421
421
422 rootfm.end()
422 rootfm.end()
423
423
424 @command('archive',
424 @command('archive',
425 [('', 'no-decode', None, _('do not pass files through decoders')),
425 [('', 'no-decode', None, _('do not pass files through decoders')),
426 ('p', 'prefix', '', _('directory prefix for files in archive'),
426 ('p', 'prefix', '', _('directory prefix for files in archive'),
427 _('PREFIX')),
427 _('PREFIX')),
428 ('r', 'rev', '', _('revision to distribute'), _('REV')),
428 ('r', 'rev', '', _('revision to distribute'), _('REV')),
429 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
429 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
430 ] + subrepoopts + walkopts,
430 ] + subrepoopts + walkopts,
431 _('[OPTION]... DEST'))
431 _('[OPTION]... DEST'))
432 def archive(ui, repo, dest, **opts):
432 def archive(ui, repo, dest, **opts):
433 '''create an unversioned archive of a repository revision
433 '''create an unversioned archive of a repository revision
434
434
435 By default, the revision used is the parent of the working
435 By default, the revision used is the parent of the working
436 directory; use -r/--rev to specify a different revision.
436 directory; use -r/--rev to specify a different revision.
437
437
438 The archive type is automatically detected based on file
438 The archive type is automatically detected based on file
439 extension (to override, use -t/--type).
439 extension (to override, use -t/--type).
440
440
441 .. container:: verbose
441 .. container:: verbose
442
442
443 Examples:
443 Examples:
444
444
445 - create a zip file containing the 1.0 release::
445 - create a zip file containing the 1.0 release::
446
446
447 hg archive -r 1.0 project-1.0.zip
447 hg archive -r 1.0 project-1.0.zip
448
448
449 - create a tarball excluding .hg files::
449 - create a tarball excluding .hg files::
450
450
451 hg archive project.tar.gz -X ".hg*"
451 hg archive project.tar.gz -X ".hg*"
452
452
453 Valid types are:
453 Valid types are:
454
454
455 :``files``: a directory full of files (default)
455 :``files``: a directory full of files (default)
456 :``tar``: tar archive, uncompressed
456 :``tar``: tar archive, uncompressed
457 :``tbz2``: tar archive, compressed using bzip2
457 :``tbz2``: tar archive, compressed using bzip2
458 :``tgz``: tar archive, compressed using gzip
458 :``tgz``: tar archive, compressed using gzip
459 :``uzip``: zip archive, uncompressed
459 :``uzip``: zip archive, uncompressed
460 :``zip``: zip archive, compressed using deflate
460 :``zip``: zip archive, compressed using deflate
461
461
462 The exact name of the destination archive or directory is given
462 The exact name of the destination archive or directory is given
463 using a format string; see :hg:`help export` for details.
463 using a format string; see :hg:`help export` for details.
464
464
465 Each member added to an archive file has a directory prefix
465 Each member added to an archive file has a directory prefix
466 prepended. Use -p/--prefix to specify a format string for the
466 prepended. Use -p/--prefix to specify a format string for the
467 prefix. The default is the basename of the archive, with suffixes
467 prefix. The default is the basename of the archive, with suffixes
468 removed.
468 removed.
469
469
470 Returns 0 on success.
470 Returns 0 on success.
471 '''
471 '''
472
472
473 opts = pycompat.byteskwargs(opts)
473 opts = pycompat.byteskwargs(opts)
474 rev = opts.get('rev')
474 rev = opts.get('rev')
475 if rev:
475 if rev:
476 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
476 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
477 ctx = scmutil.revsingle(repo, rev)
477 ctx = scmutil.revsingle(repo, rev)
478 if not ctx:
478 if not ctx:
479 raise error.Abort(_('no working directory: please specify a revision'))
479 raise error.Abort(_('no working directory: please specify a revision'))
480 node = ctx.node()
480 node = ctx.node()
481 dest = cmdutil.makefilename(ctx, dest)
481 dest = cmdutil.makefilename(ctx, dest)
482 if os.path.realpath(dest) == repo.root:
482 if os.path.realpath(dest) == repo.root:
483 raise error.Abort(_('repository root cannot be destination'))
483 raise error.Abort(_('repository root cannot be destination'))
484
484
485 kind = opts.get('type') or archival.guesskind(dest) or 'files'
485 kind = opts.get('type') or archival.guesskind(dest) or 'files'
486 prefix = opts.get('prefix')
486 prefix = opts.get('prefix')
487
487
488 if dest == '-':
488 if dest == '-':
489 if kind == 'files':
489 if kind == 'files':
490 raise error.Abort(_('cannot archive plain files to stdout'))
490 raise error.Abort(_('cannot archive plain files to stdout'))
491 dest = cmdutil.makefileobj(ctx, dest)
491 dest = cmdutil.makefileobj(ctx, dest)
492 if not prefix:
492 if not prefix:
493 prefix = os.path.basename(repo.root) + '-%h'
493 prefix = os.path.basename(repo.root) + '-%h'
494
494
495 prefix = cmdutil.makefilename(ctx, prefix)
495 prefix = cmdutil.makefilename(ctx, prefix)
496 match = scmutil.match(ctx, [], opts)
496 match = scmutil.match(ctx, [], opts)
497 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
497 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
498 match, prefix, subrepos=opts.get('subrepos'))
498 match, prefix, subrepos=opts.get('subrepos'))
499
499
500 @command('backout',
500 @command('backout',
501 [('', 'merge', None, _('merge with old dirstate parent after backout')),
501 [('', 'merge', None, _('merge with old dirstate parent after backout')),
502 ('', 'commit', None,
502 ('', 'commit', None,
503 _('commit if no conflicts were encountered (DEPRECATED)')),
503 _('commit if no conflicts were encountered (DEPRECATED)')),
504 ('', 'no-commit', None, _('do not commit')),
504 ('', 'no-commit', None, _('do not commit')),
505 ('', 'parent', '',
505 ('', 'parent', '',
506 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
506 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
507 ('r', 'rev', '', _('revision to backout'), _('REV')),
507 ('r', 'rev', '', _('revision to backout'), _('REV')),
508 ('e', 'edit', False, _('invoke editor on commit messages')),
508 ('e', 'edit', False, _('invoke editor on commit messages')),
509 ] + mergetoolopts + walkopts + commitopts + commitopts2,
509 ] + mergetoolopts + walkopts + commitopts + commitopts2,
510 _('[OPTION]... [-r] REV'))
510 _('[OPTION]... [-r] REV'))
511 def backout(ui, repo, node=None, rev=None, **opts):
511 def backout(ui, repo, node=None, rev=None, **opts):
512 '''reverse effect of earlier changeset
512 '''reverse effect of earlier changeset
513
513
514 Prepare a new changeset with the effect of REV undone in the
514 Prepare a new changeset with the effect of REV undone in the
515 current working directory. If no conflicts were encountered,
515 current working directory. If no conflicts were encountered,
516 it will be committed immediately.
516 it will be committed immediately.
517
517
518 If REV is the parent of the working directory, then this new changeset
518 If REV is the parent of the working directory, then this new changeset
519 is committed automatically (unless --no-commit is specified).
519 is committed automatically (unless --no-commit is specified).
520
520
521 .. note::
521 .. note::
522
522
523 :hg:`backout` cannot be used to fix either an unwanted or
523 :hg:`backout` cannot be used to fix either an unwanted or
524 incorrect merge.
524 incorrect merge.
525
525
526 .. container:: verbose
526 .. container:: verbose
527
527
528 Examples:
528 Examples:
529
529
530 - Reverse the effect of the parent of the working directory.
530 - Reverse the effect of the parent of the working directory.
531 This backout will be committed immediately::
531 This backout will be committed immediately::
532
532
533 hg backout -r .
533 hg backout -r .
534
534
535 - Reverse the effect of previous bad revision 23::
535 - Reverse the effect of previous bad revision 23::
536
536
537 hg backout -r 23
537 hg backout -r 23
538
538
539 - Reverse the effect of previous bad revision 23 and
539 - Reverse the effect of previous bad revision 23 and
540 leave changes uncommitted::
540 leave changes uncommitted::
541
541
542 hg backout -r 23 --no-commit
542 hg backout -r 23 --no-commit
543 hg commit -m "Backout revision 23"
543 hg commit -m "Backout revision 23"
544
544
545 By default, the pending changeset will have one parent,
545 By default, the pending changeset will have one parent,
546 maintaining a linear history. With --merge, the pending
546 maintaining a linear history. With --merge, the pending
547 changeset will instead have two parents: the old parent of the
547 changeset will instead have two parents: the old parent of the
548 working directory and a new child of REV that simply undoes REV.
548 working directory and a new child of REV that simply undoes REV.
549
549
550 Before version 1.7, the behavior without --merge was equivalent
550 Before version 1.7, the behavior without --merge was equivalent
551 to specifying --merge followed by :hg:`update --clean .` to
551 to specifying --merge followed by :hg:`update --clean .` to
552 cancel the merge and leave the child of REV as a head to be
552 cancel the merge and leave the child of REV as a head to be
553 merged separately.
553 merged separately.
554
554
555 See :hg:`help dates` for a list of formats valid for -d/--date.
555 See :hg:`help dates` for a list of formats valid for -d/--date.
556
556
557 See :hg:`help revert` for a way to restore files to the state
557 See :hg:`help revert` for a way to restore files to the state
558 of another revision.
558 of another revision.
559
559
560 Returns 0 on success, 1 if nothing to backout or there are unresolved
560 Returns 0 on success, 1 if nothing to backout or there are unresolved
561 files.
561 files.
562 '''
562 '''
563 wlock = lock = None
563 wlock = lock = None
564 try:
564 try:
565 wlock = repo.wlock()
565 wlock = repo.wlock()
566 lock = repo.lock()
566 lock = repo.lock()
567 return _dobackout(ui, repo, node, rev, **opts)
567 return _dobackout(ui, repo, node, rev, **opts)
568 finally:
568 finally:
569 release(lock, wlock)
569 release(lock, wlock)
570
570
571 def _dobackout(ui, repo, node=None, rev=None, **opts):
571 def _dobackout(ui, repo, node=None, rev=None, **opts):
572 opts = pycompat.byteskwargs(opts)
572 opts = pycompat.byteskwargs(opts)
573 if opts.get('commit') and opts.get('no_commit'):
573 if opts.get('commit') and opts.get('no_commit'):
574 raise error.Abort(_("cannot use --commit with --no-commit"))
574 raise error.Abort(_("cannot use --commit with --no-commit"))
575 if opts.get('merge') and opts.get('no_commit'):
575 if opts.get('merge') and opts.get('no_commit'):
576 raise error.Abort(_("cannot use --merge with --no-commit"))
576 raise error.Abort(_("cannot use --merge with --no-commit"))
577
577
578 if rev and node:
578 if rev and node:
579 raise error.Abort(_("please specify just one revision"))
579 raise error.Abort(_("please specify just one revision"))
580
580
581 if not rev:
581 if not rev:
582 rev = node
582 rev = node
583
583
584 if not rev:
584 if not rev:
585 raise error.Abort(_("please specify a revision to backout"))
585 raise error.Abort(_("please specify a revision to backout"))
586
586
587 date = opts.get('date')
587 date = opts.get('date')
588 if date:
588 if date:
589 opts['date'] = dateutil.parsedate(date)
589 opts['date'] = dateutil.parsedate(date)
590
590
591 cmdutil.checkunfinished(repo)
591 cmdutil.checkunfinished(repo)
592 cmdutil.bailifchanged(repo)
592 cmdutil.bailifchanged(repo)
593 node = scmutil.revsingle(repo, rev).node()
593 node = scmutil.revsingle(repo, rev).node()
594
594
595 op1, op2 = repo.dirstate.parents()
595 op1, op2 = repo.dirstate.parents()
596 if not repo.changelog.isancestor(node, op1):
596 if not repo.changelog.isancestor(node, op1):
597 raise error.Abort(_('cannot backout change that is not an ancestor'))
597 raise error.Abort(_('cannot backout change that is not an ancestor'))
598
598
599 p1, p2 = repo.changelog.parents(node)
599 p1, p2 = repo.changelog.parents(node)
600 if p1 == nullid:
600 if p1 == nullid:
601 raise error.Abort(_('cannot backout a change with no parents'))
601 raise error.Abort(_('cannot backout a change with no parents'))
602 if p2 != nullid:
602 if p2 != nullid:
603 if not opts.get('parent'):
603 if not opts.get('parent'):
604 raise error.Abort(_('cannot backout a merge changeset'))
604 raise error.Abort(_('cannot backout a merge changeset'))
605 p = repo.lookup(opts['parent'])
605 p = repo.lookup(opts['parent'])
606 if p not in (p1, p2):
606 if p not in (p1, p2):
607 raise error.Abort(_('%s is not a parent of %s') %
607 raise error.Abort(_('%s is not a parent of %s') %
608 (short(p), short(node)))
608 (short(p), short(node)))
609 parent = p
609 parent = p
610 else:
610 else:
611 if opts.get('parent'):
611 if opts.get('parent'):
612 raise error.Abort(_('cannot use --parent on non-merge changeset'))
612 raise error.Abort(_('cannot use --parent on non-merge changeset'))
613 parent = p1
613 parent = p1
614
614
615 # the backout should appear on the same branch
615 # the backout should appear on the same branch
616 branch = repo.dirstate.branch()
616 branch = repo.dirstate.branch()
617 bheads = repo.branchheads(branch)
617 bheads = repo.branchheads(branch)
618 rctx = scmutil.revsingle(repo, hex(parent))
618 rctx = scmutil.revsingle(repo, hex(parent))
619 if not opts.get('merge') and op1 != node:
619 if not opts.get('merge') and op1 != node:
620 dsguard = dirstateguard.dirstateguard(repo, 'backout')
620 dsguard = dirstateguard.dirstateguard(repo, 'backout')
621 try:
621 try:
622 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
622 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
623 'backout')
623 'backout')
624 stats = mergemod.update(repo, parent, True, True, node, False)
624 stats = mergemod.update(repo, parent, True, True, node, False)
625 repo.setparents(op1, op2)
625 repo.setparents(op1, op2)
626 dsguard.close()
626 dsguard.close()
627 hg._showstats(repo, stats)
627 hg._showstats(repo, stats)
628 if stats.unresolvedcount:
628 if stats.unresolvedcount:
629 repo.ui.status(_("use 'hg resolve' to retry unresolved "
629 repo.ui.status(_("use 'hg resolve' to retry unresolved "
630 "file merges\n"))
630 "file merges\n"))
631 return 1
631 return 1
632 finally:
632 finally:
633 ui.setconfig('ui', 'forcemerge', '', '')
633 ui.setconfig('ui', 'forcemerge', '', '')
634 lockmod.release(dsguard)
634 lockmod.release(dsguard)
635 else:
635 else:
636 hg.clean(repo, node, show_stats=False)
636 hg.clean(repo, node, show_stats=False)
637 repo.dirstate.setbranch(branch)
637 repo.dirstate.setbranch(branch)
638 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
638 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
639
639
640 if opts.get('no_commit'):
640 if opts.get('no_commit'):
641 msg = _("changeset %s backed out, "
641 msg = _("changeset %s backed out, "
642 "don't forget to commit.\n")
642 "don't forget to commit.\n")
643 ui.status(msg % short(node))
643 ui.status(msg % short(node))
644 return 0
644 return 0
645
645
646 def commitfunc(ui, repo, message, match, opts):
646 def commitfunc(ui, repo, message, match, opts):
647 editform = 'backout'
647 editform = 'backout'
648 e = cmdutil.getcommiteditor(editform=editform,
648 e = cmdutil.getcommiteditor(editform=editform,
649 **pycompat.strkwargs(opts))
649 **pycompat.strkwargs(opts))
650 if not message:
650 if not message:
651 # we don't translate commit messages
651 # we don't translate commit messages
652 message = "Backed out changeset %s" % short(node)
652 message = "Backed out changeset %s" % short(node)
653 e = cmdutil.getcommiteditor(edit=True, editform=editform)
653 e = cmdutil.getcommiteditor(edit=True, editform=editform)
654 return repo.commit(message, opts.get('user'), opts.get('date'),
654 return repo.commit(message, opts.get('user'), opts.get('date'),
655 match, editor=e)
655 match, editor=e)
656 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
656 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
657 if not newnode:
657 if not newnode:
658 ui.status(_("nothing changed\n"))
658 ui.status(_("nothing changed\n"))
659 return 1
659 return 1
660 cmdutil.commitstatus(repo, newnode, branch, bheads)
660 cmdutil.commitstatus(repo, newnode, branch, bheads)
661
661
662 def nice(node):
662 def nice(node):
663 return '%d:%s' % (repo.changelog.rev(node), short(node))
663 return '%d:%s' % (repo.changelog.rev(node), short(node))
664 ui.status(_('changeset %s backs out changeset %s\n') %
664 ui.status(_('changeset %s backs out changeset %s\n') %
665 (nice(repo.changelog.tip()), nice(node)))
665 (nice(repo.changelog.tip()), nice(node)))
666 if opts.get('merge') and op1 != node:
666 if opts.get('merge') and op1 != node:
667 hg.clean(repo, op1, show_stats=False)
667 hg.clean(repo, op1, show_stats=False)
668 ui.status(_('merging with changeset %s\n')
668 ui.status(_('merging with changeset %s\n')
669 % nice(repo.changelog.tip()))
669 % nice(repo.changelog.tip()))
670 try:
670 try:
671 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
671 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
672 'backout')
672 'backout')
673 return hg.merge(repo, hex(repo.changelog.tip()))
673 return hg.merge(repo, hex(repo.changelog.tip()))
674 finally:
674 finally:
675 ui.setconfig('ui', 'forcemerge', '', '')
675 ui.setconfig('ui', 'forcemerge', '', '')
676 return 0
676 return 0
677
677
678 @command('bisect',
678 @command('bisect',
679 [('r', 'reset', False, _('reset bisect state')),
679 [('r', 'reset', False, _('reset bisect state')),
680 ('g', 'good', False, _('mark changeset good')),
680 ('g', 'good', False, _('mark changeset good')),
681 ('b', 'bad', False, _('mark changeset bad')),
681 ('b', 'bad', False, _('mark changeset bad')),
682 ('s', 'skip', False, _('skip testing changeset')),
682 ('s', 'skip', False, _('skip testing changeset')),
683 ('e', 'extend', False, _('extend the bisect range')),
683 ('e', 'extend', False, _('extend the bisect range')),
684 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
684 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
685 ('U', 'noupdate', False, _('do not update to target'))],
685 ('U', 'noupdate', False, _('do not update to target'))],
686 _("[-gbsr] [-U] [-c CMD] [REV]"))
686 _("[-gbsr] [-U] [-c CMD] [REV]"))
687 def bisect(ui, repo, rev=None, extra=None, command=None,
687 def bisect(ui, repo, rev=None, extra=None, command=None,
688 reset=None, good=None, bad=None, skip=None, extend=None,
688 reset=None, good=None, bad=None, skip=None, extend=None,
689 noupdate=None):
689 noupdate=None):
690 """subdivision search of changesets
690 """subdivision search of changesets
691
691
692 This command helps to find changesets which introduce problems. To
692 This command helps to find changesets which introduce problems. To
693 use, mark the earliest changeset you know exhibits the problem as
693 use, mark the earliest changeset you know exhibits the problem as
694 bad, then mark the latest changeset which is free from the problem
694 bad, then mark the latest changeset which is free from the problem
695 as good. Bisect will update your working directory to a revision
695 as good. Bisect will update your working directory to a revision
696 for testing (unless the -U/--noupdate option is specified). Once
696 for testing (unless the -U/--noupdate option is specified). Once
697 you have performed tests, mark the working directory as good or
697 you have performed tests, mark the working directory as good or
698 bad, and bisect will either update to another candidate changeset
698 bad, and bisect will either update to another candidate changeset
699 or announce that it has found the bad revision.
699 or announce that it has found the bad revision.
700
700
701 As a shortcut, you can also use the revision argument to mark a
701 As a shortcut, you can also use the revision argument to mark a
702 revision as good or bad without checking it out first.
702 revision as good or bad without checking it out first.
703
703
704 If you supply a command, it will be used for automatic bisection.
704 If you supply a command, it will be used for automatic bisection.
705 The environment variable HG_NODE will contain the ID of the
705 The environment variable HG_NODE will contain the ID of the
706 changeset being tested. The exit status of the command will be
706 changeset being tested. The exit status of the command will be
707 used to mark revisions as good or bad: status 0 means good, 125
707 used to mark revisions as good or bad: status 0 means good, 125
708 means to skip the revision, 127 (command not found) will abort the
708 means to skip the revision, 127 (command not found) will abort the
709 bisection, and any other non-zero exit status means the revision
709 bisection, and any other non-zero exit status means the revision
710 is bad.
710 is bad.
711
711
712 .. container:: verbose
712 .. container:: verbose
713
713
714 Some examples:
714 Some examples:
715
715
716 - start a bisection with known bad revision 34, and good revision 12::
716 - start a bisection with known bad revision 34, and good revision 12::
717
717
718 hg bisect --bad 34
718 hg bisect --bad 34
719 hg bisect --good 12
719 hg bisect --good 12
720
720
721 - advance the current bisection by marking current revision as good or
721 - advance the current bisection by marking current revision as good or
722 bad::
722 bad::
723
723
724 hg bisect --good
724 hg bisect --good
725 hg bisect --bad
725 hg bisect --bad
726
726
727 - mark the current revision, or a known revision, to be skipped (e.g. if
727 - mark the current revision, or a known revision, to be skipped (e.g. if
728 that revision is not usable because of another issue)::
728 that revision is not usable because of another issue)::
729
729
730 hg bisect --skip
730 hg bisect --skip
731 hg bisect --skip 23
731 hg bisect --skip 23
732
732
733 - skip all revisions that do not touch directories ``foo`` or ``bar``::
733 - skip all revisions that do not touch directories ``foo`` or ``bar``::
734
734
735 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
735 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
736
736
737 - forget the current bisection::
737 - forget the current bisection::
738
738
739 hg bisect --reset
739 hg bisect --reset
740
740
741 - use 'make && make tests' to automatically find the first broken
741 - use 'make && make tests' to automatically find the first broken
742 revision::
742 revision::
743
743
744 hg bisect --reset
744 hg bisect --reset
745 hg bisect --bad 34
745 hg bisect --bad 34
746 hg bisect --good 12
746 hg bisect --good 12
747 hg bisect --command "make && make tests"
747 hg bisect --command "make && make tests"
748
748
749 - see all changesets whose states are already known in the current
749 - see all changesets whose states are already known in the current
750 bisection::
750 bisection::
751
751
752 hg log -r "bisect(pruned)"
752 hg log -r "bisect(pruned)"
753
753
754 - see the changeset currently being bisected (especially useful
754 - see the changeset currently being bisected (especially useful
755 if running with -U/--noupdate)::
755 if running with -U/--noupdate)::
756
756
757 hg log -r "bisect(current)"
757 hg log -r "bisect(current)"
758
758
759 - see all changesets that took part in the current bisection::
759 - see all changesets that took part in the current bisection::
760
760
761 hg log -r "bisect(range)"
761 hg log -r "bisect(range)"
762
762
763 - you can even get a nice graph::
763 - you can even get a nice graph::
764
764
765 hg log --graph -r "bisect(range)"
765 hg log --graph -r "bisect(range)"
766
766
767 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
767 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
768
768
769 Returns 0 on success.
769 Returns 0 on success.
770 """
770 """
771 # backward compatibility
771 # backward compatibility
772 if rev in "good bad reset init".split():
772 if rev in "good bad reset init".split():
773 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
773 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
774 cmd, rev, extra = rev, extra, None
774 cmd, rev, extra = rev, extra, None
775 if cmd == "good":
775 if cmd == "good":
776 good = True
776 good = True
777 elif cmd == "bad":
777 elif cmd == "bad":
778 bad = True
778 bad = True
779 else:
779 else:
780 reset = True
780 reset = True
781 elif extra:
781 elif extra:
782 raise error.Abort(_('incompatible arguments'))
782 raise error.Abort(_('incompatible arguments'))
783
783
784 incompatibles = {
784 incompatibles = {
785 '--bad': bad,
785 '--bad': bad,
786 '--command': bool(command),
786 '--command': bool(command),
787 '--extend': extend,
787 '--extend': extend,
788 '--good': good,
788 '--good': good,
789 '--reset': reset,
789 '--reset': reset,
790 '--skip': skip,
790 '--skip': skip,
791 }
791 }
792
792
793 enabled = [x for x in incompatibles if incompatibles[x]]
793 enabled = [x for x in incompatibles if incompatibles[x]]
794
794
795 if len(enabled) > 1:
795 if len(enabled) > 1:
796 raise error.Abort(_('%s and %s are incompatible') %
796 raise error.Abort(_('%s and %s are incompatible') %
797 tuple(sorted(enabled)[0:2]))
797 tuple(sorted(enabled)[0:2]))
798
798
799 if reset:
799 if reset:
800 hbisect.resetstate(repo)
800 hbisect.resetstate(repo)
801 return
801 return
802
802
803 state = hbisect.load_state(repo)
803 state = hbisect.load_state(repo)
804
804
805 # update state
805 # update state
806 if good or bad or skip:
806 if good or bad or skip:
807 if rev:
807 if rev:
808 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
808 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
809 else:
809 else:
810 nodes = [repo.lookup('.')]
810 nodes = [repo.lookup('.')]
811 if good:
811 if good:
812 state['good'] += nodes
812 state['good'] += nodes
813 elif bad:
813 elif bad:
814 state['bad'] += nodes
814 state['bad'] += nodes
815 elif skip:
815 elif skip:
816 state['skip'] += nodes
816 state['skip'] += nodes
817 hbisect.save_state(repo, state)
817 hbisect.save_state(repo, state)
818 if not (state['good'] and state['bad']):
818 if not (state['good'] and state['bad']):
819 return
819 return
820
820
821 def mayupdate(repo, node, show_stats=True):
821 def mayupdate(repo, node, show_stats=True):
822 """common used update sequence"""
822 """common used update sequence"""
823 if noupdate:
823 if noupdate:
824 return
824 return
825 cmdutil.checkunfinished(repo)
825 cmdutil.checkunfinished(repo)
826 cmdutil.bailifchanged(repo)
826 cmdutil.bailifchanged(repo)
827 return hg.clean(repo, node, show_stats=show_stats)
827 return hg.clean(repo, node, show_stats=show_stats)
828
828
829 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
829 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
830
830
831 if command:
831 if command:
832 changesets = 1
832 changesets = 1
833 if noupdate:
833 if noupdate:
834 try:
834 try:
835 node = state['current'][0]
835 node = state['current'][0]
836 except LookupError:
836 except LookupError:
837 raise error.Abort(_('current bisect revision is unknown - '
837 raise error.Abort(_('current bisect revision is unknown - '
838 'start a new bisect to fix'))
838 'start a new bisect to fix'))
839 else:
839 else:
840 node, p2 = repo.dirstate.parents()
840 node, p2 = repo.dirstate.parents()
841 if p2 != nullid:
841 if p2 != nullid:
842 raise error.Abort(_('current bisect revision is a merge'))
842 raise error.Abort(_('current bisect revision is a merge'))
843 if rev:
843 if rev:
844 node = repo[scmutil.revsingle(repo, rev, node)].node()
844 node = repo[scmutil.revsingle(repo, rev, node)].node()
845 try:
845 try:
846 while changesets:
846 while changesets:
847 # update state
847 # update state
848 state['current'] = [node]
848 state['current'] = [node]
849 hbisect.save_state(repo, state)
849 hbisect.save_state(repo, state)
850 status = ui.system(command, environ={'HG_NODE': hex(node)},
850 status = ui.system(command, environ={'HG_NODE': hex(node)},
851 blockedtag='bisect_check')
851 blockedtag='bisect_check')
852 if status == 125:
852 if status == 125:
853 transition = "skip"
853 transition = "skip"
854 elif status == 0:
854 elif status == 0:
855 transition = "good"
855 transition = "good"
856 # status < 0 means process was killed
856 # status < 0 means process was killed
857 elif status == 127:
857 elif status == 127:
858 raise error.Abort(_("failed to execute %s") % command)
858 raise error.Abort(_("failed to execute %s") % command)
859 elif status < 0:
859 elif status < 0:
860 raise error.Abort(_("%s killed") % command)
860 raise error.Abort(_("%s killed") % command)
861 else:
861 else:
862 transition = "bad"
862 transition = "bad"
863 state[transition].append(node)
863 state[transition].append(node)
864 ctx = repo[node]
864 ctx = repo[node]
865 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
865 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
866 transition))
866 transition))
867 hbisect.checkstate(state)
867 hbisect.checkstate(state)
868 # bisect
868 # bisect
869 nodes, changesets, bgood = hbisect.bisect(repo, state)
869 nodes, changesets, bgood = hbisect.bisect(repo, state)
870 # update to next check
870 # update to next check
871 node = nodes[0]
871 node = nodes[0]
872 mayupdate(repo, node, show_stats=False)
872 mayupdate(repo, node, show_stats=False)
873 finally:
873 finally:
874 state['current'] = [node]
874 state['current'] = [node]
875 hbisect.save_state(repo, state)
875 hbisect.save_state(repo, state)
876 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
876 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
877 return
877 return
878
878
879 hbisect.checkstate(state)
879 hbisect.checkstate(state)
880
880
881 # actually bisect
881 # actually bisect
882 nodes, changesets, good = hbisect.bisect(repo, state)
882 nodes, changesets, good = hbisect.bisect(repo, state)
883 if extend:
883 if extend:
884 if not changesets:
884 if not changesets:
885 extendnode = hbisect.extendrange(repo, state, nodes, good)
885 extendnode = hbisect.extendrange(repo, state, nodes, good)
886 if extendnode is not None:
886 if extendnode is not None:
887 ui.write(_("Extending search to changeset %d:%s\n")
887 ui.write(_("Extending search to changeset %d:%s\n")
888 % (extendnode.rev(), extendnode))
888 % (extendnode.rev(), extendnode))
889 state['current'] = [extendnode.node()]
889 state['current'] = [extendnode.node()]
890 hbisect.save_state(repo, state)
890 hbisect.save_state(repo, state)
891 return mayupdate(repo, extendnode.node())
891 return mayupdate(repo, extendnode.node())
892 raise error.Abort(_("nothing to extend"))
892 raise error.Abort(_("nothing to extend"))
893
893
894 if changesets == 0:
894 if changesets == 0:
895 hbisect.printresult(ui, repo, state, displayer, nodes, good)
895 hbisect.printresult(ui, repo, state, displayer, nodes, good)
896 else:
896 else:
897 assert len(nodes) == 1 # only a single node can be tested next
897 assert len(nodes) == 1 # only a single node can be tested next
898 node = nodes[0]
898 node = nodes[0]
899 # compute the approximate number of remaining tests
899 # compute the approximate number of remaining tests
900 tests, size = 0, 2
900 tests, size = 0, 2
901 while size <= changesets:
901 while size <= changesets:
902 tests, size = tests + 1, size * 2
902 tests, size = tests + 1, size * 2
903 rev = repo.changelog.rev(node)
903 rev = repo.changelog.rev(node)
904 ui.write(_("Testing changeset %d:%s "
904 ui.write(_("Testing changeset %d:%s "
905 "(%d changesets remaining, ~%d tests)\n")
905 "(%d changesets remaining, ~%d tests)\n")
906 % (rev, short(node), changesets, tests))
906 % (rev, short(node), changesets, tests))
907 state['current'] = [node]
907 state['current'] = [node]
908 hbisect.save_state(repo, state)
908 hbisect.save_state(repo, state)
909 return mayupdate(repo, node)
909 return mayupdate(repo, node)
910
910
911 @command('bookmarks|bookmark',
911 @command('bookmarks|bookmark',
912 [('f', 'force', False, _('force')),
912 [('f', 'force', False, _('force')),
913 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
913 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
914 ('d', 'delete', False, _('delete a given bookmark')),
914 ('d', 'delete', False, _('delete a given bookmark')),
915 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
915 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
916 ('i', 'inactive', False, _('mark a bookmark inactive')),
916 ('i', 'inactive', False, _('mark a bookmark inactive')),
917 ] + formatteropts,
917 ] + formatteropts,
918 _('hg bookmarks [OPTIONS]... [NAME]...'))
918 _('hg bookmarks [OPTIONS]... [NAME]...'))
919 def bookmark(ui, repo, *names, **opts):
919 def bookmark(ui, repo, *names, **opts):
920 '''create a new bookmark or list existing bookmarks
920 '''create a new bookmark or list existing bookmarks
921
921
922 Bookmarks are labels on changesets to help track lines of development.
922 Bookmarks are labels on changesets to help track lines of development.
923 Bookmarks are unversioned and can be moved, renamed and deleted.
923 Bookmarks are unversioned and can be moved, renamed and deleted.
924 Deleting or moving a bookmark has no effect on the associated changesets.
924 Deleting or moving a bookmark has no effect on the associated changesets.
925
925
926 Creating or updating to a bookmark causes it to be marked as 'active'.
926 Creating or updating to a bookmark causes it to be marked as 'active'.
927 The active bookmark is indicated with a '*'.
927 The active bookmark is indicated with a '*'.
928 When a commit is made, the active bookmark will advance to the new commit.
928 When a commit is made, the active bookmark will advance to the new commit.
929 A plain :hg:`update` will also advance an active bookmark, if possible.
929 A plain :hg:`update` will also advance an active bookmark, if possible.
930 Updating away from a bookmark will cause it to be deactivated.
930 Updating away from a bookmark will cause it to be deactivated.
931
931
932 Bookmarks can be pushed and pulled between repositories (see
932 Bookmarks can be pushed and pulled between repositories (see
933 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
933 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
934 diverged, a new 'divergent bookmark' of the form 'name@path' will
934 diverged, a new 'divergent bookmark' of the form 'name@path' will
935 be created. Using :hg:`merge` will resolve the divergence.
935 be created. Using :hg:`merge` will resolve the divergence.
936
936
937 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
937 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
938 the active bookmark's name.
938 the active bookmark's name.
939
939
940 A bookmark named '@' has the special property that :hg:`clone` will
940 A bookmark named '@' has the special property that :hg:`clone` will
941 check it out by default if it exists.
941 check it out by default if it exists.
942
942
943 .. container:: verbose
943 .. container:: verbose
944
944
945 Examples:
945 Examples:
946
946
947 - create an active bookmark for a new line of development::
947 - create an active bookmark for a new line of development::
948
948
949 hg book new-feature
949 hg book new-feature
950
950
951 - create an inactive bookmark as a place marker::
951 - create an inactive bookmark as a place marker::
952
952
953 hg book -i reviewed
953 hg book -i reviewed
954
954
955 - create an inactive bookmark on another changeset::
955 - create an inactive bookmark on another changeset::
956
956
957 hg book -r .^ tested
957 hg book -r .^ tested
958
958
959 - rename bookmark turkey to dinner::
959 - rename bookmark turkey to dinner::
960
960
961 hg book -m turkey dinner
961 hg book -m turkey dinner
962
962
963 - move the '@' bookmark from another branch::
963 - move the '@' bookmark from another branch::
964
964
965 hg book -f @
965 hg book -f @
966 '''
966 '''
967 force = opts.get(r'force')
967 force = opts.get(r'force')
968 rev = opts.get(r'rev')
968 rev = opts.get(r'rev')
969 delete = opts.get(r'delete')
969 delete = opts.get(r'delete')
970 rename = opts.get(r'rename')
970 rename = opts.get(r'rename')
971 inactive = opts.get(r'inactive')
971 inactive = opts.get(r'inactive')
972
972
973 if delete and rename:
973 if delete and rename:
974 raise error.Abort(_("--delete and --rename are incompatible"))
974 raise error.Abort(_("--delete and --rename are incompatible"))
975 if delete and rev:
975 if delete and rev:
976 raise error.Abort(_("--rev is incompatible with --delete"))
976 raise error.Abort(_("--rev is incompatible with --delete"))
977 if rename and rev:
977 if rename and rev:
978 raise error.Abort(_("--rev is incompatible with --rename"))
978 raise error.Abort(_("--rev is incompatible with --rename"))
979 if not names and (delete or rev):
979 if not names and (delete or rev):
980 raise error.Abort(_("bookmark name required"))
980 raise error.Abort(_("bookmark name required"))
981
981
982 if delete or rename or names or inactive:
982 if delete or rename or names or inactive:
983 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
983 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
984 if delete:
984 if delete:
985 names = pycompat.maplist(repo._bookmarks.expandname, names)
985 names = pycompat.maplist(repo._bookmarks.expandname, names)
986 bookmarks.delete(repo, tr, names)
986 bookmarks.delete(repo, tr, names)
987 elif rename:
987 elif rename:
988 if not names:
988 if not names:
989 raise error.Abort(_("new bookmark name required"))
989 raise error.Abort(_("new bookmark name required"))
990 elif len(names) > 1:
990 elif len(names) > 1:
991 raise error.Abort(_("only one new bookmark name allowed"))
991 raise error.Abort(_("only one new bookmark name allowed"))
992 rename = repo._bookmarks.expandname(rename)
992 rename = repo._bookmarks.expandname(rename)
993 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
993 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
994 elif names:
994 elif names:
995 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
995 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
996 elif inactive:
996 elif inactive:
997 if len(repo._bookmarks) == 0:
997 if len(repo._bookmarks) == 0:
998 ui.status(_("no bookmarks set\n"))
998 ui.status(_("no bookmarks set\n"))
999 elif not repo._activebookmark:
999 elif not repo._activebookmark:
1000 ui.status(_("no active bookmark\n"))
1000 ui.status(_("no active bookmark\n"))
1001 else:
1001 else:
1002 bookmarks.deactivate(repo)
1002 bookmarks.deactivate(repo)
1003 else: # show bookmarks
1003 else: # show bookmarks
1004 bookmarks.printbookmarks(ui, repo, **opts)
1004 bookmarks.printbookmarks(ui, repo, **opts)
1005
1005
1006 @command('branch',
1006 @command('branch',
1007 [('f', 'force', None,
1007 [('f', 'force', None,
1008 _('set branch name even if it shadows an existing branch')),
1008 _('set branch name even if it shadows an existing branch')),
1009 ('C', 'clean', None, _('reset branch name to parent branch name')),
1009 ('C', 'clean', None, _('reset branch name to parent branch name')),
1010 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1010 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1011 ],
1011 ],
1012 _('[-fC] [NAME]'))
1012 _('[-fC] [NAME]'))
1013 def branch(ui, repo, label=None, **opts):
1013 def branch(ui, repo, label=None, **opts):
1014 """set or show the current branch name
1014 """set or show the current branch name
1015
1015
1016 .. note::
1016 .. note::
1017
1017
1018 Branch names are permanent and global. Use :hg:`bookmark` to create a
1018 Branch names are permanent and global. Use :hg:`bookmark` to create a
1019 light-weight bookmark instead. See :hg:`help glossary` for more
1019 light-weight bookmark instead. See :hg:`help glossary` for more
1020 information about named branches and bookmarks.
1020 information about named branches and bookmarks.
1021
1021
1022 With no argument, show the current branch name. With one argument,
1022 With no argument, show the current branch name. With one argument,
1023 set the working directory branch name (the branch will not exist
1023 set the working directory branch name (the branch will not exist
1024 in the repository until the next commit). Standard practice
1024 in the repository until the next commit). Standard practice
1025 recommends that primary development take place on the 'default'
1025 recommends that primary development take place on the 'default'
1026 branch.
1026 branch.
1027
1027
1028 Unless -f/--force is specified, branch will not let you set a
1028 Unless -f/--force is specified, branch will not let you set a
1029 branch name that already exists.
1029 branch name that already exists.
1030
1030
1031 Use -C/--clean to reset the working directory branch to that of
1031 Use -C/--clean to reset the working directory branch to that of
1032 the parent of the working directory, negating a previous branch
1032 the parent of the working directory, negating a previous branch
1033 change.
1033 change.
1034
1034
1035 Use the command :hg:`update` to switch to an existing branch. Use
1035 Use the command :hg:`update` to switch to an existing branch. Use
1036 :hg:`commit --close-branch` to mark this branch head as closed.
1036 :hg:`commit --close-branch` to mark this branch head as closed.
1037 When all heads of a branch are closed, the branch will be
1037 When all heads of a branch are closed, the branch will be
1038 considered closed.
1038 considered closed.
1039
1039
1040 Returns 0 on success.
1040 Returns 0 on success.
1041 """
1041 """
1042 opts = pycompat.byteskwargs(opts)
1042 opts = pycompat.byteskwargs(opts)
1043 revs = opts.get('rev')
1043 revs = opts.get('rev')
1044 if label:
1044 if label:
1045 label = label.strip()
1045 label = label.strip()
1046
1046
1047 if not opts.get('clean') and not label:
1047 if not opts.get('clean') and not label:
1048 if revs:
1048 if revs:
1049 raise error.Abort(_("no branch name specified for the revisions"))
1049 raise error.Abort(_("no branch name specified for the revisions"))
1050 ui.write("%s\n" % repo.dirstate.branch())
1050 ui.write("%s\n" % repo.dirstate.branch())
1051 return
1051 return
1052
1052
1053 with repo.wlock():
1053 with repo.wlock():
1054 if opts.get('clean'):
1054 if opts.get('clean'):
1055 label = repo[None].p1().branch()
1055 label = repo[None].p1().branch()
1056 repo.dirstate.setbranch(label)
1056 repo.dirstate.setbranch(label)
1057 ui.status(_('reset working directory to branch %s\n') % label)
1057 ui.status(_('reset working directory to branch %s\n') % label)
1058 elif label:
1058 elif label:
1059
1059
1060 scmutil.checknewlabel(repo, label, 'branch')
1060 scmutil.checknewlabel(repo, label, 'branch')
1061 if revs:
1061 if revs:
1062 return cmdutil.changebranch(ui, repo, revs, label)
1062 return cmdutil.changebranch(ui, repo, revs, label)
1063
1063
1064 if not opts.get('force') and label in repo.branchmap():
1064 if not opts.get('force') and label in repo.branchmap():
1065 if label not in [p.branch() for p in repo[None].parents()]:
1065 if label not in [p.branch() for p in repo[None].parents()]:
1066 raise error.Abort(_('a branch of the same name already'
1066 raise error.Abort(_('a branch of the same name already'
1067 ' exists'),
1067 ' exists'),
1068 # i18n: "it" refers to an existing branch
1068 # i18n: "it" refers to an existing branch
1069 hint=_("use 'hg update' to switch to it"))
1069 hint=_("use 'hg update' to switch to it"))
1070
1070
1071 repo.dirstate.setbranch(label)
1071 repo.dirstate.setbranch(label)
1072 ui.status(_('marked working directory as branch %s\n') % label)
1072 ui.status(_('marked working directory as branch %s\n') % label)
1073
1073
1074 # find any open named branches aside from default
1074 # find any open named branches aside from default
1075 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1075 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1076 if n != "default" and not c]
1076 if n != "default" and not c]
1077 if not others:
1077 if not others:
1078 ui.status(_('(branches are permanent and global, '
1078 ui.status(_('(branches are permanent and global, '
1079 'did you want a bookmark?)\n'))
1079 'did you want a bookmark?)\n'))
1080
1080
1081 @command('branches',
1081 @command('branches',
1082 [('a', 'active', False,
1082 [('a', 'active', False,
1083 _('show only branches that have unmerged heads (DEPRECATED)')),
1083 _('show only branches that have unmerged heads (DEPRECATED)')),
1084 ('c', 'closed', False, _('show normal and closed branches')),
1084 ('c', 'closed', False, _('show normal and closed branches')),
1085 ] + formatteropts,
1085 ] + formatteropts,
1086 _('[-c]'),
1086 _('[-c]'),
1087 intents={INTENT_READONLY})
1087 intents={INTENT_READONLY})
1088 def branches(ui, repo, active=False, closed=False, **opts):
1088 def branches(ui, repo, active=False, closed=False, **opts):
1089 """list repository named branches
1089 """list repository named branches
1090
1090
1091 List the repository's named branches, indicating which ones are
1091 List the repository's named branches, indicating which ones are
1092 inactive. If -c/--closed is specified, also list branches which have
1092 inactive. If -c/--closed is specified, also list branches which have
1093 been marked closed (see :hg:`commit --close-branch`).
1093 been marked closed (see :hg:`commit --close-branch`).
1094
1094
1095 Use the command :hg:`update` to switch to an existing branch.
1095 Use the command :hg:`update` to switch to an existing branch.
1096
1096
1097 Returns 0.
1097 Returns 0.
1098 """
1098 """
1099
1099
1100 opts = pycompat.byteskwargs(opts)
1100 opts = pycompat.byteskwargs(opts)
1101 ui.pager('branches')
1101 ui.pager('branches')
1102 fm = ui.formatter('branches', opts)
1102 fm = ui.formatter('branches', opts)
1103 hexfunc = fm.hexfunc
1103 hexfunc = fm.hexfunc
1104
1104
1105 allheads = set(repo.heads())
1105 allheads = set(repo.heads())
1106 branches = []
1106 branches = []
1107 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1107 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1108 isactive = False
1108 isactive = False
1109 if not isclosed:
1109 if not isclosed:
1110 openheads = set(repo.branchmap().iteropen(heads))
1110 openheads = set(repo.branchmap().iteropen(heads))
1111 isactive = bool(openheads & allheads)
1111 isactive = bool(openheads & allheads)
1112 branches.append((tag, repo[tip], isactive, not isclosed))
1112 branches.append((tag, repo[tip], isactive, not isclosed))
1113 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1113 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1114 reverse=True)
1114 reverse=True)
1115
1115
1116 for tag, ctx, isactive, isopen in branches:
1116 for tag, ctx, isactive, isopen in branches:
1117 if active and not isactive:
1117 if active and not isactive:
1118 continue
1118 continue
1119 if isactive:
1119 if isactive:
1120 label = 'branches.active'
1120 label = 'branches.active'
1121 notice = ''
1121 notice = ''
1122 elif not isopen:
1122 elif not isopen:
1123 if not closed:
1123 if not closed:
1124 continue
1124 continue
1125 label = 'branches.closed'
1125 label = 'branches.closed'
1126 notice = _(' (closed)')
1126 notice = _(' (closed)')
1127 else:
1127 else:
1128 label = 'branches.inactive'
1128 label = 'branches.inactive'
1129 notice = _(' (inactive)')
1129 notice = _(' (inactive)')
1130 current = (tag == repo.dirstate.branch())
1130 current = (tag == repo.dirstate.branch())
1131 if current:
1131 if current:
1132 label = 'branches.current'
1132 label = 'branches.current'
1133
1133
1134 fm.startitem()
1134 fm.startitem()
1135 fm.write('branch', '%s', tag, label=label)
1135 fm.write('branch', '%s', tag, label=label)
1136 rev = ctx.rev()
1136 rev = ctx.rev()
1137 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1137 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1138 fmt = ' ' * padsize + ' %d:%s'
1138 fmt = ' ' * padsize + ' %d:%s'
1139 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1139 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1140 label='log.changeset changeset.%s' % ctx.phasestr())
1140 label='log.changeset changeset.%s' % ctx.phasestr())
1141 fm.context(ctx=ctx)
1141 fm.context(ctx=ctx)
1142 fm.data(active=isactive, closed=not isopen, current=current)
1142 fm.data(active=isactive, closed=not isopen, current=current)
1143 if not ui.quiet:
1143 if not ui.quiet:
1144 fm.plain(notice)
1144 fm.plain(notice)
1145 fm.plain('\n')
1145 fm.plain('\n')
1146 fm.end()
1146 fm.end()
1147
1147
1148 @command('bundle',
1148 @command('bundle',
1149 [('f', 'force', None, _('run even when the destination is unrelated')),
1149 [('f', 'force', None, _('run even when the destination is unrelated')),
1150 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1150 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1151 _('REV')),
1151 _('REV')),
1152 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1152 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1153 _('BRANCH')),
1153 _('BRANCH')),
1154 ('', 'base', [],
1154 ('', 'base', [],
1155 _('a base changeset assumed to be available at the destination'),
1155 _('a base changeset assumed to be available at the destination'),
1156 _('REV')),
1156 _('REV')),
1157 ('a', 'all', None, _('bundle all changesets in the repository')),
1157 ('a', 'all', None, _('bundle all changesets in the repository')),
1158 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1158 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1159 ] + remoteopts,
1159 ] + remoteopts,
1160 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1160 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1161 def bundle(ui, repo, fname, dest=None, **opts):
1161 def bundle(ui, repo, fname, dest=None, **opts):
1162 """create a bundle file
1162 """create a bundle file
1163
1163
1164 Generate a bundle file containing data to be transferred to another
1164 Generate a bundle file containing data to be transferred to another
1165 repository.
1165 repository.
1166
1166
1167 To create a bundle containing all changesets, use -a/--all
1167 To create a bundle containing all changesets, use -a/--all
1168 (or --base null). Otherwise, hg assumes the destination will have
1168 (or --base null). Otherwise, hg assumes the destination will have
1169 all the nodes you specify with --base parameters. Otherwise, hg
1169 all the nodes you specify with --base parameters. Otherwise, hg
1170 will assume the repository has all the nodes in destination, or
1170 will assume the repository has all the nodes in destination, or
1171 default-push/default if no destination is specified, where destination
1171 default-push/default if no destination is specified, where destination
1172 is the repository you provide through DEST option.
1172 is the repository you provide through DEST option.
1173
1173
1174 You can change bundle format with the -t/--type option. See
1174 You can change bundle format with the -t/--type option. See
1175 :hg:`help bundlespec` for documentation on this format. By default,
1175 :hg:`help bundlespec` for documentation on this format. By default,
1176 the most appropriate format is used and compression defaults to
1176 the most appropriate format is used and compression defaults to
1177 bzip2.
1177 bzip2.
1178
1178
1179 The bundle file can then be transferred using conventional means
1179 The bundle file can then be transferred using conventional means
1180 and applied to another repository with the unbundle or pull
1180 and applied to another repository with the unbundle or pull
1181 command. This is useful when direct push and pull are not
1181 command. This is useful when direct push and pull are not
1182 available or when exporting an entire repository is undesirable.
1182 available or when exporting an entire repository is undesirable.
1183
1183
1184 Applying bundles preserves all changeset contents including
1184 Applying bundles preserves all changeset contents including
1185 permissions, copy/rename information, and revision history.
1185 permissions, copy/rename information, and revision history.
1186
1186
1187 Returns 0 on success, 1 if no changes found.
1187 Returns 0 on success, 1 if no changes found.
1188 """
1188 """
1189 opts = pycompat.byteskwargs(opts)
1189 opts = pycompat.byteskwargs(opts)
1190 revs = None
1190 revs = None
1191 if 'rev' in opts:
1191 if 'rev' in opts:
1192 revstrings = opts['rev']
1192 revstrings = opts['rev']
1193 revs = scmutil.revrange(repo, revstrings)
1193 revs = scmutil.revrange(repo, revstrings)
1194 if revstrings and not revs:
1194 if revstrings and not revs:
1195 raise error.Abort(_('no commits to bundle'))
1195 raise error.Abort(_('no commits to bundle'))
1196
1196
1197 bundletype = opts.get('type', 'bzip2').lower()
1197 bundletype = opts.get('type', 'bzip2').lower()
1198 try:
1198 try:
1199 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1199 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1200 except error.UnsupportedBundleSpecification as e:
1200 except error.UnsupportedBundleSpecification as e:
1201 raise error.Abort(pycompat.bytestr(e),
1201 raise error.Abort(pycompat.bytestr(e),
1202 hint=_("see 'hg help bundlespec' for supported "
1202 hint=_("see 'hg help bundlespec' for supported "
1203 "values for --type"))
1203 "values for --type"))
1204 cgversion = bundlespec.contentopts["cg.version"]
1204 cgversion = bundlespec.contentopts["cg.version"]
1205
1205
1206 # Packed bundles are a pseudo bundle format for now.
1206 # Packed bundles are a pseudo bundle format for now.
1207 if cgversion == 's1':
1207 if cgversion == 's1':
1208 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1208 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1209 hint=_("use 'hg debugcreatestreamclonebundle'"))
1209 hint=_("use 'hg debugcreatestreamclonebundle'"))
1210
1210
1211 if opts.get('all'):
1211 if opts.get('all'):
1212 if dest:
1212 if dest:
1213 raise error.Abort(_("--all is incompatible with specifying "
1213 raise error.Abort(_("--all is incompatible with specifying "
1214 "a destination"))
1214 "a destination"))
1215 if opts.get('base'):
1215 if opts.get('base'):
1216 ui.warn(_("ignoring --base because --all was specified\n"))
1216 ui.warn(_("ignoring --base because --all was specified\n"))
1217 base = ['null']
1217 base = ['null']
1218 else:
1218 else:
1219 base = scmutil.revrange(repo, opts.get('base'))
1219 base = scmutil.revrange(repo, opts.get('base'))
1220 if cgversion not in changegroup.supportedoutgoingversions(repo):
1220 if cgversion not in changegroup.supportedoutgoingversions(repo):
1221 raise error.Abort(_("repository does not support bundle version %s") %
1221 raise error.Abort(_("repository does not support bundle version %s") %
1222 cgversion)
1222 cgversion)
1223
1223
1224 if base:
1224 if base:
1225 if dest:
1225 if dest:
1226 raise error.Abort(_("--base is incompatible with specifying "
1226 raise error.Abort(_("--base is incompatible with specifying "
1227 "a destination"))
1227 "a destination"))
1228 common = [repo[rev].node() for rev in base]
1228 common = [repo[rev].node() for rev in base]
1229 heads = [repo[r].node() for r in revs] if revs else None
1229 heads = [repo[r].node() for r in revs] if revs else None
1230 outgoing = discovery.outgoing(repo, common, heads)
1230 outgoing = discovery.outgoing(repo, common, heads)
1231 else:
1231 else:
1232 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1232 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1233 dest, branches = hg.parseurl(dest, opts.get('branch'))
1233 dest, branches = hg.parseurl(dest, opts.get('branch'))
1234 other = hg.peer(repo, opts, dest)
1234 other = hg.peer(repo, opts, dest)
1235 revs = [repo[r].hex() for r in revs]
1235 revs = [repo[r].hex() for r in revs]
1236 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1236 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1237 heads = revs and map(repo.lookup, revs) or revs
1237 heads = revs and map(repo.lookup, revs) or revs
1238 outgoing = discovery.findcommonoutgoing(repo, other,
1238 outgoing = discovery.findcommonoutgoing(repo, other,
1239 onlyheads=heads,
1239 onlyheads=heads,
1240 force=opts.get('force'),
1240 force=opts.get('force'),
1241 portable=True)
1241 portable=True)
1242
1242
1243 if not outgoing.missing:
1243 if not outgoing.missing:
1244 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1244 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1245 return 1
1245 return 1
1246
1246
1247 if cgversion == '01': #bundle1
1247 if cgversion == '01': #bundle1
1248 bversion = 'HG10' + bundlespec.wirecompression
1248 bversion = 'HG10' + bundlespec.wirecompression
1249 bcompression = None
1249 bcompression = None
1250 elif cgversion in ('02', '03'):
1250 elif cgversion in ('02', '03'):
1251 bversion = 'HG20'
1251 bversion = 'HG20'
1252 bcompression = bundlespec.wirecompression
1252 bcompression = bundlespec.wirecompression
1253 else:
1253 else:
1254 raise error.ProgrammingError(
1254 raise error.ProgrammingError(
1255 'bundle: unexpected changegroup version %s' % cgversion)
1255 'bundle: unexpected changegroup version %s' % cgversion)
1256
1256
1257 # TODO compression options should be derived from bundlespec parsing.
1257 # TODO compression options should be derived from bundlespec parsing.
1258 # This is a temporary hack to allow adjusting bundle compression
1258 # This is a temporary hack to allow adjusting bundle compression
1259 # level without a) formalizing the bundlespec changes to declare it
1259 # level without a) formalizing the bundlespec changes to declare it
1260 # b) introducing a command flag.
1260 # b) introducing a command flag.
1261 compopts = {}
1261 compopts = {}
1262 complevel = ui.configint('experimental',
1262 complevel = ui.configint('experimental',
1263 'bundlecomplevel.' + bundlespec.compression)
1263 'bundlecomplevel.' + bundlespec.compression)
1264 if complevel is None:
1264 if complevel is None:
1265 complevel = ui.configint('experimental', 'bundlecomplevel')
1265 complevel = ui.configint('experimental', 'bundlecomplevel')
1266 if complevel is not None:
1266 if complevel is not None:
1267 compopts['level'] = complevel
1267 compopts['level'] = complevel
1268
1268
1269 # Allow overriding the bundling of obsmarker in phases through
1269 # Allow overriding the bundling of obsmarker in phases through
1270 # configuration while we don't have a bundle version that include them
1270 # configuration while we don't have a bundle version that include them
1271 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1271 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1272 bundlespec.contentopts['obsolescence'] = True
1272 bundlespec.contentopts['obsolescence'] = True
1273 if repo.ui.configbool('experimental', 'bundle-phases'):
1273 if repo.ui.configbool('experimental', 'bundle-phases'):
1274 bundlespec.contentopts['phases'] = True
1274 bundlespec.contentopts['phases'] = True
1275
1275
1276 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1276 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1277 bundlespec.contentopts, compression=bcompression,
1277 bundlespec.contentopts, compression=bcompression,
1278 compopts=compopts)
1278 compopts=compopts)
1279
1279
1280 @command('cat',
1280 @command('cat',
1281 [('o', 'output', '',
1281 [('o', 'output', '',
1282 _('print output to file with formatted name'), _('FORMAT')),
1282 _('print output to file with formatted name'), _('FORMAT')),
1283 ('r', 'rev', '', _('print the given revision'), _('REV')),
1283 ('r', 'rev', '', _('print the given revision'), _('REV')),
1284 ('', 'decode', None, _('apply any matching decode filter')),
1284 ('', 'decode', None, _('apply any matching decode filter')),
1285 ] + walkopts + formatteropts,
1285 ] + walkopts + formatteropts,
1286 _('[OPTION]... FILE...'),
1286 _('[OPTION]... FILE...'),
1287 inferrepo=True,
1287 inferrepo=True,
1288 intents={INTENT_READONLY})
1288 intents={INTENT_READONLY})
1289 def cat(ui, repo, file1, *pats, **opts):
1289 def cat(ui, repo, file1, *pats, **opts):
1290 """output the current or given revision of files
1290 """output the current or given revision of files
1291
1291
1292 Print the specified files as they were at the given revision. If
1292 Print the specified files as they were at the given revision. If
1293 no revision is given, the parent of the working directory is used.
1293 no revision is given, the parent of the working directory is used.
1294
1294
1295 Output may be to a file, in which case the name of the file is
1295 Output may be to a file, in which case the name of the file is
1296 given using a template string. See :hg:`help templates`. In addition
1296 given using a template string. See :hg:`help templates`. In addition
1297 to the common template keywords, the following formatting rules are
1297 to the common template keywords, the following formatting rules are
1298 supported:
1298 supported:
1299
1299
1300 :``%%``: literal "%" character
1300 :``%%``: literal "%" character
1301 :``%s``: basename of file being printed
1301 :``%s``: basename of file being printed
1302 :``%d``: dirname of file being printed, or '.' if in repository root
1302 :``%d``: dirname of file being printed, or '.' if in repository root
1303 :``%p``: root-relative path name of file being printed
1303 :``%p``: root-relative path name of file being printed
1304 :``%H``: changeset hash (40 hexadecimal digits)
1304 :``%H``: changeset hash (40 hexadecimal digits)
1305 :``%R``: changeset revision number
1305 :``%R``: changeset revision number
1306 :``%h``: short-form changeset hash (12 hexadecimal digits)
1306 :``%h``: short-form changeset hash (12 hexadecimal digits)
1307 :``%r``: zero-padded changeset revision number
1307 :``%r``: zero-padded changeset revision number
1308 :``%b``: basename of the exporting repository
1308 :``%b``: basename of the exporting repository
1309 :``\\``: literal "\\" character
1309 :``\\``: literal "\\" character
1310
1310
1311 Returns 0 on success.
1311 Returns 0 on success.
1312 """
1312 """
1313 opts = pycompat.byteskwargs(opts)
1313 opts = pycompat.byteskwargs(opts)
1314 rev = opts.get('rev')
1314 rev = opts.get('rev')
1315 if rev:
1315 if rev:
1316 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1316 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1317 ctx = scmutil.revsingle(repo, rev)
1317 ctx = scmutil.revsingle(repo, rev)
1318 m = scmutil.match(ctx, (file1,) + pats, opts)
1318 m = scmutil.match(ctx, (file1,) + pats, opts)
1319 fntemplate = opts.pop('output', '')
1319 fntemplate = opts.pop('output', '')
1320 if cmdutil.isstdiofilename(fntemplate):
1320 if cmdutil.isstdiofilename(fntemplate):
1321 fntemplate = ''
1321 fntemplate = ''
1322
1322
1323 if fntemplate:
1323 if fntemplate:
1324 fm = formatter.nullformatter(ui, 'cat', opts)
1324 fm = formatter.nullformatter(ui, 'cat', opts)
1325 else:
1325 else:
1326 ui.pager('cat')
1326 ui.pager('cat')
1327 fm = ui.formatter('cat', opts)
1327 fm = ui.formatter('cat', opts)
1328 with fm:
1328 with fm:
1329 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1329 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1330 **pycompat.strkwargs(opts))
1330 **pycompat.strkwargs(opts))
1331
1331
1332 @command('^clone',
1332 @command('^clone',
1333 [('U', 'noupdate', None, _('the clone will include an empty working '
1333 [('U', 'noupdate', None, _('the clone will include an empty working '
1334 'directory (only a repository)')),
1334 'directory (only a repository)')),
1335 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1335 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1336 _('REV')),
1336 _('REV')),
1337 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1337 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1338 ' and its ancestors'), _('REV')),
1338 ' and its ancestors'), _('REV')),
1339 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1339 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1340 ' changesets and their ancestors'), _('BRANCH')),
1340 ' changesets and their ancestors'), _('BRANCH')),
1341 ('', 'pull', None, _('use pull protocol to copy metadata')),
1341 ('', 'pull', None, _('use pull protocol to copy metadata')),
1342 ('', 'uncompressed', None,
1342 ('', 'uncompressed', None,
1343 _('an alias to --stream (DEPRECATED)')),
1343 _('an alias to --stream (DEPRECATED)')),
1344 ('', 'stream', None,
1344 ('', 'stream', None,
1345 _('clone with minimal data processing')),
1345 _('clone with minimal data processing')),
1346 ] + remoteopts,
1346 ] + remoteopts,
1347 _('[OPTION]... SOURCE [DEST]'),
1347 _('[OPTION]... SOURCE [DEST]'),
1348 norepo=True)
1348 norepo=True)
1349 def clone(ui, source, dest=None, **opts):
1349 def clone(ui, source, dest=None, **opts):
1350 """make a copy of an existing repository
1350 """make a copy of an existing repository
1351
1351
1352 Create a copy of an existing repository in a new directory.
1352 Create a copy of an existing repository in a new directory.
1353
1353
1354 If no destination directory name is specified, it defaults to the
1354 If no destination directory name is specified, it defaults to the
1355 basename of the source.
1355 basename of the source.
1356
1356
1357 The location of the source is added to the new repository's
1357 The location of the source is added to the new repository's
1358 ``.hg/hgrc`` file, as the default to be used for future pulls.
1358 ``.hg/hgrc`` file, as the default to be used for future pulls.
1359
1359
1360 Only local paths and ``ssh://`` URLs are supported as
1360 Only local paths and ``ssh://`` URLs are supported as
1361 destinations. For ``ssh://`` destinations, no working directory or
1361 destinations. For ``ssh://`` destinations, no working directory or
1362 ``.hg/hgrc`` will be created on the remote side.
1362 ``.hg/hgrc`` will be created on the remote side.
1363
1363
1364 If the source repository has a bookmark called '@' set, that
1364 If the source repository has a bookmark called '@' set, that
1365 revision will be checked out in the new repository by default.
1365 revision will be checked out in the new repository by default.
1366
1366
1367 To check out a particular version, use -u/--update, or
1367 To check out a particular version, use -u/--update, or
1368 -U/--noupdate to create a clone with no working directory.
1368 -U/--noupdate to create a clone with no working directory.
1369
1369
1370 To pull only a subset of changesets, specify one or more revisions
1370 To pull only a subset of changesets, specify one or more revisions
1371 identifiers with -r/--rev or branches with -b/--branch. The
1371 identifiers with -r/--rev or branches with -b/--branch. The
1372 resulting clone will contain only the specified changesets and
1372 resulting clone will contain only the specified changesets and
1373 their ancestors. These options (or 'clone src#rev dest') imply
1373 their ancestors. These options (or 'clone src#rev dest') imply
1374 --pull, even for local source repositories.
1374 --pull, even for local source repositories.
1375
1375
1376 In normal clone mode, the remote normalizes repository data into a common
1376 In normal clone mode, the remote normalizes repository data into a common
1377 exchange format and the receiving end translates this data into its local
1377 exchange format and the receiving end translates this data into its local
1378 storage format. --stream activates a different clone mode that essentially
1378 storage format. --stream activates a different clone mode that essentially
1379 copies repository files from the remote with minimal data processing. This
1379 copies repository files from the remote with minimal data processing. This
1380 significantly reduces the CPU cost of a clone both remotely and locally.
1380 significantly reduces the CPU cost of a clone both remotely and locally.
1381 However, it often increases the transferred data size by 30-40%. This can
1381 However, it often increases the transferred data size by 30-40%. This can
1382 result in substantially faster clones where I/O throughput is plentiful,
1382 result in substantially faster clones where I/O throughput is plentiful,
1383 especially for larger repositories. A side-effect of --stream clones is
1383 especially for larger repositories. A side-effect of --stream clones is
1384 that storage settings and requirements on the remote are applied locally:
1384 that storage settings and requirements on the remote are applied locally:
1385 a modern client may inherit legacy or inefficient storage used by the
1385 a modern client may inherit legacy or inefficient storage used by the
1386 remote or a legacy Mercurial client may not be able to clone from a
1386 remote or a legacy Mercurial client may not be able to clone from a
1387 modern Mercurial remote.
1387 modern Mercurial remote.
1388
1388
1389 .. note::
1389 .. note::
1390
1390
1391 Specifying a tag will include the tagged changeset but not the
1391 Specifying a tag will include the tagged changeset but not the
1392 changeset containing the tag.
1392 changeset containing the tag.
1393
1393
1394 .. container:: verbose
1394 .. container:: verbose
1395
1395
1396 For efficiency, hardlinks are used for cloning whenever the
1396 For efficiency, hardlinks are used for cloning whenever the
1397 source and destination are on the same filesystem (note this
1397 source and destination are on the same filesystem (note this
1398 applies only to the repository data, not to the working
1398 applies only to the repository data, not to the working
1399 directory). Some filesystems, such as AFS, implement hardlinking
1399 directory). Some filesystems, such as AFS, implement hardlinking
1400 incorrectly, but do not report errors. In these cases, use the
1400 incorrectly, but do not report errors. In these cases, use the
1401 --pull option to avoid hardlinking.
1401 --pull option to avoid hardlinking.
1402
1402
1403 Mercurial will update the working directory to the first applicable
1403 Mercurial will update the working directory to the first applicable
1404 revision from this list:
1404 revision from this list:
1405
1405
1406 a) null if -U or the source repository has no changesets
1406 a) null if -U or the source repository has no changesets
1407 b) if -u . and the source repository is local, the first parent of
1407 b) if -u . and the source repository is local, the first parent of
1408 the source repository's working directory
1408 the source repository's working directory
1409 c) the changeset specified with -u (if a branch name, this means the
1409 c) the changeset specified with -u (if a branch name, this means the
1410 latest head of that branch)
1410 latest head of that branch)
1411 d) the changeset specified with -r
1411 d) the changeset specified with -r
1412 e) the tipmost head specified with -b
1412 e) the tipmost head specified with -b
1413 f) the tipmost head specified with the url#branch source syntax
1413 f) the tipmost head specified with the url#branch source syntax
1414 g) the revision marked with the '@' bookmark, if present
1414 g) the revision marked with the '@' bookmark, if present
1415 h) the tipmost head of the default branch
1415 h) the tipmost head of the default branch
1416 i) tip
1416 i) tip
1417
1417
1418 When cloning from servers that support it, Mercurial may fetch
1418 When cloning from servers that support it, Mercurial may fetch
1419 pre-generated data from a server-advertised URL or inline from the
1419 pre-generated data from a server-advertised URL or inline from the
1420 same stream. When this is done, hooks operating on incoming changesets
1420 same stream. When this is done, hooks operating on incoming changesets
1421 and changegroups may fire more than once, once for each pre-generated
1421 and changegroups may fire more than once, once for each pre-generated
1422 bundle and as well as for any additional remaining data. In addition,
1422 bundle and as well as for any additional remaining data. In addition,
1423 if an error occurs, the repository may be rolled back to a partial
1423 if an error occurs, the repository may be rolled back to a partial
1424 clone. This behavior may change in future releases.
1424 clone. This behavior may change in future releases.
1425 See :hg:`help -e clonebundles` for more.
1425 See :hg:`help -e clonebundles` for more.
1426
1426
1427 Examples:
1427 Examples:
1428
1428
1429 - clone a remote repository to a new directory named hg/::
1429 - clone a remote repository to a new directory named hg/::
1430
1430
1431 hg clone https://www.mercurial-scm.org/repo/hg/
1431 hg clone https://www.mercurial-scm.org/repo/hg/
1432
1432
1433 - create a lightweight local clone::
1433 - create a lightweight local clone::
1434
1434
1435 hg clone project/ project-feature/
1435 hg clone project/ project-feature/
1436
1436
1437 - clone from an absolute path on an ssh server (note double-slash)::
1437 - clone from an absolute path on an ssh server (note double-slash)::
1438
1438
1439 hg clone ssh://user@server//home/projects/alpha/
1439 hg clone ssh://user@server//home/projects/alpha/
1440
1440
1441 - do a streaming clone while checking out a specified version::
1441 - do a streaming clone while checking out a specified version::
1442
1442
1443 hg clone --stream http://server/repo -u 1.5
1443 hg clone --stream http://server/repo -u 1.5
1444
1444
1445 - create a repository without changesets after a particular revision::
1445 - create a repository without changesets after a particular revision::
1446
1446
1447 hg clone -r 04e544 experimental/ good/
1447 hg clone -r 04e544 experimental/ good/
1448
1448
1449 - clone (and track) a particular named branch::
1449 - clone (and track) a particular named branch::
1450
1450
1451 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1451 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1452
1452
1453 See :hg:`help urls` for details on specifying URLs.
1453 See :hg:`help urls` for details on specifying URLs.
1454
1454
1455 Returns 0 on success.
1455 Returns 0 on success.
1456 """
1456 """
1457 opts = pycompat.byteskwargs(opts)
1457 opts = pycompat.byteskwargs(opts)
1458 if opts.get('noupdate') and opts.get('updaterev'):
1458 if opts.get('noupdate') and opts.get('updaterev'):
1459 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1459 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1460
1460
1461 r = hg.clone(ui, opts, source, dest,
1461 r = hg.clone(ui, opts, source, dest,
1462 pull=opts.get('pull'),
1462 pull=opts.get('pull'),
1463 stream=opts.get('stream') or opts.get('uncompressed'),
1463 stream=opts.get('stream') or opts.get('uncompressed'),
1464 revs=opts.get('rev'),
1464 revs=opts.get('rev'),
1465 update=opts.get('updaterev') or not opts.get('noupdate'),
1465 update=opts.get('updaterev') or not opts.get('noupdate'),
1466 branch=opts.get('branch'),
1466 branch=opts.get('branch'),
1467 shareopts=opts.get('shareopts'))
1467 shareopts=opts.get('shareopts'))
1468
1468
1469 return r is None
1469 return r is None
1470
1470
1471 @command('^commit|ci',
1471 @command('^commit|ci',
1472 [('A', 'addremove', None,
1472 [('A', 'addremove', None,
1473 _('mark new/missing files as added/removed before committing')),
1473 _('mark new/missing files as added/removed before committing')),
1474 ('', 'close-branch', None,
1474 ('', 'close-branch', None,
1475 _('mark a branch head as closed')),
1475 _('mark a branch head as closed')),
1476 ('', 'amend', None, _('amend the parent of the working directory')),
1476 ('', 'amend', None, _('amend the parent of the working directory')),
1477 ('s', 'secret', None, _('use the secret phase for committing')),
1477 ('s', 'secret', None, _('use the secret phase for committing')),
1478 ('e', 'edit', None, _('invoke editor on commit messages')),
1478 ('e', 'edit', None, _('invoke editor on commit messages')),
1479 ('i', 'interactive', None, _('use interactive mode')),
1479 ('i', 'interactive', None, _('use interactive mode')),
1480 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1480 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1481 _('[OPTION]... [FILE]...'),
1481 _('[OPTION]... [FILE]...'),
1482 inferrepo=True)
1482 inferrepo=True)
1483 def commit(ui, repo, *pats, **opts):
1483 def commit(ui, repo, *pats, **opts):
1484 """commit the specified files or all outstanding changes
1484 """commit the specified files or all outstanding changes
1485
1485
1486 Commit changes to the given files into the repository. Unlike a
1486 Commit changes to the given files into the repository. Unlike a
1487 centralized SCM, this operation is a local operation. See
1487 centralized SCM, this operation is a local operation. See
1488 :hg:`push` for a way to actively distribute your changes.
1488 :hg:`push` for a way to actively distribute your changes.
1489
1489
1490 If a list of files is omitted, all changes reported by :hg:`status`
1490 If a list of files is omitted, all changes reported by :hg:`status`
1491 will be committed.
1491 will be committed.
1492
1492
1493 If you are committing the result of a merge, do not provide any
1493 If you are committing the result of a merge, do not provide any
1494 filenames or -I/-X filters.
1494 filenames or -I/-X filters.
1495
1495
1496 If no commit message is specified, Mercurial starts your
1496 If no commit message is specified, Mercurial starts your
1497 configured editor where you can enter a message. In case your
1497 configured editor where you can enter a message. In case your
1498 commit fails, you will find a backup of your message in
1498 commit fails, you will find a backup of your message in
1499 ``.hg/last-message.txt``.
1499 ``.hg/last-message.txt``.
1500
1500
1501 The --close-branch flag can be used to mark the current branch
1501 The --close-branch flag can be used to mark the current branch
1502 head closed. When all heads of a branch are closed, the branch
1502 head closed. When all heads of a branch are closed, the branch
1503 will be considered closed and no longer listed.
1503 will be considered closed and no longer listed.
1504
1504
1505 The --amend flag can be used to amend the parent of the
1505 The --amend flag can be used to amend the parent of the
1506 working directory with a new commit that contains the changes
1506 working directory with a new commit that contains the changes
1507 in the parent in addition to those currently reported by :hg:`status`,
1507 in the parent in addition to those currently reported by :hg:`status`,
1508 if there are any. The old commit is stored in a backup bundle in
1508 if there are any. The old commit is stored in a backup bundle in
1509 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1509 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1510 on how to restore it).
1510 on how to restore it).
1511
1511
1512 Message, user and date are taken from the amended commit unless
1512 Message, user and date are taken from the amended commit unless
1513 specified. When a message isn't specified on the command line,
1513 specified. When a message isn't specified on the command line,
1514 the editor will open with the message of the amended commit.
1514 the editor will open with the message of the amended commit.
1515
1515
1516 It is not possible to amend public changesets (see :hg:`help phases`)
1516 It is not possible to amend public changesets (see :hg:`help phases`)
1517 or changesets that have children.
1517 or changesets that have children.
1518
1518
1519 See :hg:`help dates` for a list of formats valid for -d/--date.
1519 See :hg:`help dates` for a list of formats valid for -d/--date.
1520
1520
1521 Returns 0 on success, 1 if nothing changed.
1521 Returns 0 on success, 1 if nothing changed.
1522
1522
1523 .. container:: verbose
1523 .. container:: verbose
1524
1524
1525 Examples:
1525 Examples:
1526
1526
1527 - commit all files ending in .py::
1527 - commit all files ending in .py::
1528
1528
1529 hg commit --include "set:**.py"
1529 hg commit --include "set:**.py"
1530
1530
1531 - commit all non-binary files::
1531 - commit all non-binary files::
1532
1532
1533 hg commit --exclude "set:binary()"
1533 hg commit --exclude "set:binary()"
1534
1534
1535 - amend the current commit and set the date to now::
1535 - amend the current commit and set the date to now::
1536
1536
1537 hg commit --amend --date now
1537 hg commit --amend --date now
1538 """
1538 """
1539 wlock = lock = None
1539 wlock = lock = None
1540 try:
1540 try:
1541 wlock = repo.wlock()
1541 wlock = repo.wlock()
1542 lock = repo.lock()
1542 lock = repo.lock()
1543 return _docommit(ui, repo, *pats, **opts)
1543 return _docommit(ui, repo, *pats, **opts)
1544 finally:
1544 finally:
1545 release(lock, wlock)
1545 release(lock, wlock)
1546
1546
1547 def _docommit(ui, repo, *pats, **opts):
1547 def _docommit(ui, repo, *pats, **opts):
1548 if opts.get(r'interactive'):
1548 if opts.get(r'interactive'):
1549 opts.pop(r'interactive')
1549 opts.pop(r'interactive')
1550 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1550 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1551 cmdutil.recordfilter, *pats,
1551 cmdutil.recordfilter, *pats,
1552 **opts)
1552 **opts)
1553 # ret can be 0 (no changes to record) or the value returned by
1553 # ret can be 0 (no changes to record) or the value returned by
1554 # commit(), 1 if nothing changed or None on success.
1554 # commit(), 1 if nothing changed or None on success.
1555 return 1 if ret == 0 else ret
1555 return 1 if ret == 0 else ret
1556
1556
1557 opts = pycompat.byteskwargs(opts)
1557 opts = pycompat.byteskwargs(opts)
1558 if opts.get('subrepos'):
1558 if opts.get('subrepos'):
1559 if opts.get('amend'):
1559 if opts.get('amend'):
1560 raise error.Abort(_('cannot amend with --subrepos'))
1560 raise error.Abort(_('cannot amend with --subrepos'))
1561 # Let --subrepos on the command line override config setting.
1561 # Let --subrepos on the command line override config setting.
1562 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1562 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1563
1563
1564 cmdutil.checkunfinished(repo, commit=True)
1564 cmdutil.checkunfinished(repo, commit=True)
1565
1565
1566 branch = repo[None].branch()
1566 branch = repo[None].branch()
1567 bheads = repo.branchheads(branch)
1567 bheads = repo.branchheads(branch)
1568
1568
1569 extra = {}
1569 extra = {}
1570 if opts.get('close_branch'):
1570 if opts.get('close_branch'):
1571 extra['close'] = '1'
1571 extra['close'] = '1'
1572
1572
1573 if not bheads:
1573 if not bheads:
1574 raise error.Abort(_('can only close branch heads'))
1574 raise error.Abort(_('can only close branch heads'))
1575 elif opts.get('amend'):
1575 elif opts.get('amend'):
1576 if repo[None].parents()[0].p1().branch() != branch and \
1576 if repo[None].parents()[0].p1().branch() != branch and \
1577 repo[None].parents()[0].p2().branch() != branch:
1577 repo[None].parents()[0].p2().branch() != branch:
1578 raise error.Abort(_('can only close branch heads'))
1578 raise error.Abort(_('can only close branch heads'))
1579
1579
1580 if opts.get('amend'):
1580 if opts.get('amend'):
1581 if ui.configbool('ui', 'commitsubrepos'):
1581 if ui.configbool('ui', 'commitsubrepos'):
1582 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1582 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1583
1583
1584 old = repo['.']
1584 old = repo['.']
1585 rewriteutil.precheck(repo, [old.rev()], 'amend')
1585 rewriteutil.precheck(repo, [old.rev()], 'amend')
1586
1586
1587 # Currently histedit gets confused if an amend happens while histedit
1587 # Currently histedit gets confused if an amend happens while histedit
1588 # is in progress. Since we have a checkunfinished command, we are
1588 # is in progress. Since we have a checkunfinished command, we are
1589 # temporarily honoring it.
1589 # temporarily honoring it.
1590 #
1590 #
1591 # Note: eventually this guard will be removed. Please do not expect
1591 # Note: eventually this guard will be removed. Please do not expect
1592 # this behavior to remain.
1592 # this behavior to remain.
1593 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1593 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1594 cmdutil.checkunfinished(repo)
1594 cmdutil.checkunfinished(repo)
1595
1595
1596 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1596 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1597 if node == old.node():
1597 if node == old.node():
1598 ui.status(_("nothing changed\n"))
1598 ui.status(_("nothing changed\n"))
1599 return 1
1599 return 1
1600 else:
1600 else:
1601 def commitfunc(ui, repo, message, match, opts):
1601 def commitfunc(ui, repo, message, match, opts):
1602 overrides = {}
1602 overrides = {}
1603 if opts.get('secret'):
1603 if opts.get('secret'):
1604 overrides[('phases', 'new-commit')] = 'secret'
1604 overrides[('phases', 'new-commit')] = 'secret'
1605
1605
1606 baseui = repo.baseui
1606 baseui = repo.baseui
1607 with baseui.configoverride(overrides, 'commit'):
1607 with baseui.configoverride(overrides, 'commit'):
1608 with ui.configoverride(overrides, 'commit'):
1608 with ui.configoverride(overrides, 'commit'):
1609 editform = cmdutil.mergeeditform(repo[None],
1609 editform = cmdutil.mergeeditform(repo[None],
1610 'commit.normal')
1610 'commit.normal')
1611 editor = cmdutil.getcommiteditor(
1611 editor = cmdutil.getcommiteditor(
1612 editform=editform, **pycompat.strkwargs(opts))
1612 editform=editform, **pycompat.strkwargs(opts))
1613 return repo.commit(message,
1613 return repo.commit(message,
1614 opts.get('user'),
1614 opts.get('user'),
1615 opts.get('date'),
1615 opts.get('date'),
1616 match,
1616 match,
1617 editor=editor,
1617 editor=editor,
1618 extra=extra)
1618 extra=extra)
1619
1619
1620 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1620 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1621
1621
1622 if not node:
1622 if not node:
1623 stat = cmdutil.postcommitstatus(repo, pats, opts)
1623 stat = cmdutil.postcommitstatus(repo, pats, opts)
1624 if stat[3]:
1624 if stat[3]:
1625 ui.status(_("nothing changed (%d missing files, see "
1625 ui.status(_("nothing changed (%d missing files, see "
1626 "'hg status')\n") % len(stat[3]))
1626 "'hg status')\n") % len(stat[3]))
1627 else:
1627 else:
1628 ui.status(_("nothing changed\n"))
1628 ui.status(_("nothing changed\n"))
1629 return 1
1629 return 1
1630
1630
1631 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1631 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1632
1632
1633 @command('config|showconfig|debugconfig',
1633 @command('config|showconfig|debugconfig',
1634 [('u', 'untrusted', None, _('show untrusted configuration options')),
1634 [('u', 'untrusted', None, _('show untrusted configuration options')),
1635 ('e', 'edit', None, _('edit user config')),
1635 ('e', 'edit', None, _('edit user config')),
1636 ('l', 'local', None, _('edit repository config')),
1636 ('l', 'local', None, _('edit repository config')),
1637 ('g', 'global', None, _('edit global config'))] + formatteropts,
1637 ('g', 'global', None, _('edit global config'))] + formatteropts,
1638 _('[-u] [NAME]...'),
1638 _('[-u] [NAME]...'),
1639 optionalrepo=True,
1639 optionalrepo=True,
1640 intents={INTENT_READONLY})
1640 intents={INTENT_READONLY})
1641 def config(ui, repo, *values, **opts):
1641 def config(ui, repo, *values, **opts):
1642 """show combined config settings from all hgrc files
1642 """show combined config settings from all hgrc files
1643
1643
1644 With no arguments, print names and values of all config items.
1644 With no arguments, print names and values of all config items.
1645
1645
1646 With one argument of the form section.name, print just the value
1646 With one argument of the form section.name, print just the value
1647 of that config item.
1647 of that config item.
1648
1648
1649 With multiple arguments, print names and values of all config
1649 With multiple arguments, print names and values of all config
1650 items with matching section names or section.names.
1650 items with matching section names or section.names.
1651
1651
1652 With --edit, start an editor on the user-level config file. With
1652 With --edit, start an editor on the user-level config file. With
1653 --global, edit the system-wide config file. With --local, edit the
1653 --global, edit the system-wide config file. With --local, edit the
1654 repository-level config file.
1654 repository-level config file.
1655
1655
1656 With --debug, the source (filename and line number) is printed
1656 With --debug, the source (filename and line number) is printed
1657 for each config item.
1657 for each config item.
1658
1658
1659 See :hg:`help config` for more information about config files.
1659 See :hg:`help config` for more information about config files.
1660
1660
1661 Returns 0 on success, 1 if NAME does not exist.
1661 Returns 0 on success, 1 if NAME does not exist.
1662
1662
1663 """
1663 """
1664
1664
1665 opts = pycompat.byteskwargs(opts)
1665 opts = pycompat.byteskwargs(opts)
1666 if opts.get('edit') or opts.get('local') or opts.get('global'):
1666 if opts.get('edit') or opts.get('local') or opts.get('global'):
1667 if opts.get('local') and opts.get('global'):
1667 if opts.get('local') and opts.get('global'):
1668 raise error.Abort(_("can't use --local and --global together"))
1668 raise error.Abort(_("can't use --local and --global together"))
1669
1669
1670 if opts.get('local'):
1670 if opts.get('local'):
1671 if not repo:
1671 if not repo:
1672 raise error.Abort(_("can't use --local outside a repository"))
1672 raise error.Abort(_("can't use --local outside a repository"))
1673 paths = [repo.vfs.join('hgrc')]
1673 paths = [repo.vfs.join('hgrc')]
1674 elif opts.get('global'):
1674 elif opts.get('global'):
1675 paths = rcutil.systemrcpath()
1675 paths = rcutil.systemrcpath()
1676 else:
1676 else:
1677 paths = rcutil.userrcpath()
1677 paths = rcutil.userrcpath()
1678
1678
1679 for f in paths:
1679 for f in paths:
1680 if os.path.exists(f):
1680 if os.path.exists(f):
1681 break
1681 break
1682 else:
1682 else:
1683 if opts.get('global'):
1683 if opts.get('global'):
1684 samplehgrc = uimod.samplehgrcs['global']
1684 samplehgrc = uimod.samplehgrcs['global']
1685 elif opts.get('local'):
1685 elif opts.get('local'):
1686 samplehgrc = uimod.samplehgrcs['local']
1686 samplehgrc = uimod.samplehgrcs['local']
1687 else:
1687 else:
1688 samplehgrc = uimod.samplehgrcs['user']
1688 samplehgrc = uimod.samplehgrcs['user']
1689
1689
1690 f = paths[0]
1690 f = paths[0]
1691 fp = open(f, "wb")
1691 fp = open(f, "wb")
1692 fp.write(util.tonativeeol(samplehgrc))
1692 fp.write(util.tonativeeol(samplehgrc))
1693 fp.close()
1693 fp.close()
1694
1694
1695 editor = ui.geteditor()
1695 editor = ui.geteditor()
1696 ui.system("%s \"%s\"" % (editor, f),
1696 ui.system("%s \"%s\"" % (editor, f),
1697 onerr=error.Abort, errprefix=_("edit failed"),
1697 onerr=error.Abort, errprefix=_("edit failed"),
1698 blockedtag='config_edit')
1698 blockedtag='config_edit')
1699 return
1699 return
1700 ui.pager('config')
1700 ui.pager('config')
1701 fm = ui.formatter('config', opts)
1701 fm = ui.formatter('config', opts)
1702 for t, f in rcutil.rccomponents():
1702 for t, f in rcutil.rccomponents():
1703 if t == 'path':
1703 if t == 'path':
1704 ui.debug('read config from: %s\n' % f)
1704 ui.debug('read config from: %s\n' % f)
1705 elif t == 'items':
1705 elif t == 'items':
1706 for section, name, value, source in f:
1706 for section, name, value, source in f:
1707 ui.debug('set config by: %s\n' % source)
1707 ui.debug('set config by: %s\n' % source)
1708 else:
1708 else:
1709 raise error.ProgrammingError('unknown rctype: %s' % t)
1709 raise error.ProgrammingError('unknown rctype: %s' % t)
1710 untrusted = bool(opts.get('untrusted'))
1710 untrusted = bool(opts.get('untrusted'))
1711
1711
1712 selsections = selentries = []
1712 selsections = selentries = []
1713 if values:
1713 if values:
1714 selsections = [v for v in values if '.' not in v]
1714 selsections = [v for v in values if '.' not in v]
1715 selentries = [v for v in values if '.' in v]
1715 selentries = [v for v in values if '.' in v]
1716 uniquesel = (len(selentries) == 1 and not selsections)
1716 uniquesel = (len(selentries) == 1 and not selsections)
1717 selsections = set(selsections)
1717 selsections = set(selsections)
1718 selentries = set(selentries)
1718 selentries = set(selentries)
1719
1719
1720 matched = False
1720 matched = False
1721 for section, name, value in ui.walkconfig(untrusted=untrusted):
1721 for section, name, value in ui.walkconfig(untrusted=untrusted):
1722 source = ui.configsource(section, name, untrusted)
1722 source = ui.configsource(section, name, untrusted)
1723 value = pycompat.bytestr(value)
1723 value = pycompat.bytestr(value)
1724 if fm.isplain():
1724 if fm.isplain():
1725 source = source or 'none'
1725 source = source or 'none'
1726 value = value.replace('\n', '\\n')
1726 value = value.replace('\n', '\\n')
1727 entryname = section + '.' + name
1727 entryname = section + '.' + name
1728 if values and not (section in selsections or entryname in selentries):
1728 if values and not (section in selsections or entryname in selentries):
1729 continue
1729 continue
1730 fm.startitem()
1730 fm.startitem()
1731 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1731 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1732 if uniquesel:
1732 if uniquesel:
1733 fm.data(name=entryname)
1733 fm.data(name=entryname)
1734 fm.write('value', '%s\n', value)
1734 fm.write('value', '%s\n', value)
1735 else:
1735 else:
1736 fm.write('name value', '%s=%s\n', entryname, value)
1736 fm.write('name value', '%s=%s\n', entryname, value)
1737 matched = True
1737 matched = True
1738 fm.end()
1738 fm.end()
1739 if matched:
1739 if matched:
1740 return 0
1740 return 0
1741 return 1
1741 return 1
1742
1742
1743 @command('copy|cp',
1743 @command('copy|cp',
1744 [('A', 'after', None, _('record a copy that has already occurred')),
1744 [('A', 'after', None, _('record a copy that has already occurred')),
1745 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1745 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1746 ] + walkopts + dryrunopts,
1746 ] + walkopts + dryrunopts,
1747 _('[OPTION]... [SOURCE]... DEST'))
1747 _('[OPTION]... [SOURCE]... DEST'))
1748 def copy(ui, repo, *pats, **opts):
1748 def copy(ui, repo, *pats, **opts):
1749 """mark files as copied for the next commit
1749 """mark files as copied for the next commit
1750
1750
1751 Mark dest as having copies of source files. If dest is a
1751 Mark dest as having copies of source files. If dest is a
1752 directory, copies are put in that directory. If dest is a file,
1752 directory, copies are put in that directory. If dest is a file,
1753 the source must be a single file.
1753 the source must be a single file.
1754
1754
1755 By default, this command copies the contents of files as they
1755 By default, this command copies the contents of files as they
1756 exist in the working directory. If invoked with -A/--after, the
1756 exist in the working directory. If invoked with -A/--after, the
1757 operation is recorded, but no copying is performed.
1757 operation is recorded, but no copying is performed.
1758
1758
1759 This command takes effect with the next commit. To undo a copy
1759 This command takes effect with the next commit. To undo a copy
1760 before that, see :hg:`revert`.
1760 before that, see :hg:`revert`.
1761
1761
1762 Returns 0 on success, 1 if errors are encountered.
1762 Returns 0 on success, 1 if errors are encountered.
1763 """
1763 """
1764 opts = pycompat.byteskwargs(opts)
1764 opts = pycompat.byteskwargs(opts)
1765 with repo.wlock(False):
1765 with repo.wlock(False):
1766 return cmdutil.copy(ui, repo, pats, opts)
1766 return cmdutil.copy(ui, repo, pats, opts)
1767
1767
1768 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1768 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1769 def debugcommands(ui, cmd='', *args):
1769 def debugcommands(ui, cmd='', *args):
1770 """list all available commands and options"""
1770 """list all available commands and options"""
1771 for cmd, vals in sorted(table.iteritems()):
1771 for cmd, vals in sorted(table.iteritems()):
1772 cmd = cmd.split('|')[0].strip('^')
1772 cmd = cmd.split('|')[0].strip('^')
1773 opts = ', '.join([i[1] for i in vals[1]])
1773 opts = ', '.join([i[1] for i in vals[1]])
1774 ui.write('%s: %s\n' % (cmd, opts))
1774 ui.write('%s: %s\n' % (cmd, opts))
1775
1775
1776 @command('debugcomplete',
1776 @command('debugcomplete',
1777 [('o', 'options', None, _('show the command options'))],
1777 [('o', 'options', None, _('show the command options'))],
1778 _('[-o] CMD'),
1778 _('[-o] CMD'),
1779 norepo=True)
1779 norepo=True)
1780 def debugcomplete(ui, cmd='', **opts):
1780 def debugcomplete(ui, cmd='', **opts):
1781 """returns the completion list associated with the given command"""
1781 """returns the completion list associated with the given command"""
1782
1782
1783 if opts.get(r'options'):
1783 if opts.get(r'options'):
1784 options = []
1784 options = []
1785 otables = [globalopts]
1785 otables = [globalopts]
1786 if cmd:
1786 if cmd:
1787 aliases, entry = cmdutil.findcmd(cmd, table, False)
1787 aliases, entry = cmdutil.findcmd(cmd, table, False)
1788 otables.append(entry[1])
1788 otables.append(entry[1])
1789 for t in otables:
1789 for t in otables:
1790 for o in t:
1790 for o in t:
1791 if "(DEPRECATED)" in o[3]:
1791 if "(DEPRECATED)" in o[3]:
1792 continue
1792 continue
1793 if o[0]:
1793 if o[0]:
1794 options.append('-%s' % o[0])
1794 options.append('-%s' % o[0])
1795 options.append('--%s' % o[1])
1795 options.append('--%s' % o[1])
1796 ui.write("%s\n" % "\n".join(options))
1796 ui.write("%s\n" % "\n".join(options))
1797 return
1797 return
1798
1798
1799 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1799 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1800 if ui.verbose:
1800 if ui.verbose:
1801 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1801 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1802 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1802 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1803
1803
1804 @command('^diff',
1804 @command('^diff',
1805 [('r', 'rev', [], _('revision'), _('REV')),
1805 [('r', 'rev', [], _('revision'), _('REV')),
1806 ('c', 'change', '', _('change made by revision'), _('REV'))
1806 ('c', 'change', '', _('change made by revision'), _('REV'))
1807 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1807 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1808 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1808 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1809 inferrepo=True,
1809 inferrepo=True,
1810 intents={INTENT_READONLY})
1810 intents={INTENT_READONLY})
1811 def diff(ui, repo, *pats, **opts):
1811 def diff(ui, repo, *pats, **opts):
1812 """diff repository (or selected files)
1812 """diff repository (or selected files)
1813
1813
1814 Show differences between revisions for the specified files.
1814 Show differences between revisions for the specified files.
1815
1815
1816 Differences between files are shown using the unified diff format.
1816 Differences between files are shown using the unified diff format.
1817
1817
1818 .. note::
1818 .. note::
1819
1819
1820 :hg:`diff` may generate unexpected results for merges, as it will
1820 :hg:`diff` may generate unexpected results for merges, as it will
1821 default to comparing against the working directory's first
1821 default to comparing against the working directory's first
1822 parent changeset if no revisions are specified.
1822 parent changeset if no revisions are specified.
1823
1823
1824 When two revision arguments are given, then changes are shown
1824 When two revision arguments are given, then changes are shown
1825 between those revisions. If only one revision is specified then
1825 between those revisions. If only one revision is specified then
1826 that revision is compared to the working directory, and, when no
1826 that revision is compared to the working directory, and, when no
1827 revisions are specified, the working directory files are compared
1827 revisions are specified, the working directory files are compared
1828 to its first parent.
1828 to its first parent.
1829
1829
1830 Alternatively you can specify -c/--change with a revision to see
1830 Alternatively you can specify -c/--change with a revision to see
1831 the changes in that changeset relative to its first parent.
1831 the changes in that changeset relative to its first parent.
1832
1832
1833 Without the -a/--text option, diff will avoid generating diffs of
1833 Without the -a/--text option, diff will avoid generating diffs of
1834 files it detects as binary. With -a, diff will generate a diff
1834 files it detects as binary. With -a, diff will generate a diff
1835 anyway, probably with undesirable results.
1835 anyway, probably with undesirable results.
1836
1836
1837 Use the -g/--git option to generate diffs in the git extended diff
1837 Use the -g/--git option to generate diffs in the git extended diff
1838 format. For more information, read :hg:`help diffs`.
1838 format. For more information, read :hg:`help diffs`.
1839
1839
1840 .. container:: verbose
1840 .. container:: verbose
1841
1841
1842 Examples:
1842 Examples:
1843
1843
1844 - compare a file in the current working directory to its parent::
1844 - compare a file in the current working directory to its parent::
1845
1845
1846 hg diff foo.c
1846 hg diff foo.c
1847
1847
1848 - compare two historical versions of a directory, with rename info::
1848 - compare two historical versions of a directory, with rename info::
1849
1849
1850 hg diff --git -r 1.0:1.2 lib/
1850 hg diff --git -r 1.0:1.2 lib/
1851
1851
1852 - get change stats relative to the last change on some date::
1852 - get change stats relative to the last change on some date::
1853
1853
1854 hg diff --stat -r "date('may 2')"
1854 hg diff --stat -r "date('may 2')"
1855
1855
1856 - diff all newly-added files that contain a keyword::
1856 - diff all newly-added files that contain a keyword::
1857
1857
1858 hg diff "set:added() and grep(GNU)"
1858 hg diff "set:added() and grep(GNU)"
1859
1859
1860 - compare a revision and its parents::
1860 - compare a revision and its parents::
1861
1861
1862 hg diff -c 9353 # compare against first parent
1862 hg diff -c 9353 # compare against first parent
1863 hg diff -r 9353^:9353 # same using revset syntax
1863 hg diff -r 9353^:9353 # same using revset syntax
1864 hg diff -r 9353^2:9353 # compare against the second parent
1864 hg diff -r 9353^2:9353 # compare against the second parent
1865
1865
1866 Returns 0 on success.
1866 Returns 0 on success.
1867 """
1867 """
1868
1868
1869 opts = pycompat.byteskwargs(opts)
1869 opts = pycompat.byteskwargs(opts)
1870 revs = opts.get('rev')
1870 revs = opts.get('rev')
1871 change = opts.get('change')
1871 change = opts.get('change')
1872 stat = opts.get('stat')
1872 stat = opts.get('stat')
1873 reverse = opts.get('reverse')
1873 reverse = opts.get('reverse')
1874
1874
1875 if revs and change:
1875 if revs and change:
1876 msg = _('cannot specify --rev and --change at the same time')
1876 msg = _('cannot specify --rev and --change at the same time')
1877 raise error.Abort(msg)
1877 raise error.Abort(msg)
1878 elif change:
1878 elif change:
1879 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1879 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1880 ctx2 = scmutil.revsingle(repo, change, None)
1880 ctx2 = scmutil.revsingle(repo, change, None)
1881 ctx1 = ctx2.p1()
1881 ctx1 = ctx2.p1()
1882 else:
1882 else:
1883 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1883 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1884 ctx1, ctx2 = scmutil.revpair(repo, revs)
1884 ctx1, ctx2 = scmutil.revpair(repo, revs)
1885 node1, node2 = ctx1.node(), ctx2.node()
1885 node1, node2 = ctx1.node(), ctx2.node()
1886
1886
1887 if reverse:
1887 if reverse:
1888 node1, node2 = node2, node1
1888 node1, node2 = node2, node1
1889
1889
1890 diffopts = patch.diffallopts(ui, opts)
1890 diffopts = patch.diffallopts(ui, opts)
1891 m = scmutil.match(ctx2, pats, opts)
1891 m = scmutil.match(ctx2, pats, opts)
1892 ui.pager('diff')
1892 ui.pager('diff')
1893 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1893 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1894 listsubrepos=opts.get('subrepos'),
1894 listsubrepos=opts.get('subrepos'),
1895 root=opts.get('root'))
1895 root=opts.get('root'))
1896
1896
1897 @command('^export',
1897 @command('^export',
1898 [('B', 'bookmark', '',
1898 [('B', 'bookmark', '',
1899 _('export changes only reachable by given bookmark')),
1899 _('export changes only reachable by given bookmark')),
1900 ('o', 'output', '',
1900 ('o', 'output', '',
1901 _('print output to file with formatted name'), _('FORMAT')),
1901 _('print output to file with formatted name'), _('FORMAT')),
1902 ('', 'switch-parent', None, _('diff against the second parent')),
1902 ('', 'switch-parent', None, _('diff against the second parent')),
1903 ('r', 'rev', [], _('revisions to export'), _('REV')),
1903 ('r', 'rev', [], _('revisions to export'), _('REV')),
1904 ] + diffopts + formatteropts,
1904 ] + diffopts + formatteropts,
1905 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
1905 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
1906 intents={INTENT_READONLY})
1906 intents={INTENT_READONLY})
1907 def export(ui, repo, *changesets, **opts):
1907 def export(ui, repo, *changesets, **opts):
1908 """dump the header and diffs for one or more changesets
1908 """dump the header and diffs for one or more changesets
1909
1909
1910 Print the changeset header and diffs for one or more revisions.
1910 Print the changeset header and diffs for one or more revisions.
1911 If no revision is given, the parent of the working directory is used.
1911 If no revision is given, the parent of the working directory is used.
1912
1912
1913 The information shown in the changeset header is: author, date,
1913 The information shown in the changeset header is: author, date,
1914 branch name (if non-default), changeset hash, parent(s) and commit
1914 branch name (if non-default), changeset hash, parent(s) and commit
1915 comment.
1915 comment.
1916
1916
1917 .. note::
1917 .. note::
1918
1918
1919 :hg:`export` may generate unexpected diff output for merge
1919 :hg:`export` may generate unexpected diff output for merge
1920 changesets, as it will compare the merge changeset against its
1920 changesets, as it will compare the merge changeset against its
1921 first parent only.
1921 first parent only.
1922
1922
1923 Output may be to a file, in which case the name of the file is
1923 Output may be to a file, in which case the name of the file is
1924 given using a template string. See :hg:`help templates`. In addition
1924 given using a template string. See :hg:`help templates`. In addition
1925 to the common template keywords, the following formatting rules are
1925 to the common template keywords, the following formatting rules are
1926 supported:
1926 supported:
1927
1927
1928 :``%%``: literal "%" character
1928 :``%%``: literal "%" character
1929 :``%H``: changeset hash (40 hexadecimal digits)
1929 :``%H``: changeset hash (40 hexadecimal digits)
1930 :``%N``: number of patches being generated
1930 :``%N``: number of patches being generated
1931 :``%R``: changeset revision number
1931 :``%R``: changeset revision number
1932 :``%b``: basename of the exporting repository
1932 :``%b``: basename of the exporting repository
1933 :``%h``: short-form changeset hash (12 hexadecimal digits)
1933 :``%h``: short-form changeset hash (12 hexadecimal digits)
1934 :``%m``: first line of the commit message (only alphanumeric characters)
1934 :``%m``: first line of the commit message (only alphanumeric characters)
1935 :``%n``: zero-padded sequence number, starting at 1
1935 :``%n``: zero-padded sequence number, starting at 1
1936 :``%r``: zero-padded changeset revision number
1936 :``%r``: zero-padded changeset revision number
1937 :``\\``: literal "\\" character
1937 :``\\``: literal "\\" character
1938
1938
1939 Without the -a/--text option, export will avoid generating diffs
1939 Without the -a/--text option, export will avoid generating diffs
1940 of files it detects as binary. With -a, export will generate a
1940 of files it detects as binary. With -a, export will generate a
1941 diff anyway, probably with undesirable results.
1941 diff anyway, probably with undesirable results.
1942
1942
1943 With -B/--bookmark changesets reachable by the given bookmark are
1943 With -B/--bookmark changesets reachable by the given bookmark are
1944 selected.
1944 selected.
1945
1945
1946 Use the -g/--git option to generate diffs in the git extended diff
1946 Use the -g/--git option to generate diffs in the git extended diff
1947 format. See :hg:`help diffs` for more information.
1947 format. See :hg:`help diffs` for more information.
1948
1948
1949 With the --switch-parent option, the diff will be against the
1949 With the --switch-parent option, the diff will be against the
1950 second parent. It can be useful to review a merge.
1950 second parent. It can be useful to review a merge.
1951
1951
1952 .. container:: verbose
1952 .. container:: verbose
1953
1953
1954 Examples:
1954 Examples:
1955
1955
1956 - use export and import to transplant a bugfix to the current
1956 - use export and import to transplant a bugfix to the current
1957 branch::
1957 branch::
1958
1958
1959 hg export -r 9353 | hg import -
1959 hg export -r 9353 | hg import -
1960
1960
1961 - export all the changesets between two revisions to a file with
1961 - export all the changesets between two revisions to a file with
1962 rename information::
1962 rename information::
1963
1963
1964 hg export --git -r 123:150 > changes.txt
1964 hg export --git -r 123:150 > changes.txt
1965
1965
1966 - split outgoing changes into a series of patches with
1966 - split outgoing changes into a series of patches with
1967 descriptive names::
1967 descriptive names::
1968
1968
1969 hg export -r "outgoing()" -o "%n-%m.patch"
1969 hg export -r "outgoing()" -o "%n-%m.patch"
1970
1970
1971 Returns 0 on success.
1971 Returns 0 on success.
1972 """
1972 """
1973 opts = pycompat.byteskwargs(opts)
1973 opts = pycompat.byteskwargs(opts)
1974 bookmark = opts.get('bookmark')
1974 bookmark = opts.get('bookmark')
1975 changesets += tuple(opts.get('rev', []))
1975 changesets += tuple(opts.get('rev', []))
1976
1976
1977 if bookmark and changesets:
1977 if bookmark and changesets:
1978 raise error.Abort(_("-r and -B are mutually exclusive"))
1978 raise error.Abort(_("-r and -B are mutually exclusive"))
1979
1979
1980 if bookmark:
1980 if bookmark:
1981 if bookmark not in repo._bookmarks:
1981 if bookmark not in repo._bookmarks:
1982 raise error.Abort(_("bookmark '%s' not found") % bookmark)
1982 raise error.Abort(_("bookmark '%s' not found") % bookmark)
1983
1983
1984 revs = scmutil.bookmarkrevs(repo, bookmark)
1984 revs = scmutil.bookmarkrevs(repo, bookmark)
1985 else:
1985 else:
1986 if not changesets:
1986 if not changesets:
1987 changesets = ['.']
1987 changesets = ['.']
1988
1988
1989 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1989 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1990 revs = scmutil.revrange(repo, changesets)
1990 revs = scmutil.revrange(repo, changesets)
1991
1991
1992 if not revs:
1992 if not revs:
1993 raise error.Abort(_("export requires at least one changeset"))
1993 raise error.Abort(_("export requires at least one changeset"))
1994 if len(revs) > 1:
1994 if len(revs) > 1:
1995 ui.note(_('exporting patches:\n'))
1995 ui.note(_('exporting patches:\n'))
1996 else:
1996 else:
1997 ui.note(_('exporting patch:\n'))
1997 ui.note(_('exporting patch:\n'))
1998
1998
1999 fntemplate = opts.get('output')
1999 fntemplate = opts.get('output')
2000 if cmdutil.isstdiofilename(fntemplate):
2000 if cmdutil.isstdiofilename(fntemplate):
2001 fntemplate = ''
2001 fntemplate = ''
2002
2002
2003 if fntemplate:
2003 if fntemplate:
2004 fm = formatter.nullformatter(ui, 'export', opts)
2004 fm = formatter.nullformatter(ui, 'export', opts)
2005 else:
2005 else:
2006 ui.pager('export')
2006 ui.pager('export')
2007 fm = ui.formatter('export', opts)
2007 fm = ui.formatter('export', opts)
2008 with fm:
2008 with fm:
2009 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2009 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2010 switch_parent=opts.get('switch_parent'),
2010 switch_parent=opts.get('switch_parent'),
2011 opts=patch.diffallopts(ui, opts))
2011 opts=patch.diffallopts(ui, opts))
2012
2012
2013 @command('files',
2013 @command('files',
2014 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2014 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2015 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2015 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2016 ] + walkopts + formatteropts + subrepoopts,
2016 ] + walkopts + formatteropts + subrepoopts,
2017 _('[OPTION]... [FILE]...'),
2017 _('[OPTION]... [FILE]...'),
2018 intents={INTENT_READONLY})
2018 intents={INTENT_READONLY})
2019 def files(ui, repo, *pats, **opts):
2019 def files(ui, repo, *pats, **opts):
2020 """list tracked files
2020 """list tracked files
2021
2021
2022 Print files under Mercurial control in the working directory or
2022 Print files under Mercurial control in the working directory or
2023 specified revision for given files (excluding removed files).
2023 specified revision for given files (excluding removed files).
2024 Files can be specified as filenames or filesets.
2024 Files can be specified as filenames or filesets.
2025
2025
2026 If no files are given to match, this command prints the names
2026 If no files are given to match, this command prints the names
2027 of all files under Mercurial control.
2027 of all files under Mercurial control.
2028
2028
2029 .. container:: verbose
2029 .. container:: verbose
2030
2030
2031 Examples:
2031 Examples:
2032
2032
2033 - list all files under the current directory::
2033 - list all files under the current directory::
2034
2034
2035 hg files .
2035 hg files .
2036
2036
2037 - shows sizes and flags for current revision::
2037 - shows sizes and flags for current revision::
2038
2038
2039 hg files -vr .
2039 hg files -vr .
2040
2040
2041 - list all files named README::
2041 - list all files named README::
2042
2042
2043 hg files -I "**/README"
2043 hg files -I "**/README"
2044
2044
2045 - list all binary files::
2045 - list all binary files::
2046
2046
2047 hg files "set:binary()"
2047 hg files "set:binary()"
2048
2048
2049 - find files containing a regular expression::
2049 - find files containing a regular expression::
2050
2050
2051 hg files "set:grep('bob')"
2051 hg files "set:grep('bob')"
2052
2052
2053 - search tracked file contents with xargs and grep::
2053 - search tracked file contents with xargs and grep::
2054
2054
2055 hg files -0 | xargs -0 grep foo
2055 hg files -0 | xargs -0 grep foo
2056
2056
2057 See :hg:`help patterns` and :hg:`help filesets` for more information
2057 See :hg:`help patterns` and :hg:`help filesets` for more information
2058 on specifying file patterns.
2058 on specifying file patterns.
2059
2059
2060 Returns 0 if a match is found, 1 otherwise.
2060 Returns 0 if a match is found, 1 otherwise.
2061
2061
2062 """
2062 """
2063
2063
2064 opts = pycompat.byteskwargs(opts)
2064 opts = pycompat.byteskwargs(opts)
2065 rev = opts.get('rev')
2065 rev = opts.get('rev')
2066 if rev:
2066 if rev:
2067 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2067 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2068 ctx = scmutil.revsingle(repo, rev, None)
2068 ctx = scmutil.revsingle(repo, rev, None)
2069
2069
2070 end = '\n'
2070 end = '\n'
2071 if opts.get('print0'):
2071 if opts.get('print0'):
2072 end = '\0'
2072 end = '\0'
2073 fmt = '%s' + end
2073 fmt = '%s' + end
2074
2074
2075 m = scmutil.match(ctx, pats, opts)
2075 m = scmutil.match(ctx, pats, opts)
2076 ui.pager('files')
2076 ui.pager('files')
2077 with ui.formatter('files', opts) as fm:
2077 with ui.formatter('files', opts) as fm:
2078 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2078 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2079
2079
2080 @command(
2080 @command(
2081 '^forget',
2081 '^forget',
2082 [('i', 'interactive', None, _('use interactive mode')),
2082 [('i', 'interactive', None, _('use interactive mode')),
2083 ] + walkopts + dryrunopts,
2083 ] + walkopts + dryrunopts,
2084 _('[OPTION]... FILE...'), inferrepo=True)
2084 _('[OPTION]... FILE...'), inferrepo=True)
2085 def forget(ui, repo, *pats, **opts):
2085 def forget(ui, repo, *pats, **opts):
2086 """forget the specified files on the next commit
2086 """forget the specified files on the next commit
2087
2087
2088 Mark the specified files so they will no longer be tracked
2088 Mark the specified files so they will no longer be tracked
2089 after the next commit.
2089 after the next commit.
2090
2090
2091 This only removes files from the current branch, not from the
2091 This only removes files from the current branch, not from the
2092 entire project history, and it does not delete them from the
2092 entire project history, and it does not delete them from the
2093 working directory.
2093 working directory.
2094
2094
2095 To delete the file from the working directory, see :hg:`remove`.
2095 To delete the file from the working directory, see :hg:`remove`.
2096
2096
2097 To undo a forget before the next commit, see :hg:`add`.
2097 To undo a forget before the next commit, see :hg:`add`.
2098
2098
2099 .. container:: verbose
2099 .. container:: verbose
2100
2100
2101 Examples:
2101 Examples:
2102
2102
2103 - forget newly-added binary files::
2103 - forget newly-added binary files::
2104
2104
2105 hg forget "set:added() and binary()"
2105 hg forget "set:added() and binary()"
2106
2106
2107 - forget files that would be excluded by .hgignore::
2107 - forget files that would be excluded by .hgignore::
2108
2108
2109 hg forget "set:hgignore()"
2109 hg forget "set:hgignore()"
2110
2110
2111 Returns 0 on success.
2111 Returns 0 on success.
2112 """
2112 """
2113
2113
2114 opts = pycompat.byteskwargs(opts)
2114 opts = pycompat.byteskwargs(opts)
2115 if not pats:
2115 if not pats:
2116 raise error.Abort(_('no files specified'))
2116 raise error.Abort(_('no files specified'))
2117
2117
2118 m = scmutil.match(repo[None], pats, opts)
2118 m = scmutil.match(repo[None], pats, opts)
2119 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2119 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2120 rejected = cmdutil.forget(ui, repo, m, prefix="",
2120 rejected = cmdutil.forget(ui, repo, m, prefix="",
2121 explicitonly=False, dryrun=dryrun,
2121 explicitonly=False, dryrun=dryrun,
2122 interactive=interactive)[0]
2122 interactive=interactive)[0]
2123 return rejected and 1 or 0
2123 return rejected and 1 or 0
2124
2124
2125 @command(
2125 @command(
2126 'graft',
2126 'graft',
2127 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2127 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2128 ('c', 'continue', False, _('resume interrupted graft')),
2128 ('c', 'continue', False, _('resume interrupted graft')),
2129 ('e', 'edit', False, _('invoke editor on commit messages')),
2129 ('e', 'edit', False, _('invoke editor on commit messages')),
2130 ('', 'log', None, _('append graft info to log message')),
2130 ('', 'log', None, _('append graft info to log message')),
2131 ('f', 'force', False, _('force graft')),
2131 ('f', 'force', False, _('force graft')),
2132 ('D', 'currentdate', False,
2132 ('D', 'currentdate', False,
2133 _('record the current date as commit date')),
2133 _('record the current date as commit date')),
2134 ('U', 'currentuser', False,
2134 ('U', 'currentuser', False,
2135 _('record the current user as committer'), _('DATE'))]
2135 _('record the current user as committer'), _('DATE'))]
2136 + commitopts2 + mergetoolopts + dryrunopts,
2136 + commitopts2 + mergetoolopts + dryrunopts,
2137 _('[OPTION]... [-r REV]... REV...'))
2137 _('[OPTION]... [-r REV]... REV...'))
2138 def graft(ui, repo, *revs, **opts):
2138 def graft(ui, repo, *revs, **opts):
2139 '''copy changes from other branches onto the current branch
2139 '''copy changes from other branches onto the current branch
2140
2140
2141 This command uses Mercurial's merge logic to copy individual
2141 This command uses Mercurial's merge logic to copy individual
2142 changes from other branches without merging branches in the
2142 changes from other branches without merging branches in the
2143 history graph. This is sometimes known as 'backporting' or
2143 history graph. This is sometimes known as 'backporting' or
2144 'cherry-picking'. By default, graft will copy user, date, and
2144 'cherry-picking'. By default, graft will copy user, date, and
2145 description from the source changesets.
2145 description from the source changesets.
2146
2146
2147 Changesets that are ancestors of the current revision, that have
2147 Changesets that are ancestors of the current revision, that have
2148 already been grafted, or that are merges will be skipped.
2148 already been grafted, or that are merges will be skipped.
2149
2149
2150 If --log is specified, log messages will have a comment appended
2150 If --log is specified, log messages will have a comment appended
2151 of the form::
2151 of the form::
2152
2152
2153 (grafted from CHANGESETHASH)
2153 (grafted from CHANGESETHASH)
2154
2154
2155 If --force is specified, revisions will be grafted even if they
2155 If --force is specified, revisions will be grafted even if they
2156 are already ancestors of, or have been grafted to, the destination.
2156 are already ancestors of, or have been grafted to, the destination.
2157 This is useful when the revisions have since been backed out.
2157 This is useful when the revisions have since been backed out.
2158
2158
2159 If a graft merge results in conflicts, the graft process is
2159 If a graft merge results in conflicts, the graft process is
2160 interrupted so that the current merge can be manually resolved.
2160 interrupted so that the current merge can be manually resolved.
2161 Once all conflicts are addressed, the graft process can be
2161 Once all conflicts are addressed, the graft process can be
2162 continued with the -c/--continue option.
2162 continued with the -c/--continue option.
2163
2163
2164 .. note::
2164 .. note::
2165
2165
2166 The -c/--continue option does not reapply earlier options, except
2166 The -c/--continue option does not reapply earlier options, except
2167 for --force.
2167 for --force.
2168
2168
2169 .. container:: verbose
2169 .. container:: verbose
2170
2170
2171 Examples:
2171 Examples:
2172
2172
2173 - copy a single change to the stable branch and edit its description::
2173 - copy a single change to the stable branch and edit its description::
2174
2174
2175 hg update stable
2175 hg update stable
2176 hg graft --edit 9393
2176 hg graft --edit 9393
2177
2177
2178 - graft a range of changesets with one exception, updating dates::
2178 - graft a range of changesets with one exception, updating dates::
2179
2179
2180 hg graft -D "2085::2093 and not 2091"
2180 hg graft -D "2085::2093 and not 2091"
2181
2181
2182 - continue a graft after resolving conflicts::
2182 - continue a graft after resolving conflicts::
2183
2183
2184 hg graft -c
2184 hg graft -c
2185
2185
2186 - show the source of a grafted changeset::
2186 - show the source of a grafted changeset::
2187
2187
2188 hg log --debug -r .
2188 hg log --debug -r .
2189
2189
2190 - show revisions sorted by date::
2190 - show revisions sorted by date::
2191
2191
2192 hg log -r "sort(all(), date)"
2192 hg log -r "sort(all(), date)"
2193
2193
2194 See :hg:`help revisions` for more about specifying revisions.
2194 See :hg:`help revisions` for more about specifying revisions.
2195
2195
2196 Returns 0 on successful completion.
2196 Returns 0 on successful completion.
2197 '''
2197 '''
2198 with repo.wlock():
2198 with repo.wlock():
2199 return _dograft(ui, repo, *revs, **opts)
2199 return _dograft(ui, repo, *revs, **opts)
2200
2200
2201 def _dograft(ui, repo, *revs, **opts):
2201 def _dograft(ui, repo, *revs, **opts):
2202 opts = pycompat.byteskwargs(opts)
2202 opts = pycompat.byteskwargs(opts)
2203 if revs and opts.get('rev'):
2203 if revs and opts.get('rev'):
2204 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2204 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2205 'revision ordering!\n'))
2205 'revision ordering!\n'))
2206
2206
2207 revs = list(revs)
2207 revs = list(revs)
2208 revs.extend(opts.get('rev'))
2208 revs.extend(opts.get('rev'))
2209 # a dict of data to be stored in state file
2209 # a dict of data to be stored in state file
2210 statedata = {}
2210 statedata = {}
2211
2211
2212 if not opts.get('user') and opts.get('currentuser'):
2212 if not opts.get('user') and opts.get('currentuser'):
2213 opts['user'] = ui.username()
2213 opts['user'] = ui.username()
2214 if not opts.get('date') and opts.get('currentdate'):
2214 if not opts.get('date') and opts.get('currentdate'):
2215 opts['date'] = "%d %d" % dateutil.makedate()
2215 opts['date'] = "%d %d" % dateutil.makedate()
2216
2216
2217 editor = cmdutil.getcommiteditor(editform='graft',
2217 editor = cmdutil.getcommiteditor(editform='graft',
2218 **pycompat.strkwargs(opts))
2218 **pycompat.strkwargs(opts))
2219
2219
2220 cont = False
2220 cont = False
2221 graftstate = statemod.cmdstate(repo, 'graftstate')
2221 graftstate = statemod.cmdstate(repo, 'graftstate')
2222 if opts.get('continue'):
2222 if opts.get('continue'):
2223 cont = True
2223 cont = True
2224 if revs:
2224 if revs:
2225 raise error.Abort(_("can't specify --continue and revisions"))
2225 raise error.Abort(_("can't specify --continue and revisions"))
2226 # read in unfinished revisions
2226 # read in unfinished revisions
2227 if graftstate.exists():
2227 if graftstate.exists():
2228 statedata = _readgraftstate(repo, graftstate)
2228 statedata = _readgraftstate(repo, graftstate)
2229 if statedata.get('date'):
2229 if statedata.get('date'):
2230 opts['date'] = statedata['date']
2230 opts['date'] = statedata['date']
2231 if statedata.get('user'):
2231 if statedata.get('user'):
2232 opts['user'] = statedata['user']
2232 opts['user'] = statedata['user']
2233 nodes = statedata['nodes']
2233 nodes = statedata['nodes']
2234 revs = [repo[node].rev() for node in nodes]
2234 revs = [repo[node].rev() for node in nodes]
2235 else:
2235 else:
2236 cmdutil.wrongtooltocontinue(repo, _('graft'))
2236 cmdutil.wrongtooltocontinue(repo, _('graft'))
2237 else:
2237 else:
2238 if not revs:
2238 if not revs:
2239 raise error.Abort(_('no revisions specified'))
2239 raise error.Abort(_('no revisions specified'))
2240 cmdutil.checkunfinished(repo)
2240 cmdutil.checkunfinished(repo)
2241 cmdutil.bailifchanged(repo)
2241 cmdutil.bailifchanged(repo)
2242 revs = scmutil.revrange(repo, revs)
2242 revs = scmutil.revrange(repo, revs)
2243
2243
2244 skipped = set()
2244 skipped = set()
2245 # check for merges
2245 # check for merges
2246 for rev in repo.revs('%ld and merge()', revs):
2246 for rev in repo.revs('%ld and merge()', revs):
2247 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2247 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2248 skipped.add(rev)
2248 skipped.add(rev)
2249 revs = [r for r in revs if r not in skipped]
2249 revs = [r for r in revs if r not in skipped]
2250 if not revs:
2250 if not revs:
2251 return -1
2251 return -1
2252
2252
2253 # Don't check in the --continue case, in effect retaining --force across
2253 # Don't check in the --continue case, in effect retaining --force across
2254 # --continues. That's because without --force, any revisions we decided to
2254 # --continues. That's because without --force, any revisions we decided to
2255 # skip would have been filtered out here, so they wouldn't have made their
2255 # skip would have been filtered out here, so they wouldn't have made their
2256 # way to the graftstate. With --force, any revisions we would have otherwise
2256 # way to the graftstate. With --force, any revisions we would have otherwise
2257 # skipped would not have been filtered out, and if they hadn't been applied
2257 # skipped would not have been filtered out, and if they hadn't been applied
2258 # already, they'd have been in the graftstate.
2258 # already, they'd have been in the graftstate.
2259 if not (cont or opts.get('force')):
2259 if not (cont or opts.get('force')):
2260 # check for ancestors of dest branch
2260 # check for ancestors of dest branch
2261 crev = repo['.'].rev()
2261 crev = repo['.'].rev()
2262 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2262 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2263 # XXX make this lazy in the future
2263 # XXX make this lazy in the future
2264 # don't mutate while iterating, create a copy
2264 # don't mutate while iterating, create a copy
2265 for rev in list(revs):
2265 for rev in list(revs):
2266 if rev in ancestors:
2266 if rev in ancestors:
2267 ui.warn(_('skipping ancestor revision %d:%s\n') %
2267 ui.warn(_('skipping ancestor revision %d:%s\n') %
2268 (rev, repo[rev]))
2268 (rev, repo[rev]))
2269 # XXX remove on list is slow
2269 # XXX remove on list is slow
2270 revs.remove(rev)
2270 revs.remove(rev)
2271 if not revs:
2271 if not revs:
2272 return -1
2272 return -1
2273
2273
2274 # analyze revs for earlier grafts
2274 # analyze revs for earlier grafts
2275 ids = {}
2275 ids = {}
2276 for ctx in repo.set("%ld", revs):
2276 for ctx in repo.set("%ld", revs):
2277 ids[ctx.hex()] = ctx.rev()
2277 ids[ctx.hex()] = ctx.rev()
2278 n = ctx.extra().get('source')
2278 n = ctx.extra().get('source')
2279 if n:
2279 if n:
2280 ids[n] = ctx.rev()
2280 ids[n] = ctx.rev()
2281
2281
2282 # check ancestors for earlier grafts
2282 # check ancestors for earlier grafts
2283 ui.debug('scanning for duplicate grafts\n')
2283 ui.debug('scanning for duplicate grafts\n')
2284
2284
2285 # The only changesets we can be sure doesn't contain grafts of any
2285 # The only changesets we can be sure doesn't contain grafts of any
2286 # revs, are the ones that are common ancestors of *all* revs:
2286 # revs, are the ones that are common ancestors of *all* revs:
2287 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2287 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2288 ctx = repo[rev]
2288 ctx = repo[rev]
2289 n = ctx.extra().get('source')
2289 n = ctx.extra().get('source')
2290 if n in ids:
2290 if n in ids:
2291 try:
2291 try:
2292 r = repo[n].rev()
2292 r = repo[n].rev()
2293 except error.RepoLookupError:
2293 except error.RepoLookupError:
2294 r = None
2294 r = None
2295 if r in revs:
2295 if r in revs:
2296 ui.warn(_('skipping revision %d:%s '
2296 ui.warn(_('skipping revision %d:%s '
2297 '(already grafted to %d:%s)\n')
2297 '(already grafted to %d:%s)\n')
2298 % (r, repo[r], rev, ctx))
2298 % (r, repo[r], rev, ctx))
2299 revs.remove(r)
2299 revs.remove(r)
2300 elif ids[n] in revs:
2300 elif ids[n] in revs:
2301 if r is None:
2301 if r is None:
2302 ui.warn(_('skipping already grafted revision %d:%s '
2302 ui.warn(_('skipping already grafted revision %d:%s '
2303 '(%d:%s also has unknown origin %s)\n')
2303 '(%d:%s also has unknown origin %s)\n')
2304 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2304 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2305 else:
2305 else:
2306 ui.warn(_('skipping already grafted revision %d:%s '
2306 ui.warn(_('skipping already grafted revision %d:%s '
2307 '(%d:%s also has origin %d:%s)\n')
2307 '(%d:%s also has origin %d:%s)\n')
2308 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2308 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2309 revs.remove(ids[n])
2309 revs.remove(ids[n])
2310 elif ctx.hex() in ids:
2310 elif ctx.hex() in ids:
2311 r = ids[ctx.hex()]
2311 r = ids[ctx.hex()]
2312 ui.warn(_('skipping already grafted revision %d:%s '
2312 ui.warn(_('skipping already grafted revision %d:%s '
2313 '(was grafted from %d:%s)\n') %
2313 '(was grafted from %d:%s)\n') %
2314 (r, repo[r], rev, ctx))
2314 (r, repo[r], rev, ctx))
2315 revs.remove(r)
2315 revs.remove(r)
2316 if not revs:
2316 if not revs:
2317 return -1
2317 return -1
2318
2318
2319 for pos, ctx in enumerate(repo.set("%ld", revs)):
2319 for pos, ctx in enumerate(repo.set("%ld", revs)):
2320 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2320 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2321 ctx.description().split('\n', 1)[0])
2321 ctx.description().split('\n', 1)[0])
2322 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2322 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2323 if names:
2323 if names:
2324 desc += ' (%s)' % ' '.join(names)
2324 desc += ' (%s)' % ' '.join(names)
2325 ui.status(_('grafting %s\n') % desc)
2325 ui.status(_('grafting %s\n') % desc)
2326 if opts.get('dry_run'):
2326 if opts.get('dry_run'):
2327 continue
2327 continue
2328
2328
2329 source = ctx.extra().get('source')
2329 source = ctx.extra().get('source')
2330 extra = {}
2330 extra = {}
2331 if source:
2331 if source:
2332 extra['source'] = source
2332 extra['source'] = source
2333 extra['intermediate-source'] = ctx.hex()
2333 extra['intermediate-source'] = ctx.hex()
2334 else:
2334 else:
2335 extra['source'] = ctx.hex()
2335 extra['source'] = ctx.hex()
2336 user = ctx.user()
2336 user = ctx.user()
2337 if opts.get('user'):
2337 if opts.get('user'):
2338 user = opts['user']
2338 user = opts['user']
2339 statedata['user'] = user
2339 statedata['user'] = user
2340 date = ctx.date()
2340 date = ctx.date()
2341 if opts.get('date'):
2341 if opts.get('date'):
2342 date = opts['date']
2342 date = opts['date']
2343 statedata['date'] = date
2343 statedata['date'] = date
2344 message = ctx.description()
2344 message = ctx.description()
2345 if opts.get('log'):
2345 if opts.get('log'):
2346 message += '\n(grafted from %s)' % ctx.hex()
2346 message += '\n(grafted from %s)' % ctx.hex()
2347
2347
2348 # we don't merge the first commit when continuing
2348 # we don't merge the first commit when continuing
2349 if not cont:
2349 if not cont:
2350 # perform the graft merge with p1(rev) as 'ancestor'
2350 # perform the graft merge with p1(rev) as 'ancestor'
2351 try:
2351 try:
2352 # ui.forcemerge is an internal variable, do not document
2352 # ui.forcemerge is an internal variable, do not document
2353 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2353 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2354 'graft')
2354 'graft')
2355 stats = mergemod.graft(repo, ctx, ctx.p1(),
2355 stats = mergemod.graft(repo, ctx, ctx.p1(),
2356 ['local', 'graft'])
2356 ['local', 'graft'])
2357 finally:
2357 finally:
2358 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2358 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2359 # report any conflicts
2359 # report any conflicts
2360 if stats.unresolvedcount > 0:
2360 if stats.unresolvedcount > 0:
2361 # write out state for --continue
2361 # write out state for --continue
2362 nodes = [repo[rev].hex() for rev in revs[pos:]]
2362 nodes = [repo[rev].hex() for rev in revs[pos:]]
2363 statedata['nodes'] = nodes
2363 statedata['nodes'] = nodes
2364 stateversion = 1
2364 stateversion = 1
2365 graftstate.save(stateversion, statedata)
2365 graftstate.save(stateversion, statedata)
2366 extra = ''
2366 extra = ''
2367 if opts.get('log'):
2367 if opts.get('log'):
2368 extra += ' --log'
2368 extra += ' --log'
2369 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2369 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2370 raise error.Abort(
2370 raise error.Abort(
2371 _("unresolved conflicts, can't continue"),
2371 _("unresolved conflicts, can't continue"),
2372 hint=hint)
2372 hint=hint)
2373 else:
2373 else:
2374 cont = False
2374 cont = False
2375
2375
2376 # commit
2376 # commit
2377 node = repo.commit(text=message, user=user,
2377 node = repo.commit(text=message, user=user,
2378 date=date, extra=extra, editor=editor)
2378 date=date, extra=extra, editor=editor)
2379 if node is None:
2379 if node is None:
2380 ui.warn(
2380 ui.warn(
2381 _('note: graft of %d:%s created no changes to commit\n') %
2381 _('note: graft of %d:%s created no changes to commit\n') %
2382 (ctx.rev(), ctx))
2382 (ctx.rev(), ctx))
2383
2383
2384 # remove state when we complete successfully
2384 # remove state when we complete successfully
2385 if not opts.get('dry_run'):
2385 if not opts.get('dry_run'):
2386 graftstate.delete()
2386 graftstate.delete()
2387
2387
2388 return 0
2388 return 0
2389
2389
2390 def _readgraftstate(repo, graftstate):
2390 def _readgraftstate(repo, graftstate):
2391 """read the graft state file and return a dict of the data stored in it"""
2391 """read the graft state file and return a dict of the data stored in it"""
2392 try:
2392 try:
2393 return graftstate.read()
2393 return graftstate.read()
2394 except error.CorruptedState:
2394 except error.CorruptedState:
2395 nodes = repo.vfs.read('graftstate').splitlines()
2395 nodes = repo.vfs.read('graftstate').splitlines()
2396 return {'nodes': nodes}
2396 return {'nodes': nodes}
2397
2397
2398 @command('grep',
2398 @command('grep',
2399 [('0', 'print0', None, _('end fields with NUL')),
2399 [('0', 'print0', None, _('end fields with NUL')),
2400 ('', 'all', None, _('print all revisions that match')),
2400 ('', 'all', None, _('print all revisions that match')),
2401 ('a', 'text', None, _('treat all files as text')),
2401 ('a', 'text', None, _('treat all files as text')),
2402 ('f', 'follow', None,
2402 ('f', 'follow', None,
2403 _('follow changeset history,'
2403 _('follow changeset history,'
2404 ' or file history across copies and renames')),
2404 ' or file history across copies and renames')),
2405 ('i', 'ignore-case', None, _('ignore case when matching')),
2405 ('i', 'ignore-case', None, _('ignore case when matching')),
2406 ('l', 'files-with-matches', None,
2406 ('l', 'files-with-matches', None,
2407 _('print only filenames and revisions that match')),
2407 _('print only filenames and revisions that match')),
2408 ('n', 'line-number', None, _('print matching line numbers')),
2408 ('n', 'line-number', None, _('print matching line numbers')),
2409 ('r', 'rev', [],
2409 ('r', 'rev', [],
2410 _('only search files changed within revision range'), _('REV')),
2410 _('only search files changed within revision range'), _('REV')),
2411 ('u', 'user', None, _('list the author (long with -v)')),
2411 ('u', 'user', None, _('list the author (long with -v)')),
2412 ('d', 'date', None, _('list the date (short with -q)')),
2412 ('d', 'date', None, _('list the date (short with -q)')),
2413 ] + formatteropts + walkopts,
2413 ] + formatteropts + walkopts,
2414 _('[OPTION]... PATTERN [FILE]...'),
2414 _('[OPTION]... PATTERN [FILE]...'),
2415 inferrepo=True,
2415 inferrepo=True,
2416 intents={INTENT_READONLY})
2416 intents={INTENT_READONLY})
2417 def grep(ui, repo, pattern, *pats, **opts):
2417 def grep(ui, repo, pattern, *pats, **opts):
2418 """search revision history for a pattern in specified files
2418 """search revision history for a pattern in specified files
2419
2419
2420 Search revision history for a regular expression in the specified
2420 Search revision history for a regular expression in the specified
2421 files or the entire project.
2421 files or the entire project.
2422
2422
2423 By default, grep prints the most recent revision number for each
2423 By default, grep prints the most recent revision number for each
2424 file in which it finds a match. To get it to print every revision
2424 file in which it finds a match. To get it to print every revision
2425 that contains a change in match status ("-" for a match that becomes
2425 that contains a change in match status ("-" for a match that becomes
2426 a non-match, or "+" for a non-match that becomes a match), use the
2426 a non-match, or "+" for a non-match that becomes a match), use the
2427 --all flag.
2427 --all flag.
2428
2428
2429 PATTERN can be any Python (roughly Perl-compatible) regular
2429 PATTERN can be any Python (roughly Perl-compatible) regular
2430 expression.
2430 expression.
2431
2431
2432 If no FILEs are specified (and -f/--follow isn't set), all files in
2432 If no FILEs are specified (and -f/--follow isn't set), all files in
2433 the repository are searched, including those that don't exist in the
2433 the repository are searched, including those that don't exist in the
2434 current branch or have been deleted in a prior changeset.
2434 current branch or have been deleted in a prior changeset.
2435
2435
2436 Returns 0 if a match is found, 1 otherwise.
2436 Returns 0 if a match is found, 1 otherwise.
2437 """
2437 """
2438 opts = pycompat.byteskwargs(opts)
2438 opts = pycompat.byteskwargs(opts)
2439 reflags = re.M
2439 reflags = re.M
2440 if opts.get('ignore_case'):
2440 if opts.get('ignore_case'):
2441 reflags |= re.I
2441 reflags |= re.I
2442 try:
2442 try:
2443 regexp = util.re.compile(pattern, reflags)
2443 regexp = util.re.compile(pattern, reflags)
2444 except re.error as inst:
2444 except re.error as inst:
2445 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2445 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2446 return 1
2446 return 1
2447 sep, eol = ':', '\n'
2447 sep, eol = ':', '\n'
2448 if opts.get('print0'):
2448 if opts.get('print0'):
2449 sep = eol = '\0'
2449 sep = eol = '\0'
2450
2450
2451 getfile = util.lrucachefunc(repo.file)
2451 getfile = util.lrucachefunc(repo.file)
2452
2452
2453 def matchlines(body):
2453 def matchlines(body):
2454 begin = 0
2454 begin = 0
2455 linenum = 0
2455 linenum = 0
2456 while begin < len(body):
2456 while begin < len(body):
2457 match = regexp.search(body, begin)
2457 match = regexp.search(body, begin)
2458 if not match:
2458 if not match:
2459 break
2459 break
2460 mstart, mend = match.span()
2460 mstart, mend = match.span()
2461 linenum += body.count('\n', begin, mstart) + 1
2461 linenum += body.count('\n', begin, mstart) + 1
2462 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2462 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2463 begin = body.find('\n', mend) + 1 or len(body) + 1
2463 begin = body.find('\n', mend) + 1 or len(body) + 1
2464 lend = begin - 1
2464 lend = begin - 1
2465 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2465 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2466
2466
2467 class linestate(object):
2467 class linestate(object):
2468 def __init__(self, line, linenum, colstart, colend):
2468 def __init__(self, line, linenum, colstart, colend):
2469 self.line = line
2469 self.line = line
2470 self.linenum = linenum
2470 self.linenum = linenum
2471 self.colstart = colstart
2471 self.colstart = colstart
2472 self.colend = colend
2472 self.colend = colend
2473
2473
2474 def __hash__(self):
2474 def __hash__(self):
2475 return hash((self.linenum, self.line))
2475 return hash((self.linenum, self.line))
2476
2476
2477 def __eq__(self, other):
2477 def __eq__(self, other):
2478 return self.line == other.line
2478 return self.line == other.line
2479
2479
2480 def findpos(self):
2480 def findpos(self):
2481 """Iterate all (start, end) indices of matches"""
2481 """Iterate all (start, end) indices of matches"""
2482 yield self.colstart, self.colend
2482 yield self.colstart, self.colend
2483 p = self.colend
2483 p = self.colend
2484 while p < len(self.line):
2484 while p < len(self.line):
2485 m = regexp.search(self.line, p)
2485 m = regexp.search(self.line, p)
2486 if not m:
2486 if not m:
2487 break
2487 break
2488 yield m.span()
2488 yield m.span()
2489 p = m.end()
2489 p = m.end()
2490
2490
2491 matches = {}
2491 matches = {}
2492 copies = {}
2492 copies = {}
2493 def grepbody(fn, rev, body):
2493 def grepbody(fn, rev, body):
2494 matches[rev].setdefault(fn, [])
2494 matches[rev].setdefault(fn, [])
2495 m = matches[rev][fn]
2495 m = matches[rev][fn]
2496 for lnum, cstart, cend, line in matchlines(body):
2496 for lnum, cstart, cend, line in matchlines(body):
2497 s = linestate(line, lnum, cstart, cend)
2497 s = linestate(line, lnum, cstart, cend)
2498 m.append(s)
2498 m.append(s)
2499
2499
2500 def difflinestates(a, b):
2500 def difflinestates(a, b):
2501 sm = difflib.SequenceMatcher(None, a, b)
2501 sm = difflib.SequenceMatcher(None, a, b)
2502 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2502 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2503 if tag == 'insert':
2503 if tag == 'insert':
2504 for i in xrange(blo, bhi):
2504 for i in xrange(blo, bhi):
2505 yield ('+', b[i])
2505 yield ('+', b[i])
2506 elif tag == 'delete':
2506 elif tag == 'delete':
2507 for i in xrange(alo, ahi):
2507 for i in xrange(alo, ahi):
2508 yield ('-', a[i])
2508 yield ('-', a[i])
2509 elif tag == 'replace':
2509 elif tag == 'replace':
2510 for i in xrange(alo, ahi):
2510 for i in xrange(alo, ahi):
2511 yield ('-', a[i])
2511 yield ('-', a[i])
2512 for i in xrange(blo, bhi):
2512 for i in xrange(blo, bhi):
2513 yield ('+', b[i])
2513 yield ('+', b[i])
2514
2514
2515 def display(fm, fn, ctx, pstates, states):
2515 def display(fm, fn, ctx, pstates, states):
2516 rev = ctx.rev()
2516 rev = scmutil.intrev(ctx)
2517 if fm.isplain():
2517 if fm.isplain():
2518 formatuser = ui.shortuser
2518 formatuser = ui.shortuser
2519 else:
2519 else:
2520 formatuser = str
2520 formatuser = str
2521 if ui.quiet:
2521 if ui.quiet:
2522 datefmt = '%Y-%m-%d'
2522 datefmt = '%Y-%m-%d'
2523 else:
2523 else:
2524 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2524 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2525 found = False
2525 found = False
2526 @util.cachefunc
2526 @util.cachefunc
2527 def binary():
2527 def binary():
2528 flog = getfile(fn)
2528 flog = getfile(fn)
2529 try:
2529 return stringutil.binary(flog.read(ctx.filenode(fn)))
2530 return stringutil.binary(flog.read(ctx.filenode(fn)))
2531 except error.WdirUnsupported:
2532 return ctx[fn].isbinary()
2530
2533
2531 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2534 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2532 if opts.get('all'):
2535 if opts.get('all'):
2533 iter = difflinestates(pstates, states)
2536 iter = difflinestates(pstates, states)
2534 else:
2537 else:
2535 iter = [('', l) for l in states]
2538 iter = [('', l) for l in states]
2536 for change, l in iter:
2539 for change, l in iter:
2537 fm.startitem()
2540 fm.startitem()
2538 fm.data(node=fm.hexfunc(ctx.node()))
2541 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2542
2539 cols = [
2543 cols = [
2540 ('filename', fn, True),
2544 ('filename', fn, True),
2541 ('rev', rev, True),
2545 ('rev', rev, True),
2542 ('linenumber', l.linenum, opts.get('line_number')),
2546 ('linenumber', l.linenum, opts.get('line_number')),
2543 ]
2547 ]
2544 if opts.get('all'):
2548 if opts.get('all'):
2545 cols.append(('change', change, True))
2549 cols.append(('change', change, True))
2546 cols.extend([
2550 cols.extend([
2547 ('user', formatuser(ctx.user()), opts.get('user')),
2551 ('user', formatuser(ctx.user()), opts.get('user')),
2548 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2552 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2549 ])
2553 ])
2550 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2554 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2551 for name, data, cond in cols:
2555 for name, data, cond in cols:
2552 field = fieldnamemap.get(name, name)
2556 field = fieldnamemap.get(name, name)
2553 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2557 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2554 if cond and name != lastcol:
2558 if cond and name != lastcol:
2555 fm.plain(sep, label='grep.sep')
2559 fm.plain(sep, label='grep.sep')
2556 if not opts.get('files_with_matches'):
2560 if not opts.get('files_with_matches'):
2557 fm.plain(sep, label='grep.sep')
2561 fm.plain(sep, label='grep.sep')
2558 if not opts.get('text') and binary():
2562 if not opts.get('text') and binary():
2559 fm.plain(_(" Binary file matches"))
2563 fm.plain(_(" Binary file matches"))
2560 else:
2564 else:
2561 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2565 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2562 fm.plain(eol)
2566 fm.plain(eol)
2563 found = True
2567 found = True
2564 if opts.get('files_with_matches'):
2568 if opts.get('files_with_matches'):
2565 break
2569 break
2566 return found
2570 return found
2567
2571
2568 def displaymatches(fm, l):
2572 def displaymatches(fm, l):
2569 p = 0
2573 p = 0
2570 for s, e in l.findpos():
2574 for s, e in l.findpos():
2571 if p < s:
2575 if p < s:
2572 fm.startitem()
2576 fm.startitem()
2573 fm.write('text', '%s', l.line[p:s])
2577 fm.write('text', '%s', l.line[p:s])
2574 fm.data(matched=False)
2578 fm.data(matched=False)
2575 fm.startitem()
2579 fm.startitem()
2576 fm.write('text', '%s', l.line[s:e], label='grep.match')
2580 fm.write('text', '%s', l.line[s:e], label='grep.match')
2577 fm.data(matched=True)
2581 fm.data(matched=True)
2578 p = e
2582 p = e
2579 if p < len(l.line):
2583 if p < len(l.line):
2580 fm.startitem()
2584 fm.startitem()
2581 fm.write('text', '%s', l.line[p:])
2585 fm.write('text', '%s', l.line[p:])
2582 fm.data(matched=False)
2586 fm.data(matched=False)
2583 fm.end()
2587 fm.end()
2584
2588
2585 skip = {}
2589 skip = {}
2586 revfiles = {}
2590 revfiles = {}
2587 match = scmutil.match(repo[None], pats, opts)
2591 match = scmutil.match(repo[None], pats, opts)
2588 found = False
2592 found = False
2589 follow = opts.get('follow')
2593 follow = opts.get('follow')
2590
2594
2591 def prep(ctx, fns):
2595 def prep(ctx, fns):
2592 rev = ctx.rev()
2596 rev = ctx.rev()
2593 pctx = ctx.p1()
2597 pctx = ctx.p1()
2594 parent = pctx.rev()
2598 parent = pctx.rev()
2595 matches.setdefault(rev, {})
2599 matches.setdefault(rev, {})
2596 matches.setdefault(parent, {})
2600 matches.setdefault(parent, {})
2597 files = revfiles.setdefault(rev, [])
2601 files = revfiles.setdefault(rev, [])
2598 for fn in fns:
2602 for fn in fns:
2599 flog = getfile(fn)
2603 flog = getfile(fn)
2600 try:
2604 try:
2601 fnode = ctx.filenode(fn)
2605 fnode = ctx.filenode(fn)
2602 except error.LookupError:
2606 except error.LookupError:
2603 continue
2607 continue
2604
2608 try:
2605 copied = flog.renamed(fnode)
2609 copied = flog.renamed(fnode)
2610 except error.WdirUnsupported:
2611 copied = ctx[fn].renamed()
2606 copy = follow and copied and copied[0]
2612 copy = follow and copied and copied[0]
2607 if copy:
2613 if copy:
2608 copies.setdefault(rev, {})[fn] = copy
2614 copies.setdefault(rev, {})[fn] = copy
2609 if fn in skip:
2615 if fn in skip:
2610 if copy:
2616 if copy:
2611 skip[copy] = True
2617 skip[copy] = True
2612 continue
2618 continue
2613 files.append(fn)
2619 files.append(fn)
2614
2620
2615 if fn not in matches[rev]:
2621 if fn not in matches[rev]:
2616 grepbody(fn, rev, flog.read(fnode))
2622 try:
2623 content = flog.read(fnode)
2624 except error.WdirUnsupported:
2625 content = ctx[fn].data()
2626 grepbody(fn, rev, content)
2617
2627
2618 pfn = copy or fn
2628 pfn = copy or fn
2619 if pfn not in matches[parent]:
2629 if pfn not in matches[parent]:
2620 try:
2630 try:
2621 fnode = pctx.filenode(pfn)
2631 fnode = pctx.filenode(pfn)
2622 grepbody(pfn, parent, flog.read(fnode))
2632 grepbody(pfn, parent, flog.read(fnode))
2623 except error.LookupError:
2633 except error.LookupError:
2624 pass
2634 pass
2625
2635
2626 ui.pager('grep')
2636 ui.pager('grep')
2627 fm = ui.formatter('grep', opts)
2637 fm = ui.formatter('grep', opts)
2628 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2638 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2629 rev = ctx.rev()
2639 rev = ctx.rev()
2630 parent = ctx.p1().rev()
2640 parent = ctx.p1().rev()
2631 for fn in sorted(revfiles.get(rev, [])):
2641 for fn in sorted(revfiles.get(rev, [])):
2632 states = matches[rev][fn]
2642 states = matches[rev][fn]
2633 copy = copies.get(rev, {}).get(fn)
2643 copy = copies.get(rev, {}).get(fn)
2634 if fn in skip:
2644 if fn in skip:
2635 if copy:
2645 if copy:
2636 skip[copy] = True
2646 skip[copy] = True
2637 continue
2647 continue
2638 pstates = matches.get(parent, {}).get(copy or fn, [])
2648 pstates = matches.get(parent, {}).get(copy or fn, [])
2639 if pstates or states:
2649 if pstates or states:
2640 r = display(fm, fn, ctx, pstates, states)
2650 r = display(fm, fn, ctx, pstates, states)
2641 found = found or r
2651 found = found or r
2642 if r and not opts.get('all'):
2652 if r and not opts.get('all'):
2643 skip[fn] = True
2653 skip[fn] = True
2644 if copy:
2654 if copy:
2645 skip[copy] = True
2655 skip[copy] = True
2646 del revfiles[rev]
2656 del revfiles[rev]
2647 # We will keep the matches dict for the duration of the window
2657 # We will keep the matches dict for the duration of the window
2648 # clear the matches dict once the window is over
2658 # clear the matches dict once the window is over
2649 if not revfiles:
2659 if not revfiles:
2650 matches.clear()
2660 matches.clear()
2651 fm.end()
2661 fm.end()
2652
2662
2653 return not found
2663 return not found
2654
2664
2655 @command('heads',
2665 @command('heads',
2656 [('r', 'rev', '',
2666 [('r', 'rev', '',
2657 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2667 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2658 ('t', 'topo', False, _('show topological heads only')),
2668 ('t', 'topo', False, _('show topological heads only')),
2659 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2669 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2660 ('c', 'closed', False, _('show normal and closed branch heads')),
2670 ('c', 'closed', False, _('show normal and closed branch heads')),
2661 ] + templateopts,
2671 ] + templateopts,
2662 _('[-ct] [-r STARTREV] [REV]...'),
2672 _('[-ct] [-r STARTREV] [REV]...'),
2663 intents={INTENT_READONLY})
2673 intents={INTENT_READONLY})
2664 def heads(ui, repo, *branchrevs, **opts):
2674 def heads(ui, repo, *branchrevs, **opts):
2665 """show branch heads
2675 """show branch heads
2666
2676
2667 With no arguments, show all open branch heads in the repository.
2677 With no arguments, show all open branch heads in the repository.
2668 Branch heads are changesets that have no descendants on the
2678 Branch heads are changesets that have no descendants on the
2669 same branch. They are where development generally takes place and
2679 same branch. They are where development generally takes place and
2670 are the usual targets for update and merge operations.
2680 are the usual targets for update and merge operations.
2671
2681
2672 If one or more REVs are given, only open branch heads on the
2682 If one or more REVs are given, only open branch heads on the
2673 branches associated with the specified changesets are shown. This
2683 branches associated with the specified changesets are shown. This
2674 means that you can use :hg:`heads .` to see the heads on the
2684 means that you can use :hg:`heads .` to see the heads on the
2675 currently checked-out branch.
2685 currently checked-out branch.
2676
2686
2677 If -c/--closed is specified, also show branch heads marked closed
2687 If -c/--closed is specified, also show branch heads marked closed
2678 (see :hg:`commit --close-branch`).
2688 (see :hg:`commit --close-branch`).
2679
2689
2680 If STARTREV is specified, only those heads that are descendants of
2690 If STARTREV is specified, only those heads that are descendants of
2681 STARTREV will be displayed.
2691 STARTREV will be displayed.
2682
2692
2683 If -t/--topo is specified, named branch mechanics will be ignored and only
2693 If -t/--topo is specified, named branch mechanics will be ignored and only
2684 topological heads (changesets with no children) will be shown.
2694 topological heads (changesets with no children) will be shown.
2685
2695
2686 Returns 0 if matching heads are found, 1 if not.
2696 Returns 0 if matching heads are found, 1 if not.
2687 """
2697 """
2688
2698
2689 opts = pycompat.byteskwargs(opts)
2699 opts = pycompat.byteskwargs(opts)
2690 start = None
2700 start = None
2691 rev = opts.get('rev')
2701 rev = opts.get('rev')
2692 if rev:
2702 if rev:
2693 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2703 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2694 start = scmutil.revsingle(repo, rev, None).node()
2704 start = scmutil.revsingle(repo, rev, None).node()
2695
2705
2696 if opts.get('topo'):
2706 if opts.get('topo'):
2697 heads = [repo[h] for h in repo.heads(start)]
2707 heads = [repo[h] for h in repo.heads(start)]
2698 else:
2708 else:
2699 heads = []
2709 heads = []
2700 for branch in repo.branchmap():
2710 for branch in repo.branchmap():
2701 heads += repo.branchheads(branch, start, opts.get('closed'))
2711 heads += repo.branchheads(branch, start, opts.get('closed'))
2702 heads = [repo[h] for h in heads]
2712 heads = [repo[h] for h in heads]
2703
2713
2704 if branchrevs:
2714 if branchrevs:
2705 branches = set(repo[r].branch()
2715 branches = set(repo[r].branch()
2706 for r in scmutil.revrange(repo, branchrevs))
2716 for r in scmutil.revrange(repo, branchrevs))
2707 heads = [h for h in heads if h.branch() in branches]
2717 heads = [h for h in heads if h.branch() in branches]
2708
2718
2709 if opts.get('active') and branchrevs:
2719 if opts.get('active') and branchrevs:
2710 dagheads = repo.heads(start)
2720 dagheads = repo.heads(start)
2711 heads = [h for h in heads if h.node() in dagheads]
2721 heads = [h for h in heads if h.node() in dagheads]
2712
2722
2713 if branchrevs:
2723 if branchrevs:
2714 haveheads = set(h.branch() for h in heads)
2724 haveheads = set(h.branch() for h in heads)
2715 if branches - haveheads:
2725 if branches - haveheads:
2716 headless = ', '.join(b for b in branches - haveheads)
2726 headless = ', '.join(b for b in branches - haveheads)
2717 msg = _('no open branch heads found on branches %s')
2727 msg = _('no open branch heads found on branches %s')
2718 if opts.get('rev'):
2728 if opts.get('rev'):
2719 msg += _(' (started at %s)') % opts['rev']
2729 msg += _(' (started at %s)') % opts['rev']
2720 ui.warn((msg + '\n') % headless)
2730 ui.warn((msg + '\n') % headless)
2721
2731
2722 if not heads:
2732 if not heads:
2723 return 1
2733 return 1
2724
2734
2725 ui.pager('heads')
2735 ui.pager('heads')
2726 heads = sorted(heads, key=lambda x: -x.rev())
2736 heads = sorted(heads, key=lambda x: -x.rev())
2727 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2737 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2728 for ctx in heads:
2738 for ctx in heads:
2729 displayer.show(ctx)
2739 displayer.show(ctx)
2730 displayer.close()
2740 displayer.close()
2731
2741
2732 @command('help',
2742 @command('help',
2733 [('e', 'extension', None, _('show only help for extensions')),
2743 [('e', 'extension', None, _('show only help for extensions')),
2734 ('c', 'command', None, _('show only help for commands')),
2744 ('c', 'command', None, _('show only help for commands')),
2735 ('k', 'keyword', None, _('show topics matching keyword')),
2745 ('k', 'keyword', None, _('show topics matching keyword')),
2736 ('s', 'system', [], _('show help for specific platform(s)')),
2746 ('s', 'system', [], _('show help for specific platform(s)')),
2737 ],
2747 ],
2738 _('[-ecks] [TOPIC]'),
2748 _('[-ecks] [TOPIC]'),
2739 norepo=True,
2749 norepo=True,
2740 intents={INTENT_READONLY})
2750 intents={INTENT_READONLY})
2741 def help_(ui, name=None, **opts):
2751 def help_(ui, name=None, **opts):
2742 """show help for a given topic or a help overview
2752 """show help for a given topic or a help overview
2743
2753
2744 With no arguments, print a list of commands with short help messages.
2754 With no arguments, print a list of commands with short help messages.
2745
2755
2746 Given a topic, extension, or command name, print help for that
2756 Given a topic, extension, or command name, print help for that
2747 topic.
2757 topic.
2748
2758
2749 Returns 0 if successful.
2759 Returns 0 if successful.
2750 """
2760 """
2751
2761
2752 keep = opts.get(r'system') or []
2762 keep = opts.get(r'system') or []
2753 if len(keep) == 0:
2763 if len(keep) == 0:
2754 if pycompat.sysplatform.startswith('win'):
2764 if pycompat.sysplatform.startswith('win'):
2755 keep.append('windows')
2765 keep.append('windows')
2756 elif pycompat.sysplatform == 'OpenVMS':
2766 elif pycompat.sysplatform == 'OpenVMS':
2757 keep.append('vms')
2767 keep.append('vms')
2758 elif pycompat.sysplatform == 'plan9':
2768 elif pycompat.sysplatform == 'plan9':
2759 keep.append('plan9')
2769 keep.append('plan9')
2760 else:
2770 else:
2761 keep.append('unix')
2771 keep.append('unix')
2762 keep.append(pycompat.sysplatform.lower())
2772 keep.append(pycompat.sysplatform.lower())
2763 if ui.verbose:
2773 if ui.verbose:
2764 keep.append('verbose')
2774 keep.append('verbose')
2765
2775
2766 commands = sys.modules[__name__]
2776 commands = sys.modules[__name__]
2767 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2777 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2768 ui.pager('help')
2778 ui.pager('help')
2769 ui.write(formatted)
2779 ui.write(formatted)
2770
2780
2771
2781
2772 @command('identify|id',
2782 @command('identify|id',
2773 [('r', 'rev', '',
2783 [('r', 'rev', '',
2774 _('identify the specified revision'), _('REV')),
2784 _('identify the specified revision'), _('REV')),
2775 ('n', 'num', None, _('show local revision number')),
2785 ('n', 'num', None, _('show local revision number')),
2776 ('i', 'id', None, _('show global revision id')),
2786 ('i', 'id', None, _('show global revision id')),
2777 ('b', 'branch', None, _('show branch')),
2787 ('b', 'branch', None, _('show branch')),
2778 ('t', 'tags', None, _('show tags')),
2788 ('t', 'tags', None, _('show tags')),
2779 ('B', 'bookmarks', None, _('show bookmarks')),
2789 ('B', 'bookmarks', None, _('show bookmarks')),
2780 ] + remoteopts + formatteropts,
2790 ] + remoteopts + formatteropts,
2781 _('[-nibtB] [-r REV] [SOURCE]'),
2791 _('[-nibtB] [-r REV] [SOURCE]'),
2782 optionalrepo=True,
2792 optionalrepo=True,
2783 intents={INTENT_READONLY})
2793 intents={INTENT_READONLY})
2784 def identify(ui, repo, source=None, rev=None,
2794 def identify(ui, repo, source=None, rev=None,
2785 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2795 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2786 """identify the working directory or specified revision
2796 """identify the working directory or specified revision
2787
2797
2788 Print a summary identifying the repository state at REV using one or
2798 Print a summary identifying the repository state at REV using one or
2789 two parent hash identifiers, followed by a "+" if the working
2799 two parent hash identifiers, followed by a "+" if the working
2790 directory has uncommitted changes, the branch name (if not default),
2800 directory has uncommitted changes, the branch name (if not default),
2791 a list of tags, and a list of bookmarks.
2801 a list of tags, and a list of bookmarks.
2792
2802
2793 When REV is not given, print a summary of the current state of the
2803 When REV is not given, print a summary of the current state of the
2794 repository including the working directory. Specify -r. to get information
2804 repository including the working directory. Specify -r. to get information
2795 of the working directory parent without scanning uncommitted changes.
2805 of the working directory parent without scanning uncommitted changes.
2796
2806
2797 Specifying a path to a repository root or Mercurial bundle will
2807 Specifying a path to a repository root or Mercurial bundle will
2798 cause lookup to operate on that repository/bundle.
2808 cause lookup to operate on that repository/bundle.
2799
2809
2800 .. container:: verbose
2810 .. container:: verbose
2801
2811
2802 Examples:
2812 Examples:
2803
2813
2804 - generate a build identifier for the working directory::
2814 - generate a build identifier for the working directory::
2805
2815
2806 hg id --id > build-id.dat
2816 hg id --id > build-id.dat
2807
2817
2808 - find the revision corresponding to a tag::
2818 - find the revision corresponding to a tag::
2809
2819
2810 hg id -n -r 1.3
2820 hg id -n -r 1.3
2811
2821
2812 - check the most recent revision of a remote repository::
2822 - check the most recent revision of a remote repository::
2813
2823
2814 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2824 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2815
2825
2816 See :hg:`log` for generating more information about specific revisions,
2826 See :hg:`log` for generating more information about specific revisions,
2817 including full hash identifiers.
2827 including full hash identifiers.
2818
2828
2819 Returns 0 if successful.
2829 Returns 0 if successful.
2820 """
2830 """
2821
2831
2822 opts = pycompat.byteskwargs(opts)
2832 opts = pycompat.byteskwargs(opts)
2823 if not repo and not source:
2833 if not repo and not source:
2824 raise error.Abort(_("there is no Mercurial repository here "
2834 raise error.Abort(_("there is no Mercurial repository here "
2825 "(.hg not found)"))
2835 "(.hg not found)"))
2826
2836
2827 if ui.debugflag:
2837 if ui.debugflag:
2828 hexfunc = hex
2838 hexfunc = hex
2829 else:
2839 else:
2830 hexfunc = short
2840 hexfunc = short
2831 default = not (num or id or branch or tags or bookmarks)
2841 default = not (num or id or branch or tags or bookmarks)
2832 output = []
2842 output = []
2833 revs = []
2843 revs = []
2834
2844
2835 if source:
2845 if source:
2836 source, branches = hg.parseurl(ui.expandpath(source))
2846 source, branches = hg.parseurl(ui.expandpath(source))
2837 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2847 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2838 repo = peer.local()
2848 repo = peer.local()
2839 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2849 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2840
2850
2841 fm = ui.formatter('identify', opts)
2851 fm = ui.formatter('identify', opts)
2842 fm.startitem()
2852 fm.startitem()
2843
2853
2844 if not repo:
2854 if not repo:
2845 if num or branch or tags:
2855 if num or branch or tags:
2846 raise error.Abort(
2856 raise error.Abort(
2847 _("can't query remote revision number, branch, or tags"))
2857 _("can't query remote revision number, branch, or tags"))
2848 if not rev and revs:
2858 if not rev and revs:
2849 rev = revs[0]
2859 rev = revs[0]
2850 if not rev:
2860 if not rev:
2851 rev = "tip"
2861 rev = "tip"
2852
2862
2853 remoterev = peer.lookup(rev)
2863 remoterev = peer.lookup(rev)
2854 hexrev = hexfunc(remoterev)
2864 hexrev = hexfunc(remoterev)
2855 if default or id:
2865 if default or id:
2856 output = [hexrev]
2866 output = [hexrev]
2857 fm.data(id=hexrev)
2867 fm.data(id=hexrev)
2858
2868
2859 def getbms():
2869 def getbms():
2860 bms = []
2870 bms = []
2861
2871
2862 if 'bookmarks' in peer.listkeys('namespaces'):
2872 if 'bookmarks' in peer.listkeys('namespaces'):
2863 hexremoterev = hex(remoterev)
2873 hexremoterev = hex(remoterev)
2864 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2874 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2865 if bmr == hexremoterev]
2875 if bmr == hexremoterev]
2866
2876
2867 return sorted(bms)
2877 return sorted(bms)
2868
2878
2869 bms = getbms()
2879 bms = getbms()
2870 if bookmarks:
2880 if bookmarks:
2871 output.extend(bms)
2881 output.extend(bms)
2872 elif default and not ui.quiet:
2882 elif default and not ui.quiet:
2873 # multiple bookmarks for a single parent separated by '/'
2883 # multiple bookmarks for a single parent separated by '/'
2874 bm = '/'.join(bms)
2884 bm = '/'.join(bms)
2875 if bm:
2885 if bm:
2876 output.append(bm)
2886 output.append(bm)
2877
2887
2878 fm.data(node=hex(remoterev))
2888 fm.data(node=hex(remoterev))
2879 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2889 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2880 else:
2890 else:
2881 if rev:
2891 if rev:
2882 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2892 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2883 ctx = scmutil.revsingle(repo, rev, None)
2893 ctx = scmutil.revsingle(repo, rev, None)
2884
2894
2885 if ctx.rev() is None:
2895 if ctx.rev() is None:
2886 ctx = repo[None]
2896 ctx = repo[None]
2887 parents = ctx.parents()
2897 parents = ctx.parents()
2888 taglist = []
2898 taglist = []
2889 for p in parents:
2899 for p in parents:
2890 taglist.extend(p.tags())
2900 taglist.extend(p.tags())
2891
2901
2892 dirty = ""
2902 dirty = ""
2893 if ctx.dirty(missing=True, merge=False, branch=False):
2903 if ctx.dirty(missing=True, merge=False, branch=False):
2894 dirty = '+'
2904 dirty = '+'
2895 fm.data(dirty=dirty)
2905 fm.data(dirty=dirty)
2896
2906
2897 hexoutput = [hexfunc(p.node()) for p in parents]
2907 hexoutput = [hexfunc(p.node()) for p in parents]
2898 if default or id:
2908 if default or id:
2899 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2909 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2900 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2910 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2901
2911
2902 if num:
2912 if num:
2903 numoutput = ["%d" % p.rev() for p in parents]
2913 numoutput = ["%d" % p.rev() for p in parents]
2904 output.append("%s%s" % ('+'.join(numoutput), dirty))
2914 output.append("%s%s" % ('+'.join(numoutput), dirty))
2905
2915
2906 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
2916 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
2907 for p in parents:
2917 for p in parents:
2908 fn.startitem()
2918 fn.startitem()
2909 fn.data(rev=p.rev())
2919 fn.data(rev=p.rev())
2910 fn.data(node=p.hex())
2920 fn.data(node=p.hex())
2911 fn.context(ctx=p)
2921 fn.context(ctx=p)
2912 fn.end()
2922 fn.end()
2913 else:
2923 else:
2914 hexoutput = hexfunc(ctx.node())
2924 hexoutput = hexfunc(ctx.node())
2915 if default or id:
2925 if default or id:
2916 output = [hexoutput]
2926 output = [hexoutput]
2917 fm.data(id=hexoutput)
2927 fm.data(id=hexoutput)
2918
2928
2919 if num:
2929 if num:
2920 output.append(pycompat.bytestr(ctx.rev()))
2930 output.append(pycompat.bytestr(ctx.rev()))
2921 taglist = ctx.tags()
2931 taglist = ctx.tags()
2922
2932
2923 if default and not ui.quiet:
2933 if default and not ui.quiet:
2924 b = ctx.branch()
2934 b = ctx.branch()
2925 if b != 'default':
2935 if b != 'default':
2926 output.append("(%s)" % b)
2936 output.append("(%s)" % b)
2927
2937
2928 # multiple tags for a single parent separated by '/'
2938 # multiple tags for a single parent separated by '/'
2929 t = '/'.join(taglist)
2939 t = '/'.join(taglist)
2930 if t:
2940 if t:
2931 output.append(t)
2941 output.append(t)
2932
2942
2933 # multiple bookmarks for a single parent separated by '/'
2943 # multiple bookmarks for a single parent separated by '/'
2934 bm = '/'.join(ctx.bookmarks())
2944 bm = '/'.join(ctx.bookmarks())
2935 if bm:
2945 if bm:
2936 output.append(bm)
2946 output.append(bm)
2937 else:
2947 else:
2938 if branch:
2948 if branch:
2939 output.append(ctx.branch())
2949 output.append(ctx.branch())
2940
2950
2941 if tags:
2951 if tags:
2942 output.extend(taglist)
2952 output.extend(taglist)
2943
2953
2944 if bookmarks:
2954 if bookmarks:
2945 output.extend(ctx.bookmarks())
2955 output.extend(ctx.bookmarks())
2946
2956
2947 fm.data(node=ctx.hex())
2957 fm.data(node=ctx.hex())
2948 fm.data(branch=ctx.branch())
2958 fm.data(branch=ctx.branch())
2949 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2959 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2950 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2960 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2951 fm.context(ctx=ctx)
2961 fm.context(ctx=ctx)
2952
2962
2953 fm.plain("%s\n" % ' '.join(output))
2963 fm.plain("%s\n" % ' '.join(output))
2954 fm.end()
2964 fm.end()
2955
2965
2956 @command('import|patch',
2966 @command('import|patch',
2957 [('p', 'strip', 1,
2967 [('p', 'strip', 1,
2958 _('directory strip option for patch. This has the same '
2968 _('directory strip option for patch. This has the same '
2959 'meaning as the corresponding patch option'), _('NUM')),
2969 'meaning as the corresponding patch option'), _('NUM')),
2960 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2970 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2961 ('e', 'edit', False, _('invoke editor on commit messages')),
2971 ('e', 'edit', False, _('invoke editor on commit messages')),
2962 ('f', 'force', None,
2972 ('f', 'force', None,
2963 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2973 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2964 ('', 'no-commit', None,
2974 ('', 'no-commit', None,
2965 _("don't commit, just update the working directory")),
2975 _("don't commit, just update the working directory")),
2966 ('', 'bypass', None,
2976 ('', 'bypass', None,
2967 _("apply patch without touching the working directory")),
2977 _("apply patch without touching the working directory")),
2968 ('', 'partial', None,
2978 ('', 'partial', None,
2969 _('commit even if some hunks fail')),
2979 _('commit even if some hunks fail')),
2970 ('', 'exact', None,
2980 ('', 'exact', None,
2971 _('abort if patch would apply lossily')),
2981 _('abort if patch would apply lossily')),
2972 ('', 'prefix', '',
2982 ('', 'prefix', '',
2973 _('apply patch to subdirectory'), _('DIR')),
2983 _('apply patch to subdirectory'), _('DIR')),
2974 ('', 'import-branch', None,
2984 ('', 'import-branch', None,
2975 _('use any branch information in patch (implied by --exact)'))] +
2985 _('use any branch information in patch (implied by --exact)'))] +
2976 commitopts + commitopts2 + similarityopts,
2986 commitopts + commitopts2 + similarityopts,
2977 _('[OPTION]... PATCH...'))
2987 _('[OPTION]... PATCH...'))
2978 def import_(ui, repo, patch1=None, *patches, **opts):
2988 def import_(ui, repo, patch1=None, *patches, **opts):
2979 """import an ordered set of patches
2989 """import an ordered set of patches
2980
2990
2981 Import a list of patches and commit them individually (unless
2991 Import a list of patches and commit them individually (unless
2982 --no-commit is specified).
2992 --no-commit is specified).
2983
2993
2984 To read a patch from standard input (stdin), use "-" as the patch
2994 To read a patch from standard input (stdin), use "-" as the patch
2985 name. If a URL is specified, the patch will be downloaded from
2995 name. If a URL is specified, the patch will be downloaded from
2986 there.
2996 there.
2987
2997
2988 Import first applies changes to the working directory (unless
2998 Import first applies changes to the working directory (unless
2989 --bypass is specified), import will abort if there are outstanding
2999 --bypass is specified), import will abort if there are outstanding
2990 changes.
3000 changes.
2991
3001
2992 Use --bypass to apply and commit patches directly to the
3002 Use --bypass to apply and commit patches directly to the
2993 repository, without affecting the working directory. Without
3003 repository, without affecting the working directory. Without
2994 --exact, patches will be applied on top of the working directory
3004 --exact, patches will be applied on top of the working directory
2995 parent revision.
3005 parent revision.
2996
3006
2997 You can import a patch straight from a mail message. Even patches
3007 You can import a patch straight from a mail message. Even patches
2998 as attachments work (to use the body part, it must have type
3008 as attachments work (to use the body part, it must have type
2999 text/plain or text/x-patch). From and Subject headers of email
3009 text/plain or text/x-patch). From and Subject headers of email
3000 message are used as default committer and commit message. All
3010 message are used as default committer and commit message. All
3001 text/plain body parts before first diff are added to the commit
3011 text/plain body parts before first diff are added to the commit
3002 message.
3012 message.
3003
3013
3004 If the imported patch was generated by :hg:`export`, user and
3014 If the imported patch was generated by :hg:`export`, user and
3005 description from patch override values from message headers and
3015 description from patch override values from message headers and
3006 body. Values given on command line with -m/--message and -u/--user
3016 body. Values given on command line with -m/--message and -u/--user
3007 override these.
3017 override these.
3008
3018
3009 If --exact is specified, import will set the working directory to
3019 If --exact is specified, import will set the working directory to
3010 the parent of each patch before applying it, and will abort if the
3020 the parent of each patch before applying it, and will abort if the
3011 resulting changeset has a different ID than the one recorded in
3021 resulting changeset has a different ID than the one recorded in
3012 the patch. This will guard against various ways that portable
3022 the patch. This will guard against various ways that portable
3013 patch formats and mail systems might fail to transfer Mercurial
3023 patch formats and mail systems might fail to transfer Mercurial
3014 data or metadata. See :hg:`bundle` for lossless transmission.
3024 data or metadata. See :hg:`bundle` for lossless transmission.
3015
3025
3016 Use --partial to ensure a changeset will be created from the patch
3026 Use --partial to ensure a changeset will be created from the patch
3017 even if some hunks fail to apply. Hunks that fail to apply will be
3027 even if some hunks fail to apply. Hunks that fail to apply will be
3018 written to a <target-file>.rej file. Conflicts can then be resolved
3028 written to a <target-file>.rej file. Conflicts can then be resolved
3019 by hand before :hg:`commit --amend` is run to update the created
3029 by hand before :hg:`commit --amend` is run to update the created
3020 changeset. This flag exists to let people import patches that
3030 changeset. This flag exists to let people import patches that
3021 partially apply without losing the associated metadata (author,
3031 partially apply without losing the associated metadata (author,
3022 date, description, ...).
3032 date, description, ...).
3023
3033
3024 .. note::
3034 .. note::
3025
3035
3026 When no hunks apply cleanly, :hg:`import --partial` will create
3036 When no hunks apply cleanly, :hg:`import --partial` will create
3027 an empty changeset, importing only the patch metadata.
3037 an empty changeset, importing only the patch metadata.
3028
3038
3029 With -s/--similarity, hg will attempt to discover renames and
3039 With -s/--similarity, hg will attempt to discover renames and
3030 copies in the patch in the same way as :hg:`addremove`.
3040 copies in the patch in the same way as :hg:`addremove`.
3031
3041
3032 It is possible to use external patch programs to perform the patch
3042 It is possible to use external patch programs to perform the patch
3033 by setting the ``ui.patch`` configuration option. For the default
3043 by setting the ``ui.patch`` configuration option. For the default
3034 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3044 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3035 See :hg:`help config` for more information about configuration
3045 See :hg:`help config` for more information about configuration
3036 files and how to use these options.
3046 files and how to use these options.
3037
3047
3038 See :hg:`help dates` for a list of formats valid for -d/--date.
3048 See :hg:`help dates` for a list of formats valid for -d/--date.
3039
3049
3040 .. container:: verbose
3050 .. container:: verbose
3041
3051
3042 Examples:
3052 Examples:
3043
3053
3044 - import a traditional patch from a website and detect renames::
3054 - import a traditional patch from a website and detect renames::
3045
3055
3046 hg import -s 80 http://example.com/bugfix.patch
3056 hg import -s 80 http://example.com/bugfix.patch
3047
3057
3048 - import a changeset from an hgweb server::
3058 - import a changeset from an hgweb server::
3049
3059
3050 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3060 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3051
3061
3052 - import all the patches in an Unix-style mbox::
3062 - import all the patches in an Unix-style mbox::
3053
3063
3054 hg import incoming-patches.mbox
3064 hg import incoming-patches.mbox
3055
3065
3056 - import patches from stdin::
3066 - import patches from stdin::
3057
3067
3058 hg import -
3068 hg import -
3059
3069
3060 - attempt to exactly restore an exported changeset (not always
3070 - attempt to exactly restore an exported changeset (not always
3061 possible)::
3071 possible)::
3062
3072
3063 hg import --exact proposed-fix.patch
3073 hg import --exact proposed-fix.patch
3064
3074
3065 - use an external tool to apply a patch which is too fuzzy for
3075 - use an external tool to apply a patch which is too fuzzy for
3066 the default internal tool.
3076 the default internal tool.
3067
3077
3068 hg import --config ui.patch="patch --merge" fuzzy.patch
3078 hg import --config ui.patch="patch --merge" fuzzy.patch
3069
3079
3070 - change the default fuzzing from 2 to a less strict 7
3080 - change the default fuzzing from 2 to a less strict 7
3071
3081
3072 hg import --config ui.fuzz=7 fuzz.patch
3082 hg import --config ui.fuzz=7 fuzz.patch
3073
3083
3074 Returns 0 on success, 1 on partial success (see --partial).
3084 Returns 0 on success, 1 on partial success (see --partial).
3075 """
3085 """
3076
3086
3077 opts = pycompat.byteskwargs(opts)
3087 opts = pycompat.byteskwargs(opts)
3078 if not patch1:
3088 if not patch1:
3079 raise error.Abort(_('need at least one patch to import'))
3089 raise error.Abort(_('need at least one patch to import'))
3080
3090
3081 patches = (patch1,) + patches
3091 patches = (patch1,) + patches
3082
3092
3083 date = opts.get('date')
3093 date = opts.get('date')
3084 if date:
3094 if date:
3085 opts['date'] = dateutil.parsedate(date)
3095 opts['date'] = dateutil.parsedate(date)
3086
3096
3087 exact = opts.get('exact')
3097 exact = opts.get('exact')
3088 update = not opts.get('bypass')
3098 update = not opts.get('bypass')
3089 if not update and opts.get('no_commit'):
3099 if not update and opts.get('no_commit'):
3090 raise error.Abort(_('cannot use --no-commit with --bypass'))
3100 raise error.Abort(_('cannot use --no-commit with --bypass'))
3091 try:
3101 try:
3092 sim = float(opts.get('similarity') or 0)
3102 sim = float(opts.get('similarity') or 0)
3093 except ValueError:
3103 except ValueError:
3094 raise error.Abort(_('similarity must be a number'))
3104 raise error.Abort(_('similarity must be a number'))
3095 if sim < 0 or sim > 100:
3105 if sim < 0 or sim > 100:
3096 raise error.Abort(_('similarity must be between 0 and 100'))
3106 raise error.Abort(_('similarity must be between 0 and 100'))
3097 if sim and not update:
3107 if sim and not update:
3098 raise error.Abort(_('cannot use --similarity with --bypass'))
3108 raise error.Abort(_('cannot use --similarity with --bypass'))
3099 if exact:
3109 if exact:
3100 if opts.get('edit'):
3110 if opts.get('edit'):
3101 raise error.Abort(_('cannot use --exact with --edit'))
3111 raise error.Abort(_('cannot use --exact with --edit'))
3102 if opts.get('prefix'):
3112 if opts.get('prefix'):
3103 raise error.Abort(_('cannot use --exact with --prefix'))
3113 raise error.Abort(_('cannot use --exact with --prefix'))
3104
3114
3105 base = opts["base"]
3115 base = opts["base"]
3106 wlock = dsguard = lock = tr = None
3116 wlock = dsguard = lock = tr = None
3107 msgs = []
3117 msgs = []
3108 ret = 0
3118 ret = 0
3109
3119
3110
3120
3111 try:
3121 try:
3112 wlock = repo.wlock()
3122 wlock = repo.wlock()
3113
3123
3114 if update:
3124 if update:
3115 cmdutil.checkunfinished(repo)
3125 cmdutil.checkunfinished(repo)
3116 if (exact or not opts.get('force')):
3126 if (exact or not opts.get('force')):
3117 cmdutil.bailifchanged(repo)
3127 cmdutil.bailifchanged(repo)
3118
3128
3119 if not opts.get('no_commit'):
3129 if not opts.get('no_commit'):
3120 lock = repo.lock()
3130 lock = repo.lock()
3121 tr = repo.transaction('import')
3131 tr = repo.transaction('import')
3122 else:
3132 else:
3123 dsguard = dirstateguard.dirstateguard(repo, 'import')
3133 dsguard = dirstateguard.dirstateguard(repo, 'import')
3124 parents = repo[None].parents()
3134 parents = repo[None].parents()
3125 for patchurl in patches:
3135 for patchurl in patches:
3126 if patchurl == '-':
3136 if patchurl == '-':
3127 ui.status(_('applying patch from stdin\n'))
3137 ui.status(_('applying patch from stdin\n'))
3128 patchfile = ui.fin
3138 patchfile = ui.fin
3129 patchurl = 'stdin' # for error message
3139 patchurl = 'stdin' # for error message
3130 else:
3140 else:
3131 patchurl = os.path.join(base, patchurl)
3141 patchurl = os.path.join(base, patchurl)
3132 ui.status(_('applying %s\n') % patchurl)
3142 ui.status(_('applying %s\n') % patchurl)
3133 patchfile = hg.openpath(ui, patchurl)
3143 patchfile = hg.openpath(ui, patchurl)
3134
3144
3135 haspatch = False
3145 haspatch = False
3136 for hunk in patch.split(patchfile):
3146 for hunk in patch.split(patchfile):
3137 with patch.extract(ui, hunk) as patchdata:
3147 with patch.extract(ui, hunk) as patchdata:
3138 msg, node, rej = cmdutil.tryimportone(ui, repo, patchdata,
3148 msg, node, rej = cmdutil.tryimportone(ui, repo, patchdata,
3139 parents, opts,
3149 parents, opts,
3140 msgs, hg.clean)
3150 msgs, hg.clean)
3141 if msg:
3151 if msg:
3142 haspatch = True
3152 haspatch = True
3143 ui.note(msg + '\n')
3153 ui.note(msg + '\n')
3144 if update or exact:
3154 if update or exact:
3145 parents = repo[None].parents()
3155 parents = repo[None].parents()
3146 else:
3156 else:
3147 parents = [repo[node]]
3157 parents = [repo[node]]
3148 if rej:
3158 if rej:
3149 ui.write_err(_("patch applied partially\n"))
3159 ui.write_err(_("patch applied partially\n"))
3150 ui.write_err(_("(fix the .rej files and run "
3160 ui.write_err(_("(fix the .rej files and run "
3151 "`hg commit --amend`)\n"))
3161 "`hg commit --amend`)\n"))
3152 ret = 1
3162 ret = 1
3153 break
3163 break
3154
3164
3155 if not haspatch:
3165 if not haspatch:
3156 raise error.Abort(_('%s: no diffs found') % patchurl)
3166 raise error.Abort(_('%s: no diffs found') % patchurl)
3157
3167
3158 if tr:
3168 if tr:
3159 tr.close()
3169 tr.close()
3160 if msgs:
3170 if msgs:
3161 repo.savecommitmessage('\n* * *\n'.join(msgs))
3171 repo.savecommitmessage('\n* * *\n'.join(msgs))
3162 if dsguard:
3172 if dsguard:
3163 dsguard.close()
3173 dsguard.close()
3164 return ret
3174 return ret
3165 finally:
3175 finally:
3166 if tr:
3176 if tr:
3167 tr.release()
3177 tr.release()
3168 release(lock, dsguard, wlock)
3178 release(lock, dsguard, wlock)
3169
3179
3170 @command('incoming|in',
3180 @command('incoming|in',
3171 [('f', 'force', None,
3181 [('f', 'force', None,
3172 _('run even if remote repository is unrelated')),
3182 _('run even if remote repository is unrelated')),
3173 ('n', 'newest-first', None, _('show newest record first')),
3183 ('n', 'newest-first', None, _('show newest record first')),
3174 ('', 'bundle', '',
3184 ('', 'bundle', '',
3175 _('file to store the bundles into'), _('FILE')),
3185 _('file to store the bundles into'), _('FILE')),
3176 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3186 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3177 ('B', 'bookmarks', False, _("compare bookmarks")),
3187 ('B', 'bookmarks', False, _("compare bookmarks")),
3178 ('b', 'branch', [],
3188 ('b', 'branch', [],
3179 _('a specific branch you would like to pull'), _('BRANCH')),
3189 _('a specific branch you would like to pull'), _('BRANCH')),
3180 ] + logopts + remoteopts + subrepoopts,
3190 ] + logopts + remoteopts + subrepoopts,
3181 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3191 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3182 def incoming(ui, repo, source="default", **opts):
3192 def incoming(ui, repo, source="default", **opts):
3183 """show new changesets found in source
3193 """show new changesets found in source
3184
3194
3185 Show new changesets found in the specified path/URL or the default
3195 Show new changesets found in the specified path/URL or the default
3186 pull location. These are the changesets that would have been pulled
3196 pull location. These are the changesets that would have been pulled
3187 by :hg:`pull` at the time you issued this command.
3197 by :hg:`pull` at the time you issued this command.
3188
3198
3189 See pull for valid source format details.
3199 See pull for valid source format details.
3190
3200
3191 .. container:: verbose
3201 .. container:: verbose
3192
3202
3193 With -B/--bookmarks, the result of bookmark comparison between
3203 With -B/--bookmarks, the result of bookmark comparison between
3194 local and remote repositories is displayed. With -v/--verbose,
3204 local and remote repositories is displayed. With -v/--verbose,
3195 status is also displayed for each bookmark like below::
3205 status is also displayed for each bookmark like below::
3196
3206
3197 BM1 01234567890a added
3207 BM1 01234567890a added
3198 BM2 1234567890ab advanced
3208 BM2 1234567890ab advanced
3199 BM3 234567890abc diverged
3209 BM3 234567890abc diverged
3200 BM4 34567890abcd changed
3210 BM4 34567890abcd changed
3201
3211
3202 The action taken locally when pulling depends on the
3212 The action taken locally when pulling depends on the
3203 status of each bookmark:
3213 status of each bookmark:
3204
3214
3205 :``added``: pull will create it
3215 :``added``: pull will create it
3206 :``advanced``: pull will update it
3216 :``advanced``: pull will update it
3207 :``diverged``: pull will create a divergent bookmark
3217 :``diverged``: pull will create a divergent bookmark
3208 :``changed``: result depends on remote changesets
3218 :``changed``: result depends on remote changesets
3209
3219
3210 From the point of view of pulling behavior, bookmark
3220 From the point of view of pulling behavior, bookmark
3211 existing only in the remote repository are treated as ``added``,
3221 existing only in the remote repository are treated as ``added``,
3212 even if it is in fact locally deleted.
3222 even if it is in fact locally deleted.
3213
3223
3214 .. container:: verbose
3224 .. container:: verbose
3215
3225
3216 For remote repository, using --bundle avoids downloading the
3226 For remote repository, using --bundle avoids downloading the
3217 changesets twice if the incoming is followed by a pull.
3227 changesets twice if the incoming is followed by a pull.
3218
3228
3219 Examples:
3229 Examples:
3220
3230
3221 - show incoming changes with patches and full description::
3231 - show incoming changes with patches and full description::
3222
3232
3223 hg incoming -vp
3233 hg incoming -vp
3224
3234
3225 - show incoming changes excluding merges, store a bundle::
3235 - show incoming changes excluding merges, store a bundle::
3226
3236
3227 hg in -vpM --bundle incoming.hg
3237 hg in -vpM --bundle incoming.hg
3228 hg pull incoming.hg
3238 hg pull incoming.hg
3229
3239
3230 - briefly list changes inside a bundle::
3240 - briefly list changes inside a bundle::
3231
3241
3232 hg in changes.hg -T "{desc|firstline}\\n"
3242 hg in changes.hg -T "{desc|firstline}\\n"
3233
3243
3234 Returns 0 if there are incoming changes, 1 otherwise.
3244 Returns 0 if there are incoming changes, 1 otherwise.
3235 """
3245 """
3236 opts = pycompat.byteskwargs(opts)
3246 opts = pycompat.byteskwargs(opts)
3237 if opts.get('graph'):
3247 if opts.get('graph'):
3238 logcmdutil.checkunsupportedgraphflags([], opts)
3248 logcmdutil.checkunsupportedgraphflags([], opts)
3239 def display(other, chlist, displayer):
3249 def display(other, chlist, displayer):
3240 revdag = logcmdutil.graphrevs(other, chlist, opts)
3250 revdag = logcmdutil.graphrevs(other, chlist, opts)
3241 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3251 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3242 graphmod.asciiedges)
3252 graphmod.asciiedges)
3243
3253
3244 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3254 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3245 return 0
3255 return 0
3246
3256
3247 if opts.get('bundle') and opts.get('subrepos'):
3257 if opts.get('bundle') and opts.get('subrepos'):
3248 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3258 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3249
3259
3250 if opts.get('bookmarks'):
3260 if opts.get('bookmarks'):
3251 source, branches = hg.parseurl(ui.expandpath(source),
3261 source, branches = hg.parseurl(ui.expandpath(source),
3252 opts.get('branch'))
3262 opts.get('branch'))
3253 other = hg.peer(repo, opts, source)
3263 other = hg.peer(repo, opts, source)
3254 if 'bookmarks' not in other.listkeys('namespaces'):
3264 if 'bookmarks' not in other.listkeys('namespaces'):
3255 ui.warn(_("remote doesn't support bookmarks\n"))
3265 ui.warn(_("remote doesn't support bookmarks\n"))
3256 return 0
3266 return 0
3257 ui.pager('incoming')
3267 ui.pager('incoming')
3258 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3268 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3259 return bookmarks.incoming(ui, repo, other)
3269 return bookmarks.incoming(ui, repo, other)
3260
3270
3261 repo._subtoppath = ui.expandpath(source)
3271 repo._subtoppath = ui.expandpath(source)
3262 try:
3272 try:
3263 return hg.incoming(ui, repo, source, opts)
3273 return hg.incoming(ui, repo, source, opts)
3264 finally:
3274 finally:
3265 del repo._subtoppath
3275 del repo._subtoppath
3266
3276
3267
3277
3268 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3278 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3269 norepo=True)
3279 norepo=True)
3270 def init(ui, dest=".", **opts):
3280 def init(ui, dest=".", **opts):
3271 """create a new repository in the given directory
3281 """create a new repository in the given directory
3272
3282
3273 Initialize a new repository in the given directory. If the given
3283 Initialize a new repository in the given directory. If the given
3274 directory does not exist, it will be created.
3284 directory does not exist, it will be created.
3275
3285
3276 If no directory is given, the current directory is used.
3286 If no directory is given, the current directory is used.
3277
3287
3278 It is possible to specify an ``ssh://`` URL as the destination.
3288 It is possible to specify an ``ssh://`` URL as the destination.
3279 See :hg:`help urls` for more information.
3289 See :hg:`help urls` for more information.
3280
3290
3281 Returns 0 on success.
3291 Returns 0 on success.
3282 """
3292 """
3283 opts = pycompat.byteskwargs(opts)
3293 opts = pycompat.byteskwargs(opts)
3284 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3294 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3285
3295
3286 @command('locate',
3296 @command('locate',
3287 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3297 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3288 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3298 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3289 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3299 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3290 ] + walkopts,
3300 ] + walkopts,
3291 _('[OPTION]... [PATTERN]...'))
3301 _('[OPTION]... [PATTERN]...'))
3292 def locate(ui, repo, *pats, **opts):
3302 def locate(ui, repo, *pats, **opts):
3293 """locate files matching specific patterns (DEPRECATED)
3303 """locate files matching specific patterns (DEPRECATED)
3294
3304
3295 Print files under Mercurial control in the working directory whose
3305 Print files under Mercurial control in the working directory whose
3296 names match the given patterns.
3306 names match the given patterns.
3297
3307
3298 By default, this command searches all directories in the working
3308 By default, this command searches all directories in the working
3299 directory. To search just the current directory and its
3309 directory. To search just the current directory and its
3300 subdirectories, use "--include .".
3310 subdirectories, use "--include .".
3301
3311
3302 If no patterns are given to match, this command prints the names
3312 If no patterns are given to match, this command prints the names
3303 of all files under Mercurial control in the working directory.
3313 of all files under Mercurial control in the working directory.
3304
3314
3305 If you want to feed the output of this command into the "xargs"
3315 If you want to feed the output of this command into the "xargs"
3306 command, use the -0 option to both this command and "xargs". This
3316 command, use the -0 option to both this command and "xargs". This
3307 will avoid the problem of "xargs" treating single filenames that
3317 will avoid the problem of "xargs" treating single filenames that
3308 contain whitespace as multiple filenames.
3318 contain whitespace as multiple filenames.
3309
3319
3310 See :hg:`help files` for a more versatile command.
3320 See :hg:`help files` for a more versatile command.
3311
3321
3312 Returns 0 if a match is found, 1 otherwise.
3322 Returns 0 if a match is found, 1 otherwise.
3313 """
3323 """
3314 opts = pycompat.byteskwargs(opts)
3324 opts = pycompat.byteskwargs(opts)
3315 if opts.get('print0'):
3325 if opts.get('print0'):
3316 end = '\0'
3326 end = '\0'
3317 else:
3327 else:
3318 end = '\n'
3328 end = '\n'
3319 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3329 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3320
3330
3321 ret = 1
3331 ret = 1
3322 m = scmutil.match(ctx, pats, opts, default='relglob',
3332 m = scmutil.match(ctx, pats, opts, default='relglob',
3323 badfn=lambda x, y: False)
3333 badfn=lambda x, y: False)
3324
3334
3325 ui.pager('locate')
3335 ui.pager('locate')
3326 for abs in ctx.matches(m):
3336 for abs in ctx.matches(m):
3327 if opts.get('fullpath'):
3337 if opts.get('fullpath'):
3328 ui.write(repo.wjoin(abs), end)
3338 ui.write(repo.wjoin(abs), end)
3329 else:
3339 else:
3330 ui.write(((pats and m.rel(abs)) or abs), end)
3340 ui.write(((pats and m.rel(abs)) or abs), end)
3331 ret = 0
3341 ret = 0
3332
3342
3333 return ret
3343 return ret
3334
3344
3335 @command('^log|history',
3345 @command('^log|history',
3336 [('f', 'follow', None,
3346 [('f', 'follow', None,
3337 _('follow changeset history, or file history across copies and renames')),
3347 _('follow changeset history, or file history across copies and renames')),
3338 ('', 'follow-first', None,
3348 ('', 'follow-first', None,
3339 _('only follow the first parent of merge changesets (DEPRECATED)')),
3349 _('only follow the first parent of merge changesets (DEPRECATED)')),
3340 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3350 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3341 ('C', 'copies', None, _('show copied files')),
3351 ('C', 'copies', None, _('show copied files')),
3342 ('k', 'keyword', [],
3352 ('k', 'keyword', [],
3343 _('do case-insensitive search for a given text'), _('TEXT')),
3353 _('do case-insensitive search for a given text'), _('TEXT')),
3344 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3354 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3345 ('L', 'line-range', [],
3355 ('L', 'line-range', [],
3346 _('follow line range of specified file (EXPERIMENTAL)'),
3356 _('follow line range of specified file (EXPERIMENTAL)'),
3347 _('FILE,RANGE')),
3357 _('FILE,RANGE')),
3348 ('', 'removed', None, _('include revisions where files were removed')),
3358 ('', 'removed', None, _('include revisions where files were removed')),
3349 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3359 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3350 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3360 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3351 ('', 'only-branch', [],
3361 ('', 'only-branch', [],
3352 _('show only changesets within the given named branch (DEPRECATED)'),
3362 _('show only changesets within the given named branch (DEPRECATED)'),
3353 _('BRANCH')),
3363 _('BRANCH')),
3354 ('b', 'branch', [],
3364 ('b', 'branch', [],
3355 _('show changesets within the given named branch'), _('BRANCH')),
3365 _('show changesets within the given named branch'), _('BRANCH')),
3356 ('P', 'prune', [],
3366 ('P', 'prune', [],
3357 _('do not display revision or any of its ancestors'), _('REV')),
3367 _('do not display revision or any of its ancestors'), _('REV')),
3358 ] + logopts + walkopts,
3368 ] + logopts + walkopts,
3359 _('[OPTION]... [FILE]'),
3369 _('[OPTION]... [FILE]'),
3360 inferrepo=True,
3370 inferrepo=True,
3361 intents={INTENT_READONLY})
3371 intents={INTENT_READONLY})
3362 def log(ui, repo, *pats, **opts):
3372 def log(ui, repo, *pats, **opts):
3363 """show revision history of entire repository or files
3373 """show revision history of entire repository or files
3364
3374
3365 Print the revision history of the specified files or the entire
3375 Print the revision history of the specified files or the entire
3366 project.
3376 project.
3367
3377
3368 If no revision range is specified, the default is ``tip:0`` unless
3378 If no revision range is specified, the default is ``tip:0`` unless
3369 --follow is set, in which case the working directory parent is
3379 --follow is set, in which case the working directory parent is
3370 used as the starting revision.
3380 used as the starting revision.
3371
3381
3372 File history is shown without following rename or copy history of
3382 File history is shown without following rename or copy history of
3373 files. Use -f/--follow with a filename to follow history across
3383 files. Use -f/--follow with a filename to follow history across
3374 renames and copies. --follow without a filename will only show
3384 renames and copies. --follow without a filename will only show
3375 ancestors of the starting revision.
3385 ancestors of the starting revision.
3376
3386
3377 By default this command prints revision number and changeset id,
3387 By default this command prints revision number and changeset id,
3378 tags, non-trivial parents, user, date and time, and a summary for
3388 tags, non-trivial parents, user, date and time, and a summary for
3379 each commit. When the -v/--verbose switch is used, the list of
3389 each commit. When the -v/--verbose switch is used, the list of
3380 changed files and full commit message are shown.
3390 changed files and full commit message are shown.
3381
3391
3382 With --graph the revisions are shown as an ASCII art DAG with the most
3392 With --graph the revisions are shown as an ASCII art DAG with the most
3383 recent changeset at the top.
3393 recent changeset at the top.
3384 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3394 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3385 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3395 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3386 changeset from the lines below is a parent of the 'o' merge on the same
3396 changeset from the lines below is a parent of the 'o' merge on the same
3387 line.
3397 line.
3388 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3398 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3389 of a '|' indicates one or more revisions in a path are omitted.
3399 of a '|' indicates one or more revisions in a path are omitted.
3390
3400
3391 .. container:: verbose
3401 .. container:: verbose
3392
3402
3393 Use -L/--line-range FILE,M:N options to follow the history of lines
3403 Use -L/--line-range FILE,M:N options to follow the history of lines
3394 from M to N in FILE. With -p/--patch only diff hunks affecting
3404 from M to N in FILE. With -p/--patch only diff hunks affecting
3395 specified line range will be shown. This option requires --follow;
3405 specified line range will be shown. This option requires --follow;
3396 it can be specified multiple times. Currently, this option is not
3406 it can be specified multiple times. Currently, this option is not
3397 compatible with --graph. This option is experimental.
3407 compatible with --graph. This option is experimental.
3398
3408
3399 .. note::
3409 .. note::
3400
3410
3401 :hg:`log --patch` may generate unexpected diff output for merge
3411 :hg:`log --patch` may generate unexpected diff output for merge
3402 changesets, as it will only compare the merge changeset against
3412 changesets, as it will only compare the merge changeset against
3403 its first parent. Also, only files different from BOTH parents
3413 its first parent. Also, only files different from BOTH parents
3404 will appear in files:.
3414 will appear in files:.
3405
3415
3406 .. note::
3416 .. note::
3407
3417
3408 For performance reasons, :hg:`log FILE` may omit duplicate changes
3418 For performance reasons, :hg:`log FILE` may omit duplicate changes
3409 made on branches and will not show removals or mode changes. To
3419 made on branches and will not show removals or mode changes. To
3410 see all such changes, use the --removed switch.
3420 see all such changes, use the --removed switch.
3411
3421
3412 .. container:: verbose
3422 .. container:: verbose
3413
3423
3414 .. note::
3424 .. note::
3415
3425
3416 The history resulting from -L/--line-range options depends on diff
3426 The history resulting from -L/--line-range options depends on diff
3417 options; for instance if white-spaces are ignored, respective changes
3427 options; for instance if white-spaces are ignored, respective changes
3418 with only white-spaces in specified line range will not be listed.
3428 with only white-spaces in specified line range will not be listed.
3419
3429
3420 .. container:: verbose
3430 .. container:: verbose
3421
3431
3422 Some examples:
3432 Some examples:
3423
3433
3424 - changesets with full descriptions and file lists::
3434 - changesets with full descriptions and file lists::
3425
3435
3426 hg log -v
3436 hg log -v
3427
3437
3428 - changesets ancestral to the working directory::
3438 - changesets ancestral to the working directory::
3429
3439
3430 hg log -f
3440 hg log -f
3431
3441
3432 - last 10 commits on the current branch::
3442 - last 10 commits on the current branch::
3433
3443
3434 hg log -l 10 -b .
3444 hg log -l 10 -b .
3435
3445
3436 - changesets showing all modifications of a file, including removals::
3446 - changesets showing all modifications of a file, including removals::
3437
3447
3438 hg log --removed file.c
3448 hg log --removed file.c
3439
3449
3440 - all changesets that touch a directory, with diffs, excluding merges::
3450 - all changesets that touch a directory, with diffs, excluding merges::
3441
3451
3442 hg log -Mp lib/
3452 hg log -Mp lib/
3443
3453
3444 - all revision numbers that match a keyword::
3454 - all revision numbers that match a keyword::
3445
3455
3446 hg log -k bug --template "{rev}\\n"
3456 hg log -k bug --template "{rev}\\n"
3447
3457
3448 - the full hash identifier of the working directory parent::
3458 - the full hash identifier of the working directory parent::
3449
3459
3450 hg log -r . --template "{node}\\n"
3460 hg log -r . --template "{node}\\n"
3451
3461
3452 - list available log templates::
3462 - list available log templates::
3453
3463
3454 hg log -T list
3464 hg log -T list
3455
3465
3456 - check if a given changeset is included in a tagged release::
3466 - check if a given changeset is included in a tagged release::
3457
3467
3458 hg log -r "a21ccf and ancestor(1.9)"
3468 hg log -r "a21ccf and ancestor(1.9)"
3459
3469
3460 - find all changesets by some user in a date range::
3470 - find all changesets by some user in a date range::
3461
3471
3462 hg log -k alice -d "may 2008 to jul 2008"
3472 hg log -k alice -d "may 2008 to jul 2008"
3463
3473
3464 - summary of all changesets after the last tag::
3474 - summary of all changesets after the last tag::
3465
3475
3466 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3476 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3467
3477
3468 - changesets touching lines 13 to 23 for file.c::
3478 - changesets touching lines 13 to 23 for file.c::
3469
3479
3470 hg log -L file.c,13:23
3480 hg log -L file.c,13:23
3471
3481
3472 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3482 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3473 main.c with patch::
3483 main.c with patch::
3474
3484
3475 hg log -L file.c,13:23 -L main.c,2:6 -p
3485 hg log -L file.c,13:23 -L main.c,2:6 -p
3476
3486
3477 See :hg:`help dates` for a list of formats valid for -d/--date.
3487 See :hg:`help dates` for a list of formats valid for -d/--date.
3478
3488
3479 See :hg:`help revisions` for more about specifying and ordering
3489 See :hg:`help revisions` for more about specifying and ordering
3480 revisions.
3490 revisions.
3481
3491
3482 See :hg:`help templates` for more about pre-packaged styles and
3492 See :hg:`help templates` for more about pre-packaged styles and
3483 specifying custom templates. The default template used by the log
3493 specifying custom templates. The default template used by the log
3484 command can be customized via the ``ui.logtemplate`` configuration
3494 command can be customized via the ``ui.logtemplate`` configuration
3485 setting.
3495 setting.
3486
3496
3487 Returns 0 on success.
3497 Returns 0 on success.
3488
3498
3489 """
3499 """
3490 opts = pycompat.byteskwargs(opts)
3500 opts = pycompat.byteskwargs(opts)
3491 linerange = opts.get('line_range')
3501 linerange = opts.get('line_range')
3492
3502
3493 if linerange and not opts.get('follow'):
3503 if linerange and not opts.get('follow'):
3494 raise error.Abort(_('--line-range requires --follow'))
3504 raise error.Abort(_('--line-range requires --follow'))
3495
3505
3496 if linerange and pats:
3506 if linerange and pats:
3497 # TODO: take pats as patterns with no line-range filter
3507 # TODO: take pats as patterns with no line-range filter
3498 raise error.Abort(
3508 raise error.Abort(
3499 _('FILE arguments are not compatible with --line-range option')
3509 _('FILE arguments are not compatible with --line-range option')
3500 )
3510 )
3501
3511
3502 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3512 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3503 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3513 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3504 if linerange:
3514 if linerange:
3505 # TODO: should follow file history from logcmdutil._initialrevs(),
3515 # TODO: should follow file history from logcmdutil._initialrevs(),
3506 # then filter the result by logcmdutil._makerevset() and --limit
3516 # then filter the result by logcmdutil._makerevset() and --limit
3507 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3517 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3508
3518
3509 getrenamed = None
3519 getrenamed = None
3510 if opts.get('copies'):
3520 if opts.get('copies'):
3511 endrev = None
3521 endrev = None
3512 if revs:
3522 if revs:
3513 endrev = revs.max() + 1
3523 endrev = revs.max() + 1
3514 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3524 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3515
3525
3516 ui.pager('log')
3526 ui.pager('log')
3517 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3527 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3518 buffered=True)
3528 buffered=True)
3519 if opts.get('graph'):
3529 if opts.get('graph'):
3520 displayfn = logcmdutil.displaygraphrevs
3530 displayfn = logcmdutil.displaygraphrevs
3521 else:
3531 else:
3522 displayfn = logcmdutil.displayrevs
3532 displayfn = logcmdutil.displayrevs
3523 displayfn(ui, repo, revs, displayer, getrenamed)
3533 displayfn(ui, repo, revs, displayer, getrenamed)
3524
3534
3525 @command('manifest',
3535 @command('manifest',
3526 [('r', 'rev', '', _('revision to display'), _('REV')),
3536 [('r', 'rev', '', _('revision to display'), _('REV')),
3527 ('', 'all', False, _("list files from all revisions"))]
3537 ('', 'all', False, _("list files from all revisions"))]
3528 + formatteropts,
3538 + formatteropts,
3529 _('[-r REV]'),
3539 _('[-r REV]'),
3530 intents={INTENT_READONLY})
3540 intents={INTENT_READONLY})
3531 def manifest(ui, repo, node=None, rev=None, **opts):
3541 def manifest(ui, repo, node=None, rev=None, **opts):
3532 """output the current or given revision of the project manifest
3542 """output the current or given revision of the project manifest
3533
3543
3534 Print a list of version controlled files for the given revision.
3544 Print a list of version controlled files for the given revision.
3535 If no revision is given, the first parent of the working directory
3545 If no revision is given, the first parent of the working directory
3536 is used, or the null revision if no revision is checked out.
3546 is used, or the null revision if no revision is checked out.
3537
3547
3538 With -v, print file permissions, symlink and executable bits.
3548 With -v, print file permissions, symlink and executable bits.
3539 With --debug, print file revision hashes.
3549 With --debug, print file revision hashes.
3540
3550
3541 If option --all is specified, the list of all files from all revisions
3551 If option --all is specified, the list of all files from all revisions
3542 is printed. This includes deleted and renamed files.
3552 is printed. This includes deleted and renamed files.
3543
3553
3544 Returns 0 on success.
3554 Returns 0 on success.
3545 """
3555 """
3546 opts = pycompat.byteskwargs(opts)
3556 opts = pycompat.byteskwargs(opts)
3547 fm = ui.formatter('manifest', opts)
3557 fm = ui.formatter('manifest', opts)
3548
3558
3549 if opts.get('all'):
3559 if opts.get('all'):
3550 if rev or node:
3560 if rev or node:
3551 raise error.Abort(_("can't specify a revision with --all"))
3561 raise error.Abort(_("can't specify a revision with --all"))
3552
3562
3553 res = set()
3563 res = set()
3554 for rev in repo:
3564 for rev in repo:
3555 ctx = repo[rev]
3565 ctx = repo[rev]
3556 res |= set(ctx.files())
3566 res |= set(ctx.files())
3557
3567
3558 ui.pager('manifest')
3568 ui.pager('manifest')
3559 for f in sorted(res):
3569 for f in sorted(res):
3560 fm.startitem()
3570 fm.startitem()
3561 fm.write("path", '%s\n', f)
3571 fm.write("path", '%s\n', f)
3562 fm.end()
3572 fm.end()
3563 return
3573 return
3564
3574
3565 if rev and node:
3575 if rev and node:
3566 raise error.Abort(_("please specify just one revision"))
3576 raise error.Abort(_("please specify just one revision"))
3567
3577
3568 if not node:
3578 if not node:
3569 node = rev
3579 node = rev
3570
3580
3571 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3581 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3572 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3582 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3573 if node:
3583 if node:
3574 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3584 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3575 ctx = scmutil.revsingle(repo, node)
3585 ctx = scmutil.revsingle(repo, node)
3576 mf = ctx.manifest()
3586 mf = ctx.manifest()
3577 ui.pager('manifest')
3587 ui.pager('manifest')
3578 for f in ctx:
3588 for f in ctx:
3579 fm.startitem()
3589 fm.startitem()
3580 fl = ctx[f].flags()
3590 fl = ctx[f].flags()
3581 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3591 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3582 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3592 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3583 fm.write('path', '%s\n', f)
3593 fm.write('path', '%s\n', f)
3584 fm.end()
3594 fm.end()
3585
3595
3586 @command('^merge',
3596 @command('^merge',
3587 [('f', 'force', None,
3597 [('f', 'force', None,
3588 _('force a merge including outstanding changes (DEPRECATED)')),
3598 _('force a merge including outstanding changes (DEPRECATED)')),
3589 ('r', 'rev', '', _('revision to merge'), _('REV')),
3599 ('r', 'rev', '', _('revision to merge'), _('REV')),
3590 ('P', 'preview', None,
3600 ('P', 'preview', None,
3591 _('review revisions to merge (no merge is performed)')),
3601 _('review revisions to merge (no merge is performed)')),
3592 ('', 'abort', None, _('abort the ongoing merge')),
3602 ('', 'abort', None, _('abort the ongoing merge')),
3593 ] + mergetoolopts,
3603 ] + mergetoolopts,
3594 _('[-P] [[-r] REV]'))
3604 _('[-P] [[-r] REV]'))
3595 def merge(ui, repo, node=None, **opts):
3605 def merge(ui, repo, node=None, **opts):
3596 """merge another revision into working directory
3606 """merge another revision into working directory
3597
3607
3598 The current working directory is updated with all changes made in
3608 The current working directory is updated with all changes made in
3599 the requested revision since the last common predecessor revision.
3609 the requested revision since the last common predecessor revision.
3600
3610
3601 Files that changed between either parent are marked as changed for
3611 Files that changed between either parent are marked as changed for
3602 the next commit and a commit must be performed before any further
3612 the next commit and a commit must be performed before any further
3603 updates to the repository are allowed. The next commit will have
3613 updates to the repository are allowed. The next commit will have
3604 two parents.
3614 two parents.
3605
3615
3606 ``--tool`` can be used to specify the merge tool used for file
3616 ``--tool`` can be used to specify the merge tool used for file
3607 merges. It overrides the HGMERGE environment variable and your
3617 merges. It overrides the HGMERGE environment variable and your
3608 configuration files. See :hg:`help merge-tools` for options.
3618 configuration files. See :hg:`help merge-tools` for options.
3609
3619
3610 If no revision is specified, the working directory's parent is a
3620 If no revision is specified, the working directory's parent is a
3611 head revision, and the current branch contains exactly one other
3621 head revision, and the current branch contains exactly one other
3612 head, the other head is merged with by default. Otherwise, an
3622 head, the other head is merged with by default. Otherwise, an
3613 explicit revision with which to merge with must be provided.
3623 explicit revision with which to merge with must be provided.
3614
3624
3615 See :hg:`help resolve` for information on handling file conflicts.
3625 See :hg:`help resolve` for information on handling file conflicts.
3616
3626
3617 To undo an uncommitted merge, use :hg:`merge --abort` which
3627 To undo an uncommitted merge, use :hg:`merge --abort` which
3618 will check out a clean copy of the original merge parent, losing
3628 will check out a clean copy of the original merge parent, losing
3619 all changes.
3629 all changes.
3620
3630
3621 Returns 0 on success, 1 if there are unresolved files.
3631 Returns 0 on success, 1 if there are unresolved files.
3622 """
3632 """
3623
3633
3624 opts = pycompat.byteskwargs(opts)
3634 opts = pycompat.byteskwargs(opts)
3625 abort = opts.get('abort')
3635 abort = opts.get('abort')
3626 if abort and repo.dirstate.p2() == nullid:
3636 if abort and repo.dirstate.p2() == nullid:
3627 cmdutil.wrongtooltocontinue(repo, _('merge'))
3637 cmdutil.wrongtooltocontinue(repo, _('merge'))
3628 if abort:
3638 if abort:
3629 if node:
3639 if node:
3630 raise error.Abort(_("cannot specify a node with --abort"))
3640 raise error.Abort(_("cannot specify a node with --abort"))
3631 if opts.get('rev'):
3641 if opts.get('rev'):
3632 raise error.Abort(_("cannot specify both --rev and --abort"))
3642 raise error.Abort(_("cannot specify both --rev and --abort"))
3633 if opts.get('preview'):
3643 if opts.get('preview'):
3634 raise error.Abort(_("cannot specify --preview with --abort"))
3644 raise error.Abort(_("cannot specify --preview with --abort"))
3635 if opts.get('rev') and node:
3645 if opts.get('rev') and node:
3636 raise error.Abort(_("please specify just one revision"))
3646 raise error.Abort(_("please specify just one revision"))
3637 if not node:
3647 if not node:
3638 node = opts.get('rev')
3648 node = opts.get('rev')
3639
3649
3640 if node:
3650 if node:
3641 node = scmutil.revsingle(repo, node).node()
3651 node = scmutil.revsingle(repo, node).node()
3642
3652
3643 if not node and not abort:
3653 if not node and not abort:
3644 node = repo[destutil.destmerge(repo)].node()
3654 node = repo[destutil.destmerge(repo)].node()
3645
3655
3646 if opts.get('preview'):
3656 if opts.get('preview'):
3647 # find nodes that are ancestors of p2 but not of p1
3657 # find nodes that are ancestors of p2 but not of p1
3648 p1 = repo.lookup('.')
3658 p1 = repo.lookup('.')
3649 p2 = node
3659 p2 = node
3650 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3660 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3651
3661
3652 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3662 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3653 for node in nodes:
3663 for node in nodes:
3654 displayer.show(repo[node])
3664 displayer.show(repo[node])
3655 displayer.close()
3665 displayer.close()
3656 return 0
3666 return 0
3657
3667
3658 try:
3668 try:
3659 # ui.forcemerge is an internal variable, do not document
3669 # ui.forcemerge is an internal variable, do not document
3660 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3670 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3661 force = opts.get('force')
3671 force = opts.get('force')
3662 labels = ['working copy', 'merge rev']
3672 labels = ['working copy', 'merge rev']
3663 return hg.merge(repo, node, force=force, mergeforce=force,
3673 return hg.merge(repo, node, force=force, mergeforce=force,
3664 labels=labels, abort=abort)
3674 labels=labels, abort=abort)
3665 finally:
3675 finally:
3666 ui.setconfig('ui', 'forcemerge', '', 'merge')
3676 ui.setconfig('ui', 'forcemerge', '', 'merge')
3667
3677
3668 @command('outgoing|out',
3678 @command('outgoing|out',
3669 [('f', 'force', None, _('run even when the destination is unrelated')),
3679 [('f', 'force', None, _('run even when the destination is unrelated')),
3670 ('r', 'rev', [],
3680 ('r', 'rev', [],
3671 _('a changeset intended to be included in the destination'), _('REV')),
3681 _('a changeset intended to be included in the destination'), _('REV')),
3672 ('n', 'newest-first', None, _('show newest record first')),
3682 ('n', 'newest-first', None, _('show newest record first')),
3673 ('B', 'bookmarks', False, _('compare bookmarks')),
3683 ('B', 'bookmarks', False, _('compare bookmarks')),
3674 ('b', 'branch', [], _('a specific branch you would like to push'),
3684 ('b', 'branch', [], _('a specific branch you would like to push'),
3675 _('BRANCH')),
3685 _('BRANCH')),
3676 ] + logopts + remoteopts + subrepoopts,
3686 ] + logopts + remoteopts + subrepoopts,
3677 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3687 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3678 def outgoing(ui, repo, dest=None, **opts):
3688 def outgoing(ui, repo, dest=None, **opts):
3679 """show changesets not found in the destination
3689 """show changesets not found in the destination
3680
3690
3681 Show changesets not found in the specified destination repository
3691 Show changesets not found in the specified destination repository
3682 or the default push location. These are the changesets that would
3692 or the default push location. These are the changesets that would
3683 be pushed if a push was requested.
3693 be pushed if a push was requested.
3684
3694
3685 See pull for details of valid destination formats.
3695 See pull for details of valid destination formats.
3686
3696
3687 .. container:: verbose
3697 .. container:: verbose
3688
3698
3689 With -B/--bookmarks, the result of bookmark comparison between
3699 With -B/--bookmarks, the result of bookmark comparison between
3690 local and remote repositories is displayed. With -v/--verbose,
3700 local and remote repositories is displayed. With -v/--verbose,
3691 status is also displayed for each bookmark like below::
3701 status is also displayed for each bookmark like below::
3692
3702
3693 BM1 01234567890a added
3703 BM1 01234567890a added
3694 BM2 deleted
3704 BM2 deleted
3695 BM3 234567890abc advanced
3705 BM3 234567890abc advanced
3696 BM4 34567890abcd diverged
3706 BM4 34567890abcd diverged
3697 BM5 4567890abcde changed
3707 BM5 4567890abcde changed
3698
3708
3699 The action taken when pushing depends on the
3709 The action taken when pushing depends on the
3700 status of each bookmark:
3710 status of each bookmark:
3701
3711
3702 :``added``: push with ``-B`` will create it
3712 :``added``: push with ``-B`` will create it
3703 :``deleted``: push with ``-B`` will delete it
3713 :``deleted``: push with ``-B`` will delete it
3704 :``advanced``: push will update it
3714 :``advanced``: push will update it
3705 :``diverged``: push with ``-B`` will update it
3715 :``diverged``: push with ``-B`` will update it
3706 :``changed``: push with ``-B`` will update it
3716 :``changed``: push with ``-B`` will update it
3707
3717
3708 From the point of view of pushing behavior, bookmarks
3718 From the point of view of pushing behavior, bookmarks
3709 existing only in the remote repository are treated as
3719 existing only in the remote repository are treated as
3710 ``deleted``, even if it is in fact added remotely.
3720 ``deleted``, even if it is in fact added remotely.
3711
3721
3712 Returns 0 if there are outgoing changes, 1 otherwise.
3722 Returns 0 if there are outgoing changes, 1 otherwise.
3713 """
3723 """
3714 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3724 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3715 # style URLs, so don't overwrite dest.
3725 # style URLs, so don't overwrite dest.
3716 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3726 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3717 if not path:
3727 if not path:
3718 raise error.Abort(_('default repository not configured!'),
3728 raise error.Abort(_('default repository not configured!'),
3719 hint=_("see 'hg help config.paths'"))
3729 hint=_("see 'hg help config.paths'"))
3720
3730
3721 opts = pycompat.byteskwargs(opts)
3731 opts = pycompat.byteskwargs(opts)
3722 if opts.get('graph'):
3732 if opts.get('graph'):
3723 logcmdutil.checkunsupportedgraphflags([], opts)
3733 logcmdutil.checkunsupportedgraphflags([], opts)
3724 o, other = hg._outgoing(ui, repo, dest, opts)
3734 o, other = hg._outgoing(ui, repo, dest, opts)
3725 if not o:
3735 if not o:
3726 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3736 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3727 return
3737 return
3728
3738
3729 revdag = logcmdutil.graphrevs(repo, o, opts)
3739 revdag = logcmdutil.graphrevs(repo, o, opts)
3730 ui.pager('outgoing')
3740 ui.pager('outgoing')
3731 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3741 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3732 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3742 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3733 graphmod.asciiedges)
3743 graphmod.asciiedges)
3734 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3744 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3735 return 0
3745 return 0
3736
3746
3737 if opts.get('bookmarks'):
3747 if opts.get('bookmarks'):
3738 dest = path.pushloc or path.loc
3748 dest = path.pushloc or path.loc
3739 other = hg.peer(repo, opts, dest)
3749 other = hg.peer(repo, opts, dest)
3740 if 'bookmarks' not in other.listkeys('namespaces'):
3750 if 'bookmarks' not in other.listkeys('namespaces'):
3741 ui.warn(_("remote doesn't support bookmarks\n"))
3751 ui.warn(_("remote doesn't support bookmarks\n"))
3742 return 0
3752 return 0
3743 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3753 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3744 ui.pager('outgoing')
3754 ui.pager('outgoing')
3745 return bookmarks.outgoing(ui, repo, other)
3755 return bookmarks.outgoing(ui, repo, other)
3746
3756
3747 repo._subtoppath = path.pushloc or path.loc
3757 repo._subtoppath = path.pushloc or path.loc
3748 try:
3758 try:
3749 return hg.outgoing(ui, repo, dest, opts)
3759 return hg.outgoing(ui, repo, dest, opts)
3750 finally:
3760 finally:
3751 del repo._subtoppath
3761 del repo._subtoppath
3752
3762
3753 @command('parents',
3763 @command('parents',
3754 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3764 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3755 ] + templateopts,
3765 ] + templateopts,
3756 _('[-r REV] [FILE]'),
3766 _('[-r REV] [FILE]'),
3757 inferrepo=True)
3767 inferrepo=True)
3758 def parents(ui, repo, file_=None, **opts):
3768 def parents(ui, repo, file_=None, **opts):
3759 """show the parents of the working directory or revision (DEPRECATED)
3769 """show the parents of the working directory or revision (DEPRECATED)
3760
3770
3761 Print the working directory's parent revisions. If a revision is
3771 Print the working directory's parent revisions. If a revision is
3762 given via -r/--rev, the parent of that revision will be printed.
3772 given via -r/--rev, the parent of that revision will be printed.
3763 If a file argument is given, the revision in which the file was
3773 If a file argument is given, the revision in which the file was
3764 last changed (before the working directory revision or the
3774 last changed (before the working directory revision or the
3765 argument to --rev if given) is printed.
3775 argument to --rev if given) is printed.
3766
3776
3767 This command is equivalent to::
3777 This command is equivalent to::
3768
3778
3769 hg log -r "p1()+p2()" or
3779 hg log -r "p1()+p2()" or
3770 hg log -r "p1(REV)+p2(REV)" or
3780 hg log -r "p1(REV)+p2(REV)" or
3771 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3781 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3772 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3782 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3773
3783
3774 See :hg:`summary` and :hg:`help revsets` for related information.
3784 See :hg:`summary` and :hg:`help revsets` for related information.
3775
3785
3776 Returns 0 on success.
3786 Returns 0 on success.
3777 """
3787 """
3778
3788
3779 opts = pycompat.byteskwargs(opts)
3789 opts = pycompat.byteskwargs(opts)
3780 rev = opts.get('rev')
3790 rev = opts.get('rev')
3781 if rev:
3791 if rev:
3782 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3792 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3783 ctx = scmutil.revsingle(repo, rev, None)
3793 ctx = scmutil.revsingle(repo, rev, None)
3784
3794
3785 if file_:
3795 if file_:
3786 m = scmutil.match(ctx, (file_,), opts)
3796 m = scmutil.match(ctx, (file_,), opts)
3787 if m.anypats() or len(m.files()) != 1:
3797 if m.anypats() or len(m.files()) != 1:
3788 raise error.Abort(_('can only specify an explicit filename'))
3798 raise error.Abort(_('can only specify an explicit filename'))
3789 file_ = m.files()[0]
3799 file_ = m.files()[0]
3790 filenodes = []
3800 filenodes = []
3791 for cp in ctx.parents():
3801 for cp in ctx.parents():
3792 if not cp:
3802 if not cp:
3793 continue
3803 continue
3794 try:
3804 try:
3795 filenodes.append(cp.filenode(file_))
3805 filenodes.append(cp.filenode(file_))
3796 except error.LookupError:
3806 except error.LookupError:
3797 pass
3807 pass
3798 if not filenodes:
3808 if not filenodes:
3799 raise error.Abort(_("'%s' not found in manifest!") % file_)
3809 raise error.Abort(_("'%s' not found in manifest!") % file_)
3800 p = []
3810 p = []
3801 for fn in filenodes:
3811 for fn in filenodes:
3802 fctx = repo.filectx(file_, fileid=fn)
3812 fctx = repo.filectx(file_, fileid=fn)
3803 p.append(fctx.node())
3813 p.append(fctx.node())
3804 else:
3814 else:
3805 p = [cp.node() for cp in ctx.parents()]
3815 p = [cp.node() for cp in ctx.parents()]
3806
3816
3807 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3817 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3808 for n in p:
3818 for n in p:
3809 if n != nullid:
3819 if n != nullid:
3810 displayer.show(repo[n])
3820 displayer.show(repo[n])
3811 displayer.close()
3821 displayer.close()
3812
3822
3813 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3823 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3814 intents={INTENT_READONLY})
3824 intents={INTENT_READONLY})
3815 def paths(ui, repo, search=None, **opts):
3825 def paths(ui, repo, search=None, **opts):
3816 """show aliases for remote repositories
3826 """show aliases for remote repositories
3817
3827
3818 Show definition of symbolic path name NAME. If no name is given,
3828 Show definition of symbolic path name NAME. If no name is given,
3819 show definition of all available names.
3829 show definition of all available names.
3820
3830
3821 Option -q/--quiet suppresses all output when searching for NAME
3831 Option -q/--quiet suppresses all output when searching for NAME
3822 and shows only the path names when listing all definitions.
3832 and shows only the path names when listing all definitions.
3823
3833
3824 Path names are defined in the [paths] section of your
3834 Path names are defined in the [paths] section of your
3825 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3835 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3826 repository, ``.hg/hgrc`` is used, too.
3836 repository, ``.hg/hgrc`` is used, too.
3827
3837
3828 The path names ``default`` and ``default-push`` have a special
3838 The path names ``default`` and ``default-push`` have a special
3829 meaning. When performing a push or pull operation, they are used
3839 meaning. When performing a push or pull operation, they are used
3830 as fallbacks if no location is specified on the command-line.
3840 as fallbacks if no location is specified on the command-line.
3831 When ``default-push`` is set, it will be used for push and
3841 When ``default-push`` is set, it will be used for push and
3832 ``default`` will be used for pull; otherwise ``default`` is used
3842 ``default`` will be used for pull; otherwise ``default`` is used
3833 as the fallback for both. When cloning a repository, the clone
3843 as the fallback for both. When cloning a repository, the clone
3834 source is written as ``default`` in ``.hg/hgrc``.
3844 source is written as ``default`` in ``.hg/hgrc``.
3835
3845
3836 .. note::
3846 .. note::
3837
3847
3838 ``default`` and ``default-push`` apply to all inbound (e.g.
3848 ``default`` and ``default-push`` apply to all inbound (e.g.
3839 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3849 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3840 and :hg:`bundle`) operations.
3850 and :hg:`bundle`) operations.
3841
3851
3842 See :hg:`help urls` for more information.
3852 See :hg:`help urls` for more information.
3843
3853
3844 Returns 0 on success.
3854 Returns 0 on success.
3845 """
3855 """
3846
3856
3847 opts = pycompat.byteskwargs(opts)
3857 opts = pycompat.byteskwargs(opts)
3848 ui.pager('paths')
3858 ui.pager('paths')
3849 if search:
3859 if search:
3850 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3860 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3851 if name == search]
3861 if name == search]
3852 else:
3862 else:
3853 pathitems = sorted(ui.paths.iteritems())
3863 pathitems = sorted(ui.paths.iteritems())
3854
3864
3855 fm = ui.formatter('paths', opts)
3865 fm = ui.formatter('paths', opts)
3856 if fm.isplain():
3866 if fm.isplain():
3857 hidepassword = util.hidepassword
3867 hidepassword = util.hidepassword
3858 else:
3868 else:
3859 hidepassword = bytes
3869 hidepassword = bytes
3860 if ui.quiet:
3870 if ui.quiet:
3861 namefmt = '%s\n'
3871 namefmt = '%s\n'
3862 else:
3872 else:
3863 namefmt = '%s = '
3873 namefmt = '%s = '
3864 showsubopts = not search and not ui.quiet
3874 showsubopts = not search and not ui.quiet
3865
3875
3866 for name, path in pathitems:
3876 for name, path in pathitems:
3867 fm.startitem()
3877 fm.startitem()
3868 fm.condwrite(not search, 'name', namefmt, name)
3878 fm.condwrite(not search, 'name', namefmt, name)
3869 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3879 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3870 for subopt, value in sorted(path.suboptions.items()):
3880 for subopt, value in sorted(path.suboptions.items()):
3871 assert subopt not in ('name', 'url')
3881 assert subopt not in ('name', 'url')
3872 if showsubopts:
3882 if showsubopts:
3873 fm.plain('%s:%s = ' % (name, subopt))
3883 fm.plain('%s:%s = ' % (name, subopt))
3874 fm.condwrite(showsubopts, subopt, '%s\n', value)
3884 fm.condwrite(showsubopts, subopt, '%s\n', value)
3875
3885
3876 fm.end()
3886 fm.end()
3877
3887
3878 if search and not pathitems:
3888 if search and not pathitems:
3879 if not ui.quiet:
3889 if not ui.quiet:
3880 ui.warn(_("not found!\n"))
3890 ui.warn(_("not found!\n"))
3881 return 1
3891 return 1
3882 else:
3892 else:
3883 return 0
3893 return 0
3884
3894
3885 @command('phase',
3895 @command('phase',
3886 [('p', 'public', False, _('set changeset phase to public')),
3896 [('p', 'public', False, _('set changeset phase to public')),
3887 ('d', 'draft', False, _('set changeset phase to draft')),
3897 ('d', 'draft', False, _('set changeset phase to draft')),
3888 ('s', 'secret', False, _('set changeset phase to secret')),
3898 ('s', 'secret', False, _('set changeset phase to secret')),
3889 ('f', 'force', False, _('allow to move boundary backward')),
3899 ('f', 'force', False, _('allow to move boundary backward')),
3890 ('r', 'rev', [], _('target revision'), _('REV')),
3900 ('r', 'rev', [], _('target revision'), _('REV')),
3891 ],
3901 ],
3892 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3902 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3893 def phase(ui, repo, *revs, **opts):
3903 def phase(ui, repo, *revs, **opts):
3894 """set or show the current phase name
3904 """set or show the current phase name
3895
3905
3896 With no argument, show the phase name of the current revision(s).
3906 With no argument, show the phase name of the current revision(s).
3897
3907
3898 With one of -p/--public, -d/--draft or -s/--secret, change the
3908 With one of -p/--public, -d/--draft or -s/--secret, change the
3899 phase value of the specified revisions.
3909 phase value of the specified revisions.
3900
3910
3901 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3911 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3902 lower phase to a higher phase. Phases are ordered as follows::
3912 lower phase to a higher phase. Phases are ordered as follows::
3903
3913
3904 public < draft < secret
3914 public < draft < secret
3905
3915
3906 Returns 0 on success, 1 if some phases could not be changed.
3916 Returns 0 on success, 1 if some phases could not be changed.
3907
3917
3908 (For more information about the phases concept, see :hg:`help phases`.)
3918 (For more information about the phases concept, see :hg:`help phases`.)
3909 """
3919 """
3910 opts = pycompat.byteskwargs(opts)
3920 opts = pycompat.byteskwargs(opts)
3911 # search for a unique phase argument
3921 # search for a unique phase argument
3912 targetphase = None
3922 targetphase = None
3913 for idx, name in enumerate(phases.phasenames):
3923 for idx, name in enumerate(phases.phasenames):
3914 if opts[name]:
3924 if opts[name]:
3915 if targetphase is not None:
3925 if targetphase is not None:
3916 raise error.Abort(_('only one phase can be specified'))
3926 raise error.Abort(_('only one phase can be specified'))
3917 targetphase = idx
3927 targetphase = idx
3918
3928
3919 # look for specified revision
3929 # look for specified revision
3920 revs = list(revs)
3930 revs = list(revs)
3921 revs.extend(opts['rev'])
3931 revs.extend(opts['rev'])
3922 if not revs:
3932 if not revs:
3923 # display both parents as the second parent phase can influence
3933 # display both parents as the second parent phase can influence
3924 # the phase of a merge commit
3934 # the phase of a merge commit
3925 revs = [c.rev() for c in repo[None].parents()]
3935 revs = [c.rev() for c in repo[None].parents()]
3926
3936
3927 revs = scmutil.revrange(repo, revs)
3937 revs = scmutil.revrange(repo, revs)
3928
3938
3929 ret = 0
3939 ret = 0
3930 if targetphase is None:
3940 if targetphase is None:
3931 # display
3941 # display
3932 for r in revs:
3942 for r in revs:
3933 ctx = repo[r]
3943 ctx = repo[r]
3934 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3944 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3935 else:
3945 else:
3936 with repo.lock(), repo.transaction("phase") as tr:
3946 with repo.lock(), repo.transaction("phase") as tr:
3937 # set phase
3947 # set phase
3938 if not revs:
3948 if not revs:
3939 raise error.Abort(_('empty revision set'))
3949 raise error.Abort(_('empty revision set'))
3940 nodes = [repo[r].node() for r in revs]
3950 nodes = [repo[r].node() for r in revs]
3941 # moving revision from public to draft may hide them
3951 # moving revision from public to draft may hide them
3942 # We have to check result on an unfiltered repository
3952 # We have to check result on an unfiltered repository
3943 unfi = repo.unfiltered()
3953 unfi = repo.unfiltered()
3944 getphase = unfi._phasecache.phase
3954 getphase = unfi._phasecache.phase
3945 olddata = [getphase(unfi, r) for r in unfi]
3955 olddata = [getphase(unfi, r) for r in unfi]
3946 phases.advanceboundary(repo, tr, targetphase, nodes)
3956 phases.advanceboundary(repo, tr, targetphase, nodes)
3947 if opts['force']:
3957 if opts['force']:
3948 phases.retractboundary(repo, tr, targetphase, nodes)
3958 phases.retractboundary(repo, tr, targetphase, nodes)
3949 getphase = unfi._phasecache.phase
3959 getphase = unfi._phasecache.phase
3950 newdata = [getphase(unfi, r) for r in unfi]
3960 newdata = [getphase(unfi, r) for r in unfi]
3951 changes = sum(newdata[r] != olddata[r] for r in unfi)
3961 changes = sum(newdata[r] != olddata[r] for r in unfi)
3952 cl = unfi.changelog
3962 cl = unfi.changelog
3953 rejected = [n for n in nodes
3963 rejected = [n for n in nodes
3954 if newdata[cl.rev(n)] < targetphase]
3964 if newdata[cl.rev(n)] < targetphase]
3955 if rejected:
3965 if rejected:
3956 ui.warn(_('cannot move %i changesets to a higher '
3966 ui.warn(_('cannot move %i changesets to a higher '
3957 'phase, use --force\n') % len(rejected))
3967 'phase, use --force\n') % len(rejected))
3958 ret = 1
3968 ret = 1
3959 if changes:
3969 if changes:
3960 msg = _('phase changed for %i changesets\n') % changes
3970 msg = _('phase changed for %i changesets\n') % changes
3961 if ret:
3971 if ret:
3962 ui.status(msg)
3972 ui.status(msg)
3963 else:
3973 else:
3964 ui.note(msg)
3974 ui.note(msg)
3965 else:
3975 else:
3966 ui.warn(_('no phases changed\n'))
3976 ui.warn(_('no phases changed\n'))
3967 return ret
3977 return ret
3968
3978
3969 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3979 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3970 """Run after a changegroup has been added via pull/unbundle
3980 """Run after a changegroup has been added via pull/unbundle
3971
3981
3972 This takes arguments below:
3982 This takes arguments below:
3973
3983
3974 :modheads: change of heads by pull/unbundle
3984 :modheads: change of heads by pull/unbundle
3975 :optupdate: updating working directory is needed or not
3985 :optupdate: updating working directory is needed or not
3976 :checkout: update destination revision (or None to default destination)
3986 :checkout: update destination revision (or None to default destination)
3977 :brev: a name, which might be a bookmark to be activated after updating
3987 :brev: a name, which might be a bookmark to be activated after updating
3978 """
3988 """
3979 if modheads == 0:
3989 if modheads == 0:
3980 return
3990 return
3981 if optupdate:
3991 if optupdate:
3982 try:
3992 try:
3983 return hg.updatetotally(ui, repo, checkout, brev)
3993 return hg.updatetotally(ui, repo, checkout, brev)
3984 except error.UpdateAbort as inst:
3994 except error.UpdateAbort as inst:
3985 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
3995 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
3986 hint = inst.hint
3996 hint = inst.hint
3987 raise error.UpdateAbort(msg, hint=hint)
3997 raise error.UpdateAbort(msg, hint=hint)
3988 if modheads > 1:
3998 if modheads > 1:
3989 currentbranchheads = len(repo.branchheads())
3999 currentbranchheads = len(repo.branchheads())
3990 if currentbranchheads == modheads:
4000 if currentbranchheads == modheads:
3991 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4001 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3992 elif currentbranchheads > 1:
4002 elif currentbranchheads > 1:
3993 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4003 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3994 "merge)\n"))
4004 "merge)\n"))
3995 else:
4005 else:
3996 ui.status(_("(run 'hg heads' to see heads)\n"))
4006 ui.status(_("(run 'hg heads' to see heads)\n"))
3997 elif not ui.configbool('commands', 'update.requiredest'):
4007 elif not ui.configbool('commands', 'update.requiredest'):
3998 ui.status(_("(run 'hg update' to get a working copy)\n"))
4008 ui.status(_("(run 'hg update' to get a working copy)\n"))
3999
4009
4000 @command('^pull',
4010 @command('^pull',
4001 [('u', 'update', None,
4011 [('u', 'update', None,
4002 _('update to new branch head if new descendants were pulled')),
4012 _('update to new branch head if new descendants were pulled')),
4003 ('f', 'force', None, _('run even when remote repository is unrelated')),
4013 ('f', 'force', None, _('run even when remote repository is unrelated')),
4004 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4014 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4005 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4015 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4006 ('b', 'branch', [], _('a specific branch you would like to pull'),
4016 ('b', 'branch', [], _('a specific branch you would like to pull'),
4007 _('BRANCH')),
4017 _('BRANCH')),
4008 ] + remoteopts,
4018 ] + remoteopts,
4009 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4019 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4010 def pull(ui, repo, source="default", **opts):
4020 def pull(ui, repo, source="default", **opts):
4011 """pull changes from the specified source
4021 """pull changes from the specified source
4012
4022
4013 Pull changes from a remote repository to a local one.
4023 Pull changes from a remote repository to a local one.
4014
4024
4015 This finds all changes from the repository at the specified path
4025 This finds all changes from the repository at the specified path
4016 or URL and adds them to a local repository (the current one unless
4026 or URL and adds them to a local repository (the current one unless
4017 -R is specified). By default, this does not update the copy of the
4027 -R is specified). By default, this does not update the copy of the
4018 project in the working directory.
4028 project in the working directory.
4019
4029
4020 When cloning from servers that support it, Mercurial may fetch
4030 When cloning from servers that support it, Mercurial may fetch
4021 pre-generated data. When this is done, hooks operating on incoming
4031 pre-generated data. When this is done, hooks operating on incoming
4022 changesets and changegroups may fire more than once, once for each
4032 changesets and changegroups may fire more than once, once for each
4023 pre-generated bundle and as well as for any additional remaining
4033 pre-generated bundle and as well as for any additional remaining
4024 data. See :hg:`help -e clonebundles` for more.
4034 data. See :hg:`help -e clonebundles` for more.
4025
4035
4026 Use :hg:`incoming` if you want to see what would have been added
4036 Use :hg:`incoming` if you want to see what would have been added
4027 by a pull at the time you issued this command. If you then decide
4037 by a pull at the time you issued this command. If you then decide
4028 to add those changes to the repository, you should use :hg:`pull
4038 to add those changes to the repository, you should use :hg:`pull
4029 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4039 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4030
4040
4031 If SOURCE is omitted, the 'default' path will be used.
4041 If SOURCE is omitted, the 'default' path will be used.
4032 See :hg:`help urls` for more information.
4042 See :hg:`help urls` for more information.
4033
4043
4034 Specifying bookmark as ``.`` is equivalent to specifying the active
4044 Specifying bookmark as ``.`` is equivalent to specifying the active
4035 bookmark's name.
4045 bookmark's name.
4036
4046
4037 Returns 0 on success, 1 if an update had unresolved files.
4047 Returns 0 on success, 1 if an update had unresolved files.
4038 """
4048 """
4039
4049
4040 opts = pycompat.byteskwargs(opts)
4050 opts = pycompat.byteskwargs(opts)
4041 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4051 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4042 msg = _('update destination required by configuration')
4052 msg = _('update destination required by configuration')
4043 hint = _('use hg pull followed by hg update DEST')
4053 hint = _('use hg pull followed by hg update DEST')
4044 raise error.Abort(msg, hint=hint)
4054 raise error.Abort(msg, hint=hint)
4045
4055
4046 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4056 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4047 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4057 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4048 other = hg.peer(repo, opts, source)
4058 other = hg.peer(repo, opts, source)
4049 try:
4059 try:
4050 revs, checkout = hg.addbranchrevs(repo, other, branches,
4060 revs, checkout = hg.addbranchrevs(repo, other, branches,
4051 opts.get('rev'))
4061 opts.get('rev'))
4052
4062
4053
4063
4054 pullopargs = {}
4064 pullopargs = {}
4055 if opts.get('bookmark'):
4065 if opts.get('bookmark'):
4056 if not revs:
4066 if not revs:
4057 revs = []
4067 revs = []
4058 # The list of bookmark used here is not the one used to actually
4068 # The list of bookmark used here is not the one used to actually
4059 # update the bookmark name. This can result in the revision pulled
4069 # update the bookmark name. This can result in the revision pulled
4060 # not ending up with the name of the bookmark because of a race
4070 # not ending up with the name of the bookmark because of a race
4061 # condition on the server. (See issue 4689 for details)
4071 # condition on the server. (See issue 4689 for details)
4062 remotebookmarks = other.listkeys('bookmarks')
4072 remotebookmarks = other.listkeys('bookmarks')
4063 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4073 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4064 pullopargs['remotebookmarks'] = remotebookmarks
4074 pullopargs['remotebookmarks'] = remotebookmarks
4065 for b in opts['bookmark']:
4075 for b in opts['bookmark']:
4066 b = repo._bookmarks.expandname(b)
4076 b = repo._bookmarks.expandname(b)
4067 if b not in remotebookmarks:
4077 if b not in remotebookmarks:
4068 raise error.Abort(_('remote bookmark %s not found!') % b)
4078 raise error.Abort(_('remote bookmark %s not found!') % b)
4069 revs.append(hex(remotebookmarks[b]))
4079 revs.append(hex(remotebookmarks[b]))
4070
4080
4071 if revs:
4081 if revs:
4072 try:
4082 try:
4073 # When 'rev' is a bookmark name, we cannot guarantee that it
4083 # When 'rev' is a bookmark name, we cannot guarantee that it
4074 # will be updated with that name because of a race condition
4084 # will be updated with that name because of a race condition
4075 # server side. (See issue 4689 for details)
4085 # server side. (See issue 4689 for details)
4076 oldrevs = revs
4086 oldrevs = revs
4077 revs = [] # actually, nodes
4087 revs = [] # actually, nodes
4078 for r in oldrevs:
4088 for r in oldrevs:
4079 with other.commandexecutor() as e:
4089 with other.commandexecutor() as e:
4080 node = e.callcommand('lookup', {'key': r}).result()
4090 node = e.callcommand('lookup', {'key': r}).result()
4081
4091
4082 revs.append(node)
4092 revs.append(node)
4083 if r == checkout:
4093 if r == checkout:
4084 checkout = node
4094 checkout = node
4085 except error.CapabilityError:
4095 except error.CapabilityError:
4086 err = _("other repository doesn't support revision lookup, "
4096 err = _("other repository doesn't support revision lookup, "
4087 "so a rev cannot be specified.")
4097 "so a rev cannot be specified.")
4088 raise error.Abort(err)
4098 raise error.Abort(err)
4089
4099
4090 wlock = util.nullcontextmanager()
4100 wlock = util.nullcontextmanager()
4091 if opts.get('update'):
4101 if opts.get('update'):
4092 wlock = repo.wlock()
4102 wlock = repo.wlock()
4093 with wlock:
4103 with wlock:
4094 pullopargs.update(opts.get('opargs', {}))
4104 pullopargs.update(opts.get('opargs', {}))
4095 modheads = exchange.pull(repo, other, heads=revs,
4105 modheads = exchange.pull(repo, other, heads=revs,
4096 force=opts.get('force'),
4106 force=opts.get('force'),
4097 bookmarks=opts.get('bookmark', ()),
4107 bookmarks=opts.get('bookmark', ()),
4098 opargs=pullopargs).cgresult
4108 opargs=pullopargs).cgresult
4099
4109
4100 # brev is a name, which might be a bookmark to be activated at
4110 # brev is a name, which might be a bookmark to be activated at
4101 # the end of the update. In other words, it is an explicit
4111 # the end of the update. In other words, it is an explicit
4102 # destination of the update
4112 # destination of the update
4103 brev = None
4113 brev = None
4104
4114
4105 if checkout:
4115 if checkout:
4106 checkout = repo.changelog.rev(checkout)
4116 checkout = repo.changelog.rev(checkout)
4107
4117
4108 # order below depends on implementation of
4118 # order below depends on implementation of
4109 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4119 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4110 # because 'checkout' is determined without it.
4120 # because 'checkout' is determined without it.
4111 if opts.get('rev'):
4121 if opts.get('rev'):
4112 brev = opts['rev'][0]
4122 brev = opts['rev'][0]
4113 elif opts.get('branch'):
4123 elif opts.get('branch'):
4114 brev = opts['branch'][0]
4124 brev = opts['branch'][0]
4115 else:
4125 else:
4116 brev = branches[0]
4126 brev = branches[0]
4117 repo._subtoppath = source
4127 repo._subtoppath = source
4118 try:
4128 try:
4119 ret = postincoming(ui, repo, modheads, opts.get('update'),
4129 ret = postincoming(ui, repo, modheads, opts.get('update'),
4120 checkout, brev)
4130 checkout, brev)
4121
4131
4122 finally:
4132 finally:
4123 del repo._subtoppath
4133 del repo._subtoppath
4124
4134
4125 finally:
4135 finally:
4126 other.close()
4136 other.close()
4127 return ret
4137 return ret
4128
4138
4129 @command('^push',
4139 @command('^push',
4130 [('f', 'force', None, _('force push')),
4140 [('f', 'force', None, _('force push')),
4131 ('r', 'rev', [],
4141 ('r', 'rev', [],
4132 _('a changeset intended to be included in the destination'),
4142 _('a changeset intended to be included in the destination'),
4133 _('REV')),
4143 _('REV')),
4134 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4144 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4135 ('b', 'branch', [],
4145 ('b', 'branch', [],
4136 _('a specific branch you would like to push'), _('BRANCH')),
4146 _('a specific branch you would like to push'), _('BRANCH')),
4137 ('', 'new-branch', False, _('allow pushing a new branch')),
4147 ('', 'new-branch', False, _('allow pushing a new branch')),
4138 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4148 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4139 ] + remoteopts,
4149 ] + remoteopts,
4140 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4150 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4141 def push(ui, repo, dest=None, **opts):
4151 def push(ui, repo, dest=None, **opts):
4142 """push changes to the specified destination
4152 """push changes to the specified destination
4143
4153
4144 Push changesets from the local repository to the specified
4154 Push changesets from the local repository to the specified
4145 destination.
4155 destination.
4146
4156
4147 This operation is symmetrical to pull: it is identical to a pull
4157 This operation is symmetrical to pull: it is identical to a pull
4148 in the destination repository from the current one.
4158 in the destination repository from the current one.
4149
4159
4150 By default, push will not allow creation of new heads at the
4160 By default, push will not allow creation of new heads at the
4151 destination, since multiple heads would make it unclear which head
4161 destination, since multiple heads would make it unclear which head
4152 to use. In this situation, it is recommended to pull and merge
4162 to use. In this situation, it is recommended to pull and merge
4153 before pushing.
4163 before pushing.
4154
4164
4155 Use --new-branch if you want to allow push to create a new named
4165 Use --new-branch if you want to allow push to create a new named
4156 branch that is not present at the destination. This allows you to
4166 branch that is not present at the destination. This allows you to
4157 only create a new branch without forcing other changes.
4167 only create a new branch without forcing other changes.
4158
4168
4159 .. note::
4169 .. note::
4160
4170
4161 Extra care should be taken with the -f/--force option,
4171 Extra care should be taken with the -f/--force option,
4162 which will push all new heads on all branches, an action which will
4172 which will push all new heads on all branches, an action which will
4163 almost always cause confusion for collaborators.
4173 almost always cause confusion for collaborators.
4164
4174
4165 If -r/--rev is used, the specified revision and all its ancestors
4175 If -r/--rev is used, the specified revision and all its ancestors
4166 will be pushed to the remote repository.
4176 will be pushed to the remote repository.
4167
4177
4168 If -B/--bookmark is used, the specified bookmarked revision, its
4178 If -B/--bookmark is used, the specified bookmarked revision, its
4169 ancestors, and the bookmark will be pushed to the remote
4179 ancestors, and the bookmark will be pushed to the remote
4170 repository. Specifying ``.`` is equivalent to specifying the active
4180 repository. Specifying ``.`` is equivalent to specifying the active
4171 bookmark's name.
4181 bookmark's name.
4172
4182
4173 Please see :hg:`help urls` for important details about ``ssh://``
4183 Please see :hg:`help urls` for important details about ``ssh://``
4174 URLs. If DESTINATION is omitted, a default path will be used.
4184 URLs. If DESTINATION is omitted, a default path will be used.
4175
4185
4176 .. container:: verbose
4186 .. container:: verbose
4177
4187
4178 The --pushvars option sends strings to the server that become
4188 The --pushvars option sends strings to the server that become
4179 environment variables prepended with ``HG_USERVAR_``. For example,
4189 environment variables prepended with ``HG_USERVAR_``. For example,
4180 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4190 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4181 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4191 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4182
4192
4183 pushvars can provide for user-overridable hooks as well as set debug
4193 pushvars can provide for user-overridable hooks as well as set debug
4184 levels. One example is having a hook that blocks commits containing
4194 levels. One example is having a hook that blocks commits containing
4185 conflict markers, but enables the user to override the hook if the file
4195 conflict markers, but enables the user to override the hook if the file
4186 is using conflict markers for testing purposes or the file format has
4196 is using conflict markers for testing purposes or the file format has
4187 strings that look like conflict markers.
4197 strings that look like conflict markers.
4188
4198
4189 By default, servers will ignore `--pushvars`. To enable it add the
4199 By default, servers will ignore `--pushvars`. To enable it add the
4190 following to your configuration file::
4200 following to your configuration file::
4191
4201
4192 [push]
4202 [push]
4193 pushvars.server = true
4203 pushvars.server = true
4194
4204
4195 Returns 0 if push was successful, 1 if nothing to push.
4205 Returns 0 if push was successful, 1 if nothing to push.
4196 """
4206 """
4197
4207
4198 opts = pycompat.byteskwargs(opts)
4208 opts = pycompat.byteskwargs(opts)
4199 if opts.get('bookmark'):
4209 if opts.get('bookmark'):
4200 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4210 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4201 for b in opts['bookmark']:
4211 for b in opts['bookmark']:
4202 # translate -B options to -r so changesets get pushed
4212 # translate -B options to -r so changesets get pushed
4203 b = repo._bookmarks.expandname(b)
4213 b = repo._bookmarks.expandname(b)
4204 if b in repo._bookmarks:
4214 if b in repo._bookmarks:
4205 opts.setdefault('rev', []).append(b)
4215 opts.setdefault('rev', []).append(b)
4206 else:
4216 else:
4207 # if we try to push a deleted bookmark, translate it to null
4217 # if we try to push a deleted bookmark, translate it to null
4208 # this lets simultaneous -r, -b options continue working
4218 # this lets simultaneous -r, -b options continue working
4209 opts.setdefault('rev', []).append("null")
4219 opts.setdefault('rev', []).append("null")
4210
4220
4211 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4221 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4212 if not path:
4222 if not path:
4213 raise error.Abort(_('default repository not configured!'),
4223 raise error.Abort(_('default repository not configured!'),
4214 hint=_("see 'hg help config.paths'"))
4224 hint=_("see 'hg help config.paths'"))
4215 dest = path.pushloc or path.loc
4225 dest = path.pushloc or path.loc
4216 branches = (path.branch, opts.get('branch') or [])
4226 branches = (path.branch, opts.get('branch') or [])
4217 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4227 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4218 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4228 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4219 other = hg.peer(repo, opts, dest)
4229 other = hg.peer(repo, opts, dest)
4220
4230
4221 if revs:
4231 if revs:
4222 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4232 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4223 if not revs:
4233 if not revs:
4224 raise error.Abort(_("specified revisions evaluate to an empty set"),
4234 raise error.Abort(_("specified revisions evaluate to an empty set"),
4225 hint=_("use different revision arguments"))
4235 hint=_("use different revision arguments"))
4226 elif path.pushrev:
4236 elif path.pushrev:
4227 # It doesn't make any sense to specify ancestor revisions. So limit
4237 # It doesn't make any sense to specify ancestor revisions. So limit
4228 # to DAG heads to make discovery simpler.
4238 # to DAG heads to make discovery simpler.
4229 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4239 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4230 revs = scmutil.revrange(repo, [expr])
4240 revs = scmutil.revrange(repo, [expr])
4231 revs = [repo[rev].node() for rev in revs]
4241 revs = [repo[rev].node() for rev in revs]
4232 if not revs:
4242 if not revs:
4233 raise error.Abort(_('default push revset for path evaluates to an '
4243 raise error.Abort(_('default push revset for path evaluates to an '
4234 'empty set'))
4244 'empty set'))
4235
4245
4236 repo._subtoppath = dest
4246 repo._subtoppath = dest
4237 try:
4247 try:
4238 # push subrepos depth-first for coherent ordering
4248 # push subrepos depth-first for coherent ordering
4239 c = repo['.']
4249 c = repo['.']
4240 subs = c.substate # only repos that are committed
4250 subs = c.substate # only repos that are committed
4241 for s in sorted(subs):
4251 for s in sorted(subs):
4242 result = c.sub(s).push(opts)
4252 result = c.sub(s).push(opts)
4243 if result == 0:
4253 if result == 0:
4244 return not result
4254 return not result
4245 finally:
4255 finally:
4246 del repo._subtoppath
4256 del repo._subtoppath
4247
4257
4248 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4258 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4249 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4259 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4250
4260
4251 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4261 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4252 newbranch=opts.get('new_branch'),
4262 newbranch=opts.get('new_branch'),
4253 bookmarks=opts.get('bookmark', ()),
4263 bookmarks=opts.get('bookmark', ()),
4254 opargs=opargs)
4264 opargs=opargs)
4255
4265
4256 result = not pushop.cgresult
4266 result = not pushop.cgresult
4257
4267
4258 if pushop.bkresult is not None:
4268 if pushop.bkresult is not None:
4259 if pushop.bkresult == 2:
4269 if pushop.bkresult == 2:
4260 result = 2
4270 result = 2
4261 elif not result and pushop.bkresult:
4271 elif not result and pushop.bkresult:
4262 result = 2
4272 result = 2
4263
4273
4264 return result
4274 return result
4265
4275
4266 @command('recover', [])
4276 @command('recover', [])
4267 def recover(ui, repo):
4277 def recover(ui, repo):
4268 """roll back an interrupted transaction
4278 """roll back an interrupted transaction
4269
4279
4270 Recover from an interrupted commit or pull.
4280 Recover from an interrupted commit or pull.
4271
4281
4272 This command tries to fix the repository status after an
4282 This command tries to fix the repository status after an
4273 interrupted operation. It should only be necessary when Mercurial
4283 interrupted operation. It should only be necessary when Mercurial
4274 suggests it.
4284 suggests it.
4275
4285
4276 Returns 0 if successful, 1 if nothing to recover or verify fails.
4286 Returns 0 if successful, 1 if nothing to recover or verify fails.
4277 """
4287 """
4278 if repo.recover():
4288 if repo.recover():
4279 return hg.verify(repo)
4289 return hg.verify(repo)
4280 return 1
4290 return 1
4281
4291
4282 @command('^remove|rm',
4292 @command('^remove|rm',
4283 [('A', 'after', None, _('record delete for missing files')),
4293 [('A', 'after', None, _('record delete for missing files')),
4284 ('f', 'force', None,
4294 ('f', 'force', None,
4285 _('forget added files, delete modified files')),
4295 _('forget added files, delete modified files')),
4286 ] + subrepoopts + walkopts + dryrunopts,
4296 ] + subrepoopts + walkopts + dryrunopts,
4287 _('[OPTION]... FILE...'),
4297 _('[OPTION]... FILE...'),
4288 inferrepo=True)
4298 inferrepo=True)
4289 def remove(ui, repo, *pats, **opts):
4299 def remove(ui, repo, *pats, **opts):
4290 """remove the specified files on the next commit
4300 """remove the specified files on the next commit
4291
4301
4292 Schedule the indicated files for removal from the current branch.
4302 Schedule the indicated files for removal from the current branch.
4293
4303
4294 This command schedules the files to be removed at the next commit.
4304 This command schedules the files to be removed at the next commit.
4295 To undo a remove before that, see :hg:`revert`. To undo added
4305 To undo a remove before that, see :hg:`revert`. To undo added
4296 files, see :hg:`forget`.
4306 files, see :hg:`forget`.
4297
4307
4298 .. container:: verbose
4308 .. container:: verbose
4299
4309
4300 -A/--after can be used to remove only files that have already
4310 -A/--after can be used to remove only files that have already
4301 been deleted, -f/--force can be used to force deletion, and -Af
4311 been deleted, -f/--force can be used to force deletion, and -Af
4302 can be used to remove files from the next revision without
4312 can be used to remove files from the next revision without
4303 deleting them from the working directory.
4313 deleting them from the working directory.
4304
4314
4305 The following table details the behavior of remove for different
4315 The following table details the behavior of remove for different
4306 file states (columns) and option combinations (rows). The file
4316 file states (columns) and option combinations (rows). The file
4307 states are Added [A], Clean [C], Modified [M] and Missing [!]
4317 states are Added [A], Clean [C], Modified [M] and Missing [!]
4308 (as reported by :hg:`status`). The actions are Warn, Remove
4318 (as reported by :hg:`status`). The actions are Warn, Remove
4309 (from branch) and Delete (from disk):
4319 (from branch) and Delete (from disk):
4310
4320
4311 ========= == == == ==
4321 ========= == == == ==
4312 opt/state A C M !
4322 opt/state A C M !
4313 ========= == == == ==
4323 ========= == == == ==
4314 none W RD W R
4324 none W RD W R
4315 -f R RD RD R
4325 -f R RD RD R
4316 -A W W W R
4326 -A W W W R
4317 -Af R R R R
4327 -Af R R R R
4318 ========= == == == ==
4328 ========= == == == ==
4319
4329
4320 .. note::
4330 .. note::
4321
4331
4322 :hg:`remove` never deletes files in Added [A] state from the
4332 :hg:`remove` never deletes files in Added [A] state from the
4323 working directory, not even if ``--force`` is specified.
4333 working directory, not even if ``--force`` is specified.
4324
4334
4325 Returns 0 on success, 1 if any warnings encountered.
4335 Returns 0 on success, 1 if any warnings encountered.
4326 """
4336 """
4327
4337
4328 opts = pycompat.byteskwargs(opts)
4338 opts = pycompat.byteskwargs(opts)
4329 after, force = opts.get('after'), opts.get('force')
4339 after, force = opts.get('after'), opts.get('force')
4330 dryrun = opts.get('dry_run')
4340 dryrun = opts.get('dry_run')
4331 if not pats and not after:
4341 if not pats and not after:
4332 raise error.Abort(_('no files specified'))
4342 raise error.Abort(_('no files specified'))
4333
4343
4334 m = scmutil.match(repo[None], pats, opts)
4344 m = scmutil.match(repo[None], pats, opts)
4335 subrepos = opts.get('subrepos')
4345 subrepos = opts.get('subrepos')
4336 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4346 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4337 dryrun=dryrun)
4347 dryrun=dryrun)
4338
4348
4339 @command('rename|move|mv',
4349 @command('rename|move|mv',
4340 [('A', 'after', None, _('record a rename that has already occurred')),
4350 [('A', 'after', None, _('record a rename that has already occurred')),
4341 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4351 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4342 ] + walkopts + dryrunopts,
4352 ] + walkopts + dryrunopts,
4343 _('[OPTION]... SOURCE... DEST'))
4353 _('[OPTION]... SOURCE... DEST'))
4344 def rename(ui, repo, *pats, **opts):
4354 def rename(ui, repo, *pats, **opts):
4345 """rename files; equivalent of copy + remove
4355 """rename files; equivalent of copy + remove
4346
4356
4347 Mark dest as copies of sources; mark sources for deletion. If dest
4357 Mark dest as copies of sources; mark sources for deletion. If dest
4348 is a directory, copies are put in that directory. If dest is a
4358 is a directory, copies are put in that directory. If dest is a
4349 file, there can only be one source.
4359 file, there can only be one source.
4350
4360
4351 By default, this command copies the contents of files as they
4361 By default, this command copies the contents of files as they
4352 exist in the working directory. If invoked with -A/--after, the
4362 exist in the working directory. If invoked with -A/--after, the
4353 operation is recorded, but no copying is performed.
4363 operation is recorded, but no copying is performed.
4354
4364
4355 This command takes effect at the next commit. To undo a rename
4365 This command takes effect at the next commit. To undo a rename
4356 before that, see :hg:`revert`.
4366 before that, see :hg:`revert`.
4357
4367
4358 Returns 0 on success, 1 if errors are encountered.
4368 Returns 0 on success, 1 if errors are encountered.
4359 """
4369 """
4360 opts = pycompat.byteskwargs(opts)
4370 opts = pycompat.byteskwargs(opts)
4361 with repo.wlock(False):
4371 with repo.wlock(False):
4362 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4372 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4363
4373
4364 @command('resolve',
4374 @command('resolve',
4365 [('a', 'all', None, _('select all unresolved files')),
4375 [('a', 'all', None, _('select all unresolved files')),
4366 ('l', 'list', None, _('list state of files needing merge')),
4376 ('l', 'list', None, _('list state of files needing merge')),
4367 ('m', 'mark', None, _('mark files as resolved')),
4377 ('m', 'mark', None, _('mark files as resolved')),
4368 ('u', 'unmark', None, _('mark files as unresolved')),
4378 ('u', 'unmark', None, _('mark files as unresolved')),
4369 ('n', 'no-status', None, _('hide status prefix'))]
4379 ('n', 'no-status', None, _('hide status prefix'))]
4370 + mergetoolopts + walkopts + formatteropts,
4380 + mergetoolopts + walkopts + formatteropts,
4371 _('[OPTION]... [FILE]...'),
4381 _('[OPTION]... [FILE]...'),
4372 inferrepo=True)
4382 inferrepo=True)
4373 def resolve(ui, repo, *pats, **opts):
4383 def resolve(ui, repo, *pats, **opts):
4374 """redo merges or set/view the merge status of files
4384 """redo merges or set/view the merge status of files
4375
4385
4376 Merges with unresolved conflicts are often the result of
4386 Merges with unresolved conflicts are often the result of
4377 non-interactive merging using the ``internal:merge`` configuration
4387 non-interactive merging using the ``internal:merge`` configuration
4378 setting, or a command-line merge tool like ``diff3``. The resolve
4388 setting, or a command-line merge tool like ``diff3``. The resolve
4379 command is used to manage the files involved in a merge, after
4389 command is used to manage the files involved in a merge, after
4380 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4390 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4381 working directory must have two parents). See :hg:`help
4391 working directory must have two parents). See :hg:`help
4382 merge-tools` for information on configuring merge tools.
4392 merge-tools` for information on configuring merge tools.
4383
4393
4384 The resolve command can be used in the following ways:
4394 The resolve command can be used in the following ways:
4385
4395
4386 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4396 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4387 files, discarding any previous merge attempts. Re-merging is not
4397 files, discarding any previous merge attempts. Re-merging is not
4388 performed for files already marked as resolved. Use ``--all/-a``
4398 performed for files already marked as resolved. Use ``--all/-a``
4389 to select all unresolved files. ``--tool`` can be used to specify
4399 to select all unresolved files. ``--tool`` can be used to specify
4390 the merge tool used for the given files. It overrides the HGMERGE
4400 the merge tool used for the given files. It overrides the HGMERGE
4391 environment variable and your configuration files. Previous file
4401 environment variable and your configuration files. Previous file
4392 contents are saved with a ``.orig`` suffix.
4402 contents are saved with a ``.orig`` suffix.
4393
4403
4394 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4404 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4395 (e.g. after having manually fixed-up the files). The default is
4405 (e.g. after having manually fixed-up the files). The default is
4396 to mark all unresolved files.
4406 to mark all unresolved files.
4397
4407
4398 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4408 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4399 default is to mark all resolved files.
4409 default is to mark all resolved files.
4400
4410
4401 - :hg:`resolve -l`: list files which had or still have conflicts.
4411 - :hg:`resolve -l`: list files which had or still have conflicts.
4402 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4412 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4403 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4413 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4404 the list. See :hg:`help filesets` for details.
4414 the list. See :hg:`help filesets` for details.
4405
4415
4406 .. note::
4416 .. note::
4407
4417
4408 Mercurial will not let you commit files with unresolved merge
4418 Mercurial will not let you commit files with unresolved merge
4409 conflicts. You must use :hg:`resolve -m ...` before you can
4419 conflicts. You must use :hg:`resolve -m ...` before you can
4410 commit after a conflicting merge.
4420 commit after a conflicting merge.
4411
4421
4412 Returns 0 on success, 1 if any files fail a resolve attempt.
4422 Returns 0 on success, 1 if any files fail a resolve attempt.
4413 """
4423 """
4414
4424
4415 opts = pycompat.byteskwargs(opts)
4425 opts = pycompat.byteskwargs(opts)
4416 flaglist = 'all mark unmark list no_status'.split()
4426 flaglist = 'all mark unmark list no_status'.split()
4417 all, mark, unmark, show, nostatus = \
4427 all, mark, unmark, show, nostatus = \
4418 [opts.get(o) for o in flaglist]
4428 [opts.get(o) for o in flaglist]
4419
4429
4420 if (show and (mark or unmark)) or (mark and unmark):
4430 if (show and (mark or unmark)) or (mark and unmark):
4421 raise error.Abort(_("too many options specified"))
4431 raise error.Abort(_("too many options specified"))
4422 if pats and all:
4432 if pats and all:
4423 raise error.Abort(_("can't specify --all and patterns"))
4433 raise error.Abort(_("can't specify --all and patterns"))
4424 if not (all or pats or show or mark or unmark):
4434 if not (all or pats or show or mark or unmark):
4425 raise error.Abort(_('no files or directories specified'),
4435 raise error.Abort(_('no files or directories specified'),
4426 hint=('use --all to re-merge all unresolved files'))
4436 hint=('use --all to re-merge all unresolved files'))
4427
4437
4428 if show:
4438 if show:
4429 ui.pager('resolve')
4439 ui.pager('resolve')
4430 fm = ui.formatter('resolve', opts)
4440 fm = ui.formatter('resolve', opts)
4431 ms = mergemod.mergestate.read(repo)
4441 ms = mergemod.mergestate.read(repo)
4432 m = scmutil.match(repo[None], pats, opts)
4442 m = scmutil.match(repo[None], pats, opts)
4433
4443
4434 # Labels and keys based on merge state. Unresolved path conflicts show
4444 # Labels and keys based on merge state. Unresolved path conflicts show
4435 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4445 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4436 # resolved conflicts.
4446 # resolved conflicts.
4437 mergestateinfo = {
4447 mergestateinfo = {
4438 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4448 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4439 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4449 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4440 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4450 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4441 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4451 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4442 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4452 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4443 'D'),
4453 'D'),
4444 }
4454 }
4445
4455
4446 for f in ms:
4456 for f in ms:
4447 if not m(f):
4457 if not m(f):
4448 continue
4458 continue
4449
4459
4450 label, key = mergestateinfo[ms[f]]
4460 label, key = mergestateinfo[ms[f]]
4451 fm.startitem()
4461 fm.startitem()
4452 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4462 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4453 fm.write('path', '%s\n', f, label=label)
4463 fm.write('path', '%s\n', f, label=label)
4454 fm.end()
4464 fm.end()
4455 return 0
4465 return 0
4456
4466
4457 with repo.wlock():
4467 with repo.wlock():
4458 ms = mergemod.mergestate.read(repo)
4468 ms = mergemod.mergestate.read(repo)
4459
4469
4460 if not (ms.active() or repo.dirstate.p2() != nullid):
4470 if not (ms.active() or repo.dirstate.p2() != nullid):
4461 raise error.Abort(
4471 raise error.Abort(
4462 _('resolve command not applicable when not merging'))
4472 _('resolve command not applicable when not merging'))
4463
4473
4464 wctx = repo[None]
4474 wctx = repo[None]
4465
4475
4466 if (ms.mergedriver
4476 if (ms.mergedriver
4467 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4477 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4468 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4478 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4469 ms.commit()
4479 ms.commit()
4470 # allow mark and unmark to go through
4480 # allow mark and unmark to go through
4471 if not mark and not unmark and not proceed:
4481 if not mark and not unmark and not proceed:
4472 return 1
4482 return 1
4473
4483
4474 m = scmutil.match(wctx, pats, opts)
4484 m = scmutil.match(wctx, pats, opts)
4475 ret = 0
4485 ret = 0
4476 didwork = False
4486 didwork = False
4477 runconclude = False
4487 runconclude = False
4478
4488
4479 tocomplete = []
4489 tocomplete = []
4480 for f in ms:
4490 for f in ms:
4481 if not m(f):
4491 if not m(f):
4482 continue
4492 continue
4483
4493
4484 didwork = True
4494 didwork = True
4485
4495
4486 # don't let driver-resolved files be marked, and run the conclude
4496 # don't let driver-resolved files be marked, and run the conclude
4487 # step if asked to resolve
4497 # step if asked to resolve
4488 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4498 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4489 exact = m.exact(f)
4499 exact = m.exact(f)
4490 if mark:
4500 if mark:
4491 if exact:
4501 if exact:
4492 ui.warn(_('not marking %s as it is driver-resolved\n')
4502 ui.warn(_('not marking %s as it is driver-resolved\n')
4493 % f)
4503 % f)
4494 elif unmark:
4504 elif unmark:
4495 if exact:
4505 if exact:
4496 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4506 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4497 % f)
4507 % f)
4498 else:
4508 else:
4499 runconclude = True
4509 runconclude = True
4500 continue
4510 continue
4501
4511
4502 # path conflicts must be resolved manually
4512 # path conflicts must be resolved manually
4503 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4513 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4504 mergemod.MERGE_RECORD_RESOLVED_PATH):
4514 mergemod.MERGE_RECORD_RESOLVED_PATH):
4505 if mark:
4515 if mark:
4506 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4516 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4507 elif unmark:
4517 elif unmark:
4508 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4518 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4509 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4519 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4510 ui.warn(_('%s: path conflict must be resolved manually\n')
4520 ui.warn(_('%s: path conflict must be resolved manually\n')
4511 % f)
4521 % f)
4512 continue
4522 continue
4513
4523
4514 if mark:
4524 if mark:
4515 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4525 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4516 elif unmark:
4526 elif unmark:
4517 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4527 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4518 else:
4528 else:
4519 # backup pre-resolve (merge uses .orig for its own purposes)
4529 # backup pre-resolve (merge uses .orig for its own purposes)
4520 a = repo.wjoin(f)
4530 a = repo.wjoin(f)
4521 try:
4531 try:
4522 util.copyfile(a, a + ".resolve")
4532 util.copyfile(a, a + ".resolve")
4523 except (IOError, OSError) as inst:
4533 except (IOError, OSError) as inst:
4524 if inst.errno != errno.ENOENT:
4534 if inst.errno != errno.ENOENT:
4525 raise
4535 raise
4526
4536
4527 try:
4537 try:
4528 # preresolve file
4538 # preresolve file
4529 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4539 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4530 'resolve')
4540 'resolve')
4531 complete, r = ms.preresolve(f, wctx)
4541 complete, r = ms.preresolve(f, wctx)
4532 if not complete:
4542 if not complete:
4533 tocomplete.append(f)
4543 tocomplete.append(f)
4534 elif r:
4544 elif r:
4535 ret = 1
4545 ret = 1
4536 finally:
4546 finally:
4537 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4547 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4538 ms.commit()
4548 ms.commit()
4539
4549
4540 # replace filemerge's .orig file with our resolve file, but only
4550 # replace filemerge's .orig file with our resolve file, but only
4541 # for merges that are complete
4551 # for merges that are complete
4542 if complete:
4552 if complete:
4543 try:
4553 try:
4544 util.rename(a + ".resolve",
4554 util.rename(a + ".resolve",
4545 scmutil.origpath(ui, repo, a))
4555 scmutil.origpath(ui, repo, a))
4546 except OSError as inst:
4556 except OSError as inst:
4547 if inst.errno != errno.ENOENT:
4557 if inst.errno != errno.ENOENT:
4548 raise
4558 raise
4549
4559
4550 for f in tocomplete:
4560 for f in tocomplete:
4551 try:
4561 try:
4552 # resolve file
4562 # resolve file
4553 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4563 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4554 'resolve')
4564 'resolve')
4555 r = ms.resolve(f, wctx)
4565 r = ms.resolve(f, wctx)
4556 if r:
4566 if r:
4557 ret = 1
4567 ret = 1
4558 finally:
4568 finally:
4559 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4569 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4560 ms.commit()
4570 ms.commit()
4561
4571
4562 # replace filemerge's .orig file with our resolve file
4572 # replace filemerge's .orig file with our resolve file
4563 a = repo.wjoin(f)
4573 a = repo.wjoin(f)
4564 try:
4574 try:
4565 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4575 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4566 except OSError as inst:
4576 except OSError as inst:
4567 if inst.errno != errno.ENOENT:
4577 if inst.errno != errno.ENOENT:
4568 raise
4578 raise
4569
4579
4570 ms.commit()
4580 ms.commit()
4571 ms.recordactions()
4581 ms.recordactions()
4572
4582
4573 if not didwork and pats:
4583 if not didwork and pats:
4574 hint = None
4584 hint = None
4575 if not any([p for p in pats if p.find(':') >= 0]):
4585 if not any([p for p in pats if p.find(':') >= 0]):
4576 pats = ['path:%s' % p for p in pats]
4586 pats = ['path:%s' % p for p in pats]
4577 m = scmutil.match(wctx, pats, opts)
4587 m = scmutil.match(wctx, pats, opts)
4578 for f in ms:
4588 for f in ms:
4579 if not m(f):
4589 if not m(f):
4580 continue
4590 continue
4581 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4591 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4582 if opts.get(o)])
4592 if opts.get(o)])
4583 hint = _("(try: hg resolve %s%s)\n") % (
4593 hint = _("(try: hg resolve %s%s)\n") % (
4584 flags,
4594 flags,
4585 ' '.join(pats))
4595 ' '.join(pats))
4586 break
4596 break
4587 ui.warn(_("arguments do not match paths that need resolving\n"))
4597 ui.warn(_("arguments do not match paths that need resolving\n"))
4588 if hint:
4598 if hint:
4589 ui.warn(hint)
4599 ui.warn(hint)
4590 elif ms.mergedriver and ms.mdstate() != 's':
4600 elif ms.mergedriver and ms.mdstate() != 's':
4591 # run conclude step when either a driver-resolved file is requested
4601 # run conclude step when either a driver-resolved file is requested
4592 # or there are no driver-resolved files
4602 # or there are no driver-resolved files
4593 # we can't use 'ret' to determine whether any files are unresolved
4603 # we can't use 'ret' to determine whether any files are unresolved
4594 # because we might not have tried to resolve some
4604 # because we might not have tried to resolve some
4595 if ((runconclude or not list(ms.driverresolved()))
4605 if ((runconclude or not list(ms.driverresolved()))
4596 and not list(ms.unresolved())):
4606 and not list(ms.unresolved())):
4597 proceed = mergemod.driverconclude(repo, ms, wctx)
4607 proceed = mergemod.driverconclude(repo, ms, wctx)
4598 ms.commit()
4608 ms.commit()
4599 if not proceed:
4609 if not proceed:
4600 return 1
4610 return 1
4601
4611
4602 # Nudge users into finishing an unfinished operation
4612 # Nudge users into finishing an unfinished operation
4603 unresolvedf = list(ms.unresolved())
4613 unresolvedf = list(ms.unresolved())
4604 driverresolvedf = list(ms.driverresolved())
4614 driverresolvedf = list(ms.driverresolved())
4605 if not unresolvedf and not driverresolvedf:
4615 if not unresolvedf and not driverresolvedf:
4606 ui.status(_('(no more unresolved files)\n'))
4616 ui.status(_('(no more unresolved files)\n'))
4607 cmdutil.checkafterresolved(repo)
4617 cmdutil.checkafterresolved(repo)
4608 elif not unresolvedf:
4618 elif not unresolvedf:
4609 ui.status(_('(no more unresolved files -- '
4619 ui.status(_('(no more unresolved files -- '
4610 'run "hg resolve --all" to conclude)\n'))
4620 'run "hg resolve --all" to conclude)\n'))
4611
4621
4612 return ret
4622 return ret
4613
4623
4614 @command('revert',
4624 @command('revert',
4615 [('a', 'all', None, _('revert all changes when no arguments given')),
4625 [('a', 'all', None, _('revert all changes when no arguments given')),
4616 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4626 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4617 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4627 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4618 ('C', 'no-backup', None, _('do not save backup copies of files')),
4628 ('C', 'no-backup', None, _('do not save backup copies of files')),
4619 ('i', 'interactive', None, _('interactively select the changes')),
4629 ('i', 'interactive', None, _('interactively select the changes')),
4620 ] + walkopts + dryrunopts,
4630 ] + walkopts + dryrunopts,
4621 _('[OPTION]... [-r REV] [NAME]...'))
4631 _('[OPTION]... [-r REV] [NAME]...'))
4622 def revert(ui, repo, *pats, **opts):
4632 def revert(ui, repo, *pats, **opts):
4623 """restore files to their checkout state
4633 """restore files to their checkout state
4624
4634
4625 .. note::
4635 .. note::
4626
4636
4627 To check out earlier revisions, you should use :hg:`update REV`.
4637 To check out earlier revisions, you should use :hg:`update REV`.
4628 To cancel an uncommitted merge (and lose your changes),
4638 To cancel an uncommitted merge (and lose your changes),
4629 use :hg:`merge --abort`.
4639 use :hg:`merge --abort`.
4630
4640
4631 With no revision specified, revert the specified files or directories
4641 With no revision specified, revert the specified files or directories
4632 to the contents they had in the parent of the working directory.
4642 to the contents they had in the parent of the working directory.
4633 This restores the contents of files to an unmodified
4643 This restores the contents of files to an unmodified
4634 state and unschedules adds, removes, copies, and renames. If the
4644 state and unschedules adds, removes, copies, and renames. If the
4635 working directory has two parents, you must explicitly specify a
4645 working directory has two parents, you must explicitly specify a
4636 revision.
4646 revision.
4637
4647
4638 Using the -r/--rev or -d/--date options, revert the given files or
4648 Using the -r/--rev or -d/--date options, revert the given files or
4639 directories to their states as of a specific revision. Because
4649 directories to their states as of a specific revision. Because
4640 revert does not change the working directory parents, this will
4650 revert does not change the working directory parents, this will
4641 cause these files to appear modified. This can be helpful to "back
4651 cause these files to appear modified. This can be helpful to "back
4642 out" some or all of an earlier change. See :hg:`backout` for a
4652 out" some or all of an earlier change. See :hg:`backout` for a
4643 related method.
4653 related method.
4644
4654
4645 Modified files are saved with a .orig suffix before reverting.
4655 Modified files are saved with a .orig suffix before reverting.
4646 To disable these backups, use --no-backup. It is possible to store
4656 To disable these backups, use --no-backup. It is possible to store
4647 the backup files in a custom directory relative to the root of the
4657 the backup files in a custom directory relative to the root of the
4648 repository by setting the ``ui.origbackuppath`` configuration
4658 repository by setting the ``ui.origbackuppath`` configuration
4649 option.
4659 option.
4650
4660
4651 See :hg:`help dates` for a list of formats valid for -d/--date.
4661 See :hg:`help dates` for a list of formats valid for -d/--date.
4652
4662
4653 See :hg:`help backout` for a way to reverse the effect of an
4663 See :hg:`help backout` for a way to reverse the effect of an
4654 earlier changeset.
4664 earlier changeset.
4655
4665
4656 Returns 0 on success.
4666 Returns 0 on success.
4657 """
4667 """
4658
4668
4659 opts = pycompat.byteskwargs(opts)
4669 opts = pycompat.byteskwargs(opts)
4660 if opts.get("date"):
4670 if opts.get("date"):
4661 if opts.get("rev"):
4671 if opts.get("rev"):
4662 raise error.Abort(_("you can't specify a revision and a date"))
4672 raise error.Abort(_("you can't specify a revision and a date"))
4663 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4673 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4664
4674
4665 parent, p2 = repo.dirstate.parents()
4675 parent, p2 = repo.dirstate.parents()
4666 if not opts.get('rev') and p2 != nullid:
4676 if not opts.get('rev') and p2 != nullid:
4667 # revert after merge is a trap for new users (issue2915)
4677 # revert after merge is a trap for new users (issue2915)
4668 raise error.Abort(_('uncommitted merge with no revision specified'),
4678 raise error.Abort(_('uncommitted merge with no revision specified'),
4669 hint=_("use 'hg update' or see 'hg help revert'"))
4679 hint=_("use 'hg update' or see 'hg help revert'"))
4670
4680
4671 rev = opts.get('rev')
4681 rev = opts.get('rev')
4672 if rev:
4682 if rev:
4673 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4683 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4674 ctx = scmutil.revsingle(repo, rev)
4684 ctx = scmutil.revsingle(repo, rev)
4675
4685
4676 if (not (pats or opts.get('include') or opts.get('exclude') or
4686 if (not (pats or opts.get('include') or opts.get('exclude') or
4677 opts.get('all') or opts.get('interactive'))):
4687 opts.get('all') or opts.get('interactive'))):
4678 msg = _("no files or directories specified")
4688 msg = _("no files or directories specified")
4679 if p2 != nullid:
4689 if p2 != nullid:
4680 hint = _("uncommitted merge, use --all to discard all changes,"
4690 hint = _("uncommitted merge, use --all to discard all changes,"
4681 " or 'hg update -C .' to abort the merge")
4691 " or 'hg update -C .' to abort the merge")
4682 raise error.Abort(msg, hint=hint)
4692 raise error.Abort(msg, hint=hint)
4683 dirty = any(repo.status())
4693 dirty = any(repo.status())
4684 node = ctx.node()
4694 node = ctx.node()
4685 if node != parent:
4695 if node != parent:
4686 if dirty:
4696 if dirty:
4687 hint = _("uncommitted changes, use --all to discard all"
4697 hint = _("uncommitted changes, use --all to discard all"
4688 " changes, or 'hg update %s' to update") % ctx.rev()
4698 " changes, or 'hg update %s' to update") % ctx.rev()
4689 else:
4699 else:
4690 hint = _("use --all to revert all files,"
4700 hint = _("use --all to revert all files,"
4691 " or 'hg update %s' to update") % ctx.rev()
4701 " or 'hg update %s' to update") % ctx.rev()
4692 elif dirty:
4702 elif dirty:
4693 hint = _("uncommitted changes, use --all to discard all changes")
4703 hint = _("uncommitted changes, use --all to discard all changes")
4694 else:
4704 else:
4695 hint = _("use --all to revert all files")
4705 hint = _("use --all to revert all files")
4696 raise error.Abort(msg, hint=hint)
4706 raise error.Abort(msg, hint=hint)
4697
4707
4698 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4708 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4699 **pycompat.strkwargs(opts))
4709 **pycompat.strkwargs(opts))
4700
4710
4701 @command('rollback', dryrunopts +
4711 @command('rollback', dryrunopts +
4702 [('f', 'force', False, _('ignore safety measures'))])
4712 [('f', 'force', False, _('ignore safety measures'))])
4703 def rollback(ui, repo, **opts):
4713 def rollback(ui, repo, **opts):
4704 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4714 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4705
4715
4706 Please use :hg:`commit --amend` instead of rollback to correct
4716 Please use :hg:`commit --amend` instead of rollback to correct
4707 mistakes in the last commit.
4717 mistakes in the last commit.
4708
4718
4709 This command should be used with care. There is only one level of
4719 This command should be used with care. There is only one level of
4710 rollback, and there is no way to undo a rollback. It will also
4720 rollback, and there is no way to undo a rollback. It will also
4711 restore the dirstate at the time of the last transaction, losing
4721 restore the dirstate at the time of the last transaction, losing
4712 any dirstate changes since that time. This command does not alter
4722 any dirstate changes since that time. This command does not alter
4713 the working directory.
4723 the working directory.
4714
4724
4715 Transactions are used to encapsulate the effects of all commands
4725 Transactions are used to encapsulate the effects of all commands
4716 that create new changesets or propagate existing changesets into a
4726 that create new changesets or propagate existing changesets into a
4717 repository.
4727 repository.
4718
4728
4719 .. container:: verbose
4729 .. container:: verbose
4720
4730
4721 For example, the following commands are transactional, and their
4731 For example, the following commands are transactional, and their
4722 effects can be rolled back:
4732 effects can be rolled back:
4723
4733
4724 - commit
4734 - commit
4725 - import
4735 - import
4726 - pull
4736 - pull
4727 - push (with this repository as the destination)
4737 - push (with this repository as the destination)
4728 - unbundle
4738 - unbundle
4729
4739
4730 To avoid permanent data loss, rollback will refuse to rollback a
4740 To avoid permanent data loss, rollback will refuse to rollback a
4731 commit transaction if it isn't checked out. Use --force to
4741 commit transaction if it isn't checked out. Use --force to
4732 override this protection.
4742 override this protection.
4733
4743
4734 The rollback command can be entirely disabled by setting the
4744 The rollback command can be entirely disabled by setting the
4735 ``ui.rollback`` configuration setting to false. If you're here
4745 ``ui.rollback`` configuration setting to false. If you're here
4736 because you want to use rollback and it's disabled, you can
4746 because you want to use rollback and it's disabled, you can
4737 re-enable the command by setting ``ui.rollback`` to true.
4747 re-enable the command by setting ``ui.rollback`` to true.
4738
4748
4739 This command is not intended for use on public repositories. Once
4749 This command is not intended for use on public repositories. Once
4740 changes are visible for pull by other users, rolling a transaction
4750 changes are visible for pull by other users, rolling a transaction
4741 back locally is ineffective (someone else may already have pulled
4751 back locally is ineffective (someone else may already have pulled
4742 the changes). Furthermore, a race is possible with readers of the
4752 the changes). Furthermore, a race is possible with readers of the
4743 repository; for example an in-progress pull from the repository
4753 repository; for example an in-progress pull from the repository
4744 may fail if a rollback is performed.
4754 may fail if a rollback is performed.
4745
4755
4746 Returns 0 on success, 1 if no rollback data is available.
4756 Returns 0 on success, 1 if no rollback data is available.
4747 """
4757 """
4748 if not ui.configbool('ui', 'rollback'):
4758 if not ui.configbool('ui', 'rollback'):
4749 raise error.Abort(_('rollback is disabled because it is unsafe'),
4759 raise error.Abort(_('rollback is disabled because it is unsafe'),
4750 hint=('see `hg help -v rollback` for information'))
4760 hint=('see `hg help -v rollback` for information'))
4751 return repo.rollback(dryrun=opts.get(r'dry_run'),
4761 return repo.rollback(dryrun=opts.get(r'dry_run'),
4752 force=opts.get(r'force'))
4762 force=opts.get(r'force'))
4753
4763
4754 @command('root', [], intents={INTENT_READONLY})
4764 @command('root', [], intents={INTENT_READONLY})
4755 def root(ui, repo):
4765 def root(ui, repo):
4756 """print the root (top) of the current working directory
4766 """print the root (top) of the current working directory
4757
4767
4758 Print the root directory of the current repository.
4768 Print the root directory of the current repository.
4759
4769
4760 Returns 0 on success.
4770 Returns 0 on success.
4761 """
4771 """
4762 ui.write(repo.root + "\n")
4772 ui.write(repo.root + "\n")
4763
4773
4764 @command('^serve',
4774 @command('^serve',
4765 [('A', 'accesslog', '', _('name of access log file to write to'),
4775 [('A', 'accesslog', '', _('name of access log file to write to'),
4766 _('FILE')),
4776 _('FILE')),
4767 ('d', 'daemon', None, _('run server in background')),
4777 ('d', 'daemon', None, _('run server in background')),
4768 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4778 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4769 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4779 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4770 # use string type, then we can check if something was passed
4780 # use string type, then we can check if something was passed
4771 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4781 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4772 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4782 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4773 _('ADDR')),
4783 _('ADDR')),
4774 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4784 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4775 _('PREFIX')),
4785 _('PREFIX')),
4776 ('n', 'name', '',
4786 ('n', 'name', '',
4777 _('name to show in web pages (default: working directory)'), _('NAME')),
4787 _('name to show in web pages (default: working directory)'), _('NAME')),
4778 ('', 'web-conf', '',
4788 ('', 'web-conf', '',
4779 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4789 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4780 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4790 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4781 _('FILE')),
4791 _('FILE')),
4782 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4792 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4783 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4793 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4784 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4794 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4785 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4795 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4786 ('', 'style', '', _('template style to use'), _('STYLE')),
4796 ('', 'style', '', _('template style to use'), _('STYLE')),
4787 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4797 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4788 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4798 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4789 ('', 'print-url', None, _('start and print only the URL'))]
4799 ('', 'print-url', None, _('start and print only the URL'))]
4790 + subrepoopts,
4800 + subrepoopts,
4791 _('[OPTION]...'),
4801 _('[OPTION]...'),
4792 optionalrepo=True)
4802 optionalrepo=True)
4793 def serve(ui, repo, **opts):
4803 def serve(ui, repo, **opts):
4794 """start stand-alone webserver
4804 """start stand-alone webserver
4795
4805
4796 Start a local HTTP repository browser and pull server. You can use
4806 Start a local HTTP repository browser and pull server. You can use
4797 this for ad-hoc sharing and browsing of repositories. It is
4807 this for ad-hoc sharing and browsing of repositories. It is
4798 recommended to use a real web server to serve a repository for
4808 recommended to use a real web server to serve a repository for
4799 longer periods of time.
4809 longer periods of time.
4800
4810
4801 Please note that the server does not implement access control.
4811 Please note that the server does not implement access control.
4802 This means that, by default, anybody can read from the server and
4812 This means that, by default, anybody can read from the server and
4803 nobody can write to it by default. Set the ``web.allow-push``
4813 nobody can write to it by default. Set the ``web.allow-push``
4804 option to ``*`` to allow everybody to push to the server. You
4814 option to ``*`` to allow everybody to push to the server. You
4805 should use a real web server if you need to authenticate users.
4815 should use a real web server if you need to authenticate users.
4806
4816
4807 By default, the server logs accesses to stdout and errors to
4817 By default, the server logs accesses to stdout and errors to
4808 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4818 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4809 files.
4819 files.
4810
4820
4811 To have the server choose a free port number to listen on, specify
4821 To have the server choose a free port number to listen on, specify
4812 a port number of 0; in this case, the server will print the port
4822 a port number of 0; in this case, the server will print the port
4813 number it uses.
4823 number it uses.
4814
4824
4815 Returns 0 on success.
4825 Returns 0 on success.
4816 """
4826 """
4817
4827
4818 opts = pycompat.byteskwargs(opts)
4828 opts = pycompat.byteskwargs(opts)
4819 if opts["stdio"] and opts["cmdserver"]:
4829 if opts["stdio"] and opts["cmdserver"]:
4820 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4830 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4821 if opts["print_url"] and ui.verbose:
4831 if opts["print_url"] and ui.verbose:
4822 raise error.Abort(_("cannot use --print-url with --verbose"))
4832 raise error.Abort(_("cannot use --print-url with --verbose"))
4823 if opts["print_url"]:
4833 if opts["print_url"]:
4824 opts['daemon'] = True
4834 opts['daemon'] = True
4825
4835
4826 if opts["stdio"]:
4836 if opts["stdio"]:
4827 if repo is None:
4837 if repo is None:
4828 raise error.RepoError(_("there is no Mercurial repository here"
4838 raise error.RepoError(_("there is no Mercurial repository here"
4829 " (.hg not found)"))
4839 " (.hg not found)"))
4830 s = wireprotoserver.sshserver(ui, repo)
4840 s = wireprotoserver.sshserver(ui, repo)
4831 s.serve_forever()
4841 s.serve_forever()
4832
4842
4833 service = server.createservice(ui, repo, opts)
4843 service = server.createservice(ui, repo, opts)
4834 return server.runservice(opts, initfn=service.init, runfn=service.run)
4844 return server.runservice(opts, initfn=service.init, runfn=service.run)
4835
4845
4836 _NOTTERSE = 'nothing'
4846 _NOTTERSE = 'nothing'
4837
4847
4838 @command('^status|st',
4848 @command('^status|st',
4839 [('A', 'all', None, _('show status of all files')),
4849 [('A', 'all', None, _('show status of all files')),
4840 ('m', 'modified', None, _('show only modified files')),
4850 ('m', 'modified', None, _('show only modified files')),
4841 ('a', 'added', None, _('show only added files')),
4851 ('a', 'added', None, _('show only added files')),
4842 ('r', 'removed', None, _('show only removed files')),
4852 ('r', 'removed', None, _('show only removed files')),
4843 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4853 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4844 ('c', 'clean', None, _('show only files without changes')),
4854 ('c', 'clean', None, _('show only files without changes')),
4845 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4855 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4846 ('i', 'ignored', None, _('show only ignored files')),
4856 ('i', 'ignored', None, _('show only ignored files')),
4847 ('n', 'no-status', None, _('hide status prefix')),
4857 ('n', 'no-status', None, _('hide status prefix')),
4848 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
4858 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
4849 ('C', 'copies', None, _('show source of copied files')),
4859 ('C', 'copies', None, _('show source of copied files')),
4850 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4860 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4851 ('', 'rev', [], _('show difference from revision'), _('REV')),
4861 ('', 'rev', [], _('show difference from revision'), _('REV')),
4852 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4862 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4853 ] + walkopts + subrepoopts + formatteropts,
4863 ] + walkopts + subrepoopts + formatteropts,
4854 _('[OPTION]... [FILE]...'),
4864 _('[OPTION]... [FILE]...'),
4855 inferrepo=True,
4865 inferrepo=True,
4856 intents={INTENT_READONLY})
4866 intents={INTENT_READONLY})
4857 def status(ui, repo, *pats, **opts):
4867 def status(ui, repo, *pats, **opts):
4858 """show changed files in the working directory
4868 """show changed files in the working directory
4859
4869
4860 Show status of files in the repository. If names are given, only
4870 Show status of files in the repository. If names are given, only
4861 files that match are shown. Files that are clean or ignored or
4871 files that match are shown. Files that are clean or ignored or
4862 the source of a copy/move operation, are not listed unless
4872 the source of a copy/move operation, are not listed unless
4863 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4873 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4864 Unless options described with "show only ..." are given, the
4874 Unless options described with "show only ..." are given, the
4865 options -mardu are used.
4875 options -mardu are used.
4866
4876
4867 Option -q/--quiet hides untracked (unknown and ignored) files
4877 Option -q/--quiet hides untracked (unknown and ignored) files
4868 unless explicitly requested with -u/--unknown or -i/--ignored.
4878 unless explicitly requested with -u/--unknown or -i/--ignored.
4869
4879
4870 .. note::
4880 .. note::
4871
4881
4872 :hg:`status` may appear to disagree with diff if permissions have
4882 :hg:`status` may appear to disagree with diff if permissions have
4873 changed or a merge has occurred. The standard diff format does
4883 changed or a merge has occurred. The standard diff format does
4874 not report permission changes and diff only reports changes
4884 not report permission changes and diff only reports changes
4875 relative to one merge parent.
4885 relative to one merge parent.
4876
4886
4877 If one revision is given, it is used as the base revision.
4887 If one revision is given, it is used as the base revision.
4878 If two revisions are given, the differences between them are
4888 If two revisions are given, the differences between them are
4879 shown. The --change option can also be used as a shortcut to list
4889 shown. The --change option can also be used as a shortcut to list
4880 the changed files of a revision from its first parent.
4890 the changed files of a revision from its first parent.
4881
4891
4882 The codes used to show the status of files are::
4892 The codes used to show the status of files are::
4883
4893
4884 M = modified
4894 M = modified
4885 A = added
4895 A = added
4886 R = removed
4896 R = removed
4887 C = clean
4897 C = clean
4888 ! = missing (deleted by non-hg command, but still tracked)
4898 ! = missing (deleted by non-hg command, but still tracked)
4889 ? = not tracked
4899 ? = not tracked
4890 I = ignored
4900 I = ignored
4891 = origin of the previous file (with --copies)
4901 = origin of the previous file (with --copies)
4892
4902
4893 .. container:: verbose
4903 .. container:: verbose
4894
4904
4895 The -t/--terse option abbreviates the output by showing only the directory
4905 The -t/--terse option abbreviates the output by showing only the directory
4896 name if all the files in it share the same status. The option takes an
4906 name if all the files in it share the same status. The option takes an
4897 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4907 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4898 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4908 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4899 for 'ignored' and 'c' for clean.
4909 for 'ignored' and 'c' for clean.
4900
4910
4901 It abbreviates only those statuses which are passed. Note that clean and
4911 It abbreviates only those statuses which are passed. Note that clean and
4902 ignored files are not displayed with '--terse ic' unless the -c/--clean
4912 ignored files are not displayed with '--terse ic' unless the -c/--clean
4903 and -i/--ignored options are also used.
4913 and -i/--ignored options are also used.
4904
4914
4905 The -v/--verbose option shows information when the repository is in an
4915 The -v/--verbose option shows information when the repository is in an
4906 unfinished merge, shelve, rebase state etc. You can have this behavior
4916 unfinished merge, shelve, rebase state etc. You can have this behavior
4907 turned on by default by enabling the ``commands.status.verbose`` option.
4917 turned on by default by enabling the ``commands.status.verbose`` option.
4908
4918
4909 You can skip displaying some of these states by setting
4919 You can skip displaying some of these states by setting
4910 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4920 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4911 'histedit', 'merge', 'rebase', or 'unshelve'.
4921 'histedit', 'merge', 'rebase', or 'unshelve'.
4912
4922
4913 Examples:
4923 Examples:
4914
4924
4915 - show changes in the working directory relative to a
4925 - show changes in the working directory relative to a
4916 changeset::
4926 changeset::
4917
4927
4918 hg status --rev 9353
4928 hg status --rev 9353
4919
4929
4920 - show changes in the working directory relative to the
4930 - show changes in the working directory relative to the
4921 current directory (see :hg:`help patterns` for more information)::
4931 current directory (see :hg:`help patterns` for more information)::
4922
4932
4923 hg status re:
4933 hg status re:
4924
4934
4925 - show all changes including copies in an existing changeset::
4935 - show all changes including copies in an existing changeset::
4926
4936
4927 hg status --copies --change 9353
4937 hg status --copies --change 9353
4928
4938
4929 - get a NUL separated list of added files, suitable for xargs::
4939 - get a NUL separated list of added files, suitable for xargs::
4930
4940
4931 hg status -an0
4941 hg status -an0
4932
4942
4933 - show more information about the repository status, abbreviating
4943 - show more information about the repository status, abbreviating
4934 added, removed, modified, deleted, and untracked paths::
4944 added, removed, modified, deleted, and untracked paths::
4935
4945
4936 hg status -v -t mardu
4946 hg status -v -t mardu
4937
4947
4938 Returns 0 on success.
4948 Returns 0 on success.
4939
4949
4940 """
4950 """
4941
4951
4942 opts = pycompat.byteskwargs(opts)
4952 opts = pycompat.byteskwargs(opts)
4943 revs = opts.get('rev')
4953 revs = opts.get('rev')
4944 change = opts.get('change')
4954 change = opts.get('change')
4945 terse = opts.get('terse')
4955 terse = opts.get('terse')
4946 if terse is _NOTTERSE:
4956 if terse is _NOTTERSE:
4947 if revs:
4957 if revs:
4948 terse = ''
4958 terse = ''
4949 else:
4959 else:
4950 terse = ui.config('commands', 'status.terse')
4960 terse = ui.config('commands', 'status.terse')
4951
4961
4952 if revs and change:
4962 if revs and change:
4953 msg = _('cannot specify --rev and --change at the same time')
4963 msg = _('cannot specify --rev and --change at the same time')
4954 raise error.Abort(msg)
4964 raise error.Abort(msg)
4955 elif revs and terse:
4965 elif revs and terse:
4956 msg = _('cannot use --terse with --rev')
4966 msg = _('cannot use --terse with --rev')
4957 raise error.Abort(msg)
4967 raise error.Abort(msg)
4958 elif change:
4968 elif change:
4959 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4969 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4960 ctx2 = scmutil.revsingle(repo, change, None)
4970 ctx2 = scmutil.revsingle(repo, change, None)
4961 ctx1 = ctx2.p1()
4971 ctx1 = ctx2.p1()
4962 else:
4972 else:
4963 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4973 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4964 ctx1, ctx2 = scmutil.revpair(repo, revs)
4974 ctx1, ctx2 = scmutil.revpair(repo, revs)
4965
4975
4966 if pats or ui.configbool('commands', 'status.relative'):
4976 if pats or ui.configbool('commands', 'status.relative'):
4967 cwd = repo.getcwd()
4977 cwd = repo.getcwd()
4968 else:
4978 else:
4969 cwd = ''
4979 cwd = ''
4970
4980
4971 if opts.get('print0'):
4981 if opts.get('print0'):
4972 end = '\0'
4982 end = '\0'
4973 else:
4983 else:
4974 end = '\n'
4984 end = '\n'
4975 copy = {}
4985 copy = {}
4976 states = 'modified added removed deleted unknown ignored clean'.split()
4986 states = 'modified added removed deleted unknown ignored clean'.split()
4977 show = [k for k in states if opts.get(k)]
4987 show = [k for k in states if opts.get(k)]
4978 if opts.get('all'):
4988 if opts.get('all'):
4979 show += ui.quiet and (states[:4] + ['clean']) or states
4989 show += ui.quiet and (states[:4] + ['clean']) or states
4980
4990
4981 if not show:
4991 if not show:
4982 if ui.quiet:
4992 if ui.quiet:
4983 show = states[:4]
4993 show = states[:4]
4984 else:
4994 else:
4985 show = states[:5]
4995 show = states[:5]
4986
4996
4987 m = scmutil.match(ctx2, pats, opts)
4997 m = scmutil.match(ctx2, pats, opts)
4988 if terse:
4998 if terse:
4989 # we need to compute clean and unknown to terse
4999 # we need to compute clean and unknown to terse
4990 stat = repo.status(ctx1.node(), ctx2.node(), m,
5000 stat = repo.status(ctx1.node(), ctx2.node(), m,
4991 'ignored' in show or 'i' in terse,
5001 'ignored' in show or 'i' in terse,
4992 True, True, opts.get('subrepos'))
5002 True, True, opts.get('subrepos'))
4993
5003
4994 stat = cmdutil.tersedir(stat, terse)
5004 stat = cmdutil.tersedir(stat, terse)
4995 else:
5005 else:
4996 stat = repo.status(ctx1.node(), ctx2.node(), m,
5006 stat = repo.status(ctx1.node(), ctx2.node(), m,
4997 'ignored' in show, 'clean' in show,
5007 'ignored' in show, 'clean' in show,
4998 'unknown' in show, opts.get('subrepos'))
5008 'unknown' in show, opts.get('subrepos'))
4999
5009
5000 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5010 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5001
5011
5002 if (opts.get('all') or opts.get('copies')
5012 if (opts.get('all') or opts.get('copies')
5003 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5013 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5004 copy = copies.pathcopies(ctx1, ctx2, m)
5014 copy = copies.pathcopies(ctx1, ctx2, m)
5005
5015
5006 ui.pager('status')
5016 ui.pager('status')
5007 fm = ui.formatter('status', opts)
5017 fm = ui.formatter('status', opts)
5008 fmt = '%s' + end
5018 fmt = '%s' + end
5009 showchar = not opts.get('no_status')
5019 showchar = not opts.get('no_status')
5010
5020
5011 for state, char, files in changestates:
5021 for state, char, files in changestates:
5012 if state in show:
5022 if state in show:
5013 label = 'status.' + state
5023 label = 'status.' + state
5014 for f in files:
5024 for f in files:
5015 fm.startitem()
5025 fm.startitem()
5016 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5026 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5017 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5027 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5018 if f in copy:
5028 if f in copy:
5019 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5029 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5020 label='status.copied')
5030 label='status.copied')
5021
5031
5022 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5032 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5023 and not ui.plain()):
5033 and not ui.plain()):
5024 cmdutil.morestatus(repo, fm)
5034 cmdutil.morestatus(repo, fm)
5025 fm.end()
5035 fm.end()
5026
5036
5027 @command('^summary|sum',
5037 @command('^summary|sum',
5028 [('', 'remote', None, _('check for push and pull'))],
5038 [('', 'remote', None, _('check for push and pull'))],
5029 '[--remote]',
5039 '[--remote]',
5030 intents={INTENT_READONLY})
5040 intents={INTENT_READONLY})
5031 def summary(ui, repo, **opts):
5041 def summary(ui, repo, **opts):
5032 """summarize working directory state
5042 """summarize working directory state
5033
5043
5034 This generates a brief summary of the working directory state,
5044 This generates a brief summary of the working directory state,
5035 including parents, branch, commit status, phase and available updates.
5045 including parents, branch, commit status, phase and available updates.
5036
5046
5037 With the --remote option, this will check the default paths for
5047 With the --remote option, this will check the default paths for
5038 incoming and outgoing changes. This can be time-consuming.
5048 incoming and outgoing changes. This can be time-consuming.
5039
5049
5040 Returns 0 on success.
5050 Returns 0 on success.
5041 """
5051 """
5042
5052
5043 opts = pycompat.byteskwargs(opts)
5053 opts = pycompat.byteskwargs(opts)
5044 ui.pager('summary')
5054 ui.pager('summary')
5045 ctx = repo[None]
5055 ctx = repo[None]
5046 parents = ctx.parents()
5056 parents = ctx.parents()
5047 pnode = parents[0].node()
5057 pnode = parents[0].node()
5048 marks = []
5058 marks = []
5049
5059
5050 ms = None
5060 ms = None
5051 try:
5061 try:
5052 ms = mergemod.mergestate.read(repo)
5062 ms = mergemod.mergestate.read(repo)
5053 except error.UnsupportedMergeRecords as e:
5063 except error.UnsupportedMergeRecords as e:
5054 s = ' '.join(e.recordtypes)
5064 s = ' '.join(e.recordtypes)
5055 ui.warn(
5065 ui.warn(
5056 _('warning: merge state has unsupported record types: %s\n') % s)
5066 _('warning: merge state has unsupported record types: %s\n') % s)
5057 unresolved = []
5067 unresolved = []
5058 else:
5068 else:
5059 unresolved = list(ms.unresolved())
5069 unresolved = list(ms.unresolved())
5060
5070
5061 for p in parents:
5071 for p in parents:
5062 # label with log.changeset (instead of log.parent) since this
5072 # label with log.changeset (instead of log.parent) since this
5063 # shows a working directory parent *changeset*:
5073 # shows a working directory parent *changeset*:
5064 # i18n: column positioning for "hg summary"
5074 # i18n: column positioning for "hg summary"
5065 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5075 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5066 label=logcmdutil.changesetlabels(p))
5076 label=logcmdutil.changesetlabels(p))
5067 ui.write(' '.join(p.tags()), label='log.tag')
5077 ui.write(' '.join(p.tags()), label='log.tag')
5068 if p.bookmarks():
5078 if p.bookmarks():
5069 marks.extend(p.bookmarks())
5079 marks.extend(p.bookmarks())
5070 if p.rev() == -1:
5080 if p.rev() == -1:
5071 if not len(repo):
5081 if not len(repo):
5072 ui.write(_(' (empty repository)'))
5082 ui.write(_(' (empty repository)'))
5073 else:
5083 else:
5074 ui.write(_(' (no revision checked out)'))
5084 ui.write(_(' (no revision checked out)'))
5075 if p.obsolete():
5085 if p.obsolete():
5076 ui.write(_(' (obsolete)'))
5086 ui.write(_(' (obsolete)'))
5077 if p.isunstable():
5087 if p.isunstable():
5078 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5088 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5079 for instability in p.instabilities())
5089 for instability in p.instabilities())
5080 ui.write(' ('
5090 ui.write(' ('
5081 + ', '.join(instabilities)
5091 + ', '.join(instabilities)
5082 + ')')
5092 + ')')
5083 ui.write('\n')
5093 ui.write('\n')
5084 if p.description():
5094 if p.description():
5085 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5095 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5086 label='log.summary')
5096 label='log.summary')
5087
5097
5088 branch = ctx.branch()
5098 branch = ctx.branch()
5089 bheads = repo.branchheads(branch)
5099 bheads = repo.branchheads(branch)
5090 # i18n: column positioning for "hg summary"
5100 # i18n: column positioning for "hg summary"
5091 m = _('branch: %s\n') % branch
5101 m = _('branch: %s\n') % branch
5092 if branch != 'default':
5102 if branch != 'default':
5093 ui.write(m, label='log.branch')
5103 ui.write(m, label='log.branch')
5094 else:
5104 else:
5095 ui.status(m, label='log.branch')
5105 ui.status(m, label='log.branch')
5096
5106
5097 if marks:
5107 if marks:
5098 active = repo._activebookmark
5108 active = repo._activebookmark
5099 # i18n: column positioning for "hg summary"
5109 # i18n: column positioning for "hg summary"
5100 ui.write(_('bookmarks:'), label='log.bookmark')
5110 ui.write(_('bookmarks:'), label='log.bookmark')
5101 if active is not None:
5111 if active is not None:
5102 if active in marks:
5112 if active in marks:
5103 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5113 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5104 marks.remove(active)
5114 marks.remove(active)
5105 else:
5115 else:
5106 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5116 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5107 for m in marks:
5117 for m in marks:
5108 ui.write(' ' + m, label='log.bookmark')
5118 ui.write(' ' + m, label='log.bookmark')
5109 ui.write('\n', label='log.bookmark')
5119 ui.write('\n', label='log.bookmark')
5110
5120
5111 status = repo.status(unknown=True)
5121 status = repo.status(unknown=True)
5112
5122
5113 c = repo.dirstate.copies()
5123 c = repo.dirstate.copies()
5114 copied, renamed = [], []
5124 copied, renamed = [], []
5115 for d, s in c.iteritems():
5125 for d, s in c.iteritems():
5116 if s in status.removed:
5126 if s in status.removed:
5117 status.removed.remove(s)
5127 status.removed.remove(s)
5118 renamed.append(d)
5128 renamed.append(d)
5119 else:
5129 else:
5120 copied.append(d)
5130 copied.append(d)
5121 if d in status.added:
5131 if d in status.added:
5122 status.added.remove(d)
5132 status.added.remove(d)
5123
5133
5124 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5134 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5125
5135
5126 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5136 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5127 (ui.label(_('%d added'), 'status.added'), status.added),
5137 (ui.label(_('%d added'), 'status.added'), status.added),
5128 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5138 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5129 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5139 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5130 (ui.label(_('%d copied'), 'status.copied'), copied),
5140 (ui.label(_('%d copied'), 'status.copied'), copied),
5131 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5141 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5132 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5142 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5133 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5143 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5134 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5144 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5135 t = []
5145 t = []
5136 for l, s in labels:
5146 for l, s in labels:
5137 if s:
5147 if s:
5138 t.append(l % len(s))
5148 t.append(l % len(s))
5139
5149
5140 t = ', '.join(t)
5150 t = ', '.join(t)
5141 cleanworkdir = False
5151 cleanworkdir = False
5142
5152
5143 if repo.vfs.exists('graftstate'):
5153 if repo.vfs.exists('graftstate'):
5144 t += _(' (graft in progress)')
5154 t += _(' (graft in progress)')
5145 if repo.vfs.exists('updatestate'):
5155 if repo.vfs.exists('updatestate'):
5146 t += _(' (interrupted update)')
5156 t += _(' (interrupted update)')
5147 elif len(parents) > 1:
5157 elif len(parents) > 1:
5148 t += _(' (merge)')
5158 t += _(' (merge)')
5149 elif branch != parents[0].branch():
5159 elif branch != parents[0].branch():
5150 t += _(' (new branch)')
5160 t += _(' (new branch)')
5151 elif (parents[0].closesbranch() and
5161 elif (parents[0].closesbranch() and
5152 pnode in repo.branchheads(branch, closed=True)):
5162 pnode in repo.branchheads(branch, closed=True)):
5153 t += _(' (head closed)')
5163 t += _(' (head closed)')
5154 elif not (status.modified or status.added or status.removed or renamed or
5164 elif not (status.modified or status.added or status.removed or renamed or
5155 copied or subs):
5165 copied or subs):
5156 t += _(' (clean)')
5166 t += _(' (clean)')
5157 cleanworkdir = True
5167 cleanworkdir = True
5158 elif pnode not in bheads:
5168 elif pnode not in bheads:
5159 t += _(' (new branch head)')
5169 t += _(' (new branch head)')
5160
5170
5161 if parents:
5171 if parents:
5162 pendingphase = max(p.phase() for p in parents)
5172 pendingphase = max(p.phase() for p in parents)
5163 else:
5173 else:
5164 pendingphase = phases.public
5174 pendingphase = phases.public
5165
5175
5166 if pendingphase > phases.newcommitphase(ui):
5176 if pendingphase > phases.newcommitphase(ui):
5167 t += ' (%s)' % phases.phasenames[pendingphase]
5177 t += ' (%s)' % phases.phasenames[pendingphase]
5168
5178
5169 if cleanworkdir:
5179 if cleanworkdir:
5170 # i18n: column positioning for "hg summary"
5180 # i18n: column positioning for "hg summary"
5171 ui.status(_('commit: %s\n') % t.strip())
5181 ui.status(_('commit: %s\n') % t.strip())
5172 else:
5182 else:
5173 # i18n: column positioning for "hg summary"
5183 # i18n: column positioning for "hg summary"
5174 ui.write(_('commit: %s\n') % t.strip())
5184 ui.write(_('commit: %s\n') % t.strip())
5175
5185
5176 # all ancestors of branch heads - all ancestors of parent = new csets
5186 # all ancestors of branch heads - all ancestors of parent = new csets
5177 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5187 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5178 bheads))
5188 bheads))
5179
5189
5180 if new == 0:
5190 if new == 0:
5181 # i18n: column positioning for "hg summary"
5191 # i18n: column positioning for "hg summary"
5182 ui.status(_('update: (current)\n'))
5192 ui.status(_('update: (current)\n'))
5183 elif pnode not in bheads:
5193 elif pnode not in bheads:
5184 # i18n: column positioning for "hg summary"
5194 # i18n: column positioning for "hg summary"
5185 ui.write(_('update: %d new changesets (update)\n') % new)
5195 ui.write(_('update: %d new changesets (update)\n') % new)
5186 else:
5196 else:
5187 # i18n: column positioning for "hg summary"
5197 # i18n: column positioning for "hg summary"
5188 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5198 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5189 (new, len(bheads)))
5199 (new, len(bheads)))
5190
5200
5191 t = []
5201 t = []
5192 draft = len(repo.revs('draft()'))
5202 draft = len(repo.revs('draft()'))
5193 if draft:
5203 if draft:
5194 t.append(_('%d draft') % draft)
5204 t.append(_('%d draft') % draft)
5195 secret = len(repo.revs('secret()'))
5205 secret = len(repo.revs('secret()'))
5196 if secret:
5206 if secret:
5197 t.append(_('%d secret') % secret)
5207 t.append(_('%d secret') % secret)
5198
5208
5199 if draft or secret:
5209 if draft or secret:
5200 ui.status(_('phases: %s\n') % ', '.join(t))
5210 ui.status(_('phases: %s\n') % ', '.join(t))
5201
5211
5202 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5212 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5203 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5213 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5204 numtrouble = len(repo.revs(trouble + "()"))
5214 numtrouble = len(repo.revs(trouble + "()"))
5205 # We write all the possibilities to ease translation
5215 # We write all the possibilities to ease translation
5206 troublemsg = {
5216 troublemsg = {
5207 "orphan": _("orphan: %d changesets"),
5217 "orphan": _("orphan: %d changesets"),
5208 "contentdivergent": _("content-divergent: %d changesets"),
5218 "contentdivergent": _("content-divergent: %d changesets"),
5209 "phasedivergent": _("phase-divergent: %d changesets"),
5219 "phasedivergent": _("phase-divergent: %d changesets"),
5210 }
5220 }
5211 if numtrouble > 0:
5221 if numtrouble > 0:
5212 ui.status(troublemsg[trouble] % numtrouble + "\n")
5222 ui.status(troublemsg[trouble] % numtrouble + "\n")
5213
5223
5214 cmdutil.summaryhooks(ui, repo)
5224 cmdutil.summaryhooks(ui, repo)
5215
5225
5216 if opts.get('remote'):
5226 if opts.get('remote'):
5217 needsincoming, needsoutgoing = True, True
5227 needsincoming, needsoutgoing = True, True
5218 else:
5228 else:
5219 needsincoming, needsoutgoing = False, False
5229 needsincoming, needsoutgoing = False, False
5220 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5230 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5221 if i:
5231 if i:
5222 needsincoming = True
5232 needsincoming = True
5223 if o:
5233 if o:
5224 needsoutgoing = True
5234 needsoutgoing = True
5225 if not needsincoming and not needsoutgoing:
5235 if not needsincoming and not needsoutgoing:
5226 return
5236 return
5227
5237
5228 def getincoming():
5238 def getincoming():
5229 source, branches = hg.parseurl(ui.expandpath('default'))
5239 source, branches = hg.parseurl(ui.expandpath('default'))
5230 sbranch = branches[0]
5240 sbranch = branches[0]
5231 try:
5241 try:
5232 other = hg.peer(repo, {}, source)
5242 other = hg.peer(repo, {}, source)
5233 except error.RepoError:
5243 except error.RepoError:
5234 if opts.get('remote'):
5244 if opts.get('remote'):
5235 raise
5245 raise
5236 return source, sbranch, None, None, None
5246 return source, sbranch, None, None, None
5237 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5247 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5238 if revs:
5248 if revs:
5239 revs = [other.lookup(rev) for rev in revs]
5249 revs = [other.lookup(rev) for rev in revs]
5240 ui.debug('comparing with %s\n' % util.hidepassword(source))
5250 ui.debug('comparing with %s\n' % util.hidepassword(source))
5241 repo.ui.pushbuffer()
5251 repo.ui.pushbuffer()
5242 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5252 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5243 repo.ui.popbuffer()
5253 repo.ui.popbuffer()
5244 return source, sbranch, other, commoninc, commoninc[1]
5254 return source, sbranch, other, commoninc, commoninc[1]
5245
5255
5246 if needsincoming:
5256 if needsincoming:
5247 source, sbranch, sother, commoninc, incoming = getincoming()
5257 source, sbranch, sother, commoninc, incoming = getincoming()
5248 else:
5258 else:
5249 source = sbranch = sother = commoninc = incoming = None
5259 source = sbranch = sother = commoninc = incoming = None
5250
5260
5251 def getoutgoing():
5261 def getoutgoing():
5252 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5262 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5253 dbranch = branches[0]
5263 dbranch = branches[0]
5254 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5264 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5255 if source != dest:
5265 if source != dest:
5256 try:
5266 try:
5257 dother = hg.peer(repo, {}, dest)
5267 dother = hg.peer(repo, {}, dest)
5258 except error.RepoError:
5268 except error.RepoError:
5259 if opts.get('remote'):
5269 if opts.get('remote'):
5260 raise
5270 raise
5261 return dest, dbranch, None, None
5271 return dest, dbranch, None, None
5262 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5272 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5263 elif sother is None:
5273 elif sother is None:
5264 # there is no explicit destination peer, but source one is invalid
5274 # there is no explicit destination peer, but source one is invalid
5265 return dest, dbranch, None, None
5275 return dest, dbranch, None, None
5266 else:
5276 else:
5267 dother = sother
5277 dother = sother
5268 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5278 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5269 common = None
5279 common = None
5270 else:
5280 else:
5271 common = commoninc
5281 common = commoninc
5272 if revs:
5282 if revs:
5273 revs = [repo.lookup(rev) for rev in revs]
5283 revs = [repo.lookup(rev) for rev in revs]
5274 repo.ui.pushbuffer()
5284 repo.ui.pushbuffer()
5275 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5285 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5276 commoninc=common)
5286 commoninc=common)
5277 repo.ui.popbuffer()
5287 repo.ui.popbuffer()
5278 return dest, dbranch, dother, outgoing
5288 return dest, dbranch, dother, outgoing
5279
5289
5280 if needsoutgoing:
5290 if needsoutgoing:
5281 dest, dbranch, dother, outgoing = getoutgoing()
5291 dest, dbranch, dother, outgoing = getoutgoing()
5282 else:
5292 else:
5283 dest = dbranch = dother = outgoing = None
5293 dest = dbranch = dother = outgoing = None
5284
5294
5285 if opts.get('remote'):
5295 if opts.get('remote'):
5286 t = []
5296 t = []
5287 if incoming:
5297 if incoming:
5288 t.append(_('1 or more incoming'))
5298 t.append(_('1 or more incoming'))
5289 o = outgoing.missing
5299 o = outgoing.missing
5290 if o:
5300 if o:
5291 t.append(_('%d outgoing') % len(o))
5301 t.append(_('%d outgoing') % len(o))
5292 other = dother or sother
5302 other = dother or sother
5293 if 'bookmarks' in other.listkeys('namespaces'):
5303 if 'bookmarks' in other.listkeys('namespaces'):
5294 counts = bookmarks.summary(repo, other)
5304 counts = bookmarks.summary(repo, other)
5295 if counts[0] > 0:
5305 if counts[0] > 0:
5296 t.append(_('%d incoming bookmarks') % counts[0])
5306 t.append(_('%d incoming bookmarks') % counts[0])
5297 if counts[1] > 0:
5307 if counts[1] > 0:
5298 t.append(_('%d outgoing bookmarks') % counts[1])
5308 t.append(_('%d outgoing bookmarks') % counts[1])
5299
5309
5300 if t:
5310 if t:
5301 # i18n: column positioning for "hg summary"
5311 # i18n: column positioning for "hg summary"
5302 ui.write(_('remote: %s\n') % (', '.join(t)))
5312 ui.write(_('remote: %s\n') % (', '.join(t)))
5303 else:
5313 else:
5304 # i18n: column positioning for "hg summary"
5314 # i18n: column positioning for "hg summary"
5305 ui.status(_('remote: (synced)\n'))
5315 ui.status(_('remote: (synced)\n'))
5306
5316
5307 cmdutil.summaryremotehooks(ui, repo, opts,
5317 cmdutil.summaryremotehooks(ui, repo, opts,
5308 ((source, sbranch, sother, commoninc),
5318 ((source, sbranch, sother, commoninc),
5309 (dest, dbranch, dother, outgoing)))
5319 (dest, dbranch, dother, outgoing)))
5310
5320
5311 @command('tag',
5321 @command('tag',
5312 [('f', 'force', None, _('force tag')),
5322 [('f', 'force', None, _('force tag')),
5313 ('l', 'local', None, _('make the tag local')),
5323 ('l', 'local', None, _('make the tag local')),
5314 ('r', 'rev', '', _('revision to tag'), _('REV')),
5324 ('r', 'rev', '', _('revision to tag'), _('REV')),
5315 ('', 'remove', None, _('remove a tag')),
5325 ('', 'remove', None, _('remove a tag')),
5316 # -l/--local is already there, commitopts cannot be used
5326 # -l/--local is already there, commitopts cannot be used
5317 ('e', 'edit', None, _('invoke editor on commit messages')),
5327 ('e', 'edit', None, _('invoke editor on commit messages')),
5318 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5328 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5319 ] + commitopts2,
5329 ] + commitopts2,
5320 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5330 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5321 def tag(ui, repo, name1, *names, **opts):
5331 def tag(ui, repo, name1, *names, **opts):
5322 """add one or more tags for the current or given revision
5332 """add one or more tags for the current or given revision
5323
5333
5324 Name a particular revision using <name>.
5334 Name a particular revision using <name>.
5325
5335
5326 Tags are used to name particular revisions of the repository and are
5336 Tags are used to name particular revisions of the repository and are
5327 very useful to compare different revisions, to go back to significant
5337 very useful to compare different revisions, to go back to significant
5328 earlier versions or to mark branch points as releases, etc. Changing
5338 earlier versions or to mark branch points as releases, etc. Changing
5329 an existing tag is normally disallowed; use -f/--force to override.
5339 an existing tag is normally disallowed; use -f/--force to override.
5330
5340
5331 If no revision is given, the parent of the working directory is
5341 If no revision is given, the parent of the working directory is
5332 used.
5342 used.
5333
5343
5334 To facilitate version control, distribution, and merging of tags,
5344 To facilitate version control, distribution, and merging of tags,
5335 they are stored as a file named ".hgtags" which is managed similarly
5345 they are stored as a file named ".hgtags" which is managed similarly
5336 to other project files and can be hand-edited if necessary. This
5346 to other project files and can be hand-edited if necessary. This
5337 also means that tagging creates a new commit. The file
5347 also means that tagging creates a new commit. The file
5338 ".hg/localtags" is used for local tags (not shared among
5348 ".hg/localtags" is used for local tags (not shared among
5339 repositories).
5349 repositories).
5340
5350
5341 Tag commits are usually made at the head of a branch. If the parent
5351 Tag commits are usually made at the head of a branch. If the parent
5342 of the working directory is not a branch head, :hg:`tag` aborts; use
5352 of the working directory is not a branch head, :hg:`tag` aborts; use
5343 -f/--force to force the tag commit to be based on a non-head
5353 -f/--force to force the tag commit to be based on a non-head
5344 changeset.
5354 changeset.
5345
5355
5346 See :hg:`help dates` for a list of formats valid for -d/--date.
5356 See :hg:`help dates` for a list of formats valid for -d/--date.
5347
5357
5348 Since tag names have priority over branch names during revision
5358 Since tag names have priority over branch names during revision
5349 lookup, using an existing branch name as a tag name is discouraged.
5359 lookup, using an existing branch name as a tag name is discouraged.
5350
5360
5351 Returns 0 on success.
5361 Returns 0 on success.
5352 """
5362 """
5353 opts = pycompat.byteskwargs(opts)
5363 opts = pycompat.byteskwargs(opts)
5354 wlock = lock = None
5364 wlock = lock = None
5355 try:
5365 try:
5356 wlock = repo.wlock()
5366 wlock = repo.wlock()
5357 lock = repo.lock()
5367 lock = repo.lock()
5358 rev_ = "."
5368 rev_ = "."
5359 names = [t.strip() for t in (name1,) + names]
5369 names = [t.strip() for t in (name1,) + names]
5360 if len(names) != len(set(names)):
5370 if len(names) != len(set(names)):
5361 raise error.Abort(_('tag names must be unique'))
5371 raise error.Abort(_('tag names must be unique'))
5362 for n in names:
5372 for n in names:
5363 scmutil.checknewlabel(repo, n, 'tag')
5373 scmutil.checknewlabel(repo, n, 'tag')
5364 if not n:
5374 if not n:
5365 raise error.Abort(_('tag names cannot consist entirely of '
5375 raise error.Abort(_('tag names cannot consist entirely of '
5366 'whitespace'))
5376 'whitespace'))
5367 if opts.get('rev') and opts.get('remove'):
5377 if opts.get('rev') and opts.get('remove'):
5368 raise error.Abort(_("--rev and --remove are incompatible"))
5378 raise error.Abort(_("--rev and --remove are incompatible"))
5369 if opts.get('rev'):
5379 if opts.get('rev'):
5370 rev_ = opts['rev']
5380 rev_ = opts['rev']
5371 message = opts.get('message')
5381 message = opts.get('message')
5372 if opts.get('remove'):
5382 if opts.get('remove'):
5373 if opts.get('local'):
5383 if opts.get('local'):
5374 expectedtype = 'local'
5384 expectedtype = 'local'
5375 else:
5385 else:
5376 expectedtype = 'global'
5386 expectedtype = 'global'
5377
5387
5378 for n in names:
5388 for n in names:
5379 if not repo.tagtype(n):
5389 if not repo.tagtype(n):
5380 raise error.Abort(_("tag '%s' does not exist") % n)
5390 raise error.Abort(_("tag '%s' does not exist") % n)
5381 if repo.tagtype(n) != expectedtype:
5391 if repo.tagtype(n) != expectedtype:
5382 if expectedtype == 'global':
5392 if expectedtype == 'global':
5383 raise error.Abort(_("tag '%s' is not a global tag") % n)
5393 raise error.Abort(_("tag '%s' is not a global tag") % n)
5384 else:
5394 else:
5385 raise error.Abort(_("tag '%s' is not a local tag") % n)
5395 raise error.Abort(_("tag '%s' is not a local tag") % n)
5386 rev_ = 'null'
5396 rev_ = 'null'
5387 if not message:
5397 if not message:
5388 # we don't translate commit messages
5398 # we don't translate commit messages
5389 message = 'Removed tag %s' % ', '.join(names)
5399 message = 'Removed tag %s' % ', '.join(names)
5390 elif not opts.get('force'):
5400 elif not opts.get('force'):
5391 for n in names:
5401 for n in names:
5392 if n in repo.tags():
5402 if n in repo.tags():
5393 raise error.Abort(_("tag '%s' already exists "
5403 raise error.Abort(_("tag '%s' already exists "
5394 "(use -f to force)") % n)
5404 "(use -f to force)") % n)
5395 if not opts.get('local'):
5405 if not opts.get('local'):
5396 p1, p2 = repo.dirstate.parents()
5406 p1, p2 = repo.dirstate.parents()
5397 if p2 != nullid:
5407 if p2 != nullid:
5398 raise error.Abort(_('uncommitted merge'))
5408 raise error.Abort(_('uncommitted merge'))
5399 bheads = repo.branchheads()
5409 bheads = repo.branchheads()
5400 if not opts.get('force') and bheads and p1 not in bheads:
5410 if not opts.get('force') and bheads and p1 not in bheads:
5401 raise error.Abort(_('working directory is not at a branch head '
5411 raise error.Abort(_('working directory is not at a branch head '
5402 '(use -f to force)'))
5412 '(use -f to force)'))
5403 node = scmutil.revsingle(repo, rev_).node()
5413 node = scmutil.revsingle(repo, rev_).node()
5404
5414
5405 if not message:
5415 if not message:
5406 # we don't translate commit messages
5416 # we don't translate commit messages
5407 message = ('Added tag %s for changeset %s' %
5417 message = ('Added tag %s for changeset %s' %
5408 (', '.join(names), short(node)))
5418 (', '.join(names), short(node)))
5409
5419
5410 date = opts.get('date')
5420 date = opts.get('date')
5411 if date:
5421 if date:
5412 date = dateutil.parsedate(date)
5422 date = dateutil.parsedate(date)
5413
5423
5414 if opts.get('remove'):
5424 if opts.get('remove'):
5415 editform = 'tag.remove'
5425 editform = 'tag.remove'
5416 else:
5426 else:
5417 editform = 'tag.add'
5427 editform = 'tag.add'
5418 editor = cmdutil.getcommiteditor(editform=editform,
5428 editor = cmdutil.getcommiteditor(editform=editform,
5419 **pycompat.strkwargs(opts))
5429 **pycompat.strkwargs(opts))
5420
5430
5421 # don't allow tagging the null rev
5431 # don't allow tagging the null rev
5422 if (not opts.get('remove') and
5432 if (not opts.get('remove') and
5423 scmutil.revsingle(repo, rev_).rev() == nullrev):
5433 scmutil.revsingle(repo, rev_).rev() == nullrev):
5424 raise error.Abort(_("cannot tag null revision"))
5434 raise error.Abort(_("cannot tag null revision"))
5425
5435
5426 tagsmod.tag(repo, names, node, message, opts.get('local'),
5436 tagsmod.tag(repo, names, node, message, opts.get('local'),
5427 opts.get('user'), date, editor=editor)
5437 opts.get('user'), date, editor=editor)
5428 finally:
5438 finally:
5429 release(lock, wlock)
5439 release(lock, wlock)
5430
5440
5431 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5441 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5432 def tags(ui, repo, **opts):
5442 def tags(ui, repo, **opts):
5433 """list repository tags
5443 """list repository tags
5434
5444
5435 This lists both regular and local tags. When the -v/--verbose
5445 This lists both regular and local tags. When the -v/--verbose
5436 switch is used, a third column "local" is printed for local tags.
5446 switch is used, a third column "local" is printed for local tags.
5437 When the -q/--quiet switch is used, only the tag name is printed.
5447 When the -q/--quiet switch is used, only the tag name is printed.
5438
5448
5439 Returns 0 on success.
5449 Returns 0 on success.
5440 """
5450 """
5441
5451
5442 opts = pycompat.byteskwargs(opts)
5452 opts = pycompat.byteskwargs(opts)
5443 ui.pager('tags')
5453 ui.pager('tags')
5444 fm = ui.formatter('tags', opts)
5454 fm = ui.formatter('tags', opts)
5445 hexfunc = fm.hexfunc
5455 hexfunc = fm.hexfunc
5446 tagtype = ""
5456 tagtype = ""
5447
5457
5448 for t, n in reversed(repo.tagslist()):
5458 for t, n in reversed(repo.tagslist()):
5449 hn = hexfunc(n)
5459 hn = hexfunc(n)
5450 label = 'tags.normal'
5460 label = 'tags.normal'
5451 tagtype = ''
5461 tagtype = ''
5452 if repo.tagtype(t) == 'local':
5462 if repo.tagtype(t) == 'local':
5453 label = 'tags.local'
5463 label = 'tags.local'
5454 tagtype = 'local'
5464 tagtype = 'local'
5455
5465
5456 fm.startitem()
5466 fm.startitem()
5457 fm.write('tag', '%s', t, label=label)
5467 fm.write('tag', '%s', t, label=label)
5458 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5468 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5459 fm.condwrite(not ui.quiet, 'rev node', fmt,
5469 fm.condwrite(not ui.quiet, 'rev node', fmt,
5460 repo.changelog.rev(n), hn, label=label)
5470 repo.changelog.rev(n), hn, label=label)
5461 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5471 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5462 tagtype, label=label)
5472 tagtype, label=label)
5463 fm.plain('\n')
5473 fm.plain('\n')
5464 fm.end()
5474 fm.end()
5465
5475
5466 @command('tip',
5476 @command('tip',
5467 [('p', 'patch', None, _('show patch')),
5477 [('p', 'patch', None, _('show patch')),
5468 ('g', 'git', None, _('use git extended diff format')),
5478 ('g', 'git', None, _('use git extended diff format')),
5469 ] + templateopts,
5479 ] + templateopts,
5470 _('[-p] [-g]'))
5480 _('[-p] [-g]'))
5471 def tip(ui, repo, **opts):
5481 def tip(ui, repo, **opts):
5472 """show the tip revision (DEPRECATED)
5482 """show the tip revision (DEPRECATED)
5473
5483
5474 The tip revision (usually just called the tip) is the changeset
5484 The tip revision (usually just called the tip) is the changeset
5475 most recently added to the repository (and therefore the most
5485 most recently added to the repository (and therefore the most
5476 recently changed head).
5486 recently changed head).
5477
5487
5478 If you have just made a commit, that commit will be the tip. If
5488 If you have just made a commit, that commit will be the tip. If
5479 you have just pulled changes from another repository, the tip of
5489 you have just pulled changes from another repository, the tip of
5480 that repository becomes the current tip. The "tip" tag is special
5490 that repository becomes the current tip. The "tip" tag is special
5481 and cannot be renamed or assigned to a different changeset.
5491 and cannot be renamed or assigned to a different changeset.
5482
5492
5483 This command is deprecated, please use :hg:`heads` instead.
5493 This command is deprecated, please use :hg:`heads` instead.
5484
5494
5485 Returns 0 on success.
5495 Returns 0 on success.
5486 """
5496 """
5487 opts = pycompat.byteskwargs(opts)
5497 opts = pycompat.byteskwargs(opts)
5488 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5498 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5489 displayer.show(repo['tip'])
5499 displayer.show(repo['tip'])
5490 displayer.close()
5500 displayer.close()
5491
5501
5492 @command('unbundle',
5502 @command('unbundle',
5493 [('u', 'update', None,
5503 [('u', 'update', None,
5494 _('update to new branch head if changesets were unbundled'))],
5504 _('update to new branch head if changesets were unbundled'))],
5495 _('[-u] FILE...'))
5505 _('[-u] FILE...'))
5496 def unbundle(ui, repo, fname1, *fnames, **opts):
5506 def unbundle(ui, repo, fname1, *fnames, **opts):
5497 """apply one or more bundle files
5507 """apply one or more bundle files
5498
5508
5499 Apply one or more bundle files generated by :hg:`bundle`.
5509 Apply one or more bundle files generated by :hg:`bundle`.
5500
5510
5501 Returns 0 on success, 1 if an update has unresolved files.
5511 Returns 0 on success, 1 if an update has unresolved files.
5502 """
5512 """
5503 fnames = (fname1,) + fnames
5513 fnames = (fname1,) + fnames
5504
5514
5505 with repo.lock():
5515 with repo.lock():
5506 for fname in fnames:
5516 for fname in fnames:
5507 f = hg.openpath(ui, fname)
5517 f = hg.openpath(ui, fname)
5508 gen = exchange.readbundle(ui, f, fname)
5518 gen = exchange.readbundle(ui, f, fname)
5509 if isinstance(gen, streamclone.streamcloneapplier):
5519 if isinstance(gen, streamclone.streamcloneapplier):
5510 raise error.Abort(
5520 raise error.Abort(
5511 _('packed bundles cannot be applied with '
5521 _('packed bundles cannot be applied with '
5512 '"hg unbundle"'),
5522 '"hg unbundle"'),
5513 hint=_('use "hg debugapplystreamclonebundle"'))
5523 hint=_('use "hg debugapplystreamclonebundle"'))
5514 url = 'bundle:' + fname
5524 url = 'bundle:' + fname
5515 try:
5525 try:
5516 txnname = 'unbundle'
5526 txnname = 'unbundle'
5517 if not isinstance(gen, bundle2.unbundle20):
5527 if not isinstance(gen, bundle2.unbundle20):
5518 txnname = 'unbundle\n%s' % util.hidepassword(url)
5528 txnname = 'unbundle\n%s' % util.hidepassword(url)
5519 with repo.transaction(txnname) as tr:
5529 with repo.transaction(txnname) as tr:
5520 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5530 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5521 url=url)
5531 url=url)
5522 except error.BundleUnknownFeatureError as exc:
5532 except error.BundleUnknownFeatureError as exc:
5523 raise error.Abort(
5533 raise error.Abort(
5524 _('%s: unknown bundle feature, %s') % (fname, exc),
5534 _('%s: unknown bundle feature, %s') % (fname, exc),
5525 hint=_("see https://mercurial-scm.org/"
5535 hint=_("see https://mercurial-scm.org/"
5526 "wiki/BundleFeature for more "
5536 "wiki/BundleFeature for more "
5527 "information"))
5537 "information"))
5528 modheads = bundle2.combinechangegroupresults(op)
5538 modheads = bundle2.combinechangegroupresults(op)
5529
5539
5530 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5540 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5531
5541
5532 @command('^update|up|checkout|co',
5542 @command('^update|up|checkout|co',
5533 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5543 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5534 ('c', 'check', None, _('require clean working directory')),
5544 ('c', 'check', None, _('require clean working directory')),
5535 ('m', 'merge', None, _('merge uncommitted changes')),
5545 ('m', 'merge', None, _('merge uncommitted changes')),
5536 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5546 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5537 ('r', 'rev', '', _('revision'), _('REV'))
5547 ('r', 'rev', '', _('revision'), _('REV'))
5538 ] + mergetoolopts,
5548 ] + mergetoolopts,
5539 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5549 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5540 def update(ui, repo, node=None, **opts):
5550 def update(ui, repo, node=None, **opts):
5541 """update working directory (or switch revisions)
5551 """update working directory (or switch revisions)
5542
5552
5543 Update the repository's working directory to the specified
5553 Update the repository's working directory to the specified
5544 changeset. If no changeset is specified, update to the tip of the
5554 changeset. If no changeset is specified, update to the tip of the
5545 current named branch and move the active bookmark (see :hg:`help
5555 current named branch and move the active bookmark (see :hg:`help
5546 bookmarks`).
5556 bookmarks`).
5547
5557
5548 Update sets the working directory's parent revision to the specified
5558 Update sets the working directory's parent revision to the specified
5549 changeset (see :hg:`help parents`).
5559 changeset (see :hg:`help parents`).
5550
5560
5551 If the changeset is not a descendant or ancestor of the working
5561 If the changeset is not a descendant or ancestor of the working
5552 directory's parent and there are uncommitted changes, the update is
5562 directory's parent and there are uncommitted changes, the update is
5553 aborted. With the -c/--check option, the working directory is checked
5563 aborted. With the -c/--check option, the working directory is checked
5554 for uncommitted changes; if none are found, the working directory is
5564 for uncommitted changes; if none are found, the working directory is
5555 updated to the specified changeset.
5565 updated to the specified changeset.
5556
5566
5557 .. container:: verbose
5567 .. container:: verbose
5558
5568
5559 The -C/--clean, -c/--check, and -m/--merge options control what
5569 The -C/--clean, -c/--check, and -m/--merge options control what
5560 happens if the working directory contains uncommitted changes.
5570 happens if the working directory contains uncommitted changes.
5561 At most of one of them can be specified.
5571 At most of one of them can be specified.
5562
5572
5563 1. If no option is specified, and if
5573 1. If no option is specified, and if
5564 the requested changeset is an ancestor or descendant of
5574 the requested changeset is an ancestor or descendant of
5565 the working directory's parent, the uncommitted changes
5575 the working directory's parent, the uncommitted changes
5566 are merged into the requested changeset and the merged
5576 are merged into the requested changeset and the merged
5567 result is left uncommitted. If the requested changeset is
5577 result is left uncommitted. If the requested changeset is
5568 not an ancestor or descendant (that is, it is on another
5578 not an ancestor or descendant (that is, it is on another
5569 branch), the update is aborted and the uncommitted changes
5579 branch), the update is aborted and the uncommitted changes
5570 are preserved.
5580 are preserved.
5571
5581
5572 2. With the -m/--merge option, the update is allowed even if the
5582 2. With the -m/--merge option, the update is allowed even if the
5573 requested changeset is not an ancestor or descendant of
5583 requested changeset is not an ancestor or descendant of
5574 the working directory's parent.
5584 the working directory's parent.
5575
5585
5576 3. With the -c/--check option, the update is aborted and the
5586 3. With the -c/--check option, the update is aborted and the
5577 uncommitted changes are preserved.
5587 uncommitted changes are preserved.
5578
5588
5579 4. With the -C/--clean option, uncommitted changes are discarded and
5589 4. With the -C/--clean option, uncommitted changes are discarded and
5580 the working directory is updated to the requested changeset.
5590 the working directory is updated to the requested changeset.
5581
5591
5582 To cancel an uncommitted merge (and lose your changes), use
5592 To cancel an uncommitted merge (and lose your changes), use
5583 :hg:`merge --abort`.
5593 :hg:`merge --abort`.
5584
5594
5585 Use null as the changeset to remove the working directory (like
5595 Use null as the changeset to remove the working directory (like
5586 :hg:`clone -U`).
5596 :hg:`clone -U`).
5587
5597
5588 If you want to revert just one file to an older revision, use
5598 If you want to revert just one file to an older revision, use
5589 :hg:`revert [-r REV] NAME`.
5599 :hg:`revert [-r REV] NAME`.
5590
5600
5591 See :hg:`help dates` for a list of formats valid for -d/--date.
5601 See :hg:`help dates` for a list of formats valid for -d/--date.
5592
5602
5593 Returns 0 on success, 1 if there are unresolved files.
5603 Returns 0 on success, 1 if there are unresolved files.
5594 """
5604 """
5595 rev = opts.get(r'rev')
5605 rev = opts.get(r'rev')
5596 date = opts.get(r'date')
5606 date = opts.get(r'date')
5597 clean = opts.get(r'clean')
5607 clean = opts.get(r'clean')
5598 check = opts.get(r'check')
5608 check = opts.get(r'check')
5599 merge = opts.get(r'merge')
5609 merge = opts.get(r'merge')
5600 if rev and node:
5610 if rev and node:
5601 raise error.Abort(_("please specify just one revision"))
5611 raise error.Abort(_("please specify just one revision"))
5602
5612
5603 if ui.configbool('commands', 'update.requiredest'):
5613 if ui.configbool('commands', 'update.requiredest'):
5604 if not node and not rev and not date:
5614 if not node and not rev and not date:
5605 raise error.Abort(_('you must specify a destination'),
5615 raise error.Abort(_('you must specify a destination'),
5606 hint=_('for example: hg update ".::"'))
5616 hint=_('for example: hg update ".::"'))
5607
5617
5608 if rev is None or rev == '':
5618 if rev is None or rev == '':
5609 rev = node
5619 rev = node
5610
5620
5611 if date and rev is not None:
5621 if date and rev is not None:
5612 raise error.Abort(_("you can't specify a revision and a date"))
5622 raise error.Abort(_("you can't specify a revision and a date"))
5613
5623
5614 if len([x for x in (clean, check, merge) if x]) > 1:
5624 if len([x for x in (clean, check, merge) if x]) > 1:
5615 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5625 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5616 "or -m/--merge"))
5626 "or -m/--merge"))
5617
5627
5618 updatecheck = None
5628 updatecheck = None
5619 if check:
5629 if check:
5620 updatecheck = 'abort'
5630 updatecheck = 'abort'
5621 elif merge:
5631 elif merge:
5622 updatecheck = 'none'
5632 updatecheck = 'none'
5623
5633
5624 with repo.wlock():
5634 with repo.wlock():
5625 cmdutil.clearunfinished(repo)
5635 cmdutil.clearunfinished(repo)
5626
5636
5627 if date:
5637 if date:
5628 rev = cmdutil.finddate(ui, repo, date)
5638 rev = cmdutil.finddate(ui, repo, date)
5629
5639
5630 # if we defined a bookmark, we have to remember the original name
5640 # if we defined a bookmark, we have to remember the original name
5631 brev = rev
5641 brev = rev
5632 if rev:
5642 if rev:
5633 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5643 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5634 ctx = scmutil.revsingle(repo, rev, rev)
5644 ctx = scmutil.revsingle(repo, rev, rev)
5635 rev = ctx.rev()
5645 rev = ctx.rev()
5636 hidden = ctx.hidden()
5646 hidden = ctx.hidden()
5637 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
5647 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
5638
5648
5639 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5649 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5640 updatecheck=updatecheck)
5650 updatecheck=updatecheck)
5641 if hidden:
5651 if hidden:
5642 ctxstr = ctx.hex()[:12]
5652 ctxstr = ctx.hex()[:12]
5643 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5653 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5644
5654
5645 if ctx.obsolete():
5655 if ctx.obsolete():
5646 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5656 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5647 ui.warn("(%s)\n" % obsfatemsg)
5657 ui.warn("(%s)\n" % obsfatemsg)
5648 return ret
5658 return ret
5649
5659
5650 @command('verify', [])
5660 @command('verify', [])
5651 def verify(ui, repo):
5661 def verify(ui, repo):
5652 """verify the integrity of the repository
5662 """verify the integrity of the repository
5653
5663
5654 Verify the integrity of the current repository.
5664 Verify the integrity of the current repository.
5655
5665
5656 This will perform an extensive check of the repository's
5666 This will perform an extensive check of the repository's
5657 integrity, validating the hashes and checksums of each entry in
5667 integrity, validating the hashes and checksums of each entry in
5658 the changelog, manifest, and tracked files, as well as the
5668 the changelog, manifest, and tracked files, as well as the
5659 integrity of their crosslinks and indices.
5669 integrity of their crosslinks and indices.
5660
5670
5661 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5671 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5662 for more information about recovery from corruption of the
5672 for more information about recovery from corruption of the
5663 repository.
5673 repository.
5664
5674
5665 Returns 0 on success, 1 if errors are encountered.
5675 Returns 0 on success, 1 if errors are encountered.
5666 """
5676 """
5667 return hg.verify(repo)
5677 return hg.verify(repo)
5668
5678
5669 @command('version', [] + formatteropts, norepo=True,
5679 @command('version', [] + formatteropts, norepo=True,
5670 intents={INTENT_READONLY})
5680 intents={INTENT_READONLY})
5671 def version_(ui, **opts):
5681 def version_(ui, **opts):
5672 """output version and copyright information"""
5682 """output version and copyright information"""
5673 opts = pycompat.byteskwargs(opts)
5683 opts = pycompat.byteskwargs(opts)
5674 if ui.verbose:
5684 if ui.verbose:
5675 ui.pager('version')
5685 ui.pager('version')
5676 fm = ui.formatter("version", opts)
5686 fm = ui.formatter("version", opts)
5677 fm.startitem()
5687 fm.startitem()
5678 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5688 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5679 util.version())
5689 util.version())
5680 license = _(
5690 license = _(
5681 "(see https://mercurial-scm.org for more information)\n"
5691 "(see https://mercurial-scm.org for more information)\n"
5682 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5692 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5683 "This is free software; see the source for copying conditions. "
5693 "This is free software; see the source for copying conditions. "
5684 "There is NO\nwarranty; "
5694 "There is NO\nwarranty; "
5685 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5695 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5686 )
5696 )
5687 if not ui.quiet:
5697 if not ui.quiet:
5688 fm.plain(license)
5698 fm.plain(license)
5689
5699
5690 if ui.verbose:
5700 if ui.verbose:
5691 fm.plain(_("\nEnabled extensions:\n\n"))
5701 fm.plain(_("\nEnabled extensions:\n\n"))
5692 # format names and versions into columns
5702 # format names and versions into columns
5693 names = []
5703 names = []
5694 vers = []
5704 vers = []
5695 isinternals = []
5705 isinternals = []
5696 for name, module in extensions.extensions():
5706 for name, module in extensions.extensions():
5697 names.append(name)
5707 names.append(name)
5698 vers.append(extensions.moduleversion(module) or None)
5708 vers.append(extensions.moduleversion(module) or None)
5699 isinternals.append(extensions.ismoduleinternal(module))
5709 isinternals.append(extensions.ismoduleinternal(module))
5700 fn = fm.nested("extensions", tmpl='{name}\n')
5710 fn = fm.nested("extensions", tmpl='{name}\n')
5701 if names:
5711 if names:
5702 namefmt = " %%-%ds " % max(len(n) for n in names)
5712 namefmt = " %%-%ds " % max(len(n) for n in names)
5703 places = [_("external"), _("internal")]
5713 places = [_("external"), _("internal")]
5704 for n, v, p in zip(names, vers, isinternals):
5714 for n, v, p in zip(names, vers, isinternals):
5705 fn.startitem()
5715 fn.startitem()
5706 fn.condwrite(ui.verbose, "name", namefmt, n)
5716 fn.condwrite(ui.verbose, "name", namefmt, n)
5707 if ui.verbose:
5717 if ui.verbose:
5708 fn.plain("%s " % places[p])
5718 fn.plain("%s " % places[p])
5709 fn.data(bundled=p)
5719 fn.data(bundled=p)
5710 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5720 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5711 if ui.verbose:
5721 if ui.verbose:
5712 fn.plain("\n")
5722 fn.plain("\n")
5713 fn.end()
5723 fn.end()
5714 fm.end()
5724 fm.end()
5715
5725
5716 def loadcmdtable(ui, name, cmdtable):
5726 def loadcmdtable(ui, name, cmdtable):
5717 """Load command functions from specified cmdtable
5727 """Load command functions from specified cmdtable
5718 """
5728 """
5719 overrides = [cmd for cmd in cmdtable if cmd in table]
5729 overrides = [cmd for cmd in cmdtable if cmd in table]
5720 if overrides:
5730 if overrides:
5721 ui.warn(_("extension '%s' overrides commands: %s\n")
5731 ui.warn(_("extension '%s' overrides commands: %s\n")
5722 % (name, " ".join(overrides)))
5732 % (name, " ".join(overrides)))
5723 table.update(cmdtable)
5733 table.update(cmdtable)
@@ -1,370 +1,384 b''
1 $ hg init t
1 $ hg init t
2 $ cd t
2 $ cd t
3 $ echo import > port
3 $ echo import > port
4 $ hg add port
4 $ hg add port
5 $ hg commit -m 0 -u spam -d '0 0'
5 $ hg commit -m 0 -u spam -d '0 0'
6 $ echo export >> port
6 $ echo export >> port
7 $ hg commit -m 1 -u eggs -d '1 0'
7 $ hg commit -m 1 -u eggs -d '1 0'
8 $ echo export > port
8 $ echo export > port
9 $ echo vaportight >> port
9 $ echo vaportight >> port
10 $ echo 'import/export' >> port
10 $ echo 'import/export' >> port
11 $ hg commit -m 2 -u spam -d '2 0'
11 $ hg commit -m 2 -u spam -d '2 0'
12 $ echo 'import/export' >> port
12 $ echo 'import/export' >> port
13 $ hg commit -m 3 -u eggs -d '3 0'
13 $ hg commit -m 3 -u eggs -d '3 0'
14 $ head -n 3 port > port1
14 $ head -n 3 port > port1
15 $ mv port1 port
15 $ mv port1 port
16 $ hg commit -m 4 -u spam -d '4 0'
16 $ hg commit -m 4 -u spam -d '4 0'
17
17
18 pattern error
18 pattern error
19
19
20 $ hg grep '**test**'
20 $ hg grep '**test**'
21 grep: invalid match pattern: nothing to repeat
21 grep: invalid match pattern: nothing to repeat
22 [1]
22 [1]
23
23
24 simple
24 simple
25
25
26 $ hg grep '.*'
26 $ hg grep '.*'
27 port:4:export
27 port:4:export
28 port:4:vaportight
28 port:4:vaportight
29 port:4:import/export
29 port:4:import/export
30 $ hg grep port port
30 $ hg grep port port
31 port:4:export
31 port:4:export
32 port:4:vaportight
32 port:4:vaportight
33 port:4:import/export
33 port:4:import/export
34
34
35 simple with color
35 simple with color
36
36
37 $ hg --config extensions.color= grep --config color.mode=ansi \
37 $ hg --config extensions.color= grep --config color.mode=ansi \
38 > --color=always port port
38 > --color=always port port
39 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
39 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
40 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
40 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
41 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
41 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
42
42
43 simple templated
43 simple templated
44
44
45 $ hg grep port \
45 $ hg grep port \
46 > -T '{file}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
46 > -T '{file}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
47 port:4:914fa752cdea:exPORT
47 port:4:914fa752cdea:exPORT
48 port:4:914fa752cdea:vaPORTight
48 port:4:914fa752cdea:vaPORTight
49 port:4:914fa752cdea:imPORT/exPORT
49 port:4:914fa752cdea:imPORT/exPORT
50
50
51 $ hg grep port -T '{file}:{rev}:{texts}\n'
51 $ hg grep port -T '{file}:{rev}:{texts}\n'
52 port:4:export
52 port:4:export
53 port:4:vaportight
53 port:4:vaportight
54 port:4:import/export
54 port:4:import/export
55
55
56 simple JSON (no "change" field)
56 simple JSON (no "change" field)
57
57
58 $ hg grep -Tjson port
58 $ hg grep -Tjson port
59 [
59 [
60 {
60 {
61 "date": [4, 0],
61 "date": [4, 0],
62 "file": "port",
62 "file": "port",
63 "line_number": 1,
63 "line_number": 1,
64 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
64 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
65 "rev": 4,
65 "rev": 4,
66 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
66 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
67 "user": "spam"
67 "user": "spam"
68 },
68 },
69 {
69 {
70 "date": [4, 0],
70 "date": [4, 0],
71 "file": "port",
71 "file": "port",
72 "line_number": 2,
72 "line_number": 2,
73 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
73 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
74 "rev": 4,
74 "rev": 4,
75 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
75 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
76 "user": "spam"
76 "user": "spam"
77 },
77 },
78 {
78 {
79 "date": [4, 0],
79 "date": [4, 0],
80 "file": "port",
80 "file": "port",
81 "line_number": 3,
81 "line_number": 3,
82 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
82 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
83 "rev": 4,
83 "rev": 4,
84 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
84 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
85 "user": "spam"
85 "user": "spam"
86 }
86 }
87 ]
87 ]
88
88
89 simple JSON without matching lines
89 simple JSON without matching lines
90
90
91 $ hg grep -Tjson -l port
91 $ hg grep -Tjson -l port
92 [
92 [
93 {
93 {
94 "date": [4, 0],
94 "date": [4, 0],
95 "file": "port",
95 "file": "port",
96 "line_number": 1,
96 "line_number": 1,
97 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
97 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
98 "rev": 4,
98 "rev": 4,
99 "user": "spam"
99 "user": "spam"
100 }
100 }
101 ]
101 ]
102
102
103 all
103 all
104
104
105 $ hg grep --traceback --all -nu port port
105 $ hg grep --traceback --all -nu port port
106 port:4:4:-:spam:import/export
106 port:4:4:-:spam:import/export
107 port:3:4:+:eggs:import/export
107 port:3:4:+:eggs:import/export
108 port:2:1:-:spam:import
108 port:2:1:-:spam:import
109 port:2:2:-:spam:export
109 port:2:2:-:spam:export
110 port:2:1:+:spam:export
110 port:2:1:+:spam:export
111 port:2:2:+:spam:vaportight
111 port:2:2:+:spam:vaportight
112 port:2:3:+:spam:import/export
112 port:2:3:+:spam:import/export
113 port:1:2:+:eggs:export
113 port:1:2:+:eggs:export
114 port:0:1:+:spam:import
114 port:0:1:+:spam:import
115
115
116 all JSON
116 all JSON
117
117
118 $ hg grep --all -Tjson port port
118 $ hg grep --all -Tjson port port
119 [
119 [
120 {
120 {
121 "change": "-",
121 "change": "-",
122 "date": [4, 0],
122 "date": [4, 0],
123 "file": "port",
123 "file": "port",
124 "line_number": 4,
124 "line_number": 4,
125 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
125 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
126 "rev": 4,
126 "rev": 4,
127 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
127 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
128 "user": "spam"
128 "user": "spam"
129 },
129 },
130 {
130 {
131 "change": "+",
131 "change": "+",
132 "date": [3, 0],
132 "date": [3, 0],
133 "file": "port",
133 "file": "port",
134 "line_number": 4,
134 "line_number": 4,
135 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
135 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
136 "rev": 3,
136 "rev": 3,
137 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
137 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
138 "user": "eggs"
138 "user": "eggs"
139 },
139 },
140 {
140 {
141 "change": "-",
141 "change": "-",
142 "date": [2, 0],
142 "date": [2, 0],
143 "file": "port",
143 "file": "port",
144 "line_number": 1,
144 "line_number": 1,
145 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
145 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
146 "rev": 2,
146 "rev": 2,
147 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
147 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
148 "user": "spam"
148 "user": "spam"
149 },
149 },
150 {
150 {
151 "change": "-",
151 "change": "-",
152 "date": [2, 0],
152 "date": [2, 0],
153 "file": "port",
153 "file": "port",
154 "line_number": 2,
154 "line_number": 2,
155 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
155 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
156 "rev": 2,
156 "rev": 2,
157 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
157 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
158 "user": "spam"
158 "user": "spam"
159 },
159 },
160 {
160 {
161 "change": "+",
161 "change": "+",
162 "date": [2, 0],
162 "date": [2, 0],
163 "file": "port",
163 "file": "port",
164 "line_number": 1,
164 "line_number": 1,
165 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
165 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
166 "rev": 2,
166 "rev": 2,
167 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
167 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
168 "user": "spam"
168 "user": "spam"
169 },
169 },
170 {
170 {
171 "change": "+",
171 "change": "+",
172 "date": [2, 0],
172 "date": [2, 0],
173 "file": "port",
173 "file": "port",
174 "line_number": 2,
174 "line_number": 2,
175 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
175 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
176 "rev": 2,
176 "rev": 2,
177 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
177 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
178 "user": "spam"
178 "user": "spam"
179 },
179 },
180 {
180 {
181 "change": "+",
181 "change": "+",
182 "date": [2, 0],
182 "date": [2, 0],
183 "file": "port",
183 "file": "port",
184 "line_number": 3,
184 "line_number": 3,
185 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
185 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
186 "rev": 2,
186 "rev": 2,
187 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
187 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
188 "user": "spam"
188 "user": "spam"
189 },
189 },
190 {
190 {
191 "change": "+",
191 "change": "+",
192 "date": [1, 0],
192 "date": [1, 0],
193 "file": "port",
193 "file": "port",
194 "line_number": 2,
194 "line_number": 2,
195 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
195 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
196 "rev": 1,
196 "rev": 1,
197 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
197 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
198 "user": "eggs"
198 "user": "eggs"
199 },
199 },
200 {
200 {
201 "change": "+",
201 "change": "+",
202 "date": [0, 0],
202 "date": [0, 0],
203 "file": "port",
203 "file": "port",
204 "line_number": 1,
204 "line_number": 1,
205 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
205 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
206 "rev": 0,
206 "rev": 0,
207 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
207 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
208 "user": "spam"
208 "user": "spam"
209 }
209 }
210 ]
210 ]
211
211
212 other
212 other
213
213
214 $ hg grep -l port port
214 $ hg grep -l port port
215 port:4
215 port:4
216 $ hg grep import port
216 $ hg grep import port
217 port:4:import/export
217 port:4:import/export
218
218
219 $ hg cp port port2
219 $ hg cp port port2
220 $ hg commit -m 4 -u spam -d '5 0'
220 $ hg commit -m 4 -u spam -d '5 0'
221
221
222 follow
222 follow
223
223
224 $ hg grep --traceback -f 'import\n\Z' port2
224 $ hg grep --traceback -f 'import\n\Z' port2
225 port:0:import
225 port:0:import
226
226
227 $ echo deport >> port2
227 $ echo deport >> port2
228 $ hg commit -m 5 -u eggs -d '6 0'
228 $ hg commit -m 5 -u eggs -d '6 0'
229 $ hg grep -f --all -nu port port2
229 $ hg grep -f --all -nu port port2
230 port2:6:4:+:eggs:deport
230 port2:6:4:+:eggs:deport
231 port:4:4:-:spam:import/export
231 port:4:4:-:spam:import/export
232 port:3:4:+:eggs:import/export
232 port:3:4:+:eggs:import/export
233 port:2:1:-:spam:import
233 port:2:1:-:spam:import
234 port:2:2:-:spam:export
234 port:2:2:-:spam:export
235 port:2:1:+:spam:export
235 port:2:1:+:spam:export
236 port:2:2:+:spam:vaportight
236 port:2:2:+:spam:vaportight
237 port:2:3:+:spam:import/export
237 port:2:3:+:spam:import/export
238 port:1:2:+:eggs:export
238 port:1:2:+:eggs:export
239 port:0:1:+:spam:import
239 port:0:1:+:spam:import
240
240
241 $ hg up -q null
241 $ hg up -q null
242 $ hg grep -f port
242 $ hg grep -f port
243 [1]
243 [1]
244
244
245 Test wdir
245 Test wdir
246 (at least, this shouldn't crash)
246 (at least, this shouldn't crash)
247
247
248 $ hg up -q
248 $ hg up -q
249 $ echo wport >> port2
249 $ echo wport >> port2
250 $ hg stat
250 $ hg stat
251 M port2
251 M port2
252 $ hg grep -r 'wdir()' port
252 $ hg grep -r 'wdir()' port
253 abort: working directory revision cannot be specified
253 port2:2147483647:export
254 [255]
254 port2:2147483647:vaportight
255 port2:2147483647:import/export
256 port2:2147483647:deport
257 port2:2147483647:wport
255
258
256 $ cd ..
259 $ cd ..
257 $ hg init t2
260 $ hg init t2
258 $ cd t2
261 $ cd t2
259 $ hg grep foobar foo
262 $ hg grep foobar foo
260 [1]
263 [1]
261 $ hg grep foobar
264 $ hg grep foobar
262 [1]
265 [1]
263 $ echo blue >> color
266 $ echo blue >> color
264 $ echo black >> color
267 $ echo black >> color
265 $ hg add color
268 $ hg add color
266 $ hg ci -m 0
269 $ hg ci -m 0
267 $ echo orange >> color
270 $ echo orange >> color
268 $ hg ci -m 1
271 $ hg ci -m 1
269 $ echo black > color
272 $ echo black > color
270 $ hg ci -m 2
273 $ hg ci -m 2
271 $ echo orange >> color
274 $ echo orange >> color
272 $ echo blue >> color
275 $ echo blue >> color
273 $ hg ci -m 3
276 $ hg ci -m 3
274 $ hg grep orange
277 $ hg grep orange
275 color:3:orange
278 color:3:orange
276 $ hg grep --all orange
279 $ hg grep --all orange
277 color:3:+:orange
280 color:3:+:orange
278 color:2:-:orange
281 color:2:-:orange
279 color:1:+:orange
282 color:1:+:orange
280
283
281 test substring match: '^' should only match at the beginning
284 test substring match: '^' should only match at the beginning
282
285
283 $ hg grep '^.' --config extensions.color= --color debug
286 $ hg grep '^.' --config extensions.color= --color debug
284 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
287 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
285 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
288 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
286 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
289 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
287
290
288 match in last "line" without newline
291 match in last "line" without newline
289
292
290 $ $PYTHON -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
293 $ $PYTHON -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
291 $ hg ci -Amnoeol
294 $ hg ci -Amnoeol
292 adding noeol
295 adding noeol
293 $ hg grep loop
296 $ hg grep loop
294 noeol:4:no infinite loop
297 noeol:4:no infinite loop
295
298
296 $ cd ..
299 $ cd ..
297
300
298 Issue685: traceback in grep -r after rename
301 Issue685: traceback in grep -r after rename
299
302
300 Got a traceback when using grep on a single
303 Got a traceback when using grep on a single
301 revision with renamed files.
304 revision with renamed files.
302
305
303 $ hg init issue685
306 $ hg init issue685
304 $ cd issue685
307 $ cd issue685
305 $ echo octarine > color
308 $ echo octarine > color
306 $ hg ci -Amcolor
309 $ hg ci -Amcolor
307 adding color
310 adding color
308 $ hg rename color colour
311 $ hg rename color colour
309 $ hg ci -Am rename
312 $ hg ci -Am rename
310 $ hg grep octarine
313 $ hg grep octarine
311 colour:1:octarine
314 colour:1:octarine
312 color:0:octarine
315 color:0:octarine
313
316
314 Used to crash here
317 Used to crash here
315
318
316 $ hg grep -r 1 octarine
319 $ hg grep -r 1 octarine
317 colour:1:octarine
320 colour:1:octarine
318 $ cd ..
321 $ cd ..
319
322
320
323
321 Issue337: test that grep follows parent-child relationships instead
324 Issue337: test that grep follows parent-child relationships instead
322 of just using revision numbers.
325 of just using revision numbers.
323
326
324 $ hg init issue337
327 $ hg init issue337
325 $ cd issue337
328 $ cd issue337
326
329
327 $ echo white > color
330 $ echo white > color
328 $ hg commit -A -m "0 white"
331 $ hg commit -A -m "0 white"
329 adding color
332 adding color
330
333
331 $ echo red > color
334 $ echo red > color
332 $ hg commit -A -m "1 red"
335 $ hg commit -A -m "1 red"
333
336
334 $ hg update 0
337 $ hg update 0
335 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336 $ echo black > color
339 $ echo black > color
337 $ hg commit -A -m "2 black"
340 $ hg commit -A -m "2 black"
338 created new head
341 created new head
339
342
340 $ hg update --clean 1
343 $ hg update --clean 1
341 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
344 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
342 $ echo blue > color
345 $ echo blue > color
343 $ hg commit -A -m "3 blue"
346 $ hg commit -A -m "3 blue"
344
347
345 $ hg grep --all red
348 $ hg grep --all red
346 color:3:-:red
349 color:3:-:red
347 color:1:+:red
350 color:1:+:red
348
351
349 Issue3885: test that changing revision order does not alter the
352 Issue3885: test that changing revision order does not alter the
350 revisions printed, just their order.
353 revisions printed, just their order.
351
354
352 $ hg grep --all red -r "all()"
355 $ hg grep --all red -r "all()"
353 color:1:+:red
356 color:1:+:red
354 color:3:-:red
357 color:3:-:red
355
358
356 $ hg grep --all red -r "reverse(all())"
359 $ hg grep --all red -r "reverse(all())"
357 color:3:-:red
360 color:3:-:red
358 color:1:+:red
361 color:1:+:red
359
362
360 $ cd ..
363 $ cd ..
361
364
362 $ hg init a
365 $ hg init a
363 $ cd a
366 $ cd a
364 $ cp "$TESTDIR/binfile.bin" .
367 $ cp "$TESTDIR/binfile.bin" .
365 $ hg add binfile.bin
368 $ hg add binfile.bin
366 $ hg ci -m 'add binfile.bin'
369 $ hg ci -m 'add binfile.bin'
367 $ hg grep "MaCam" --all
370 $ hg grep "MaCam" --all
368 binfile.bin:0:+: Binary file matches
371 binfile.bin:0:+: Binary file matches
369
372
370 $ cd ..
373 $ cd ..
374
375 Fix_Wdir(): test that passing wdir() t -r flag does greps on the
376 files modified in the working directory
377
378 $ cd a
379 $ echo "abracadara" >> a
380 $ hg add a
381 $ hg grep -r "wdir()" "abra"
382 a:2147483647:abracadara
383
384 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now