##// END OF EJS Templates
grep: don't look up copy info unless --follow is given...
Martin von Zweigbergk -
r41412:b44f1703 default
parent child Browse files
Show More
@@ -1,6217 +1,6219 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 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from . import (
25 from . import (
26 archival,
26 archival,
27 bookmarks,
27 bookmarks,
28 bundle2,
28 bundle2,
29 changegroup,
29 changegroup,
30 cmdutil,
30 cmdutil,
31 copies,
31 copies,
32 debugcommands as debugcommandsmod,
32 debugcommands as debugcommandsmod,
33 destutil,
33 destutil,
34 dirstateguard,
34 dirstateguard,
35 discovery,
35 discovery,
36 encoding,
36 encoding,
37 error,
37 error,
38 exchange,
38 exchange,
39 extensions,
39 extensions,
40 filemerge,
40 filemerge,
41 formatter,
41 formatter,
42 graphmod,
42 graphmod,
43 hbisect,
43 hbisect,
44 help,
44 help,
45 hg,
45 hg,
46 logcmdutil,
46 logcmdutil,
47 merge as mergemod,
47 merge as mergemod,
48 narrowspec,
48 narrowspec,
49 obsolete,
49 obsolete,
50 obsutil,
50 obsutil,
51 patch,
51 patch,
52 phases,
52 phases,
53 pycompat,
53 pycompat,
54 rcutil,
54 rcutil,
55 registrar,
55 registrar,
56 repair,
56 repair,
57 revsetlang,
57 revsetlang,
58 rewriteutil,
58 rewriteutil,
59 scmutil,
59 scmutil,
60 server,
60 server,
61 state as statemod,
61 state as statemod,
62 streamclone,
62 streamclone,
63 tags as tagsmod,
63 tags as tagsmod,
64 templatekw,
64 templatekw,
65 ui as uimod,
65 ui as uimod,
66 util,
66 util,
67 wireprotoserver,
67 wireprotoserver,
68 )
68 )
69 from .utils import (
69 from .utils import (
70 dateutil,
70 dateutil,
71 stringutil,
71 stringutil,
72 )
72 )
73
73
74 table = {}
74 table = {}
75 table.update(debugcommandsmod.command._table)
75 table.update(debugcommandsmod.command._table)
76
76
77 command = registrar.command(table)
77 command = registrar.command(table)
78 INTENT_READONLY = registrar.INTENT_READONLY
78 INTENT_READONLY = registrar.INTENT_READONLY
79
79
80 # common command options
80 # common command options
81
81
82 globalopts = [
82 globalopts = [
83 ('R', 'repository', '',
83 ('R', 'repository', '',
84 _('repository root directory or name of overlay bundle file'),
84 _('repository root directory or name of overlay bundle file'),
85 _('REPO')),
85 _('REPO')),
86 ('', 'cwd', '',
86 ('', 'cwd', '',
87 _('change working directory'), _('DIR')),
87 _('change working directory'), _('DIR')),
88 ('y', 'noninteractive', None,
88 ('y', 'noninteractive', None,
89 _('do not prompt, automatically pick the first choice for all prompts')),
89 _('do not prompt, automatically pick the first choice for all prompts')),
90 ('q', 'quiet', None, _('suppress output')),
90 ('q', 'quiet', None, _('suppress output')),
91 ('v', 'verbose', None, _('enable additional output')),
91 ('v', 'verbose', None, _('enable additional output')),
92 ('', 'color', '',
92 ('', 'color', '',
93 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
93 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
94 # and should not be translated
94 # and should not be translated
95 _("when to colorize (boolean, always, auto, never, or debug)"),
95 _("when to colorize (boolean, always, auto, never, or debug)"),
96 _('TYPE')),
96 _('TYPE')),
97 ('', 'config', [],
97 ('', 'config', [],
98 _('set/override config option (use \'section.name=value\')'),
98 _('set/override config option (use \'section.name=value\')'),
99 _('CONFIG')),
99 _('CONFIG')),
100 ('', 'debug', None, _('enable debugging output')),
100 ('', 'debug', None, _('enable debugging output')),
101 ('', 'debugger', None, _('start debugger')),
101 ('', 'debugger', None, _('start debugger')),
102 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
102 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
103 _('ENCODE')),
103 _('ENCODE')),
104 ('', 'encodingmode', encoding.encodingmode,
104 ('', 'encodingmode', encoding.encodingmode,
105 _('set the charset encoding mode'), _('MODE')),
105 _('set the charset encoding mode'), _('MODE')),
106 ('', 'traceback', None, _('always print a traceback on exception')),
106 ('', 'traceback', None, _('always print a traceback on exception')),
107 ('', 'time', None, _('time how long the command takes')),
107 ('', 'time', None, _('time how long the command takes')),
108 ('', 'profile', None, _('print command execution profile')),
108 ('', 'profile', None, _('print command execution profile')),
109 ('', 'version', None, _('output version information and exit')),
109 ('', 'version', None, _('output version information and exit')),
110 ('h', 'help', None, _('display help and exit')),
110 ('h', 'help', None, _('display help and exit')),
111 ('', 'hidden', False, _('consider hidden changesets')),
111 ('', 'hidden', False, _('consider hidden changesets')),
112 ('', 'pager', 'auto',
112 ('', 'pager', 'auto',
113 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
113 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
114 ]
114 ]
115
115
116 dryrunopts = cmdutil.dryrunopts
116 dryrunopts = cmdutil.dryrunopts
117 remoteopts = cmdutil.remoteopts
117 remoteopts = cmdutil.remoteopts
118 walkopts = cmdutil.walkopts
118 walkopts = cmdutil.walkopts
119 commitopts = cmdutil.commitopts
119 commitopts = cmdutil.commitopts
120 commitopts2 = cmdutil.commitopts2
120 commitopts2 = cmdutil.commitopts2
121 formatteropts = cmdutil.formatteropts
121 formatteropts = cmdutil.formatteropts
122 templateopts = cmdutil.templateopts
122 templateopts = cmdutil.templateopts
123 logopts = cmdutil.logopts
123 logopts = cmdutil.logopts
124 diffopts = cmdutil.diffopts
124 diffopts = cmdutil.diffopts
125 diffwsopts = cmdutil.diffwsopts
125 diffwsopts = cmdutil.diffwsopts
126 diffopts2 = cmdutil.diffopts2
126 diffopts2 = cmdutil.diffopts2
127 mergetoolopts = cmdutil.mergetoolopts
127 mergetoolopts = cmdutil.mergetoolopts
128 similarityopts = cmdutil.similarityopts
128 similarityopts = cmdutil.similarityopts
129 subrepoopts = cmdutil.subrepoopts
129 subrepoopts = cmdutil.subrepoopts
130 debugrevlogopts = cmdutil.debugrevlogopts
130 debugrevlogopts = cmdutil.debugrevlogopts
131
131
132 # Commands start here, listed alphabetically
132 # Commands start here, listed alphabetically
133
133
134 @command('add',
134 @command('add',
135 walkopts + subrepoopts + dryrunopts,
135 walkopts + subrepoopts + dryrunopts,
136 _('[OPTION]... [FILE]...'),
136 _('[OPTION]... [FILE]...'),
137 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
137 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
138 helpbasic=True, inferrepo=True)
138 helpbasic=True, inferrepo=True)
139 def add(ui, repo, *pats, **opts):
139 def add(ui, repo, *pats, **opts):
140 """add the specified files on the next commit
140 """add the specified files on the next commit
141
141
142 Schedule files to be version controlled and added to the
142 Schedule files to be version controlled and added to the
143 repository.
143 repository.
144
144
145 The files will be added to the repository at the next commit. To
145 The files will be added to the repository at the next commit. To
146 undo an add before that, see :hg:`forget`.
146 undo an add before that, see :hg:`forget`.
147
147
148 If no names are given, add all files to the repository (except
148 If no names are given, add all files to the repository (except
149 files matching ``.hgignore``).
149 files matching ``.hgignore``).
150
150
151 .. container:: verbose
151 .. container:: verbose
152
152
153 Examples:
153 Examples:
154
154
155 - New (unknown) files are added
155 - New (unknown) files are added
156 automatically by :hg:`add`::
156 automatically by :hg:`add`::
157
157
158 $ ls
158 $ ls
159 foo.c
159 foo.c
160 $ hg status
160 $ hg status
161 ? foo.c
161 ? foo.c
162 $ hg add
162 $ hg add
163 adding foo.c
163 adding foo.c
164 $ hg status
164 $ hg status
165 A foo.c
165 A foo.c
166
166
167 - Specific files to be added can be specified::
167 - Specific files to be added can be specified::
168
168
169 $ ls
169 $ ls
170 bar.c foo.c
170 bar.c foo.c
171 $ hg status
171 $ hg status
172 ? bar.c
172 ? bar.c
173 ? foo.c
173 ? foo.c
174 $ hg add bar.c
174 $ hg add bar.c
175 $ hg status
175 $ hg status
176 A bar.c
176 A bar.c
177 ? foo.c
177 ? foo.c
178
178
179 Returns 0 if all files are successfully added.
179 Returns 0 if all files are successfully added.
180 """
180 """
181
181
182 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
182 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
183 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
183 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
184 return rejected and 1 or 0
184 return rejected and 1 or 0
185
185
186 @command('addremove',
186 @command('addremove',
187 similarityopts + subrepoopts + walkopts + dryrunopts,
187 similarityopts + subrepoopts + walkopts + dryrunopts,
188 _('[OPTION]... [FILE]...'),
188 _('[OPTION]... [FILE]...'),
189 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
189 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
190 inferrepo=True)
190 inferrepo=True)
191 def addremove(ui, repo, *pats, **opts):
191 def addremove(ui, repo, *pats, **opts):
192 """add all new files, delete all missing files
192 """add all new files, delete all missing files
193
193
194 Add all new files and remove all missing files from the
194 Add all new files and remove all missing files from the
195 repository.
195 repository.
196
196
197 Unless names are given, new files are ignored if they match any of
197 Unless names are given, new files are ignored if they match any of
198 the patterns in ``.hgignore``. As with add, these changes take
198 the patterns in ``.hgignore``. As with add, these changes take
199 effect at the next commit.
199 effect at the next commit.
200
200
201 Use the -s/--similarity option to detect renamed files. This
201 Use the -s/--similarity option to detect renamed files. This
202 option takes a percentage between 0 (disabled) and 100 (files must
202 option takes a percentage between 0 (disabled) and 100 (files must
203 be identical) as its parameter. With a parameter greater than 0,
203 be identical) as its parameter. With a parameter greater than 0,
204 this compares every removed file with every added file and records
204 this compares every removed file with every added file and records
205 those similar enough as renames. Detecting renamed files this way
205 those similar enough as renames. Detecting renamed files this way
206 can be expensive. After using this option, :hg:`status -C` can be
206 can be expensive. After using this option, :hg:`status -C` can be
207 used to check which files were identified as moved or renamed. If
207 used to check which files were identified as moved or renamed. If
208 not specified, -s/--similarity defaults to 100 and only renames of
208 not specified, -s/--similarity defaults to 100 and only renames of
209 identical files are detected.
209 identical files are detected.
210
210
211 .. container:: verbose
211 .. container:: verbose
212
212
213 Examples:
213 Examples:
214
214
215 - A number of files (bar.c and foo.c) are new,
215 - A number of files (bar.c and foo.c) are new,
216 while foobar.c has been removed (without using :hg:`remove`)
216 while foobar.c has been removed (without using :hg:`remove`)
217 from the repository::
217 from the repository::
218
218
219 $ ls
219 $ ls
220 bar.c foo.c
220 bar.c foo.c
221 $ hg status
221 $ hg status
222 ! foobar.c
222 ! foobar.c
223 ? bar.c
223 ? bar.c
224 ? foo.c
224 ? foo.c
225 $ hg addremove
225 $ hg addremove
226 adding bar.c
226 adding bar.c
227 adding foo.c
227 adding foo.c
228 removing foobar.c
228 removing foobar.c
229 $ hg status
229 $ hg status
230 A bar.c
230 A bar.c
231 A foo.c
231 A foo.c
232 R foobar.c
232 R foobar.c
233
233
234 - A file foobar.c was moved to foo.c without using :hg:`rename`.
234 - A file foobar.c was moved to foo.c without using :hg:`rename`.
235 Afterwards, it was edited slightly::
235 Afterwards, it was edited slightly::
236
236
237 $ ls
237 $ ls
238 foo.c
238 foo.c
239 $ hg status
239 $ hg status
240 ! foobar.c
240 ! foobar.c
241 ? foo.c
241 ? foo.c
242 $ hg addremove --similarity 90
242 $ hg addremove --similarity 90
243 removing foobar.c
243 removing foobar.c
244 adding foo.c
244 adding foo.c
245 recording removal of foobar.c as rename to foo.c (94% similar)
245 recording removal of foobar.c as rename to foo.c (94% similar)
246 $ hg status -C
246 $ hg status -C
247 A foo.c
247 A foo.c
248 foobar.c
248 foobar.c
249 R foobar.c
249 R foobar.c
250
250
251 Returns 0 if all files are successfully added.
251 Returns 0 if all files are successfully added.
252 """
252 """
253 opts = pycompat.byteskwargs(opts)
253 opts = pycompat.byteskwargs(opts)
254 if not opts.get('similarity'):
254 if not opts.get('similarity'):
255 opts['similarity'] = '100'
255 opts['similarity'] = '100'
256 matcher = scmutil.match(repo[None], pats, opts)
256 matcher = scmutil.match(repo[None], pats, opts)
257 return scmutil.addremove(repo, matcher, "", opts)
257 return scmutil.addremove(repo, matcher, "", opts)
258
258
259 @command('annotate|blame',
259 @command('annotate|blame',
260 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
260 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
261 ('', 'follow', None,
261 ('', 'follow', None,
262 _('follow copies/renames and list the filename (DEPRECATED)')),
262 _('follow copies/renames and list the filename (DEPRECATED)')),
263 ('', 'no-follow', None, _("don't follow copies and renames")),
263 ('', 'no-follow', None, _("don't follow copies and renames")),
264 ('a', 'text', None, _('treat all files as text')),
264 ('a', 'text', None, _('treat all files as text')),
265 ('u', 'user', None, _('list the author (long with -v)')),
265 ('u', 'user', None, _('list the author (long with -v)')),
266 ('f', 'file', None, _('list the filename')),
266 ('f', 'file', None, _('list the filename')),
267 ('d', 'date', None, _('list the date (short with -q)')),
267 ('d', 'date', None, _('list the date (short with -q)')),
268 ('n', 'number', None, _('list the revision number (default)')),
268 ('n', 'number', None, _('list the revision number (default)')),
269 ('c', 'changeset', None, _('list the changeset')),
269 ('c', 'changeset', None, _('list the changeset')),
270 ('l', 'line-number', None, _('show line number at the first appearance')),
270 ('l', 'line-number', None, _('show line number at the first appearance')),
271 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
271 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
272 ] + diffwsopts + walkopts + formatteropts,
272 ] + diffwsopts + walkopts + formatteropts,
273 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
273 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
274 helpcategory=command.CATEGORY_FILE_CONTENTS,
274 helpcategory=command.CATEGORY_FILE_CONTENTS,
275 helpbasic=True, inferrepo=True)
275 helpbasic=True, inferrepo=True)
276 def annotate(ui, repo, *pats, **opts):
276 def annotate(ui, repo, *pats, **opts):
277 """show changeset information by line for each file
277 """show changeset information by line for each file
278
278
279 List changes in files, showing the revision id responsible for
279 List changes in files, showing the revision id responsible for
280 each line.
280 each line.
281
281
282 This command is useful for discovering when a change was made and
282 This command is useful for discovering when a change was made and
283 by whom.
283 by whom.
284
284
285 If you include --file, --user, or --date, the revision number is
285 If you include --file, --user, or --date, the revision number is
286 suppressed unless you also include --number.
286 suppressed unless you also include --number.
287
287
288 Without the -a/--text option, annotate will avoid processing files
288 Without the -a/--text option, annotate will avoid processing files
289 it detects as binary. With -a, annotate will annotate the file
289 it detects as binary. With -a, annotate will annotate the file
290 anyway, although the results will probably be neither useful
290 anyway, although the results will probably be neither useful
291 nor desirable.
291 nor desirable.
292
292
293 .. container:: verbose
293 .. container:: verbose
294
294
295 Template:
295 Template:
296
296
297 The following keywords are supported in addition to the common template
297 The following keywords are supported in addition to the common template
298 keywords and functions. See also :hg:`help templates`.
298 keywords and functions. See also :hg:`help templates`.
299
299
300 :lines: List of lines with annotation data.
300 :lines: List of lines with annotation data.
301 :path: String. Repository-absolute path of the specified file.
301 :path: String. Repository-absolute path of the specified file.
302
302
303 And each entry of ``{lines}`` provides the following sub-keywords in
303 And each entry of ``{lines}`` provides the following sub-keywords in
304 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
304 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
305
305
306 :line: String. Line content.
306 :line: String. Line content.
307 :lineno: Integer. Line number at that revision.
307 :lineno: Integer. Line number at that revision.
308 :path: String. Repository-absolute path of the file at that revision.
308 :path: String. Repository-absolute path of the file at that revision.
309
309
310 See :hg:`help templates.operators` for the list expansion syntax.
310 See :hg:`help templates.operators` for the list expansion syntax.
311
311
312 Returns 0 on success.
312 Returns 0 on success.
313 """
313 """
314 opts = pycompat.byteskwargs(opts)
314 opts = pycompat.byteskwargs(opts)
315 if not pats:
315 if not pats:
316 raise error.Abort(_('at least one filename or pattern is required'))
316 raise error.Abort(_('at least one filename or pattern is required'))
317
317
318 if opts.get('follow'):
318 if opts.get('follow'):
319 # --follow is deprecated and now just an alias for -f/--file
319 # --follow is deprecated and now just an alias for -f/--file
320 # to mimic the behavior of Mercurial before version 1.5
320 # to mimic the behavior of Mercurial before version 1.5
321 opts['file'] = True
321 opts['file'] = True
322
322
323 if (not opts.get('user') and not opts.get('changeset')
323 if (not opts.get('user') and not opts.get('changeset')
324 and not opts.get('date') and not opts.get('file')):
324 and not opts.get('date') and not opts.get('file')):
325 opts['number'] = True
325 opts['number'] = True
326
326
327 linenumber = opts.get('line_number') is not None
327 linenumber = opts.get('line_number') is not None
328 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
328 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
329 raise error.Abort(_('at least one of -n/-c is required for -l'))
329 raise error.Abort(_('at least one of -n/-c is required for -l'))
330
330
331 rev = opts.get('rev')
331 rev = opts.get('rev')
332 if rev:
332 if rev:
333 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
333 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
334 ctx = scmutil.revsingle(repo, rev)
334 ctx = scmutil.revsingle(repo, rev)
335
335
336 ui.pager('annotate')
336 ui.pager('annotate')
337 rootfm = ui.formatter('annotate', opts)
337 rootfm = ui.formatter('annotate', opts)
338 if ui.debugflag:
338 if ui.debugflag:
339 shorthex = pycompat.identity
339 shorthex = pycompat.identity
340 else:
340 else:
341 def shorthex(h):
341 def shorthex(h):
342 return h[:12]
342 return h[:12]
343 if ui.quiet:
343 if ui.quiet:
344 datefunc = dateutil.shortdate
344 datefunc = dateutil.shortdate
345 else:
345 else:
346 datefunc = dateutil.datestr
346 datefunc = dateutil.datestr
347 if ctx.rev() is None:
347 if ctx.rev() is None:
348 if opts.get('changeset'):
348 if opts.get('changeset'):
349 # omit "+" suffix which is appended to node hex
349 # omit "+" suffix which is appended to node hex
350 def formatrev(rev):
350 def formatrev(rev):
351 if rev == wdirrev:
351 if rev == wdirrev:
352 return '%d' % ctx.p1().rev()
352 return '%d' % ctx.p1().rev()
353 else:
353 else:
354 return '%d' % rev
354 return '%d' % rev
355 else:
355 else:
356 def formatrev(rev):
356 def formatrev(rev):
357 if rev == wdirrev:
357 if rev == wdirrev:
358 return '%d+' % ctx.p1().rev()
358 return '%d+' % ctx.p1().rev()
359 else:
359 else:
360 return '%d ' % rev
360 return '%d ' % rev
361 def formathex(h):
361 def formathex(h):
362 if h == wdirhex:
362 if h == wdirhex:
363 return '%s+' % shorthex(hex(ctx.p1().node()))
363 return '%s+' % shorthex(hex(ctx.p1().node()))
364 else:
364 else:
365 return '%s ' % shorthex(h)
365 return '%s ' % shorthex(h)
366 else:
366 else:
367 formatrev = b'%d'.__mod__
367 formatrev = b'%d'.__mod__
368 formathex = shorthex
368 formathex = shorthex
369
369
370 opmap = [
370 opmap = [
371 ('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
371 ('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
372 ('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
372 ('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
373 ('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
373 ('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
374 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
374 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
375 ('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
375 ('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
376 ('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
376 ('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
377 ]
377 ]
378 opnamemap = {
378 opnamemap = {
379 'rev': 'number',
379 'rev': 'number',
380 'node': 'changeset',
380 'node': 'changeset',
381 'path': 'file',
381 'path': 'file',
382 'lineno': 'line_number',
382 'lineno': 'line_number',
383 }
383 }
384
384
385 if rootfm.isplain():
385 if rootfm.isplain():
386 def makefunc(get, fmt):
386 def makefunc(get, fmt):
387 return lambda x: fmt(get(x))
387 return lambda x: fmt(get(x))
388 else:
388 else:
389 def makefunc(get, fmt):
389 def makefunc(get, fmt):
390 return get
390 return get
391 datahint = rootfm.datahint()
391 datahint = rootfm.datahint()
392 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
392 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
393 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
393 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
394 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
394 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
395 fields = ' '.join(fn for fn, sep, get, fmt in opmap
395 fields = ' '.join(fn for fn, sep, get, fmt in opmap
396 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
396 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
397
397
398 def bad(x, y):
398 def bad(x, y):
399 raise error.Abort("%s: %s" % (x, y))
399 raise error.Abort("%s: %s" % (x, y))
400
400
401 m = scmutil.match(ctx, pats, opts, badfn=bad)
401 m = scmutil.match(ctx, pats, opts, badfn=bad)
402
402
403 follow = not opts.get('no_follow')
403 follow = not opts.get('no_follow')
404 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
404 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
405 whitespace=True)
405 whitespace=True)
406 skiprevs = opts.get('skip')
406 skiprevs = opts.get('skip')
407 if skiprevs:
407 if skiprevs:
408 skiprevs = scmutil.revrange(repo, skiprevs)
408 skiprevs = scmutil.revrange(repo, skiprevs)
409
409
410 for abs in ctx.walk(m):
410 for abs in ctx.walk(m):
411 fctx = ctx[abs]
411 fctx = ctx[abs]
412 rootfm.startitem()
412 rootfm.startitem()
413 rootfm.data(path=abs)
413 rootfm.data(path=abs)
414 if not opts.get('text') and fctx.isbinary():
414 if not opts.get('text') and fctx.isbinary():
415 rootfm.plain(_("%s: binary file\n") % m.rel(abs))
415 rootfm.plain(_("%s: binary file\n") % m.rel(abs))
416 continue
416 continue
417
417
418 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
418 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
419 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
419 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
420 diffopts=diffopts)
420 diffopts=diffopts)
421 if not lines:
421 if not lines:
422 fm.end()
422 fm.end()
423 continue
423 continue
424 formats = []
424 formats = []
425 pieces = []
425 pieces = []
426
426
427 for f, sep in funcmap:
427 for f, sep in funcmap:
428 l = [f(n) for n in lines]
428 l = [f(n) for n in lines]
429 if fm.isplain():
429 if fm.isplain():
430 sizes = [encoding.colwidth(x) for x in l]
430 sizes = [encoding.colwidth(x) for x in l]
431 ml = max(sizes)
431 ml = max(sizes)
432 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
432 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
433 else:
433 else:
434 formats.append(['%s' for x in l])
434 formats.append(['%s' for x in l])
435 pieces.append(l)
435 pieces.append(l)
436
436
437 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
437 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
438 fm.startitem()
438 fm.startitem()
439 fm.context(fctx=n.fctx)
439 fm.context(fctx=n.fctx)
440 fm.write(fields, "".join(f), *p)
440 fm.write(fields, "".join(f), *p)
441 if n.skip:
441 if n.skip:
442 fmt = "* %s"
442 fmt = "* %s"
443 else:
443 else:
444 fmt = ": %s"
444 fmt = ": %s"
445 fm.write('line', fmt, n.text)
445 fm.write('line', fmt, n.text)
446
446
447 if not lines[-1].text.endswith('\n'):
447 if not lines[-1].text.endswith('\n'):
448 fm.plain('\n')
448 fm.plain('\n')
449 fm.end()
449 fm.end()
450
450
451 rootfm.end()
451 rootfm.end()
452
452
453 @command('archive',
453 @command('archive',
454 [('', 'no-decode', None, _('do not pass files through decoders')),
454 [('', 'no-decode', None, _('do not pass files through decoders')),
455 ('p', 'prefix', '', _('directory prefix for files in archive'),
455 ('p', 'prefix', '', _('directory prefix for files in archive'),
456 _('PREFIX')),
456 _('PREFIX')),
457 ('r', 'rev', '', _('revision to distribute'), _('REV')),
457 ('r', 'rev', '', _('revision to distribute'), _('REV')),
458 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
458 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
459 ] + subrepoopts + walkopts,
459 ] + subrepoopts + walkopts,
460 _('[OPTION]... DEST'),
460 _('[OPTION]... DEST'),
461 helpcategory=command.CATEGORY_IMPORT_EXPORT)
461 helpcategory=command.CATEGORY_IMPORT_EXPORT)
462 def archive(ui, repo, dest, **opts):
462 def archive(ui, repo, dest, **opts):
463 '''create an unversioned archive of a repository revision
463 '''create an unversioned archive of a repository revision
464
464
465 By default, the revision used is the parent of the working
465 By default, the revision used is the parent of the working
466 directory; use -r/--rev to specify a different revision.
466 directory; use -r/--rev to specify a different revision.
467
467
468 The archive type is automatically detected based on file
468 The archive type is automatically detected based on file
469 extension (to override, use -t/--type).
469 extension (to override, use -t/--type).
470
470
471 .. container:: verbose
471 .. container:: verbose
472
472
473 Examples:
473 Examples:
474
474
475 - create a zip file containing the 1.0 release::
475 - create a zip file containing the 1.0 release::
476
476
477 hg archive -r 1.0 project-1.0.zip
477 hg archive -r 1.0 project-1.0.zip
478
478
479 - create a tarball excluding .hg files::
479 - create a tarball excluding .hg files::
480
480
481 hg archive project.tar.gz -X ".hg*"
481 hg archive project.tar.gz -X ".hg*"
482
482
483 Valid types are:
483 Valid types are:
484
484
485 :``files``: a directory full of files (default)
485 :``files``: a directory full of files (default)
486 :``tar``: tar archive, uncompressed
486 :``tar``: tar archive, uncompressed
487 :``tbz2``: tar archive, compressed using bzip2
487 :``tbz2``: tar archive, compressed using bzip2
488 :``tgz``: tar archive, compressed using gzip
488 :``tgz``: tar archive, compressed using gzip
489 :``uzip``: zip archive, uncompressed
489 :``uzip``: zip archive, uncompressed
490 :``zip``: zip archive, compressed using deflate
490 :``zip``: zip archive, compressed using deflate
491
491
492 The exact name of the destination archive or directory is given
492 The exact name of the destination archive or directory is given
493 using a format string; see :hg:`help export` for details.
493 using a format string; see :hg:`help export` for details.
494
494
495 Each member added to an archive file has a directory prefix
495 Each member added to an archive file has a directory prefix
496 prepended. Use -p/--prefix to specify a format string for the
496 prepended. Use -p/--prefix to specify a format string for the
497 prefix. The default is the basename of the archive, with suffixes
497 prefix. The default is the basename of the archive, with suffixes
498 removed.
498 removed.
499
499
500 Returns 0 on success.
500 Returns 0 on success.
501 '''
501 '''
502
502
503 opts = pycompat.byteskwargs(opts)
503 opts = pycompat.byteskwargs(opts)
504 rev = opts.get('rev')
504 rev = opts.get('rev')
505 if rev:
505 if rev:
506 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
506 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
507 ctx = scmutil.revsingle(repo, rev)
507 ctx = scmutil.revsingle(repo, rev)
508 if not ctx:
508 if not ctx:
509 raise error.Abort(_('no working directory: please specify a revision'))
509 raise error.Abort(_('no working directory: please specify a revision'))
510 node = ctx.node()
510 node = ctx.node()
511 dest = cmdutil.makefilename(ctx, dest)
511 dest = cmdutil.makefilename(ctx, dest)
512 if os.path.realpath(dest) == repo.root:
512 if os.path.realpath(dest) == repo.root:
513 raise error.Abort(_('repository root cannot be destination'))
513 raise error.Abort(_('repository root cannot be destination'))
514
514
515 kind = opts.get('type') or archival.guesskind(dest) or 'files'
515 kind = opts.get('type') or archival.guesskind(dest) or 'files'
516 prefix = opts.get('prefix')
516 prefix = opts.get('prefix')
517
517
518 if dest == '-':
518 if dest == '-':
519 if kind == 'files':
519 if kind == 'files':
520 raise error.Abort(_('cannot archive plain files to stdout'))
520 raise error.Abort(_('cannot archive plain files to stdout'))
521 dest = cmdutil.makefileobj(ctx, dest)
521 dest = cmdutil.makefileobj(ctx, dest)
522 if not prefix:
522 if not prefix:
523 prefix = os.path.basename(repo.root) + '-%h'
523 prefix = os.path.basename(repo.root) + '-%h'
524
524
525 prefix = cmdutil.makefilename(ctx, prefix)
525 prefix = cmdutil.makefilename(ctx, prefix)
526 match = scmutil.match(ctx, [], opts)
526 match = scmutil.match(ctx, [], opts)
527 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
527 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
528 match, prefix, subrepos=opts.get('subrepos'))
528 match, prefix, subrepos=opts.get('subrepos'))
529
529
530 @command('backout',
530 @command('backout',
531 [('', 'merge', None, _('merge with old dirstate parent after backout')),
531 [('', 'merge', None, _('merge with old dirstate parent after backout')),
532 ('', 'commit', None,
532 ('', 'commit', None,
533 _('commit if no conflicts were encountered (DEPRECATED)')),
533 _('commit if no conflicts were encountered (DEPRECATED)')),
534 ('', 'no-commit', None, _('do not commit')),
534 ('', 'no-commit', None, _('do not commit')),
535 ('', 'parent', '',
535 ('', 'parent', '',
536 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
536 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
537 ('r', 'rev', '', _('revision to backout'), _('REV')),
537 ('r', 'rev', '', _('revision to backout'), _('REV')),
538 ('e', 'edit', False, _('invoke editor on commit messages')),
538 ('e', 'edit', False, _('invoke editor on commit messages')),
539 ] + mergetoolopts + walkopts + commitopts + commitopts2,
539 ] + mergetoolopts + walkopts + commitopts + commitopts2,
540 _('[OPTION]... [-r] REV'),
540 _('[OPTION]... [-r] REV'),
541 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
541 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
542 def backout(ui, repo, node=None, rev=None, **opts):
542 def backout(ui, repo, node=None, rev=None, **opts):
543 '''reverse effect of earlier changeset
543 '''reverse effect of earlier changeset
544
544
545 Prepare a new changeset with the effect of REV undone in the
545 Prepare a new changeset with the effect of REV undone in the
546 current working directory. If no conflicts were encountered,
546 current working directory. If no conflicts were encountered,
547 it will be committed immediately.
547 it will be committed immediately.
548
548
549 If REV is the parent of the working directory, then this new changeset
549 If REV is the parent of the working directory, then this new changeset
550 is committed automatically (unless --no-commit is specified).
550 is committed automatically (unless --no-commit is specified).
551
551
552 .. note::
552 .. note::
553
553
554 :hg:`backout` cannot be used to fix either an unwanted or
554 :hg:`backout` cannot be used to fix either an unwanted or
555 incorrect merge.
555 incorrect merge.
556
556
557 .. container:: verbose
557 .. container:: verbose
558
558
559 Examples:
559 Examples:
560
560
561 - Reverse the effect of the parent of the working directory.
561 - Reverse the effect of the parent of the working directory.
562 This backout will be committed immediately::
562 This backout will be committed immediately::
563
563
564 hg backout -r .
564 hg backout -r .
565
565
566 - Reverse the effect of previous bad revision 23::
566 - Reverse the effect of previous bad revision 23::
567
567
568 hg backout -r 23
568 hg backout -r 23
569
569
570 - Reverse the effect of previous bad revision 23 and
570 - Reverse the effect of previous bad revision 23 and
571 leave changes uncommitted::
571 leave changes uncommitted::
572
572
573 hg backout -r 23 --no-commit
573 hg backout -r 23 --no-commit
574 hg commit -m "Backout revision 23"
574 hg commit -m "Backout revision 23"
575
575
576 By default, the pending changeset will have one parent,
576 By default, the pending changeset will have one parent,
577 maintaining a linear history. With --merge, the pending
577 maintaining a linear history. With --merge, the pending
578 changeset will instead have two parents: the old parent of the
578 changeset will instead have two parents: the old parent of the
579 working directory and a new child of REV that simply undoes REV.
579 working directory and a new child of REV that simply undoes REV.
580
580
581 Before version 1.7, the behavior without --merge was equivalent
581 Before version 1.7, the behavior without --merge was equivalent
582 to specifying --merge followed by :hg:`update --clean .` to
582 to specifying --merge followed by :hg:`update --clean .` to
583 cancel the merge and leave the child of REV as a head to be
583 cancel the merge and leave the child of REV as a head to be
584 merged separately.
584 merged separately.
585
585
586 See :hg:`help dates` for a list of formats valid for -d/--date.
586 See :hg:`help dates` for a list of formats valid for -d/--date.
587
587
588 See :hg:`help revert` for a way to restore files to the state
588 See :hg:`help revert` for a way to restore files to the state
589 of another revision.
589 of another revision.
590
590
591 Returns 0 on success, 1 if nothing to backout or there are unresolved
591 Returns 0 on success, 1 if nothing to backout or there are unresolved
592 files.
592 files.
593 '''
593 '''
594 with repo.wlock(), repo.lock():
594 with repo.wlock(), repo.lock():
595 return _dobackout(ui, repo, node, rev, **opts)
595 return _dobackout(ui, repo, node, rev, **opts)
596
596
597 def _dobackout(ui, repo, node=None, rev=None, **opts):
597 def _dobackout(ui, repo, node=None, rev=None, **opts):
598 opts = pycompat.byteskwargs(opts)
598 opts = pycompat.byteskwargs(opts)
599 if opts.get('commit') and opts.get('no_commit'):
599 if opts.get('commit') and opts.get('no_commit'):
600 raise error.Abort(_("cannot use --commit with --no-commit"))
600 raise error.Abort(_("cannot use --commit with --no-commit"))
601 if opts.get('merge') and opts.get('no_commit'):
601 if opts.get('merge') and opts.get('no_commit'):
602 raise error.Abort(_("cannot use --merge with --no-commit"))
602 raise error.Abort(_("cannot use --merge with --no-commit"))
603
603
604 if rev and node:
604 if rev and node:
605 raise error.Abort(_("please specify just one revision"))
605 raise error.Abort(_("please specify just one revision"))
606
606
607 if not rev:
607 if not rev:
608 rev = node
608 rev = node
609
609
610 if not rev:
610 if not rev:
611 raise error.Abort(_("please specify a revision to backout"))
611 raise error.Abort(_("please specify a revision to backout"))
612
612
613 date = opts.get('date')
613 date = opts.get('date')
614 if date:
614 if date:
615 opts['date'] = dateutil.parsedate(date)
615 opts['date'] = dateutil.parsedate(date)
616
616
617 cmdutil.checkunfinished(repo)
617 cmdutil.checkunfinished(repo)
618 cmdutil.bailifchanged(repo)
618 cmdutil.bailifchanged(repo)
619 node = scmutil.revsingle(repo, rev).node()
619 node = scmutil.revsingle(repo, rev).node()
620
620
621 op1, op2 = repo.dirstate.parents()
621 op1, op2 = repo.dirstate.parents()
622 if not repo.changelog.isancestor(node, op1):
622 if not repo.changelog.isancestor(node, op1):
623 raise error.Abort(_('cannot backout change that is not an ancestor'))
623 raise error.Abort(_('cannot backout change that is not an ancestor'))
624
624
625 p1, p2 = repo.changelog.parents(node)
625 p1, p2 = repo.changelog.parents(node)
626 if p1 == nullid:
626 if p1 == nullid:
627 raise error.Abort(_('cannot backout a change with no parents'))
627 raise error.Abort(_('cannot backout a change with no parents'))
628 if p2 != nullid:
628 if p2 != nullid:
629 if not opts.get('parent'):
629 if not opts.get('parent'):
630 raise error.Abort(_('cannot backout a merge changeset'))
630 raise error.Abort(_('cannot backout a merge changeset'))
631 p = repo.lookup(opts['parent'])
631 p = repo.lookup(opts['parent'])
632 if p not in (p1, p2):
632 if p not in (p1, p2):
633 raise error.Abort(_('%s is not a parent of %s') %
633 raise error.Abort(_('%s is not a parent of %s') %
634 (short(p), short(node)))
634 (short(p), short(node)))
635 parent = p
635 parent = p
636 else:
636 else:
637 if opts.get('parent'):
637 if opts.get('parent'):
638 raise error.Abort(_('cannot use --parent on non-merge changeset'))
638 raise error.Abort(_('cannot use --parent on non-merge changeset'))
639 parent = p1
639 parent = p1
640
640
641 # the backout should appear on the same branch
641 # the backout should appear on the same branch
642 branch = repo.dirstate.branch()
642 branch = repo.dirstate.branch()
643 bheads = repo.branchheads(branch)
643 bheads = repo.branchheads(branch)
644 rctx = scmutil.revsingle(repo, hex(parent))
644 rctx = scmutil.revsingle(repo, hex(parent))
645 if not opts.get('merge') and op1 != node:
645 if not opts.get('merge') and op1 != node:
646 with dirstateguard.dirstateguard(repo, 'backout'):
646 with dirstateguard.dirstateguard(repo, 'backout'):
647 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
647 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
648 with ui.configoverride(overrides, 'backout'):
648 with ui.configoverride(overrides, 'backout'):
649 stats = mergemod.update(repo, parent, branchmerge=True,
649 stats = mergemod.update(repo, parent, branchmerge=True,
650 force=True, ancestor=node,
650 force=True, ancestor=node,
651 mergeancestor=False)
651 mergeancestor=False)
652 repo.setparents(op1, op2)
652 repo.setparents(op1, op2)
653 hg._showstats(repo, stats)
653 hg._showstats(repo, stats)
654 if stats.unresolvedcount:
654 if stats.unresolvedcount:
655 repo.ui.status(_("use 'hg resolve' to retry unresolved "
655 repo.ui.status(_("use 'hg resolve' to retry unresolved "
656 "file merges\n"))
656 "file merges\n"))
657 return 1
657 return 1
658 else:
658 else:
659 hg.clean(repo, node, show_stats=False)
659 hg.clean(repo, node, show_stats=False)
660 repo.dirstate.setbranch(branch)
660 repo.dirstate.setbranch(branch)
661 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
661 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
662
662
663 if opts.get('no_commit'):
663 if opts.get('no_commit'):
664 msg = _("changeset %s backed out, "
664 msg = _("changeset %s backed out, "
665 "don't forget to commit.\n")
665 "don't forget to commit.\n")
666 ui.status(msg % short(node))
666 ui.status(msg % short(node))
667 return 0
667 return 0
668
668
669 def commitfunc(ui, repo, message, match, opts):
669 def commitfunc(ui, repo, message, match, opts):
670 editform = 'backout'
670 editform = 'backout'
671 e = cmdutil.getcommiteditor(editform=editform,
671 e = cmdutil.getcommiteditor(editform=editform,
672 **pycompat.strkwargs(opts))
672 **pycompat.strkwargs(opts))
673 if not message:
673 if not message:
674 # we don't translate commit messages
674 # we don't translate commit messages
675 message = "Backed out changeset %s" % short(node)
675 message = "Backed out changeset %s" % short(node)
676 e = cmdutil.getcommiteditor(edit=True, editform=editform)
676 e = cmdutil.getcommiteditor(edit=True, editform=editform)
677 return repo.commit(message, opts.get('user'), opts.get('date'),
677 return repo.commit(message, opts.get('user'), opts.get('date'),
678 match, editor=e)
678 match, editor=e)
679 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
679 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
680 if not newnode:
680 if not newnode:
681 ui.status(_("nothing changed\n"))
681 ui.status(_("nothing changed\n"))
682 return 1
682 return 1
683 cmdutil.commitstatus(repo, newnode, branch, bheads)
683 cmdutil.commitstatus(repo, newnode, branch, bheads)
684
684
685 def nice(node):
685 def nice(node):
686 return '%d:%s' % (repo.changelog.rev(node), short(node))
686 return '%d:%s' % (repo.changelog.rev(node), short(node))
687 ui.status(_('changeset %s backs out changeset %s\n') %
687 ui.status(_('changeset %s backs out changeset %s\n') %
688 (nice(repo.changelog.tip()), nice(node)))
688 (nice(repo.changelog.tip()), nice(node)))
689 if opts.get('merge') and op1 != node:
689 if opts.get('merge') and op1 != node:
690 hg.clean(repo, op1, show_stats=False)
690 hg.clean(repo, op1, show_stats=False)
691 ui.status(_('merging with changeset %s\n')
691 ui.status(_('merging with changeset %s\n')
692 % nice(repo.changelog.tip()))
692 % nice(repo.changelog.tip()))
693 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
693 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
694 with ui.configoverride(overrides, 'backout'):
694 with ui.configoverride(overrides, 'backout'):
695 return hg.merge(repo, hex(repo.changelog.tip()))
695 return hg.merge(repo, hex(repo.changelog.tip()))
696 return 0
696 return 0
697
697
698 @command('bisect',
698 @command('bisect',
699 [('r', 'reset', False, _('reset bisect state')),
699 [('r', 'reset', False, _('reset bisect state')),
700 ('g', 'good', False, _('mark changeset good')),
700 ('g', 'good', False, _('mark changeset good')),
701 ('b', 'bad', False, _('mark changeset bad')),
701 ('b', 'bad', False, _('mark changeset bad')),
702 ('s', 'skip', False, _('skip testing changeset')),
702 ('s', 'skip', False, _('skip testing changeset')),
703 ('e', 'extend', False, _('extend the bisect range')),
703 ('e', 'extend', False, _('extend the bisect range')),
704 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
704 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
705 ('U', 'noupdate', False, _('do not update to target'))],
705 ('U', 'noupdate', False, _('do not update to target'))],
706 _("[-gbsr] [-U] [-c CMD] [REV]"),
706 _("[-gbsr] [-U] [-c CMD] [REV]"),
707 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
707 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
708 def bisect(ui, repo, rev=None, extra=None, command=None,
708 def bisect(ui, repo, rev=None, extra=None, command=None,
709 reset=None, good=None, bad=None, skip=None, extend=None,
709 reset=None, good=None, bad=None, skip=None, extend=None,
710 noupdate=None):
710 noupdate=None):
711 """subdivision search of changesets
711 """subdivision search of changesets
712
712
713 This command helps to find changesets which introduce problems. To
713 This command helps to find changesets which introduce problems. To
714 use, mark the earliest changeset you know exhibits the problem as
714 use, mark the earliest changeset you know exhibits the problem as
715 bad, then mark the latest changeset which is free from the problem
715 bad, then mark the latest changeset which is free from the problem
716 as good. Bisect will update your working directory to a revision
716 as good. Bisect will update your working directory to a revision
717 for testing (unless the -U/--noupdate option is specified). Once
717 for testing (unless the -U/--noupdate option is specified). Once
718 you have performed tests, mark the working directory as good or
718 you have performed tests, mark the working directory as good or
719 bad, and bisect will either update to another candidate changeset
719 bad, and bisect will either update to another candidate changeset
720 or announce that it has found the bad revision.
720 or announce that it has found the bad revision.
721
721
722 As a shortcut, you can also use the revision argument to mark a
722 As a shortcut, you can also use the revision argument to mark a
723 revision as good or bad without checking it out first.
723 revision as good or bad without checking it out first.
724
724
725 If you supply a command, it will be used for automatic bisection.
725 If you supply a command, it will be used for automatic bisection.
726 The environment variable HG_NODE will contain the ID of the
726 The environment variable HG_NODE will contain the ID of the
727 changeset being tested. The exit status of the command will be
727 changeset being tested. The exit status of the command will be
728 used to mark revisions as good or bad: status 0 means good, 125
728 used to mark revisions as good or bad: status 0 means good, 125
729 means to skip the revision, 127 (command not found) will abort the
729 means to skip the revision, 127 (command not found) will abort the
730 bisection, and any other non-zero exit status means the revision
730 bisection, and any other non-zero exit status means the revision
731 is bad.
731 is bad.
732
732
733 .. container:: verbose
733 .. container:: verbose
734
734
735 Some examples:
735 Some examples:
736
736
737 - start a bisection with known bad revision 34, and good revision 12::
737 - start a bisection with known bad revision 34, and good revision 12::
738
738
739 hg bisect --bad 34
739 hg bisect --bad 34
740 hg bisect --good 12
740 hg bisect --good 12
741
741
742 - advance the current bisection by marking current revision as good or
742 - advance the current bisection by marking current revision as good or
743 bad::
743 bad::
744
744
745 hg bisect --good
745 hg bisect --good
746 hg bisect --bad
746 hg bisect --bad
747
747
748 - mark the current revision, or a known revision, to be skipped (e.g. if
748 - mark the current revision, or a known revision, to be skipped (e.g. if
749 that revision is not usable because of another issue)::
749 that revision is not usable because of another issue)::
750
750
751 hg bisect --skip
751 hg bisect --skip
752 hg bisect --skip 23
752 hg bisect --skip 23
753
753
754 - skip all revisions that do not touch directories ``foo`` or ``bar``::
754 - skip all revisions that do not touch directories ``foo`` or ``bar``::
755
755
756 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
756 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
757
757
758 - forget the current bisection::
758 - forget the current bisection::
759
759
760 hg bisect --reset
760 hg bisect --reset
761
761
762 - use 'make && make tests' to automatically find the first broken
762 - use 'make && make tests' to automatically find the first broken
763 revision::
763 revision::
764
764
765 hg bisect --reset
765 hg bisect --reset
766 hg bisect --bad 34
766 hg bisect --bad 34
767 hg bisect --good 12
767 hg bisect --good 12
768 hg bisect --command "make && make tests"
768 hg bisect --command "make && make tests"
769
769
770 - see all changesets whose states are already known in the current
770 - see all changesets whose states are already known in the current
771 bisection::
771 bisection::
772
772
773 hg log -r "bisect(pruned)"
773 hg log -r "bisect(pruned)"
774
774
775 - see the changeset currently being bisected (especially useful
775 - see the changeset currently being bisected (especially useful
776 if running with -U/--noupdate)::
776 if running with -U/--noupdate)::
777
777
778 hg log -r "bisect(current)"
778 hg log -r "bisect(current)"
779
779
780 - see all changesets that took part in the current bisection::
780 - see all changesets that took part in the current bisection::
781
781
782 hg log -r "bisect(range)"
782 hg log -r "bisect(range)"
783
783
784 - you can even get a nice graph::
784 - you can even get a nice graph::
785
785
786 hg log --graph -r "bisect(range)"
786 hg log --graph -r "bisect(range)"
787
787
788 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
788 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
789
789
790 Returns 0 on success.
790 Returns 0 on success.
791 """
791 """
792 # backward compatibility
792 # backward compatibility
793 if rev in "good bad reset init".split():
793 if rev in "good bad reset init".split():
794 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
794 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
795 cmd, rev, extra = rev, extra, None
795 cmd, rev, extra = rev, extra, None
796 if cmd == "good":
796 if cmd == "good":
797 good = True
797 good = True
798 elif cmd == "bad":
798 elif cmd == "bad":
799 bad = True
799 bad = True
800 else:
800 else:
801 reset = True
801 reset = True
802 elif extra:
802 elif extra:
803 raise error.Abort(_('incompatible arguments'))
803 raise error.Abort(_('incompatible arguments'))
804
804
805 incompatibles = {
805 incompatibles = {
806 '--bad': bad,
806 '--bad': bad,
807 '--command': bool(command),
807 '--command': bool(command),
808 '--extend': extend,
808 '--extend': extend,
809 '--good': good,
809 '--good': good,
810 '--reset': reset,
810 '--reset': reset,
811 '--skip': skip,
811 '--skip': skip,
812 }
812 }
813
813
814 enabled = [x for x in incompatibles if incompatibles[x]]
814 enabled = [x for x in incompatibles if incompatibles[x]]
815
815
816 if len(enabled) > 1:
816 if len(enabled) > 1:
817 raise error.Abort(_('%s and %s are incompatible') %
817 raise error.Abort(_('%s and %s are incompatible') %
818 tuple(sorted(enabled)[0:2]))
818 tuple(sorted(enabled)[0:2]))
819
819
820 if reset:
820 if reset:
821 hbisect.resetstate(repo)
821 hbisect.resetstate(repo)
822 return
822 return
823
823
824 state = hbisect.load_state(repo)
824 state = hbisect.load_state(repo)
825
825
826 # update state
826 # update state
827 if good or bad or skip:
827 if good or bad or skip:
828 if rev:
828 if rev:
829 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
829 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
830 else:
830 else:
831 nodes = [repo.lookup('.')]
831 nodes = [repo.lookup('.')]
832 if good:
832 if good:
833 state['good'] += nodes
833 state['good'] += nodes
834 elif bad:
834 elif bad:
835 state['bad'] += nodes
835 state['bad'] += nodes
836 elif skip:
836 elif skip:
837 state['skip'] += nodes
837 state['skip'] += nodes
838 hbisect.save_state(repo, state)
838 hbisect.save_state(repo, state)
839 if not (state['good'] and state['bad']):
839 if not (state['good'] and state['bad']):
840 return
840 return
841
841
842 def mayupdate(repo, node, show_stats=True):
842 def mayupdate(repo, node, show_stats=True):
843 """common used update sequence"""
843 """common used update sequence"""
844 if noupdate:
844 if noupdate:
845 return
845 return
846 cmdutil.checkunfinished(repo)
846 cmdutil.checkunfinished(repo)
847 cmdutil.bailifchanged(repo)
847 cmdutil.bailifchanged(repo)
848 return hg.clean(repo, node, show_stats=show_stats)
848 return hg.clean(repo, node, show_stats=show_stats)
849
849
850 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
850 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
851
851
852 if command:
852 if command:
853 changesets = 1
853 changesets = 1
854 if noupdate:
854 if noupdate:
855 try:
855 try:
856 node = state['current'][0]
856 node = state['current'][0]
857 except LookupError:
857 except LookupError:
858 raise error.Abort(_('current bisect revision is unknown - '
858 raise error.Abort(_('current bisect revision is unknown - '
859 'start a new bisect to fix'))
859 'start a new bisect to fix'))
860 else:
860 else:
861 node, p2 = repo.dirstate.parents()
861 node, p2 = repo.dirstate.parents()
862 if p2 != nullid:
862 if p2 != nullid:
863 raise error.Abort(_('current bisect revision is a merge'))
863 raise error.Abort(_('current bisect revision is a merge'))
864 if rev:
864 if rev:
865 node = repo[scmutil.revsingle(repo, rev, node)].node()
865 node = repo[scmutil.revsingle(repo, rev, node)].node()
866 try:
866 try:
867 while changesets:
867 while changesets:
868 # update state
868 # update state
869 state['current'] = [node]
869 state['current'] = [node]
870 hbisect.save_state(repo, state)
870 hbisect.save_state(repo, state)
871 status = ui.system(command, environ={'HG_NODE': hex(node)},
871 status = ui.system(command, environ={'HG_NODE': hex(node)},
872 blockedtag='bisect_check')
872 blockedtag='bisect_check')
873 if status == 125:
873 if status == 125:
874 transition = "skip"
874 transition = "skip"
875 elif status == 0:
875 elif status == 0:
876 transition = "good"
876 transition = "good"
877 # status < 0 means process was killed
877 # status < 0 means process was killed
878 elif status == 127:
878 elif status == 127:
879 raise error.Abort(_("failed to execute %s") % command)
879 raise error.Abort(_("failed to execute %s") % command)
880 elif status < 0:
880 elif status < 0:
881 raise error.Abort(_("%s killed") % command)
881 raise error.Abort(_("%s killed") % command)
882 else:
882 else:
883 transition = "bad"
883 transition = "bad"
884 state[transition].append(node)
884 state[transition].append(node)
885 ctx = repo[node]
885 ctx = repo[node]
886 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
886 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
887 transition))
887 transition))
888 hbisect.checkstate(state)
888 hbisect.checkstate(state)
889 # bisect
889 # bisect
890 nodes, changesets, bgood = hbisect.bisect(repo, state)
890 nodes, changesets, bgood = hbisect.bisect(repo, state)
891 # update to next check
891 # update to next check
892 node = nodes[0]
892 node = nodes[0]
893 mayupdate(repo, node, show_stats=False)
893 mayupdate(repo, node, show_stats=False)
894 finally:
894 finally:
895 state['current'] = [node]
895 state['current'] = [node]
896 hbisect.save_state(repo, state)
896 hbisect.save_state(repo, state)
897 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
897 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
898 return
898 return
899
899
900 hbisect.checkstate(state)
900 hbisect.checkstate(state)
901
901
902 # actually bisect
902 # actually bisect
903 nodes, changesets, good = hbisect.bisect(repo, state)
903 nodes, changesets, good = hbisect.bisect(repo, state)
904 if extend:
904 if extend:
905 if not changesets:
905 if not changesets:
906 extendnode = hbisect.extendrange(repo, state, nodes, good)
906 extendnode = hbisect.extendrange(repo, state, nodes, good)
907 if extendnode is not None:
907 if extendnode is not None:
908 ui.write(_("Extending search to changeset %d:%s\n")
908 ui.write(_("Extending search to changeset %d:%s\n")
909 % (extendnode.rev(), extendnode))
909 % (extendnode.rev(), extendnode))
910 state['current'] = [extendnode.node()]
910 state['current'] = [extendnode.node()]
911 hbisect.save_state(repo, state)
911 hbisect.save_state(repo, state)
912 return mayupdate(repo, extendnode.node())
912 return mayupdate(repo, extendnode.node())
913 raise error.Abort(_("nothing to extend"))
913 raise error.Abort(_("nothing to extend"))
914
914
915 if changesets == 0:
915 if changesets == 0:
916 hbisect.printresult(ui, repo, state, displayer, nodes, good)
916 hbisect.printresult(ui, repo, state, displayer, nodes, good)
917 else:
917 else:
918 assert len(nodes) == 1 # only a single node can be tested next
918 assert len(nodes) == 1 # only a single node can be tested next
919 node = nodes[0]
919 node = nodes[0]
920 # compute the approximate number of remaining tests
920 # compute the approximate number of remaining tests
921 tests, size = 0, 2
921 tests, size = 0, 2
922 while size <= changesets:
922 while size <= changesets:
923 tests, size = tests + 1, size * 2
923 tests, size = tests + 1, size * 2
924 rev = repo.changelog.rev(node)
924 rev = repo.changelog.rev(node)
925 ui.write(_("Testing changeset %d:%s "
925 ui.write(_("Testing changeset %d:%s "
926 "(%d changesets remaining, ~%d tests)\n")
926 "(%d changesets remaining, ~%d tests)\n")
927 % (rev, short(node), changesets, tests))
927 % (rev, short(node), changesets, tests))
928 state['current'] = [node]
928 state['current'] = [node]
929 hbisect.save_state(repo, state)
929 hbisect.save_state(repo, state)
930 return mayupdate(repo, node)
930 return mayupdate(repo, node)
931
931
932 @command('bookmarks|bookmark',
932 @command('bookmarks|bookmark',
933 [('f', 'force', False, _('force')),
933 [('f', 'force', False, _('force')),
934 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
934 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
935 ('d', 'delete', False, _('delete a given bookmark')),
935 ('d', 'delete', False, _('delete a given bookmark')),
936 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
936 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
937 ('i', 'inactive', False, _('mark a bookmark inactive')),
937 ('i', 'inactive', False, _('mark a bookmark inactive')),
938 ('l', 'list', False, _('list existing bookmarks')),
938 ('l', 'list', False, _('list existing bookmarks')),
939 ] + formatteropts,
939 ] + formatteropts,
940 _('hg bookmarks [OPTIONS]... [NAME]...'),
940 _('hg bookmarks [OPTIONS]... [NAME]...'),
941 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
941 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
942 def bookmark(ui, repo, *names, **opts):
942 def bookmark(ui, repo, *names, **opts):
943 '''create a new bookmark or list existing bookmarks
943 '''create a new bookmark or list existing bookmarks
944
944
945 Bookmarks are labels on changesets to help track lines of development.
945 Bookmarks are labels on changesets to help track lines of development.
946 Bookmarks are unversioned and can be moved, renamed and deleted.
946 Bookmarks are unversioned and can be moved, renamed and deleted.
947 Deleting or moving a bookmark has no effect on the associated changesets.
947 Deleting or moving a bookmark has no effect on the associated changesets.
948
948
949 Creating or updating to a bookmark causes it to be marked as 'active'.
949 Creating or updating to a bookmark causes it to be marked as 'active'.
950 The active bookmark is indicated with a '*'.
950 The active bookmark is indicated with a '*'.
951 When a commit is made, the active bookmark will advance to the new commit.
951 When a commit is made, the active bookmark will advance to the new commit.
952 A plain :hg:`update` will also advance an active bookmark, if possible.
952 A plain :hg:`update` will also advance an active bookmark, if possible.
953 Updating away from a bookmark will cause it to be deactivated.
953 Updating away from a bookmark will cause it to be deactivated.
954
954
955 Bookmarks can be pushed and pulled between repositories (see
955 Bookmarks can be pushed and pulled between repositories (see
956 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
956 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
957 diverged, a new 'divergent bookmark' of the form 'name@path' will
957 diverged, a new 'divergent bookmark' of the form 'name@path' will
958 be created. Using :hg:`merge` will resolve the divergence.
958 be created. Using :hg:`merge` will resolve the divergence.
959
959
960 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
960 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
961 the active bookmark's name.
961 the active bookmark's name.
962
962
963 A bookmark named '@' has the special property that :hg:`clone` will
963 A bookmark named '@' has the special property that :hg:`clone` will
964 check it out by default if it exists.
964 check it out by default if it exists.
965
965
966 .. container:: verbose
966 .. container:: verbose
967
967
968 Template:
968 Template:
969
969
970 The following keywords are supported in addition to the common template
970 The following keywords are supported in addition to the common template
971 keywords and functions such as ``{bookmark}``. See also
971 keywords and functions such as ``{bookmark}``. See also
972 :hg:`help templates`.
972 :hg:`help templates`.
973
973
974 :active: Boolean. True if the bookmark is active.
974 :active: Boolean. True if the bookmark is active.
975
975
976 Examples:
976 Examples:
977
977
978 - create an active bookmark for a new line of development::
978 - create an active bookmark for a new line of development::
979
979
980 hg book new-feature
980 hg book new-feature
981
981
982 - create an inactive bookmark as a place marker::
982 - create an inactive bookmark as a place marker::
983
983
984 hg book -i reviewed
984 hg book -i reviewed
985
985
986 - create an inactive bookmark on another changeset::
986 - create an inactive bookmark on another changeset::
987
987
988 hg book -r .^ tested
988 hg book -r .^ tested
989
989
990 - rename bookmark turkey to dinner::
990 - rename bookmark turkey to dinner::
991
991
992 hg book -m turkey dinner
992 hg book -m turkey dinner
993
993
994 - move the '@' bookmark from another branch::
994 - move the '@' bookmark from another branch::
995
995
996 hg book -f @
996 hg book -f @
997
997
998 - print only the active bookmark name::
998 - print only the active bookmark name::
999
999
1000 hg book -ql .
1000 hg book -ql .
1001 '''
1001 '''
1002 opts = pycompat.byteskwargs(opts)
1002 opts = pycompat.byteskwargs(opts)
1003 force = opts.get('force')
1003 force = opts.get('force')
1004 rev = opts.get('rev')
1004 rev = opts.get('rev')
1005 inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
1005 inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
1006
1006
1007 selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
1007 selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
1008 if len(selactions) > 1:
1008 if len(selactions) > 1:
1009 raise error.Abort(_('--%s and --%s are incompatible')
1009 raise error.Abort(_('--%s and --%s are incompatible')
1010 % tuple(selactions[:2]))
1010 % tuple(selactions[:2]))
1011 if selactions:
1011 if selactions:
1012 action = selactions[0]
1012 action = selactions[0]
1013 elif names or rev:
1013 elif names or rev:
1014 action = 'add'
1014 action = 'add'
1015 elif inactive:
1015 elif inactive:
1016 action = 'inactive' # meaning deactivate
1016 action = 'inactive' # meaning deactivate
1017 else:
1017 else:
1018 action = 'list'
1018 action = 'list'
1019
1019
1020 if rev and action in {'delete', 'rename', 'list'}:
1020 if rev and action in {'delete', 'rename', 'list'}:
1021 raise error.Abort(_("--rev is incompatible with --%s") % action)
1021 raise error.Abort(_("--rev is incompatible with --%s") % action)
1022 if inactive and action in {'delete', 'list'}:
1022 if inactive and action in {'delete', 'list'}:
1023 raise error.Abort(_("--inactive is incompatible with --%s") % action)
1023 raise error.Abort(_("--inactive is incompatible with --%s") % action)
1024 if not names and action in {'add', 'delete'}:
1024 if not names and action in {'add', 'delete'}:
1025 raise error.Abort(_("bookmark name required"))
1025 raise error.Abort(_("bookmark name required"))
1026
1026
1027 if action in {'add', 'delete', 'rename', 'inactive'}:
1027 if action in {'add', 'delete', 'rename', 'inactive'}:
1028 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
1028 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
1029 if action == 'delete':
1029 if action == 'delete':
1030 names = pycompat.maplist(repo._bookmarks.expandname, names)
1030 names = pycompat.maplist(repo._bookmarks.expandname, names)
1031 bookmarks.delete(repo, tr, names)
1031 bookmarks.delete(repo, tr, names)
1032 elif action == 'rename':
1032 elif action == 'rename':
1033 if not names:
1033 if not names:
1034 raise error.Abort(_("new bookmark name required"))
1034 raise error.Abort(_("new bookmark name required"))
1035 elif len(names) > 1:
1035 elif len(names) > 1:
1036 raise error.Abort(_("only one new bookmark name allowed"))
1036 raise error.Abort(_("only one new bookmark name allowed"))
1037 oldname = repo._bookmarks.expandname(opts['rename'])
1037 oldname = repo._bookmarks.expandname(opts['rename'])
1038 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1038 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1039 elif action == 'add':
1039 elif action == 'add':
1040 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1040 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1041 elif action == 'inactive':
1041 elif action == 'inactive':
1042 if len(repo._bookmarks) == 0:
1042 if len(repo._bookmarks) == 0:
1043 ui.status(_("no bookmarks set\n"))
1043 ui.status(_("no bookmarks set\n"))
1044 elif not repo._activebookmark:
1044 elif not repo._activebookmark:
1045 ui.status(_("no active bookmark\n"))
1045 ui.status(_("no active bookmark\n"))
1046 else:
1046 else:
1047 bookmarks.deactivate(repo)
1047 bookmarks.deactivate(repo)
1048 elif action == 'list':
1048 elif action == 'list':
1049 names = pycompat.maplist(repo._bookmarks.expandname, names)
1049 names = pycompat.maplist(repo._bookmarks.expandname, names)
1050 with ui.formatter('bookmarks', opts) as fm:
1050 with ui.formatter('bookmarks', opts) as fm:
1051 bookmarks.printbookmarks(ui, repo, fm, names)
1051 bookmarks.printbookmarks(ui, repo, fm, names)
1052 else:
1052 else:
1053 raise error.ProgrammingError('invalid action: %s' % action)
1053 raise error.ProgrammingError('invalid action: %s' % action)
1054
1054
1055 @command('branch',
1055 @command('branch',
1056 [('f', 'force', None,
1056 [('f', 'force', None,
1057 _('set branch name even if it shadows an existing branch')),
1057 _('set branch name even if it shadows an existing branch')),
1058 ('C', 'clean', None, _('reset branch name to parent branch name')),
1058 ('C', 'clean', None, _('reset branch name to parent branch name')),
1059 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1059 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1060 ],
1060 ],
1061 _('[-fC] [NAME]'),
1061 _('[-fC] [NAME]'),
1062 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
1062 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
1063 def branch(ui, repo, label=None, **opts):
1063 def branch(ui, repo, label=None, **opts):
1064 """set or show the current branch name
1064 """set or show the current branch name
1065
1065
1066 .. note::
1066 .. note::
1067
1067
1068 Branch names are permanent and global. Use :hg:`bookmark` to create a
1068 Branch names are permanent and global. Use :hg:`bookmark` to create a
1069 light-weight bookmark instead. See :hg:`help glossary` for more
1069 light-weight bookmark instead. See :hg:`help glossary` for more
1070 information about named branches and bookmarks.
1070 information about named branches and bookmarks.
1071
1071
1072 With no argument, show the current branch name. With one argument,
1072 With no argument, show the current branch name. With one argument,
1073 set the working directory branch name (the branch will not exist
1073 set the working directory branch name (the branch will not exist
1074 in the repository until the next commit). Standard practice
1074 in the repository until the next commit). Standard practice
1075 recommends that primary development take place on the 'default'
1075 recommends that primary development take place on the 'default'
1076 branch.
1076 branch.
1077
1077
1078 Unless -f/--force is specified, branch will not let you set a
1078 Unless -f/--force is specified, branch will not let you set a
1079 branch name that already exists.
1079 branch name that already exists.
1080
1080
1081 Use -C/--clean to reset the working directory branch to that of
1081 Use -C/--clean to reset the working directory branch to that of
1082 the parent of the working directory, negating a previous branch
1082 the parent of the working directory, negating a previous branch
1083 change.
1083 change.
1084
1084
1085 Use the command :hg:`update` to switch to an existing branch. Use
1085 Use the command :hg:`update` to switch to an existing branch. Use
1086 :hg:`commit --close-branch` to mark this branch head as closed.
1086 :hg:`commit --close-branch` to mark this branch head as closed.
1087 When all heads of a branch are closed, the branch will be
1087 When all heads of a branch are closed, the branch will be
1088 considered closed.
1088 considered closed.
1089
1089
1090 Returns 0 on success.
1090 Returns 0 on success.
1091 """
1091 """
1092 opts = pycompat.byteskwargs(opts)
1092 opts = pycompat.byteskwargs(opts)
1093 revs = opts.get('rev')
1093 revs = opts.get('rev')
1094 if label:
1094 if label:
1095 label = label.strip()
1095 label = label.strip()
1096
1096
1097 if not opts.get('clean') and not label:
1097 if not opts.get('clean') and not label:
1098 if revs:
1098 if revs:
1099 raise error.Abort(_("no branch name specified for the revisions"))
1099 raise error.Abort(_("no branch name specified for the revisions"))
1100 ui.write("%s\n" % repo.dirstate.branch())
1100 ui.write("%s\n" % repo.dirstate.branch())
1101 return
1101 return
1102
1102
1103 with repo.wlock():
1103 with repo.wlock():
1104 if opts.get('clean'):
1104 if opts.get('clean'):
1105 label = repo[None].p1().branch()
1105 label = repo[None].p1().branch()
1106 repo.dirstate.setbranch(label)
1106 repo.dirstate.setbranch(label)
1107 ui.status(_('reset working directory to branch %s\n') % label)
1107 ui.status(_('reset working directory to branch %s\n') % label)
1108 elif label:
1108 elif label:
1109
1109
1110 scmutil.checknewlabel(repo, label, 'branch')
1110 scmutil.checknewlabel(repo, label, 'branch')
1111 if revs:
1111 if revs:
1112 return cmdutil.changebranch(ui, repo, revs, label)
1112 return cmdutil.changebranch(ui, repo, revs, label)
1113
1113
1114 if not opts.get('force') and label in repo.branchmap():
1114 if not opts.get('force') and label in repo.branchmap():
1115 if label not in [p.branch() for p in repo[None].parents()]:
1115 if label not in [p.branch() for p in repo[None].parents()]:
1116 raise error.Abort(_('a branch of the same name already'
1116 raise error.Abort(_('a branch of the same name already'
1117 ' exists'),
1117 ' exists'),
1118 # i18n: "it" refers to an existing branch
1118 # i18n: "it" refers to an existing branch
1119 hint=_("use 'hg update' to switch to it"))
1119 hint=_("use 'hg update' to switch to it"))
1120
1120
1121 repo.dirstate.setbranch(label)
1121 repo.dirstate.setbranch(label)
1122 ui.status(_('marked working directory as branch %s\n') % label)
1122 ui.status(_('marked working directory as branch %s\n') % label)
1123
1123
1124 # find any open named branches aside from default
1124 # find any open named branches aside from default
1125 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1125 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1126 if n != "default" and not c]
1126 if n != "default" and not c]
1127 if not others:
1127 if not others:
1128 ui.status(_('(branches are permanent and global, '
1128 ui.status(_('(branches are permanent and global, '
1129 'did you want a bookmark?)\n'))
1129 'did you want a bookmark?)\n'))
1130
1130
1131 @command('branches',
1131 @command('branches',
1132 [('a', 'active', False,
1132 [('a', 'active', False,
1133 _('show only branches that have unmerged heads (DEPRECATED)')),
1133 _('show only branches that have unmerged heads (DEPRECATED)')),
1134 ('c', 'closed', False, _('show normal and closed branches')),
1134 ('c', 'closed', False, _('show normal and closed branches')),
1135 ('r', 'rev', [], _('show branch name(s) of the given rev'))
1135 ('r', 'rev', [], _('show branch name(s) of the given rev'))
1136 ] + formatteropts,
1136 ] + formatteropts,
1137 _('[-c]'),
1137 _('[-c]'),
1138 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1138 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1139 intents={INTENT_READONLY})
1139 intents={INTENT_READONLY})
1140 def branches(ui, repo, active=False, closed=False, **opts):
1140 def branches(ui, repo, active=False, closed=False, **opts):
1141 """list repository named branches
1141 """list repository named branches
1142
1142
1143 List the repository's named branches, indicating which ones are
1143 List the repository's named branches, indicating which ones are
1144 inactive. If -c/--closed is specified, also list branches which have
1144 inactive. If -c/--closed is specified, also list branches which have
1145 been marked closed (see :hg:`commit --close-branch`).
1145 been marked closed (see :hg:`commit --close-branch`).
1146
1146
1147 Use the command :hg:`update` to switch to an existing branch.
1147 Use the command :hg:`update` to switch to an existing branch.
1148
1148
1149 .. container:: verbose
1149 .. container:: verbose
1150
1150
1151 Template:
1151 Template:
1152
1152
1153 The following keywords are supported in addition to the common template
1153 The following keywords are supported in addition to the common template
1154 keywords and functions such as ``{branch}``. See also
1154 keywords and functions such as ``{branch}``. See also
1155 :hg:`help templates`.
1155 :hg:`help templates`.
1156
1156
1157 :active: Boolean. True if the branch is active.
1157 :active: Boolean. True if the branch is active.
1158 :closed: Boolean. True if the branch is closed.
1158 :closed: Boolean. True if the branch is closed.
1159 :current: Boolean. True if it is the current branch.
1159 :current: Boolean. True if it is the current branch.
1160
1160
1161 Returns 0.
1161 Returns 0.
1162 """
1162 """
1163
1163
1164 opts = pycompat.byteskwargs(opts)
1164 opts = pycompat.byteskwargs(opts)
1165 revs = opts.get('rev')
1165 revs = opts.get('rev')
1166 selectedbranches = None
1166 selectedbranches = None
1167 if revs:
1167 if revs:
1168 revs = scmutil.revrange(repo, revs)
1168 revs = scmutil.revrange(repo, revs)
1169 getbi = repo.revbranchcache().branchinfo
1169 getbi = repo.revbranchcache().branchinfo
1170 selectedbranches = {getbi(r)[0] for r in revs}
1170 selectedbranches = {getbi(r)[0] for r in revs}
1171
1171
1172 ui.pager('branches')
1172 ui.pager('branches')
1173 fm = ui.formatter('branches', opts)
1173 fm = ui.formatter('branches', opts)
1174 hexfunc = fm.hexfunc
1174 hexfunc = fm.hexfunc
1175
1175
1176 allheads = set(repo.heads())
1176 allheads = set(repo.heads())
1177 branches = []
1177 branches = []
1178 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1178 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1179 if selectedbranches is not None and tag not in selectedbranches:
1179 if selectedbranches is not None and tag not in selectedbranches:
1180 continue
1180 continue
1181 isactive = False
1181 isactive = False
1182 if not isclosed:
1182 if not isclosed:
1183 openheads = set(repo.branchmap().iteropen(heads))
1183 openheads = set(repo.branchmap().iteropen(heads))
1184 isactive = bool(openheads & allheads)
1184 isactive = bool(openheads & allheads)
1185 branches.append((tag, repo[tip], isactive, not isclosed))
1185 branches.append((tag, repo[tip], isactive, not isclosed))
1186 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1186 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1187 reverse=True)
1187 reverse=True)
1188
1188
1189 for tag, ctx, isactive, isopen in branches:
1189 for tag, ctx, isactive, isopen in branches:
1190 if active and not isactive:
1190 if active and not isactive:
1191 continue
1191 continue
1192 if isactive:
1192 if isactive:
1193 label = 'branches.active'
1193 label = 'branches.active'
1194 notice = ''
1194 notice = ''
1195 elif not isopen:
1195 elif not isopen:
1196 if not closed:
1196 if not closed:
1197 continue
1197 continue
1198 label = 'branches.closed'
1198 label = 'branches.closed'
1199 notice = _(' (closed)')
1199 notice = _(' (closed)')
1200 else:
1200 else:
1201 label = 'branches.inactive'
1201 label = 'branches.inactive'
1202 notice = _(' (inactive)')
1202 notice = _(' (inactive)')
1203 current = (tag == repo.dirstate.branch())
1203 current = (tag == repo.dirstate.branch())
1204 if current:
1204 if current:
1205 label = 'branches.current'
1205 label = 'branches.current'
1206
1206
1207 fm.startitem()
1207 fm.startitem()
1208 fm.write('branch', '%s', tag, label=label)
1208 fm.write('branch', '%s', tag, label=label)
1209 rev = ctx.rev()
1209 rev = ctx.rev()
1210 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1210 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1211 fmt = ' ' * padsize + ' %d:%s'
1211 fmt = ' ' * padsize + ' %d:%s'
1212 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1212 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1213 label='log.changeset changeset.%s' % ctx.phasestr())
1213 label='log.changeset changeset.%s' % ctx.phasestr())
1214 fm.context(ctx=ctx)
1214 fm.context(ctx=ctx)
1215 fm.data(active=isactive, closed=not isopen, current=current)
1215 fm.data(active=isactive, closed=not isopen, current=current)
1216 if not ui.quiet:
1216 if not ui.quiet:
1217 fm.plain(notice)
1217 fm.plain(notice)
1218 fm.plain('\n')
1218 fm.plain('\n')
1219 fm.end()
1219 fm.end()
1220
1220
1221 @command('bundle',
1221 @command('bundle',
1222 [('f', 'force', None, _('run even when the destination is unrelated')),
1222 [('f', 'force', None, _('run even when the destination is unrelated')),
1223 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1223 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1224 _('REV')),
1224 _('REV')),
1225 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1225 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1226 _('BRANCH')),
1226 _('BRANCH')),
1227 ('', 'base', [],
1227 ('', 'base', [],
1228 _('a base changeset assumed to be available at the destination'),
1228 _('a base changeset assumed to be available at the destination'),
1229 _('REV')),
1229 _('REV')),
1230 ('a', 'all', None, _('bundle all changesets in the repository')),
1230 ('a', 'all', None, _('bundle all changesets in the repository')),
1231 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1231 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1232 ] + remoteopts,
1232 ] + remoteopts,
1233 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1233 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1234 helpcategory=command.CATEGORY_IMPORT_EXPORT)
1234 helpcategory=command.CATEGORY_IMPORT_EXPORT)
1235 def bundle(ui, repo, fname, dest=None, **opts):
1235 def bundle(ui, repo, fname, dest=None, **opts):
1236 """create a bundle file
1236 """create a bundle file
1237
1237
1238 Generate a bundle file containing data to be transferred to another
1238 Generate a bundle file containing data to be transferred to another
1239 repository.
1239 repository.
1240
1240
1241 To create a bundle containing all changesets, use -a/--all
1241 To create a bundle containing all changesets, use -a/--all
1242 (or --base null). Otherwise, hg assumes the destination will have
1242 (or --base null). Otherwise, hg assumes the destination will have
1243 all the nodes you specify with --base parameters. Otherwise, hg
1243 all the nodes you specify with --base parameters. Otherwise, hg
1244 will assume the repository has all the nodes in destination, or
1244 will assume the repository has all the nodes in destination, or
1245 default-push/default if no destination is specified, where destination
1245 default-push/default if no destination is specified, where destination
1246 is the repository you provide through DEST option.
1246 is the repository you provide through DEST option.
1247
1247
1248 You can change bundle format with the -t/--type option. See
1248 You can change bundle format with the -t/--type option. See
1249 :hg:`help bundlespec` for documentation on this format. By default,
1249 :hg:`help bundlespec` for documentation on this format. By default,
1250 the most appropriate format is used and compression defaults to
1250 the most appropriate format is used and compression defaults to
1251 bzip2.
1251 bzip2.
1252
1252
1253 The bundle file can then be transferred using conventional means
1253 The bundle file can then be transferred using conventional means
1254 and applied to another repository with the unbundle or pull
1254 and applied to another repository with the unbundle or pull
1255 command. This is useful when direct push and pull are not
1255 command. This is useful when direct push and pull are not
1256 available or when exporting an entire repository is undesirable.
1256 available or when exporting an entire repository is undesirable.
1257
1257
1258 Applying bundles preserves all changeset contents including
1258 Applying bundles preserves all changeset contents including
1259 permissions, copy/rename information, and revision history.
1259 permissions, copy/rename information, and revision history.
1260
1260
1261 Returns 0 on success, 1 if no changes found.
1261 Returns 0 on success, 1 if no changes found.
1262 """
1262 """
1263 opts = pycompat.byteskwargs(opts)
1263 opts = pycompat.byteskwargs(opts)
1264 revs = None
1264 revs = None
1265 if 'rev' in opts:
1265 if 'rev' in opts:
1266 revstrings = opts['rev']
1266 revstrings = opts['rev']
1267 revs = scmutil.revrange(repo, revstrings)
1267 revs = scmutil.revrange(repo, revstrings)
1268 if revstrings and not revs:
1268 if revstrings and not revs:
1269 raise error.Abort(_('no commits to bundle'))
1269 raise error.Abort(_('no commits to bundle'))
1270
1270
1271 bundletype = opts.get('type', 'bzip2').lower()
1271 bundletype = opts.get('type', 'bzip2').lower()
1272 try:
1272 try:
1273 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1273 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1274 except error.UnsupportedBundleSpecification as e:
1274 except error.UnsupportedBundleSpecification as e:
1275 raise error.Abort(pycompat.bytestr(e),
1275 raise error.Abort(pycompat.bytestr(e),
1276 hint=_("see 'hg help bundlespec' for supported "
1276 hint=_("see 'hg help bundlespec' for supported "
1277 "values for --type"))
1277 "values for --type"))
1278 cgversion = bundlespec.contentopts["cg.version"]
1278 cgversion = bundlespec.contentopts["cg.version"]
1279
1279
1280 # Packed bundles are a pseudo bundle format for now.
1280 # Packed bundles are a pseudo bundle format for now.
1281 if cgversion == 's1':
1281 if cgversion == 's1':
1282 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1282 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1283 hint=_("use 'hg debugcreatestreamclonebundle'"))
1283 hint=_("use 'hg debugcreatestreamclonebundle'"))
1284
1284
1285 if opts.get('all'):
1285 if opts.get('all'):
1286 if dest:
1286 if dest:
1287 raise error.Abort(_("--all is incompatible with specifying "
1287 raise error.Abort(_("--all is incompatible with specifying "
1288 "a destination"))
1288 "a destination"))
1289 if opts.get('base'):
1289 if opts.get('base'):
1290 ui.warn(_("ignoring --base because --all was specified\n"))
1290 ui.warn(_("ignoring --base because --all was specified\n"))
1291 base = [nullrev]
1291 base = [nullrev]
1292 else:
1292 else:
1293 base = scmutil.revrange(repo, opts.get('base'))
1293 base = scmutil.revrange(repo, opts.get('base'))
1294 if cgversion not in changegroup.supportedoutgoingversions(repo):
1294 if cgversion not in changegroup.supportedoutgoingversions(repo):
1295 raise error.Abort(_("repository does not support bundle version %s") %
1295 raise error.Abort(_("repository does not support bundle version %s") %
1296 cgversion)
1296 cgversion)
1297
1297
1298 if base:
1298 if base:
1299 if dest:
1299 if dest:
1300 raise error.Abort(_("--base is incompatible with specifying "
1300 raise error.Abort(_("--base is incompatible with specifying "
1301 "a destination"))
1301 "a destination"))
1302 common = [repo[rev].node() for rev in base]
1302 common = [repo[rev].node() for rev in base]
1303 heads = [repo[r].node() for r in revs] if revs else None
1303 heads = [repo[r].node() for r in revs] if revs else None
1304 outgoing = discovery.outgoing(repo, common, heads)
1304 outgoing = discovery.outgoing(repo, common, heads)
1305 else:
1305 else:
1306 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1306 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1307 dest, branches = hg.parseurl(dest, opts.get('branch'))
1307 dest, branches = hg.parseurl(dest, opts.get('branch'))
1308 other = hg.peer(repo, opts, dest)
1308 other = hg.peer(repo, opts, dest)
1309 revs = [repo[r].hex() for r in revs]
1309 revs = [repo[r].hex() for r in revs]
1310 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1310 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1311 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1311 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1312 outgoing = discovery.findcommonoutgoing(repo, other,
1312 outgoing = discovery.findcommonoutgoing(repo, other,
1313 onlyheads=heads,
1313 onlyheads=heads,
1314 force=opts.get('force'),
1314 force=opts.get('force'),
1315 portable=True)
1315 portable=True)
1316
1316
1317 if not outgoing.missing:
1317 if not outgoing.missing:
1318 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1318 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1319 return 1
1319 return 1
1320
1320
1321 if cgversion == '01': #bundle1
1321 if cgversion == '01': #bundle1
1322 bversion = 'HG10' + bundlespec.wirecompression
1322 bversion = 'HG10' + bundlespec.wirecompression
1323 bcompression = None
1323 bcompression = None
1324 elif cgversion in ('02', '03'):
1324 elif cgversion in ('02', '03'):
1325 bversion = 'HG20'
1325 bversion = 'HG20'
1326 bcompression = bundlespec.wirecompression
1326 bcompression = bundlespec.wirecompression
1327 else:
1327 else:
1328 raise error.ProgrammingError(
1328 raise error.ProgrammingError(
1329 'bundle: unexpected changegroup version %s' % cgversion)
1329 'bundle: unexpected changegroup version %s' % cgversion)
1330
1330
1331 # TODO compression options should be derived from bundlespec parsing.
1331 # TODO compression options should be derived from bundlespec parsing.
1332 # This is a temporary hack to allow adjusting bundle compression
1332 # This is a temporary hack to allow adjusting bundle compression
1333 # level without a) formalizing the bundlespec changes to declare it
1333 # level without a) formalizing the bundlespec changes to declare it
1334 # b) introducing a command flag.
1334 # b) introducing a command flag.
1335 compopts = {}
1335 compopts = {}
1336 complevel = ui.configint('experimental',
1336 complevel = ui.configint('experimental',
1337 'bundlecomplevel.' + bundlespec.compression)
1337 'bundlecomplevel.' + bundlespec.compression)
1338 if complevel is None:
1338 if complevel is None:
1339 complevel = ui.configint('experimental', 'bundlecomplevel')
1339 complevel = ui.configint('experimental', 'bundlecomplevel')
1340 if complevel is not None:
1340 if complevel is not None:
1341 compopts['level'] = complevel
1341 compopts['level'] = complevel
1342
1342
1343 # Allow overriding the bundling of obsmarker in phases through
1343 # Allow overriding the bundling of obsmarker in phases through
1344 # configuration while we don't have a bundle version that include them
1344 # configuration while we don't have a bundle version that include them
1345 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1345 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1346 bundlespec.contentopts['obsolescence'] = True
1346 bundlespec.contentopts['obsolescence'] = True
1347 if repo.ui.configbool('experimental', 'bundle-phases'):
1347 if repo.ui.configbool('experimental', 'bundle-phases'):
1348 bundlespec.contentopts['phases'] = True
1348 bundlespec.contentopts['phases'] = True
1349
1349
1350 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1350 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1351 bundlespec.contentopts, compression=bcompression,
1351 bundlespec.contentopts, compression=bcompression,
1352 compopts=compopts)
1352 compopts=compopts)
1353
1353
1354 @command('cat',
1354 @command('cat',
1355 [('o', 'output', '',
1355 [('o', 'output', '',
1356 _('print output to file with formatted name'), _('FORMAT')),
1356 _('print output to file with formatted name'), _('FORMAT')),
1357 ('r', 'rev', '', _('print the given revision'), _('REV')),
1357 ('r', 'rev', '', _('print the given revision'), _('REV')),
1358 ('', 'decode', None, _('apply any matching decode filter')),
1358 ('', 'decode', None, _('apply any matching decode filter')),
1359 ] + walkopts + formatteropts,
1359 ] + walkopts + formatteropts,
1360 _('[OPTION]... FILE...'),
1360 _('[OPTION]... FILE...'),
1361 helpcategory=command.CATEGORY_FILE_CONTENTS,
1361 helpcategory=command.CATEGORY_FILE_CONTENTS,
1362 inferrepo=True,
1362 inferrepo=True,
1363 intents={INTENT_READONLY})
1363 intents={INTENT_READONLY})
1364 def cat(ui, repo, file1, *pats, **opts):
1364 def cat(ui, repo, file1, *pats, **opts):
1365 """output the current or given revision of files
1365 """output the current or given revision of files
1366
1366
1367 Print the specified files as they were at the given revision. If
1367 Print the specified files as they were at the given revision. If
1368 no revision is given, the parent of the working directory is used.
1368 no revision is given, the parent of the working directory is used.
1369
1369
1370 Output may be to a file, in which case the name of the file is
1370 Output may be to a file, in which case the name of the file is
1371 given using a template string. See :hg:`help templates`. In addition
1371 given using a template string. See :hg:`help templates`. In addition
1372 to the common template keywords, the following formatting rules are
1372 to the common template keywords, the following formatting rules are
1373 supported:
1373 supported:
1374
1374
1375 :``%%``: literal "%" character
1375 :``%%``: literal "%" character
1376 :``%s``: basename of file being printed
1376 :``%s``: basename of file being printed
1377 :``%d``: dirname of file being printed, or '.' if in repository root
1377 :``%d``: dirname of file being printed, or '.' if in repository root
1378 :``%p``: root-relative path name of file being printed
1378 :``%p``: root-relative path name of file being printed
1379 :``%H``: changeset hash (40 hexadecimal digits)
1379 :``%H``: changeset hash (40 hexadecimal digits)
1380 :``%R``: changeset revision number
1380 :``%R``: changeset revision number
1381 :``%h``: short-form changeset hash (12 hexadecimal digits)
1381 :``%h``: short-form changeset hash (12 hexadecimal digits)
1382 :``%r``: zero-padded changeset revision number
1382 :``%r``: zero-padded changeset revision number
1383 :``%b``: basename of the exporting repository
1383 :``%b``: basename of the exporting repository
1384 :``\\``: literal "\\" character
1384 :``\\``: literal "\\" character
1385
1385
1386 .. container:: verbose
1386 .. container:: verbose
1387
1387
1388 Template:
1388 Template:
1389
1389
1390 The following keywords are supported in addition to the common template
1390 The following keywords are supported in addition to the common template
1391 keywords and functions. See also :hg:`help templates`.
1391 keywords and functions. See also :hg:`help templates`.
1392
1392
1393 :data: String. File content.
1393 :data: String. File content.
1394 :path: String. Repository-absolute path of the file.
1394 :path: String. Repository-absolute path of the file.
1395
1395
1396 Returns 0 on success.
1396 Returns 0 on success.
1397 """
1397 """
1398 opts = pycompat.byteskwargs(opts)
1398 opts = pycompat.byteskwargs(opts)
1399 rev = opts.get('rev')
1399 rev = opts.get('rev')
1400 if rev:
1400 if rev:
1401 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1401 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1402 ctx = scmutil.revsingle(repo, rev)
1402 ctx = scmutil.revsingle(repo, rev)
1403 m = scmutil.match(ctx, (file1,) + pats, opts)
1403 m = scmutil.match(ctx, (file1,) + pats, opts)
1404 fntemplate = opts.pop('output', '')
1404 fntemplate = opts.pop('output', '')
1405 if cmdutil.isstdiofilename(fntemplate):
1405 if cmdutil.isstdiofilename(fntemplate):
1406 fntemplate = ''
1406 fntemplate = ''
1407
1407
1408 if fntemplate:
1408 if fntemplate:
1409 fm = formatter.nullformatter(ui, 'cat', opts)
1409 fm = formatter.nullformatter(ui, 'cat', opts)
1410 else:
1410 else:
1411 ui.pager('cat')
1411 ui.pager('cat')
1412 fm = ui.formatter('cat', opts)
1412 fm = ui.formatter('cat', opts)
1413 with fm:
1413 with fm:
1414 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1414 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1415 **pycompat.strkwargs(opts))
1415 **pycompat.strkwargs(opts))
1416
1416
1417 @command('clone',
1417 @command('clone',
1418 [('U', 'noupdate', None, _('the clone will include an empty working '
1418 [('U', 'noupdate', None, _('the clone will include an empty working '
1419 'directory (only a repository)')),
1419 'directory (only a repository)')),
1420 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1420 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1421 _('REV')),
1421 _('REV')),
1422 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1422 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1423 ' and its ancestors'), _('REV')),
1423 ' and its ancestors'), _('REV')),
1424 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1424 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1425 ' changesets and their ancestors'), _('BRANCH')),
1425 ' changesets and their ancestors'), _('BRANCH')),
1426 ('', 'pull', None, _('use pull protocol to copy metadata')),
1426 ('', 'pull', None, _('use pull protocol to copy metadata')),
1427 ('', 'uncompressed', None,
1427 ('', 'uncompressed', None,
1428 _('an alias to --stream (DEPRECATED)')),
1428 _('an alias to --stream (DEPRECATED)')),
1429 ('', 'stream', None,
1429 ('', 'stream', None,
1430 _('clone with minimal data processing')),
1430 _('clone with minimal data processing')),
1431 ] + remoteopts,
1431 ] + remoteopts,
1432 _('[OPTION]... SOURCE [DEST]'),
1432 _('[OPTION]... SOURCE [DEST]'),
1433 helpcategory=command.CATEGORY_REPO_CREATION,
1433 helpcategory=command.CATEGORY_REPO_CREATION,
1434 helpbasic=True, norepo=True)
1434 helpbasic=True, norepo=True)
1435 def clone(ui, source, dest=None, **opts):
1435 def clone(ui, source, dest=None, **opts):
1436 """make a copy of an existing repository
1436 """make a copy of an existing repository
1437
1437
1438 Create a copy of an existing repository in a new directory.
1438 Create a copy of an existing repository in a new directory.
1439
1439
1440 If no destination directory name is specified, it defaults to the
1440 If no destination directory name is specified, it defaults to the
1441 basename of the source.
1441 basename of the source.
1442
1442
1443 The location of the source is added to the new repository's
1443 The location of the source is added to the new repository's
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1445
1445
1446 Only local paths and ``ssh://`` URLs are supported as
1446 Only local paths and ``ssh://`` URLs are supported as
1447 destinations. For ``ssh://`` destinations, no working directory or
1447 destinations. For ``ssh://`` destinations, no working directory or
1448 ``.hg/hgrc`` will be created on the remote side.
1448 ``.hg/hgrc`` will be created on the remote side.
1449
1449
1450 If the source repository has a bookmark called '@' set, that
1450 If the source repository has a bookmark called '@' set, that
1451 revision will be checked out in the new repository by default.
1451 revision will be checked out in the new repository by default.
1452
1452
1453 To check out a particular version, use -u/--update, or
1453 To check out a particular version, use -u/--update, or
1454 -U/--noupdate to create a clone with no working directory.
1454 -U/--noupdate to create a clone with no working directory.
1455
1455
1456 To pull only a subset of changesets, specify one or more revisions
1456 To pull only a subset of changesets, specify one or more revisions
1457 identifiers with -r/--rev or branches with -b/--branch. The
1457 identifiers with -r/--rev or branches with -b/--branch. The
1458 resulting clone will contain only the specified changesets and
1458 resulting clone will contain only the specified changesets and
1459 their ancestors. These options (or 'clone src#rev dest') imply
1459 their ancestors. These options (or 'clone src#rev dest') imply
1460 --pull, even for local source repositories.
1460 --pull, even for local source repositories.
1461
1461
1462 In normal clone mode, the remote normalizes repository data into a common
1462 In normal clone mode, the remote normalizes repository data into a common
1463 exchange format and the receiving end translates this data into its local
1463 exchange format and the receiving end translates this data into its local
1464 storage format. --stream activates a different clone mode that essentially
1464 storage format. --stream activates a different clone mode that essentially
1465 copies repository files from the remote with minimal data processing. This
1465 copies repository files from the remote with minimal data processing. This
1466 significantly reduces the CPU cost of a clone both remotely and locally.
1466 significantly reduces the CPU cost of a clone both remotely and locally.
1467 However, it often increases the transferred data size by 30-40%. This can
1467 However, it often increases the transferred data size by 30-40%. This can
1468 result in substantially faster clones where I/O throughput is plentiful,
1468 result in substantially faster clones where I/O throughput is plentiful,
1469 especially for larger repositories. A side-effect of --stream clones is
1469 especially for larger repositories. A side-effect of --stream clones is
1470 that storage settings and requirements on the remote are applied locally:
1470 that storage settings and requirements on the remote are applied locally:
1471 a modern client may inherit legacy or inefficient storage used by the
1471 a modern client may inherit legacy or inefficient storage used by the
1472 remote or a legacy Mercurial client may not be able to clone from a
1472 remote or a legacy Mercurial client may not be able to clone from a
1473 modern Mercurial remote.
1473 modern Mercurial remote.
1474
1474
1475 .. note::
1475 .. note::
1476
1476
1477 Specifying a tag will include the tagged changeset but not the
1477 Specifying a tag will include the tagged changeset but not the
1478 changeset containing the tag.
1478 changeset containing the tag.
1479
1479
1480 .. container:: verbose
1480 .. container:: verbose
1481
1481
1482 For efficiency, hardlinks are used for cloning whenever the
1482 For efficiency, hardlinks are used for cloning whenever the
1483 source and destination are on the same filesystem (note this
1483 source and destination are on the same filesystem (note this
1484 applies only to the repository data, not to the working
1484 applies only to the repository data, not to the working
1485 directory). Some filesystems, such as AFS, implement hardlinking
1485 directory). Some filesystems, such as AFS, implement hardlinking
1486 incorrectly, but do not report errors. In these cases, use the
1486 incorrectly, but do not report errors. In these cases, use the
1487 --pull option to avoid hardlinking.
1487 --pull option to avoid hardlinking.
1488
1488
1489 Mercurial will update the working directory to the first applicable
1489 Mercurial will update the working directory to the first applicable
1490 revision from this list:
1490 revision from this list:
1491
1491
1492 a) null if -U or the source repository has no changesets
1492 a) null if -U or the source repository has no changesets
1493 b) if -u . and the source repository is local, the first parent of
1493 b) if -u . and the source repository is local, the first parent of
1494 the source repository's working directory
1494 the source repository's working directory
1495 c) the changeset specified with -u (if a branch name, this means the
1495 c) the changeset specified with -u (if a branch name, this means the
1496 latest head of that branch)
1496 latest head of that branch)
1497 d) the changeset specified with -r
1497 d) the changeset specified with -r
1498 e) the tipmost head specified with -b
1498 e) the tipmost head specified with -b
1499 f) the tipmost head specified with the url#branch source syntax
1499 f) the tipmost head specified with the url#branch source syntax
1500 g) the revision marked with the '@' bookmark, if present
1500 g) the revision marked with the '@' bookmark, if present
1501 h) the tipmost head of the default branch
1501 h) the tipmost head of the default branch
1502 i) tip
1502 i) tip
1503
1503
1504 When cloning from servers that support it, Mercurial may fetch
1504 When cloning from servers that support it, Mercurial may fetch
1505 pre-generated data from a server-advertised URL or inline from the
1505 pre-generated data from a server-advertised URL or inline from the
1506 same stream. When this is done, hooks operating on incoming changesets
1506 same stream. When this is done, hooks operating on incoming changesets
1507 and changegroups may fire more than once, once for each pre-generated
1507 and changegroups may fire more than once, once for each pre-generated
1508 bundle and as well as for any additional remaining data. In addition,
1508 bundle and as well as for any additional remaining data. In addition,
1509 if an error occurs, the repository may be rolled back to a partial
1509 if an error occurs, the repository may be rolled back to a partial
1510 clone. This behavior may change in future releases.
1510 clone. This behavior may change in future releases.
1511 See :hg:`help -e clonebundles` for more.
1511 See :hg:`help -e clonebundles` for more.
1512
1512
1513 Examples:
1513 Examples:
1514
1514
1515 - clone a remote repository to a new directory named hg/::
1515 - clone a remote repository to a new directory named hg/::
1516
1516
1517 hg clone https://www.mercurial-scm.org/repo/hg/
1517 hg clone https://www.mercurial-scm.org/repo/hg/
1518
1518
1519 - create a lightweight local clone::
1519 - create a lightweight local clone::
1520
1520
1521 hg clone project/ project-feature/
1521 hg clone project/ project-feature/
1522
1522
1523 - clone from an absolute path on an ssh server (note double-slash)::
1523 - clone from an absolute path on an ssh server (note double-slash)::
1524
1524
1525 hg clone ssh://user@server//home/projects/alpha/
1525 hg clone ssh://user@server//home/projects/alpha/
1526
1526
1527 - do a streaming clone while checking out a specified version::
1527 - do a streaming clone while checking out a specified version::
1528
1528
1529 hg clone --stream http://server/repo -u 1.5
1529 hg clone --stream http://server/repo -u 1.5
1530
1530
1531 - create a repository without changesets after a particular revision::
1531 - create a repository without changesets after a particular revision::
1532
1532
1533 hg clone -r 04e544 experimental/ good/
1533 hg clone -r 04e544 experimental/ good/
1534
1534
1535 - clone (and track) a particular named branch::
1535 - clone (and track) a particular named branch::
1536
1536
1537 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1537 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1538
1538
1539 See :hg:`help urls` for details on specifying URLs.
1539 See :hg:`help urls` for details on specifying URLs.
1540
1540
1541 Returns 0 on success.
1541 Returns 0 on success.
1542 """
1542 """
1543 opts = pycompat.byteskwargs(opts)
1543 opts = pycompat.byteskwargs(opts)
1544 if opts.get('noupdate') and opts.get('updaterev'):
1544 if opts.get('noupdate') and opts.get('updaterev'):
1545 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1545 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1546
1546
1547 # --include/--exclude can come from narrow or sparse.
1547 # --include/--exclude can come from narrow or sparse.
1548 includepats, excludepats = None, None
1548 includepats, excludepats = None, None
1549
1549
1550 # hg.clone() differentiates between None and an empty set. So make sure
1550 # hg.clone() differentiates between None and an empty set. So make sure
1551 # patterns are sets if narrow is requested without patterns.
1551 # patterns are sets if narrow is requested without patterns.
1552 if opts.get('narrow'):
1552 if opts.get('narrow'):
1553 includepats = set()
1553 includepats = set()
1554 excludepats = set()
1554 excludepats = set()
1555
1555
1556 if opts.get('include'):
1556 if opts.get('include'):
1557 includepats = narrowspec.parsepatterns(opts.get('include'))
1557 includepats = narrowspec.parsepatterns(opts.get('include'))
1558 if opts.get('exclude'):
1558 if opts.get('exclude'):
1559 excludepats = narrowspec.parsepatterns(opts.get('exclude'))
1559 excludepats = narrowspec.parsepatterns(opts.get('exclude'))
1560
1560
1561 r = hg.clone(ui, opts, source, dest,
1561 r = hg.clone(ui, opts, source, dest,
1562 pull=opts.get('pull'),
1562 pull=opts.get('pull'),
1563 stream=opts.get('stream') or opts.get('uncompressed'),
1563 stream=opts.get('stream') or opts.get('uncompressed'),
1564 revs=opts.get('rev'),
1564 revs=opts.get('rev'),
1565 update=opts.get('updaterev') or not opts.get('noupdate'),
1565 update=opts.get('updaterev') or not opts.get('noupdate'),
1566 branch=opts.get('branch'),
1566 branch=opts.get('branch'),
1567 shareopts=opts.get('shareopts'),
1567 shareopts=opts.get('shareopts'),
1568 storeincludepats=includepats,
1568 storeincludepats=includepats,
1569 storeexcludepats=excludepats,
1569 storeexcludepats=excludepats,
1570 depth=opts.get('depth') or None)
1570 depth=opts.get('depth') or None)
1571
1571
1572 return r is None
1572 return r is None
1573
1573
1574 @command('commit|ci',
1574 @command('commit|ci',
1575 [('A', 'addremove', None,
1575 [('A', 'addremove', None,
1576 _('mark new/missing files as added/removed before committing')),
1576 _('mark new/missing files as added/removed before committing')),
1577 ('', 'close-branch', None,
1577 ('', 'close-branch', None,
1578 _('mark a branch head as closed')),
1578 _('mark a branch head as closed')),
1579 ('', 'amend', None, _('amend the parent of the working directory')),
1579 ('', 'amend', None, _('amend the parent of the working directory')),
1580 ('s', 'secret', None, _('use the secret phase for committing')),
1580 ('s', 'secret', None, _('use the secret phase for committing')),
1581 ('e', 'edit', None, _('invoke editor on commit messages')),
1581 ('e', 'edit', None, _('invoke editor on commit messages')),
1582 ('i', 'interactive', None, _('use interactive mode')),
1582 ('i', 'interactive', None, _('use interactive mode')),
1583 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1583 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1584 _('[OPTION]... [FILE]...'),
1584 _('[OPTION]... [FILE]...'),
1585 helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
1585 helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
1586 inferrepo=True)
1586 inferrepo=True)
1587 def commit(ui, repo, *pats, **opts):
1587 def commit(ui, repo, *pats, **opts):
1588 """commit the specified files or all outstanding changes
1588 """commit the specified files or all outstanding changes
1589
1589
1590 Commit changes to the given files into the repository. Unlike a
1590 Commit changes to the given files into the repository. Unlike a
1591 centralized SCM, this operation is a local operation. See
1591 centralized SCM, this operation is a local operation. See
1592 :hg:`push` for a way to actively distribute your changes.
1592 :hg:`push` for a way to actively distribute your changes.
1593
1593
1594 If a list of files is omitted, all changes reported by :hg:`status`
1594 If a list of files is omitted, all changes reported by :hg:`status`
1595 will be committed.
1595 will be committed.
1596
1596
1597 If you are committing the result of a merge, do not provide any
1597 If you are committing the result of a merge, do not provide any
1598 filenames or -I/-X filters.
1598 filenames or -I/-X filters.
1599
1599
1600 If no commit message is specified, Mercurial starts your
1600 If no commit message is specified, Mercurial starts your
1601 configured editor where you can enter a message. In case your
1601 configured editor where you can enter a message. In case your
1602 commit fails, you will find a backup of your message in
1602 commit fails, you will find a backup of your message in
1603 ``.hg/last-message.txt``.
1603 ``.hg/last-message.txt``.
1604
1604
1605 The --close-branch flag can be used to mark the current branch
1605 The --close-branch flag can be used to mark the current branch
1606 head closed. When all heads of a branch are closed, the branch
1606 head closed. When all heads of a branch are closed, the branch
1607 will be considered closed and no longer listed.
1607 will be considered closed and no longer listed.
1608
1608
1609 The --amend flag can be used to amend the parent of the
1609 The --amend flag can be used to amend the parent of the
1610 working directory with a new commit that contains the changes
1610 working directory with a new commit that contains the changes
1611 in the parent in addition to those currently reported by :hg:`status`,
1611 in the parent in addition to those currently reported by :hg:`status`,
1612 if there are any. The old commit is stored in a backup bundle in
1612 if there are any. The old commit is stored in a backup bundle in
1613 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1613 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1614 on how to restore it).
1614 on how to restore it).
1615
1615
1616 Message, user and date are taken from the amended commit unless
1616 Message, user and date are taken from the amended commit unless
1617 specified. When a message isn't specified on the command line,
1617 specified. When a message isn't specified on the command line,
1618 the editor will open with the message of the amended commit.
1618 the editor will open with the message of the amended commit.
1619
1619
1620 It is not possible to amend public changesets (see :hg:`help phases`)
1620 It is not possible to amend public changesets (see :hg:`help phases`)
1621 or changesets that have children.
1621 or changesets that have children.
1622
1622
1623 See :hg:`help dates` for a list of formats valid for -d/--date.
1623 See :hg:`help dates` for a list of formats valid for -d/--date.
1624
1624
1625 Returns 0 on success, 1 if nothing changed.
1625 Returns 0 on success, 1 if nothing changed.
1626
1626
1627 .. container:: verbose
1627 .. container:: verbose
1628
1628
1629 Examples:
1629 Examples:
1630
1630
1631 - commit all files ending in .py::
1631 - commit all files ending in .py::
1632
1632
1633 hg commit --include "set:**.py"
1633 hg commit --include "set:**.py"
1634
1634
1635 - commit all non-binary files::
1635 - commit all non-binary files::
1636
1636
1637 hg commit --exclude "set:binary()"
1637 hg commit --exclude "set:binary()"
1638
1638
1639 - amend the current commit and set the date to now::
1639 - amend the current commit and set the date to now::
1640
1640
1641 hg commit --amend --date now
1641 hg commit --amend --date now
1642 """
1642 """
1643 with repo.wlock(), repo.lock():
1643 with repo.wlock(), repo.lock():
1644 return _docommit(ui, repo, *pats, **opts)
1644 return _docommit(ui, repo, *pats, **opts)
1645
1645
1646 def _docommit(ui, repo, *pats, **opts):
1646 def _docommit(ui, repo, *pats, **opts):
1647 if opts.get(r'interactive'):
1647 if opts.get(r'interactive'):
1648 opts.pop(r'interactive')
1648 opts.pop(r'interactive')
1649 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1649 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1650 cmdutil.recordfilter, *pats,
1650 cmdutil.recordfilter, *pats,
1651 **opts)
1651 **opts)
1652 # ret can be 0 (no changes to record) or the value returned by
1652 # ret can be 0 (no changes to record) or the value returned by
1653 # commit(), 1 if nothing changed or None on success.
1653 # commit(), 1 if nothing changed or None on success.
1654 return 1 if ret == 0 else ret
1654 return 1 if ret == 0 else ret
1655
1655
1656 opts = pycompat.byteskwargs(opts)
1656 opts = pycompat.byteskwargs(opts)
1657 if opts.get('subrepos'):
1657 if opts.get('subrepos'):
1658 if opts.get('amend'):
1658 if opts.get('amend'):
1659 raise error.Abort(_('cannot amend with --subrepos'))
1659 raise error.Abort(_('cannot amend with --subrepos'))
1660 # Let --subrepos on the command line override config setting.
1660 # Let --subrepos on the command line override config setting.
1661 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1661 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1662
1662
1663 cmdutil.checkunfinished(repo, commit=True)
1663 cmdutil.checkunfinished(repo, commit=True)
1664
1664
1665 branch = repo[None].branch()
1665 branch = repo[None].branch()
1666 bheads = repo.branchheads(branch)
1666 bheads = repo.branchheads(branch)
1667
1667
1668 extra = {}
1668 extra = {}
1669 if opts.get('close_branch'):
1669 if opts.get('close_branch'):
1670 extra['close'] = '1'
1670 extra['close'] = '1'
1671
1671
1672 if not bheads:
1672 if not bheads:
1673 raise error.Abort(_('can only close branch heads'))
1673 raise error.Abort(_('can only close branch heads'))
1674 elif opts.get('amend'):
1674 elif opts.get('amend'):
1675 if repo[None].parents()[0].p1().branch() != branch and \
1675 if repo[None].parents()[0].p1().branch() != branch and \
1676 repo[None].parents()[0].p2().branch() != branch:
1676 repo[None].parents()[0].p2().branch() != branch:
1677 raise error.Abort(_('can only close branch heads'))
1677 raise error.Abort(_('can only close branch heads'))
1678
1678
1679 if opts.get('amend'):
1679 if opts.get('amend'):
1680 if ui.configbool('ui', 'commitsubrepos'):
1680 if ui.configbool('ui', 'commitsubrepos'):
1681 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1681 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1682
1682
1683 old = repo['.']
1683 old = repo['.']
1684 rewriteutil.precheck(repo, [old.rev()], 'amend')
1684 rewriteutil.precheck(repo, [old.rev()], 'amend')
1685
1685
1686 # Currently histedit gets confused if an amend happens while histedit
1686 # Currently histedit gets confused if an amend happens while histedit
1687 # is in progress. Since we have a checkunfinished command, we are
1687 # is in progress. Since we have a checkunfinished command, we are
1688 # temporarily honoring it.
1688 # temporarily honoring it.
1689 #
1689 #
1690 # Note: eventually this guard will be removed. Please do not expect
1690 # Note: eventually this guard will be removed. Please do not expect
1691 # this behavior to remain.
1691 # this behavior to remain.
1692 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1692 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1693 cmdutil.checkunfinished(repo)
1693 cmdutil.checkunfinished(repo)
1694
1694
1695 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1695 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1696 if node == old.node():
1696 if node == old.node():
1697 ui.status(_("nothing changed\n"))
1697 ui.status(_("nothing changed\n"))
1698 return 1
1698 return 1
1699 else:
1699 else:
1700 def commitfunc(ui, repo, message, match, opts):
1700 def commitfunc(ui, repo, message, match, opts):
1701 overrides = {}
1701 overrides = {}
1702 if opts.get('secret'):
1702 if opts.get('secret'):
1703 overrides[('phases', 'new-commit')] = 'secret'
1703 overrides[('phases', 'new-commit')] = 'secret'
1704
1704
1705 baseui = repo.baseui
1705 baseui = repo.baseui
1706 with baseui.configoverride(overrides, 'commit'):
1706 with baseui.configoverride(overrides, 'commit'):
1707 with ui.configoverride(overrides, 'commit'):
1707 with ui.configoverride(overrides, 'commit'):
1708 editform = cmdutil.mergeeditform(repo[None],
1708 editform = cmdutil.mergeeditform(repo[None],
1709 'commit.normal')
1709 'commit.normal')
1710 editor = cmdutil.getcommiteditor(
1710 editor = cmdutil.getcommiteditor(
1711 editform=editform, **pycompat.strkwargs(opts))
1711 editform=editform, **pycompat.strkwargs(opts))
1712 return repo.commit(message,
1712 return repo.commit(message,
1713 opts.get('user'),
1713 opts.get('user'),
1714 opts.get('date'),
1714 opts.get('date'),
1715 match,
1715 match,
1716 editor=editor,
1716 editor=editor,
1717 extra=extra)
1717 extra=extra)
1718
1718
1719 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1719 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1720
1720
1721 if not node:
1721 if not node:
1722 stat = cmdutil.postcommitstatus(repo, pats, opts)
1722 stat = cmdutil.postcommitstatus(repo, pats, opts)
1723 if stat[3]:
1723 if stat[3]:
1724 ui.status(_("nothing changed (%d missing files, see "
1724 ui.status(_("nothing changed (%d missing files, see "
1725 "'hg status')\n") % len(stat[3]))
1725 "'hg status')\n") % len(stat[3]))
1726 else:
1726 else:
1727 ui.status(_("nothing changed\n"))
1727 ui.status(_("nothing changed\n"))
1728 return 1
1728 return 1
1729
1729
1730 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1730 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1731
1731
1732 @command('config|showconfig|debugconfig',
1732 @command('config|showconfig|debugconfig',
1733 [('u', 'untrusted', None, _('show untrusted configuration options')),
1733 [('u', 'untrusted', None, _('show untrusted configuration options')),
1734 ('e', 'edit', None, _('edit user config')),
1734 ('e', 'edit', None, _('edit user config')),
1735 ('l', 'local', None, _('edit repository config')),
1735 ('l', 'local', None, _('edit repository config')),
1736 ('g', 'global', None, _('edit global config'))] + formatteropts,
1736 ('g', 'global', None, _('edit global config'))] + formatteropts,
1737 _('[-u] [NAME]...'),
1737 _('[-u] [NAME]...'),
1738 helpcategory=command.CATEGORY_HELP,
1738 helpcategory=command.CATEGORY_HELP,
1739 optionalrepo=True,
1739 optionalrepo=True,
1740 intents={INTENT_READONLY})
1740 intents={INTENT_READONLY})
1741 def config(ui, repo, *values, **opts):
1741 def config(ui, repo, *values, **opts):
1742 """show combined config settings from all hgrc files
1742 """show combined config settings from all hgrc files
1743
1743
1744 With no arguments, print names and values of all config items.
1744 With no arguments, print names and values of all config items.
1745
1745
1746 With one argument of the form section.name, print just the value
1746 With one argument of the form section.name, print just the value
1747 of that config item.
1747 of that config item.
1748
1748
1749 With multiple arguments, print names and values of all config
1749 With multiple arguments, print names and values of all config
1750 items with matching section names or section.names.
1750 items with matching section names or section.names.
1751
1751
1752 With --edit, start an editor on the user-level config file. With
1752 With --edit, start an editor on the user-level config file. With
1753 --global, edit the system-wide config file. With --local, edit the
1753 --global, edit the system-wide config file. With --local, edit the
1754 repository-level config file.
1754 repository-level config file.
1755
1755
1756 With --debug, the source (filename and line number) is printed
1756 With --debug, the source (filename and line number) is printed
1757 for each config item.
1757 for each config item.
1758
1758
1759 See :hg:`help config` for more information about config files.
1759 See :hg:`help config` for more information about config files.
1760
1760
1761 .. container:: verbose
1761 .. container:: verbose
1762
1762
1763 Template:
1763 Template:
1764
1764
1765 The following keywords are supported. See also :hg:`help templates`.
1765 The following keywords are supported. See also :hg:`help templates`.
1766
1766
1767 :name: String. Config name.
1767 :name: String. Config name.
1768 :source: String. Filename and line number where the item is defined.
1768 :source: String. Filename and line number where the item is defined.
1769 :value: String. Config value.
1769 :value: String. Config value.
1770
1770
1771 Returns 0 on success, 1 if NAME does not exist.
1771 Returns 0 on success, 1 if NAME does not exist.
1772
1772
1773 """
1773 """
1774
1774
1775 opts = pycompat.byteskwargs(opts)
1775 opts = pycompat.byteskwargs(opts)
1776 if opts.get('edit') or opts.get('local') or opts.get('global'):
1776 if opts.get('edit') or opts.get('local') or opts.get('global'):
1777 if opts.get('local') and opts.get('global'):
1777 if opts.get('local') and opts.get('global'):
1778 raise error.Abort(_("can't use --local and --global together"))
1778 raise error.Abort(_("can't use --local and --global together"))
1779
1779
1780 if opts.get('local'):
1780 if opts.get('local'):
1781 if not repo:
1781 if not repo:
1782 raise error.Abort(_("can't use --local outside a repository"))
1782 raise error.Abort(_("can't use --local outside a repository"))
1783 paths = [repo.vfs.join('hgrc')]
1783 paths = [repo.vfs.join('hgrc')]
1784 elif opts.get('global'):
1784 elif opts.get('global'):
1785 paths = rcutil.systemrcpath()
1785 paths = rcutil.systemrcpath()
1786 else:
1786 else:
1787 paths = rcutil.userrcpath()
1787 paths = rcutil.userrcpath()
1788
1788
1789 for f in paths:
1789 for f in paths:
1790 if os.path.exists(f):
1790 if os.path.exists(f):
1791 break
1791 break
1792 else:
1792 else:
1793 if opts.get('global'):
1793 if opts.get('global'):
1794 samplehgrc = uimod.samplehgrcs['global']
1794 samplehgrc = uimod.samplehgrcs['global']
1795 elif opts.get('local'):
1795 elif opts.get('local'):
1796 samplehgrc = uimod.samplehgrcs['local']
1796 samplehgrc = uimod.samplehgrcs['local']
1797 else:
1797 else:
1798 samplehgrc = uimod.samplehgrcs['user']
1798 samplehgrc = uimod.samplehgrcs['user']
1799
1799
1800 f = paths[0]
1800 f = paths[0]
1801 fp = open(f, "wb")
1801 fp = open(f, "wb")
1802 fp.write(util.tonativeeol(samplehgrc))
1802 fp.write(util.tonativeeol(samplehgrc))
1803 fp.close()
1803 fp.close()
1804
1804
1805 editor = ui.geteditor()
1805 editor = ui.geteditor()
1806 ui.system("%s \"%s\"" % (editor, f),
1806 ui.system("%s \"%s\"" % (editor, f),
1807 onerr=error.Abort, errprefix=_("edit failed"),
1807 onerr=error.Abort, errprefix=_("edit failed"),
1808 blockedtag='config_edit')
1808 blockedtag='config_edit')
1809 return
1809 return
1810 ui.pager('config')
1810 ui.pager('config')
1811 fm = ui.formatter('config', opts)
1811 fm = ui.formatter('config', opts)
1812 for t, f in rcutil.rccomponents():
1812 for t, f in rcutil.rccomponents():
1813 if t == 'path':
1813 if t == 'path':
1814 ui.debug('read config from: %s\n' % f)
1814 ui.debug('read config from: %s\n' % f)
1815 elif t == 'items':
1815 elif t == 'items':
1816 for section, name, value, source in f:
1816 for section, name, value, source in f:
1817 ui.debug('set config by: %s\n' % source)
1817 ui.debug('set config by: %s\n' % source)
1818 else:
1818 else:
1819 raise error.ProgrammingError('unknown rctype: %s' % t)
1819 raise error.ProgrammingError('unknown rctype: %s' % t)
1820 untrusted = bool(opts.get('untrusted'))
1820 untrusted = bool(opts.get('untrusted'))
1821
1821
1822 selsections = selentries = []
1822 selsections = selentries = []
1823 if values:
1823 if values:
1824 selsections = [v for v in values if '.' not in v]
1824 selsections = [v for v in values if '.' not in v]
1825 selentries = [v for v in values if '.' in v]
1825 selentries = [v for v in values if '.' in v]
1826 uniquesel = (len(selentries) == 1 and not selsections)
1826 uniquesel = (len(selentries) == 1 and not selsections)
1827 selsections = set(selsections)
1827 selsections = set(selsections)
1828 selentries = set(selentries)
1828 selentries = set(selentries)
1829
1829
1830 matched = False
1830 matched = False
1831 for section, name, value in ui.walkconfig(untrusted=untrusted):
1831 for section, name, value in ui.walkconfig(untrusted=untrusted):
1832 source = ui.configsource(section, name, untrusted)
1832 source = ui.configsource(section, name, untrusted)
1833 value = pycompat.bytestr(value)
1833 value = pycompat.bytestr(value)
1834 if fm.isplain():
1834 if fm.isplain():
1835 source = source or 'none'
1835 source = source or 'none'
1836 value = value.replace('\n', '\\n')
1836 value = value.replace('\n', '\\n')
1837 entryname = section + '.' + name
1837 entryname = section + '.' + name
1838 if values and not (section in selsections or entryname in selentries):
1838 if values and not (section in selsections or entryname in selentries):
1839 continue
1839 continue
1840 fm.startitem()
1840 fm.startitem()
1841 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1841 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1842 if uniquesel:
1842 if uniquesel:
1843 fm.data(name=entryname)
1843 fm.data(name=entryname)
1844 fm.write('value', '%s\n', value)
1844 fm.write('value', '%s\n', value)
1845 else:
1845 else:
1846 fm.write('name value', '%s=%s\n', entryname, value)
1846 fm.write('name value', '%s=%s\n', entryname, value)
1847 matched = True
1847 matched = True
1848 fm.end()
1848 fm.end()
1849 if matched:
1849 if matched:
1850 return 0
1850 return 0
1851 return 1
1851 return 1
1852
1852
1853 @command('copy|cp',
1853 @command('copy|cp',
1854 [('A', 'after', None, _('record a copy that has already occurred')),
1854 [('A', 'after', None, _('record a copy that has already occurred')),
1855 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1855 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1856 ] + walkopts + dryrunopts,
1856 ] + walkopts + dryrunopts,
1857 _('[OPTION]... [SOURCE]... DEST'),
1857 _('[OPTION]... [SOURCE]... DEST'),
1858 helpcategory=command.CATEGORY_FILE_CONTENTS)
1858 helpcategory=command.CATEGORY_FILE_CONTENTS)
1859 def copy(ui, repo, *pats, **opts):
1859 def copy(ui, repo, *pats, **opts):
1860 """mark files as copied for the next commit
1860 """mark files as copied for the next commit
1861
1861
1862 Mark dest as having copies of source files. If dest is a
1862 Mark dest as having copies of source files. If dest is a
1863 directory, copies are put in that directory. If dest is a file,
1863 directory, copies are put in that directory. If dest is a file,
1864 the source must be a single file.
1864 the source must be a single file.
1865
1865
1866 By default, this command copies the contents of files as they
1866 By default, this command copies the contents of files as they
1867 exist in the working directory. If invoked with -A/--after, the
1867 exist in the working directory. If invoked with -A/--after, the
1868 operation is recorded, but no copying is performed.
1868 operation is recorded, but no copying is performed.
1869
1869
1870 This command takes effect with the next commit. To undo a copy
1870 This command takes effect with the next commit. To undo a copy
1871 before that, see :hg:`revert`.
1871 before that, see :hg:`revert`.
1872
1872
1873 Returns 0 on success, 1 if errors are encountered.
1873 Returns 0 on success, 1 if errors are encountered.
1874 """
1874 """
1875 opts = pycompat.byteskwargs(opts)
1875 opts = pycompat.byteskwargs(opts)
1876 with repo.wlock(False):
1876 with repo.wlock(False):
1877 return cmdutil.copy(ui, repo, pats, opts)
1877 return cmdutil.copy(ui, repo, pats, opts)
1878
1878
1879 @command(
1879 @command(
1880 'debugcommands', [], _('[COMMAND]'),
1880 'debugcommands', [], _('[COMMAND]'),
1881 helpcategory=command.CATEGORY_HELP,
1881 helpcategory=command.CATEGORY_HELP,
1882 norepo=True)
1882 norepo=True)
1883 def debugcommands(ui, cmd='', *args):
1883 def debugcommands(ui, cmd='', *args):
1884 """list all available commands and options"""
1884 """list all available commands and options"""
1885 for cmd, vals in sorted(table.iteritems()):
1885 for cmd, vals in sorted(table.iteritems()):
1886 cmd = cmd.split('|')[0]
1886 cmd = cmd.split('|')[0]
1887 opts = ', '.join([i[1] for i in vals[1]])
1887 opts = ', '.join([i[1] for i in vals[1]])
1888 ui.write('%s: %s\n' % (cmd, opts))
1888 ui.write('%s: %s\n' % (cmd, opts))
1889
1889
1890 @command('debugcomplete',
1890 @command('debugcomplete',
1891 [('o', 'options', None, _('show the command options'))],
1891 [('o', 'options', None, _('show the command options'))],
1892 _('[-o] CMD'),
1892 _('[-o] CMD'),
1893 helpcategory=command.CATEGORY_HELP,
1893 helpcategory=command.CATEGORY_HELP,
1894 norepo=True)
1894 norepo=True)
1895 def debugcomplete(ui, cmd='', **opts):
1895 def debugcomplete(ui, cmd='', **opts):
1896 """returns the completion list associated with the given command"""
1896 """returns the completion list associated with the given command"""
1897
1897
1898 if opts.get(r'options'):
1898 if opts.get(r'options'):
1899 options = []
1899 options = []
1900 otables = [globalopts]
1900 otables = [globalopts]
1901 if cmd:
1901 if cmd:
1902 aliases, entry = cmdutil.findcmd(cmd, table, False)
1902 aliases, entry = cmdutil.findcmd(cmd, table, False)
1903 otables.append(entry[1])
1903 otables.append(entry[1])
1904 for t in otables:
1904 for t in otables:
1905 for o in t:
1905 for o in t:
1906 if "(DEPRECATED)" in o[3]:
1906 if "(DEPRECATED)" in o[3]:
1907 continue
1907 continue
1908 if o[0]:
1908 if o[0]:
1909 options.append('-%s' % o[0])
1909 options.append('-%s' % o[0])
1910 options.append('--%s' % o[1])
1910 options.append('--%s' % o[1])
1911 ui.write("%s\n" % "\n".join(options))
1911 ui.write("%s\n" % "\n".join(options))
1912 return
1912 return
1913
1913
1914 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1914 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1915 if ui.verbose:
1915 if ui.verbose:
1916 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1916 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1917 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1917 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1918
1918
1919 @command('diff',
1919 @command('diff',
1920 [('r', 'rev', [], _('revision'), _('REV')),
1920 [('r', 'rev', [], _('revision'), _('REV')),
1921 ('c', 'change', '', _('change made by revision'), _('REV'))
1921 ('c', 'change', '', _('change made by revision'), _('REV'))
1922 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1922 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1923 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1923 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1924 helpcategory=command.CATEGORY_FILE_CONTENTS,
1924 helpcategory=command.CATEGORY_FILE_CONTENTS,
1925 helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
1925 helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
1926 def diff(ui, repo, *pats, **opts):
1926 def diff(ui, repo, *pats, **opts):
1927 """diff repository (or selected files)
1927 """diff repository (or selected files)
1928
1928
1929 Show differences between revisions for the specified files.
1929 Show differences between revisions for the specified files.
1930
1930
1931 Differences between files are shown using the unified diff format.
1931 Differences between files are shown using the unified diff format.
1932
1932
1933 .. note::
1933 .. note::
1934
1934
1935 :hg:`diff` may generate unexpected results for merges, as it will
1935 :hg:`diff` may generate unexpected results for merges, as it will
1936 default to comparing against the working directory's first
1936 default to comparing against the working directory's first
1937 parent changeset if no revisions are specified.
1937 parent changeset if no revisions are specified.
1938
1938
1939 When two revision arguments are given, then changes are shown
1939 When two revision arguments are given, then changes are shown
1940 between those revisions. If only one revision is specified then
1940 between those revisions. If only one revision is specified then
1941 that revision is compared to the working directory, and, when no
1941 that revision is compared to the working directory, and, when no
1942 revisions are specified, the working directory files are compared
1942 revisions are specified, the working directory files are compared
1943 to its first parent.
1943 to its first parent.
1944
1944
1945 Alternatively you can specify -c/--change with a revision to see
1945 Alternatively you can specify -c/--change with a revision to see
1946 the changes in that changeset relative to its first parent.
1946 the changes in that changeset relative to its first parent.
1947
1947
1948 Without the -a/--text option, diff will avoid generating diffs of
1948 Without the -a/--text option, diff will avoid generating diffs of
1949 files it detects as binary. With -a, diff will generate a diff
1949 files it detects as binary. With -a, diff will generate a diff
1950 anyway, probably with undesirable results.
1950 anyway, probably with undesirable results.
1951
1951
1952 Use the -g/--git option to generate diffs in the git extended diff
1952 Use the -g/--git option to generate diffs in the git extended diff
1953 format. For more information, read :hg:`help diffs`.
1953 format. For more information, read :hg:`help diffs`.
1954
1954
1955 .. container:: verbose
1955 .. container:: verbose
1956
1956
1957 Examples:
1957 Examples:
1958
1958
1959 - compare a file in the current working directory to its parent::
1959 - compare a file in the current working directory to its parent::
1960
1960
1961 hg diff foo.c
1961 hg diff foo.c
1962
1962
1963 - compare two historical versions of a directory, with rename info::
1963 - compare two historical versions of a directory, with rename info::
1964
1964
1965 hg diff --git -r 1.0:1.2 lib/
1965 hg diff --git -r 1.0:1.2 lib/
1966
1966
1967 - get change stats relative to the last change on some date::
1967 - get change stats relative to the last change on some date::
1968
1968
1969 hg diff --stat -r "date('may 2')"
1969 hg diff --stat -r "date('may 2')"
1970
1970
1971 - diff all newly-added files that contain a keyword::
1971 - diff all newly-added files that contain a keyword::
1972
1972
1973 hg diff "set:added() and grep(GNU)"
1973 hg diff "set:added() and grep(GNU)"
1974
1974
1975 - compare a revision and its parents::
1975 - compare a revision and its parents::
1976
1976
1977 hg diff -c 9353 # compare against first parent
1977 hg diff -c 9353 # compare against first parent
1978 hg diff -r 9353^:9353 # same using revset syntax
1978 hg diff -r 9353^:9353 # same using revset syntax
1979 hg diff -r 9353^2:9353 # compare against the second parent
1979 hg diff -r 9353^2:9353 # compare against the second parent
1980
1980
1981 Returns 0 on success.
1981 Returns 0 on success.
1982 """
1982 """
1983
1983
1984 opts = pycompat.byteskwargs(opts)
1984 opts = pycompat.byteskwargs(opts)
1985 revs = opts.get('rev')
1985 revs = opts.get('rev')
1986 change = opts.get('change')
1986 change = opts.get('change')
1987 stat = opts.get('stat')
1987 stat = opts.get('stat')
1988 reverse = opts.get('reverse')
1988 reverse = opts.get('reverse')
1989
1989
1990 if revs and change:
1990 if revs and change:
1991 msg = _('cannot specify --rev and --change at the same time')
1991 msg = _('cannot specify --rev and --change at the same time')
1992 raise error.Abort(msg)
1992 raise error.Abort(msg)
1993 elif change:
1993 elif change:
1994 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1994 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1995 ctx2 = scmutil.revsingle(repo, change, None)
1995 ctx2 = scmutil.revsingle(repo, change, None)
1996 ctx1 = ctx2.p1()
1996 ctx1 = ctx2.p1()
1997 else:
1997 else:
1998 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1998 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1999 ctx1, ctx2 = scmutil.revpair(repo, revs)
1999 ctx1, ctx2 = scmutil.revpair(repo, revs)
2000 node1, node2 = ctx1.node(), ctx2.node()
2000 node1, node2 = ctx1.node(), ctx2.node()
2001
2001
2002 if reverse:
2002 if reverse:
2003 node1, node2 = node2, node1
2003 node1, node2 = node2, node1
2004
2004
2005 diffopts = patch.diffallopts(ui, opts)
2005 diffopts = patch.diffallopts(ui, opts)
2006 m = scmutil.match(ctx2, pats, opts)
2006 m = scmutil.match(ctx2, pats, opts)
2007 m = repo.narrowmatch(m)
2007 m = repo.narrowmatch(m)
2008 ui.pager('diff')
2008 ui.pager('diff')
2009 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2009 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2010 listsubrepos=opts.get('subrepos'),
2010 listsubrepos=opts.get('subrepos'),
2011 root=opts.get('root'))
2011 root=opts.get('root'))
2012
2012
2013 @command('export',
2013 @command('export',
2014 [('B', 'bookmark', '',
2014 [('B', 'bookmark', '',
2015 _('export changes only reachable by given bookmark'), _('BOOKMARK')),
2015 _('export changes only reachable by given bookmark'), _('BOOKMARK')),
2016 ('o', 'output', '',
2016 ('o', 'output', '',
2017 _('print output to file with formatted name'), _('FORMAT')),
2017 _('print output to file with formatted name'), _('FORMAT')),
2018 ('', 'switch-parent', None, _('diff against the second parent')),
2018 ('', 'switch-parent', None, _('diff against the second parent')),
2019 ('r', 'rev', [], _('revisions to export'), _('REV')),
2019 ('r', 'rev', [], _('revisions to export'), _('REV')),
2020 ] + diffopts + formatteropts,
2020 ] + diffopts + formatteropts,
2021 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2021 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2022 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2022 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2023 helpbasic=True, intents={INTENT_READONLY})
2023 helpbasic=True, intents={INTENT_READONLY})
2024 def export(ui, repo, *changesets, **opts):
2024 def export(ui, repo, *changesets, **opts):
2025 """dump the header and diffs for one or more changesets
2025 """dump the header and diffs for one or more changesets
2026
2026
2027 Print the changeset header and diffs for one or more revisions.
2027 Print the changeset header and diffs for one or more revisions.
2028 If no revision is given, the parent of the working directory is used.
2028 If no revision is given, the parent of the working directory is used.
2029
2029
2030 The information shown in the changeset header is: author, date,
2030 The information shown in the changeset header is: author, date,
2031 branch name (if non-default), changeset hash, parent(s) and commit
2031 branch name (if non-default), changeset hash, parent(s) and commit
2032 comment.
2032 comment.
2033
2033
2034 .. note::
2034 .. note::
2035
2035
2036 :hg:`export` may generate unexpected diff output for merge
2036 :hg:`export` may generate unexpected diff output for merge
2037 changesets, as it will compare the merge changeset against its
2037 changesets, as it will compare the merge changeset against its
2038 first parent only.
2038 first parent only.
2039
2039
2040 Output may be to a file, in which case the name of the file is
2040 Output may be to a file, in which case the name of the file is
2041 given using a template string. See :hg:`help templates`. In addition
2041 given using a template string. See :hg:`help templates`. In addition
2042 to the common template keywords, the following formatting rules are
2042 to the common template keywords, the following formatting rules are
2043 supported:
2043 supported:
2044
2044
2045 :``%%``: literal "%" character
2045 :``%%``: literal "%" character
2046 :``%H``: changeset hash (40 hexadecimal digits)
2046 :``%H``: changeset hash (40 hexadecimal digits)
2047 :``%N``: number of patches being generated
2047 :``%N``: number of patches being generated
2048 :``%R``: changeset revision number
2048 :``%R``: changeset revision number
2049 :``%b``: basename of the exporting repository
2049 :``%b``: basename of the exporting repository
2050 :``%h``: short-form changeset hash (12 hexadecimal digits)
2050 :``%h``: short-form changeset hash (12 hexadecimal digits)
2051 :``%m``: first line of the commit message (only alphanumeric characters)
2051 :``%m``: first line of the commit message (only alphanumeric characters)
2052 :``%n``: zero-padded sequence number, starting at 1
2052 :``%n``: zero-padded sequence number, starting at 1
2053 :``%r``: zero-padded changeset revision number
2053 :``%r``: zero-padded changeset revision number
2054 :``\\``: literal "\\" character
2054 :``\\``: literal "\\" character
2055
2055
2056 Without the -a/--text option, export will avoid generating diffs
2056 Without the -a/--text option, export will avoid generating diffs
2057 of files it detects as binary. With -a, export will generate a
2057 of files it detects as binary. With -a, export will generate a
2058 diff anyway, probably with undesirable results.
2058 diff anyway, probably with undesirable results.
2059
2059
2060 With -B/--bookmark changesets reachable by the given bookmark are
2060 With -B/--bookmark changesets reachable by the given bookmark are
2061 selected.
2061 selected.
2062
2062
2063 Use the -g/--git option to generate diffs in the git extended diff
2063 Use the -g/--git option to generate diffs in the git extended diff
2064 format. See :hg:`help diffs` for more information.
2064 format. See :hg:`help diffs` for more information.
2065
2065
2066 With the --switch-parent option, the diff will be against the
2066 With the --switch-parent option, the diff will be against the
2067 second parent. It can be useful to review a merge.
2067 second parent. It can be useful to review a merge.
2068
2068
2069 .. container:: verbose
2069 .. container:: verbose
2070
2070
2071 Template:
2071 Template:
2072
2072
2073 The following keywords are supported in addition to the common template
2073 The following keywords are supported in addition to the common template
2074 keywords and functions. See also :hg:`help templates`.
2074 keywords and functions. See also :hg:`help templates`.
2075
2075
2076 :diff: String. Diff content.
2076 :diff: String. Diff content.
2077 :parents: List of strings. Parent nodes of the changeset.
2077 :parents: List of strings. Parent nodes of the changeset.
2078
2078
2079 Examples:
2079 Examples:
2080
2080
2081 - use export and import to transplant a bugfix to the current
2081 - use export and import to transplant a bugfix to the current
2082 branch::
2082 branch::
2083
2083
2084 hg export -r 9353 | hg import -
2084 hg export -r 9353 | hg import -
2085
2085
2086 - export all the changesets between two revisions to a file with
2086 - export all the changesets between two revisions to a file with
2087 rename information::
2087 rename information::
2088
2088
2089 hg export --git -r 123:150 > changes.txt
2089 hg export --git -r 123:150 > changes.txt
2090
2090
2091 - split outgoing changes into a series of patches with
2091 - split outgoing changes into a series of patches with
2092 descriptive names::
2092 descriptive names::
2093
2093
2094 hg export -r "outgoing()" -o "%n-%m.patch"
2094 hg export -r "outgoing()" -o "%n-%m.patch"
2095
2095
2096 Returns 0 on success.
2096 Returns 0 on success.
2097 """
2097 """
2098 opts = pycompat.byteskwargs(opts)
2098 opts = pycompat.byteskwargs(opts)
2099 bookmark = opts.get('bookmark')
2099 bookmark = opts.get('bookmark')
2100 changesets += tuple(opts.get('rev', []))
2100 changesets += tuple(opts.get('rev', []))
2101
2101
2102 if bookmark and changesets:
2102 if bookmark and changesets:
2103 raise error.Abort(_("-r and -B are mutually exclusive"))
2103 raise error.Abort(_("-r and -B are mutually exclusive"))
2104
2104
2105 if bookmark:
2105 if bookmark:
2106 if bookmark not in repo._bookmarks:
2106 if bookmark not in repo._bookmarks:
2107 raise error.Abort(_("bookmark '%s' not found") % bookmark)
2107 raise error.Abort(_("bookmark '%s' not found") % bookmark)
2108
2108
2109 revs = scmutil.bookmarkrevs(repo, bookmark)
2109 revs = scmutil.bookmarkrevs(repo, bookmark)
2110 else:
2110 else:
2111 if not changesets:
2111 if not changesets:
2112 changesets = ['.']
2112 changesets = ['.']
2113
2113
2114 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
2114 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
2115 revs = scmutil.revrange(repo, changesets)
2115 revs = scmutil.revrange(repo, changesets)
2116
2116
2117 if not revs:
2117 if not revs:
2118 raise error.Abort(_("export requires at least one changeset"))
2118 raise error.Abort(_("export requires at least one changeset"))
2119 if len(revs) > 1:
2119 if len(revs) > 1:
2120 ui.note(_('exporting patches:\n'))
2120 ui.note(_('exporting patches:\n'))
2121 else:
2121 else:
2122 ui.note(_('exporting patch:\n'))
2122 ui.note(_('exporting patch:\n'))
2123
2123
2124 fntemplate = opts.get('output')
2124 fntemplate = opts.get('output')
2125 if cmdutil.isstdiofilename(fntemplate):
2125 if cmdutil.isstdiofilename(fntemplate):
2126 fntemplate = ''
2126 fntemplate = ''
2127
2127
2128 if fntemplate:
2128 if fntemplate:
2129 fm = formatter.nullformatter(ui, 'export', opts)
2129 fm = formatter.nullformatter(ui, 'export', opts)
2130 else:
2130 else:
2131 ui.pager('export')
2131 ui.pager('export')
2132 fm = ui.formatter('export', opts)
2132 fm = ui.formatter('export', opts)
2133 with fm:
2133 with fm:
2134 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2134 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2135 switch_parent=opts.get('switch_parent'),
2135 switch_parent=opts.get('switch_parent'),
2136 opts=patch.diffallopts(ui, opts))
2136 opts=patch.diffallopts(ui, opts))
2137
2137
2138 @command('files',
2138 @command('files',
2139 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2139 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2140 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2140 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2141 ] + walkopts + formatteropts + subrepoopts,
2141 ] + walkopts + formatteropts + subrepoopts,
2142 _('[OPTION]... [FILE]...'),
2142 _('[OPTION]... [FILE]...'),
2143 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2143 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2144 intents={INTENT_READONLY})
2144 intents={INTENT_READONLY})
2145 def files(ui, repo, *pats, **opts):
2145 def files(ui, repo, *pats, **opts):
2146 """list tracked files
2146 """list tracked files
2147
2147
2148 Print files under Mercurial control in the working directory or
2148 Print files under Mercurial control in the working directory or
2149 specified revision for given files (excluding removed files).
2149 specified revision for given files (excluding removed files).
2150 Files can be specified as filenames or filesets.
2150 Files can be specified as filenames or filesets.
2151
2151
2152 If no files are given to match, this command prints the names
2152 If no files are given to match, this command prints the names
2153 of all files under Mercurial control.
2153 of all files under Mercurial control.
2154
2154
2155 .. container:: verbose
2155 .. container:: verbose
2156
2156
2157 Template:
2157 Template:
2158
2158
2159 The following keywords are supported in addition to the common template
2159 The following keywords are supported in addition to the common template
2160 keywords and functions. See also :hg:`help templates`.
2160 keywords and functions. See also :hg:`help templates`.
2161
2161
2162 :flags: String. Character denoting file's symlink and executable bits.
2162 :flags: String. Character denoting file's symlink and executable bits.
2163 :path: String. Repository-absolute path of the file.
2163 :path: String. Repository-absolute path of the file.
2164 :size: Integer. Size of the file in bytes.
2164 :size: Integer. Size of the file in bytes.
2165
2165
2166 Examples:
2166 Examples:
2167
2167
2168 - list all files under the current directory::
2168 - list all files under the current directory::
2169
2169
2170 hg files .
2170 hg files .
2171
2171
2172 - shows sizes and flags for current revision::
2172 - shows sizes and flags for current revision::
2173
2173
2174 hg files -vr .
2174 hg files -vr .
2175
2175
2176 - list all files named README::
2176 - list all files named README::
2177
2177
2178 hg files -I "**/README"
2178 hg files -I "**/README"
2179
2179
2180 - list all binary files::
2180 - list all binary files::
2181
2181
2182 hg files "set:binary()"
2182 hg files "set:binary()"
2183
2183
2184 - find files containing a regular expression::
2184 - find files containing a regular expression::
2185
2185
2186 hg files "set:grep('bob')"
2186 hg files "set:grep('bob')"
2187
2187
2188 - search tracked file contents with xargs and grep::
2188 - search tracked file contents with xargs and grep::
2189
2189
2190 hg files -0 | xargs -0 grep foo
2190 hg files -0 | xargs -0 grep foo
2191
2191
2192 See :hg:`help patterns` and :hg:`help filesets` for more information
2192 See :hg:`help patterns` and :hg:`help filesets` for more information
2193 on specifying file patterns.
2193 on specifying file patterns.
2194
2194
2195 Returns 0 if a match is found, 1 otherwise.
2195 Returns 0 if a match is found, 1 otherwise.
2196
2196
2197 """
2197 """
2198
2198
2199 opts = pycompat.byteskwargs(opts)
2199 opts = pycompat.byteskwargs(opts)
2200 rev = opts.get('rev')
2200 rev = opts.get('rev')
2201 if rev:
2201 if rev:
2202 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2202 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2203 ctx = scmutil.revsingle(repo, rev, None)
2203 ctx = scmutil.revsingle(repo, rev, None)
2204
2204
2205 end = '\n'
2205 end = '\n'
2206 if opts.get('print0'):
2206 if opts.get('print0'):
2207 end = '\0'
2207 end = '\0'
2208 fmt = '%s' + end
2208 fmt = '%s' + end
2209
2209
2210 m = scmutil.match(ctx, pats, opts)
2210 m = scmutil.match(ctx, pats, opts)
2211 ui.pager('files')
2211 ui.pager('files')
2212 with ui.formatter('files', opts) as fm:
2212 with ui.formatter('files', opts) as fm:
2213 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2213 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2214
2214
2215 @command(
2215 @command(
2216 'forget',
2216 'forget',
2217 [('i', 'interactive', None, _('use interactive mode')),
2217 [('i', 'interactive', None, _('use interactive mode')),
2218 ] + walkopts + dryrunopts,
2218 ] + walkopts + dryrunopts,
2219 _('[OPTION]... FILE...'),
2219 _('[OPTION]... FILE...'),
2220 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2220 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2221 helpbasic=True, inferrepo=True)
2221 helpbasic=True, inferrepo=True)
2222 def forget(ui, repo, *pats, **opts):
2222 def forget(ui, repo, *pats, **opts):
2223 """forget the specified files on the next commit
2223 """forget the specified files on the next commit
2224
2224
2225 Mark the specified files so they will no longer be tracked
2225 Mark the specified files so they will no longer be tracked
2226 after the next commit.
2226 after the next commit.
2227
2227
2228 This only removes files from the current branch, not from the
2228 This only removes files from the current branch, not from the
2229 entire project history, and it does not delete them from the
2229 entire project history, and it does not delete them from the
2230 working directory.
2230 working directory.
2231
2231
2232 To delete the file from the working directory, see :hg:`remove`.
2232 To delete the file from the working directory, see :hg:`remove`.
2233
2233
2234 To undo a forget before the next commit, see :hg:`add`.
2234 To undo a forget before the next commit, see :hg:`add`.
2235
2235
2236 .. container:: verbose
2236 .. container:: verbose
2237
2237
2238 Examples:
2238 Examples:
2239
2239
2240 - forget newly-added binary files::
2240 - forget newly-added binary files::
2241
2241
2242 hg forget "set:added() and binary()"
2242 hg forget "set:added() and binary()"
2243
2243
2244 - forget files that would be excluded by .hgignore::
2244 - forget files that would be excluded by .hgignore::
2245
2245
2246 hg forget "set:hgignore()"
2246 hg forget "set:hgignore()"
2247
2247
2248 Returns 0 on success.
2248 Returns 0 on success.
2249 """
2249 """
2250
2250
2251 opts = pycompat.byteskwargs(opts)
2251 opts = pycompat.byteskwargs(opts)
2252 if not pats:
2252 if not pats:
2253 raise error.Abort(_('no files specified'))
2253 raise error.Abort(_('no files specified'))
2254
2254
2255 m = scmutil.match(repo[None], pats, opts)
2255 m = scmutil.match(repo[None], pats, opts)
2256 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2256 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2257 rejected = cmdutil.forget(ui, repo, m, prefix="",
2257 rejected = cmdutil.forget(ui, repo, m, prefix="",
2258 explicitonly=False, dryrun=dryrun,
2258 explicitonly=False, dryrun=dryrun,
2259 interactive=interactive)[0]
2259 interactive=interactive)[0]
2260 return rejected and 1 or 0
2260 return rejected and 1 or 0
2261
2261
2262 @command(
2262 @command(
2263 'graft',
2263 'graft',
2264 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2264 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2265 ('', 'base', '',
2265 ('', 'base', '',
2266 _('base revision when doing the graft merge (ADVANCED)'), _('REV')),
2266 _('base revision when doing the graft merge (ADVANCED)'), _('REV')),
2267 ('c', 'continue', False, _('resume interrupted graft')),
2267 ('c', 'continue', False, _('resume interrupted graft')),
2268 ('', 'stop', False, _('stop interrupted graft')),
2268 ('', 'stop', False, _('stop interrupted graft')),
2269 ('', 'abort', False, _('abort interrupted graft')),
2269 ('', 'abort', False, _('abort interrupted graft')),
2270 ('e', 'edit', False, _('invoke editor on commit messages')),
2270 ('e', 'edit', False, _('invoke editor on commit messages')),
2271 ('', 'log', None, _('append graft info to log message')),
2271 ('', 'log', None, _('append graft info to log message')),
2272 ('', 'no-commit', None,
2272 ('', 'no-commit', None,
2273 _("don't commit, just apply the changes in working directory")),
2273 _("don't commit, just apply the changes in working directory")),
2274 ('f', 'force', False, _('force graft')),
2274 ('f', 'force', False, _('force graft')),
2275 ('D', 'currentdate', False,
2275 ('D', 'currentdate', False,
2276 _('record the current date as commit date')),
2276 _('record the current date as commit date')),
2277 ('U', 'currentuser', False,
2277 ('U', 'currentuser', False,
2278 _('record the current user as committer'))]
2278 _('record the current user as committer'))]
2279 + commitopts2 + mergetoolopts + dryrunopts,
2279 + commitopts2 + mergetoolopts + dryrunopts,
2280 _('[OPTION]... [-r REV]... REV...'),
2280 _('[OPTION]... [-r REV]... REV...'),
2281 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
2281 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
2282 def graft(ui, repo, *revs, **opts):
2282 def graft(ui, repo, *revs, **opts):
2283 '''copy changes from other branches onto the current branch
2283 '''copy changes from other branches onto the current branch
2284
2284
2285 This command uses Mercurial's merge logic to copy individual
2285 This command uses Mercurial's merge logic to copy individual
2286 changes from other branches without merging branches in the
2286 changes from other branches without merging branches in the
2287 history graph. This is sometimes known as 'backporting' or
2287 history graph. This is sometimes known as 'backporting' or
2288 'cherry-picking'. By default, graft will copy user, date, and
2288 'cherry-picking'. By default, graft will copy user, date, and
2289 description from the source changesets.
2289 description from the source changesets.
2290
2290
2291 Changesets that are ancestors of the current revision, that have
2291 Changesets that are ancestors of the current revision, that have
2292 already been grafted, or that are merges will be skipped.
2292 already been grafted, or that are merges will be skipped.
2293
2293
2294 If --log is specified, log messages will have a comment appended
2294 If --log is specified, log messages will have a comment appended
2295 of the form::
2295 of the form::
2296
2296
2297 (grafted from CHANGESETHASH)
2297 (grafted from CHANGESETHASH)
2298
2298
2299 If --force is specified, revisions will be grafted even if they
2299 If --force is specified, revisions will be grafted even if they
2300 are already ancestors of, or have been grafted to, the destination.
2300 are already ancestors of, or have been grafted to, the destination.
2301 This is useful when the revisions have since been backed out.
2301 This is useful when the revisions have since been backed out.
2302
2302
2303 If a graft merge results in conflicts, the graft process is
2303 If a graft merge results in conflicts, the graft process is
2304 interrupted so that the current merge can be manually resolved.
2304 interrupted so that the current merge can be manually resolved.
2305 Once all conflicts are addressed, the graft process can be
2305 Once all conflicts are addressed, the graft process can be
2306 continued with the -c/--continue option.
2306 continued with the -c/--continue option.
2307
2307
2308 The -c/--continue option reapplies all the earlier options.
2308 The -c/--continue option reapplies all the earlier options.
2309
2309
2310 .. container:: verbose
2310 .. container:: verbose
2311
2311
2312 The --base option exposes more of how graft internally uses merge with a
2312 The --base option exposes more of how graft internally uses merge with a
2313 custom base revision. --base can be used to specify another ancestor than
2313 custom base revision. --base can be used to specify another ancestor than
2314 the first and only parent.
2314 the first and only parent.
2315
2315
2316 The command::
2316 The command::
2317
2317
2318 hg graft -r 345 --base 234
2318 hg graft -r 345 --base 234
2319
2319
2320 is thus pretty much the same as::
2320 is thus pretty much the same as::
2321
2321
2322 hg diff -r 234 -r 345 | hg import
2322 hg diff -r 234 -r 345 | hg import
2323
2323
2324 but using merge to resolve conflicts and track moved files.
2324 but using merge to resolve conflicts and track moved files.
2325
2325
2326 The result of a merge can thus be backported as a single commit by
2326 The result of a merge can thus be backported as a single commit by
2327 specifying one of the merge parents as base, and thus effectively
2327 specifying one of the merge parents as base, and thus effectively
2328 grafting the changes from the other side.
2328 grafting the changes from the other side.
2329
2329
2330 It is also possible to collapse multiple changesets and clean up history
2330 It is also possible to collapse multiple changesets and clean up history
2331 by specifying another ancestor as base, much like rebase --collapse
2331 by specifying another ancestor as base, much like rebase --collapse
2332 --keep.
2332 --keep.
2333
2333
2334 The commit message can be tweaked after the fact using commit --amend .
2334 The commit message can be tweaked after the fact using commit --amend .
2335
2335
2336 For using non-ancestors as the base to backout changes, see the backout
2336 For using non-ancestors as the base to backout changes, see the backout
2337 command and the hidden --parent option.
2337 command and the hidden --parent option.
2338
2338
2339 .. container:: verbose
2339 .. container:: verbose
2340
2340
2341 Examples:
2341 Examples:
2342
2342
2343 - copy a single change to the stable branch and edit its description::
2343 - copy a single change to the stable branch and edit its description::
2344
2344
2345 hg update stable
2345 hg update stable
2346 hg graft --edit 9393
2346 hg graft --edit 9393
2347
2347
2348 - graft a range of changesets with one exception, updating dates::
2348 - graft a range of changesets with one exception, updating dates::
2349
2349
2350 hg graft -D "2085::2093 and not 2091"
2350 hg graft -D "2085::2093 and not 2091"
2351
2351
2352 - continue a graft after resolving conflicts::
2352 - continue a graft after resolving conflicts::
2353
2353
2354 hg graft -c
2354 hg graft -c
2355
2355
2356 - show the source of a grafted changeset::
2356 - show the source of a grafted changeset::
2357
2357
2358 hg log --debug -r .
2358 hg log --debug -r .
2359
2359
2360 - show revisions sorted by date::
2360 - show revisions sorted by date::
2361
2361
2362 hg log -r "sort(all(), date)"
2362 hg log -r "sort(all(), date)"
2363
2363
2364 - backport the result of a merge as a single commit::
2364 - backport the result of a merge as a single commit::
2365
2365
2366 hg graft -r 123 --base 123^
2366 hg graft -r 123 --base 123^
2367
2367
2368 - land a feature branch as one changeset::
2368 - land a feature branch as one changeset::
2369
2369
2370 hg up -cr default
2370 hg up -cr default
2371 hg graft -r featureX --base "ancestor('featureX', 'default')"
2371 hg graft -r featureX --base "ancestor('featureX', 'default')"
2372
2372
2373 See :hg:`help revisions` for more about specifying revisions.
2373 See :hg:`help revisions` for more about specifying revisions.
2374
2374
2375 Returns 0 on successful completion.
2375 Returns 0 on successful completion.
2376 '''
2376 '''
2377 with repo.wlock():
2377 with repo.wlock():
2378 return _dograft(ui, repo, *revs, **opts)
2378 return _dograft(ui, repo, *revs, **opts)
2379
2379
2380 def _dograft(ui, repo, *revs, **opts):
2380 def _dograft(ui, repo, *revs, **opts):
2381 opts = pycompat.byteskwargs(opts)
2381 opts = pycompat.byteskwargs(opts)
2382 if revs and opts.get('rev'):
2382 if revs and opts.get('rev'):
2383 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2383 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2384 'revision ordering!\n'))
2384 'revision ordering!\n'))
2385
2385
2386 revs = list(revs)
2386 revs = list(revs)
2387 revs.extend(opts.get('rev'))
2387 revs.extend(opts.get('rev'))
2388 basectx = None
2388 basectx = None
2389 if opts.get('base'):
2389 if opts.get('base'):
2390 basectx = scmutil.revsingle(repo, opts['base'], None)
2390 basectx = scmutil.revsingle(repo, opts['base'], None)
2391 # a dict of data to be stored in state file
2391 # a dict of data to be stored in state file
2392 statedata = {}
2392 statedata = {}
2393 # list of new nodes created by ongoing graft
2393 # list of new nodes created by ongoing graft
2394 statedata['newnodes'] = []
2394 statedata['newnodes'] = []
2395
2395
2396 if opts.get('user') and opts.get('currentuser'):
2396 if opts.get('user') and opts.get('currentuser'):
2397 raise error.Abort(_('--user and --currentuser are mutually exclusive'))
2397 raise error.Abort(_('--user and --currentuser are mutually exclusive'))
2398 if opts.get('date') and opts.get('currentdate'):
2398 if opts.get('date') and opts.get('currentdate'):
2399 raise error.Abort(_('--date and --currentdate are mutually exclusive'))
2399 raise error.Abort(_('--date and --currentdate are mutually exclusive'))
2400 if not opts.get('user') and opts.get('currentuser'):
2400 if not opts.get('user') and opts.get('currentuser'):
2401 opts['user'] = ui.username()
2401 opts['user'] = ui.username()
2402 if not opts.get('date') and opts.get('currentdate'):
2402 if not opts.get('date') and opts.get('currentdate'):
2403 opts['date'] = "%d %d" % dateutil.makedate()
2403 opts['date'] = "%d %d" % dateutil.makedate()
2404
2404
2405 editor = cmdutil.getcommiteditor(editform='graft',
2405 editor = cmdutil.getcommiteditor(editform='graft',
2406 **pycompat.strkwargs(opts))
2406 **pycompat.strkwargs(opts))
2407
2407
2408 cont = False
2408 cont = False
2409 if opts.get('no_commit'):
2409 if opts.get('no_commit'):
2410 if opts.get('edit'):
2410 if opts.get('edit'):
2411 raise error.Abort(_("cannot specify --no-commit and "
2411 raise error.Abort(_("cannot specify --no-commit and "
2412 "--edit together"))
2412 "--edit together"))
2413 if opts.get('currentuser'):
2413 if opts.get('currentuser'):
2414 raise error.Abort(_("cannot specify --no-commit and "
2414 raise error.Abort(_("cannot specify --no-commit and "
2415 "--currentuser together"))
2415 "--currentuser together"))
2416 if opts.get('currentdate'):
2416 if opts.get('currentdate'):
2417 raise error.Abort(_("cannot specify --no-commit and "
2417 raise error.Abort(_("cannot specify --no-commit and "
2418 "--currentdate together"))
2418 "--currentdate together"))
2419 if opts.get('log'):
2419 if opts.get('log'):
2420 raise error.Abort(_("cannot specify --no-commit and "
2420 raise error.Abort(_("cannot specify --no-commit and "
2421 "--log together"))
2421 "--log together"))
2422
2422
2423 graftstate = statemod.cmdstate(repo, 'graftstate')
2423 graftstate = statemod.cmdstate(repo, 'graftstate')
2424
2424
2425 if opts.get('stop'):
2425 if opts.get('stop'):
2426 if opts.get('continue'):
2426 if opts.get('continue'):
2427 raise error.Abort(_("cannot use '--continue' and "
2427 raise error.Abort(_("cannot use '--continue' and "
2428 "'--stop' together"))
2428 "'--stop' together"))
2429 if opts.get('abort'):
2429 if opts.get('abort'):
2430 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
2430 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
2431
2431
2432 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2432 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2433 opts.get('date'), opts.get('currentdate'),
2433 opts.get('date'), opts.get('currentdate'),
2434 opts.get('currentuser'), opts.get('rev'))):
2434 opts.get('currentuser'), opts.get('rev'))):
2435 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2435 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2436 return _stopgraft(ui, repo, graftstate)
2436 return _stopgraft(ui, repo, graftstate)
2437 elif opts.get('abort'):
2437 elif opts.get('abort'):
2438 if opts.get('continue'):
2438 if opts.get('continue'):
2439 raise error.Abort(_("cannot use '--continue' and "
2439 raise error.Abort(_("cannot use '--continue' and "
2440 "'--abort' together"))
2440 "'--abort' together"))
2441 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2441 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2442 opts.get('date'), opts.get('currentdate'),
2442 opts.get('date'), opts.get('currentdate'),
2443 opts.get('currentuser'), opts.get('rev'))):
2443 opts.get('currentuser'), opts.get('rev'))):
2444 raise error.Abort(_("cannot specify any other flag with '--abort'"))
2444 raise error.Abort(_("cannot specify any other flag with '--abort'"))
2445
2445
2446 return _abortgraft(ui, repo, graftstate)
2446 return _abortgraft(ui, repo, graftstate)
2447 elif opts.get('continue'):
2447 elif opts.get('continue'):
2448 cont = True
2448 cont = True
2449 if revs:
2449 if revs:
2450 raise error.Abort(_("can't specify --continue and revisions"))
2450 raise error.Abort(_("can't specify --continue and revisions"))
2451 # read in unfinished revisions
2451 # read in unfinished revisions
2452 if graftstate.exists():
2452 if graftstate.exists():
2453 statedata = _readgraftstate(repo, graftstate)
2453 statedata = _readgraftstate(repo, graftstate)
2454 if statedata.get('date'):
2454 if statedata.get('date'):
2455 opts['date'] = statedata['date']
2455 opts['date'] = statedata['date']
2456 if statedata.get('user'):
2456 if statedata.get('user'):
2457 opts['user'] = statedata['user']
2457 opts['user'] = statedata['user']
2458 if statedata.get('log'):
2458 if statedata.get('log'):
2459 opts['log'] = True
2459 opts['log'] = True
2460 if statedata.get('no_commit'):
2460 if statedata.get('no_commit'):
2461 opts['no_commit'] = statedata.get('no_commit')
2461 opts['no_commit'] = statedata.get('no_commit')
2462 nodes = statedata['nodes']
2462 nodes = statedata['nodes']
2463 revs = [repo[node].rev() for node in nodes]
2463 revs = [repo[node].rev() for node in nodes]
2464 else:
2464 else:
2465 cmdutil.wrongtooltocontinue(repo, _('graft'))
2465 cmdutil.wrongtooltocontinue(repo, _('graft'))
2466 else:
2466 else:
2467 if not revs:
2467 if not revs:
2468 raise error.Abort(_('no revisions specified'))
2468 raise error.Abort(_('no revisions specified'))
2469 cmdutil.checkunfinished(repo)
2469 cmdutil.checkunfinished(repo)
2470 cmdutil.bailifchanged(repo)
2470 cmdutil.bailifchanged(repo)
2471 revs = scmutil.revrange(repo, revs)
2471 revs = scmutil.revrange(repo, revs)
2472
2472
2473 skipped = set()
2473 skipped = set()
2474 if basectx is None:
2474 if basectx is None:
2475 # check for merges
2475 # check for merges
2476 for rev in repo.revs('%ld and merge()', revs):
2476 for rev in repo.revs('%ld and merge()', revs):
2477 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2477 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2478 skipped.add(rev)
2478 skipped.add(rev)
2479 revs = [r for r in revs if r not in skipped]
2479 revs = [r for r in revs if r not in skipped]
2480 if not revs:
2480 if not revs:
2481 return -1
2481 return -1
2482 if basectx is not None and len(revs) != 1:
2482 if basectx is not None and len(revs) != 1:
2483 raise error.Abort(_('only one revision allowed with --base '))
2483 raise error.Abort(_('only one revision allowed with --base '))
2484
2484
2485 # Don't check in the --continue case, in effect retaining --force across
2485 # Don't check in the --continue case, in effect retaining --force across
2486 # --continues. That's because without --force, any revisions we decided to
2486 # --continues. That's because without --force, any revisions we decided to
2487 # skip would have been filtered out here, so they wouldn't have made their
2487 # skip would have been filtered out here, so they wouldn't have made their
2488 # way to the graftstate. With --force, any revisions we would have otherwise
2488 # way to the graftstate. With --force, any revisions we would have otherwise
2489 # skipped would not have been filtered out, and if they hadn't been applied
2489 # skipped would not have been filtered out, and if they hadn't been applied
2490 # already, they'd have been in the graftstate.
2490 # already, they'd have been in the graftstate.
2491 if not (cont or opts.get('force')) and basectx is None:
2491 if not (cont or opts.get('force')) and basectx is None:
2492 # check for ancestors of dest branch
2492 # check for ancestors of dest branch
2493 crev = repo['.'].rev()
2493 crev = repo['.'].rev()
2494 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2494 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2495 # XXX make this lazy in the future
2495 # XXX make this lazy in the future
2496 # don't mutate while iterating, create a copy
2496 # don't mutate while iterating, create a copy
2497 for rev in list(revs):
2497 for rev in list(revs):
2498 if rev in ancestors:
2498 if rev in ancestors:
2499 ui.warn(_('skipping ancestor revision %d:%s\n') %
2499 ui.warn(_('skipping ancestor revision %d:%s\n') %
2500 (rev, repo[rev]))
2500 (rev, repo[rev]))
2501 # XXX remove on list is slow
2501 # XXX remove on list is slow
2502 revs.remove(rev)
2502 revs.remove(rev)
2503 if not revs:
2503 if not revs:
2504 return -1
2504 return -1
2505
2505
2506 # analyze revs for earlier grafts
2506 # analyze revs for earlier grafts
2507 ids = {}
2507 ids = {}
2508 for ctx in repo.set("%ld", revs):
2508 for ctx in repo.set("%ld", revs):
2509 ids[ctx.hex()] = ctx.rev()
2509 ids[ctx.hex()] = ctx.rev()
2510 n = ctx.extra().get('source')
2510 n = ctx.extra().get('source')
2511 if n:
2511 if n:
2512 ids[n] = ctx.rev()
2512 ids[n] = ctx.rev()
2513
2513
2514 # check ancestors for earlier grafts
2514 # check ancestors for earlier grafts
2515 ui.debug('scanning for duplicate grafts\n')
2515 ui.debug('scanning for duplicate grafts\n')
2516
2516
2517 # The only changesets we can be sure doesn't contain grafts of any
2517 # The only changesets we can be sure doesn't contain grafts of any
2518 # revs, are the ones that are common ancestors of *all* revs:
2518 # revs, are the ones that are common ancestors of *all* revs:
2519 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2519 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2520 ctx = repo[rev]
2520 ctx = repo[rev]
2521 n = ctx.extra().get('source')
2521 n = ctx.extra().get('source')
2522 if n in ids:
2522 if n in ids:
2523 try:
2523 try:
2524 r = repo[n].rev()
2524 r = repo[n].rev()
2525 except error.RepoLookupError:
2525 except error.RepoLookupError:
2526 r = None
2526 r = None
2527 if r in revs:
2527 if r in revs:
2528 ui.warn(_('skipping revision %d:%s '
2528 ui.warn(_('skipping revision %d:%s '
2529 '(already grafted to %d:%s)\n')
2529 '(already grafted to %d:%s)\n')
2530 % (r, repo[r], rev, ctx))
2530 % (r, repo[r], rev, ctx))
2531 revs.remove(r)
2531 revs.remove(r)
2532 elif ids[n] in revs:
2532 elif ids[n] in revs:
2533 if r is None:
2533 if r is None:
2534 ui.warn(_('skipping already grafted revision %d:%s '
2534 ui.warn(_('skipping already grafted revision %d:%s '
2535 '(%d:%s also has unknown origin %s)\n')
2535 '(%d:%s also has unknown origin %s)\n')
2536 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2536 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2537 else:
2537 else:
2538 ui.warn(_('skipping already grafted revision %d:%s '
2538 ui.warn(_('skipping already grafted revision %d:%s '
2539 '(%d:%s also has origin %d:%s)\n')
2539 '(%d:%s also has origin %d:%s)\n')
2540 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2540 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2541 revs.remove(ids[n])
2541 revs.remove(ids[n])
2542 elif ctx.hex() in ids:
2542 elif ctx.hex() in ids:
2543 r = ids[ctx.hex()]
2543 r = ids[ctx.hex()]
2544 if r in revs:
2544 if r in revs:
2545 ui.warn(_('skipping already grafted revision %d:%s '
2545 ui.warn(_('skipping already grafted revision %d:%s '
2546 '(was grafted from %d:%s)\n') %
2546 '(was grafted from %d:%s)\n') %
2547 (r, repo[r], rev, ctx))
2547 (r, repo[r], rev, ctx))
2548 revs.remove(r)
2548 revs.remove(r)
2549 if not revs:
2549 if not revs:
2550 return -1
2550 return -1
2551
2551
2552 if opts.get('no_commit'):
2552 if opts.get('no_commit'):
2553 statedata['no_commit'] = True
2553 statedata['no_commit'] = True
2554 for pos, ctx in enumerate(repo.set("%ld", revs)):
2554 for pos, ctx in enumerate(repo.set("%ld", revs)):
2555 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2555 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2556 ctx.description().split('\n', 1)[0])
2556 ctx.description().split('\n', 1)[0])
2557 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2557 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2558 if names:
2558 if names:
2559 desc += ' (%s)' % ' '.join(names)
2559 desc += ' (%s)' % ' '.join(names)
2560 ui.status(_('grafting %s\n') % desc)
2560 ui.status(_('grafting %s\n') % desc)
2561 if opts.get('dry_run'):
2561 if opts.get('dry_run'):
2562 continue
2562 continue
2563
2563
2564 source = ctx.extra().get('source')
2564 source = ctx.extra().get('source')
2565 extra = {}
2565 extra = {}
2566 if source:
2566 if source:
2567 extra['source'] = source
2567 extra['source'] = source
2568 extra['intermediate-source'] = ctx.hex()
2568 extra['intermediate-source'] = ctx.hex()
2569 else:
2569 else:
2570 extra['source'] = ctx.hex()
2570 extra['source'] = ctx.hex()
2571 user = ctx.user()
2571 user = ctx.user()
2572 if opts.get('user'):
2572 if opts.get('user'):
2573 user = opts['user']
2573 user = opts['user']
2574 statedata['user'] = user
2574 statedata['user'] = user
2575 date = ctx.date()
2575 date = ctx.date()
2576 if opts.get('date'):
2576 if opts.get('date'):
2577 date = opts['date']
2577 date = opts['date']
2578 statedata['date'] = date
2578 statedata['date'] = date
2579 message = ctx.description()
2579 message = ctx.description()
2580 if opts.get('log'):
2580 if opts.get('log'):
2581 message += '\n(grafted from %s)' % ctx.hex()
2581 message += '\n(grafted from %s)' % ctx.hex()
2582 statedata['log'] = True
2582 statedata['log'] = True
2583
2583
2584 # we don't merge the first commit when continuing
2584 # we don't merge the first commit when continuing
2585 if not cont:
2585 if not cont:
2586 # perform the graft merge with p1(rev) as 'ancestor'
2586 # perform the graft merge with p1(rev) as 'ancestor'
2587 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2587 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2588 base = ctx.p1() if basectx is None else basectx
2588 base = ctx.p1() if basectx is None else basectx
2589 with ui.configoverride(overrides, 'graft'):
2589 with ui.configoverride(overrides, 'graft'):
2590 stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
2590 stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
2591 # report any conflicts
2591 # report any conflicts
2592 if stats.unresolvedcount > 0:
2592 if stats.unresolvedcount > 0:
2593 # write out state for --continue
2593 # write out state for --continue
2594 nodes = [repo[rev].hex() for rev in revs[pos:]]
2594 nodes = [repo[rev].hex() for rev in revs[pos:]]
2595 statedata['nodes'] = nodes
2595 statedata['nodes'] = nodes
2596 stateversion = 1
2596 stateversion = 1
2597 graftstate.save(stateversion, statedata)
2597 graftstate.save(stateversion, statedata)
2598 hint = _("use 'hg resolve' and 'hg graft --continue'")
2598 hint = _("use 'hg resolve' and 'hg graft --continue'")
2599 raise error.Abort(
2599 raise error.Abort(
2600 _("unresolved conflicts, can't continue"),
2600 _("unresolved conflicts, can't continue"),
2601 hint=hint)
2601 hint=hint)
2602 else:
2602 else:
2603 cont = False
2603 cont = False
2604
2604
2605 # commit if --no-commit is false
2605 # commit if --no-commit is false
2606 if not opts.get('no_commit'):
2606 if not opts.get('no_commit'):
2607 node = repo.commit(text=message, user=user, date=date, extra=extra,
2607 node = repo.commit(text=message, user=user, date=date, extra=extra,
2608 editor=editor)
2608 editor=editor)
2609 if node is None:
2609 if node is None:
2610 ui.warn(
2610 ui.warn(
2611 _('note: graft of %d:%s created no changes to commit\n') %
2611 _('note: graft of %d:%s created no changes to commit\n') %
2612 (ctx.rev(), ctx))
2612 (ctx.rev(), ctx))
2613 # checking that newnodes exist because old state files won't have it
2613 # checking that newnodes exist because old state files won't have it
2614 elif statedata.get('newnodes') is not None:
2614 elif statedata.get('newnodes') is not None:
2615 statedata['newnodes'].append(node)
2615 statedata['newnodes'].append(node)
2616
2616
2617 # remove state when we complete successfully
2617 # remove state when we complete successfully
2618 if not opts.get('dry_run'):
2618 if not opts.get('dry_run'):
2619 graftstate.delete()
2619 graftstate.delete()
2620
2620
2621 return 0
2621 return 0
2622
2622
2623 def _abortgraft(ui, repo, graftstate):
2623 def _abortgraft(ui, repo, graftstate):
2624 """abort the interrupted graft and rollbacks to the state before interrupted
2624 """abort the interrupted graft and rollbacks to the state before interrupted
2625 graft"""
2625 graft"""
2626 if not graftstate.exists():
2626 if not graftstate.exists():
2627 raise error.Abort(_("no interrupted graft to abort"))
2627 raise error.Abort(_("no interrupted graft to abort"))
2628 statedata = _readgraftstate(repo, graftstate)
2628 statedata = _readgraftstate(repo, graftstate)
2629 newnodes = statedata.get('newnodes')
2629 newnodes = statedata.get('newnodes')
2630 if newnodes is None:
2630 if newnodes is None:
2631 # and old graft state which does not have all the data required to abort
2631 # and old graft state which does not have all the data required to abort
2632 # the graft
2632 # the graft
2633 raise error.Abort(_("cannot abort using an old graftstate"))
2633 raise error.Abort(_("cannot abort using an old graftstate"))
2634
2634
2635 # changeset from which graft operation was started
2635 # changeset from which graft operation was started
2636 if len(newnodes) > 0:
2636 if len(newnodes) > 0:
2637 startctx = repo[newnodes[0]].p1()
2637 startctx = repo[newnodes[0]].p1()
2638 else:
2638 else:
2639 startctx = repo['.']
2639 startctx = repo['.']
2640 # whether to strip or not
2640 # whether to strip or not
2641 cleanup = False
2641 cleanup = False
2642 if newnodes:
2642 if newnodes:
2643 newnodes = [repo[r].rev() for r in newnodes]
2643 newnodes = [repo[r].rev() for r in newnodes]
2644 cleanup = True
2644 cleanup = True
2645 # checking that none of the newnodes turned public or is public
2645 # checking that none of the newnodes turned public or is public
2646 immutable = [c for c in newnodes if not repo[c].mutable()]
2646 immutable = [c for c in newnodes if not repo[c].mutable()]
2647 if immutable:
2647 if immutable:
2648 repo.ui.warn(_("cannot clean up public changesets %s\n")
2648 repo.ui.warn(_("cannot clean up public changesets %s\n")
2649 % ', '.join(bytes(repo[r]) for r in immutable),
2649 % ', '.join(bytes(repo[r]) for r in immutable),
2650 hint=_("see 'hg help phases' for details"))
2650 hint=_("see 'hg help phases' for details"))
2651 cleanup = False
2651 cleanup = False
2652
2652
2653 # checking that no new nodes are created on top of grafted revs
2653 # checking that no new nodes are created on top of grafted revs
2654 desc = set(repo.changelog.descendants(newnodes))
2654 desc = set(repo.changelog.descendants(newnodes))
2655 if desc - set(newnodes):
2655 if desc - set(newnodes):
2656 repo.ui.warn(_("new changesets detected on destination "
2656 repo.ui.warn(_("new changesets detected on destination "
2657 "branch, can't strip\n"))
2657 "branch, can't strip\n"))
2658 cleanup = False
2658 cleanup = False
2659
2659
2660 if cleanup:
2660 if cleanup:
2661 with repo.wlock(), repo.lock():
2661 with repo.wlock(), repo.lock():
2662 hg.updaterepo(repo, startctx.node(), overwrite=True)
2662 hg.updaterepo(repo, startctx.node(), overwrite=True)
2663 # stripping the new nodes created
2663 # stripping the new nodes created
2664 strippoints = [c.node() for c in repo.set("roots(%ld)",
2664 strippoints = [c.node() for c in repo.set("roots(%ld)",
2665 newnodes)]
2665 newnodes)]
2666 repair.strip(repo.ui, repo, strippoints, backup=False)
2666 repair.strip(repo.ui, repo, strippoints, backup=False)
2667
2667
2668 if not cleanup:
2668 if not cleanup:
2669 # we don't update to the startnode if we can't strip
2669 # we don't update to the startnode if we can't strip
2670 startctx = repo['.']
2670 startctx = repo['.']
2671 hg.updaterepo(repo, startctx.node(), overwrite=True)
2671 hg.updaterepo(repo, startctx.node(), overwrite=True)
2672
2672
2673 ui.status(_("graft aborted\n"))
2673 ui.status(_("graft aborted\n"))
2674 ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
2674 ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
2675 graftstate.delete()
2675 graftstate.delete()
2676 return 0
2676 return 0
2677
2677
2678 def _readgraftstate(repo, graftstate):
2678 def _readgraftstate(repo, graftstate):
2679 """read the graft state file and return a dict of the data stored in it"""
2679 """read the graft state file and return a dict of the data stored in it"""
2680 try:
2680 try:
2681 return graftstate.read()
2681 return graftstate.read()
2682 except error.CorruptedState:
2682 except error.CorruptedState:
2683 nodes = repo.vfs.read('graftstate').splitlines()
2683 nodes = repo.vfs.read('graftstate').splitlines()
2684 return {'nodes': nodes}
2684 return {'nodes': nodes}
2685
2685
2686 def _stopgraft(ui, repo, graftstate):
2686 def _stopgraft(ui, repo, graftstate):
2687 """stop the interrupted graft"""
2687 """stop the interrupted graft"""
2688 if not graftstate.exists():
2688 if not graftstate.exists():
2689 raise error.Abort(_("no interrupted graft found"))
2689 raise error.Abort(_("no interrupted graft found"))
2690 pctx = repo['.']
2690 pctx = repo['.']
2691 hg.updaterepo(repo, pctx.node(), overwrite=True)
2691 hg.updaterepo(repo, pctx.node(), overwrite=True)
2692 graftstate.delete()
2692 graftstate.delete()
2693 ui.status(_("stopped the interrupted graft\n"))
2693 ui.status(_("stopped the interrupted graft\n"))
2694 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2694 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2695 return 0
2695 return 0
2696
2696
2697 @command('grep',
2697 @command('grep',
2698 [('0', 'print0', None, _('end fields with NUL')),
2698 [('0', 'print0', None, _('end fields with NUL')),
2699 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
2699 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
2700 ('', 'diff', None, _('print all revisions when the term was introduced '
2700 ('', 'diff', None, _('print all revisions when the term was introduced '
2701 'or removed')),
2701 'or removed')),
2702 ('a', 'text', None, _('treat all files as text')),
2702 ('a', 'text', None, _('treat all files as text')),
2703 ('f', 'follow', None,
2703 ('f', 'follow', None,
2704 _('follow changeset history,'
2704 _('follow changeset history,'
2705 ' or file history across copies and renames')),
2705 ' or file history across copies and renames')),
2706 ('i', 'ignore-case', None, _('ignore case when matching')),
2706 ('i', 'ignore-case', None, _('ignore case when matching')),
2707 ('l', 'files-with-matches', None,
2707 ('l', 'files-with-matches', None,
2708 _('print only filenames and revisions that match')),
2708 _('print only filenames and revisions that match')),
2709 ('n', 'line-number', None, _('print matching line numbers')),
2709 ('n', 'line-number', None, _('print matching line numbers')),
2710 ('r', 'rev', [],
2710 ('r', 'rev', [],
2711 _('only search files changed within revision range'), _('REV')),
2711 _('only search files changed within revision range'), _('REV')),
2712 ('', 'all-files', None,
2712 ('', 'all-files', None,
2713 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2713 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2714 ('u', 'user', None, _('list the author (long with -v)')),
2714 ('u', 'user', None, _('list the author (long with -v)')),
2715 ('d', 'date', None, _('list the date (short with -q)')),
2715 ('d', 'date', None, _('list the date (short with -q)')),
2716 ] + formatteropts + walkopts,
2716 ] + formatteropts + walkopts,
2717 _('[OPTION]... PATTERN [FILE]...'),
2717 _('[OPTION]... PATTERN [FILE]...'),
2718 helpcategory=command.CATEGORY_FILE_CONTENTS,
2718 helpcategory=command.CATEGORY_FILE_CONTENTS,
2719 inferrepo=True,
2719 inferrepo=True,
2720 intents={INTENT_READONLY})
2720 intents={INTENT_READONLY})
2721 def grep(ui, repo, pattern, *pats, **opts):
2721 def grep(ui, repo, pattern, *pats, **opts):
2722 """search revision history for a pattern in specified files
2722 """search revision history for a pattern in specified files
2723
2723
2724 Search revision history for a regular expression in the specified
2724 Search revision history for a regular expression in the specified
2725 files or the entire project.
2725 files or the entire project.
2726
2726
2727 By default, grep prints the most recent revision number for each
2727 By default, grep prints the most recent revision number for each
2728 file in which it finds a match. To get it to print every revision
2728 file in which it finds a match. To get it to print every revision
2729 that contains a change in match status ("-" for a match that becomes
2729 that contains a change in match status ("-" for a match that becomes
2730 a non-match, or "+" for a non-match that becomes a match), use the
2730 a non-match, or "+" for a non-match that becomes a match), use the
2731 --diff flag.
2731 --diff flag.
2732
2732
2733 PATTERN can be any Python (roughly Perl-compatible) regular
2733 PATTERN can be any Python (roughly Perl-compatible) regular
2734 expression.
2734 expression.
2735
2735
2736 If no FILEs are specified (and -f/--follow isn't set), all files in
2736 If no FILEs are specified (and -f/--follow isn't set), all files in
2737 the repository are searched, including those that don't exist in the
2737 the repository are searched, including those that don't exist in the
2738 current branch or have been deleted in a prior changeset.
2738 current branch or have been deleted in a prior changeset.
2739
2739
2740 .. container:: verbose
2740 .. container:: verbose
2741
2741
2742 Template:
2742 Template:
2743
2743
2744 The following keywords are supported in addition to the common template
2744 The following keywords are supported in addition to the common template
2745 keywords and functions. See also :hg:`help templates`.
2745 keywords and functions. See also :hg:`help templates`.
2746
2746
2747 :change: String. Character denoting insertion ``+`` or removal ``-``.
2747 :change: String. Character denoting insertion ``+`` or removal ``-``.
2748 Available if ``--diff`` is specified.
2748 Available if ``--diff`` is specified.
2749 :lineno: Integer. Line number of the match.
2749 :lineno: Integer. Line number of the match.
2750 :path: String. Repository-absolute path of the file.
2750 :path: String. Repository-absolute path of the file.
2751 :texts: List of text chunks.
2751 :texts: List of text chunks.
2752
2752
2753 And each entry of ``{texts}`` provides the following sub-keywords.
2753 And each entry of ``{texts}`` provides the following sub-keywords.
2754
2754
2755 :matched: Boolean. True if the chunk matches the specified pattern.
2755 :matched: Boolean. True if the chunk matches the specified pattern.
2756 :text: String. Chunk content.
2756 :text: String. Chunk content.
2757
2757
2758 See :hg:`help templates.operators` for the list expansion syntax.
2758 See :hg:`help templates.operators` for the list expansion syntax.
2759
2759
2760 Returns 0 if a match is found, 1 otherwise.
2760 Returns 0 if a match is found, 1 otherwise.
2761 """
2761 """
2762 opts = pycompat.byteskwargs(opts)
2762 opts = pycompat.byteskwargs(opts)
2763 diff = opts.get('all') or opts.get('diff')
2763 diff = opts.get('all') or opts.get('diff')
2764 all_files = opts.get('all_files')
2764 all_files = opts.get('all_files')
2765 if diff and opts.get('all_files'):
2765 if diff and opts.get('all_files'):
2766 raise error.Abort(_('--diff and --all-files are mutually exclusive'))
2766 raise error.Abort(_('--diff and --all-files are mutually exclusive'))
2767 # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
2767 # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
2768 if opts.get('all_files') is None and not opts.get('rev') and not diff:
2768 if opts.get('all_files') is None and not opts.get('rev') and not diff:
2769 # experimental config: commands.grep.all-files
2769 # experimental config: commands.grep.all-files
2770 opts['all_files'] = ui.configbool('commands', 'grep.all-files')
2770 opts['all_files'] = ui.configbool('commands', 'grep.all-files')
2771 plaingrep = opts.get('all_files') and not opts.get('rev')
2771 plaingrep = opts.get('all_files') and not opts.get('rev')
2772 if plaingrep:
2772 if plaingrep:
2773 opts['rev'] = ['wdir()']
2773 opts['rev'] = ['wdir()']
2774
2774
2775 reflags = re.M
2775 reflags = re.M
2776 if opts.get('ignore_case'):
2776 if opts.get('ignore_case'):
2777 reflags |= re.I
2777 reflags |= re.I
2778 try:
2778 try:
2779 regexp = util.re.compile(pattern, reflags)
2779 regexp = util.re.compile(pattern, reflags)
2780 except re.error as inst:
2780 except re.error as inst:
2781 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2781 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2782 return 1
2782 return 1
2783 sep, eol = ':', '\n'
2783 sep, eol = ':', '\n'
2784 if opts.get('print0'):
2784 if opts.get('print0'):
2785 sep = eol = '\0'
2785 sep = eol = '\0'
2786
2786
2787 getfile = util.lrucachefunc(repo.file)
2787 getfile = util.lrucachefunc(repo.file)
2788
2788
2789 def matchlines(body):
2789 def matchlines(body):
2790 begin = 0
2790 begin = 0
2791 linenum = 0
2791 linenum = 0
2792 while begin < len(body):
2792 while begin < len(body):
2793 match = regexp.search(body, begin)
2793 match = regexp.search(body, begin)
2794 if not match:
2794 if not match:
2795 break
2795 break
2796 mstart, mend = match.span()
2796 mstart, mend = match.span()
2797 linenum += body.count('\n', begin, mstart) + 1
2797 linenum += body.count('\n', begin, mstart) + 1
2798 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2798 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2799 begin = body.find('\n', mend) + 1 or len(body) + 1
2799 begin = body.find('\n', mend) + 1 or len(body) + 1
2800 lend = begin - 1
2800 lend = begin - 1
2801 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2801 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2802
2802
2803 class linestate(object):
2803 class linestate(object):
2804 def __init__(self, line, linenum, colstart, colend):
2804 def __init__(self, line, linenum, colstart, colend):
2805 self.line = line
2805 self.line = line
2806 self.linenum = linenum
2806 self.linenum = linenum
2807 self.colstart = colstart
2807 self.colstart = colstart
2808 self.colend = colend
2808 self.colend = colend
2809
2809
2810 def __hash__(self):
2810 def __hash__(self):
2811 return hash((self.linenum, self.line))
2811 return hash((self.linenum, self.line))
2812
2812
2813 def __eq__(self, other):
2813 def __eq__(self, other):
2814 return self.line == other.line
2814 return self.line == other.line
2815
2815
2816 def findpos(self):
2816 def findpos(self):
2817 """Iterate all (start, end) indices of matches"""
2817 """Iterate all (start, end) indices of matches"""
2818 yield self.colstart, self.colend
2818 yield self.colstart, self.colend
2819 p = self.colend
2819 p = self.colend
2820 while p < len(self.line):
2820 while p < len(self.line):
2821 m = regexp.search(self.line, p)
2821 m = regexp.search(self.line, p)
2822 if not m:
2822 if not m:
2823 break
2823 break
2824 yield m.span()
2824 yield m.span()
2825 p = m.end()
2825 p = m.end()
2826
2826
2827 matches = {}
2827 matches = {}
2828 copies = {}
2828 copies = {}
2829 def grepbody(fn, rev, body):
2829 def grepbody(fn, rev, body):
2830 matches[rev].setdefault(fn, [])
2830 matches[rev].setdefault(fn, [])
2831 m = matches[rev][fn]
2831 m = matches[rev][fn]
2832 for lnum, cstart, cend, line in matchlines(body):
2832 for lnum, cstart, cend, line in matchlines(body):
2833 s = linestate(line, lnum, cstart, cend)
2833 s = linestate(line, lnum, cstart, cend)
2834 m.append(s)
2834 m.append(s)
2835
2835
2836 def difflinestates(a, b):
2836 def difflinestates(a, b):
2837 sm = difflib.SequenceMatcher(None, a, b)
2837 sm = difflib.SequenceMatcher(None, a, b)
2838 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2838 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2839 if tag == r'insert':
2839 if tag == r'insert':
2840 for i in pycompat.xrange(blo, bhi):
2840 for i in pycompat.xrange(blo, bhi):
2841 yield ('+', b[i])
2841 yield ('+', b[i])
2842 elif tag == r'delete':
2842 elif tag == r'delete':
2843 for i in pycompat.xrange(alo, ahi):
2843 for i in pycompat.xrange(alo, ahi):
2844 yield ('-', a[i])
2844 yield ('-', a[i])
2845 elif tag == r'replace':
2845 elif tag == r'replace':
2846 for i in pycompat.xrange(alo, ahi):
2846 for i in pycompat.xrange(alo, ahi):
2847 yield ('-', a[i])
2847 yield ('-', a[i])
2848 for i in pycompat.xrange(blo, bhi):
2848 for i in pycompat.xrange(blo, bhi):
2849 yield ('+', b[i])
2849 yield ('+', b[i])
2850
2850
2851 def display(fm, fn, ctx, pstates, states):
2851 def display(fm, fn, ctx, pstates, states):
2852 rev = scmutil.intrev(ctx)
2852 rev = scmutil.intrev(ctx)
2853 if fm.isplain():
2853 if fm.isplain():
2854 formatuser = ui.shortuser
2854 formatuser = ui.shortuser
2855 else:
2855 else:
2856 formatuser = pycompat.bytestr
2856 formatuser = pycompat.bytestr
2857 if ui.quiet:
2857 if ui.quiet:
2858 datefmt = '%Y-%m-%d'
2858 datefmt = '%Y-%m-%d'
2859 else:
2859 else:
2860 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2860 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2861 found = False
2861 found = False
2862 @util.cachefunc
2862 @util.cachefunc
2863 def binary():
2863 def binary():
2864 flog = getfile(fn)
2864 flog = getfile(fn)
2865 try:
2865 try:
2866 return stringutil.binary(flog.read(ctx.filenode(fn)))
2866 return stringutil.binary(flog.read(ctx.filenode(fn)))
2867 except error.WdirUnsupported:
2867 except error.WdirUnsupported:
2868 return ctx[fn].isbinary()
2868 return ctx[fn].isbinary()
2869
2869
2870 fieldnamemap = {'filename': 'path', 'linenumber': 'lineno'}
2870 fieldnamemap = {'filename': 'path', 'linenumber': 'lineno'}
2871 if diff:
2871 if diff:
2872 iter = difflinestates(pstates, states)
2872 iter = difflinestates(pstates, states)
2873 else:
2873 else:
2874 iter = [('', l) for l in states]
2874 iter = [('', l) for l in states]
2875 for change, l in iter:
2875 for change, l in iter:
2876 fm.startitem()
2876 fm.startitem()
2877 fm.context(ctx=ctx)
2877 fm.context(ctx=ctx)
2878 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2878 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2879
2879
2880 cols = [
2880 cols = [
2881 ('filename', '%s', fn, True),
2881 ('filename', '%s', fn, True),
2882 ('rev', '%d', rev, not plaingrep),
2882 ('rev', '%d', rev, not plaingrep),
2883 ('linenumber', '%d', l.linenum, opts.get('line_number')),
2883 ('linenumber', '%d', l.linenum, opts.get('line_number')),
2884 ]
2884 ]
2885 if diff:
2885 if diff:
2886 cols.append(('change', '%s', change, True))
2886 cols.append(('change', '%s', change, True))
2887 cols.extend([
2887 cols.extend([
2888 ('user', '%s', formatuser(ctx.user()), opts.get('user')),
2888 ('user', '%s', formatuser(ctx.user()), opts.get('user')),
2889 ('date', '%s', fm.formatdate(ctx.date(), datefmt),
2889 ('date', '%s', fm.formatdate(ctx.date(), datefmt),
2890 opts.get('date')),
2890 opts.get('date')),
2891 ])
2891 ])
2892 lastcol = next(
2892 lastcol = next(
2893 name for name, fmt, data, cond in reversed(cols) if cond)
2893 name for name, fmt, data, cond in reversed(cols) if cond)
2894 for name, fmt, data, cond in cols:
2894 for name, fmt, data, cond in cols:
2895 field = fieldnamemap.get(name, name)
2895 field = fieldnamemap.get(name, name)
2896 fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
2896 fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
2897 if cond and name != lastcol:
2897 if cond and name != lastcol:
2898 fm.plain(sep, label='grep.sep')
2898 fm.plain(sep, label='grep.sep')
2899 if not opts.get('files_with_matches'):
2899 if not opts.get('files_with_matches'):
2900 fm.plain(sep, label='grep.sep')
2900 fm.plain(sep, label='grep.sep')
2901 if not opts.get('text') and binary():
2901 if not opts.get('text') and binary():
2902 fm.plain(_(" Binary file matches"))
2902 fm.plain(_(" Binary file matches"))
2903 else:
2903 else:
2904 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2904 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2905 fm.plain(eol)
2905 fm.plain(eol)
2906 found = True
2906 found = True
2907 if opts.get('files_with_matches'):
2907 if opts.get('files_with_matches'):
2908 break
2908 break
2909 return found
2909 return found
2910
2910
2911 def displaymatches(fm, l):
2911 def displaymatches(fm, l):
2912 p = 0
2912 p = 0
2913 for s, e in l.findpos():
2913 for s, e in l.findpos():
2914 if p < s:
2914 if p < s:
2915 fm.startitem()
2915 fm.startitem()
2916 fm.write('text', '%s', l.line[p:s])
2916 fm.write('text', '%s', l.line[p:s])
2917 fm.data(matched=False)
2917 fm.data(matched=False)
2918 fm.startitem()
2918 fm.startitem()
2919 fm.write('text', '%s', l.line[s:e], label='grep.match')
2919 fm.write('text', '%s', l.line[s:e], label='grep.match')
2920 fm.data(matched=True)
2920 fm.data(matched=True)
2921 p = e
2921 p = e
2922 if p < len(l.line):
2922 if p < len(l.line):
2923 fm.startitem()
2923 fm.startitem()
2924 fm.write('text', '%s', l.line[p:])
2924 fm.write('text', '%s', l.line[p:])
2925 fm.data(matched=False)
2925 fm.data(matched=False)
2926 fm.end()
2926 fm.end()
2927
2927
2928 skip = {}
2928 skip = {}
2929 revfiles = {}
2929 revfiles = {}
2930 match = scmutil.match(repo[None], pats, opts)
2930 match = scmutil.match(repo[None], pats, opts)
2931 found = False
2931 found = False
2932 follow = opts.get('follow')
2932 follow = opts.get('follow')
2933
2933
2934 def prep(ctx, fns):
2934 def prep(ctx, fns):
2935 rev = ctx.rev()
2935 rev = ctx.rev()
2936 pctx = ctx.p1()
2936 pctx = ctx.p1()
2937 parent = pctx.rev()
2937 parent = pctx.rev()
2938 matches.setdefault(rev, {})
2938 matches.setdefault(rev, {})
2939 matches.setdefault(parent, {})
2939 matches.setdefault(parent, {})
2940 files = revfiles.setdefault(rev, [])
2940 files = revfiles.setdefault(rev, [])
2941 for fn in fns:
2941 for fn in fns:
2942 flog = getfile(fn)
2942 flog = getfile(fn)
2943 try:
2943 try:
2944 fnode = ctx.filenode(fn)
2944 fnode = ctx.filenode(fn)
2945 except error.LookupError:
2945 except error.LookupError:
2946 continue
2946 continue
2947 copy = None
2948 if follow:
2947 try:
2949 try:
2948 copied = flog.renamed(fnode)
2950 copied = flog.renamed(fnode)
2949 except error.WdirUnsupported:
2951 except error.WdirUnsupported:
2950 copied = ctx[fn].renamed()
2952 copied = ctx[fn].renamed()
2951 copy = follow and copied and copied[0]
2953 copy = copied and copied[0]
2952 if copy:
2954 if copy:
2953 copies.setdefault(rev, {})[fn] = copy
2955 copies.setdefault(rev, {})[fn] = copy
2954 if fn in skip:
2956 if fn in skip:
2955 if copy:
2956 skip[copy] = True
2957 skip[copy] = True
2958 if fn in skip:
2957 continue
2959 continue
2958 files.append(fn)
2960 files.append(fn)
2959
2961
2960 if fn not in matches[rev]:
2962 if fn not in matches[rev]:
2961 try:
2963 try:
2962 content = flog.read(fnode)
2964 content = flog.read(fnode)
2963 except error.WdirUnsupported:
2965 except error.WdirUnsupported:
2964 content = ctx[fn].data()
2966 content = ctx[fn].data()
2965 grepbody(fn, rev, content)
2967 grepbody(fn, rev, content)
2966
2968
2967 pfn = copy or fn
2969 pfn = copy or fn
2968 if pfn not in matches[parent]:
2970 if pfn not in matches[parent]:
2969 try:
2971 try:
2970 fnode = pctx.filenode(pfn)
2972 fnode = pctx.filenode(pfn)
2971 grepbody(pfn, parent, flog.read(fnode))
2973 grepbody(pfn, parent, flog.read(fnode))
2972 except error.LookupError:
2974 except error.LookupError:
2973 pass
2975 pass
2974
2976
2975 ui.pager('grep')
2977 ui.pager('grep')
2976 fm = ui.formatter('grep', opts)
2978 fm = ui.formatter('grep', opts)
2977 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2979 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2978 rev = ctx.rev()
2980 rev = ctx.rev()
2979 parent = ctx.p1().rev()
2981 parent = ctx.p1().rev()
2980 for fn in sorted(revfiles.get(rev, [])):
2982 for fn in sorted(revfiles.get(rev, [])):
2981 states = matches[rev][fn]
2983 states = matches[rev][fn]
2982 copy = copies.get(rev, {}).get(fn)
2984 copy = copies.get(rev, {}).get(fn)
2983 if fn in skip:
2985 if fn in skip:
2984 if copy:
2986 if copy:
2985 skip[copy] = True
2987 skip[copy] = True
2986 continue
2988 continue
2987 pstates = matches.get(parent, {}).get(copy or fn, [])
2989 pstates = matches.get(parent, {}).get(copy or fn, [])
2988 if pstates or states:
2990 if pstates or states:
2989 r = display(fm, fn, ctx, pstates, states)
2991 r = display(fm, fn, ctx, pstates, states)
2990 found = found or r
2992 found = found or r
2991 if r and not diff and not all_files:
2993 if r and not diff and not all_files:
2992 skip[fn] = True
2994 skip[fn] = True
2993 if copy:
2995 if copy:
2994 skip[copy] = True
2996 skip[copy] = True
2995 del revfiles[rev]
2997 del revfiles[rev]
2996 # We will keep the matches dict for the duration of the window
2998 # We will keep the matches dict for the duration of the window
2997 # clear the matches dict once the window is over
2999 # clear the matches dict once the window is over
2998 if not revfiles:
3000 if not revfiles:
2999 matches.clear()
3001 matches.clear()
3000 fm.end()
3002 fm.end()
3001
3003
3002 return not found
3004 return not found
3003
3005
3004 @command('heads',
3006 @command('heads',
3005 [('r', 'rev', '',
3007 [('r', 'rev', '',
3006 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3008 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3007 ('t', 'topo', False, _('show topological heads only')),
3009 ('t', 'topo', False, _('show topological heads only')),
3008 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3010 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3009 ('c', 'closed', False, _('show normal and closed branch heads')),
3011 ('c', 'closed', False, _('show normal and closed branch heads')),
3010 ] + templateopts,
3012 ] + templateopts,
3011 _('[-ct] [-r STARTREV] [REV]...'),
3013 _('[-ct] [-r STARTREV] [REV]...'),
3012 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3014 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3013 intents={INTENT_READONLY})
3015 intents={INTENT_READONLY})
3014 def heads(ui, repo, *branchrevs, **opts):
3016 def heads(ui, repo, *branchrevs, **opts):
3015 """show branch heads
3017 """show branch heads
3016
3018
3017 With no arguments, show all open branch heads in the repository.
3019 With no arguments, show all open branch heads in the repository.
3018 Branch heads are changesets that have no descendants on the
3020 Branch heads are changesets that have no descendants on the
3019 same branch. They are where development generally takes place and
3021 same branch. They are where development generally takes place and
3020 are the usual targets for update and merge operations.
3022 are the usual targets for update and merge operations.
3021
3023
3022 If one or more REVs are given, only open branch heads on the
3024 If one or more REVs are given, only open branch heads on the
3023 branches associated with the specified changesets are shown. This
3025 branches associated with the specified changesets are shown. This
3024 means that you can use :hg:`heads .` to see the heads on the
3026 means that you can use :hg:`heads .` to see the heads on the
3025 currently checked-out branch.
3027 currently checked-out branch.
3026
3028
3027 If -c/--closed is specified, also show branch heads marked closed
3029 If -c/--closed is specified, also show branch heads marked closed
3028 (see :hg:`commit --close-branch`).
3030 (see :hg:`commit --close-branch`).
3029
3031
3030 If STARTREV is specified, only those heads that are descendants of
3032 If STARTREV is specified, only those heads that are descendants of
3031 STARTREV will be displayed.
3033 STARTREV will be displayed.
3032
3034
3033 If -t/--topo is specified, named branch mechanics will be ignored and only
3035 If -t/--topo is specified, named branch mechanics will be ignored and only
3034 topological heads (changesets with no children) will be shown.
3036 topological heads (changesets with no children) will be shown.
3035
3037
3036 Returns 0 if matching heads are found, 1 if not.
3038 Returns 0 if matching heads are found, 1 if not.
3037 """
3039 """
3038
3040
3039 opts = pycompat.byteskwargs(opts)
3041 opts = pycompat.byteskwargs(opts)
3040 start = None
3042 start = None
3041 rev = opts.get('rev')
3043 rev = opts.get('rev')
3042 if rev:
3044 if rev:
3043 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3045 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3044 start = scmutil.revsingle(repo, rev, None).node()
3046 start = scmutil.revsingle(repo, rev, None).node()
3045
3047
3046 if opts.get('topo'):
3048 if opts.get('topo'):
3047 heads = [repo[h] for h in repo.heads(start)]
3049 heads = [repo[h] for h in repo.heads(start)]
3048 else:
3050 else:
3049 heads = []
3051 heads = []
3050 for branch in repo.branchmap():
3052 for branch in repo.branchmap():
3051 heads += repo.branchheads(branch, start, opts.get('closed'))
3053 heads += repo.branchheads(branch, start, opts.get('closed'))
3052 heads = [repo[h] for h in heads]
3054 heads = [repo[h] for h in heads]
3053
3055
3054 if branchrevs:
3056 if branchrevs:
3055 branches = set(repo[r].branch()
3057 branches = set(repo[r].branch()
3056 for r in scmutil.revrange(repo, branchrevs))
3058 for r in scmutil.revrange(repo, branchrevs))
3057 heads = [h for h in heads if h.branch() in branches]
3059 heads = [h for h in heads if h.branch() in branches]
3058
3060
3059 if opts.get('active') and branchrevs:
3061 if opts.get('active') and branchrevs:
3060 dagheads = repo.heads(start)
3062 dagheads = repo.heads(start)
3061 heads = [h for h in heads if h.node() in dagheads]
3063 heads = [h for h in heads if h.node() in dagheads]
3062
3064
3063 if branchrevs:
3065 if branchrevs:
3064 haveheads = set(h.branch() for h in heads)
3066 haveheads = set(h.branch() for h in heads)
3065 if branches - haveheads:
3067 if branches - haveheads:
3066 headless = ', '.join(b for b in branches - haveheads)
3068 headless = ', '.join(b for b in branches - haveheads)
3067 msg = _('no open branch heads found on branches %s')
3069 msg = _('no open branch heads found on branches %s')
3068 if opts.get('rev'):
3070 if opts.get('rev'):
3069 msg += _(' (started at %s)') % opts['rev']
3071 msg += _(' (started at %s)') % opts['rev']
3070 ui.warn((msg + '\n') % headless)
3072 ui.warn((msg + '\n') % headless)
3071
3073
3072 if not heads:
3074 if not heads:
3073 return 1
3075 return 1
3074
3076
3075 ui.pager('heads')
3077 ui.pager('heads')
3076 heads = sorted(heads, key=lambda x: -x.rev())
3078 heads = sorted(heads, key=lambda x: -x.rev())
3077 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3079 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3078 for ctx in heads:
3080 for ctx in heads:
3079 displayer.show(ctx)
3081 displayer.show(ctx)
3080 displayer.close()
3082 displayer.close()
3081
3083
3082 @command('help',
3084 @command('help',
3083 [('e', 'extension', None, _('show only help for extensions')),
3085 [('e', 'extension', None, _('show only help for extensions')),
3084 ('c', 'command', None, _('show only help for commands')),
3086 ('c', 'command', None, _('show only help for commands')),
3085 ('k', 'keyword', None, _('show topics matching keyword')),
3087 ('k', 'keyword', None, _('show topics matching keyword')),
3086 ('s', 'system', [],
3088 ('s', 'system', [],
3087 _('show help for specific platform(s)'), _('PLATFORM')),
3089 _('show help for specific platform(s)'), _('PLATFORM')),
3088 ],
3090 ],
3089 _('[-eck] [-s PLATFORM] [TOPIC]'),
3091 _('[-eck] [-s PLATFORM] [TOPIC]'),
3090 helpcategory=command.CATEGORY_HELP,
3092 helpcategory=command.CATEGORY_HELP,
3091 norepo=True,
3093 norepo=True,
3092 intents={INTENT_READONLY})
3094 intents={INTENT_READONLY})
3093 def help_(ui, name=None, **opts):
3095 def help_(ui, name=None, **opts):
3094 """show help for a given topic or a help overview
3096 """show help for a given topic or a help overview
3095
3097
3096 With no arguments, print a list of commands with short help messages.
3098 With no arguments, print a list of commands with short help messages.
3097
3099
3098 Given a topic, extension, or command name, print help for that
3100 Given a topic, extension, or command name, print help for that
3099 topic.
3101 topic.
3100
3102
3101 Returns 0 if successful.
3103 Returns 0 if successful.
3102 """
3104 """
3103
3105
3104 keep = opts.get(r'system') or []
3106 keep = opts.get(r'system') or []
3105 if len(keep) == 0:
3107 if len(keep) == 0:
3106 if pycompat.sysplatform.startswith('win'):
3108 if pycompat.sysplatform.startswith('win'):
3107 keep.append('windows')
3109 keep.append('windows')
3108 elif pycompat.sysplatform == 'OpenVMS':
3110 elif pycompat.sysplatform == 'OpenVMS':
3109 keep.append('vms')
3111 keep.append('vms')
3110 elif pycompat.sysplatform == 'plan9':
3112 elif pycompat.sysplatform == 'plan9':
3111 keep.append('plan9')
3113 keep.append('plan9')
3112 else:
3114 else:
3113 keep.append('unix')
3115 keep.append('unix')
3114 keep.append(pycompat.sysplatform.lower())
3116 keep.append(pycompat.sysplatform.lower())
3115 if ui.verbose:
3117 if ui.verbose:
3116 keep.append('verbose')
3118 keep.append('verbose')
3117
3119
3118 commands = sys.modules[__name__]
3120 commands = sys.modules[__name__]
3119 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3121 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3120 ui.pager('help')
3122 ui.pager('help')
3121 ui.write(formatted)
3123 ui.write(formatted)
3122
3124
3123
3125
3124 @command('identify|id',
3126 @command('identify|id',
3125 [('r', 'rev', '',
3127 [('r', 'rev', '',
3126 _('identify the specified revision'), _('REV')),
3128 _('identify the specified revision'), _('REV')),
3127 ('n', 'num', None, _('show local revision number')),
3129 ('n', 'num', None, _('show local revision number')),
3128 ('i', 'id', None, _('show global revision id')),
3130 ('i', 'id', None, _('show global revision id')),
3129 ('b', 'branch', None, _('show branch')),
3131 ('b', 'branch', None, _('show branch')),
3130 ('t', 'tags', None, _('show tags')),
3132 ('t', 'tags', None, _('show tags')),
3131 ('B', 'bookmarks', None, _('show bookmarks')),
3133 ('B', 'bookmarks', None, _('show bookmarks')),
3132 ] + remoteopts + formatteropts,
3134 ] + remoteopts + formatteropts,
3133 _('[-nibtB] [-r REV] [SOURCE]'),
3135 _('[-nibtB] [-r REV] [SOURCE]'),
3134 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3136 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3135 optionalrepo=True,
3137 optionalrepo=True,
3136 intents={INTENT_READONLY})
3138 intents={INTENT_READONLY})
3137 def identify(ui, repo, source=None, rev=None,
3139 def identify(ui, repo, source=None, rev=None,
3138 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3140 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3139 """identify the working directory or specified revision
3141 """identify the working directory or specified revision
3140
3142
3141 Print a summary identifying the repository state at REV using one or
3143 Print a summary identifying the repository state at REV using one or
3142 two parent hash identifiers, followed by a "+" if the working
3144 two parent hash identifiers, followed by a "+" if the working
3143 directory has uncommitted changes, the branch name (if not default),
3145 directory has uncommitted changes, the branch name (if not default),
3144 a list of tags, and a list of bookmarks.
3146 a list of tags, and a list of bookmarks.
3145
3147
3146 When REV is not given, print a summary of the current state of the
3148 When REV is not given, print a summary of the current state of the
3147 repository including the working directory. Specify -r. to get information
3149 repository including the working directory. Specify -r. to get information
3148 of the working directory parent without scanning uncommitted changes.
3150 of the working directory parent without scanning uncommitted changes.
3149
3151
3150 Specifying a path to a repository root or Mercurial bundle will
3152 Specifying a path to a repository root or Mercurial bundle will
3151 cause lookup to operate on that repository/bundle.
3153 cause lookup to operate on that repository/bundle.
3152
3154
3153 .. container:: verbose
3155 .. container:: verbose
3154
3156
3155 Template:
3157 Template:
3156
3158
3157 The following keywords are supported in addition to the common template
3159 The following keywords are supported in addition to the common template
3158 keywords and functions. See also :hg:`help templates`.
3160 keywords and functions. See also :hg:`help templates`.
3159
3161
3160 :dirty: String. Character ``+`` denoting if the working directory has
3162 :dirty: String. Character ``+`` denoting if the working directory has
3161 uncommitted changes.
3163 uncommitted changes.
3162 :id: String. One or two nodes, optionally followed by ``+``.
3164 :id: String. One or two nodes, optionally followed by ``+``.
3163 :parents: List of strings. Parent nodes of the changeset.
3165 :parents: List of strings. Parent nodes of the changeset.
3164
3166
3165 Examples:
3167 Examples:
3166
3168
3167 - generate a build identifier for the working directory::
3169 - generate a build identifier for the working directory::
3168
3170
3169 hg id --id > build-id.dat
3171 hg id --id > build-id.dat
3170
3172
3171 - find the revision corresponding to a tag::
3173 - find the revision corresponding to a tag::
3172
3174
3173 hg id -n -r 1.3
3175 hg id -n -r 1.3
3174
3176
3175 - check the most recent revision of a remote repository::
3177 - check the most recent revision of a remote repository::
3176
3178
3177 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3179 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3178
3180
3179 See :hg:`log` for generating more information about specific revisions,
3181 See :hg:`log` for generating more information about specific revisions,
3180 including full hash identifiers.
3182 including full hash identifiers.
3181
3183
3182 Returns 0 if successful.
3184 Returns 0 if successful.
3183 """
3185 """
3184
3186
3185 opts = pycompat.byteskwargs(opts)
3187 opts = pycompat.byteskwargs(opts)
3186 if not repo and not source:
3188 if not repo and not source:
3187 raise error.Abort(_("there is no Mercurial repository here "
3189 raise error.Abort(_("there is no Mercurial repository here "
3188 "(.hg not found)"))
3190 "(.hg not found)"))
3189
3191
3190 default = not (num or id or branch or tags or bookmarks)
3192 default = not (num or id or branch or tags or bookmarks)
3191 output = []
3193 output = []
3192 revs = []
3194 revs = []
3193
3195
3194 if source:
3196 if source:
3195 source, branches = hg.parseurl(ui.expandpath(source))
3197 source, branches = hg.parseurl(ui.expandpath(source))
3196 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3198 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3197 repo = peer.local()
3199 repo = peer.local()
3198 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3200 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3199
3201
3200 fm = ui.formatter('identify', opts)
3202 fm = ui.formatter('identify', opts)
3201 fm.startitem()
3203 fm.startitem()
3202
3204
3203 if not repo:
3205 if not repo:
3204 if num or branch or tags:
3206 if num or branch or tags:
3205 raise error.Abort(
3207 raise error.Abort(
3206 _("can't query remote revision number, branch, or tags"))
3208 _("can't query remote revision number, branch, or tags"))
3207 if not rev and revs:
3209 if not rev and revs:
3208 rev = revs[0]
3210 rev = revs[0]
3209 if not rev:
3211 if not rev:
3210 rev = "tip"
3212 rev = "tip"
3211
3213
3212 remoterev = peer.lookup(rev)
3214 remoterev = peer.lookup(rev)
3213 hexrev = fm.hexfunc(remoterev)
3215 hexrev = fm.hexfunc(remoterev)
3214 if default or id:
3216 if default or id:
3215 output = [hexrev]
3217 output = [hexrev]
3216 fm.data(id=hexrev)
3218 fm.data(id=hexrev)
3217
3219
3218 @util.cachefunc
3220 @util.cachefunc
3219 def getbms():
3221 def getbms():
3220 bms = []
3222 bms = []
3221
3223
3222 if 'bookmarks' in peer.listkeys('namespaces'):
3224 if 'bookmarks' in peer.listkeys('namespaces'):
3223 hexremoterev = hex(remoterev)
3225 hexremoterev = hex(remoterev)
3224 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3226 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3225 if bmr == hexremoterev]
3227 if bmr == hexremoterev]
3226
3228
3227 return sorted(bms)
3229 return sorted(bms)
3228
3230
3229 if fm.isplain():
3231 if fm.isplain():
3230 if bookmarks:
3232 if bookmarks:
3231 output.extend(getbms())
3233 output.extend(getbms())
3232 elif default and not ui.quiet:
3234 elif default and not ui.quiet:
3233 # multiple bookmarks for a single parent separated by '/'
3235 # multiple bookmarks for a single parent separated by '/'
3234 bm = '/'.join(getbms())
3236 bm = '/'.join(getbms())
3235 if bm:
3237 if bm:
3236 output.append(bm)
3238 output.append(bm)
3237 else:
3239 else:
3238 fm.data(node=hex(remoterev))
3240 fm.data(node=hex(remoterev))
3239 if bookmarks or 'bookmarks' in fm.datahint():
3241 if bookmarks or 'bookmarks' in fm.datahint():
3240 fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
3242 fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
3241 else:
3243 else:
3242 if rev:
3244 if rev:
3243 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3245 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3244 ctx = scmutil.revsingle(repo, rev, None)
3246 ctx = scmutil.revsingle(repo, rev, None)
3245
3247
3246 if ctx.rev() is None:
3248 if ctx.rev() is None:
3247 ctx = repo[None]
3249 ctx = repo[None]
3248 parents = ctx.parents()
3250 parents = ctx.parents()
3249 taglist = []
3251 taglist = []
3250 for p in parents:
3252 for p in parents:
3251 taglist.extend(p.tags())
3253 taglist.extend(p.tags())
3252
3254
3253 dirty = ""
3255 dirty = ""
3254 if ctx.dirty(missing=True, merge=False, branch=False):
3256 if ctx.dirty(missing=True, merge=False, branch=False):
3255 dirty = '+'
3257 dirty = '+'
3256 fm.data(dirty=dirty)
3258 fm.data(dirty=dirty)
3257
3259
3258 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3260 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3259 if default or id:
3261 if default or id:
3260 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
3262 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
3261 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
3263 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
3262
3264
3263 if num:
3265 if num:
3264 numoutput = ["%d" % p.rev() for p in parents]
3266 numoutput = ["%d" % p.rev() for p in parents]
3265 output.append("%s%s" % ('+'.join(numoutput), dirty))
3267 output.append("%s%s" % ('+'.join(numoutput), dirty))
3266
3268
3267 fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
3269 fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
3268 for p in parents], name='node'))
3270 for p in parents], name='node'))
3269 else:
3271 else:
3270 hexoutput = fm.hexfunc(ctx.node())
3272 hexoutput = fm.hexfunc(ctx.node())
3271 if default or id:
3273 if default or id:
3272 output = [hexoutput]
3274 output = [hexoutput]
3273 fm.data(id=hexoutput)
3275 fm.data(id=hexoutput)
3274
3276
3275 if num:
3277 if num:
3276 output.append(pycompat.bytestr(ctx.rev()))
3278 output.append(pycompat.bytestr(ctx.rev()))
3277 taglist = ctx.tags()
3279 taglist = ctx.tags()
3278
3280
3279 if default and not ui.quiet:
3281 if default and not ui.quiet:
3280 b = ctx.branch()
3282 b = ctx.branch()
3281 if b != 'default':
3283 if b != 'default':
3282 output.append("(%s)" % b)
3284 output.append("(%s)" % b)
3283
3285
3284 # multiple tags for a single parent separated by '/'
3286 # multiple tags for a single parent separated by '/'
3285 t = '/'.join(taglist)
3287 t = '/'.join(taglist)
3286 if t:
3288 if t:
3287 output.append(t)
3289 output.append(t)
3288
3290
3289 # multiple bookmarks for a single parent separated by '/'
3291 # multiple bookmarks for a single parent separated by '/'
3290 bm = '/'.join(ctx.bookmarks())
3292 bm = '/'.join(ctx.bookmarks())
3291 if bm:
3293 if bm:
3292 output.append(bm)
3294 output.append(bm)
3293 else:
3295 else:
3294 if branch:
3296 if branch:
3295 output.append(ctx.branch())
3297 output.append(ctx.branch())
3296
3298
3297 if tags:
3299 if tags:
3298 output.extend(taglist)
3300 output.extend(taglist)
3299
3301
3300 if bookmarks:
3302 if bookmarks:
3301 output.extend(ctx.bookmarks())
3303 output.extend(ctx.bookmarks())
3302
3304
3303 fm.data(node=ctx.hex())
3305 fm.data(node=ctx.hex())
3304 fm.data(branch=ctx.branch())
3306 fm.data(branch=ctx.branch())
3305 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
3307 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
3306 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
3308 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
3307 fm.context(ctx=ctx)
3309 fm.context(ctx=ctx)
3308
3310
3309 fm.plain("%s\n" % ' '.join(output))
3311 fm.plain("%s\n" % ' '.join(output))
3310 fm.end()
3312 fm.end()
3311
3313
3312 @command('import|patch',
3314 @command('import|patch',
3313 [('p', 'strip', 1,
3315 [('p', 'strip', 1,
3314 _('directory strip option for patch. This has the same '
3316 _('directory strip option for patch. This has the same '
3315 'meaning as the corresponding patch option'), _('NUM')),
3317 'meaning as the corresponding patch option'), _('NUM')),
3316 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3318 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3317 ('e', 'edit', False, _('invoke editor on commit messages')),
3319 ('e', 'edit', False, _('invoke editor on commit messages')),
3318 ('f', 'force', None,
3320 ('f', 'force', None,
3319 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3321 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3320 ('', 'no-commit', None,
3322 ('', 'no-commit', None,
3321 _("don't commit, just update the working directory")),
3323 _("don't commit, just update the working directory")),
3322 ('', 'bypass', None,
3324 ('', 'bypass', None,
3323 _("apply patch without touching the working directory")),
3325 _("apply patch without touching the working directory")),
3324 ('', 'partial', None,
3326 ('', 'partial', None,
3325 _('commit even if some hunks fail')),
3327 _('commit even if some hunks fail')),
3326 ('', 'exact', None,
3328 ('', 'exact', None,
3327 _('abort if patch would apply lossily')),
3329 _('abort if patch would apply lossily')),
3328 ('', 'prefix', '',
3330 ('', 'prefix', '',
3329 _('apply patch to subdirectory'), _('DIR')),
3331 _('apply patch to subdirectory'), _('DIR')),
3330 ('', 'import-branch', None,
3332 ('', 'import-branch', None,
3331 _('use any branch information in patch (implied by --exact)'))] +
3333 _('use any branch information in patch (implied by --exact)'))] +
3332 commitopts + commitopts2 + similarityopts,
3334 commitopts + commitopts2 + similarityopts,
3333 _('[OPTION]... PATCH...'),
3335 _('[OPTION]... PATCH...'),
3334 helpcategory=command.CATEGORY_IMPORT_EXPORT)
3336 helpcategory=command.CATEGORY_IMPORT_EXPORT)
3335 def import_(ui, repo, patch1=None, *patches, **opts):
3337 def import_(ui, repo, patch1=None, *patches, **opts):
3336 """import an ordered set of patches
3338 """import an ordered set of patches
3337
3339
3338 Import a list of patches and commit them individually (unless
3340 Import a list of patches and commit them individually (unless
3339 --no-commit is specified).
3341 --no-commit is specified).
3340
3342
3341 To read a patch from standard input (stdin), use "-" as the patch
3343 To read a patch from standard input (stdin), use "-" as the patch
3342 name. If a URL is specified, the patch will be downloaded from
3344 name. If a URL is specified, the patch will be downloaded from
3343 there.
3345 there.
3344
3346
3345 Import first applies changes to the working directory (unless
3347 Import first applies changes to the working directory (unless
3346 --bypass is specified), import will abort if there are outstanding
3348 --bypass is specified), import will abort if there are outstanding
3347 changes.
3349 changes.
3348
3350
3349 Use --bypass to apply and commit patches directly to the
3351 Use --bypass to apply and commit patches directly to the
3350 repository, without affecting the working directory. Without
3352 repository, without affecting the working directory. Without
3351 --exact, patches will be applied on top of the working directory
3353 --exact, patches will be applied on top of the working directory
3352 parent revision.
3354 parent revision.
3353
3355
3354 You can import a patch straight from a mail message. Even patches
3356 You can import a patch straight from a mail message. Even patches
3355 as attachments work (to use the body part, it must have type
3357 as attachments work (to use the body part, it must have type
3356 text/plain or text/x-patch). From and Subject headers of email
3358 text/plain or text/x-patch). From and Subject headers of email
3357 message are used as default committer and commit message. All
3359 message are used as default committer and commit message. All
3358 text/plain body parts before first diff are added to the commit
3360 text/plain body parts before first diff are added to the commit
3359 message.
3361 message.
3360
3362
3361 If the imported patch was generated by :hg:`export`, user and
3363 If the imported patch was generated by :hg:`export`, user and
3362 description from patch override values from message headers and
3364 description from patch override values from message headers and
3363 body. Values given on command line with -m/--message and -u/--user
3365 body. Values given on command line with -m/--message and -u/--user
3364 override these.
3366 override these.
3365
3367
3366 If --exact is specified, import will set the working directory to
3368 If --exact is specified, import will set the working directory to
3367 the parent of each patch before applying it, and will abort if the
3369 the parent of each patch before applying it, and will abort if the
3368 resulting changeset has a different ID than the one recorded in
3370 resulting changeset has a different ID than the one recorded in
3369 the patch. This will guard against various ways that portable
3371 the patch. This will guard against various ways that portable
3370 patch formats and mail systems might fail to transfer Mercurial
3372 patch formats and mail systems might fail to transfer Mercurial
3371 data or metadata. See :hg:`bundle` for lossless transmission.
3373 data or metadata. See :hg:`bundle` for lossless transmission.
3372
3374
3373 Use --partial to ensure a changeset will be created from the patch
3375 Use --partial to ensure a changeset will be created from the patch
3374 even if some hunks fail to apply. Hunks that fail to apply will be
3376 even if some hunks fail to apply. Hunks that fail to apply will be
3375 written to a <target-file>.rej file. Conflicts can then be resolved
3377 written to a <target-file>.rej file. Conflicts can then be resolved
3376 by hand before :hg:`commit --amend` is run to update the created
3378 by hand before :hg:`commit --amend` is run to update the created
3377 changeset. This flag exists to let people import patches that
3379 changeset. This flag exists to let people import patches that
3378 partially apply without losing the associated metadata (author,
3380 partially apply without losing the associated metadata (author,
3379 date, description, ...).
3381 date, description, ...).
3380
3382
3381 .. note::
3383 .. note::
3382
3384
3383 When no hunks apply cleanly, :hg:`import --partial` will create
3385 When no hunks apply cleanly, :hg:`import --partial` will create
3384 an empty changeset, importing only the patch metadata.
3386 an empty changeset, importing only the patch metadata.
3385
3387
3386 With -s/--similarity, hg will attempt to discover renames and
3388 With -s/--similarity, hg will attempt to discover renames and
3387 copies in the patch in the same way as :hg:`addremove`.
3389 copies in the patch in the same way as :hg:`addremove`.
3388
3390
3389 It is possible to use external patch programs to perform the patch
3391 It is possible to use external patch programs to perform the patch
3390 by setting the ``ui.patch`` configuration option. For the default
3392 by setting the ``ui.patch`` configuration option. For the default
3391 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3393 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3392 See :hg:`help config` for more information about configuration
3394 See :hg:`help config` for more information about configuration
3393 files and how to use these options.
3395 files and how to use these options.
3394
3396
3395 See :hg:`help dates` for a list of formats valid for -d/--date.
3397 See :hg:`help dates` for a list of formats valid for -d/--date.
3396
3398
3397 .. container:: verbose
3399 .. container:: verbose
3398
3400
3399 Examples:
3401 Examples:
3400
3402
3401 - import a traditional patch from a website and detect renames::
3403 - import a traditional patch from a website and detect renames::
3402
3404
3403 hg import -s 80 http://example.com/bugfix.patch
3405 hg import -s 80 http://example.com/bugfix.patch
3404
3406
3405 - import a changeset from an hgweb server::
3407 - import a changeset from an hgweb server::
3406
3408
3407 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3409 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3408
3410
3409 - import all the patches in an Unix-style mbox::
3411 - import all the patches in an Unix-style mbox::
3410
3412
3411 hg import incoming-patches.mbox
3413 hg import incoming-patches.mbox
3412
3414
3413 - import patches from stdin::
3415 - import patches from stdin::
3414
3416
3415 hg import -
3417 hg import -
3416
3418
3417 - attempt to exactly restore an exported changeset (not always
3419 - attempt to exactly restore an exported changeset (not always
3418 possible)::
3420 possible)::
3419
3421
3420 hg import --exact proposed-fix.patch
3422 hg import --exact proposed-fix.patch
3421
3423
3422 - use an external tool to apply a patch which is too fuzzy for
3424 - use an external tool to apply a patch which is too fuzzy for
3423 the default internal tool.
3425 the default internal tool.
3424
3426
3425 hg import --config ui.patch="patch --merge" fuzzy.patch
3427 hg import --config ui.patch="patch --merge" fuzzy.patch
3426
3428
3427 - change the default fuzzing from 2 to a less strict 7
3429 - change the default fuzzing from 2 to a less strict 7
3428
3430
3429 hg import --config ui.fuzz=7 fuzz.patch
3431 hg import --config ui.fuzz=7 fuzz.patch
3430
3432
3431 Returns 0 on success, 1 on partial success (see --partial).
3433 Returns 0 on success, 1 on partial success (see --partial).
3432 """
3434 """
3433
3435
3434 opts = pycompat.byteskwargs(opts)
3436 opts = pycompat.byteskwargs(opts)
3435 if not patch1:
3437 if not patch1:
3436 raise error.Abort(_('need at least one patch to import'))
3438 raise error.Abort(_('need at least one patch to import'))
3437
3439
3438 patches = (patch1,) + patches
3440 patches = (patch1,) + patches
3439
3441
3440 date = opts.get('date')
3442 date = opts.get('date')
3441 if date:
3443 if date:
3442 opts['date'] = dateutil.parsedate(date)
3444 opts['date'] = dateutil.parsedate(date)
3443
3445
3444 exact = opts.get('exact')
3446 exact = opts.get('exact')
3445 update = not opts.get('bypass')
3447 update = not opts.get('bypass')
3446 if not update and opts.get('no_commit'):
3448 if not update and opts.get('no_commit'):
3447 raise error.Abort(_('cannot use --no-commit with --bypass'))
3449 raise error.Abort(_('cannot use --no-commit with --bypass'))
3448 try:
3450 try:
3449 sim = float(opts.get('similarity') or 0)
3451 sim = float(opts.get('similarity') or 0)
3450 except ValueError:
3452 except ValueError:
3451 raise error.Abort(_('similarity must be a number'))
3453 raise error.Abort(_('similarity must be a number'))
3452 if sim < 0 or sim > 100:
3454 if sim < 0 or sim > 100:
3453 raise error.Abort(_('similarity must be between 0 and 100'))
3455 raise error.Abort(_('similarity must be between 0 and 100'))
3454 if sim and not update:
3456 if sim and not update:
3455 raise error.Abort(_('cannot use --similarity with --bypass'))
3457 raise error.Abort(_('cannot use --similarity with --bypass'))
3456 if exact:
3458 if exact:
3457 if opts.get('edit'):
3459 if opts.get('edit'):
3458 raise error.Abort(_('cannot use --exact with --edit'))
3460 raise error.Abort(_('cannot use --exact with --edit'))
3459 if opts.get('prefix'):
3461 if opts.get('prefix'):
3460 raise error.Abort(_('cannot use --exact with --prefix'))
3462 raise error.Abort(_('cannot use --exact with --prefix'))
3461
3463
3462 base = opts["base"]
3464 base = opts["base"]
3463 msgs = []
3465 msgs = []
3464 ret = 0
3466 ret = 0
3465
3467
3466 with repo.wlock():
3468 with repo.wlock():
3467 if update:
3469 if update:
3468 cmdutil.checkunfinished(repo)
3470 cmdutil.checkunfinished(repo)
3469 if (exact or not opts.get('force')):
3471 if (exact or not opts.get('force')):
3470 cmdutil.bailifchanged(repo)
3472 cmdutil.bailifchanged(repo)
3471
3473
3472 if not opts.get('no_commit'):
3474 if not opts.get('no_commit'):
3473 lock = repo.lock
3475 lock = repo.lock
3474 tr = lambda: repo.transaction('import')
3476 tr = lambda: repo.transaction('import')
3475 dsguard = util.nullcontextmanager
3477 dsguard = util.nullcontextmanager
3476 else:
3478 else:
3477 lock = util.nullcontextmanager
3479 lock = util.nullcontextmanager
3478 tr = util.nullcontextmanager
3480 tr = util.nullcontextmanager
3479 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3481 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3480 with lock(), tr(), dsguard():
3482 with lock(), tr(), dsguard():
3481 parents = repo[None].parents()
3483 parents = repo[None].parents()
3482 for patchurl in patches:
3484 for patchurl in patches:
3483 if patchurl == '-':
3485 if patchurl == '-':
3484 ui.status(_('applying patch from stdin\n'))
3486 ui.status(_('applying patch from stdin\n'))
3485 patchfile = ui.fin
3487 patchfile = ui.fin
3486 patchurl = 'stdin' # for error message
3488 patchurl = 'stdin' # for error message
3487 else:
3489 else:
3488 patchurl = os.path.join(base, patchurl)
3490 patchurl = os.path.join(base, patchurl)
3489 ui.status(_('applying %s\n') % patchurl)
3491 ui.status(_('applying %s\n') % patchurl)
3490 patchfile = hg.openpath(ui, patchurl)
3492 patchfile = hg.openpath(ui, patchurl)
3491
3493
3492 haspatch = False
3494 haspatch = False
3493 for hunk in patch.split(patchfile):
3495 for hunk in patch.split(patchfile):
3494 with patch.extract(ui, hunk) as patchdata:
3496 with patch.extract(ui, hunk) as patchdata:
3495 msg, node, rej = cmdutil.tryimportone(ui, repo,
3497 msg, node, rej = cmdutil.tryimportone(ui, repo,
3496 patchdata,
3498 patchdata,
3497 parents, opts,
3499 parents, opts,
3498 msgs, hg.clean)
3500 msgs, hg.clean)
3499 if msg:
3501 if msg:
3500 haspatch = True
3502 haspatch = True
3501 ui.note(msg + '\n')
3503 ui.note(msg + '\n')
3502 if update or exact:
3504 if update or exact:
3503 parents = repo[None].parents()
3505 parents = repo[None].parents()
3504 else:
3506 else:
3505 parents = [repo[node]]
3507 parents = [repo[node]]
3506 if rej:
3508 if rej:
3507 ui.write_err(_("patch applied partially\n"))
3509 ui.write_err(_("patch applied partially\n"))
3508 ui.write_err(_("(fix the .rej files and run "
3510 ui.write_err(_("(fix the .rej files and run "
3509 "`hg commit --amend`)\n"))
3511 "`hg commit --amend`)\n"))
3510 ret = 1
3512 ret = 1
3511 break
3513 break
3512
3514
3513 if not haspatch:
3515 if not haspatch:
3514 raise error.Abort(_('%s: no diffs found') % patchurl)
3516 raise error.Abort(_('%s: no diffs found') % patchurl)
3515
3517
3516 if msgs:
3518 if msgs:
3517 repo.savecommitmessage('\n* * *\n'.join(msgs))
3519 repo.savecommitmessage('\n* * *\n'.join(msgs))
3518 return ret
3520 return ret
3519
3521
3520 @command('incoming|in',
3522 @command('incoming|in',
3521 [('f', 'force', None,
3523 [('f', 'force', None,
3522 _('run even if remote repository is unrelated')),
3524 _('run even if remote repository is unrelated')),
3523 ('n', 'newest-first', None, _('show newest record first')),
3525 ('n', 'newest-first', None, _('show newest record first')),
3524 ('', 'bundle', '',
3526 ('', 'bundle', '',
3525 _('file to store the bundles into'), _('FILE')),
3527 _('file to store the bundles into'), _('FILE')),
3526 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3528 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3527 ('B', 'bookmarks', False, _("compare bookmarks")),
3529 ('B', 'bookmarks', False, _("compare bookmarks")),
3528 ('b', 'branch', [],
3530 ('b', 'branch', [],
3529 _('a specific branch you would like to pull'), _('BRANCH')),
3531 _('a specific branch you would like to pull'), _('BRANCH')),
3530 ] + logopts + remoteopts + subrepoopts,
3532 ] + logopts + remoteopts + subrepoopts,
3531 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
3533 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
3532 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
3534 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
3533 def incoming(ui, repo, source="default", **opts):
3535 def incoming(ui, repo, source="default", **opts):
3534 """show new changesets found in source
3536 """show new changesets found in source
3535
3537
3536 Show new changesets found in the specified path/URL or the default
3538 Show new changesets found in the specified path/URL or the default
3537 pull location. These are the changesets that would have been pulled
3539 pull location. These are the changesets that would have been pulled
3538 by :hg:`pull` at the time you issued this command.
3540 by :hg:`pull` at the time you issued this command.
3539
3541
3540 See pull for valid source format details.
3542 See pull for valid source format details.
3541
3543
3542 .. container:: verbose
3544 .. container:: verbose
3543
3545
3544 With -B/--bookmarks, the result of bookmark comparison between
3546 With -B/--bookmarks, the result of bookmark comparison between
3545 local and remote repositories is displayed. With -v/--verbose,
3547 local and remote repositories is displayed. With -v/--verbose,
3546 status is also displayed for each bookmark like below::
3548 status is also displayed for each bookmark like below::
3547
3549
3548 BM1 01234567890a added
3550 BM1 01234567890a added
3549 BM2 1234567890ab advanced
3551 BM2 1234567890ab advanced
3550 BM3 234567890abc diverged
3552 BM3 234567890abc diverged
3551 BM4 34567890abcd changed
3553 BM4 34567890abcd changed
3552
3554
3553 The action taken locally when pulling depends on the
3555 The action taken locally when pulling depends on the
3554 status of each bookmark:
3556 status of each bookmark:
3555
3557
3556 :``added``: pull will create it
3558 :``added``: pull will create it
3557 :``advanced``: pull will update it
3559 :``advanced``: pull will update it
3558 :``diverged``: pull will create a divergent bookmark
3560 :``diverged``: pull will create a divergent bookmark
3559 :``changed``: result depends on remote changesets
3561 :``changed``: result depends on remote changesets
3560
3562
3561 From the point of view of pulling behavior, bookmark
3563 From the point of view of pulling behavior, bookmark
3562 existing only in the remote repository are treated as ``added``,
3564 existing only in the remote repository are treated as ``added``,
3563 even if it is in fact locally deleted.
3565 even if it is in fact locally deleted.
3564
3566
3565 .. container:: verbose
3567 .. container:: verbose
3566
3568
3567 For remote repository, using --bundle avoids downloading the
3569 For remote repository, using --bundle avoids downloading the
3568 changesets twice if the incoming is followed by a pull.
3570 changesets twice if the incoming is followed by a pull.
3569
3571
3570 Examples:
3572 Examples:
3571
3573
3572 - show incoming changes with patches and full description::
3574 - show incoming changes with patches and full description::
3573
3575
3574 hg incoming -vp
3576 hg incoming -vp
3575
3577
3576 - show incoming changes excluding merges, store a bundle::
3578 - show incoming changes excluding merges, store a bundle::
3577
3579
3578 hg in -vpM --bundle incoming.hg
3580 hg in -vpM --bundle incoming.hg
3579 hg pull incoming.hg
3581 hg pull incoming.hg
3580
3582
3581 - briefly list changes inside a bundle::
3583 - briefly list changes inside a bundle::
3582
3584
3583 hg in changes.hg -T "{desc|firstline}\\n"
3585 hg in changes.hg -T "{desc|firstline}\\n"
3584
3586
3585 Returns 0 if there are incoming changes, 1 otherwise.
3587 Returns 0 if there are incoming changes, 1 otherwise.
3586 """
3588 """
3587 opts = pycompat.byteskwargs(opts)
3589 opts = pycompat.byteskwargs(opts)
3588 if opts.get('graph'):
3590 if opts.get('graph'):
3589 logcmdutil.checkunsupportedgraphflags([], opts)
3591 logcmdutil.checkunsupportedgraphflags([], opts)
3590 def display(other, chlist, displayer):
3592 def display(other, chlist, displayer):
3591 revdag = logcmdutil.graphrevs(other, chlist, opts)
3593 revdag = logcmdutil.graphrevs(other, chlist, opts)
3592 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3594 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3593 graphmod.asciiedges)
3595 graphmod.asciiedges)
3594
3596
3595 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3597 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3596 return 0
3598 return 0
3597
3599
3598 if opts.get('bundle') and opts.get('subrepos'):
3600 if opts.get('bundle') and opts.get('subrepos'):
3599 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3601 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3600
3602
3601 if opts.get('bookmarks'):
3603 if opts.get('bookmarks'):
3602 source, branches = hg.parseurl(ui.expandpath(source),
3604 source, branches = hg.parseurl(ui.expandpath(source),
3603 opts.get('branch'))
3605 opts.get('branch'))
3604 other = hg.peer(repo, opts, source)
3606 other = hg.peer(repo, opts, source)
3605 if 'bookmarks' not in other.listkeys('namespaces'):
3607 if 'bookmarks' not in other.listkeys('namespaces'):
3606 ui.warn(_("remote doesn't support bookmarks\n"))
3608 ui.warn(_("remote doesn't support bookmarks\n"))
3607 return 0
3609 return 0
3608 ui.pager('incoming')
3610 ui.pager('incoming')
3609 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3611 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3610 return bookmarks.incoming(ui, repo, other)
3612 return bookmarks.incoming(ui, repo, other)
3611
3613
3612 repo._subtoppath = ui.expandpath(source)
3614 repo._subtoppath = ui.expandpath(source)
3613 try:
3615 try:
3614 return hg.incoming(ui, repo, source, opts)
3616 return hg.incoming(ui, repo, source, opts)
3615 finally:
3617 finally:
3616 del repo._subtoppath
3618 del repo._subtoppath
3617
3619
3618
3620
3619 @command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3621 @command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3620 helpcategory=command.CATEGORY_REPO_CREATION,
3622 helpcategory=command.CATEGORY_REPO_CREATION,
3621 helpbasic=True, norepo=True)
3623 helpbasic=True, norepo=True)
3622 def init(ui, dest=".", **opts):
3624 def init(ui, dest=".", **opts):
3623 """create a new repository in the given directory
3625 """create a new repository in the given directory
3624
3626
3625 Initialize a new repository in the given directory. If the given
3627 Initialize a new repository in the given directory. If the given
3626 directory does not exist, it will be created.
3628 directory does not exist, it will be created.
3627
3629
3628 If no directory is given, the current directory is used.
3630 If no directory is given, the current directory is used.
3629
3631
3630 It is possible to specify an ``ssh://`` URL as the destination.
3632 It is possible to specify an ``ssh://`` URL as the destination.
3631 See :hg:`help urls` for more information.
3633 See :hg:`help urls` for more information.
3632
3634
3633 Returns 0 on success.
3635 Returns 0 on success.
3634 """
3636 """
3635 opts = pycompat.byteskwargs(opts)
3637 opts = pycompat.byteskwargs(opts)
3636 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3638 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3637
3639
3638 @command('locate',
3640 @command('locate',
3639 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3641 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3640 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3642 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3641 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3643 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3642 ] + walkopts,
3644 ] + walkopts,
3643 _('[OPTION]... [PATTERN]...'),
3645 _('[OPTION]... [PATTERN]...'),
3644 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
3646 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
3645 def locate(ui, repo, *pats, **opts):
3647 def locate(ui, repo, *pats, **opts):
3646 """locate files matching specific patterns (DEPRECATED)
3648 """locate files matching specific patterns (DEPRECATED)
3647
3649
3648 Print files under Mercurial control in the working directory whose
3650 Print files under Mercurial control in the working directory whose
3649 names match the given patterns.
3651 names match the given patterns.
3650
3652
3651 By default, this command searches all directories in the working
3653 By default, this command searches all directories in the working
3652 directory. To search just the current directory and its
3654 directory. To search just the current directory and its
3653 subdirectories, use "--include .".
3655 subdirectories, use "--include .".
3654
3656
3655 If no patterns are given to match, this command prints the names
3657 If no patterns are given to match, this command prints the names
3656 of all files under Mercurial control in the working directory.
3658 of all files under Mercurial control in the working directory.
3657
3659
3658 If you want to feed the output of this command into the "xargs"
3660 If you want to feed the output of this command into the "xargs"
3659 command, use the -0 option to both this command and "xargs". This
3661 command, use the -0 option to both this command and "xargs". This
3660 will avoid the problem of "xargs" treating single filenames that
3662 will avoid the problem of "xargs" treating single filenames that
3661 contain whitespace as multiple filenames.
3663 contain whitespace as multiple filenames.
3662
3664
3663 See :hg:`help files` for a more versatile command.
3665 See :hg:`help files` for a more versatile command.
3664
3666
3665 Returns 0 if a match is found, 1 otherwise.
3667 Returns 0 if a match is found, 1 otherwise.
3666 """
3668 """
3667 opts = pycompat.byteskwargs(opts)
3669 opts = pycompat.byteskwargs(opts)
3668 if opts.get('print0'):
3670 if opts.get('print0'):
3669 end = '\0'
3671 end = '\0'
3670 else:
3672 else:
3671 end = '\n'
3673 end = '\n'
3672 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3674 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3673
3675
3674 ret = 1
3676 ret = 1
3675 m = scmutil.match(ctx, pats, opts, default='relglob',
3677 m = scmutil.match(ctx, pats, opts, default='relglob',
3676 badfn=lambda x, y: False)
3678 badfn=lambda x, y: False)
3677
3679
3678 ui.pager('locate')
3680 ui.pager('locate')
3679 if ctx.rev() is None:
3681 if ctx.rev() is None:
3680 # When run on the working copy, "locate" includes removed files, so
3682 # When run on the working copy, "locate" includes removed files, so
3681 # we get the list of files from the dirstate.
3683 # we get the list of files from the dirstate.
3682 filesgen = sorted(repo.dirstate.matches(m))
3684 filesgen = sorted(repo.dirstate.matches(m))
3683 else:
3685 else:
3684 filesgen = ctx.matches(m)
3686 filesgen = ctx.matches(m)
3685 for abs in filesgen:
3687 for abs in filesgen:
3686 if opts.get('fullpath'):
3688 if opts.get('fullpath'):
3687 ui.write(repo.wjoin(abs), end)
3689 ui.write(repo.wjoin(abs), end)
3688 else:
3690 else:
3689 ui.write(((pats and m.rel(abs)) or abs), end)
3691 ui.write(((pats and m.rel(abs)) or abs), end)
3690 ret = 0
3692 ret = 0
3691
3693
3692 return ret
3694 return ret
3693
3695
3694 @command('log|history',
3696 @command('log|history',
3695 [('f', 'follow', None,
3697 [('f', 'follow', None,
3696 _('follow changeset history, or file history across copies and renames')),
3698 _('follow changeset history, or file history across copies and renames')),
3697 ('', 'follow-first', None,
3699 ('', 'follow-first', None,
3698 _('only follow the first parent of merge changesets (DEPRECATED)')),
3700 _('only follow the first parent of merge changesets (DEPRECATED)')),
3699 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3701 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3700 ('C', 'copies', None, _('show copied files')),
3702 ('C', 'copies', None, _('show copied files')),
3701 ('k', 'keyword', [],
3703 ('k', 'keyword', [],
3702 _('do case-insensitive search for a given text'), _('TEXT')),
3704 _('do case-insensitive search for a given text'), _('TEXT')),
3703 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3705 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3704 ('L', 'line-range', [],
3706 ('L', 'line-range', [],
3705 _('follow line range of specified file (EXPERIMENTAL)'),
3707 _('follow line range of specified file (EXPERIMENTAL)'),
3706 _('FILE,RANGE')),
3708 _('FILE,RANGE')),
3707 ('', 'removed', None, _('include revisions where files were removed')),
3709 ('', 'removed', None, _('include revisions where files were removed')),
3708 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3710 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3709 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3711 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3710 ('', 'only-branch', [],
3712 ('', 'only-branch', [],
3711 _('show only changesets within the given named branch (DEPRECATED)'),
3713 _('show only changesets within the given named branch (DEPRECATED)'),
3712 _('BRANCH')),
3714 _('BRANCH')),
3713 ('b', 'branch', [],
3715 ('b', 'branch', [],
3714 _('show changesets within the given named branch'), _('BRANCH')),
3716 _('show changesets within the given named branch'), _('BRANCH')),
3715 ('P', 'prune', [],
3717 ('P', 'prune', [],
3716 _('do not display revision or any of its ancestors'), _('REV')),
3718 _('do not display revision or any of its ancestors'), _('REV')),
3717 ] + logopts + walkopts,
3719 ] + logopts + walkopts,
3718 _('[OPTION]... [FILE]'),
3720 _('[OPTION]... [FILE]'),
3719 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3721 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3720 helpbasic=True, inferrepo=True,
3722 helpbasic=True, inferrepo=True,
3721 intents={INTENT_READONLY})
3723 intents={INTENT_READONLY})
3722 def log(ui, repo, *pats, **opts):
3724 def log(ui, repo, *pats, **opts):
3723 """show revision history of entire repository or files
3725 """show revision history of entire repository or files
3724
3726
3725 Print the revision history of the specified files or the entire
3727 Print the revision history of the specified files or the entire
3726 project.
3728 project.
3727
3729
3728 If no revision range is specified, the default is ``tip:0`` unless
3730 If no revision range is specified, the default is ``tip:0`` unless
3729 --follow is set, in which case the working directory parent is
3731 --follow is set, in which case the working directory parent is
3730 used as the starting revision.
3732 used as the starting revision.
3731
3733
3732 File history is shown without following rename or copy history of
3734 File history is shown without following rename or copy history of
3733 files. Use -f/--follow with a filename to follow history across
3735 files. Use -f/--follow with a filename to follow history across
3734 renames and copies. --follow without a filename will only show
3736 renames and copies. --follow without a filename will only show
3735 ancestors of the starting revision.
3737 ancestors of the starting revision.
3736
3738
3737 By default this command prints revision number and changeset id,
3739 By default this command prints revision number and changeset id,
3738 tags, non-trivial parents, user, date and time, and a summary for
3740 tags, non-trivial parents, user, date and time, and a summary for
3739 each commit. When the -v/--verbose switch is used, the list of
3741 each commit. When the -v/--verbose switch is used, the list of
3740 changed files and full commit message are shown.
3742 changed files and full commit message are shown.
3741
3743
3742 With --graph the revisions are shown as an ASCII art DAG with the most
3744 With --graph the revisions are shown as an ASCII art DAG with the most
3743 recent changeset at the top.
3745 recent changeset at the top.
3744 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3746 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3745 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3747 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3746 changeset from the lines below is a parent of the 'o' merge on the same
3748 changeset from the lines below is a parent of the 'o' merge on the same
3747 line.
3749 line.
3748 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3750 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3749 of a '|' indicates one or more revisions in a path are omitted.
3751 of a '|' indicates one or more revisions in a path are omitted.
3750
3752
3751 .. container:: verbose
3753 .. container:: verbose
3752
3754
3753 Use -L/--line-range FILE,M:N options to follow the history of lines
3755 Use -L/--line-range FILE,M:N options to follow the history of lines
3754 from M to N in FILE. With -p/--patch only diff hunks affecting
3756 from M to N in FILE. With -p/--patch only diff hunks affecting
3755 specified line range will be shown. This option requires --follow;
3757 specified line range will be shown. This option requires --follow;
3756 it can be specified multiple times. Currently, this option is not
3758 it can be specified multiple times. Currently, this option is not
3757 compatible with --graph. This option is experimental.
3759 compatible with --graph. This option is experimental.
3758
3760
3759 .. note::
3761 .. note::
3760
3762
3761 :hg:`log --patch` may generate unexpected diff output for merge
3763 :hg:`log --patch` may generate unexpected diff output for merge
3762 changesets, as it will only compare the merge changeset against
3764 changesets, as it will only compare the merge changeset against
3763 its first parent. Also, only files different from BOTH parents
3765 its first parent. Also, only files different from BOTH parents
3764 will appear in files:.
3766 will appear in files:.
3765
3767
3766 .. note::
3768 .. note::
3767
3769
3768 For performance reasons, :hg:`log FILE` may omit duplicate changes
3770 For performance reasons, :hg:`log FILE` may omit duplicate changes
3769 made on branches and will not show removals or mode changes. To
3771 made on branches and will not show removals or mode changes. To
3770 see all such changes, use the --removed switch.
3772 see all such changes, use the --removed switch.
3771
3773
3772 .. container:: verbose
3774 .. container:: verbose
3773
3775
3774 .. note::
3776 .. note::
3775
3777
3776 The history resulting from -L/--line-range options depends on diff
3778 The history resulting from -L/--line-range options depends on diff
3777 options; for instance if white-spaces are ignored, respective changes
3779 options; for instance if white-spaces are ignored, respective changes
3778 with only white-spaces in specified line range will not be listed.
3780 with only white-spaces in specified line range will not be listed.
3779
3781
3780 .. container:: verbose
3782 .. container:: verbose
3781
3783
3782 Some examples:
3784 Some examples:
3783
3785
3784 - changesets with full descriptions and file lists::
3786 - changesets with full descriptions and file lists::
3785
3787
3786 hg log -v
3788 hg log -v
3787
3789
3788 - changesets ancestral to the working directory::
3790 - changesets ancestral to the working directory::
3789
3791
3790 hg log -f
3792 hg log -f
3791
3793
3792 - last 10 commits on the current branch::
3794 - last 10 commits on the current branch::
3793
3795
3794 hg log -l 10 -b .
3796 hg log -l 10 -b .
3795
3797
3796 - changesets showing all modifications of a file, including removals::
3798 - changesets showing all modifications of a file, including removals::
3797
3799
3798 hg log --removed file.c
3800 hg log --removed file.c
3799
3801
3800 - all changesets that touch a directory, with diffs, excluding merges::
3802 - all changesets that touch a directory, with diffs, excluding merges::
3801
3803
3802 hg log -Mp lib/
3804 hg log -Mp lib/
3803
3805
3804 - all revision numbers that match a keyword::
3806 - all revision numbers that match a keyword::
3805
3807
3806 hg log -k bug --template "{rev}\\n"
3808 hg log -k bug --template "{rev}\\n"
3807
3809
3808 - the full hash identifier of the working directory parent::
3810 - the full hash identifier of the working directory parent::
3809
3811
3810 hg log -r . --template "{node}\\n"
3812 hg log -r . --template "{node}\\n"
3811
3813
3812 - list available log templates::
3814 - list available log templates::
3813
3815
3814 hg log -T list
3816 hg log -T list
3815
3817
3816 - check if a given changeset is included in a tagged release::
3818 - check if a given changeset is included in a tagged release::
3817
3819
3818 hg log -r "a21ccf and ancestor(1.9)"
3820 hg log -r "a21ccf and ancestor(1.9)"
3819
3821
3820 - find all changesets by some user in a date range::
3822 - find all changesets by some user in a date range::
3821
3823
3822 hg log -k alice -d "may 2008 to jul 2008"
3824 hg log -k alice -d "may 2008 to jul 2008"
3823
3825
3824 - summary of all changesets after the last tag::
3826 - summary of all changesets after the last tag::
3825
3827
3826 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3828 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3827
3829
3828 - changesets touching lines 13 to 23 for file.c::
3830 - changesets touching lines 13 to 23 for file.c::
3829
3831
3830 hg log -L file.c,13:23
3832 hg log -L file.c,13:23
3831
3833
3832 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3834 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3833 main.c with patch::
3835 main.c with patch::
3834
3836
3835 hg log -L file.c,13:23 -L main.c,2:6 -p
3837 hg log -L file.c,13:23 -L main.c,2:6 -p
3836
3838
3837 See :hg:`help dates` for a list of formats valid for -d/--date.
3839 See :hg:`help dates` for a list of formats valid for -d/--date.
3838
3840
3839 See :hg:`help revisions` for more about specifying and ordering
3841 See :hg:`help revisions` for more about specifying and ordering
3840 revisions.
3842 revisions.
3841
3843
3842 See :hg:`help templates` for more about pre-packaged styles and
3844 See :hg:`help templates` for more about pre-packaged styles and
3843 specifying custom templates. The default template used by the log
3845 specifying custom templates. The default template used by the log
3844 command can be customized via the ``ui.logtemplate`` configuration
3846 command can be customized via the ``ui.logtemplate`` configuration
3845 setting.
3847 setting.
3846
3848
3847 Returns 0 on success.
3849 Returns 0 on success.
3848
3850
3849 """
3851 """
3850 opts = pycompat.byteskwargs(opts)
3852 opts = pycompat.byteskwargs(opts)
3851 linerange = opts.get('line_range')
3853 linerange = opts.get('line_range')
3852
3854
3853 if linerange and not opts.get('follow'):
3855 if linerange and not opts.get('follow'):
3854 raise error.Abort(_('--line-range requires --follow'))
3856 raise error.Abort(_('--line-range requires --follow'))
3855
3857
3856 if linerange and pats:
3858 if linerange and pats:
3857 # TODO: take pats as patterns with no line-range filter
3859 # TODO: take pats as patterns with no line-range filter
3858 raise error.Abort(
3860 raise error.Abort(
3859 _('FILE arguments are not compatible with --line-range option')
3861 _('FILE arguments are not compatible with --line-range option')
3860 )
3862 )
3861
3863
3862 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3864 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3863 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3865 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3864 if linerange:
3866 if linerange:
3865 # TODO: should follow file history from logcmdutil._initialrevs(),
3867 # TODO: should follow file history from logcmdutil._initialrevs(),
3866 # then filter the result by logcmdutil._makerevset() and --limit
3868 # then filter the result by logcmdutil._makerevset() and --limit
3867 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3869 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3868
3870
3869 getrenamed = None
3871 getrenamed = None
3870 if opts.get('copies'):
3872 if opts.get('copies'):
3871 endrev = None
3873 endrev = None
3872 if revs:
3874 if revs:
3873 endrev = revs.max() + 1
3875 endrev = revs.max() + 1
3874 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3876 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3875
3877
3876 ui.pager('log')
3878 ui.pager('log')
3877 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3879 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3878 buffered=True)
3880 buffered=True)
3879 if opts.get('graph'):
3881 if opts.get('graph'):
3880 displayfn = logcmdutil.displaygraphrevs
3882 displayfn = logcmdutil.displaygraphrevs
3881 else:
3883 else:
3882 displayfn = logcmdutil.displayrevs
3884 displayfn = logcmdutil.displayrevs
3883 displayfn(ui, repo, revs, displayer, getrenamed)
3885 displayfn(ui, repo, revs, displayer, getrenamed)
3884
3886
3885 @command('manifest',
3887 @command('manifest',
3886 [('r', 'rev', '', _('revision to display'), _('REV')),
3888 [('r', 'rev', '', _('revision to display'), _('REV')),
3887 ('', 'all', False, _("list files from all revisions"))]
3889 ('', 'all', False, _("list files from all revisions"))]
3888 + formatteropts,
3890 + formatteropts,
3889 _('[-r REV]'),
3891 _('[-r REV]'),
3890 helpcategory=command.CATEGORY_MAINTENANCE,
3892 helpcategory=command.CATEGORY_MAINTENANCE,
3891 intents={INTENT_READONLY})
3893 intents={INTENT_READONLY})
3892 def manifest(ui, repo, node=None, rev=None, **opts):
3894 def manifest(ui, repo, node=None, rev=None, **opts):
3893 """output the current or given revision of the project manifest
3895 """output the current or given revision of the project manifest
3894
3896
3895 Print a list of version controlled files for the given revision.
3897 Print a list of version controlled files for the given revision.
3896 If no revision is given, the first parent of the working directory
3898 If no revision is given, the first parent of the working directory
3897 is used, or the null revision if no revision is checked out.
3899 is used, or the null revision if no revision is checked out.
3898
3900
3899 With -v, print file permissions, symlink and executable bits.
3901 With -v, print file permissions, symlink and executable bits.
3900 With --debug, print file revision hashes.
3902 With --debug, print file revision hashes.
3901
3903
3902 If option --all is specified, the list of all files from all revisions
3904 If option --all is specified, the list of all files from all revisions
3903 is printed. This includes deleted and renamed files.
3905 is printed. This includes deleted and renamed files.
3904
3906
3905 Returns 0 on success.
3907 Returns 0 on success.
3906 """
3908 """
3907 opts = pycompat.byteskwargs(opts)
3909 opts = pycompat.byteskwargs(opts)
3908 fm = ui.formatter('manifest', opts)
3910 fm = ui.formatter('manifest', opts)
3909
3911
3910 if opts.get('all'):
3912 if opts.get('all'):
3911 if rev or node:
3913 if rev or node:
3912 raise error.Abort(_("can't specify a revision with --all"))
3914 raise error.Abort(_("can't specify a revision with --all"))
3913
3915
3914 res = set()
3916 res = set()
3915 for rev in repo:
3917 for rev in repo:
3916 ctx = repo[rev]
3918 ctx = repo[rev]
3917 res |= set(ctx.files())
3919 res |= set(ctx.files())
3918
3920
3919 ui.pager('manifest')
3921 ui.pager('manifest')
3920 for f in sorted(res):
3922 for f in sorted(res):
3921 fm.startitem()
3923 fm.startitem()
3922 fm.write("path", '%s\n', f)
3924 fm.write("path", '%s\n', f)
3923 fm.end()
3925 fm.end()
3924 return
3926 return
3925
3927
3926 if rev and node:
3928 if rev and node:
3927 raise error.Abort(_("please specify just one revision"))
3929 raise error.Abort(_("please specify just one revision"))
3928
3930
3929 if not node:
3931 if not node:
3930 node = rev
3932 node = rev
3931
3933
3932 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3934 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3933 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3935 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3934 if node:
3936 if node:
3935 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3937 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3936 ctx = scmutil.revsingle(repo, node)
3938 ctx = scmutil.revsingle(repo, node)
3937 mf = ctx.manifest()
3939 mf = ctx.manifest()
3938 ui.pager('manifest')
3940 ui.pager('manifest')
3939 for f in ctx:
3941 for f in ctx:
3940 fm.startitem()
3942 fm.startitem()
3941 fm.context(ctx=ctx)
3943 fm.context(ctx=ctx)
3942 fl = ctx[f].flags()
3944 fl = ctx[f].flags()
3943 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3945 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3944 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3946 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3945 fm.write('path', '%s\n', f)
3947 fm.write('path', '%s\n', f)
3946 fm.end()
3948 fm.end()
3947
3949
3948 @command('merge',
3950 @command('merge',
3949 [('f', 'force', None,
3951 [('f', 'force', None,
3950 _('force a merge including outstanding changes (DEPRECATED)')),
3952 _('force a merge including outstanding changes (DEPRECATED)')),
3951 ('r', 'rev', '', _('revision to merge'), _('REV')),
3953 ('r', 'rev', '', _('revision to merge'), _('REV')),
3952 ('P', 'preview', None,
3954 ('P', 'preview', None,
3953 _('review revisions to merge (no merge is performed)')),
3955 _('review revisions to merge (no merge is performed)')),
3954 ('', 'abort', None, _('abort the ongoing merge')),
3956 ('', 'abort', None, _('abort the ongoing merge')),
3955 ] + mergetoolopts,
3957 ] + mergetoolopts,
3956 _('[-P] [[-r] REV]'),
3958 _('[-P] [[-r] REV]'),
3957 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
3959 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
3958 def merge(ui, repo, node=None, **opts):
3960 def merge(ui, repo, node=None, **opts):
3959 """merge another revision into working directory
3961 """merge another revision into working directory
3960
3962
3961 The current working directory is updated with all changes made in
3963 The current working directory is updated with all changes made in
3962 the requested revision since the last common predecessor revision.
3964 the requested revision since the last common predecessor revision.
3963
3965
3964 Files that changed between either parent are marked as changed for
3966 Files that changed between either parent are marked as changed for
3965 the next commit and a commit must be performed before any further
3967 the next commit and a commit must be performed before any further
3966 updates to the repository are allowed. The next commit will have
3968 updates to the repository are allowed. The next commit will have
3967 two parents.
3969 two parents.
3968
3970
3969 ``--tool`` can be used to specify the merge tool used for file
3971 ``--tool`` can be used to specify the merge tool used for file
3970 merges. It overrides the HGMERGE environment variable and your
3972 merges. It overrides the HGMERGE environment variable and your
3971 configuration files. See :hg:`help merge-tools` for options.
3973 configuration files. See :hg:`help merge-tools` for options.
3972
3974
3973 If no revision is specified, the working directory's parent is a
3975 If no revision is specified, the working directory's parent is a
3974 head revision, and the current branch contains exactly one other
3976 head revision, and the current branch contains exactly one other
3975 head, the other head is merged with by default. Otherwise, an
3977 head, the other head is merged with by default. Otherwise, an
3976 explicit revision with which to merge with must be provided.
3978 explicit revision with which to merge with must be provided.
3977
3979
3978 See :hg:`help resolve` for information on handling file conflicts.
3980 See :hg:`help resolve` for information on handling file conflicts.
3979
3981
3980 To undo an uncommitted merge, use :hg:`merge --abort` which
3982 To undo an uncommitted merge, use :hg:`merge --abort` which
3981 will check out a clean copy of the original merge parent, losing
3983 will check out a clean copy of the original merge parent, losing
3982 all changes.
3984 all changes.
3983
3985
3984 Returns 0 on success, 1 if there are unresolved files.
3986 Returns 0 on success, 1 if there are unresolved files.
3985 """
3987 """
3986
3988
3987 opts = pycompat.byteskwargs(opts)
3989 opts = pycompat.byteskwargs(opts)
3988 abort = opts.get('abort')
3990 abort = opts.get('abort')
3989 if abort and repo.dirstate.p2() == nullid:
3991 if abort and repo.dirstate.p2() == nullid:
3990 cmdutil.wrongtooltocontinue(repo, _('merge'))
3992 cmdutil.wrongtooltocontinue(repo, _('merge'))
3991 if abort:
3993 if abort:
3992 if node:
3994 if node:
3993 raise error.Abort(_("cannot specify a node with --abort"))
3995 raise error.Abort(_("cannot specify a node with --abort"))
3994 if opts.get('rev'):
3996 if opts.get('rev'):
3995 raise error.Abort(_("cannot specify both --rev and --abort"))
3997 raise error.Abort(_("cannot specify both --rev and --abort"))
3996 if opts.get('preview'):
3998 if opts.get('preview'):
3997 raise error.Abort(_("cannot specify --preview with --abort"))
3999 raise error.Abort(_("cannot specify --preview with --abort"))
3998 if opts.get('rev') and node:
4000 if opts.get('rev') and node:
3999 raise error.Abort(_("please specify just one revision"))
4001 raise error.Abort(_("please specify just one revision"))
4000 if not node:
4002 if not node:
4001 node = opts.get('rev')
4003 node = opts.get('rev')
4002
4004
4003 if node:
4005 if node:
4004 node = scmutil.revsingle(repo, node).node()
4006 node = scmutil.revsingle(repo, node).node()
4005
4007
4006 if not node and not abort:
4008 if not node and not abort:
4007 node = repo[destutil.destmerge(repo)].node()
4009 node = repo[destutil.destmerge(repo)].node()
4008
4010
4009 if opts.get('preview'):
4011 if opts.get('preview'):
4010 # find nodes that are ancestors of p2 but not of p1
4012 # find nodes that are ancestors of p2 but not of p1
4011 p1 = repo.lookup('.')
4013 p1 = repo.lookup('.')
4012 p2 = node
4014 p2 = node
4013 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4015 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4014
4016
4015 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4017 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4016 for node in nodes:
4018 for node in nodes:
4017 displayer.show(repo[node])
4019 displayer.show(repo[node])
4018 displayer.close()
4020 displayer.close()
4019 return 0
4021 return 0
4020
4022
4021 # ui.forcemerge is an internal variable, do not document
4023 # ui.forcemerge is an internal variable, do not document
4022 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4024 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4023 with ui.configoverride(overrides, 'merge'):
4025 with ui.configoverride(overrides, 'merge'):
4024 force = opts.get('force')
4026 force = opts.get('force')
4025 labels = ['working copy', 'merge rev']
4027 labels = ['working copy', 'merge rev']
4026 return hg.merge(repo, node, force=force, mergeforce=force,
4028 return hg.merge(repo, node, force=force, mergeforce=force,
4027 labels=labels, abort=abort)
4029 labels=labels, abort=abort)
4028
4030
4029 @command('outgoing|out',
4031 @command('outgoing|out',
4030 [('f', 'force', None, _('run even when the destination is unrelated')),
4032 [('f', 'force', None, _('run even when the destination is unrelated')),
4031 ('r', 'rev', [],
4033 ('r', 'rev', [],
4032 _('a changeset intended to be included in the destination'), _('REV')),
4034 _('a changeset intended to be included in the destination'), _('REV')),
4033 ('n', 'newest-first', None, _('show newest record first')),
4035 ('n', 'newest-first', None, _('show newest record first')),
4034 ('B', 'bookmarks', False, _('compare bookmarks')),
4036 ('B', 'bookmarks', False, _('compare bookmarks')),
4035 ('b', 'branch', [], _('a specific branch you would like to push'),
4037 ('b', 'branch', [], _('a specific branch you would like to push'),
4036 _('BRANCH')),
4038 _('BRANCH')),
4037 ] + logopts + remoteopts + subrepoopts,
4039 ] + logopts + remoteopts + subrepoopts,
4038 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4040 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4039 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
4041 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
4040 def outgoing(ui, repo, dest=None, **opts):
4042 def outgoing(ui, repo, dest=None, **opts):
4041 """show changesets not found in the destination
4043 """show changesets not found in the destination
4042
4044
4043 Show changesets not found in the specified destination repository
4045 Show changesets not found in the specified destination repository
4044 or the default push location. These are the changesets that would
4046 or the default push location. These are the changesets that would
4045 be pushed if a push was requested.
4047 be pushed if a push was requested.
4046
4048
4047 See pull for details of valid destination formats.
4049 See pull for details of valid destination formats.
4048
4050
4049 .. container:: verbose
4051 .. container:: verbose
4050
4052
4051 With -B/--bookmarks, the result of bookmark comparison between
4053 With -B/--bookmarks, the result of bookmark comparison between
4052 local and remote repositories is displayed. With -v/--verbose,
4054 local and remote repositories is displayed. With -v/--verbose,
4053 status is also displayed for each bookmark like below::
4055 status is also displayed for each bookmark like below::
4054
4056
4055 BM1 01234567890a added
4057 BM1 01234567890a added
4056 BM2 deleted
4058 BM2 deleted
4057 BM3 234567890abc advanced
4059 BM3 234567890abc advanced
4058 BM4 34567890abcd diverged
4060 BM4 34567890abcd diverged
4059 BM5 4567890abcde changed
4061 BM5 4567890abcde changed
4060
4062
4061 The action taken when pushing depends on the
4063 The action taken when pushing depends on the
4062 status of each bookmark:
4064 status of each bookmark:
4063
4065
4064 :``added``: push with ``-B`` will create it
4066 :``added``: push with ``-B`` will create it
4065 :``deleted``: push with ``-B`` will delete it
4067 :``deleted``: push with ``-B`` will delete it
4066 :``advanced``: push will update it
4068 :``advanced``: push will update it
4067 :``diverged``: push with ``-B`` will update it
4069 :``diverged``: push with ``-B`` will update it
4068 :``changed``: push with ``-B`` will update it
4070 :``changed``: push with ``-B`` will update it
4069
4071
4070 From the point of view of pushing behavior, bookmarks
4072 From the point of view of pushing behavior, bookmarks
4071 existing only in the remote repository are treated as
4073 existing only in the remote repository are treated as
4072 ``deleted``, even if it is in fact added remotely.
4074 ``deleted``, even if it is in fact added remotely.
4073
4075
4074 Returns 0 if there are outgoing changes, 1 otherwise.
4076 Returns 0 if there are outgoing changes, 1 otherwise.
4075 """
4077 """
4076 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4078 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4077 # style URLs, so don't overwrite dest.
4079 # style URLs, so don't overwrite dest.
4078 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4080 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4079 if not path:
4081 if not path:
4080 raise error.Abort(_('default repository not configured!'),
4082 raise error.Abort(_('default repository not configured!'),
4081 hint=_("see 'hg help config.paths'"))
4083 hint=_("see 'hg help config.paths'"))
4082
4084
4083 opts = pycompat.byteskwargs(opts)
4085 opts = pycompat.byteskwargs(opts)
4084 if opts.get('graph'):
4086 if opts.get('graph'):
4085 logcmdutil.checkunsupportedgraphflags([], opts)
4087 logcmdutil.checkunsupportedgraphflags([], opts)
4086 o, other = hg._outgoing(ui, repo, dest, opts)
4088 o, other = hg._outgoing(ui, repo, dest, opts)
4087 if not o:
4089 if not o:
4088 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4090 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4089 return
4091 return
4090
4092
4091 revdag = logcmdutil.graphrevs(repo, o, opts)
4093 revdag = logcmdutil.graphrevs(repo, o, opts)
4092 ui.pager('outgoing')
4094 ui.pager('outgoing')
4093 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4095 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4094 logcmdutil.displaygraph(ui, repo, revdag, displayer,
4096 logcmdutil.displaygraph(ui, repo, revdag, displayer,
4095 graphmod.asciiedges)
4097 graphmod.asciiedges)
4096 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4098 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4097 return 0
4099 return 0
4098
4100
4099 if opts.get('bookmarks'):
4101 if opts.get('bookmarks'):
4100 dest = path.pushloc or path.loc
4102 dest = path.pushloc or path.loc
4101 other = hg.peer(repo, opts, dest)
4103 other = hg.peer(repo, opts, dest)
4102 if 'bookmarks' not in other.listkeys('namespaces'):
4104 if 'bookmarks' not in other.listkeys('namespaces'):
4103 ui.warn(_("remote doesn't support bookmarks\n"))
4105 ui.warn(_("remote doesn't support bookmarks\n"))
4104 return 0
4106 return 0
4105 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4107 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4106 ui.pager('outgoing')
4108 ui.pager('outgoing')
4107 return bookmarks.outgoing(ui, repo, other)
4109 return bookmarks.outgoing(ui, repo, other)
4108
4110
4109 repo._subtoppath = path.pushloc or path.loc
4111 repo._subtoppath = path.pushloc or path.loc
4110 try:
4112 try:
4111 return hg.outgoing(ui, repo, dest, opts)
4113 return hg.outgoing(ui, repo, dest, opts)
4112 finally:
4114 finally:
4113 del repo._subtoppath
4115 del repo._subtoppath
4114
4116
4115 @command('parents',
4117 @command('parents',
4116 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4118 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4117 ] + templateopts,
4119 ] + templateopts,
4118 _('[-r REV] [FILE]'),
4120 _('[-r REV] [FILE]'),
4119 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4121 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4120 inferrepo=True)
4122 inferrepo=True)
4121 def parents(ui, repo, file_=None, **opts):
4123 def parents(ui, repo, file_=None, **opts):
4122 """show the parents of the working directory or revision (DEPRECATED)
4124 """show the parents of the working directory or revision (DEPRECATED)
4123
4125
4124 Print the working directory's parent revisions. If a revision is
4126 Print the working directory's parent revisions. If a revision is
4125 given via -r/--rev, the parent of that revision will be printed.
4127 given via -r/--rev, the parent of that revision will be printed.
4126 If a file argument is given, the revision in which the file was
4128 If a file argument is given, the revision in which the file was
4127 last changed (before the working directory revision or the
4129 last changed (before the working directory revision or the
4128 argument to --rev if given) is printed.
4130 argument to --rev if given) is printed.
4129
4131
4130 This command is equivalent to::
4132 This command is equivalent to::
4131
4133
4132 hg log -r "p1()+p2()" or
4134 hg log -r "p1()+p2()" or
4133 hg log -r "p1(REV)+p2(REV)" or
4135 hg log -r "p1(REV)+p2(REV)" or
4134 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4136 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4135 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4137 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4136
4138
4137 See :hg:`summary` and :hg:`help revsets` for related information.
4139 See :hg:`summary` and :hg:`help revsets` for related information.
4138
4140
4139 Returns 0 on success.
4141 Returns 0 on success.
4140 """
4142 """
4141
4143
4142 opts = pycompat.byteskwargs(opts)
4144 opts = pycompat.byteskwargs(opts)
4143 rev = opts.get('rev')
4145 rev = opts.get('rev')
4144 if rev:
4146 if rev:
4145 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4147 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4146 ctx = scmutil.revsingle(repo, rev, None)
4148 ctx = scmutil.revsingle(repo, rev, None)
4147
4149
4148 if file_:
4150 if file_:
4149 m = scmutil.match(ctx, (file_,), opts)
4151 m = scmutil.match(ctx, (file_,), opts)
4150 if m.anypats() or len(m.files()) != 1:
4152 if m.anypats() or len(m.files()) != 1:
4151 raise error.Abort(_('can only specify an explicit filename'))
4153 raise error.Abort(_('can only specify an explicit filename'))
4152 file_ = m.files()[0]
4154 file_ = m.files()[0]
4153 filenodes = []
4155 filenodes = []
4154 for cp in ctx.parents():
4156 for cp in ctx.parents():
4155 if not cp:
4157 if not cp:
4156 continue
4158 continue
4157 try:
4159 try:
4158 filenodes.append(cp.filenode(file_))
4160 filenodes.append(cp.filenode(file_))
4159 except error.LookupError:
4161 except error.LookupError:
4160 pass
4162 pass
4161 if not filenodes:
4163 if not filenodes:
4162 raise error.Abort(_("'%s' not found in manifest!") % file_)
4164 raise error.Abort(_("'%s' not found in manifest!") % file_)
4163 p = []
4165 p = []
4164 for fn in filenodes:
4166 for fn in filenodes:
4165 fctx = repo.filectx(file_, fileid=fn)
4167 fctx = repo.filectx(file_, fileid=fn)
4166 p.append(fctx.node())
4168 p.append(fctx.node())
4167 else:
4169 else:
4168 p = [cp.node() for cp in ctx.parents()]
4170 p = [cp.node() for cp in ctx.parents()]
4169
4171
4170 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4172 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4171 for n in p:
4173 for n in p:
4172 if n != nullid:
4174 if n != nullid:
4173 displayer.show(repo[n])
4175 displayer.show(repo[n])
4174 displayer.close()
4176 displayer.close()
4175
4177
4176 @command('paths', formatteropts, _('[NAME]'),
4178 @command('paths', formatteropts, _('[NAME]'),
4177 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4179 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4178 optionalrepo=True, intents={INTENT_READONLY})
4180 optionalrepo=True, intents={INTENT_READONLY})
4179 def paths(ui, repo, search=None, **opts):
4181 def paths(ui, repo, search=None, **opts):
4180 """show aliases for remote repositories
4182 """show aliases for remote repositories
4181
4183
4182 Show definition of symbolic path name NAME. If no name is given,
4184 Show definition of symbolic path name NAME. If no name is given,
4183 show definition of all available names.
4185 show definition of all available names.
4184
4186
4185 Option -q/--quiet suppresses all output when searching for NAME
4187 Option -q/--quiet suppresses all output when searching for NAME
4186 and shows only the path names when listing all definitions.
4188 and shows only the path names when listing all definitions.
4187
4189
4188 Path names are defined in the [paths] section of your
4190 Path names are defined in the [paths] section of your
4189 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4191 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4190 repository, ``.hg/hgrc`` is used, too.
4192 repository, ``.hg/hgrc`` is used, too.
4191
4193
4192 The path names ``default`` and ``default-push`` have a special
4194 The path names ``default`` and ``default-push`` have a special
4193 meaning. When performing a push or pull operation, they are used
4195 meaning. When performing a push or pull operation, they are used
4194 as fallbacks if no location is specified on the command-line.
4196 as fallbacks if no location is specified on the command-line.
4195 When ``default-push`` is set, it will be used for push and
4197 When ``default-push`` is set, it will be used for push and
4196 ``default`` will be used for pull; otherwise ``default`` is used
4198 ``default`` will be used for pull; otherwise ``default`` is used
4197 as the fallback for both. When cloning a repository, the clone
4199 as the fallback for both. When cloning a repository, the clone
4198 source is written as ``default`` in ``.hg/hgrc``.
4200 source is written as ``default`` in ``.hg/hgrc``.
4199
4201
4200 .. note::
4202 .. note::
4201
4203
4202 ``default`` and ``default-push`` apply to all inbound (e.g.
4204 ``default`` and ``default-push`` apply to all inbound (e.g.
4203 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4205 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4204 and :hg:`bundle`) operations.
4206 and :hg:`bundle`) operations.
4205
4207
4206 See :hg:`help urls` for more information.
4208 See :hg:`help urls` for more information.
4207
4209
4208 .. container:: verbose
4210 .. container:: verbose
4209
4211
4210 Template:
4212 Template:
4211
4213
4212 The following keywords are supported. See also :hg:`help templates`.
4214 The following keywords are supported. See also :hg:`help templates`.
4213
4215
4214 :name: String. Symbolic name of the path alias.
4216 :name: String. Symbolic name of the path alias.
4215 :pushurl: String. URL for push operations.
4217 :pushurl: String. URL for push operations.
4216 :url: String. URL or directory path for the other operations.
4218 :url: String. URL or directory path for the other operations.
4217
4219
4218 Returns 0 on success.
4220 Returns 0 on success.
4219 """
4221 """
4220
4222
4221 opts = pycompat.byteskwargs(opts)
4223 opts = pycompat.byteskwargs(opts)
4222 ui.pager('paths')
4224 ui.pager('paths')
4223 if search:
4225 if search:
4224 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4226 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4225 if name == search]
4227 if name == search]
4226 else:
4228 else:
4227 pathitems = sorted(ui.paths.iteritems())
4229 pathitems = sorted(ui.paths.iteritems())
4228
4230
4229 fm = ui.formatter('paths', opts)
4231 fm = ui.formatter('paths', opts)
4230 if fm.isplain():
4232 if fm.isplain():
4231 hidepassword = util.hidepassword
4233 hidepassword = util.hidepassword
4232 else:
4234 else:
4233 hidepassword = bytes
4235 hidepassword = bytes
4234 if ui.quiet:
4236 if ui.quiet:
4235 namefmt = '%s\n'
4237 namefmt = '%s\n'
4236 else:
4238 else:
4237 namefmt = '%s = '
4239 namefmt = '%s = '
4238 showsubopts = not search and not ui.quiet
4240 showsubopts = not search and not ui.quiet
4239
4241
4240 for name, path in pathitems:
4242 for name, path in pathitems:
4241 fm.startitem()
4243 fm.startitem()
4242 fm.condwrite(not search, 'name', namefmt, name)
4244 fm.condwrite(not search, 'name', namefmt, name)
4243 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4245 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4244 for subopt, value in sorted(path.suboptions.items()):
4246 for subopt, value in sorted(path.suboptions.items()):
4245 assert subopt not in ('name', 'url')
4247 assert subopt not in ('name', 'url')
4246 if showsubopts:
4248 if showsubopts:
4247 fm.plain('%s:%s = ' % (name, subopt))
4249 fm.plain('%s:%s = ' % (name, subopt))
4248 fm.condwrite(showsubopts, subopt, '%s\n', value)
4250 fm.condwrite(showsubopts, subopt, '%s\n', value)
4249
4251
4250 fm.end()
4252 fm.end()
4251
4253
4252 if search and not pathitems:
4254 if search and not pathitems:
4253 if not ui.quiet:
4255 if not ui.quiet:
4254 ui.warn(_("not found!\n"))
4256 ui.warn(_("not found!\n"))
4255 return 1
4257 return 1
4256 else:
4258 else:
4257 return 0
4259 return 0
4258
4260
4259 @command('phase',
4261 @command('phase',
4260 [('p', 'public', False, _('set changeset phase to public')),
4262 [('p', 'public', False, _('set changeset phase to public')),
4261 ('d', 'draft', False, _('set changeset phase to draft')),
4263 ('d', 'draft', False, _('set changeset phase to draft')),
4262 ('s', 'secret', False, _('set changeset phase to secret')),
4264 ('s', 'secret', False, _('set changeset phase to secret')),
4263 ('f', 'force', False, _('allow to move boundary backward')),
4265 ('f', 'force', False, _('allow to move boundary backward')),
4264 ('r', 'rev', [], _('target revision'), _('REV')),
4266 ('r', 'rev', [], _('target revision'), _('REV')),
4265 ],
4267 ],
4266 _('[-p|-d|-s] [-f] [-r] [REV...]'),
4268 _('[-p|-d|-s] [-f] [-r] [REV...]'),
4267 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
4269 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
4268 def phase(ui, repo, *revs, **opts):
4270 def phase(ui, repo, *revs, **opts):
4269 """set or show the current phase name
4271 """set or show the current phase name
4270
4272
4271 With no argument, show the phase name of the current revision(s).
4273 With no argument, show the phase name of the current revision(s).
4272
4274
4273 With one of -p/--public, -d/--draft or -s/--secret, change the
4275 With one of -p/--public, -d/--draft or -s/--secret, change the
4274 phase value of the specified revisions.
4276 phase value of the specified revisions.
4275
4277
4276 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
4278 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
4277 lower phase to a higher phase. Phases are ordered as follows::
4279 lower phase to a higher phase. Phases are ordered as follows::
4278
4280
4279 public < draft < secret
4281 public < draft < secret
4280
4282
4281 Returns 0 on success, 1 if some phases could not be changed.
4283 Returns 0 on success, 1 if some phases could not be changed.
4282
4284
4283 (For more information about the phases concept, see :hg:`help phases`.)
4285 (For more information about the phases concept, see :hg:`help phases`.)
4284 """
4286 """
4285 opts = pycompat.byteskwargs(opts)
4287 opts = pycompat.byteskwargs(opts)
4286 # search for a unique phase argument
4288 # search for a unique phase argument
4287 targetphase = None
4289 targetphase = None
4288 for idx, name in enumerate(phases.cmdphasenames):
4290 for idx, name in enumerate(phases.cmdphasenames):
4289 if opts[name]:
4291 if opts[name]:
4290 if targetphase is not None:
4292 if targetphase is not None:
4291 raise error.Abort(_('only one phase can be specified'))
4293 raise error.Abort(_('only one phase can be specified'))
4292 targetphase = idx
4294 targetphase = idx
4293
4295
4294 # look for specified revision
4296 # look for specified revision
4295 revs = list(revs)
4297 revs = list(revs)
4296 revs.extend(opts['rev'])
4298 revs.extend(opts['rev'])
4297 if not revs:
4299 if not revs:
4298 # display both parents as the second parent phase can influence
4300 # display both parents as the second parent phase can influence
4299 # the phase of a merge commit
4301 # the phase of a merge commit
4300 revs = [c.rev() for c in repo[None].parents()]
4302 revs = [c.rev() for c in repo[None].parents()]
4301
4303
4302 revs = scmutil.revrange(repo, revs)
4304 revs = scmutil.revrange(repo, revs)
4303
4305
4304 ret = 0
4306 ret = 0
4305 if targetphase is None:
4307 if targetphase is None:
4306 # display
4308 # display
4307 for r in revs:
4309 for r in revs:
4308 ctx = repo[r]
4310 ctx = repo[r]
4309 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4311 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4310 else:
4312 else:
4311 with repo.lock(), repo.transaction("phase") as tr:
4313 with repo.lock(), repo.transaction("phase") as tr:
4312 # set phase
4314 # set phase
4313 if not revs:
4315 if not revs:
4314 raise error.Abort(_('empty revision set'))
4316 raise error.Abort(_('empty revision set'))
4315 nodes = [repo[r].node() for r in revs]
4317 nodes = [repo[r].node() for r in revs]
4316 # moving revision from public to draft may hide them
4318 # moving revision from public to draft may hide them
4317 # We have to check result on an unfiltered repository
4319 # We have to check result on an unfiltered repository
4318 unfi = repo.unfiltered()
4320 unfi = repo.unfiltered()
4319 getphase = unfi._phasecache.phase
4321 getphase = unfi._phasecache.phase
4320 olddata = [getphase(unfi, r) for r in unfi]
4322 olddata = [getphase(unfi, r) for r in unfi]
4321 phases.advanceboundary(repo, tr, targetphase, nodes)
4323 phases.advanceboundary(repo, tr, targetphase, nodes)
4322 if opts['force']:
4324 if opts['force']:
4323 phases.retractboundary(repo, tr, targetphase, nodes)
4325 phases.retractboundary(repo, tr, targetphase, nodes)
4324 getphase = unfi._phasecache.phase
4326 getphase = unfi._phasecache.phase
4325 newdata = [getphase(unfi, r) for r in unfi]
4327 newdata = [getphase(unfi, r) for r in unfi]
4326 changes = sum(newdata[r] != olddata[r] for r in unfi)
4328 changes = sum(newdata[r] != olddata[r] for r in unfi)
4327 cl = unfi.changelog
4329 cl = unfi.changelog
4328 rejected = [n for n in nodes
4330 rejected = [n for n in nodes
4329 if newdata[cl.rev(n)] < targetphase]
4331 if newdata[cl.rev(n)] < targetphase]
4330 if rejected:
4332 if rejected:
4331 ui.warn(_('cannot move %i changesets to a higher '
4333 ui.warn(_('cannot move %i changesets to a higher '
4332 'phase, use --force\n') % len(rejected))
4334 'phase, use --force\n') % len(rejected))
4333 ret = 1
4335 ret = 1
4334 if changes:
4336 if changes:
4335 msg = _('phase changed for %i changesets\n') % changes
4337 msg = _('phase changed for %i changesets\n') % changes
4336 if ret:
4338 if ret:
4337 ui.status(msg)
4339 ui.status(msg)
4338 else:
4340 else:
4339 ui.note(msg)
4341 ui.note(msg)
4340 else:
4342 else:
4341 ui.warn(_('no phases changed\n'))
4343 ui.warn(_('no phases changed\n'))
4342 return ret
4344 return ret
4343
4345
4344 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4346 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4345 """Run after a changegroup has been added via pull/unbundle
4347 """Run after a changegroup has been added via pull/unbundle
4346
4348
4347 This takes arguments below:
4349 This takes arguments below:
4348
4350
4349 :modheads: change of heads by pull/unbundle
4351 :modheads: change of heads by pull/unbundle
4350 :optupdate: updating working directory is needed or not
4352 :optupdate: updating working directory is needed or not
4351 :checkout: update destination revision (or None to default destination)
4353 :checkout: update destination revision (or None to default destination)
4352 :brev: a name, which might be a bookmark to be activated after updating
4354 :brev: a name, which might be a bookmark to be activated after updating
4353 """
4355 """
4354 if modheads == 0:
4356 if modheads == 0:
4355 return
4357 return
4356 if optupdate:
4358 if optupdate:
4357 try:
4359 try:
4358 return hg.updatetotally(ui, repo, checkout, brev)
4360 return hg.updatetotally(ui, repo, checkout, brev)
4359 except error.UpdateAbort as inst:
4361 except error.UpdateAbort as inst:
4360 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4362 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4361 hint = inst.hint
4363 hint = inst.hint
4362 raise error.UpdateAbort(msg, hint=hint)
4364 raise error.UpdateAbort(msg, hint=hint)
4363 if modheads > 1:
4365 if modheads > 1:
4364 currentbranchheads = len(repo.branchheads())
4366 currentbranchheads = len(repo.branchheads())
4365 if currentbranchheads == modheads:
4367 if currentbranchheads == modheads:
4366 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4368 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4367 elif currentbranchheads > 1:
4369 elif currentbranchheads > 1:
4368 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4370 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4369 "merge)\n"))
4371 "merge)\n"))
4370 else:
4372 else:
4371 ui.status(_("(run 'hg heads' to see heads)\n"))
4373 ui.status(_("(run 'hg heads' to see heads)\n"))
4372 elif not ui.configbool('commands', 'update.requiredest'):
4374 elif not ui.configbool('commands', 'update.requiredest'):
4373 ui.status(_("(run 'hg update' to get a working copy)\n"))
4375 ui.status(_("(run 'hg update' to get a working copy)\n"))
4374
4376
4375 @command('pull',
4377 @command('pull',
4376 [('u', 'update', None,
4378 [('u', 'update', None,
4377 _('update to new branch head if new descendants were pulled')),
4379 _('update to new branch head if new descendants were pulled')),
4378 ('f', 'force', None, _('run even when remote repository is unrelated')),
4380 ('f', 'force', None, _('run even when remote repository is unrelated')),
4379 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4381 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4380 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4382 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4381 ('b', 'branch', [], _('a specific branch you would like to pull'),
4383 ('b', 'branch', [], _('a specific branch you would like to pull'),
4382 _('BRANCH')),
4384 _('BRANCH')),
4383 ] + remoteopts,
4385 ] + remoteopts,
4384 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
4386 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
4385 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4387 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4386 helpbasic=True)
4388 helpbasic=True)
4387 def pull(ui, repo, source="default", **opts):
4389 def pull(ui, repo, source="default", **opts):
4388 """pull changes from the specified source
4390 """pull changes from the specified source
4389
4391
4390 Pull changes from a remote repository to a local one.
4392 Pull changes from a remote repository to a local one.
4391
4393
4392 This finds all changes from the repository at the specified path
4394 This finds all changes from the repository at the specified path
4393 or URL and adds them to a local repository (the current one unless
4395 or URL and adds them to a local repository (the current one unless
4394 -R is specified). By default, this does not update the copy of the
4396 -R is specified). By default, this does not update the copy of the
4395 project in the working directory.
4397 project in the working directory.
4396
4398
4397 When cloning from servers that support it, Mercurial may fetch
4399 When cloning from servers that support it, Mercurial may fetch
4398 pre-generated data. When this is done, hooks operating on incoming
4400 pre-generated data. When this is done, hooks operating on incoming
4399 changesets and changegroups may fire more than once, once for each
4401 changesets and changegroups may fire more than once, once for each
4400 pre-generated bundle and as well as for any additional remaining
4402 pre-generated bundle and as well as for any additional remaining
4401 data. See :hg:`help -e clonebundles` for more.
4403 data. See :hg:`help -e clonebundles` for more.
4402
4404
4403 Use :hg:`incoming` if you want to see what would have been added
4405 Use :hg:`incoming` if you want to see what would have been added
4404 by a pull at the time you issued this command. If you then decide
4406 by a pull at the time you issued this command. If you then decide
4405 to add those changes to the repository, you should use :hg:`pull
4407 to add those changes to the repository, you should use :hg:`pull
4406 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4408 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4407
4409
4408 If SOURCE is omitted, the 'default' path will be used.
4410 If SOURCE is omitted, the 'default' path will be used.
4409 See :hg:`help urls` for more information.
4411 See :hg:`help urls` for more information.
4410
4412
4411 Specifying bookmark as ``.`` is equivalent to specifying the active
4413 Specifying bookmark as ``.`` is equivalent to specifying the active
4412 bookmark's name.
4414 bookmark's name.
4413
4415
4414 Returns 0 on success, 1 if an update had unresolved files.
4416 Returns 0 on success, 1 if an update had unresolved files.
4415 """
4417 """
4416
4418
4417 opts = pycompat.byteskwargs(opts)
4419 opts = pycompat.byteskwargs(opts)
4418 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4420 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4419 msg = _('update destination required by configuration')
4421 msg = _('update destination required by configuration')
4420 hint = _('use hg pull followed by hg update DEST')
4422 hint = _('use hg pull followed by hg update DEST')
4421 raise error.Abort(msg, hint=hint)
4423 raise error.Abort(msg, hint=hint)
4422
4424
4423 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4425 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4424 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4426 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4425 other = hg.peer(repo, opts, source)
4427 other = hg.peer(repo, opts, source)
4426 try:
4428 try:
4427 revs, checkout = hg.addbranchrevs(repo, other, branches,
4429 revs, checkout = hg.addbranchrevs(repo, other, branches,
4428 opts.get('rev'))
4430 opts.get('rev'))
4429
4431
4430 pullopargs = {}
4432 pullopargs = {}
4431
4433
4432 nodes = None
4434 nodes = None
4433 if opts.get('bookmark') or revs:
4435 if opts.get('bookmark') or revs:
4434 # The list of bookmark used here is the same used to actually update
4436 # The list of bookmark used here is the same used to actually update
4435 # the bookmark names, to avoid the race from issue 4689 and we do
4437 # the bookmark names, to avoid the race from issue 4689 and we do
4436 # all lookup and bookmark queries in one go so they see the same
4438 # all lookup and bookmark queries in one go so they see the same
4437 # version of the server state (issue 4700).
4439 # version of the server state (issue 4700).
4438 nodes = []
4440 nodes = []
4439 fnodes = []
4441 fnodes = []
4440 revs = revs or []
4442 revs = revs or []
4441 if revs and not other.capable('lookup'):
4443 if revs and not other.capable('lookup'):
4442 err = _("other repository doesn't support revision lookup, "
4444 err = _("other repository doesn't support revision lookup, "
4443 "so a rev cannot be specified.")
4445 "so a rev cannot be specified.")
4444 raise error.Abort(err)
4446 raise error.Abort(err)
4445 with other.commandexecutor() as e:
4447 with other.commandexecutor() as e:
4446 fremotebookmarks = e.callcommand('listkeys', {
4448 fremotebookmarks = e.callcommand('listkeys', {
4447 'namespace': 'bookmarks'
4449 'namespace': 'bookmarks'
4448 })
4450 })
4449 for r in revs:
4451 for r in revs:
4450 fnodes.append(e.callcommand('lookup', {'key': r}))
4452 fnodes.append(e.callcommand('lookup', {'key': r}))
4451 remotebookmarks = fremotebookmarks.result()
4453 remotebookmarks = fremotebookmarks.result()
4452 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4454 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4453 pullopargs['remotebookmarks'] = remotebookmarks
4455 pullopargs['remotebookmarks'] = remotebookmarks
4454 for b in opts.get('bookmark', []):
4456 for b in opts.get('bookmark', []):
4455 b = repo._bookmarks.expandname(b)
4457 b = repo._bookmarks.expandname(b)
4456 if b not in remotebookmarks:
4458 if b not in remotebookmarks:
4457 raise error.Abort(_('remote bookmark %s not found!') % b)
4459 raise error.Abort(_('remote bookmark %s not found!') % b)
4458 nodes.append(remotebookmarks[b])
4460 nodes.append(remotebookmarks[b])
4459 for i, rev in enumerate(revs):
4461 for i, rev in enumerate(revs):
4460 node = fnodes[i].result()
4462 node = fnodes[i].result()
4461 nodes.append(node)
4463 nodes.append(node)
4462 if rev == checkout:
4464 if rev == checkout:
4463 checkout = node
4465 checkout = node
4464
4466
4465 wlock = util.nullcontextmanager()
4467 wlock = util.nullcontextmanager()
4466 if opts.get('update'):
4468 if opts.get('update'):
4467 wlock = repo.wlock()
4469 wlock = repo.wlock()
4468 with wlock:
4470 with wlock:
4469 pullopargs.update(opts.get('opargs', {}))
4471 pullopargs.update(opts.get('opargs', {}))
4470 modheads = exchange.pull(repo, other, heads=nodes,
4472 modheads = exchange.pull(repo, other, heads=nodes,
4471 force=opts.get('force'),
4473 force=opts.get('force'),
4472 bookmarks=opts.get('bookmark', ()),
4474 bookmarks=opts.get('bookmark', ()),
4473 opargs=pullopargs).cgresult
4475 opargs=pullopargs).cgresult
4474
4476
4475 # brev is a name, which might be a bookmark to be activated at
4477 # brev is a name, which might be a bookmark to be activated at
4476 # the end of the update. In other words, it is an explicit
4478 # the end of the update. In other words, it is an explicit
4477 # destination of the update
4479 # destination of the update
4478 brev = None
4480 brev = None
4479
4481
4480 if checkout:
4482 if checkout:
4481 checkout = repo.changelog.rev(checkout)
4483 checkout = repo.changelog.rev(checkout)
4482
4484
4483 # order below depends on implementation of
4485 # order below depends on implementation of
4484 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4486 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4485 # because 'checkout' is determined without it.
4487 # because 'checkout' is determined without it.
4486 if opts.get('rev'):
4488 if opts.get('rev'):
4487 brev = opts['rev'][0]
4489 brev = opts['rev'][0]
4488 elif opts.get('branch'):
4490 elif opts.get('branch'):
4489 brev = opts['branch'][0]
4491 brev = opts['branch'][0]
4490 else:
4492 else:
4491 brev = branches[0]
4493 brev = branches[0]
4492 repo._subtoppath = source
4494 repo._subtoppath = source
4493 try:
4495 try:
4494 ret = postincoming(ui, repo, modheads, opts.get('update'),
4496 ret = postincoming(ui, repo, modheads, opts.get('update'),
4495 checkout, brev)
4497 checkout, brev)
4496
4498
4497 finally:
4499 finally:
4498 del repo._subtoppath
4500 del repo._subtoppath
4499
4501
4500 finally:
4502 finally:
4501 other.close()
4503 other.close()
4502 return ret
4504 return ret
4503
4505
4504 @command('push',
4506 @command('push',
4505 [('f', 'force', None, _('force push')),
4507 [('f', 'force', None, _('force push')),
4506 ('r', 'rev', [],
4508 ('r', 'rev', [],
4507 _('a changeset intended to be included in the destination'),
4509 _('a changeset intended to be included in the destination'),
4508 _('REV')),
4510 _('REV')),
4509 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4511 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4510 ('b', 'branch', [],
4512 ('b', 'branch', [],
4511 _('a specific branch you would like to push'), _('BRANCH')),
4513 _('a specific branch you would like to push'), _('BRANCH')),
4512 ('', 'new-branch', False, _('allow pushing a new branch')),
4514 ('', 'new-branch', False, _('allow pushing a new branch')),
4513 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4515 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4514 ('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
4516 ('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
4515 ] + remoteopts,
4517 ] + remoteopts,
4516 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
4518 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
4517 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4519 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4518 helpbasic=True)
4520 helpbasic=True)
4519 def push(ui, repo, dest=None, **opts):
4521 def push(ui, repo, dest=None, **opts):
4520 """push changes to the specified destination
4522 """push changes to the specified destination
4521
4523
4522 Push changesets from the local repository to the specified
4524 Push changesets from the local repository to the specified
4523 destination.
4525 destination.
4524
4526
4525 This operation is symmetrical to pull: it is identical to a pull
4527 This operation is symmetrical to pull: it is identical to a pull
4526 in the destination repository from the current one.
4528 in the destination repository from the current one.
4527
4529
4528 By default, push will not allow creation of new heads at the
4530 By default, push will not allow creation of new heads at the
4529 destination, since multiple heads would make it unclear which head
4531 destination, since multiple heads would make it unclear which head
4530 to use. In this situation, it is recommended to pull and merge
4532 to use. In this situation, it is recommended to pull and merge
4531 before pushing.
4533 before pushing.
4532
4534
4533 Use --new-branch if you want to allow push to create a new named
4535 Use --new-branch if you want to allow push to create a new named
4534 branch that is not present at the destination. This allows you to
4536 branch that is not present at the destination. This allows you to
4535 only create a new branch without forcing other changes.
4537 only create a new branch without forcing other changes.
4536
4538
4537 .. note::
4539 .. note::
4538
4540
4539 Extra care should be taken with the -f/--force option,
4541 Extra care should be taken with the -f/--force option,
4540 which will push all new heads on all branches, an action which will
4542 which will push all new heads on all branches, an action which will
4541 almost always cause confusion for collaborators.
4543 almost always cause confusion for collaborators.
4542
4544
4543 If -r/--rev is used, the specified revision and all its ancestors
4545 If -r/--rev is used, the specified revision and all its ancestors
4544 will be pushed to the remote repository.
4546 will be pushed to the remote repository.
4545
4547
4546 If -B/--bookmark is used, the specified bookmarked revision, its
4548 If -B/--bookmark is used, the specified bookmarked revision, its
4547 ancestors, and the bookmark will be pushed to the remote
4549 ancestors, and the bookmark will be pushed to the remote
4548 repository. Specifying ``.`` is equivalent to specifying the active
4550 repository. Specifying ``.`` is equivalent to specifying the active
4549 bookmark's name.
4551 bookmark's name.
4550
4552
4551 Please see :hg:`help urls` for important details about ``ssh://``
4553 Please see :hg:`help urls` for important details about ``ssh://``
4552 URLs. If DESTINATION is omitted, a default path will be used.
4554 URLs. If DESTINATION is omitted, a default path will be used.
4553
4555
4554 .. container:: verbose
4556 .. container:: verbose
4555
4557
4556 The --pushvars option sends strings to the server that become
4558 The --pushvars option sends strings to the server that become
4557 environment variables prepended with ``HG_USERVAR_``. For example,
4559 environment variables prepended with ``HG_USERVAR_``. For example,
4558 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4560 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4559 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4561 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4560
4562
4561 pushvars can provide for user-overridable hooks as well as set debug
4563 pushvars can provide for user-overridable hooks as well as set debug
4562 levels. One example is having a hook that blocks commits containing
4564 levels. One example is having a hook that blocks commits containing
4563 conflict markers, but enables the user to override the hook if the file
4565 conflict markers, but enables the user to override the hook if the file
4564 is using conflict markers for testing purposes or the file format has
4566 is using conflict markers for testing purposes or the file format has
4565 strings that look like conflict markers.
4567 strings that look like conflict markers.
4566
4568
4567 By default, servers will ignore `--pushvars`. To enable it add the
4569 By default, servers will ignore `--pushvars`. To enable it add the
4568 following to your configuration file::
4570 following to your configuration file::
4569
4571
4570 [push]
4572 [push]
4571 pushvars.server = true
4573 pushvars.server = true
4572
4574
4573 Returns 0 if push was successful, 1 if nothing to push.
4575 Returns 0 if push was successful, 1 if nothing to push.
4574 """
4576 """
4575
4577
4576 opts = pycompat.byteskwargs(opts)
4578 opts = pycompat.byteskwargs(opts)
4577 if opts.get('bookmark'):
4579 if opts.get('bookmark'):
4578 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4580 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4579 for b in opts['bookmark']:
4581 for b in opts['bookmark']:
4580 # translate -B options to -r so changesets get pushed
4582 # translate -B options to -r so changesets get pushed
4581 b = repo._bookmarks.expandname(b)
4583 b = repo._bookmarks.expandname(b)
4582 if b in repo._bookmarks:
4584 if b in repo._bookmarks:
4583 opts.setdefault('rev', []).append(b)
4585 opts.setdefault('rev', []).append(b)
4584 else:
4586 else:
4585 # if we try to push a deleted bookmark, translate it to null
4587 # if we try to push a deleted bookmark, translate it to null
4586 # this lets simultaneous -r, -b options continue working
4588 # this lets simultaneous -r, -b options continue working
4587 opts.setdefault('rev', []).append("null")
4589 opts.setdefault('rev', []).append("null")
4588
4590
4589 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4591 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4590 if not path:
4592 if not path:
4591 raise error.Abort(_('default repository not configured!'),
4593 raise error.Abort(_('default repository not configured!'),
4592 hint=_("see 'hg help config.paths'"))
4594 hint=_("see 'hg help config.paths'"))
4593 dest = path.pushloc or path.loc
4595 dest = path.pushloc or path.loc
4594 branches = (path.branch, opts.get('branch') or [])
4596 branches = (path.branch, opts.get('branch') or [])
4595 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4597 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4596 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4598 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4597 other = hg.peer(repo, opts, dest)
4599 other = hg.peer(repo, opts, dest)
4598
4600
4599 if revs:
4601 if revs:
4600 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4602 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4601 if not revs:
4603 if not revs:
4602 raise error.Abort(_("specified revisions evaluate to an empty set"),
4604 raise error.Abort(_("specified revisions evaluate to an empty set"),
4603 hint=_("use different revision arguments"))
4605 hint=_("use different revision arguments"))
4604 elif path.pushrev:
4606 elif path.pushrev:
4605 # It doesn't make any sense to specify ancestor revisions. So limit
4607 # It doesn't make any sense to specify ancestor revisions. So limit
4606 # to DAG heads to make discovery simpler.
4608 # to DAG heads to make discovery simpler.
4607 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4609 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4608 revs = scmutil.revrange(repo, [expr])
4610 revs = scmutil.revrange(repo, [expr])
4609 revs = [repo[rev].node() for rev in revs]
4611 revs = [repo[rev].node() for rev in revs]
4610 if not revs:
4612 if not revs:
4611 raise error.Abort(_('default push revset for path evaluates to an '
4613 raise error.Abort(_('default push revset for path evaluates to an '
4612 'empty set'))
4614 'empty set'))
4613
4615
4614 repo._subtoppath = dest
4616 repo._subtoppath = dest
4615 try:
4617 try:
4616 # push subrepos depth-first for coherent ordering
4618 # push subrepos depth-first for coherent ordering
4617 c = repo['.']
4619 c = repo['.']
4618 subs = c.substate # only repos that are committed
4620 subs = c.substate # only repos that are committed
4619 for s in sorted(subs):
4621 for s in sorted(subs):
4620 result = c.sub(s).push(opts)
4622 result = c.sub(s).push(opts)
4621 if result == 0:
4623 if result == 0:
4622 return not result
4624 return not result
4623 finally:
4625 finally:
4624 del repo._subtoppath
4626 del repo._subtoppath
4625
4627
4626 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4628 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4627 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4629 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4628
4630
4629 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4631 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4630 newbranch=opts.get('new_branch'),
4632 newbranch=opts.get('new_branch'),
4631 bookmarks=opts.get('bookmark', ()),
4633 bookmarks=opts.get('bookmark', ()),
4632 publish=opts.get('publish'),
4634 publish=opts.get('publish'),
4633 opargs=opargs)
4635 opargs=opargs)
4634
4636
4635 result = not pushop.cgresult
4637 result = not pushop.cgresult
4636
4638
4637 if pushop.bkresult is not None:
4639 if pushop.bkresult is not None:
4638 if pushop.bkresult == 2:
4640 if pushop.bkresult == 2:
4639 result = 2
4641 result = 2
4640 elif not result and pushop.bkresult:
4642 elif not result and pushop.bkresult:
4641 result = 2
4643 result = 2
4642
4644
4643 return result
4645 return result
4644
4646
4645 @command('recover', [], helpcategory=command.CATEGORY_MAINTENANCE)
4647 @command('recover', [], helpcategory=command.CATEGORY_MAINTENANCE)
4646 def recover(ui, repo):
4648 def recover(ui, repo):
4647 """roll back an interrupted transaction
4649 """roll back an interrupted transaction
4648
4650
4649 Recover from an interrupted commit or pull.
4651 Recover from an interrupted commit or pull.
4650
4652
4651 This command tries to fix the repository status after an
4653 This command tries to fix the repository status after an
4652 interrupted operation. It should only be necessary when Mercurial
4654 interrupted operation. It should only be necessary when Mercurial
4653 suggests it.
4655 suggests it.
4654
4656
4655 Returns 0 if successful, 1 if nothing to recover or verify fails.
4657 Returns 0 if successful, 1 if nothing to recover or verify fails.
4656 """
4658 """
4657 if repo.recover():
4659 if repo.recover():
4658 return hg.verify(repo)
4660 return hg.verify(repo)
4659 return 1
4661 return 1
4660
4662
4661 @command('remove|rm',
4663 @command('remove|rm',
4662 [('A', 'after', None, _('record delete for missing files')),
4664 [('A', 'after', None, _('record delete for missing files')),
4663 ('f', 'force', None,
4665 ('f', 'force', None,
4664 _('forget added files, delete modified files')),
4666 _('forget added files, delete modified files')),
4665 ] + subrepoopts + walkopts + dryrunopts,
4667 ] + subrepoopts + walkopts + dryrunopts,
4666 _('[OPTION]... FILE...'),
4668 _('[OPTION]... FILE...'),
4667 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4669 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4668 helpbasic=True, inferrepo=True)
4670 helpbasic=True, inferrepo=True)
4669 def remove(ui, repo, *pats, **opts):
4671 def remove(ui, repo, *pats, **opts):
4670 """remove the specified files on the next commit
4672 """remove the specified files on the next commit
4671
4673
4672 Schedule the indicated files for removal from the current branch.
4674 Schedule the indicated files for removal from the current branch.
4673
4675
4674 This command schedules the files to be removed at the next commit.
4676 This command schedules the files to be removed at the next commit.
4675 To undo a remove before that, see :hg:`revert`. To undo added
4677 To undo a remove before that, see :hg:`revert`. To undo added
4676 files, see :hg:`forget`.
4678 files, see :hg:`forget`.
4677
4679
4678 .. container:: verbose
4680 .. container:: verbose
4679
4681
4680 -A/--after can be used to remove only files that have already
4682 -A/--after can be used to remove only files that have already
4681 been deleted, -f/--force can be used to force deletion, and -Af
4683 been deleted, -f/--force can be used to force deletion, and -Af
4682 can be used to remove files from the next revision without
4684 can be used to remove files from the next revision without
4683 deleting them from the working directory.
4685 deleting them from the working directory.
4684
4686
4685 The following table details the behavior of remove for different
4687 The following table details the behavior of remove for different
4686 file states (columns) and option combinations (rows). The file
4688 file states (columns) and option combinations (rows). The file
4687 states are Added [A], Clean [C], Modified [M] and Missing [!]
4689 states are Added [A], Clean [C], Modified [M] and Missing [!]
4688 (as reported by :hg:`status`). The actions are Warn, Remove
4690 (as reported by :hg:`status`). The actions are Warn, Remove
4689 (from branch) and Delete (from disk):
4691 (from branch) and Delete (from disk):
4690
4692
4691 ========= == == == ==
4693 ========= == == == ==
4692 opt/state A C M !
4694 opt/state A C M !
4693 ========= == == == ==
4695 ========= == == == ==
4694 none W RD W R
4696 none W RD W R
4695 -f R RD RD R
4697 -f R RD RD R
4696 -A W W W R
4698 -A W W W R
4697 -Af R R R R
4699 -Af R R R R
4698 ========= == == == ==
4700 ========= == == == ==
4699
4701
4700 .. note::
4702 .. note::
4701
4703
4702 :hg:`remove` never deletes files in Added [A] state from the
4704 :hg:`remove` never deletes files in Added [A] state from the
4703 working directory, not even if ``--force`` is specified.
4705 working directory, not even if ``--force`` is specified.
4704
4706
4705 Returns 0 on success, 1 if any warnings encountered.
4707 Returns 0 on success, 1 if any warnings encountered.
4706 """
4708 """
4707
4709
4708 opts = pycompat.byteskwargs(opts)
4710 opts = pycompat.byteskwargs(opts)
4709 after, force = opts.get('after'), opts.get('force')
4711 after, force = opts.get('after'), opts.get('force')
4710 dryrun = opts.get('dry_run')
4712 dryrun = opts.get('dry_run')
4711 if not pats and not after:
4713 if not pats and not after:
4712 raise error.Abort(_('no files specified'))
4714 raise error.Abort(_('no files specified'))
4713
4715
4714 m = scmutil.match(repo[None], pats, opts)
4716 m = scmutil.match(repo[None], pats, opts)
4715 subrepos = opts.get('subrepos')
4717 subrepos = opts.get('subrepos')
4716 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4718 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4717 dryrun=dryrun)
4719 dryrun=dryrun)
4718
4720
4719 @command('rename|move|mv',
4721 @command('rename|move|mv',
4720 [('A', 'after', None, _('record a rename that has already occurred')),
4722 [('A', 'after', None, _('record a rename that has already occurred')),
4721 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4723 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4722 ] + walkopts + dryrunopts,
4724 ] + walkopts + dryrunopts,
4723 _('[OPTION]... SOURCE... DEST'),
4725 _('[OPTION]... SOURCE... DEST'),
4724 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
4726 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
4725 def rename(ui, repo, *pats, **opts):
4727 def rename(ui, repo, *pats, **opts):
4726 """rename files; equivalent of copy + remove
4728 """rename files; equivalent of copy + remove
4727
4729
4728 Mark dest as copies of sources; mark sources for deletion. If dest
4730 Mark dest as copies of sources; mark sources for deletion. If dest
4729 is a directory, copies are put in that directory. If dest is a
4731 is a directory, copies are put in that directory. If dest is a
4730 file, there can only be one source.
4732 file, there can only be one source.
4731
4733
4732 By default, this command copies the contents of files as they
4734 By default, this command copies the contents of files as they
4733 exist in the working directory. If invoked with -A/--after, the
4735 exist in the working directory. If invoked with -A/--after, the
4734 operation is recorded, but no copying is performed.
4736 operation is recorded, but no copying is performed.
4735
4737
4736 This command takes effect at the next commit. To undo a rename
4738 This command takes effect at the next commit. To undo a rename
4737 before that, see :hg:`revert`.
4739 before that, see :hg:`revert`.
4738
4740
4739 Returns 0 on success, 1 if errors are encountered.
4741 Returns 0 on success, 1 if errors are encountered.
4740 """
4742 """
4741 opts = pycompat.byteskwargs(opts)
4743 opts = pycompat.byteskwargs(opts)
4742 with repo.wlock(False):
4744 with repo.wlock(False):
4743 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4745 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4744
4746
4745 @command('resolve',
4747 @command('resolve',
4746 [('a', 'all', None, _('select all unresolved files')),
4748 [('a', 'all', None, _('select all unresolved files')),
4747 ('l', 'list', None, _('list state of files needing merge')),
4749 ('l', 'list', None, _('list state of files needing merge')),
4748 ('m', 'mark', None, _('mark files as resolved')),
4750 ('m', 'mark', None, _('mark files as resolved')),
4749 ('u', 'unmark', None, _('mark files as unresolved')),
4751 ('u', 'unmark', None, _('mark files as unresolved')),
4750 ('n', 'no-status', None, _('hide status prefix')),
4752 ('n', 'no-status', None, _('hide status prefix')),
4751 ('', 're-merge', None, _('re-merge files'))]
4753 ('', 're-merge', None, _('re-merge files'))]
4752 + mergetoolopts + walkopts + formatteropts,
4754 + mergetoolopts + walkopts + formatteropts,
4753 _('[OPTION]... [FILE]...'),
4755 _('[OPTION]... [FILE]...'),
4754 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4756 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4755 inferrepo=True)
4757 inferrepo=True)
4756 def resolve(ui, repo, *pats, **opts):
4758 def resolve(ui, repo, *pats, **opts):
4757 """redo merges or set/view the merge status of files
4759 """redo merges or set/view the merge status of files
4758
4760
4759 Merges with unresolved conflicts are often the result of
4761 Merges with unresolved conflicts are often the result of
4760 non-interactive merging using the ``internal:merge`` configuration
4762 non-interactive merging using the ``internal:merge`` configuration
4761 setting, or a command-line merge tool like ``diff3``. The resolve
4763 setting, or a command-line merge tool like ``diff3``. The resolve
4762 command is used to manage the files involved in a merge, after
4764 command is used to manage the files involved in a merge, after
4763 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4765 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4764 working directory must have two parents). See :hg:`help
4766 working directory must have two parents). See :hg:`help
4765 merge-tools` for information on configuring merge tools.
4767 merge-tools` for information on configuring merge tools.
4766
4768
4767 The resolve command can be used in the following ways:
4769 The resolve command can be used in the following ways:
4768
4770
4769 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
4771 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
4770 the specified files, discarding any previous merge attempts. Re-merging
4772 the specified files, discarding any previous merge attempts. Re-merging
4771 is not performed for files already marked as resolved. Use ``--all/-a``
4773 is not performed for files already marked as resolved. Use ``--all/-a``
4772 to select all unresolved files. ``--tool`` can be used to specify
4774 to select all unresolved files. ``--tool`` can be used to specify
4773 the merge tool used for the given files. It overrides the HGMERGE
4775 the merge tool used for the given files. It overrides the HGMERGE
4774 environment variable and your configuration files. Previous file
4776 environment variable and your configuration files. Previous file
4775 contents are saved with a ``.orig`` suffix.
4777 contents are saved with a ``.orig`` suffix.
4776
4778
4777 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4779 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4778 (e.g. after having manually fixed-up the files). The default is
4780 (e.g. after having manually fixed-up the files). The default is
4779 to mark all unresolved files.
4781 to mark all unresolved files.
4780
4782
4781 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4783 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4782 default is to mark all resolved files.
4784 default is to mark all resolved files.
4783
4785
4784 - :hg:`resolve -l`: list files which had or still have conflicts.
4786 - :hg:`resolve -l`: list files which had or still have conflicts.
4785 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4787 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4786 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4788 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4787 the list. See :hg:`help filesets` for details.
4789 the list. See :hg:`help filesets` for details.
4788
4790
4789 .. note::
4791 .. note::
4790
4792
4791 Mercurial will not let you commit files with unresolved merge
4793 Mercurial will not let you commit files with unresolved merge
4792 conflicts. You must use :hg:`resolve -m ...` before you can
4794 conflicts. You must use :hg:`resolve -m ...` before you can
4793 commit after a conflicting merge.
4795 commit after a conflicting merge.
4794
4796
4795 .. container:: verbose
4797 .. container:: verbose
4796
4798
4797 Template:
4799 Template:
4798
4800
4799 The following keywords are supported in addition to the common template
4801 The following keywords are supported in addition to the common template
4800 keywords and functions. See also :hg:`help templates`.
4802 keywords and functions. See also :hg:`help templates`.
4801
4803
4802 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
4804 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
4803 :path: String. Repository-absolute path of the file.
4805 :path: String. Repository-absolute path of the file.
4804
4806
4805 Returns 0 on success, 1 if any files fail a resolve attempt.
4807 Returns 0 on success, 1 if any files fail a resolve attempt.
4806 """
4808 """
4807
4809
4808 opts = pycompat.byteskwargs(opts)
4810 opts = pycompat.byteskwargs(opts)
4809 confirm = ui.configbool('commands', 'resolve.confirm')
4811 confirm = ui.configbool('commands', 'resolve.confirm')
4810 flaglist = 'all mark unmark list no_status re_merge'.split()
4812 flaglist = 'all mark unmark list no_status re_merge'.split()
4811 all, mark, unmark, show, nostatus, remerge = \
4813 all, mark, unmark, show, nostatus, remerge = \
4812 [opts.get(o) for o in flaglist]
4814 [opts.get(o) for o in flaglist]
4813
4815
4814 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
4816 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
4815 if actioncount > 1:
4817 if actioncount > 1:
4816 raise error.Abort(_("too many actions specified"))
4818 raise error.Abort(_("too many actions specified"))
4817 elif (actioncount == 0
4819 elif (actioncount == 0
4818 and ui.configbool('commands', 'resolve.explicit-re-merge')):
4820 and ui.configbool('commands', 'resolve.explicit-re-merge')):
4819 hint = _('use --mark, --unmark, --list or --re-merge')
4821 hint = _('use --mark, --unmark, --list or --re-merge')
4820 raise error.Abort(_('no action specified'), hint=hint)
4822 raise error.Abort(_('no action specified'), hint=hint)
4821 if pats and all:
4823 if pats and all:
4822 raise error.Abort(_("can't specify --all and patterns"))
4824 raise error.Abort(_("can't specify --all and patterns"))
4823 if not (all or pats or show or mark or unmark):
4825 if not (all or pats or show or mark or unmark):
4824 raise error.Abort(_('no files or directories specified'),
4826 raise error.Abort(_('no files or directories specified'),
4825 hint=('use --all to re-merge all unresolved files'))
4827 hint=('use --all to re-merge all unresolved files'))
4826
4828
4827 if confirm:
4829 if confirm:
4828 if all:
4830 if all:
4829 if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
4831 if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
4830 b'$$ &Yes $$ &No')):
4832 b'$$ &Yes $$ &No')):
4831 raise error.Abort(_('user quit'))
4833 raise error.Abort(_('user quit'))
4832 if mark and not pats:
4834 if mark and not pats:
4833 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
4835 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
4834 b'$$ &Yes $$ &No')):
4836 b'$$ &Yes $$ &No')):
4835 raise error.Abort(_('user quit'))
4837 raise error.Abort(_('user quit'))
4836 if unmark and not pats:
4838 if unmark and not pats:
4837 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
4839 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
4838 b'$$ &Yes $$ &No')):
4840 b'$$ &Yes $$ &No')):
4839 raise error.Abort(_('user quit'))
4841 raise error.Abort(_('user quit'))
4840
4842
4841 if show:
4843 if show:
4842 ui.pager('resolve')
4844 ui.pager('resolve')
4843 fm = ui.formatter('resolve', opts)
4845 fm = ui.formatter('resolve', opts)
4844 ms = mergemod.mergestate.read(repo)
4846 ms = mergemod.mergestate.read(repo)
4845 wctx = repo[None]
4847 wctx = repo[None]
4846 m = scmutil.match(wctx, pats, opts)
4848 m = scmutil.match(wctx, pats, opts)
4847
4849
4848 # Labels and keys based on merge state. Unresolved path conflicts show
4850 # Labels and keys based on merge state. Unresolved path conflicts show
4849 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4851 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4850 # resolved conflicts.
4852 # resolved conflicts.
4851 mergestateinfo = {
4853 mergestateinfo = {
4852 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4854 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4853 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4855 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4854 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4856 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4855 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4857 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4856 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4858 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4857 'D'),
4859 'D'),
4858 }
4860 }
4859
4861
4860 for f in ms:
4862 for f in ms:
4861 if not m(f):
4863 if not m(f):
4862 continue
4864 continue
4863
4865
4864 label, key = mergestateinfo[ms[f]]
4866 label, key = mergestateinfo[ms[f]]
4865 fm.startitem()
4867 fm.startitem()
4866 fm.context(ctx=wctx)
4868 fm.context(ctx=wctx)
4867 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
4869 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
4868 fm.write('path', '%s\n', f, label=label)
4870 fm.write('path', '%s\n', f, label=label)
4869 fm.end()
4871 fm.end()
4870 return 0
4872 return 0
4871
4873
4872 with repo.wlock():
4874 with repo.wlock():
4873 ms = mergemod.mergestate.read(repo)
4875 ms = mergemod.mergestate.read(repo)
4874
4876
4875 if not (ms.active() or repo.dirstate.p2() != nullid):
4877 if not (ms.active() or repo.dirstate.p2() != nullid):
4876 raise error.Abort(
4878 raise error.Abort(
4877 _('resolve command not applicable when not merging'))
4879 _('resolve command not applicable when not merging'))
4878
4880
4879 wctx = repo[None]
4881 wctx = repo[None]
4880
4882
4881 if (ms.mergedriver
4883 if (ms.mergedriver
4882 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4884 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4883 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4885 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4884 ms.commit()
4886 ms.commit()
4885 # allow mark and unmark to go through
4887 # allow mark and unmark to go through
4886 if not mark and not unmark and not proceed:
4888 if not mark and not unmark and not proceed:
4887 return 1
4889 return 1
4888
4890
4889 m = scmutil.match(wctx, pats, opts)
4891 m = scmutil.match(wctx, pats, opts)
4890 ret = 0
4892 ret = 0
4891 didwork = False
4893 didwork = False
4892 runconclude = False
4894 runconclude = False
4893
4895
4894 tocomplete = []
4896 tocomplete = []
4895 hasconflictmarkers = []
4897 hasconflictmarkers = []
4896 if mark:
4898 if mark:
4897 markcheck = ui.config('commands', 'resolve.mark-check')
4899 markcheck = ui.config('commands', 'resolve.mark-check')
4898 if markcheck not in ['warn', 'abort']:
4900 if markcheck not in ['warn', 'abort']:
4899 # Treat all invalid / unrecognized values as 'none'.
4901 # Treat all invalid / unrecognized values as 'none'.
4900 markcheck = False
4902 markcheck = False
4901 for f in ms:
4903 for f in ms:
4902 if not m(f):
4904 if not m(f):
4903 continue
4905 continue
4904
4906
4905 didwork = True
4907 didwork = True
4906
4908
4907 # don't let driver-resolved files be marked, and run the conclude
4909 # don't let driver-resolved files be marked, and run the conclude
4908 # step if asked to resolve
4910 # step if asked to resolve
4909 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4911 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4910 exact = m.exact(f)
4912 exact = m.exact(f)
4911 if mark:
4913 if mark:
4912 if exact:
4914 if exact:
4913 ui.warn(_('not marking %s as it is driver-resolved\n')
4915 ui.warn(_('not marking %s as it is driver-resolved\n')
4914 % f)
4916 % f)
4915 elif unmark:
4917 elif unmark:
4916 if exact:
4918 if exact:
4917 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4919 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4918 % f)
4920 % f)
4919 else:
4921 else:
4920 runconclude = True
4922 runconclude = True
4921 continue
4923 continue
4922
4924
4923 # path conflicts must be resolved manually
4925 # path conflicts must be resolved manually
4924 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4926 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4925 mergemod.MERGE_RECORD_RESOLVED_PATH):
4927 mergemod.MERGE_RECORD_RESOLVED_PATH):
4926 if mark:
4928 if mark:
4927 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4929 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4928 elif unmark:
4930 elif unmark:
4929 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4931 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4930 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4932 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4931 ui.warn(_('%s: path conflict must be resolved manually\n')
4933 ui.warn(_('%s: path conflict must be resolved manually\n')
4932 % f)
4934 % f)
4933 continue
4935 continue
4934
4936
4935 if mark:
4937 if mark:
4936 if markcheck:
4938 if markcheck:
4937 fdata = repo.wvfs.tryread(f)
4939 fdata = repo.wvfs.tryread(f)
4938 if filemerge.hasconflictmarkers(fdata) and \
4940 if filemerge.hasconflictmarkers(fdata) and \
4939 ms[f] != mergemod.MERGE_RECORD_RESOLVED:
4941 ms[f] != mergemod.MERGE_RECORD_RESOLVED:
4940 hasconflictmarkers.append(f)
4942 hasconflictmarkers.append(f)
4941 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4943 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4942 elif unmark:
4944 elif unmark:
4943 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4945 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4944 else:
4946 else:
4945 # backup pre-resolve (merge uses .orig for its own purposes)
4947 # backup pre-resolve (merge uses .orig for its own purposes)
4946 a = repo.wjoin(f)
4948 a = repo.wjoin(f)
4947 try:
4949 try:
4948 util.copyfile(a, a + ".resolve")
4950 util.copyfile(a, a + ".resolve")
4949 except (IOError, OSError) as inst:
4951 except (IOError, OSError) as inst:
4950 if inst.errno != errno.ENOENT:
4952 if inst.errno != errno.ENOENT:
4951 raise
4953 raise
4952
4954
4953 try:
4955 try:
4954 # preresolve file
4956 # preresolve file
4955 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4957 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4956 with ui.configoverride(overrides, 'resolve'):
4958 with ui.configoverride(overrides, 'resolve'):
4957 complete, r = ms.preresolve(f, wctx)
4959 complete, r = ms.preresolve(f, wctx)
4958 if not complete:
4960 if not complete:
4959 tocomplete.append(f)
4961 tocomplete.append(f)
4960 elif r:
4962 elif r:
4961 ret = 1
4963 ret = 1
4962 finally:
4964 finally:
4963 ms.commit()
4965 ms.commit()
4964
4966
4965 # replace filemerge's .orig file with our resolve file, but only
4967 # replace filemerge's .orig file with our resolve file, but only
4966 # for merges that are complete
4968 # for merges that are complete
4967 if complete:
4969 if complete:
4968 try:
4970 try:
4969 util.rename(a + ".resolve",
4971 util.rename(a + ".resolve",
4970 scmutil.origpath(ui, repo, a))
4972 scmutil.origpath(ui, repo, a))
4971 except OSError as inst:
4973 except OSError as inst:
4972 if inst.errno != errno.ENOENT:
4974 if inst.errno != errno.ENOENT:
4973 raise
4975 raise
4974
4976
4975 if hasconflictmarkers:
4977 if hasconflictmarkers:
4976 ui.warn(_('warning: the following files still have conflict '
4978 ui.warn(_('warning: the following files still have conflict '
4977 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
4979 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
4978 if markcheck == 'abort' and not all and not pats:
4980 if markcheck == 'abort' and not all and not pats:
4979 raise error.Abort(_('conflict markers detected'),
4981 raise error.Abort(_('conflict markers detected'),
4980 hint=_('use --all to mark anyway'))
4982 hint=_('use --all to mark anyway'))
4981
4983
4982 for f in tocomplete:
4984 for f in tocomplete:
4983 try:
4985 try:
4984 # resolve file
4986 # resolve file
4985 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4987 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4986 with ui.configoverride(overrides, 'resolve'):
4988 with ui.configoverride(overrides, 'resolve'):
4987 r = ms.resolve(f, wctx)
4989 r = ms.resolve(f, wctx)
4988 if r:
4990 if r:
4989 ret = 1
4991 ret = 1
4990 finally:
4992 finally:
4991 ms.commit()
4993 ms.commit()
4992
4994
4993 # replace filemerge's .orig file with our resolve file
4995 # replace filemerge's .orig file with our resolve file
4994 a = repo.wjoin(f)
4996 a = repo.wjoin(f)
4995 try:
4997 try:
4996 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4998 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4997 except OSError as inst:
4999 except OSError as inst:
4998 if inst.errno != errno.ENOENT:
5000 if inst.errno != errno.ENOENT:
4999 raise
5001 raise
5000
5002
5001 ms.commit()
5003 ms.commit()
5002 ms.recordactions()
5004 ms.recordactions()
5003
5005
5004 if not didwork and pats:
5006 if not didwork and pats:
5005 hint = None
5007 hint = None
5006 if not any([p for p in pats if p.find(':') >= 0]):
5008 if not any([p for p in pats if p.find(':') >= 0]):
5007 pats = ['path:%s' % p for p in pats]
5009 pats = ['path:%s' % p for p in pats]
5008 m = scmutil.match(wctx, pats, opts)
5010 m = scmutil.match(wctx, pats, opts)
5009 for f in ms:
5011 for f in ms:
5010 if not m(f):
5012 if not m(f):
5011 continue
5013 continue
5012 def flag(o):
5014 def flag(o):
5013 if o == 're_merge':
5015 if o == 're_merge':
5014 return '--re-merge '
5016 return '--re-merge '
5015 return '-%s ' % o[0:1]
5017 return '-%s ' % o[0:1]
5016 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
5018 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
5017 hint = _("(try: hg resolve %s%s)\n") % (
5019 hint = _("(try: hg resolve %s%s)\n") % (
5018 flags,
5020 flags,
5019 ' '.join(pats))
5021 ' '.join(pats))
5020 break
5022 break
5021 ui.warn(_("arguments do not match paths that need resolving\n"))
5023 ui.warn(_("arguments do not match paths that need resolving\n"))
5022 if hint:
5024 if hint:
5023 ui.warn(hint)
5025 ui.warn(hint)
5024 elif ms.mergedriver and ms.mdstate() != 's':
5026 elif ms.mergedriver and ms.mdstate() != 's':
5025 # run conclude step when either a driver-resolved file is requested
5027 # run conclude step when either a driver-resolved file is requested
5026 # or there are no driver-resolved files
5028 # or there are no driver-resolved files
5027 # we can't use 'ret' to determine whether any files are unresolved
5029 # we can't use 'ret' to determine whether any files are unresolved
5028 # because we might not have tried to resolve some
5030 # because we might not have tried to resolve some
5029 if ((runconclude or not list(ms.driverresolved()))
5031 if ((runconclude or not list(ms.driverresolved()))
5030 and not list(ms.unresolved())):
5032 and not list(ms.unresolved())):
5031 proceed = mergemod.driverconclude(repo, ms, wctx)
5033 proceed = mergemod.driverconclude(repo, ms, wctx)
5032 ms.commit()
5034 ms.commit()
5033 if not proceed:
5035 if not proceed:
5034 return 1
5036 return 1
5035
5037
5036 # Nudge users into finishing an unfinished operation
5038 # Nudge users into finishing an unfinished operation
5037 unresolvedf = list(ms.unresolved())
5039 unresolvedf = list(ms.unresolved())
5038 driverresolvedf = list(ms.driverresolved())
5040 driverresolvedf = list(ms.driverresolved())
5039 if not unresolvedf and not driverresolvedf:
5041 if not unresolvedf and not driverresolvedf:
5040 ui.status(_('(no more unresolved files)\n'))
5042 ui.status(_('(no more unresolved files)\n'))
5041 cmdutil.checkafterresolved(repo)
5043 cmdutil.checkafterresolved(repo)
5042 elif not unresolvedf:
5044 elif not unresolvedf:
5043 ui.status(_('(no more unresolved files -- '
5045 ui.status(_('(no more unresolved files -- '
5044 'run "hg resolve --all" to conclude)\n'))
5046 'run "hg resolve --all" to conclude)\n'))
5045
5047
5046 return ret
5048 return ret
5047
5049
5048 @command('revert',
5050 @command('revert',
5049 [('a', 'all', None, _('revert all changes when no arguments given')),
5051 [('a', 'all', None, _('revert all changes when no arguments given')),
5050 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5052 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5051 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5053 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5052 ('C', 'no-backup', None, _('do not save backup copies of files')),
5054 ('C', 'no-backup', None, _('do not save backup copies of files')),
5053 ('i', 'interactive', None, _('interactively select the changes')),
5055 ('i', 'interactive', None, _('interactively select the changes')),
5054 ] + walkopts + dryrunopts,
5056 ] + walkopts + dryrunopts,
5055 _('[OPTION]... [-r REV] [NAME]...'),
5057 _('[OPTION]... [-r REV] [NAME]...'),
5056 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5058 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5057 def revert(ui, repo, *pats, **opts):
5059 def revert(ui, repo, *pats, **opts):
5058 """restore files to their checkout state
5060 """restore files to their checkout state
5059
5061
5060 .. note::
5062 .. note::
5061
5063
5062 To check out earlier revisions, you should use :hg:`update REV`.
5064 To check out earlier revisions, you should use :hg:`update REV`.
5063 To cancel an uncommitted merge (and lose your changes),
5065 To cancel an uncommitted merge (and lose your changes),
5064 use :hg:`merge --abort`.
5066 use :hg:`merge --abort`.
5065
5067
5066 With no revision specified, revert the specified files or directories
5068 With no revision specified, revert the specified files or directories
5067 to the contents they had in the parent of the working directory.
5069 to the contents they had in the parent of the working directory.
5068 This restores the contents of files to an unmodified
5070 This restores the contents of files to an unmodified
5069 state and unschedules adds, removes, copies, and renames. If the
5071 state and unschedules adds, removes, copies, and renames. If the
5070 working directory has two parents, you must explicitly specify a
5072 working directory has two parents, you must explicitly specify a
5071 revision.
5073 revision.
5072
5074
5073 Using the -r/--rev or -d/--date options, revert the given files or
5075 Using the -r/--rev or -d/--date options, revert the given files or
5074 directories to their states as of a specific revision. Because
5076 directories to their states as of a specific revision. Because
5075 revert does not change the working directory parents, this will
5077 revert does not change the working directory parents, this will
5076 cause these files to appear modified. This can be helpful to "back
5078 cause these files to appear modified. This can be helpful to "back
5077 out" some or all of an earlier change. See :hg:`backout` for a
5079 out" some or all of an earlier change. See :hg:`backout` for a
5078 related method.
5080 related method.
5079
5081
5080 Modified files are saved with a .orig suffix before reverting.
5082 Modified files are saved with a .orig suffix before reverting.
5081 To disable these backups, use --no-backup. It is possible to store
5083 To disable these backups, use --no-backup. It is possible to store
5082 the backup files in a custom directory relative to the root of the
5084 the backup files in a custom directory relative to the root of the
5083 repository by setting the ``ui.origbackuppath`` configuration
5085 repository by setting the ``ui.origbackuppath`` configuration
5084 option.
5086 option.
5085
5087
5086 See :hg:`help dates` for a list of formats valid for -d/--date.
5088 See :hg:`help dates` for a list of formats valid for -d/--date.
5087
5089
5088 See :hg:`help backout` for a way to reverse the effect of an
5090 See :hg:`help backout` for a way to reverse the effect of an
5089 earlier changeset.
5091 earlier changeset.
5090
5092
5091 Returns 0 on success.
5093 Returns 0 on success.
5092 """
5094 """
5093
5095
5094 opts = pycompat.byteskwargs(opts)
5096 opts = pycompat.byteskwargs(opts)
5095 if opts.get("date"):
5097 if opts.get("date"):
5096 if opts.get("rev"):
5098 if opts.get("rev"):
5097 raise error.Abort(_("you can't specify a revision and a date"))
5099 raise error.Abort(_("you can't specify a revision and a date"))
5098 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5100 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5099
5101
5100 parent, p2 = repo.dirstate.parents()
5102 parent, p2 = repo.dirstate.parents()
5101 if not opts.get('rev') and p2 != nullid:
5103 if not opts.get('rev') and p2 != nullid:
5102 # revert after merge is a trap for new users (issue2915)
5104 # revert after merge is a trap for new users (issue2915)
5103 raise error.Abort(_('uncommitted merge with no revision specified'),
5105 raise error.Abort(_('uncommitted merge with no revision specified'),
5104 hint=_("use 'hg update' or see 'hg help revert'"))
5106 hint=_("use 'hg update' or see 'hg help revert'"))
5105
5107
5106 rev = opts.get('rev')
5108 rev = opts.get('rev')
5107 if rev:
5109 if rev:
5108 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5110 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5109 ctx = scmutil.revsingle(repo, rev)
5111 ctx = scmutil.revsingle(repo, rev)
5110
5112
5111 if (not (pats or opts.get('include') or opts.get('exclude') or
5113 if (not (pats or opts.get('include') or opts.get('exclude') or
5112 opts.get('all') or opts.get('interactive'))):
5114 opts.get('all') or opts.get('interactive'))):
5113 msg = _("no files or directories specified")
5115 msg = _("no files or directories specified")
5114 if p2 != nullid:
5116 if p2 != nullid:
5115 hint = _("uncommitted merge, use --all to discard all changes,"
5117 hint = _("uncommitted merge, use --all to discard all changes,"
5116 " or 'hg update -C .' to abort the merge")
5118 " or 'hg update -C .' to abort the merge")
5117 raise error.Abort(msg, hint=hint)
5119 raise error.Abort(msg, hint=hint)
5118 dirty = any(repo.status())
5120 dirty = any(repo.status())
5119 node = ctx.node()
5121 node = ctx.node()
5120 if node != parent:
5122 if node != parent:
5121 if dirty:
5123 if dirty:
5122 hint = _("uncommitted changes, use --all to discard all"
5124 hint = _("uncommitted changes, use --all to discard all"
5123 " changes, or 'hg update %d' to update") % ctx.rev()
5125 " changes, or 'hg update %d' to update") % ctx.rev()
5124 else:
5126 else:
5125 hint = _("use --all to revert all files,"
5127 hint = _("use --all to revert all files,"
5126 " or 'hg update %d' to update") % ctx.rev()
5128 " or 'hg update %d' to update") % ctx.rev()
5127 elif dirty:
5129 elif dirty:
5128 hint = _("uncommitted changes, use --all to discard all changes")
5130 hint = _("uncommitted changes, use --all to discard all changes")
5129 else:
5131 else:
5130 hint = _("use --all to revert all files")
5132 hint = _("use --all to revert all files")
5131 raise error.Abort(msg, hint=hint)
5133 raise error.Abort(msg, hint=hint)
5132
5134
5133 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
5135 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
5134 **pycompat.strkwargs(opts))
5136 **pycompat.strkwargs(opts))
5135
5137
5136 @command(
5138 @command(
5137 'rollback',
5139 'rollback',
5138 dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
5140 dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
5139 helpcategory=command.CATEGORY_MAINTENANCE)
5141 helpcategory=command.CATEGORY_MAINTENANCE)
5140 def rollback(ui, repo, **opts):
5142 def rollback(ui, repo, **opts):
5141 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5143 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5142
5144
5143 Please use :hg:`commit --amend` instead of rollback to correct
5145 Please use :hg:`commit --amend` instead of rollback to correct
5144 mistakes in the last commit.
5146 mistakes in the last commit.
5145
5147
5146 This command should be used with care. There is only one level of
5148 This command should be used with care. There is only one level of
5147 rollback, and there is no way to undo a rollback. It will also
5149 rollback, and there is no way to undo a rollback. It will also
5148 restore the dirstate at the time of the last transaction, losing
5150 restore the dirstate at the time of the last transaction, losing
5149 any dirstate changes since that time. This command does not alter
5151 any dirstate changes since that time. This command does not alter
5150 the working directory.
5152 the working directory.
5151
5153
5152 Transactions are used to encapsulate the effects of all commands
5154 Transactions are used to encapsulate the effects of all commands
5153 that create new changesets or propagate existing changesets into a
5155 that create new changesets or propagate existing changesets into a
5154 repository.
5156 repository.
5155
5157
5156 .. container:: verbose
5158 .. container:: verbose
5157
5159
5158 For example, the following commands are transactional, and their
5160 For example, the following commands are transactional, and their
5159 effects can be rolled back:
5161 effects can be rolled back:
5160
5162
5161 - commit
5163 - commit
5162 - import
5164 - import
5163 - pull
5165 - pull
5164 - push (with this repository as the destination)
5166 - push (with this repository as the destination)
5165 - unbundle
5167 - unbundle
5166
5168
5167 To avoid permanent data loss, rollback will refuse to rollback a
5169 To avoid permanent data loss, rollback will refuse to rollback a
5168 commit transaction if it isn't checked out. Use --force to
5170 commit transaction if it isn't checked out. Use --force to
5169 override this protection.
5171 override this protection.
5170
5172
5171 The rollback command can be entirely disabled by setting the
5173 The rollback command can be entirely disabled by setting the
5172 ``ui.rollback`` configuration setting to false. If you're here
5174 ``ui.rollback`` configuration setting to false. If you're here
5173 because you want to use rollback and it's disabled, you can
5175 because you want to use rollback and it's disabled, you can
5174 re-enable the command by setting ``ui.rollback`` to true.
5176 re-enable the command by setting ``ui.rollback`` to true.
5175
5177
5176 This command is not intended for use on public repositories. Once
5178 This command is not intended for use on public repositories. Once
5177 changes are visible for pull by other users, rolling a transaction
5179 changes are visible for pull by other users, rolling a transaction
5178 back locally is ineffective (someone else may already have pulled
5180 back locally is ineffective (someone else may already have pulled
5179 the changes). Furthermore, a race is possible with readers of the
5181 the changes). Furthermore, a race is possible with readers of the
5180 repository; for example an in-progress pull from the repository
5182 repository; for example an in-progress pull from the repository
5181 may fail if a rollback is performed.
5183 may fail if a rollback is performed.
5182
5184
5183 Returns 0 on success, 1 if no rollback data is available.
5185 Returns 0 on success, 1 if no rollback data is available.
5184 """
5186 """
5185 if not ui.configbool('ui', 'rollback'):
5187 if not ui.configbool('ui', 'rollback'):
5186 raise error.Abort(_('rollback is disabled because it is unsafe'),
5188 raise error.Abort(_('rollback is disabled because it is unsafe'),
5187 hint=('see `hg help -v rollback` for information'))
5189 hint=('see `hg help -v rollback` for information'))
5188 return repo.rollback(dryrun=opts.get(r'dry_run'),
5190 return repo.rollback(dryrun=opts.get(r'dry_run'),
5189 force=opts.get(r'force'))
5191 force=opts.get(r'force'))
5190
5192
5191 @command(
5193 @command(
5192 'root', [], intents={INTENT_READONLY},
5194 'root', [], intents={INTENT_READONLY},
5193 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5195 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5194 def root(ui, repo):
5196 def root(ui, repo):
5195 """print the root (top) of the current working directory
5197 """print the root (top) of the current working directory
5196
5198
5197 Print the root directory of the current repository.
5199 Print the root directory of the current repository.
5198
5200
5199 Returns 0 on success.
5201 Returns 0 on success.
5200 """
5202 """
5201 ui.write(repo.root + "\n")
5203 ui.write(repo.root + "\n")
5202
5204
5203 @command('serve',
5205 @command('serve',
5204 [('A', 'accesslog', '', _('name of access log file to write to'),
5206 [('A', 'accesslog', '', _('name of access log file to write to'),
5205 _('FILE')),
5207 _('FILE')),
5206 ('d', 'daemon', None, _('run server in background')),
5208 ('d', 'daemon', None, _('run server in background')),
5207 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5209 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5208 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5210 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5209 # use string type, then we can check if something was passed
5211 # use string type, then we can check if something was passed
5210 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5212 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5211 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5213 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5212 _('ADDR')),
5214 _('ADDR')),
5213 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5215 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5214 _('PREFIX')),
5216 _('PREFIX')),
5215 ('n', 'name', '',
5217 ('n', 'name', '',
5216 _('name to show in web pages (default: working directory)'), _('NAME')),
5218 _('name to show in web pages (default: working directory)'), _('NAME')),
5217 ('', 'web-conf', '',
5219 ('', 'web-conf', '',
5218 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5220 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5219 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5221 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5220 _('FILE')),
5222 _('FILE')),
5221 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5223 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5222 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
5224 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
5223 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
5225 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
5224 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5226 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5225 ('', 'style', '', _('template style to use'), _('STYLE')),
5227 ('', 'style', '', _('template style to use'), _('STYLE')),
5226 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5228 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5227 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
5229 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
5228 ('', 'print-url', None, _('start and print only the URL'))]
5230 ('', 'print-url', None, _('start and print only the URL'))]
5229 + subrepoopts,
5231 + subrepoopts,
5230 _('[OPTION]...'),
5232 _('[OPTION]...'),
5231 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5233 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5232 helpbasic=True, optionalrepo=True)
5234 helpbasic=True, optionalrepo=True)
5233 def serve(ui, repo, **opts):
5235 def serve(ui, repo, **opts):
5234 """start stand-alone webserver
5236 """start stand-alone webserver
5235
5237
5236 Start a local HTTP repository browser and pull server. You can use
5238 Start a local HTTP repository browser and pull server. You can use
5237 this for ad-hoc sharing and browsing of repositories. It is
5239 this for ad-hoc sharing and browsing of repositories. It is
5238 recommended to use a real web server to serve a repository for
5240 recommended to use a real web server to serve a repository for
5239 longer periods of time.
5241 longer periods of time.
5240
5242
5241 Please note that the server does not implement access control.
5243 Please note that the server does not implement access control.
5242 This means that, by default, anybody can read from the server and
5244 This means that, by default, anybody can read from the server and
5243 nobody can write to it by default. Set the ``web.allow-push``
5245 nobody can write to it by default. Set the ``web.allow-push``
5244 option to ``*`` to allow everybody to push to the server. You
5246 option to ``*`` to allow everybody to push to the server. You
5245 should use a real web server if you need to authenticate users.
5247 should use a real web server if you need to authenticate users.
5246
5248
5247 By default, the server logs accesses to stdout and errors to
5249 By default, the server logs accesses to stdout and errors to
5248 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5250 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5249 files.
5251 files.
5250
5252
5251 To have the server choose a free port number to listen on, specify
5253 To have the server choose a free port number to listen on, specify
5252 a port number of 0; in this case, the server will print the port
5254 a port number of 0; in this case, the server will print the port
5253 number it uses.
5255 number it uses.
5254
5256
5255 Returns 0 on success.
5257 Returns 0 on success.
5256 """
5258 """
5257
5259
5258 opts = pycompat.byteskwargs(opts)
5260 opts = pycompat.byteskwargs(opts)
5259 if opts["stdio"] and opts["cmdserver"]:
5261 if opts["stdio"] and opts["cmdserver"]:
5260 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5262 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5261 if opts["print_url"] and ui.verbose:
5263 if opts["print_url"] and ui.verbose:
5262 raise error.Abort(_("cannot use --print-url with --verbose"))
5264 raise error.Abort(_("cannot use --print-url with --verbose"))
5263
5265
5264 if opts["stdio"]:
5266 if opts["stdio"]:
5265 if repo is None:
5267 if repo is None:
5266 raise error.RepoError(_("there is no Mercurial repository here"
5268 raise error.RepoError(_("there is no Mercurial repository here"
5267 " (.hg not found)"))
5269 " (.hg not found)"))
5268 s = wireprotoserver.sshserver(ui, repo)
5270 s = wireprotoserver.sshserver(ui, repo)
5269 s.serve_forever()
5271 s.serve_forever()
5270
5272
5271 service = server.createservice(ui, repo, opts)
5273 service = server.createservice(ui, repo, opts)
5272 return server.runservice(opts, initfn=service.init, runfn=service.run)
5274 return server.runservice(opts, initfn=service.init, runfn=service.run)
5273
5275
5274 _NOTTERSE = 'nothing'
5276 _NOTTERSE = 'nothing'
5275
5277
5276 @command('status|st',
5278 @command('status|st',
5277 [('A', 'all', None, _('show status of all files')),
5279 [('A', 'all', None, _('show status of all files')),
5278 ('m', 'modified', None, _('show only modified files')),
5280 ('m', 'modified', None, _('show only modified files')),
5279 ('a', 'added', None, _('show only added files')),
5281 ('a', 'added', None, _('show only added files')),
5280 ('r', 'removed', None, _('show only removed files')),
5282 ('r', 'removed', None, _('show only removed files')),
5281 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5283 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5282 ('c', 'clean', None, _('show only files without changes')),
5284 ('c', 'clean', None, _('show only files without changes')),
5283 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5285 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5284 ('i', 'ignored', None, _('show only ignored files')),
5286 ('i', 'ignored', None, _('show only ignored files')),
5285 ('n', 'no-status', None, _('hide status prefix')),
5287 ('n', 'no-status', None, _('hide status prefix')),
5286 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
5288 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
5287 ('C', 'copies', None, _('show source of copied files')),
5289 ('C', 'copies', None, _('show source of copied files')),
5288 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5290 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5289 ('', 'rev', [], _('show difference from revision'), _('REV')),
5291 ('', 'rev', [], _('show difference from revision'), _('REV')),
5290 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5292 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5291 ] + walkopts + subrepoopts + formatteropts,
5293 ] + walkopts + subrepoopts + formatteropts,
5292 _('[OPTION]... [FILE]...'),
5294 _('[OPTION]... [FILE]...'),
5293 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5295 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5294 helpbasic=True, inferrepo=True,
5296 helpbasic=True, inferrepo=True,
5295 intents={INTENT_READONLY})
5297 intents={INTENT_READONLY})
5296 def status(ui, repo, *pats, **opts):
5298 def status(ui, repo, *pats, **opts):
5297 """show changed files in the working directory
5299 """show changed files in the working directory
5298
5300
5299 Show status of files in the repository. If names are given, only
5301 Show status of files in the repository. If names are given, only
5300 files that match are shown. Files that are clean or ignored or
5302 files that match are shown. Files that are clean or ignored or
5301 the source of a copy/move operation, are not listed unless
5303 the source of a copy/move operation, are not listed unless
5302 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5304 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5303 Unless options described with "show only ..." are given, the
5305 Unless options described with "show only ..." are given, the
5304 options -mardu are used.
5306 options -mardu are used.
5305
5307
5306 Option -q/--quiet hides untracked (unknown and ignored) files
5308 Option -q/--quiet hides untracked (unknown and ignored) files
5307 unless explicitly requested with -u/--unknown or -i/--ignored.
5309 unless explicitly requested with -u/--unknown or -i/--ignored.
5308
5310
5309 .. note::
5311 .. note::
5310
5312
5311 :hg:`status` may appear to disagree with diff if permissions have
5313 :hg:`status` may appear to disagree with diff if permissions have
5312 changed or a merge has occurred. The standard diff format does
5314 changed or a merge has occurred. The standard diff format does
5313 not report permission changes and diff only reports changes
5315 not report permission changes and diff only reports changes
5314 relative to one merge parent.
5316 relative to one merge parent.
5315
5317
5316 If one revision is given, it is used as the base revision.
5318 If one revision is given, it is used as the base revision.
5317 If two revisions are given, the differences between them are
5319 If two revisions are given, the differences between them are
5318 shown. The --change option can also be used as a shortcut to list
5320 shown. The --change option can also be used as a shortcut to list
5319 the changed files of a revision from its first parent.
5321 the changed files of a revision from its first parent.
5320
5322
5321 The codes used to show the status of files are::
5323 The codes used to show the status of files are::
5322
5324
5323 M = modified
5325 M = modified
5324 A = added
5326 A = added
5325 R = removed
5327 R = removed
5326 C = clean
5328 C = clean
5327 ! = missing (deleted by non-hg command, but still tracked)
5329 ! = missing (deleted by non-hg command, but still tracked)
5328 ? = not tracked
5330 ? = not tracked
5329 I = ignored
5331 I = ignored
5330 = origin of the previous file (with --copies)
5332 = origin of the previous file (with --copies)
5331
5333
5332 .. container:: verbose
5334 .. container:: verbose
5333
5335
5334 The -t/--terse option abbreviates the output by showing only the directory
5336 The -t/--terse option abbreviates the output by showing only the directory
5335 name if all the files in it share the same status. The option takes an
5337 name if all the files in it share the same status. The option takes an
5336 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
5338 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
5337 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
5339 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
5338 for 'ignored' and 'c' for clean.
5340 for 'ignored' and 'c' for clean.
5339
5341
5340 It abbreviates only those statuses which are passed. Note that clean and
5342 It abbreviates only those statuses which are passed. Note that clean and
5341 ignored files are not displayed with '--terse ic' unless the -c/--clean
5343 ignored files are not displayed with '--terse ic' unless the -c/--clean
5342 and -i/--ignored options are also used.
5344 and -i/--ignored options are also used.
5343
5345
5344 The -v/--verbose option shows information when the repository is in an
5346 The -v/--verbose option shows information when the repository is in an
5345 unfinished merge, shelve, rebase state etc. You can have this behavior
5347 unfinished merge, shelve, rebase state etc. You can have this behavior
5346 turned on by default by enabling the ``commands.status.verbose`` option.
5348 turned on by default by enabling the ``commands.status.verbose`` option.
5347
5349
5348 You can skip displaying some of these states by setting
5350 You can skip displaying some of these states by setting
5349 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
5351 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
5350 'histedit', 'merge', 'rebase', or 'unshelve'.
5352 'histedit', 'merge', 'rebase', or 'unshelve'.
5351
5353
5352 Template:
5354 Template:
5353
5355
5354 The following keywords are supported in addition to the common template
5356 The following keywords are supported in addition to the common template
5355 keywords and functions. See also :hg:`help templates`.
5357 keywords and functions. See also :hg:`help templates`.
5356
5358
5357 :path: String. Repository-absolute path of the file.
5359 :path: String. Repository-absolute path of the file.
5358 :source: String. Repository-absolute path of the file originated from.
5360 :source: String. Repository-absolute path of the file originated from.
5359 Available if ``--copies`` is specified.
5361 Available if ``--copies`` is specified.
5360 :status: String. Character denoting file's status.
5362 :status: String. Character denoting file's status.
5361
5363
5362 Examples:
5364 Examples:
5363
5365
5364 - show changes in the working directory relative to a
5366 - show changes in the working directory relative to a
5365 changeset::
5367 changeset::
5366
5368
5367 hg status --rev 9353
5369 hg status --rev 9353
5368
5370
5369 - show changes in the working directory relative to the
5371 - show changes in the working directory relative to the
5370 current directory (see :hg:`help patterns` for more information)::
5372 current directory (see :hg:`help patterns` for more information)::
5371
5373
5372 hg status re:
5374 hg status re:
5373
5375
5374 - show all changes including copies in an existing changeset::
5376 - show all changes including copies in an existing changeset::
5375
5377
5376 hg status --copies --change 9353
5378 hg status --copies --change 9353
5377
5379
5378 - get a NUL separated list of added files, suitable for xargs::
5380 - get a NUL separated list of added files, suitable for xargs::
5379
5381
5380 hg status -an0
5382 hg status -an0
5381
5383
5382 - show more information about the repository status, abbreviating
5384 - show more information about the repository status, abbreviating
5383 added, removed, modified, deleted, and untracked paths::
5385 added, removed, modified, deleted, and untracked paths::
5384
5386
5385 hg status -v -t mardu
5387 hg status -v -t mardu
5386
5388
5387 Returns 0 on success.
5389 Returns 0 on success.
5388
5390
5389 """
5391 """
5390
5392
5391 opts = pycompat.byteskwargs(opts)
5393 opts = pycompat.byteskwargs(opts)
5392 revs = opts.get('rev')
5394 revs = opts.get('rev')
5393 change = opts.get('change')
5395 change = opts.get('change')
5394 terse = opts.get('terse')
5396 terse = opts.get('terse')
5395 if terse is _NOTTERSE:
5397 if terse is _NOTTERSE:
5396 if revs:
5398 if revs:
5397 terse = ''
5399 terse = ''
5398 else:
5400 else:
5399 terse = ui.config('commands', 'status.terse')
5401 terse = ui.config('commands', 'status.terse')
5400
5402
5401 if revs and change:
5403 if revs and change:
5402 msg = _('cannot specify --rev and --change at the same time')
5404 msg = _('cannot specify --rev and --change at the same time')
5403 raise error.Abort(msg)
5405 raise error.Abort(msg)
5404 elif revs and terse:
5406 elif revs and terse:
5405 msg = _('cannot use --terse with --rev')
5407 msg = _('cannot use --terse with --rev')
5406 raise error.Abort(msg)
5408 raise error.Abort(msg)
5407 elif change:
5409 elif change:
5408 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
5410 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
5409 ctx2 = scmutil.revsingle(repo, change, None)
5411 ctx2 = scmutil.revsingle(repo, change, None)
5410 ctx1 = ctx2.p1()
5412 ctx1 = ctx2.p1()
5411 else:
5413 else:
5412 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
5414 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
5413 ctx1, ctx2 = scmutil.revpair(repo, revs)
5415 ctx1, ctx2 = scmutil.revpair(repo, revs)
5414
5416
5415 if pats or ui.configbool('commands', 'status.relative'):
5417 if pats or ui.configbool('commands', 'status.relative'):
5416 cwd = repo.getcwd()
5418 cwd = repo.getcwd()
5417 else:
5419 else:
5418 cwd = ''
5420 cwd = ''
5419
5421
5420 if opts.get('print0'):
5422 if opts.get('print0'):
5421 end = '\0'
5423 end = '\0'
5422 else:
5424 else:
5423 end = '\n'
5425 end = '\n'
5424 copy = {}
5426 copy = {}
5425 states = 'modified added removed deleted unknown ignored clean'.split()
5427 states = 'modified added removed deleted unknown ignored clean'.split()
5426 show = [k for k in states if opts.get(k)]
5428 show = [k for k in states if opts.get(k)]
5427 if opts.get('all'):
5429 if opts.get('all'):
5428 show += ui.quiet and (states[:4] + ['clean']) or states
5430 show += ui.quiet and (states[:4] + ['clean']) or states
5429
5431
5430 if not show:
5432 if not show:
5431 if ui.quiet:
5433 if ui.quiet:
5432 show = states[:4]
5434 show = states[:4]
5433 else:
5435 else:
5434 show = states[:5]
5436 show = states[:5]
5435
5437
5436 m = scmutil.match(ctx2, pats, opts)
5438 m = scmutil.match(ctx2, pats, opts)
5437 if terse:
5439 if terse:
5438 # we need to compute clean and unknown to terse
5440 # we need to compute clean and unknown to terse
5439 stat = repo.status(ctx1.node(), ctx2.node(), m,
5441 stat = repo.status(ctx1.node(), ctx2.node(), m,
5440 'ignored' in show or 'i' in terse,
5442 'ignored' in show or 'i' in terse,
5441 clean=True, unknown=True,
5443 clean=True, unknown=True,
5442 listsubrepos=opts.get('subrepos'))
5444 listsubrepos=opts.get('subrepos'))
5443
5445
5444 stat = cmdutil.tersedir(stat, terse)
5446 stat = cmdutil.tersedir(stat, terse)
5445 else:
5447 else:
5446 stat = repo.status(ctx1.node(), ctx2.node(), m,
5448 stat = repo.status(ctx1.node(), ctx2.node(), m,
5447 'ignored' in show, 'clean' in show,
5449 'ignored' in show, 'clean' in show,
5448 'unknown' in show, opts.get('subrepos'))
5450 'unknown' in show, opts.get('subrepos'))
5449
5451
5450 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5452 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5451
5453
5452 if (opts.get('all') or opts.get('copies')
5454 if (opts.get('all') or opts.get('copies')
5453 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5455 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5454 copy = copies.pathcopies(ctx1, ctx2, m)
5456 copy = copies.pathcopies(ctx1, ctx2, m)
5455
5457
5456 ui.pager('status')
5458 ui.pager('status')
5457 fm = ui.formatter('status', opts)
5459 fm = ui.formatter('status', opts)
5458 fmt = '%s' + end
5460 fmt = '%s' + end
5459 showchar = not opts.get('no_status')
5461 showchar = not opts.get('no_status')
5460
5462
5461 for state, char, files in changestates:
5463 for state, char, files in changestates:
5462 if state in show:
5464 if state in show:
5463 label = 'status.' + state
5465 label = 'status.' + state
5464 for f in files:
5466 for f in files:
5465 fm.startitem()
5467 fm.startitem()
5466 fm.context(ctx=ctx2)
5468 fm.context(ctx=ctx2)
5467 fm.data(path=f)
5469 fm.data(path=f)
5468 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5470 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5469 fm.plain(fmt % repo.pathto(f, cwd), label=label)
5471 fm.plain(fmt % repo.pathto(f, cwd), label=label)
5470 if f in copy:
5472 if f in copy:
5471 fm.data(source=copy[f])
5473 fm.data(source=copy[f])
5472 fm.plain((' %s' + end) % repo.pathto(copy[f], cwd),
5474 fm.plain((' %s' + end) % repo.pathto(copy[f], cwd),
5473 label='status.copied')
5475 label='status.copied')
5474
5476
5475 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5477 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5476 and not ui.plain()):
5478 and not ui.plain()):
5477 cmdutil.morestatus(repo, fm)
5479 cmdutil.morestatus(repo, fm)
5478 fm.end()
5480 fm.end()
5479
5481
5480 @command('summary|sum',
5482 @command('summary|sum',
5481 [('', 'remote', None, _('check for push and pull'))],
5483 [('', 'remote', None, _('check for push and pull'))],
5482 '[--remote]',
5484 '[--remote]',
5483 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5485 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5484 helpbasic=True,
5486 helpbasic=True,
5485 intents={INTENT_READONLY})
5487 intents={INTENT_READONLY})
5486 def summary(ui, repo, **opts):
5488 def summary(ui, repo, **opts):
5487 """summarize working directory state
5489 """summarize working directory state
5488
5490
5489 This generates a brief summary of the working directory state,
5491 This generates a brief summary of the working directory state,
5490 including parents, branch, commit status, phase and available updates.
5492 including parents, branch, commit status, phase and available updates.
5491
5493
5492 With the --remote option, this will check the default paths for
5494 With the --remote option, this will check the default paths for
5493 incoming and outgoing changes. This can be time-consuming.
5495 incoming and outgoing changes. This can be time-consuming.
5494
5496
5495 Returns 0 on success.
5497 Returns 0 on success.
5496 """
5498 """
5497
5499
5498 opts = pycompat.byteskwargs(opts)
5500 opts = pycompat.byteskwargs(opts)
5499 ui.pager('summary')
5501 ui.pager('summary')
5500 ctx = repo[None]
5502 ctx = repo[None]
5501 parents = ctx.parents()
5503 parents = ctx.parents()
5502 pnode = parents[0].node()
5504 pnode = parents[0].node()
5503 marks = []
5505 marks = []
5504
5506
5505 try:
5507 try:
5506 ms = mergemod.mergestate.read(repo)
5508 ms = mergemod.mergestate.read(repo)
5507 except error.UnsupportedMergeRecords as e:
5509 except error.UnsupportedMergeRecords as e:
5508 s = ' '.join(e.recordtypes)
5510 s = ' '.join(e.recordtypes)
5509 ui.warn(
5511 ui.warn(
5510 _('warning: merge state has unsupported record types: %s\n') % s)
5512 _('warning: merge state has unsupported record types: %s\n') % s)
5511 unresolved = []
5513 unresolved = []
5512 else:
5514 else:
5513 unresolved = list(ms.unresolved())
5515 unresolved = list(ms.unresolved())
5514
5516
5515 for p in parents:
5517 for p in parents:
5516 # label with log.changeset (instead of log.parent) since this
5518 # label with log.changeset (instead of log.parent) since this
5517 # shows a working directory parent *changeset*:
5519 # shows a working directory parent *changeset*:
5518 # i18n: column positioning for "hg summary"
5520 # i18n: column positioning for "hg summary"
5519 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5521 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5520 label=logcmdutil.changesetlabels(p))
5522 label=logcmdutil.changesetlabels(p))
5521 ui.write(' '.join(p.tags()), label='log.tag')
5523 ui.write(' '.join(p.tags()), label='log.tag')
5522 if p.bookmarks():
5524 if p.bookmarks():
5523 marks.extend(p.bookmarks())
5525 marks.extend(p.bookmarks())
5524 if p.rev() == -1:
5526 if p.rev() == -1:
5525 if not len(repo):
5527 if not len(repo):
5526 ui.write(_(' (empty repository)'))
5528 ui.write(_(' (empty repository)'))
5527 else:
5529 else:
5528 ui.write(_(' (no revision checked out)'))
5530 ui.write(_(' (no revision checked out)'))
5529 if p.obsolete():
5531 if p.obsolete():
5530 ui.write(_(' (obsolete)'))
5532 ui.write(_(' (obsolete)'))
5531 if p.isunstable():
5533 if p.isunstable():
5532 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5534 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5533 for instability in p.instabilities())
5535 for instability in p.instabilities())
5534 ui.write(' ('
5536 ui.write(' ('
5535 + ', '.join(instabilities)
5537 + ', '.join(instabilities)
5536 + ')')
5538 + ')')
5537 ui.write('\n')
5539 ui.write('\n')
5538 if p.description():
5540 if p.description():
5539 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5541 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5540 label='log.summary')
5542 label='log.summary')
5541
5543
5542 branch = ctx.branch()
5544 branch = ctx.branch()
5543 bheads = repo.branchheads(branch)
5545 bheads = repo.branchheads(branch)
5544 # i18n: column positioning for "hg summary"
5546 # i18n: column positioning for "hg summary"
5545 m = _('branch: %s\n') % branch
5547 m = _('branch: %s\n') % branch
5546 if branch != 'default':
5548 if branch != 'default':
5547 ui.write(m, label='log.branch')
5549 ui.write(m, label='log.branch')
5548 else:
5550 else:
5549 ui.status(m, label='log.branch')
5551 ui.status(m, label='log.branch')
5550
5552
5551 if marks:
5553 if marks:
5552 active = repo._activebookmark
5554 active = repo._activebookmark
5553 # i18n: column positioning for "hg summary"
5555 # i18n: column positioning for "hg summary"
5554 ui.write(_('bookmarks:'), label='log.bookmark')
5556 ui.write(_('bookmarks:'), label='log.bookmark')
5555 if active is not None:
5557 if active is not None:
5556 if active in marks:
5558 if active in marks:
5557 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5559 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5558 marks.remove(active)
5560 marks.remove(active)
5559 else:
5561 else:
5560 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5562 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5561 for m in marks:
5563 for m in marks:
5562 ui.write(' ' + m, label='log.bookmark')
5564 ui.write(' ' + m, label='log.bookmark')
5563 ui.write('\n', label='log.bookmark')
5565 ui.write('\n', label='log.bookmark')
5564
5566
5565 status = repo.status(unknown=True)
5567 status = repo.status(unknown=True)
5566
5568
5567 c = repo.dirstate.copies()
5569 c = repo.dirstate.copies()
5568 copied, renamed = [], []
5570 copied, renamed = [], []
5569 for d, s in c.iteritems():
5571 for d, s in c.iteritems():
5570 if s in status.removed:
5572 if s in status.removed:
5571 status.removed.remove(s)
5573 status.removed.remove(s)
5572 renamed.append(d)
5574 renamed.append(d)
5573 else:
5575 else:
5574 copied.append(d)
5576 copied.append(d)
5575 if d in status.added:
5577 if d in status.added:
5576 status.added.remove(d)
5578 status.added.remove(d)
5577
5579
5578 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5580 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5579
5581
5580 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5582 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5581 (ui.label(_('%d added'), 'status.added'), status.added),
5583 (ui.label(_('%d added'), 'status.added'), status.added),
5582 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5584 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5583 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5585 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5584 (ui.label(_('%d copied'), 'status.copied'), copied),
5586 (ui.label(_('%d copied'), 'status.copied'), copied),
5585 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5587 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5586 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5588 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5587 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5589 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5588 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5590 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5589 t = []
5591 t = []
5590 for l, s in labels:
5592 for l, s in labels:
5591 if s:
5593 if s:
5592 t.append(l % len(s))
5594 t.append(l % len(s))
5593
5595
5594 t = ', '.join(t)
5596 t = ', '.join(t)
5595 cleanworkdir = False
5597 cleanworkdir = False
5596
5598
5597 if repo.vfs.exists('graftstate'):
5599 if repo.vfs.exists('graftstate'):
5598 t += _(' (graft in progress)')
5600 t += _(' (graft in progress)')
5599 if repo.vfs.exists('updatestate'):
5601 if repo.vfs.exists('updatestate'):
5600 t += _(' (interrupted update)')
5602 t += _(' (interrupted update)')
5601 elif len(parents) > 1:
5603 elif len(parents) > 1:
5602 t += _(' (merge)')
5604 t += _(' (merge)')
5603 elif branch != parents[0].branch():
5605 elif branch != parents[0].branch():
5604 t += _(' (new branch)')
5606 t += _(' (new branch)')
5605 elif (parents[0].closesbranch() and
5607 elif (parents[0].closesbranch() and
5606 pnode in repo.branchheads(branch, closed=True)):
5608 pnode in repo.branchheads(branch, closed=True)):
5607 t += _(' (head closed)')
5609 t += _(' (head closed)')
5608 elif not (status.modified or status.added or status.removed or renamed or
5610 elif not (status.modified or status.added or status.removed or renamed or
5609 copied or subs):
5611 copied or subs):
5610 t += _(' (clean)')
5612 t += _(' (clean)')
5611 cleanworkdir = True
5613 cleanworkdir = True
5612 elif pnode not in bheads:
5614 elif pnode not in bheads:
5613 t += _(' (new branch head)')
5615 t += _(' (new branch head)')
5614
5616
5615 if parents:
5617 if parents:
5616 pendingphase = max(p.phase() for p in parents)
5618 pendingphase = max(p.phase() for p in parents)
5617 else:
5619 else:
5618 pendingphase = phases.public
5620 pendingphase = phases.public
5619
5621
5620 if pendingphase > phases.newcommitphase(ui):
5622 if pendingphase > phases.newcommitphase(ui):
5621 t += ' (%s)' % phases.phasenames[pendingphase]
5623 t += ' (%s)' % phases.phasenames[pendingphase]
5622
5624
5623 if cleanworkdir:
5625 if cleanworkdir:
5624 # i18n: column positioning for "hg summary"
5626 # i18n: column positioning for "hg summary"
5625 ui.status(_('commit: %s\n') % t.strip())
5627 ui.status(_('commit: %s\n') % t.strip())
5626 else:
5628 else:
5627 # i18n: column positioning for "hg summary"
5629 # i18n: column positioning for "hg summary"
5628 ui.write(_('commit: %s\n') % t.strip())
5630 ui.write(_('commit: %s\n') % t.strip())
5629
5631
5630 # all ancestors of branch heads - all ancestors of parent = new csets
5632 # all ancestors of branch heads - all ancestors of parent = new csets
5631 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5633 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5632 bheads))
5634 bheads))
5633
5635
5634 if new == 0:
5636 if new == 0:
5635 # i18n: column positioning for "hg summary"
5637 # i18n: column positioning for "hg summary"
5636 ui.status(_('update: (current)\n'))
5638 ui.status(_('update: (current)\n'))
5637 elif pnode not in bheads:
5639 elif pnode not in bheads:
5638 # i18n: column positioning for "hg summary"
5640 # i18n: column positioning for "hg summary"
5639 ui.write(_('update: %d new changesets (update)\n') % new)
5641 ui.write(_('update: %d new changesets (update)\n') % new)
5640 else:
5642 else:
5641 # i18n: column positioning for "hg summary"
5643 # i18n: column positioning for "hg summary"
5642 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5644 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5643 (new, len(bheads)))
5645 (new, len(bheads)))
5644
5646
5645 t = []
5647 t = []
5646 draft = len(repo.revs('draft()'))
5648 draft = len(repo.revs('draft()'))
5647 if draft:
5649 if draft:
5648 t.append(_('%d draft') % draft)
5650 t.append(_('%d draft') % draft)
5649 secret = len(repo.revs('secret()'))
5651 secret = len(repo.revs('secret()'))
5650 if secret:
5652 if secret:
5651 t.append(_('%d secret') % secret)
5653 t.append(_('%d secret') % secret)
5652
5654
5653 if draft or secret:
5655 if draft or secret:
5654 ui.status(_('phases: %s\n') % ', '.join(t))
5656 ui.status(_('phases: %s\n') % ', '.join(t))
5655
5657
5656 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5658 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5657 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5659 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5658 numtrouble = len(repo.revs(trouble + "()"))
5660 numtrouble = len(repo.revs(trouble + "()"))
5659 # We write all the possibilities to ease translation
5661 # We write all the possibilities to ease translation
5660 troublemsg = {
5662 troublemsg = {
5661 "orphan": _("orphan: %d changesets"),
5663 "orphan": _("orphan: %d changesets"),
5662 "contentdivergent": _("content-divergent: %d changesets"),
5664 "contentdivergent": _("content-divergent: %d changesets"),
5663 "phasedivergent": _("phase-divergent: %d changesets"),
5665 "phasedivergent": _("phase-divergent: %d changesets"),
5664 }
5666 }
5665 if numtrouble > 0:
5667 if numtrouble > 0:
5666 ui.status(troublemsg[trouble] % numtrouble + "\n")
5668 ui.status(troublemsg[trouble] % numtrouble + "\n")
5667
5669
5668 cmdutil.summaryhooks(ui, repo)
5670 cmdutil.summaryhooks(ui, repo)
5669
5671
5670 if opts.get('remote'):
5672 if opts.get('remote'):
5671 needsincoming, needsoutgoing = True, True
5673 needsincoming, needsoutgoing = True, True
5672 else:
5674 else:
5673 needsincoming, needsoutgoing = False, False
5675 needsincoming, needsoutgoing = False, False
5674 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5676 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5675 if i:
5677 if i:
5676 needsincoming = True
5678 needsincoming = True
5677 if o:
5679 if o:
5678 needsoutgoing = True
5680 needsoutgoing = True
5679 if not needsincoming and not needsoutgoing:
5681 if not needsincoming and not needsoutgoing:
5680 return
5682 return
5681
5683
5682 def getincoming():
5684 def getincoming():
5683 source, branches = hg.parseurl(ui.expandpath('default'))
5685 source, branches = hg.parseurl(ui.expandpath('default'))
5684 sbranch = branches[0]
5686 sbranch = branches[0]
5685 try:
5687 try:
5686 other = hg.peer(repo, {}, source)
5688 other = hg.peer(repo, {}, source)
5687 except error.RepoError:
5689 except error.RepoError:
5688 if opts.get('remote'):
5690 if opts.get('remote'):
5689 raise
5691 raise
5690 return source, sbranch, None, None, None
5692 return source, sbranch, None, None, None
5691 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5693 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5692 if revs:
5694 if revs:
5693 revs = [other.lookup(rev) for rev in revs]
5695 revs = [other.lookup(rev) for rev in revs]
5694 ui.debug('comparing with %s\n' % util.hidepassword(source))
5696 ui.debug('comparing with %s\n' % util.hidepassword(source))
5695 repo.ui.pushbuffer()
5697 repo.ui.pushbuffer()
5696 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5698 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5697 repo.ui.popbuffer()
5699 repo.ui.popbuffer()
5698 return source, sbranch, other, commoninc, commoninc[1]
5700 return source, sbranch, other, commoninc, commoninc[1]
5699
5701
5700 if needsincoming:
5702 if needsincoming:
5701 source, sbranch, sother, commoninc, incoming = getincoming()
5703 source, sbranch, sother, commoninc, incoming = getincoming()
5702 else:
5704 else:
5703 source = sbranch = sother = commoninc = incoming = None
5705 source = sbranch = sother = commoninc = incoming = None
5704
5706
5705 def getoutgoing():
5707 def getoutgoing():
5706 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5708 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5707 dbranch = branches[0]
5709 dbranch = branches[0]
5708 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5710 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5709 if source != dest:
5711 if source != dest:
5710 try:
5712 try:
5711 dother = hg.peer(repo, {}, dest)
5713 dother = hg.peer(repo, {}, dest)
5712 except error.RepoError:
5714 except error.RepoError:
5713 if opts.get('remote'):
5715 if opts.get('remote'):
5714 raise
5716 raise
5715 return dest, dbranch, None, None
5717 return dest, dbranch, None, None
5716 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5718 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5717 elif sother is None:
5719 elif sother is None:
5718 # there is no explicit destination peer, but source one is invalid
5720 # there is no explicit destination peer, but source one is invalid
5719 return dest, dbranch, None, None
5721 return dest, dbranch, None, None
5720 else:
5722 else:
5721 dother = sother
5723 dother = sother
5722 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5724 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5723 common = None
5725 common = None
5724 else:
5726 else:
5725 common = commoninc
5727 common = commoninc
5726 if revs:
5728 if revs:
5727 revs = [repo.lookup(rev) for rev in revs]
5729 revs = [repo.lookup(rev) for rev in revs]
5728 repo.ui.pushbuffer()
5730 repo.ui.pushbuffer()
5729 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5731 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5730 commoninc=common)
5732 commoninc=common)
5731 repo.ui.popbuffer()
5733 repo.ui.popbuffer()
5732 return dest, dbranch, dother, outgoing
5734 return dest, dbranch, dother, outgoing
5733
5735
5734 if needsoutgoing:
5736 if needsoutgoing:
5735 dest, dbranch, dother, outgoing = getoutgoing()
5737 dest, dbranch, dother, outgoing = getoutgoing()
5736 else:
5738 else:
5737 dest = dbranch = dother = outgoing = None
5739 dest = dbranch = dother = outgoing = None
5738
5740
5739 if opts.get('remote'):
5741 if opts.get('remote'):
5740 t = []
5742 t = []
5741 if incoming:
5743 if incoming:
5742 t.append(_('1 or more incoming'))
5744 t.append(_('1 or more incoming'))
5743 o = outgoing.missing
5745 o = outgoing.missing
5744 if o:
5746 if o:
5745 t.append(_('%d outgoing') % len(o))
5747 t.append(_('%d outgoing') % len(o))
5746 other = dother or sother
5748 other = dother or sother
5747 if 'bookmarks' in other.listkeys('namespaces'):
5749 if 'bookmarks' in other.listkeys('namespaces'):
5748 counts = bookmarks.summary(repo, other)
5750 counts = bookmarks.summary(repo, other)
5749 if counts[0] > 0:
5751 if counts[0] > 0:
5750 t.append(_('%d incoming bookmarks') % counts[0])
5752 t.append(_('%d incoming bookmarks') % counts[0])
5751 if counts[1] > 0:
5753 if counts[1] > 0:
5752 t.append(_('%d outgoing bookmarks') % counts[1])
5754 t.append(_('%d outgoing bookmarks') % counts[1])
5753
5755
5754 if t:
5756 if t:
5755 # i18n: column positioning for "hg summary"
5757 # i18n: column positioning for "hg summary"
5756 ui.write(_('remote: %s\n') % (', '.join(t)))
5758 ui.write(_('remote: %s\n') % (', '.join(t)))
5757 else:
5759 else:
5758 # i18n: column positioning for "hg summary"
5760 # i18n: column positioning for "hg summary"
5759 ui.status(_('remote: (synced)\n'))
5761 ui.status(_('remote: (synced)\n'))
5760
5762
5761 cmdutil.summaryremotehooks(ui, repo, opts,
5763 cmdutil.summaryremotehooks(ui, repo, opts,
5762 ((source, sbranch, sother, commoninc),
5764 ((source, sbranch, sother, commoninc),
5763 (dest, dbranch, dother, outgoing)))
5765 (dest, dbranch, dother, outgoing)))
5764
5766
5765 @command('tag',
5767 @command('tag',
5766 [('f', 'force', None, _('force tag')),
5768 [('f', 'force', None, _('force tag')),
5767 ('l', 'local', None, _('make the tag local')),
5769 ('l', 'local', None, _('make the tag local')),
5768 ('r', 'rev', '', _('revision to tag'), _('REV')),
5770 ('r', 'rev', '', _('revision to tag'), _('REV')),
5769 ('', 'remove', None, _('remove a tag')),
5771 ('', 'remove', None, _('remove a tag')),
5770 # -l/--local is already there, commitopts cannot be used
5772 # -l/--local is already there, commitopts cannot be used
5771 ('e', 'edit', None, _('invoke editor on commit messages')),
5773 ('e', 'edit', None, _('invoke editor on commit messages')),
5772 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5774 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5773 ] + commitopts2,
5775 ] + commitopts2,
5774 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
5776 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
5775 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
5777 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
5776 def tag(ui, repo, name1, *names, **opts):
5778 def tag(ui, repo, name1, *names, **opts):
5777 """add one or more tags for the current or given revision
5779 """add one or more tags for the current or given revision
5778
5780
5779 Name a particular revision using <name>.
5781 Name a particular revision using <name>.
5780
5782
5781 Tags are used to name particular revisions of the repository and are
5783 Tags are used to name particular revisions of the repository and are
5782 very useful to compare different revisions, to go back to significant
5784 very useful to compare different revisions, to go back to significant
5783 earlier versions or to mark branch points as releases, etc. Changing
5785 earlier versions or to mark branch points as releases, etc. Changing
5784 an existing tag is normally disallowed; use -f/--force to override.
5786 an existing tag is normally disallowed; use -f/--force to override.
5785
5787
5786 If no revision is given, the parent of the working directory is
5788 If no revision is given, the parent of the working directory is
5787 used.
5789 used.
5788
5790
5789 To facilitate version control, distribution, and merging of tags,
5791 To facilitate version control, distribution, and merging of tags,
5790 they are stored as a file named ".hgtags" which is managed similarly
5792 they are stored as a file named ".hgtags" which is managed similarly
5791 to other project files and can be hand-edited if necessary. This
5793 to other project files and can be hand-edited if necessary. This
5792 also means that tagging creates a new commit. The file
5794 also means that tagging creates a new commit. The file
5793 ".hg/localtags" is used for local tags (not shared among
5795 ".hg/localtags" is used for local tags (not shared among
5794 repositories).
5796 repositories).
5795
5797
5796 Tag commits are usually made at the head of a branch. If the parent
5798 Tag commits are usually made at the head of a branch. If the parent
5797 of the working directory is not a branch head, :hg:`tag` aborts; use
5799 of the working directory is not a branch head, :hg:`tag` aborts; use
5798 -f/--force to force the tag commit to be based on a non-head
5800 -f/--force to force the tag commit to be based on a non-head
5799 changeset.
5801 changeset.
5800
5802
5801 See :hg:`help dates` for a list of formats valid for -d/--date.
5803 See :hg:`help dates` for a list of formats valid for -d/--date.
5802
5804
5803 Since tag names have priority over branch names during revision
5805 Since tag names have priority over branch names during revision
5804 lookup, using an existing branch name as a tag name is discouraged.
5806 lookup, using an existing branch name as a tag name is discouraged.
5805
5807
5806 Returns 0 on success.
5808 Returns 0 on success.
5807 """
5809 """
5808 opts = pycompat.byteskwargs(opts)
5810 opts = pycompat.byteskwargs(opts)
5809 with repo.wlock(), repo.lock():
5811 with repo.wlock(), repo.lock():
5810 rev_ = "."
5812 rev_ = "."
5811 names = [t.strip() for t in (name1,) + names]
5813 names = [t.strip() for t in (name1,) + names]
5812 if len(names) != len(set(names)):
5814 if len(names) != len(set(names)):
5813 raise error.Abort(_('tag names must be unique'))
5815 raise error.Abort(_('tag names must be unique'))
5814 for n in names:
5816 for n in names:
5815 scmutil.checknewlabel(repo, n, 'tag')
5817 scmutil.checknewlabel(repo, n, 'tag')
5816 if not n:
5818 if not n:
5817 raise error.Abort(_('tag names cannot consist entirely of '
5819 raise error.Abort(_('tag names cannot consist entirely of '
5818 'whitespace'))
5820 'whitespace'))
5819 if opts.get('rev') and opts.get('remove'):
5821 if opts.get('rev') and opts.get('remove'):
5820 raise error.Abort(_("--rev and --remove are incompatible"))
5822 raise error.Abort(_("--rev and --remove are incompatible"))
5821 if opts.get('rev'):
5823 if opts.get('rev'):
5822 rev_ = opts['rev']
5824 rev_ = opts['rev']
5823 message = opts.get('message')
5825 message = opts.get('message')
5824 if opts.get('remove'):
5826 if opts.get('remove'):
5825 if opts.get('local'):
5827 if opts.get('local'):
5826 expectedtype = 'local'
5828 expectedtype = 'local'
5827 else:
5829 else:
5828 expectedtype = 'global'
5830 expectedtype = 'global'
5829
5831
5830 for n in names:
5832 for n in names:
5831 if not repo.tagtype(n):
5833 if not repo.tagtype(n):
5832 raise error.Abort(_("tag '%s' does not exist") % n)
5834 raise error.Abort(_("tag '%s' does not exist") % n)
5833 if repo.tagtype(n) != expectedtype:
5835 if repo.tagtype(n) != expectedtype:
5834 if expectedtype == 'global':
5836 if expectedtype == 'global':
5835 raise error.Abort(_("tag '%s' is not a global tag") % n)
5837 raise error.Abort(_("tag '%s' is not a global tag") % n)
5836 else:
5838 else:
5837 raise error.Abort(_("tag '%s' is not a local tag") % n)
5839 raise error.Abort(_("tag '%s' is not a local tag") % n)
5838 rev_ = 'null'
5840 rev_ = 'null'
5839 if not message:
5841 if not message:
5840 # we don't translate commit messages
5842 # we don't translate commit messages
5841 message = 'Removed tag %s' % ', '.join(names)
5843 message = 'Removed tag %s' % ', '.join(names)
5842 elif not opts.get('force'):
5844 elif not opts.get('force'):
5843 for n in names:
5845 for n in names:
5844 if n in repo.tags():
5846 if n in repo.tags():
5845 raise error.Abort(_("tag '%s' already exists "
5847 raise error.Abort(_("tag '%s' already exists "
5846 "(use -f to force)") % n)
5848 "(use -f to force)") % n)
5847 if not opts.get('local'):
5849 if not opts.get('local'):
5848 p1, p2 = repo.dirstate.parents()
5850 p1, p2 = repo.dirstate.parents()
5849 if p2 != nullid:
5851 if p2 != nullid:
5850 raise error.Abort(_('uncommitted merge'))
5852 raise error.Abort(_('uncommitted merge'))
5851 bheads = repo.branchheads()
5853 bheads = repo.branchheads()
5852 if not opts.get('force') and bheads and p1 not in bheads:
5854 if not opts.get('force') and bheads and p1 not in bheads:
5853 raise error.Abort(_('working directory is not at a branch head '
5855 raise error.Abort(_('working directory is not at a branch head '
5854 '(use -f to force)'))
5856 '(use -f to force)'))
5855 node = scmutil.revsingle(repo, rev_).node()
5857 node = scmutil.revsingle(repo, rev_).node()
5856
5858
5857 if not message:
5859 if not message:
5858 # we don't translate commit messages
5860 # we don't translate commit messages
5859 message = ('Added tag %s for changeset %s' %
5861 message = ('Added tag %s for changeset %s' %
5860 (', '.join(names), short(node)))
5862 (', '.join(names), short(node)))
5861
5863
5862 date = opts.get('date')
5864 date = opts.get('date')
5863 if date:
5865 if date:
5864 date = dateutil.parsedate(date)
5866 date = dateutil.parsedate(date)
5865
5867
5866 if opts.get('remove'):
5868 if opts.get('remove'):
5867 editform = 'tag.remove'
5869 editform = 'tag.remove'
5868 else:
5870 else:
5869 editform = 'tag.add'
5871 editform = 'tag.add'
5870 editor = cmdutil.getcommiteditor(editform=editform,
5872 editor = cmdutil.getcommiteditor(editform=editform,
5871 **pycompat.strkwargs(opts))
5873 **pycompat.strkwargs(opts))
5872
5874
5873 # don't allow tagging the null rev
5875 # don't allow tagging the null rev
5874 if (not opts.get('remove') and
5876 if (not opts.get('remove') and
5875 scmutil.revsingle(repo, rev_).rev() == nullrev):
5877 scmutil.revsingle(repo, rev_).rev() == nullrev):
5876 raise error.Abort(_("cannot tag null revision"))
5878 raise error.Abort(_("cannot tag null revision"))
5877
5879
5878 tagsmod.tag(repo, names, node, message, opts.get('local'),
5880 tagsmod.tag(repo, names, node, message, opts.get('local'),
5879 opts.get('user'), date, editor=editor)
5881 opts.get('user'), date, editor=editor)
5880
5882
5881 @command(
5883 @command(
5882 'tags', formatteropts, '',
5884 'tags', formatteropts, '',
5883 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5885 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5884 intents={INTENT_READONLY})
5886 intents={INTENT_READONLY})
5885 def tags(ui, repo, **opts):
5887 def tags(ui, repo, **opts):
5886 """list repository tags
5888 """list repository tags
5887
5889
5888 This lists both regular and local tags. When the -v/--verbose
5890 This lists both regular and local tags. When the -v/--verbose
5889 switch is used, a third column "local" is printed for local tags.
5891 switch is used, a third column "local" is printed for local tags.
5890 When the -q/--quiet switch is used, only the tag name is printed.
5892 When the -q/--quiet switch is used, only the tag name is printed.
5891
5893
5892 .. container:: verbose
5894 .. container:: verbose
5893
5895
5894 Template:
5896 Template:
5895
5897
5896 The following keywords are supported in addition to the common template
5898 The following keywords are supported in addition to the common template
5897 keywords and functions such as ``{tag}``. See also
5899 keywords and functions such as ``{tag}``. See also
5898 :hg:`help templates`.
5900 :hg:`help templates`.
5899
5901
5900 :type: String. ``local`` for local tags.
5902 :type: String. ``local`` for local tags.
5901
5903
5902 Returns 0 on success.
5904 Returns 0 on success.
5903 """
5905 """
5904
5906
5905 opts = pycompat.byteskwargs(opts)
5907 opts = pycompat.byteskwargs(opts)
5906 ui.pager('tags')
5908 ui.pager('tags')
5907 fm = ui.formatter('tags', opts)
5909 fm = ui.formatter('tags', opts)
5908 hexfunc = fm.hexfunc
5910 hexfunc = fm.hexfunc
5909
5911
5910 for t, n in reversed(repo.tagslist()):
5912 for t, n in reversed(repo.tagslist()):
5911 hn = hexfunc(n)
5913 hn = hexfunc(n)
5912 label = 'tags.normal'
5914 label = 'tags.normal'
5913 tagtype = ''
5915 tagtype = ''
5914 if repo.tagtype(t) == 'local':
5916 if repo.tagtype(t) == 'local':
5915 label = 'tags.local'
5917 label = 'tags.local'
5916 tagtype = 'local'
5918 tagtype = 'local'
5917
5919
5918 fm.startitem()
5920 fm.startitem()
5919 fm.context(repo=repo)
5921 fm.context(repo=repo)
5920 fm.write('tag', '%s', t, label=label)
5922 fm.write('tag', '%s', t, label=label)
5921 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5923 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5922 fm.condwrite(not ui.quiet, 'rev node', fmt,
5924 fm.condwrite(not ui.quiet, 'rev node', fmt,
5923 repo.changelog.rev(n), hn, label=label)
5925 repo.changelog.rev(n), hn, label=label)
5924 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5926 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5925 tagtype, label=label)
5927 tagtype, label=label)
5926 fm.plain('\n')
5928 fm.plain('\n')
5927 fm.end()
5929 fm.end()
5928
5930
5929 @command('tip',
5931 @command('tip',
5930 [('p', 'patch', None, _('show patch')),
5932 [('p', 'patch', None, _('show patch')),
5931 ('g', 'git', None, _('use git extended diff format')),
5933 ('g', 'git', None, _('use git extended diff format')),
5932 ] + templateopts,
5934 ] + templateopts,
5933 _('[-p] [-g]'),
5935 _('[-p] [-g]'),
5934 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
5936 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
5935 def tip(ui, repo, **opts):
5937 def tip(ui, repo, **opts):
5936 """show the tip revision (DEPRECATED)
5938 """show the tip revision (DEPRECATED)
5937
5939
5938 The tip revision (usually just called the tip) is the changeset
5940 The tip revision (usually just called the tip) is the changeset
5939 most recently added to the repository (and therefore the most
5941 most recently added to the repository (and therefore the most
5940 recently changed head).
5942 recently changed head).
5941
5943
5942 If you have just made a commit, that commit will be the tip. If
5944 If you have just made a commit, that commit will be the tip. If
5943 you have just pulled changes from another repository, the tip of
5945 you have just pulled changes from another repository, the tip of
5944 that repository becomes the current tip. The "tip" tag is special
5946 that repository becomes the current tip. The "tip" tag is special
5945 and cannot be renamed or assigned to a different changeset.
5947 and cannot be renamed or assigned to a different changeset.
5946
5948
5947 This command is deprecated, please use :hg:`heads` instead.
5949 This command is deprecated, please use :hg:`heads` instead.
5948
5950
5949 Returns 0 on success.
5951 Returns 0 on success.
5950 """
5952 """
5951 opts = pycompat.byteskwargs(opts)
5953 opts = pycompat.byteskwargs(opts)
5952 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5954 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5953 displayer.show(repo['tip'])
5955 displayer.show(repo['tip'])
5954 displayer.close()
5956 displayer.close()
5955
5957
5956 @command('unbundle',
5958 @command('unbundle',
5957 [('u', 'update', None,
5959 [('u', 'update', None,
5958 _('update to new branch head if changesets were unbundled'))],
5960 _('update to new branch head if changesets were unbundled'))],
5959 _('[-u] FILE...'),
5961 _('[-u] FILE...'),
5960 helpcategory=command.CATEGORY_IMPORT_EXPORT)
5962 helpcategory=command.CATEGORY_IMPORT_EXPORT)
5961 def unbundle(ui, repo, fname1, *fnames, **opts):
5963 def unbundle(ui, repo, fname1, *fnames, **opts):
5962 """apply one or more bundle files
5964 """apply one or more bundle files
5963
5965
5964 Apply one or more bundle files generated by :hg:`bundle`.
5966 Apply one or more bundle files generated by :hg:`bundle`.
5965
5967
5966 Returns 0 on success, 1 if an update has unresolved files.
5968 Returns 0 on success, 1 if an update has unresolved files.
5967 """
5969 """
5968 fnames = (fname1,) + fnames
5970 fnames = (fname1,) + fnames
5969
5971
5970 with repo.lock():
5972 with repo.lock():
5971 for fname in fnames:
5973 for fname in fnames:
5972 f = hg.openpath(ui, fname)
5974 f = hg.openpath(ui, fname)
5973 gen = exchange.readbundle(ui, f, fname)
5975 gen = exchange.readbundle(ui, f, fname)
5974 if isinstance(gen, streamclone.streamcloneapplier):
5976 if isinstance(gen, streamclone.streamcloneapplier):
5975 raise error.Abort(
5977 raise error.Abort(
5976 _('packed bundles cannot be applied with '
5978 _('packed bundles cannot be applied with '
5977 '"hg unbundle"'),
5979 '"hg unbundle"'),
5978 hint=_('use "hg debugapplystreamclonebundle"'))
5980 hint=_('use "hg debugapplystreamclonebundle"'))
5979 url = 'bundle:' + fname
5981 url = 'bundle:' + fname
5980 try:
5982 try:
5981 txnname = 'unbundle'
5983 txnname = 'unbundle'
5982 if not isinstance(gen, bundle2.unbundle20):
5984 if not isinstance(gen, bundle2.unbundle20):
5983 txnname = 'unbundle\n%s' % util.hidepassword(url)
5985 txnname = 'unbundle\n%s' % util.hidepassword(url)
5984 with repo.transaction(txnname) as tr:
5986 with repo.transaction(txnname) as tr:
5985 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5987 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5986 url=url)
5988 url=url)
5987 except error.BundleUnknownFeatureError as exc:
5989 except error.BundleUnknownFeatureError as exc:
5988 raise error.Abort(
5990 raise error.Abort(
5989 _('%s: unknown bundle feature, %s') % (fname, exc),
5991 _('%s: unknown bundle feature, %s') % (fname, exc),
5990 hint=_("see https://mercurial-scm.org/"
5992 hint=_("see https://mercurial-scm.org/"
5991 "wiki/BundleFeature for more "
5993 "wiki/BundleFeature for more "
5992 "information"))
5994 "information"))
5993 modheads = bundle2.combinechangegroupresults(op)
5995 modheads = bundle2.combinechangegroupresults(op)
5994
5996
5995 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5997 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5996
5998
5997 @command('update|up|checkout|co',
5999 @command('update|up|checkout|co',
5998 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6000 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5999 ('c', 'check', None, _('require clean working directory')),
6001 ('c', 'check', None, _('require clean working directory')),
6000 ('m', 'merge', None, _('merge uncommitted changes')),
6002 ('m', 'merge', None, _('merge uncommitted changes')),
6001 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6003 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6002 ('r', 'rev', '', _('revision'), _('REV'))
6004 ('r', 'rev', '', _('revision'), _('REV'))
6003 ] + mergetoolopts,
6005 ] + mergetoolopts,
6004 _('[-C|-c|-m] [-d DATE] [[-r] REV]'),
6006 _('[-C|-c|-m] [-d DATE] [[-r] REV]'),
6005 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6007 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6006 helpbasic=True)
6008 helpbasic=True)
6007 def update(ui, repo, node=None, **opts):
6009 def update(ui, repo, node=None, **opts):
6008 """update working directory (or switch revisions)
6010 """update working directory (or switch revisions)
6009
6011
6010 Update the repository's working directory to the specified
6012 Update the repository's working directory to the specified
6011 changeset. If no changeset is specified, update to the tip of the
6013 changeset. If no changeset is specified, update to the tip of the
6012 current named branch and move the active bookmark (see :hg:`help
6014 current named branch and move the active bookmark (see :hg:`help
6013 bookmarks`).
6015 bookmarks`).
6014
6016
6015 Update sets the working directory's parent revision to the specified
6017 Update sets the working directory's parent revision to the specified
6016 changeset (see :hg:`help parents`).
6018 changeset (see :hg:`help parents`).
6017
6019
6018 If the changeset is not a descendant or ancestor of the working
6020 If the changeset is not a descendant or ancestor of the working
6019 directory's parent and there are uncommitted changes, the update is
6021 directory's parent and there are uncommitted changes, the update is
6020 aborted. With the -c/--check option, the working directory is checked
6022 aborted. With the -c/--check option, the working directory is checked
6021 for uncommitted changes; if none are found, the working directory is
6023 for uncommitted changes; if none are found, the working directory is
6022 updated to the specified changeset.
6024 updated to the specified changeset.
6023
6025
6024 .. container:: verbose
6026 .. container:: verbose
6025
6027
6026 The -C/--clean, -c/--check, and -m/--merge options control what
6028 The -C/--clean, -c/--check, and -m/--merge options control what
6027 happens if the working directory contains uncommitted changes.
6029 happens if the working directory contains uncommitted changes.
6028 At most of one of them can be specified.
6030 At most of one of them can be specified.
6029
6031
6030 1. If no option is specified, and if
6032 1. If no option is specified, and if
6031 the requested changeset is an ancestor or descendant of
6033 the requested changeset is an ancestor or descendant of
6032 the working directory's parent, the uncommitted changes
6034 the working directory's parent, the uncommitted changes
6033 are merged into the requested changeset and the merged
6035 are merged into the requested changeset and the merged
6034 result is left uncommitted. If the requested changeset is
6036 result is left uncommitted. If the requested changeset is
6035 not an ancestor or descendant (that is, it is on another
6037 not an ancestor or descendant (that is, it is on another
6036 branch), the update is aborted and the uncommitted changes
6038 branch), the update is aborted and the uncommitted changes
6037 are preserved.
6039 are preserved.
6038
6040
6039 2. With the -m/--merge option, the update is allowed even if the
6041 2. With the -m/--merge option, the update is allowed even if the
6040 requested changeset is not an ancestor or descendant of
6042 requested changeset is not an ancestor or descendant of
6041 the working directory's parent.
6043 the working directory's parent.
6042
6044
6043 3. With the -c/--check option, the update is aborted and the
6045 3. With the -c/--check option, the update is aborted and the
6044 uncommitted changes are preserved.
6046 uncommitted changes are preserved.
6045
6047
6046 4. With the -C/--clean option, uncommitted changes are discarded and
6048 4. With the -C/--clean option, uncommitted changes are discarded and
6047 the working directory is updated to the requested changeset.
6049 the working directory is updated to the requested changeset.
6048
6050
6049 To cancel an uncommitted merge (and lose your changes), use
6051 To cancel an uncommitted merge (and lose your changes), use
6050 :hg:`merge --abort`.
6052 :hg:`merge --abort`.
6051
6053
6052 Use null as the changeset to remove the working directory (like
6054 Use null as the changeset to remove the working directory (like
6053 :hg:`clone -U`).
6055 :hg:`clone -U`).
6054
6056
6055 If you want to revert just one file to an older revision, use
6057 If you want to revert just one file to an older revision, use
6056 :hg:`revert [-r REV] NAME`.
6058 :hg:`revert [-r REV] NAME`.
6057
6059
6058 See :hg:`help dates` for a list of formats valid for -d/--date.
6060 See :hg:`help dates` for a list of formats valid for -d/--date.
6059
6061
6060 Returns 0 on success, 1 if there are unresolved files.
6062 Returns 0 on success, 1 if there are unresolved files.
6061 """
6063 """
6062 rev = opts.get(r'rev')
6064 rev = opts.get(r'rev')
6063 date = opts.get(r'date')
6065 date = opts.get(r'date')
6064 clean = opts.get(r'clean')
6066 clean = opts.get(r'clean')
6065 check = opts.get(r'check')
6067 check = opts.get(r'check')
6066 merge = opts.get(r'merge')
6068 merge = opts.get(r'merge')
6067 if rev and node:
6069 if rev and node:
6068 raise error.Abort(_("please specify just one revision"))
6070 raise error.Abort(_("please specify just one revision"))
6069
6071
6070 if ui.configbool('commands', 'update.requiredest'):
6072 if ui.configbool('commands', 'update.requiredest'):
6071 if not node and not rev and not date:
6073 if not node and not rev and not date:
6072 raise error.Abort(_('you must specify a destination'),
6074 raise error.Abort(_('you must specify a destination'),
6073 hint=_('for example: hg update ".::"'))
6075 hint=_('for example: hg update ".::"'))
6074
6076
6075 if rev is None or rev == '':
6077 if rev is None or rev == '':
6076 rev = node
6078 rev = node
6077
6079
6078 if date and rev is not None:
6080 if date and rev is not None:
6079 raise error.Abort(_("you can't specify a revision and a date"))
6081 raise error.Abort(_("you can't specify a revision and a date"))
6080
6082
6081 if len([x for x in (clean, check, merge) if x]) > 1:
6083 if len([x for x in (clean, check, merge) if x]) > 1:
6082 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
6084 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
6083 "or -m/--merge"))
6085 "or -m/--merge"))
6084
6086
6085 updatecheck = None
6087 updatecheck = None
6086 if check:
6088 if check:
6087 updatecheck = 'abort'
6089 updatecheck = 'abort'
6088 elif merge:
6090 elif merge:
6089 updatecheck = 'none'
6091 updatecheck = 'none'
6090
6092
6091 with repo.wlock():
6093 with repo.wlock():
6092 cmdutil.clearunfinished(repo)
6094 cmdutil.clearunfinished(repo)
6093
6095
6094 if date:
6096 if date:
6095 rev = cmdutil.finddate(ui, repo, date)
6097 rev = cmdutil.finddate(ui, repo, date)
6096
6098
6097 # if we defined a bookmark, we have to remember the original name
6099 # if we defined a bookmark, we have to remember the original name
6098 brev = rev
6100 brev = rev
6099 if rev:
6101 if rev:
6100 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
6102 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
6101 ctx = scmutil.revsingle(repo, rev, default=None)
6103 ctx = scmutil.revsingle(repo, rev, default=None)
6102 rev = ctx.rev()
6104 rev = ctx.rev()
6103 hidden = ctx.hidden()
6105 hidden = ctx.hidden()
6104 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
6106 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
6105 with ui.configoverride(overrides, 'update'):
6107 with ui.configoverride(overrides, 'update'):
6106 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
6108 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
6107 updatecheck=updatecheck)
6109 updatecheck=updatecheck)
6108 if hidden:
6110 if hidden:
6109 ctxstr = ctx.hex()[:12]
6111 ctxstr = ctx.hex()[:12]
6110 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
6112 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
6111
6113
6112 if ctx.obsolete():
6114 if ctx.obsolete():
6113 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
6115 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
6114 ui.warn("(%s)\n" % obsfatemsg)
6116 ui.warn("(%s)\n" % obsfatemsg)
6115 return ret
6117 return ret
6116
6118
6117 @command('verify', [], helpcategory=command.CATEGORY_MAINTENANCE)
6119 @command('verify', [], helpcategory=command.CATEGORY_MAINTENANCE)
6118 def verify(ui, repo):
6120 def verify(ui, repo):
6119 """verify the integrity of the repository
6121 """verify the integrity of the repository
6120
6122
6121 Verify the integrity of the current repository.
6123 Verify the integrity of the current repository.
6122
6124
6123 This will perform an extensive check of the repository's
6125 This will perform an extensive check of the repository's
6124 integrity, validating the hashes and checksums of each entry in
6126 integrity, validating the hashes and checksums of each entry in
6125 the changelog, manifest, and tracked files, as well as the
6127 the changelog, manifest, and tracked files, as well as the
6126 integrity of their crosslinks and indices.
6128 integrity of their crosslinks and indices.
6127
6129
6128 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6130 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6129 for more information about recovery from corruption of the
6131 for more information about recovery from corruption of the
6130 repository.
6132 repository.
6131
6133
6132 Returns 0 on success, 1 if errors are encountered.
6134 Returns 0 on success, 1 if errors are encountered.
6133 """
6135 """
6134 return hg.verify(repo)
6136 return hg.verify(repo)
6135
6137
6136 @command(
6138 @command(
6137 'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
6139 'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
6138 norepo=True, intents={INTENT_READONLY})
6140 norepo=True, intents={INTENT_READONLY})
6139 def version_(ui, **opts):
6141 def version_(ui, **opts):
6140 """output version and copyright information
6142 """output version and copyright information
6141
6143
6142 .. container:: verbose
6144 .. container:: verbose
6143
6145
6144 Template:
6146 Template:
6145
6147
6146 The following keywords are supported. See also :hg:`help templates`.
6148 The following keywords are supported. See also :hg:`help templates`.
6147
6149
6148 :extensions: List of extensions.
6150 :extensions: List of extensions.
6149 :ver: String. Version number.
6151 :ver: String. Version number.
6150
6152
6151 And each entry of ``{extensions}`` provides the following sub-keywords
6153 And each entry of ``{extensions}`` provides the following sub-keywords
6152 in addition to ``{ver}``.
6154 in addition to ``{ver}``.
6153
6155
6154 :bundled: Boolean. True if included in the release.
6156 :bundled: Boolean. True if included in the release.
6155 :name: String. Extension name.
6157 :name: String. Extension name.
6156 """
6158 """
6157 opts = pycompat.byteskwargs(opts)
6159 opts = pycompat.byteskwargs(opts)
6158 if ui.verbose:
6160 if ui.verbose:
6159 ui.pager('version')
6161 ui.pager('version')
6160 fm = ui.formatter("version", opts)
6162 fm = ui.formatter("version", opts)
6161 fm.startitem()
6163 fm.startitem()
6162 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6164 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6163 util.version())
6165 util.version())
6164 license = _(
6166 license = _(
6165 "(see https://mercurial-scm.org for more information)\n"
6167 "(see https://mercurial-scm.org for more information)\n"
6166 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
6168 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
6167 "This is free software; see the source for copying conditions. "
6169 "This is free software; see the source for copying conditions. "
6168 "There is NO\nwarranty; "
6170 "There is NO\nwarranty; "
6169 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6171 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6170 )
6172 )
6171 if not ui.quiet:
6173 if not ui.quiet:
6172 fm.plain(license)
6174 fm.plain(license)
6173
6175
6174 if ui.verbose:
6176 if ui.verbose:
6175 fm.plain(_("\nEnabled extensions:\n\n"))
6177 fm.plain(_("\nEnabled extensions:\n\n"))
6176 # format names and versions into columns
6178 # format names and versions into columns
6177 names = []
6179 names = []
6178 vers = []
6180 vers = []
6179 isinternals = []
6181 isinternals = []
6180 for name, module in extensions.extensions():
6182 for name, module in extensions.extensions():
6181 names.append(name)
6183 names.append(name)
6182 vers.append(extensions.moduleversion(module) or None)
6184 vers.append(extensions.moduleversion(module) or None)
6183 isinternals.append(extensions.ismoduleinternal(module))
6185 isinternals.append(extensions.ismoduleinternal(module))
6184 fn = fm.nested("extensions", tmpl='{name}\n')
6186 fn = fm.nested("extensions", tmpl='{name}\n')
6185 if names:
6187 if names:
6186 namefmt = " %%-%ds " % max(len(n) for n in names)
6188 namefmt = " %%-%ds " % max(len(n) for n in names)
6187 places = [_("external"), _("internal")]
6189 places = [_("external"), _("internal")]
6188 for n, v, p in zip(names, vers, isinternals):
6190 for n, v, p in zip(names, vers, isinternals):
6189 fn.startitem()
6191 fn.startitem()
6190 fn.condwrite(ui.verbose, "name", namefmt, n)
6192 fn.condwrite(ui.verbose, "name", namefmt, n)
6191 if ui.verbose:
6193 if ui.verbose:
6192 fn.plain("%s " % places[p])
6194 fn.plain("%s " % places[p])
6193 fn.data(bundled=p)
6195 fn.data(bundled=p)
6194 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6196 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6195 if ui.verbose:
6197 if ui.verbose:
6196 fn.plain("\n")
6198 fn.plain("\n")
6197 fn.end()
6199 fn.end()
6198 fm.end()
6200 fm.end()
6199
6201
6200 def loadcmdtable(ui, name, cmdtable):
6202 def loadcmdtable(ui, name, cmdtable):
6201 """Load command functions from specified cmdtable
6203 """Load command functions from specified cmdtable
6202 """
6204 """
6203 cmdtable = cmdtable.copy()
6205 cmdtable = cmdtable.copy()
6204 for cmd in list(cmdtable):
6206 for cmd in list(cmdtable):
6205 if not cmd.startswith('^'):
6207 if not cmd.startswith('^'):
6206 continue
6208 continue
6207 ui.deprecwarn("old-style command registration '%s' in extension '%s'"
6209 ui.deprecwarn("old-style command registration '%s' in extension '%s'"
6208 % (cmd, name), '4.8')
6210 % (cmd, name), '4.8')
6209 entry = cmdtable.pop(cmd)
6211 entry = cmdtable.pop(cmd)
6210 entry[0].helpbasic = True
6212 entry[0].helpbasic = True
6211 cmdtable[cmd[1:]] = entry
6213 cmdtable[cmd[1:]] = entry
6212
6214
6213 overrides = [cmd for cmd in cmdtable if cmd in table]
6215 overrides = [cmd for cmd in cmdtable if cmd in table]
6214 if overrides:
6216 if overrides:
6215 ui.warn(_("extension '%s' overrides commands: %s\n")
6217 ui.warn(_("extension '%s' overrides commands: %s\n")
6216 % (name, " ".join(overrides)))
6218 % (name, " ".join(overrides)))
6217 table.update(cmdtable)
6219 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now