##// END OF EJS Templates
serve: do not daemonize by default by --print-url...
Yuya Nishihara -
r38301:1a05e205 default
parent child Browse files
Show More
@@ -1,5757 +1,5755 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 ('', 'stop', False, _('stop interrupted graft')),
2129 ('', 'stop', False, _('stop interrupted graft')),
2130 ('e', 'edit', False, _('invoke editor on commit messages')),
2130 ('e', 'edit', False, _('invoke editor on commit messages')),
2131 ('', 'log', None, _('append graft info to log message')),
2131 ('', 'log', None, _('append graft info to log message')),
2132 ('f', 'force', False, _('force graft')),
2132 ('f', 'force', False, _('force graft')),
2133 ('D', 'currentdate', False,
2133 ('D', 'currentdate', False,
2134 _('record the current date as commit date')),
2134 _('record the current date as commit date')),
2135 ('U', 'currentuser', False,
2135 ('U', 'currentuser', False,
2136 _('record the current user as committer'), _('DATE'))]
2136 _('record the current user as committer'), _('DATE'))]
2137 + commitopts2 + mergetoolopts + dryrunopts,
2137 + commitopts2 + mergetoolopts + dryrunopts,
2138 _('[OPTION]... [-r REV]... REV...'))
2138 _('[OPTION]... [-r REV]... REV...'))
2139 def graft(ui, repo, *revs, **opts):
2139 def graft(ui, repo, *revs, **opts):
2140 '''copy changes from other branches onto the current branch
2140 '''copy changes from other branches onto the current branch
2141
2141
2142 This command uses Mercurial's merge logic to copy individual
2142 This command uses Mercurial's merge logic to copy individual
2143 changes from other branches without merging branches in the
2143 changes from other branches without merging branches in the
2144 history graph. This is sometimes known as 'backporting' or
2144 history graph. This is sometimes known as 'backporting' or
2145 'cherry-picking'. By default, graft will copy user, date, and
2145 'cherry-picking'. By default, graft will copy user, date, and
2146 description from the source changesets.
2146 description from the source changesets.
2147
2147
2148 Changesets that are ancestors of the current revision, that have
2148 Changesets that are ancestors of the current revision, that have
2149 already been grafted, or that are merges will be skipped.
2149 already been grafted, or that are merges will be skipped.
2150
2150
2151 If --log is specified, log messages will have a comment appended
2151 If --log is specified, log messages will have a comment appended
2152 of the form::
2152 of the form::
2153
2153
2154 (grafted from CHANGESETHASH)
2154 (grafted from CHANGESETHASH)
2155
2155
2156 If --force is specified, revisions will be grafted even if they
2156 If --force is specified, revisions will be grafted even if they
2157 are already ancestors of, or have been grafted to, the destination.
2157 are already ancestors of, or have been grafted to, the destination.
2158 This is useful when the revisions have since been backed out.
2158 This is useful when the revisions have since been backed out.
2159
2159
2160 If a graft merge results in conflicts, the graft process is
2160 If a graft merge results in conflicts, the graft process is
2161 interrupted so that the current merge can be manually resolved.
2161 interrupted so that the current merge can be manually resolved.
2162 Once all conflicts are addressed, the graft process can be
2162 Once all conflicts are addressed, the graft process can be
2163 continued with the -c/--continue option.
2163 continued with the -c/--continue option.
2164
2164
2165 The -c/--continue option reapplies all the earlier options.
2165 The -c/--continue option reapplies all the earlier options.
2166
2166
2167 .. container:: verbose
2167 .. container:: verbose
2168
2168
2169 Examples:
2169 Examples:
2170
2170
2171 - copy a single change to the stable branch and edit its description::
2171 - copy a single change to the stable branch and edit its description::
2172
2172
2173 hg update stable
2173 hg update stable
2174 hg graft --edit 9393
2174 hg graft --edit 9393
2175
2175
2176 - graft a range of changesets with one exception, updating dates::
2176 - graft a range of changesets with one exception, updating dates::
2177
2177
2178 hg graft -D "2085::2093 and not 2091"
2178 hg graft -D "2085::2093 and not 2091"
2179
2179
2180 - continue a graft after resolving conflicts::
2180 - continue a graft after resolving conflicts::
2181
2181
2182 hg graft -c
2182 hg graft -c
2183
2183
2184 - show the source of a grafted changeset::
2184 - show the source of a grafted changeset::
2185
2185
2186 hg log --debug -r .
2186 hg log --debug -r .
2187
2187
2188 - show revisions sorted by date::
2188 - show revisions sorted by date::
2189
2189
2190 hg log -r "sort(all(), date)"
2190 hg log -r "sort(all(), date)"
2191
2191
2192 See :hg:`help revisions` for more about specifying revisions.
2192 See :hg:`help revisions` for more about specifying revisions.
2193
2193
2194 Returns 0 on successful completion.
2194 Returns 0 on successful completion.
2195 '''
2195 '''
2196 with repo.wlock():
2196 with repo.wlock():
2197 return _dograft(ui, repo, *revs, **opts)
2197 return _dograft(ui, repo, *revs, **opts)
2198
2198
2199 def _dograft(ui, repo, *revs, **opts):
2199 def _dograft(ui, repo, *revs, **opts):
2200 opts = pycompat.byteskwargs(opts)
2200 opts = pycompat.byteskwargs(opts)
2201 if revs and opts.get('rev'):
2201 if revs and opts.get('rev'):
2202 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2202 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2203 'revision ordering!\n'))
2203 'revision ordering!\n'))
2204
2204
2205 revs = list(revs)
2205 revs = list(revs)
2206 revs.extend(opts.get('rev'))
2206 revs.extend(opts.get('rev'))
2207 # a dict of data to be stored in state file
2207 # a dict of data to be stored in state file
2208 statedata = {}
2208 statedata = {}
2209
2209
2210 if not opts.get('user') and opts.get('currentuser'):
2210 if not opts.get('user') and opts.get('currentuser'):
2211 opts['user'] = ui.username()
2211 opts['user'] = ui.username()
2212 if not opts.get('date') and opts.get('currentdate'):
2212 if not opts.get('date') and opts.get('currentdate'):
2213 opts['date'] = "%d %d" % dateutil.makedate()
2213 opts['date'] = "%d %d" % dateutil.makedate()
2214
2214
2215 editor = cmdutil.getcommiteditor(editform='graft',
2215 editor = cmdutil.getcommiteditor(editform='graft',
2216 **pycompat.strkwargs(opts))
2216 **pycompat.strkwargs(opts))
2217
2217
2218 cont = False
2218 cont = False
2219 graftstate = statemod.cmdstate(repo, 'graftstate')
2219 graftstate = statemod.cmdstate(repo, 'graftstate')
2220 if opts.get('stop'):
2220 if opts.get('stop'):
2221 if opts.get('continue'):
2221 if opts.get('continue'):
2222 raise error.Abort(_("cannot use '--continue' and "
2222 raise error.Abort(_("cannot use '--continue' and "
2223 "'--stop' together"))
2223 "'--stop' together"))
2224 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2224 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2225 opts.get('date'), opts.get('currentdate'),
2225 opts.get('date'), opts.get('currentdate'),
2226 opts.get('currentuser'), opts.get('rev'))):
2226 opts.get('currentuser'), opts.get('rev'))):
2227 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2227 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2228 return _stopgraft(ui, repo, graftstate)
2228 return _stopgraft(ui, repo, graftstate)
2229 if opts.get('continue'):
2229 if opts.get('continue'):
2230 cont = True
2230 cont = True
2231 if revs:
2231 if revs:
2232 raise error.Abort(_("can't specify --continue and revisions"))
2232 raise error.Abort(_("can't specify --continue and revisions"))
2233 # read in unfinished revisions
2233 # read in unfinished revisions
2234 if graftstate.exists():
2234 if graftstate.exists():
2235 statedata = _readgraftstate(repo, graftstate)
2235 statedata = _readgraftstate(repo, graftstate)
2236 if statedata.get('date'):
2236 if statedata.get('date'):
2237 opts['date'] = statedata['date']
2237 opts['date'] = statedata['date']
2238 if statedata.get('user'):
2238 if statedata.get('user'):
2239 opts['user'] = statedata['user']
2239 opts['user'] = statedata['user']
2240 if statedata.get('log'):
2240 if statedata.get('log'):
2241 opts['log'] = True
2241 opts['log'] = True
2242 nodes = statedata['nodes']
2242 nodes = statedata['nodes']
2243 revs = [repo[node].rev() for node in nodes]
2243 revs = [repo[node].rev() for node in nodes]
2244 else:
2244 else:
2245 cmdutil.wrongtooltocontinue(repo, _('graft'))
2245 cmdutil.wrongtooltocontinue(repo, _('graft'))
2246 else:
2246 else:
2247 if not revs:
2247 if not revs:
2248 raise error.Abort(_('no revisions specified'))
2248 raise error.Abort(_('no revisions specified'))
2249 cmdutil.checkunfinished(repo)
2249 cmdutil.checkunfinished(repo)
2250 cmdutil.bailifchanged(repo)
2250 cmdutil.bailifchanged(repo)
2251 revs = scmutil.revrange(repo, revs)
2251 revs = scmutil.revrange(repo, revs)
2252
2252
2253 skipped = set()
2253 skipped = set()
2254 # check for merges
2254 # check for merges
2255 for rev in repo.revs('%ld and merge()', revs):
2255 for rev in repo.revs('%ld and merge()', revs):
2256 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2256 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2257 skipped.add(rev)
2257 skipped.add(rev)
2258 revs = [r for r in revs if r not in skipped]
2258 revs = [r for r in revs if r not in skipped]
2259 if not revs:
2259 if not revs:
2260 return -1
2260 return -1
2261
2261
2262 # Don't check in the --continue case, in effect retaining --force across
2262 # Don't check in the --continue case, in effect retaining --force across
2263 # --continues. That's because without --force, any revisions we decided to
2263 # --continues. That's because without --force, any revisions we decided to
2264 # skip would have been filtered out here, so they wouldn't have made their
2264 # skip would have been filtered out here, so they wouldn't have made their
2265 # way to the graftstate. With --force, any revisions we would have otherwise
2265 # way to the graftstate. With --force, any revisions we would have otherwise
2266 # skipped would not have been filtered out, and if they hadn't been applied
2266 # skipped would not have been filtered out, and if they hadn't been applied
2267 # already, they'd have been in the graftstate.
2267 # already, they'd have been in the graftstate.
2268 if not (cont or opts.get('force')):
2268 if not (cont or opts.get('force')):
2269 # check for ancestors of dest branch
2269 # check for ancestors of dest branch
2270 crev = repo['.'].rev()
2270 crev = repo['.'].rev()
2271 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2271 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2272 # XXX make this lazy in the future
2272 # XXX make this lazy in the future
2273 # don't mutate while iterating, create a copy
2273 # don't mutate while iterating, create a copy
2274 for rev in list(revs):
2274 for rev in list(revs):
2275 if rev in ancestors:
2275 if rev in ancestors:
2276 ui.warn(_('skipping ancestor revision %d:%s\n') %
2276 ui.warn(_('skipping ancestor revision %d:%s\n') %
2277 (rev, repo[rev]))
2277 (rev, repo[rev]))
2278 # XXX remove on list is slow
2278 # XXX remove on list is slow
2279 revs.remove(rev)
2279 revs.remove(rev)
2280 if not revs:
2280 if not revs:
2281 return -1
2281 return -1
2282
2282
2283 # analyze revs for earlier grafts
2283 # analyze revs for earlier grafts
2284 ids = {}
2284 ids = {}
2285 for ctx in repo.set("%ld", revs):
2285 for ctx in repo.set("%ld", revs):
2286 ids[ctx.hex()] = ctx.rev()
2286 ids[ctx.hex()] = ctx.rev()
2287 n = ctx.extra().get('source')
2287 n = ctx.extra().get('source')
2288 if n:
2288 if n:
2289 ids[n] = ctx.rev()
2289 ids[n] = ctx.rev()
2290
2290
2291 # check ancestors for earlier grafts
2291 # check ancestors for earlier grafts
2292 ui.debug('scanning for duplicate grafts\n')
2292 ui.debug('scanning for duplicate grafts\n')
2293
2293
2294 # The only changesets we can be sure doesn't contain grafts of any
2294 # The only changesets we can be sure doesn't contain grafts of any
2295 # revs, are the ones that are common ancestors of *all* revs:
2295 # revs, are the ones that are common ancestors of *all* revs:
2296 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2296 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2297 ctx = repo[rev]
2297 ctx = repo[rev]
2298 n = ctx.extra().get('source')
2298 n = ctx.extra().get('source')
2299 if n in ids:
2299 if n in ids:
2300 try:
2300 try:
2301 r = repo[n].rev()
2301 r = repo[n].rev()
2302 except error.RepoLookupError:
2302 except error.RepoLookupError:
2303 r = None
2303 r = None
2304 if r in revs:
2304 if r in revs:
2305 ui.warn(_('skipping revision %d:%s '
2305 ui.warn(_('skipping revision %d:%s '
2306 '(already grafted to %d:%s)\n')
2306 '(already grafted to %d:%s)\n')
2307 % (r, repo[r], rev, ctx))
2307 % (r, repo[r], rev, ctx))
2308 revs.remove(r)
2308 revs.remove(r)
2309 elif ids[n] in revs:
2309 elif ids[n] in revs:
2310 if r is None:
2310 if r is None:
2311 ui.warn(_('skipping already grafted revision %d:%s '
2311 ui.warn(_('skipping already grafted revision %d:%s '
2312 '(%d:%s also has unknown origin %s)\n')
2312 '(%d:%s also has unknown origin %s)\n')
2313 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2313 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2314 else:
2314 else:
2315 ui.warn(_('skipping already grafted revision %d:%s '
2315 ui.warn(_('skipping already grafted revision %d:%s '
2316 '(%d:%s also has origin %d:%s)\n')
2316 '(%d:%s also has origin %d:%s)\n')
2317 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2317 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2318 revs.remove(ids[n])
2318 revs.remove(ids[n])
2319 elif ctx.hex() in ids:
2319 elif ctx.hex() in ids:
2320 r = ids[ctx.hex()]
2320 r = ids[ctx.hex()]
2321 ui.warn(_('skipping already grafted revision %d:%s '
2321 ui.warn(_('skipping already grafted revision %d:%s '
2322 '(was grafted from %d:%s)\n') %
2322 '(was grafted from %d:%s)\n') %
2323 (r, repo[r], rev, ctx))
2323 (r, repo[r], rev, ctx))
2324 revs.remove(r)
2324 revs.remove(r)
2325 if not revs:
2325 if not revs:
2326 return -1
2326 return -1
2327
2327
2328 for pos, ctx in enumerate(repo.set("%ld", revs)):
2328 for pos, ctx in enumerate(repo.set("%ld", revs)):
2329 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2329 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2330 ctx.description().split('\n', 1)[0])
2330 ctx.description().split('\n', 1)[0])
2331 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2331 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2332 if names:
2332 if names:
2333 desc += ' (%s)' % ' '.join(names)
2333 desc += ' (%s)' % ' '.join(names)
2334 ui.status(_('grafting %s\n') % desc)
2334 ui.status(_('grafting %s\n') % desc)
2335 if opts.get('dry_run'):
2335 if opts.get('dry_run'):
2336 continue
2336 continue
2337
2337
2338 source = ctx.extra().get('source')
2338 source = ctx.extra().get('source')
2339 extra = {}
2339 extra = {}
2340 if source:
2340 if source:
2341 extra['source'] = source
2341 extra['source'] = source
2342 extra['intermediate-source'] = ctx.hex()
2342 extra['intermediate-source'] = ctx.hex()
2343 else:
2343 else:
2344 extra['source'] = ctx.hex()
2344 extra['source'] = ctx.hex()
2345 user = ctx.user()
2345 user = ctx.user()
2346 if opts.get('user'):
2346 if opts.get('user'):
2347 user = opts['user']
2347 user = opts['user']
2348 statedata['user'] = user
2348 statedata['user'] = user
2349 date = ctx.date()
2349 date = ctx.date()
2350 if opts.get('date'):
2350 if opts.get('date'):
2351 date = opts['date']
2351 date = opts['date']
2352 statedata['date'] = date
2352 statedata['date'] = date
2353 message = ctx.description()
2353 message = ctx.description()
2354 if opts.get('log'):
2354 if opts.get('log'):
2355 message += '\n(grafted from %s)' % ctx.hex()
2355 message += '\n(grafted from %s)' % ctx.hex()
2356 statedata['log'] = True
2356 statedata['log'] = True
2357
2357
2358 # we don't merge the first commit when continuing
2358 # we don't merge the first commit when continuing
2359 if not cont:
2359 if not cont:
2360 # perform the graft merge with p1(rev) as 'ancestor'
2360 # perform the graft merge with p1(rev) as 'ancestor'
2361 try:
2361 try:
2362 # ui.forcemerge is an internal variable, do not document
2362 # ui.forcemerge is an internal variable, do not document
2363 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2363 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2364 'graft')
2364 'graft')
2365 stats = mergemod.graft(repo, ctx, ctx.p1(),
2365 stats = mergemod.graft(repo, ctx, ctx.p1(),
2366 ['local', 'graft'])
2366 ['local', 'graft'])
2367 finally:
2367 finally:
2368 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2368 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2369 # report any conflicts
2369 # report any conflicts
2370 if stats.unresolvedcount > 0:
2370 if stats.unresolvedcount > 0:
2371 # write out state for --continue
2371 # write out state for --continue
2372 nodes = [repo[rev].hex() for rev in revs[pos:]]
2372 nodes = [repo[rev].hex() for rev in revs[pos:]]
2373 statedata['nodes'] = nodes
2373 statedata['nodes'] = nodes
2374 stateversion = 1
2374 stateversion = 1
2375 graftstate.save(stateversion, statedata)
2375 graftstate.save(stateversion, statedata)
2376 hint = _("use 'hg resolve' and 'hg graft --continue'")
2376 hint = _("use 'hg resolve' and 'hg graft --continue'")
2377 raise error.Abort(
2377 raise error.Abort(
2378 _("unresolved conflicts, can't continue"),
2378 _("unresolved conflicts, can't continue"),
2379 hint=hint)
2379 hint=hint)
2380 else:
2380 else:
2381 cont = False
2381 cont = False
2382
2382
2383 # commit
2383 # commit
2384 node = repo.commit(text=message, user=user,
2384 node = repo.commit(text=message, user=user,
2385 date=date, extra=extra, editor=editor)
2385 date=date, extra=extra, editor=editor)
2386 if node is None:
2386 if node is None:
2387 ui.warn(
2387 ui.warn(
2388 _('note: graft of %d:%s created no changes to commit\n') %
2388 _('note: graft of %d:%s created no changes to commit\n') %
2389 (ctx.rev(), ctx))
2389 (ctx.rev(), ctx))
2390
2390
2391 # remove state when we complete successfully
2391 # remove state when we complete successfully
2392 if not opts.get('dry_run'):
2392 if not opts.get('dry_run'):
2393 graftstate.delete()
2393 graftstate.delete()
2394
2394
2395 return 0
2395 return 0
2396
2396
2397 def _readgraftstate(repo, graftstate):
2397 def _readgraftstate(repo, graftstate):
2398 """read the graft state file and return a dict of the data stored in it"""
2398 """read the graft state file and return a dict of the data stored in it"""
2399 try:
2399 try:
2400 return graftstate.read()
2400 return graftstate.read()
2401 except error.CorruptedState:
2401 except error.CorruptedState:
2402 nodes = repo.vfs.read('graftstate').splitlines()
2402 nodes = repo.vfs.read('graftstate').splitlines()
2403 return {'nodes': nodes}
2403 return {'nodes': nodes}
2404
2404
2405 def _stopgraft(ui, repo, graftstate):
2405 def _stopgraft(ui, repo, graftstate):
2406 """stop the interrupted graft"""
2406 """stop the interrupted graft"""
2407 if not graftstate.exists():
2407 if not graftstate.exists():
2408 raise error.Abort(_("no interrupted graft found"))
2408 raise error.Abort(_("no interrupted graft found"))
2409 pctx = repo['.']
2409 pctx = repo['.']
2410 hg.updaterepo(repo, pctx.node(), True)
2410 hg.updaterepo(repo, pctx.node(), True)
2411 graftstate.delete()
2411 graftstate.delete()
2412 ui.status(_("stopped the interrupted graft\n"))
2412 ui.status(_("stopped the interrupted graft\n"))
2413 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2413 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2414 return 0
2414 return 0
2415
2415
2416 @command('grep',
2416 @command('grep',
2417 [('0', 'print0', None, _('end fields with NUL')),
2417 [('0', 'print0', None, _('end fields with NUL')),
2418 ('', 'all', None, _('print all revisions that match')),
2418 ('', 'all', None, _('print all revisions that match')),
2419 ('a', 'text', None, _('treat all files as text')),
2419 ('a', 'text', None, _('treat all files as text')),
2420 ('f', 'follow', None,
2420 ('f', 'follow', None,
2421 _('follow changeset history,'
2421 _('follow changeset history,'
2422 ' or file history across copies and renames')),
2422 ' or file history across copies and renames')),
2423 ('i', 'ignore-case', None, _('ignore case when matching')),
2423 ('i', 'ignore-case', None, _('ignore case when matching')),
2424 ('l', 'files-with-matches', None,
2424 ('l', 'files-with-matches', None,
2425 _('print only filenames and revisions that match')),
2425 _('print only filenames and revisions that match')),
2426 ('n', 'line-number', None, _('print matching line numbers')),
2426 ('n', 'line-number', None, _('print matching line numbers')),
2427 ('r', 'rev', [],
2427 ('r', 'rev', [],
2428 _('only search files changed within revision range'), _('REV')),
2428 _('only search files changed within revision range'), _('REV')),
2429 ('u', 'user', None, _('list the author (long with -v)')),
2429 ('u', 'user', None, _('list the author (long with -v)')),
2430 ('d', 'date', None, _('list the date (short with -q)')),
2430 ('d', 'date', None, _('list the date (short with -q)')),
2431 ] + formatteropts + walkopts,
2431 ] + formatteropts + walkopts,
2432 _('[OPTION]... PATTERN [FILE]...'),
2432 _('[OPTION]... PATTERN [FILE]...'),
2433 inferrepo=True,
2433 inferrepo=True,
2434 intents={INTENT_READONLY})
2434 intents={INTENT_READONLY})
2435 def grep(ui, repo, pattern, *pats, **opts):
2435 def grep(ui, repo, pattern, *pats, **opts):
2436 """search revision history for a pattern in specified files
2436 """search revision history for a pattern in specified files
2437
2437
2438 Search revision history for a regular expression in the specified
2438 Search revision history for a regular expression in the specified
2439 files or the entire project.
2439 files or the entire project.
2440
2440
2441 By default, grep prints the most recent revision number for each
2441 By default, grep prints the most recent revision number for each
2442 file in which it finds a match. To get it to print every revision
2442 file in which it finds a match. To get it to print every revision
2443 that contains a change in match status ("-" for a match that becomes
2443 that contains a change in match status ("-" for a match that becomes
2444 a non-match, or "+" for a non-match that becomes a match), use the
2444 a non-match, or "+" for a non-match that becomes a match), use the
2445 --all flag.
2445 --all flag.
2446
2446
2447 PATTERN can be any Python (roughly Perl-compatible) regular
2447 PATTERN can be any Python (roughly Perl-compatible) regular
2448 expression.
2448 expression.
2449
2449
2450 If no FILEs are specified (and -f/--follow isn't set), all files in
2450 If no FILEs are specified (and -f/--follow isn't set), all files in
2451 the repository are searched, including those that don't exist in the
2451 the repository are searched, including those that don't exist in the
2452 current branch or have been deleted in a prior changeset.
2452 current branch or have been deleted in a prior changeset.
2453
2453
2454 Returns 0 if a match is found, 1 otherwise.
2454 Returns 0 if a match is found, 1 otherwise.
2455 """
2455 """
2456 opts = pycompat.byteskwargs(opts)
2456 opts = pycompat.byteskwargs(opts)
2457 reflags = re.M
2457 reflags = re.M
2458 if opts.get('ignore_case'):
2458 if opts.get('ignore_case'):
2459 reflags |= re.I
2459 reflags |= re.I
2460 try:
2460 try:
2461 regexp = util.re.compile(pattern, reflags)
2461 regexp = util.re.compile(pattern, reflags)
2462 except re.error as inst:
2462 except re.error as inst:
2463 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2463 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2464 return 1
2464 return 1
2465 sep, eol = ':', '\n'
2465 sep, eol = ':', '\n'
2466 if opts.get('print0'):
2466 if opts.get('print0'):
2467 sep = eol = '\0'
2467 sep = eol = '\0'
2468
2468
2469 getfile = util.lrucachefunc(repo.file)
2469 getfile = util.lrucachefunc(repo.file)
2470
2470
2471 def matchlines(body):
2471 def matchlines(body):
2472 begin = 0
2472 begin = 0
2473 linenum = 0
2473 linenum = 0
2474 while begin < len(body):
2474 while begin < len(body):
2475 match = regexp.search(body, begin)
2475 match = regexp.search(body, begin)
2476 if not match:
2476 if not match:
2477 break
2477 break
2478 mstart, mend = match.span()
2478 mstart, mend = match.span()
2479 linenum += body.count('\n', begin, mstart) + 1
2479 linenum += body.count('\n', begin, mstart) + 1
2480 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2480 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2481 begin = body.find('\n', mend) + 1 or len(body) + 1
2481 begin = body.find('\n', mend) + 1 or len(body) + 1
2482 lend = begin - 1
2482 lend = begin - 1
2483 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2483 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2484
2484
2485 class linestate(object):
2485 class linestate(object):
2486 def __init__(self, line, linenum, colstart, colend):
2486 def __init__(self, line, linenum, colstart, colend):
2487 self.line = line
2487 self.line = line
2488 self.linenum = linenum
2488 self.linenum = linenum
2489 self.colstart = colstart
2489 self.colstart = colstart
2490 self.colend = colend
2490 self.colend = colend
2491
2491
2492 def __hash__(self):
2492 def __hash__(self):
2493 return hash((self.linenum, self.line))
2493 return hash((self.linenum, self.line))
2494
2494
2495 def __eq__(self, other):
2495 def __eq__(self, other):
2496 return self.line == other.line
2496 return self.line == other.line
2497
2497
2498 def findpos(self):
2498 def findpos(self):
2499 """Iterate all (start, end) indices of matches"""
2499 """Iterate all (start, end) indices of matches"""
2500 yield self.colstart, self.colend
2500 yield self.colstart, self.colend
2501 p = self.colend
2501 p = self.colend
2502 while p < len(self.line):
2502 while p < len(self.line):
2503 m = regexp.search(self.line, p)
2503 m = regexp.search(self.line, p)
2504 if not m:
2504 if not m:
2505 break
2505 break
2506 yield m.span()
2506 yield m.span()
2507 p = m.end()
2507 p = m.end()
2508
2508
2509 matches = {}
2509 matches = {}
2510 copies = {}
2510 copies = {}
2511 def grepbody(fn, rev, body):
2511 def grepbody(fn, rev, body):
2512 matches[rev].setdefault(fn, [])
2512 matches[rev].setdefault(fn, [])
2513 m = matches[rev][fn]
2513 m = matches[rev][fn]
2514 for lnum, cstart, cend, line in matchlines(body):
2514 for lnum, cstart, cend, line in matchlines(body):
2515 s = linestate(line, lnum, cstart, cend)
2515 s = linestate(line, lnum, cstart, cend)
2516 m.append(s)
2516 m.append(s)
2517
2517
2518 def difflinestates(a, b):
2518 def difflinestates(a, b):
2519 sm = difflib.SequenceMatcher(None, a, b)
2519 sm = difflib.SequenceMatcher(None, a, b)
2520 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2520 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2521 if tag == 'insert':
2521 if tag == 'insert':
2522 for i in xrange(blo, bhi):
2522 for i in xrange(blo, bhi):
2523 yield ('+', b[i])
2523 yield ('+', b[i])
2524 elif tag == 'delete':
2524 elif tag == 'delete':
2525 for i in xrange(alo, ahi):
2525 for i in xrange(alo, ahi):
2526 yield ('-', a[i])
2526 yield ('-', a[i])
2527 elif tag == 'replace':
2527 elif tag == 'replace':
2528 for i in xrange(alo, ahi):
2528 for i in xrange(alo, ahi):
2529 yield ('-', a[i])
2529 yield ('-', a[i])
2530 for i in xrange(blo, bhi):
2530 for i in xrange(blo, bhi):
2531 yield ('+', b[i])
2531 yield ('+', b[i])
2532
2532
2533 def display(fm, fn, ctx, pstates, states):
2533 def display(fm, fn, ctx, pstates, states):
2534 rev = scmutil.intrev(ctx)
2534 rev = scmutil.intrev(ctx)
2535 if fm.isplain():
2535 if fm.isplain():
2536 formatuser = ui.shortuser
2536 formatuser = ui.shortuser
2537 else:
2537 else:
2538 formatuser = str
2538 formatuser = str
2539 if ui.quiet:
2539 if ui.quiet:
2540 datefmt = '%Y-%m-%d'
2540 datefmt = '%Y-%m-%d'
2541 else:
2541 else:
2542 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2542 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2543 found = False
2543 found = False
2544 @util.cachefunc
2544 @util.cachefunc
2545 def binary():
2545 def binary():
2546 flog = getfile(fn)
2546 flog = getfile(fn)
2547 try:
2547 try:
2548 return stringutil.binary(flog.read(ctx.filenode(fn)))
2548 return stringutil.binary(flog.read(ctx.filenode(fn)))
2549 except error.WdirUnsupported:
2549 except error.WdirUnsupported:
2550 return ctx[fn].isbinary()
2550 return ctx[fn].isbinary()
2551
2551
2552 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2552 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2553 if opts.get('all'):
2553 if opts.get('all'):
2554 iter = difflinestates(pstates, states)
2554 iter = difflinestates(pstates, states)
2555 else:
2555 else:
2556 iter = [('', l) for l in states]
2556 iter = [('', l) for l in states]
2557 for change, l in iter:
2557 for change, l in iter:
2558 fm.startitem()
2558 fm.startitem()
2559 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2559 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2560
2560
2561 cols = [
2561 cols = [
2562 ('filename', fn, True),
2562 ('filename', fn, True),
2563 ('rev', rev, True),
2563 ('rev', rev, True),
2564 ('linenumber', l.linenum, opts.get('line_number')),
2564 ('linenumber', l.linenum, opts.get('line_number')),
2565 ]
2565 ]
2566 if opts.get('all'):
2566 if opts.get('all'):
2567 cols.append(('change', change, True))
2567 cols.append(('change', change, True))
2568 cols.extend([
2568 cols.extend([
2569 ('user', formatuser(ctx.user()), opts.get('user')),
2569 ('user', formatuser(ctx.user()), opts.get('user')),
2570 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2570 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2571 ])
2571 ])
2572 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2572 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2573 for name, data, cond in cols:
2573 for name, data, cond in cols:
2574 field = fieldnamemap.get(name, name)
2574 field = fieldnamemap.get(name, name)
2575 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2575 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2576 if cond and name != lastcol:
2576 if cond and name != lastcol:
2577 fm.plain(sep, label='grep.sep')
2577 fm.plain(sep, label='grep.sep')
2578 if not opts.get('files_with_matches'):
2578 if not opts.get('files_with_matches'):
2579 fm.plain(sep, label='grep.sep')
2579 fm.plain(sep, label='grep.sep')
2580 if not opts.get('text') and binary():
2580 if not opts.get('text') and binary():
2581 fm.plain(_(" Binary file matches"))
2581 fm.plain(_(" Binary file matches"))
2582 else:
2582 else:
2583 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2583 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2584 fm.plain(eol)
2584 fm.plain(eol)
2585 found = True
2585 found = True
2586 if opts.get('files_with_matches'):
2586 if opts.get('files_with_matches'):
2587 break
2587 break
2588 return found
2588 return found
2589
2589
2590 def displaymatches(fm, l):
2590 def displaymatches(fm, l):
2591 p = 0
2591 p = 0
2592 for s, e in l.findpos():
2592 for s, e in l.findpos():
2593 if p < s:
2593 if p < s:
2594 fm.startitem()
2594 fm.startitem()
2595 fm.write('text', '%s', l.line[p:s])
2595 fm.write('text', '%s', l.line[p:s])
2596 fm.data(matched=False)
2596 fm.data(matched=False)
2597 fm.startitem()
2597 fm.startitem()
2598 fm.write('text', '%s', l.line[s:e], label='grep.match')
2598 fm.write('text', '%s', l.line[s:e], label='grep.match')
2599 fm.data(matched=True)
2599 fm.data(matched=True)
2600 p = e
2600 p = e
2601 if p < len(l.line):
2601 if p < len(l.line):
2602 fm.startitem()
2602 fm.startitem()
2603 fm.write('text', '%s', l.line[p:])
2603 fm.write('text', '%s', l.line[p:])
2604 fm.data(matched=False)
2604 fm.data(matched=False)
2605 fm.end()
2605 fm.end()
2606
2606
2607 skip = {}
2607 skip = {}
2608 revfiles = {}
2608 revfiles = {}
2609 match = scmutil.match(repo[None], pats, opts)
2609 match = scmutil.match(repo[None], pats, opts)
2610 found = False
2610 found = False
2611 follow = opts.get('follow')
2611 follow = opts.get('follow')
2612
2612
2613 def prep(ctx, fns):
2613 def prep(ctx, fns):
2614 rev = ctx.rev()
2614 rev = ctx.rev()
2615 pctx = ctx.p1()
2615 pctx = ctx.p1()
2616 parent = pctx.rev()
2616 parent = pctx.rev()
2617 matches.setdefault(rev, {})
2617 matches.setdefault(rev, {})
2618 matches.setdefault(parent, {})
2618 matches.setdefault(parent, {})
2619 files = revfiles.setdefault(rev, [])
2619 files = revfiles.setdefault(rev, [])
2620 for fn in fns:
2620 for fn in fns:
2621 flog = getfile(fn)
2621 flog = getfile(fn)
2622 try:
2622 try:
2623 fnode = ctx.filenode(fn)
2623 fnode = ctx.filenode(fn)
2624 except error.LookupError:
2624 except error.LookupError:
2625 continue
2625 continue
2626 try:
2626 try:
2627 copied = flog.renamed(fnode)
2627 copied = flog.renamed(fnode)
2628 except error.WdirUnsupported:
2628 except error.WdirUnsupported:
2629 copied = ctx[fn].renamed()
2629 copied = ctx[fn].renamed()
2630 copy = follow and copied and copied[0]
2630 copy = follow and copied and copied[0]
2631 if copy:
2631 if copy:
2632 copies.setdefault(rev, {})[fn] = copy
2632 copies.setdefault(rev, {})[fn] = copy
2633 if fn in skip:
2633 if fn in skip:
2634 if copy:
2634 if copy:
2635 skip[copy] = True
2635 skip[copy] = True
2636 continue
2636 continue
2637 files.append(fn)
2637 files.append(fn)
2638
2638
2639 if fn not in matches[rev]:
2639 if fn not in matches[rev]:
2640 try:
2640 try:
2641 content = flog.read(fnode)
2641 content = flog.read(fnode)
2642 except error.WdirUnsupported:
2642 except error.WdirUnsupported:
2643 content = ctx[fn].data()
2643 content = ctx[fn].data()
2644 grepbody(fn, rev, content)
2644 grepbody(fn, rev, content)
2645
2645
2646 pfn = copy or fn
2646 pfn = copy or fn
2647 if pfn not in matches[parent]:
2647 if pfn not in matches[parent]:
2648 try:
2648 try:
2649 fnode = pctx.filenode(pfn)
2649 fnode = pctx.filenode(pfn)
2650 grepbody(pfn, parent, flog.read(fnode))
2650 grepbody(pfn, parent, flog.read(fnode))
2651 except error.LookupError:
2651 except error.LookupError:
2652 pass
2652 pass
2653
2653
2654 ui.pager('grep')
2654 ui.pager('grep')
2655 fm = ui.formatter('grep', opts)
2655 fm = ui.formatter('grep', opts)
2656 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2656 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2657 rev = ctx.rev()
2657 rev = ctx.rev()
2658 parent = ctx.p1().rev()
2658 parent = ctx.p1().rev()
2659 for fn in sorted(revfiles.get(rev, [])):
2659 for fn in sorted(revfiles.get(rev, [])):
2660 states = matches[rev][fn]
2660 states = matches[rev][fn]
2661 copy = copies.get(rev, {}).get(fn)
2661 copy = copies.get(rev, {}).get(fn)
2662 if fn in skip:
2662 if fn in skip:
2663 if copy:
2663 if copy:
2664 skip[copy] = True
2664 skip[copy] = True
2665 continue
2665 continue
2666 pstates = matches.get(parent, {}).get(copy or fn, [])
2666 pstates = matches.get(parent, {}).get(copy or fn, [])
2667 if pstates or states:
2667 if pstates or states:
2668 r = display(fm, fn, ctx, pstates, states)
2668 r = display(fm, fn, ctx, pstates, states)
2669 found = found or r
2669 found = found or r
2670 if r and not opts.get('all'):
2670 if r and not opts.get('all'):
2671 skip[fn] = True
2671 skip[fn] = True
2672 if copy:
2672 if copy:
2673 skip[copy] = True
2673 skip[copy] = True
2674 del revfiles[rev]
2674 del revfiles[rev]
2675 # We will keep the matches dict for the duration of the window
2675 # We will keep the matches dict for the duration of the window
2676 # clear the matches dict once the window is over
2676 # clear the matches dict once the window is over
2677 if not revfiles:
2677 if not revfiles:
2678 matches.clear()
2678 matches.clear()
2679 fm.end()
2679 fm.end()
2680
2680
2681 return not found
2681 return not found
2682
2682
2683 @command('heads',
2683 @command('heads',
2684 [('r', 'rev', '',
2684 [('r', 'rev', '',
2685 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2685 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2686 ('t', 'topo', False, _('show topological heads only')),
2686 ('t', 'topo', False, _('show topological heads only')),
2687 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2687 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2688 ('c', 'closed', False, _('show normal and closed branch heads')),
2688 ('c', 'closed', False, _('show normal and closed branch heads')),
2689 ] + templateopts,
2689 ] + templateopts,
2690 _('[-ct] [-r STARTREV] [REV]...'),
2690 _('[-ct] [-r STARTREV] [REV]...'),
2691 intents={INTENT_READONLY})
2691 intents={INTENT_READONLY})
2692 def heads(ui, repo, *branchrevs, **opts):
2692 def heads(ui, repo, *branchrevs, **opts):
2693 """show branch heads
2693 """show branch heads
2694
2694
2695 With no arguments, show all open branch heads in the repository.
2695 With no arguments, show all open branch heads in the repository.
2696 Branch heads are changesets that have no descendants on the
2696 Branch heads are changesets that have no descendants on the
2697 same branch. They are where development generally takes place and
2697 same branch. They are where development generally takes place and
2698 are the usual targets for update and merge operations.
2698 are the usual targets for update and merge operations.
2699
2699
2700 If one or more REVs are given, only open branch heads on the
2700 If one or more REVs are given, only open branch heads on the
2701 branches associated with the specified changesets are shown. This
2701 branches associated with the specified changesets are shown. This
2702 means that you can use :hg:`heads .` to see the heads on the
2702 means that you can use :hg:`heads .` to see the heads on the
2703 currently checked-out branch.
2703 currently checked-out branch.
2704
2704
2705 If -c/--closed is specified, also show branch heads marked closed
2705 If -c/--closed is specified, also show branch heads marked closed
2706 (see :hg:`commit --close-branch`).
2706 (see :hg:`commit --close-branch`).
2707
2707
2708 If STARTREV is specified, only those heads that are descendants of
2708 If STARTREV is specified, only those heads that are descendants of
2709 STARTREV will be displayed.
2709 STARTREV will be displayed.
2710
2710
2711 If -t/--topo is specified, named branch mechanics will be ignored and only
2711 If -t/--topo is specified, named branch mechanics will be ignored and only
2712 topological heads (changesets with no children) will be shown.
2712 topological heads (changesets with no children) will be shown.
2713
2713
2714 Returns 0 if matching heads are found, 1 if not.
2714 Returns 0 if matching heads are found, 1 if not.
2715 """
2715 """
2716
2716
2717 opts = pycompat.byteskwargs(opts)
2717 opts = pycompat.byteskwargs(opts)
2718 start = None
2718 start = None
2719 rev = opts.get('rev')
2719 rev = opts.get('rev')
2720 if rev:
2720 if rev:
2721 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2721 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2722 start = scmutil.revsingle(repo, rev, None).node()
2722 start = scmutil.revsingle(repo, rev, None).node()
2723
2723
2724 if opts.get('topo'):
2724 if opts.get('topo'):
2725 heads = [repo[h] for h in repo.heads(start)]
2725 heads = [repo[h] for h in repo.heads(start)]
2726 else:
2726 else:
2727 heads = []
2727 heads = []
2728 for branch in repo.branchmap():
2728 for branch in repo.branchmap():
2729 heads += repo.branchheads(branch, start, opts.get('closed'))
2729 heads += repo.branchheads(branch, start, opts.get('closed'))
2730 heads = [repo[h] for h in heads]
2730 heads = [repo[h] for h in heads]
2731
2731
2732 if branchrevs:
2732 if branchrevs:
2733 branches = set(repo[r].branch()
2733 branches = set(repo[r].branch()
2734 for r in scmutil.revrange(repo, branchrevs))
2734 for r in scmutil.revrange(repo, branchrevs))
2735 heads = [h for h in heads if h.branch() in branches]
2735 heads = [h for h in heads if h.branch() in branches]
2736
2736
2737 if opts.get('active') and branchrevs:
2737 if opts.get('active') and branchrevs:
2738 dagheads = repo.heads(start)
2738 dagheads = repo.heads(start)
2739 heads = [h for h in heads if h.node() in dagheads]
2739 heads = [h for h in heads if h.node() in dagheads]
2740
2740
2741 if branchrevs:
2741 if branchrevs:
2742 haveheads = set(h.branch() for h in heads)
2742 haveheads = set(h.branch() for h in heads)
2743 if branches - haveheads:
2743 if branches - haveheads:
2744 headless = ', '.join(b for b in branches - haveheads)
2744 headless = ', '.join(b for b in branches - haveheads)
2745 msg = _('no open branch heads found on branches %s')
2745 msg = _('no open branch heads found on branches %s')
2746 if opts.get('rev'):
2746 if opts.get('rev'):
2747 msg += _(' (started at %s)') % opts['rev']
2747 msg += _(' (started at %s)') % opts['rev']
2748 ui.warn((msg + '\n') % headless)
2748 ui.warn((msg + '\n') % headless)
2749
2749
2750 if not heads:
2750 if not heads:
2751 return 1
2751 return 1
2752
2752
2753 ui.pager('heads')
2753 ui.pager('heads')
2754 heads = sorted(heads, key=lambda x: -x.rev())
2754 heads = sorted(heads, key=lambda x: -x.rev())
2755 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2755 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2756 for ctx in heads:
2756 for ctx in heads:
2757 displayer.show(ctx)
2757 displayer.show(ctx)
2758 displayer.close()
2758 displayer.close()
2759
2759
2760 @command('help',
2760 @command('help',
2761 [('e', 'extension', None, _('show only help for extensions')),
2761 [('e', 'extension', None, _('show only help for extensions')),
2762 ('c', 'command', None, _('show only help for commands')),
2762 ('c', 'command', None, _('show only help for commands')),
2763 ('k', 'keyword', None, _('show topics matching keyword')),
2763 ('k', 'keyword', None, _('show topics matching keyword')),
2764 ('s', 'system', [], _('show help for specific platform(s)')),
2764 ('s', 'system', [], _('show help for specific platform(s)')),
2765 ],
2765 ],
2766 _('[-ecks] [TOPIC]'),
2766 _('[-ecks] [TOPIC]'),
2767 norepo=True,
2767 norepo=True,
2768 intents={INTENT_READONLY})
2768 intents={INTENT_READONLY})
2769 def help_(ui, name=None, **opts):
2769 def help_(ui, name=None, **opts):
2770 """show help for a given topic or a help overview
2770 """show help for a given topic or a help overview
2771
2771
2772 With no arguments, print a list of commands with short help messages.
2772 With no arguments, print a list of commands with short help messages.
2773
2773
2774 Given a topic, extension, or command name, print help for that
2774 Given a topic, extension, or command name, print help for that
2775 topic.
2775 topic.
2776
2776
2777 Returns 0 if successful.
2777 Returns 0 if successful.
2778 """
2778 """
2779
2779
2780 keep = opts.get(r'system') or []
2780 keep = opts.get(r'system') or []
2781 if len(keep) == 0:
2781 if len(keep) == 0:
2782 if pycompat.sysplatform.startswith('win'):
2782 if pycompat.sysplatform.startswith('win'):
2783 keep.append('windows')
2783 keep.append('windows')
2784 elif pycompat.sysplatform == 'OpenVMS':
2784 elif pycompat.sysplatform == 'OpenVMS':
2785 keep.append('vms')
2785 keep.append('vms')
2786 elif pycompat.sysplatform == 'plan9':
2786 elif pycompat.sysplatform == 'plan9':
2787 keep.append('plan9')
2787 keep.append('plan9')
2788 else:
2788 else:
2789 keep.append('unix')
2789 keep.append('unix')
2790 keep.append(pycompat.sysplatform.lower())
2790 keep.append(pycompat.sysplatform.lower())
2791 if ui.verbose:
2791 if ui.verbose:
2792 keep.append('verbose')
2792 keep.append('verbose')
2793
2793
2794 commands = sys.modules[__name__]
2794 commands = sys.modules[__name__]
2795 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2795 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2796 ui.pager('help')
2796 ui.pager('help')
2797 ui.write(formatted)
2797 ui.write(formatted)
2798
2798
2799
2799
2800 @command('identify|id',
2800 @command('identify|id',
2801 [('r', 'rev', '',
2801 [('r', 'rev', '',
2802 _('identify the specified revision'), _('REV')),
2802 _('identify the specified revision'), _('REV')),
2803 ('n', 'num', None, _('show local revision number')),
2803 ('n', 'num', None, _('show local revision number')),
2804 ('i', 'id', None, _('show global revision id')),
2804 ('i', 'id', None, _('show global revision id')),
2805 ('b', 'branch', None, _('show branch')),
2805 ('b', 'branch', None, _('show branch')),
2806 ('t', 'tags', None, _('show tags')),
2806 ('t', 'tags', None, _('show tags')),
2807 ('B', 'bookmarks', None, _('show bookmarks')),
2807 ('B', 'bookmarks', None, _('show bookmarks')),
2808 ] + remoteopts + formatteropts,
2808 ] + remoteopts + formatteropts,
2809 _('[-nibtB] [-r REV] [SOURCE]'),
2809 _('[-nibtB] [-r REV] [SOURCE]'),
2810 optionalrepo=True,
2810 optionalrepo=True,
2811 intents={INTENT_READONLY})
2811 intents={INTENT_READONLY})
2812 def identify(ui, repo, source=None, rev=None,
2812 def identify(ui, repo, source=None, rev=None,
2813 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2813 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2814 """identify the working directory or specified revision
2814 """identify the working directory or specified revision
2815
2815
2816 Print a summary identifying the repository state at REV using one or
2816 Print a summary identifying the repository state at REV using one or
2817 two parent hash identifiers, followed by a "+" if the working
2817 two parent hash identifiers, followed by a "+" if the working
2818 directory has uncommitted changes, the branch name (if not default),
2818 directory has uncommitted changes, the branch name (if not default),
2819 a list of tags, and a list of bookmarks.
2819 a list of tags, and a list of bookmarks.
2820
2820
2821 When REV is not given, print a summary of the current state of the
2821 When REV is not given, print a summary of the current state of the
2822 repository including the working directory. Specify -r. to get information
2822 repository including the working directory. Specify -r. to get information
2823 of the working directory parent without scanning uncommitted changes.
2823 of the working directory parent without scanning uncommitted changes.
2824
2824
2825 Specifying a path to a repository root or Mercurial bundle will
2825 Specifying a path to a repository root or Mercurial bundle will
2826 cause lookup to operate on that repository/bundle.
2826 cause lookup to operate on that repository/bundle.
2827
2827
2828 .. container:: verbose
2828 .. container:: verbose
2829
2829
2830 Examples:
2830 Examples:
2831
2831
2832 - generate a build identifier for the working directory::
2832 - generate a build identifier for the working directory::
2833
2833
2834 hg id --id > build-id.dat
2834 hg id --id > build-id.dat
2835
2835
2836 - find the revision corresponding to a tag::
2836 - find the revision corresponding to a tag::
2837
2837
2838 hg id -n -r 1.3
2838 hg id -n -r 1.3
2839
2839
2840 - check the most recent revision of a remote repository::
2840 - check the most recent revision of a remote repository::
2841
2841
2842 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2842 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2843
2843
2844 See :hg:`log` for generating more information about specific revisions,
2844 See :hg:`log` for generating more information about specific revisions,
2845 including full hash identifiers.
2845 including full hash identifiers.
2846
2846
2847 Returns 0 if successful.
2847 Returns 0 if successful.
2848 """
2848 """
2849
2849
2850 opts = pycompat.byteskwargs(opts)
2850 opts = pycompat.byteskwargs(opts)
2851 if not repo and not source:
2851 if not repo and not source:
2852 raise error.Abort(_("there is no Mercurial repository here "
2852 raise error.Abort(_("there is no Mercurial repository here "
2853 "(.hg not found)"))
2853 "(.hg not found)"))
2854
2854
2855 if ui.debugflag:
2855 if ui.debugflag:
2856 hexfunc = hex
2856 hexfunc = hex
2857 else:
2857 else:
2858 hexfunc = short
2858 hexfunc = short
2859 default = not (num or id or branch or tags or bookmarks)
2859 default = not (num or id or branch or tags or bookmarks)
2860 output = []
2860 output = []
2861 revs = []
2861 revs = []
2862
2862
2863 if source:
2863 if source:
2864 source, branches = hg.parseurl(ui.expandpath(source))
2864 source, branches = hg.parseurl(ui.expandpath(source))
2865 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2865 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2866 repo = peer.local()
2866 repo = peer.local()
2867 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2867 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2868
2868
2869 fm = ui.formatter('identify', opts)
2869 fm = ui.formatter('identify', opts)
2870 fm.startitem()
2870 fm.startitem()
2871
2871
2872 if not repo:
2872 if not repo:
2873 if num or branch or tags:
2873 if num or branch or tags:
2874 raise error.Abort(
2874 raise error.Abort(
2875 _("can't query remote revision number, branch, or tags"))
2875 _("can't query remote revision number, branch, or tags"))
2876 if not rev and revs:
2876 if not rev and revs:
2877 rev = revs[0]
2877 rev = revs[0]
2878 if not rev:
2878 if not rev:
2879 rev = "tip"
2879 rev = "tip"
2880
2880
2881 remoterev = peer.lookup(rev)
2881 remoterev = peer.lookup(rev)
2882 hexrev = hexfunc(remoterev)
2882 hexrev = hexfunc(remoterev)
2883 if default or id:
2883 if default or id:
2884 output = [hexrev]
2884 output = [hexrev]
2885 fm.data(id=hexrev)
2885 fm.data(id=hexrev)
2886
2886
2887 def getbms():
2887 def getbms():
2888 bms = []
2888 bms = []
2889
2889
2890 if 'bookmarks' in peer.listkeys('namespaces'):
2890 if 'bookmarks' in peer.listkeys('namespaces'):
2891 hexremoterev = hex(remoterev)
2891 hexremoterev = hex(remoterev)
2892 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2892 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2893 if bmr == hexremoterev]
2893 if bmr == hexremoterev]
2894
2894
2895 return sorted(bms)
2895 return sorted(bms)
2896
2896
2897 bms = getbms()
2897 bms = getbms()
2898 if bookmarks:
2898 if bookmarks:
2899 output.extend(bms)
2899 output.extend(bms)
2900 elif default and not ui.quiet:
2900 elif default and not ui.quiet:
2901 # multiple bookmarks for a single parent separated by '/'
2901 # multiple bookmarks for a single parent separated by '/'
2902 bm = '/'.join(bms)
2902 bm = '/'.join(bms)
2903 if bm:
2903 if bm:
2904 output.append(bm)
2904 output.append(bm)
2905
2905
2906 fm.data(node=hex(remoterev))
2906 fm.data(node=hex(remoterev))
2907 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2907 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2908 else:
2908 else:
2909 if rev:
2909 if rev:
2910 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2910 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2911 ctx = scmutil.revsingle(repo, rev, None)
2911 ctx = scmutil.revsingle(repo, rev, None)
2912
2912
2913 if ctx.rev() is None:
2913 if ctx.rev() is None:
2914 ctx = repo[None]
2914 ctx = repo[None]
2915 parents = ctx.parents()
2915 parents = ctx.parents()
2916 taglist = []
2916 taglist = []
2917 for p in parents:
2917 for p in parents:
2918 taglist.extend(p.tags())
2918 taglist.extend(p.tags())
2919
2919
2920 dirty = ""
2920 dirty = ""
2921 if ctx.dirty(missing=True, merge=False, branch=False):
2921 if ctx.dirty(missing=True, merge=False, branch=False):
2922 dirty = '+'
2922 dirty = '+'
2923 fm.data(dirty=dirty)
2923 fm.data(dirty=dirty)
2924
2924
2925 hexoutput = [hexfunc(p.node()) for p in parents]
2925 hexoutput = [hexfunc(p.node()) for p in parents]
2926 if default or id:
2926 if default or id:
2927 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2927 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2928 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2928 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2929
2929
2930 if num:
2930 if num:
2931 numoutput = ["%d" % p.rev() for p in parents]
2931 numoutput = ["%d" % p.rev() for p in parents]
2932 output.append("%s%s" % ('+'.join(numoutput), dirty))
2932 output.append("%s%s" % ('+'.join(numoutput), dirty))
2933
2933
2934 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
2934 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
2935 for p in parents:
2935 for p in parents:
2936 fn.startitem()
2936 fn.startitem()
2937 fn.data(rev=p.rev())
2937 fn.data(rev=p.rev())
2938 fn.data(node=p.hex())
2938 fn.data(node=p.hex())
2939 fn.context(ctx=p)
2939 fn.context(ctx=p)
2940 fn.end()
2940 fn.end()
2941 else:
2941 else:
2942 hexoutput = hexfunc(ctx.node())
2942 hexoutput = hexfunc(ctx.node())
2943 if default or id:
2943 if default or id:
2944 output = [hexoutput]
2944 output = [hexoutput]
2945 fm.data(id=hexoutput)
2945 fm.data(id=hexoutput)
2946
2946
2947 if num:
2947 if num:
2948 output.append(pycompat.bytestr(ctx.rev()))
2948 output.append(pycompat.bytestr(ctx.rev()))
2949 taglist = ctx.tags()
2949 taglist = ctx.tags()
2950
2950
2951 if default and not ui.quiet:
2951 if default and not ui.quiet:
2952 b = ctx.branch()
2952 b = ctx.branch()
2953 if b != 'default':
2953 if b != 'default':
2954 output.append("(%s)" % b)
2954 output.append("(%s)" % b)
2955
2955
2956 # multiple tags for a single parent separated by '/'
2956 # multiple tags for a single parent separated by '/'
2957 t = '/'.join(taglist)
2957 t = '/'.join(taglist)
2958 if t:
2958 if t:
2959 output.append(t)
2959 output.append(t)
2960
2960
2961 # multiple bookmarks for a single parent separated by '/'
2961 # multiple bookmarks for a single parent separated by '/'
2962 bm = '/'.join(ctx.bookmarks())
2962 bm = '/'.join(ctx.bookmarks())
2963 if bm:
2963 if bm:
2964 output.append(bm)
2964 output.append(bm)
2965 else:
2965 else:
2966 if branch:
2966 if branch:
2967 output.append(ctx.branch())
2967 output.append(ctx.branch())
2968
2968
2969 if tags:
2969 if tags:
2970 output.extend(taglist)
2970 output.extend(taglist)
2971
2971
2972 if bookmarks:
2972 if bookmarks:
2973 output.extend(ctx.bookmarks())
2973 output.extend(ctx.bookmarks())
2974
2974
2975 fm.data(node=ctx.hex())
2975 fm.data(node=ctx.hex())
2976 fm.data(branch=ctx.branch())
2976 fm.data(branch=ctx.branch())
2977 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2977 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2978 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2978 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2979 fm.context(ctx=ctx)
2979 fm.context(ctx=ctx)
2980
2980
2981 fm.plain("%s\n" % ' '.join(output))
2981 fm.plain("%s\n" % ' '.join(output))
2982 fm.end()
2982 fm.end()
2983
2983
2984 @command('import|patch',
2984 @command('import|patch',
2985 [('p', 'strip', 1,
2985 [('p', 'strip', 1,
2986 _('directory strip option for patch. This has the same '
2986 _('directory strip option for patch. This has the same '
2987 'meaning as the corresponding patch option'), _('NUM')),
2987 'meaning as the corresponding patch option'), _('NUM')),
2988 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2988 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2989 ('e', 'edit', False, _('invoke editor on commit messages')),
2989 ('e', 'edit', False, _('invoke editor on commit messages')),
2990 ('f', 'force', None,
2990 ('f', 'force', None,
2991 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2991 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2992 ('', 'no-commit', None,
2992 ('', 'no-commit', None,
2993 _("don't commit, just update the working directory")),
2993 _("don't commit, just update the working directory")),
2994 ('', 'bypass', None,
2994 ('', 'bypass', None,
2995 _("apply patch without touching the working directory")),
2995 _("apply patch without touching the working directory")),
2996 ('', 'partial', None,
2996 ('', 'partial', None,
2997 _('commit even if some hunks fail')),
2997 _('commit even if some hunks fail')),
2998 ('', 'exact', None,
2998 ('', 'exact', None,
2999 _('abort if patch would apply lossily')),
2999 _('abort if patch would apply lossily')),
3000 ('', 'prefix', '',
3000 ('', 'prefix', '',
3001 _('apply patch to subdirectory'), _('DIR')),
3001 _('apply patch to subdirectory'), _('DIR')),
3002 ('', 'import-branch', None,
3002 ('', 'import-branch', None,
3003 _('use any branch information in patch (implied by --exact)'))] +
3003 _('use any branch information in patch (implied by --exact)'))] +
3004 commitopts + commitopts2 + similarityopts,
3004 commitopts + commitopts2 + similarityopts,
3005 _('[OPTION]... PATCH...'))
3005 _('[OPTION]... PATCH...'))
3006 def import_(ui, repo, patch1=None, *patches, **opts):
3006 def import_(ui, repo, patch1=None, *patches, **opts):
3007 """import an ordered set of patches
3007 """import an ordered set of patches
3008
3008
3009 Import a list of patches and commit them individually (unless
3009 Import a list of patches and commit them individually (unless
3010 --no-commit is specified).
3010 --no-commit is specified).
3011
3011
3012 To read a patch from standard input (stdin), use "-" as the patch
3012 To read a patch from standard input (stdin), use "-" as the patch
3013 name. If a URL is specified, the patch will be downloaded from
3013 name. If a URL is specified, the patch will be downloaded from
3014 there.
3014 there.
3015
3015
3016 Import first applies changes to the working directory (unless
3016 Import first applies changes to the working directory (unless
3017 --bypass is specified), import will abort if there are outstanding
3017 --bypass is specified), import will abort if there are outstanding
3018 changes.
3018 changes.
3019
3019
3020 Use --bypass to apply and commit patches directly to the
3020 Use --bypass to apply and commit patches directly to the
3021 repository, without affecting the working directory. Without
3021 repository, without affecting the working directory. Without
3022 --exact, patches will be applied on top of the working directory
3022 --exact, patches will be applied on top of the working directory
3023 parent revision.
3023 parent revision.
3024
3024
3025 You can import a patch straight from a mail message. Even patches
3025 You can import a patch straight from a mail message. Even patches
3026 as attachments work (to use the body part, it must have type
3026 as attachments work (to use the body part, it must have type
3027 text/plain or text/x-patch). From and Subject headers of email
3027 text/plain or text/x-patch). From and Subject headers of email
3028 message are used as default committer and commit message. All
3028 message are used as default committer and commit message. All
3029 text/plain body parts before first diff are added to the commit
3029 text/plain body parts before first diff are added to the commit
3030 message.
3030 message.
3031
3031
3032 If the imported patch was generated by :hg:`export`, user and
3032 If the imported patch was generated by :hg:`export`, user and
3033 description from patch override values from message headers and
3033 description from patch override values from message headers and
3034 body. Values given on command line with -m/--message and -u/--user
3034 body. Values given on command line with -m/--message and -u/--user
3035 override these.
3035 override these.
3036
3036
3037 If --exact is specified, import will set the working directory to
3037 If --exact is specified, import will set the working directory to
3038 the parent of each patch before applying it, and will abort if the
3038 the parent of each patch before applying it, and will abort if the
3039 resulting changeset has a different ID than the one recorded in
3039 resulting changeset has a different ID than the one recorded in
3040 the patch. This will guard against various ways that portable
3040 the patch. This will guard against various ways that portable
3041 patch formats and mail systems might fail to transfer Mercurial
3041 patch formats and mail systems might fail to transfer Mercurial
3042 data or metadata. See :hg:`bundle` for lossless transmission.
3042 data or metadata. See :hg:`bundle` for lossless transmission.
3043
3043
3044 Use --partial to ensure a changeset will be created from the patch
3044 Use --partial to ensure a changeset will be created from the patch
3045 even if some hunks fail to apply. Hunks that fail to apply will be
3045 even if some hunks fail to apply. Hunks that fail to apply will be
3046 written to a <target-file>.rej file. Conflicts can then be resolved
3046 written to a <target-file>.rej file. Conflicts can then be resolved
3047 by hand before :hg:`commit --amend` is run to update the created
3047 by hand before :hg:`commit --amend` is run to update the created
3048 changeset. This flag exists to let people import patches that
3048 changeset. This flag exists to let people import patches that
3049 partially apply without losing the associated metadata (author,
3049 partially apply without losing the associated metadata (author,
3050 date, description, ...).
3050 date, description, ...).
3051
3051
3052 .. note::
3052 .. note::
3053
3053
3054 When no hunks apply cleanly, :hg:`import --partial` will create
3054 When no hunks apply cleanly, :hg:`import --partial` will create
3055 an empty changeset, importing only the patch metadata.
3055 an empty changeset, importing only the patch metadata.
3056
3056
3057 With -s/--similarity, hg will attempt to discover renames and
3057 With -s/--similarity, hg will attempt to discover renames and
3058 copies in the patch in the same way as :hg:`addremove`.
3058 copies in the patch in the same way as :hg:`addremove`.
3059
3059
3060 It is possible to use external patch programs to perform the patch
3060 It is possible to use external patch programs to perform the patch
3061 by setting the ``ui.patch`` configuration option. For the default
3061 by setting the ``ui.patch`` configuration option. For the default
3062 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3062 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3063 See :hg:`help config` for more information about configuration
3063 See :hg:`help config` for more information about configuration
3064 files and how to use these options.
3064 files and how to use these options.
3065
3065
3066 See :hg:`help dates` for a list of formats valid for -d/--date.
3066 See :hg:`help dates` for a list of formats valid for -d/--date.
3067
3067
3068 .. container:: verbose
3068 .. container:: verbose
3069
3069
3070 Examples:
3070 Examples:
3071
3071
3072 - import a traditional patch from a website and detect renames::
3072 - import a traditional patch from a website and detect renames::
3073
3073
3074 hg import -s 80 http://example.com/bugfix.patch
3074 hg import -s 80 http://example.com/bugfix.patch
3075
3075
3076 - import a changeset from an hgweb server::
3076 - import a changeset from an hgweb server::
3077
3077
3078 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3078 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3079
3079
3080 - import all the patches in an Unix-style mbox::
3080 - import all the patches in an Unix-style mbox::
3081
3081
3082 hg import incoming-patches.mbox
3082 hg import incoming-patches.mbox
3083
3083
3084 - import patches from stdin::
3084 - import patches from stdin::
3085
3085
3086 hg import -
3086 hg import -
3087
3087
3088 - attempt to exactly restore an exported changeset (not always
3088 - attempt to exactly restore an exported changeset (not always
3089 possible)::
3089 possible)::
3090
3090
3091 hg import --exact proposed-fix.patch
3091 hg import --exact proposed-fix.patch
3092
3092
3093 - use an external tool to apply a patch which is too fuzzy for
3093 - use an external tool to apply a patch which is too fuzzy for
3094 the default internal tool.
3094 the default internal tool.
3095
3095
3096 hg import --config ui.patch="patch --merge" fuzzy.patch
3096 hg import --config ui.patch="patch --merge" fuzzy.patch
3097
3097
3098 - change the default fuzzing from 2 to a less strict 7
3098 - change the default fuzzing from 2 to a less strict 7
3099
3099
3100 hg import --config ui.fuzz=7 fuzz.patch
3100 hg import --config ui.fuzz=7 fuzz.patch
3101
3101
3102 Returns 0 on success, 1 on partial success (see --partial).
3102 Returns 0 on success, 1 on partial success (see --partial).
3103 """
3103 """
3104
3104
3105 opts = pycompat.byteskwargs(opts)
3105 opts = pycompat.byteskwargs(opts)
3106 if not patch1:
3106 if not patch1:
3107 raise error.Abort(_('need at least one patch to import'))
3107 raise error.Abort(_('need at least one patch to import'))
3108
3108
3109 patches = (patch1,) + patches
3109 patches = (patch1,) + patches
3110
3110
3111 date = opts.get('date')
3111 date = opts.get('date')
3112 if date:
3112 if date:
3113 opts['date'] = dateutil.parsedate(date)
3113 opts['date'] = dateutil.parsedate(date)
3114
3114
3115 exact = opts.get('exact')
3115 exact = opts.get('exact')
3116 update = not opts.get('bypass')
3116 update = not opts.get('bypass')
3117 if not update and opts.get('no_commit'):
3117 if not update and opts.get('no_commit'):
3118 raise error.Abort(_('cannot use --no-commit with --bypass'))
3118 raise error.Abort(_('cannot use --no-commit with --bypass'))
3119 try:
3119 try:
3120 sim = float(opts.get('similarity') or 0)
3120 sim = float(opts.get('similarity') or 0)
3121 except ValueError:
3121 except ValueError:
3122 raise error.Abort(_('similarity must be a number'))
3122 raise error.Abort(_('similarity must be a number'))
3123 if sim < 0 or sim > 100:
3123 if sim < 0 or sim > 100:
3124 raise error.Abort(_('similarity must be between 0 and 100'))
3124 raise error.Abort(_('similarity must be between 0 and 100'))
3125 if sim and not update:
3125 if sim and not update:
3126 raise error.Abort(_('cannot use --similarity with --bypass'))
3126 raise error.Abort(_('cannot use --similarity with --bypass'))
3127 if exact:
3127 if exact:
3128 if opts.get('edit'):
3128 if opts.get('edit'):
3129 raise error.Abort(_('cannot use --exact with --edit'))
3129 raise error.Abort(_('cannot use --exact with --edit'))
3130 if opts.get('prefix'):
3130 if opts.get('prefix'):
3131 raise error.Abort(_('cannot use --exact with --prefix'))
3131 raise error.Abort(_('cannot use --exact with --prefix'))
3132
3132
3133 base = opts["base"]
3133 base = opts["base"]
3134 wlock = dsguard = lock = tr = None
3134 wlock = dsguard = lock = tr = None
3135 msgs = []
3135 msgs = []
3136 ret = 0
3136 ret = 0
3137
3137
3138
3138
3139 try:
3139 try:
3140 wlock = repo.wlock()
3140 wlock = repo.wlock()
3141
3141
3142 if update:
3142 if update:
3143 cmdutil.checkunfinished(repo)
3143 cmdutil.checkunfinished(repo)
3144 if (exact or not opts.get('force')):
3144 if (exact or not opts.get('force')):
3145 cmdutil.bailifchanged(repo)
3145 cmdutil.bailifchanged(repo)
3146
3146
3147 if not opts.get('no_commit'):
3147 if not opts.get('no_commit'):
3148 lock = repo.lock()
3148 lock = repo.lock()
3149 tr = repo.transaction('import')
3149 tr = repo.transaction('import')
3150 else:
3150 else:
3151 dsguard = dirstateguard.dirstateguard(repo, 'import')
3151 dsguard = dirstateguard.dirstateguard(repo, 'import')
3152 parents = repo[None].parents()
3152 parents = repo[None].parents()
3153 for patchurl in patches:
3153 for patchurl in patches:
3154 if patchurl == '-':
3154 if patchurl == '-':
3155 ui.status(_('applying patch from stdin\n'))
3155 ui.status(_('applying patch from stdin\n'))
3156 patchfile = ui.fin
3156 patchfile = ui.fin
3157 patchurl = 'stdin' # for error message
3157 patchurl = 'stdin' # for error message
3158 else:
3158 else:
3159 patchurl = os.path.join(base, patchurl)
3159 patchurl = os.path.join(base, patchurl)
3160 ui.status(_('applying %s\n') % patchurl)
3160 ui.status(_('applying %s\n') % patchurl)
3161 patchfile = hg.openpath(ui, patchurl)
3161 patchfile = hg.openpath(ui, patchurl)
3162
3162
3163 haspatch = False
3163 haspatch = False
3164 for hunk in patch.split(patchfile):
3164 for hunk in patch.split(patchfile):
3165 with patch.extract(ui, hunk) as patchdata:
3165 with patch.extract(ui, hunk) as patchdata:
3166 msg, node, rej = cmdutil.tryimportone(ui, repo, patchdata,
3166 msg, node, rej = cmdutil.tryimportone(ui, repo, patchdata,
3167 parents, opts,
3167 parents, opts,
3168 msgs, hg.clean)
3168 msgs, hg.clean)
3169 if msg:
3169 if msg:
3170 haspatch = True
3170 haspatch = True
3171 ui.note(msg + '\n')
3171 ui.note(msg + '\n')
3172 if update or exact:
3172 if update or exact:
3173 parents = repo[None].parents()
3173 parents = repo[None].parents()
3174 else:
3174 else:
3175 parents = [repo[node]]
3175 parents = [repo[node]]
3176 if rej:
3176 if rej:
3177 ui.write_err(_("patch applied partially\n"))
3177 ui.write_err(_("patch applied partially\n"))
3178 ui.write_err(_("(fix the .rej files and run "
3178 ui.write_err(_("(fix the .rej files and run "
3179 "`hg commit --amend`)\n"))
3179 "`hg commit --amend`)\n"))
3180 ret = 1
3180 ret = 1
3181 break
3181 break
3182
3182
3183 if not haspatch:
3183 if not haspatch:
3184 raise error.Abort(_('%s: no diffs found') % patchurl)
3184 raise error.Abort(_('%s: no diffs found') % patchurl)
3185
3185
3186 if tr:
3186 if tr:
3187 tr.close()
3187 tr.close()
3188 if msgs:
3188 if msgs:
3189 repo.savecommitmessage('\n* * *\n'.join(msgs))
3189 repo.savecommitmessage('\n* * *\n'.join(msgs))
3190 if dsguard:
3190 if dsguard:
3191 dsguard.close()
3191 dsguard.close()
3192 return ret
3192 return ret
3193 finally:
3193 finally:
3194 if tr:
3194 if tr:
3195 tr.release()
3195 tr.release()
3196 release(lock, dsguard, wlock)
3196 release(lock, dsguard, wlock)
3197
3197
3198 @command('incoming|in',
3198 @command('incoming|in',
3199 [('f', 'force', None,
3199 [('f', 'force', None,
3200 _('run even if remote repository is unrelated')),
3200 _('run even if remote repository is unrelated')),
3201 ('n', 'newest-first', None, _('show newest record first')),
3201 ('n', 'newest-first', None, _('show newest record first')),
3202 ('', 'bundle', '',
3202 ('', 'bundle', '',
3203 _('file to store the bundles into'), _('FILE')),
3203 _('file to store the bundles into'), _('FILE')),
3204 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3204 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3205 ('B', 'bookmarks', False, _("compare bookmarks")),
3205 ('B', 'bookmarks', False, _("compare bookmarks")),
3206 ('b', 'branch', [],
3206 ('b', 'branch', [],
3207 _('a specific branch you would like to pull'), _('BRANCH')),
3207 _('a specific branch you would like to pull'), _('BRANCH')),
3208 ] + logopts + remoteopts + subrepoopts,
3208 ] + logopts + remoteopts + subrepoopts,
3209 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3209 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3210 def incoming(ui, repo, source="default", **opts):
3210 def incoming(ui, repo, source="default", **opts):
3211 """show new changesets found in source
3211 """show new changesets found in source
3212
3212
3213 Show new changesets found in the specified path/URL or the default
3213 Show new changesets found in the specified path/URL or the default
3214 pull location. These are the changesets that would have been pulled
3214 pull location. These are the changesets that would have been pulled
3215 by :hg:`pull` at the time you issued this command.
3215 by :hg:`pull` at the time you issued this command.
3216
3216
3217 See pull for valid source format details.
3217 See pull for valid source format details.
3218
3218
3219 .. container:: verbose
3219 .. container:: verbose
3220
3220
3221 With -B/--bookmarks, the result of bookmark comparison between
3221 With -B/--bookmarks, the result of bookmark comparison between
3222 local and remote repositories is displayed. With -v/--verbose,
3222 local and remote repositories is displayed. With -v/--verbose,
3223 status is also displayed for each bookmark like below::
3223 status is also displayed for each bookmark like below::
3224
3224
3225 BM1 01234567890a added
3225 BM1 01234567890a added
3226 BM2 1234567890ab advanced
3226 BM2 1234567890ab advanced
3227 BM3 234567890abc diverged
3227 BM3 234567890abc diverged
3228 BM4 34567890abcd changed
3228 BM4 34567890abcd changed
3229
3229
3230 The action taken locally when pulling depends on the
3230 The action taken locally when pulling depends on the
3231 status of each bookmark:
3231 status of each bookmark:
3232
3232
3233 :``added``: pull will create it
3233 :``added``: pull will create it
3234 :``advanced``: pull will update it
3234 :``advanced``: pull will update it
3235 :``diverged``: pull will create a divergent bookmark
3235 :``diverged``: pull will create a divergent bookmark
3236 :``changed``: result depends on remote changesets
3236 :``changed``: result depends on remote changesets
3237
3237
3238 From the point of view of pulling behavior, bookmark
3238 From the point of view of pulling behavior, bookmark
3239 existing only in the remote repository are treated as ``added``,
3239 existing only in the remote repository are treated as ``added``,
3240 even if it is in fact locally deleted.
3240 even if it is in fact locally deleted.
3241
3241
3242 .. container:: verbose
3242 .. container:: verbose
3243
3243
3244 For remote repository, using --bundle avoids downloading the
3244 For remote repository, using --bundle avoids downloading the
3245 changesets twice if the incoming is followed by a pull.
3245 changesets twice if the incoming is followed by a pull.
3246
3246
3247 Examples:
3247 Examples:
3248
3248
3249 - show incoming changes with patches and full description::
3249 - show incoming changes with patches and full description::
3250
3250
3251 hg incoming -vp
3251 hg incoming -vp
3252
3252
3253 - show incoming changes excluding merges, store a bundle::
3253 - show incoming changes excluding merges, store a bundle::
3254
3254
3255 hg in -vpM --bundle incoming.hg
3255 hg in -vpM --bundle incoming.hg
3256 hg pull incoming.hg
3256 hg pull incoming.hg
3257
3257
3258 - briefly list changes inside a bundle::
3258 - briefly list changes inside a bundle::
3259
3259
3260 hg in changes.hg -T "{desc|firstline}\\n"
3260 hg in changes.hg -T "{desc|firstline}\\n"
3261
3261
3262 Returns 0 if there are incoming changes, 1 otherwise.
3262 Returns 0 if there are incoming changes, 1 otherwise.
3263 """
3263 """
3264 opts = pycompat.byteskwargs(opts)
3264 opts = pycompat.byteskwargs(opts)
3265 if opts.get('graph'):
3265 if opts.get('graph'):
3266 logcmdutil.checkunsupportedgraphflags([], opts)
3266 logcmdutil.checkunsupportedgraphflags([], opts)
3267 def display(other, chlist, displayer):
3267 def display(other, chlist, displayer):
3268 revdag = logcmdutil.graphrevs(other, chlist, opts)
3268 revdag = logcmdutil.graphrevs(other, chlist, opts)
3269 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3269 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3270 graphmod.asciiedges)
3270 graphmod.asciiedges)
3271
3271
3272 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3272 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3273 return 0
3273 return 0
3274
3274
3275 if opts.get('bundle') and opts.get('subrepos'):
3275 if opts.get('bundle') and opts.get('subrepos'):
3276 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3276 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3277
3277
3278 if opts.get('bookmarks'):
3278 if opts.get('bookmarks'):
3279 source, branches = hg.parseurl(ui.expandpath(source),
3279 source, branches = hg.parseurl(ui.expandpath(source),
3280 opts.get('branch'))
3280 opts.get('branch'))
3281 other = hg.peer(repo, opts, source)
3281 other = hg.peer(repo, opts, source)
3282 if 'bookmarks' not in other.listkeys('namespaces'):
3282 if 'bookmarks' not in other.listkeys('namespaces'):
3283 ui.warn(_("remote doesn't support bookmarks\n"))
3283 ui.warn(_("remote doesn't support bookmarks\n"))
3284 return 0
3284 return 0
3285 ui.pager('incoming')
3285 ui.pager('incoming')
3286 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3286 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3287 return bookmarks.incoming(ui, repo, other)
3287 return bookmarks.incoming(ui, repo, other)
3288
3288
3289 repo._subtoppath = ui.expandpath(source)
3289 repo._subtoppath = ui.expandpath(source)
3290 try:
3290 try:
3291 return hg.incoming(ui, repo, source, opts)
3291 return hg.incoming(ui, repo, source, opts)
3292 finally:
3292 finally:
3293 del repo._subtoppath
3293 del repo._subtoppath
3294
3294
3295
3295
3296 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3296 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3297 norepo=True)
3297 norepo=True)
3298 def init(ui, dest=".", **opts):
3298 def init(ui, dest=".", **opts):
3299 """create a new repository in the given directory
3299 """create a new repository in the given directory
3300
3300
3301 Initialize a new repository in the given directory. If the given
3301 Initialize a new repository in the given directory. If the given
3302 directory does not exist, it will be created.
3302 directory does not exist, it will be created.
3303
3303
3304 If no directory is given, the current directory is used.
3304 If no directory is given, the current directory is used.
3305
3305
3306 It is possible to specify an ``ssh://`` URL as the destination.
3306 It is possible to specify an ``ssh://`` URL as the destination.
3307 See :hg:`help urls` for more information.
3307 See :hg:`help urls` for more information.
3308
3308
3309 Returns 0 on success.
3309 Returns 0 on success.
3310 """
3310 """
3311 opts = pycompat.byteskwargs(opts)
3311 opts = pycompat.byteskwargs(opts)
3312 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3312 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3313
3313
3314 @command('locate',
3314 @command('locate',
3315 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3315 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3316 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3316 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3317 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3317 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3318 ] + walkopts,
3318 ] + walkopts,
3319 _('[OPTION]... [PATTERN]...'))
3319 _('[OPTION]... [PATTERN]...'))
3320 def locate(ui, repo, *pats, **opts):
3320 def locate(ui, repo, *pats, **opts):
3321 """locate files matching specific patterns (DEPRECATED)
3321 """locate files matching specific patterns (DEPRECATED)
3322
3322
3323 Print files under Mercurial control in the working directory whose
3323 Print files under Mercurial control in the working directory whose
3324 names match the given patterns.
3324 names match the given patterns.
3325
3325
3326 By default, this command searches all directories in the working
3326 By default, this command searches all directories in the working
3327 directory. To search just the current directory and its
3327 directory. To search just the current directory and its
3328 subdirectories, use "--include .".
3328 subdirectories, use "--include .".
3329
3329
3330 If no patterns are given to match, this command prints the names
3330 If no patterns are given to match, this command prints the names
3331 of all files under Mercurial control in the working directory.
3331 of all files under Mercurial control in the working directory.
3332
3332
3333 If you want to feed the output of this command into the "xargs"
3333 If you want to feed the output of this command into the "xargs"
3334 command, use the -0 option to both this command and "xargs". This
3334 command, use the -0 option to both this command and "xargs". This
3335 will avoid the problem of "xargs" treating single filenames that
3335 will avoid the problem of "xargs" treating single filenames that
3336 contain whitespace as multiple filenames.
3336 contain whitespace as multiple filenames.
3337
3337
3338 See :hg:`help files` for a more versatile command.
3338 See :hg:`help files` for a more versatile command.
3339
3339
3340 Returns 0 if a match is found, 1 otherwise.
3340 Returns 0 if a match is found, 1 otherwise.
3341 """
3341 """
3342 opts = pycompat.byteskwargs(opts)
3342 opts = pycompat.byteskwargs(opts)
3343 if opts.get('print0'):
3343 if opts.get('print0'):
3344 end = '\0'
3344 end = '\0'
3345 else:
3345 else:
3346 end = '\n'
3346 end = '\n'
3347 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3347 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3348
3348
3349 ret = 1
3349 ret = 1
3350 m = scmutil.match(ctx, pats, opts, default='relglob',
3350 m = scmutil.match(ctx, pats, opts, default='relglob',
3351 badfn=lambda x, y: False)
3351 badfn=lambda x, y: False)
3352
3352
3353 ui.pager('locate')
3353 ui.pager('locate')
3354 if ctx.rev() is None:
3354 if ctx.rev() is None:
3355 # When run on the working copy, "locate" includes removed files, so
3355 # When run on the working copy, "locate" includes removed files, so
3356 # we get the list of files from the dirstate.
3356 # we get the list of files from the dirstate.
3357 filesgen = sorted(repo.dirstate.matches(m))
3357 filesgen = sorted(repo.dirstate.matches(m))
3358 else:
3358 else:
3359 filesgen = ctx.matches(m)
3359 filesgen = ctx.matches(m)
3360 for abs in filesgen:
3360 for abs in filesgen:
3361 if opts.get('fullpath'):
3361 if opts.get('fullpath'):
3362 ui.write(repo.wjoin(abs), end)
3362 ui.write(repo.wjoin(abs), end)
3363 else:
3363 else:
3364 ui.write(((pats and m.rel(abs)) or abs), end)
3364 ui.write(((pats and m.rel(abs)) or abs), end)
3365 ret = 0
3365 ret = 0
3366
3366
3367 return ret
3367 return ret
3368
3368
3369 @command('^log|history',
3369 @command('^log|history',
3370 [('f', 'follow', None,
3370 [('f', 'follow', None,
3371 _('follow changeset history, or file history across copies and renames')),
3371 _('follow changeset history, or file history across copies and renames')),
3372 ('', 'follow-first', None,
3372 ('', 'follow-first', None,
3373 _('only follow the first parent of merge changesets (DEPRECATED)')),
3373 _('only follow the first parent of merge changesets (DEPRECATED)')),
3374 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3374 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3375 ('C', 'copies', None, _('show copied files')),
3375 ('C', 'copies', None, _('show copied files')),
3376 ('k', 'keyword', [],
3376 ('k', 'keyword', [],
3377 _('do case-insensitive search for a given text'), _('TEXT')),
3377 _('do case-insensitive search for a given text'), _('TEXT')),
3378 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3378 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3379 ('L', 'line-range', [],
3379 ('L', 'line-range', [],
3380 _('follow line range of specified file (EXPERIMENTAL)'),
3380 _('follow line range of specified file (EXPERIMENTAL)'),
3381 _('FILE,RANGE')),
3381 _('FILE,RANGE')),
3382 ('', 'removed', None, _('include revisions where files were removed')),
3382 ('', 'removed', None, _('include revisions where files were removed')),
3383 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3383 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3384 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3384 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3385 ('', 'only-branch', [],
3385 ('', 'only-branch', [],
3386 _('show only changesets within the given named branch (DEPRECATED)'),
3386 _('show only changesets within the given named branch (DEPRECATED)'),
3387 _('BRANCH')),
3387 _('BRANCH')),
3388 ('b', 'branch', [],
3388 ('b', 'branch', [],
3389 _('show changesets within the given named branch'), _('BRANCH')),
3389 _('show changesets within the given named branch'), _('BRANCH')),
3390 ('P', 'prune', [],
3390 ('P', 'prune', [],
3391 _('do not display revision or any of its ancestors'), _('REV')),
3391 _('do not display revision or any of its ancestors'), _('REV')),
3392 ] + logopts + walkopts,
3392 ] + logopts + walkopts,
3393 _('[OPTION]... [FILE]'),
3393 _('[OPTION]... [FILE]'),
3394 inferrepo=True,
3394 inferrepo=True,
3395 intents={INTENT_READONLY})
3395 intents={INTENT_READONLY})
3396 def log(ui, repo, *pats, **opts):
3396 def log(ui, repo, *pats, **opts):
3397 """show revision history of entire repository or files
3397 """show revision history of entire repository or files
3398
3398
3399 Print the revision history of the specified files or the entire
3399 Print the revision history of the specified files or the entire
3400 project.
3400 project.
3401
3401
3402 If no revision range is specified, the default is ``tip:0`` unless
3402 If no revision range is specified, the default is ``tip:0`` unless
3403 --follow is set, in which case the working directory parent is
3403 --follow is set, in which case the working directory parent is
3404 used as the starting revision.
3404 used as the starting revision.
3405
3405
3406 File history is shown without following rename or copy history of
3406 File history is shown without following rename or copy history of
3407 files. Use -f/--follow with a filename to follow history across
3407 files. Use -f/--follow with a filename to follow history across
3408 renames and copies. --follow without a filename will only show
3408 renames and copies. --follow without a filename will only show
3409 ancestors of the starting revision.
3409 ancestors of the starting revision.
3410
3410
3411 By default this command prints revision number and changeset id,
3411 By default this command prints revision number and changeset id,
3412 tags, non-trivial parents, user, date and time, and a summary for
3412 tags, non-trivial parents, user, date and time, and a summary for
3413 each commit. When the -v/--verbose switch is used, the list of
3413 each commit. When the -v/--verbose switch is used, the list of
3414 changed files and full commit message are shown.
3414 changed files and full commit message are shown.
3415
3415
3416 With --graph the revisions are shown as an ASCII art DAG with the most
3416 With --graph the revisions are shown as an ASCII art DAG with the most
3417 recent changeset at the top.
3417 recent changeset at the top.
3418 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3418 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3419 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3419 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3420 changeset from the lines below is a parent of the 'o' merge on the same
3420 changeset from the lines below is a parent of the 'o' merge on the same
3421 line.
3421 line.
3422 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3422 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3423 of a '|' indicates one or more revisions in a path are omitted.
3423 of a '|' indicates one or more revisions in a path are omitted.
3424
3424
3425 .. container:: verbose
3425 .. container:: verbose
3426
3426
3427 Use -L/--line-range FILE,M:N options to follow the history of lines
3427 Use -L/--line-range FILE,M:N options to follow the history of lines
3428 from M to N in FILE. With -p/--patch only diff hunks affecting
3428 from M to N in FILE. With -p/--patch only diff hunks affecting
3429 specified line range will be shown. This option requires --follow;
3429 specified line range will be shown. This option requires --follow;
3430 it can be specified multiple times. Currently, this option is not
3430 it can be specified multiple times. Currently, this option is not
3431 compatible with --graph. This option is experimental.
3431 compatible with --graph. This option is experimental.
3432
3432
3433 .. note::
3433 .. note::
3434
3434
3435 :hg:`log --patch` may generate unexpected diff output for merge
3435 :hg:`log --patch` may generate unexpected diff output for merge
3436 changesets, as it will only compare the merge changeset against
3436 changesets, as it will only compare the merge changeset against
3437 its first parent. Also, only files different from BOTH parents
3437 its first parent. Also, only files different from BOTH parents
3438 will appear in files:.
3438 will appear in files:.
3439
3439
3440 .. note::
3440 .. note::
3441
3441
3442 For performance reasons, :hg:`log FILE` may omit duplicate changes
3442 For performance reasons, :hg:`log FILE` may omit duplicate changes
3443 made on branches and will not show removals or mode changes. To
3443 made on branches and will not show removals or mode changes. To
3444 see all such changes, use the --removed switch.
3444 see all such changes, use the --removed switch.
3445
3445
3446 .. container:: verbose
3446 .. container:: verbose
3447
3447
3448 .. note::
3448 .. note::
3449
3449
3450 The history resulting from -L/--line-range options depends on diff
3450 The history resulting from -L/--line-range options depends on diff
3451 options; for instance if white-spaces are ignored, respective changes
3451 options; for instance if white-spaces are ignored, respective changes
3452 with only white-spaces in specified line range will not be listed.
3452 with only white-spaces in specified line range will not be listed.
3453
3453
3454 .. container:: verbose
3454 .. container:: verbose
3455
3455
3456 Some examples:
3456 Some examples:
3457
3457
3458 - changesets with full descriptions and file lists::
3458 - changesets with full descriptions and file lists::
3459
3459
3460 hg log -v
3460 hg log -v
3461
3461
3462 - changesets ancestral to the working directory::
3462 - changesets ancestral to the working directory::
3463
3463
3464 hg log -f
3464 hg log -f
3465
3465
3466 - last 10 commits on the current branch::
3466 - last 10 commits on the current branch::
3467
3467
3468 hg log -l 10 -b .
3468 hg log -l 10 -b .
3469
3469
3470 - changesets showing all modifications of a file, including removals::
3470 - changesets showing all modifications of a file, including removals::
3471
3471
3472 hg log --removed file.c
3472 hg log --removed file.c
3473
3473
3474 - all changesets that touch a directory, with diffs, excluding merges::
3474 - all changesets that touch a directory, with diffs, excluding merges::
3475
3475
3476 hg log -Mp lib/
3476 hg log -Mp lib/
3477
3477
3478 - all revision numbers that match a keyword::
3478 - all revision numbers that match a keyword::
3479
3479
3480 hg log -k bug --template "{rev}\\n"
3480 hg log -k bug --template "{rev}\\n"
3481
3481
3482 - the full hash identifier of the working directory parent::
3482 - the full hash identifier of the working directory parent::
3483
3483
3484 hg log -r . --template "{node}\\n"
3484 hg log -r . --template "{node}\\n"
3485
3485
3486 - list available log templates::
3486 - list available log templates::
3487
3487
3488 hg log -T list
3488 hg log -T list
3489
3489
3490 - check if a given changeset is included in a tagged release::
3490 - check if a given changeset is included in a tagged release::
3491
3491
3492 hg log -r "a21ccf and ancestor(1.9)"
3492 hg log -r "a21ccf and ancestor(1.9)"
3493
3493
3494 - find all changesets by some user in a date range::
3494 - find all changesets by some user in a date range::
3495
3495
3496 hg log -k alice -d "may 2008 to jul 2008"
3496 hg log -k alice -d "may 2008 to jul 2008"
3497
3497
3498 - summary of all changesets after the last tag::
3498 - summary of all changesets after the last tag::
3499
3499
3500 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3500 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3501
3501
3502 - changesets touching lines 13 to 23 for file.c::
3502 - changesets touching lines 13 to 23 for file.c::
3503
3503
3504 hg log -L file.c,13:23
3504 hg log -L file.c,13:23
3505
3505
3506 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3506 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3507 main.c with patch::
3507 main.c with patch::
3508
3508
3509 hg log -L file.c,13:23 -L main.c,2:6 -p
3509 hg log -L file.c,13:23 -L main.c,2:6 -p
3510
3510
3511 See :hg:`help dates` for a list of formats valid for -d/--date.
3511 See :hg:`help dates` for a list of formats valid for -d/--date.
3512
3512
3513 See :hg:`help revisions` for more about specifying and ordering
3513 See :hg:`help revisions` for more about specifying and ordering
3514 revisions.
3514 revisions.
3515
3515
3516 See :hg:`help templates` for more about pre-packaged styles and
3516 See :hg:`help templates` for more about pre-packaged styles and
3517 specifying custom templates. The default template used by the log
3517 specifying custom templates. The default template used by the log
3518 command can be customized via the ``ui.logtemplate`` configuration
3518 command can be customized via the ``ui.logtemplate`` configuration
3519 setting.
3519 setting.
3520
3520
3521 Returns 0 on success.
3521 Returns 0 on success.
3522
3522
3523 """
3523 """
3524 opts = pycompat.byteskwargs(opts)
3524 opts = pycompat.byteskwargs(opts)
3525 linerange = opts.get('line_range')
3525 linerange = opts.get('line_range')
3526
3526
3527 if linerange and not opts.get('follow'):
3527 if linerange and not opts.get('follow'):
3528 raise error.Abort(_('--line-range requires --follow'))
3528 raise error.Abort(_('--line-range requires --follow'))
3529
3529
3530 if linerange and pats:
3530 if linerange and pats:
3531 # TODO: take pats as patterns with no line-range filter
3531 # TODO: take pats as patterns with no line-range filter
3532 raise error.Abort(
3532 raise error.Abort(
3533 _('FILE arguments are not compatible with --line-range option')
3533 _('FILE arguments are not compatible with --line-range option')
3534 )
3534 )
3535
3535
3536 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3536 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3537 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3537 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3538 if linerange:
3538 if linerange:
3539 # TODO: should follow file history from logcmdutil._initialrevs(),
3539 # TODO: should follow file history from logcmdutil._initialrevs(),
3540 # then filter the result by logcmdutil._makerevset() and --limit
3540 # then filter the result by logcmdutil._makerevset() and --limit
3541 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3541 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3542
3542
3543 getrenamed = None
3543 getrenamed = None
3544 if opts.get('copies'):
3544 if opts.get('copies'):
3545 endrev = None
3545 endrev = None
3546 if revs:
3546 if revs:
3547 endrev = revs.max() + 1
3547 endrev = revs.max() + 1
3548 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3548 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3549
3549
3550 ui.pager('log')
3550 ui.pager('log')
3551 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3551 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3552 buffered=True)
3552 buffered=True)
3553 if opts.get('graph'):
3553 if opts.get('graph'):
3554 displayfn = logcmdutil.displaygraphrevs
3554 displayfn = logcmdutil.displaygraphrevs
3555 else:
3555 else:
3556 displayfn = logcmdutil.displayrevs
3556 displayfn = logcmdutil.displayrevs
3557 displayfn(ui, repo, revs, displayer, getrenamed)
3557 displayfn(ui, repo, revs, displayer, getrenamed)
3558
3558
3559 @command('manifest',
3559 @command('manifest',
3560 [('r', 'rev', '', _('revision to display'), _('REV')),
3560 [('r', 'rev', '', _('revision to display'), _('REV')),
3561 ('', 'all', False, _("list files from all revisions"))]
3561 ('', 'all', False, _("list files from all revisions"))]
3562 + formatteropts,
3562 + formatteropts,
3563 _('[-r REV]'),
3563 _('[-r REV]'),
3564 intents={INTENT_READONLY})
3564 intents={INTENT_READONLY})
3565 def manifest(ui, repo, node=None, rev=None, **opts):
3565 def manifest(ui, repo, node=None, rev=None, **opts):
3566 """output the current or given revision of the project manifest
3566 """output the current or given revision of the project manifest
3567
3567
3568 Print a list of version controlled files for the given revision.
3568 Print a list of version controlled files for the given revision.
3569 If no revision is given, the first parent of the working directory
3569 If no revision is given, the first parent of the working directory
3570 is used, or the null revision if no revision is checked out.
3570 is used, or the null revision if no revision is checked out.
3571
3571
3572 With -v, print file permissions, symlink and executable bits.
3572 With -v, print file permissions, symlink and executable bits.
3573 With --debug, print file revision hashes.
3573 With --debug, print file revision hashes.
3574
3574
3575 If option --all is specified, the list of all files from all revisions
3575 If option --all is specified, the list of all files from all revisions
3576 is printed. This includes deleted and renamed files.
3576 is printed. This includes deleted and renamed files.
3577
3577
3578 Returns 0 on success.
3578 Returns 0 on success.
3579 """
3579 """
3580 opts = pycompat.byteskwargs(opts)
3580 opts = pycompat.byteskwargs(opts)
3581 fm = ui.formatter('manifest', opts)
3581 fm = ui.formatter('manifest', opts)
3582
3582
3583 if opts.get('all'):
3583 if opts.get('all'):
3584 if rev or node:
3584 if rev or node:
3585 raise error.Abort(_("can't specify a revision with --all"))
3585 raise error.Abort(_("can't specify a revision with --all"))
3586
3586
3587 res = set()
3587 res = set()
3588 for rev in repo:
3588 for rev in repo:
3589 ctx = repo[rev]
3589 ctx = repo[rev]
3590 res |= set(ctx.files())
3590 res |= set(ctx.files())
3591
3591
3592 ui.pager('manifest')
3592 ui.pager('manifest')
3593 for f in sorted(res):
3593 for f in sorted(res):
3594 fm.startitem()
3594 fm.startitem()
3595 fm.write("path", '%s\n', f)
3595 fm.write("path", '%s\n', f)
3596 fm.end()
3596 fm.end()
3597 return
3597 return
3598
3598
3599 if rev and node:
3599 if rev and node:
3600 raise error.Abort(_("please specify just one revision"))
3600 raise error.Abort(_("please specify just one revision"))
3601
3601
3602 if not node:
3602 if not node:
3603 node = rev
3603 node = rev
3604
3604
3605 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3605 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3606 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3606 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3607 if node:
3607 if node:
3608 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3608 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3609 ctx = scmutil.revsingle(repo, node)
3609 ctx = scmutil.revsingle(repo, node)
3610 mf = ctx.manifest()
3610 mf = ctx.manifest()
3611 ui.pager('manifest')
3611 ui.pager('manifest')
3612 for f in ctx:
3612 for f in ctx:
3613 fm.startitem()
3613 fm.startitem()
3614 fl = ctx[f].flags()
3614 fl = ctx[f].flags()
3615 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3615 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3616 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3616 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3617 fm.write('path', '%s\n', f)
3617 fm.write('path', '%s\n', f)
3618 fm.end()
3618 fm.end()
3619
3619
3620 @command('^merge',
3620 @command('^merge',
3621 [('f', 'force', None,
3621 [('f', 'force', None,
3622 _('force a merge including outstanding changes (DEPRECATED)')),
3622 _('force a merge including outstanding changes (DEPRECATED)')),
3623 ('r', 'rev', '', _('revision to merge'), _('REV')),
3623 ('r', 'rev', '', _('revision to merge'), _('REV')),
3624 ('P', 'preview', None,
3624 ('P', 'preview', None,
3625 _('review revisions to merge (no merge is performed)')),
3625 _('review revisions to merge (no merge is performed)')),
3626 ('', 'abort', None, _('abort the ongoing merge')),
3626 ('', 'abort', None, _('abort the ongoing merge')),
3627 ] + mergetoolopts,
3627 ] + mergetoolopts,
3628 _('[-P] [[-r] REV]'))
3628 _('[-P] [[-r] REV]'))
3629 def merge(ui, repo, node=None, **opts):
3629 def merge(ui, repo, node=None, **opts):
3630 """merge another revision into working directory
3630 """merge another revision into working directory
3631
3631
3632 The current working directory is updated with all changes made in
3632 The current working directory is updated with all changes made in
3633 the requested revision since the last common predecessor revision.
3633 the requested revision since the last common predecessor revision.
3634
3634
3635 Files that changed between either parent are marked as changed for
3635 Files that changed between either parent are marked as changed for
3636 the next commit and a commit must be performed before any further
3636 the next commit and a commit must be performed before any further
3637 updates to the repository are allowed. The next commit will have
3637 updates to the repository are allowed. The next commit will have
3638 two parents.
3638 two parents.
3639
3639
3640 ``--tool`` can be used to specify the merge tool used for file
3640 ``--tool`` can be used to specify the merge tool used for file
3641 merges. It overrides the HGMERGE environment variable and your
3641 merges. It overrides the HGMERGE environment variable and your
3642 configuration files. See :hg:`help merge-tools` for options.
3642 configuration files. See :hg:`help merge-tools` for options.
3643
3643
3644 If no revision is specified, the working directory's parent is a
3644 If no revision is specified, the working directory's parent is a
3645 head revision, and the current branch contains exactly one other
3645 head revision, and the current branch contains exactly one other
3646 head, the other head is merged with by default. Otherwise, an
3646 head, the other head is merged with by default. Otherwise, an
3647 explicit revision with which to merge with must be provided.
3647 explicit revision with which to merge with must be provided.
3648
3648
3649 See :hg:`help resolve` for information on handling file conflicts.
3649 See :hg:`help resolve` for information on handling file conflicts.
3650
3650
3651 To undo an uncommitted merge, use :hg:`merge --abort` which
3651 To undo an uncommitted merge, use :hg:`merge --abort` which
3652 will check out a clean copy of the original merge parent, losing
3652 will check out a clean copy of the original merge parent, losing
3653 all changes.
3653 all changes.
3654
3654
3655 Returns 0 on success, 1 if there are unresolved files.
3655 Returns 0 on success, 1 if there are unresolved files.
3656 """
3656 """
3657
3657
3658 opts = pycompat.byteskwargs(opts)
3658 opts = pycompat.byteskwargs(opts)
3659 abort = opts.get('abort')
3659 abort = opts.get('abort')
3660 if abort and repo.dirstate.p2() == nullid:
3660 if abort and repo.dirstate.p2() == nullid:
3661 cmdutil.wrongtooltocontinue(repo, _('merge'))
3661 cmdutil.wrongtooltocontinue(repo, _('merge'))
3662 if abort:
3662 if abort:
3663 if node:
3663 if node:
3664 raise error.Abort(_("cannot specify a node with --abort"))
3664 raise error.Abort(_("cannot specify a node with --abort"))
3665 if opts.get('rev'):
3665 if opts.get('rev'):
3666 raise error.Abort(_("cannot specify both --rev and --abort"))
3666 raise error.Abort(_("cannot specify both --rev and --abort"))
3667 if opts.get('preview'):
3667 if opts.get('preview'):
3668 raise error.Abort(_("cannot specify --preview with --abort"))
3668 raise error.Abort(_("cannot specify --preview with --abort"))
3669 if opts.get('rev') and node:
3669 if opts.get('rev') and node:
3670 raise error.Abort(_("please specify just one revision"))
3670 raise error.Abort(_("please specify just one revision"))
3671 if not node:
3671 if not node:
3672 node = opts.get('rev')
3672 node = opts.get('rev')
3673
3673
3674 if node:
3674 if node:
3675 node = scmutil.revsingle(repo, node).node()
3675 node = scmutil.revsingle(repo, node).node()
3676
3676
3677 if not node and not abort:
3677 if not node and not abort:
3678 node = repo[destutil.destmerge(repo)].node()
3678 node = repo[destutil.destmerge(repo)].node()
3679
3679
3680 if opts.get('preview'):
3680 if opts.get('preview'):
3681 # find nodes that are ancestors of p2 but not of p1
3681 # find nodes that are ancestors of p2 but not of p1
3682 p1 = repo.lookup('.')
3682 p1 = repo.lookup('.')
3683 p2 = node
3683 p2 = node
3684 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3684 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3685
3685
3686 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3686 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3687 for node in nodes:
3687 for node in nodes:
3688 displayer.show(repo[node])
3688 displayer.show(repo[node])
3689 displayer.close()
3689 displayer.close()
3690 return 0
3690 return 0
3691
3691
3692 try:
3692 try:
3693 # ui.forcemerge is an internal variable, do not document
3693 # ui.forcemerge is an internal variable, do not document
3694 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3694 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3695 force = opts.get('force')
3695 force = opts.get('force')
3696 labels = ['working copy', 'merge rev']
3696 labels = ['working copy', 'merge rev']
3697 return hg.merge(repo, node, force=force, mergeforce=force,
3697 return hg.merge(repo, node, force=force, mergeforce=force,
3698 labels=labels, abort=abort)
3698 labels=labels, abort=abort)
3699 finally:
3699 finally:
3700 ui.setconfig('ui', 'forcemerge', '', 'merge')
3700 ui.setconfig('ui', 'forcemerge', '', 'merge')
3701
3701
3702 @command('outgoing|out',
3702 @command('outgoing|out',
3703 [('f', 'force', None, _('run even when the destination is unrelated')),
3703 [('f', 'force', None, _('run even when the destination is unrelated')),
3704 ('r', 'rev', [],
3704 ('r', 'rev', [],
3705 _('a changeset intended to be included in the destination'), _('REV')),
3705 _('a changeset intended to be included in the destination'), _('REV')),
3706 ('n', 'newest-first', None, _('show newest record first')),
3706 ('n', 'newest-first', None, _('show newest record first')),
3707 ('B', 'bookmarks', False, _('compare bookmarks')),
3707 ('B', 'bookmarks', False, _('compare bookmarks')),
3708 ('b', 'branch', [], _('a specific branch you would like to push'),
3708 ('b', 'branch', [], _('a specific branch you would like to push'),
3709 _('BRANCH')),
3709 _('BRANCH')),
3710 ] + logopts + remoteopts + subrepoopts,
3710 ] + logopts + remoteopts + subrepoopts,
3711 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3711 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3712 def outgoing(ui, repo, dest=None, **opts):
3712 def outgoing(ui, repo, dest=None, **opts):
3713 """show changesets not found in the destination
3713 """show changesets not found in the destination
3714
3714
3715 Show changesets not found in the specified destination repository
3715 Show changesets not found in the specified destination repository
3716 or the default push location. These are the changesets that would
3716 or the default push location. These are the changesets that would
3717 be pushed if a push was requested.
3717 be pushed if a push was requested.
3718
3718
3719 See pull for details of valid destination formats.
3719 See pull for details of valid destination formats.
3720
3720
3721 .. container:: verbose
3721 .. container:: verbose
3722
3722
3723 With -B/--bookmarks, the result of bookmark comparison between
3723 With -B/--bookmarks, the result of bookmark comparison between
3724 local and remote repositories is displayed. With -v/--verbose,
3724 local and remote repositories is displayed. With -v/--verbose,
3725 status is also displayed for each bookmark like below::
3725 status is also displayed for each bookmark like below::
3726
3726
3727 BM1 01234567890a added
3727 BM1 01234567890a added
3728 BM2 deleted
3728 BM2 deleted
3729 BM3 234567890abc advanced
3729 BM3 234567890abc advanced
3730 BM4 34567890abcd diverged
3730 BM4 34567890abcd diverged
3731 BM5 4567890abcde changed
3731 BM5 4567890abcde changed
3732
3732
3733 The action taken when pushing depends on the
3733 The action taken when pushing depends on the
3734 status of each bookmark:
3734 status of each bookmark:
3735
3735
3736 :``added``: push with ``-B`` will create it
3736 :``added``: push with ``-B`` will create it
3737 :``deleted``: push with ``-B`` will delete it
3737 :``deleted``: push with ``-B`` will delete it
3738 :``advanced``: push will update it
3738 :``advanced``: push will update it
3739 :``diverged``: push with ``-B`` will update it
3739 :``diverged``: push with ``-B`` will update it
3740 :``changed``: push with ``-B`` will update it
3740 :``changed``: push with ``-B`` will update it
3741
3741
3742 From the point of view of pushing behavior, bookmarks
3742 From the point of view of pushing behavior, bookmarks
3743 existing only in the remote repository are treated as
3743 existing only in the remote repository are treated as
3744 ``deleted``, even if it is in fact added remotely.
3744 ``deleted``, even if it is in fact added remotely.
3745
3745
3746 Returns 0 if there are outgoing changes, 1 otherwise.
3746 Returns 0 if there are outgoing changes, 1 otherwise.
3747 """
3747 """
3748 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3748 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3749 # style URLs, so don't overwrite dest.
3749 # style URLs, so don't overwrite dest.
3750 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3750 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3751 if not path:
3751 if not path:
3752 raise error.Abort(_('default repository not configured!'),
3752 raise error.Abort(_('default repository not configured!'),
3753 hint=_("see 'hg help config.paths'"))
3753 hint=_("see 'hg help config.paths'"))
3754
3754
3755 opts = pycompat.byteskwargs(opts)
3755 opts = pycompat.byteskwargs(opts)
3756 if opts.get('graph'):
3756 if opts.get('graph'):
3757 logcmdutil.checkunsupportedgraphflags([], opts)
3757 logcmdutil.checkunsupportedgraphflags([], opts)
3758 o, other = hg._outgoing(ui, repo, dest, opts)
3758 o, other = hg._outgoing(ui, repo, dest, opts)
3759 if not o:
3759 if not o:
3760 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3760 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3761 return
3761 return
3762
3762
3763 revdag = logcmdutil.graphrevs(repo, o, opts)
3763 revdag = logcmdutil.graphrevs(repo, o, opts)
3764 ui.pager('outgoing')
3764 ui.pager('outgoing')
3765 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3765 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3766 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3766 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3767 graphmod.asciiedges)
3767 graphmod.asciiedges)
3768 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3768 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3769 return 0
3769 return 0
3770
3770
3771 if opts.get('bookmarks'):
3771 if opts.get('bookmarks'):
3772 dest = path.pushloc or path.loc
3772 dest = path.pushloc or path.loc
3773 other = hg.peer(repo, opts, dest)
3773 other = hg.peer(repo, opts, dest)
3774 if 'bookmarks' not in other.listkeys('namespaces'):
3774 if 'bookmarks' not in other.listkeys('namespaces'):
3775 ui.warn(_("remote doesn't support bookmarks\n"))
3775 ui.warn(_("remote doesn't support bookmarks\n"))
3776 return 0
3776 return 0
3777 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3777 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3778 ui.pager('outgoing')
3778 ui.pager('outgoing')
3779 return bookmarks.outgoing(ui, repo, other)
3779 return bookmarks.outgoing(ui, repo, other)
3780
3780
3781 repo._subtoppath = path.pushloc or path.loc
3781 repo._subtoppath = path.pushloc or path.loc
3782 try:
3782 try:
3783 return hg.outgoing(ui, repo, dest, opts)
3783 return hg.outgoing(ui, repo, dest, opts)
3784 finally:
3784 finally:
3785 del repo._subtoppath
3785 del repo._subtoppath
3786
3786
3787 @command('parents',
3787 @command('parents',
3788 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3788 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3789 ] + templateopts,
3789 ] + templateopts,
3790 _('[-r REV] [FILE]'),
3790 _('[-r REV] [FILE]'),
3791 inferrepo=True)
3791 inferrepo=True)
3792 def parents(ui, repo, file_=None, **opts):
3792 def parents(ui, repo, file_=None, **opts):
3793 """show the parents of the working directory or revision (DEPRECATED)
3793 """show the parents of the working directory or revision (DEPRECATED)
3794
3794
3795 Print the working directory's parent revisions. If a revision is
3795 Print the working directory's parent revisions. If a revision is
3796 given via -r/--rev, the parent of that revision will be printed.
3796 given via -r/--rev, the parent of that revision will be printed.
3797 If a file argument is given, the revision in which the file was
3797 If a file argument is given, the revision in which the file was
3798 last changed (before the working directory revision or the
3798 last changed (before the working directory revision or the
3799 argument to --rev if given) is printed.
3799 argument to --rev if given) is printed.
3800
3800
3801 This command is equivalent to::
3801 This command is equivalent to::
3802
3802
3803 hg log -r "p1()+p2()" or
3803 hg log -r "p1()+p2()" or
3804 hg log -r "p1(REV)+p2(REV)" or
3804 hg log -r "p1(REV)+p2(REV)" or
3805 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3805 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3806 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3806 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3807
3807
3808 See :hg:`summary` and :hg:`help revsets` for related information.
3808 See :hg:`summary` and :hg:`help revsets` for related information.
3809
3809
3810 Returns 0 on success.
3810 Returns 0 on success.
3811 """
3811 """
3812
3812
3813 opts = pycompat.byteskwargs(opts)
3813 opts = pycompat.byteskwargs(opts)
3814 rev = opts.get('rev')
3814 rev = opts.get('rev')
3815 if rev:
3815 if rev:
3816 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3816 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3817 ctx = scmutil.revsingle(repo, rev, None)
3817 ctx = scmutil.revsingle(repo, rev, None)
3818
3818
3819 if file_:
3819 if file_:
3820 m = scmutil.match(ctx, (file_,), opts)
3820 m = scmutil.match(ctx, (file_,), opts)
3821 if m.anypats() or len(m.files()) != 1:
3821 if m.anypats() or len(m.files()) != 1:
3822 raise error.Abort(_('can only specify an explicit filename'))
3822 raise error.Abort(_('can only specify an explicit filename'))
3823 file_ = m.files()[0]
3823 file_ = m.files()[0]
3824 filenodes = []
3824 filenodes = []
3825 for cp in ctx.parents():
3825 for cp in ctx.parents():
3826 if not cp:
3826 if not cp:
3827 continue
3827 continue
3828 try:
3828 try:
3829 filenodes.append(cp.filenode(file_))
3829 filenodes.append(cp.filenode(file_))
3830 except error.LookupError:
3830 except error.LookupError:
3831 pass
3831 pass
3832 if not filenodes:
3832 if not filenodes:
3833 raise error.Abort(_("'%s' not found in manifest!") % file_)
3833 raise error.Abort(_("'%s' not found in manifest!") % file_)
3834 p = []
3834 p = []
3835 for fn in filenodes:
3835 for fn in filenodes:
3836 fctx = repo.filectx(file_, fileid=fn)
3836 fctx = repo.filectx(file_, fileid=fn)
3837 p.append(fctx.node())
3837 p.append(fctx.node())
3838 else:
3838 else:
3839 p = [cp.node() for cp in ctx.parents()]
3839 p = [cp.node() for cp in ctx.parents()]
3840
3840
3841 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3841 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3842 for n in p:
3842 for n in p:
3843 if n != nullid:
3843 if n != nullid:
3844 displayer.show(repo[n])
3844 displayer.show(repo[n])
3845 displayer.close()
3845 displayer.close()
3846
3846
3847 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3847 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3848 intents={INTENT_READONLY})
3848 intents={INTENT_READONLY})
3849 def paths(ui, repo, search=None, **opts):
3849 def paths(ui, repo, search=None, **opts):
3850 """show aliases for remote repositories
3850 """show aliases for remote repositories
3851
3851
3852 Show definition of symbolic path name NAME. If no name is given,
3852 Show definition of symbolic path name NAME. If no name is given,
3853 show definition of all available names.
3853 show definition of all available names.
3854
3854
3855 Option -q/--quiet suppresses all output when searching for NAME
3855 Option -q/--quiet suppresses all output when searching for NAME
3856 and shows only the path names when listing all definitions.
3856 and shows only the path names when listing all definitions.
3857
3857
3858 Path names are defined in the [paths] section of your
3858 Path names are defined in the [paths] section of your
3859 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3859 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3860 repository, ``.hg/hgrc`` is used, too.
3860 repository, ``.hg/hgrc`` is used, too.
3861
3861
3862 The path names ``default`` and ``default-push`` have a special
3862 The path names ``default`` and ``default-push`` have a special
3863 meaning. When performing a push or pull operation, they are used
3863 meaning. When performing a push or pull operation, they are used
3864 as fallbacks if no location is specified on the command-line.
3864 as fallbacks if no location is specified on the command-line.
3865 When ``default-push`` is set, it will be used for push and
3865 When ``default-push`` is set, it will be used for push and
3866 ``default`` will be used for pull; otherwise ``default`` is used
3866 ``default`` will be used for pull; otherwise ``default`` is used
3867 as the fallback for both. When cloning a repository, the clone
3867 as the fallback for both. When cloning a repository, the clone
3868 source is written as ``default`` in ``.hg/hgrc``.
3868 source is written as ``default`` in ``.hg/hgrc``.
3869
3869
3870 .. note::
3870 .. note::
3871
3871
3872 ``default`` and ``default-push`` apply to all inbound (e.g.
3872 ``default`` and ``default-push`` apply to all inbound (e.g.
3873 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3873 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3874 and :hg:`bundle`) operations.
3874 and :hg:`bundle`) operations.
3875
3875
3876 See :hg:`help urls` for more information.
3876 See :hg:`help urls` for more information.
3877
3877
3878 Returns 0 on success.
3878 Returns 0 on success.
3879 """
3879 """
3880
3880
3881 opts = pycompat.byteskwargs(opts)
3881 opts = pycompat.byteskwargs(opts)
3882 ui.pager('paths')
3882 ui.pager('paths')
3883 if search:
3883 if search:
3884 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3884 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3885 if name == search]
3885 if name == search]
3886 else:
3886 else:
3887 pathitems = sorted(ui.paths.iteritems())
3887 pathitems = sorted(ui.paths.iteritems())
3888
3888
3889 fm = ui.formatter('paths', opts)
3889 fm = ui.formatter('paths', opts)
3890 if fm.isplain():
3890 if fm.isplain():
3891 hidepassword = util.hidepassword
3891 hidepassword = util.hidepassword
3892 else:
3892 else:
3893 hidepassword = bytes
3893 hidepassword = bytes
3894 if ui.quiet:
3894 if ui.quiet:
3895 namefmt = '%s\n'
3895 namefmt = '%s\n'
3896 else:
3896 else:
3897 namefmt = '%s = '
3897 namefmt = '%s = '
3898 showsubopts = not search and not ui.quiet
3898 showsubopts = not search and not ui.quiet
3899
3899
3900 for name, path in pathitems:
3900 for name, path in pathitems:
3901 fm.startitem()
3901 fm.startitem()
3902 fm.condwrite(not search, 'name', namefmt, name)
3902 fm.condwrite(not search, 'name', namefmt, name)
3903 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3903 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3904 for subopt, value in sorted(path.suboptions.items()):
3904 for subopt, value in sorted(path.suboptions.items()):
3905 assert subopt not in ('name', 'url')
3905 assert subopt not in ('name', 'url')
3906 if showsubopts:
3906 if showsubopts:
3907 fm.plain('%s:%s = ' % (name, subopt))
3907 fm.plain('%s:%s = ' % (name, subopt))
3908 fm.condwrite(showsubopts, subopt, '%s\n', value)
3908 fm.condwrite(showsubopts, subopt, '%s\n', value)
3909
3909
3910 fm.end()
3910 fm.end()
3911
3911
3912 if search and not pathitems:
3912 if search and not pathitems:
3913 if not ui.quiet:
3913 if not ui.quiet:
3914 ui.warn(_("not found!\n"))
3914 ui.warn(_("not found!\n"))
3915 return 1
3915 return 1
3916 else:
3916 else:
3917 return 0
3917 return 0
3918
3918
3919 @command('phase',
3919 @command('phase',
3920 [('p', 'public', False, _('set changeset phase to public')),
3920 [('p', 'public', False, _('set changeset phase to public')),
3921 ('d', 'draft', False, _('set changeset phase to draft')),
3921 ('d', 'draft', False, _('set changeset phase to draft')),
3922 ('s', 'secret', False, _('set changeset phase to secret')),
3922 ('s', 'secret', False, _('set changeset phase to secret')),
3923 ('f', 'force', False, _('allow to move boundary backward')),
3923 ('f', 'force', False, _('allow to move boundary backward')),
3924 ('r', 'rev', [], _('target revision'), _('REV')),
3924 ('r', 'rev', [], _('target revision'), _('REV')),
3925 ],
3925 ],
3926 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3926 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3927 def phase(ui, repo, *revs, **opts):
3927 def phase(ui, repo, *revs, **opts):
3928 """set or show the current phase name
3928 """set or show the current phase name
3929
3929
3930 With no argument, show the phase name of the current revision(s).
3930 With no argument, show the phase name of the current revision(s).
3931
3931
3932 With one of -p/--public, -d/--draft or -s/--secret, change the
3932 With one of -p/--public, -d/--draft or -s/--secret, change the
3933 phase value of the specified revisions.
3933 phase value of the specified revisions.
3934
3934
3935 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3935 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3936 lower phase to a higher phase. Phases are ordered as follows::
3936 lower phase to a higher phase. Phases are ordered as follows::
3937
3937
3938 public < draft < secret
3938 public < draft < secret
3939
3939
3940 Returns 0 on success, 1 if some phases could not be changed.
3940 Returns 0 on success, 1 if some phases could not be changed.
3941
3941
3942 (For more information about the phases concept, see :hg:`help phases`.)
3942 (For more information about the phases concept, see :hg:`help phases`.)
3943 """
3943 """
3944 opts = pycompat.byteskwargs(opts)
3944 opts = pycompat.byteskwargs(opts)
3945 # search for a unique phase argument
3945 # search for a unique phase argument
3946 targetphase = None
3946 targetphase = None
3947 for idx, name in enumerate(phases.phasenames):
3947 for idx, name in enumerate(phases.phasenames):
3948 if opts[name]:
3948 if opts[name]:
3949 if targetphase is not None:
3949 if targetphase is not None:
3950 raise error.Abort(_('only one phase can be specified'))
3950 raise error.Abort(_('only one phase can be specified'))
3951 targetphase = idx
3951 targetphase = idx
3952
3952
3953 # look for specified revision
3953 # look for specified revision
3954 revs = list(revs)
3954 revs = list(revs)
3955 revs.extend(opts['rev'])
3955 revs.extend(opts['rev'])
3956 if not revs:
3956 if not revs:
3957 # display both parents as the second parent phase can influence
3957 # display both parents as the second parent phase can influence
3958 # the phase of a merge commit
3958 # the phase of a merge commit
3959 revs = [c.rev() for c in repo[None].parents()]
3959 revs = [c.rev() for c in repo[None].parents()]
3960
3960
3961 revs = scmutil.revrange(repo, revs)
3961 revs = scmutil.revrange(repo, revs)
3962
3962
3963 ret = 0
3963 ret = 0
3964 if targetphase is None:
3964 if targetphase is None:
3965 # display
3965 # display
3966 for r in revs:
3966 for r in revs:
3967 ctx = repo[r]
3967 ctx = repo[r]
3968 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3968 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3969 else:
3969 else:
3970 with repo.lock(), repo.transaction("phase") as tr:
3970 with repo.lock(), repo.transaction("phase") as tr:
3971 # set phase
3971 # set phase
3972 if not revs:
3972 if not revs:
3973 raise error.Abort(_('empty revision set'))
3973 raise error.Abort(_('empty revision set'))
3974 nodes = [repo[r].node() for r in revs]
3974 nodes = [repo[r].node() for r in revs]
3975 # moving revision from public to draft may hide them
3975 # moving revision from public to draft may hide them
3976 # We have to check result on an unfiltered repository
3976 # We have to check result on an unfiltered repository
3977 unfi = repo.unfiltered()
3977 unfi = repo.unfiltered()
3978 getphase = unfi._phasecache.phase
3978 getphase = unfi._phasecache.phase
3979 olddata = [getphase(unfi, r) for r in unfi]
3979 olddata = [getphase(unfi, r) for r in unfi]
3980 phases.advanceboundary(repo, tr, targetphase, nodes)
3980 phases.advanceboundary(repo, tr, targetphase, nodes)
3981 if opts['force']:
3981 if opts['force']:
3982 phases.retractboundary(repo, tr, targetphase, nodes)
3982 phases.retractboundary(repo, tr, targetphase, nodes)
3983 getphase = unfi._phasecache.phase
3983 getphase = unfi._phasecache.phase
3984 newdata = [getphase(unfi, r) for r in unfi]
3984 newdata = [getphase(unfi, r) for r in unfi]
3985 changes = sum(newdata[r] != olddata[r] for r in unfi)
3985 changes = sum(newdata[r] != olddata[r] for r in unfi)
3986 cl = unfi.changelog
3986 cl = unfi.changelog
3987 rejected = [n for n in nodes
3987 rejected = [n for n in nodes
3988 if newdata[cl.rev(n)] < targetphase]
3988 if newdata[cl.rev(n)] < targetphase]
3989 if rejected:
3989 if rejected:
3990 ui.warn(_('cannot move %i changesets to a higher '
3990 ui.warn(_('cannot move %i changesets to a higher '
3991 'phase, use --force\n') % len(rejected))
3991 'phase, use --force\n') % len(rejected))
3992 ret = 1
3992 ret = 1
3993 if changes:
3993 if changes:
3994 msg = _('phase changed for %i changesets\n') % changes
3994 msg = _('phase changed for %i changesets\n') % changes
3995 if ret:
3995 if ret:
3996 ui.status(msg)
3996 ui.status(msg)
3997 else:
3997 else:
3998 ui.note(msg)
3998 ui.note(msg)
3999 else:
3999 else:
4000 ui.warn(_('no phases changed\n'))
4000 ui.warn(_('no phases changed\n'))
4001 return ret
4001 return ret
4002
4002
4003 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4003 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4004 """Run after a changegroup has been added via pull/unbundle
4004 """Run after a changegroup has been added via pull/unbundle
4005
4005
4006 This takes arguments below:
4006 This takes arguments below:
4007
4007
4008 :modheads: change of heads by pull/unbundle
4008 :modheads: change of heads by pull/unbundle
4009 :optupdate: updating working directory is needed or not
4009 :optupdate: updating working directory is needed or not
4010 :checkout: update destination revision (or None to default destination)
4010 :checkout: update destination revision (or None to default destination)
4011 :brev: a name, which might be a bookmark to be activated after updating
4011 :brev: a name, which might be a bookmark to be activated after updating
4012 """
4012 """
4013 if modheads == 0:
4013 if modheads == 0:
4014 return
4014 return
4015 if optupdate:
4015 if optupdate:
4016 try:
4016 try:
4017 return hg.updatetotally(ui, repo, checkout, brev)
4017 return hg.updatetotally(ui, repo, checkout, brev)
4018 except error.UpdateAbort as inst:
4018 except error.UpdateAbort as inst:
4019 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4019 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4020 hint = inst.hint
4020 hint = inst.hint
4021 raise error.UpdateAbort(msg, hint=hint)
4021 raise error.UpdateAbort(msg, hint=hint)
4022 if modheads > 1:
4022 if modheads > 1:
4023 currentbranchheads = len(repo.branchheads())
4023 currentbranchheads = len(repo.branchheads())
4024 if currentbranchheads == modheads:
4024 if currentbranchheads == modheads:
4025 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4025 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4026 elif currentbranchheads > 1:
4026 elif currentbranchheads > 1:
4027 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4027 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4028 "merge)\n"))
4028 "merge)\n"))
4029 else:
4029 else:
4030 ui.status(_("(run 'hg heads' to see heads)\n"))
4030 ui.status(_("(run 'hg heads' to see heads)\n"))
4031 elif not ui.configbool('commands', 'update.requiredest'):
4031 elif not ui.configbool('commands', 'update.requiredest'):
4032 ui.status(_("(run 'hg update' to get a working copy)\n"))
4032 ui.status(_("(run 'hg update' to get a working copy)\n"))
4033
4033
4034 @command('^pull',
4034 @command('^pull',
4035 [('u', 'update', None,
4035 [('u', 'update', None,
4036 _('update to new branch head if new descendants were pulled')),
4036 _('update to new branch head if new descendants were pulled')),
4037 ('f', 'force', None, _('run even when remote repository is unrelated')),
4037 ('f', 'force', None, _('run even when remote repository is unrelated')),
4038 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4038 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4039 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4039 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4040 ('b', 'branch', [], _('a specific branch you would like to pull'),
4040 ('b', 'branch', [], _('a specific branch you would like to pull'),
4041 _('BRANCH')),
4041 _('BRANCH')),
4042 ] + remoteopts,
4042 ] + remoteopts,
4043 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4043 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4044 def pull(ui, repo, source="default", **opts):
4044 def pull(ui, repo, source="default", **opts):
4045 """pull changes from the specified source
4045 """pull changes from the specified source
4046
4046
4047 Pull changes from a remote repository to a local one.
4047 Pull changes from a remote repository to a local one.
4048
4048
4049 This finds all changes from the repository at the specified path
4049 This finds all changes from the repository at the specified path
4050 or URL and adds them to a local repository (the current one unless
4050 or URL and adds them to a local repository (the current one unless
4051 -R is specified). By default, this does not update the copy of the
4051 -R is specified). By default, this does not update the copy of the
4052 project in the working directory.
4052 project in the working directory.
4053
4053
4054 When cloning from servers that support it, Mercurial may fetch
4054 When cloning from servers that support it, Mercurial may fetch
4055 pre-generated data. When this is done, hooks operating on incoming
4055 pre-generated data. When this is done, hooks operating on incoming
4056 changesets and changegroups may fire more than once, once for each
4056 changesets and changegroups may fire more than once, once for each
4057 pre-generated bundle and as well as for any additional remaining
4057 pre-generated bundle and as well as for any additional remaining
4058 data. See :hg:`help -e clonebundles` for more.
4058 data. See :hg:`help -e clonebundles` for more.
4059
4059
4060 Use :hg:`incoming` if you want to see what would have been added
4060 Use :hg:`incoming` if you want to see what would have been added
4061 by a pull at the time you issued this command. If you then decide
4061 by a pull at the time you issued this command. If you then decide
4062 to add those changes to the repository, you should use :hg:`pull
4062 to add those changes to the repository, you should use :hg:`pull
4063 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4063 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4064
4064
4065 If SOURCE is omitted, the 'default' path will be used.
4065 If SOURCE is omitted, the 'default' path will be used.
4066 See :hg:`help urls` for more information.
4066 See :hg:`help urls` for more information.
4067
4067
4068 Specifying bookmark as ``.`` is equivalent to specifying the active
4068 Specifying bookmark as ``.`` is equivalent to specifying the active
4069 bookmark's name.
4069 bookmark's name.
4070
4070
4071 Returns 0 on success, 1 if an update had unresolved files.
4071 Returns 0 on success, 1 if an update had unresolved files.
4072 """
4072 """
4073
4073
4074 opts = pycompat.byteskwargs(opts)
4074 opts = pycompat.byteskwargs(opts)
4075 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4075 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4076 msg = _('update destination required by configuration')
4076 msg = _('update destination required by configuration')
4077 hint = _('use hg pull followed by hg update DEST')
4077 hint = _('use hg pull followed by hg update DEST')
4078 raise error.Abort(msg, hint=hint)
4078 raise error.Abort(msg, hint=hint)
4079
4079
4080 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4080 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4081 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4081 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4082 other = hg.peer(repo, opts, source)
4082 other = hg.peer(repo, opts, source)
4083 try:
4083 try:
4084 revs, checkout = hg.addbranchrevs(repo, other, branches,
4084 revs, checkout = hg.addbranchrevs(repo, other, branches,
4085 opts.get('rev'))
4085 opts.get('rev'))
4086
4086
4087
4087
4088 pullopargs = {}
4088 pullopargs = {}
4089 if opts.get('bookmark'):
4089 if opts.get('bookmark'):
4090 if not revs:
4090 if not revs:
4091 revs = []
4091 revs = []
4092 # The list of bookmark used here is not the one used to actually
4092 # The list of bookmark used here is not the one used to actually
4093 # update the bookmark name. This can result in the revision pulled
4093 # update the bookmark name. This can result in the revision pulled
4094 # not ending up with the name of the bookmark because of a race
4094 # not ending up with the name of the bookmark because of a race
4095 # condition on the server. (See issue 4689 for details)
4095 # condition on the server. (See issue 4689 for details)
4096 remotebookmarks = other.listkeys('bookmarks')
4096 remotebookmarks = other.listkeys('bookmarks')
4097 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4097 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4098 pullopargs['remotebookmarks'] = remotebookmarks
4098 pullopargs['remotebookmarks'] = remotebookmarks
4099 for b in opts['bookmark']:
4099 for b in opts['bookmark']:
4100 b = repo._bookmarks.expandname(b)
4100 b = repo._bookmarks.expandname(b)
4101 if b not in remotebookmarks:
4101 if b not in remotebookmarks:
4102 raise error.Abort(_('remote bookmark %s not found!') % b)
4102 raise error.Abort(_('remote bookmark %s not found!') % b)
4103 revs.append(hex(remotebookmarks[b]))
4103 revs.append(hex(remotebookmarks[b]))
4104
4104
4105 if revs:
4105 if revs:
4106 try:
4106 try:
4107 # When 'rev' is a bookmark name, we cannot guarantee that it
4107 # When 'rev' is a bookmark name, we cannot guarantee that it
4108 # will be updated with that name because of a race condition
4108 # will be updated with that name because of a race condition
4109 # server side. (See issue 4689 for details)
4109 # server side. (See issue 4689 for details)
4110 oldrevs = revs
4110 oldrevs = revs
4111 revs = [] # actually, nodes
4111 revs = [] # actually, nodes
4112 for r in oldrevs:
4112 for r in oldrevs:
4113 with other.commandexecutor() as e:
4113 with other.commandexecutor() as e:
4114 node = e.callcommand('lookup', {'key': r}).result()
4114 node = e.callcommand('lookup', {'key': r}).result()
4115
4115
4116 revs.append(node)
4116 revs.append(node)
4117 if r == checkout:
4117 if r == checkout:
4118 checkout = node
4118 checkout = node
4119 except error.CapabilityError:
4119 except error.CapabilityError:
4120 err = _("other repository doesn't support revision lookup, "
4120 err = _("other repository doesn't support revision lookup, "
4121 "so a rev cannot be specified.")
4121 "so a rev cannot be specified.")
4122 raise error.Abort(err)
4122 raise error.Abort(err)
4123
4123
4124 wlock = util.nullcontextmanager()
4124 wlock = util.nullcontextmanager()
4125 if opts.get('update'):
4125 if opts.get('update'):
4126 wlock = repo.wlock()
4126 wlock = repo.wlock()
4127 with wlock:
4127 with wlock:
4128 pullopargs.update(opts.get('opargs', {}))
4128 pullopargs.update(opts.get('opargs', {}))
4129 modheads = exchange.pull(repo, other, heads=revs,
4129 modheads = exchange.pull(repo, other, heads=revs,
4130 force=opts.get('force'),
4130 force=opts.get('force'),
4131 bookmarks=opts.get('bookmark', ()),
4131 bookmarks=opts.get('bookmark', ()),
4132 opargs=pullopargs).cgresult
4132 opargs=pullopargs).cgresult
4133
4133
4134 # brev is a name, which might be a bookmark to be activated at
4134 # brev is a name, which might be a bookmark to be activated at
4135 # the end of the update. In other words, it is an explicit
4135 # the end of the update. In other words, it is an explicit
4136 # destination of the update
4136 # destination of the update
4137 brev = None
4137 brev = None
4138
4138
4139 if checkout:
4139 if checkout:
4140 checkout = repo.changelog.rev(checkout)
4140 checkout = repo.changelog.rev(checkout)
4141
4141
4142 # order below depends on implementation of
4142 # order below depends on implementation of
4143 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4143 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4144 # because 'checkout' is determined without it.
4144 # because 'checkout' is determined without it.
4145 if opts.get('rev'):
4145 if opts.get('rev'):
4146 brev = opts['rev'][0]
4146 brev = opts['rev'][0]
4147 elif opts.get('branch'):
4147 elif opts.get('branch'):
4148 brev = opts['branch'][0]
4148 brev = opts['branch'][0]
4149 else:
4149 else:
4150 brev = branches[0]
4150 brev = branches[0]
4151 repo._subtoppath = source
4151 repo._subtoppath = source
4152 try:
4152 try:
4153 ret = postincoming(ui, repo, modheads, opts.get('update'),
4153 ret = postincoming(ui, repo, modheads, opts.get('update'),
4154 checkout, brev)
4154 checkout, brev)
4155
4155
4156 finally:
4156 finally:
4157 del repo._subtoppath
4157 del repo._subtoppath
4158
4158
4159 finally:
4159 finally:
4160 other.close()
4160 other.close()
4161 return ret
4161 return ret
4162
4162
4163 @command('^push',
4163 @command('^push',
4164 [('f', 'force', None, _('force push')),
4164 [('f', 'force', None, _('force push')),
4165 ('r', 'rev', [],
4165 ('r', 'rev', [],
4166 _('a changeset intended to be included in the destination'),
4166 _('a changeset intended to be included in the destination'),
4167 _('REV')),
4167 _('REV')),
4168 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4168 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4169 ('b', 'branch', [],
4169 ('b', 'branch', [],
4170 _('a specific branch you would like to push'), _('BRANCH')),
4170 _('a specific branch you would like to push'), _('BRANCH')),
4171 ('', 'new-branch', False, _('allow pushing a new branch')),
4171 ('', 'new-branch', False, _('allow pushing a new branch')),
4172 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4172 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4173 ] + remoteopts,
4173 ] + remoteopts,
4174 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4174 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4175 def push(ui, repo, dest=None, **opts):
4175 def push(ui, repo, dest=None, **opts):
4176 """push changes to the specified destination
4176 """push changes to the specified destination
4177
4177
4178 Push changesets from the local repository to the specified
4178 Push changesets from the local repository to the specified
4179 destination.
4179 destination.
4180
4180
4181 This operation is symmetrical to pull: it is identical to a pull
4181 This operation is symmetrical to pull: it is identical to a pull
4182 in the destination repository from the current one.
4182 in the destination repository from the current one.
4183
4183
4184 By default, push will not allow creation of new heads at the
4184 By default, push will not allow creation of new heads at the
4185 destination, since multiple heads would make it unclear which head
4185 destination, since multiple heads would make it unclear which head
4186 to use. In this situation, it is recommended to pull and merge
4186 to use. In this situation, it is recommended to pull and merge
4187 before pushing.
4187 before pushing.
4188
4188
4189 Use --new-branch if you want to allow push to create a new named
4189 Use --new-branch if you want to allow push to create a new named
4190 branch that is not present at the destination. This allows you to
4190 branch that is not present at the destination. This allows you to
4191 only create a new branch without forcing other changes.
4191 only create a new branch without forcing other changes.
4192
4192
4193 .. note::
4193 .. note::
4194
4194
4195 Extra care should be taken with the -f/--force option,
4195 Extra care should be taken with the -f/--force option,
4196 which will push all new heads on all branches, an action which will
4196 which will push all new heads on all branches, an action which will
4197 almost always cause confusion for collaborators.
4197 almost always cause confusion for collaborators.
4198
4198
4199 If -r/--rev is used, the specified revision and all its ancestors
4199 If -r/--rev is used, the specified revision and all its ancestors
4200 will be pushed to the remote repository.
4200 will be pushed to the remote repository.
4201
4201
4202 If -B/--bookmark is used, the specified bookmarked revision, its
4202 If -B/--bookmark is used, the specified bookmarked revision, its
4203 ancestors, and the bookmark will be pushed to the remote
4203 ancestors, and the bookmark will be pushed to the remote
4204 repository. Specifying ``.`` is equivalent to specifying the active
4204 repository. Specifying ``.`` is equivalent to specifying the active
4205 bookmark's name.
4205 bookmark's name.
4206
4206
4207 Please see :hg:`help urls` for important details about ``ssh://``
4207 Please see :hg:`help urls` for important details about ``ssh://``
4208 URLs. If DESTINATION is omitted, a default path will be used.
4208 URLs. If DESTINATION is omitted, a default path will be used.
4209
4209
4210 .. container:: verbose
4210 .. container:: verbose
4211
4211
4212 The --pushvars option sends strings to the server that become
4212 The --pushvars option sends strings to the server that become
4213 environment variables prepended with ``HG_USERVAR_``. For example,
4213 environment variables prepended with ``HG_USERVAR_``. For example,
4214 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4214 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4215 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4215 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4216
4216
4217 pushvars can provide for user-overridable hooks as well as set debug
4217 pushvars can provide for user-overridable hooks as well as set debug
4218 levels. One example is having a hook that blocks commits containing
4218 levels. One example is having a hook that blocks commits containing
4219 conflict markers, but enables the user to override the hook if the file
4219 conflict markers, but enables the user to override the hook if the file
4220 is using conflict markers for testing purposes or the file format has
4220 is using conflict markers for testing purposes or the file format has
4221 strings that look like conflict markers.
4221 strings that look like conflict markers.
4222
4222
4223 By default, servers will ignore `--pushvars`. To enable it add the
4223 By default, servers will ignore `--pushvars`. To enable it add the
4224 following to your configuration file::
4224 following to your configuration file::
4225
4225
4226 [push]
4226 [push]
4227 pushvars.server = true
4227 pushvars.server = true
4228
4228
4229 Returns 0 if push was successful, 1 if nothing to push.
4229 Returns 0 if push was successful, 1 if nothing to push.
4230 """
4230 """
4231
4231
4232 opts = pycompat.byteskwargs(opts)
4232 opts = pycompat.byteskwargs(opts)
4233 if opts.get('bookmark'):
4233 if opts.get('bookmark'):
4234 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4234 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4235 for b in opts['bookmark']:
4235 for b in opts['bookmark']:
4236 # translate -B options to -r so changesets get pushed
4236 # translate -B options to -r so changesets get pushed
4237 b = repo._bookmarks.expandname(b)
4237 b = repo._bookmarks.expandname(b)
4238 if b in repo._bookmarks:
4238 if b in repo._bookmarks:
4239 opts.setdefault('rev', []).append(b)
4239 opts.setdefault('rev', []).append(b)
4240 else:
4240 else:
4241 # if we try to push a deleted bookmark, translate it to null
4241 # if we try to push a deleted bookmark, translate it to null
4242 # this lets simultaneous -r, -b options continue working
4242 # this lets simultaneous -r, -b options continue working
4243 opts.setdefault('rev', []).append("null")
4243 opts.setdefault('rev', []).append("null")
4244
4244
4245 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4245 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4246 if not path:
4246 if not path:
4247 raise error.Abort(_('default repository not configured!'),
4247 raise error.Abort(_('default repository not configured!'),
4248 hint=_("see 'hg help config.paths'"))
4248 hint=_("see 'hg help config.paths'"))
4249 dest = path.pushloc or path.loc
4249 dest = path.pushloc or path.loc
4250 branches = (path.branch, opts.get('branch') or [])
4250 branches = (path.branch, opts.get('branch') or [])
4251 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4251 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4252 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4252 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4253 other = hg.peer(repo, opts, dest)
4253 other = hg.peer(repo, opts, dest)
4254
4254
4255 if revs:
4255 if revs:
4256 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4256 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4257 if not revs:
4257 if not revs:
4258 raise error.Abort(_("specified revisions evaluate to an empty set"),
4258 raise error.Abort(_("specified revisions evaluate to an empty set"),
4259 hint=_("use different revision arguments"))
4259 hint=_("use different revision arguments"))
4260 elif path.pushrev:
4260 elif path.pushrev:
4261 # It doesn't make any sense to specify ancestor revisions. So limit
4261 # It doesn't make any sense to specify ancestor revisions. So limit
4262 # to DAG heads to make discovery simpler.
4262 # to DAG heads to make discovery simpler.
4263 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4263 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4264 revs = scmutil.revrange(repo, [expr])
4264 revs = scmutil.revrange(repo, [expr])
4265 revs = [repo[rev].node() for rev in revs]
4265 revs = [repo[rev].node() for rev in revs]
4266 if not revs:
4266 if not revs:
4267 raise error.Abort(_('default push revset for path evaluates to an '
4267 raise error.Abort(_('default push revset for path evaluates to an '
4268 'empty set'))
4268 'empty set'))
4269
4269
4270 repo._subtoppath = dest
4270 repo._subtoppath = dest
4271 try:
4271 try:
4272 # push subrepos depth-first for coherent ordering
4272 # push subrepos depth-first for coherent ordering
4273 c = repo['.']
4273 c = repo['.']
4274 subs = c.substate # only repos that are committed
4274 subs = c.substate # only repos that are committed
4275 for s in sorted(subs):
4275 for s in sorted(subs):
4276 result = c.sub(s).push(opts)
4276 result = c.sub(s).push(opts)
4277 if result == 0:
4277 if result == 0:
4278 return not result
4278 return not result
4279 finally:
4279 finally:
4280 del repo._subtoppath
4280 del repo._subtoppath
4281
4281
4282 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4282 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4283 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4283 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4284
4284
4285 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4285 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4286 newbranch=opts.get('new_branch'),
4286 newbranch=opts.get('new_branch'),
4287 bookmarks=opts.get('bookmark', ()),
4287 bookmarks=opts.get('bookmark', ()),
4288 opargs=opargs)
4288 opargs=opargs)
4289
4289
4290 result = not pushop.cgresult
4290 result = not pushop.cgresult
4291
4291
4292 if pushop.bkresult is not None:
4292 if pushop.bkresult is not None:
4293 if pushop.bkresult == 2:
4293 if pushop.bkresult == 2:
4294 result = 2
4294 result = 2
4295 elif not result and pushop.bkresult:
4295 elif not result and pushop.bkresult:
4296 result = 2
4296 result = 2
4297
4297
4298 return result
4298 return result
4299
4299
4300 @command('recover', [])
4300 @command('recover', [])
4301 def recover(ui, repo):
4301 def recover(ui, repo):
4302 """roll back an interrupted transaction
4302 """roll back an interrupted transaction
4303
4303
4304 Recover from an interrupted commit or pull.
4304 Recover from an interrupted commit or pull.
4305
4305
4306 This command tries to fix the repository status after an
4306 This command tries to fix the repository status after an
4307 interrupted operation. It should only be necessary when Mercurial
4307 interrupted operation. It should only be necessary when Mercurial
4308 suggests it.
4308 suggests it.
4309
4309
4310 Returns 0 if successful, 1 if nothing to recover or verify fails.
4310 Returns 0 if successful, 1 if nothing to recover or verify fails.
4311 """
4311 """
4312 if repo.recover():
4312 if repo.recover():
4313 return hg.verify(repo)
4313 return hg.verify(repo)
4314 return 1
4314 return 1
4315
4315
4316 @command('^remove|rm',
4316 @command('^remove|rm',
4317 [('A', 'after', None, _('record delete for missing files')),
4317 [('A', 'after', None, _('record delete for missing files')),
4318 ('f', 'force', None,
4318 ('f', 'force', None,
4319 _('forget added files, delete modified files')),
4319 _('forget added files, delete modified files')),
4320 ] + subrepoopts + walkopts + dryrunopts,
4320 ] + subrepoopts + walkopts + dryrunopts,
4321 _('[OPTION]... FILE...'),
4321 _('[OPTION]... FILE...'),
4322 inferrepo=True)
4322 inferrepo=True)
4323 def remove(ui, repo, *pats, **opts):
4323 def remove(ui, repo, *pats, **opts):
4324 """remove the specified files on the next commit
4324 """remove the specified files on the next commit
4325
4325
4326 Schedule the indicated files for removal from the current branch.
4326 Schedule the indicated files for removal from the current branch.
4327
4327
4328 This command schedules the files to be removed at the next commit.
4328 This command schedules the files to be removed at the next commit.
4329 To undo a remove before that, see :hg:`revert`. To undo added
4329 To undo a remove before that, see :hg:`revert`. To undo added
4330 files, see :hg:`forget`.
4330 files, see :hg:`forget`.
4331
4331
4332 .. container:: verbose
4332 .. container:: verbose
4333
4333
4334 -A/--after can be used to remove only files that have already
4334 -A/--after can be used to remove only files that have already
4335 been deleted, -f/--force can be used to force deletion, and -Af
4335 been deleted, -f/--force can be used to force deletion, and -Af
4336 can be used to remove files from the next revision without
4336 can be used to remove files from the next revision without
4337 deleting them from the working directory.
4337 deleting them from the working directory.
4338
4338
4339 The following table details the behavior of remove for different
4339 The following table details the behavior of remove for different
4340 file states (columns) and option combinations (rows). The file
4340 file states (columns) and option combinations (rows). The file
4341 states are Added [A], Clean [C], Modified [M] and Missing [!]
4341 states are Added [A], Clean [C], Modified [M] and Missing [!]
4342 (as reported by :hg:`status`). The actions are Warn, Remove
4342 (as reported by :hg:`status`). The actions are Warn, Remove
4343 (from branch) and Delete (from disk):
4343 (from branch) and Delete (from disk):
4344
4344
4345 ========= == == == ==
4345 ========= == == == ==
4346 opt/state A C M !
4346 opt/state A C M !
4347 ========= == == == ==
4347 ========= == == == ==
4348 none W RD W R
4348 none W RD W R
4349 -f R RD RD R
4349 -f R RD RD R
4350 -A W W W R
4350 -A W W W R
4351 -Af R R R R
4351 -Af R R R R
4352 ========= == == == ==
4352 ========= == == == ==
4353
4353
4354 .. note::
4354 .. note::
4355
4355
4356 :hg:`remove` never deletes files in Added [A] state from the
4356 :hg:`remove` never deletes files in Added [A] state from the
4357 working directory, not even if ``--force`` is specified.
4357 working directory, not even if ``--force`` is specified.
4358
4358
4359 Returns 0 on success, 1 if any warnings encountered.
4359 Returns 0 on success, 1 if any warnings encountered.
4360 """
4360 """
4361
4361
4362 opts = pycompat.byteskwargs(opts)
4362 opts = pycompat.byteskwargs(opts)
4363 after, force = opts.get('after'), opts.get('force')
4363 after, force = opts.get('after'), opts.get('force')
4364 dryrun = opts.get('dry_run')
4364 dryrun = opts.get('dry_run')
4365 if not pats and not after:
4365 if not pats and not after:
4366 raise error.Abort(_('no files specified'))
4366 raise error.Abort(_('no files specified'))
4367
4367
4368 m = scmutil.match(repo[None], pats, opts)
4368 m = scmutil.match(repo[None], pats, opts)
4369 subrepos = opts.get('subrepos')
4369 subrepos = opts.get('subrepos')
4370 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4370 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4371 dryrun=dryrun)
4371 dryrun=dryrun)
4372
4372
4373 @command('rename|move|mv',
4373 @command('rename|move|mv',
4374 [('A', 'after', None, _('record a rename that has already occurred')),
4374 [('A', 'after', None, _('record a rename that has already occurred')),
4375 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4375 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4376 ] + walkopts + dryrunopts,
4376 ] + walkopts + dryrunopts,
4377 _('[OPTION]... SOURCE... DEST'))
4377 _('[OPTION]... SOURCE... DEST'))
4378 def rename(ui, repo, *pats, **opts):
4378 def rename(ui, repo, *pats, **opts):
4379 """rename files; equivalent of copy + remove
4379 """rename files; equivalent of copy + remove
4380
4380
4381 Mark dest as copies of sources; mark sources for deletion. If dest
4381 Mark dest as copies of sources; mark sources for deletion. If dest
4382 is a directory, copies are put in that directory. If dest is a
4382 is a directory, copies are put in that directory. If dest is a
4383 file, there can only be one source.
4383 file, there can only be one source.
4384
4384
4385 By default, this command copies the contents of files as they
4385 By default, this command copies the contents of files as they
4386 exist in the working directory. If invoked with -A/--after, the
4386 exist in the working directory. If invoked with -A/--after, the
4387 operation is recorded, but no copying is performed.
4387 operation is recorded, but no copying is performed.
4388
4388
4389 This command takes effect at the next commit. To undo a rename
4389 This command takes effect at the next commit. To undo a rename
4390 before that, see :hg:`revert`.
4390 before that, see :hg:`revert`.
4391
4391
4392 Returns 0 on success, 1 if errors are encountered.
4392 Returns 0 on success, 1 if errors are encountered.
4393 """
4393 """
4394 opts = pycompat.byteskwargs(opts)
4394 opts = pycompat.byteskwargs(opts)
4395 with repo.wlock(False):
4395 with repo.wlock(False):
4396 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4396 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4397
4397
4398 @command('resolve',
4398 @command('resolve',
4399 [('a', 'all', None, _('select all unresolved files')),
4399 [('a', 'all', None, _('select all unresolved files')),
4400 ('l', 'list', None, _('list state of files needing merge')),
4400 ('l', 'list', None, _('list state of files needing merge')),
4401 ('m', 'mark', None, _('mark files as resolved')),
4401 ('m', 'mark', None, _('mark files as resolved')),
4402 ('u', 'unmark', None, _('mark files as unresolved')),
4402 ('u', 'unmark', None, _('mark files as unresolved')),
4403 ('n', 'no-status', None, _('hide status prefix'))]
4403 ('n', 'no-status', None, _('hide status prefix'))]
4404 + mergetoolopts + walkopts + formatteropts,
4404 + mergetoolopts + walkopts + formatteropts,
4405 _('[OPTION]... [FILE]...'),
4405 _('[OPTION]... [FILE]...'),
4406 inferrepo=True)
4406 inferrepo=True)
4407 def resolve(ui, repo, *pats, **opts):
4407 def resolve(ui, repo, *pats, **opts):
4408 """redo merges or set/view the merge status of files
4408 """redo merges or set/view the merge status of files
4409
4409
4410 Merges with unresolved conflicts are often the result of
4410 Merges with unresolved conflicts are often the result of
4411 non-interactive merging using the ``internal:merge`` configuration
4411 non-interactive merging using the ``internal:merge`` configuration
4412 setting, or a command-line merge tool like ``diff3``. The resolve
4412 setting, or a command-line merge tool like ``diff3``. The resolve
4413 command is used to manage the files involved in a merge, after
4413 command is used to manage the files involved in a merge, after
4414 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4414 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4415 working directory must have two parents). See :hg:`help
4415 working directory must have two parents). See :hg:`help
4416 merge-tools` for information on configuring merge tools.
4416 merge-tools` for information on configuring merge tools.
4417
4417
4418 The resolve command can be used in the following ways:
4418 The resolve command can be used in the following ways:
4419
4419
4420 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4420 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4421 files, discarding any previous merge attempts. Re-merging is not
4421 files, discarding any previous merge attempts. Re-merging is not
4422 performed for files already marked as resolved. Use ``--all/-a``
4422 performed for files already marked as resolved. Use ``--all/-a``
4423 to select all unresolved files. ``--tool`` can be used to specify
4423 to select all unresolved files. ``--tool`` can be used to specify
4424 the merge tool used for the given files. It overrides the HGMERGE
4424 the merge tool used for the given files. It overrides the HGMERGE
4425 environment variable and your configuration files. Previous file
4425 environment variable and your configuration files. Previous file
4426 contents are saved with a ``.orig`` suffix.
4426 contents are saved with a ``.orig`` suffix.
4427
4427
4428 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4428 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4429 (e.g. after having manually fixed-up the files). The default is
4429 (e.g. after having manually fixed-up the files). The default is
4430 to mark all unresolved files.
4430 to mark all unresolved files.
4431
4431
4432 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4432 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4433 default is to mark all resolved files.
4433 default is to mark all resolved files.
4434
4434
4435 - :hg:`resolve -l`: list files which had or still have conflicts.
4435 - :hg:`resolve -l`: list files which had or still have conflicts.
4436 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4436 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4437 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4437 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4438 the list. See :hg:`help filesets` for details.
4438 the list. See :hg:`help filesets` for details.
4439
4439
4440 .. note::
4440 .. note::
4441
4441
4442 Mercurial will not let you commit files with unresolved merge
4442 Mercurial will not let you commit files with unresolved merge
4443 conflicts. You must use :hg:`resolve -m ...` before you can
4443 conflicts. You must use :hg:`resolve -m ...` before you can
4444 commit after a conflicting merge.
4444 commit after a conflicting merge.
4445
4445
4446 Returns 0 on success, 1 if any files fail a resolve attempt.
4446 Returns 0 on success, 1 if any files fail a resolve attempt.
4447 """
4447 """
4448
4448
4449 opts = pycompat.byteskwargs(opts)
4449 opts = pycompat.byteskwargs(opts)
4450 flaglist = 'all mark unmark list no_status'.split()
4450 flaglist = 'all mark unmark list no_status'.split()
4451 all, mark, unmark, show, nostatus = \
4451 all, mark, unmark, show, nostatus = \
4452 [opts.get(o) for o in flaglist]
4452 [opts.get(o) for o in flaglist]
4453
4453
4454 if (show and (mark or unmark)) or (mark and unmark):
4454 if (show and (mark or unmark)) or (mark and unmark):
4455 raise error.Abort(_("too many options specified"))
4455 raise error.Abort(_("too many options specified"))
4456 if pats and all:
4456 if pats and all:
4457 raise error.Abort(_("can't specify --all and patterns"))
4457 raise error.Abort(_("can't specify --all and patterns"))
4458 if not (all or pats or show or mark or unmark):
4458 if not (all or pats or show or mark or unmark):
4459 raise error.Abort(_('no files or directories specified'),
4459 raise error.Abort(_('no files or directories specified'),
4460 hint=('use --all to re-merge all unresolved files'))
4460 hint=('use --all to re-merge all unresolved files'))
4461
4461
4462 if show:
4462 if show:
4463 ui.pager('resolve')
4463 ui.pager('resolve')
4464 fm = ui.formatter('resolve', opts)
4464 fm = ui.formatter('resolve', opts)
4465 ms = mergemod.mergestate.read(repo)
4465 ms = mergemod.mergestate.read(repo)
4466 m = scmutil.match(repo[None], pats, opts)
4466 m = scmutil.match(repo[None], pats, opts)
4467
4467
4468 # Labels and keys based on merge state. Unresolved path conflicts show
4468 # Labels and keys based on merge state. Unresolved path conflicts show
4469 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4469 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4470 # resolved conflicts.
4470 # resolved conflicts.
4471 mergestateinfo = {
4471 mergestateinfo = {
4472 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4472 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4473 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4473 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4474 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4474 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4475 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4475 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4476 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4476 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4477 'D'),
4477 'D'),
4478 }
4478 }
4479
4479
4480 for f in ms:
4480 for f in ms:
4481 if not m(f):
4481 if not m(f):
4482 continue
4482 continue
4483
4483
4484 label, key = mergestateinfo[ms[f]]
4484 label, key = mergestateinfo[ms[f]]
4485 fm.startitem()
4485 fm.startitem()
4486 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4486 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4487 fm.write('path', '%s\n', f, label=label)
4487 fm.write('path', '%s\n', f, label=label)
4488 fm.end()
4488 fm.end()
4489 return 0
4489 return 0
4490
4490
4491 with repo.wlock():
4491 with repo.wlock():
4492 ms = mergemod.mergestate.read(repo)
4492 ms = mergemod.mergestate.read(repo)
4493
4493
4494 if not (ms.active() or repo.dirstate.p2() != nullid):
4494 if not (ms.active() or repo.dirstate.p2() != nullid):
4495 raise error.Abort(
4495 raise error.Abort(
4496 _('resolve command not applicable when not merging'))
4496 _('resolve command not applicable when not merging'))
4497
4497
4498 wctx = repo[None]
4498 wctx = repo[None]
4499
4499
4500 if (ms.mergedriver
4500 if (ms.mergedriver
4501 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4501 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4502 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4502 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4503 ms.commit()
4503 ms.commit()
4504 # allow mark and unmark to go through
4504 # allow mark and unmark to go through
4505 if not mark and not unmark and not proceed:
4505 if not mark and not unmark and not proceed:
4506 return 1
4506 return 1
4507
4507
4508 m = scmutil.match(wctx, pats, opts)
4508 m = scmutil.match(wctx, pats, opts)
4509 ret = 0
4509 ret = 0
4510 didwork = False
4510 didwork = False
4511 runconclude = False
4511 runconclude = False
4512
4512
4513 tocomplete = []
4513 tocomplete = []
4514 for f in ms:
4514 for f in ms:
4515 if not m(f):
4515 if not m(f):
4516 continue
4516 continue
4517
4517
4518 didwork = True
4518 didwork = True
4519
4519
4520 # don't let driver-resolved files be marked, and run the conclude
4520 # don't let driver-resolved files be marked, and run the conclude
4521 # step if asked to resolve
4521 # step if asked to resolve
4522 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4522 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4523 exact = m.exact(f)
4523 exact = m.exact(f)
4524 if mark:
4524 if mark:
4525 if exact:
4525 if exact:
4526 ui.warn(_('not marking %s as it is driver-resolved\n')
4526 ui.warn(_('not marking %s as it is driver-resolved\n')
4527 % f)
4527 % f)
4528 elif unmark:
4528 elif unmark:
4529 if exact:
4529 if exact:
4530 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4530 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4531 % f)
4531 % f)
4532 else:
4532 else:
4533 runconclude = True
4533 runconclude = True
4534 continue
4534 continue
4535
4535
4536 # path conflicts must be resolved manually
4536 # path conflicts must be resolved manually
4537 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4537 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4538 mergemod.MERGE_RECORD_RESOLVED_PATH):
4538 mergemod.MERGE_RECORD_RESOLVED_PATH):
4539 if mark:
4539 if mark:
4540 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4540 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4541 elif unmark:
4541 elif unmark:
4542 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4542 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4543 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4543 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4544 ui.warn(_('%s: path conflict must be resolved manually\n')
4544 ui.warn(_('%s: path conflict must be resolved manually\n')
4545 % f)
4545 % f)
4546 continue
4546 continue
4547
4547
4548 if mark:
4548 if mark:
4549 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4549 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4550 elif unmark:
4550 elif unmark:
4551 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4551 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4552 else:
4552 else:
4553 # backup pre-resolve (merge uses .orig for its own purposes)
4553 # backup pre-resolve (merge uses .orig for its own purposes)
4554 a = repo.wjoin(f)
4554 a = repo.wjoin(f)
4555 try:
4555 try:
4556 util.copyfile(a, a + ".resolve")
4556 util.copyfile(a, a + ".resolve")
4557 except (IOError, OSError) as inst:
4557 except (IOError, OSError) as inst:
4558 if inst.errno != errno.ENOENT:
4558 if inst.errno != errno.ENOENT:
4559 raise
4559 raise
4560
4560
4561 try:
4561 try:
4562 # preresolve file
4562 # preresolve file
4563 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4563 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4564 'resolve')
4564 'resolve')
4565 complete, r = ms.preresolve(f, wctx)
4565 complete, r = ms.preresolve(f, wctx)
4566 if not complete:
4566 if not complete:
4567 tocomplete.append(f)
4567 tocomplete.append(f)
4568 elif r:
4568 elif r:
4569 ret = 1
4569 ret = 1
4570 finally:
4570 finally:
4571 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4571 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4572 ms.commit()
4572 ms.commit()
4573
4573
4574 # replace filemerge's .orig file with our resolve file, but only
4574 # replace filemerge's .orig file with our resolve file, but only
4575 # for merges that are complete
4575 # for merges that are complete
4576 if complete:
4576 if complete:
4577 try:
4577 try:
4578 util.rename(a + ".resolve",
4578 util.rename(a + ".resolve",
4579 scmutil.origpath(ui, repo, a))
4579 scmutil.origpath(ui, repo, a))
4580 except OSError as inst:
4580 except OSError as inst:
4581 if inst.errno != errno.ENOENT:
4581 if inst.errno != errno.ENOENT:
4582 raise
4582 raise
4583
4583
4584 for f in tocomplete:
4584 for f in tocomplete:
4585 try:
4585 try:
4586 # resolve file
4586 # resolve file
4587 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4587 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4588 'resolve')
4588 'resolve')
4589 r = ms.resolve(f, wctx)
4589 r = ms.resolve(f, wctx)
4590 if r:
4590 if r:
4591 ret = 1
4591 ret = 1
4592 finally:
4592 finally:
4593 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4593 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4594 ms.commit()
4594 ms.commit()
4595
4595
4596 # replace filemerge's .orig file with our resolve file
4596 # replace filemerge's .orig file with our resolve file
4597 a = repo.wjoin(f)
4597 a = repo.wjoin(f)
4598 try:
4598 try:
4599 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4599 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4600 except OSError as inst:
4600 except OSError as inst:
4601 if inst.errno != errno.ENOENT:
4601 if inst.errno != errno.ENOENT:
4602 raise
4602 raise
4603
4603
4604 ms.commit()
4604 ms.commit()
4605 ms.recordactions()
4605 ms.recordactions()
4606
4606
4607 if not didwork and pats:
4607 if not didwork and pats:
4608 hint = None
4608 hint = None
4609 if not any([p for p in pats if p.find(':') >= 0]):
4609 if not any([p for p in pats if p.find(':') >= 0]):
4610 pats = ['path:%s' % p for p in pats]
4610 pats = ['path:%s' % p for p in pats]
4611 m = scmutil.match(wctx, pats, opts)
4611 m = scmutil.match(wctx, pats, opts)
4612 for f in ms:
4612 for f in ms:
4613 if not m(f):
4613 if not m(f):
4614 continue
4614 continue
4615 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4615 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4616 if opts.get(o)])
4616 if opts.get(o)])
4617 hint = _("(try: hg resolve %s%s)\n") % (
4617 hint = _("(try: hg resolve %s%s)\n") % (
4618 flags,
4618 flags,
4619 ' '.join(pats))
4619 ' '.join(pats))
4620 break
4620 break
4621 ui.warn(_("arguments do not match paths that need resolving\n"))
4621 ui.warn(_("arguments do not match paths that need resolving\n"))
4622 if hint:
4622 if hint:
4623 ui.warn(hint)
4623 ui.warn(hint)
4624 elif ms.mergedriver and ms.mdstate() != 's':
4624 elif ms.mergedriver and ms.mdstate() != 's':
4625 # run conclude step when either a driver-resolved file is requested
4625 # run conclude step when either a driver-resolved file is requested
4626 # or there are no driver-resolved files
4626 # or there are no driver-resolved files
4627 # we can't use 'ret' to determine whether any files are unresolved
4627 # we can't use 'ret' to determine whether any files are unresolved
4628 # because we might not have tried to resolve some
4628 # because we might not have tried to resolve some
4629 if ((runconclude or not list(ms.driverresolved()))
4629 if ((runconclude or not list(ms.driverresolved()))
4630 and not list(ms.unresolved())):
4630 and not list(ms.unresolved())):
4631 proceed = mergemod.driverconclude(repo, ms, wctx)
4631 proceed = mergemod.driverconclude(repo, ms, wctx)
4632 ms.commit()
4632 ms.commit()
4633 if not proceed:
4633 if not proceed:
4634 return 1
4634 return 1
4635
4635
4636 # Nudge users into finishing an unfinished operation
4636 # Nudge users into finishing an unfinished operation
4637 unresolvedf = list(ms.unresolved())
4637 unresolvedf = list(ms.unresolved())
4638 driverresolvedf = list(ms.driverresolved())
4638 driverresolvedf = list(ms.driverresolved())
4639 if not unresolvedf and not driverresolvedf:
4639 if not unresolvedf and not driverresolvedf:
4640 ui.status(_('(no more unresolved files)\n'))
4640 ui.status(_('(no more unresolved files)\n'))
4641 cmdutil.checkafterresolved(repo)
4641 cmdutil.checkafterresolved(repo)
4642 elif not unresolvedf:
4642 elif not unresolvedf:
4643 ui.status(_('(no more unresolved files -- '
4643 ui.status(_('(no more unresolved files -- '
4644 'run "hg resolve --all" to conclude)\n'))
4644 'run "hg resolve --all" to conclude)\n'))
4645
4645
4646 return ret
4646 return ret
4647
4647
4648 @command('revert',
4648 @command('revert',
4649 [('a', 'all', None, _('revert all changes when no arguments given')),
4649 [('a', 'all', None, _('revert all changes when no arguments given')),
4650 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4650 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4651 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4651 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4652 ('C', 'no-backup', None, _('do not save backup copies of files')),
4652 ('C', 'no-backup', None, _('do not save backup copies of files')),
4653 ('i', 'interactive', None, _('interactively select the changes')),
4653 ('i', 'interactive', None, _('interactively select the changes')),
4654 ] + walkopts + dryrunopts,
4654 ] + walkopts + dryrunopts,
4655 _('[OPTION]... [-r REV] [NAME]...'))
4655 _('[OPTION]... [-r REV] [NAME]...'))
4656 def revert(ui, repo, *pats, **opts):
4656 def revert(ui, repo, *pats, **opts):
4657 """restore files to their checkout state
4657 """restore files to their checkout state
4658
4658
4659 .. note::
4659 .. note::
4660
4660
4661 To check out earlier revisions, you should use :hg:`update REV`.
4661 To check out earlier revisions, you should use :hg:`update REV`.
4662 To cancel an uncommitted merge (and lose your changes),
4662 To cancel an uncommitted merge (and lose your changes),
4663 use :hg:`merge --abort`.
4663 use :hg:`merge --abort`.
4664
4664
4665 With no revision specified, revert the specified files or directories
4665 With no revision specified, revert the specified files or directories
4666 to the contents they had in the parent of the working directory.
4666 to the contents they had in the parent of the working directory.
4667 This restores the contents of files to an unmodified
4667 This restores the contents of files to an unmodified
4668 state and unschedules adds, removes, copies, and renames. If the
4668 state and unschedules adds, removes, copies, and renames. If the
4669 working directory has two parents, you must explicitly specify a
4669 working directory has two parents, you must explicitly specify a
4670 revision.
4670 revision.
4671
4671
4672 Using the -r/--rev or -d/--date options, revert the given files or
4672 Using the -r/--rev or -d/--date options, revert the given files or
4673 directories to their states as of a specific revision. Because
4673 directories to their states as of a specific revision. Because
4674 revert does not change the working directory parents, this will
4674 revert does not change the working directory parents, this will
4675 cause these files to appear modified. This can be helpful to "back
4675 cause these files to appear modified. This can be helpful to "back
4676 out" some or all of an earlier change. See :hg:`backout` for a
4676 out" some or all of an earlier change. See :hg:`backout` for a
4677 related method.
4677 related method.
4678
4678
4679 Modified files are saved with a .orig suffix before reverting.
4679 Modified files are saved with a .orig suffix before reverting.
4680 To disable these backups, use --no-backup. It is possible to store
4680 To disable these backups, use --no-backup. It is possible to store
4681 the backup files in a custom directory relative to the root of the
4681 the backup files in a custom directory relative to the root of the
4682 repository by setting the ``ui.origbackuppath`` configuration
4682 repository by setting the ``ui.origbackuppath`` configuration
4683 option.
4683 option.
4684
4684
4685 See :hg:`help dates` for a list of formats valid for -d/--date.
4685 See :hg:`help dates` for a list of formats valid for -d/--date.
4686
4686
4687 See :hg:`help backout` for a way to reverse the effect of an
4687 See :hg:`help backout` for a way to reverse the effect of an
4688 earlier changeset.
4688 earlier changeset.
4689
4689
4690 Returns 0 on success.
4690 Returns 0 on success.
4691 """
4691 """
4692
4692
4693 opts = pycompat.byteskwargs(opts)
4693 opts = pycompat.byteskwargs(opts)
4694 if opts.get("date"):
4694 if opts.get("date"):
4695 if opts.get("rev"):
4695 if opts.get("rev"):
4696 raise error.Abort(_("you can't specify a revision and a date"))
4696 raise error.Abort(_("you can't specify a revision and a date"))
4697 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4697 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4698
4698
4699 parent, p2 = repo.dirstate.parents()
4699 parent, p2 = repo.dirstate.parents()
4700 if not opts.get('rev') and p2 != nullid:
4700 if not opts.get('rev') and p2 != nullid:
4701 # revert after merge is a trap for new users (issue2915)
4701 # revert after merge is a trap for new users (issue2915)
4702 raise error.Abort(_('uncommitted merge with no revision specified'),
4702 raise error.Abort(_('uncommitted merge with no revision specified'),
4703 hint=_("use 'hg update' or see 'hg help revert'"))
4703 hint=_("use 'hg update' or see 'hg help revert'"))
4704
4704
4705 rev = opts.get('rev')
4705 rev = opts.get('rev')
4706 if rev:
4706 if rev:
4707 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4707 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4708 ctx = scmutil.revsingle(repo, rev)
4708 ctx = scmutil.revsingle(repo, rev)
4709
4709
4710 if (not (pats or opts.get('include') or opts.get('exclude') or
4710 if (not (pats or opts.get('include') or opts.get('exclude') or
4711 opts.get('all') or opts.get('interactive'))):
4711 opts.get('all') or opts.get('interactive'))):
4712 msg = _("no files or directories specified")
4712 msg = _("no files or directories specified")
4713 if p2 != nullid:
4713 if p2 != nullid:
4714 hint = _("uncommitted merge, use --all to discard all changes,"
4714 hint = _("uncommitted merge, use --all to discard all changes,"
4715 " or 'hg update -C .' to abort the merge")
4715 " or 'hg update -C .' to abort the merge")
4716 raise error.Abort(msg, hint=hint)
4716 raise error.Abort(msg, hint=hint)
4717 dirty = any(repo.status())
4717 dirty = any(repo.status())
4718 node = ctx.node()
4718 node = ctx.node()
4719 if node != parent:
4719 if node != parent:
4720 if dirty:
4720 if dirty:
4721 hint = _("uncommitted changes, use --all to discard all"
4721 hint = _("uncommitted changes, use --all to discard all"
4722 " changes, or 'hg update %s' to update") % ctx.rev()
4722 " changes, or 'hg update %s' to update") % ctx.rev()
4723 else:
4723 else:
4724 hint = _("use --all to revert all files,"
4724 hint = _("use --all to revert all files,"
4725 " or 'hg update %s' to update") % ctx.rev()
4725 " or 'hg update %s' to update") % ctx.rev()
4726 elif dirty:
4726 elif dirty:
4727 hint = _("uncommitted changes, use --all to discard all changes")
4727 hint = _("uncommitted changes, use --all to discard all changes")
4728 else:
4728 else:
4729 hint = _("use --all to revert all files")
4729 hint = _("use --all to revert all files")
4730 raise error.Abort(msg, hint=hint)
4730 raise error.Abort(msg, hint=hint)
4731
4731
4732 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4732 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4733 **pycompat.strkwargs(opts))
4733 **pycompat.strkwargs(opts))
4734
4734
4735 @command('rollback', dryrunopts +
4735 @command('rollback', dryrunopts +
4736 [('f', 'force', False, _('ignore safety measures'))])
4736 [('f', 'force', False, _('ignore safety measures'))])
4737 def rollback(ui, repo, **opts):
4737 def rollback(ui, repo, **opts):
4738 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4738 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4739
4739
4740 Please use :hg:`commit --amend` instead of rollback to correct
4740 Please use :hg:`commit --amend` instead of rollback to correct
4741 mistakes in the last commit.
4741 mistakes in the last commit.
4742
4742
4743 This command should be used with care. There is only one level of
4743 This command should be used with care. There is only one level of
4744 rollback, and there is no way to undo a rollback. It will also
4744 rollback, and there is no way to undo a rollback. It will also
4745 restore the dirstate at the time of the last transaction, losing
4745 restore the dirstate at the time of the last transaction, losing
4746 any dirstate changes since that time. This command does not alter
4746 any dirstate changes since that time. This command does not alter
4747 the working directory.
4747 the working directory.
4748
4748
4749 Transactions are used to encapsulate the effects of all commands
4749 Transactions are used to encapsulate the effects of all commands
4750 that create new changesets or propagate existing changesets into a
4750 that create new changesets or propagate existing changesets into a
4751 repository.
4751 repository.
4752
4752
4753 .. container:: verbose
4753 .. container:: verbose
4754
4754
4755 For example, the following commands are transactional, and their
4755 For example, the following commands are transactional, and their
4756 effects can be rolled back:
4756 effects can be rolled back:
4757
4757
4758 - commit
4758 - commit
4759 - import
4759 - import
4760 - pull
4760 - pull
4761 - push (with this repository as the destination)
4761 - push (with this repository as the destination)
4762 - unbundle
4762 - unbundle
4763
4763
4764 To avoid permanent data loss, rollback will refuse to rollback a
4764 To avoid permanent data loss, rollback will refuse to rollback a
4765 commit transaction if it isn't checked out. Use --force to
4765 commit transaction if it isn't checked out. Use --force to
4766 override this protection.
4766 override this protection.
4767
4767
4768 The rollback command can be entirely disabled by setting the
4768 The rollback command can be entirely disabled by setting the
4769 ``ui.rollback`` configuration setting to false. If you're here
4769 ``ui.rollback`` configuration setting to false. If you're here
4770 because you want to use rollback and it's disabled, you can
4770 because you want to use rollback and it's disabled, you can
4771 re-enable the command by setting ``ui.rollback`` to true.
4771 re-enable the command by setting ``ui.rollback`` to true.
4772
4772
4773 This command is not intended for use on public repositories. Once
4773 This command is not intended for use on public repositories. Once
4774 changes are visible for pull by other users, rolling a transaction
4774 changes are visible for pull by other users, rolling a transaction
4775 back locally is ineffective (someone else may already have pulled
4775 back locally is ineffective (someone else may already have pulled
4776 the changes). Furthermore, a race is possible with readers of the
4776 the changes). Furthermore, a race is possible with readers of the
4777 repository; for example an in-progress pull from the repository
4777 repository; for example an in-progress pull from the repository
4778 may fail if a rollback is performed.
4778 may fail if a rollback is performed.
4779
4779
4780 Returns 0 on success, 1 if no rollback data is available.
4780 Returns 0 on success, 1 if no rollback data is available.
4781 """
4781 """
4782 if not ui.configbool('ui', 'rollback'):
4782 if not ui.configbool('ui', 'rollback'):
4783 raise error.Abort(_('rollback is disabled because it is unsafe'),
4783 raise error.Abort(_('rollback is disabled because it is unsafe'),
4784 hint=('see `hg help -v rollback` for information'))
4784 hint=('see `hg help -v rollback` for information'))
4785 return repo.rollback(dryrun=opts.get(r'dry_run'),
4785 return repo.rollback(dryrun=opts.get(r'dry_run'),
4786 force=opts.get(r'force'))
4786 force=opts.get(r'force'))
4787
4787
4788 @command('root', [], intents={INTENT_READONLY})
4788 @command('root', [], intents={INTENT_READONLY})
4789 def root(ui, repo):
4789 def root(ui, repo):
4790 """print the root (top) of the current working directory
4790 """print the root (top) of the current working directory
4791
4791
4792 Print the root directory of the current repository.
4792 Print the root directory of the current repository.
4793
4793
4794 Returns 0 on success.
4794 Returns 0 on success.
4795 """
4795 """
4796 ui.write(repo.root + "\n")
4796 ui.write(repo.root + "\n")
4797
4797
4798 @command('^serve',
4798 @command('^serve',
4799 [('A', 'accesslog', '', _('name of access log file to write to'),
4799 [('A', 'accesslog', '', _('name of access log file to write to'),
4800 _('FILE')),
4800 _('FILE')),
4801 ('d', 'daemon', None, _('run server in background')),
4801 ('d', 'daemon', None, _('run server in background')),
4802 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4802 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4803 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4803 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4804 # use string type, then we can check if something was passed
4804 # use string type, then we can check if something was passed
4805 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4805 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4806 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4806 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4807 _('ADDR')),
4807 _('ADDR')),
4808 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4808 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4809 _('PREFIX')),
4809 _('PREFIX')),
4810 ('n', 'name', '',
4810 ('n', 'name', '',
4811 _('name to show in web pages (default: working directory)'), _('NAME')),
4811 _('name to show in web pages (default: working directory)'), _('NAME')),
4812 ('', 'web-conf', '',
4812 ('', 'web-conf', '',
4813 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4813 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4814 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4814 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4815 _('FILE')),
4815 _('FILE')),
4816 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4816 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4817 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4817 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4818 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4818 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4819 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4819 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4820 ('', 'style', '', _('template style to use'), _('STYLE')),
4820 ('', 'style', '', _('template style to use'), _('STYLE')),
4821 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4821 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4822 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4822 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4823 ('', 'print-url', None, _('start and print only the URL'))]
4823 ('', 'print-url', None, _('start and print only the URL'))]
4824 + subrepoopts,
4824 + subrepoopts,
4825 _('[OPTION]...'),
4825 _('[OPTION]...'),
4826 optionalrepo=True)
4826 optionalrepo=True)
4827 def serve(ui, repo, **opts):
4827 def serve(ui, repo, **opts):
4828 """start stand-alone webserver
4828 """start stand-alone webserver
4829
4829
4830 Start a local HTTP repository browser and pull server. You can use
4830 Start a local HTTP repository browser and pull server. You can use
4831 this for ad-hoc sharing and browsing of repositories. It is
4831 this for ad-hoc sharing and browsing of repositories. It is
4832 recommended to use a real web server to serve a repository for
4832 recommended to use a real web server to serve a repository for
4833 longer periods of time.
4833 longer periods of time.
4834
4834
4835 Please note that the server does not implement access control.
4835 Please note that the server does not implement access control.
4836 This means that, by default, anybody can read from the server and
4836 This means that, by default, anybody can read from the server and
4837 nobody can write to it by default. Set the ``web.allow-push``
4837 nobody can write to it by default. Set the ``web.allow-push``
4838 option to ``*`` to allow everybody to push to the server. You
4838 option to ``*`` to allow everybody to push to the server. You
4839 should use a real web server if you need to authenticate users.
4839 should use a real web server if you need to authenticate users.
4840
4840
4841 By default, the server logs accesses to stdout and errors to
4841 By default, the server logs accesses to stdout and errors to
4842 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4842 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4843 files.
4843 files.
4844
4844
4845 To have the server choose a free port number to listen on, specify
4845 To have the server choose a free port number to listen on, specify
4846 a port number of 0; in this case, the server will print the port
4846 a port number of 0; in this case, the server will print the port
4847 number it uses.
4847 number it uses.
4848
4848
4849 Returns 0 on success.
4849 Returns 0 on success.
4850 """
4850 """
4851
4851
4852 opts = pycompat.byteskwargs(opts)
4852 opts = pycompat.byteskwargs(opts)
4853 if opts["stdio"] and opts["cmdserver"]:
4853 if opts["stdio"] and opts["cmdserver"]:
4854 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4854 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4855 if opts["print_url"] and ui.verbose:
4855 if opts["print_url"] and ui.verbose:
4856 raise error.Abort(_("cannot use --print-url with --verbose"))
4856 raise error.Abort(_("cannot use --print-url with --verbose"))
4857 if opts["print_url"]:
4858 opts['daemon'] = True
4859
4857
4860 if opts["stdio"]:
4858 if opts["stdio"]:
4861 if repo is None:
4859 if repo is None:
4862 raise error.RepoError(_("there is no Mercurial repository here"
4860 raise error.RepoError(_("there is no Mercurial repository here"
4863 " (.hg not found)"))
4861 " (.hg not found)"))
4864 s = wireprotoserver.sshserver(ui, repo)
4862 s = wireprotoserver.sshserver(ui, repo)
4865 s.serve_forever()
4863 s.serve_forever()
4866
4864
4867 service = server.createservice(ui, repo, opts)
4865 service = server.createservice(ui, repo, opts)
4868 return server.runservice(opts, initfn=service.init, runfn=service.run)
4866 return server.runservice(opts, initfn=service.init, runfn=service.run)
4869
4867
4870 _NOTTERSE = 'nothing'
4868 _NOTTERSE = 'nothing'
4871
4869
4872 @command('^status|st',
4870 @command('^status|st',
4873 [('A', 'all', None, _('show status of all files')),
4871 [('A', 'all', None, _('show status of all files')),
4874 ('m', 'modified', None, _('show only modified files')),
4872 ('m', 'modified', None, _('show only modified files')),
4875 ('a', 'added', None, _('show only added files')),
4873 ('a', 'added', None, _('show only added files')),
4876 ('r', 'removed', None, _('show only removed files')),
4874 ('r', 'removed', None, _('show only removed files')),
4877 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4875 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4878 ('c', 'clean', None, _('show only files without changes')),
4876 ('c', 'clean', None, _('show only files without changes')),
4879 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4877 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4880 ('i', 'ignored', None, _('show only ignored files')),
4878 ('i', 'ignored', None, _('show only ignored files')),
4881 ('n', 'no-status', None, _('hide status prefix')),
4879 ('n', 'no-status', None, _('hide status prefix')),
4882 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
4880 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
4883 ('C', 'copies', None, _('show source of copied files')),
4881 ('C', 'copies', None, _('show source of copied files')),
4884 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4882 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4885 ('', 'rev', [], _('show difference from revision'), _('REV')),
4883 ('', 'rev', [], _('show difference from revision'), _('REV')),
4886 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4884 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4887 ] + walkopts + subrepoopts + formatteropts,
4885 ] + walkopts + subrepoopts + formatteropts,
4888 _('[OPTION]... [FILE]...'),
4886 _('[OPTION]... [FILE]...'),
4889 inferrepo=True,
4887 inferrepo=True,
4890 intents={INTENT_READONLY})
4888 intents={INTENT_READONLY})
4891 def status(ui, repo, *pats, **opts):
4889 def status(ui, repo, *pats, **opts):
4892 """show changed files in the working directory
4890 """show changed files in the working directory
4893
4891
4894 Show status of files in the repository. If names are given, only
4892 Show status of files in the repository. If names are given, only
4895 files that match are shown. Files that are clean or ignored or
4893 files that match are shown. Files that are clean or ignored or
4896 the source of a copy/move operation, are not listed unless
4894 the source of a copy/move operation, are not listed unless
4897 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4895 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4898 Unless options described with "show only ..." are given, the
4896 Unless options described with "show only ..." are given, the
4899 options -mardu are used.
4897 options -mardu are used.
4900
4898
4901 Option -q/--quiet hides untracked (unknown and ignored) files
4899 Option -q/--quiet hides untracked (unknown and ignored) files
4902 unless explicitly requested with -u/--unknown or -i/--ignored.
4900 unless explicitly requested with -u/--unknown or -i/--ignored.
4903
4901
4904 .. note::
4902 .. note::
4905
4903
4906 :hg:`status` may appear to disagree with diff if permissions have
4904 :hg:`status` may appear to disagree with diff if permissions have
4907 changed or a merge has occurred. The standard diff format does
4905 changed or a merge has occurred. The standard diff format does
4908 not report permission changes and diff only reports changes
4906 not report permission changes and diff only reports changes
4909 relative to one merge parent.
4907 relative to one merge parent.
4910
4908
4911 If one revision is given, it is used as the base revision.
4909 If one revision is given, it is used as the base revision.
4912 If two revisions are given, the differences between them are
4910 If two revisions are given, the differences between them are
4913 shown. The --change option can also be used as a shortcut to list
4911 shown. The --change option can also be used as a shortcut to list
4914 the changed files of a revision from its first parent.
4912 the changed files of a revision from its first parent.
4915
4913
4916 The codes used to show the status of files are::
4914 The codes used to show the status of files are::
4917
4915
4918 M = modified
4916 M = modified
4919 A = added
4917 A = added
4920 R = removed
4918 R = removed
4921 C = clean
4919 C = clean
4922 ! = missing (deleted by non-hg command, but still tracked)
4920 ! = missing (deleted by non-hg command, but still tracked)
4923 ? = not tracked
4921 ? = not tracked
4924 I = ignored
4922 I = ignored
4925 = origin of the previous file (with --copies)
4923 = origin of the previous file (with --copies)
4926
4924
4927 .. container:: verbose
4925 .. container:: verbose
4928
4926
4929 The -t/--terse option abbreviates the output by showing only the directory
4927 The -t/--terse option abbreviates the output by showing only the directory
4930 name if all the files in it share the same status. The option takes an
4928 name if all the files in it share the same status. The option takes an
4931 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4929 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4932 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4930 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4933 for 'ignored' and 'c' for clean.
4931 for 'ignored' and 'c' for clean.
4934
4932
4935 It abbreviates only those statuses which are passed. Note that clean and
4933 It abbreviates only those statuses which are passed. Note that clean and
4936 ignored files are not displayed with '--terse ic' unless the -c/--clean
4934 ignored files are not displayed with '--terse ic' unless the -c/--clean
4937 and -i/--ignored options are also used.
4935 and -i/--ignored options are also used.
4938
4936
4939 The -v/--verbose option shows information when the repository is in an
4937 The -v/--verbose option shows information when the repository is in an
4940 unfinished merge, shelve, rebase state etc. You can have this behavior
4938 unfinished merge, shelve, rebase state etc. You can have this behavior
4941 turned on by default by enabling the ``commands.status.verbose`` option.
4939 turned on by default by enabling the ``commands.status.verbose`` option.
4942
4940
4943 You can skip displaying some of these states by setting
4941 You can skip displaying some of these states by setting
4944 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4942 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4945 'histedit', 'merge', 'rebase', or 'unshelve'.
4943 'histedit', 'merge', 'rebase', or 'unshelve'.
4946
4944
4947 Examples:
4945 Examples:
4948
4946
4949 - show changes in the working directory relative to a
4947 - show changes in the working directory relative to a
4950 changeset::
4948 changeset::
4951
4949
4952 hg status --rev 9353
4950 hg status --rev 9353
4953
4951
4954 - show changes in the working directory relative to the
4952 - show changes in the working directory relative to the
4955 current directory (see :hg:`help patterns` for more information)::
4953 current directory (see :hg:`help patterns` for more information)::
4956
4954
4957 hg status re:
4955 hg status re:
4958
4956
4959 - show all changes including copies in an existing changeset::
4957 - show all changes including copies in an existing changeset::
4960
4958
4961 hg status --copies --change 9353
4959 hg status --copies --change 9353
4962
4960
4963 - get a NUL separated list of added files, suitable for xargs::
4961 - get a NUL separated list of added files, suitable for xargs::
4964
4962
4965 hg status -an0
4963 hg status -an0
4966
4964
4967 - show more information about the repository status, abbreviating
4965 - show more information about the repository status, abbreviating
4968 added, removed, modified, deleted, and untracked paths::
4966 added, removed, modified, deleted, and untracked paths::
4969
4967
4970 hg status -v -t mardu
4968 hg status -v -t mardu
4971
4969
4972 Returns 0 on success.
4970 Returns 0 on success.
4973
4971
4974 """
4972 """
4975
4973
4976 opts = pycompat.byteskwargs(opts)
4974 opts = pycompat.byteskwargs(opts)
4977 revs = opts.get('rev')
4975 revs = opts.get('rev')
4978 change = opts.get('change')
4976 change = opts.get('change')
4979 terse = opts.get('terse')
4977 terse = opts.get('terse')
4980 if terse is _NOTTERSE:
4978 if terse is _NOTTERSE:
4981 if revs:
4979 if revs:
4982 terse = ''
4980 terse = ''
4983 else:
4981 else:
4984 terse = ui.config('commands', 'status.terse')
4982 terse = ui.config('commands', 'status.terse')
4985
4983
4986 if revs and change:
4984 if revs and change:
4987 msg = _('cannot specify --rev and --change at the same time')
4985 msg = _('cannot specify --rev and --change at the same time')
4988 raise error.Abort(msg)
4986 raise error.Abort(msg)
4989 elif revs and terse:
4987 elif revs and terse:
4990 msg = _('cannot use --terse with --rev')
4988 msg = _('cannot use --terse with --rev')
4991 raise error.Abort(msg)
4989 raise error.Abort(msg)
4992 elif change:
4990 elif change:
4993 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4991 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4994 ctx2 = scmutil.revsingle(repo, change, None)
4992 ctx2 = scmutil.revsingle(repo, change, None)
4995 ctx1 = ctx2.p1()
4993 ctx1 = ctx2.p1()
4996 else:
4994 else:
4997 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4995 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4998 ctx1, ctx2 = scmutil.revpair(repo, revs)
4996 ctx1, ctx2 = scmutil.revpair(repo, revs)
4999
4997
5000 if pats or ui.configbool('commands', 'status.relative'):
4998 if pats or ui.configbool('commands', 'status.relative'):
5001 cwd = repo.getcwd()
4999 cwd = repo.getcwd()
5002 else:
5000 else:
5003 cwd = ''
5001 cwd = ''
5004
5002
5005 if opts.get('print0'):
5003 if opts.get('print0'):
5006 end = '\0'
5004 end = '\0'
5007 else:
5005 else:
5008 end = '\n'
5006 end = '\n'
5009 copy = {}
5007 copy = {}
5010 states = 'modified added removed deleted unknown ignored clean'.split()
5008 states = 'modified added removed deleted unknown ignored clean'.split()
5011 show = [k for k in states if opts.get(k)]
5009 show = [k for k in states if opts.get(k)]
5012 if opts.get('all'):
5010 if opts.get('all'):
5013 show += ui.quiet and (states[:4] + ['clean']) or states
5011 show += ui.quiet and (states[:4] + ['clean']) or states
5014
5012
5015 if not show:
5013 if not show:
5016 if ui.quiet:
5014 if ui.quiet:
5017 show = states[:4]
5015 show = states[:4]
5018 else:
5016 else:
5019 show = states[:5]
5017 show = states[:5]
5020
5018
5021 m = scmutil.match(ctx2, pats, opts)
5019 m = scmutil.match(ctx2, pats, opts)
5022 if terse:
5020 if terse:
5023 # we need to compute clean and unknown to terse
5021 # we need to compute clean and unknown to terse
5024 stat = repo.status(ctx1.node(), ctx2.node(), m,
5022 stat = repo.status(ctx1.node(), ctx2.node(), m,
5025 'ignored' in show or 'i' in terse,
5023 'ignored' in show or 'i' in terse,
5026 True, True, opts.get('subrepos'))
5024 True, True, opts.get('subrepos'))
5027
5025
5028 stat = cmdutil.tersedir(stat, terse)
5026 stat = cmdutil.tersedir(stat, terse)
5029 else:
5027 else:
5030 stat = repo.status(ctx1.node(), ctx2.node(), m,
5028 stat = repo.status(ctx1.node(), ctx2.node(), m,
5031 'ignored' in show, 'clean' in show,
5029 'ignored' in show, 'clean' in show,
5032 'unknown' in show, opts.get('subrepos'))
5030 'unknown' in show, opts.get('subrepos'))
5033
5031
5034 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5032 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5035
5033
5036 if (opts.get('all') or opts.get('copies')
5034 if (opts.get('all') or opts.get('copies')
5037 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5035 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5038 copy = copies.pathcopies(ctx1, ctx2, m)
5036 copy = copies.pathcopies(ctx1, ctx2, m)
5039
5037
5040 ui.pager('status')
5038 ui.pager('status')
5041 fm = ui.formatter('status', opts)
5039 fm = ui.formatter('status', opts)
5042 fmt = '%s' + end
5040 fmt = '%s' + end
5043 showchar = not opts.get('no_status')
5041 showchar = not opts.get('no_status')
5044
5042
5045 for state, char, files in changestates:
5043 for state, char, files in changestates:
5046 if state in show:
5044 if state in show:
5047 label = 'status.' + state
5045 label = 'status.' + state
5048 for f in files:
5046 for f in files:
5049 fm.startitem()
5047 fm.startitem()
5050 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5048 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5051 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5049 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5052 if f in copy:
5050 if f in copy:
5053 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5051 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5054 label='status.copied')
5052 label='status.copied')
5055
5053
5056 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5054 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5057 and not ui.plain()):
5055 and not ui.plain()):
5058 cmdutil.morestatus(repo, fm)
5056 cmdutil.morestatus(repo, fm)
5059 fm.end()
5057 fm.end()
5060
5058
5061 @command('^summary|sum',
5059 @command('^summary|sum',
5062 [('', 'remote', None, _('check for push and pull'))],
5060 [('', 'remote', None, _('check for push and pull'))],
5063 '[--remote]',
5061 '[--remote]',
5064 intents={INTENT_READONLY})
5062 intents={INTENT_READONLY})
5065 def summary(ui, repo, **opts):
5063 def summary(ui, repo, **opts):
5066 """summarize working directory state
5064 """summarize working directory state
5067
5065
5068 This generates a brief summary of the working directory state,
5066 This generates a brief summary of the working directory state,
5069 including parents, branch, commit status, phase and available updates.
5067 including parents, branch, commit status, phase and available updates.
5070
5068
5071 With the --remote option, this will check the default paths for
5069 With the --remote option, this will check the default paths for
5072 incoming and outgoing changes. This can be time-consuming.
5070 incoming and outgoing changes. This can be time-consuming.
5073
5071
5074 Returns 0 on success.
5072 Returns 0 on success.
5075 """
5073 """
5076
5074
5077 opts = pycompat.byteskwargs(opts)
5075 opts = pycompat.byteskwargs(opts)
5078 ui.pager('summary')
5076 ui.pager('summary')
5079 ctx = repo[None]
5077 ctx = repo[None]
5080 parents = ctx.parents()
5078 parents = ctx.parents()
5081 pnode = parents[0].node()
5079 pnode = parents[0].node()
5082 marks = []
5080 marks = []
5083
5081
5084 ms = None
5082 ms = None
5085 try:
5083 try:
5086 ms = mergemod.mergestate.read(repo)
5084 ms = mergemod.mergestate.read(repo)
5087 except error.UnsupportedMergeRecords as e:
5085 except error.UnsupportedMergeRecords as e:
5088 s = ' '.join(e.recordtypes)
5086 s = ' '.join(e.recordtypes)
5089 ui.warn(
5087 ui.warn(
5090 _('warning: merge state has unsupported record types: %s\n') % s)
5088 _('warning: merge state has unsupported record types: %s\n') % s)
5091 unresolved = []
5089 unresolved = []
5092 else:
5090 else:
5093 unresolved = list(ms.unresolved())
5091 unresolved = list(ms.unresolved())
5094
5092
5095 for p in parents:
5093 for p in parents:
5096 # label with log.changeset (instead of log.parent) since this
5094 # label with log.changeset (instead of log.parent) since this
5097 # shows a working directory parent *changeset*:
5095 # shows a working directory parent *changeset*:
5098 # i18n: column positioning for "hg summary"
5096 # i18n: column positioning for "hg summary"
5099 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5097 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5100 label=logcmdutil.changesetlabels(p))
5098 label=logcmdutil.changesetlabels(p))
5101 ui.write(' '.join(p.tags()), label='log.tag')
5099 ui.write(' '.join(p.tags()), label='log.tag')
5102 if p.bookmarks():
5100 if p.bookmarks():
5103 marks.extend(p.bookmarks())
5101 marks.extend(p.bookmarks())
5104 if p.rev() == -1:
5102 if p.rev() == -1:
5105 if not len(repo):
5103 if not len(repo):
5106 ui.write(_(' (empty repository)'))
5104 ui.write(_(' (empty repository)'))
5107 else:
5105 else:
5108 ui.write(_(' (no revision checked out)'))
5106 ui.write(_(' (no revision checked out)'))
5109 if p.obsolete():
5107 if p.obsolete():
5110 ui.write(_(' (obsolete)'))
5108 ui.write(_(' (obsolete)'))
5111 if p.isunstable():
5109 if p.isunstable():
5112 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5110 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5113 for instability in p.instabilities())
5111 for instability in p.instabilities())
5114 ui.write(' ('
5112 ui.write(' ('
5115 + ', '.join(instabilities)
5113 + ', '.join(instabilities)
5116 + ')')
5114 + ')')
5117 ui.write('\n')
5115 ui.write('\n')
5118 if p.description():
5116 if p.description():
5119 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5117 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5120 label='log.summary')
5118 label='log.summary')
5121
5119
5122 branch = ctx.branch()
5120 branch = ctx.branch()
5123 bheads = repo.branchheads(branch)
5121 bheads = repo.branchheads(branch)
5124 # i18n: column positioning for "hg summary"
5122 # i18n: column positioning for "hg summary"
5125 m = _('branch: %s\n') % branch
5123 m = _('branch: %s\n') % branch
5126 if branch != 'default':
5124 if branch != 'default':
5127 ui.write(m, label='log.branch')
5125 ui.write(m, label='log.branch')
5128 else:
5126 else:
5129 ui.status(m, label='log.branch')
5127 ui.status(m, label='log.branch')
5130
5128
5131 if marks:
5129 if marks:
5132 active = repo._activebookmark
5130 active = repo._activebookmark
5133 # i18n: column positioning for "hg summary"
5131 # i18n: column positioning for "hg summary"
5134 ui.write(_('bookmarks:'), label='log.bookmark')
5132 ui.write(_('bookmarks:'), label='log.bookmark')
5135 if active is not None:
5133 if active is not None:
5136 if active in marks:
5134 if active in marks:
5137 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5135 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5138 marks.remove(active)
5136 marks.remove(active)
5139 else:
5137 else:
5140 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5138 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5141 for m in marks:
5139 for m in marks:
5142 ui.write(' ' + m, label='log.bookmark')
5140 ui.write(' ' + m, label='log.bookmark')
5143 ui.write('\n', label='log.bookmark')
5141 ui.write('\n', label='log.bookmark')
5144
5142
5145 status = repo.status(unknown=True)
5143 status = repo.status(unknown=True)
5146
5144
5147 c = repo.dirstate.copies()
5145 c = repo.dirstate.copies()
5148 copied, renamed = [], []
5146 copied, renamed = [], []
5149 for d, s in c.iteritems():
5147 for d, s in c.iteritems():
5150 if s in status.removed:
5148 if s in status.removed:
5151 status.removed.remove(s)
5149 status.removed.remove(s)
5152 renamed.append(d)
5150 renamed.append(d)
5153 else:
5151 else:
5154 copied.append(d)
5152 copied.append(d)
5155 if d in status.added:
5153 if d in status.added:
5156 status.added.remove(d)
5154 status.added.remove(d)
5157
5155
5158 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5156 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5159
5157
5160 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5158 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5161 (ui.label(_('%d added'), 'status.added'), status.added),
5159 (ui.label(_('%d added'), 'status.added'), status.added),
5162 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5160 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5163 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5161 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5164 (ui.label(_('%d copied'), 'status.copied'), copied),
5162 (ui.label(_('%d copied'), 'status.copied'), copied),
5165 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5163 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5166 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5164 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5167 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5165 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5168 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5166 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5169 t = []
5167 t = []
5170 for l, s in labels:
5168 for l, s in labels:
5171 if s:
5169 if s:
5172 t.append(l % len(s))
5170 t.append(l % len(s))
5173
5171
5174 t = ', '.join(t)
5172 t = ', '.join(t)
5175 cleanworkdir = False
5173 cleanworkdir = False
5176
5174
5177 if repo.vfs.exists('graftstate'):
5175 if repo.vfs.exists('graftstate'):
5178 t += _(' (graft in progress)')
5176 t += _(' (graft in progress)')
5179 if repo.vfs.exists('updatestate'):
5177 if repo.vfs.exists('updatestate'):
5180 t += _(' (interrupted update)')
5178 t += _(' (interrupted update)')
5181 elif len(parents) > 1:
5179 elif len(parents) > 1:
5182 t += _(' (merge)')
5180 t += _(' (merge)')
5183 elif branch != parents[0].branch():
5181 elif branch != parents[0].branch():
5184 t += _(' (new branch)')
5182 t += _(' (new branch)')
5185 elif (parents[0].closesbranch() and
5183 elif (parents[0].closesbranch() and
5186 pnode in repo.branchheads(branch, closed=True)):
5184 pnode in repo.branchheads(branch, closed=True)):
5187 t += _(' (head closed)')
5185 t += _(' (head closed)')
5188 elif not (status.modified or status.added or status.removed or renamed or
5186 elif not (status.modified or status.added or status.removed or renamed or
5189 copied or subs):
5187 copied or subs):
5190 t += _(' (clean)')
5188 t += _(' (clean)')
5191 cleanworkdir = True
5189 cleanworkdir = True
5192 elif pnode not in bheads:
5190 elif pnode not in bheads:
5193 t += _(' (new branch head)')
5191 t += _(' (new branch head)')
5194
5192
5195 if parents:
5193 if parents:
5196 pendingphase = max(p.phase() for p in parents)
5194 pendingphase = max(p.phase() for p in parents)
5197 else:
5195 else:
5198 pendingphase = phases.public
5196 pendingphase = phases.public
5199
5197
5200 if pendingphase > phases.newcommitphase(ui):
5198 if pendingphase > phases.newcommitphase(ui):
5201 t += ' (%s)' % phases.phasenames[pendingphase]
5199 t += ' (%s)' % phases.phasenames[pendingphase]
5202
5200
5203 if cleanworkdir:
5201 if cleanworkdir:
5204 # i18n: column positioning for "hg summary"
5202 # i18n: column positioning for "hg summary"
5205 ui.status(_('commit: %s\n') % t.strip())
5203 ui.status(_('commit: %s\n') % t.strip())
5206 else:
5204 else:
5207 # i18n: column positioning for "hg summary"
5205 # i18n: column positioning for "hg summary"
5208 ui.write(_('commit: %s\n') % t.strip())
5206 ui.write(_('commit: %s\n') % t.strip())
5209
5207
5210 # all ancestors of branch heads - all ancestors of parent = new csets
5208 # all ancestors of branch heads - all ancestors of parent = new csets
5211 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5209 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5212 bheads))
5210 bheads))
5213
5211
5214 if new == 0:
5212 if new == 0:
5215 # i18n: column positioning for "hg summary"
5213 # i18n: column positioning for "hg summary"
5216 ui.status(_('update: (current)\n'))
5214 ui.status(_('update: (current)\n'))
5217 elif pnode not in bheads:
5215 elif pnode not in bheads:
5218 # i18n: column positioning for "hg summary"
5216 # i18n: column positioning for "hg summary"
5219 ui.write(_('update: %d new changesets (update)\n') % new)
5217 ui.write(_('update: %d new changesets (update)\n') % new)
5220 else:
5218 else:
5221 # i18n: column positioning for "hg summary"
5219 # i18n: column positioning for "hg summary"
5222 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5220 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5223 (new, len(bheads)))
5221 (new, len(bheads)))
5224
5222
5225 t = []
5223 t = []
5226 draft = len(repo.revs('draft()'))
5224 draft = len(repo.revs('draft()'))
5227 if draft:
5225 if draft:
5228 t.append(_('%d draft') % draft)
5226 t.append(_('%d draft') % draft)
5229 secret = len(repo.revs('secret()'))
5227 secret = len(repo.revs('secret()'))
5230 if secret:
5228 if secret:
5231 t.append(_('%d secret') % secret)
5229 t.append(_('%d secret') % secret)
5232
5230
5233 if draft or secret:
5231 if draft or secret:
5234 ui.status(_('phases: %s\n') % ', '.join(t))
5232 ui.status(_('phases: %s\n') % ', '.join(t))
5235
5233
5236 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5234 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5237 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5235 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5238 numtrouble = len(repo.revs(trouble + "()"))
5236 numtrouble = len(repo.revs(trouble + "()"))
5239 # We write all the possibilities to ease translation
5237 # We write all the possibilities to ease translation
5240 troublemsg = {
5238 troublemsg = {
5241 "orphan": _("orphan: %d changesets"),
5239 "orphan": _("orphan: %d changesets"),
5242 "contentdivergent": _("content-divergent: %d changesets"),
5240 "contentdivergent": _("content-divergent: %d changesets"),
5243 "phasedivergent": _("phase-divergent: %d changesets"),
5241 "phasedivergent": _("phase-divergent: %d changesets"),
5244 }
5242 }
5245 if numtrouble > 0:
5243 if numtrouble > 0:
5246 ui.status(troublemsg[trouble] % numtrouble + "\n")
5244 ui.status(troublemsg[trouble] % numtrouble + "\n")
5247
5245
5248 cmdutil.summaryhooks(ui, repo)
5246 cmdutil.summaryhooks(ui, repo)
5249
5247
5250 if opts.get('remote'):
5248 if opts.get('remote'):
5251 needsincoming, needsoutgoing = True, True
5249 needsincoming, needsoutgoing = True, True
5252 else:
5250 else:
5253 needsincoming, needsoutgoing = False, False
5251 needsincoming, needsoutgoing = False, False
5254 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5252 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5255 if i:
5253 if i:
5256 needsincoming = True
5254 needsincoming = True
5257 if o:
5255 if o:
5258 needsoutgoing = True
5256 needsoutgoing = True
5259 if not needsincoming and not needsoutgoing:
5257 if not needsincoming and not needsoutgoing:
5260 return
5258 return
5261
5259
5262 def getincoming():
5260 def getincoming():
5263 source, branches = hg.parseurl(ui.expandpath('default'))
5261 source, branches = hg.parseurl(ui.expandpath('default'))
5264 sbranch = branches[0]
5262 sbranch = branches[0]
5265 try:
5263 try:
5266 other = hg.peer(repo, {}, source)
5264 other = hg.peer(repo, {}, source)
5267 except error.RepoError:
5265 except error.RepoError:
5268 if opts.get('remote'):
5266 if opts.get('remote'):
5269 raise
5267 raise
5270 return source, sbranch, None, None, None
5268 return source, sbranch, None, None, None
5271 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5269 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5272 if revs:
5270 if revs:
5273 revs = [other.lookup(rev) for rev in revs]
5271 revs = [other.lookup(rev) for rev in revs]
5274 ui.debug('comparing with %s\n' % util.hidepassword(source))
5272 ui.debug('comparing with %s\n' % util.hidepassword(source))
5275 repo.ui.pushbuffer()
5273 repo.ui.pushbuffer()
5276 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5274 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5277 repo.ui.popbuffer()
5275 repo.ui.popbuffer()
5278 return source, sbranch, other, commoninc, commoninc[1]
5276 return source, sbranch, other, commoninc, commoninc[1]
5279
5277
5280 if needsincoming:
5278 if needsincoming:
5281 source, sbranch, sother, commoninc, incoming = getincoming()
5279 source, sbranch, sother, commoninc, incoming = getincoming()
5282 else:
5280 else:
5283 source = sbranch = sother = commoninc = incoming = None
5281 source = sbranch = sother = commoninc = incoming = None
5284
5282
5285 def getoutgoing():
5283 def getoutgoing():
5286 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5284 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5287 dbranch = branches[0]
5285 dbranch = branches[0]
5288 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5286 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5289 if source != dest:
5287 if source != dest:
5290 try:
5288 try:
5291 dother = hg.peer(repo, {}, dest)
5289 dother = hg.peer(repo, {}, dest)
5292 except error.RepoError:
5290 except error.RepoError:
5293 if opts.get('remote'):
5291 if opts.get('remote'):
5294 raise
5292 raise
5295 return dest, dbranch, None, None
5293 return dest, dbranch, None, None
5296 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5294 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5297 elif sother is None:
5295 elif sother is None:
5298 # there is no explicit destination peer, but source one is invalid
5296 # there is no explicit destination peer, but source one is invalid
5299 return dest, dbranch, None, None
5297 return dest, dbranch, None, None
5300 else:
5298 else:
5301 dother = sother
5299 dother = sother
5302 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5300 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5303 common = None
5301 common = None
5304 else:
5302 else:
5305 common = commoninc
5303 common = commoninc
5306 if revs:
5304 if revs:
5307 revs = [repo.lookup(rev) for rev in revs]
5305 revs = [repo.lookup(rev) for rev in revs]
5308 repo.ui.pushbuffer()
5306 repo.ui.pushbuffer()
5309 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5307 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5310 commoninc=common)
5308 commoninc=common)
5311 repo.ui.popbuffer()
5309 repo.ui.popbuffer()
5312 return dest, dbranch, dother, outgoing
5310 return dest, dbranch, dother, outgoing
5313
5311
5314 if needsoutgoing:
5312 if needsoutgoing:
5315 dest, dbranch, dother, outgoing = getoutgoing()
5313 dest, dbranch, dother, outgoing = getoutgoing()
5316 else:
5314 else:
5317 dest = dbranch = dother = outgoing = None
5315 dest = dbranch = dother = outgoing = None
5318
5316
5319 if opts.get('remote'):
5317 if opts.get('remote'):
5320 t = []
5318 t = []
5321 if incoming:
5319 if incoming:
5322 t.append(_('1 or more incoming'))
5320 t.append(_('1 or more incoming'))
5323 o = outgoing.missing
5321 o = outgoing.missing
5324 if o:
5322 if o:
5325 t.append(_('%d outgoing') % len(o))
5323 t.append(_('%d outgoing') % len(o))
5326 other = dother or sother
5324 other = dother or sother
5327 if 'bookmarks' in other.listkeys('namespaces'):
5325 if 'bookmarks' in other.listkeys('namespaces'):
5328 counts = bookmarks.summary(repo, other)
5326 counts = bookmarks.summary(repo, other)
5329 if counts[0] > 0:
5327 if counts[0] > 0:
5330 t.append(_('%d incoming bookmarks') % counts[0])
5328 t.append(_('%d incoming bookmarks') % counts[0])
5331 if counts[1] > 0:
5329 if counts[1] > 0:
5332 t.append(_('%d outgoing bookmarks') % counts[1])
5330 t.append(_('%d outgoing bookmarks') % counts[1])
5333
5331
5334 if t:
5332 if t:
5335 # i18n: column positioning for "hg summary"
5333 # i18n: column positioning for "hg summary"
5336 ui.write(_('remote: %s\n') % (', '.join(t)))
5334 ui.write(_('remote: %s\n') % (', '.join(t)))
5337 else:
5335 else:
5338 # i18n: column positioning for "hg summary"
5336 # i18n: column positioning for "hg summary"
5339 ui.status(_('remote: (synced)\n'))
5337 ui.status(_('remote: (synced)\n'))
5340
5338
5341 cmdutil.summaryremotehooks(ui, repo, opts,
5339 cmdutil.summaryremotehooks(ui, repo, opts,
5342 ((source, sbranch, sother, commoninc),
5340 ((source, sbranch, sother, commoninc),
5343 (dest, dbranch, dother, outgoing)))
5341 (dest, dbranch, dother, outgoing)))
5344
5342
5345 @command('tag',
5343 @command('tag',
5346 [('f', 'force', None, _('force tag')),
5344 [('f', 'force', None, _('force tag')),
5347 ('l', 'local', None, _('make the tag local')),
5345 ('l', 'local', None, _('make the tag local')),
5348 ('r', 'rev', '', _('revision to tag'), _('REV')),
5346 ('r', 'rev', '', _('revision to tag'), _('REV')),
5349 ('', 'remove', None, _('remove a tag')),
5347 ('', 'remove', None, _('remove a tag')),
5350 # -l/--local is already there, commitopts cannot be used
5348 # -l/--local is already there, commitopts cannot be used
5351 ('e', 'edit', None, _('invoke editor on commit messages')),
5349 ('e', 'edit', None, _('invoke editor on commit messages')),
5352 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5350 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5353 ] + commitopts2,
5351 ] + commitopts2,
5354 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5352 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5355 def tag(ui, repo, name1, *names, **opts):
5353 def tag(ui, repo, name1, *names, **opts):
5356 """add one or more tags for the current or given revision
5354 """add one or more tags for the current or given revision
5357
5355
5358 Name a particular revision using <name>.
5356 Name a particular revision using <name>.
5359
5357
5360 Tags are used to name particular revisions of the repository and are
5358 Tags are used to name particular revisions of the repository and are
5361 very useful to compare different revisions, to go back to significant
5359 very useful to compare different revisions, to go back to significant
5362 earlier versions or to mark branch points as releases, etc. Changing
5360 earlier versions or to mark branch points as releases, etc. Changing
5363 an existing tag is normally disallowed; use -f/--force to override.
5361 an existing tag is normally disallowed; use -f/--force to override.
5364
5362
5365 If no revision is given, the parent of the working directory is
5363 If no revision is given, the parent of the working directory is
5366 used.
5364 used.
5367
5365
5368 To facilitate version control, distribution, and merging of tags,
5366 To facilitate version control, distribution, and merging of tags,
5369 they are stored as a file named ".hgtags" which is managed similarly
5367 they are stored as a file named ".hgtags" which is managed similarly
5370 to other project files and can be hand-edited if necessary. This
5368 to other project files and can be hand-edited if necessary. This
5371 also means that tagging creates a new commit. The file
5369 also means that tagging creates a new commit. The file
5372 ".hg/localtags" is used for local tags (not shared among
5370 ".hg/localtags" is used for local tags (not shared among
5373 repositories).
5371 repositories).
5374
5372
5375 Tag commits are usually made at the head of a branch. If the parent
5373 Tag commits are usually made at the head of a branch. If the parent
5376 of the working directory is not a branch head, :hg:`tag` aborts; use
5374 of the working directory is not a branch head, :hg:`tag` aborts; use
5377 -f/--force to force the tag commit to be based on a non-head
5375 -f/--force to force the tag commit to be based on a non-head
5378 changeset.
5376 changeset.
5379
5377
5380 See :hg:`help dates` for a list of formats valid for -d/--date.
5378 See :hg:`help dates` for a list of formats valid for -d/--date.
5381
5379
5382 Since tag names have priority over branch names during revision
5380 Since tag names have priority over branch names during revision
5383 lookup, using an existing branch name as a tag name is discouraged.
5381 lookup, using an existing branch name as a tag name is discouraged.
5384
5382
5385 Returns 0 on success.
5383 Returns 0 on success.
5386 """
5384 """
5387 opts = pycompat.byteskwargs(opts)
5385 opts = pycompat.byteskwargs(opts)
5388 wlock = lock = None
5386 wlock = lock = None
5389 try:
5387 try:
5390 wlock = repo.wlock()
5388 wlock = repo.wlock()
5391 lock = repo.lock()
5389 lock = repo.lock()
5392 rev_ = "."
5390 rev_ = "."
5393 names = [t.strip() for t in (name1,) + names]
5391 names = [t.strip() for t in (name1,) + names]
5394 if len(names) != len(set(names)):
5392 if len(names) != len(set(names)):
5395 raise error.Abort(_('tag names must be unique'))
5393 raise error.Abort(_('tag names must be unique'))
5396 for n in names:
5394 for n in names:
5397 scmutil.checknewlabel(repo, n, 'tag')
5395 scmutil.checknewlabel(repo, n, 'tag')
5398 if not n:
5396 if not n:
5399 raise error.Abort(_('tag names cannot consist entirely of '
5397 raise error.Abort(_('tag names cannot consist entirely of '
5400 'whitespace'))
5398 'whitespace'))
5401 if opts.get('rev') and opts.get('remove'):
5399 if opts.get('rev') and opts.get('remove'):
5402 raise error.Abort(_("--rev and --remove are incompatible"))
5400 raise error.Abort(_("--rev and --remove are incompatible"))
5403 if opts.get('rev'):
5401 if opts.get('rev'):
5404 rev_ = opts['rev']
5402 rev_ = opts['rev']
5405 message = opts.get('message')
5403 message = opts.get('message')
5406 if opts.get('remove'):
5404 if opts.get('remove'):
5407 if opts.get('local'):
5405 if opts.get('local'):
5408 expectedtype = 'local'
5406 expectedtype = 'local'
5409 else:
5407 else:
5410 expectedtype = 'global'
5408 expectedtype = 'global'
5411
5409
5412 for n in names:
5410 for n in names:
5413 if not repo.tagtype(n):
5411 if not repo.tagtype(n):
5414 raise error.Abort(_("tag '%s' does not exist") % n)
5412 raise error.Abort(_("tag '%s' does not exist") % n)
5415 if repo.tagtype(n) != expectedtype:
5413 if repo.tagtype(n) != expectedtype:
5416 if expectedtype == 'global':
5414 if expectedtype == 'global':
5417 raise error.Abort(_("tag '%s' is not a global tag") % n)
5415 raise error.Abort(_("tag '%s' is not a global tag") % n)
5418 else:
5416 else:
5419 raise error.Abort(_("tag '%s' is not a local tag") % n)
5417 raise error.Abort(_("tag '%s' is not a local tag") % n)
5420 rev_ = 'null'
5418 rev_ = 'null'
5421 if not message:
5419 if not message:
5422 # we don't translate commit messages
5420 # we don't translate commit messages
5423 message = 'Removed tag %s' % ', '.join(names)
5421 message = 'Removed tag %s' % ', '.join(names)
5424 elif not opts.get('force'):
5422 elif not opts.get('force'):
5425 for n in names:
5423 for n in names:
5426 if n in repo.tags():
5424 if n in repo.tags():
5427 raise error.Abort(_("tag '%s' already exists "
5425 raise error.Abort(_("tag '%s' already exists "
5428 "(use -f to force)") % n)
5426 "(use -f to force)") % n)
5429 if not opts.get('local'):
5427 if not opts.get('local'):
5430 p1, p2 = repo.dirstate.parents()
5428 p1, p2 = repo.dirstate.parents()
5431 if p2 != nullid:
5429 if p2 != nullid:
5432 raise error.Abort(_('uncommitted merge'))
5430 raise error.Abort(_('uncommitted merge'))
5433 bheads = repo.branchheads()
5431 bheads = repo.branchheads()
5434 if not opts.get('force') and bheads and p1 not in bheads:
5432 if not opts.get('force') and bheads and p1 not in bheads:
5435 raise error.Abort(_('working directory is not at a branch head '
5433 raise error.Abort(_('working directory is not at a branch head '
5436 '(use -f to force)'))
5434 '(use -f to force)'))
5437 node = scmutil.revsingle(repo, rev_).node()
5435 node = scmutil.revsingle(repo, rev_).node()
5438
5436
5439 if not message:
5437 if not message:
5440 # we don't translate commit messages
5438 # we don't translate commit messages
5441 message = ('Added tag %s for changeset %s' %
5439 message = ('Added tag %s for changeset %s' %
5442 (', '.join(names), short(node)))
5440 (', '.join(names), short(node)))
5443
5441
5444 date = opts.get('date')
5442 date = opts.get('date')
5445 if date:
5443 if date:
5446 date = dateutil.parsedate(date)
5444 date = dateutil.parsedate(date)
5447
5445
5448 if opts.get('remove'):
5446 if opts.get('remove'):
5449 editform = 'tag.remove'
5447 editform = 'tag.remove'
5450 else:
5448 else:
5451 editform = 'tag.add'
5449 editform = 'tag.add'
5452 editor = cmdutil.getcommiteditor(editform=editform,
5450 editor = cmdutil.getcommiteditor(editform=editform,
5453 **pycompat.strkwargs(opts))
5451 **pycompat.strkwargs(opts))
5454
5452
5455 # don't allow tagging the null rev
5453 # don't allow tagging the null rev
5456 if (not opts.get('remove') and
5454 if (not opts.get('remove') and
5457 scmutil.revsingle(repo, rev_).rev() == nullrev):
5455 scmutil.revsingle(repo, rev_).rev() == nullrev):
5458 raise error.Abort(_("cannot tag null revision"))
5456 raise error.Abort(_("cannot tag null revision"))
5459
5457
5460 tagsmod.tag(repo, names, node, message, opts.get('local'),
5458 tagsmod.tag(repo, names, node, message, opts.get('local'),
5461 opts.get('user'), date, editor=editor)
5459 opts.get('user'), date, editor=editor)
5462 finally:
5460 finally:
5463 release(lock, wlock)
5461 release(lock, wlock)
5464
5462
5465 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5463 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5466 def tags(ui, repo, **opts):
5464 def tags(ui, repo, **opts):
5467 """list repository tags
5465 """list repository tags
5468
5466
5469 This lists both regular and local tags. When the -v/--verbose
5467 This lists both regular and local tags. When the -v/--verbose
5470 switch is used, a third column "local" is printed for local tags.
5468 switch is used, a third column "local" is printed for local tags.
5471 When the -q/--quiet switch is used, only the tag name is printed.
5469 When the -q/--quiet switch is used, only the tag name is printed.
5472
5470
5473 Returns 0 on success.
5471 Returns 0 on success.
5474 """
5472 """
5475
5473
5476 opts = pycompat.byteskwargs(opts)
5474 opts = pycompat.byteskwargs(opts)
5477 ui.pager('tags')
5475 ui.pager('tags')
5478 fm = ui.formatter('tags', opts)
5476 fm = ui.formatter('tags', opts)
5479 hexfunc = fm.hexfunc
5477 hexfunc = fm.hexfunc
5480 tagtype = ""
5478 tagtype = ""
5481
5479
5482 for t, n in reversed(repo.tagslist()):
5480 for t, n in reversed(repo.tagslist()):
5483 hn = hexfunc(n)
5481 hn = hexfunc(n)
5484 label = 'tags.normal'
5482 label = 'tags.normal'
5485 tagtype = ''
5483 tagtype = ''
5486 if repo.tagtype(t) == 'local':
5484 if repo.tagtype(t) == 'local':
5487 label = 'tags.local'
5485 label = 'tags.local'
5488 tagtype = 'local'
5486 tagtype = 'local'
5489
5487
5490 fm.startitem()
5488 fm.startitem()
5491 fm.write('tag', '%s', t, label=label)
5489 fm.write('tag', '%s', t, label=label)
5492 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5490 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5493 fm.condwrite(not ui.quiet, 'rev node', fmt,
5491 fm.condwrite(not ui.quiet, 'rev node', fmt,
5494 repo.changelog.rev(n), hn, label=label)
5492 repo.changelog.rev(n), hn, label=label)
5495 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5493 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5496 tagtype, label=label)
5494 tagtype, label=label)
5497 fm.plain('\n')
5495 fm.plain('\n')
5498 fm.end()
5496 fm.end()
5499
5497
5500 @command('tip',
5498 @command('tip',
5501 [('p', 'patch', None, _('show patch')),
5499 [('p', 'patch', None, _('show patch')),
5502 ('g', 'git', None, _('use git extended diff format')),
5500 ('g', 'git', None, _('use git extended diff format')),
5503 ] + templateopts,
5501 ] + templateopts,
5504 _('[-p] [-g]'))
5502 _('[-p] [-g]'))
5505 def tip(ui, repo, **opts):
5503 def tip(ui, repo, **opts):
5506 """show the tip revision (DEPRECATED)
5504 """show the tip revision (DEPRECATED)
5507
5505
5508 The tip revision (usually just called the tip) is the changeset
5506 The tip revision (usually just called the tip) is the changeset
5509 most recently added to the repository (and therefore the most
5507 most recently added to the repository (and therefore the most
5510 recently changed head).
5508 recently changed head).
5511
5509
5512 If you have just made a commit, that commit will be the tip. If
5510 If you have just made a commit, that commit will be the tip. If
5513 you have just pulled changes from another repository, the tip of
5511 you have just pulled changes from another repository, the tip of
5514 that repository becomes the current tip. The "tip" tag is special
5512 that repository becomes the current tip. The "tip" tag is special
5515 and cannot be renamed or assigned to a different changeset.
5513 and cannot be renamed or assigned to a different changeset.
5516
5514
5517 This command is deprecated, please use :hg:`heads` instead.
5515 This command is deprecated, please use :hg:`heads` instead.
5518
5516
5519 Returns 0 on success.
5517 Returns 0 on success.
5520 """
5518 """
5521 opts = pycompat.byteskwargs(opts)
5519 opts = pycompat.byteskwargs(opts)
5522 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5520 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5523 displayer.show(repo['tip'])
5521 displayer.show(repo['tip'])
5524 displayer.close()
5522 displayer.close()
5525
5523
5526 @command('unbundle',
5524 @command('unbundle',
5527 [('u', 'update', None,
5525 [('u', 'update', None,
5528 _('update to new branch head if changesets were unbundled'))],
5526 _('update to new branch head if changesets were unbundled'))],
5529 _('[-u] FILE...'))
5527 _('[-u] FILE...'))
5530 def unbundle(ui, repo, fname1, *fnames, **opts):
5528 def unbundle(ui, repo, fname1, *fnames, **opts):
5531 """apply one or more bundle files
5529 """apply one or more bundle files
5532
5530
5533 Apply one or more bundle files generated by :hg:`bundle`.
5531 Apply one or more bundle files generated by :hg:`bundle`.
5534
5532
5535 Returns 0 on success, 1 if an update has unresolved files.
5533 Returns 0 on success, 1 if an update has unresolved files.
5536 """
5534 """
5537 fnames = (fname1,) + fnames
5535 fnames = (fname1,) + fnames
5538
5536
5539 with repo.lock():
5537 with repo.lock():
5540 for fname in fnames:
5538 for fname in fnames:
5541 f = hg.openpath(ui, fname)
5539 f = hg.openpath(ui, fname)
5542 gen = exchange.readbundle(ui, f, fname)
5540 gen = exchange.readbundle(ui, f, fname)
5543 if isinstance(gen, streamclone.streamcloneapplier):
5541 if isinstance(gen, streamclone.streamcloneapplier):
5544 raise error.Abort(
5542 raise error.Abort(
5545 _('packed bundles cannot be applied with '
5543 _('packed bundles cannot be applied with '
5546 '"hg unbundle"'),
5544 '"hg unbundle"'),
5547 hint=_('use "hg debugapplystreamclonebundle"'))
5545 hint=_('use "hg debugapplystreamclonebundle"'))
5548 url = 'bundle:' + fname
5546 url = 'bundle:' + fname
5549 try:
5547 try:
5550 txnname = 'unbundle'
5548 txnname = 'unbundle'
5551 if not isinstance(gen, bundle2.unbundle20):
5549 if not isinstance(gen, bundle2.unbundle20):
5552 txnname = 'unbundle\n%s' % util.hidepassword(url)
5550 txnname = 'unbundle\n%s' % util.hidepassword(url)
5553 with repo.transaction(txnname) as tr:
5551 with repo.transaction(txnname) as tr:
5554 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5552 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5555 url=url)
5553 url=url)
5556 except error.BundleUnknownFeatureError as exc:
5554 except error.BundleUnknownFeatureError as exc:
5557 raise error.Abort(
5555 raise error.Abort(
5558 _('%s: unknown bundle feature, %s') % (fname, exc),
5556 _('%s: unknown bundle feature, %s') % (fname, exc),
5559 hint=_("see https://mercurial-scm.org/"
5557 hint=_("see https://mercurial-scm.org/"
5560 "wiki/BundleFeature for more "
5558 "wiki/BundleFeature for more "
5561 "information"))
5559 "information"))
5562 modheads = bundle2.combinechangegroupresults(op)
5560 modheads = bundle2.combinechangegroupresults(op)
5563
5561
5564 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5562 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5565
5563
5566 @command('^update|up|checkout|co',
5564 @command('^update|up|checkout|co',
5567 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5565 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5568 ('c', 'check', None, _('require clean working directory')),
5566 ('c', 'check', None, _('require clean working directory')),
5569 ('m', 'merge', None, _('merge uncommitted changes')),
5567 ('m', 'merge', None, _('merge uncommitted changes')),
5570 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5568 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5571 ('r', 'rev', '', _('revision'), _('REV'))
5569 ('r', 'rev', '', _('revision'), _('REV'))
5572 ] + mergetoolopts,
5570 ] + mergetoolopts,
5573 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5571 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5574 def update(ui, repo, node=None, **opts):
5572 def update(ui, repo, node=None, **opts):
5575 """update working directory (or switch revisions)
5573 """update working directory (or switch revisions)
5576
5574
5577 Update the repository's working directory to the specified
5575 Update the repository's working directory to the specified
5578 changeset. If no changeset is specified, update to the tip of the
5576 changeset. If no changeset is specified, update to the tip of the
5579 current named branch and move the active bookmark (see :hg:`help
5577 current named branch and move the active bookmark (see :hg:`help
5580 bookmarks`).
5578 bookmarks`).
5581
5579
5582 Update sets the working directory's parent revision to the specified
5580 Update sets the working directory's parent revision to the specified
5583 changeset (see :hg:`help parents`).
5581 changeset (see :hg:`help parents`).
5584
5582
5585 If the changeset is not a descendant or ancestor of the working
5583 If the changeset is not a descendant or ancestor of the working
5586 directory's parent and there are uncommitted changes, the update is
5584 directory's parent and there are uncommitted changes, the update is
5587 aborted. With the -c/--check option, the working directory is checked
5585 aborted. With the -c/--check option, the working directory is checked
5588 for uncommitted changes; if none are found, the working directory is
5586 for uncommitted changes; if none are found, the working directory is
5589 updated to the specified changeset.
5587 updated to the specified changeset.
5590
5588
5591 .. container:: verbose
5589 .. container:: verbose
5592
5590
5593 The -C/--clean, -c/--check, and -m/--merge options control what
5591 The -C/--clean, -c/--check, and -m/--merge options control what
5594 happens if the working directory contains uncommitted changes.
5592 happens if the working directory contains uncommitted changes.
5595 At most of one of them can be specified.
5593 At most of one of them can be specified.
5596
5594
5597 1. If no option is specified, and if
5595 1. If no option is specified, and if
5598 the requested changeset is an ancestor or descendant of
5596 the requested changeset is an ancestor or descendant of
5599 the working directory's parent, the uncommitted changes
5597 the working directory's parent, the uncommitted changes
5600 are merged into the requested changeset and the merged
5598 are merged into the requested changeset and the merged
5601 result is left uncommitted. If the requested changeset is
5599 result is left uncommitted. If the requested changeset is
5602 not an ancestor or descendant (that is, it is on another
5600 not an ancestor or descendant (that is, it is on another
5603 branch), the update is aborted and the uncommitted changes
5601 branch), the update is aborted and the uncommitted changes
5604 are preserved.
5602 are preserved.
5605
5603
5606 2. With the -m/--merge option, the update is allowed even if the
5604 2. With the -m/--merge option, the update is allowed even if the
5607 requested changeset is not an ancestor or descendant of
5605 requested changeset is not an ancestor or descendant of
5608 the working directory's parent.
5606 the working directory's parent.
5609
5607
5610 3. With the -c/--check option, the update is aborted and the
5608 3. With the -c/--check option, the update is aborted and the
5611 uncommitted changes are preserved.
5609 uncommitted changes are preserved.
5612
5610
5613 4. With the -C/--clean option, uncommitted changes are discarded and
5611 4. With the -C/--clean option, uncommitted changes are discarded and
5614 the working directory is updated to the requested changeset.
5612 the working directory is updated to the requested changeset.
5615
5613
5616 To cancel an uncommitted merge (and lose your changes), use
5614 To cancel an uncommitted merge (and lose your changes), use
5617 :hg:`merge --abort`.
5615 :hg:`merge --abort`.
5618
5616
5619 Use null as the changeset to remove the working directory (like
5617 Use null as the changeset to remove the working directory (like
5620 :hg:`clone -U`).
5618 :hg:`clone -U`).
5621
5619
5622 If you want to revert just one file to an older revision, use
5620 If you want to revert just one file to an older revision, use
5623 :hg:`revert [-r REV] NAME`.
5621 :hg:`revert [-r REV] NAME`.
5624
5622
5625 See :hg:`help dates` for a list of formats valid for -d/--date.
5623 See :hg:`help dates` for a list of formats valid for -d/--date.
5626
5624
5627 Returns 0 on success, 1 if there are unresolved files.
5625 Returns 0 on success, 1 if there are unresolved files.
5628 """
5626 """
5629 rev = opts.get(r'rev')
5627 rev = opts.get(r'rev')
5630 date = opts.get(r'date')
5628 date = opts.get(r'date')
5631 clean = opts.get(r'clean')
5629 clean = opts.get(r'clean')
5632 check = opts.get(r'check')
5630 check = opts.get(r'check')
5633 merge = opts.get(r'merge')
5631 merge = opts.get(r'merge')
5634 if rev and node:
5632 if rev and node:
5635 raise error.Abort(_("please specify just one revision"))
5633 raise error.Abort(_("please specify just one revision"))
5636
5634
5637 if ui.configbool('commands', 'update.requiredest'):
5635 if ui.configbool('commands', 'update.requiredest'):
5638 if not node and not rev and not date:
5636 if not node and not rev and not date:
5639 raise error.Abort(_('you must specify a destination'),
5637 raise error.Abort(_('you must specify a destination'),
5640 hint=_('for example: hg update ".::"'))
5638 hint=_('for example: hg update ".::"'))
5641
5639
5642 if rev is None or rev == '':
5640 if rev is None or rev == '':
5643 rev = node
5641 rev = node
5644
5642
5645 if date and rev is not None:
5643 if date and rev is not None:
5646 raise error.Abort(_("you can't specify a revision and a date"))
5644 raise error.Abort(_("you can't specify a revision and a date"))
5647
5645
5648 if len([x for x in (clean, check, merge) if x]) > 1:
5646 if len([x for x in (clean, check, merge) if x]) > 1:
5649 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5647 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5650 "or -m/--merge"))
5648 "or -m/--merge"))
5651
5649
5652 updatecheck = None
5650 updatecheck = None
5653 if check:
5651 if check:
5654 updatecheck = 'abort'
5652 updatecheck = 'abort'
5655 elif merge:
5653 elif merge:
5656 updatecheck = 'none'
5654 updatecheck = 'none'
5657
5655
5658 with repo.wlock():
5656 with repo.wlock():
5659 cmdutil.clearunfinished(repo)
5657 cmdutil.clearunfinished(repo)
5660
5658
5661 if date:
5659 if date:
5662 rev = cmdutil.finddate(ui, repo, date)
5660 rev = cmdutil.finddate(ui, repo, date)
5663
5661
5664 # if we defined a bookmark, we have to remember the original name
5662 # if we defined a bookmark, we have to remember the original name
5665 brev = rev
5663 brev = rev
5666 if rev:
5664 if rev:
5667 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5665 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5668 ctx = scmutil.revsingle(repo, rev, rev)
5666 ctx = scmutil.revsingle(repo, rev, rev)
5669 rev = ctx.rev()
5667 rev = ctx.rev()
5670 hidden = ctx.hidden()
5668 hidden = ctx.hidden()
5671 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
5669 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
5672
5670
5673 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5671 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5674 updatecheck=updatecheck)
5672 updatecheck=updatecheck)
5675 if hidden:
5673 if hidden:
5676 ctxstr = ctx.hex()[:12]
5674 ctxstr = ctx.hex()[:12]
5677 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5675 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5678
5676
5679 if ctx.obsolete():
5677 if ctx.obsolete():
5680 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5678 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5681 ui.warn("(%s)\n" % obsfatemsg)
5679 ui.warn("(%s)\n" % obsfatemsg)
5682 return ret
5680 return ret
5683
5681
5684 @command('verify', [])
5682 @command('verify', [])
5685 def verify(ui, repo):
5683 def verify(ui, repo):
5686 """verify the integrity of the repository
5684 """verify the integrity of the repository
5687
5685
5688 Verify the integrity of the current repository.
5686 Verify the integrity of the current repository.
5689
5687
5690 This will perform an extensive check of the repository's
5688 This will perform an extensive check of the repository's
5691 integrity, validating the hashes and checksums of each entry in
5689 integrity, validating the hashes and checksums of each entry in
5692 the changelog, manifest, and tracked files, as well as the
5690 the changelog, manifest, and tracked files, as well as the
5693 integrity of their crosslinks and indices.
5691 integrity of their crosslinks and indices.
5694
5692
5695 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5693 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5696 for more information about recovery from corruption of the
5694 for more information about recovery from corruption of the
5697 repository.
5695 repository.
5698
5696
5699 Returns 0 on success, 1 if errors are encountered.
5697 Returns 0 on success, 1 if errors are encountered.
5700 """
5698 """
5701 return hg.verify(repo)
5699 return hg.verify(repo)
5702
5700
5703 @command('version', [] + formatteropts, norepo=True,
5701 @command('version', [] + formatteropts, norepo=True,
5704 intents={INTENT_READONLY})
5702 intents={INTENT_READONLY})
5705 def version_(ui, **opts):
5703 def version_(ui, **opts):
5706 """output version and copyright information"""
5704 """output version and copyright information"""
5707 opts = pycompat.byteskwargs(opts)
5705 opts = pycompat.byteskwargs(opts)
5708 if ui.verbose:
5706 if ui.verbose:
5709 ui.pager('version')
5707 ui.pager('version')
5710 fm = ui.formatter("version", opts)
5708 fm = ui.formatter("version", opts)
5711 fm.startitem()
5709 fm.startitem()
5712 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5710 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5713 util.version())
5711 util.version())
5714 license = _(
5712 license = _(
5715 "(see https://mercurial-scm.org for more information)\n"
5713 "(see https://mercurial-scm.org for more information)\n"
5716 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5714 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5717 "This is free software; see the source for copying conditions. "
5715 "This is free software; see the source for copying conditions. "
5718 "There is NO\nwarranty; "
5716 "There is NO\nwarranty; "
5719 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5717 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5720 )
5718 )
5721 if not ui.quiet:
5719 if not ui.quiet:
5722 fm.plain(license)
5720 fm.plain(license)
5723
5721
5724 if ui.verbose:
5722 if ui.verbose:
5725 fm.plain(_("\nEnabled extensions:\n\n"))
5723 fm.plain(_("\nEnabled extensions:\n\n"))
5726 # format names and versions into columns
5724 # format names and versions into columns
5727 names = []
5725 names = []
5728 vers = []
5726 vers = []
5729 isinternals = []
5727 isinternals = []
5730 for name, module in extensions.extensions():
5728 for name, module in extensions.extensions():
5731 names.append(name)
5729 names.append(name)
5732 vers.append(extensions.moduleversion(module) or None)
5730 vers.append(extensions.moduleversion(module) or None)
5733 isinternals.append(extensions.ismoduleinternal(module))
5731 isinternals.append(extensions.ismoduleinternal(module))
5734 fn = fm.nested("extensions", tmpl='{name}\n')
5732 fn = fm.nested("extensions", tmpl='{name}\n')
5735 if names:
5733 if names:
5736 namefmt = " %%-%ds " % max(len(n) for n in names)
5734 namefmt = " %%-%ds " % max(len(n) for n in names)
5737 places = [_("external"), _("internal")]
5735 places = [_("external"), _("internal")]
5738 for n, v, p in zip(names, vers, isinternals):
5736 for n, v, p in zip(names, vers, isinternals):
5739 fn.startitem()
5737 fn.startitem()
5740 fn.condwrite(ui.verbose, "name", namefmt, n)
5738 fn.condwrite(ui.verbose, "name", namefmt, n)
5741 if ui.verbose:
5739 if ui.verbose:
5742 fn.plain("%s " % places[p])
5740 fn.plain("%s " % places[p])
5743 fn.data(bundled=p)
5741 fn.data(bundled=p)
5744 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5742 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5745 if ui.verbose:
5743 if ui.verbose:
5746 fn.plain("\n")
5744 fn.plain("\n")
5747 fn.end()
5745 fn.end()
5748 fm.end()
5746 fm.end()
5749
5747
5750 def loadcmdtable(ui, name, cmdtable):
5748 def loadcmdtable(ui, name, cmdtable):
5751 """Load command functions from specified cmdtable
5749 """Load command functions from specified cmdtable
5752 """
5750 """
5753 overrides = [cmd for cmd in cmdtable if cmd in table]
5751 overrides = [cmd for cmd in cmdtable if cmd in table]
5754 if overrides:
5752 if overrides:
5755 ui.warn(_("extension '%s' overrides commands: %s\n")
5753 ui.warn(_("extension '%s' overrides commands: %s\n")
5756 % (name, " ".join(overrides)))
5754 % (name, " ".join(overrides)))
5757 table.update(cmdtable)
5755 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now