##// END OF EJS Templates
resolve: ui.config -> ui.configbool, for better validation...
Valentin Gatien-Baron -
r39432:a80b8832 default
parent child Browse files
Show More
@@ -1,5906 +1,5906 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 )
22 )
23 from . import (
23 from . import (
24 archival,
24 archival,
25 bookmarks,
25 bookmarks,
26 bundle2,
26 bundle2,
27 changegroup,
27 changegroup,
28 cmdutil,
28 cmdutil,
29 copies,
29 copies,
30 debugcommands as debugcommandsmod,
30 debugcommands as debugcommandsmod,
31 destutil,
31 destutil,
32 dirstateguard,
32 dirstateguard,
33 discovery,
33 discovery,
34 encoding,
34 encoding,
35 error,
35 error,
36 exchange,
36 exchange,
37 extensions,
37 extensions,
38 filemerge,
38 filemerge,
39 formatter,
39 formatter,
40 graphmod,
40 graphmod,
41 hbisect,
41 hbisect,
42 help,
42 help,
43 hg,
43 hg,
44 logcmdutil,
44 logcmdutil,
45 merge as mergemod,
45 merge as mergemod,
46 obsolete,
46 obsolete,
47 obsutil,
47 obsutil,
48 patch,
48 patch,
49 phases,
49 phases,
50 pycompat,
50 pycompat,
51 rcutil,
51 rcutil,
52 registrar,
52 registrar,
53 repair,
53 repair,
54 revsetlang,
54 revsetlang,
55 rewriteutil,
55 rewriteutil,
56 scmutil,
56 scmutil,
57 server,
57 server,
58 state as statemod,
58 state as statemod,
59 streamclone,
59 streamclone,
60 tags as tagsmod,
60 tags as tagsmod,
61 templatekw,
61 templatekw,
62 ui as uimod,
62 ui as uimod,
63 util,
63 util,
64 wireprotoserver,
64 wireprotoserver,
65 )
65 )
66 from .utils import (
66 from .utils import (
67 dateutil,
67 dateutil,
68 stringutil,
68 stringutil,
69 )
69 )
70
70
71 table = {}
71 table = {}
72 table.update(debugcommandsmod.command._table)
72 table.update(debugcommandsmod.command._table)
73
73
74 command = registrar.command(table)
74 command = registrar.command(table)
75 INTENT_READONLY = registrar.INTENT_READONLY
75 INTENT_READONLY = registrar.INTENT_READONLY
76
76
77 # common command options
77 # common command options
78
78
79 globalopts = [
79 globalopts = [
80 ('R', 'repository', '',
80 ('R', 'repository', '',
81 _('repository root directory or name of overlay bundle file'),
81 _('repository root directory or name of overlay bundle file'),
82 _('REPO')),
82 _('REPO')),
83 ('', 'cwd', '',
83 ('', 'cwd', '',
84 _('change working directory'), _('DIR')),
84 _('change working directory'), _('DIR')),
85 ('y', 'noninteractive', None,
85 ('y', 'noninteractive', None,
86 _('do not prompt, automatically pick the first choice for all prompts')),
86 _('do not prompt, automatically pick the first choice for all prompts')),
87 ('q', 'quiet', None, _('suppress output')),
87 ('q', 'quiet', None, _('suppress output')),
88 ('v', 'verbose', None, _('enable additional output')),
88 ('v', 'verbose', None, _('enable additional output')),
89 ('', 'color', '',
89 ('', 'color', '',
90 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
90 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
91 # and should not be translated
91 # and should not be translated
92 _("when to colorize (boolean, always, auto, never, or debug)"),
92 _("when to colorize (boolean, always, auto, never, or debug)"),
93 _('TYPE')),
93 _('TYPE')),
94 ('', 'config', [],
94 ('', 'config', [],
95 _('set/override config option (use \'section.name=value\')'),
95 _('set/override config option (use \'section.name=value\')'),
96 _('CONFIG')),
96 _('CONFIG')),
97 ('', 'debug', None, _('enable debugging output')),
97 ('', 'debug', None, _('enable debugging output')),
98 ('', 'debugger', None, _('start debugger')),
98 ('', 'debugger', None, _('start debugger')),
99 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
99 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
100 _('ENCODE')),
100 _('ENCODE')),
101 ('', 'encodingmode', encoding.encodingmode,
101 ('', 'encodingmode', encoding.encodingmode,
102 _('set the charset encoding mode'), _('MODE')),
102 _('set the charset encoding mode'), _('MODE')),
103 ('', 'traceback', None, _('always print a traceback on exception')),
103 ('', 'traceback', None, _('always print a traceback on exception')),
104 ('', 'time', None, _('time how long the command takes')),
104 ('', 'time', None, _('time how long the command takes')),
105 ('', 'profile', None, _('print command execution profile')),
105 ('', 'profile', None, _('print command execution profile')),
106 ('', 'version', None, _('output version information and exit')),
106 ('', 'version', None, _('output version information and exit')),
107 ('h', 'help', None, _('display help and exit')),
107 ('h', 'help', None, _('display help and exit')),
108 ('', 'hidden', False, _('consider hidden changesets')),
108 ('', 'hidden', False, _('consider hidden changesets')),
109 ('', 'pager', 'auto',
109 ('', 'pager', 'auto',
110 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
110 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
111 ]
111 ]
112
112
113 dryrunopts = cmdutil.dryrunopts
113 dryrunopts = cmdutil.dryrunopts
114 remoteopts = cmdutil.remoteopts
114 remoteopts = cmdutil.remoteopts
115 walkopts = cmdutil.walkopts
115 walkopts = cmdutil.walkopts
116 commitopts = cmdutil.commitopts
116 commitopts = cmdutil.commitopts
117 commitopts2 = cmdutil.commitopts2
117 commitopts2 = cmdutil.commitopts2
118 formatteropts = cmdutil.formatteropts
118 formatteropts = cmdutil.formatteropts
119 templateopts = cmdutil.templateopts
119 templateopts = cmdutil.templateopts
120 logopts = cmdutil.logopts
120 logopts = cmdutil.logopts
121 diffopts = cmdutil.diffopts
121 diffopts = cmdutil.diffopts
122 diffwsopts = cmdutil.diffwsopts
122 diffwsopts = cmdutil.diffwsopts
123 diffopts2 = cmdutil.diffopts2
123 diffopts2 = cmdutil.diffopts2
124 mergetoolopts = cmdutil.mergetoolopts
124 mergetoolopts = cmdutil.mergetoolopts
125 similarityopts = cmdutil.similarityopts
125 similarityopts = cmdutil.similarityopts
126 subrepoopts = cmdutil.subrepoopts
126 subrepoopts = cmdutil.subrepoopts
127 debugrevlogopts = cmdutil.debugrevlogopts
127 debugrevlogopts = cmdutil.debugrevlogopts
128
128
129 # Commands start here, listed alphabetically
129 # Commands start here, listed alphabetically
130
130
131 @command('^add',
131 @command('^add',
132 walkopts + subrepoopts + dryrunopts,
132 walkopts + subrepoopts + dryrunopts,
133 _('[OPTION]... [FILE]...'),
133 _('[OPTION]... [FILE]...'),
134 inferrepo=True)
134 inferrepo=True)
135 def add(ui, repo, *pats, **opts):
135 def add(ui, repo, *pats, **opts):
136 """add the specified files on the next commit
136 """add the specified files on the next commit
137
137
138 Schedule files to be version controlled and added to the
138 Schedule files to be version controlled and added to the
139 repository.
139 repository.
140
140
141 The files will be added to the repository at the next commit. To
141 The files will be added to the repository at the next commit. To
142 undo an add before that, see :hg:`forget`.
142 undo an add before that, see :hg:`forget`.
143
143
144 If no names are given, add all files to the repository (except
144 If no names are given, add all files to the repository (except
145 files matching ``.hgignore``).
145 files matching ``.hgignore``).
146
146
147 .. container:: verbose
147 .. container:: verbose
148
148
149 Examples:
149 Examples:
150
150
151 - New (unknown) files are added
151 - New (unknown) files are added
152 automatically by :hg:`add`::
152 automatically by :hg:`add`::
153
153
154 $ ls
154 $ ls
155 foo.c
155 foo.c
156 $ hg status
156 $ hg status
157 ? foo.c
157 ? foo.c
158 $ hg add
158 $ hg add
159 adding foo.c
159 adding foo.c
160 $ hg status
160 $ hg status
161 A foo.c
161 A foo.c
162
162
163 - Specific files to be added can be specified::
163 - Specific files to be added can be specified::
164
164
165 $ ls
165 $ ls
166 bar.c foo.c
166 bar.c foo.c
167 $ hg status
167 $ hg status
168 ? bar.c
168 ? bar.c
169 ? foo.c
169 ? foo.c
170 $ hg add bar.c
170 $ hg add bar.c
171 $ hg status
171 $ hg status
172 A bar.c
172 A bar.c
173 ? foo.c
173 ? foo.c
174
174
175 Returns 0 if all files are successfully added.
175 Returns 0 if all files are successfully added.
176 """
176 """
177
177
178 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
178 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
179 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
179 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
180 return rejected and 1 or 0
180 return rejected and 1 or 0
181
181
182 @command('addremove',
182 @command('addremove',
183 similarityopts + subrepoopts + walkopts + dryrunopts,
183 similarityopts + subrepoopts + walkopts + dryrunopts,
184 _('[OPTION]... [FILE]...'),
184 _('[OPTION]... [FILE]...'),
185 inferrepo=True)
185 inferrepo=True)
186 def addremove(ui, repo, *pats, **opts):
186 def addremove(ui, repo, *pats, **opts):
187 """add all new files, delete all missing files
187 """add all new files, delete all missing files
188
188
189 Add all new files and remove all missing files from the
189 Add all new files and remove all missing files from the
190 repository.
190 repository.
191
191
192 Unless names are given, new files are ignored if they match any of
192 Unless names are given, new files are ignored if they match any of
193 the patterns in ``.hgignore``. As with add, these changes take
193 the patterns in ``.hgignore``. As with add, these changes take
194 effect at the next commit.
194 effect at the next commit.
195
195
196 Use the -s/--similarity option to detect renamed files. This
196 Use the -s/--similarity option to detect renamed files. This
197 option takes a percentage between 0 (disabled) and 100 (files must
197 option takes a percentage between 0 (disabled) and 100 (files must
198 be identical) as its parameter. With a parameter greater than 0,
198 be identical) as its parameter. With a parameter greater than 0,
199 this compares every removed file with every added file and records
199 this compares every removed file with every added file and records
200 those similar enough as renames. Detecting renamed files this way
200 those similar enough as renames. Detecting renamed files this way
201 can be expensive. After using this option, :hg:`status -C` can be
201 can be expensive. After using this option, :hg:`status -C` can be
202 used to check which files were identified as moved or renamed. If
202 used to check which files were identified as moved or renamed. If
203 not specified, -s/--similarity defaults to 100 and only renames of
203 not specified, -s/--similarity defaults to 100 and only renames of
204 identical files are detected.
204 identical files are detected.
205
205
206 .. container:: verbose
206 .. container:: verbose
207
207
208 Examples:
208 Examples:
209
209
210 - A number of files (bar.c and foo.c) are new,
210 - A number of files (bar.c and foo.c) are new,
211 while foobar.c has been removed (without using :hg:`remove`)
211 while foobar.c has been removed (without using :hg:`remove`)
212 from the repository::
212 from the repository::
213
213
214 $ ls
214 $ ls
215 bar.c foo.c
215 bar.c foo.c
216 $ hg status
216 $ hg status
217 ! foobar.c
217 ! foobar.c
218 ? bar.c
218 ? bar.c
219 ? foo.c
219 ? foo.c
220 $ hg addremove
220 $ hg addremove
221 adding bar.c
221 adding bar.c
222 adding foo.c
222 adding foo.c
223 removing foobar.c
223 removing foobar.c
224 $ hg status
224 $ hg status
225 A bar.c
225 A bar.c
226 A foo.c
226 A foo.c
227 R foobar.c
227 R foobar.c
228
228
229 - A file foobar.c was moved to foo.c without using :hg:`rename`.
229 - A file foobar.c was moved to foo.c without using :hg:`rename`.
230 Afterwards, it was edited slightly::
230 Afterwards, it was edited slightly::
231
231
232 $ ls
232 $ ls
233 foo.c
233 foo.c
234 $ hg status
234 $ hg status
235 ! foobar.c
235 ! foobar.c
236 ? foo.c
236 ? foo.c
237 $ hg addremove --similarity 90
237 $ hg addremove --similarity 90
238 removing foobar.c
238 removing foobar.c
239 adding foo.c
239 adding foo.c
240 recording removal of foobar.c as rename to foo.c (94% similar)
240 recording removal of foobar.c as rename to foo.c (94% similar)
241 $ hg status -C
241 $ hg status -C
242 A foo.c
242 A foo.c
243 foobar.c
243 foobar.c
244 R foobar.c
244 R foobar.c
245
245
246 Returns 0 if all files are successfully added.
246 Returns 0 if all files are successfully added.
247 """
247 """
248 opts = pycompat.byteskwargs(opts)
248 opts = pycompat.byteskwargs(opts)
249 if not opts.get('similarity'):
249 if not opts.get('similarity'):
250 opts['similarity'] = '100'
250 opts['similarity'] = '100'
251 matcher = scmutil.match(repo[None], pats, opts)
251 matcher = scmutil.match(repo[None], pats, opts)
252 return scmutil.addremove(repo, matcher, "", opts)
252 return scmutil.addremove(repo, matcher, "", opts)
253
253
254 @command('^annotate|blame',
254 @command('^annotate|blame',
255 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
255 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
256 ('', 'follow', None,
256 ('', 'follow', None,
257 _('follow copies/renames and list the filename (DEPRECATED)')),
257 _('follow copies/renames and list the filename (DEPRECATED)')),
258 ('', 'no-follow', None, _("don't follow copies and renames")),
258 ('', 'no-follow', None, _("don't follow copies and renames")),
259 ('a', 'text', None, _('treat all files as text')),
259 ('a', 'text', None, _('treat all files as text')),
260 ('u', 'user', None, _('list the author (long with -v)')),
260 ('u', 'user', None, _('list the author (long with -v)')),
261 ('f', 'file', None, _('list the filename')),
261 ('f', 'file', None, _('list the filename')),
262 ('d', 'date', None, _('list the date (short with -q)')),
262 ('d', 'date', None, _('list the date (short with -q)')),
263 ('n', 'number', None, _('list the revision number (default)')),
263 ('n', 'number', None, _('list the revision number (default)')),
264 ('c', 'changeset', None, _('list the changeset')),
264 ('c', 'changeset', None, _('list the changeset')),
265 ('l', 'line-number', None, _('show line number at the first appearance')),
265 ('l', 'line-number', None, _('show line number at the first appearance')),
266 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
266 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
267 ] + diffwsopts + walkopts + formatteropts,
267 ] + diffwsopts + walkopts + formatteropts,
268 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
268 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
269 inferrepo=True)
269 inferrepo=True)
270 def annotate(ui, repo, *pats, **opts):
270 def annotate(ui, repo, *pats, **opts):
271 """show changeset information by line for each file
271 """show changeset information by line for each file
272
272
273 List changes in files, showing the revision id responsible for
273 List changes in files, showing the revision id responsible for
274 each line.
274 each line.
275
275
276 This command is useful for discovering when a change was made and
276 This command is useful for discovering when a change was made and
277 by whom.
277 by whom.
278
278
279 If you include --file, --user, or --date, the revision number is
279 If you include --file, --user, or --date, the revision number is
280 suppressed unless you also include --number.
280 suppressed unless you also include --number.
281
281
282 Without the -a/--text option, annotate will avoid processing files
282 Without the -a/--text option, annotate will avoid processing files
283 it detects as binary. With -a, annotate will annotate the file
283 it detects as binary. With -a, annotate will annotate the file
284 anyway, although the results will probably be neither useful
284 anyway, although the results will probably be neither useful
285 nor desirable.
285 nor desirable.
286
286
287 Returns 0 on success.
287 Returns 0 on success.
288 """
288 """
289 opts = pycompat.byteskwargs(opts)
289 opts = pycompat.byteskwargs(opts)
290 if not pats:
290 if not pats:
291 raise error.Abort(_('at least one filename or pattern is required'))
291 raise error.Abort(_('at least one filename or pattern is required'))
292
292
293 if opts.get('follow'):
293 if opts.get('follow'):
294 # --follow is deprecated and now just an alias for -f/--file
294 # --follow is deprecated and now just an alias for -f/--file
295 # to mimic the behavior of Mercurial before version 1.5
295 # to mimic the behavior of Mercurial before version 1.5
296 opts['file'] = True
296 opts['file'] = True
297
297
298 rev = opts.get('rev')
298 rev = opts.get('rev')
299 if rev:
299 if rev:
300 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
300 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
301 ctx = scmutil.revsingle(repo, rev)
301 ctx = scmutil.revsingle(repo, rev)
302
302
303 rootfm = ui.formatter('annotate', opts)
303 rootfm = ui.formatter('annotate', opts)
304 if ui.quiet:
304 if ui.quiet:
305 datefunc = dateutil.shortdate
305 datefunc = dateutil.shortdate
306 else:
306 else:
307 datefunc = dateutil.datestr
307 datefunc = dateutil.datestr
308 if ctx.rev() is None:
308 if ctx.rev() is None:
309 def hexfn(node):
309 def hexfn(node):
310 if node is None:
310 if node is None:
311 return None
311 return None
312 else:
312 else:
313 return rootfm.hexfunc(node)
313 return rootfm.hexfunc(node)
314 if opts.get('changeset'):
314 if opts.get('changeset'):
315 # omit "+" suffix which is appended to node hex
315 # omit "+" suffix which is appended to node hex
316 def formatrev(rev):
316 def formatrev(rev):
317 if rev is None:
317 if rev is None:
318 return '%d' % ctx.p1().rev()
318 return '%d' % ctx.p1().rev()
319 else:
319 else:
320 return '%d' % rev
320 return '%d' % rev
321 else:
321 else:
322 def formatrev(rev):
322 def formatrev(rev):
323 if rev is None:
323 if rev is None:
324 return '%d+' % ctx.p1().rev()
324 return '%d+' % ctx.p1().rev()
325 else:
325 else:
326 return '%d ' % rev
326 return '%d ' % rev
327 def formathex(hex):
327 def formathex(hex):
328 if hex is None:
328 if hex is None:
329 return '%s+' % rootfm.hexfunc(ctx.p1().node())
329 return '%s+' % rootfm.hexfunc(ctx.p1().node())
330 else:
330 else:
331 return '%s ' % hex
331 return '%s ' % hex
332 else:
332 else:
333 hexfn = rootfm.hexfunc
333 hexfn = rootfm.hexfunc
334 formatrev = formathex = pycompat.bytestr
334 formatrev = formathex = pycompat.bytestr
335
335
336 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
336 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
337 ('rev', ' ', lambda x: x.fctx.rev(), formatrev),
337 ('rev', ' ', lambda x: x.fctx.rev(), formatrev),
338 ('node', ' ', lambda x: hexfn(x.fctx.node()), formathex),
338 ('node', ' ', lambda x: hexfn(x.fctx.node()), formathex),
339 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
339 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
340 ('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
340 ('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
341 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
341 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
342 ]
342 ]
343 opnamemap = {'rev': 'number', 'node': 'changeset', 'path': 'file'}
343 opnamemap = {'rev': 'number', 'node': 'changeset', 'path': 'file'}
344
344
345 if (not opts.get('user') and not opts.get('changeset')
345 if (not opts.get('user') and not opts.get('changeset')
346 and not opts.get('date') and not opts.get('file')):
346 and not opts.get('date') and not opts.get('file')):
347 opts['number'] = True
347 opts['number'] = True
348
348
349 linenumber = opts.get('line_number') is not None
349 linenumber = opts.get('line_number') is not None
350 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
350 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
351 raise error.Abort(_('at least one of -n/-c is required for -l'))
351 raise error.Abort(_('at least one of -n/-c is required for -l'))
352
352
353 ui.pager('annotate')
353 ui.pager('annotate')
354
354
355 if rootfm.isplain():
355 if rootfm.isplain():
356 def makefunc(get, fmt):
356 def makefunc(get, fmt):
357 return lambda x: fmt(get(x))
357 return lambda x: fmt(get(x))
358 else:
358 else:
359 def makefunc(get, fmt):
359 def makefunc(get, fmt):
360 return get
360 return get
361 datahint = rootfm.datahint()
361 datahint = rootfm.datahint()
362 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
362 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
363 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
363 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
364 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
364 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
365 fields = ' '.join(fn for fn, sep, get, fmt in opmap
365 fields = ' '.join(fn for fn, sep, get, fmt in opmap
366 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
366 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
367
367
368 def bad(x, y):
368 def bad(x, y):
369 raise error.Abort("%s: %s" % (x, y))
369 raise error.Abort("%s: %s" % (x, y))
370
370
371 m = scmutil.match(ctx, pats, opts, badfn=bad)
371 m = scmutil.match(ctx, pats, opts, badfn=bad)
372
372
373 follow = not opts.get('no_follow')
373 follow = not opts.get('no_follow')
374 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
374 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
375 whitespace=True)
375 whitespace=True)
376 skiprevs = opts.get('skip')
376 skiprevs = opts.get('skip')
377 if skiprevs:
377 if skiprevs:
378 skiprevs = scmutil.revrange(repo, skiprevs)
378 skiprevs = scmutil.revrange(repo, skiprevs)
379
379
380 for abs in ctx.walk(m):
380 for abs in ctx.walk(m):
381 fctx = ctx[abs]
381 fctx = ctx[abs]
382 rootfm.startitem()
382 rootfm.startitem()
383 rootfm.data(path=abs)
383 rootfm.data(path=abs)
384 if not opts.get('text') and fctx.isbinary():
384 if not opts.get('text') and fctx.isbinary():
385 rootfm.plain(_("%s: binary file\n")
385 rootfm.plain(_("%s: binary file\n")
386 % ((pats and m.rel(abs)) or abs))
386 % ((pats and m.rel(abs)) or abs))
387 continue
387 continue
388
388
389 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
389 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
390 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
390 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
391 diffopts=diffopts)
391 diffopts=diffopts)
392 if not lines:
392 if not lines:
393 fm.end()
393 fm.end()
394 continue
394 continue
395 formats = []
395 formats = []
396 pieces = []
396 pieces = []
397
397
398 for f, sep in funcmap:
398 for f, sep in funcmap:
399 l = [f(n) for n in lines]
399 l = [f(n) for n in lines]
400 if fm.isplain():
400 if fm.isplain():
401 sizes = [encoding.colwidth(x) for x in l]
401 sizes = [encoding.colwidth(x) for x in l]
402 ml = max(sizes)
402 ml = max(sizes)
403 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
403 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
404 else:
404 else:
405 formats.append(['%s' for x in l])
405 formats.append(['%s' for x in l])
406 pieces.append(l)
406 pieces.append(l)
407
407
408 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
408 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
409 fm.startitem()
409 fm.startitem()
410 fm.context(fctx=n.fctx)
410 fm.context(fctx=n.fctx)
411 fm.write(fields, "".join(f), *p)
411 fm.write(fields, "".join(f), *p)
412 if n.skip:
412 if n.skip:
413 fmt = "* %s"
413 fmt = "* %s"
414 else:
414 else:
415 fmt = ": %s"
415 fmt = ": %s"
416 fm.write('line', fmt, n.text)
416 fm.write('line', fmt, n.text)
417
417
418 if not lines[-1].text.endswith('\n'):
418 if not lines[-1].text.endswith('\n'):
419 fm.plain('\n')
419 fm.plain('\n')
420 fm.end()
420 fm.end()
421
421
422 rootfm.end()
422 rootfm.end()
423
423
424 @command('archive',
424 @command('archive',
425 [('', 'no-decode', None, _('do not pass files through decoders')),
425 [('', 'no-decode', None, _('do not pass files through decoders')),
426 ('p', 'prefix', '', _('directory prefix for files in archive'),
426 ('p', 'prefix', '', _('directory prefix for files in archive'),
427 _('PREFIX')),
427 _('PREFIX')),
428 ('r', 'rev', '', _('revision to distribute'), _('REV')),
428 ('r', 'rev', '', _('revision to distribute'), _('REV')),
429 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
429 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
430 ] + subrepoopts + walkopts,
430 ] + subrepoopts + walkopts,
431 _('[OPTION]... DEST'))
431 _('[OPTION]... DEST'))
432 def archive(ui, repo, dest, **opts):
432 def archive(ui, repo, dest, **opts):
433 '''create an unversioned archive of a repository revision
433 '''create an unversioned archive of a repository revision
434
434
435 By default, the revision used is the parent of the working
435 By default, the revision used is the parent of the working
436 directory; use -r/--rev to specify a different revision.
436 directory; use -r/--rev to specify a different revision.
437
437
438 The archive type is automatically detected based on file
438 The archive type is automatically detected based on file
439 extension (to override, use -t/--type).
439 extension (to override, use -t/--type).
440
440
441 .. container:: verbose
441 .. container:: verbose
442
442
443 Examples:
443 Examples:
444
444
445 - create a zip file containing the 1.0 release::
445 - create a zip file containing the 1.0 release::
446
446
447 hg archive -r 1.0 project-1.0.zip
447 hg archive -r 1.0 project-1.0.zip
448
448
449 - create a tarball excluding .hg files::
449 - create a tarball excluding .hg files::
450
450
451 hg archive project.tar.gz -X ".hg*"
451 hg archive project.tar.gz -X ".hg*"
452
452
453 Valid types are:
453 Valid types are:
454
454
455 :``files``: a directory full of files (default)
455 :``files``: a directory full of files (default)
456 :``tar``: tar archive, uncompressed
456 :``tar``: tar archive, uncompressed
457 :``tbz2``: tar archive, compressed using bzip2
457 :``tbz2``: tar archive, compressed using bzip2
458 :``tgz``: tar archive, compressed using gzip
458 :``tgz``: tar archive, compressed using gzip
459 :``uzip``: zip archive, uncompressed
459 :``uzip``: zip archive, uncompressed
460 :``zip``: zip archive, compressed using deflate
460 :``zip``: zip archive, compressed using deflate
461
461
462 The exact name of the destination archive or directory is given
462 The exact name of the destination archive or directory is given
463 using a format string; see :hg:`help export` for details.
463 using a format string; see :hg:`help export` for details.
464
464
465 Each member added to an archive file has a directory prefix
465 Each member added to an archive file has a directory prefix
466 prepended. Use -p/--prefix to specify a format string for the
466 prepended. Use -p/--prefix to specify a format string for the
467 prefix. The default is the basename of the archive, with suffixes
467 prefix. The default is the basename of the archive, with suffixes
468 removed.
468 removed.
469
469
470 Returns 0 on success.
470 Returns 0 on success.
471 '''
471 '''
472
472
473 opts = pycompat.byteskwargs(opts)
473 opts = pycompat.byteskwargs(opts)
474 rev = opts.get('rev')
474 rev = opts.get('rev')
475 if rev:
475 if rev:
476 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
476 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
477 ctx = scmutil.revsingle(repo, rev)
477 ctx = scmutil.revsingle(repo, rev)
478 if not ctx:
478 if not ctx:
479 raise error.Abort(_('no working directory: please specify a revision'))
479 raise error.Abort(_('no working directory: please specify a revision'))
480 node = ctx.node()
480 node = ctx.node()
481 dest = cmdutil.makefilename(ctx, dest)
481 dest = cmdutil.makefilename(ctx, dest)
482 if os.path.realpath(dest) == repo.root:
482 if os.path.realpath(dest) == repo.root:
483 raise error.Abort(_('repository root cannot be destination'))
483 raise error.Abort(_('repository root cannot be destination'))
484
484
485 kind = opts.get('type') or archival.guesskind(dest) or 'files'
485 kind = opts.get('type') or archival.guesskind(dest) or 'files'
486 prefix = opts.get('prefix')
486 prefix = opts.get('prefix')
487
487
488 if dest == '-':
488 if dest == '-':
489 if kind == 'files':
489 if kind == 'files':
490 raise error.Abort(_('cannot archive plain files to stdout'))
490 raise error.Abort(_('cannot archive plain files to stdout'))
491 dest = cmdutil.makefileobj(ctx, dest)
491 dest = cmdutil.makefileobj(ctx, dest)
492 if not prefix:
492 if not prefix:
493 prefix = os.path.basename(repo.root) + '-%h'
493 prefix = os.path.basename(repo.root) + '-%h'
494
494
495 prefix = cmdutil.makefilename(ctx, prefix)
495 prefix = cmdutil.makefilename(ctx, prefix)
496 match = scmutil.match(ctx, [], opts)
496 match = scmutil.match(ctx, [], opts)
497 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
497 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
498 match, prefix, subrepos=opts.get('subrepos'))
498 match, prefix, subrepos=opts.get('subrepos'))
499
499
500 @command('backout',
500 @command('backout',
501 [('', 'merge', None, _('merge with old dirstate parent after backout')),
501 [('', 'merge', None, _('merge with old dirstate parent after backout')),
502 ('', 'commit', None,
502 ('', 'commit', None,
503 _('commit if no conflicts were encountered (DEPRECATED)')),
503 _('commit if no conflicts were encountered (DEPRECATED)')),
504 ('', 'no-commit', None, _('do not commit')),
504 ('', 'no-commit', None, _('do not commit')),
505 ('', 'parent', '',
505 ('', 'parent', '',
506 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
506 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
507 ('r', 'rev', '', _('revision to backout'), _('REV')),
507 ('r', 'rev', '', _('revision to backout'), _('REV')),
508 ('e', 'edit', False, _('invoke editor on commit messages')),
508 ('e', 'edit', False, _('invoke editor on commit messages')),
509 ] + mergetoolopts + walkopts + commitopts + commitopts2,
509 ] + mergetoolopts + walkopts + commitopts + commitopts2,
510 _('[OPTION]... [-r] REV'))
510 _('[OPTION]... [-r] REV'))
511 def backout(ui, repo, node=None, rev=None, **opts):
511 def backout(ui, repo, node=None, rev=None, **opts):
512 '''reverse effect of earlier changeset
512 '''reverse effect of earlier changeset
513
513
514 Prepare a new changeset with the effect of REV undone in the
514 Prepare a new changeset with the effect of REV undone in the
515 current working directory. If no conflicts were encountered,
515 current working directory. If no conflicts were encountered,
516 it will be committed immediately.
516 it will be committed immediately.
517
517
518 If REV is the parent of the working directory, then this new changeset
518 If REV is the parent of the working directory, then this new changeset
519 is committed automatically (unless --no-commit is specified).
519 is committed automatically (unless --no-commit is specified).
520
520
521 .. note::
521 .. note::
522
522
523 :hg:`backout` cannot be used to fix either an unwanted or
523 :hg:`backout` cannot be used to fix either an unwanted or
524 incorrect merge.
524 incorrect merge.
525
525
526 .. container:: verbose
526 .. container:: verbose
527
527
528 Examples:
528 Examples:
529
529
530 - Reverse the effect of the parent of the working directory.
530 - Reverse the effect of the parent of the working directory.
531 This backout will be committed immediately::
531 This backout will be committed immediately::
532
532
533 hg backout -r .
533 hg backout -r .
534
534
535 - Reverse the effect of previous bad revision 23::
535 - Reverse the effect of previous bad revision 23::
536
536
537 hg backout -r 23
537 hg backout -r 23
538
538
539 - Reverse the effect of previous bad revision 23 and
539 - Reverse the effect of previous bad revision 23 and
540 leave changes uncommitted::
540 leave changes uncommitted::
541
541
542 hg backout -r 23 --no-commit
542 hg backout -r 23 --no-commit
543 hg commit -m "Backout revision 23"
543 hg commit -m "Backout revision 23"
544
544
545 By default, the pending changeset will have one parent,
545 By default, the pending changeset will have one parent,
546 maintaining a linear history. With --merge, the pending
546 maintaining a linear history. With --merge, the pending
547 changeset will instead have two parents: the old parent of the
547 changeset will instead have two parents: the old parent of the
548 working directory and a new child of REV that simply undoes REV.
548 working directory and a new child of REV that simply undoes REV.
549
549
550 Before version 1.7, the behavior without --merge was equivalent
550 Before version 1.7, the behavior without --merge was equivalent
551 to specifying --merge followed by :hg:`update --clean .` to
551 to specifying --merge followed by :hg:`update --clean .` to
552 cancel the merge and leave the child of REV as a head to be
552 cancel the merge and leave the child of REV as a head to be
553 merged separately.
553 merged separately.
554
554
555 See :hg:`help dates` for a list of formats valid for -d/--date.
555 See :hg:`help dates` for a list of formats valid for -d/--date.
556
556
557 See :hg:`help revert` for a way to restore files to the state
557 See :hg:`help revert` for a way to restore files to the state
558 of another revision.
558 of another revision.
559
559
560 Returns 0 on success, 1 if nothing to backout or there are unresolved
560 Returns 0 on success, 1 if nothing to backout or there are unresolved
561 files.
561 files.
562 '''
562 '''
563 with repo.wlock(), repo.lock():
563 with repo.wlock(), repo.lock():
564 return _dobackout(ui, repo, node, rev, **opts)
564 return _dobackout(ui, repo, node, rev, **opts)
565
565
566 def _dobackout(ui, repo, node=None, rev=None, **opts):
566 def _dobackout(ui, repo, node=None, rev=None, **opts):
567 opts = pycompat.byteskwargs(opts)
567 opts = pycompat.byteskwargs(opts)
568 if opts.get('commit') and opts.get('no_commit'):
568 if opts.get('commit') and opts.get('no_commit'):
569 raise error.Abort(_("cannot use --commit with --no-commit"))
569 raise error.Abort(_("cannot use --commit with --no-commit"))
570 if opts.get('merge') and opts.get('no_commit'):
570 if opts.get('merge') and opts.get('no_commit'):
571 raise error.Abort(_("cannot use --merge with --no-commit"))
571 raise error.Abort(_("cannot use --merge with --no-commit"))
572
572
573 if rev and node:
573 if rev and node:
574 raise error.Abort(_("please specify just one revision"))
574 raise error.Abort(_("please specify just one revision"))
575
575
576 if not rev:
576 if not rev:
577 rev = node
577 rev = node
578
578
579 if not rev:
579 if not rev:
580 raise error.Abort(_("please specify a revision to backout"))
580 raise error.Abort(_("please specify a revision to backout"))
581
581
582 date = opts.get('date')
582 date = opts.get('date')
583 if date:
583 if date:
584 opts['date'] = dateutil.parsedate(date)
584 opts['date'] = dateutil.parsedate(date)
585
585
586 cmdutil.checkunfinished(repo)
586 cmdutil.checkunfinished(repo)
587 cmdutil.bailifchanged(repo)
587 cmdutil.bailifchanged(repo)
588 node = scmutil.revsingle(repo, rev).node()
588 node = scmutil.revsingle(repo, rev).node()
589
589
590 op1, op2 = repo.dirstate.parents()
590 op1, op2 = repo.dirstate.parents()
591 if not repo.changelog.isancestor(node, op1):
591 if not repo.changelog.isancestor(node, op1):
592 raise error.Abort(_('cannot backout change that is not an ancestor'))
592 raise error.Abort(_('cannot backout change that is not an ancestor'))
593
593
594 p1, p2 = repo.changelog.parents(node)
594 p1, p2 = repo.changelog.parents(node)
595 if p1 == nullid:
595 if p1 == nullid:
596 raise error.Abort(_('cannot backout a change with no parents'))
596 raise error.Abort(_('cannot backout a change with no parents'))
597 if p2 != nullid:
597 if p2 != nullid:
598 if not opts.get('parent'):
598 if not opts.get('parent'):
599 raise error.Abort(_('cannot backout a merge changeset'))
599 raise error.Abort(_('cannot backout a merge changeset'))
600 p = repo.lookup(opts['parent'])
600 p = repo.lookup(opts['parent'])
601 if p not in (p1, p2):
601 if p not in (p1, p2):
602 raise error.Abort(_('%s is not a parent of %s') %
602 raise error.Abort(_('%s is not a parent of %s') %
603 (short(p), short(node)))
603 (short(p), short(node)))
604 parent = p
604 parent = p
605 else:
605 else:
606 if opts.get('parent'):
606 if opts.get('parent'):
607 raise error.Abort(_('cannot use --parent on non-merge changeset'))
607 raise error.Abort(_('cannot use --parent on non-merge changeset'))
608 parent = p1
608 parent = p1
609
609
610 # the backout should appear on the same branch
610 # the backout should appear on the same branch
611 branch = repo.dirstate.branch()
611 branch = repo.dirstate.branch()
612 bheads = repo.branchheads(branch)
612 bheads = repo.branchheads(branch)
613 rctx = scmutil.revsingle(repo, hex(parent))
613 rctx = scmutil.revsingle(repo, hex(parent))
614 if not opts.get('merge') and op1 != node:
614 if not opts.get('merge') and op1 != node:
615 with dirstateguard.dirstateguard(repo, 'backout'):
615 with dirstateguard.dirstateguard(repo, 'backout'):
616 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
616 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
617 with ui.configoverride(overrides, 'backout'):
617 with ui.configoverride(overrides, 'backout'):
618 stats = mergemod.update(repo, parent, True, True, node, False)
618 stats = mergemod.update(repo, parent, True, True, node, False)
619 repo.setparents(op1, op2)
619 repo.setparents(op1, op2)
620 hg._showstats(repo, stats)
620 hg._showstats(repo, stats)
621 if stats.unresolvedcount:
621 if stats.unresolvedcount:
622 repo.ui.status(_("use 'hg resolve' to retry unresolved "
622 repo.ui.status(_("use 'hg resolve' to retry unresolved "
623 "file merges\n"))
623 "file merges\n"))
624 return 1
624 return 1
625 else:
625 else:
626 hg.clean(repo, node, show_stats=False)
626 hg.clean(repo, node, show_stats=False)
627 repo.dirstate.setbranch(branch)
627 repo.dirstate.setbranch(branch)
628 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
628 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
629
629
630 if opts.get('no_commit'):
630 if opts.get('no_commit'):
631 msg = _("changeset %s backed out, "
631 msg = _("changeset %s backed out, "
632 "don't forget to commit.\n")
632 "don't forget to commit.\n")
633 ui.status(msg % short(node))
633 ui.status(msg % short(node))
634 return 0
634 return 0
635
635
636 def commitfunc(ui, repo, message, match, opts):
636 def commitfunc(ui, repo, message, match, opts):
637 editform = 'backout'
637 editform = 'backout'
638 e = cmdutil.getcommiteditor(editform=editform,
638 e = cmdutil.getcommiteditor(editform=editform,
639 **pycompat.strkwargs(opts))
639 **pycompat.strkwargs(opts))
640 if not message:
640 if not message:
641 # we don't translate commit messages
641 # we don't translate commit messages
642 message = "Backed out changeset %s" % short(node)
642 message = "Backed out changeset %s" % short(node)
643 e = cmdutil.getcommiteditor(edit=True, editform=editform)
643 e = cmdutil.getcommiteditor(edit=True, editform=editform)
644 return repo.commit(message, opts.get('user'), opts.get('date'),
644 return repo.commit(message, opts.get('user'), opts.get('date'),
645 match, editor=e)
645 match, editor=e)
646 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
646 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
647 if not newnode:
647 if not newnode:
648 ui.status(_("nothing changed\n"))
648 ui.status(_("nothing changed\n"))
649 return 1
649 return 1
650 cmdutil.commitstatus(repo, newnode, branch, bheads)
650 cmdutil.commitstatus(repo, newnode, branch, bheads)
651
651
652 def nice(node):
652 def nice(node):
653 return '%d:%s' % (repo.changelog.rev(node), short(node))
653 return '%d:%s' % (repo.changelog.rev(node), short(node))
654 ui.status(_('changeset %s backs out changeset %s\n') %
654 ui.status(_('changeset %s backs out changeset %s\n') %
655 (nice(repo.changelog.tip()), nice(node)))
655 (nice(repo.changelog.tip()), nice(node)))
656 if opts.get('merge') and op1 != node:
656 if opts.get('merge') and op1 != node:
657 hg.clean(repo, op1, show_stats=False)
657 hg.clean(repo, op1, show_stats=False)
658 ui.status(_('merging with changeset %s\n')
658 ui.status(_('merging with changeset %s\n')
659 % nice(repo.changelog.tip()))
659 % nice(repo.changelog.tip()))
660 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
660 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
661 with ui.configoverride(overrides, 'backout'):
661 with ui.configoverride(overrides, 'backout'):
662 return hg.merge(repo, hex(repo.changelog.tip()))
662 return hg.merge(repo, hex(repo.changelog.tip()))
663 return 0
663 return 0
664
664
665 @command('bisect',
665 @command('bisect',
666 [('r', 'reset', False, _('reset bisect state')),
666 [('r', 'reset', False, _('reset bisect state')),
667 ('g', 'good', False, _('mark changeset good')),
667 ('g', 'good', False, _('mark changeset good')),
668 ('b', 'bad', False, _('mark changeset bad')),
668 ('b', 'bad', False, _('mark changeset bad')),
669 ('s', 'skip', False, _('skip testing changeset')),
669 ('s', 'skip', False, _('skip testing changeset')),
670 ('e', 'extend', False, _('extend the bisect range')),
670 ('e', 'extend', False, _('extend the bisect range')),
671 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
671 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
672 ('U', 'noupdate', False, _('do not update to target'))],
672 ('U', 'noupdate', False, _('do not update to target'))],
673 _("[-gbsr] [-U] [-c CMD] [REV]"))
673 _("[-gbsr] [-U] [-c CMD] [REV]"))
674 def bisect(ui, repo, rev=None, extra=None, command=None,
674 def bisect(ui, repo, rev=None, extra=None, command=None,
675 reset=None, good=None, bad=None, skip=None, extend=None,
675 reset=None, good=None, bad=None, skip=None, extend=None,
676 noupdate=None):
676 noupdate=None):
677 """subdivision search of changesets
677 """subdivision search of changesets
678
678
679 This command helps to find changesets which introduce problems. To
679 This command helps to find changesets which introduce problems. To
680 use, mark the earliest changeset you know exhibits the problem as
680 use, mark the earliest changeset you know exhibits the problem as
681 bad, then mark the latest changeset which is free from the problem
681 bad, then mark the latest changeset which is free from the problem
682 as good. Bisect will update your working directory to a revision
682 as good. Bisect will update your working directory to a revision
683 for testing (unless the -U/--noupdate option is specified). Once
683 for testing (unless the -U/--noupdate option is specified). Once
684 you have performed tests, mark the working directory as good or
684 you have performed tests, mark the working directory as good or
685 bad, and bisect will either update to another candidate changeset
685 bad, and bisect will either update to another candidate changeset
686 or announce that it has found the bad revision.
686 or announce that it has found the bad revision.
687
687
688 As a shortcut, you can also use the revision argument to mark a
688 As a shortcut, you can also use the revision argument to mark a
689 revision as good or bad without checking it out first.
689 revision as good or bad without checking it out first.
690
690
691 If you supply a command, it will be used for automatic bisection.
691 If you supply a command, it will be used for automatic bisection.
692 The environment variable HG_NODE will contain the ID of the
692 The environment variable HG_NODE will contain the ID of the
693 changeset being tested. The exit status of the command will be
693 changeset being tested. The exit status of the command will be
694 used to mark revisions as good or bad: status 0 means good, 125
694 used to mark revisions as good or bad: status 0 means good, 125
695 means to skip the revision, 127 (command not found) will abort the
695 means to skip the revision, 127 (command not found) will abort the
696 bisection, and any other non-zero exit status means the revision
696 bisection, and any other non-zero exit status means the revision
697 is bad.
697 is bad.
698
698
699 .. container:: verbose
699 .. container:: verbose
700
700
701 Some examples:
701 Some examples:
702
702
703 - start a bisection with known bad revision 34, and good revision 12::
703 - start a bisection with known bad revision 34, and good revision 12::
704
704
705 hg bisect --bad 34
705 hg bisect --bad 34
706 hg bisect --good 12
706 hg bisect --good 12
707
707
708 - advance the current bisection by marking current revision as good or
708 - advance the current bisection by marking current revision as good or
709 bad::
709 bad::
710
710
711 hg bisect --good
711 hg bisect --good
712 hg bisect --bad
712 hg bisect --bad
713
713
714 - mark the current revision, or a known revision, to be skipped (e.g. if
714 - mark the current revision, or a known revision, to be skipped (e.g. if
715 that revision is not usable because of another issue)::
715 that revision is not usable because of another issue)::
716
716
717 hg bisect --skip
717 hg bisect --skip
718 hg bisect --skip 23
718 hg bisect --skip 23
719
719
720 - skip all revisions that do not touch directories ``foo`` or ``bar``::
720 - skip all revisions that do not touch directories ``foo`` or ``bar``::
721
721
722 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
722 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
723
723
724 - forget the current bisection::
724 - forget the current bisection::
725
725
726 hg bisect --reset
726 hg bisect --reset
727
727
728 - use 'make && make tests' to automatically find the first broken
728 - use 'make && make tests' to automatically find the first broken
729 revision::
729 revision::
730
730
731 hg bisect --reset
731 hg bisect --reset
732 hg bisect --bad 34
732 hg bisect --bad 34
733 hg bisect --good 12
733 hg bisect --good 12
734 hg bisect --command "make && make tests"
734 hg bisect --command "make && make tests"
735
735
736 - see all changesets whose states are already known in the current
736 - see all changesets whose states are already known in the current
737 bisection::
737 bisection::
738
738
739 hg log -r "bisect(pruned)"
739 hg log -r "bisect(pruned)"
740
740
741 - see the changeset currently being bisected (especially useful
741 - see the changeset currently being bisected (especially useful
742 if running with -U/--noupdate)::
742 if running with -U/--noupdate)::
743
743
744 hg log -r "bisect(current)"
744 hg log -r "bisect(current)"
745
745
746 - see all changesets that took part in the current bisection::
746 - see all changesets that took part in the current bisection::
747
747
748 hg log -r "bisect(range)"
748 hg log -r "bisect(range)"
749
749
750 - you can even get a nice graph::
750 - you can even get a nice graph::
751
751
752 hg log --graph -r "bisect(range)"
752 hg log --graph -r "bisect(range)"
753
753
754 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
754 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
755
755
756 Returns 0 on success.
756 Returns 0 on success.
757 """
757 """
758 # backward compatibility
758 # backward compatibility
759 if rev in "good bad reset init".split():
759 if rev in "good bad reset init".split():
760 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
760 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
761 cmd, rev, extra = rev, extra, None
761 cmd, rev, extra = rev, extra, None
762 if cmd == "good":
762 if cmd == "good":
763 good = True
763 good = True
764 elif cmd == "bad":
764 elif cmd == "bad":
765 bad = True
765 bad = True
766 else:
766 else:
767 reset = True
767 reset = True
768 elif extra:
768 elif extra:
769 raise error.Abort(_('incompatible arguments'))
769 raise error.Abort(_('incompatible arguments'))
770
770
771 incompatibles = {
771 incompatibles = {
772 '--bad': bad,
772 '--bad': bad,
773 '--command': bool(command),
773 '--command': bool(command),
774 '--extend': extend,
774 '--extend': extend,
775 '--good': good,
775 '--good': good,
776 '--reset': reset,
776 '--reset': reset,
777 '--skip': skip,
777 '--skip': skip,
778 }
778 }
779
779
780 enabled = [x for x in incompatibles if incompatibles[x]]
780 enabled = [x for x in incompatibles if incompatibles[x]]
781
781
782 if len(enabled) > 1:
782 if len(enabled) > 1:
783 raise error.Abort(_('%s and %s are incompatible') %
783 raise error.Abort(_('%s and %s are incompatible') %
784 tuple(sorted(enabled)[0:2]))
784 tuple(sorted(enabled)[0:2]))
785
785
786 if reset:
786 if reset:
787 hbisect.resetstate(repo)
787 hbisect.resetstate(repo)
788 return
788 return
789
789
790 state = hbisect.load_state(repo)
790 state = hbisect.load_state(repo)
791
791
792 # update state
792 # update state
793 if good or bad or skip:
793 if good or bad or skip:
794 if rev:
794 if rev:
795 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
795 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
796 else:
796 else:
797 nodes = [repo.lookup('.')]
797 nodes = [repo.lookup('.')]
798 if good:
798 if good:
799 state['good'] += nodes
799 state['good'] += nodes
800 elif bad:
800 elif bad:
801 state['bad'] += nodes
801 state['bad'] += nodes
802 elif skip:
802 elif skip:
803 state['skip'] += nodes
803 state['skip'] += nodes
804 hbisect.save_state(repo, state)
804 hbisect.save_state(repo, state)
805 if not (state['good'] and state['bad']):
805 if not (state['good'] and state['bad']):
806 return
806 return
807
807
808 def mayupdate(repo, node, show_stats=True):
808 def mayupdate(repo, node, show_stats=True):
809 """common used update sequence"""
809 """common used update sequence"""
810 if noupdate:
810 if noupdate:
811 return
811 return
812 cmdutil.checkunfinished(repo)
812 cmdutil.checkunfinished(repo)
813 cmdutil.bailifchanged(repo)
813 cmdutil.bailifchanged(repo)
814 return hg.clean(repo, node, show_stats=show_stats)
814 return hg.clean(repo, node, show_stats=show_stats)
815
815
816 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
816 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
817
817
818 if command:
818 if command:
819 changesets = 1
819 changesets = 1
820 if noupdate:
820 if noupdate:
821 try:
821 try:
822 node = state['current'][0]
822 node = state['current'][0]
823 except LookupError:
823 except LookupError:
824 raise error.Abort(_('current bisect revision is unknown - '
824 raise error.Abort(_('current bisect revision is unknown - '
825 'start a new bisect to fix'))
825 'start a new bisect to fix'))
826 else:
826 else:
827 node, p2 = repo.dirstate.parents()
827 node, p2 = repo.dirstate.parents()
828 if p2 != nullid:
828 if p2 != nullid:
829 raise error.Abort(_('current bisect revision is a merge'))
829 raise error.Abort(_('current bisect revision is a merge'))
830 if rev:
830 if rev:
831 node = repo[scmutil.revsingle(repo, rev, node)].node()
831 node = repo[scmutil.revsingle(repo, rev, node)].node()
832 try:
832 try:
833 while changesets:
833 while changesets:
834 # update state
834 # update state
835 state['current'] = [node]
835 state['current'] = [node]
836 hbisect.save_state(repo, state)
836 hbisect.save_state(repo, state)
837 status = ui.system(command, environ={'HG_NODE': hex(node)},
837 status = ui.system(command, environ={'HG_NODE': hex(node)},
838 blockedtag='bisect_check')
838 blockedtag='bisect_check')
839 if status == 125:
839 if status == 125:
840 transition = "skip"
840 transition = "skip"
841 elif status == 0:
841 elif status == 0:
842 transition = "good"
842 transition = "good"
843 # status < 0 means process was killed
843 # status < 0 means process was killed
844 elif status == 127:
844 elif status == 127:
845 raise error.Abort(_("failed to execute %s") % command)
845 raise error.Abort(_("failed to execute %s") % command)
846 elif status < 0:
846 elif status < 0:
847 raise error.Abort(_("%s killed") % command)
847 raise error.Abort(_("%s killed") % command)
848 else:
848 else:
849 transition = "bad"
849 transition = "bad"
850 state[transition].append(node)
850 state[transition].append(node)
851 ctx = repo[node]
851 ctx = repo[node]
852 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
852 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
853 transition))
853 transition))
854 hbisect.checkstate(state)
854 hbisect.checkstate(state)
855 # bisect
855 # bisect
856 nodes, changesets, bgood = hbisect.bisect(repo, state)
856 nodes, changesets, bgood = hbisect.bisect(repo, state)
857 # update to next check
857 # update to next check
858 node = nodes[0]
858 node = nodes[0]
859 mayupdate(repo, node, show_stats=False)
859 mayupdate(repo, node, show_stats=False)
860 finally:
860 finally:
861 state['current'] = [node]
861 state['current'] = [node]
862 hbisect.save_state(repo, state)
862 hbisect.save_state(repo, state)
863 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
863 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
864 return
864 return
865
865
866 hbisect.checkstate(state)
866 hbisect.checkstate(state)
867
867
868 # actually bisect
868 # actually bisect
869 nodes, changesets, good = hbisect.bisect(repo, state)
869 nodes, changesets, good = hbisect.bisect(repo, state)
870 if extend:
870 if extend:
871 if not changesets:
871 if not changesets:
872 extendnode = hbisect.extendrange(repo, state, nodes, good)
872 extendnode = hbisect.extendrange(repo, state, nodes, good)
873 if extendnode is not None:
873 if extendnode is not None:
874 ui.write(_("Extending search to changeset %d:%s\n")
874 ui.write(_("Extending search to changeset %d:%s\n")
875 % (extendnode.rev(), extendnode))
875 % (extendnode.rev(), extendnode))
876 state['current'] = [extendnode.node()]
876 state['current'] = [extendnode.node()]
877 hbisect.save_state(repo, state)
877 hbisect.save_state(repo, state)
878 return mayupdate(repo, extendnode.node())
878 return mayupdate(repo, extendnode.node())
879 raise error.Abort(_("nothing to extend"))
879 raise error.Abort(_("nothing to extend"))
880
880
881 if changesets == 0:
881 if changesets == 0:
882 hbisect.printresult(ui, repo, state, displayer, nodes, good)
882 hbisect.printresult(ui, repo, state, displayer, nodes, good)
883 else:
883 else:
884 assert len(nodes) == 1 # only a single node can be tested next
884 assert len(nodes) == 1 # only a single node can be tested next
885 node = nodes[0]
885 node = nodes[0]
886 # compute the approximate number of remaining tests
886 # compute the approximate number of remaining tests
887 tests, size = 0, 2
887 tests, size = 0, 2
888 while size <= changesets:
888 while size <= changesets:
889 tests, size = tests + 1, size * 2
889 tests, size = tests + 1, size * 2
890 rev = repo.changelog.rev(node)
890 rev = repo.changelog.rev(node)
891 ui.write(_("Testing changeset %d:%s "
891 ui.write(_("Testing changeset %d:%s "
892 "(%d changesets remaining, ~%d tests)\n")
892 "(%d changesets remaining, ~%d tests)\n")
893 % (rev, short(node), changesets, tests))
893 % (rev, short(node), changesets, tests))
894 state['current'] = [node]
894 state['current'] = [node]
895 hbisect.save_state(repo, state)
895 hbisect.save_state(repo, state)
896 return mayupdate(repo, node)
896 return mayupdate(repo, node)
897
897
898 @command('bookmarks|bookmark',
898 @command('bookmarks|bookmark',
899 [('f', 'force', False, _('force')),
899 [('f', 'force', False, _('force')),
900 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
900 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
901 ('d', 'delete', False, _('delete a given bookmark')),
901 ('d', 'delete', False, _('delete a given bookmark')),
902 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
902 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
903 ('i', 'inactive', False, _('mark a bookmark inactive')),
903 ('i', 'inactive', False, _('mark a bookmark inactive')),
904 ('', 'active', False, _('display the active bookmark')),
904 ('', 'active', False, _('display the active bookmark')),
905 ] + formatteropts,
905 ] + formatteropts,
906 _('hg bookmarks [OPTIONS]... [NAME]...'))
906 _('hg bookmarks [OPTIONS]... [NAME]...'))
907 def bookmark(ui, repo, *names, **opts):
907 def bookmark(ui, repo, *names, **opts):
908 '''create a new bookmark or list existing bookmarks
908 '''create a new bookmark or list existing bookmarks
909
909
910 Bookmarks are labels on changesets to help track lines of development.
910 Bookmarks are labels on changesets to help track lines of development.
911 Bookmarks are unversioned and can be moved, renamed and deleted.
911 Bookmarks are unversioned and can be moved, renamed and deleted.
912 Deleting or moving a bookmark has no effect on the associated changesets.
912 Deleting or moving a bookmark has no effect on the associated changesets.
913
913
914 Creating or updating to a bookmark causes it to be marked as 'active'.
914 Creating or updating to a bookmark causes it to be marked as 'active'.
915 The active bookmark is indicated with a '*'.
915 The active bookmark is indicated with a '*'.
916 When a commit is made, the active bookmark will advance to the new commit.
916 When a commit is made, the active bookmark will advance to the new commit.
917 A plain :hg:`update` will also advance an active bookmark, if possible.
917 A plain :hg:`update` will also advance an active bookmark, if possible.
918 Updating away from a bookmark will cause it to be deactivated.
918 Updating away from a bookmark will cause it to be deactivated.
919
919
920 Bookmarks can be pushed and pulled between repositories (see
920 Bookmarks can be pushed and pulled between repositories (see
921 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
921 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
922 diverged, a new 'divergent bookmark' of the form 'name@path' will
922 diverged, a new 'divergent bookmark' of the form 'name@path' will
923 be created. Using :hg:`merge` will resolve the divergence.
923 be created. Using :hg:`merge` will resolve the divergence.
924
924
925 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
925 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
926 the active bookmark's name.
926 the active bookmark's name.
927
927
928 A bookmark named '@' has the special property that :hg:`clone` will
928 A bookmark named '@' has the special property that :hg:`clone` will
929 check it out by default if it exists.
929 check it out by default if it exists.
930
930
931 The '--active' flag will display the current bookmark or return non-zero,
931 The '--active' flag will display the current bookmark or return non-zero,
932 if combined with other action, they will be performed on the active
932 if combined with other action, they will be performed on the active
933 bookmark.
933 bookmark.
934
934
935 .. container:: verbose
935 .. container:: verbose
936
936
937 Examples:
937 Examples:
938
938
939 - create an active bookmark for a new line of development::
939 - create an active bookmark for a new line of development::
940
940
941 hg book new-feature
941 hg book new-feature
942
942
943 - create an inactive bookmark as a place marker::
943 - create an inactive bookmark as a place marker::
944
944
945 hg book -i reviewed
945 hg book -i reviewed
946
946
947 - create an inactive bookmark on another changeset::
947 - create an inactive bookmark on another changeset::
948
948
949 hg book -r .^ tested
949 hg book -r .^ tested
950
950
951 - rename bookmark turkey to dinner::
951 - rename bookmark turkey to dinner::
952
952
953 hg book -m turkey dinner
953 hg book -m turkey dinner
954
954
955 - move the '@' bookmark from another branch::
955 - move the '@' bookmark from another branch::
956
956
957 hg book -f @
957 hg book -f @
958 '''
958 '''
959 force = opts.get(r'force')
959 force = opts.get(r'force')
960 rev = opts.get(r'rev')
960 rev = opts.get(r'rev')
961 delete = opts.get(r'delete')
961 delete = opts.get(r'delete')
962 rename = opts.get(r'rename')
962 rename = opts.get(r'rename')
963 inactive = opts.get(r'inactive')
963 inactive = opts.get(r'inactive')
964 active = opts.get(r'active')
964 active = opts.get(r'active')
965
965
966 if delete and rename:
966 if delete and rename:
967 raise error.Abort(_("--delete and --rename are incompatible"))
967 raise error.Abort(_("--delete and --rename are incompatible"))
968 if delete and rev:
968 if delete and rev:
969 raise error.Abort(_("--rev is incompatible with --delete"))
969 raise error.Abort(_("--rev is incompatible with --delete"))
970 if rename and rev:
970 if rename and rev:
971 raise error.Abort(_("--rev is incompatible with --rename"))
971 raise error.Abort(_("--rev is incompatible with --rename"))
972 if delete and active:
972 if delete and active:
973 raise error.Abort(_("--delete is incompatible with --active"))
973 raise error.Abort(_("--delete is incompatible with --active"))
974 if rev and active:
974 if rev and active:
975 raise error.Abort(_("--rev is incompatible with --active"))
975 raise error.Abort(_("--rev is incompatible with --active"))
976 if rename and active:
976 if rename and active:
977 raise error.Abort(_("--rename is incompatible with --active"))
977 raise error.Abort(_("--rename is incompatible with --active"))
978 if names and active:
978 if names and active:
979 raise error.Abort(_("NAMES is incompatible with --active"))
979 raise error.Abort(_("NAMES is incompatible with --active"))
980 if inactive and active:
980 if inactive and active:
981 raise error.Abort(_("--inactive is incompatible with --active"))
981 raise error.Abort(_("--inactive is incompatible with --active"))
982 if not names and (delete or rev):
982 if not names and (delete or rev):
983 raise error.Abort(_("bookmark name required"))
983 raise error.Abort(_("bookmark name required"))
984
984
985 if delete or rename or names or inactive:
985 if delete or rename or names or inactive:
986 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
986 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
987 if delete:
987 if delete:
988 names = pycompat.maplist(repo._bookmarks.expandname, names)
988 names = pycompat.maplist(repo._bookmarks.expandname, names)
989 bookmarks.delete(repo, tr, names)
989 bookmarks.delete(repo, tr, names)
990 elif rename:
990 elif rename:
991 if not names:
991 if not names:
992 raise error.Abort(_("new bookmark name required"))
992 raise error.Abort(_("new bookmark name required"))
993 elif len(names) > 1:
993 elif len(names) > 1:
994 raise error.Abort(_("only one new bookmark name allowed"))
994 raise error.Abort(_("only one new bookmark name allowed"))
995 rename = repo._bookmarks.expandname(rename)
995 rename = repo._bookmarks.expandname(rename)
996 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
996 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
997 elif names:
997 elif names:
998 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
998 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
999 elif inactive:
999 elif inactive:
1000 if len(repo._bookmarks) == 0:
1000 if len(repo._bookmarks) == 0:
1001 ui.status(_("no bookmarks set\n"))
1001 ui.status(_("no bookmarks set\n"))
1002 elif not repo._activebookmark:
1002 elif not repo._activebookmark:
1003 ui.status(_("no active bookmark\n"))
1003 ui.status(_("no active bookmark\n"))
1004 else:
1004 else:
1005 bookmarks.deactivate(repo)
1005 bookmarks.deactivate(repo)
1006 elif active:
1006 elif active:
1007 book = repo._activebookmark
1007 book = repo._activebookmark
1008 if book is None:
1008 if book is None:
1009 return 1
1009 return 1
1010 ui.write("%s\n" % book, label=bookmarks.activebookmarklabel)
1010 ui.write("%s\n" % book, label=bookmarks.activebookmarklabel)
1011 else: # show bookmarks
1011 else: # show bookmarks
1012 bookmarks.printbookmarks(ui, repo, **opts)
1012 bookmarks.printbookmarks(ui, repo, **opts)
1013
1013
1014 @command('branch',
1014 @command('branch',
1015 [('f', 'force', None,
1015 [('f', 'force', None,
1016 _('set branch name even if it shadows an existing branch')),
1016 _('set branch name even if it shadows an existing branch')),
1017 ('C', 'clean', None, _('reset branch name to parent branch name')),
1017 ('C', 'clean', None, _('reset branch name to parent branch name')),
1018 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1018 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1019 ],
1019 ],
1020 _('[-fC] [NAME]'))
1020 _('[-fC] [NAME]'))
1021 def branch(ui, repo, label=None, **opts):
1021 def branch(ui, repo, label=None, **opts):
1022 """set or show the current branch name
1022 """set or show the current branch name
1023
1023
1024 .. note::
1024 .. note::
1025
1025
1026 Branch names are permanent and global. Use :hg:`bookmark` to create a
1026 Branch names are permanent and global. Use :hg:`bookmark` to create a
1027 light-weight bookmark instead. See :hg:`help glossary` for more
1027 light-weight bookmark instead. See :hg:`help glossary` for more
1028 information about named branches and bookmarks.
1028 information about named branches and bookmarks.
1029
1029
1030 With no argument, show the current branch name. With one argument,
1030 With no argument, show the current branch name. With one argument,
1031 set the working directory branch name (the branch will not exist
1031 set the working directory branch name (the branch will not exist
1032 in the repository until the next commit). Standard practice
1032 in the repository until the next commit). Standard practice
1033 recommends that primary development take place on the 'default'
1033 recommends that primary development take place on the 'default'
1034 branch.
1034 branch.
1035
1035
1036 Unless -f/--force is specified, branch will not let you set a
1036 Unless -f/--force is specified, branch will not let you set a
1037 branch name that already exists.
1037 branch name that already exists.
1038
1038
1039 Use -C/--clean to reset the working directory branch to that of
1039 Use -C/--clean to reset the working directory branch to that of
1040 the parent of the working directory, negating a previous branch
1040 the parent of the working directory, negating a previous branch
1041 change.
1041 change.
1042
1042
1043 Use the command :hg:`update` to switch to an existing branch. Use
1043 Use the command :hg:`update` to switch to an existing branch. Use
1044 :hg:`commit --close-branch` to mark this branch head as closed.
1044 :hg:`commit --close-branch` to mark this branch head as closed.
1045 When all heads of a branch are closed, the branch will be
1045 When all heads of a branch are closed, the branch will be
1046 considered closed.
1046 considered closed.
1047
1047
1048 Returns 0 on success.
1048 Returns 0 on success.
1049 """
1049 """
1050 opts = pycompat.byteskwargs(opts)
1050 opts = pycompat.byteskwargs(opts)
1051 revs = opts.get('rev')
1051 revs = opts.get('rev')
1052 if label:
1052 if label:
1053 label = label.strip()
1053 label = label.strip()
1054
1054
1055 if not opts.get('clean') and not label:
1055 if not opts.get('clean') and not label:
1056 if revs:
1056 if revs:
1057 raise error.Abort(_("no branch name specified for the revisions"))
1057 raise error.Abort(_("no branch name specified for the revisions"))
1058 ui.write("%s\n" % repo.dirstate.branch())
1058 ui.write("%s\n" % repo.dirstate.branch())
1059 return
1059 return
1060
1060
1061 with repo.wlock():
1061 with repo.wlock():
1062 if opts.get('clean'):
1062 if opts.get('clean'):
1063 label = repo[None].p1().branch()
1063 label = repo[None].p1().branch()
1064 repo.dirstate.setbranch(label)
1064 repo.dirstate.setbranch(label)
1065 ui.status(_('reset working directory to branch %s\n') % label)
1065 ui.status(_('reset working directory to branch %s\n') % label)
1066 elif label:
1066 elif label:
1067
1067
1068 scmutil.checknewlabel(repo, label, 'branch')
1068 scmutil.checknewlabel(repo, label, 'branch')
1069 if revs:
1069 if revs:
1070 return cmdutil.changebranch(ui, repo, revs, label)
1070 return cmdutil.changebranch(ui, repo, revs, label)
1071
1071
1072 if not opts.get('force') and label in repo.branchmap():
1072 if not opts.get('force') and label in repo.branchmap():
1073 if label not in [p.branch() for p in repo[None].parents()]:
1073 if label not in [p.branch() for p in repo[None].parents()]:
1074 raise error.Abort(_('a branch of the same name already'
1074 raise error.Abort(_('a branch of the same name already'
1075 ' exists'),
1075 ' exists'),
1076 # i18n: "it" refers to an existing branch
1076 # i18n: "it" refers to an existing branch
1077 hint=_("use 'hg update' to switch to it"))
1077 hint=_("use 'hg update' to switch to it"))
1078
1078
1079 repo.dirstate.setbranch(label)
1079 repo.dirstate.setbranch(label)
1080 ui.status(_('marked working directory as branch %s\n') % label)
1080 ui.status(_('marked working directory as branch %s\n') % label)
1081
1081
1082 # find any open named branches aside from default
1082 # find any open named branches aside from default
1083 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1083 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1084 if n != "default" and not c]
1084 if n != "default" and not c]
1085 if not others:
1085 if not others:
1086 ui.status(_('(branches are permanent and global, '
1086 ui.status(_('(branches are permanent and global, '
1087 'did you want a bookmark?)\n'))
1087 'did you want a bookmark?)\n'))
1088
1088
1089 @command('branches',
1089 @command('branches',
1090 [('a', 'active', False,
1090 [('a', 'active', False,
1091 _('show only branches that have unmerged heads (DEPRECATED)')),
1091 _('show only branches that have unmerged heads (DEPRECATED)')),
1092 ('c', 'closed', False, _('show normal and closed branches')),
1092 ('c', 'closed', False, _('show normal and closed branches')),
1093 ] + formatteropts,
1093 ] + formatteropts,
1094 _('[-c]'),
1094 _('[-c]'),
1095 intents={INTENT_READONLY})
1095 intents={INTENT_READONLY})
1096 def branches(ui, repo, active=False, closed=False, **opts):
1096 def branches(ui, repo, active=False, closed=False, **opts):
1097 """list repository named branches
1097 """list repository named branches
1098
1098
1099 List the repository's named branches, indicating which ones are
1099 List the repository's named branches, indicating which ones are
1100 inactive. If -c/--closed is specified, also list branches which have
1100 inactive. If -c/--closed is specified, also list branches which have
1101 been marked closed (see :hg:`commit --close-branch`).
1101 been marked closed (see :hg:`commit --close-branch`).
1102
1102
1103 Use the command :hg:`update` to switch to an existing branch.
1103 Use the command :hg:`update` to switch to an existing branch.
1104
1104
1105 Returns 0.
1105 Returns 0.
1106 """
1106 """
1107
1107
1108 opts = pycompat.byteskwargs(opts)
1108 opts = pycompat.byteskwargs(opts)
1109 ui.pager('branches')
1109 ui.pager('branches')
1110 fm = ui.formatter('branches', opts)
1110 fm = ui.formatter('branches', opts)
1111 hexfunc = fm.hexfunc
1111 hexfunc = fm.hexfunc
1112
1112
1113 allheads = set(repo.heads())
1113 allheads = set(repo.heads())
1114 branches = []
1114 branches = []
1115 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1115 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1116 isactive = False
1116 isactive = False
1117 if not isclosed:
1117 if not isclosed:
1118 openheads = set(repo.branchmap().iteropen(heads))
1118 openheads = set(repo.branchmap().iteropen(heads))
1119 isactive = bool(openheads & allheads)
1119 isactive = bool(openheads & allheads)
1120 branches.append((tag, repo[tip], isactive, not isclosed))
1120 branches.append((tag, repo[tip], isactive, not isclosed))
1121 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1121 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1122 reverse=True)
1122 reverse=True)
1123
1123
1124 for tag, ctx, isactive, isopen in branches:
1124 for tag, ctx, isactive, isopen in branches:
1125 if active and not isactive:
1125 if active and not isactive:
1126 continue
1126 continue
1127 if isactive:
1127 if isactive:
1128 label = 'branches.active'
1128 label = 'branches.active'
1129 notice = ''
1129 notice = ''
1130 elif not isopen:
1130 elif not isopen:
1131 if not closed:
1131 if not closed:
1132 continue
1132 continue
1133 label = 'branches.closed'
1133 label = 'branches.closed'
1134 notice = _(' (closed)')
1134 notice = _(' (closed)')
1135 else:
1135 else:
1136 label = 'branches.inactive'
1136 label = 'branches.inactive'
1137 notice = _(' (inactive)')
1137 notice = _(' (inactive)')
1138 current = (tag == repo.dirstate.branch())
1138 current = (tag == repo.dirstate.branch())
1139 if current:
1139 if current:
1140 label = 'branches.current'
1140 label = 'branches.current'
1141
1141
1142 fm.startitem()
1142 fm.startitem()
1143 fm.write('branch', '%s', tag, label=label)
1143 fm.write('branch', '%s', tag, label=label)
1144 rev = ctx.rev()
1144 rev = ctx.rev()
1145 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1145 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1146 fmt = ' ' * padsize + ' %d:%s'
1146 fmt = ' ' * padsize + ' %d:%s'
1147 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1147 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1148 label='log.changeset changeset.%s' % ctx.phasestr())
1148 label='log.changeset changeset.%s' % ctx.phasestr())
1149 fm.context(ctx=ctx)
1149 fm.context(ctx=ctx)
1150 fm.data(active=isactive, closed=not isopen, current=current)
1150 fm.data(active=isactive, closed=not isopen, current=current)
1151 if not ui.quiet:
1151 if not ui.quiet:
1152 fm.plain(notice)
1152 fm.plain(notice)
1153 fm.plain('\n')
1153 fm.plain('\n')
1154 fm.end()
1154 fm.end()
1155
1155
1156 @command('bundle',
1156 @command('bundle',
1157 [('f', 'force', None, _('run even when the destination is unrelated')),
1157 [('f', 'force', None, _('run even when the destination is unrelated')),
1158 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1158 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1159 _('REV')),
1159 _('REV')),
1160 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1160 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1161 _('BRANCH')),
1161 _('BRANCH')),
1162 ('', 'base', [],
1162 ('', 'base', [],
1163 _('a base changeset assumed to be available at the destination'),
1163 _('a base changeset assumed to be available at the destination'),
1164 _('REV')),
1164 _('REV')),
1165 ('a', 'all', None, _('bundle all changesets in the repository')),
1165 ('a', 'all', None, _('bundle all changesets in the repository')),
1166 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1166 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1167 ] + remoteopts,
1167 ] + remoteopts,
1168 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1168 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1169 def bundle(ui, repo, fname, dest=None, **opts):
1169 def bundle(ui, repo, fname, dest=None, **opts):
1170 """create a bundle file
1170 """create a bundle file
1171
1171
1172 Generate a bundle file containing data to be transferred to another
1172 Generate a bundle file containing data to be transferred to another
1173 repository.
1173 repository.
1174
1174
1175 To create a bundle containing all changesets, use -a/--all
1175 To create a bundle containing all changesets, use -a/--all
1176 (or --base null). Otherwise, hg assumes the destination will have
1176 (or --base null). Otherwise, hg assumes the destination will have
1177 all the nodes you specify with --base parameters. Otherwise, hg
1177 all the nodes you specify with --base parameters. Otherwise, hg
1178 will assume the repository has all the nodes in destination, or
1178 will assume the repository has all the nodes in destination, or
1179 default-push/default if no destination is specified, where destination
1179 default-push/default if no destination is specified, where destination
1180 is the repository you provide through DEST option.
1180 is the repository you provide through DEST option.
1181
1181
1182 You can change bundle format with the -t/--type option. See
1182 You can change bundle format with the -t/--type option. See
1183 :hg:`help bundlespec` for documentation on this format. By default,
1183 :hg:`help bundlespec` for documentation on this format. By default,
1184 the most appropriate format is used and compression defaults to
1184 the most appropriate format is used and compression defaults to
1185 bzip2.
1185 bzip2.
1186
1186
1187 The bundle file can then be transferred using conventional means
1187 The bundle file can then be transferred using conventional means
1188 and applied to another repository with the unbundle or pull
1188 and applied to another repository with the unbundle or pull
1189 command. This is useful when direct push and pull are not
1189 command. This is useful when direct push and pull are not
1190 available or when exporting an entire repository is undesirable.
1190 available or when exporting an entire repository is undesirable.
1191
1191
1192 Applying bundles preserves all changeset contents including
1192 Applying bundles preserves all changeset contents including
1193 permissions, copy/rename information, and revision history.
1193 permissions, copy/rename information, and revision history.
1194
1194
1195 Returns 0 on success, 1 if no changes found.
1195 Returns 0 on success, 1 if no changes found.
1196 """
1196 """
1197 opts = pycompat.byteskwargs(opts)
1197 opts = pycompat.byteskwargs(opts)
1198 revs = None
1198 revs = None
1199 if 'rev' in opts:
1199 if 'rev' in opts:
1200 revstrings = opts['rev']
1200 revstrings = opts['rev']
1201 revs = scmutil.revrange(repo, revstrings)
1201 revs = scmutil.revrange(repo, revstrings)
1202 if revstrings and not revs:
1202 if revstrings and not revs:
1203 raise error.Abort(_('no commits to bundle'))
1203 raise error.Abort(_('no commits to bundle'))
1204
1204
1205 bundletype = opts.get('type', 'bzip2').lower()
1205 bundletype = opts.get('type', 'bzip2').lower()
1206 try:
1206 try:
1207 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1207 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1208 except error.UnsupportedBundleSpecification as e:
1208 except error.UnsupportedBundleSpecification as e:
1209 raise error.Abort(pycompat.bytestr(e),
1209 raise error.Abort(pycompat.bytestr(e),
1210 hint=_("see 'hg help bundlespec' for supported "
1210 hint=_("see 'hg help bundlespec' for supported "
1211 "values for --type"))
1211 "values for --type"))
1212 cgversion = bundlespec.contentopts["cg.version"]
1212 cgversion = bundlespec.contentopts["cg.version"]
1213
1213
1214 # Packed bundles are a pseudo bundle format for now.
1214 # Packed bundles are a pseudo bundle format for now.
1215 if cgversion == 's1':
1215 if cgversion == 's1':
1216 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1216 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1217 hint=_("use 'hg debugcreatestreamclonebundle'"))
1217 hint=_("use 'hg debugcreatestreamclonebundle'"))
1218
1218
1219 if opts.get('all'):
1219 if opts.get('all'):
1220 if dest:
1220 if dest:
1221 raise error.Abort(_("--all is incompatible with specifying "
1221 raise error.Abort(_("--all is incompatible with specifying "
1222 "a destination"))
1222 "a destination"))
1223 if opts.get('base'):
1223 if opts.get('base'):
1224 ui.warn(_("ignoring --base because --all was specified\n"))
1224 ui.warn(_("ignoring --base because --all was specified\n"))
1225 base = ['null']
1225 base = ['null']
1226 else:
1226 else:
1227 base = scmutil.revrange(repo, opts.get('base'))
1227 base = scmutil.revrange(repo, opts.get('base'))
1228 if cgversion not in changegroup.supportedoutgoingversions(repo):
1228 if cgversion not in changegroup.supportedoutgoingversions(repo):
1229 raise error.Abort(_("repository does not support bundle version %s") %
1229 raise error.Abort(_("repository does not support bundle version %s") %
1230 cgversion)
1230 cgversion)
1231
1231
1232 if base:
1232 if base:
1233 if dest:
1233 if dest:
1234 raise error.Abort(_("--base is incompatible with specifying "
1234 raise error.Abort(_("--base is incompatible with specifying "
1235 "a destination"))
1235 "a destination"))
1236 common = [repo[rev].node() for rev in base]
1236 common = [repo[rev].node() for rev in base]
1237 heads = [repo[r].node() for r in revs] if revs else None
1237 heads = [repo[r].node() for r in revs] if revs else None
1238 outgoing = discovery.outgoing(repo, common, heads)
1238 outgoing = discovery.outgoing(repo, common, heads)
1239 else:
1239 else:
1240 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1240 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1241 dest, branches = hg.parseurl(dest, opts.get('branch'))
1241 dest, branches = hg.parseurl(dest, opts.get('branch'))
1242 other = hg.peer(repo, opts, dest)
1242 other = hg.peer(repo, opts, dest)
1243 revs = [repo[r].hex() for r in revs]
1243 revs = [repo[r].hex() for r in revs]
1244 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1244 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1245 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1245 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1246 outgoing = discovery.findcommonoutgoing(repo, other,
1246 outgoing = discovery.findcommonoutgoing(repo, other,
1247 onlyheads=heads,
1247 onlyheads=heads,
1248 force=opts.get('force'),
1248 force=opts.get('force'),
1249 portable=True)
1249 portable=True)
1250
1250
1251 if not outgoing.missing:
1251 if not outgoing.missing:
1252 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1252 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1253 return 1
1253 return 1
1254
1254
1255 if cgversion == '01': #bundle1
1255 if cgversion == '01': #bundle1
1256 bversion = 'HG10' + bundlespec.wirecompression
1256 bversion = 'HG10' + bundlespec.wirecompression
1257 bcompression = None
1257 bcompression = None
1258 elif cgversion in ('02', '03'):
1258 elif cgversion in ('02', '03'):
1259 bversion = 'HG20'
1259 bversion = 'HG20'
1260 bcompression = bundlespec.wirecompression
1260 bcompression = bundlespec.wirecompression
1261 else:
1261 else:
1262 raise error.ProgrammingError(
1262 raise error.ProgrammingError(
1263 'bundle: unexpected changegroup version %s' % cgversion)
1263 'bundle: unexpected changegroup version %s' % cgversion)
1264
1264
1265 # TODO compression options should be derived from bundlespec parsing.
1265 # TODO compression options should be derived from bundlespec parsing.
1266 # This is a temporary hack to allow adjusting bundle compression
1266 # This is a temporary hack to allow adjusting bundle compression
1267 # level without a) formalizing the bundlespec changes to declare it
1267 # level without a) formalizing the bundlespec changes to declare it
1268 # b) introducing a command flag.
1268 # b) introducing a command flag.
1269 compopts = {}
1269 compopts = {}
1270 complevel = ui.configint('experimental',
1270 complevel = ui.configint('experimental',
1271 'bundlecomplevel.' + bundlespec.compression)
1271 'bundlecomplevel.' + bundlespec.compression)
1272 if complevel is None:
1272 if complevel is None:
1273 complevel = ui.configint('experimental', 'bundlecomplevel')
1273 complevel = ui.configint('experimental', 'bundlecomplevel')
1274 if complevel is not None:
1274 if complevel is not None:
1275 compopts['level'] = complevel
1275 compopts['level'] = complevel
1276
1276
1277 # Allow overriding the bundling of obsmarker in phases through
1277 # Allow overriding the bundling of obsmarker in phases through
1278 # configuration while we don't have a bundle version that include them
1278 # configuration while we don't have a bundle version that include them
1279 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1279 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1280 bundlespec.contentopts['obsolescence'] = True
1280 bundlespec.contentopts['obsolescence'] = True
1281 if repo.ui.configbool('experimental', 'bundle-phases'):
1281 if repo.ui.configbool('experimental', 'bundle-phases'):
1282 bundlespec.contentopts['phases'] = True
1282 bundlespec.contentopts['phases'] = True
1283
1283
1284 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1284 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1285 bundlespec.contentopts, compression=bcompression,
1285 bundlespec.contentopts, compression=bcompression,
1286 compopts=compopts)
1286 compopts=compopts)
1287
1287
1288 @command('cat',
1288 @command('cat',
1289 [('o', 'output', '',
1289 [('o', 'output', '',
1290 _('print output to file with formatted name'), _('FORMAT')),
1290 _('print output to file with formatted name'), _('FORMAT')),
1291 ('r', 'rev', '', _('print the given revision'), _('REV')),
1291 ('r', 'rev', '', _('print the given revision'), _('REV')),
1292 ('', 'decode', None, _('apply any matching decode filter')),
1292 ('', 'decode', None, _('apply any matching decode filter')),
1293 ] + walkopts + formatteropts,
1293 ] + walkopts + formatteropts,
1294 _('[OPTION]... FILE...'),
1294 _('[OPTION]... FILE...'),
1295 inferrepo=True,
1295 inferrepo=True,
1296 intents={INTENT_READONLY})
1296 intents={INTENT_READONLY})
1297 def cat(ui, repo, file1, *pats, **opts):
1297 def cat(ui, repo, file1, *pats, **opts):
1298 """output the current or given revision of files
1298 """output the current or given revision of files
1299
1299
1300 Print the specified files as they were at the given revision. If
1300 Print the specified files as they were at the given revision. If
1301 no revision is given, the parent of the working directory is used.
1301 no revision is given, the parent of the working directory is used.
1302
1302
1303 Output may be to a file, in which case the name of the file is
1303 Output may be to a file, in which case the name of the file is
1304 given using a template string. See :hg:`help templates`. In addition
1304 given using a template string. See :hg:`help templates`. In addition
1305 to the common template keywords, the following formatting rules are
1305 to the common template keywords, the following formatting rules are
1306 supported:
1306 supported:
1307
1307
1308 :``%%``: literal "%" character
1308 :``%%``: literal "%" character
1309 :``%s``: basename of file being printed
1309 :``%s``: basename of file being printed
1310 :``%d``: dirname of file being printed, or '.' if in repository root
1310 :``%d``: dirname of file being printed, or '.' if in repository root
1311 :``%p``: root-relative path name of file being printed
1311 :``%p``: root-relative path name of file being printed
1312 :``%H``: changeset hash (40 hexadecimal digits)
1312 :``%H``: changeset hash (40 hexadecimal digits)
1313 :``%R``: changeset revision number
1313 :``%R``: changeset revision number
1314 :``%h``: short-form changeset hash (12 hexadecimal digits)
1314 :``%h``: short-form changeset hash (12 hexadecimal digits)
1315 :``%r``: zero-padded changeset revision number
1315 :``%r``: zero-padded changeset revision number
1316 :``%b``: basename of the exporting repository
1316 :``%b``: basename of the exporting repository
1317 :``\\``: literal "\\" character
1317 :``\\``: literal "\\" character
1318
1318
1319 Returns 0 on success.
1319 Returns 0 on success.
1320 """
1320 """
1321 opts = pycompat.byteskwargs(opts)
1321 opts = pycompat.byteskwargs(opts)
1322 rev = opts.get('rev')
1322 rev = opts.get('rev')
1323 if rev:
1323 if rev:
1324 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1324 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1325 ctx = scmutil.revsingle(repo, rev)
1325 ctx = scmutil.revsingle(repo, rev)
1326 m = scmutil.match(ctx, (file1,) + pats, opts)
1326 m = scmutil.match(ctx, (file1,) + pats, opts)
1327 fntemplate = opts.pop('output', '')
1327 fntemplate = opts.pop('output', '')
1328 if cmdutil.isstdiofilename(fntemplate):
1328 if cmdutil.isstdiofilename(fntemplate):
1329 fntemplate = ''
1329 fntemplate = ''
1330
1330
1331 if fntemplate:
1331 if fntemplate:
1332 fm = formatter.nullformatter(ui, 'cat', opts)
1332 fm = formatter.nullformatter(ui, 'cat', opts)
1333 else:
1333 else:
1334 ui.pager('cat')
1334 ui.pager('cat')
1335 fm = ui.formatter('cat', opts)
1335 fm = ui.formatter('cat', opts)
1336 with fm:
1336 with fm:
1337 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1337 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1338 **pycompat.strkwargs(opts))
1338 **pycompat.strkwargs(opts))
1339
1339
1340 @command('^clone',
1340 @command('^clone',
1341 [('U', 'noupdate', None, _('the clone will include an empty working '
1341 [('U', 'noupdate', None, _('the clone will include an empty working '
1342 'directory (only a repository)')),
1342 'directory (only a repository)')),
1343 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1343 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1344 _('REV')),
1344 _('REV')),
1345 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1345 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1346 ' and its ancestors'), _('REV')),
1346 ' and its ancestors'), _('REV')),
1347 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1347 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1348 ' changesets and their ancestors'), _('BRANCH')),
1348 ' changesets and their ancestors'), _('BRANCH')),
1349 ('', 'pull', None, _('use pull protocol to copy metadata')),
1349 ('', 'pull', None, _('use pull protocol to copy metadata')),
1350 ('', 'uncompressed', None,
1350 ('', 'uncompressed', None,
1351 _('an alias to --stream (DEPRECATED)')),
1351 _('an alias to --stream (DEPRECATED)')),
1352 ('', 'stream', None,
1352 ('', 'stream', None,
1353 _('clone with minimal data processing')),
1353 _('clone with minimal data processing')),
1354 ] + remoteopts,
1354 ] + remoteopts,
1355 _('[OPTION]... SOURCE [DEST]'),
1355 _('[OPTION]... SOURCE [DEST]'),
1356 norepo=True)
1356 norepo=True)
1357 def clone(ui, source, dest=None, **opts):
1357 def clone(ui, source, dest=None, **opts):
1358 """make a copy of an existing repository
1358 """make a copy of an existing repository
1359
1359
1360 Create a copy of an existing repository in a new directory.
1360 Create a copy of an existing repository in a new directory.
1361
1361
1362 If no destination directory name is specified, it defaults to the
1362 If no destination directory name is specified, it defaults to the
1363 basename of the source.
1363 basename of the source.
1364
1364
1365 The location of the source is added to the new repository's
1365 The location of the source is added to the new repository's
1366 ``.hg/hgrc`` file, as the default to be used for future pulls.
1366 ``.hg/hgrc`` file, as the default to be used for future pulls.
1367
1367
1368 Only local paths and ``ssh://`` URLs are supported as
1368 Only local paths and ``ssh://`` URLs are supported as
1369 destinations. For ``ssh://`` destinations, no working directory or
1369 destinations. For ``ssh://`` destinations, no working directory or
1370 ``.hg/hgrc`` will be created on the remote side.
1370 ``.hg/hgrc`` will be created on the remote side.
1371
1371
1372 If the source repository has a bookmark called '@' set, that
1372 If the source repository has a bookmark called '@' set, that
1373 revision will be checked out in the new repository by default.
1373 revision will be checked out in the new repository by default.
1374
1374
1375 To check out a particular version, use -u/--update, or
1375 To check out a particular version, use -u/--update, or
1376 -U/--noupdate to create a clone with no working directory.
1376 -U/--noupdate to create a clone with no working directory.
1377
1377
1378 To pull only a subset of changesets, specify one or more revisions
1378 To pull only a subset of changesets, specify one or more revisions
1379 identifiers with -r/--rev or branches with -b/--branch. The
1379 identifiers with -r/--rev or branches with -b/--branch. The
1380 resulting clone will contain only the specified changesets and
1380 resulting clone will contain only the specified changesets and
1381 their ancestors. These options (or 'clone src#rev dest') imply
1381 their ancestors. These options (or 'clone src#rev dest') imply
1382 --pull, even for local source repositories.
1382 --pull, even for local source repositories.
1383
1383
1384 In normal clone mode, the remote normalizes repository data into a common
1384 In normal clone mode, the remote normalizes repository data into a common
1385 exchange format and the receiving end translates this data into its local
1385 exchange format and the receiving end translates this data into its local
1386 storage format. --stream activates a different clone mode that essentially
1386 storage format. --stream activates a different clone mode that essentially
1387 copies repository files from the remote with minimal data processing. This
1387 copies repository files from the remote with minimal data processing. This
1388 significantly reduces the CPU cost of a clone both remotely and locally.
1388 significantly reduces the CPU cost of a clone both remotely and locally.
1389 However, it often increases the transferred data size by 30-40%. This can
1389 However, it often increases the transferred data size by 30-40%. This can
1390 result in substantially faster clones where I/O throughput is plentiful,
1390 result in substantially faster clones where I/O throughput is plentiful,
1391 especially for larger repositories. A side-effect of --stream clones is
1391 especially for larger repositories. A side-effect of --stream clones is
1392 that storage settings and requirements on the remote are applied locally:
1392 that storage settings and requirements on the remote are applied locally:
1393 a modern client may inherit legacy or inefficient storage used by the
1393 a modern client may inherit legacy or inefficient storage used by the
1394 remote or a legacy Mercurial client may not be able to clone from a
1394 remote or a legacy Mercurial client may not be able to clone from a
1395 modern Mercurial remote.
1395 modern Mercurial remote.
1396
1396
1397 .. note::
1397 .. note::
1398
1398
1399 Specifying a tag will include the tagged changeset but not the
1399 Specifying a tag will include the tagged changeset but not the
1400 changeset containing the tag.
1400 changeset containing the tag.
1401
1401
1402 .. container:: verbose
1402 .. container:: verbose
1403
1403
1404 For efficiency, hardlinks are used for cloning whenever the
1404 For efficiency, hardlinks are used for cloning whenever the
1405 source and destination are on the same filesystem (note this
1405 source and destination are on the same filesystem (note this
1406 applies only to the repository data, not to the working
1406 applies only to the repository data, not to the working
1407 directory). Some filesystems, such as AFS, implement hardlinking
1407 directory). Some filesystems, such as AFS, implement hardlinking
1408 incorrectly, but do not report errors. In these cases, use the
1408 incorrectly, but do not report errors. In these cases, use the
1409 --pull option to avoid hardlinking.
1409 --pull option to avoid hardlinking.
1410
1410
1411 Mercurial will update the working directory to the first applicable
1411 Mercurial will update the working directory to the first applicable
1412 revision from this list:
1412 revision from this list:
1413
1413
1414 a) null if -U or the source repository has no changesets
1414 a) null if -U or the source repository has no changesets
1415 b) if -u . and the source repository is local, the first parent of
1415 b) if -u . and the source repository is local, the first parent of
1416 the source repository's working directory
1416 the source repository's working directory
1417 c) the changeset specified with -u (if a branch name, this means the
1417 c) the changeset specified with -u (if a branch name, this means the
1418 latest head of that branch)
1418 latest head of that branch)
1419 d) the changeset specified with -r
1419 d) the changeset specified with -r
1420 e) the tipmost head specified with -b
1420 e) the tipmost head specified with -b
1421 f) the tipmost head specified with the url#branch source syntax
1421 f) the tipmost head specified with the url#branch source syntax
1422 g) the revision marked with the '@' bookmark, if present
1422 g) the revision marked with the '@' bookmark, if present
1423 h) the tipmost head of the default branch
1423 h) the tipmost head of the default branch
1424 i) tip
1424 i) tip
1425
1425
1426 When cloning from servers that support it, Mercurial may fetch
1426 When cloning from servers that support it, Mercurial may fetch
1427 pre-generated data from a server-advertised URL or inline from the
1427 pre-generated data from a server-advertised URL or inline from the
1428 same stream. When this is done, hooks operating on incoming changesets
1428 same stream. When this is done, hooks operating on incoming changesets
1429 and changegroups may fire more than once, once for each pre-generated
1429 and changegroups may fire more than once, once for each pre-generated
1430 bundle and as well as for any additional remaining data. In addition,
1430 bundle and as well as for any additional remaining data. In addition,
1431 if an error occurs, the repository may be rolled back to a partial
1431 if an error occurs, the repository may be rolled back to a partial
1432 clone. This behavior may change in future releases.
1432 clone. This behavior may change in future releases.
1433 See :hg:`help -e clonebundles` for more.
1433 See :hg:`help -e clonebundles` for more.
1434
1434
1435 Examples:
1435 Examples:
1436
1436
1437 - clone a remote repository to a new directory named hg/::
1437 - clone a remote repository to a new directory named hg/::
1438
1438
1439 hg clone https://www.mercurial-scm.org/repo/hg/
1439 hg clone https://www.mercurial-scm.org/repo/hg/
1440
1440
1441 - create a lightweight local clone::
1441 - create a lightweight local clone::
1442
1442
1443 hg clone project/ project-feature/
1443 hg clone project/ project-feature/
1444
1444
1445 - clone from an absolute path on an ssh server (note double-slash)::
1445 - clone from an absolute path on an ssh server (note double-slash)::
1446
1446
1447 hg clone ssh://user@server//home/projects/alpha/
1447 hg clone ssh://user@server//home/projects/alpha/
1448
1448
1449 - do a streaming clone while checking out a specified version::
1449 - do a streaming clone while checking out a specified version::
1450
1450
1451 hg clone --stream http://server/repo -u 1.5
1451 hg clone --stream http://server/repo -u 1.5
1452
1452
1453 - create a repository without changesets after a particular revision::
1453 - create a repository without changesets after a particular revision::
1454
1454
1455 hg clone -r 04e544 experimental/ good/
1455 hg clone -r 04e544 experimental/ good/
1456
1456
1457 - clone (and track) a particular named branch::
1457 - clone (and track) a particular named branch::
1458
1458
1459 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1459 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1460
1460
1461 See :hg:`help urls` for details on specifying URLs.
1461 See :hg:`help urls` for details on specifying URLs.
1462
1462
1463 Returns 0 on success.
1463 Returns 0 on success.
1464 """
1464 """
1465 opts = pycompat.byteskwargs(opts)
1465 opts = pycompat.byteskwargs(opts)
1466 if opts.get('noupdate') and opts.get('updaterev'):
1466 if opts.get('noupdate') and opts.get('updaterev'):
1467 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1467 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1468
1468
1469 r = hg.clone(ui, opts, source, dest,
1469 r = hg.clone(ui, opts, source, dest,
1470 pull=opts.get('pull'),
1470 pull=opts.get('pull'),
1471 stream=opts.get('stream') or opts.get('uncompressed'),
1471 stream=opts.get('stream') or opts.get('uncompressed'),
1472 revs=opts.get('rev'),
1472 revs=opts.get('rev'),
1473 update=opts.get('updaterev') or not opts.get('noupdate'),
1473 update=opts.get('updaterev') or not opts.get('noupdate'),
1474 branch=opts.get('branch'),
1474 branch=opts.get('branch'),
1475 shareopts=opts.get('shareopts'))
1475 shareopts=opts.get('shareopts'))
1476
1476
1477 return r is None
1477 return r is None
1478
1478
1479 @command('^commit|ci',
1479 @command('^commit|ci',
1480 [('A', 'addremove', None,
1480 [('A', 'addremove', None,
1481 _('mark new/missing files as added/removed before committing')),
1481 _('mark new/missing files as added/removed before committing')),
1482 ('', 'close-branch', None,
1482 ('', 'close-branch', None,
1483 _('mark a branch head as closed')),
1483 _('mark a branch head as closed')),
1484 ('', 'amend', None, _('amend the parent of the working directory')),
1484 ('', 'amend', None, _('amend the parent of the working directory')),
1485 ('s', 'secret', None, _('use the secret phase for committing')),
1485 ('s', 'secret', None, _('use the secret phase for committing')),
1486 ('e', 'edit', None, _('invoke editor on commit messages')),
1486 ('e', 'edit', None, _('invoke editor on commit messages')),
1487 ('i', 'interactive', None, _('use interactive mode')),
1487 ('i', 'interactive', None, _('use interactive mode')),
1488 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1488 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1489 _('[OPTION]... [FILE]...'),
1489 _('[OPTION]... [FILE]...'),
1490 inferrepo=True)
1490 inferrepo=True)
1491 def commit(ui, repo, *pats, **opts):
1491 def commit(ui, repo, *pats, **opts):
1492 """commit the specified files or all outstanding changes
1492 """commit the specified files or all outstanding changes
1493
1493
1494 Commit changes to the given files into the repository. Unlike a
1494 Commit changes to the given files into the repository. Unlike a
1495 centralized SCM, this operation is a local operation. See
1495 centralized SCM, this operation is a local operation. See
1496 :hg:`push` for a way to actively distribute your changes.
1496 :hg:`push` for a way to actively distribute your changes.
1497
1497
1498 If a list of files is omitted, all changes reported by :hg:`status`
1498 If a list of files is omitted, all changes reported by :hg:`status`
1499 will be committed.
1499 will be committed.
1500
1500
1501 If you are committing the result of a merge, do not provide any
1501 If you are committing the result of a merge, do not provide any
1502 filenames or -I/-X filters.
1502 filenames or -I/-X filters.
1503
1503
1504 If no commit message is specified, Mercurial starts your
1504 If no commit message is specified, Mercurial starts your
1505 configured editor where you can enter a message. In case your
1505 configured editor where you can enter a message. In case your
1506 commit fails, you will find a backup of your message in
1506 commit fails, you will find a backup of your message in
1507 ``.hg/last-message.txt``.
1507 ``.hg/last-message.txt``.
1508
1508
1509 The --close-branch flag can be used to mark the current branch
1509 The --close-branch flag can be used to mark the current branch
1510 head closed. When all heads of a branch are closed, the branch
1510 head closed. When all heads of a branch are closed, the branch
1511 will be considered closed and no longer listed.
1511 will be considered closed and no longer listed.
1512
1512
1513 The --amend flag can be used to amend the parent of the
1513 The --amend flag can be used to amend the parent of the
1514 working directory with a new commit that contains the changes
1514 working directory with a new commit that contains the changes
1515 in the parent in addition to those currently reported by :hg:`status`,
1515 in the parent in addition to those currently reported by :hg:`status`,
1516 if there are any. The old commit is stored in a backup bundle in
1516 if there are any. The old commit is stored in a backup bundle in
1517 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1517 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1518 on how to restore it).
1518 on how to restore it).
1519
1519
1520 Message, user and date are taken from the amended commit unless
1520 Message, user and date are taken from the amended commit unless
1521 specified. When a message isn't specified on the command line,
1521 specified. When a message isn't specified on the command line,
1522 the editor will open with the message of the amended commit.
1522 the editor will open with the message of the amended commit.
1523
1523
1524 It is not possible to amend public changesets (see :hg:`help phases`)
1524 It is not possible to amend public changesets (see :hg:`help phases`)
1525 or changesets that have children.
1525 or changesets that have children.
1526
1526
1527 See :hg:`help dates` for a list of formats valid for -d/--date.
1527 See :hg:`help dates` for a list of formats valid for -d/--date.
1528
1528
1529 Returns 0 on success, 1 if nothing changed.
1529 Returns 0 on success, 1 if nothing changed.
1530
1530
1531 .. container:: verbose
1531 .. container:: verbose
1532
1532
1533 Examples:
1533 Examples:
1534
1534
1535 - commit all files ending in .py::
1535 - commit all files ending in .py::
1536
1536
1537 hg commit --include "set:**.py"
1537 hg commit --include "set:**.py"
1538
1538
1539 - commit all non-binary files::
1539 - commit all non-binary files::
1540
1540
1541 hg commit --exclude "set:binary()"
1541 hg commit --exclude "set:binary()"
1542
1542
1543 - amend the current commit and set the date to now::
1543 - amend the current commit and set the date to now::
1544
1544
1545 hg commit --amend --date now
1545 hg commit --amend --date now
1546 """
1546 """
1547 with repo.wlock(), repo.lock():
1547 with repo.wlock(), repo.lock():
1548 return _docommit(ui, repo, *pats, **opts)
1548 return _docommit(ui, repo, *pats, **opts)
1549
1549
1550 def _docommit(ui, repo, *pats, **opts):
1550 def _docommit(ui, repo, *pats, **opts):
1551 if opts.get(r'interactive'):
1551 if opts.get(r'interactive'):
1552 opts.pop(r'interactive')
1552 opts.pop(r'interactive')
1553 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1553 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1554 cmdutil.recordfilter, *pats,
1554 cmdutil.recordfilter, *pats,
1555 **opts)
1555 **opts)
1556 # ret can be 0 (no changes to record) or the value returned by
1556 # ret can be 0 (no changes to record) or the value returned by
1557 # commit(), 1 if nothing changed or None on success.
1557 # commit(), 1 if nothing changed or None on success.
1558 return 1 if ret == 0 else ret
1558 return 1 if ret == 0 else ret
1559
1559
1560 opts = pycompat.byteskwargs(opts)
1560 opts = pycompat.byteskwargs(opts)
1561 if opts.get('subrepos'):
1561 if opts.get('subrepos'):
1562 if opts.get('amend'):
1562 if opts.get('amend'):
1563 raise error.Abort(_('cannot amend with --subrepos'))
1563 raise error.Abort(_('cannot amend with --subrepos'))
1564 # Let --subrepos on the command line override config setting.
1564 # Let --subrepos on the command line override config setting.
1565 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1565 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1566
1566
1567 cmdutil.checkunfinished(repo, commit=True)
1567 cmdutil.checkunfinished(repo, commit=True)
1568
1568
1569 branch = repo[None].branch()
1569 branch = repo[None].branch()
1570 bheads = repo.branchheads(branch)
1570 bheads = repo.branchheads(branch)
1571
1571
1572 extra = {}
1572 extra = {}
1573 if opts.get('close_branch'):
1573 if opts.get('close_branch'):
1574 extra['close'] = '1'
1574 extra['close'] = '1'
1575
1575
1576 if not bheads:
1576 if not bheads:
1577 raise error.Abort(_('can only close branch heads'))
1577 raise error.Abort(_('can only close branch heads'))
1578 elif opts.get('amend'):
1578 elif opts.get('amend'):
1579 if repo[None].parents()[0].p1().branch() != branch and \
1579 if repo[None].parents()[0].p1().branch() != branch and \
1580 repo[None].parents()[0].p2().branch() != branch:
1580 repo[None].parents()[0].p2().branch() != branch:
1581 raise error.Abort(_('can only close branch heads'))
1581 raise error.Abort(_('can only close branch heads'))
1582
1582
1583 if opts.get('amend'):
1583 if opts.get('amend'):
1584 if ui.configbool('ui', 'commitsubrepos'):
1584 if ui.configbool('ui', 'commitsubrepos'):
1585 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1585 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1586
1586
1587 old = repo['.']
1587 old = repo['.']
1588 rewriteutil.precheck(repo, [old.rev()], 'amend')
1588 rewriteutil.precheck(repo, [old.rev()], 'amend')
1589
1589
1590 # Currently histedit gets confused if an amend happens while histedit
1590 # Currently histedit gets confused if an amend happens while histedit
1591 # is in progress. Since we have a checkunfinished command, we are
1591 # is in progress. Since we have a checkunfinished command, we are
1592 # temporarily honoring it.
1592 # temporarily honoring it.
1593 #
1593 #
1594 # Note: eventually this guard will be removed. Please do not expect
1594 # Note: eventually this guard will be removed. Please do not expect
1595 # this behavior to remain.
1595 # this behavior to remain.
1596 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1596 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1597 cmdutil.checkunfinished(repo)
1597 cmdutil.checkunfinished(repo)
1598
1598
1599 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1599 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1600 if node == old.node():
1600 if node == old.node():
1601 ui.status(_("nothing changed\n"))
1601 ui.status(_("nothing changed\n"))
1602 return 1
1602 return 1
1603 else:
1603 else:
1604 def commitfunc(ui, repo, message, match, opts):
1604 def commitfunc(ui, repo, message, match, opts):
1605 overrides = {}
1605 overrides = {}
1606 if opts.get('secret'):
1606 if opts.get('secret'):
1607 overrides[('phases', 'new-commit')] = 'secret'
1607 overrides[('phases', 'new-commit')] = 'secret'
1608
1608
1609 baseui = repo.baseui
1609 baseui = repo.baseui
1610 with baseui.configoverride(overrides, 'commit'):
1610 with baseui.configoverride(overrides, 'commit'):
1611 with ui.configoverride(overrides, 'commit'):
1611 with ui.configoverride(overrides, 'commit'):
1612 editform = cmdutil.mergeeditform(repo[None],
1612 editform = cmdutil.mergeeditform(repo[None],
1613 'commit.normal')
1613 'commit.normal')
1614 editor = cmdutil.getcommiteditor(
1614 editor = cmdutil.getcommiteditor(
1615 editform=editform, **pycompat.strkwargs(opts))
1615 editform=editform, **pycompat.strkwargs(opts))
1616 return repo.commit(message,
1616 return repo.commit(message,
1617 opts.get('user'),
1617 opts.get('user'),
1618 opts.get('date'),
1618 opts.get('date'),
1619 match,
1619 match,
1620 editor=editor,
1620 editor=editor,
1621 extra=extra)
1621 extra=extra)
1622
1622
1623 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1623 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1624
1624
1625 if not node:
1625 if not node:
1626 stat = cmdutil.postcommitstatus(repo, pats, opts)
1626 stat = cmdutil.postcommitstatus(repo, pats, opts)
1627 if stat[3]:
1627 if stat[3]:
1628 ui.status(_("nothing changed (%d missing files, see "
1628 ui.status(_("nothing changed (%d missing files, see "
1629 "'hg status')\n") % len(stat[3]))
1629 "'hg status')\n") % len(stat[3]))
1630 else:
1630 else:
1631 ui.status(_("nothing changed\n"))
1631 ui.status(_("nothing changed\n"))
1632 return 1
1632 return 1
1633
1633
1634 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1634 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1635
1635
1636 @command('config|showconfig|debugconfig',
1636 @command('config|showconfig|debugconfig',
1637 [('u', 'untrusted', None, _('show untrusted configuration options')),
1637 [('u', 'untrusted', None, _('show untrusted configuration options')),
1638 ('e', 'edit', None, _('edit user config')),
1638 ('e', 'edit', None, _('edit user config')),
1639 ('l', 'local', None, _('edit repository config')),
1639 ('l', 'local', None, _('edit repository config')),
1640 ('g', 'global', None, _('edit global config'))] + formatteropts,
1640 ('g', 'global', None, _('edit global config'))] + formatteropts,
1641 _('[-u] [NAME]...'),
1641 _('[-u] [NAME]...'),
1642 optionalrepo=True,
1642 optionalrepo=True,
1643 intents={INTENT_READONLY})
1643 intents={INTENT_READONLY})
1644 def config(ui, repo, *values, **opts):
1644 def config(ui, repo, *values, **opts):
1645 """show combined config settings from all hgrc files
1645 """show combined config settings from all hgrc files
1646
1646
1647 With no arguments, print names and values of all config items.
1647 With no arguments, print names and values of all config items.
1648
1648
1649 With one argument of the form section.name, print just the value
1649 With one argument of the form section.name, print just the value
1650 of that config item.
1650 of that config item.
1651
1651
1652 With multiple arguments, print names and values of all config
1652 With multiple arguments, print names and values of all config
1653 items with matching section names or section.names.
1653 items with matching section names or section.names.
1654
1654
1655 With --edit, start an editor on the user-level config file. With
1655 With --edit, start an editor on the user-level config file. With
1656 --global, edit the system-wide config file. With --local, edit the
1656 --global, edit the system-wide config file. With --local, edit the
1657 repository-level config file.
1657 repository-level config file.
1658
1658
1659 With --debug, the source (filename and line number) is printed
1659 With --debug, the source (filename and line number) is printed
1660 for each config item.
1660 for each config item.
1661
1661
1662 See :hg:`help config` for more information about config files.
1662 See :hg:`help config` for more information about config files.
1663
1663
1664 Returns 0 on success, 1 if NAME does not exist.
1664 Returns 0 on success, 1 if NAME does not exist.
1665
1665
1666 """
1666 """
1667
1667
1668 opts = pycompat.byteskwargs(opts)
1668 opts = pycompat.byteskwargs(opts)
1669 if opts.get('edit') or opts.get('local') or opts.get('global'):
1669 if opts.get('edit') or opts.get('local') or opts.get('global'):
1670 if opts.get('local') and opts.get('global'):
1670 if opts.get('local') and opts.get('global'):
1671 raise error.Abort(_("can't use --local and --global together"))
1671 raise error.Abort(_("can't use --local and --global together"))
1672
1672
1673 if opts.get('local'):
1673 if opts.get('local'):
1674 if not repo:
1674 if not repo:
1675 raise error.Abort(_("can't use --local outside a repository"))
1675 raise error.Abort(_("can't use --local outside a repository"))
1676 paths = [repo.vfs.join('hgrc')]
1676 paths = [repo.vfs.join('hgrc')]
1677 elif opts.get('global'):
1677 elif opts.get('global'):
1678 paths = rcutil.systemrcpath()
1678 paths = rcutil.systemrcpath()
1679 else:
1679 else:
1680 paths = rcutil.userrcpath()
1680 paths = rcutil.userrcpath()
1681
1681
1682 for f in paths:
1682 for f in paths:
1683 if os.path.exists(f):
1683 if os.path.exists(f):
1684 break
1684 break
1685 else:
1685 else:
1686 if opts.get('global'):
1686 if opts.get('global'):
1687 samplehgrc = uimod.samplehgrcs['global']
1687 samplehgrc = uimod.samplehgrcs['global']
1688 elif opts.get('local'):
1688 elif opts.get('local'):
1689 samplehgrc = uimod.samplehgrcs['local']
1689 samplehgrc = uimod.samplehgrcs['local']
1690 else:
1690 else:
1691 samplehgrc = uimod.samplehgrcs['user']
1691 samplehgrc = uimod.samplehgrcs['user']
1692
1692
1693 f = paths[0]
1693 f = paths[0]
1694 fp = open(f, "wb")
1694 fp = open(f, "wb")
1695 fp.write(util.tonativeeol(samplehgrc))
1695 fp.write(util.tonativeeol(samplehgrc))
1696 fp.close()
1696 fp.close()
1697
1697
1698 editor = ui.geteditor()
1698 editor = ui.geteditor()
1699 ui.system("%s \"%s\"" % (editor, f),
1699 ui.system("%s \"%s\"" % (editor, f),
1700 onerr=error.Abort, errprefix=_("edit failed"),
1700 onerr=error.Abort, errprefix=_("edit failed"),
1701 blockedtag='config_edit')
1701 blockedtag='config_edit')
1702 return
1702 return
1703 ui.pager('config')
1703 ui.pager('config')
1704 fm = ui.formatter('config', opts)
1704 fm = ui.formatter('config', opts)
1705 for t, f in rcutil.rccomponents():
1705 for t, f in rcutil.rccomponents():
1706 if t == 'path':
1706 if t == 'path':
1707 ui.debug('read config from: %s\n' % f)
1707 ui.debug('read config from: %s\n' % f)
1708 elif t == 'items':
1708 elif t == 'items':
1709 for section, name, value, source in f:
1709 for section, name, value, source in f:
1710 ui.debug('set config by: %s\n' % source)
1710 ui.debug('set config by: %s\n' % source)
1711 else:
1711 else:
1712 raise error.ProgrammingError('unknown rctype: %s' % t)
1712 raise error.ProgrammingError('unknown rctype: %s' % t)
1713 untrusted = bool(opts.get('untrusted'))
1713 untrusted = bool(opts.get('untrusted'))
1714
1714
1715 selsections = selentries = []
1715 selsections = selentries = []
1716 if values:
1716 if values:
1717 selsections = [v for v in values if '.' not in v]
1717 selsections = [v for v in values if '.' not in v]
1718 selentries = [v for v in values if '.' in v]
1718 selentries = [v for v in values if '.' in v]
1719 uniquesel = (len(selentries) == 1 and not selsections)
1719 uniquesel = (len(selentries) == 1 and not selsections)
1720 selsections = set(selsections)
1720 selsections = set(selsections)
1721 selentries = set(selentries)
1721 selentries = set(selentries)
1722
1722
1723 matched = False
1723 matched = False
1724 for section, name, value in ui.walkconfig(untrusted=untrusted):
1724 for section, name, value in ui.walkconfig(untrusted=untrusted):
1725 source = ui.configsource(section, name, untrusted)
1725 source = ui.configsource(section, name, untrusted)
1726 value = pycompat.bytestr(value)
1726 value = pycompat.bytestr(value)
1727 if fm.isplain():
1727 if fm.isplain():
1728 source = source or 'none'
1728 source = source or 'none'
1729 value = value.replace('\n', '\\n')
1729 value = value.replace('\n', '\\n')
1730 entryname = section + '.' + name
1730 entryname = section + '.' + name
1731 if values and not (section in selsections or entryname in selentries):
1731 if values and not (section in selsections or entryname in selentries):
1732 continue
1732 continue
1733 fm.startitem()
1733 fm.startitem()
1734 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1734 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1735 if uniquesel:
1735 if uniquesel:
1736 fm.data(name=entryname)
1736 fm.data(name=entryname)
1737 fm.write('value', '%s\n', value)
1737 fm.write('value', '%s\n', value)
1738 else:
1738 else:
1739 fm.write('name value', '%s=%s\n', entryname, value)
1739 fm.write('name value', '%s=%s\n', entryname, value)
1740 matched = True
1740 matched = True
1741 fm.end()
1741 fm.end()
1742 if matched:
1742 if matched:
1743 return 0
1743 return 0
1744 return 1
1744 return 1
1745
1745
1746 @command('copy|cp',
1746 @command('copy|cp',
1747 [('A', 'after', None, _('record a copy that has already occurred')),
1747 [('A', 'after', None, _('record a copy that has already occurred')),
1748 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1748 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1749 ] + walkopts + dryrunopts,
1749 ] + walkopts + dryrunopts,
1750 _('[OPTION]... [SOURCE]... DEST'))
1750 _('[OPTION]... [SOURCE]... DEST'))
1751 def copy(ui, repo, *pats, **opts):
1751 def copy(ui, repo, *pats, **opts):
1752 """mark files as copied for the next commit
1752 """mark files as copied for the next commit
1753
1753
1754 Mark dest as having copies of source files. If dest is a
1754 Mark dest as having copies of source files. If dest is a
1755 directory, copies are put in that directory. If dest is a file,
1755 directory, copies are put in that directory. If dest is a file,
1756 the source must be a single file.
1756 the source must be a single file.
1757
1757
1758 By default, this command copies the contents of files as they
1758 By default, this command copies the contents of files as they
1759 exist in the working directory. If invoked with -A/--after, the
1759 exist in the working directory. If invoked with -A/--after, the
1760 operation is recorded, but no copying is performed.
1760 operation is recorded, but no copying is performed.
1761
1761
1762 This command takes effect with the next commit. To undo a copy
1762 This command takes effect with the next commit. To undo a copy
1763 before that, see :hg:`revert`.
1763 before that, see :hg:`revert`.
1764
1764
1765 Returns 0 on success, 1 if errors are encountered.
1765 Returns 0 on success, 1 if errors are encountered.
1766 """
1766 """
1767 opts = pycompat.byteskwargs(opts)
1767 opts = pycompat.byteskwargs(opts)
1768 with repo.wlock(False):
1768 with repo.wlock(False):
1769 return cmdutil.copy(ui, repo, pats, opts)
1769 return cmdutil.copy(ui, repo, pats, opts)
1770
1770
1771 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1771 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1772 def debugcommands(ui, cmd='', *args):
1772 def debugcommands(ui, cmd='', *args):
1773 """list all available commands and options"""
1773 """list all available commands and options"""
1774 for cmd, vals in sorted(table.iteritems()):
1774 for cmd, vals in sorted(table.iteritems()):
1775 cmd = cmd.split('|')[0].strip('^')
1775 cmd = cmd.split('|')[0].strip('^')
1776 opts = ', '.join([i[1] for i in vals[1]])
1776 opts = ', '.join([i[1] for i in vals[1]])
1777 ui.write('%s: %s\n' % (cmd, opts))
1777 ui.write('%s: %s\n' % (cmd, opts))
1778
1778
1779 @command('debugcomplete',
1779 @command('debugcomplete',
1780 [('o', 'options', None, _('show the command options'))],
1780 [('o', 'options', None, _('show the command options'))],
1781 _('[-o] CMD'),
1781 _('[-o] CMD'),
1782 norepo=True)
1782 norepo=True)
1783 def debugcomplete(ui, cmd='', **opts):
1783 def debugcomplete(ui, cmd='', **opts):
1784 """returns the completion list associated with the given command"""
1784 """returns the completion list associated with the given command"""
1785
1785
1786 if opts.get(r'options'):
1786 if opts.get(r'options'):
1787 options = []
1787 options = []
1788 otables = [globalopts]
1788 otables = [globalopts]
1789 if cmd:
1789 if cmd:
1790 aliases, entry = cmdutil.findcmd(cmd, table, False)
1790 aliases, entry = cmdutil.findcmd(cmd, table, False)
1791 otables.append(entry[1])
1791 otables.append(entry[1])
1792 for t in otables:
1792 for t in otables:
1793 for o in t:
1793 for o in t:
1794 if "(DEPRECATED)" in o[3]:
1794 if "(DEPRECATED)" in o[3]:
1795 continue
1795 continue
1796 if o[0]:
1796 if o[0]:
1797 options.append('-%s' % o[0])
1797 options.append('-%s' % o[0])
1798 options.append('--%s' % o[1])
1798 options.append('--%s' % o[1])
1799 ui.write("%s\n" % "\n".join(options))
1799 ui.write("%s\n" % "\n".join(options))
1800 return
1800 return
1801
1801
1802 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1802 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1803 if ui.verbose:
1803 if ui.verbose:
1804 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1804 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1805 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1805 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1806
1806
1807 @command('^diff',
1807 @command('^diff',
1808 [('r', 'rev', [], _('revision'), _('REV')),
1808 [('r', 'rev', [], _('revision'), _('REV')),
1809 ('c', 'change', '', _('change made by revision'), _('REV'))
1809 ('c', 'change', '', _('change made by revision'), _('REV'))
1810 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1810 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1811 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1811 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1812 inferrepo=True,
1812 inferrepo=True,
1813 intents={INTENT_READONLY})
1813 intents={INTENT_READONLY})
1814 def diff(ui, repo, *pats, **opts):
1814 def diff(ui, repo, *pats, **opts):
1815 """diff repository (or selected files)
1815 """diff repository (or selected files)
1816
1816
1817 Show differences between revisions for the specified files.
1817 Show differences between revisions for the specified files.
1818
1818
1819 Differences between files are shown using the unified diff format.
1819 Differences between files are shown using the unified diff format.
1820
1820
1821 .. note::
1821 .. note::
1822
1822
1823 :hg:`diff` may generate unexpected results for merges, as it will
1823 :hg:`diff` may generate unexpected results for merges, as it will
1824 default to comparing against the working directory's first
1824 default to comparing against the working directory's first
1825 parent changeset if no revisions are specified.
1825 parent changeset if no revisions are specified.
1826
1826
1827 When two revision arguments are given, then changes are shown
1827 When two revision arguments are given, then changes are shown
1828 between those revisions. If only one revision is specified then
1828 between those revisions. If only one revision is specified then
1829 that revision is compared to the working directory, and, when no
1829 that revision is compared to the working directory, and, when no
1830 revisions are specified, the working directory files are compared
1830 revisions are specified, the working directory files are compared
1831 to its first parent.
1831 to its first parent.
1832
1832
1833 Alternatively you can specify -c/--change with a revision to see
1833 Alternatively you can specify -c/--change with a revision to see
1834 the changes in that changeset relative to its first parent.
1834 the changes in that changeset relative to its first parent.
1835
1835
1836 Without the -a/--text option, diff will avoid generating diffs of
1836 Without the -a/--text option, diff will avoid generating diffs of
1837 files it detects as binary. With -a, diff will generate a diff
1837 files it detects as binary. With -a, diff will generate a diff
1838 anyway, probably with undesirable results.
1838 anyway, probably with undesirable results.
1839
1839
1840 Use the -g/--git option to generate diffs in the git extended diff
1840 Use the -g/--git option to generate diffs in the git extended diff
1841 format. For more information, read :hg:`help diffs`.
1841 format. For more information, read :hg:`help diffs`.
1842
1842
1843 .. container:: verbose
1843 .. container:: verbose
1844
1844
1845 Examples:
1845 Examples:
1846
1846
1847 - compare a file in the current working directory to its parent::
1847 - compare a file in the current working directory to its parent::
1848
1848
1849 hg diff foo.c
1849 hg diff foo.c
1850
1850
1851 - compare two historical versions of a directory, with rename info::
1851 - compare two historical versions of a directory, with rename info::
1852
1852
1853 hg diff --git -r 1.0:1.2 lib/
1853 hg diff --git -r 1.0:1.2 lib/
1854
1854
1855 - get change stats relative to the last change on some date::
1855 - get change stats relative to the last change on some date::
1856
1856
1857 hg diff --stat -r "date('may 2')"
1857 hg diff --stat -r "date('may 2')"
1858
1858
1859 - diff all newly-added files that contain a keyword::
1859 - diff all newly-added files that contain a keyword::
1860
1860
1861 hg diff "set:added() and grep(GNU)"
1861 hg diff "set:added() and grep(GNU)"
1862
1862
1863 - compare a revision and its parents::
1863 - compare a revision and its parents::
1864
1864
1865 hg diff -c 9353 # compare against first parent
1865 hg diff -c 9353 # compare against first parent
1866 hg diff -r 9353^:9353 # same using revset syntax
1866 hg diff -r 9353^:9353 # same using revset syntax
1867 hg diff -r 9353^2:9353 # compare against the second parent
1867 hg diff -r 9353^2:9353 # compare against the second parent
1868
1868
1869 Returns 0 on success.
1869 Returns 0 on success.
1870 """
1870 """
1871
1871
1872 opts = pycompat.byteskwargs(opts)
1872 opts = pycompat.byteskwargs(opts)
1873 revs = opts.get('rev')
1873 revs = opts.get('rev')
1874 change = opts.get('change')
1874 change = opts.get('change')
1875 stat = opts.get('stat')
1875 stat = opts.get('stat')
1876 reverse = opts.get('reverse')
1876 reverse = opts.get('reverse')
1877
1877
1878 if revs and change:
1878 if revs and change:
1879 msg = _('cannot specify --rev and --change at the same time')
1879 msg = _('cannot specify --rev and --change at the same time')
1880 raise error.Abort(msg)
1880 raise error.Abort(msg)
1881 elif change:
1881 elif change:
1882 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1882 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1883 ctx2 = scmutil.revsingle(repo, change, None)
1883 ctx2 = scmutil.revsingle(repo, change, None)
1884 ctx1 = ctx2.p1()
1884 ctx1 = ctx2.p1()
1885 else:
1885 else:
1886 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1886 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1887 ctx1, ctx2 = scmutil.revpair(repo, revs)
1887 ctx1, ctx2 = scmutil.revpair(repo, revs)
1888 node1, node2 = ctx1.node(), ctx2.node()
1888 node1, node2 = ctx1.node(), ctx2.node()
1889
1889
1890 if reverse:
1890 if reverse:
1891 node1, node2 = node2, node1
1891 node1, node2 = node2, node1
1892
1892
1893 diffopts = patch.diffallopts(ui, opts)
1893 diffopts = patch.diffallopts(ui, opts)
1894 m = scmutil.match(ctx2, pats, opts)
1894 m = scmutil.match(ctx2, pats, opts)
1895 ui.pager('diff')
1895 ui.pager('diff')
1896 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1896 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1897 listsubrepos=opts.get('subrepos'),
1897 listsubrepos=opts.get('subrepos'),
1898 root=opts.get('root'))
1898 root=opts.get('root'))
1899
1899
1900 @command('^export',
1900 @command('^export',
1901 [('B', 'bookmark', '',
1901 [('B', 'bookmark', '',
1902 _('export changes only reachable by given bookmark')),
1902 _('export changes only reachable by given bookmark')),
1903 ('o', 'output', '',
1903 ('o', 'output', '',
1904 _('print output to file with formatted name'), _('FORMAT')),
1904 _('print output to file with formatted name'), _('FORMAT')),
1905 ('', 'switch-parent', None, _('diff against the second parent')),
1905 ('', 'switch-parent', None, _('diff against the second parent')),
1906 ('r', 'rev', [], _('revisions to export'), _('REV')),
1906 ('r', 'rev', [], _('revisions to export'), _('REV')),
1907 ] + diffopts + formatteropts,
1907 ] + diffopts + formatteropts,
1908 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
1908 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
1909 intents={INTENT_READONLY})
1909 intents={INTENT_READONLY})
1910 def export(ui, repo, *changesets, **opts):
1910 def export(ui, repo, *changesets, **opts):
1911 """dump the header and diffs for one or more changesets
1911 """dump the header and diffs for one or more changesets
1912
1912
1913 Print the changeset header and diffs for one or more revisions.
1913 Print the changeset header and diffs for one or more revisions.
1914 If no revision is given, the parent of the working directory is used.
1914 If no revision is given, the parent of the working directory is used.
1915
1915
1916 The information shown in the changeset header is: author, date,
1916 The information shown in the changeset header is: author, date,
1917 branch name (if non-default), changeset hash, parent(s) and commit
1917 branch name (if non-default), changeset hash, parent(s) and commit
1918 comment.
1918 comment.
1919
1919
1920 .. note::
1920 .. note::
1921
1921
1922 :hg:`export` may generate unexpected diff output for merge
1922 :hg:`export` may generate unexpected diff output for merge
1923 changesets, as it will compare the merge changeset against its
1923 changesets, as it will compare the merge changeset against its
1924 first parent only.
1924 first parent only.
1925
1925
1926 Output may be to a file, in which case the name of the file is
1926 Output may be to a file, in which case the name of the file is
1927 given using a template string. See :hg:`help templates`. In addition
1927 given using a template string. See :hg:`help templates`. In addition
1928 to the common template keywords, the following formatting rules are
1928 to the common template keywords, the following formatting rules are
1929 supported:
1929 supported:
1930
1930
1931 :``%%``: literal "%" character
1931 :``%%``: literal "%" character
1932 :``%H``: changeset hash (40 hexadecimal digits)
1932 :``%H``: changeset hash (40 hexadecimal digits)
1933 :``%N``: number of patches being generated
1933 :``%N``: number of patches being generated
1934 :``%R``: changeset revision number
1934 :``%R``: changeset revision number
1935 :``%b``: basename of the exporting repository
1935 :``%b``: basename of the exporting repository
1936 :``%h``: short-form changeset hash (12 hexadecimal digits)
1936 :``%h``: short-form changeset hash (12 hexadecimal digits)
1937 :``%m``: first line of the commit message (only alphanumeric characters)
1937 :``%m``: first line of the commit message (only alphanumeric characters)
1938 :``%n``: zero-padded sequence number, starting at 1
1938 :``%n``: zero-padded sequence number, starting at 1
1939 :``%r``: zero-padded changeset revision number
1939 :``%r``: zero-padded changeset revision number
1940 :``\\``: literal "\\" character
1940 :``\\``: literal "\\" character
1941
1941
1942 Without the -a/--text option, export will avoid generating diffs
1942 Without the -a/--text option, export will avoid generating diffs
1943 of files it detects as binary. With -a, export will generate a
1943 of files it detects as binary. With -a, export will generate a
1944 diff anyway, probably with undesirable results.
1944 diff anyway, probably with undesirable results.
1945
1945
1946 With -B/--bookmark changesets reachable by the given bookmark are
1946 With -B/--bookmark changesets reachable by the given bookmark are
1947 selected.
1947 selected.
1948
1948
1949 Use the -g/--git option to generate diffs in the git extended diff
1949 Use the -g/--git option to generate diffs in the git extended diff
1950 format. See :hg:`help diffs` for more information.
1950 format. See :hg:`help diffs` for more information.
1951
1951
1952 With the --switch-parent option, the diff will be against the
1952 With the --switch-parent option, the diff will be against the
1953 second parent. It can be useful to review a merge.
1953 second parent. It can be useful to review a merge.
1954
1954
1955 .. container:: verbose
1955 .. container:: verbose
1956
1956
1957 Examples:
1957 Examples:
1958
1958
1959 - use export and import to transplant a bugfix to the current
1959 - use export and import to transplant a bugfix to the current
1960 branch::
1960 branch::
1961
1961
1962 hg export -r 9353 | hg import -
1962 hg export -r 9353 | hg import -
1963
1963
1964 - export all the changesets between two revisions to a file with
1964 - export all the changesets between two revisions to a file with
1965 rename information::
1965 rename information::
1966
1966
1967 hg export --git -r 123:150 > changes.txt
1967 hg export --git -r 123:150 > changes.txt
1968
1968
1969 - split outgoing changes into a series of patches with
1969 - split outgoing changes into a series of patches with
1970 descriptive names::
1970 descriptive names::
1971
1971
1972 hg export -r "outgoing()" -o "%n-%m.patch"
1972 hg export -r "outgoing()" -o "%n-%m.patch"
1973
1973
1974 Returns 0 on success.
1974 Returns 0 on success.
1975 """
1975 """
1976 opts = pycompat.byteskwargs(opts)
1976 opts = pycompat.byteskwargs(opts)
1977 bookmark = opts.get('bookmark')
1977 bookmark = opts.get('bookmark')
1978 changesets += tuple(opts.get('rev', []))
1978 changesets += tuple(opts.get('rev', []))
1979
1979
1980 if bookmark and changesets:
1980 if bookmark and changesets:
1981 raise error.Abort(_("-r and -B are mutually exclusive"))
1981 raise error.Abort(_("-r and -B are mutually exclusive"))
1982
1982
1983 if bookmark:
1983 if bookmark:
1984 if bookmark not in repo._bookmarks:
1984 if bookmark not in repo._bookmarks:
1985 raise error.Abort(_("bookmark '%s' not found") % bookmark)
1985 raise error.Abort(_("bookmark '%s' not found") % bookmark)
1986
1986
1987 revs = scmutil.bookmarkrevs(repo, bookmark)
1987 revs = scmutil.bookmarkrevs(repo, bookmark)
1988 else:
1988 else:
1989 if not changesets:
1989 if not changesets:
1990 changesets = ['.']
1990 changesets = ['.']
1991
1991
1992 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1992 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1993 revs = scmutil.revrange(repo, changesets)
1993 revs = scmutil.revrange(repo, changesets)
1994
1994
1995 if not revs:
1995 if not revs:
1996 raise error.Abort(_("export requires at least one changeset"))
1996 raise error.Abort(_("export requires at least one changeset"))
1997 if len(revs) > 1:
1997 if len(revs) > 1:
1998 ui.note(_('exporting patches:\n'))
1998 ui.note(_('exporting patches:\n'))
1999 else:
1999 else:
2000 ui.note(_('exporting patch:\n'))
2000 ui.note(_('exporting patch:\n'))
2001
2001
2002 fntemplate = opts.get('output')
2002 fntemplate = opts.get('output')
2003 if cmdutil.isstdiofilename(fntemplate):
2003 if cmdutil.isstdiofilename(fntemplate):
2004 fntemplate = ''
2004 fntemplate = ''
2005
2005
2006 if fntemplate:
2006 if fntemplate:
2007 fm = formatter.nullformatter(ui, 'export', opts)
2007 fm = formatter.nullformatter(ui, 'export', opts)
2008 else:
2008 else:
2009 ui.pager('export')
2009 ui.pager('export')
2010 fm = ui.formatter('export', opts)
2010 fm = ui.formatter('export', opts)
2011 with fm:
2011 with fm:
2012 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2012 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2013 switch_parent=opts.get('switch_parent'),
2013 switch_parent=opts.get('switch_parent'),
2014 opts=patch.diffallopts(ui, opts))
2014 opts=patch.diffallopts(ui, opts))
2015
2015
2016 @command('files',
2016 @command('files',
2017 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2017 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2018 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2018 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2019 ] + walkopts + formatteropts + subrepoopts,
2019 ] + walkopts + formatteropts + subrepoopts,
2020 _('[OPTION]... [FILE]...'),
2020 _('[OPTION]... [FILE]...'),
2021 intents={INTENT_READONLY})
2021 intents={INTENT_READONLY})
2022 def files(ui, repo, *pats, **opts):
2022 def files(ui, repo, *pats, **opts):
2023 """list tracked files
2023 """list tracked files
2024
2024
2025 Print files under Mercurial control in the working directory or
2025 Print files under Mercurial control in the working directory or
2026 specified revision for given files (excluding removed files).
2026 specified revision for given files (excluding removed files).
2027 Files can be specified as filenames or filesets.
2027 Files can be specified as filenames or filesets.
2028
2028
2029 If no files are given to match, this command prints the names
2029 If no files are given to match, this command prints the names
2030 of all files under Mercurial control.
2030 of all files under Mercurial control.
2031
2031
2032 .. container:: verbose
2032 .. container:: verbose
2033
2033
2034 Examples:
2034 Examples:
2035
2035
2036 - list all files under the current directory::
2036 - list all files under the current directory::
2037
2037
2038 hg files .
2038 hg files .
2039
2039
2040 - shows sizes and flags for current revision::
2040 - shows sizes and flags for current revision::
2041
2041
2042 hg files -vr .
2042 hg files -vr .
2043
2043
2044 - list all files named README::
2044 - list all files named README::
2045
2045
2046 hg files -I "**/README"
2046 hg files -I "**/README"
2047
2047
2048 - list all binary files::
2048 - list all binary files::
2049
2049
2050 hg files "set:binary()"
2050 hg files "set:binary()"
2051
2051
2052 - find files containing a regular expression::
2052 - find files containing a regular expression::
2053
2053
2054 hg files "set:grep('bob')"
2054 hg files "set:grep('bob')"
2055
2055
2056 - search tracked file contents with xargs and grep::
2056 - search tracked file contents with xargs and grep::
2057
2057
2058 hg files -0 | xargs -0 grep foo
2058 hg files -0 | xargs -0 grep foo
2059
2059
2060 See :hg:`help patterns` and :hg:`help filesets` for more information
2060 See :hg:`help patterns` and :hg:`help filesets` for more information
2061 on specifying file patterns.
2061 on specifying file patterns.
2062
2062
2063 Returns 0 if a match is found, 1 otherwise.
2063 Returns 0 if a match is found, 1 otherwise.
2064
2064
2065 """
2065 """
2066
2066
2067 opts = pycompat.byteskwargs(opts)
2067 opts = pycompat.byteskwargs(opts)
2068 rev = opts.get('rev')
2068 rev = opts.get('rev')
2069 if rev:
2069 if rev:
2070 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2070 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2071 ctx = scmutil.revsingle(repo, rev, None)
2071 ctx = scmutil.revsingle(repo, rev, None)
2072
2072
2073 end = '\n'
2073 end = '\n'
2074 if opts.get('print0'):
2074 if opts.get('print0'):
2075 end = '\0'
2075 end = '\0'
2076 fmt = '%s' + end
2076 fmt = '%s' + end
2077
2077
2078 m = scmutil.match(ctx, pats, opts)
2078 m = scmutil.match(ctx, pats, opts)
2079 ui.pager('files')
2079 ui.pager('files')
2080 with ui.formatter('files', opts) as fm:
2080 with ui.formatter('files', opts) as fm:
2081 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2081 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2082
2082
2083 @command(
2083 @command(
2084 '^forget',
2084 '^forget',
2085 [('i', 'interactive', None, _('use interactive mode')),
2085 [('i', 'interactive', None, _('use interactive mode')),
2086 ] + walkopts + dryrunopts,
2086 ] + walkopts + dryrunopts,
2087 _('[OPTION]... FILE...'), inferrepo=True)
2087 _('[OPTION]... FILE...'), inferrepo=True)
2088 def forget(ui, repo, *pats, **opts):
2088 def forget(ui, repo, *pats, **opts):
2089 """forget the specified files on the next commit
2089 """forget the specified files on the next commit
2090
2090
2091 Mark the specified files so they will no longer be tracked
2091 Mark the specified files so they will no longer be tracked
2092 after the next commit.
2092 after the next commit.
2093
2093
2094 This only removes files from the current branch, not from the
2094 This only removes files from the current branch, not from the
2095 entire project history, and it does not delete them from the
2095 entire project history, and it does not delete them from the
2096 working directory.
2096 working directory.
2097
2097
2098 To delete the file from the working directory, see :hg:`remove`.
2098 To delete the file from the working directory, see :hg:`remove`.
2099
2099
2100 To undo a forget before the next commit, see :hg:`add`.
2100 To undo a forget before the next commit, see :hg:`add`.
2101
2101
2102 .. container:: verbose
2102 .. container:: verbose
2103
2103
2104 Examples:
2104 Examples:
2105
2105
2106 - forget newly-added binary files::
2106 - forget newly-added binary files::
2107
2107
2108 hg forget "set:added() and binary()"
2108 hg forget "set:added() and binary()"
2109
2109
2110 - forget files that would be excluded by .hgignore::
2110 - forget files that would be excluded by .hgignore::
2111
2111
2112 hg forget "set:hgignore()"
2112 hg forget "set:hgignore()"
2113
2113
2114 Returns 0 on success.
2114 Returns 0 on success.
2115 """
2115 """
2116
2116
2117 opts = pycompat.byteskwargs(opts)
2117 opts = pycompat.byteskwargs(opts)
2118 if not pats:
2118 if not pats:
2119 raise error.Abort(_('no files specified'))
2119 raise error.Abort(_('no files specified'))
2120
2120
2121 m = scmutil.match(repo[None], pats, opts)
2121 m = scmutil.match(repo[None], pats, opts)
2122 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2122 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2123 rejected = cmdutil.forget(ui, repo, m, prefix="",
2123 rejected = cmdutil.forget(ui, repo, m, prefix="",
2124 explicitonly=False, dryrun=dryrun,
2124 explicitonly=False, dryrun=dryrun,
2125 interactive=interactive)[0]
2125 interactive=interactive)[0]
2126 return rejected and 1 or 0
2126 return rejected and 1 or 0
2127
2127
2128 @command(
2128 @command(
2129 'graft',
2129 'graft',
2130 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2130 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2131 ('c', 'continue', False, _('resume interrupted graft')),
2131 ('c', 'continue', False, _('resume interrupted graft')),
2132 ('', 'stop', False, _('stop interrupted graft')),
2132 ('', 'stop', False, _('stop interrupted graft')),
2133 ('', 'abort', False, _('abort interrupted graft')),
2133 ('', 'abort', False, _('abort interrupted graft')),
2134 ('e', 'edit', False, _('invoke editor on commit messages')),
2134 ('e', 'edit', False, _('invoke editor on commit messages')),
2135 ('', 'log', None, _('append graft info to log message')),
2135 ('', 'log', None, _('append graft info to log message')),
2136 ('', 'no-commit', None,
2136 ('', 'no-commit', None,
2137 _("don't commit, just apply the changes in working directory")),
2137 _("don't commit, just apply the changes in working directory")),
2138 ('f', 'force', False, _('force graft')),
2138 ('f', 'force', False, _('force graft')),
2139 ('D', 'currentdate', False,
2139 ('D', 'currentdate', False,
2140 _('record the current date as commit date')),
2140 _('record the current date as commit date')),
2141 ('U', 'currentuser', False,
2141 ('U', 'currentuser', False,
2142 _('record the current user as committer'), _('DATE'))]
2142 _('record the current user as committer'), _('DATE'))]
2143 + commitopts2 + mergetoolopts + dryrunopts,
2143 + commitopts2 + mergetoolopts + dryrunopts,
2144 _('[OPTION]... [-r REV]... REV...'))
2144 _('[OPTION]... [-r REV]... REV...'))
2145 def graft(ui, repo, *revs, **opts):
2145 def graft(ui, repo, *revs, **opts):
2146 '''copy changes from other branches onto the current branch
2146 '''copy changes from other branches onto the current branch
2147
2147
2148 This command uses Mercurial's merge logic to copy individual
2148 This command uses Mercurial's merge logic to copy individual
2149 changes from other branches without merging branches in the
2149 changes from other branches without merging branches in the
2150 history graph. This is sometimes known as 'backporting' or
2150 history graph. This is sometimes known as 'backporting' or
2151 'cherry-picking'. By default, graft will copy user, date, and
2151 'cherry-picking'. By default, graft will copy user, date, and
2152 description from the source changesets.
2152 description from the source changesets.
2153
2153
2154 Changesets that are ancestors of the current revision, that have
2154 Changesets that are ancestors of the current revision, that have
2155 already been grafted, or that are merges will be skipped.
2155 already been grafted, or that are merges will be skipped.
2156
2156
2157 If --log is specified, log messages will have a comment appended
2157 If --log is specified, log messages will have a comment appended
2158 of the form::
2158 of the form::
2159
2159
2160 (grafted from CHANGESETHASH)
2160 (grafted from CHANGESETHASH)
2161
2161
2162 If --force is specified, revisions will be grafted even if they
2162 If --force is specified, revisions will be grafted even if they
2163 are already ancestors of, or have been grafted to, the destination.
2163 are already ancestors of, or have been grafted to, the destination.
2164 This is useful when the revisions have since been backed out.
2164 This is useful when the revisions have since been backed out.
2165
2165
2166 If a graft merge results in conflicts, the graft process is
2166 If a graft merge results in conflicts, the graft process is
2167 interrupted so that the current merge can be manually resolved.
2167 interrupted so that the current merge can be manually resolved.
2168 Once all conflicts are addressed, the graft process can be
2168 Once all conflicts are addressed, the graft process can be
2169 continued with the -c/--continue option.
2169 continued with the -c/--continue option.
2170
2170
2171 The -c/--continue option reapplies all the earlier options.
2171 The -c/--continue option reapplies all the earlier options.
2172
2172
2173 .. container:: verbose
2173 .. container:: verbose
2174
2174
2175 Examples:
2175 Examples:
2176
2176
2177 - copy a single change to the stable branch and edit its description::
2177 - copy a single change to the stable branch and edit its description::
2178
2178
2179 hg update stable
2179 hg update stable
2180 hg graft --edit 9393
2180 hg graft --edit 9393
2181
2181
2182 - graft a range of changesets with one exception, updating dates::
2182 - graft a range of changesets with one exception, updating dates::
2183
2183
2184 hg graft -D "2085::2093 and not 2091"
2184 hg graft -D "2085::2093 and not 2091"
2185
2185
2186 - continue a graft after resolving conflicts::
2186 - continue a graft after resolving conflicts::
2187
2187
2188 hg graft -c
2188 hg graft -c
2189
2189
2190 - show the source of a grafted changeset::
2190 - show the source of a grafted changeset::
2191
2191
2192 hg log --debug -r .
2192 hg log --debug -r .
2193
2193
2194 - show revisions sorted by date::
2194 - show revisions sorted by date::
2195
2195
2196 hg log -r "sort(all(), date)"
2196 hg log -r "sort(all(), date)"
2197
2197
2198 See :hg:`help revisions` for more about specifying revisions.
2198 See :hg:`help revisions` for more about specifying revisions.
2199
2199
2200 Returns 0 on successful completion.
2200 Returns 0 on successful completion.
2201 '''
2201 '''
2202 with repo.wlock():
2202 with repo.wlock():
2203 return _dograft(ui, repo, *revs, **opts)
2203 return _dograft(ui, repo, *revs, **opts)
2204
2204
2205 def _dograft(ui, repo, *revs, **opts):
2205 def _dograft(ui, repo, *revs, **opts):
2206 opts = pycompat.byteskwargs(opts)
2206 opts = pycompat.byteskwargs(opts)
2207 if revs and opts.get('rev'):
2207 if revs and opts.get('rev'):
2208 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2208 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2209 'revision ordering!\n'))
2209 'revision ordering!\n'))
2210
2210
2211 revs = list(revs)
2211 revs = list(revs)
2212 revs.extend(opts.get('rev'))
2212 revs.extend(opts.get('rev'))
2213 # a dict of data to be stored in state file
2213 # a dict of data to be stored in state file
2214 statedata = {}
2214 statedata = {}
2215 # list of new nodes created by ongoing graft
2215 # list of new nodes created by ongoing graft
2216 statedata['newnodes'] = []
2216 statedata['newnodes'] = []
2217
2217
2218 if not opts.get('user') and opts.get('currentuser'):
2218 if not opts.get('user') and opts.get('currentuser'):
2219 opts['user'] = ui.username()
2219 opts['user'] = ui.username()
2220 if not opts.get('date') and opts.get('currentdate'):
2220 if not opts.get('date') and opts.get('currentdate'):
2221 opts['date'] = "%d %d" % dateutil.makedate()
2221 opts['date'] = "%d %d" % dateutil.makedate()
2222
2222
2223 editor = cmdutil.getcommiteditor(editform='graft',
2223 editor = cmdutil.getcommiteditor(editform='graft',
2224 **pycompat.strkwargs(opts))
2224 **pycompat.strkwargs(opts))
2225
2225
2226 cont = False
2226 cont = False
2227 if opts.get('no_commit'):
2227 if opts.get('no_commit'):
2228 if opts.get('edit'):
2228 if opts.get('edit'):
2229 raise error.Abort(_("cannot specify --no-commit and "
2229 raise error.Abort(_("cannot specify --no-commit and "
2230 "--edit together"))
2230 "--edit together"))
2231 if opts.get('currentuser'):
2231 if opts.get('currentuser'):
2232 raise error.Abort(_("cannot specify --no-commit and "
2232 raise error.Abort(_("cannot specify --no-commit and "
2233 "--currentuser together"))
2233 "--currentuser together"))
2234 if opts.get('currentdate'):
2234 if opts.get('currentdate'):
2235 raise error.Abort(_("cannot specify --no-commit and "
2235 raise error.Abort(_("cannot specify --no-commit and "
2236 "--currentdate together"))
2236 "--currentdate together"))
2237 if opts.get('log'):
2237 if opts.get('log'):
2238 raise error.Abort(_("cannot specify --no-commit and "
2238 raise error.Abort(_("cannot specify --no-commit and "
2239 "--log together"))
2239 "--log together"))
2240
2240
2241 graftstate = statemod.cmdstate(repo, 'graftstate')
2241 graftstate = statemod.cmdstate(repo, 'graftstate')
2242
2242
2243 if opts.get('stop'):
2243 if opts.get('stop'):
2244 if opts.get('continue'):
2244 if opts.get('continue'):
2245 raise error.Abort(_("cannot use '--continue' and "
2245 raise error.Abort(_("cannot use '--continue' and "
2246 "'--stop' together"))
2246 "'--stop' together"))
2247 if opts.get('abort'):
2247 if opts.get('abort'):
2248 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
2248 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
2249
2249
2250 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2250 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2251 opts.get('date'), opts.get('currentdate'),
2251 opts.get('date'), opts.get('currentdate'),
2252 opts.get('currentuser'), opts.get('rev'))):
2252 opts.get('currentuser'), opts.get('rev'))):
2253 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2253 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2254 return _stopgraft(ui, repo, graftstate)
2254 return _stopgraft(ui, repo, graftstate)
2255 elif opts.get('abort'):
2255 elif opts.get('abort'):
2256 if opts.get('continue'):
2256 if opts.get('continue'):
2257 raise error.Abort(_("cannot use '--continue' and "
2257 raise error.Abort(_("cannot use '--continue' and "
2258 "'--abort' together"))
2258 "'--abort' together"))
2259 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2259 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2260 opts.get('date'), opts.get('currentdate'),
2260 opts.get('date'), opts.get('currentdate'),
2261 opts.get('currentuser'), opts.get('rev'))):
2261 opts.get('currentuser'), opts.get('rev'))):
2262 raise error.Abort(_("cannot specify any other flag with '--abort'"))
2262 raise error.Abort(_("cannot specify any other flag with '--abort'"))
2263
2263
2264 return _abortgraft(ui, repo, graftstate)
2264 return _abortgraft(ui, repo, graftstate)
2265 elif opts.get('continue'):
2265 elif opts.get('continue'):
2266 cont = True
2266 cont = True
2267 if revs:
2267 if revs:
2268 raise error.Abort(_("can't specify --continue and revisions"))
2268 raise error.Abort(_("can't specify --continue and revisions"))
2269 # read in unfinished revisions
2269 # read in unfinished revisions
2270 if graftstate.exists():
2270 if graftstate.exists():
2271 statedata = _readgraftstate(repo, graftstate)
2271 statedata = _readgraftstate(repo, graftstate)
2272 if statedata.get('date'):
2272 if statedata.get('date'):
2273 opts['date'] = statedata['date']
2273 opts['date'] = statedata['date']
2274 if statedata.get('user'):
2274 if statedata.get('user'):
2275 opts['user'] = statedata['user']
2275 opts['user'] = statedata['user']
2276 if statedata.get('log'):
2276 if statedata.get('log'):
2277 opts['log'] = True
2277 opts['log'] = True
2278 if statedata.get('no_commit'):
2278 if statedata.get('no_commit'):
2279 opts['no_commit'] = statedata.get('no_commit')
2279 opts['no_commit'] = statedata.get('no_commit')
2280 nodes = statedata['nodes']
2280 nodes = statedata['nodes']
2281 revs = [repo[node].rev() for node in nodes]
2281 revs = [repo[node].rev() for node in nodes]
2282 else:
2282 else:
2283 cmdutil.wrongtooltocontinue(repo, _('graft'))
2283 cmdutil.wrongtooltocontinue(repo, _('graft'))
2284 else:
2284 else:
2285 if not revs:
2285 if not revs:
2286 raise error.Abort(_('no revisions specified'))
2286 raise error.Abort(_('no revisions specified'))
2287 cmdutil.checkunfinished(repo)
2287 cmdutil.checkunfinished(repo)
2288 cmdutil.bailifchanged(repo)
2288 cmdutil.bailifchanged(repo)
2289 revs = scmutil.revrange(repo, revs)
2289 revs = scmutil.revrange(repo, revs)
2290
2290
2291 skipped = set()
2291 skipped = set()
2292 # check for merges
2292 # check for merges
2293 for rev in repo.revs('%ld and merge()', revs):
2293 for rev in repo.revs('%ld and merge()', revs):
2294 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2294 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2295 skipped.add(rev)
2295 skipped.add(rev)
2296 revs = [r for r in revs if r not in skipped]
2296 revs = [r for r in revs if r not in skipped]
2297 if not revs:
2297 if not revs:
2298 return -1
2298 return -1
2299
2299
2300 # Don't check in the --continue case, in effect retaining --force across
2300 # Don't check in the --continue case, in effect retaining --force across
2301 # --continues. That's because without --force, any revisions we decided to
2301 # --continues. That's because without --force, any revisions we decided to
2302 # skip would have been filtered out here, so they wouldn't have made their
2302 # skip would have been filtered out here, so they wouldn't have made their
2303 # way to the graftstate. With --force, any revisions we would have otherwise
2303 # way to the graftstate. With --force, any revisions we would have otherwise
2304 # skipped would not have been filtered out, and if they hadn't been applied
2304 # skipped would not have been filtered out, and if they hadn't been applied
2305 # already, they'd have been in the graftstate.
2305 # already, they'd have been in the graftstate.
2306 if not (cont or opts.get('force')):
2306 if not (cont or opts.get('force')):
2307 # check for ancestors of dest branch
2307 # check for ancestors of dest branch
2308 crev = repo['.'].rev()
2308 crev = repo['.'].rev()
2309 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2309 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2310 # XXX make this lazy in the future
2310 # XXX make this lazy in the future
2311 # don't mutate while iterating, create a copy
2311 # don't mutate while iterating, create a copy
2312 for rev in list(revs):
2312 for rev in list(revs):
2313 if rev in ancestors:
2313 if rev in ancestors:
2314 ui.warn(_('skipping ancestor revision %d:%s\n') %
2314 ui.warn(_('skipping ancestor revision %d:%s\n') %
2315 (rev, repo[rev]))
2315 (rev, repo[rev]))
2316 # XXX remove on list is slow
2316 # XXX remove on list is slow
2317 revs.remove(rev)
2317 revs.remove(rev)
2318 if not revs:
2318 if not revs:
2319 return -1
2319 return -1
2320
2320
2321 # analyze revs for earlier grafts
2321 # analyze revs for earlier grafts
2322 ids = {}
2322 ids = {}
2323 for ctx in repo.set("%ld", revs):
2323 for ctx in repo.set("%ld", revs):
2324 ids[ctx.hex()] = ctx.rev()
2324 ids[ctx.hex()] = ctx.rev()
2325 n = ctx.extra().get('source')
2325 n = ctx.extra().get('source')
2326 if n:
2326 if n:
2327 ids[n] = ctx.rev()
2327 ids[n] = ctx.rev()
2328
2328
2329 # check ancestors for earlier grafts
2329 # check ancestors for earlier grafts
2330 ui.debug('scanning for duplicate grafts\n')
2330 ui.debug('scanning for duplicate grafts\n')
2331
2331
2332 # The only changesets we can be sure doesn't contain grafts of any
2332 # The only changesets we can be sure doesn't contain grafts of any
2333 # revs, are the ones that are common ancestors of *all* revs:
2333 # revs, are the ones that are common ancestors of *all* revs:
2334 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2334 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2335 ctx = repo[rev]
2335 ctx = repo[rev]
2336 n = ctx.extra().get('source')
2336 n = ctx.extra().get('source')
2337 if n in ids:
2337 if n in ids:
2338 try:
2338 try:
2339 r = repo[n].rev()
2339 r = repo[n].rev()
2340 except error.RepoLookupError:
2340 except error.RepoLookupError:
2341 r = None
2341 r = None
2342 if r in revs:
2342 if r in revs:
2343 ui.warn(_('skipping revision %d:%s '
2343 ui.warn(_('skipping revision %d:%s '
2344 '(already grafted to %d:%s)\n')
2344 '(already grafted to %d:%s)\n')
2345 % (r, repo[r], rev, ctx))
2345 % (r, repo[r], rev, ctx))
2346 revs.remove(r)
2346 revs.remove(r)
2347 elif ids[n] in revs:
2347 elif ids[n] in revs:
2348 if r is None:
2348 if r is None:
2349 ui.warn(_('skipping already grafted revision %d:%s '
2349 ui.warn(_('skipping already grafted revision %d:%s '
2350 '(%d:%s also has unknown origin %s)\n')
2350 '(%d:%s also has unknown origin %s)\n')
2351 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2351 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2352 else:
2352 else:
2353 ui.warn(_('skipping already grafted revision %d:%s '
2353 ui.warn(_('skipping already grafted revision %d:%s '
2354 '(%d:%s also has origin %d:%s)\n')
2354 '(%d:%s also has origin %d:%s)\n')
2355 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2355 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2356 revs.remove(ids[n])
2356 revs.remove(ids[n])
2357 elif ctx.hex() in ids:
2357 elif ctx.hex() in ids:
2358 r = ids[ctx.hex()]
2358 r = ids[ctx.hex()]
2359 ui.warn(_('skipping already grafted revision %d:%s '
2359 ui.warn(_('skipping already grafted revision %d:%s '
2360 '(was grafted from %d:%s)\n') %
2360 '(was grafted from %d:%s)\n') %
2361 (r, repo[r], rev, ctx))
2361 (r, repo[r], rev, ctx))
2362 revs.remove(r)
2362 revs.remove(r)
2363 if not revs:
2363 if not revs:
2364 return -1
2364 return -1
2365
2365
2366 if opts.get('no_commit'):
2366 if opts.get('no_commit'):
2367 statedata['no_commit'] = True
2367 statedata['no_commit'] = True
2368 for pos, ctx in enumerate(repo.set("%ld", revs)):
2368 for pos, ctx in enumerate(repo.set("%ld", revs)):
2369 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2369 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2370 ctx.description().split('\n', 1)[0])
2370 ctx.description().split('\n', 1)[0])
2371 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2371 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2372 if names:
2372 if names:
2373 desc += ' (%s)' % ' '.join(names)
2373 desc += ' (%s)' % ' '.join(names)
2374 ui.status(_('grafting %s\n') % desc)
2374 ui.status(_('grafting %s\n') % desc)
2375 if opts.get('dry_run'):
2375 if opts.get('dry_run'):
2376 continue
2376 continue
2377
2377
2378 source = ctx.extra().get('source')
2378 source = ctx.extra().get('source')
2379 extra = {}
2379 extra = {}
2380 if source:
2380 if source:
2381 extra['source'] = source
2381 extra['source'] = source
2382 extra['intermediate-source'] = ctx.hex()
2382 extra['intermediate-source'] = ctx.hex()
2383 else:
2383 else:
2384 extra['source'] = ctx.hex()
2384 extra['source'] = ctx.hex()
2385 user = ctx.user()
2385 user = ctx.user()
2386 if opts.get('user'):
2386 if opts.get('user'):
2387 user = opts['user']
2387 user = opts['user']
2388 statedata['user'] = user
2388 statedata['user'] = user
2389 date = ctx.date()
2389 date = ctx.date()
2390 if opts.get('date'):
2390 if opts.get('date'):
2391 date = opts['date']
2391 date = opts['date']
2392 statedata['date'] = date
2392 statedata['date'] = date
2393 message = ctx.description()
2393 message = ctx.description()
2394 if opts.get('log'):
2394 if opts.get('log'):
2395 message += '\n(grafted from %s)' % ctx.hex()
2395 message += '\n(grafted from %s)' % ctx.hex()
2396 statedata['log'] = True
2396 statedata['log'] = True
2397
2397
2398 # we don't merge the first commit when continuing
2398 # we don't merge the first commit when continuing
2399 if not cont:
2399 if not cont:
2400 # perform the graft merge with p1(rev) as 'ancestor'
2400 # perform the graft merge with p1(rev) as 'ancestor'
2401 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2401 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2402 with ui.configoverride(overrides, 'graft'):
2402 with ui.configoverride(overrides, 'graft'):
2403 stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'graft'])
2403 stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'graft'])
2404 # report any conflicts
2404 # report any conflicts
2405 if stats.unresolvedcount > 0:
2405 if stats.unresolvedcount > 0:
2406 # write out state for --continue
2406 # write out state for --continue
2407 nodes = [repo[rev].hex() for rev in revs[pos:]]
2407 nodes = [repo[rev].hex() for rev in revs[pos:]]
2408 statedata['nodes'] = nodes
2408 statedata['nodes'] = nodes
2409 stateversion = 1
2409 stateversion = 1
2410 graftstate.save(stateversion, statedata)
2410 graftstate.save(stateversion, statedata)
2411 hint = _("use 'hg resolve' and 'hg graft --continue'")
2411 hint = _("use 'hg resolve' and 'hg graft --continue'")
2412 raise error.Abort(
2412 raise error.Abort(
2413 _("unresolved conflicts, can't continue"),
2413 _("unresolved conflicts, can't continue"),
2414 hint=hint)
2414 hint=hint)
2415 else:
2415 else:
2416 cont = False
2416 cont = False
2417
2417
2418 # commit if --no-commit is false
2418 # commit if --no-commit is false
2419 if not opts.get('no_commit'):
2419 if not opts.get('no_commit'):
2420 node = repo.commit(text=message, user=user, date=date, extra=extra,
2420 node = repo.commit(text=message, user=user, date=date, extra=extra,
2421 editor=editor)
2421 editor=editor)
2422 if node is None:
2422 if node is None:
2423 ui.warn(
2423 ui.warn(
2424 _('note: graft of %d:%s created no changes to commit\n') %
2424 _('note: graft of %d:%s created no changes to commit\n') %
2425 (ctx.rev(), ctx))
2425 (ctx.rev(), ctx))
2426 # checking that newnodes exist because old state files won't have it
2426 # checking that newnodes exist because old state files won't have it
2427 elif statedata.get('newnodes') is not None:
2427 elif statedata.get('newnodes') is not None:
2428 statedata['newnodes'].append(node)
2428 statedata['newnodes'].append(node)
2429
2429
2430 # remove state when we complete successfully
2430 # remove state when we complete successfully
2431 if not opts.get('dry_run'):
2431 if not opts.get('dry_run'):
2432 graftstate.delete()
2432 graftstate.delete()
2433
2433
2434 return 0
2434 return 0
2435
2435
2436 def _abortgraft(ui, repo, graftstate):
2436 def _abortgraft(ui, repo, graftstate):
2437 """abort the interrupted graft and rollbacks to the state before interrupted
2437 """abort the interrupted graft and rollbacks to the state before interrupted
2438 graft"""
2438 graft"""
2439 if not graftstate.exists():
2439 if not graftstate.exists():
2440 raise error.Abort(_("no interrupted graft to abort"))
2440 raise error.Abort(_("no interrupted graft to abort"))
2441 statedata = _readgraftstate(repo, graftstate)
2441 statedata = _readgraftstate(repo, graftstate)
2442 newnodes = statedata.get('newnodes')
2442 newnodes = statedata.get('newnodes')
2443 if newnodes is None:
2443 if newnodes is None:
2444 # and old graft state which does not have all the data required to abort
2444 # and old graft state which does not have all the data required to abort
2445 # the graft
2445 # the graft
2446 raise error.Abort(_("cannot abort using an old graftstate"))
2446 raise error.Abort(_("cannot abort using an old graftstate"))
2447
2447
2448 # changeset from which graft operation was started
2448 # changeset from which graft operation was started
2449 startctx = None
2449 startctx = None
2450 if len(newnodes) > 0:
2450 if len(newnodes) > 0:
2451 startctx = repo[newnodes[0]].p1()
2451 startctx = repo[newnodes[0]].p1()
2452 else:
2452 else:
2453 startctx = repo['.']
2453 startctx = repo['.']
2454 # whether to strip or not
2454 # whether to strip or not
2455 cleanup = False
2455 cleanup = False
2456 if newnodes:
2456 if newnodes:
2457 newnodes = [repo[r].rev() for r in newnodes]
2457 newnodes = [repo[r].rev() for r in newnodes]
2458 cleanup = True
2458 cleanup = True
2459 # checking that none of the newnodes turned public or is public
2459 # checking that none of the newnodes turned public or is public
2460 immutable = [c for c in newnodes if not repo[c].mutable()]
2460 immutable = [c for c in newnodes if not repo[c].mutable()]
2461 if immutable:
2461 if immutable:
2462 repo.ui.warn(_("cannot clean up public changesets %s\n")
2462 repo.ui.warn(_("cannot clean up public changesets %s\n")
2463 % ', '.join(bytes(repo[r]) for r in immutable),
2463 % ', '.join(bytes(repo[r]) for r in immutable),
2464 hint=_("see 'hg help phases' for details"))
2464 hint=_("see 'hg help phases' for details"))
2465 cleanup = False
2465 cleanup = False
2466
2466
2467 # checking that no new nodes are created on top of grafted revs
2467 # checking that no new nodes are created on top of grafted revs
2468 desc = set(repo.changelog.descendants(newnodes))
2468 desc = set(repo.changelog.descendants(newnodes))
2469 if desc - set(newnodes):
2469 if desc - set(newnodes):
2470 repo.ui.warn(_("new changesets detected on destination "
2470 repo.ui.warn(_("new changesets detected on destination "
2471 "branch, can't strip\n"))
2471 "branch, can't strip\n"))
2472 cleanup = False
2472 cleanup = False
2473
2473
2474 if cleanup:
2474 if cleanup:
2475 with repo.wlock(), repo.lock():
2475 with repo.wlock(), repo.lock():
2476 hg.updaterepo(repo, startctx.node(), overwrite=True)
2476 hg.updaterepo(repo, startctx.node(), overwrite=True)
2477 # stripping the new nodes created
2477 # stripping the new nodes created
2478 strippoints = [c.node() for c in repo.set("roots(%ld)",
2478 strippoints = [c.node() for c in repo.set("roots(%ld)",
2479 newnodes)]
2479 newnodes)]
2480 repair.strip(repo.ui, repo, strippoints, backup=False)
2480 repair.strip(repo.ui, repo, strippoints, backup=False)
2481
2481
2482 if not cleanup:
2482 if not cleanup:
2483 # we don't update to the startnode if we can't strip
2483 # we don't update to the startnode if we can't strip
2484 startctx = repo['.']
2484 startctx = repo['.']
2485 hg.updaterepo(repo, startctx.node(), overwrite=True)
2485 hg.updaterepo(repo, startctx.node(), overwrite=True)
2486
2486
2487 ui.status(_("graft aborted\n"))
2487 ui.status(_("graft aborted\n"))
2488 ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
2488 ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
2489 graftstate.delete()
2489 graftstate.delete()
2490 return 0
2490 return 0
2491
2491
2492 def _readgraftstate(repo, graftstate):
2492 def _readgraftstate(repo, graftstate):
2493 """read the graft state file and return a dict of the data stored in it"""
2493 """read the graft state file and return a dict of the data stored in it"""
2494 try:
2494 try:
2495 return graftstate.read()
2495 return graftstate.read()
2496 except error.CorruptedState:
2496 except error.CorruptedState:
2497 nodes = repo.vfs.read('graftstate').splitlines()
2497 nodes = repo.vfs.read('graftstate').splitlines()
2498 return {'nodes': nodes}
2498 return {'nodes': nodes}
2499
2499
2500 def _stopgraft(ui, repo, graftstate):
2500 def _stopgraft(ui, repo, graftstate):
2501 """stop the interrupted graft"""
2501 """stop the interrupted graft"""
2502 if not graftstate.exists():
2502 if not graftstate.exists():
2503 raise error.Abort(_("no interrupted graft found"))
2503 raise error.Abort(_("no interrupted graft found"))
2504 pctx = repo['.']
2504 pctx = repo['.']
2505 hg.updaterepo(repo, pctx.node(), overwrite=True)
2505 hg.updaterepo(repo, pctx.node(), overwrite=True)
2506 graftstate.delete()
2506 graftstate.delete()
2507 ui.status(_("stopped the interrupted graft\n"))
2507 ui.status(_("stopped the interrupted graft\n"))
2508 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2508 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2509 return 0
2509 return 0
2510
2510
2511 @command('grep',
2511 @command('grep',
2512 [('0', 'print0', None, _('end fields with NUL')),
2512 [('0', 'print0', None, _('end fields with NUL')),
2513 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
2513 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
2514 ('', 'diff', None, _('print all revisions when the term was introduced '
2514 ('', 'diff', None, _('print all revisions when the term was introduced '
2515 'or removed')),
2515 'or removed')),
2516 ('a', 'text', None, _('treat all files as text')),
2516 ('a', 'text', None, _('treat all files as text')),
2517 ('f', 'follow', None,
2517 ('f', 'follow', None,
2518 _('follow changeset history,'
2518 _('follow changeset history,'
2519 ' or file history across copies and renames')),
2519 ' or file history across copies and renames')),
2520 ('i', 'ignore-case', None, _('ignore case when matching')),
2520 ('i', 'ignore-case', None, _('ignore case when matching')),
2521 ('l', 'files-with-matches', None,
2521 ('l', 'files-with-matches', None,
2522 _('print only filenames and revisions that match')),
2522 _('print only filenames and revisions that match')),
2523 ('n', 'line-number', None, _('print matching line numbers')),
2523 ('n', 'line-number', None, _('print matching line numbers')),
2524 ('r', 'rev', [],
2524 ('r', 'rev', [],
2525 _('only search files changed within revision range'), _('REV')),
2525 _('only search files changed within revision range'), _('REV')),
2526 ('', 'all-files', None,
2526 ('', 'all-files', None,
2527 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2527 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2528 ('u', 'user', None, _('list the author (long with -v)')),
2528 ('u', 'user', None, _('list the author (long with -v)')),
2529 ('d', 'date', None, _('list the date (short with -q)')),
2529 ('d', 'date', None, _('list the date (short with -q)')),
2530 ] + formatteropts + walkopts,
2530 ] + formatteropts + walkopts,
2531 _('[OPTION]... PATTERN [FILE]...'),
2531 _('[OPTION]... PATTERN [FILE]...'),
2532 inferrepo=True,
2532 inferrepo=True,
2533 intents={INTENT_READONLY})
2533 intents={INTENT_READONLY})
2534 def grep(ui, repo, pattern, *pats, **opts):
2534 def grep(ui, repo, pattern, *pats, **opts):
2535 """search revision history for a pattern in specified files
2535 """search revision history for a pattern in specified files
2536
2536
2537 Search revision history for a regular expression in the specified
2537 Search revision history for a regular expression in the specified
2538 files or the entire project.
2538 files or the entire project.
2539
2539
2540 By default, grep prints the most recent revision number for each
2540 By default, grep prints the most recent revision number for each
2541 file in which it finds a match. To get it to print every revision
2541 file in which it finds a match. To get it to print every revision
2542 that contains a change in match status ("-" for a match that becomes
2542 that contains a change in match status ("-" for a match that becomes
2543 a non-match, or "+" for a non-match that becomes a match), use the
2543 a non-match, or "+" for a non-match that becomes a match), use the
2544 --diff flag.
2544 --diff flag.
2545
2545
2546 PATTERN can be any Python (roughly Perl-compatible) regular
2546 PATTERN can be any Python (roughly Perl-compatible) regular
2547 expression.
2547 expression.
2548
2548
2549 If no FILEs are specified (and -f/--follow isn't set), all files in
2549 If no FILEs are specified (and -f/--follow isn't set), all files in
2550 the repository are searched, including those that don't exist in the
2550 the repository are searched, including those that don't exist in the
2551 current branch or have been deleted in a prior changeset.
2551 current branch or have been deleted in a prior changeset.
2552
2552
2553 Returns 0 if a match is found, 1 otherwise.
2553 Returns 0 if a match is found, 1 otherwise.
2554 """
2554 """
2555 opts = pycompat.byteskwargs(opts)
2555 opts = pycompat.byteskwargs(opts)
2556 diff = opts.get('all') or opts.get('diff')
2556 diff = opts.get('all') or opts.get('diff')
2557 all_files = opts.get('all_files')
2557 all_files = opts.get('all_files')
2558 if diff and opts.get('all_files'):
2558 if diff and opts.get('all_files'):
2559 raise error.Abort(_('--diff and --all-files are mutually exclusive'))
2559 raise error.Abort(_('--diff and --all-files are mutually exclusive'))
2560 # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
2560 # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
2561 if opts.get('all_files') is None and not opts.get('rev') and not diff:
2561 if opts.get('all_files') is None and not opts.get('rev') and not diff:
2562 # experimental config: commands.grep.all-files
2562 # experimental config: commands.grep.all-files
2563 opts['all_files'] = ui.configbool('commands', 'grep.all-files')
2563 opts['all_files'] = ui.configbool('commands', 'grep.all-files')
2564 plaingrep = opts.get('all_files') and not opts.get('rev')
2564 plaingrep = opts.get('all_files') and not opts.get('rev')
2565 if plaingrep:
2565 if plaingrep:
2566 opts['rev'] = ['wdir()']
2566 opts['rev'] = ['wdir()']
2567
2567
2568 reflags = re.M
2568 reflags = re.M
2569 if opts.get('ignore_case'):
2569 if opts.get('ignore_case'):
2570 reflags |= re.I
2570 reflags |= re.I
2571 try:
2571 try:
2572 regexp = util.re.compile(pattern, reflags)
2572 regexp = util.re.compile(pattern, reflags)
2573 except re.error as inst:
2573 except re.error as inst:
2574 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2574 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2575 return 1
2575 return 1
2576 sep, eol = ':', '\n'
2576 sep, eol = ':', '\n'
2577 if opts.get('print0'):
2577 if opts.get('print0'):
2578 sep = eol = '\0'
2578 sep = eol = '\0'
2579
2579
2580 getfile = util.lrucachefunc(repo.file)
2580 getfile = util.lrucachefunc(repo.file)
2581
2581
2582 def matchlines(body):
2582 def matchlines(body):
2583 begin = 0
2583 begin = 0
2584 linenum = 0
2584 linenum = 0
2585 while begin < len(body):
2585 while begin < len(body):
2586 match = regexp.search(body, begin)
2586 match = regexp.search(body, begin)
2587 if not match:
2587 if not match:
2588 break
2588 break
2589 mstart, mend = match.span()
2589 mstart, mend = match.span()
2590 linenum += body.count('\n', begin, mstart) + 1
2590 linenum += body.count('\n', begin, mstart) + 1
2591 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2591 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2592 begin = body.find('\n', mend) + 1 or len(body) + 1
2592 begin = body.find('\n', mend) + 1 or len(body) + 1
2593 lend = begin - 1
2593 lend = begin - 1
2594 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2594 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2595
2595
2596 class linestate(object):
2596 class linestate(object):
2597 def __init__(self, line, linenum, colstart, colend):
2597 def __init__(self, line, linenum, colstart, colend):
2598 self.line = line
2598 self.line = line
2599 self.linenum = linenum
2599 self.linenum = linenum
2600 self.colstart = colstart
2600 self.colstart = colstart
2601 self.colend = colend
2601 self.colend = colend
2602
2602
2603 def __hash__(self):
2603 def __hash__(self):
2604 return hash((self.linenum, self.line))
2604 return hash((self.linenum, self.line))
2605
2605
2606 def __eq__(self, other):
2606 def __eq__(self, other):
2607 return self.line == other.line
2607 return self.line == other.line
2608
2608
2609 def findpos(self):
2609 def findpos(self):
2610 """Iterate all (start, end) indices of matches"""
2610 """Iterate all (start, end) indices of matches"""
2611 yield self.colstart, self.colend
2611 yield self.colstart, self.colend
2612 p = self.colend
2612 p = self.colend
2613 while p < len(self.line):
2613 while p < len(self.line):
2614 m = regexp.search(self.line, p)
2614 m = regexp.search(self.line, p)
2615 if not m:
2615 if not m:
2616 break
2616 break
2617 yield m.span()
2617 yield m.span()
2618 p = m.end()
2618 p = m.end()
2619
2619
2620 matches = {}
2620 matches = {}
2621 copies = {}
2621 copies = {}
2622 def grepbody(fn, rev, body):
2622 def grepbody(fn, rev, body):
2623 matches[rev].setdefault(fn, [])
2623 matches[rev].setdefault(fn, [])
2624 m = matches[rev][fn]
2624 m = matches[rev][fn]
2625 for lnum, cstart, cend, line in matchlines(body):
2625 for lnum, cstart, cend, line in matchlines(body):
2626 s = linestate(line, lnum, cstart, cend)
2626 s = linestate(line, lnum, cstart, cend)
2627 m.append(s)
2627 m.append(s)
2628
2628
2629 def difflinestates(a, b):
2629 def difflinestates(a, b):
2630 sm = difflib.SequenceMatcher(None, a, b)
2630 sm = difflib.SequenceMatcher(None, a, b)
2631 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2631 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2632 if tag == r'insert':
2632 if tag == r'insert':
2633 for i in pycompat.xrange(blo, bhi):
2633 for i in pycompat.xrange(blo, bhi):
2634 yield ('+', b[i])
2634 yield ('+', b[i])
2635 elif tag == r'delete':
2635 elif tag == r'delete':
2636 for i in pycompat.xrange(alo, ahi):
2636 for i in pycompat.xrange(alo, ahi):
2637 yield ('-', a[i])
2637 yield ('-', a[i])
2638 elif tag == r'replace':
2638 elif tag == r'replace':
2639 for i in pycompat.xrange(alo, ahi):
2639 for i in pycompat.xrange(alo, ahi):
2640 yield ('-', a[i])
2640 yield ('-', a[i])
2641 for i in pycompat.xrange(blo, bhi):
2641 for i in pycompat.xrange(blo, bhi):
2642 yield ('+', b[i])
2642 yield ('+', b[i])
2643
2643
2644 def display(fm, fn, ctx, pstates, states):
2644 def display(fm, fn, ctx, pstates, states):
2645 rev = scmutil.intrev(ctx)
2645 rev = scmutil.intrev(ctx)
2646 if fm.isplain():
2646 if fm.isplain():
2647 formatuser = ui.shortuser
2647 formatuser = ui.shortuser
2648 else:
2648 else:
2649 formatuser = pycompat.bytestr
2649 formatuser = pycompat.bytestr
2650 if ui.quiet:
2650 if ui.quiet:
2651 datefmt = '%Y-%m-%d'
2651 datefmt = '%Y-%m-%d'
2652 else:
2652 else:
2653 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2653 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2654 found = False
2654 found = False
2655 @util.cachefunc
2655 @util.cachefunc
2656 def binary():
2656 def binary():
2657 flog = getfile(fn)
2657 flog = getfile(fn)
2658 try:
2658 try:
2659 return stringutil.binary(flog.read(ctx.filenode(fn)))
2659 return stringutil.binary(flog.read(ctx.filenode(fn)))
2660 except error.WdirUnsupported:
2660 except error.WdirUnsupported:
2661 return ctx[fn].isbinary()
2661 return ctx[fn].isbinary()
2662
2662
2663 fieldnamemap = {'filename': 'path', 'linenumber': 'line_number'}
2663 fieldnamemap = {'filename': 'path', 'linenumber': 'line_number'}
2664 if diff:
2664 if diff:
2665 iter = difflinestates(pstates, states)
2665 iter = difflinestates(pstates, states)
2666 else:
2666 else:
2667 iter = [('', l) for l in states]
2667 iter = [('', l) for l in states]
2668 for change, l in iter:
2668 for change, l in iter:
2669 fm.startitem()
2669 fm.startitem()
2670 fm.context(ctx=ctx)
2670 fm.context(ctx=ctx)
2671 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2671 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2672
2672
2673 cols = [
2673 cols = [
2674 ('filename', '%s', fn, True),
2674 ('filename', '%s', fn, True),
2675 ('rev', '%d', rev, not plaingrep),
2675 ('rev', '%d', rev, not plaingrep),
2676 ('linenumber', '%d', l.linenum, opts.get('line_number')),
2676 ('linenumber', '%d', l.linenum, opts.get('line_number')),
2677 ]
2677 ]
2678 if diff:
2678 if diff:
2679 cols.append(('change', '%s', change, True))
2679 cols.append(('change', '%s', change, True))
2680 cols.extend([
2680 cols.extend([
2681 ('user', '%s', formatuser(ctx.user()), opts.get('user')),
2681 ('user', '%s', formatuser(ctx.user()), opts.get('user')),
2682 ('date', '%s', fm.formatdate(ctx.date(), datefmt),
2682 ('date', '%s', fm.formatdate(ctx.date(), datefmt),
2683 opts.get('date')),
2683 opts.get('date')),
2684 ])
2684 ])
2685 lastcol = next(
2685 lastcol = next(
2686 name for name, fmt, data, cond in reversed(cols) if cond)
2686 name for name, fmt, data, cond in reversed(cols) if cond)
2687 for name, fmt, data, cond in cols:
2687 for name, fmt, data, cond in cols:
2688 field = fieldnamemap.get(name, name)
2688 field = fieldnamemap.get(name, name)
2689 fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
2689 fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
2690 if cond and name != lastcol:
2690 if cond and name != lastcol:
2691 fm.plain(sep, label='grep.sep')
2691 fm.plain(sep, label='grep.sep')
2692 if not opts.get('files_with_matches'):
2692 if not opts.get('files_with_matches'):
2693 fm.plain(sep, label='grep.sep')
2693 fm.plain(sep, label='grep.sep')
2694 if not opts.get('text') and binary():
2694 if not opts.get('text') and binary():
2695 fm.plain(_(" Binary file matches"))
2695 fm.plain(_(" Binary file matches"))
2696 else:
2696 else:
2697 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2697 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2698 fm.plain(eol)
2698 fm.plain(eol)
2699 found = True
2699 found = True
2700 if opts.get('files_with_matches'):
2700 if opts.get('files_with_matches'):
2701 break
2701 break
2702 return found
2702 return found
2703
2703
2704 def displaymatches(fm, l):
2704 def displaymatches(fm, l):
2705 p = 0
2705 p = 0
2706 for s, e in l.findpos():
2706 for s, e in l.findpos():
2707 if p < s:
2707 if p < s:
2708 fm.startitem()
2708 fm.startitem()
2709 fm.write('text', '%s', l.line[p:s])
2709 fm.write('text', '%s', l.line[p:s])
2710 fm.data(matched=False)
2710 fm.data(matched=False)
2711 fm.startitem()
2711 fm.startitem()
2712 fm.write('text', '%s', l.line[s:e], label='grep.match')
2712 fm.write('text', '%s', l.line[s:e], label='grep.match')
2713 fm.data(matched=True)
2713 fm.data(matched=True)
2714 p = e
2714 p = e
2715 if p < len(l.line):
2715 if p < len(l.line):
2716 fm.startitem()
2716 fm.startitem()
2717 fm.write('text', '%s', l.line[p:])
2717 fm.write('text', '%s', l.line[p:])
2718 fm.data(matched=False)
2718 fm.data(matched=False)
2719 fm.end()
2719 fm.end()
2720
2720
2721 skip = {}
2721 skip = {}
2722 revfiles = {}
2722 revfiles = {}
2723 match = scmutil.match(repo[None], pats, opts)
2723 match = scmutil.match(repo[None], pats, opts)
2724 found = False
2724 found = False
2725 follow = opts.get('follow')
2725 follow = opts.get('follow')
2726
2726
2727 def prep(ctx, fns):
2727 def prep(ctx, fns):
2728 rev = ctx.rev()
2728 rev = ctx.rev()
2729 pctx = ctx.p1()
2729 pctx = ctx.p1()
2730 parent = pctx.rev()
2730 parent = pctx.rev()
2731 matches.setdefault(rev, {})
2731 matches.setdefault(rev, {})
2732 matches.setdefault(parent, {})
2732 matches.setdefault(parent, {})
2733 files = revfiles.setdefault(rev, [])
2733 files = revfiles.setdefault(rev, [])
2734 for fn in fns:
2734 for fn in fns:
2735 flog = getfile(fn)
2735 flog = getfile(fn)
2736 try:
2736 try:
2737 fnode = ctx.filenode(fn)
2737 fnode = ctx.filenode(fn)
2738 except error.LookupError:
2738 except error.LookupError:
2739 continue
2739 continue
2740 try:
2740 try:
2741 copied = flog.renamed(fnode)
2741 copied = flog.renamed(fnode)
2742 except error.WdirUnsupported:
2742 except error.WdirUnsupported:
2743 copied = ctx[fn].renamed()
2743 copied = ctx[fn].renamed()
2744 copy = follow and copied and copied[0]
2744 copy = follow and copied and copied[0]
2745 if copy:
2745 if copy:
2746 copies.setdefault(rev, {})[fn] = copy
2746 copies.setdefault(rev, {})[fn] = copy
2747 if fn in skip:
2747 if fn in skip:
2748 if copy:
2748 if copy:
2749 skip[copy] = True
2749 skip[copy] = True
2750 continue
2750 continue
2751 files.append(fn)
2751 files.append(fn)
2752
2752
2753 if fn not in matches[rev]:
2753 if fn not in matches[rev]:
2754 try:
2754 try:
2755 content = flog.read(fnode)
2755 content = flog.read(fnode)
2756 except error.WdirUnsupported:
2756 except error.WdirUnsupported:
2757 content = ctx[fn].data()
2757 content = ctx[fn].data()
2758 grepbody(fn, rev, content)
2758 grepbody(fn, rev, content)
2759
2759
2760 pfn = copy or fn
2760 pfn = copy or fn
2761 if pfn not in matches[parent]:
2761 if pfn not in matches[parent]:
2762 try:
2762 try:
2763 fnode = pctx.filenode(pfn)
2763 fnode = pctx.filenode(pfn)
2764 grepbody(pfn, parent, flog.read(fnode))
2764 grepbody(pfn, parent, flog.read(fnode))
2765 except error.LookupError:
2765 except error.LookupError:
2766 pass
2766 pass
2767
2767
2768 ui.pager('grep')
2768 ui.pager('grep')
2769 fm = ui.formatter('grep', opts)
2769 fm = ui.formatter('grep', opts)
2770 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2770 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2771 rev = ctx.rev()
2771 rev = ctx.rev()
2772 parent = ctx.p1().rev()
2772 parent = ctx.p1().rev()
2773 for fn in sorted(revfiles.get(rev, [])):
2773 for fn in sorted(revfiles.get(rev, [])):
2774 states = matches[rev][fn]
2774 states = matches[rev][fn]
2775 copy = copies.get(rev, {}).get(fn)
2775 copy = copies.get(rev, {}).get(fn)
2776 if fn in skip:
2776 if fn in skip:
2777 if copy:
2777 if copy:
2778 skip[copy] = True
2778 skip[copy] = True
2779 continue
2779 continue
2780 pstates = matches.get(parent, {}).get(copy or fn, [])
2780 pstates = matches.get(parent, {}).get(copy or fn, [])
2781 if pstates or states:
2781 if pstates or states:
2782 r = display(fm, fn, ctx, pstates, states)
2782 r = display(fm, fn, ctx, pstates, states)
2783 found = found or r
2783 found = found or r
2784 if r and not diff and not all_files:
2784 if r and not diff and not all_files:
2785 skip[fn] = True
2785 skip[fn] = True
2786 if copy:
2786 if copy:
2787 skip[copy] = True
2787 skip[copy] = True
2788 del revfiles[rev]
2788 del revfiles[rev]
2789 # We will keep the matches dict for the duration of the window
2789 # We will keep the matches dict for the duration of the window
2790 # clear the matches dict once the window is over
2790 # clear the matches dict once the window is over
2791 if not revfiles:
2791 if not revfiles:
2792 matches.clear()
2792 matches.clear()
2793 fm.end()
2793 fm.end()
2794
2794
2795 return not found
2795 return not found
2796
2796
2797 @command('heads',
2797 @command('heads',
2798 [('r', 'rev', '',
2798 [('r', 'rev', '',
2799 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2799 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2800 ('t', 'topo', False, _('show topological heads only')),
2800 ('t', 'topo', False, _('show topological heads only')),
2801 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2801 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2802 ('c', 'closed', False, _('show normal and closed branch heads')),
2802 ('c', 'closed', False, _('show normal and closed branch heads')),
2803 ] + templateopts,
2803 ] + templateopts,
2804 _('[-ct] [-r STARTREV] [REV]...'),
2804 _('[-ct] [-r STARTREV] [REV]...'),
2805 intents={INTENT_READONLY})
2805 intents={INTENT_READONLY})
2806 def heads(ui, repo, *branchrevs, **opts):
2806 def heads(ui, repo, *branchrevs, **opts):
2807 """show branch heads
2807 """show branch heads
2808
2808
2809 With no arguments, show all open branch heads in the repository.
2809 With no arguments, show all open branch heads in the repository.
2810 Branch heads are changesets that have no descendants on the
2810 Branch heads are changesets that have no descendants on the
2811 same branch. They are where development generally takes place and
2811 same branch. They are where development generally takes place and
2812 are the usual targets for update and merge operations.
2812 are the usual targets for update and merge operations.
2813
2813
2814 If one or more REVs are given, only open branch heads on the
2814 If one or more REVs are given, only open branch heads on the
2815 branches associated with the specified changesets are shown. This
2815 branches associated with the specified changesets are shown. This
2816 means that you can use :hg:`heads .` to see the heads on the
2816 means that you can use :hg:`heads .` to see the heads on the
2817 currently checked-out branch.
2817 currently checked-out branch.
2818
2818
2819 If -c/--closed is specified, also show branch heads marked closed
2819 If -c/--closed is specified, also show branch heads marked closed
2820 (see :hg:`commit --close-branch`).
2820 (see :hg:`commit --close-branch`).
2821
2821
2822 If STARTREV is specified, only those heads that are descendants of
2822 If STARTREV is specified, only those heads that are descendants of
2823 STARTREV will be displayed.
2823 STARTREV will be displayed.
2824
2824
2825 If -t/--topo is specified, named branch mechanics will be ignored and only
2825 If -t/--topo is specified, named branch mechanics will be ignored and only
2826 topological heads (changesets with no children) will be shown.
2826 topological heads (changesets with no children) will be shown.
2827
2827
2828 Returns 0 if matching heads are found, 1 if not.
2828 Returns 0 if matching heads are found, 1 if not.
2829 """
2829 """
2830
2830
2831 opts = pycompat.byteskwargs(opts)
2831 opts = pycompat.byteskwargs(opts)
2832 start = None
2832 start = None
2833 rev = opts.get('rev')
2833 rev = opts.get('rev')
2834 if rev:
2834 if rev:
2835 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2835 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2836 start = scmutil.revsingle(repo, rev, None).node()
2836 start = scmutil.revsingle(repo, rev, None).node()
2837
2837
2838 if opts.get('topo'):
2838 if opts.get('topo'):
2839 heads = [repo[h] for h in repo.heads(start)]
2839 heads = [repo[h] for h in repo.heads(start)]
2840 else:
2840 else:
2841 heads = []
2841 heads = []
2842 for branch in repo.branchmap():
2842 for branch in repo.branchmap():
2843 heads += repo.branchheads(branch, start, opts.get('closed'))
2843 heads += repo.branchheads(branch, start, opts.get('closed'))
2844 heads = [repo[h] for h in heads]
2844 heads = [repo[h] for h in heads]
2845
2845
2846 if branchrevs:
2846 if branchrevs:
2847 branches = set(repo[r].branch()
2847 branches = set(repo[r].branch()
2848 for r in scmutil.revrange(repo, branchrevs))
2848 for r in scmutil.revrange(repo, branchrevs))
2849 heads = [h for h in heads if h.branch() in branches]
2849 heads = [h for h in heads if h.branch() in branches]
2850
2850
2851 if opts.get('active') and branchrevs:
2851 if opts.get('active') and branchrevs:
2852 dagheads = repo.heads(start)
2852 dagheads = repo.heads(start)
2853 heads = [h for h in heads if h.node() in dagheads]
2853 heads = [h for h in heads if h.node() in dagheads]
2854
2854
2855 if branchrevs:
2855 if branchrevs:
2856 haveheads = set(h.branch() for h in heads)
2856 haveheads = set(h.branch() for h in heads)
2857 if branches - haveheads:
2857 if branches - haveheads:
2858 headless = ', '.join(b for b in branches - haveheads)
2858 headless = ', '.join(b for b in branches - haveheads)
2859 msg = _('no open branch heads found on branches %s')
2859 msg = _('no open branch heads found on branches %s')
2860 if opts.get('rev'):
2860 if opts.get('rev'):
2861 msg += _(' (started at %s)') % opts['rev']
2861 msg += _(' (started at %s)') % opts['rev']
2862 ui.warn((msg + '\n') % headless)
2862 ui.warn((msg + '\n') % headless)
2863
2863
2864 if not heads:
2864 if not heads:
2865 return 1
2865 return 1
2866
2866
2867 ui.pager('heads')
2867 ui.pager('heads')
2868 heads = sorted(heads, key=lambda x: -x.rev())
2868 heads = sorted(heads, key=lambda x: -x.rev())
2869 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2869 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2870 for ctx in heads:
2870 for ctx in heads:
2871 displayer.show(ctx)
2871 displayer.show(ctx)
2872 displayer.close()
2872 displayer.close()
2873
2873
2874 @command('help',
2874 @command('help',
2875 [('e', 'extension', None, _('show only help for extensions')),
2875 [('e', 'extension', None, _('show only help for extensions')),
2876 ('c', 'command', None, _('show only help for commands')),
2876 ('c', 'command', None, _('show only help for commands')),
2877 ('k', 'keyword', None, _('show topics matching keyword')),
2877 ('k', 'keyword', None, _('show topics matching keyword')),
2878 ('s', 'system', [], _('show help for specific platform(s)')),
2878 ('s', 'system', [], _('show help for specific platform(s)')),
2879 ],
2879 ],
2880 _('[-ecks] [TOPIC]'),
2880 _('[-ecks] [TOPIC]'),
2881 norepo=True,
2881 norepo=True,
2882 intents={INTENT_READONLY})
2882 intents={INTENT_READONLY})
2883 def help_(ui, name=None, **opts):
2883 def help_(ui, name=None, **opts):
2884 """show help for a given topic or a help overview
2884 """show help for a given topic or a help overview
2885
2885
2886 With no arguments, print a list of commands with short help messages.
2886 With no arguments, print a list of commands with short help messages.
2887
2887
2888 Given a topic, extension, or command name, print help for that
2888 Given a topic, extension, or command name, print help for that
2889 topic.
2889 topic.
2890
2890
2891 Returns 0 if successful.
2891 Returns 0 if successful.
2892 """
2892 """
2893
2893
2894 keep = opts.get(r'system') or []
2894 keep = opts.get(r'system') or []
2895 if len(keep) == 0:
2895 if len(keep) == 0:
2896 if pycompat.sysplatform.startswith('win'):
2896 if pycompat.sysplatform.startswith('win'):
2897 keep.append('windows')
2897 keep.append('windows')
2898 elif pycompat.sysplatform == 'OpenVMS':
2898 elif pycompat.sysplatform == 'OpenVMS':
2899 keep.append('vms')
2899 keep.append('vms')
2900 elif pycompat.sysplatform == 'plan9':
2900 elif pycompat.sysplatform == 'plan9':
2901 keep.append('plan9')
2901 keep.append('plan9')
2902 else:
2902 else:
2903 keep.append('unix')
2903 keep.append('unix')
2904 keep.append(pycompat.sysplatform.lower())
2904 keep.append(pycompat.sysplatform.lower())
2905 if ui.verbose:
2905 if ui.verbose:
2906 keep.append('verbose')
2906 keep.append('verbose')
2907
2907
2908 commands = sys.modules[__name__]
2908 commands = sys.modules[__name__]
2909 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2909 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2910 ui.pager('help')
2910 ui.pager('help')
2911 ui.write(formatted)
2911 ui.write(formatted)
2912
2912
2913
2913
2914 @command('identify|id',
2914 @command('identify|id',
2915 [('r', 'rev', '',
2915 [('r', 'rev', '',
2916 _('identify the specified revision'), _('REV')),
2916 _('identify the specified revision'), _('REV')),
2917 ('n', 'num', None, _('show local revision number')),
2917 ('n', 'num', None, _('show local revision number')),
2918 ('i', 'id', None, _('show global revision id')),
2918 ('i', 'id', None, _('show global revision id')),
2919 ('b', 'branch', None, _('show branch')),
2919 ('b', 'branch', None, _('show branch')),
2920 ('t', 'tags', None, _('show tags')),
2920 ('t', 'tags', None, _('show tags')),
2921 ('B', 'bookmarks', None, _('show bookmarks')),
2921 ('B', 'bookmarks', None, _('show bookmarks')),
2922 ] + remoteopts + formatteropts,
2922 ] + remoteopts + formatteropts,
2923 _('[-nibtB] [-r REV] [SOURCE]'),
2923 _('[-nibtB] [-r REV] [SOURCE]'),
2924 optionalrepo=True,
2924 optionalrepo=True,
2925 intents={INTENT_READONLY})
2925 intents={INTENT_READONLY})
2926 def identify(ui, repo, source=None, rev=None,
2926 def identify(ui, repo, source=None, rev=None,
2927 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2927 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2928 """identify the working directory or specified revision
2928 """identify the working directory or specified revision
2929
2929
2930 Print a summary identifying the repository state at REV using one or
2930 Print a summary identifying the repository state at REV using one or
2931 two parent hash identifiers, followed by a "+" if the working
2931 two parent hash identifiers, followed by a "+" if the working
2932 directory has uncommitted changes, the branch name (if not default),
2932 directory has uncommitted changes, the branch name (if not default),
2933 a list of tags, and a list of bookmarks.
2933 a list of tags, and a list of bookmarks.
2934
2934
2935 When REV is not given, print a summary of the current state of the
2935 When REV is not given, print a summary of the current state of the
2936 repository including the working directory. Specify -r. to get information
2936 repository including the working directory. Specify -r. to get information
2937 of the working directory parent without scanning uncommitted changes.
2937 of the working directory parent without scanning uncommitted changes.
2938
2938
2939 Specifying a path to a repository root or Mercurial bundle will
2939 Specifying a path to a repository root or Mercurial bundle will
2940 cause lookup to operate on that repository/bundle.
2940 cause lookup to operate on that repository/bundle.
2941
2941
2942 .. container:: verbose
2942 .. container:: verbose
2943
2943
2944 Examples:
2944 Examples:
2945
2945
2946 - generate a build identifier for the working directory::
2946 - generate a build identifier for the working directory::
2947
2947
2948 hg id --id > build-id.dat
2948 hg id --id > build-id.dat
2949
2949
2950 - find the revision corresponding to a tag::
2950 - find the revision corresponding to a tag::
2951
2951
2952 hg id -n -r 1.3
2952 hg id -n -r 1.3
2953
2953
2954 - check the most recent revision of a remote repository::
2954 - check the most recent revision of a remote repository::
2955
2955
2956 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2956 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2957
2957
2958 See :hg:`log` for generating more information about specific revisions,
2958 See :hg:`log` for generating more information about specific revisions,
2959 including full hash identifiers.
2959 including full hash identifiers.
2960
2960
2961 Returns 0 if successful.
2961 Returns 0 if successful.
2962 """
2962 """
2963
2963
2964 opts = pycompat.byteskwargs(opts)
2964 opts = pycompat.byteskwargs(opts)
2965 if not repo and not source:
2965 if not repo and not source:
2966 raise error.Abort(_("there is no Mercurial repository here "
2966 raise error.Abort(_("there is no Mercurial repository here "
2967 "(.hg not found)"))
2967 "(.hg not found)"))
2968
2968
2969 if ui.debugflag:
2969 if ui.debugflag:
2970 hexfunc = hex
2970 hexfunc = hex
2971 else:
2971 else:
2972 hexfunc = short
2972 hexfunc = short
2973 default = not (num or id or branch or tags or bookmarks)
2973 default = not (num or id or branch or tags or bookmarks)
2974 output = []
2974 output = []
2975 revs = []
2975 revs = []
2976
2976
2977 if source:
2977 if source:
2978 source, branches = hg.parseurl(ui.expandpath(source))
2978 source, branches = hg.parseurl(ui.expandpath(source))
2979 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2979 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2980 repo = peer.local()
2980 repo = peer.local()
2981 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2981 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2982
2982
2983 fm = ui.formatter('identify', opts)
2983 fm = ui.formatter('identify', opts)
2984 fm.startitem()
2984 fm.startitem()
2985
2985
2986 if not repo:
2986 if not repo:
2987 if num or branch or tags:
2987 if num or branch or tags:
2988 raise error.Abort(
2988 raise error.Abort(
2989 _("can't query remote revision number, branch, or tags"))
2989 _("can't query remote revision number, branch, or tags"))
2990 if not rev and revs:
2990 if not rev and revs:
2991 rev = revs[0]
2991 rev = revs[0]
2992 if not rev:
2992 if not rev:
2993 rev = "tip"
2993 rev = "tip"
2994
2994
2995 remoterev = peer.lookup(rev)
2995 remoterev = peer.lookup(rev)
2996 hexrev = hexfunc(remoterev)
2996 hexrev = hexfunc(remoterev)
2997 if default or id:
2997 if default or id:
2998 output = [hexrev]
2998 output = [hexrev]
2999 fm.data(id=hexrev)
2999 fm.data(id=hexrev)
3000
3000
3001 def getbms():
3001 def getbms():
3002 bms = []
3002 bms = []
3003
3003
3004 if 'bookmarks' in peer.listkeys('namespaces'):
3004 if 'bookmarks' in peer.listkeys('namespaces'):
3005 hexremoterev = hex(remoterev)
3005 hexremoterev = hex(remoterev)
3006 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3006 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3007 if bmr == hexremoterev]
3007 if bmr == hexremoterev]
3008
3008
3009 return sorted(bms)
3009 return sorted(bms)
3010
3010
3011 bms = getbms()
3011 bms = getbms()
3012 if bookmarks:
3012 if bookmarks:
3013 output.extend(bms)
3013 output.extend(bms)
3014 elif default and not ui.quiet:
3014 elif default and not ui.quiet:
3015 # multiple bookmarks for a single parent separated by '/'
3015 # multiple bookmarks for a single parent separated by '/'
3016 bm = '/'.join(bms)
3016 bm = '/'.join(bms)
3017 if bm:
3017 if bm:
3018 output.append(bm)
3018 output.append(bm)
3019
3019
3020 fm.data(node=hex(remoterev))
3020 fm.data(node=hex(remoterev))
3021 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
3021 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
3022 else:
3022 else:
3023 if rev:
3023 if rev:
3024 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3024 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3025 ctx = scmutil.revsingle(repo, rev, None)
3025 ctx = scmutil.revsingle(repo, rev, None)
3026
3026
3027 if ctx.rev() is None:
3027 if ctx.rev() is None:
3028 ctx = repo[None]
3028 ctx = repo[None]
3029 parents = ctx.parents()
3029 parents = ctx.parents()
3030 taglist = []
3030 taglist = []
3031 for p in parents:
3031 for p in parents:
3032 taglist.extend(p.tags())
3032 taglist.extend(p.tags())
3033
3033
3034 dirty = ""
3034 dirty = ""
3035 if ctx.dirty(missing=True, merge=False, branch=False):
3035 if ctx.dirty(missing=True, merge=False, branch=False):
3036 dirty = '+'
3036 dirty = '+'
3037 fm.data(dirty=dirty)
3037 fm.data(dirty=dirty)
3038
3038
3039 hexoutput = [hexfunc(p.node()) for p in parents]
3039 hexoutput = [hexfunc(p.node()) for p in parents]
3040 if default or id:
3040 if default or id:
3041 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
3041 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
3042 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
3042 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
3043
3043
3044 if num:
3044 if num:
3045 numoutput = ["%d" % p.rev() for p in parents]
3045 numoutput = ["%d" % p.rev() for p in parents]
3046 output.append("%s%s" % ('+'.join(numoutput), dirty))
3046 output.append("%s%s" % ('+'.join(numoutput), dirty))
3047
3047
3048 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
3048 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
3049 for p in parents:
3049 for p in parents:
3050 fn.startitem()
3050 fn.startitem()
3051 fn.data(rev=p.rev())
3051 fn.data(rev=p.rev())
3052 fn.data(node=p.hex())
3052 fn.data(node=p.hex())
3053 fn.context(ctx=p)
3053 fn.context(ctx=p)
3054 fn.end()
3054 fn.end()
3055 else:
3055 else:
3056 hexoutput = hexfunc(ctx.node())
3056 hexoutput = hexfunc(ctx.node())
3057 if default or id:
3057 if default or id:
3058 output = [hexoutput]
3058 output = [hexoutput]
3059 fm.data(id=hexoutput)
3059 fm.data(id=hexoutput)
3060
3060
3061 if num:
3061 if num:
3062 output.append(pycompat.bytestr(ctx.rev()))
3062 output.append(pycompat.bytestr(ctx.rev()))
3063 taglist = ctx.tags()
3063 taglist = ctx.tags()
3064
3064
3065 if default and not ui.quiet:
3065 if default and not ui.quiet:
3066 b = ctx.branch()
3066 b = ctx.branch()
3067 if b != 'default':
3067 if b != 'default':
3068 output.append("(%s)" % b)
3068 output.append("(%s)" % b)
3069
3069
3070 # multiple tags for a single parent separated by '/'
3070 # multiple tags for a single parent separated by '/'
3071 t = '/'.join(taglist)
3071 t = '/'.join(taglist)
3072 if t:
3072 if t:
3073 output.append(t)
3073 output.append(t)
3074
3074
3075 # multiple bookmarks for a single parent separated by '/'
3075 # multiple bookmarks for a single parent separated by '/'
3076 bm = '/'.join(ctx.bookmarks())
3076 bm = '/'.join(ctx.bookmarks())
3077 if bm:
3077 if bm:
3078 output.append(bm)
3078 output.append(bm)
3079 else:
3079 else:
3080 if branch:
3080 if branch:
3081 output.append(ctx.branch())
3081 output.append(ctx.branch())
3082
3082
3083 if tags:
3083 if tags:
3084 output.extend(taglist)
3084 output.extend(taglist)
3085
3085
3086 if bookmarks:
3086 if bookmarks:
3087 output.extend(ctx.bookmarks())
3087 output.extend(ctx.bookmarks())
3088
3088
3089 fm.data(node=ctx.hex())
3089 fm.data(node=ctx.hex())
3090 fm.data(branch=ctx.branch())
3090 fm.data(branch=ctx.branch())
3091 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
3091 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
3092 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
3092 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
3093 fm.context(ctx=ctx)
3093 fm.context(ctx=ctx)
3094
3094
3095 fm.plain("%s\n" % ' '.join(output))
3095 fm.plain("%s\n" % ' '.join(output))
3096 fm.end()
3096 fm.end()
3097
3097
3098 @command('import|patch',
3098 @command('import|patch',
3099 [('p', 'strip', 1,
3099 [('p', 'strip', 1,
3100 _('directory strip option for patch. This has the same '
3100 _('directory strip option for patch. This has the same '
3101 'meaning as the corresponding patch option'), _('NUM')),
3101 'meaning as the corresponding patch option'), _('NUM')),
3102 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3102 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3103 ('e', 'edit', False, _('invoke editor on commit messages')),
3103 ('e', 'edit', False, _('invoke editor on commit messages')),
3104 ('f', 'force', None,
3104 ('f', 'force', None,
3105 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3105 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3106 ('', 'no-commit', None,
3106 ('', 'no-commit', None,
3107 _("don't commit, just update the working directory")),
3107 _("don't commit, just update the working directory")),
3108 ('', 'bypass', None,
3108 ('', 'bypass', None,
3109 _("apply patch without touching the working directory")),
3109 _("apply patch without touching the working directory")),
3110 ('', 'partial', None,
3110 ('', 'partial', None,
3111 _('commit even if some hunks fail')),
3111 _('commit even if some hunks fail')),
3112 ('', 'exact', None,
3112 ('', 'exact', None,
3113 _('abort if patch would apply lossily')),
3113 _('abort if patch would apply lossily')),
3114 ('', 'prefix', '',
3114 ('', 'prefix', '',
3115 _('apply patch to subdirectory'), _('DIR')),
3115 _('apply patch to subdirectory'), _('DIR')),
3116 ('', 'import-branch', None,
3116 ('', 'import-branch', None,
3117 _('use any branch information in patch (implied by --exact)'))] +
3117 _('use any branch information in patch (implied by --exact)'))] +
3118 commitopts + commitopts2 + similarityopts,
3118 commitopts + commitopts2 + similarityopts,
3119 _('[OPTION]... PATCH...'))
3119 _('[OPTION]... PATCH...'))
3120 def import_(ui, repo, patch1=None, *patches, **opts):
3120 def import_(ui, repo, patch1=None, *patches, **opts):
3121 """import an ordered set of patches
3121 """import an ordered set of patches
3122
3122
3123 Import a list of patches and commit them individually (unless
3123 Import a list of patches and commit them individually (unless
3124 --no-commit is specified).
3124 --no-commit is specified).
3125
3125
3126 To read a patch from standard input (stdin), use "-" as the patch
3126 To read a patch from standard input (stdin), use "-" as the patch
3127 name. If a URL is specified, the patch will be downloaded from
3127 name. If a URL is specified, the patch will be downloaded from
3128 there.
3128 there.
3129
3129
3130 Import first applies changes to the working directory (unless
3130 Import first applies changes to the working directory (unless
3131 --bypass is specified), import will abort if there are outstanding
3131 --bypass is specified), import will abort if there are outstanding
3132 changes.
3132 changes.
3133
3133
3134 Use --bypass to apply and commit patches directly to the
3134 Use --bypass to apply and commit patches directly to the
3135 repository, without affecting the working directory. Without
3135 repository, without affecting the working directory. Without
3136 --exact, patches will be applied on top of the working directory
3136 --exact, patches will be applied on top of the working directory
3137 parent revision.
3137 parent revision.
3138
3138
3139 You can import a patch straight from a mail message. Even patches
3139 You can import a patch straight from a mail message. Even patches
3140 as attachments work (to use the body part, it must have type
3140 as attachments work (to use the body part, it must have type
3141 text/plain or text/x-patch). From and Subject headers of email
3141 text/plain or text/x-patch). From and Subject headers of email
3142 message are used as default committer and commit message. All
3142 message are used as default committer and commit message. All
3143 text/plain body parts before first diff are added to the commit
3143 text/plain body parts before first diff are added to the commit
3144 message.
3144 message.
3145
3145
3146 If the imported patch was generated by :hg:`export`, user and
3146 If the imported patch was generated by :hg:`export`, user and
3147 description from patch override values from message headers and
3147 description from patch override values from message headers and
3148 body. Values given on command line with -m/--message and -u/--user
3148 body. Values given on command line with -m/--message and -u/--user
3149 override these.
3149 override these.
3150
3150
3151 If --exact is specified, import will set the working directory to
3151 If --exact is specified, import will set the working directory to
3152 the parent of each patch before applying it, and will abort if the
3152 the parent of each patch before applying it, and will abort if the
3153 resulting changeset has a different ID than the one recorded in
3153 resulting changeset has a different ID than the one recorded in
3154 the patch. This will guard against various ways that portable
3154 the patch. This will guard against various ways that portable
3155 patch formats and mail systems might fail to transfer Mercurial
3155 patch formats and mail systems might fail to transfer Mercurial
3156 data or metadata. See :hg:`bundle` for lossless transmission.
3156 data or metadata. See :hg:`bundle` for lossless transmission.
3157
3157
3158 Use --partial to ensure a changeset will be created from the patch
3158 Use --partial to ensure a changeset will be created from the patch
3159 even if some hunks fail to apply. Hunks that fail to apply will be
3159 even if some hunks fail to apply. Hunks that fail to apply will be
3160 written to a <target-file>.rej file. Conflicts can then be resolved
3160 written to a <target-file>.rej file. Conflicts can then be resolved
3161 by hand before :hg:`commit --amend` is run to update the created
3161 by hand before :hg:`commit --amend` is run to update the created
3162 changeset. This flag exists to let people import patches that
3162 changeset. This flag exists to let people import patches that
3163 partially apply without losing the associated metadata (author,
3163 partially apply without losing the associated metadata (author,
3164 date, description, ...).
3164 date, description, ...).
3165
3165
3166 .. note::
3166 .. note::
3167
3167
3168 When no hunks apply cleanly, :hg:`import --partial` will create
3168 When no hunks apply cleanly, :hg:`import --partial` will create
3169 an empty changeset, importing only the patch metadata.
3169 an empty changeset, importing only the patch metadata.
3170
3170
3171 With -s/--similarity, hg will attempt to discover renames and
3171 With -s/--similarity, hg will attempt to discover renames and
3172 copies in the patch in the same way as :hg:`addremove`.
3172 copies in the patch in the same way as :hg:`addremove`.
3173
3173
3174 It is possible to use external patch programs to perform the patch
3174 It is possible to use external patch programs to perform the patch
3175 by setting the ``ui.patch`` configuration option. For the default
3175 by setting the ``ui.patch`` configuration option. For the default
3176 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3176 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3177 See :hg:`help config` for more information about configuration
3177 See :hg:`help config` for more information about configuration
3178 files and how to use these options.
3178 files and how to use these options.
3179
3179
3180 See :hg:`help dates` for a list of formats valid for -d/--date.
3180 See :hg:`help dates` for a list of formats valid for -d/--date.
3181
3181
3182 .. container:: verbose
3182 .. container:: verbose
3183
3183
3184 Examples:
3184 Examples:
3185
3185
3186 - import a traditional patch from a website and detect renames::
3186 - import a traditional patch from a website and detect renames::
3187
3187
3188 hg import -s 80 http://example.com/bugfix.patch
3188 hg import -s 80 http://example.com/bugfix.patch
3189
3189
3190 - import a changeset from an hgweb server::
3190 - import a changeset from an hgweb server::
3191
3191
3192 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3192 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3193
3193
3194 - import all the patches in an Unix-style mbox::
3194 - import all the patches in an Unix-style mbox::
3195
3195
3196 hg import incoming-patches.mbox
3196 hg import incoming-patches.mbox
3197
3197
3198 - import patches from stdin::
3198 - import patches from stdin::
3199
3199
3200 hg import -
3200 hg import -
3201
3201
3202 - attempt to exactly restore an exported changeset (not always
3202 - attempt to exactly restore an exported changeset (not always
3203 possible)::
3203 possible)::
3204
3204
3205 hg import --exact proposed-fix.patch
3205 hg import --exact proposed-fix.patch
3206
3206
3207 - use an external tool to apply a patch which is too fuzzy for
3207 - use an external tool to apply a patch which is too fuzzy for
3208 the default internal tool.
3208 the default internal tool.
3209
3209
3210 hg import --config ui.patch="patch --merge" fuzzy.patch
3210 hg import --config ui.patch="patch --merge" fuzzy.patch
3211
3211
3212 - change the default fuzzing from 2 to a less strict 7
3212 - change the default fuzzing from 2 to a less strict 7
3213
3213
3214 hg import --config ui.fuzz=7 fuzz.patch
3214 hg import --config ui.fuzz=7 fuzz.patch
3215
3215
3216 Returns 0 on success, 1 on partial success (see --partial).
3216 Returns 0 on success, 1 on partial success (see --partial).
3217 """
3217 """
3218
3218
3219 opts = pycompat.byteskwargs(opts)
3219 opts = pycompat.byteskwargs(opts)
3220 if not patch1:
3220 if not patch1:
3221 raise error.Abort(_('need at least one patch to import'))
3221 raise error.Abort(_('need at least one patch to import'))
3222
3222
3223 patches = (patch1,) + patches
3223 patches = (patch1,) + patches
3224
3224
3225 date = opts.get('date')
3225 date = opts.get('date')
3226 if date:
3226 if date:
3227 opts['date'] = dateutil.parsedate(date)
3227 opts['date'] = dateutil.parsedate(date)
3228
3228
3229 exact = opts.get('exact')
3229 exact = opts.get('exact')
3230 update = not opts.get('bypass')
3230 update = not opts.get('bypass')
3231 if not update and opts.get('no_commit'):
3231 if not update and opts.get('no_commit'):
3232 raise error.Abort(_('cannot use --no-commit with --bypass'))
3232 raise error.Abort(_('cannot use --no-commit with --bypass'))
3233 try:
3233 try:
3234 sim = float(opts.get('similarity') or 0)
3234 sim = float(opts.get('similarity') or 0)
3235 except ValueError:
3235 except ValueError:
3236 raise error.Abort(_('similarity must be a number'))
3236 raise error.Abort(_('similarity must be a number'))
3237 if sim < 0 or sim > 100:
3237 if sim < 0 or sim > 100:
3238 raise error.Abort(_('similarity must be between 0 and 100'))
3238 raise error.Abort(_('similarity must be between 0 and 100'))
3239 if sim and not update:
3239 if sim and not update:
3240 raise error.Abort(_('cannot use --similarity with --bypass'))
3240 raise error.Abort(_('cannot use --similarity with --bypass'))
3241 if exact:
3241 if exact:
3242 if opts.get('edit'):
3242 if opts.get('edit'):
3243 raise error.Abort(_('cannot use --exact with --edit'))
3243 raise error.Abort(_('cannot use --exact with --edit'))
3244 if opts.get('prefix'):
3244 if opts.get('prefix'):
3245 raise error.Abort(_('cannot use --exact with --prefix'))
3245 raise error.Abort(_('cannot use --exact with --prefix'))
3246
3246
3247 base = opts["base"]
3247 base = opts["base"]
3248 msgs = []
3248 msgs = []
3249 ret = 0
3249 ret = 0
3250
3250
3251 with repo.wlock():
3251 with repo.wlock():
3252 if update:
3252 if update:
3253 cmdutil.checkunfinished(repo)
3253 cmdutil.checkunfinished(repo)
3254 if (exact or not opts.get('force')):
3254 if (exact or not opts.get('force')):
3255 cmdutil.bailifchanged(repo)
3255 cmdutil.bailifchanged(repo)
3256
3256
3257 if not opts.get('no_commit'):
3257 if not opts.get('no_commit'):
3258 lock = repo.lock
3258 lock = repo.lock
3259 tr = lambda: repo.transaction('import')
3259 tr = lambda: repo.transaction('import')
3260 dsguard = util.nullcontextmanager
3260 dsguard = util.nullcontextmanager
3261 else:
3261 else:
3262 lock = util.nullcontextmanager
3262 lock = util.nullcontextmanager
3263 tr = util.nullcontextmanager
3263 tr = util.nullcontextmanager
3264 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3264 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3265 with lock(), tr(), dsguard():
3265 with lock(), tr(), dsguard():
3266 parents = repo[None].parents()
3266 parents = repo[None].parents()
3267 for patchurl in patches:
3267 for patchurl in patches:
3268 if patchurl == '-':
3268 if patchurl == '-':
3269 ui.status(_('applying patch from stdin\n'))
3269 ui.status(_('applying patch from stdin\n'))
3270 patchfile = ui.fin
3270 patchfile = ui.fin
3271 patchurl = 'stdin' # for error message
3271 patchurl = 'stdin' # for error message
3272 else:
3272 else:
3273 patchurl = os.path.join(base, patchurl)
3273 patchurl = os.path.join(base, patchurl)
3274 ui.status(_('applying %s\n') % patchurl)
3274 ui.status(_('applying %s\n') % patchurl)
3275 patchfile = hg.openpath(ui, patchurl)
3275 patchfile = hg.openpath(ui, patchurl)
3276
3276
3277 haspatch = False
3277 haspatch = False
3278 for hunk in patch.split(patchfile):
3278 for hunk in patch.split(patchfile):
3279 with patch.extract(ui, hunk) as patchdata:
3279 with patch.extract(ui, hunk) as patchdata:
3280 msg, node, rej = cmdutil.tryimportone(ui, repo,
3280 msg, node, rej = cmdutil.tryimportone(ui, repo,
3281 patchdata,
3281 patchdata,
3282 parents, opts,
3282 parents, opts,
3283 msgs, hg.clean)
3283 msgs, hg.clean)
3284 if msg:
3284 if msg:
3285 haspatch = True
3285 haspatch = True
3286 ui.note(msg + '\n')
3286 ui.note(msg + '\n')
3287 if update or exact:
3287 if update or exact:
3288 parents = repo[None].parents()
3288 parents = repo[None].parents()
3289 else:
3289 else:
3290 parents = [repo[node]]
3290 parents = [repo[node]]
3291 if rej:
3291 if rej:
3292 ui.write_err(_("patch applied partially\n"))
3292 ui.write_err(_("patch applied partially\n"))
3293 ui.write_err(_("(fix the .rej files and run "
3293 ui.write_err(_("(fix the .rej files and run "
3294 "`hg commit --amend`)\n"))
3294 "`hg commit --amend`)\n"))
3295 ret = 1
3295 ret = 1
3296 break
3296 break
3297
3297
3298 if not haspatch:
3298 if not haspatch:
3299 raise error.Abort(_('%s: no diffs found') % patchurl)
3299 raise error.Abort(_('%s: no diffs found') % patchurl)
3300
3300
3301 if msgs:
3301 if msgs:
3302 repo.savecommitmessage('\n* * *\n'.join(msgs))
3302 repo.savecommitmessage('\n* * *\n'.join(msgs))
3303 return ret
3303 return ret
3304
3304
3305 @command('incoming|in',
3305 @command('incoming|in',
3306 [('f', 'force', None,
3306 [('f', 'force', None,
3307 _('run even if remote repository is unrelated')),
3307 _('run even if remote repository is unrelated')),
3308 ('n', 'newest-first', None, _('show newest record first')),
3308 ('n', 'newest-first', None, _('show newest record first')),
3309 ('', 'bundle', '',
3309 ('', 'bundle', '',
3310 _('file to store the bundles into'), _('FILE')),
3310 _('file to store the bundles into'), _('FILE')),
3311 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3311 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3312 ('B', 'bookmarks', False, _("compare bookmarks")),
3312 ('B', 'bookmarks', False, _("compare bookmarks")),
3313 ('b', 'branch', [],
3313 ('b', 'branch', [],
3314 _('a specific branch you would like to pull'), _('BRANCH')),
3314 _('a specific branch you would like to pull'), _('BRANCH')),
3315 ] + logopts + remoteopts + subrepoopts,
3315 ] + logopts + remoteopts + subrepoopts,
3316 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3316 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3317 def incoming(ui, repo, source="default", **opts):
3317 def incoming(ui, repo, source="default", **opts):
3318 """show new changesets found in source
3318 """show new changesets found in source
3319
3319
3320 Show new changesets found in the specified path/URL or the default
3320 Show new changesets found in the specified path/URL or the default
3321 pull location. These are the changesets that would have been pulled
3321 pull location. These are the changesets that would have been pulled
3322 by :hg:`pull` at the time you issued this command.
3322 by :hg:`pull` at the time you issued this command.
3323
3323
3324 See pull for valid source format details.
3324 See pull for valid source format details.
3325
3325
3326 .. container:: verbose
3326 .. container:: verbose
3327
3327
3328 With -B/--bookmarks, the result of bookmark comparison between
3328 With -B/--bookmarks, the result of bookmark comparison between
3329 local and remote repositories is displayed. With -v/--verbose,
3329 local and remote repositories is displayed. With -v/--verbose,
3330 status is also displayed for each bookmark like below::
3330 status is also displayed for each bookmark like below::
3331
3331
3332 BM1 01234567890a added
3332 BM1 01234567890a added
3333 BM2 1234567890ab advanced
3333 BM2 1234567890ab advanced
3334 BM3 234567890abc diverged
3334 BM3 234567890abc diverged
3335 BM4 34567890abcd changed
3335 BM4 34567890abcd changed
3336
3336
3337 The action taken locally when pulling depends on the
3337 The action taken locally when pulling depends on the
3338 status of each bookmark:
3338 status of each bookmark:
3339
3339
3340 :``added``: pull will create it
3340 :``added``: pull will create it
3341 :``advanced``: pull will update it
3341 :``advanced``: pull will update it
3342 :``diverged``: pull will create a divergent bookmark
3342 :``diverged``: pull will create a divergent bookmark
3343 :``changed``: result depends on remote changesets
3343 :``changed``: result depends on remote changesets
3344
3344
3345 From the point of view of pulling behavior, bookmark
3345 From the point of view of pulling behavior, bookmark
3346 existing only in the remote repository are treated as ``added``,
3346 existing only in the remote repository are treated as ``added``,
3347 even if it is in fact locally deleted.
3347 even if it is in fact locally deleted.
3348
3348
3349 .. container:: verbose
3349 .. container:: verbose
3350
3350
3351 For remote repository, using --bundle avoids downloading the
3351 For remote repository, using --bundle avoids downloading the
3352 changesets twice if the incoming is followed by a pull.
3352 changesets twice if the incoming is followed by a pull.
3353
3353
3354 Examples:
3354 Examples:
3355
3355
3356 - show incoming changes with patches and full description::
3356 - show incoming changes with patches and full description::
3357
3357
3358 hg incoming -vp
3358 hg incoming -vp
3359
3359
3360 - show incoming changes excluding merges, store a bundle::
3360 - show incoming changes excluding merges, store a bundle::
3361
3361
3362 hg in -vpM --bundle incoming.hg
3362 hg in -vpM --bundle incoming.hg
3363 hg pull incoming.hg
3363 hg pull incoming.hg
3364
3364
3365 - briefly list changes inside a bundle::
3365 - briefly list changes inside a bundle::
3366
3366
3367 hg in changes.hg -T "{desc|firstline}\\n"
3367 hg in changes.hg -T "{desc|firstline}\\n"
3368
3368
3369 Returns 0 if there are incoming changes, 1 otherwise.
3369 Returns 0 if there are incoming changes, 1 otherwise.
3370 """
3370 """
3371 opts = pycompat.byteskwargs(opts)
3371 opts = pycompat.byteskwargs(opts)
3372 if opts.get('graph'):
3372 if opts.get('graph'):
3373 logcmdutil.checkunsupportedgraphflags([], opts)
3373 logcmdutil.checkunsupportedgraphflags([], opts)
3374 def display(other, chlist, displayer):
3374 def display(other, chlist, displayer):
3375 revdag = logcmdutil.graphrevs(other, chlist, opts)
3375 revdag = logcmdutil.graphrevs(other, chlist, opts)
3376 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3376 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3377 graphmod.asciiedges)
3377 graphmod.asciiedges)
3378
3378
3379 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3379 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3380 return 0
3380 return 0
3381
3381
3382 if opts.get('bundle') and opts.get('subrepos'):
3382 if opts.get('bundle') and opts.get('subrepos'):
3383 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3383 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3384
3384
3385 if opts.get('bookmarks'):
3385 if opts.get('bookmarks'):
3386 source, branches = hg.parseurl(ui.expandpath(source),
3386 source, branches = hg.parseurl(ui.expandpath(source),
3387 opts.get('branch'))
3387 opts.get('branch'))
3388 other = hg.peer(repo, opts, source)
3388 other = hg.peer(repo, opts, source)
3389 if 'bookmarks' not in other.listkeys('namespaces'):
3389 if 'bookmarks' not in other.listkeys('namespaces'):
3390 ui.warn(_("remote doesn't support bookmarks\n"))
3390 ui.warn(_("remote doesn't support bookmarks\n"))
3391 return 0
3391 return 0
3392 ui.pager('incoming')
3392 ui.pager('incoming')
3393 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3393 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3394 return bookmarks.incoming(ui, repo, other)
3394 return bookmarks.incoming(ui, repo, other)
3395
3395
3396 repo._subtoppath = ui.expandpath(source)
3396 repo._subtoppath = ui.expandpath(source)
3397 try:
3397 try:
3398 return hg.incoming(ui, repo, source, opts)
3398 return hg.incoming(ui, repo, source, opts)
3399 finally:
3399 finally:
3400 del repo._subtoppath
3400 del repo._subtoppath
3401
3401
3402
3402
3403 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3403 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3404 norepo=True)
3404 norepo=True)
3405 def init(ui, dest=".", **opts):
3405 def init(ui, dest=".", **opts):
3406 """create a new repository in the given directory
3406 """create a new repository in the given directory
3407
3407
3408 Initialize a new repository in the given directory. If the given
3408 Initialize a new repository in the given directory. If the given
3409 directory does not exist, it will be created.
3409 directory does not exist, it will be created.
3410
3410
3411 If no directory is given, the current directory is used.
3411 If no directory is given, the current directory is used.
3412
3412
3413 It is possible to specify an ``ssh://`` URL as the destination.
3413 It is possible to specify an ``ssh://`` URL as the destination.
3414 See :hg:`help urls` for more information.
3414 See :hg:`help urls` for more information.
3415
3415
3416 Returns 0 on success.
3416 Returns 0 on success.
3417 """
3417 """
3418 opts = pycompat.byteskwargs(opts)
3418 opts = pycompat.byteskwargs(opts)
3419 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3419 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3420
3420
3421 @command('locate',
3421 @command('locate',
3422 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3422 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3423 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3423 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3424 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3424 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3425 ] + walkopts,
3425 ] + walkopts,
3426 _('[OPTION]... [PATTERN]...'))
3426 _('[OPTION]... [PATTERN]...'))
3427 def locate(ui, repo, *pats, **opts):
3427 def locate(ui, repo, *pats, **opts):
3428 """locate files matching specific patterns (DEPRECATED)
3428 """locate files matching specific patterns (DEPRECATED)
3429
3429
3430 Print files under Mercurial control in the working directory whose
3430 Print files under Mercurial control in the working directory whose
3431 names match the given patterns.
3431 names match the given patterns.
3432
3432
3433 By default, this command searches all directories in the working
3433 By default, this command searches all directories in the working
3434 directory. To search just the current directory and its
3434 directory. To search just the current directory and its
3435 subdirectories, use "--include .".
3435 subdirectories, use "--include .".
3436
3436
3437 If no patterns are given to match, this command prints the names
3437 If no patterns are given to match, this command prints the names
3438 of all files under Mercurial control in the working directory.
3438 of all files under Mercurial control in the working directory.
3439
3439
3440 If you want to feed the output of this command into the "xargs"
3440 If you want to feed the output of this command into the "xargs"
3441 command, use the -0 option to both this command and "xargs". This
3441 command, use the -0 option to both this command and "xargs". This
3442 will avoid the problem of "xargs" treating single filenames that
3442 will avoid the problem of "xargs" treating single filenames that
3443 contain whitespace as multiple filenames.
3443 contain whitespace as multiple filenames.
3444
3444
3445 See :hg:`help files` for a more versatile command.
3445 See :hg:`help files` for a more versatile command.
3446
3446
3447 Returns 0 if a match is found, 1 otherwise.
3447 Returns 0 if a match is found, 1 otherwise.
3448 """
3448 """
3449 opts = pycompat.byteskwargs(opts)
3449 opts = pycompat.byteskwargs(opts)
3450 if opts.get('print0'):
3450 if opts.get('print0'):
3451 end = '\0'
3451 end = '\0'
3452 else:
3452 else:
3453 end = '\n'
3453 end = '\n'
3454 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3454 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3455
3455
3456 ret = 1
3456 ret = 1
3457 m = scmutil.match(ctx, pats, opts, default='relglob',
3457 m = scmutil.match(ctx, pats, opts, default='relglob',
3458 badfn=lambda x, y: False)
3458 badfn=lambda x, y: False)
3459
3459
3460 ui.pager('locate')
3460 ui.pager('locate')
3461 if ctx.rev() is None:
3461 if ctx.rev() is None:
3462 # When run on the working copy, "locate" includes removed files, so
3462 # When run on the working copy, "locate" includes removed files, so
3463 # we get the list of files from the dirstate.
3463 # we get the list of files from the dirstate.
3464 filesgen = sorted(repo.dirstate.matches(m))
3464 filesgen = sorted(repo.dirstate.matches(m))
3465 else:
3465 else:
3466 filesgen = ctx.matches(m)
3466 filesgen = ctx.matches(m)
3467 for abs in filesgen:
3467 for abs in filesgen:
3468 if opts.get('fullpath'):
3468 if opts.get('fullpath'):
3469 ui.write(repo.wjoin(abs), end)
3469 ui.write(repo.wjoin(abs), end)
3470 else:
3470 else:
3471 ui.write(((pats and m.rel(abs)) or abs), end)
3471 ui.write(((pats and m.rel(abs)) or abs), end)
3472 ret = 0
3472 ret = 0
3473
3473
3474 return ret
3474 return ret
3475
3475
3476 @command('^log|history',
3476 @command('^log|history',
3477 [('f', 'follow', None,
3477 [('f', 'follow', None,
3478 _('follow changeset history, or file history across copies and renames')),
3478 _('follow changeset history, or file history across copies and renames')),
3479 ('', 'follow-first', None,
3479 ('', 'follow-first', None,
3480 _('only follow the first parent of merge changesets (DEPRECATED)')),
3480 _('only follow the first parent of merge changesets (DEPRECATED)')),
3481 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3481 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3482 ('C', 'copies', None, _('show copied files')),
3482 ('C', 'copies', None, _('show copied files')),
3483 ('k', 'keyword', [],
3483 ('k', 'keyword', [],
3484 _('do case-insensitive search for a given text'), _('TEXT')),
3484 _('do case-insensitive search for a given text'), _('TEXT')),
3485 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3485 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3486 ('L', 'line-range', [],
3486 ('L', 'line-range', [],
3487 _('follow line range of specified file (EXPERIMENTAL)'),
3487 _('follow line range of specified file (EXPERIMENTAL)'),
3488 _('FILE,RANGE')),
3488 _('FILE,RANGE')),
3489 ('', 'removed', None, _('include revisions where files were removed')),
3489 ('', 'removed', None, _('include revisions where files were removed')),
3490 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3490 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3491 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3491 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3492 ('', 'only-branch', [],
3492 ('', 'only-branch', [],
3493 _('show only changesets within the given named branch (DEPRECATED)'),
3493 _('show only changesets within the given named branch (DEPRECATED)'),
3494 _('BRANCH')),
3494 _('BRANCH')),
3495 ('b', 'branch', [],
3495 ('b', 'branch', [],
3496 _('show changesets within the given named branch'), _('BRANCH')),
3496 _('show changesets within the given named branch'), _('BRANCH')),
3497 ('P', 'prune', [],
3497 ('P', 'prune', [],
3498 _('do not display revision or any of its ancestors'), _('REV')),
3498 _('do not display revision or any of its ancestors'), _('REV')),
3499 ] + logopts + walkopts,
3499 ] + logopts + walkopts,
3500 _('[OPTION]... [FILE]'),
3500 _('[OPTION]... [FILE]'),
3501 inferrepo=True,
3501 inferrepo=True,
3502 intents={INTENT_READONLY})
3502 intents={INTENT_READONLY})
3503 def log(ui, repo, *pats, **opts):
3503 def log(ui, repo, *pats, **opts):
3504 """show revision history of entire repository or files
3504 """show revision history of entire repository or files
3505
3505
3506 Print the revision history of the specified files or the entire
3506 Print the revision history of the specified files or the entire
3507 project.
3507 project.
3508
3508
3509 If no revision range is specified, the default is ``tip:0`` unless
3509 If no revision range is specified, the default is ``tip:0`` unless
3510 --follow is set, in which case the working directory parent is
3510 --follow is set, in which case the working directory parent is
3511 used as the starting revision.
3511 used as the starting revision.
3512
3512
3513 File history is shown without following rename or copy history of
3513 File history is shown without following rename or copy history of
3514 files. Use -f/--follow with a filename to follow history across
3514 files. Use -f/--follow with a filename to follow history across
3515 renames and copies. --follow without a filename will only show
3515 renames and copies. --follow without a filename will only show
3516 ancestors of the starting revision.
3516 ancestors of the starting revision.
3517
3517
3518 By default this command prints revision number and changeset id,
3518 By default this command prints revision number and changeset id,
3519 tags, non-trivial parents, user, date and time, and a summary for
3519 tags, non-trivial parents, user, date and time, and a summary for
3520 each commit. When the -v/--verbose switch is used, the list of
3520 each commit. When the -v/--verbose switch is used, the list of
3521 changed files and full commit message are shown.
3521 changed files and full commit message are shown.
3522
3522
3523 With --graph the revisions are shown as an ASCII art DAG with the most
3523 With --graph the revisions are shown as an ASCII art DAG with the most
3524 recent changeset at the top.
3524 recent changeset at the top.
3525 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3525 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3526 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3526 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3527 changeset from the lines below is a parent of the 'o' merge on the same
3527 changeset from the lines below is a parent of the 'o' merge on the same
3528 line.
3528 line.
3529 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3529 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3530 of a '|' indicates one or more revisions in a path are omitted.
3530 of a '|' indicates one or more revisions in a path are omitted.
3531
3531
3532 .. container:: verbose
3532 .. container:: verbose
3533
3533
3534 Use -L/--line-range FILE,M:N options to follow the history of lines
3534 Use -L/--line-range FILE,M:N options to follow the history of lines
3535 from M to N in FILE. With -p/--patch only diff hunks affecting
3535 from M to N in FILE. With -p/--patch only diff hunks affecting
3536 specified line range will be shown. This option requires --follow;
3536 specified line range will be shown. This option requires --follow;
3537 it can be specified multiple times. Currently, this option is not
3537 it can be specified multiple times. Currently, this option is not
3538 compatible with --graph. This option is experimental.
3538 compatible with --graph. This option is experimental.
3539
3539
3540 .. note::
3540 .. note::
3541
3541
3542 :hg:`log --patch` may generate unexpected diff output for merge
3542 :hg:`log --patch` may generate unexpected diff output for merge
3543 changesets, as it will only compare the merge changeset against
3543 changesets, as it will only compare the merge changeset against
3544 its first parent. Also, only files different from BOTH parents
3544 its first parent. Also, only files different from BOTH parents
3545 will appear in files:.
3545 will appear in files:.
3546
3546
3547 .. note::
3547 .. note::
3548
3548
3549 For performance reasons, :hg:`log FILE` may omit duplicate changes
3549 For performance reasons, :hg:`log FILE` may omit duplicate changes
3550 made on branches and will not show removals or mode changes. To
3550 made on branches and will not show removals or mode changes. To
3551 see all such changes, use the --removed switch.
3551 see all such changes, use the --removed switch.
3552
3552
3553 .. container:: verbose
3553 .. container:: verbose
3554
3554
3555 .. note::
3555 .. note::
3556
3556
3557 The history resulting from -L/--line-range options depends on diff
3557 The history resulting from -L/--line-range options depends on diff
3558 options; for instance if white-spaces are ignored, respective changes
3558 options; for instance if white-spaces are ignored, respective changes
3559 with only white-spaces in specified line range will not be listed.
3559 with only white-spaces in specified line range will not be listed.
3560
3560
3561 .. container:: verbose
3561 .. container:: verbose
3562
3562
3563 Some examples:
3563 Some examples:
3564
3564
3565 - changesets with full descriptions and file lists::
3565 - changesets with full descriptions and file lists::
3566
3566
3567 hg log -v
3567 hg log -v
3568
3568
3569 - changesets ancestral to the working directory::
3569 - changesets ancestral to the working directory::
3570
3570
3571 hg log -f
3571 hg log -f
3572
3572
3573 - last 10 commits on the current branch::
3573 - last 10 commits on the current branch::
3574
3574
3575 hg log -l 10 -b .
3575 hg log -l 10 -b .
3576
3576
3577 - changesets showing all modifications of a file, including removals::
3577 - changesets showing all modifications of a file, including removals::
3578
3578
3579 hg log --removed file.c
3579 hg log --removed file.c
3580
3580
3581 - all changesets that touch a directory, with diffs, excluding merges::
3581 - all changesets that touch a directory, with diffs, excluding merges::
3582
3582
3583 hg log -Mp lib/
3583 hg log -Mp lib/
3584
3584
3585 - all revision numbers that match a keyword::
3585 - all revision numbers that match a keyword::
3586
3586
3587 hg log -k bug --template "{rev}\\n"
3587 hg log -k bug --template "{rev}\\n"
3588
3588
3589 - the full hash identifier of the working directory parent::
3589 - the full hash identifier of the working directory parent::
3590
3590
3591 hg log -r . --template "{node}\\n"
3591 hg log -r . --template "{node}\\n"
3592
3592
3593 - list available log templates::
3593 - list available log templates::
3594
3594
3595 hg log -T list
3595 hg log -T list
3596
3596
3597 - check if a given changeset is included in a tagged release::
3597 - check if a given changeset is included in a tagged release::
3598
3598
3599 hg log -r "a21ccf and ancestor(1.9)"
3599 hg log -r "a21ccf and ancestor(1.9)"
3600
3600
3601 - find all changesets by some user in a date range::
3601 - find all changesets by some user in a date range::
3602
3602
3603 hg log -k alice -d "may 2008 to jul 2008"
3603 hg log -k alice -d "may 2008 to jul 2008"
3604
3604
3605 - summary of all changesets after the last tag::
3605 - summary of all changesets after the last tag::
3606
3606
3607 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3607 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3608
3608
3609 - changesets touching lines 13 to 23 for file.c::
3609 - changesets touching lines 13 to 23 for file.c::
3610
3610
3611 hg log -L file.c,13:23
3611 hg log -L file.c,13:23
3612
3612
3613 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3613 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3614 main.c with patch::
3614 main.c with patch::
3615
3615
3616 hg log -L file.c,13:23 -L main.c,2:6 -p
3616 hg log -L file.c,13:23 -L main.c,2:6 -p
3617
3617
3618 See :hg:`help dates` for a list of formats valid for -d/--date.
3618 See :hg:`help dates` for a list of formats valid for -d/--date.
3619
3619
3620 See :hg:`help revisions` for more about specifying and ordering
3620 See :hg:`help revisions` for more about specifying and ordering
3621 revisions.
3621 revisions.
3622
3622
3623 See :hg:`help templates` for more about pre-packaged styles and
3623 See :hg:`help templates` for more about pre-packaged styles and
3624 specifying custom templates. The default template used by the log
3624 specifying custom templates. The default template used by the log
3625 command can be customized via the ``ui.logtemplate`` configuration
3625 command can be customized via the ``ui.logtemplate`` configuration
3626 setting.
3626 setting.
3627
3627
3628 Returns 0 on success.
3628 Returns 0 on success.
3629
3629
3630 """
3630 """
3631 opts = pycompat.byteskwargs(opts)
3631 opts = pycompat.byteskwargs(opts)
3632 linerange = opts.get('line_range')
3632 linerange = opts.get('line_range')
3633
3633
3634 if linerange and not opts.get('follow'):
3634 if linerange and not opts.get('follow'):
3635 raise error.Abort(_('--line-range requires --follow'))
3635 raise error.Abort(_('--line-range requires --follow'))
3636
3636
3637 if linerange and pats:
3637 if linerange and pats:
3638 # TODO: take pats as patterns with no line-range filter
3638 # TODO: take pats as patterns with no line-range filter
3639 raise error.Abort(
3639 raise error.Abort(
3640 _('FILE arguments are not compatible with --line-range option')
3640 _('FILE arguments are not compatible with --line-range option')
3641 )
3641 )
3642
3642
3643 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3643 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3644 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3644 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3645 if linerange:
3645 if linerange:
3646 # TODO: should follow file history from logcmdutil._initialrevs(),
3646 # TODO: should follow file history from logcmdutil._initialrevs(),
3647 # then filter the result by logcmdutil._makerevset() and --limit
3647 # then filter the result by logcmdutil._makerevset() and --limit
3648 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3648 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3649
3649
3650 getrenamed = None
3650 getrenamed = None
3651 if opts.get('copies'):
3651 if opts.get('copies'):
3652 endrev = None
3652 endrev = None
3653 if revs:
3653 if revs:
3654 endrev = revs.max() + 1
3654 endrev = revs.max() + 1
3655 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3655 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3656
3656
3657 ui.pager('log')
3657 ui.pager('log')
3658 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3658 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3659 buffered=True)
3659 buffered=True)
3660 if opts.get('graph'):
3660 if opts.get('graph'):
3661 displayfn = logcmdutil.displaygraphrevs
3661 displayfn = logcmdutil.displaygraphrevs
3662 else:
3662 else:
3663 displayfn = logcmdutil.displayrevs
3663 displayfn = logcmdutil.displayrevs
3664 displayfn(ui, repo, revs, displayer, getrenamed)
3664 displayfn(ui, repo, revs, displayer, getrenamed)
3665
3665
3666 @command('manifest',
3666 @command('manifest',
3667 [('r', 'rev', '', _('revision to display'), _('REV')),
3667 [('r', 'rev', '', _('revision to display'), _('REV')),
3668 ('', 'all', False, _("list files from all revisions"))]
3668 ('', 'all', False, _("list files from all revisions"))]
3669 + formatteropts,
3669 + formatteropts,
3670 _('[-r REV]'),
3670 _('[-r REV]'),
3671 intents={INTENT_READONLY})
3671 intents={INTENT_READONLY})
3672 def manifest(ui, repo, node=None, rev=None, **opts):
3672 def manifest(ui, repo, node=None, rev=None, **opts):
3673 """output the current or given revision of the project manifest
3673 """output the current or given revision of the project manifest
3674
3674
3675 Print a list of version controlled files for the given revision.
3675 Print a list of version controlled files for the given revision.
3676 If no revision is given, the first parent of the working directory
3676 If no revision is given, the first parent of the working directory
3677 is used, or the null revision if no revision is checked out.
3677 is used, or the null revision if no revision is checked out.
3678
3678
3679 With -v, print file permissions, symlink and executable bits.
3679 With -v, print file permissions, symlink and executable bits.
3680 With --debug, print file revision hashes.
3680 With --debug, print file revision hashes.
3681
3681
3682 If option --all is specified, the list of all files from all revisions
3682 If option --all is specified, the list of all files from all revisions
3683 is printed. This includes deleted and renamed files.
3683 is printed. This includes deleted and renamed files.
3684
3684
3685 Returns 0 on success.
3685 Returns 0 on success.
3686 """
3686 """
3687 opts = pycompat.byteskwargs(opts)
3687 opts = pycompat.byteskwargs(opts)
3688 fm = ui.formatter('manifest', opts)
3688 fm = ui.formatter('manifest', opts)
3689
3689
3690 if opts.get('all'):
3690 if opts.get('all'):
3691 if rev or node:
3691 if rev or node:
3692 raise error.Abort(_("can't specify a revision with --all"))
3692 raise error.Abort(_("can't specify a revision with --all"))
3693
3693
3694 res = set()
3694 res = set()
3695 for rev in repo:
3695 for rev in repo:
3696 ctx = repo[rev]
3696 ctx = repo[rev]
3697 res |= set(ctx.files())
3697 res |= set(ctx.files())
3698
3698
3699 ui.pager('manifest')
3699 ui.pager('manifest')
3700 for f in sorted(res):
3700 for f in sorted(res):
3701 fm.startitem()
3701 fm.startitem()
3702 fm.write("path", '%s\n', f)
3702 fm.write("path", '%s\n', f)
3703 fm.end()
3703 fm.end()
3704 return
3704 return
3705
3705
3706 if rev and node:
3706 if rev and node:
3707 raise error.Abort(_("please specify just one revision"))
3707 raise error.Abort(_("please specify just one revision"))
3708
3708
3709 if not node:
3709 if not node:
3710 node = rev
3710 node = rev
3711
3711
3712 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3712 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3713 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3713 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3714 if node:
3714 if node:
3715 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3715 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3716 ctx = scmutil.revsingle(repo, node)
3716 ctx = scmutil.revsingle(repo, node)
3717 mf = ctx.manifest()
3717 mf = ctx.manifest()
3718 ui.pager('manifest')
3718 ui.pager('manifest')
3719 for f in ctx:
3719 for f in ctx:
3720 fm.startitem()
3720 fm.startitem()
3721 fm.context(ctx=ctx)
3721 fm.context(ctx=ctx)
3722 fl = ctx[f].flags()
3722 fl = ctx[f].flags()
3723 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3723 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3724 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3724 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3725 fm.write('path', '%s\n', f)
3725 fm.write('path', '%s\n', f)
3726 fm.end()
3726 fm.end()
3727
3727
3728 @command('^merge',
3728 @command('^merge',
3729 [('f', 'force', None,
3729 [('f', 'force', None,
3730 _('force a merge including outstanding changes (DEPRECATED)')),
3730 _('force a merge including outstanding changes (DEPRECATED)')),
3731 ('r', 'rev', '', _('revision to merge'), _('REV')),
3731 ('r', 'rev', '', _('revision to merge'), _('REV')),
3732 ('P', 'preview', None,
3732 ('P', 'preview', None,
3733 _('review revisions to merge (no merge is performed)')),
3733 _('review revisions to merge (no merge is performed)')),
3734 ('', 'abort', None, _('abort the ongoing merge')),
3734 ('', 'abort', None, _('abort the ongoing merge')),
3735 ] + mergetoolopts,
3735 ] + mergetoolopts,
3736 _('[-P] [[-r] REV]'))
3736 _('[-P] [[-r] REV]'))
3737 def merge(ui, repo, node=None, **opts):
3737 def merge(ui, repo, node=None, **opts):
3738 """merge another revision into working directory
3738 """merge another revision into working directory
3739
3739
3740 The current working directory is updated with all changes made in
3740 The current working directory is updated with all changes made in
3741 the requested revision since the last common predecessor revision.
3741 the requested revision since the last common predecessor revision.
3742
3742
3743 Files that changed between either parent are marked as changed for
3743 Files that changed between either parent are marked as changed for
3744 the next commit and a commit must be performed before any further
3744 the next commit and a commit must be performed before any further
3745 updates to the repository are allowed. The next commit will have
3745 updates to the repository are allowed. The next commit will have
3746 two parents.
3746 two parents.
3747
3747
3748 ``--tool`` can be used to specify the merge tool used for file
3748 ``--tool`` can be used to specify the merge tool used for file
3749 merges. It overrides the HGMERGE environment variable and your
3749 merges. It overrides the HGMERGE environment variable and your
3750 configuration files. See :hg:`help merge-tools` for options.
3750 configuration files. See :hg:`help merge-tools` for options.
3751
3751
3752 If no revision is specified, the working directory's parent is a
3752 If no revision is specified, the working directory's parent is a
3753 head revision, and the current branch contains exactly one other
3753 head revision, and the current branch contains exactly one other
3754 head, the other head is merged with by default. Otherwise, an
3754 head, the other head is merged with by default. Otherwise, an
3755 explicit revision with which to merge with must be provided.
3755 explicit revision with which to merge with must be provided.
3756
3756
3757 See :hg:`help resolve` for information on handling file conflicts.
3757 See :hg:`help resolve` for information on handling file conflicts.
3758
3758
3759 To undo an uncommitted merge, use :hg:`merge --abort` which
3759 To undo an uncommitted merge, use :hg:`merge --abort` which
3760 will check out a clean copy of the original merge parent, losing
3760 will check out a clean copy of the original merge parent, losing
3761 all changes.
3761 all changes.
3762
3762
3763 Returns 0 on success, 1 if there are unresolved files.
3763 Returns 0 on success, 1 if there are unresolved files.
3764 """
3764 """
3765
3765
3766 opts = pycompat.byteskwargs(opts)
3766 opts = pycompat.byteskwargs(opts)
3767 abort = opts.get('abort')
3767 abort = opts.get('abort')
3768 if abort and repo.dirstate.p2() == nullid:
3768 if abort and repo.dirstate.p2() == nullid:
3769 cmdutil.wrongtooltocontinue(repo, _('merge'))
3769 cmdutil.wrongtooltocontinue(repo, _('merge'))
3770 if abort:
3770 if abort:
3771 if node:
3771 if node:
3772 raise error.Abort(_("cannot specify a node with --abort"))
3772 raise error.Abort(_("cannot specify a node with --abort"))
3773 if opts.get('rev'):
3773 if opts.get('rev'):
3774 raise error.Abort(_("cannot specify both --rev and --abort"))
3774 raise error.Abort(_("cannot specify both --rev and --abort"))
3775 if opts.get('preview'):
3775 if opts.get('preview'):
3776 raise error.Abort(_("cannot specify --preview with --abort"))
3776 raise error.Abort(_("cannot specify --preview with --abort"))
3777 if opts.get('rev') and node:
3777 if opts.get('rev') and node:
3778 raise error.Abort(_("please specify just one revision"))
3778 raise error.Abort(_("please specify just one revision"))
3779 if not node:
3779 if not node:
3780 node = opts.get('rev')
3780 node = opts.get('rev')
3781
3781
3782 if node:
3782 if node:
3783 node = scmutil.revsingle(repo, node).node()
3783 node = scmutil.revsingle(repo, node).node()
3784
3784
3785 if not node and not abort:
3785 if not node and not abort:
3786 node = repo[destutil.destmerge(repo)].node()
3786 node = repo[destutil.destmerge(repo)].node()
3787
3787
3788 if opts.get('preview'):
3788 if opts.get('preview'):
3789 # find nodes that are ancestors of p2 but not of p1
3789 # find nodes that are ancestors of p2 but not of p1
3790 p1 = repo.lookup('.')
3790 p1 = repo.lookup('.')
3791 p2 = node
3791 p2 = node
3792 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3792 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3793
3793
3794 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3794 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3795 for node in nodes:
3795 for node in nodes:
3796 displayer.show(repo[node])
3796 displayer.show(repo[node])
3797 displayer.close()
3797 displayer.close()
3798 return 0
3798 return 0
3799
3799
3800 # ui.forcemerge is an internal variable, do not document
3800 # ui.forcemerge is an internal variable, do not document
3801 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
3801 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
3802 with ui.configoverride(overrides, 'merge'):
3802 with ui.configoverride(overrides, 'merge'):
3803 force = opts.get('force')
3803 force = opts.get('force')
3804 labels = ['working copy', 'merge rev']
3804 labels = ['working copy', 'merge rev']
3805 return hg.merge(repo, node, force=force, mergeforce=force,
3805 return hg.merge(repo, node, force=force, mergeforce=force,
3806 labels=labels, abort=abort)
3806 labels=labels, abort=abort)
3807
3807
3808 @command('outgoing|out',
3808 @command('outgoing|out',
3809 [('f', 'force', None, _('run even when the destination is unrelated')),
3809 [('f', 'force', None, _('run even when the destination is unrelated')),
3810 ('r', 'rev', [],
3810 ('r', 'rev', [],
3811 _('a changeset intended to be included in the destination'), _('REV')),
3811 _('a changeset intended to be included in the destination'), _('REV')),
3812 ('n', 'newest-first', None, _('show newest record first')),
3812 ('n', 'newest-first', None, _('show newest record first')),
3813 ('B', 'bookmarks', False, _('compare bookmarks')),
3813 ('B', 'bookmarks', False, _('compare bookmarks')),
3814 ('b', 'branch', [], _('a specific branch you would like to push'),
3814 ('b', 'branch', [], _('a specific branch you would like to push'),
3815 _('BRANCH')),
3815 _('BRANCH')),
3816 ] + logopts + remoteopts + subrepoopts,
3816 ] + logopts + remoteopts + subrepoopts,
3817 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3817 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3818 def outgoing(ui, repo, dest=None, **opts):
3818 def outgoing(ui, repo, dest=None, **opts):
3819 """show changesets not found in the destination
3819 """show changesets not found in the destination
3820
3820
3821 Show changesets not found in the specified destination repository
3821 Show changesets not found in the specified destination repository
3822 or the default push location. These are the changesets that would
3822 or the default push location. These are the changesets that would
3823 be pushed if a push was requested.
3823 be pushed if a push was requested.
3824
3824
3825 See pull for details of valid destination formats.
3825 See pull for details of valid destination formats.
3826
3826
3827 .. container:: verbose
3827 .. container:: verbose
3828
3828
3829 With -B/--bookmarks, the result of bookmark comparison between
3829 With -B/--bookmarks, the result of bookmark comparison between
3830 local and remote repositories is displayed. With -v/--verbose,
3830 local and remote repositories is displayed. With -v/--verbose,
3831 status is also displayed for each bookmark like below::
3831 status is also displayed for each bookmark like below::
3832
3832
3833 BM1 01234567890a added
3833 BM1 01234567890a added
3834 BM2 deleted
3834 BM2 deleted
3835 BM3 234567890abc advanced
3835 BM3 234567890abc advanced
3836 BM4 34567890abcd diverged
3836 BM4 34567890abcd diverged
3837 BM5 4567890abcde changed
3837 BM5 4567890abcde changed
3838
3838
3839 The action taken when pushing depends on the
3839 The action taken when pushing depends on the
3840 status of each bookmark:
3840 status of each bookmark:
3841
3841
3842 :``added``: push with ``-B`` will create it
3842 :``added``: push with ``-B`` will create it
3843 :``deleted``: push with ``-B`` will delete it
3843 :``deleted``: push with ``-B`` will delete it
3844 :``advanced``: push will update it
3844 :``advanced``: push will update it
3845 :``diverged``: push with ``-B`` will update it
3845 :``diverged``: push with ``-B`` will update it
3846 :``changed``: push with ``-B`` will update it
3846 :``changed``: push with ``-B`` will update it
3847
3847
3848 From the point of view of pushing behavior, bookmarks
3848 From the point of view of pushing behavior, bookmarks
3849 existing only in the remote repository are treated as
3849 existing only in the remote repository are treated as
3850 ``deleted``, even if it is in fact added remotely.
3850 ``deleted``, even if it is in fact added remotely.
3851
3851
3852 Returns 0 if there are outgoing changes, 1 otherwise.
3852 Returns 0 if there are outgoing changes, 1 otherwise.
3853 """
3853 """
3854 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3854 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3855 # style URLs, so don't overwrite dest.
3855 # style URLs, so don't overwrite dest.
3856 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3856 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3857 if not path:
3857 if not path:
3858 raise error.Abort(_('default repository not configured!'),
3858 raise error.Abort(_('default repository not configured!'),
3859 hint=_("see 'hg help config.paths'"))
3859 hint=_("see 'hg help config.paths'"))
3860
3860
3861 opts = pycompat.byteskwargs(opts)
3861 opts = pycompat.byteskwargs(opts)
3862 if opts.get('graph'):
3862 if opts.get('graph'):
3863 logcmdutil.checkunsupportedgraphflags([], opts)
3863 logcmdutil.checkunsupportedgraphflags([], opts)
3864 o, other = hg._outgoing(ui, repo, dest, opts)
3864 o, other = hg._outgoing(ui, repo, dest, opts)
3865 if not o:
3865 if not o:
3866 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3866 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3867 return
3867 return
3868
3868
3869 revdag = logcmdutil.graphrevs(repo, o, opts)
3869 revdag = logcmdutil.graphrevs(repo, o, opts)
3870 ui.pager('outgoing')
3870 ui.pager('outgoing')
3871 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3871 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3872 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3872 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3873 graphmod.asciiedges)
3873 graphmod.asciiedges)
3874 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3874 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3875 return 0
3875 return 0
3876
3876
3877 if opts.get('bookmarks'):
3877 if opts.get('bookmarks'):
3878 dest = path.pushloc or path.loc
3878 dest = path.pushloc or path.loc
3879 other = hg.peer(repo, opts, dest)
3879 other = hg.peer(repo, opts, dest)
3880 if 'bookmarks' not in other.listkeys('namespaces'):
3880 if 'bookmarks' not in other.listkeys('namespaces'):
3881 ui.warn(_("remote doesn't support bookmarks\n"))
3881 ui.warn(_("remote doesn't support bookmarks\n"))
3882 return 0
3882 return 0
3883 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3883 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3884 ui.pager('outgoing')
3884 ui.pager('outgoing')
3885 return bookmarks.outgoing(ui, repo, other)
3885 return bookmarks.outgoing(ui, repo, other)
3886
3886
3887 repo._subtoppath = path.pushloc or path.loc
3887 repo._subtoppath = path.pushloc or path.loc
3888 try:
3888 try:
3889 return hg.outgoing(ui, repo, dest, opts)
3889 return hg.outgoing(ui, repo, dest, opts)
3890 finally:
3890 finally:
3891 del repo._subtoppath
3891 del repo._subtoppath
3892
3892
3893 @command('parents',
3893 @command('parents',
3894 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3894 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3895 ] + templateopts,
3895 ] + templateopts,
3896 _('[-r REV] [FILE]'),
3896 _('[-r REV] [FILE]'),
3897 inferrepo=True)
3897 inferrepo=True)
3898 def parents(ui, repo, file_=None, **opts):
3898 def parents(ui, repo, file_=None, **opts):
3899 """show the parents of the working directory or revision (DEPRECATED)
3899 """show the parents of the working directory or revision (DEPRECATED)
3900
3900
3901 Print the working directory's parent revisions. If a revision is
3901 Print the working directory's parent revisions. If a revision is
3902 given via -r/--rev, the parent of that revision will be printed.
3902 given via -r/--rev, the parent of that revision will be printed.
3903 If a file argument is given, the revision in which the file was
3903 If a file argument is given, the revision in which the file was
3904 last changed (before the working directory revision or the
3904 last changed (before the working directory revision or the
3905 argument to --rev if given) is printed.
3905 argument to --rev if given) is printed.
3906
3906
3907 This command is equivalent to::
3907 This command is equivalent to::
3908
3908
3909 hg log -r "p1()+p2()" or
3909 hg log -r "p1()+p2()" or
3910 hg log -r "p1(REV)+p2(REV)" or
3910 hg log -r "p1(REV)+p2(REV)" or
3911 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3911 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3912 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3912 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3913
3913
3914 See :hg:`summary` and :hg:`help revsets` for related information.
3914 See :hg:`summary` and :hg:`help revsets` for related information.
3915
3915
3916 Returns 0 on success.
3916 Returns 0 on success.
3917 """
3917 """
3918
3918
3919 opts = pycompat.byteskwargs(opts)
3919 opts = pycompat.byteskwargs(opts)
3920 rev = opts.get('rev')
3920 rev = opts.get('rev')
3921 if rev:
3921 if rev:
3922 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3922 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3923 ctx = scmutil.revsingle(repo, rev, None)
3923 ctx = scmutil.revsingle(repo, rev, None)
3924
3924
3925 if file_:
3925 if file_:
3926 m = scmutil.match(ctx, (file_,), opts)
3926 m = scmutil.match(ctx, (file_,), opts)
3927 if m.anypats() or len(m.files()) != 1:
3927 if m.anypats() or len(m.files()) != 1:
3928 raise error.Abort(_('can only specify an explicit filename'))
3928 raise error.Abort(_('can only specify an explicit filename'))
3929 file_ = m.files()[0]
3929 file_ = m.files()[0]
3930 filenodes = []
3930 filenodes = []
3931 for cp in ctx.parents():
3931 for cp in ctx.parents():
3932 if not cp:
3932 if not cp:
3933 continue
3933 continue
3934 try:
3934 try:
3935 filenodes.append(cp.filenode(file_))
3935 filenodes.append(cp.filenode(file_))
3936 except error.LookupError:
3936 except error.LookupError:
3937 pass
3937 pass
3938 if not filenodes:
3938 if not filenodes:
3939 raise error.Abort(_("'%s' not found in manifest!") % file_)
3939 raise error.Abort(_("'%s' not found in manifest!") % file_)
3940 p = []
3940 p = []
3941 for fn in filenodes:
3941 for fn in filenodes:
3942 fctx = repo.filectx(file_, fileid=fn)
3942 fctx = repo.filectx(file_, fileid=fn)
3943 p.append(fctx.node())
3943 p.append(fctx.node())
3944 else:
3944 else:
3945 p = [cp.node() for cp in ctx.parents()]
3945 p = [cp.node() for cp in ctx.parents()]
3946
3946
3947 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3947 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3948 for n in p:
3948 for n in p:
3949 if n != nullid:
3949 if n != nullid:
3950 displayer.show(repo[n])
3950 displayer.show(repo[n])
3951 displayer.close()
3951 displayer.close()
3952
3952
3953 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3953 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3954 intents={INTENT_READONLY})
3954 intents={INTENT_READONLY})
3955 def paths(ui, repo, search=None, **opts):
3955 def paths(ui, repo, search=None, **opts):
3956 """show aliases for remote repositories
3956 """show aliases for remote repositories
3957
3957
3958 Show definition of symbolic path name NAME. If no name is given,
3958 Show definition of symbolic path name NAME. If no name is given,
3959 show definition of all available names.
3959 show definition of all available names.
3960
3960
3961 Option -q/--quiet suppresses all output when searching for NAME
3961 Option -q/--quiet suppresses all output when searching for NAME
3962 and shows only the path names when listing all definitions.
3962 and shows only the path names when listing all definitions.
3963
3963
3964 Path names are defined in the [paths] section of your
3964 Path names are defined in the [paths] section of your
3965 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3965 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3966 repository, ``.hg/hgrc`` is used, too.
3966 repository, ``.hg/hgrc`` is used, too.
3967
3967
3968 The path names ``default`` and ``default-push`` have a special
3968 The path names ``default`` and ``default-push`` have a special
3969 meaning. When performing a push or pull operation, they are used
3969 meaning. When performing a push or pull operation, they are used
3970 as fallbacks if no location is specified on the command-line.
3970 as fallbacks if no location is specified on the command-line.
3971 When ``default-push`` is set, it will be used for push and
3971 When ``default-push`` is set, it will be used for push and
3972 ``default`` will be used for pull; otherwise ``default`` is used
3972 ``default`` will be used for pull; otherwise ``default`` is used
3973 as the fallback for both. When cloning a repository, the clone
3973 as the fallback for both. When cloning a repository, the clone
3974 source is written as ``default`` in ``.hg/hgrc``.
3974 source is written as ``default`` in ``.hg/hgrc``.
3975
3975
3976 .. note::
3976 .. note::
3977
3977
3978 ``default`` and ``default-push`` apply to all inbound (e.g.
3978 ``default`` and ``default-push`` apply to all inbound (e.g.
3979 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3979 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3980 and :hg:`bundle`) operations.
3980 and :hg:`bundle`) operations.
3981
3981
3982 See :hg:`help urls` for more information.
3982 See :hg:`help urls` for more information.
3983
3983
3984 Returns 0 on success.
3984 Returns 0 on success.
3985 """
3985 """
3986
3986
3987 opts = pycompat.byteskwargs(opts)
3987 opts = pycompat.byteskwargs(opts)
3988 ui.pager('paths')
3988 ui.pager('paths')
3989 if search:
3989 if search:
3990 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3990 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3991 if name == search]
3991 if name == search]
3992 else:
3992 else:
3993 pathitems = sorted(ui.paths.iteritems())
3993 pathitems = sorted(ui.paths.iteritems())
3994
3994
3995 fm = ui.formatter('paths', opts)
3995 fm = ui.formatter('paths', opts)
3996 if fm.isplain():
3996 if fm.isplain():
3997 hidepassword = util.hidepassword
3997 hidepassword = util.hidepassword
3998 else:
3998 else:
3999 hidepassword = bytes
3999 hidepassword = bytes
4000 if ui.quiet:
4000 if ui.quiet:
4001 namefmt = '%s\n'
4001 namefmt = '%s\n'
4002 else:
4002 else:
4003 namefmt = '%s = '
4003 namefmt = '%s = '
4004 showsubopts = not search and not ui.quiet
4004 showsubopts = not search and not ui.quiet
4005
4005
4006 for name, path in pathitems:
4006 for name, path in pathitems:
4007 fm.startitem()
4007 fm.startitem()
4008 fm.condwrite(not search, 'name', namefmt, name)
4008 fm.condwrite(not search, 'name', namefmt, name)
4009 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4009 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4010 for subopt, value in sorted(path.suboptions.items()):
4010 for subopt, value in sorted(path.suboptions.items()):
4011 assert subopt not in ('name', 'url')
4011 assert subopt not in ('name', 'url')
4012 if showsubopts:
4012 if showsubopts:
4013 fm.plain('%s:%s = ' % (name, subopt))
4013 fm.plain('%s:%s = ' % (name, subopt))
4014 fm.condwrite(showsubopts, subopt, '%s\n', value)
4014 fm.condwrite(showsubopts, subopt, '%s\n', value)
4015
4015
4016 fm.end()
4016 fm.end()
4017
4017
4018 if search and not pathitems:
4018 if search and not pathitems:
4019 if not ui.quiet:
4019 if not ui.quiet:
4020 ui.warn(_("not found!\n"))
4020 ui.warn(_("not found!\n"))
4021 return 1
4021 return 1
4022 else:
4022 else:
4023 return 0
4023 return 0
4024
4024
4025 @command('phase',
4025 @command('phase',
4026 [('p', 'public', False, _('set changeset phase to public')),
4026 [('p', 'public', False, _('set changeset phase to public')),
4027 ('d', 'draft', False, _('set changeset phase to draft')),
4027 ('d', 'draft', False, _('set changeset phase to draft')),
4028 ('s', 'secret', False, _('set changeset phase to secret')),
4028 ('s', 'secret', False, _('set changeset phase to secret')),
4029 ('f', 'force', False, _('allow to move boundary backward')),
4029 ('f', 'force', False, _('allow to move boundary backward')),
4030 ('r', 'rev', [], _('target revision'), _('REV')),
4030 ('r', 'rev', [], _('target revision'), _('REV')),
4031 ],
4031 ],
4032 _('[-p|-d|-s] [-f] [-r] [REV...]'))
4032 _('[-p|-d|-s] [-f] [-r] [REV...]'))
4033 def phase(ui, repo, *revs, **opts):
4033 def phase(ui, repo, *revs, **opts):
4034 """set or show the current phase name
4034 """set or show the current phase name
4035
4035
4036 With no argument, show the phase name of the current revision(s).
4036 With no argument, show the phase name of the current revision(s).
4037
4037
4038 With one of -p/--public, -d/--draft or -s/--secret, change the
4038 With one of -p/--public, -d/--draft or -s/--secret, change the
4039 phase value of the specified revisions.
4039 phase value of the specified revisions.
4040
4040
4041 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
4041 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
4042 lower phase to a higher phase. Phases are ordered as follows::
4042 lower phase to a higher phase. Phases are ordered as follows::
4043
4043
4044 public < draft < secret
4044 public < draft < secret
4045
4045
4046 Returns 0 on success, 1 if some phases could not be changed.
4046 Returns 0 on success, 1 if some phases could not be changed.
4047
4047
4048 (For more information about the phases concept, see :hg:`help phases`.)
4048 (For more information about the phases concept, see :hg:`help phases`.)
4049 """
4049 """
4050 opts = pycompat.byteskwargs(opts)
4050 opts = pycompat.byteskwargs(opts)
4051 # search for a unique phase argument
4051 # search for a unique phase argument
4052 targetphase = None
4052 targetphase = None
4053 for idx, name in enumerate(phases.phasenames):
4053 for idx, name in enumerate(phases.phasenames):
4054 if opts.get(name, False):
4054 if opts.get(name, False):
4055 if targetphase is not None:
4055 if targetphase is not None:
4056 raise error.Abort(_('only one phase can be specified'))
4056 raise error.Abort(_('only one phase can be specified'))
4057 targetphase = idx
4057 targetphase = idx
4058
4058
4059 # look for specified revision
4059 # look for specified revision
4060 revs = list(revs)
4060 revs = list(revs)
4061 revs.extend(opts['rev'])
4061 revs.extend(opts['rev'])
4062 if not revs:
4062 if not revs:
4063 # display both parents as the second parent phase can influence
4063 # display both parents as the second parent phase can influence
4064 # the phase of a merge commit
4064 # the phase of a merge commit
4065 revs = [c.rev() for c in repo[None].parents()]
4065 revs = [c.rev() for c in repo[None].parents()]
4066
4066
4067 revs = scmutil.revrange(repo, revs)
4067 revs = scmutil.revrange(repo, revs)
4068
4068
4069 ret = 0
4069 ret = 0
4070 if targetphase is None:
4070 if targetphase is None:
4071 # display
4071 # display
4072 for r in revs:
4072 for r in revs:
4073 ctx = repo[r]
4073 ctx = repo[r]
4074 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4074 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4075 else:
4075 else:
4076 with repo.lock(), repo.transaction("phase") as tr:
4076 with repo.lock(), repo.transaction("phase") as tr:
4077 # set phase
4077 # set phase
4078 if not revs:
4078 if not revs:
4079 raise error.Abort(_('empty revision set'))
4079 raise error.Abort(_('empty revision set'))
4080 nodes = [repo[r].node() for r in revs]
4080 nodes = [repo[r].node() for r in revs]
4081 # moving revision from public to draft may hide them
4081 # moving revision from public to draft may hide them
4082 # We have to check result on an unfiltered repository
4082 # We have to check result on an unfiltered repository
4083 unfi = repo.unfiltered()
4083 unfi = repo.unfiltered()
4084 getphase = unfi._phasecache.phase
4084 getphase = unfi._phasecache.phase
4085 olddata = [getphase(unfi, r) for r in unfi]
4085 olddata = [getphase(unfi, r) for r in unfi]
4086 phases.advanceboundary(repo, tr, targetphase, nodes)
4086 phases.advanceboundary(repo, tr, targetphase, nodes)
4087 if opts['force']:
4087 if opts['force']:
4088 phases.retractboundary(repo, tr, targetphase, nodes)
4088 phases.retractboundary(repo, tr, targetphase, nodes)
4089 getphase = unfi._phasecache.phase
4089 getphase = unfi._phasecache.phase
4090 newdata = [getphase(unfi, r) for r in unfi]
4090 newdata = [getphase(unfi, r) for r in unfi]
4091 changes = sum(newdata[r] != olddata[r] for r in unfi)
4091 changes = sum(newdata[r] != olddata[r] for r in unfi)
4092 cl = unfi.changelog
4092 cl = unfi.changelog
4093 rejected = [n for n in nodes
4093 rejected = [n for n in nodes
4094 if newdata[cl.rev(n)] < targetphase]
4094 if newdata[cl.rev(n)] < targetphase]
4095 if rejected:
4095 if rejected:
4096 ui.warn(_('cannot move %i changesets to a higher '
4096 ui.warn(_('cannot move %i changesets to a higher '
4097 'phase, use --force\n') % len(rejected))
4097 'phase, use --force\n') % len(rejected))
4098 ret = 1
4098 ret = 1
4099 if changes:
4099 if changes:
4100 msg = _('phase changed for %i changesets\n') % changes
4100 msg = _('phase changed for %i changesets\n') % changes
4101 if ret:
4101 if ret:
4102 ui.status(msg)
4102 ui.status(msg)
4103 else:
4103 else:
4104 ui.note(msg)
4104 ui.note(msg)
4105 else:
4105 else:
4106 ui.warn(_('no phases changed\n'))
4106 ui.warn(_('no phases changed\n'))
4107 return ret
4107 return ret
4108
4108
4109 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4109 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4110 """Run after a changegroup has been added via pull/unbundle
4110 """Run after a changegroup has been added via pull/unbundle
4111
4111
4112 This takes arguments below:
4112 This takes arguments below:
4113
4113
4114 :modheads: change of heads by pull/unbundle
4114 :modheads: change of heads by pull/unbundle
4115 :optupdate: updating working directory is needed or not
4115 :optupdate: updating working directory is needed or not
4116 :checkout: update destination revision (or None to default destination)
4116 :checkout: update destination revision (or None to default destination)
4117 :brev: a name, which might be a bookmark to be activated after updating
4117 :brev: a name, which might be a bookmark to be activated after updating
4118 """
4118 """
4119 if modheads == 0:
4119 if modheads == 0:
4120 return
4120 return
4121 if optupdate:
4121 if optupdate:
4122 try:
4122 try:
4123 return hg.updatetotally(ui, repo, checkout, brev)
4123 return hg.updatetotally(ui, repo, checkout, brev)
4124 except error.UpdateAbort as inst:
4124 except error.UpdateAbort as inst:
4125 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4125 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4126 hint = inst.hint
4126 hint = inst.hint
4127 raise error.UpdateAbort(msg, hint=hint)
4127 raise error.UpdateAbort(msg, hint=hint)
4128 if modheads > 1:
4128 if modheads > 1:
4129 currentbranchheads = len(repo.branchheads())
4129 currentbranchheads = len(repo.branchheads())
4130 if currentbranchheads == modheads:
4130 if currentbranchheads == modheads:
4131 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4131 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4132 elif currentbranchheads > 1:
4132 elif currentbranchheads > 1:
4133 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4133 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4134 "merge)\n"))
4134 "merge)\n"))
4135 else:
4135 else:
4136 ui.status(_("(run 'hg heads' to see heads)\n"))
4136 ui.status(_("(run 'hg heads' to see heads)\n"))
4137 elif not ui.configbool('commands', 'update.requiredest'):
4137 elif not ui.configbool('commands', 'update.requiredest'):
4138 ui.status(_("(run 'hg update' to get a working copy)\n"))
4138 ui.status(_("(run 'hg update' to get a working copy)\n"))
4139
4139
4140 @command('^pull',
4140 @command('^pull',
4141 [('u', 'update', None,
4141 [('u', 'update', None,
4142 _('update to new branch head if new descendants were pulled')),
4142 _('update to new branch head if new descendants were pulled')),
4143 ('f', 'force', None, _('run even when remote repository is unrelated')),
4143 ('f', 'force', None, _('run even when remote repository is unrelated')),
4144 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4144 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4145 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4145 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4146 ('b', 'branch', [], _('a specific branch you would like to pull'),
4146 ('b', 'branch', [], _('a specific branch you would like to pull'),
4147 _('BRANCH')),
4147 _('BRANCH')),
4148 ] + remoteopts,
4148 ] + remoteopts,
4149 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4149 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4150 def pull(ui, repo, source="default", **opts):
4150 def pull(ui, repo, source="default", **opts):
4151 """pull changes from the specified source
4151 """pull changes from the specified source
4152
4152
4153 Pull changes from a remote repository to a local one.
4153 Pull changes from a remote repository to a local one.
4154
4154
4155 This finds all changes from the repository at the specified path
4155 This finds all changes from the repository at the specified path
4156 or URL and adds them to a local repository (the current one unless
4156 or URL and adds them to a local repository (the current one unless
4157 -R is specified). By default, this does not update the copy of the
4157 -R is specified). By default, this does not update the copy of the
4158 project in the working directory.
4158 project in the working directory.
4159
4159
4160 When cloning from servers that support it, Mercurial may fetch
4160 When cloning from servers that support it, Mercurial may fetch
4161 pre-generated data. When this is done, hooks operating on incoming
4161 pre-generated data. When this is done, hooks operating on incoming
4162 changesets and changegroups may fire more than once, once for each
4162 changesets and changegroups may fire more than once, once for each
4163 pre-generated bundle and as well as for any additional remaining
4163 pre-generated bundle and as well as for any additional remaining
4164 data. See :hg:`help -e clonebundles` for more.
4164 data. See :hg:`help -e clonebundles` for more.
4165
4165
4166 Use :hg:`incoming` if you want to see what would have been added
4166 Use :hg:`incoming` if you want to see what would have been added
4167 by a pull at the time you issued this command. If you then decide
4167 by a pull at the time you issued this command. If you then decide
4168 to add those changes to the repository, you should use :hg:`pull
4168 to add those changes to the repository, you should use :hg:`pull
4169 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4169 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4170
4170
4171 If SOURCE is omitted, the 'default' path will be used.
4171 If SOURCE is omitted, the 'default' path will be used.
4172 See :hg:`help urls` for more information.
4172 See :hg:`help urls` for more information.
4173
4173
4174 Specifying bookmark as ``.`` is equivalent to specifying the active
4174 Specifying bookmark as ``.`` is equivalent to specifying the active
4175 bookmark's name.
4175 bookmark's name.
4176
4176
4177 Returns 0 on success, 1 if an update had unresolved files.
4177 Returns 0 on success, 1 if an update had unresolved files.
4178 """
4178 """
4179
4179
4180 opts = pycompat.byteskwargs(opts)
4180 opts = pycompat.byteskwargs(opts)
4181 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4181 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4182 msg = _('update destination required by configuration')
4182 msg = _('update destination required by configuration')
4183 hint = _('use hg pull followed by hg update DEST')
4183 hint = _('use hg pull followed by hg update DEST')
4184 raise error.Abort(msg, hint=hint)
4184 raise error.Abort(msg, hint=hint)
4185
4185
4186 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4186 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4187 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4187 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4188 other = hg.peer(repo, opts, source)
4188 other = hg.peer(repo, opts, source)
4189 try:
4189 try:
4190 revs, checkout = hg.addbranchrevs(repo, other, branches,
4190 revs, checkout = hg.addbranchrevs(repo, other, branches,
4191 opts.get('rev'))
4191 opts.get('rev'))
4192
4192
4193
4193
4194 pullopargs = {}
4194 pullopargs = {}
4195 if opts.get('bookmark'):
4195 if opts.get('bookmark'):
4196 if not revs:
4196 if not revs:
4197 revs = []
4197 revs = []
4198 # The list of bookmark used here is not the one used to actually
4198 # The list of bookmark used here is not the one used to actually
4199 # update the bookmark name. This can result in the revision pulled
4199 # update the bookmark name. This can result in the revision pulled
4200 # not ending up with the name of the bookmark because of a race
4200 # not ending up with the name of the bookmark because of a race
4201 # condition on the server. (See issue 4689 for details)
4201 # condition on the server. (See issue 4689 for details)
4202 remotebookmarks = other.listkeys('bookmarks')
4202 remotebookmarks = other.listkeys('bookmarks')
4203 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4203 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4204 pullopargs['remotebookmarks'] = remotebookmarks
4204 pullopargs['remotebookmarks'] = remotebookmarks
4205 for b in opts['bookmark']:
4205 for b in opts['bookmark']:
4206 b = repo._bookmarks.expandname(b)
4206 b = repo._bookmarks.expandname(b)
4207 if b not in remotebookmarks:
4207 if b not in remotebookmarks:
4208 raise error.Abort(_('remote bookmark %s not found!') % b)
4208 raise error.Abort(_('remote bookmark %s not found!') % b)
4209 revs.append(hex(remotebookmarks[b]))
4209 revs.append(hex(remotebookmarks[b]))
4210
4210
4211 if revs:
4211 if revs:
4212 try:
4212 try:
4213 # When 'rev' is a bookmark name, we cannot guarantee that it
4213 # When 'rev' is a bookmark name, we cannot guarantee that it
4214 # will be updated with that name because of a race condition
4214 # will be updated with that name because of a race condition
4215 # server side. (See issue 4689 for details)
4215 # server side. (See issue 4689 for details)
4216 oldrevs = revs
4216 oldrevs = revs
4217 revs = [] # actually, nodes
4217 revs = [] # actually, nodes
4218 for r in oldrevs:
4218 for r in oldrevs:
4219 with other.commandexecutor() as e:
4219 with other.commandexecutor() as e:
4220 node = e.callcommand('lookup', {'key': r}).result()
4220 node = e.callcommand('lookup', {'key': r}).result()
4221
4221
4222 revs.append(node)
4222 revs.append(node)
4223 if r == checkout:
4223 if r == checkout:
4224 checkout = node
4224 checkout = node
4225 except error.CapabilityError:
4225 except error.CapabilityError:
4226 err = _("other repository doesn't support revision lookup, "
4226 err = _("other repository doesn't support revision lookup, "
4227 "so a rev cannot be specified.")
4227 "so a rev cannot be specified.")
4228 raise error.Abort(err)
4228 raise error.Abort(err)
4229
4229
4230 wlock = util.nullcontextmanager()
4230 wlock = util.nullcontextmanager()
4231 if opts.get('update'):
4231 if opts.get('update'):
4232 wlock = repo.wlock()
4232 wlock = repo.wlock()
4233 with wlock:
4233 with wlock:
4234 pullopargs.update(opts.get('opargs', {}))
4234 pullopargs.update(opts.get('opargs', {}))
4235 modheads = exchange.pull(repo, other, heads=revs,
4235 modheads = exchange.pull(repo, other, heads=revs,
4236 force=opts.get('force'),
4236 force=opts.get('force'),
4237 bookmarks=opts.get('bookmark', ()),
4237 bookmarks=opts.get('bookmark', ()),
4238 opargs=pullopargs).cgresult
4238 opargs=pullopargs).cgresult
4239
4239
4240 # brev is a name, which might be a bookmark to be activated at
4240 # brev is a name, which might be a bookmark to be activated at
4241 # the end of the update. In other words, it is an explicit
4241 # the end of the update. In other words, it is an explicit
4242 # destination of the update
4242 # destination of the update
4243 brev = None
4243 brev = None
4244
4244
4245 if checkout:
4245 if checkout:
4246 checkout = repo.changelog.rev(checkout)
4246 checkout = repo.changelog.rev(checkout)
4247
4247
4248 # order below depends on implementation of
4248 # order below depends on implementation of
4249 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4249 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4250 # because 'checkout' is determined without it.
4250 # because 'checkout' is determined without it.
4251 if opts.get('rev'):
4251 if opts.get('rev'):
4252 brev = opts['rev'][0]
4252 brev = opts['rev'][0]
4253 elif opts.get('branch'):
4253 elif opts.get('branch'):
4254 brev = opts['branch'][0]
4254 brev = opts['branch'][0]
4255 else:
4255 else:
4256 brev = branches[0]
4256 brev = branches[0]
4257 repo._subtoppath = source
4257 repo._subtoppath = source
4258 try:
4258 try:
4259 ret = postincoming(ui, repo, modheads, opts.get('update'),
4259 ret = postincoming(ui, repo, modheads, opts.get('update'),
4260 checkout, brev)
4260 checkout, brev)
4261
4261
4262 finally:
4262 finally:
4263 del repo._subtoppath
4263 del repo._subtoppath
4264
4264
4265 finally:
4265 finally:
4266 other.close()
4266 other.close()
4267 return ret
4267 return ret
4268
4268
4269 @command('^push',
4269 @command('^push',
4270 [('f', 'force', None, _('force push')),
4270 [('f', 'force', None, _('force push')),
4271 ('r', 'rev', [],
4271 ('r', 'rev', [],
4272 _('a changeset intended to be included in the destination'),
4272 _('a changeset intended to be included in the destination'),
4273 _('REV')),
4273 _('REV')),
4274 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4274 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4275 ('b', 'branch', [],
4275 ('b', 'branch', [],
4276 _('a specific branch you would like to push'), _('BRANCH')),
4276 _('a specific branch you would like to push'), _('BRANCH')),
4277 ('', 'new-branch', False, _('allow pushing a new branch')),
4277 ('', 'new-branch', False, _('allow pushing a new branch')),
4278 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4278 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4279 ] + remoteopts,
4279 ] + remoteopts,
4280 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4280 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4281 def push(ui, repo, dest=None, **opts):
4281 def push(ui, repo, dest=None, **opts):
4282 """push changes to the specified destination
4282 """push changes to the specified destination
4283
4283
4284 Push changesets from the local repository to the specified
4284 Push changesets from the local repository to the specified
4285 destination.
4285 destination.
4286
4286
4287 This operation is symmetrical to pull: it is identical to a pull
4287 This operation is symmetrical to pull: it is identical to a pull
4288 in the destination repository from the current one.
4288 in the destination repository from the current one.
4289
4289
4290 By default, push will not allow creation of new heads at the
4290 By default, push will not allow creation of new heads at the
4291 destination, since multiple heads would make it unclear which head
4291 destination, since multiple heads would make it unclear which head
4292 to use. In this situation, it is recommended to pull and merge
4292 to use. In this situation, it is recommended to pull and merge
4293 before pushing.
4293 before pushing.
4294
4294
4295 Use --new-branch if you want to allow push to create a new named
4295 Use --new-branch if you want to allow push to create a new named
4296 branch that is not present at the destination. This allows you to
4296 branch that is not present at the destination. This allows you to
4297 only create a new branch without forcing other changes.
4297 only create a new branch without forcing other changes.
4298
4298
4299 .. note::
4299 .. note::
4300
4300
4301 Extra care should be taken with the -f/--force option,
4301 Extra care should be taken with the -f/--force option,
4302 which will push all new heads on all branches, an action which will
4302 which will push all new heads on all branches, an action which will
4303 almost always cause confusion for collaborators.
4303 almost always cause confusion for collaborators.
4304
4304
4305 If -r/--rev is used, the specified revision and all its ancestors
4305 If -r/--rev is used, the specified revision and all its ancestors
4306 will be pushed to the remote repository.
4306 will be pushed to the remote repository.
4307
4307
4308 If -B/--bookmark is used, the specified bookmarked revision, its
4308 If -B/--bookmark is used, the specified bookmarked revision, its
4309 ancestors, and the bookmark will be pushed to the remote
4309 ancestors, and the bookmark will be pushed to the remote
4310 repository. Specifying ``.`` is equivalent to specifying the active
4310 repository. Specifying ``.`` is equivalent to specifying the active
4311 bookmark's name.
4311 bookmark's name.
4312
4312
4313 Please see :hg:`help urls` for important details about ``ssh://``
4313 Please see :hg:`help urls` for important details about ``ssh://``
4314 URLs. If DESTINATION is omitted, a default path will be used.
4314 URLs. If DESTINATION is omitted, a default path will be used.
4315
4315
4316 .. container:: verbose
4316 .. container:: verbose
4317
4317
4318 The --pushvars option sends strings to the server that become
4318 The --pushvars option sends strings to the server that become
4319 environment variables prepended with ``HG_USERVAR_``. For example,
4319 environment variables prepended with ``HG_USERVAR_``. For example,
4320 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4320 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4321 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4321 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4322
4322
4323 pushvars can provide for user-overridable hooks as well as set debug
4323 pushvars can provide for user-overridable hooks as well as set debug
4324 levels. One example is having a hook that blocks commits containing
4324 levels. One example is having a hook that blocks commits containing
4325 conflict markers, but enables the user to override the hook if the file
4325 conflict markers, but enables the user to override the hook if the file
4326 is using conflict markers for testing purposes or the file format has
4326 is using conflict markers for testing purposes or the file format has
4327 strings that look like conflict markers.
4327 strings that look like conflict markers.
4328
4328
4329 By default, servers will ignore `--pushvars`. To enable it add the
4329 By default, servers will ignore `--pushvars`. To enable it add the
4330 following to your configuration file::
4330 following to your configuration file::
4331
4331
4332 [push]
4332 [push]
4333 pushvars.server = true
4333 pushvars.server = true
4334
4334
4335 Returns 0 if push was successful, 1 if nothing to push.
4335 Returns 0 if push was successful, 1 if nothing to push.
4336 """
4336 """
4337
4337
4338 opts = pycompat.byteskwargs(opts)
4338 opts = pycompat.byteskwargs(opts)
4339 if opts.get('bookmark'):
4339 if opts.get('bookmark'):
4340 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4340 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4341 for b in opts['bookmark']:
4341 for b in opts['bookmark']:
4342 # translate -B options to -r so changesets get pushed
4342 # translate -B options to -r so changesets get pushed
4343 b = repo._bookmarks.expandname(b)
4343 b = repo._bookmarks.expandname(b)
4344 if b in repo._bookmarks:
4344 if b in repo._bookmarks:
4345 opts.setdefault('rev', []).append(b)
4345 opts.setdefault('rev', []).append(b)
4346 else:
4346 else:
4347 # if we try to push a deleted bookmark, translate it to null
4347 # if we try to push a deleted bookmark, translate it to null
4348 # this lets simultaneous -r, -b options continue working
4348 # this lets simultaneous -r, -b options continue working
4349 opts.setdefault('rev', []).append("null")
4349 opts.setdefault('rev', []).append("null")
4350
4350
4351 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4351 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4352 if not path:
4352 if not path:
4353 raise error.Abort(_('default repository not configured!'),
4353 raise error.Abort(_('default repository not configured!'),
4354 hint=_("see 'hg help config.paths'"))
4354 hint=_("see 'hg help config.paths'"))
4355 dest = path.pushloc or path.loc
4355 dest = path.pushloc or path.loc
4356 branches = (path.branch, opts.get('branch') or [])
4356 branches = (path.branch, opts.get('branch') or [])
4357 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4357 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4358 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4358 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4359 other = hg.peer(repo, opts, dest)
4359 other = hg.peer(repo, opts, dest)
4360
4360
4361 if revs:
4361 if revs:
4362 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4362 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4363 if not revs:
4363 if not revs:
4364 raise error.Abort(_("specified revisions evaluate to an empty set"),
4364 raise error.Abort(_("specified revisions evaluate to an empty set"),
4365 hint=_("use different revision arguments"))
4365 hint=_("use different revision arguments"))
4366 elif path.pushrev:
4366 elif path.pushrev:
4367 # It doesn't make any sense to specify ancestor revisions. So limit
4367 # It doesn't make any sense to specify ancestor revisions. So limit
4368 # to DAG heads to make discovery simpler.
4368 # to DAG heads to make discovery simpler.
4369 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4369 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4370 revs = scmutil.revrange(repo, [expr])
4370 revs = scmutil.revrange(repo, [expr])
4371 revs = [repo[rev].node() for rev in revs]
4371 revs = [repo[rev].node() for rev in revs]
4372 if not revs:
4372 if not revs:
4373 raise error.Abort(_('default push revset for path evaluates to an '
4373 raise error.Abort(_('default push revset for path evaluates to an '
4374 'empty set'))
4374 'empty set'))
4375
4375
4376 repo._subtoppath = dest
4376 repo._subtoppath = dest
4377 try:
4377 try:
4378 # push subrepos depth-first for coherent ordering
4378 # push subrepos depth-first for coherent ordering
4379 c = repo['.']
4379 c = repo['.']
4380 subs = c.substate # only repos that are committed
4380 subs = c.substate # only repos that are committed
4381 for s in sorted(subs):
4381 for s in sorted(subs):
4382 result = c.sub(s).push(opts)
4382 result = c.sub(s).push(opts)
4383 if result == 0:
4383 if result == 0:
4384 return not result
4384 return not result
4385 finally:
4385 finally:
4386 del repo._subtoppath
4386 del repo._subtoppath
4387
4387
4388 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4388 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4389 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4389 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4390
4390
4391 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4391 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4392 newbranch=opts.get('new_branch'),
4392 newbranch=opts.get('new_branch'),
4393 bookmarks=opts.get('bookmark', ()),
4393 bookmarks=opts.get('bookmark', ()),
4394 opargs=opargs)
4394 opargs=opargs)
4395
4395
4396 result = not pushop.cgresult
4396 result = not pushop.cgresult
4397
4397
4398 if pushop.bkresult is not None:
4398 if pushop.bkresult is not None:
4399 if pushop.bkresult == 2:
4399 if pushop.bkresult == 2:
4400 result = 2
4400 result = 2
4401 elif not result and pushop.bkresult:
4401 elif not result and pushop.bkresult:
4402 result = 2
4402 result = 2
4403
4403
4404 return result
4404 return result
4405
4405
4406 @command('recover', [])
4406 @command('recover', [])
4407 def recover(ui, repo):
4407 def recover(ui, repo):
4408 """roll back an interrupted transaction
4408 """roll back an interrupted transaction
4409
4409
4410 Recover from an interrupted commit or pull.
4410 Recover from an interrupted commit or pull.
4411
4411
4412 This command tries to fix the repository status after an
4412 This command tries to fix the repository status after an
4413 interrupted operation. It should only be necessary when Mercurial
4413 interrupted operation. It should only be necessary when Mercurial
4414 suggests it.
4414 suggests it.
4415
4415
4416 Returns 0 if successful, 1 if nothing to recover or verify fails.
4416 Returns 0 if successful, 1 if nothing to recover or verify fails.
4417 """
4417 """
4418 if repo.recover():
4418 if repo.recover():
4419 return hg.verify(repo)
4419 return hg.verify(repo)
4420 return 1
4420 return 1
4421
4421
4422 @command('^remove|rm',
4422 @command('^remove|rm',
4423 [('A', 'after', None, _('record delete for missing files')),
4423 [('A', 'after', None, _('record delete for missing files')),
4424 ('f', 'force', None,
4424 ('f', 'force', None,
4425 _('forget added files, delete modified files')),
4425 _('forget added files, delete modified files')),
4426 ] + subrepoopts + walkopts + dryrunopts,
4426 ] + subrepoopts + walkopts + dryrunopts,
4427 _('[OPTION]... FILE...'),
4427 _('[OPTION]... FILE...'),
4428 inferrepo=True)
4428 inferrepo=True)
4429 def remove(ui, repo, *pats, **opts):
4429 def remove(ui, repo, *pats, **opts):
4430 """remove the specified files on the next commit
4430 """remove the specified files on the next commit
4431
4431
4432 Schedule the indicated files for removal from the current branch.
4432 Schedule the indicated files for removal from the current branch.
4433
4433
4434 This command schedules the files to be removed at the next commit.
4434 This command schedules the files to be removed at the next commit.
4435 To undo a remove before that, see :hg:`revert`. To undo added
4435 To undo a remove before that, see :hg:`revert`. To undo added
4436 files, see :hg:`forget`.
4436 files, see :hg:`forget`.
4437
4437
4438 .. container:: verbose
4438 .. container:: verbose
4439
4439
4440 -A/--after can be used to remove only files that have already
4440 -A/--after can be used to remove only files that have already
4441 been deleted, -f/--force can be used to force deletion, and -Af
4441 been deleted, -f/--force can be used to force deletion, and -Af
4442 can be used to remove files from the next revision without
4442 can be used to remove files from the next revision without
4443 deleting them from the working directory.
4443 deleting them from the working directory.
4444
4444
4445 The following table details the behavior of remove for different
4445 The following table details the behavior of remove for different
4446 file states (columns) and option combinations (rows). The file
4446 file states (columns) and option combinations (rows). The file
4447 states are Added [A], Clean [C], Modified [M] and Missing [!]
4447 states are Added [A], Clean [C], Modified [M] and Missing [!]
4448 (as reported by :hg:`status`). The actions are Warn, Remove
4448 (as reported by :hg:`status`). The actions are Warn, Remove
4449 (from branch) and Delete (from disk):
4449 (from branch) and Delete (from disk):
4450
4450
4451 ========= == == == ==
4451 ========= == == == ==
4452 opt/state A C M !
4452 opt/state A C M !
4453 ========= == == == ==
4453 ========= == == == ==
4454 none W RD W R
4454 none W RD W R
4455 -f R RD RD R
4455 -f R RD RD R
4456 -A W W W R
4456 -A W W W R
4457 -Af R R R R
4457 -Af R R R R
4458 ========= == == == ==
4458 ========= == == == ==
4459
4459
4460 .. note::
4460 .. note::
4461
4461
4462 :hg:`remove` never deletes files in Added [A] state from the
4462 :hg:`remove` never deletes files in Added [A] state from the
4463 working directory, not even if ``--force`` is specified.
4463 working directory, not even if ``--force`` is specified.
4464
4464
4465 Returns 0 on success, 1 if any warnings encountered.
4465 Returns 0 on success, 1 if any warnings encountered.
4466 """
4466 """
4467
4467
4468 opts = pycompat.byteskwargs(opts)
4468 opts = pycompat.byteskwargs(opts)
4469 after, force = opts.get('after'), opts.get('force')
4469 after, force = opts.get('after'), opts.get('force')
4470 dryrun = opts.get('dry_run')
4470 dryrun = opts.get('dry_run')
4471 if not pats and not after:
4471 if not pats and not after:
4472 raise error.Abort(_('no files specified'))
4472 raise error.Abort(_('no files specified'))
4473
4473
4474 m = scmutil.match(repo[None], pats, opts)
4474 m = scmutil.match(repo[None], pats, opts)
4475 subrepos = opts.get('subrepos')
4475 subrepos = opts.get('subrepos')
4476 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4476 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4477 dryrun=dryrun)
4477 dryrun=dryrun)
4478
4478
4479 @command('rename|move|mv',
4479 @command('rename|move|mv',
4480 [('A', 'after', None, _('record a rename that has already occurred')),
4480 [('A', 'after', None, _('record a rename that has already occurred')),
4481 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4481 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4482 ] + walkopts + dryrunopts,
4482 ] + walkopts + dryrunopts,
4483 _('[OPTION]... SOURCE... DEST'))
4483 _('[OPTION]... SOURCE... DEST'))
4484 def rename(ui, repo, *pats, **opts):
4484 def rename(ui, repo, *pats, **opts):
4485 """rename files; equivalent of copy + remove
4485 """rename files; equivalent of copy + remove
4486
4486
4487 Mark dest as copies of sources; mark sources for deletion. If dest
4487 Mark dest as copies of sources; mark sources for deletion. If dest
4488 is a directory, copies are put in that directory. If dest is a
4488 is a directory, copies are put in that directory. If dest is a
4489 file, there can only be one source.
4489 file, there can only be one source.
4490
4490
4491 By default, this command copies the contents of files as they
4491 By default, this command copies the contents of files as they
4492 exist in the working directory. If invoked with -A/--after, the
4492 exist in the working directory. If invoked with -A/--after, the
4493 operation is recorded, but no copying is performed.
4493 operation is recorded, but no copying is performed.
4494
4494
4495 This command takes effect at the next commit. To undo a rename
4495 This command takes effect at the next commit. To undo a rename
4496 before that, see :hg:`revert`.
4496 before that, see :hg:`revert`.
4497
4497
4498 Returns 0 on success, 1 if errors are encountered.
4498 Returns 0 on success, 1 if errors are encountered.
4499 """
4499 """
4500 opts = pycompat.byteskwargs(opts)
4500 opts = pycompat.byteskwargs(opts)
4501 with repo.wlock(False):
4501 with repo.wlock(False):
4502 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4502 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4503
4503
4504 @command('resolve',
4504 @command('resolve',
4505 [('a', 'all', None, _('select all unresolved files')),
4505 [('a', 'all', None, _('select all unresolved files')),
4506 ('l', 'list', None, _('list state of files needing merge')),
4506 ('l', 'list', None, _('list state of files needing merge')),
4507 ('m', 'mark', None, _('mark files as resolved')),
4507 ('m', 'mark', None, _('mark files as resolved')),
4508 ('u', 'unmark', None, _('mark files as unresolved')),
4508 ('u', 'unmark', None, _('mark files as unresolved')),
4509 ('n', 'no-status', None, _('hide status prefix')),
4509 ('n', 'no-status', None, _('hide status prefix')),
4510 ('', 're-merge', None, _('re-merge files'))]
4510 ('', 're-merge', None, _('re-merge files'))]
4511 + mergetoolopts + walkopts + formatteropts,
4511 + mergetoolopts + walkopts + formatteropts,
4512 _('[OPTION]... [FILE]...'),
4512 _('[OPTION]... [FILE]...'),
4513 inferrepo=True)
4513 inferrepo=True)
4514 def resolve(ui, repo, *pats, **opts):
4514 def resolve(ui, repo, *pats, **opts):
4515 """redo merges or set/view the merge status of files
4515 """redo merges or set/view the merge status of files
4516
4516
4517 Merges with unresolved conflicts are often the result of
4517 Merges with unresolved conflicts are often the result of
4518 non-interactive merging using the ``internal:merge`` configuration
4518 non-interactive merging using the ``internal:merge`` configuration
4519 setting, or a command-line merge tool like ``diff3``. The resolve
4519 setting, or a command-line merge tool like ``diff3``. The resolve
4520 command is used to manage the files involved in a merge, after
4520 command is used to manage the files involved in a merge, after
4521 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4521 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4522 working directory must have two parents). See :hg:`help
4522 working directory must have two parents). See :hg:`help
4523 merge-tools` for information on configuring merge tools.
4523 merge-tools` for information on configuring merge tools.
4524
4524
4525 The resolve command can be used in the following ways:
4525 The resolve command can be used in the following ways:
4526
4526
4527 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
4527 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
4528 the specified files, discarding any previous merge attempts. Re-merging
4528 the specified files, discarding any previous merge attempts. Re-merging
4529 is not performed for files already marked as resolved. Use ``--all/-a``
4529 is not performed for files already marked as resolved. Use ``--all/-a``
4530 to select all unresolved files. ``--tool`` can be used to specify
4530 to select all unresolved files. ``--tool`` can be used to specify
4531 the merge tool used for the given files. It overrides the HGMERGE
4531 the merge tool used for the given files. It overrides the HGMERGE
4532 environment variable and your configuration files. Previous file
4532 environment variable and your configuration files. Previous file
4533 contents are saved with a ``.orig`` suffix.
4533 contents are saved with a ``.orig`` suffix.
4534
4534
4535 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4535 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4536 (e.g. after having manually fixed-up the files). The default is
4536 (e.g. after having manually fixed-up the files). The default is
4537 to mark all unresolved files.
4537 to mark all unresolved files.
4538
4538
4539 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4539 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4540 default is to mark all resolved files.
4540 default is to mark all resolved files.
4541
4541
4542 - :hg:`resolve -l`: list files which had or still have conflicts.
4542 - :hg:`resolve -l`: list files which had or still have conflicts.
4543 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4543 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4544 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4544 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4545 the list. See :hg:`help filesets` for details.
4545 the list. See :hg:`help filesets` for details.
4546
4546
4547 .. note::
4547 .. note::
4548
4548
4549 Mercurial will not let you commit files with unresolved merge
4549 Mercurial will not let you commit files with unresolved merge
4550 conflicts. You must use :hg:`resolve -m ...` before you can
4550 conflicts. You must use :hg:`resolve -m ...` before you can
4551 commit after a conflicting merge.
4551 commit after a conflicting merge.
4552
4552
4553 Returns 0 on success, 1 if any files fail a resolve attempt.
4553 Returns 0 on success, 1 if any files fail a resolve attempt.
4554 """
4554 """
4555
4555
4556 opts = pycompat.byteskwargs(opts)
4556 opts = pycompat.byteskwargs(opts)
4557 confirm = ui.configbool('commands', 'resolve.confirm')
4557 confirm = ui.configbool('commands', 'resolve.confirm')
4558 flaglist = 'all mark unmark list no_status re_merge'.split()
4558 flaglist = 'all mark unmark list no_status re_merge'.split()
4559 all, mark, unmark, show, nostatus, remerge = \
4559 all, mark, unmark, show, nostatus, remerge = \
4560 [opts.get(o) for o in flaglist]
4560 [opts.get(o) for o in flaglist]
4561
4561
4562 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
4562 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
4563 if actioncount > 1:
4563 if actioncount > 1:
4564 raise error.Abort(_("too many actions specified"))
4564 raise error.Abort(_("too many actions specified"))
4565 elif (actioncount == 0
4565 elif (actioncount == 0
4566 and ui.config('commands', 'resolve.explicit-re-merge')):
4566 and ui.configbool('commands', 'resolve.explicit-re-merge')):
4567 hint = _('use --mark, --unmark, --list or --re-merge')
4567 hint = _('use --mark, --unmark, --list or --re-merge')
4568 raise error.Abort(_('no action specified'), hint=hint)
4568 raise error.Abort(_('no action specified'), hint=hint)
4569 if pats and all:
4569 if pats and all:
4570 raise error.Abort(_("can't specify --all and patterns"))
4570 raise error.Abort(_("can't specify --all and patterns"))
4571 if not (all or pats or show or mark or unmark):
4571 if not (all or pats or show or mark or unmark):
4572 raise error.Abort(_('no files or directories specified'),
4572 raise error.Abort(_('no files or directories specified'),
4573 hint=('use --all to re-merge all unresolved files'))
4573 hint=('use --all to re-merge all unresolved files'))
4574
4574
4575 if confirm:
4575 if confirm:
4576 if all:
4576 if all:
4577 if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
4577 if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
4578 b'$$ &Yes $$ &No')):
4578 b'$$ &Yes $$ &No')):
4579 raise error.Abort(_('user quit'))
4579 raise error.Abort(_('user quit'))
4580 if mark and not pats:
4580 if mark and not pats:
4581 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
4581 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
4582 b'$$ &Yes $$ &No')):
4582 b'$$ &Yes $$ &No')):
4583 raise error.Abort(_('user quit'))
4583 raise error.Abort(_('user quit'))
4584 if unmark and not pats:
4584 if unmark and not pats:
4585 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
4585 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
4586 b'$$ &Yes $$ &No')):
4586 b'$$ &Yes $$ &No')):
4587 raise error.Abort(_('user quit'))
4587 raise error.Abort(_('user quit'))
4588
4588
4589 if show:
4589 if show:
4590 ui.pager('resolve')
4590 ui.pager('resolve')
4591 fm = ui.formatter('resolve', opts)
4591 fm = ui.formatter('resolve', opts)
4592 ms = mergemod.mergestate.read(repo)
4592 ms = mergemod.mergestate.read(repo)
4593 wctx = repo[None]
4593 wctx = repo[None]
4594 m = scmutil.match(wctx, pats, opts)
4594 m = scmutil.match(wctx, pats, opts)
4595
4595
4596 # Labels and keys based on merge state. Unresolved path conflicts show
4596 # Labels and keys based on merge state. Unresolved path conflicts show
4597 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4597 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4598 # resolved conflicts.
4598 # resolved conflicts.
4599 mergestateinfo = {
4599 mergestateinfo = {
4600 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4600 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4601 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4601 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4602 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4602 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4603 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4603 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4604 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4604 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4605 'D'),
4605 'D'),
4606 }
4606 }
4607
4607
4608 for f in ms:
4608 for f in ms:
4609 if not m(f):
4609 if not m(f):
4610 continue
4610 continue
4611
4611
4612 label, key = mergestateinfo[ms[f]]
4612 label, key = mergestateinfo[ms[f]]
4613 fm.startitem()
4613 fm.startitem()
4614 fm.context(ctx=wctx)
4614 fm.context(ctx=wctx)
4615 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4615 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4616 fm.write('path', '%s\n', f, label=label)
4616 fm.write('path', '%s\n', f, label=label)
4617 fm.end()
4617 fm.end()
4618 return 0
4618 return 0
4619
4619
4620 with repo.wlock():
4620 with repo.wlock():
4621 ms = mergemod.mergestate.read(repo)
4621 ms = mergemod.mergestate.read(repo)
4622
4622
4623 if not (ms.active() or repo.dirstate.p2() != nullid):
4623 if not (ms.active() or repo.dirstate.p2() != nullid):
4624 raise error.Abort(
4624 raise error.Abort(
4625 _('resolve command not applicable when not merging'))
4625 _('resolve command not applicable when not merging'))
4626
4626
4627 wctx = repo[None]
4627 wctx = repo[None]
4628
4628
4629 if (ms.mergedriver
4629 if (ms.mergedriver
4630 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4630 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4631 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4631 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4632 ms.commit()
4632 ms.commit()
4633 # allow mark and unmark to go through
4633 # allow mark and unmark to go through
4634 if not mark and not unmark and not proceed:
4634 if not mark and not unmark and not proceed:
4635 return 1
4635 return 1
4636
4636
4637 m = scmutil.match(wctx, pats, opts)
4637 m = scmutil.match(wctx, pats, opts)
4638 ret = 0
4638 ret = 0
4639 didwork = False
4639 didwork = False
4640 runconclude = False
4640 runconclude = False
4641
4641
4642 tocomplete = []
4642 tocomplete = []
4643 hasconflictmarkers = []
4643 hasconflictmarkers = []
4644 if mark:
4644 if mark:
4645 markcheck = ui.config('commands', 'resolve.mark-check')
4645 markcheck = ui.config('commands', 'resolve.mark-check')
4646 if markcheck not in ['warn', 'abort']:
4646 if markcheck not in ['warn', 'abort']:
4647 # Treat all invalid / unrecognized values as 'none'.
4647 # Treat all invalid / unrecognized values as 'none'.
4648 markcheck = False
4648 markcheck = False
4649 for f in ms:
4649 for f in ms:
4650 if not m(f):
4650 if not m(f):
4651 continue
4651 continue
4652
4652
4653 didwork = True
4653 didwork = True
4654
4654
4655 # don't let driver-resolved files be marked, and run the conclude
4655 # don't let driver-resolved files be marked, and run the conclude
4656 # step if asked to resolve
4656 # step if asked to resolve
4657 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4657 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4658 exact = m.exact(f)
4658 exact = m.exact(f)
4659 if mark:
4659 if mark:
4660 if exact:
4660 if exact:
4661 ui.warn(_('not marking %s as it is driver-resolved\n')
4661 ui.warn(_('not marking %s as it is driver-resolved\n')
4662 % f)
4662 % f)
4663 elif unmark:
4663 elif unmark:
4664 if exact:
4664 if exact:
4665 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4665 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4666 % f)
4666 % f)
4667 else:
4667 else:
4668 runconclude = True
4668 runconclude = True
4669 continue
4669 continue
4670
4670
4671 # path conflicts must be resolved manually
4671 # path conflicts must be resolved manually
4672 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4672 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4673 mergemod.MERGE_RECORD_RESOLVED_PATH):
4673 mergemod.MERGE_RECORD_RESOLVED_PATH):
4674 if mark:
4674 if mark:
4675 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4675 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4676 elif unmark:
4676 elif unmark:
4677 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4677 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4678 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4678 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4679 ui.warn(_('%s: path conflict must be resolved manually\n')
4679 ui.warn(_('%s: path conflict must be resolved manually\n')
4680 % f)
4680 % f)
4681 continue
4681 continue
4682
4682
4683 if mark:
4683 if mark:
4684 if markcheck:
4684 if markcheck:
4685 with repo.wvfs(f) as fobj:
4685 with repo.wvfs(f) as fobj:
4686 fdata = fobj.read()
4686 fdata = fobj.read()
4687 if filemerge.hasconflictmarkers(fdata) and \
4687 if filemerge.hasconflictmarkers(fdata) and \
4688 ms[f] != mergemod.MERGE_RECORD_RESOLVED:
4688 ms[f] != mergemod.MERGE_RECORD_RESOLVED:
4689 hasconflictmarkers.append(f)
4689 hasconflictmarkers.append(f)
4690 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4690 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4691 elif unmark:
4691 elif unmark:
4692 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4692 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4693 else:
4693 else:
4694 # backup pre-resolve (merge uses .orig for its own purposes)
4694 # backup pre-resolve (merge uses .orig for its own purposes)
4695 a = repo.wjoin(f)
4695 a = repo.wjoin(f)
4696 try:
4696 try:
4697 util.copyfile(a, a + ".resolve")
4697 util.copyfile(a, a + ".resolve")
4698 except (IOError, OSError) as inst:
4698 except (IOError, OSError) as inst:
4699 if inst.errno != errno.ENOENT:
4699 if inst.errno != errno.ENOENT:
4700 raise
4700 raise
4701
4701
4702 try:
4702 try:
4703 # preresolve file
4703 # preresolve file
4704 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4704 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4705 with ui.configoverride(overrides, 'resolve'):
4705 with ui.configoverride(overrides, 'resolve'):
4706 complete, r = ms.preresolve(f, wctx)
4706 complete, r = ms.preresolve(f, wctx)
4707 if not complete:
4707 if not complete:
4708 tocomplete.append(f)
4708 tocomplete.append(f)
4709 elif r:
4709 elif r:
4710 ret = 1
4710 ret = 1
4711 finally:
4711 finally:
4712 ms.commit()
4712 ms.commit()
4713
4713
4714 # replace filemerge's .orig file with our resolve file, but only
4714 # replace filemerge's .orig file with our resolve file, but only
4715 # for merges that are complete
4715 # for merges that are complete
4716 if complete:
4716 if complete:
4717 try:
4717 try:
4718 util.rename(a + ".resolve",
4718 util.rename(a + ".resolve",
4719 scmutil.origpath(ui, repo, a))
4719 scmutil.origpath(ui, repo, a))
4720 except OSError as inst:
4720 except OSError as inst:
4721 if inst.errno != errno.ENOENT:
4721 if inst.errno != errno.ENOENT:
4722 raise
4722 raise
4723
4723
4724 if hasconflictmarkers:
4724 if hasconflictmarkers:
4725 ui.warn(_('warning: the following files still have conflict '
4725 ui.warn(_('warning: the following files still have conflict '
4726 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
4726 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
4727 if markcheck == 'abort' and not all:
4727 if markcheck == 'abort' and not all:
4728 raise error.Abort(_('conflict markers detected'),
4728 raise error.Abort(_('conflict markers detected'),
4729 hint=_('use --all to mark anyway'))
4729 hint=_('use --all to mark anyway'))
4730
4730
4731 for f in tocomplete:
4731 for f in tocomplete:
4732 try:
4732 try:
4733 # resolve file
4733 # resolve file
4734 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4734 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4735 with ui.configoverride(overrides, 'resolve'):
4735 with ui.configoverride(overrides, 'resolve'):
4736 r = ms.resolve(f, wctx)
4736 r = ms.resolve(f, wctx)
4737 if r:
4737 if r:
4738 ret = 1
4738 ret = 1
4739 finally:
4739 finally:
4740 ms.commit()
4740 ms.commit()
4741
4741
4742 # replace filemerge's .orig file with our resolve file
4742 # replace filemerge's .orig file with our resolve file
4743 a = repo.wjoin(f)
4743 a = repo.wjoin(f)
4744 try:
4744 try:
4745 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4745 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4746 except OSError as inst:
4746 except OSError as inst:
4747 if inst.errno != errno.ENOENT:
4747 if inst.errno != errno.ENOENT:
4748 raise
4748 raise
4749
4749
4750 ms.commit()
4750 ms.commit()
4751 ms.recordactions()
4751 ms.recordactions()
4752
4752
4753 if not didwork and pats:
4753 if not didwork and pats:
4754 hint = None
4754 hint = None
4755 if not any([p for p in pats if p.find(':') >= 0]):
4755 if not any([p for p in pats if p.find(':') >= 0]):
4756 pats = ['path:%s' % p for p in pats]
4756 pats = ['path:%s' % p for p in pats]
4757 m = scmutil.match(wctx, pats, opts)
4757 m = scmutil.match(wctx, pats, opts)
4758 for f in ms:
4758 for f in ms:
4759 if not m(f):
4759 if not m(f):
4760 continue
4760 continue
4761 def flag(o):
4761 def flag(o):
4762 if o == 're_merge':
4762 if o == 're_merge':
4763 return '--re-merge '
4763 return '--re-merge '
4764 return '-%s ' % o[0:1]
4764 return '-%s ' % o[0:1]
4765 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
4765 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
4766 hint = _("(try: hg resolve %s%s)\n") % (
4766 hint = _("(try: hg resolve %s%s)\n") % (
4767 flags,
4767 flags,
4768 ' '.join(pats))
4768 ' '.join(pats))
4769 break
4769 break
4770 ui.warn(_("arguments do not match paths that need resolving\n"))
4770 ui.warn(_("arguments do not match paths that need resolving\n"))
4771 if hint:
4771 if hint:
4772 ui.warn(hint)
4772 ui.warn(hint)
4773 elif ms.mergedriver and ms.mdstate() != 's':
4773 elif ms.mergedriver and ms.mdstate() != 's':
4774 # run conclude step when either a driver-resolved file is requested
4774 # run conclude step when either a driver-resolved file is requested
4775 # or there are no driver-resolved files
4775 # or there are no driver-resolved files
4776 # we can't use 'ret' to determine whether any files are unresolved
4776 # we can't use 'ret' to determine whether any files are unresolved
4777 # because we might not have tried to resolve some
4777 # because we might not have tried to resolve some
4778 if ((runconclude or not list(ms.driverresolved()))
4778 if ((runconclude or not list(ms.driverresolved()))
4779 and not list(ms.unresolved())):
4779 and not list(ms.unresolved())):
4780 proceed = mergemod.driverconclude(repo, ms, wctx)
4780 proceed = mergemod.driverconclude(repo, ms, wctx)
4781 ms.commit()
4781 ms.commit()
4782 if not proceed:
4782 if not proceed:
4783 return 1
4783 return 1
4784
4784
4785 # Nudge users into finishing an unfinished operation
4785 # Nudge users into finishing an unfinished operation
4786 unresolvedf = list(ms.unresolved())
4786 unresolvedf = list(ms.unresolved())
4787 driverresolvedf = list(ms.driverresolved())
4787 driverresolvedf = list(ms.driverresolved())
4788 if not unresolvedf and not driverresolvedf:
4788 if not unresolvedf and not driverresolvedf:
4789 ui.status(_('(no more unresolved files)\n'))
4789 ui.status(_('(no more unresolved files)\n'))
4790 cmdutil.checkafterresolved(repo)
4790 cmdutil.checkafterresolved(repo)
4791 elif not unresolvedf:
4791 elif not unresolvedf:
4792 ui.status(_('(no more unresolved files -- '
4792 ui.status(_('(no more unresolved files -- '
4793 'run "hg resolve --all" to conclude)\n'))
4793 'run "hg resolve --all" to conclude)\n'))
4794
4794
4795 return ret
4795 return ret
4796
4796
4797 @command('revert',
4797 @command('revert',
4798 [('a', 'all', None, _('revert all changes when no arguments given')),
4798 [('a', 'all', None, _('revert all changes when no arguments given')),
4799 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4799 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4800 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4800 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4801 ('C', 'no-backup', None, _('do not save backup copies of files')),
4801 ('C', 'no-backup', None, _('do not save backup copies of files')),
4802 ('i', 'interactive', None, _('interactively select the changes')),
4802 ('i', 'interactive', None, _('interactively select the changes')),
4803 ] + walkopts + dryrunopts,
4803 ] + walkopts + dryrunopts,
4804 _('[OPTION]... [-r REV] [NAME]...'))
4804 _('[OPTION]... [-r REV] [NAME]...'))
4805 def revert(ui, repo, *pats, **opts):
4805 def revert(ui, repo, *pats, **opts):
4806 """restore files to their checkout state
4806 """restore files to their checkout state
4807
4807
4808 .. note::
4808 .. note::
4809
4809
4810 To check out earlier revisions, you should use :hg:`update REV`.
4810 To check out earlier revisions, you should use :hg:`update REV`.
4811 To cancel an uncommitted merge (and lose your changes),
4811 To cancel an uncommitted merge (and lose your changes),
4812 use :hg:`merge --abort`.
4812 use :hg:`merge --abort`.
4813
4813
4814 With no revision specified, revert the specified files or directories
4814 With no revision specified, revert the specified files or directories
4815 to the contents they had in the parent of the working directory.
4815 to the contents they had in the parent of the working directory.
4816 This restores the contents of files to an unmodified
4816 This restores the contents of files to an unmodified
4817 state and unschedules adds, removes, copies, and renames. If the
4817 state and unschedules adds, removes, copies, and renames. If the
4818 working directory has two parents, you must explicitly specify a
4818 working directory has two parents, you must explicitly specify a
4819 revision.
4819 revision.
4820
4820
4821 Using the -r/--rev or -d/--date options, revert the given files or
4821 Using the -r/--rev or -d/--date options, revert the given files or
4822 directories to their states as of a specific revision. Because
4822 directories to their states as of a specific revision. Because
4823 revert does not change the working directory parents, this will
4823 revert does not change the working directory parents, this will
4824 cause these files to appear modified. This can be helpful to "back
4824 cause these files to appear modified. This can be helpful to "back
4825 out" some or all of an earlier change. See :hg:`backout` for a
4825 out" some or all of an earlier change. See :hg:`backout` for a
4826 related method.
4826 related method.
4827
4827
4828 Modified files are saved with a .orig suffix before reverting.
4828 Modified files are saved with a .orig suffix before reverting.
4829 To disable these backups, use --no-backup. It is possible to store
4829 To disable these backups, use --no-backup. It is possible to store
4830 the backup files in a custom directory relative to the root of the
4830 the backup files in a custom directory relative to the root of the
4831 repository by setting the ``ui.origbackuppath`` configuration
4831 repository by setting the ``ui.origbackuppath`` configuration
4832 option.
4832 option.
4833
4833
4834 See :hg:`help dates` for a list of formats valid for -d/--date.
4834 See :hg:`help dates` for a list of formats valid for -d/--date.
4835
4835
4836 See :hg:`help backout` for a way to reverse the effect of an
4836 See :hg:`help backout` for a way to reverse the effect of an
4837 earlier changeset.
4837 earlier changeset.
4838
4838
4839 Returns 0 on success.
4839 Returns 0 on success.
4840 """
4840 """
4841
4841
4842 opts = pycompat.byteskwargs(opts)
4842 opts = pycompat.byteskwargs(opts)
4843 if opts.get("date"):
4843 if opts.get("date"):
4844 if opts.get("rev"):
4844 if opts.get("rev"):
4845 raise error.Abort(_("you can't specify a revision and a date"))
4845 raise error.Abort(_("you can't specify a revision and a date"))
4846 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4846 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4847
4847
4848 parent, p2 = repo.dirstate.parents()
4848 parent, p2 = repo.dirstate.parents()
4849 if not opts.get('rev') and p2 != nullid:
4849 if not opts.get('rev') and p2 != nullid:
4850 # revert after merge is a trap for new users (issue2915)
4850 # revert after merge is a trap for new users (issue2915)
4851 raise error.Abort(_('uncommitted merge with no revision specified'),
4851 raise error.Abort(_('uncommitted merge with no revision specified'),
4852 hint=_("use 'hg update' or see 'hg help revert'"))
4852 hint=_("use 'hg update' or see 'hg help revert'"))
4853
4853
4854 rev = opts.get('rev')
4854 rev = opts.get('rev')
4855 if rev:
4855 if rev:
4856 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4856 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4857 ctx = scmutil.revsingle(repo, rev)
4857 ctx = scmutil.revsingle(repo, rev)
4858
4858
4859 if (not (pats or opts.get('include') or opts.get('exclude') or
4859 if (not (pats or opts.get('include') or opts.get('exclude') or
4860 opts.get('all') or opts.get('interactive'))):
4860 opts.get('all') or opts.get('interactive'))):
4861 msg = _("no files or directories specified")
4861 msg = _("no files or directories specified")
4862 if p2 != nullid:
4862 if p2 != nullid:
4863 hint = _("uncommitted merge, use --all to discard all changes,"
4863 hint = _("uncommitted merge, use --all to discard all changes,"
4864 " or 'hg update -C .' to abort the merge")
4864 " or 'hg update -C .' to abort the merge")
4865 raise error.Abort(msg, hint=hint)
4865 raise error.Abort(msg, hint=hint)
4866 dirty = any(repo.status())
4866 dirty = any(repo.status())
4867 node = ctx.node()
4867 node = ctx.node()
4868 if node != parent:
4868 if node != parent:
4869 if dirty:
4869 if dirty:
4870 hint = _("uncommitted changes, use --all to discard all"
4870 hint = _("uncommitted changes, use --all to discard all"
4871 " changes, or 'hg update %s' to update") % ctx.rev()
4871 " changes, or 'hg update %s' to update") % ctx.rev()
4872 else:
4872 else:
4873 hint = _("use --all to revert all files,"
4873 hint = _("use --all to revert all files,"
4874 " or 'hg update %s' to update") % ctx.rev()
4874 " or 'hg update %s' to update") % ctx.rev()
4875 elif dirty:
4875 elif dirty:
4876 hint = _("uncommitted changes, use --all to discard all changes")
4876 hint = _("uncommitted changes, use --all to discard all changes")
4877 else:
4877 else:
4878 hint = _("use --all to revert all files")
4878 hint = _("use --all to revert all files")
4879 raise error.Abort(msg, hint=hint)
4879 raise error.Abort(msg, hint=hint)
4880
4880
4881 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4881 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4882 **pycompat.strkwargs(opts))
4882 **pycompat.strkwargs(opts))
4883
4883
4884 @command('rollback', dryrunopts +
4884 @command('rollback', dryrunopts +
4885 [('f', 'force', False, _('ignore safety measures'))])
4885 [('f', 'force', False, _('ignore safety measures'))])
4886 def rollback(ui, repo, **opts):
4886 def rollback(ui, repo, **opts):
4887 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4887 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4888
4888
4889 Please use :hg:`commit --amend` instead of rollback to correct
4889 Please use :hg:`commit --amend` instead of rollback to correct
4890 mistakes in the last commit.
4890 mistakes in the last commit.
4891
4891
4892 This command should be used with care. There is only one level of
4892 This command should be used with care. There is only one level of
4893 rollback, and there is no way to undo a rollback. It will also
4893 rollback, and there is no way to undo a rollback. It will also
4894 restore the dirstate at the time of the last transaction, losing
4894 restore the dirstate at the time of the last transaction, losing
4895 any dirstate changes since that time. This command does not alter
4895 any dirstate changes since that time. This command does not alter
4896 the working directory.
4896 the working directory.
4897
4897
4898 Transactions are used to encapsulate the effects of all commands
4898 Transactions are used to encapsulate the effects of all commands
4899 that create new changesets or propagate existing changesets into a
4899 that create new changesets or propagate existing changesets into a
4900 repository.
4900 repository.
4901
4901
4902 .. container:: verbose
4902 .. container:: verbose
4903
4903
4904 For example, the following commands are transactional, and their
4904 For example, the following commands are transactional, and their
4905 effects can be rolled back:
4905 effects can be rolled back:
4906
4906
4907 - commit
4907 - commit
4908 - import
4908 - import
4909 - pull
4909 - pull
4910 - push (with this repository as the destination)
4910 - push (with this repository as the destination)
4911 - unbundle
4911 - unbundle
4912
4912
4913 To avoid permanent data loss, rollback will refuse to rollback a
4913 To avoid permanent data loss, rollback will refuse to rollback a
4914 commit transaction if it isn't checked out. Use --force to
4914 commit transaction if it isn't checked out. Use --force to
4915 override this protection.
4915 override this protection.
4916
4916
4917 The rollback command can be entirely disabled by setting the
4917 The rollback command can be entirely disabled by setting the
4918 ``ui.rollback`` configuration setting to false. If you're here
4918 ``ui.rollback`` configuration setting to false. If you're here
4919 because you want to use rollback and it's disabled, you can
4919 because you want to use rollback and it's disabled, you can
4920 re-enable the command by setting ``ui.rollback`` to true.
4920 re-enable the command by setting ``ui.rollback`` to true.
4921
4921
4922 This command is not intended for use on public repositories. Once
4922 This command is not intended for use on public repositories. Once
4923 changes are visible for pull by other users, rolling a transaction
4923 changes are visible for pull by other users, rolling a transaction
4924 back locally is ineffective (someone else may already have pulled
4924 back locally is ineffective (someone else may already have pulled
4925 the changes). Furthermore, a race is possible with readers of the
4925 the changes). Furthermore, a race is possible with readers of the
4926 repository; for example an in-progress pull from the repository
4926 repository; for example an in-progress pull from the repository
4927 may fail if a rollback is performed.
4927 may fail if a rollback is performed.
4928
4928
4929 Returns 0 on success, 1 if no rollback data is available.
4929 Returns 0 on success, 1 if no rollback data is available.
4930 """
4930 """
4931 if not ui.configbool('ui', 'rollback'):
4931 if not ui.configbool('ui', 'rollback'):
4932 raise error.Abort(_('rollback is disabled because it is unsafe'),
4932 raise error.Abort(_('rollback is disabled because it is unsafe'),
4933 hint=('see `hg help -v rollback` for information'))
4933 hint=('see `hg help -v rollback` for information'))
4934 return repo.rollback(dryrun=opts.get(r'dry_run'),
4934 return repo.rollback(dryrun=opts.get(r'dry_run'),
4935 force=opts.get(r'force'))
4935 force=opts.get(r'force'))
4936
4936
4937 @command('root', [], intents={INTENT_READONLY})
4937 @command('root', [], intents={INTENT_READONLY})
4938 def root(ui, repo):
4938 def root(ui, repo):
4939 """print the root (top) of the current working directory
4939 """print the root (top) of the current working directory
4940
4940
4941 Print the root directory of the current repository.
4941 Print the root directory of the current repository.
4942
4942
4943 Returns 0 on success.
4943 Returns 0 on success.
4944 """
4944 """
4945 ui.write(repo.root + "\n")
4945 ui.write(repo.root + "\n")
4946
4946
4947 @command('^serve',
4947 @command('^serve',
4948 [('A', 'accesslog', '', _('name of access log file to write to'),
4948 [('A', 'accesslog', '', _('name of access log file to write to'),
4949 _('FILE')),
4949 _('FILE')),
4950 ('d', 'daemon', None, _('run server in background')),
4950 ('d', 'daemon', None, _('run server in background')),
4951 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4951 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4952 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4952 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4953 # use string type, then we can check if something was passed
4953 # use string type, then we can check if something was passed
4954 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4954 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4955 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4955 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4956 _('ADDR')),
4956 _('ADDR')),
4957 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4957 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4958 _('PREFIX')),
4958 _('PREFIX')),
4959 ('n', 'name', '',
4959 ('n', 'name', '',
4960 _('name to show in web pages (default: working directory)'), _('NAME')),
4960 _('name to show in web pages (default: working directory)'), _('NAME')),
4961 ('', 'web-conf', '',
4961 ('', 'web-conf', '',
4962 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4962 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4963 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4963 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4964 _('FILE')),
4964 _('FILE')),
4965 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4965 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4966 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4966 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4967 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4967 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4968 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4968 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4969 ('', 'style', '', _('template style to use'), _('STYLE')),
4969 ('', 'style', '', _('template style to use'), _('STYLE')),
4970 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4970 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4971 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4971 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4972 ('', 'print-url', None, _('start and print only the URL'))]
4972 ('', 'print-url', None, _('start and print only the URL'))]
4973 + subrepoopts,
4973 + subrepoopts,
4974 _('[OPTION]...'),
4974 _('[OPTION]...'),
4975 optionalrepo=True)
4975 optionalrepo=True)
4976 def serve(ui, repo, **opts):
4976 def serve(ui, repo, **opts):
4977 """start stand-alone webserver
4977 """start stand-alone webserver
4978
4978
4979 Start a local HTTP repository browser and pull server. You can use
4979 Start a local HTTP repository browser and pull server. You can use
4980 this for ad-hoc sharing and browsing of repositories. It is
4980 this for ad-hoc sharing and browsing of repositories. It is
4981 recommended to use a real web server to serve a repository for
4981 recommended to use a real web server to serve a repository for
4982 longer periods of time.
4982 longer periods of time.
4983
4983
4984 Please note that the server does not implement access control.
4984 Please note that the server does not implement access control.
4985 This means that, by default, anybody can read from the server and
4985 This means that, by default, anybody can read from the server and
4986 nobody can write to it by default. Set the ``web.allow-push``
4986 nobody can write to it by default. Set the ``web.allow-push``
4987 option to ``*`` to allow everybody to push to the server. You
4987 option to ``*`` to allow everybody to push to the server. You
4988 should use a real web server if you need to authenticate users.
4988 should use a real web server if you need to authenticate users.
4989
4989
4990 By default, the server logs accesses to stdout and errors to
4990 By default, the server logs accesses to stdout and errors to
4991 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4991 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4992 files.
4992 files.
4993
4993
4994 To have the server choose a free port number to listen on, specify
4994 To have the server choose a free port number to listen on, specify
4995 a port number of 0; in this case, the server will print the port
4995 a port number of 0; in this case, the server will print the port
4996 number it uses.
4996 number it uses.
4997
4997
4998 Returns 0 on success.
4998 Returns 0 on success.
4999 """
4999 """
5000
5000
5001 opts = pycompat.byteskwargs(opts)
5001 opts = pycompat.byteskwargs(opts)
5002 if opts["stdio"] and opts["cmdserver"]:
5002 if opts["stdio"] and opts["cmdserver"]:
5003 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5003 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5004 if opts["print_url"] and ui.verbose:
5004 if opts["print_url"] and ui.verbose:
5005 raise error.Abort(_("cannot use --print-url with --verbose"))
5005 raise error.Abort(_("cannot use --print-url with --verbose"))
5006
5006
5007 if opts["stdio"]:
5007 if opts["stdio"]:
5008 if repo is None:
5008 if repo is None:
5009 raise error.RepoError(_("there is no Mercurial repository here"
5009 raise error.RepoError(_("there is no Mercurial repository here"
5010 " (.hg not found)"))
5010 " (.hg not found)"))
5011 s = wireprotoserver.sshserver(ui, repo)
5011 s = wireprotoserver.sshserver(ui, repo)
5012 s.serve_forever()
5012 s.serve_forever()
5013
5013
5014 service = server.createservice(ui, repo, opts)
5014 service = server.createservice(ui, repo, opts)
5015 return server.runservice(opts, initfn=service.init, runfn=service.run)
5015 return server.runservice(opts, initfn=service.init, runfn=service.run)
5016
5016
5017 _NOTTERSE = 'nothing'
5017 _NOTTERSE = 'nothing'
5018
5018
5019 @command('^status|st',
5019 @command('^status|st',
5020 [('A', 'all', None, _('show status of all files')),
5020 [('A', 'all', None, _('show status of all files')),
5021 ('m', 'modified', None, _('show only modified files')),
5021 ('m', 'modified', None, _('show only modified files')),
5022 ('a', 'added', None, _('show only added files')),
5022 ('a', 'added', None, _('show only added files')),
5023 ('r', 'removed', None, _('show only removed files')),
5023 ('r', 'removed', None, _('show only removed files')),
5024 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5024 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5025 ('c', 'clean', None, _('show only files without changes')),
5025 ('c', 'clean', None, _('show only files without changes')),
5026 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5026 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5027 ('i', 'ignored', None, _('show only ignored files')),
5027 ('i', 'ignored', None, _('show only ignored files')),
5028 ('n', 'no-status', None, _('hide status prefix')),
5028 ('n', 'no-status', None, _('hide status prefix')),
5029 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
5029 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
5030 ('C', 'copies', None, _('show source of copied files')),
5030 ('C', 'copies', None, _('show source of copied files')),
5031 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5031 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5032 ('', 'rev', [], _('show difference from revision'), _('REV')),
5032 ('', 'rev', [], _('show difference from revision'), _('REV')),
5033 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5033 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5034 ] + walkopts + subrepoopts + formatteropts,
5034 ] + walkopts + subrepoopts + formatteropts,
5035 _('[OPTION]... [FILE]...'),
5035 _('[OPTION]... [FILE]...'),
5036 inferrepo=True,
5036 inferrepo=True,
5037 intents={INTENT_READONLY})
5037 intents={INTENT_READONLY})
5038 def status(ui, repo, *pats, **opts):
5038 def status(ui, repo, *pats, **opts):
5039 """show changed files in the working directory
5039 """show changed files in the working directory
5040
5040
5041 Show status of files in the repository. If names are given, only
5041 Show status of files in the repository. If names are given, only
5042 files that match are shown. Files that are clean or ignored or
5042 files that match are shown. Files that are clean or ignored or
5043 the source of a copy/move operation, are not listed unless
5043 the source of a copy/move operation, are not listed unless
5044 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5044 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5045 Unless options described with "show only ..." are given, the
5045 Unless options described with "show only ..." are given, the
5046 options -mardu are used.
5046 options -mardu are used.
5047
5047
5048 Option -q/--quiet hides untracked (unknown and ignored) files
5048 Option -q/--quiet hides untracked (unknown and ignored) files
5049 unless explicitly requested with -u/--unknown or -i/--ignored.
5049 unless explicitly requested with -u/--unknown or -i/--ignored.
5050
5050
5051 .. note::
5051 .. note::
5052
5052
5053 :hg:`status` may appear to disagree with diff if permissions have
5053 :hg:`status` may appear to disagree with diff if permissions have
5054 changed or a merge has occurred. The standard diff format does
5054 changed or a merge has occurred. The standard diff format does
5055 not report permission changes and diff only reports changes
5055 not report permission changes and diff only reports changes
5056 relative to one merge parent.
5056 relative to one merge parent.
5057
5057
5058 If one revision is given, it is used as the base revision.
5058 If one revision is given, it is used as the base revision.
5059 If two revisions are given, the differences between them are
5059 If two revisions are given, the differences between them are
5060 shown. The --change option can also be used as a shortcut to list
5060 shown. The --change option can also be used as a shortcut to list
5061 the changed files of a revision from its first parent.
5061 the changed files of a revision from its first parent.
5062
5062
5063 The codes used to show the status of files are::
5063 The codes used to show the status of files are::
5064
5064
5065 M = modified
5065 M = modified
5066 A = added
5066 A = added
5067 R = removed
5067 R = removed
5068 C = clean
5068 C = clean
5069 ! = missing (deleted by non-hg command, but still tracked)
5069 ! = missing (deleted by non-hg command, but still tracked)
5070 ? = not tracked
5070 ? = not tracked
5071 I = ignored
5071 I = ignored
5072 = origin of the previous file (with --copies)
5072 = origin of the previous file (with --copies)
5073
5073
5074 .. container:: verbose
5074 .. container:: verbose
5075
5075
5076 The -t/--terse option abbreviates the output by showing only the directory
5076 The -t/--terse option abbreviates the output by showing only the directory
5077 name if all the files in it share the same status. The option takes an
5077 name if all the files in it share the same status. The option takes an
5078 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
5078 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
5079 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
5079 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
5080 for 'ignored' and 'c' for clean.
5080 for 'ignored' and 'c' for clean.
5081
5081
5082 It abbreviates only those statuses which are passed. Note that clean and
5082 It abbreviates only those statuses which are passed. Note that clean and
5083 ignored files are not displayed with '--terse ic' unless the -c/--clean
5083 ignored files are not displayed with '--terse ic' unless the -c/--clean
5084 and -i/--ignored options are also used.
5084 and -i/--ignored options are also used.
5085
5085
5086 The -v/--verbose option shows information when the repository is in an
5086 The -v/--verbose option shows information when the repository is in an
5087 unfinished merge, shelve, rebase state etc. You can have this behavior
5087 unfinished merge, shelve, rebase state etc. You can have this behavior
5088 turned on by default by enabling the ``commands.status.verbose`` option.
5088 turned on by default by enabling the ``commands.status.verbose`` option.
5089
5089
5090 You can skip displaying some of these states by setting
5090 You can skip displaying some of these states by setting
5091 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
5091 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
5092 'histedit', 'merge', 'rebase', or 'unshelve'.
5092 'histedit', 'merge', 'rebase', or 'unshelve'.
5093
5093
5094 Examples:
5094 Examples:
5095
5095
5096 - show changes in the working directory relative to a
5096 - show changes in the working directory relative to a
5097 changeset::
5097 changeset::
5098
5098
5099 hg status --rev 9353
5099 hg status --rev 9353
5100
5100
5101 - show changes in the working directory relative to the
5101 - show changes in the working directory relative to the
5102 current directory (see :hg:`help patterns` for more information)::
5102 current directory (see :hg:`help patterns` for more information)::
5103
5103
5104 hg status re:
5104 hg status re:
5105
5105
5106 - show all changes including copies in an existing changeset::
5106 - show all changes including copies in an existing changeset::
5107
5107
5108 hg status --copies --change 9353
5108 hg status --copies --change 9353
5109
5109
5110 - get a NUL separated list of added files, suitable for xargs::
5110 - get a NUL separated list of added files, suitable for xargs::
5111
5111
5112 hg status -an0
5112 hg status -an0
5113
5113
5114 - show more information about the repository status, abbreviating
5114 - show more information about the repository status, abbreviating
5115 added, removed, modified, deleted, and untracked paths::
5115 added, removed, modified, deleted, and untracked paths::
5116
5116
5117 hg status -v -t mardu
5117 hg status -v -t mardu
5118
5118
5119 Returns 0 on success.
5119 Returns 0 on success.
5120
5120
5121 """
5121 """
5122
5122
5123 opts = pycompat.byteskwargs(opts)
5123 opts = pycompat.byteskwargs(opts)
5124 revs = opts.get('rev')
5124 revs = opts.get('rev')
5125 change = opts.get('change')
5125 change = opts.get('change')
5126 terse = opts.get('terse')
5126 terse = opts.get('terse')
5127 if terse is _NOTTERSE:
5127 if terse is _NOTTERSE:
5128 if revs:
5128 if revs:
5129 terse = ''
5129 terse = ''
5130 else:
5130 else:
5131 terse = ui.config('commands', 'status.terse')
5131 terse = ui.config('commands', 'status.terse')
5132
5132
5133 if revs and change:
5133 if revs and change:
5134 msg = _('cannot specify --rev and --change at the same time')
5134 msg = _('cannot specify --rev and --change at the same time')
5135 raise error.Abort(msg)
5135 raise error.Abort(msg)
5136 elif revs and terse:
5136 elif revs and terse:
5137 msg = _('cannot use --terse with --rev')
5137 msg = _('cannot use --terse with --rev')
5138 raise error.Abort(msg)
5138 raise error.Abort(msg)
5139 elif change:
5139 elif change:
5140 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
5140 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
5141 ctx2 = scmutil.revsingle(repo, change, None)
5141 ctx2 = scmutil.revsingle(repo, change, None)
5142 ctx1 = ctx2.p1()
5142 ctx1 = ctx2.p1()
5143 else:
5143 else:
5144 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
5144 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
5145 ctx1, ctx2 = scmutil.revpair(repo, revs)
5145 ctx1, ctx2 = scmutil.revpair(repo, revs)
5146
5146
5147 if pats or ui.configbool('commands', 'status.relative'):
5147 if pats or ui.configbool('commands', 'status.relative'):
5148 cwd = repo.getcwd()
5148 cwd = repo.getcwd()
5149 else:
5149 else:
5150 cwd = ''
5150 cwd = ''
5151
5151
5152 if opts.get('print0'):
5152 if opts.get('print0'):
5153 end = '\0'
5153 end = '\0'
5154 else:
5154 else:
5155 end = '\n'
5155 end = '\n'
5156 copy = {}
5156 copy = {}
5157 states = 'modified added removed deleted unknown ignored clean'.split()
5157 states = 'modified added removed deleted unknown ignored clean'.split()
5158 show = [k for k in states if opts.get(k)]
5158 show = [k for k in states if opts.get(k)]
5159 if opts.get('all'):
5159 if opts.get('all'):
5160 show += ui.quiet and (states[:4] + ['clean']) or states
5160 show += ui.quiet and (states[:4] + ['clean']) or states
5161
5161
5162 if not show:
5162 if not show:
5163 if ui.quiet:
5163 if ui.quiet:
5164 show = states[:4]
5164 show = states[:4]
5165 else:
5165 else:
5166 show = states[:5]
5166 show = states[:5]
5167
5167
5168 m = scmutil.match(ctx2, pats, opts)
5168 m = scmutil.match(ctx2, pats, opts)
5169 if terse:
5169 if terse:
5170 # we need to compute clean and unknown to terse
5170 # we need to compute clean and unknown to terse
5171 stat = repo.status(ctx1.node(), ctx2.node(), m,
5171 stat = repo.status(ctx1.node(), ctx2.node(), m,
5172 'ignored' in show or 'i' in terse,
5172 'ignored' in show or 'i' in terse,
5173 clean=True, unknown=True,
5173 clean=True, unknown=True,
5174 listsubrepos=opts.get('subrepos'))
5174 listsubrepos=opts.get('subrepos'))
5175
5175
5176 stat = cmdutil.tersedir(stat, terse)
5176 stat = cmdutil.tersedir(stat, terse)
5177 else:
5177 else:
5178 stat = repo.status(ctx1.node(), ctx2.node(), m,
5178 stat = repo.status(ctx1.node(), ctx2.node(), m,
5179 'ignored' in show, 'clean' in show,
5179 'ignored' in show, 'clean' in show,
5180 'unknown' in show, opts.get('subrepos'))
5180 'unknown' in show, opts.get('subrepos'))
5181
5181
5182 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5182 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5183
5183
5184 if (opts.get('all') or opts.get('copies')
5184 if (opts.get('all') or opts.get('copies')
5185 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5185 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5186 copy = copies.pathcopies(ctx1, ctx2, m)
5186 copy = copies.pathcopies(ctx1, ctx2, m)
5187
5187
5188 ui.pager('status')
5188 ui.pager('status')
5189 fm = ui.formatter('status', opts)
5189 fm = ui.formatter('status', opts)
5190 fmt = '%s' + end
5190 fmt = '%s' + end
5191 showchar = not opts.get('no_status')
5191 showchar = not opts.get('no_status')
5192
5192
5193 for state, char, files in changestates:
5193 for state, char, files in changestates:
5194 if state in show:
5194 if state in show:
5195 label = 'status.' + state
5195 label = 'status.' + state
5196 for f in files:
5196 for f in files:
5197 fm.startitem()
5197 fm.startitem()
5198 fm.context(ctx=ctx2)
5198 fm.context(ctx=ctx2)
5199 fm.data(path=f)
5199 fm.data(path=f)
5200 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5200 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5201 fm.plain(fmt % repo.pathto(f, cwd), label=label)
5201 fm.plain(fmt % repo.pathto(f, cwd), label=label)
5202 if f in copy:
5202 if f in copy:
5203 fm.data(source=copy[f])
5203 fm.data(source=copy[f])
5204 fm.plain((' %s' + end) % repo.pathto(copy[f], cwd),
5204 fm.plain((' %s' + end) % repo.pathto(copy[f], cwd),
5205 label='status.copied')
5205 label='status.copied')
5206
5206
5207 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5207 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5208 and not ui.plain()):
5208 and not ui.plain()):
5209 cmdutil.morestatus(repo, fm)
5209 cmdutil.morestatus(repo, fm)
5210 fm.end()
5210 fm.end()
5211
5211
5212 @command('^summary|sum',
5212 @command('^summary|sum',
5213 [('', 'remote', None, _('check for push and pull'))],
5213 [('', 'remote', None, _('check for push and pull'))],
5214 '[--remote]',
5214 '[--remote]',
5215 intents={INTENT_READONLY})
5215 intents={INTENT_READONLY})
5216 def summary(ui, repo, **opts):
5216 def summary(ui, repo, **opts):
5217 """summarize working directory state
5217 """summarize working directory state
5218
5218
5219 This generates a brief summary of the working directory state,
5219 This generates a brief summary of the working directory state,
5220 including parents, branch, commit status, phase and available updates.
5220 including parents, branch, commit status, phase and available updates.
5221
5221
5222 With the --remote option, this will check the default paths for
5222 With the --remote option, this will check the default paths for
5223 incoming and outgoing changes. This can be time-consuming.
5223 incoming and outgoing changes. This can be time-consuming.
5224
5224
5225 Returns 0 on success.
5225 Returns 0 on success.
5226 """
5226 """
5227
5227
5228 opts = pycompat.byteskwargs(opts)
5228 opts = pycompat.byteskwargs(opts)
5229 ui.pager('summary')
5229 ui.pager('summary')
5230 ctx = repo[None]
5230 ctx = repo[None]
5231 parents = ctx.parents()
5231 parents = ctx.parents()
5232 pnode = parents[0].node()
5232 pnode = parents[0].node()
5233 marks = []
5233 marks = []
5234
5234
5235 ms = None
5235 ms = None
5236 try:
5236 try:
5237 ms = mergemod.mergestate.read(repo)
5237 ms = mergemod.mergestate.read(repo)
5238 except error.UnsupportedMergeRecords as e:
5238 except error.UnsupportedMergeRecords as e:
5239 s = ' '.join(e.recordtypes)
5239 s = ' '.join(e.recordtypes)
5240 ui.warn(
5240 ui.warn(
5241 _('warning: merge state has unsupported record types: %s\n') % s)
5241 _('warning: merge state has unsupported record types: %s\n') % s)
5242 unresolved = []
5242 unresolved = []
5243 else:
5243 else:
5244 unresolved = list(ms.unresolved())
5244 unresolved = list(ms.unresolved())
5245
5245
5246 for p in parents:
5246 for p in parents:
5247 # label with log.changeset (instead of log.parent) since this
5247 # label with log.changeset (instead of log.parent) since this
5248 # shows a working directory parent *changeset*:
5248 # shows a working directory parent *changeset*:
5249 # i18n: column positioning for "hg summary"
5249 # i18n: column positioning for "hg summary"
5250 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5250 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5251 label=logcmdutil.changesetlabels(p))
5251 label=logcmdutil.changesetlabels(p))
5252 ui.write(' '.join(p.tags()), label='log.tag')
5252 ui.write(' '.join(p.tags()), label='log.tag')
5253 if p.bookmarks():
5253 if p.bookmarks():
5254 marks.extend(p.bookmarks())
5254 marks.extend(p.bookmarks())
5255 if p.rev() == -1:
5255 if p.rev() == -1:
5256 if not len(repo):
5256 if not len(repo):
5257 ui.write(_(' (empty repository)'))
5257 ui.write(_(' (empty repository)'))
5258 else:
5258 else:
5259 ui.write(_(' (no revision checked out)'))
5259 ui.write(_(' (no revision checked out)'))
5260 if p.obsolete():
5260 if p.obsolete():
5261 ui.write(_(' (obsolete)'))
5261 ui.write(_(' (obsolete)'))
5262 if p.isunstable():
5262 if p.isunstable():
5263 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5263 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5264 for instability in p.instabilities())
5264 for instability in p.instabilities())
5265 ui.write(' ('
5265 ui.write(' ('
5266 + ', '.join(instabilities)
5266 + ', '.join(instabilities)
5267 + ')')
5267 + ')')
5268 ui.write('\n')
5268 ui.write('\n')
5269 if p.description():
5269 if p.description():
5270 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5270 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5271 label='log.summary')
5271 label='log.summary')
5272
5272
5273 branch = ctx.branch()
5273 branch = ctx.branch()
5274 bheads = repo.branchheads(branch)
5274 bheads = repo.branchheads(branch)
5275 # i18n: column positioning for "hg summary"
5275 # i18n: column positioning for "hg summary"
5276 m = _('branch: %s\n') % branch
5276 m = _('branch: %s\n') % branch
5277 if branch != 'default':
5277 if branch != 'default':
5278 ui.write(m, label='log.branch')
5278 ui.write(m, label='log.branch')
5279 else:
5279 else:
5280 ui.status(m, label='log.branch')
5280 ui.status(m, label='log.branch')
5281
5281
5282 if marks:
5282 if marks:
5283 active = repo._activebookmark
5283 active = repo._activebookmark
5284 # i18n: column positioning for "hg summary"
5284 # i18n: column positioning for "hg summary"
5285 ui.write(_('bookmarks:'), label='log.bookmark')
5285 ui.write(_('bookmarks:'), label='log.bookmark')
5286 if active is not None:
5286 if active is not None:
5287 if active in marks:
5287 if active in marks:
5288 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5288 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5289 marks.remove(active)
5289 marks.remove(active)
5290 else:
5290 else:
5291 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5291 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5292 for m in marks:
5292 for m in marks:
5293 ui.write(' ' + m, label='log.bookmark')
5293 ui.write(' ' + m, label='log.bookmark')
5294 ui.write('\n', label='log.bookmark')
5294 ui.write('\n', label='log.bookmark')
5295
5295
5296 status = repo.status(unknown=True)
5296 status = repo.status(unknown=True)
5297
5297
5298 c = repo.dirstate.copies()
5298 c = repo.dirstate.copies()
5299 copied, renamed = [], []
5299 copied, renamed = [], []
5300 for d, s in c.iteritems():
5300 for d, s in c.iteritems():
5301 if s in status.removed:
5301 if s in status.removed:
5302 status.removed.remove(s)
5302 status.removed.remove(s)
5303 renamed.append(d)
5303 renamed.append(d)
5304 else:
5304 else:
5305 copied.append(d)
5305 copied.append(d)
5306 if d in status.added:
5306 if d in status.added:
5307 status.added.remove(d)
5307 status.added.remove(d)
5308
5308
5309 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5309 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5310
5310
5311 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5311 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5312 (ui.label(_('%d added'), 'status.added'), status.added),
5312 (ui.label(_('%d added'), 'status.added'), status.added),
5313 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5313 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5314 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5314 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5315 (ui.label(_('%d copied'), 'status.copied'), copied),
5315 (ui.label(_('%d copied'), 'status.copied'), copied),
5316 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5316 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5317 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5317 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5318 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5318 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5319 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5319 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5320 t = []
5320 t = []
5321 for l, s in labels:
5321 for l, s in labels:
5322 if s:
5322 if s:
5323 t.append(l % len(s))
5323 t.append(l % len(s))
5324
5324
5325 t = ', '.join(t)
5325 t = ', '.join(t)
5326 cleanworkdir = False
5326 cleanworkdir = False
5327
5327
5328 if repo.vfs.exists('graftstate'):
5328 if repo.vfs.exists('graftstate'):
5329 t += _(' (graft in progress)')
5329 t += _(' (graft in progress)')
5330 if repo.vfs.exists('updatestate'):
5330 if repo.vfs.exists('updatestate'):
5331 t += _(' (interrupted update)')
5331 t += _(' (interrupted update)')
5332 elif len(parents) > 1:
5332 elif len(parents) > 1:
5333 t += _(' (merge)')
5333 t += _(' (merge)')
5334 elif branch != parents[0].branch():
5334 elif branch != parents[0].branch():
5335 t += _(' (new branch)')
5335 t += _(' (new branch)')
5336 elif (parents[0].closesbranch() and
5336 elif (parents[0].closesbranch() and
5337 pnode in repo.branchheads(branch, closed=True)):
5337 pnode in repo.branchheads(branch, closed=True)):
5338 t += _(' (head closed)')
5338 t += _(' (head closed)')
5339 elif not (status.modified or status.added or status.removed or renamed or
5339 elif not (status.modified or status.added or status.removed or renamed or
5340 copied or subs):
5340 copied or subs):
5341 t += _(' (clean)')
5341 t += _(' (clean)')
5342 cleanworkdir = True
5342 cleanworkdir = True
5343 elif pnode not in bheads:
5343 elif pnode not in bheads:
5344 t += _(' (new branch head)')
5344 t += _(' (new branch head)')
5345
5345
5346 if parents:
5346 if parents:
5347 pendingphase = max(p.phase() for p in parents)
5347 pendingphase = max(p.phase() for p in parents)
5348 else:
5348 else:
5349 pendingphase = phases.public
5349 pendingphase = phases.public
5350
5350
5351 if pendingphase > phases.newcommitphase(ui):
5351 if pendingphase > phases.newcommitphase(ui):
5352 t += ' (%s)' % phases.phasenames[pendingphase]
5352 t += ' (%s)' % phases.phasenames[pendingphase]
5353
5353
5354 if cleanworkdir:
5354 if cleanworkdir:
5355 # i18n: column positioning for "hg summary"
5355 # i18n: column positioning for "hg summary"
5356 ui.status(_('commit: %s\n') % t.strip())
5356 ui.status(_('commit: %s\n') % t.strip())
5357 else:
5357 else:
5358 # i18n: column positioning for "hg summary"
5358 # i18n: column positioning for "hg summary"
5359 ui.write(_('commit: %s\n') % t.strip())
5359 ui.write(_('commit: %s\n') % t.strip())
5360
5360
5361 # all ancestors of branch heads - all ancestors of parent = new csets
5361 # all ancestors of branch heads - all ancestors of parent = new csets
5362 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5362 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5363 bheads))
5363 bheads))
5364
5364
5365 if new == 0:
5365 if new == 0:
5366 # i18n: column positioning for "hg summary"
5366 # i18n: column positioning for "hg summary"
5367 ui.status(_('update: (current)\n'))
5367 ui.status(_('update: (current)\n'))
5368 elif pnode not in bheads:
5368 elif pnode not in bheads:
5369 # i18n: column positioning for "hg summary"
5369 # i18n: column positioning for "hg summary"
5370 ui.write(_('update: %d new changesets (update)\n') % new)
5370 ui.write(_('update: %d new changesets (update)\n') % new)
5371 else:
5371 else:
5372 # i18n: column positioning for "hg summary"
5372 # i18n: column positioning for "hg summary"
5373 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5373 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5374 (new, len(bheads)))
5374 (new, len(bheads)))
5375
5375
5376 t = []
5376 t = []
5377 draft = len(repo.revs('draft()'))
5377 draft = len(repo.revs('draft()'))
5378 if draft:
5378 if draft:
5379 t.append(_('%d draft') % draft)
5379 t.append(_('%d draft') % draft)
5380 secret = len(repo.revs('secret()'))
5380 secret = len(repo.revs('secret()'))
5381 if secret:
5381 if secret:
5382 t.append(_('%d secret') % secret)
5382 t.append(_('%d secret') % secret)
5383
5383
5384 if draft or secret:
5384 if draft or secret:
5385 ui.status(_('phases: %s\n') % ', '.join(t))
5385 ui.status(_('phases: %s\n') % ', '.join(t))
5386
5386
5387 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5387 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5388 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5388 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5389 numtrouble = len(repo.revs(trouble + "()"))
5389 numtrouble = len(repo.revs(trouble + "()"))
5390 # We write all the possibilities to ease translation
5390 # We write all the possibilities to ease translation
5391 troublemsg = {
5391 troublemsg = {
5392 "orphan": _("orphan: %d changesets"),
5392 "orphan": _("orphan: %d changesets"),
5393 "contentdivergent": _("content-divergent: %d changesets"),
5393 "contentdivergent": _("content-divergent: %d changesets"),
5394 "phasedivergent": _("phase-divergent: %d changesets"),
5394 "phasedivergent": _("phase-divergent: %d changesets"),
5395 }
5395 }
5396 if numtrouble > 0:
5396 if numtrouble > 0:
5397 ui.status(troublemsg[trouble] % numtrouble + "\n")
5397 ui.status(troublemsg[trouble] % numtrouble + "\n")
5398
5398
5399 cmdutil.summaryhooks(ui, repo)
5399 cmdutil.summaryhooks(ui, repo)
5400
5400
5401 if opts.get('remote'):
5401 if opts.get('remote'):
5402 needsincoming, needsoutgoing = True, True
5402 needsincoming, needsoutgoing = True, True
5403 else:
5403 else:
5404 needsincoming, needsoutgoing = False, False
5404 needsincoming, needsoutgoing = False, False
5405 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5405 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5406 if i:
5406 if i:
5407 needsincoming = True
5407 needsincoming = True
5408 if o:
5408 if o:
5409 needsoutgoing = True
5409 needsoutgoing = True
5410 if not needsincoming and not needsoutgoing:
5410 if not needsincoming and not needsoutgoing:
5411 return
5411 return
5412
5412
5413 def getincoming():
5413 def getincoming():
5414 source, branches = hg.parseurl(ui.expandpath('default'))
5414 source, branches = hg.parseurl(ui.expandpath('default'))
5415 sbranch = branches[0]
5415 sbranch = branches[0]
5416 try:
5416 try:
5417 other = hg.peer(repo, {}, source)
5417 other = hg.peer(repo, {}, source)
5418 except error.RepoError:
5418 except error.RepoError:
5419 if opts.get('remote'):
5419 if opts.get('remote'):
5420 raise
5420 raise
5421 return source, sbranch, None, None, None
5421 return source, sbranch, None, None, None
5422 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5422 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5423 if revs:
5423 if revs:
5424 revs = [other.lookup(rev) for rev in revs]
5424 revs = [other.lookup(rev) for rev in revs]
5425 ui.debug('comparing with %s\n' % util.hidepassword(source))
5425 ui.debug('comparing with %s\n' % util.hidepassword(source))
5426 repo.ui.pushbuffer()
5426 repo.ui.pushbuffer()
5427 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5427 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5428 repo.ui.popbuffer()
5428 repo.ui.popbuffer()
5429 return source, sbranch, other, commoninc, commoninc[1]
5429 return source, sbranch, other, commoninc, commoninc[1]
5430
5430
5431 if needsincoming:
5431 if needsincoming:
5432 source, sbranch, sother, commoninc, incoming = getincoming()
5432 source, sbranch, sother, commoninc, incoming = getincoming()
5433 else:
5433 else:
5434 source = sbranch = sother = commoninc = incoming = None
5434 source = sbranch = sother = commoninc = incoming = None
5435
5435
5436 def getoutgoing():
5436 def getoutgoing():
5437 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5437 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5438 dbranch = branches[0]
5438 dbranch = branches[0]
5439 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5439 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5440 if source != dest:
5440 if source != dest:
5441 try:
5441 try:
5442 dother = hg.peer(repo, {}, dest)
5442 dother = hg.peer(repo, {}, dest)
5443 except error.RepoError:
5443 except error.RepoError:
5444 if opts.get('remote'):
5444 if opts.get('remote'):
5445 raise
5445 raise
5446 return dest, dbranch, None, None
5446 return dest, dbranch, None, None
5447 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5447 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5448 elif sother is None:
5448 elif sother is None:
5449 # there is no explicit destination peer, but source one is invalid
5449 # there is no explicit destination peer, but source one is invalid
5450 return dest, dbranch, None, None
5450 return dest, dbranch, None, None
5451 else:
5451 else:
5452 dother = sother
5452 dother = sother
5453 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5453 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5454 common = None
5454 common = None
5455 else:
5455 else:
5456 common = commoninc
5456 common = commoninc
5457 if revs:
5457 if revs:
5458 revs = [repo.lookup(rev) for rev in revs]
5458 revs = [repo.lookup(rev) for rev in revs]
5459 repo.ui.pushbuffer()
5459 repo.ui.pushbuffer()
5460 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5460 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5461 commoninc=common)
5461 commoninc=common)
5462 repo.ui.popbuffer()
5462 repo.ui.popbuffer()
5463 return dest, dbranch, dother, outgoing
5463 return dest, dbranch, dother, outgoing
5464
5464
5465 if needsoutgoing:
5465 if needsoutgoing:
5466 dest, dbranch, dother, outgoing = getoutgoing()
5466 dest, dbranch, dother, outgoing = getoutgoing()
5467 else:
5467 else:
5468 dest = dbranch = dother = outgoing = None
5468 dest = dbranch = dother = outgoing = None
5469
5469
5470 if opts.get('remote'):
5470 if opts.get('remote'):
5471 t = []
5471 t = []
5472 if incoming:
5472 if incoming:
5473 t.append(_('1 or more incoming'))
5473 t.append(_('1 or more incoming'))
5474 o = outgoing.missing
5474 o = outgoing.missing
5475 if o:
5475 if o:
5476 t.append(_('%d outgoing') % len(o))
5476 t.append(_('%d outgoing') % len(o))
5477 other = dother or sother
5477 other = dother or sother
5478 if 'bookmarks' in other.listkeys('namespaces'):
5478 if 'bookmarks' in other.listkeys('namespaces'):
5479 counts = bookmarks.summary(repo, other)
5479 counts = bookmarks.summary(repo, other)
5480 if counts[0] > 0:
5480 if counts[0] > 0:
5481 t.append(_('%d incoming bookmarks') % counts[0])
5481 t.append(_('%d incoming bookmarks') % counts[0])
5482 if counts[1] > 0:
5482 if counts[1] > 0:
5483 t.append(_('%d outgoing bookmarks') % counts[1])
5483 t.append(_('%d outgoing bookmarks') % counts[1])
5484
5484
5485 if t:
5485 if t:
5486 # i18n: column positioning for "hg summary"
5486 # i18n: column positioning for "hg summary"
5487 ui.write(_('remote: %s\n') % (', '.join(t)))
5487 ui.write(_('remote: %s\n') % (', '.join(t)))
5488 else:
5488 else:
5489 # i18n: column positioning for "hg summary"
5489 # i18n: column positioning for "hg summary"
5490 ui.status(_('remote: (synced)\n'))
5490 ui.status(_('remote: (synced)\n'))
5491
5491
5492 cmdutil.summaryremotehooks(ui, repo, opts,
5492 cmdutil.summaryremotehooks(ui, repo, opts,
5493 ((source, sbranch, sother, commoninc),
5493 ((source, sbranch, sother, commoninc),
5494 (dest, dbranch, dother, outgoing)))
5494 (dest, dbranch, dother, outgoing)))
5495
5495
5496 @command('tag',
5496 @command('tag',
5497 [('f', 'force', None, _('force tag')),
5497 [('f', 'force', None, _('force tag')),
5498 ('l', 'local', None, _('make the tag local')),
5498 ('l', 'local', None, _('make the tag local')),
5499 ('r', 'rev', '', _('revision to tag'), _('REV')),
5499 ('r', 'rev', '', _('revision to tag'), _('REV')),
5500 ('', 'remove', None, _('remove a tag')),
5500 ('', 'remove', None, _('remove a tag')),
5501 # -l/--local is already there, commitopts cannot be used
5501 # -l/--local is already there, commitopts cannot be used
5502 ('e', 'edit', None, _('invoke editor on commit messages')),
5502 ('e', 'edit', None, _('invoke editor on commit messages')),
5503 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5503 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5504 ] + commitopts2,
5504 ] + commitopts2,
5505 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5505 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5506 def tag(ui, repo, name1, *names, **opts):
5506 def tag(ui, repo, name1, *names, **opts):
5507 """add one or more tags for the current or given revision
5507 """add one or more tags for the current or given revision
5508
5508
5509 Name a particular revision using <name>.
5509 Name a particular revision using <name>.
5510
5510
5511 Tags are used to name particular revisions of the repository and are
5511 Tags are used to name particular revisions of the repository and are
5512 very useful to compare different revisions, to go back to significant
5512 very useful to compare different revisions, to go back to significant
5513 earlier versions or to mark branch points as releases, etc. Changing
5513 earlier versions or to mark branch points as releases, etc. Changing
5514 an existing tag is normally disallowed; use -f/--force to override.
5514 an existing tag is normally disallowed; use -f/--force to override.
5515
5515
5516 If no revision is given, the parent of the working directory is
5516 If no revision is given, the parent of the working directory is
5517 used.
5517 used.
5518
5518
5519 To facilitate version control, distribution, and merging of tags,
5519 To facilitate version control, distribution, and merging of tags,
5520 they are stored as a file named ".hgtags" which is managed similarly
5520 they are stored as a file named ".hgtags" which is managed similarly
5521 to other project files and can be hand-edited if necessary. This
5521 to other project files and can be hand-edited if necessary. This
5522 also means that tagging creates a new commit. The file
5522 also means that tagging creates a new commit. The file
5523 ".hg/localtags" is used for local tags (not shared among
5523 ".hg/localtags" is used for local tags (not shared among
5524 repositories).
5524 repositories).
5525
5525
5526 Tag commits are usually made at the head of a branch. If the parent
5526 Tag commits are usually made at the head of a branch. If the parent
5527 of the working directory is not a branch head, :hg:`tag` aborts; use
5527 of the working directory is not a branch head, :hg:`tag` aborts; use
5528 -f/--force to force the tag commit to be based on a non-head
5528 -f/--force to force the tag commit to be based on a non-head
5529 changeset.
5529 changeset.
5530
5530
5531 See :hg:`help dates` for a list of formats valid for -d/--date.
5531 See :hg:`help dates` for a list of formats valid for -d/--date.
5532
5532
5533 Since tag names have priority over branch names during revision
5533 Since tag names have priority over branch names during revision
5534 lookup, using an existing branch name as a tag name is discouraged.
5534 lookup, using an existing branch name as a tag name is discouraged.
5535
5535
5536 Returns 0 on success.
5536 Returns 0 on success.
5537 """
5537 """
5538 opts = pycompat.byteskwargs(opts)
5538 opts = pycompat.byteskwargs(opts)
5539 with repo.wlock(), repo.lock():
5539 with repo.wlock(), repo.lock():
5540 rev_ = "."
5540 rev_ = "."
5541 names = [t.strip() for t in (name1,) + names]
5541 names = [t.strip() for t in (name1,) + names]
5542 if len(names) != len(set(names)):
5542 if len(names) != len(set(names)):
5543 raise error.Abort(_('tag names must be unique'))
5543 raise error.Abort(_('tag names must be unique'))
5544 for n in names:
5544 for n in names:
5545 scmutil.checknewlabel(repo, n, 'tag')
5545 scmutil.checknewlabel(repo, n, 'tag')
5546 if not n:
5546 if not n:
5547 raise error.Abort(_('tag names cannot consist entirely of '
5547 raise error.Abort(_('tag names cannot consist entirely of '
5548 'whitespace'))
5548 'whitespace'))
5549 if opts.get('rev') and opts.get('remove'):
5549 if opts.get('rev') and opts.get('remove'):
5550 raise error.Abort(_("--rev and --remove are incompatible"))
5550 raise error.Abort(_("--rev and --remove are incompatible"))
5551 if opts.get('rev'):
5551 if opts.get('rev'):
5552 rev_ = opts['rev']
5552 rev_ = opts['rev']
5553 message = opts.get('message')
5553 message = opts.get('message')
5554 if opts.get('remove'):
5554 if opts.get('remove'):
5555 if opts.get('local'):
5555 if opts.get('local'):
5556 expectedtype = 'local'
5556 expectedtype = 'local'
5557 else:
5557 else:
5558 expectedtype = 'global'
5558 expectedtype = 'global'
5559
5559
5560 for n in names:
5560 for n in names:
5561 if not repo.tagtype(n):
5561 if not repo.tagtype(n):
5562 raise error.Abort(_("tag '%s' does not exist") % n)
5562 raise error.Abort(_("tag '%s' does not exist") % n)
5563 if repo.tagtype(n) != expectedtype:
5563 if repo.tagtype(n) != expectedtype:
5564 if expectedtype == 'global':
5564 if expectedtype == 'global':
5565 raise error.Abort(_("tag '%s' is not a global tag") % n)
5565 raise error.Abort(_("tag '%s' is not a global tag") % n)
5566 else:
5566 else:
5567 raise error.Abort(_("tag '%s' is not a local tag") % n)
5567 raise error.Abort(_("tag '%s' is not a local tag") % n)
5568 rev_ = 'null'
5568 rev_ = 'null'
5569 if not message:
5569 if not message:
5570 # we don't translate commit messages
5570 # we don't translate commit messages
5571 message = 'Removed tag %s' % ', '.join(names)
5571 message = 'Removed tag %s' % ', '.join(names)
5572 elif not opts.get('force'):
5572 elif not opts.get('force'):
5573 for n in names:
5573 for n in names:
5574 if n in repo.tags():
5574 if n in repo.tags():
5575 raise error.Abort(_("tag '%s' already exists "
5575 raise error.Abort(_("tag '%s' already exists "
5576 "(use -f to force)") % n)
5576 "(use -f to force)") % n)
5577 if not opts.get('local'):
5577 if not opts.get('local'):
5578 p1, p2 = repo.dirstate.parents()
5578 p1, p2 = repo.dirstate.parents()
5579 if p2 != nullid:
5579 if p2 != nullid:
5580 raise error.Abort(_('uncommitted merge'))
5580 raise error.Abort(_('uncommitted merge'))
5581 bheads = repo.branchheads()
5581 bheads = repo.branchheads()
5582 if not opts.get('force') and bheads and p1 not in bheads:
5582 if not opts.get('force') and bheads and p1 not in bheads:
5583 raise error.Abort(_('working directory is not at a branch head '
5583 raise error.Abort(_('working directory is not at a branch head '
5584 '(use -f to force)'))
5584 '(use -f to force)'))
5585 node = scmutil.revsingle(repo, rev_).node()
5585 node = scmutil.revsingle(repo, rev_).node()
5586
5586
5587 if not message:
5587 if not message:
5588 # we don't translate commit messages
5588 # we don't translate commit messages
5589 message = ('Added tag %s for changeset %s' %
5589 message = ('Added tag %s for changeset %s' %
5590 (', '.join(names), short(node)))
5590 (', '.join(names), short(node)))
5591
5591
5592 date = opts.get('date')
5592 date = opts.get('date')
5593 if date:
5593 if date:
5594 date = dateutil.parsedate(date)
5594 date = dateutil.parsedate(date)
5595
5595
5596 if opts.get('remove'):
5596 if opts.get('remove'):
5597 editform = 'tag.remove'
5597 editform = 'tag.remove'
5598 else:
5598 else:
5599 editform = 'tag.add'
5599 editform = 'tag.add'
5600 editor = cmdutil.getcommiteditor(editform=editform,
5600 editor = cmdutil.getcommiteditor(editform=editform,
5601 **pycompat.strkwargs(opts))
5601 **pycompat.strkwargs(opts))
5602
5602
5603 # don't allow tagging the null rev
5603 # don't allow tagging the null rev
5604 if (not opts.get('remove') and
5604 if (not opts.get('remove') and
5605 scmutil.revsingle(repo, rev_).rev() == nullrev):
5605 scmutil.revsingle(repo, rev_).rev() == nullrev):
5606 raise error.Abort(_("cannot tag null revision"))
5606 raise error.Abort(_("cannot tag null revision"))
5607
5607
5608 tagsmod.tag(repo, names, node, message, opts.get('local'),
5608 tagsmod.tag(repo, names, node, message, opts.get('local'),
5609 opts.get('user'), date, editor=editor)
5609 opts.get('user'), date, editor=editor)
5610
5610
5611 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5611 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5612 def tags(ui, repo, **opts):
5612 def tags(ui, repo, **opts):
5613 """list repository tags
5613 """list repository tags
5614
5614
5615 This lists both regular and local tags. When the -v/--verbose
5615 This lists both regular and local tags. When the -v/--verbose
5616 switch is used, a third column "local" is printed for local tags.
5616 switch is used, a third column "local" is printed for local tags.
5617 When the -q/--quiet switch is used, only the tag name is printed.
5617 When the -q/--quiet switch is used, only the tag name is printed.
5618
5618
5619 Returns 0 on success.
5619 Returns 0 on success.
5620 """
5620 """
5621
5621
5622 opts = pycompat.byteskwargs(opts)
5622 opts = pycompat.byteskwargs(opts)
5623 ui.pager('tags')
5623 ui.pager('tags')
5624 fm = ui.formatter('tags', opts)
5624 fm = ui.formatter('tags', opts)
5625 contexthint = fm.contexthint('tag rev node type')
5625 contexthint = fm.contexthint('tag rev node type')
5626 hexfunc = fm.hexfunc
5626 hexfunc = fm.hexfunc
5627 tagtype = ""
5627 tagtype = ""
5628
5628
5629 for t, n in reversed(repo.tagslist()):
5629 for t, n in reversed(repo.tagslist()):
5630 hn = hexfunc(n)
5630 hn = hexfunc(n)
5631 label = 'tags.normal'
5631 label = 'tags.normal'
5632 tagtype = ''
5632 tagtype = ''
5633 if repo.tagtype(t) == 'local':
5633 if repo.tagtype(t) == 'local':
5634 label = 'tags.local'
5634 label = 'tags.local'
5635 tagtype = 'local'
5635 tagtype = 'local'
5636
5636
5637 fm.startitem()
5637 fm.startitem()
5638 if 'ctx' in contexthint:
5638 if 'ctx' in contexthint:
5639 fm.context(ctx=repo[n])
5639 fm.context(ctx=repo[n])
5640 fm.write('tag', '%s', t, label=label)
5640 fm.write('tag', '%s', t, label=label)
5641 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5641 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5642 fm.condwrite(not ui.quiet, 'rev node', fmt,
5642 fm.condwrite(not ui.quiet, 'rev node', fmt,
5643 repo.changelog.rev(n), hn, label=label)
5643 repo.changelog.rev(n), hn, label=label)
5644 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5644 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5645 tagtype, label=label)
5645 tagtype, label=label)
5646 fm.plain('\n')
5646 fm.plain('\n')
5647 fm.end()
5647 fm.end()
5648
5648
5649 @command('tip',
5649 @command('tip',
5650 [('p', 'patch', None, _('show patch')),
5650 [('p', 'patch', None, _('show patch')),
5651 ('g', 'git', None, _('use git extended diff format')),
5651 ('g', 'git', None, _('use git extended diff format')),
5652 ] + templateopts,
5652 ] + templateopts,
5653 _('[-p] [-g]'))
5653 _('[-p] [-g]'))
5654 def tip(ui, repo, **opts):
5654 def tip(ui, repo, **opts):
5655 """show the tip revision (DEPRECATED)
5655 """show the tip revision (DEPRECATED)
5656
5656
5657 The tip revision (usually just called the tip) is the changeset
5657 The tip revision (usually just called the tip) is the changeset
5658 most recently added to the repository (and therefore the most
5658 most recently added to the repository (and therefore the most
5659 recently changed head).
5659 recently changed head).
5660
5660
5661 If you have just made a commit, that commit will be the tip. If
5661 If you have just made a commit, that commit will be the tip. If
5662 you have just pulled changes from another repository, the tip of
5662 you have just pulled changes from another repository, the tip of
5663 that repository becomes the current tip. The "tip" tag is special
5663 that repository becomes the current tip. The "tip" tag is special
5664 and cannot be renamed or assigned to a different changeset.
5664 and cannot be renamed or assigned to a different changeset.
5665
5665
5666 This command is deprecated, please use :hg:`heads` instead.
5666 This command is deprecated, please use :hg:`heads` instead.
5667
5667
5668 Returns 0 on success.
5668 Returns 0 on success.
5669 """
5669 """
5670 opts = pycompat.byteskwargs(opts)
5670 opts = pycompat.byteskwargs(opts)
5671 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5671 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5672 displayer.show(repo['tip'])
5672 displayer.show(repo['tip'])
5673 displayer.close()
5673 displayer.close()
5674
5674
5675 @command('unbundle',
5675 @command('unbundle',
5676 [('u', 'update', None,
5676 [('u', 'update', None,
5677 _('update to new branch head if changesets were unbundled'))],
5677 _('update to new branch head if changesets were unbundled'))],
5678 _('[-u] FILE...'))
5678 _('[-u] FILE...'))
5679 def unbundle(ui, repo, fname1, *fnames, **opts):
5679 def unbundle(ui, repo, fname1, *fnames, **opts):
5680 """apply one or more bundle files
5680 """apply one or more bundle files
5681
5681
5682 Apply one or more bundle files generated by :hg:`bundle`.
5682 Apply one or more bundle files generated by :hg:`bundle`.
5683
5683
5684 Returns 0 on success, 1 if an update has unresolved files.
5684 Returns 0 on success, 1 if an update has unresolved files.
5685 """
5685 """
5686 fnames = (fname1,) + fnames
5686 fnames = (fname1,) + fnames
5687
5687
5688 with repo.lock():
5688 with repo.lock():
5689 for fname in fnames:
5689 for fname in fnames:
5690 f = hg.openpath(ui, fname)
5690 f = hg.openpath(ui, fname)
5691 gen = exchange.readbundle(ui, f, fname)
5691 gen = exchange.readbundle(ui, f, fname)
5692 if isinstance(gen, streamclone.streamcloneapplier):
5692 if isinstance(gen, streamclone.streamcloneapplier):
5693 raise error.Abort(
5693 raise error.Abort(
5694 _('packed bundles cannot be applied with '
5694 _('packed bundles cannot be applied with '
5695 '"hg unbundle"'),
5695 '"hg unbundle"'),
5696 hint=_('use "hg debugapplystreamclonebundle"'))
5696 hint=_('use "hg debugapplystreamclonebundle"'))
5697 url = 'bundle:' + fname
5697 url = 'bundle:' + fname
5698 try:
5698 try:
5699 txnname = 'unbundle'
5699 txnname = 'unbundle'
5700 if not isinstance(gen, bundle2.unbundle20):
5700 if not isinstance(gen, bundle2.unbundle20):
5701 txnname = 'unbundle\n%s' % util.hidepassword(url)
5701 txnname = 'unbundle\n%s' % util.hidepassword(url)
5702 with repo.transaction(txnname) as tr:
5702 with repo.transaction(txnname) as tr:
5703 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5703 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5704 url=url)
5704 url=url)
5705 except error.BundleUnknownFeatureError as exc:
5705 except error.BundleUnknownFeatureError as exc:
5706 raise error.Abort(
5706 raise error.Abort(
5707 _('%s: unknown bundle feature, %s') % (fname, exc),
5707 _('%s: unknown bundle feature, %s') % (fname, exc),
5708 hint=_("see https://mercurial-scm.org/"
5708 hint=_("see https://mercurial-scm.org/"
5709 "wiki/BundleFeature for more "
5709 "wiki/BundleFeature for more "
5710 "information"))
5710 "information"))
5711 modheads = bundle2.combinechangegroupresults(op)
5711 modheads = bundle2.combinechangegroupresults(op)
5712
5712
5713 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5713 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5714
5714
5715 @command('^update|up|checkout|co',
5715 @command('^update|up|checkout|co',
5716 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5716 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5717 ('c', 'check', None, _('require clean working directory')),
5717 ('c', 'check', None, _('require clean working directory')),
5718 ('m', 'merge', None, _('merge uncommitted changes')),
5718 ('m', 'merge', None, _('merge uncommitted changes')),
5719 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5719 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5720 ('r', 'rev', '', _('revision'), _('REV'))
5720 ('r', 'rev', '', _('revision'), _('REV'))
5721 ] + mergetoolopts,
5721 ] + mergetoolopts,
5722 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5722 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5723 def update(ui, repo, node=None, **opts):
5723 def update(ui, repo, node=None, **opts):
5724 """update working directory (or switch revisions)
5724 """update working directory (or switch revisions)
5725
5725
5726 Update the repository's working directory to the specified
5726 Update the repository's working directory to the specified
5727 changeset. If no changeset is specified, update to the tip of the
5727 changeset. If no changeset is specified, update to the tip of the
5728 current named branch and move the active bookmark (see :hg:`help
5728 current named branch and move the active bookmark (see :hg:`help
5729 bookmarks`).
5729 bookmarks`).
5730
5730
5731 Update sets the working directory's parent revision to the specified
5731 Update sets the working directory's parent revision to the specified
5732 changeset (see :hg:`help parents`).
5732 changeset (see :hg:`help parents`).
5733
5733
5734 If the changeset is not a descendant or ancestor of the working
5734 If the changeset is not a descendant or ancestor of the working
5735 directory's parent and there are uncommitted changes, the update is
5735 directory's parent and there are uncommitted changes, the update is
5736 aborted. With the -c/--check option, the working directory is checked
5736 aborted. With the -c/--check option, the working directory is checked
5737 for uncommitted changes; if none are found, the working directory is
5737 for uncommitted changes; if none are found, the working directory is
5738 updated to the specified changeset.
5738 updated to the specified changeset.
5739
5739
5740 .. container:: verbose
5740 .. container:: verbose
5741
5741
5742 The -C/--clean, -c/--check, and -m/--merge options control what
5742 The -C/--clean, -c/--check, and -m/--merge options control what
5743 happens if the working directory contains uncommitted changes.
5743 happens if the working directory contains uncommitted changes.
5744 At most of one of them can be specified.
5744 At most of one of them can be specified.
5745
5745
5746 1. If no option is specified, and if
5746 1. If no option is specified, and if
5747 the requested changeset is an ancestor or descendant of
5747 the requested changeset is an ancestor or descendant of
5748 the working directory's parent, the uncommitted changes
5748 the working directory's parent, the uncommitted changes
5749 are merged into the requested changeset and the merged
5749 are merged into the requested changeset and the merged
5750 result is left uncommitted. If the requested changeset is
5750 result is left uncommitted. If the requested changeset is
5751 not an ancestor or descendant (that is, it is on another
5751 not an ancestor or descendant (that is, it is on another
5752 branch), the update is aborted and the uncommitted changes
5752 branch), the update is aborted and the uncommitted changes
5753 are preserved.
5753 are preserved.
5754
5754
5755 2. With the -m/--merge option, the update is allowed even if the
5755 2. With the -m/--merge option, the update is allowed even if the
5756 requested changeset is not an ancestor or descendant of
5756 requested changeset is not an ancestor or descendant of
5757 the working directory's parent.
5757 the working directory's parent.
5758
5758
5759 3. With the -c/--check option, the update is aborted and the
5759 3. With the -c/--check option, the update is aborted and the
5760 uncommitted changes are preserved.
5760 uncommitted changes are preserved.
5761
5761
5762 4. With the -C/--clean option, uncommitted changes are discarded and
5762 4. With the -C/--clean option, uncommitted changes are discarded and
5763 the working directory is updated to the requested changeset.
5763 the working directory is updated to the requested changeset.
5764
5764
5765 To cancel an uncommitted merge (and lose your changes), use
5765 To cancel an uncommitted merge (and lose your changes), use
5766 :hg:`merge --abort`.
5766 :hg:`merge --abort`.
5767
5767
5768 Use null as the changeset to remove the working directory (like
5768 Use null as the changeset to remove the working directory (like
5769 :hg:`clone -U`).
5769 :hg:`clone -U`).
5770
5770
5771 If you want to revert just one file to an older revision, use
5771 If you want to revert just one file to an older revision, use
5772 :hg:`revert [-r REV] NAME`.
5772 :hg:`revert [-r REV] NAME`.
5773
5773
5774 See :hg:`help dates` for a list of formats valid for -d/--date.
5774 See :hg:`help dates` for a list of formats valid for -d/--date.
5775
5775
5776 Returns 0 on success, 1 if there are unresolved files.
5776 Returns 0 on success, 1 if there are unresolved files.
5777 """
5777 """
5778 rev = opts.get(r'rev')
5778 rev = opts.get(r'rev')
5779 date = opts.get(r'date')
5779 date = opts.get(r'date')
5780 clean = opts.get(r'clean')
5780 clean = opts.get(r'clean')
5781 check = opts.get(r'check')
5781 check = opts.get(r'check')
5782 merge = opts.get(r'merge')
5782 merge = opts.get(r'merge')
5783 if rev and node:
5783 if rev and node:
5784 raise error.Abort(_("please specify just one revision"))
5784 raise error.Abort(_("please specify just one revision"))
5785
5785
5786 if ui.configbool('commands', 'update.requiredest'):
5786 if ui.configbool('commands', 'update.requiredest'):
5787 if not node and not rev and not date:
5787 if not node and not rev and not date:
5788 raise error.Abort(_('you must specify a destination'),
5788 raise error.Abort(_('you must specify a destination'),
5789 hint=_('for example: hg update ".::"'))
5789 hint=_('for example: hg update ".::"'))
5790
5790
5791 if rev is None or rev == '':
5791 if rev is None or rev == '':
5792 rev = node
5792 rev = node
5793
5793
5794 if date and rev is not None:
5794 if date and rev is not None:
5795 raise error.Abort(_("you can't specify a revision and a date"))
5795 raise error.Abort(_("you can't specify a revision and a date"))
5796
5796
5797 if len([x for x in (clean, check, merge) if x]) > 1:
5797 if len([x for x in (clean, check, merge) if x]) > 1:
5798 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5798 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5799 "or -m/--merge"))
5799 "or -m/--merge"))
5800
5800
5801 updatecheck = None
5801 updatecheck = None
5802 if check:
5802 if check:
5803 updatecheck = 'abort'
5803 updatecheck = 'abort'
5804 elif merge:
5804 elif merge:
5805 updatecheck = 'none'
5805 updatecheck = 'none'
5806
5806
5807 with repo.wlock():
5807 with repo.wlock():
5808 cmdutil.clearunfinished(repo)
5808 cmdutil.clearunfinished(repo)
5809
5809
5810 if date:
5810 if date:
5811 rev = cmdutil.finddate(ui, repo, date)
5811 rev = cmdutil.finddate(ui, repo, date)
5812
5812
5813 # if we defined a bookmark, we have to remember the original name
5813 # if we defined a bookmark, we have to remember the original name
5814 brev = rev
5814 brev = rev
5815 if rev:
5815 if rev:
5816 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5816 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5817 ctx = scmutil.revsingle(repo, rev, rev)
5817 ctx = scmutil.revsingle(repo, rev, rev)
5818 rev = ctx.rev()
5818 rev = ctx.rev()
5819 hidden = ctx.hidden()
5819 hidden = ctx.hidden()
5820 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
5820 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
5821 with ui.configoverride(overrides, 'update'):
5821 with ui.configoverride(overrides, 'update'):
5822 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5822 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5823 updatecheck=updatecheck)
5823 updatecheck=updatecheck)
5824 if hidden:
5824 if hidden:
5825 ctxstr = ctx.hex()[:12]
5825 ctxstr = ctx.hex()[:12]
5826 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5826 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5827
5827
5828 if ctx.obsolete():
5828 if ctx.obsolete():
5829 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5829 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5830 ui.warn("(%s)\n" % obsfatemsg)
5830 ui.warn("(%s)\n" % obsfatemsg)
5831 return ret
5831 return ret
5832
5832
5833 @command('verify', [])
5833 @command('verify', [])
5834 def verify(ui, repo):
5834 def verify(ui, repo):
5835 """verify the integrity of the repository
5835 """verify the integrity of the repository
5836
5836
5837 Verify the integrity of the current repository.
5837 Verify the integrity of the current repository.
5838
5838
5839 This will perform an extensive check of the repository's
5839 This will perform an extensive check of the repository's
5840 integrity, validating the hashes and checksums of each entry in
5840 integrity, validating the hashes and checksums of each entry in
5841 the changelog, manifest, and tracked files, as well as the
5841 the changelog, manifest, and tracked files, as well as the
5842 integrity of their crosslinks and indices.
5842 integrity of their crosslinks and indices.
5843
5843
5844 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5844 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5845 for more information about recovery from corruption of the
5845 for more information about recovery from corruption of the
5846 repository.
5846 repository.
5847
5847
5848 Returns 0 on success, 1 if errors are encountered.
5848 Returns 0 on success, 1 if errors are encountered.
5849 """
5849 """
5850 return hg.verify(repo)
5850 return hg.verify(repo)
5851
5851
5852 @command('version', [] + formatteropts, norepo=True,
5852 @command('version', [] + formatteropts, norepo=True,
5853 intents={INTENT_READONLY})
5853 intents={INTENT_READONLY})
5854 def version_(ui, **opts):
5854 def version_(ui, **opts):
5855 """output version and copyright information"""
5855 """output version and copyright information"""
5856 opts = pycompat.byteskwargs(opts)
5856 opts = pycompat.byteskwargs(opts)
5857 if ui.verbose:
5857 if ui.verbose:
5858 ui.pager('version')
5858 ui.pager('version')
5859 fm = ui.formatter("version", opts)
5859 fm = ui.formatter("version", opts)
5860 fm.startitem()
5860 fm.startitem()
5861 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5861 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5862 util.version())
5862 util.version())
5863 license = _(
5863 license = _(
5864 "(see https://mercurial-scm.org for more information)\n"
5864 "(see https://mercurial-scm.org for more information)\n"
5865 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5865 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5866 "This is free software; see the source for copying conditions. "
5866 "This is free software; see the source for copying conditions. "
5867 "There is NO\nwarranty; "
5867 "There is NO\nwarranty; "
5868 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5868 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5869 )
5869 )
5870 if not ui.quiet:
5870 if not ui.quiet:
5871 fm.plain(license)
5871 fm.plain(license)
5872
5872
5873 if ui.verbose:
5873 if ui.verbose:
5874 fm.plain(_("\nEnabled extensions:\n\n"))
5874 fm.plain(_("\nEnabled extensions:\n\n"))
5875 # format names and versions into columns
5875 # format names and versions into columns
5876 names = []
5876 names = []
5877 vers = []
5877 vers = []
5878 isinternals = []
5878 isinternals = []
5879 for name, module in extensions.extensions():
5879 for name, module in extensions.extensions():
5880 names.append(name)
5880 names.append(name)
5881 vers.append(extensions.moduleversion(module) or None)
5881 vers.append(extensions.moduleversion(module) or None)
5882 isinternals.append(extensions.ismoduleinternal(module))
5882 isinternals.append(extensions.ismoduleinternal(module))
5883 fn = fm.nested("extensions", tmpl='{name}\n')
5883 fn = fm.nested("extensions", tmpl='{name}\n')
5884 if names:
5884 if names:
5885 namefmt = " %%-%ds " % max(len(n) for n in names)
5885 namefmt = " %%-%ds " % max(len(n) for n in names)
5886 places = [_("external"), _("internal")]
5886 places = [_("external"), _("internal")]
5887 for n, v, p in zip(names, vers, isinternals):
5887 for n, v, p in zip(names, vers, isinternals):
5888 fn.startitem()
5888 fn.startitem()
5889 fn.condwrite(ui.verbose, "name", namefmt, n)
5889 fn.condwrite(ui.verbose, "name", namefmt, n)
5890 if ui.verbose:
5890 if ui.verbose:
5891 fn.plain("%s " % places[p])
5891 fn.plain("%s " % places[p])
5892 fn.data(bundled=p)
5892 fn.data(bundled=p)
5893 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5893 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5894 if ui.verbose:
5894 if ui.verbose:
5895 fn.plain("\n")
5895 fn.plain("\n")
5896 fn.end()
5896 fn.end()
5897 fm.end()
5897 fm.end()
5898
5898
5899 def loadcmdtable(ui, name, cmdtable):
5899 def loadcmdtable(ui, name, cmdtable):
5900 """Load command functions from specified cmdtable
5900 """Load command functions from specified cmdtable
5901 """
5901 """
5902 overrides = [cmd for cmd in cmdtable if cmd in table]
5902 overrides = [cmd for cmd in cmdtable if cmd in table]
5903 if overrides:
5903 if overrides:
5904 ui.warn(_("extension '%s' overrides commands: %s\n")
5904 ui.warn(_("extension '%s' overrides commands: %s\n")
5905 % (name, " ".join(overrides)))
5905 % (name, " ".join(overrides)))
5906 table.update(cmdtable)
5906 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now