##// END OF EJS Templates
tags: unblock log-like template keywords and functions...
Yuya Nishihara -
r38449:5d9b765d default
parent child Browse files
Show More
@@ -1,5719 +1,5722 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 )
22 )
23 from . import (
23 from . import (
24 archival,
24 archival,
25 bookmarks,
25 bookmarks,
26 bundle2,
26 bundle2,
27 changegroup,
27 changegroup,
28 cmdutil,
28 cmdutil,
29 copies,
29 copies,
30 debugcommands as debugcommandsmod,
30 debugcommands as debugcommandsmod,
31 destutil,
31 destutil,
32 dirstateguard,
32 dirstateguard,
33 discovery,
33 discovery,
34 encoding,
34 encoding,
35 error,
35 error,
36 exchange,
36 exchange,
37 extensions,
37 extensions,
38 formatter,
38 formatter,
39 graphmod,
39 graphmod,
40 hbisect,
40 hbisect,
41 help,
41 help,
42 hg,
42 hg,
43 logcmdutil,
43 logcmdutil,
44 merge as mergemod,
44 merge as mergemod,
45 obsolete,
45 obsolete,
46 obsutil,
46 obsutil,
47 patch,
47 patch,
48 phases,
48 phases,
49 pycompat,
49 pycompat,
50 rcutil,
50 rcutil,
51 registrar,
51 registrar,
52 revsetlang,
52 revsetlang,
53 rewriteutil,
53 rewriteutil,
54 scmutil,
54 scmutil,
55 server,
55 server,
56 state as statemod,
56 state as statemod,
57 streamclone,
57 streamclone,
58 tags as tagsmod,
58 tags as tagsmod,
59 templatekw,
59 templatekw,
60 ui as uimod,
60 ui as uimod,
61 util,
61 util,
62 wireprotoserver,
62 wireprotoserver,
63 )
63 )
64 from .utils import (
64 from .utils import (
65 dateutil,
65 dateutil,
66 stringutil,
66 stringutil,
67 )
67 )
68
68
69 table = {}
69 table = {}
70 table.update(debugcommandsmod.command._table)
70 table.update(debugcommandsmod.command._table)
71
71
72 command = registrar.command(table)
72 command = registrar.command(table)
73 INTENT_READONLY = registrar.INTENT_READONLY
73 INTENT_READONLY = registrar.INTENT_READONLY
74
74
75 # common command options
75 # common command options
76
76
77 globalopts = [
77 globalopts = [
78 ('R', 'repository', '',
78 ('R', 'repository', '',
79 _('repository root directory or name of overlay bundle file'),
79 _('repository root directory or name of overlay bundle file'),
80 _('REPO')),
80 _('REPO')),
81 ('', 'cwd', '',
81 ('', 'cwd', '',
82 _('change working directory'), _('DIR')),
82 _('change working directory'), _('DIR')),
83 ('y', 'noninteractive', None,
83 ('y', 'noninteractive', None,
84 _('do not prompt, automatically pick the first choice for all prompts')),
84 _('do not prompt, automatically pick the first choice for all prompts')),
85 ('q', 'quiet', None, _('suppress output')),
85 ('q', 'quiet', None, _('suppress output')),
86 ('v', 'verbose', None, _('enable additional output')),
86 ('v', 'verbose', None, _('enable additional output')),
87 ('', 'color', '',
87 ('', 'color', '',
88 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
88 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
89 # and should not be translated
89 # and should not be translated
90 _("when to colorize (boolean, always, auto, never, or debug)"),
90 _("when to colorize (boolean, always, auto, never, or debug)"),
91 _('TYPE')),
91 _('TYPE')),
92 ('', 'config', [],
92 ('', 'config', [],
93 _('set/override config option (use \'section.name=value\')'),
93 _('set/override config option (use \'section.name=value\')'),
94 _('CONFIG')),
94 _('CONFIG')),
95 ('', 'debug', None, _('enable debugging output')),
95 ('', 'debug', None, _('enable debugging output')),
96 ('', 'debugger', None, _('start debugger')),
96 ('', 'debugger', None, _('start debugger')),
97 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
97 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
98 _('ENCODE')),
98 _('ENCODE')),
99 ('', 'encodingmode', encoding.encodingmode,
99 ('', 'encodingmode', encoding.encodingmode,
100 _('set the charset encoding mode'), _('MODE')),
100 _('set the charset encoding mode'), _('MODE')),
101 ('', 'traceback', None, _('always print a traceback on exception')),
101 ('', 'traceback', None, _('always print a traceback on exception')),
102 ('', 'time', None, _('time how long the command takes')),
102 ('', 'time', None, _('time how long the command takes')),
103 ('', 'profile', None, _('print command execution profile')),
103 ('', 'profile', None, _('print command execution profile')),
104 ('', 'version', None, _('output version information and exit')),
104 ('', 'version', None, _('output version information and exit')),
105 ('h', 'help', None, _('display help and exit')),
105 ('h', 'help', None, _('display help and exit')),
106 ('', 'hidden', False, _('consider hidden changesets')),
106 ('', 'hidden', False, _('consider hidden changesets')),
107 ('', 'pager', 'auto',
107 ('', 'pager', 'auto',
108 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
108 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
109 ]
109 ]
110
110
111 dryrunopts = cmdutil.dryrunopts
111 dryrunopts = cmdutil.dryrunopts
112 remoteopts = cmdutil.remoteopts
112 remoteopts = cmdutil.remoteopts
113 walkopts = cmdutil.walkopts
113 walkopts = cmdutil.walkopts
114 commitopts = cmdutil.commitopts
114 commitopts = cmdutil.commitopts
115 commitopts2 = cmdutil.commitopts2
115 commitopts2 = cmdutil.commitopts2
116 formatteropts = cmdutil.formatteropts
116 formatteropts = cmdutil.formatteropts
117 templateopts = cmdutil.templateopts
117 templateopts = cmdutil.templateopts
118 logopts = cmdutil.logopts
118 logopts = cmdutil.logopts
119 diffopts = cmdutil.diffopts
119 diffopts = cmdutil.diffopts
120 diffwsopts = cmdutil.diffwsopts
120 diffwsopts = cmdutil.diffwsopts
121 diffopts2 = cmdutil.diffopts2
121 diffopts2 = cmdutil.diffopts2
122 mergetoolopts = cmdutil.mergetoolopts
122 mergetoolopts = cmdutil.mergetoolopts
123 similarityopts = cmdutil.similarityopts
123 similarityopts = cmdutil.similarityopts
124 subrepoopts = cmdutil.subrepoopts
124 subrepoopts = cmdutil.subrepoopts
125 debugrevlogopts = cmdutil.debugrevlogopts
125 debugrevlogopts = cmdutil.debugrevlogopts
126
126
127 # Commands start here, listed alphabetically
127 # Commands start here, listed alphabetically
128
128
129 @command('^add',
129 @command('^add',
130 walkopts + subrepoopts + dryrunopts,
130 walkopts + subrepoopts + dryrunopts,
131 _('[OPTION]... [FILE]...'),
131 _('[OPTION]... [FILE]...'),
132 inferrepo=True)
132 inferrepo=True)
133 def add(ui, repo, *pats, **opts):
133 def add(ui, repo, *pats, **opts):
134 """add the specified files on the next commit
134 """add the specified files on the next commit
135
135
136 Schedule files to be version controlled and added to the
136 Schedule files to be version controlled and added to the
137 repository.
137 repository.
138
138
139 The files will be added to the repository at the next commit. To
139 The files will be added to the repository at the next commit. To
140 undo an add before that, see :hg:`forget`.
140 undo an add before that, see :hg:`forget`.
141
141
142 If no names are given, add all files to the repository (except
142 If no names are given, add all files to the repository (except
143 files matching ``.hgignore``).
143 files matching ``.hgignore``).
144
144
145 .. container:: verbose
145 .. container:: verbose
146
146
147 Examples:
147 Examples:
148
148
149 - New (unknown) files are added
149 - New (unknown) files are added
150 automatically by :hg:`add`::
150 automatically by :hg:`add`::
151
151
152 $ ls
152 $ ls
153 foo.c
153 foo.c
154 $ hg status
154 $ hg status
155 ? foo.c
155 ? foo.c
156 $ hg add
156 $ hg add
157 adding foo.c
157 adding foo.c
158 $ hg status
158 $ hg status
159 A foo.c
159 A foo.c
160
160
161 - Specific files to be added can be specified::
161 - Specific files to be added can be specified::
162
162
163 $ ls
163 $ ls
164 bar.c foo.c
164 bar.c foo.c
165 $ hg status
165 $ hg status
166 ? bar.c
166 ? bar.c
167 ? foo.c
167 ? foo.c
168 $ hg add bar.c
168 $ hg add bar.c
169 $ hg status
169 $ hg status
170 A bar.c
170 A bar.c
171 ? foo.c
171 ? foo.c
172
172
173 Returns 0 if all files are successfully added.
173 Returns 0 if all files are successfully added.
174 """
174 """
175
175
176 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
176 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
177 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
177 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
178 return rejected and 1 or 0
178 return rejected and 1 or 0
179
179
180 @command('addremove',
180 @command('addremove',
181 similarityopts + subrepoopts + walkopts + dryrunopts,
181 similarityopts + subrepoopts + walkopts + dryrunopts,
182 _('[OPTION]... [FILE]...'),
182 _('[OPTION]... [FILE]...'),
183 inferrepo=True)
183 inferrepo=True)
184 def addremove(ui, repo, *pats, **opts):
184 def addremove(ui, repo, *pats, **opts):
185 """add all new files, delete all missing files
185 """add all new files, delete all missing files
186
186
187 Add all new files and remove all missing files from the
187 Add all new files and remove all missing files from the
188 repository.
188 repository.
189
189
190 Unless names are given, new files are ignored if they match any of
190 Unless names are given, new files are ignored if they match any of
191 the patterns in ``.hgignore``. As with add, these changes take
191 the patterns in ``.hgignore``. As with add, these changes take
192 effect at the next commit.
192 effect at the next commit.
193
193
194 Use the -s/--similarity option to detect renamed files. This
194 Use the -s/--similarity option to detect renamed files. This
195 option takes a percentage between 0 (disabled) and 100 (files must
195 option takes a percentage between 0 (disabled) and 100 (files must
196 be identical) as its parameter. With a parameter greater than 0,
196 be identical) as its parameter. With a parameter greater than 0,
197 this compares every removed file with every added file and records
197 this compares every removed file with every added file and records
198 those similar enough as renames. Detecting renamed files this way
198 those similar enough as renames. Detecting renamed files this way
199 can be expensive. After using this option, :hg:`status -C` can be
199 can be expensive. After using this option, :hg:`status -C` can be
200 used to check which files were identified as moved or renamed. If
200 used to check which files were identified as moved or renamed. If
201 not specified, -s/--similarity defaults to 100 and only renames of
201 not specified, -s/--similarity defaults to 100 and only renames of
202 identical files are detected.
202 identical files are detected.
203
203
204 .. container:: verbose
204 .. container:: verbose
205
205
206 Examples:
206 Examples:
207
207
208 - A number of files (bar.c and foo.c) are new,
208 - A number of files (bar.c and foo.c) are new,
209 while foobar.c has been removed (without using :hg:`remove`)
209 while foobar.c has been removed (without using :hg:`remove`)
210 from the repository::
210 from the repository::
211
211
212 $ ls
212 $ ls
213 bar.c foo.c
213 bar.c foo.c
214 $ hg status
214 $ hg status
215 ! foobar.c
215 ! foobar.c
216 ? bar.c
216 ? bar.c
217 ? foo.c
217 ? foo.c
218 $ hg addremove
218 $ hg addremove
219 adding bar.c
219 adding bar.c
220 adding foo.c
220 adding foo.c
221 removing foobar.c
221 removing foobar.c
222 $ hg status
222 $ hg status
223 A bar.c
223 A bar.c
224 A foo.c
224 A foo.c
225 R foobar.c
225 R foobar.c
226
226
227 - A file foobar.c was moved to foo.c without using :hg:`rename`.
227 - A file foobar.c was moved to foo.c without using :hg:`rename`.
228 Afterwards, it was edited slightly::
228 Afterwards, it was edited slightly::
229
229
230 $ ls
230 $ ls
231 foo.c
231 foo.c
232 $ hg status
232 $ hg status
233 ! foobar.c
233 ! foobar.c
234 ? foo.c
234 ? foo.c
235 $ hg addremove --similarity 90
235 $ hg addremove --similarity 90
236 removing foobar.c
236 removing foobar.c
237 adding foo.c
237 adding foo.c
238 recording removal of foobar.c as rename to foo.c (94% similar)
238 recording removal of foobar.c as rename to foo.c (94% similar)
239 $ hg status -C
239 $ hg status -C
240 A foo.c
240 A foo.c
241 foobar.c
241 foobar.c
242 R foobar.c
242 R foobar.c
243
243
244 Returns 0 if all files are successfully added.
244 Returns 0 if all files are successfully added.
245 """
245 """
246 opts = pycompat.byteskwargs(opts)
246 opts = pycompat.byteskwargs(opts)
247 if not opts.get('similarity'):
247 if not opts.get('similarity'):
248 opts['similarity'] = '100'
248 opts['similarity'] = '100'
249 matcher = scmutil.match(repo[None], pats, opts)
249 matcher = scmutil.match(repo[None], pats, opts)
250 return scmutil.addremove(repo, matcher, "", opts)
250 return scmutil.addremove(repo, matcher, "", opts)
251
251
252 @command('^annotate|blame',
252 @command('^annotate|blame',
253 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
253 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
254 ('', 'follow', None,
254 ('', 'follow', None,
255 _('follow copies/renames and list the filename (DEPRECATED)')),
255 _('follow copies/renames and list the filename (DEPRECATED)')),
256 ('', 'no-follow', None, _("don't follow copies and renames")),
256 ('', 'no-follow', None, _("don't follow copies and renames")),
257 ('a', 'text', None, _('treat all files as text')),
257 ('a', 'text', None, _('treat all files as text')),
258 ('u', 'user', None, _('list the author (long with -v)')),
258 ('u', 'user', None, _('list the author (long with -v)')),
259 ('f', 'file', None, _('list the filename')),
259 ('f', 'file', None, _('list the filename')),
260 ('d', 'date', None, _('list the date (short with -q)')),
260 ('d', 'date', None, _('list the date (short with -q)')),
261 ('n', 'number', None, _('list the revision number (default)')),
261 ('n', 'number', None, _('list the revision number (default)')),
262 ('c', 'changeset', None, _('list the changeset')),
262 ('c', 'changeset', None, _('list the changeset')),
263 ('l', 'line-number', None, _('show line number at the first appearance')),
263 ('l', 'line-number', None, _('show line number at the first appearance')),
264 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
264 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
265 ] + diffwsopts + walkopts + formatteropts,
265 ] + diffwsopts + walkopts + formatteropts,
266 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
266 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
267 inferrepo=True)
267 inferrepo=True)
268 def annotate(ui, repo, *pats, **opts):
268 def annotate(ui, repo, *pats, **opts):
269 """show changeset information by line for each file
269 """show changeset information by line for each file
270
270
271 List changes in files, showing the revision id responsible for
271 List changes in files, showing the revision id responsible for
272 each line.
272 each line.
273
273
274 This command is useful for discovering when a change was made and
274 This command is useful for discovering when a change was made and
275 by whom.
275 by whom.
276
276
277 If you include --file, --user, or --date, the revision number is
277 If you include --file, --user, or --date, the revision number is
278 suppressed unless you also include --number.
278 suppressed unless you also include --number.
279
279
280 Without the -a/--text option, annotate will avoid processing files
280 Without the -a/--text option, annotate will avoid processing files
281 it detects as binary. With -a, annotate will annotate the file
281 it detects as binary. With -a, annotate will annotate the file
282 anyway, although the results will probably be neither useful
282 anyway, although the results will probably be neither useful
283 nor desirable.
283 nor desirable.
284
284
285 Returns 0 on success.
285 Returns 0 on success.
286 """
286 """
287 opts = pycompat.byteskwargs(opts)
287 opts = pycompat.byteskwargs(opts)
288 if not pats:
288 if not pats:
289 raise error.Abort(_('at least one filename or pattern is required'))
289 raise error.Abort(_('at least one filename or pattern is required'))
290
290
291 if opts.get('follow'):
291 if opts.get('follow'):
292 # --follow is deprecated and now just an alias for -f/--file
292 # --follow is deprecated and now just an alias for -f/--file
293 # to mimic the behavior of Mercurial before version 1.5
293 # to mimic the behavior of Mercurial before version 1.5
294 opts['file'] = True
294 opts['file'] = True
295
295
296 rev = opts.get('rev')
296 rev = opts.get('rev')
297 if rev:
297 if rev:
298 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
298 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
299 ctx = scmutil.revsingle(repo, rev)
299 ctx = scmutil.revsingle(repo, rev)
300
300
301 rootfm = ui.formatter('annotate', opts)
301 rootfm = ui.formatter('annotate', opts)
302 if ui.quiet:
302 if ui.quiet:
303 datefunc = dateutil.shortdate
303 datefunc = dateutil.shortdate
304 else:
304 else:
305 datefunc = dateutil.datestr
305 datefunc = dateutil.datestr
306 if ctx.rev() is None:
306 if ctx.rev() is None:
307 def hexfn(node):
307 def hexfn(node):
308 if node is None:
308 if node is None:
309 return None
309 return None
310 else:
310 else:
311 return rootfm.hexfunc(node)
311 return rootfm.hexfunc(node)
312 if opts.get('changeset'):
312 if opts.get('changeset'):
313 # omit "+" suffix which is appended to node hex
313 # omit "+" suffix which is appended to node hex
314 def formatrev(rev):
314 def formatrev(rev):
315 if rev is None:
315 if rev is None:
316 return '%d' % ctx.p1().rev()
316 return '%d' % ctx.p1().rev()
317 else:
317 else:
318 return '%d' % rev
318 return '%d' % rev
319 else:
319 else:
320 def formatrev(rev):
320 def formatrev(rev):
321 if rev is None:
321 if rev is None:
322 return '%d+' % ctx.p1().rev()
322 return '%d+' % ctx.p1().rev()
323 else:
323 else:
324 return '%d ' % rev
324 return '%d ' % rev
325 def formathex(hex):
325 def formathex(hex):
326 if hex is None:
326 if hex is None:
327 return '%s+' % rootfm.hexfunc(ctx.p1().node())
327 return '%s+' % rootfm.hexfunc(ctx.p1().node())
328 else:
328 else:
329 return '%s ' % hex
329 return '%s ' % hex
330 else:
330 else:
331 hexfn = rootfm.hexfunc
331 hexfn = rootfm.hexfunc
332 formatrev = formathex = pycompat.bytestr
332 formatrev = formathex = pycompat.bytestr
333
333
334 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
334 opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
335 ('rev', ' ', lambda x: x.fctx.rev(), formatrev),
335 ('rev', ' ', lambda x: x.fctx.rev(), formatrev),
336 ('node', ' ', lambda x: hexfn(x.fctx.node()), formathex),
336 ('node', ' ', lambda x: hexfn(x.fctx.node()), formathex),
337 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
337 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
338 ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
338 ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
339 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
339 ('line_number', ':', lambda x: x.lineno, pycompat.bytestr),
340 ]
340 ]
341 opnamemap = {'rev': 'number', 'node': 'changeset'}
341 opnamemap = {'rev': 'number', 'node': 'changeset'}
342
342
343 if (not opts.get('user') and not opts.get('changeset')
343 if (not opts.get('user') and not opts.get('changeset')
344 and not opts.get('date') and not opts.get('file')):
344 and not opts.get('date') and not opts.get('file')):
345 opts['number'] = True
345 opts['number'] = True
346
346
347 linenumber = opts.get('line_number') is not None
347 linenumber = opts.get('line_number') is not None
348 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
348 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
349 raise error.Abort(_('at least one of -n/-c is required for -l'))
349 raise error.Abort(_('at least one of -n/-c is required for -l'))
350
350
351 ui.pager('annotate')
351 ui.pager('annotate')
352
352
353 if rootfm.isplain():
353 if rootfm.isplain():
354 def makefunc(get, fmt):
354 def makefunc(get, fmt):
355 return lambda x: fmt(get(x))
355 return lambda x: fmt(get(x))
356 else:
356 else:
357 def makefunc(get, fmt):
357 def makefunc(get, fmt):
358 return get
358 return get
359 datahint = rootfm.datahint()
359 datahint = rootfm.datahint()
360 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
360 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
361 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
361 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
362 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
362 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
363 fields = ' '.join(fn for fn, sep, get, fmt in opmap
363 fields = ' '.join(fn for fn, sep, get, fmt in opmap
364 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
364 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
365
365
366 def bad(x, y):
366 def bad(x, y):
367 raise error.Abort("%s: %s" % (x, y))
367 raise error.Abort("%s: %s" % (x, y))
368
368
369 m = scmutil.match(ctx, pats, opts, badfn=bad)
369 m = scmutil.match(ctx, pats, opts, badfn=bad)
370
370
371 follow = not opts.get('no_follow')
371 follow = not opts.get('no_follow')
372 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
372 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
373 whitespace=True)
373 whitespace=True)
374 skiprevs = opts.get('skip')
374 skiprevs = opts.get('skip')
375 if skiprevs:
375 if skiprevs:
376 skiprevs = scmutil.revrange(repo, skiprevs)
376 skiprevs = scmutil.revrange(repo, skiprevs)
377
377
378 for abs in ctx.walk(m):
378 for abs in ctx.walk(m):
379 fctx = ctx[abs]
379 fctx = ctx[abs]
380 rootfm.startitem()
380 rootfm.startitem()
381 rootfm.data(abspath=abs, path=m.rel(abs))
381 rootfm.data(abspath=abs, path=m.rel(abs))
382 if not opts.get('text') and fctx.isbinary():
382 if not opts.get('text') and fctx.isbinary():
383 rootfm.plain(_("%s: binary file\n")
383 rootfm.plain(_("%s: binary file\n")
384 % ((pats and m.rel(abs)) or abs))
384 % ((pats and m.rel(abs)) or abs))
385 continue
385 continue
386
386
387 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
387 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
388 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
388 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
389 diffopts=diffopts)
389 diffopts=diffopts)
390 if not lines:
390 if not lines:
391 fm.end()
391 fm.end()
392 continue
392 continue
393 formats = []
393 formats = []
394 pieces = []
394 pieces = []
395
395
396 for f, sep in funcmap:
396 for f, sep in funcmap:
397 l = [f(n) for n in lines]
397 l = [f(n) for n in lines]
398 if fm.isplain():
398 if fm.isplain():
399 sizes = [encoding.colwidth(x) for x in l]
399 sizes = [encoding.colwidth(x) for x in l]
400 ml = max(sizes)
400 ml = max(sizes)
401 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
401 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
402 else:
402 else:
403 formats.append(['%s' for x in l])
403 formats.append(['%s' for x in l])
404 pieces.append(l)
404 pieces.append(l)
405
405
406 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
406 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
407 fm.startitem()
407 fm.startitem()
408 fm.context(fctx=n.fctx)
408 fm.context(fctx=n.fctx)
409 fm.write(fields, "".join(f), *p)
409 fm.write(fields, "".join(f), *p)
410 if n.skip:
410 if n.skip:
411 fmt = "* %s"
411 fmt = "* %s"
412 else:
412 else:
413 fmt = ": %s"
413 fmt = ": %s"
414 fm.write('line', fmt, n.text)
414 fm.write('line', fmt, n.text)
415
415
416 if not lines[-1].text.endswith('\n'):
416 if not lines[-1].text.endswith('\n'):
417 fm.plain('\n')
417 fm.plain('\n')
418 fm.end()
418 fm.end()
419
419
420 rootfm.end()
420 rootfm.end()
421
421
422 @command('archive',
422 @command('archive',
423 [('', 'no-decode', None, _('do not pass files through decoders')),
423 [('', 'no-decode', None, _('do not pass files through decoders')),
424 ('p', 'prefix', '', _('directory prefix for files in archive'),
424 ('p', 'prefix', '', _('directory prefix for files in archive'),
425 _('PREFIX')),
425 _('PREFIX')),
426 ('r', 'rev', '', _('revision to distribute'), _('REV')),
426 ('r', 'rev', '', _('revision to distribute'), _('REV')),
427 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
427 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
428 ] + subrepoopts + walkopts,
428 ] + subrepoopts + walkopts,
429 _('[OPTION]... DEST'))
429 _('[OPTION]... DEST'))
430 def archive(ui, repo, dest, **opts):
430 def archive(ui, repo, dest, **opts):
431 '''create an unversioned archive of a repository revision
431 '''create an unversioned archive of a repository revision
432
432
433 By default, the revision used is the parent of the working
433 By default, the revision used is the parent of the working
434 directory; use -r/--rev to specify a different revision.
434 directory; use -r/--rev to specify a different revision.
435
435
436 The archive type is automatically detected based on file
436 The archive type is automatically detected based on file
437 extension (to override, use -t/--type).
437 extension (to override, use -t/--type).
438
438
439 .. container:: verbose
439 .. container:: verbose
440
440
441 Examples:
441 Examples:
442
442
443 - create a zip file containing the 1.0 release::
443 - create a zip file containing the 1.0 release::
444
444
445 hg archive -r 1.0 project-1.0.zip
445 hg archive -r 1.0 project-1.0.zip
446
446
447 - create a tarball excluding .hg files::
447 - create a tarball excluding .hg files::
448
448
449 hg archive project.tar.gz -X ".hg*"
449 hg archive project.tar.gz -X ".hg*"
450
450
451 Valid types are:
451 Valid types are:
452
452
453 :``files``: a directory full of files (default)
453 :``files``: a directory full of files (default)
454 :``tar``: tar archive, uncompressed
454 :``tar``: tar archive, uncompressed
455 :``tbz2``: tar archive, compressed using bzip2
455 :``tbz2``: tar archive, compressed using bzip2
456 :``tgz``: tar archive, compressed using gzip
456 :``tgz``: tar archive, compressed using gzip
457 :``uzip``: zip archive, uncompressed
457 :``uzip``: zip archive, uncompressed
458 :``zip``: zip archive, compressed using deflate
458 :``zip``: zip archive, compressed using deflate
459
459
460 The exact name of the destination archive or directory is given
460 The exact name of the destination archive or directory is given
461 using a format string; see :hg:`help export` for details.
461 using a format string; see :hg:`help export` for details.
462
462
463 Each member added to an archive file has a directory prefix
463 Each member added to an archive file has a directory prefix
464 prepended. Use -p/--prefix to specify a format string for the
464 prepended. Use -p/--prefix to specify a format string for the
465 prefix. The default is the basename of the archive, with suffixes
465 prefix. The default is the basename of the archive, with suffixes
466 removed.
466 removed.
467
467
468 Returns 0 on success.
468 Returns 0 on success.
469 '''
469 '''
470
470
471 opts = pycompat.byteskwargs(opts)
471 opts = pycompat.byteskwargs(opts)
472 rev = opts.get('rev')
472 rev = opts.get('rev')
473 if rev:
473 if rev:
474 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
474 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
475 ctx = scmutil.revsingle(repo, rev)
475 ctx = scmutil.revsingle(repo, rev)
476 if not ctx:
476 if not ctx:
477 raise error.Abort(_('no working directory: please specify a revision'))
477 raise error.Abort(_('no working directory: please specify a revision'))
478 node = ctx.node()
478 node = ctx.node()
479 dest = cmdutil.makefilename(ctx, dest)
479 dest = cmdutil.makefilename(ctx, dest)
480 if os.path.realpath(dest) == repo.root:
480 if os.path.realpath(dest) == repo.root:
481 raise error.Abort(_('repository root cannot be destination'))
481 raise error.Abort(_('repository root cannot be destination'))
482
482
483 kind = opts.get('type') or archival.guesskind(dest) or 'files'
483 kind = opts.get('type') or archival.guesskind(dest) or 'files'
484 prefix = opts.get('prefix')
484 prefix = opts.get('prefix')
485
485
486 if dest == '-':
486 if dest == '-':
487 if kind == 'files':
487 if kind == 'files':
488 raise error.Abort(_('cannot archive plain files to stdout'))
488 raise error.Abort(_('cannot archive plain files to stdout'))
489 dest = cmdutil.makefileobj(ctx, dest)
489 dest = cmdutil.makefileobj(ctx, dest)
490 if not prefix:
490 if not prefix:
491 prefix = os.path.basename(repo.root) + '-%h'
491 prefix = os.path.basename(repo.root) + '-%h'
492
492
493 prefix = cmdutil.makefilename(ctx, prefix)
493 prefix = cmdutil.makefilename(ctx, prefix)
494 match = scmutil.match(ctx, [], opts)
494 match = scmutil.match(ctx, [], opts)
495 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
495 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
496 match, prefix, subrepos=opts.get('subrepos'))
496 match, prefix, subrepos=opts.get('subrepos'))
497
497
498 @command('backout',
498 @command('backout',
499 [('', 'merge', None, _('merge with old dirstate parent after backout')),
499 [('', 'merge', None, _('merge with old dirstate parent after backout')),
500 ('', 'commit', None,
500 ('', 'commit', None,
501 _('commit if no conflicts were encountered (DEPRECATED)')),
501 _('commit if no conflicts were encountered (DEPRECATED)')),
502 ('', 'no-commit', None, _('do not commit')),
502 ('', 'no-commit', None, _('do not commit')),
503 ('', 'parent', '',
503 ('', 'parent', '',
504 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
504 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
505 ('r', 'rev', '', _('revision to backout'), _('REV')),
505 ('r', 'rev', '', _('revision to backout'), _('REV')),
506 ('e', 'edit', False, _('invoke editor on commit messages')),
506 ('e', 'edit', False, _('invoke editor on commit messages')),
507 ] + mergetoolopts + walkopts + commitopts + commitopts2,
507 ] + mergetoolopts + walkopts + commitopts + commitopts2,
508 _('[OPTION]... [-r] REV'))
508 _('[OPTION]... [-r] REV'))
509 def backout(ui, repo, node=None, rev=None, **opts):
509 def backout(ui, repo, node=None, rev=None, **opts):
510 '''reverse effect of earlier changeset
510 '''reverse effect of earlier changeset
511
511
512 Prepare a new changeset with the effect of REV undone in the
512 Prepare a new changeset with the effect of REV undone in the
513 current working directory. If no conflicts were encountered,
513 current working directory. If no conflicts were encountered,
514 it will be committed immediately.
514 it will be committed immediately.
515
515
516 If REV is the parent of the working directory, then this new changeset
516 If REV is the parent of the working directory, then this new changeset
517 is committed automatically (unless --no-commit is specified).
517 is committed automatically (unless --no-commit is specified).
518
518
519 .. note::
519 .. note::
520
520
521 :hg:`backout` cannot be used to fix either an unwanted or
521 :hg:`backout` cannot be used to fix either an unwanted or
522 incorrect merge.
522 incorrect merge.
523
523
524 .. container:: verbose
524 .. container:: verbose
525
525
526 Examples:
526 Examples:
527
527
528 - Reverse the effect of the parent of the working directory.
528 - Reverse the effect of the parent of the working directory.
529 This backout will be committed immediately::
529 This backout will be committed immediately::
530
530
531 hg backout -r .
531 hg backout -r .
532
532
533 - Reverse the effect of previous bad revision 23::
533 - Reverse the effect of previous bad revision 23::
534
534
535 hg backout -r 23
535 hg backout -r 23
536
536
537 - Reverse the effect of previous bad revision 23 and
537 - Reverse the effect of previous bad revision 23 and
538 leave changes uncommitted::
538 leave changes uncommitted::
539
539
540 hg backout -r 23 --no-commit
540 hg backout -r 23 --no-commit
541 hg commit -m "Backout revision 23"
541 hg commit -m "Backout revision 23"
542
542
543 By default, the pending changeset will have one parent,
543 By default, the pending changeset will have one parent,
544 maintaining a linear history. With --merge, the pending
544 maintaining a linear history. With --merge, the pending
545 changeset will instead have two parents: the old parent of the
545 changeset will instead have two parents: the old parent of the
546 working directory and a new child of REV that simply undoes REV.
546 working directory and a new child of REV that simply undoes REV.
547
547
548 Before version 1.7, the behavior without --merge was equivalent
548 Before version 1.7, the behavior without --merge was equivalent
549 to specifying --merge followed by :hg:`update --clean .` to
549 to specifying --merge followed by :hg:`update --clean .` to
550 cancel the merge and leave the child of REV as a head to be
550 cancel the merge and leave the child of REV as a head to be
551 merged separately.
551 merged separately.
552
552
553 See :hg:`help dates` for a list of formats valid for -d/--date.
553 See :hg:`help dates` for a list of formats valid for -d/--date.
554
554
555 See :hg:`help revert` for a way to restore files to the state
555 See :hg:`help revert` for a way to restore files to the state
556 of another revision.
556 of another revision.
557
557
558 Returns 0 on success, 1 if nothing to backout or there are unresolved
558 Returns 0 on success, 1 if nothing to backout or there are unresolved
559 files.
559 files.
560 '''
560 '''
561 with repo.wlock(), repo.lock():
561 with repo.wlock(), repo.lock():
562 return _dobackout(ui, repo, node, rev, **opts)
562 return _dobackout(ui, repo, node, rev, **opts)
563
563
564 def _dobackout(ui, repo, node=None, rev=None, **opts):
564 def _dobackout(ui, repo, node=None, rev=None, **opts):
565 opts = pycompat.byteskwargs(opts)
565 opts = pycompat.byteskwargs(opts)
566 if opts.get('commit') and opts.get('no_commit'):
566 if opts.get('commit') and opts.get('no_commit'):
567 raise error.Abort(_("cannot use --commit with --no-commit"))
567 raise error.Abort(_("cannot use --commit with --no-commit"))
568 if opts.get('merge') and opts.get('no_commit'):
568 if opts.get('merge') and opts.get('no_commit'):
569 raise error.Abort(_("cannot use --merge with --no-commit"))
569 raise error.Abort(_("cannot use --merge with --no-commit"))
570
570
571 if rev and node:
571 if rev and node:
572 raise error.Abort(_("please specify just one revision"))
572 raise error.Abort(_("please specify just one revision"))
573
573
574 if not rev:
574 if not rev:
575 rev = node
575 rev = node
576
576
577 if not rev:
577 if not rev:
578 raise error.Abort(_("please specify a revision to backout"))
578 raise error.Abort(_("please specify a revision to backout"))
579
579
580 date = opts.get('date')
580 date = opts.get('date')
581 if date:
581 if date:
582 opts['date'] = dateutil.parsedate(date)
582 opts['date'] = dateutil.parsedate(date)
583
583
584 cmdutil.checkunfinished(repo)
584 cmdutil.checkunfinished(repo)
585 cmdutil.bailifchanged(repo)
585 cmdutil.bailifchanged(repo)
586 node = scmutil.revsingle(repo, rev).node()
586 node = scmutil.revsingle(repo, rev).node()
587
587
588 op1, op2 = repo.dirstate.parents()
588 op1, op2 = repo.dirstate.parents()
589 if not repo.changelog.isancestor(node, op1):
589 if not repo.changelog.isancestor(node, op1):
590 raise error.Abort(_('cannot backout change that is not an ancestor'))
590 raise error.Abort(_('cannot backout change that is not an ancestor'))
591
591
592 p1, p2 = repo.changelog.parents(node)
592 p1, p2 = repo.changelog.parents(node)
593 if p1 == nullid:
593 if p1 == nullid:
594 raise error.Abort(_('cannot backout a change with no parents'))
594 raise error.Abort(_('cannot backout a change with no parents'))
595 if p2 != nullid:
595 if p2 != nullid:
596 if not opts.get('parent'):
596 if not opts.get('parent'):
597 raise error.Abort(_('cannot backout a merge changeset'))
597 raise error.Abort(_('cannot backout a merge changeset'))
598 p = repo.lookup(opts['parent'])
598 p = repo.lookup(opts['parent'])
599 if p not in (p1, p2):
599 if p not in (p1, p2):
600 raise error.Abort(_('%s is not a parent of %s') %
600 raise error.Abort(_('%s is not a parent of %s') %
601 (short(p), short(node)))
601 (short(p), short(node)))
602 parent = p
602 parent = p
603 else:
603 else:
604 if opts.get('parent'):
604 if opts.get('parent'):
605 raise error.Abort(_('cannot use --parent on non-merge changeset'))
605 raise error.Abort(_('cannot use --parent on non-merge changeset'))
606 parent = p1
606 parent = p1
607
607
608 # the backout should appear on the same branch
608 # the backout should appear on the same branch
609 branch = repo.dirstate.branch()
609 branch = repo.dirstate.branch()
610 bheads = repo.branchheads(branch)
610 bheads = repo.branchheads(branch)
611 rctx = scmutil.revsingle(repo, hex(parent))
611 rctx = scmutil.revsingle(repo, hex(parent))
612 if not opts.get('merge') and op1 != node:
612 if not opts.get('merge') and op1 != node:
613 with dirstateguard.dirstateguard(repo, 'backout'):
613 with dirstateguard.dirstateguard(repo, 'backout'):
614 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
614 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
615 with ui.configoverride(overrides, 'backout'):
615 with ui.configoverride(overrides, 'backout'):
616 stats = mergemod.update(repo, parent, True, True, node, False)
616 stats = mergemod.update(repo, parent, True, True, node, False)
617 repo.setparents(op1, op2)
617 repo.setparents(op1, op2)
618 hg._showstats(repo, stats)
618 hg._showstats(repo, stats)
619 if stats.unresolvedcount:
619 if stats.unresolvedcount:
620 repo.ui.status(_("use 'hg resolve' to retry unresolved "
620 repo.ui.status(_("use 'hg resolve' to retry unresolved "
621 "file merges\n"))
621 "file merges\n"))
622 return 1
622 return 1
623 else:
623 else:
624 hg.clean(repo, node, show_stats=False)
624 hg.clean(repo, node, show_stats=False)
625 repo.dirstate.setbranch(branch)
625 repo.dirstate.setbranch(branch)
626 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
626 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
627
627
628 if opts.get('no_commit'):
628 if opts.get('no_commit'):
629 msg = _("changeset %s backed out, "
629 msg = _("changeset %s backed out, "
630 "don't forget to commit.\n")
630 "don't forget to commit.\n")
631 ui.status(msg % short(node))
631 ui.status(msg % short(node))
632 return 0
632 return 0
633
633
634 def commitfunc(ui, repo, message, match, opts):
634 def commitfunc(ui, repo, message, match, opts):
635 editform = 'backout'
635 editform = 'backout'
636 e = cmdutil.getcommiteditor(editform=editform,
636 e = cmdutil.getcommiteditor(editform=editform,
637 **pycompat.strkwargs(opts))
637 **pycompat.strkwargs(opts))
638 if not message:
638 if not message:
639 # we don't translate commit messages
639 # we don't translate commit messages
640 message = "Backed out changeset %s" % short(node)
640 message = "Backed out changeset %s" % short(node)
641 e = cmdutil.getcommiteditor(edit=True, editform=editform)
641 e = cmdutil.getcommiteditor(edit=True, editform=editform)
642 return repo.commit(message, opts.get('user'), opts.get('date'),
642 return repo.commit(message, opts.get('user'), opts.get('date'),
643 match, editor=e)
643 match, editor=e)
644 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
644 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
645 if not newnode:
645 if not newnode:
646 ui.status(_("nothing changed\n"))
646 ui.status(_("nothing changed\n"))
647 return 1
647 return 1
648 cmdutil.commitstatus(repo, newnode, branch, bheads)
648 cmdutil.commitstatus(repo, newnode, branch, bheads)
649
649
650 def nice(node):
650 def nice(node):
651 return '%d:%s' % (repo.changelog.rev(node), short(node))
651 return '%d:%s' % (repo.changelog.rev(node), short(node))
652 ui.status(_('changeset %s backs out changeset %s\n') %
652 ui.status(_('changeset %s backs out changeset %s\n') %
653 (nice(repo.changelog.tip()), nice(node)))
653 (nice(repo.changelog.tip()), nice(node)))
654 if opts.get('merge') and op1 != node:
654 if opts.get('merge') and op1 != node:
655 hg.clean(repo, op1, show_stats=False)
655 hg.clean(repo, op1, show_stats=False)
656 ui.status(_('merging with changeset %s\n')
656 ui.status(_('merging with changeset %s\n')
657 % nice(repo.changelog.tip()))
657 % nice(repo.changelog.tip()))
658 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
658 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
659 with ui.configoverride(overrides, 'backout'):
659 with ui.configoverride(overrides, 'backout'):
660 return hg.merge(repo, hex(repo.changelog.tip()))
660 return hg.merge(repo, hex(repo.changelog.tip()))
661 return 0
661 return 0
662
662
663 @command('bisect',
663 @command('bisect',
664 [('r', 'reset', False, _('reset bisect state')),
664 [('r', 'reset', False, _('reset bisect state')),
665 ('g', 'good', False, _('mark changeset good')),
665 ('g', 'good', False, _('mark changeset good')),
666 ('b', 'bad', False, _('mark changeset bad')),
666 ('b', 'bad', False, _('mark changeset bad')),
667 ('s', 'skip', False, _('skip testing changeset')),
667 ('s', 'skip', False, _('skip testing changeset')),
668 ('e', 'extend', False, _('extend the bisect range')),
668 ('e', 'extend', False, _('extend the bisect range')),
669 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
669 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
670 ('U', 'noupdate', False, _('do not update to target'))],
670 ('U', 'noupdate', False, _('do not update to target'))],
671 _("[-gbsr] [-U] [-c CMD] [REV]"))
671 _("[-gbsr] [-U] [-c CMD] [REV]"))
672 def bisect(ui, repo, rev=None, extra=None, command=None,
672 def bisect(ui, repo, rev=None, extra=None, command=None,
673 reset=None, good=None, bad=None, skip=None, extend=None,
673 reset=None, good=None, bad=None, skip=None, extend=None,
674 noupdate=None):
674 noupdate=None):
675 """subdivision search of changesets
675 """subdivision search of changesets
676
676
677 This command helps to find changesets which introduce problems. To
677 This command helps to find changesets which introduce problems. To
678 use, mark the earliest changeset you know exhibits the problem as
678 use, mark the earliest changeset you know exhibits the problem as
679 bad, then mark the latest changeset which is free from the problem
679 bad, then mark the latest changeset which is free from the problem
680 as good. Bisect will update your working directory to a revision
680 as good. Bisect will update your working directory to a revision
681 for testing (unless the -U/--noupdate option is specified). Once
681 for testing (unless the -U/--noupdate option is specified). Once
682 you have performed tests, mark the working directory as good or
682 you have performed tests, mark the working directory as good or
683 bad, and bisect will either update to another candidate changeset
683 bad, and bisect will either update to another candidate changeset
684 or announce that it has found the bad revision.
684 or announce that it has found the bad revision.
685
685
686 As a shortcut, you can also use the revision argument to mark a
686 As a shortcut, you can also use the revision argument to mark a
687 revision as good or bad without checking it out first.
687 revision as good or bad without checking it out first.
688
688
689 If you supply a command, it will be used for automatic bisection.
689 If you supply a command, it will be used for automatic bisection.
690 The environment variable HG_NODE will contain the ID of the
690 The environment variable HG_NODE will contain the ID of the
691 changeset being tested. The exit status of the command will be
691 changeset being tested. The exit status of the command will be
692 used to mark revisions as good or bad: status 0 means good, 125
692 used to mark revisions as good or bad: status 0 means good, 125
693 means to skip the revision, 127 (command not found) will abort the
693 means to skip the revision, 127 (command not found) will abort the
694 bisection, and any other non-zero exit status means the revision
694 bisection, and any other non-zero exit status means the revision
695 is bad.
695 is bad.
696
696
697 .. container:: verbose
697 .. container:: verbose
698
698
699 Some examples:
699 Some examples:
700
700
701 - start a bisection with known bad revision 34, and good revision 12::
701 - start a bisection with known bad revision 34, and good revision 12::
702
702
703 hg bisect --bad 34
703 hg bisect --bad 34
704 hg bisect --good 12
704 hg bisect --good 12
705
705
706 - advance the current bisection by marking current revision as good or
706 - advance the current bisection by marking current revision as good or
707 bad::
707 bad::
708
708
709 hg bisect --good
709 hg bisect --good
710 hg bisect --bad
710 hg bisect --bad
711
711
712 - mark the current revision, or a known revision, to be skipped (e.g. if
712 - mark the current revision, or a known revision, to be skipped (e.g. if
713 that revision is not usable because of another issue)::
713 that revision is not usable because of another issue)::
714
714
715 hg bisect --skip
715 hg bisect --skip
716 hg bisect --skip 23
716 hg bisect --skip 23
717
717
718 - skip all revisions that do not touch directories ``foo`` or ``bar``::
718 - skip all revisions that do not touch directories ``foo`` or ``bar``::
719
719
720 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
720 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
721
721
722 - forget the current bisection::
722 - forget the current bisection::
723
723
724 hg bisect --reset
724 hg bisect --reset
725
725
726 - use 'make && make tests' to automatically find the first broken
726 - use 'make && make tests' to automatically find the first broken
727 revision::
727 revision::
728
728
729 hg bisect --reset
729 hg bisect --reset
730 hg bisect --bad 34
730 hg bisect --bad 34
731 hg bisect --good 12
731 hg bisect --good 12
732 hg bisect --command "make && make tests"
732 hg bisect --command "make && make tests"
733
733
734 - see all changesets whose states are already known in the current
734 - see all changesets whose states are already known in the current
735 bisection::
735 bisection::
736
736
737 hg log -r "bisect(pruned)"
737 hg log -r "bisect(pruned)"
738
738
739 - see the changeset currently being bisected (especially useful
739 - see the changeset currently being bisected (especially useful
740 if running with -U/--noupdate)::
740 if running with -U/--noupdate)::
741
741
742 hg log -r "bisect(current)"
742 hg log -r "bisect(current)"
743
743
744 - see all changesets that took part in the current bisection::
744 - see all changesets that took part in the current bisection::
745
745
746 hg log -r "bisect(range)"
746 hg log -r "bisect(range)"
747
747
748 - you can even get a nice graph::
748 - you can even get a nice graph::
749
749
750 hg log --graph -r "bisect(range)"
750 hg log --graph -r "bisect(range)"
751
751
752 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
752 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
753
753
754 Returns 0 on success.
754 Returns 0 on success.
755 """
755 """
756 # backward compatibility
756 # backward compatibility
757 if rev in "good bad reset init".split():
757 if rev in "good bad reset init".split():
758 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
758 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
759 cmd, rev, extra = rev, extra, None
759 cmd, rev, extra = rev, extra, None
760 if cmd == "good":
760 if cmd == "good":
761 good = True
761 good = True
762 elif cmd == "bad":
762 elif cmd == "bad":
763 bad = True
763 bad = True
764 else:
764 else:
765 reset = True
765 reset = True
766 elif extra:
766 elif extra:
767 raise error.Abort(_('incompatible arguments'))
767 raise error.Abort(_('incompatible arguments'))
768
768
769 incompatibles = {
769 incompatibles = {
770 '--bad': bad,
770 '--bad': bad,
771 '--command': bool(command),
771 '--command': bool(command),
772 '--extend': extend,
772 '--extend': extend,
773 '--good': good,
773 '--good': good,
774 '--reset': reset,
774 '--reset': reset,
775 '--skip': skip,
775 '--skip': skip,
776 }
776 }
777
777
778 enabled = [x for x in incompatibles if incompatibles[x]]
778 enabled = [x for x in incompatibles if incompatibles[x]]
779
779
780 if len(enabled) > 1:
780 if len(enabled) > 1:
781 raise error.Abort(_('%s and %s are incompatible') %
781 raise error.Abort(_('%s and %s are incompatible') %
782 tuple(sorted(enabled)[0:2]))
782 tuple(sorted(enabled)[0:2]))
783
783
784 if reset:
784 if reset:
785 hbisect.resetstate(repo)
785 hbisect.resetstate(repo)
786 return
786 return
787
787
788 state = hbisect.load_state(repo)
788 state = hbisect.load_state(repo)
789
789
790 # update state
790 # update state
791 if good or bad or skip:
791 if good or bad or skip:
792 if rev:
792 if rev:
793 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
793 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
794 else:
794 else:
795 nodes = [repo.lookup('.')]
795 nodes = [repo.lookup('.')]
796 if good:
796 if good:
797 state['good'] += nodes
797 state['good'] += nodes
798 elif bad:
798 elif bad:
799 state['bad'] += nodes
799 state['bad'] += nodes
800 elif skip:
800 elif skip:
801 state['skip'] += nodes
801 state['skip'] += nodes
802 hbisect.save_state(repo, state)
802 hbisect.save_state(repo, state)
803 if not (state['good'] and state['bad']):
803 if not (state['good'] and state['bad']):
804 return
804 return
805
805
806 def mayupdate(repo, node, show_stats=True):
806 def mayupdate(repo, node, show_stats=True):
807 """common used update sequence"""
807 """common used update sequence"""
808 if noupdate:
808 if noupdate:
809 return
809 return
810 cmdutil.checkunfinished(repo)
810 cmdutil.checkunfinished(repo)
811 cmdutil.bailifchanged(repo)
811 cmdutil.bailifchanged(repo)
812 return hg.clean(repo, node, show_stats=show_stats)
812 return hg.clean(repo, node, show_stats=show_stats)
813
813
814 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
814 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
815
815
816 if command:
816 if command:
817 changesets = 1
817 changesets = 1
818 if noupdate:
818 if noupdate:
819 try:
819 try:
820 node = state['current'][0]
820 node = state['current'][0]
821 except LookupError:
821 except LookupError:
822 raise error.Abort(_('current bisect revision is unknown - '
822 raise error.Abort(_('current bisect revision is unknown - '
823 'start a new bisect to fix'))
823 'start a new bisect to fix'))
824 else:
824 else:
825 node, p2 = repo.dirstate.parents()
825 node, p2 = repo.dirstate.parents()
826 if p2 != nullid:
826 if p2 != nullid:
827 raise error.Abort(_('current bisect revision is a merge'))
827 raise error.Abort(_('current bisect revision is a merge'))
828 if rev:
828 if rev:
829 node = repo[scmutil.revsingle(repo, rev, node)].node()
829 node = repo[scmutil.revsingle(repo, rev, node)].node()
830 try:
830 try:
831 while changesets:
831 while changesets:
832 # update state
832 # update state
833 state['current'] = [node]
833 state['current'] = [node]
834 hbisect.save_state(repo, state)
834 hbisect.save_state(repo, state)
835 status = ui.system(command, environ={'HG_NODE': hex(node)},
835 status = ui.system(command, environ={'HG_NODE': hex(node)},
836 blockedtag='bisect_check')
836 blockedtag='bisect_check')
837 if status == 125:
837 if status == 125:
838 transition = "skip"
838 transition = "skip"
839 elif status == 0:
839 elif status == 0:
840 transition = "good"
840 transition = "good"
841 # status < 0 means process was killed
841 # status < 0 means process was killed
842 elif status == 127:
842 elif status == 127:
843 raise error.Abort(_("failed to execute %s") % command)
843 raise error.Abort(_("failed to execute %s") % command)
844 elif status < 0:
844 elif status < 0:
845 raise error.Abort(_("%s killed") % command)
845 raise error.Abort(_("%s killed") % command)
846 else:
846 else:
847 transition = "bad"
847 transition = "bad"
848 state[transition].append(node)
848 state[transition].append(node)
849 ctx = repo[node]
849 ctx = repo[node]
850 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
850 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
851 transition))
851 transition))
852 hbisect.checkstate(state)
852 hbisect.checkstate(state)
853 # bisect
853 # bisect
854 nodes, changesets, bgood = hbisect.bisect(repo, state)
854 nodes, changesets, bgood = hbisect.bisect(repo, state)
855 # update to next check
855 # update to next check
856 node = nodes[0]
856 node = nodes[0]
857 mayupdate(repo, node, show_stats=False)
857 mayupdate(repo, node, show_stats=False)
858 finally:
858 finally:
859 state['current'] = [node]
859 state['current'] = [node]
860 hbisect.save_state(repo, state)
860 hbisect.save_state(repo, state)
861 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
861 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
862 return
862 return
863
863
864 hbisect.checkstate(state)
864 hbisect.checkstate(state)
865
865
866 # actually bisect
866 # actually bisect
867 nodes, changesets, good = hbisect.bisect(repo, state)
867 nodes, changesets, good = hbisect.bisect(repo, state)
868 if extend:
868 if extend:
869 if not changesets:
869 if not changesets:
870 extendnode = hbisect.extendrange(repo, state, nodes, good)
870 extendnode = hbisect.extendrange(repo, state, nodes, good)
871 if extendnode is not None:
871 if extendnode is not None:
872 ui.write(_("Extending search to changeset %d:%s\n")
872 ui.write(_("Extending search to changeset %d:%s\n")
873 % (extendnode.rev(), extendnode))
873 % (extendnode.rev(), extendnode))
874 state['current'] = [extendnode.node()]
874 state['current'] = [extendnode.node()]
875 hbisect.save_state(repo, state)
875 hbisect.save_state(repo, state)
876 return mayupdate(repo, extendnode.node())
876 return mayupdate(repo, extendnode.node())
877 raise error.Abort(_("nothing to extend"))
877 raise error.Abort(_("nothing to extend"))
878
878
879 if changesets == 0:
879 if changesets == 0:
880 hbisect.printresult(ui, repo, state, displayer, nodes, good)
880 hbisect.printresult(ui, repo, state, displayer, nodes, good)
881 else:
881 else:
882 assert len(nodes) == 1 # only a single node can be tested next
882 assert len(nodes) == 1 # only a single node can be tested next
883 node = nodes[0]
883 node = nodes[0]
884 # compute the approximate number of remaining tests
884 # compute the approximate number of remaining tests
885 tests, size = 0, 2
885 tests, size = 0, 2
886 while size <= changesets:
886 while size <= changesets:
887 tests, size = tests + 1, size * 2
887 tests, size = tests + 1, size * 2
888 rev = repo.changelog.rev(node)
888 rev = repo.changelog.rev(node)
889 ui.write(_("Testing changeset %d:%s "
889 ui.write(_("Testing changeset %d:%s "
890 "(%d changesets remaining, ~%d tests)\n")
890 "(%d changesets remaining, ~%d tests)\n")
891 % (rev, short(node), changesets, tests))
891 % (rev, short(node), changesets, tests))
892 state['current'] = [node]
892 state['current'] = [node]
893 hbisect.save_state(repo, state)
893 hbisect.save_state(repo, state)
894 return mayupdate(repo, node)
894 return mayupdate(repo, node)
895
895
896 @command('bookmarks|bookmark',
896 @command('bookmarks|bookmark',
897 [('f', 'force', False, _('force')),
897 [('f', 'force', False, _('force')),
898 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
898 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
899 ('d', 'delete', False, _('delete a given bookmark')),
899 ('d', 'delete', False, _('delete a given bookmark')),
900 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
900 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
901 ('i', 'inactive', False, _('mark a bookmark inactive')),
901 ('i', 'inactive', False, _('mark a bookmark inactive')),
902 ] + formatteropts,
902 ] + formatteropts,
903 _('hg bookmarks [OPTIONS]... [NAME]...'))
903 _('hg bookmarks [OPTIONS]... [NAME]...'))
904 def bookmark(ui, repo, *names, **opts):
904 def bookmark(ui, repo, *names, **opts):
905 '''create a new bookmark or list existing bookmarks
905 '''create a new bookmark or list existing bookmarks
906
906
907 Bookmarks are labels on changesets to help track lines of development.
907 Bookmarks are labels on changesets to help track lines of development.
908 Bookmarks are unversioned and can be moved, renamed and deleted.
908 Bookmarks are unversioned and can be moved, renamed and deleted.
909 Deleting or moving a bookmark has no effect on the associated changesets.
909 Deleting or moving a bookmark has no effect on the associated changesets.
910
910
911 Creating or updating to a bookmark causes it to be marked as 'active'.
911 Creating or updating to a bookmark causes it to be marked as 'active'.
912 The active bookmark is indicated with a '*'.
912 The active bookmark is indicated with a '*'.
913 When a commit is made, the active bookmark will advance to the new commit.
913 When a commit is made, the active bookmark will advance to the new commit.
914 A plain :hg:`update` will also advance an active bookmark, if possible.
914 A plain :hg:`update` will also advance an active bookmark, if possible.
915 Updating away from a bookmark will cause it to be deactivated.
915 Updating away from a bookmark will cause it to be deactivated.
916
916
917 Bookmarks can be pushed and pulled between repositories (see
917 Bookmarks can be pushed and pulled between repositories (see
918 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
918 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
919 diverged, a new 'divergent bookmark' of the form 'name@path' will
919 diverged, a new 'divergent bookmark' of the form 'name@path' will
920 be created. Using :hg:`merge` will resolve the divergence.
920 be created. Using :hg:`merge` will resolve the divergence.
921
921
922 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
922 Specifying bookmark as '.' to -m or -d options is equivalent to specifying
923 the active bookmark's name.
923 the active bookmark's name.
924
924
925 A bookmark named '@' has the special property that :hg:`clone` will
925 A bookmark named '@' has the special property that :hg:`clone` will
926 check it out by default if it exists.
926 check it out by default if it exists.
927
927
928 .. container:: verbose
928 .. container:: verbose
929
929
930 Examples:
930 Examples:
931
931
932 - create an active bookmark for a new line of development::
932 - create an active bookmark for a new line of development::
933
933
934 hg book new-feature
934 hg book new-feature
935
935
936 - create an inactive bookmark as a place marker::
936 - create an inactive bookmark as a place marker::
937
937
938 hg book -i reviewed
938 hg book -i reviewed
939
939
940 - create an inactive bookmark on another changeset::
940 - create an inactive bookmark on another changeset::
941
941
942 hg book -r .^ tested
942 hg book -r .^ tested
943
943
944 - rename bookmark turkey to dinner::
944 - rename bookmark turkey to dinner::
945
945
946 hg book -m turkey dinner
946 hg book -m turkey dinner
947
947
948 - move the '@' bookmark from another branch::
948 - move the '@' bookmark from another branch::
949
949
950 hg book -f @
950 hg book -f @
951 '''
951 '''
952 force = opts.get(r'force')
952 force = opts.get(r'force')
953 rev = opts.get(r'rev')
953 rev = opts.get(r'rev')
954 delete = opts.get(r'delete')
954 delete = opts.get(r'delete')
955 rename = opts.get(r'rename')
955 rename = opts.get(r'rename')
956 inactive = opts.get(r'inactive')
956 inactive = opts.get(r'inactive')
957
957
958 if delete and rename:
958 if delete and rename:
959 raise error.Abort(_("--delete and --rename are incompatible"))
959 raise error.Abort(_("--delete and --rename are incompatible"))
960 if delete and rev:
960 if delete and rev:
961 raise error.Abort(_("--rev is incompatible with --delete"))
961 raise error.Abort(_("--rev is incompatible with --delete"))
962 if rename and rev:
962 if rename and rev:
963 raise error.Abort(_("--rev is incompatible with --rename"))
963 raise error.Abort(_("--rev is incompatible with --rename"))
964 if not names and (delete or rev):
964 if not names and (delete or rev):
965 raise error.Abort(_("bookmark name required"))
965 raise error.Abort(_("bookmark name required"))
966
966
967 if delete or rename or names or inactive:
967 if delete or rename or names or inactive:
968 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
968 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
969 if delete:
969 if delete:
970 names = pycompat.maplist(repo._bookmarks.expandname, names)
970 names = pycompat.maplist(repo._bookmarks.expandname, names)
971 bookmarks.delete(repo, tr, names)
971 bookmarks.delete(repo, tr, names)
972 elif rename:
972 elif rename:
973 if not names:
973 if not names:
974 raise error.Abort(_("new bookmark name required"))
974 raise error.Abort(_("new bookmark name required"))
975 elif len(names) > 1:
975 elif len(names) > 1:
976 raise error.Abort(_("only one new bookmark name allowed"))
976 raise error.Abort(_("only one new bookmark name allowed"))
977 rename = repo._bookmarks.expandname(rename)
977 rename = repo._bookmarks.expandname(rename)
978 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
978 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
979 elif names:
979 elif names:
980 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
980 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
981 elif inactive:
981 elif inactive:
982 if len(repo._bookmarks) == 0:
982 if len(repo._bookmarks) == 0:
983 ui.status(_("no bookmarks set\n"))
983 ui.status(_("no bookmarks set\n"))
984 elif not repo._activebookmark:
984 elif not repo._activebookmark:
985 ui.status(_("no active bookmark\n"))
985 ui.status(_("no active bookmark\n"))
986 else:
986 else:
987 bookmarks.deactivate(repo)
987 bookmarks.deactivate(repo)
988 else: # show bookmarks
988 else: # show bookmarks
989 bookmarks.printbookmarks(ui, repo, **opts)
989 bookmarks.printbookmarks(ui, repo, **opts)
990
990
991 @command('branch',
991 @command('branch',
992 [('f', 'force', None,
992 [('f', 'force', None,
993 _('set branch name even if it shadows an existing branch')),
993 _('set branch name even if it shadows an existing branch')),
994 ('C', 'clean', None, _('reset branch name to parent branch name')),
994 ('C', 'clean', None, _('reset branch name to parent branch name')),
995 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
995 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
996 ],
996 ],
997 _('[-fC] [NAME]'))
997 _('[-fC] [NAME]'))
998 def branch(ui, repo, label=None, **opts):
998 def branch(ui, repo, label=None, **opts):
999 """set or show the current branch name
999 """set or show the current branch name
1000
1000
1001 .. note::
1001 .. note::
1002
1002
1003 Branch names are permanent and global. Use :hg:`bookmark` to create a
1003 Branch names are permanent and global. Use :hg:`bookmark` to create a
1004 light-weight bookmark instead. See :hg:`help glossary` for more
1004 light-weight bookmark instead. See :hg:`help glossary` for more
1005 information about named branches and bookmarks.
1005 information about named branches and bookmarks.
1006
1006
1007 With no argument, show the current branch name. With one argument,
1007 With no argument, show the current branch name. With one argument,
1008 set the working directory branch name (the branch will not exist
1008 set the working directory branch name (the branch will not exist
1009 in the repository until the next commit). Standard practice
1009 in the repository until the next commit). Standard practice
1010 recommends that primary development take place on the 'default'
1010 recommends that primary development take place on the 'default'
1011 branch.
1011 branch.
1012
1012
1013 Unless -f/--force is specified, branch will not let you set a
1013 Unless -f/--force is specified, branch will not let you set a
1014 branch name that already exists.
1014 branch name that already exists.
1015
1015
1016 Use -C/--clean to reset the working directory branch to that of
1016 Use -C/--clean to reset the working directory branch to that of
1017 the parent of the working directory, negating a previous branch
1017 the parent of the working directory, negating a previous branch
1018 change.
1018 change.
1019
1019
1020 Use the command :hg:`update` to switch to an existing branch. Use
1020 Use the command :hg:`update` to switch to an existing branch. Use
1021 :hg:`commit --close-branch` to mark this branch head as closed.
1021 :hg:`commit --close-branch` to mark this branch head as closed.
1022 When all heads of a branch are closed, the branch will be
1022 When all heads of a branch are closed, the branch will be
1023 considered closed.
1023 considered closed.
1024
1024
1025 Returns 0 on success.
1025 Returns 0 on success.
1026 """
1026 """
1027 opts = pycompat.byteskwargs(opts)
1027 opts = pycompat.byteskwargs(opts)
1028 revs = opts.get('rev')
1028 revs = opts.get('rev')
1029 if label:
1029 if label:
1030 label = label.strip()
1030 label = label.strip()
1031
1031
1032 if not opts.get('clean') and not label:
1032 if not opts.get('clean') and not label:
1033 if revs:
1033 if revs:
1034 raise error.Abort(_("no branch name specified for the revisions"))
1034 raise error.Abort(_("no branch name specified for the revisions"))
1035 ui.write("%s\n" % repo.dirstate.branch())
1035 ui.write("%s\n" % repo.dirstate.branch())
1036 return
1036 return
1037
1037
1038 with repo.wlock():
1038 with repo.wlock():
1039 if opts.get('clean'):
1039 if opts.get('clean'):
1040 label = repo[None].p1().branch()
1040 label = repo[None].p1().branch()
1041 repo.dirstate.setbranch(label)
1041 repo.dirstate.setbranch(label)
1042 ui.status(_('reset working directory to branch %s\n') % label)
1042 ui.status(_('reset working directory to branch %s\n') % label)
1043 elif label:
1043 elif label:
1044
1044
1045 scmutil.checknewlabel(repo, label, 'branch')
1045 scmutil.checknewlabel(repo, label, 'branch')
1046 if revs:
1046 if revs:
1047 return cmdutil.changebranch(ui, repo, revs, label)
1047 return cmdutil.changebranch(ui, repo, revs, label)
1048
1048
1049 if not opts.get('force') and label in repo.branchmap():
1049 if not opts.get('force') and label in repo.branchmap():
1050 if label not in [p.branch() for p in repo[None].parents()]:
1050 if label not in [p.branch() for p in repo[None].parents()]:
1051 raise error.Abort(_('a branch of the same name already'
1051 raise error.Abort(_('a branch of the same name already'
1052 ' exists'),
1052 ' exists'),
1053 # i18n: "it" refers to an existing branch
1053 # i18n: "it" refers to an existing branch
1054 hint=_("use 'hg update' to switch to it"))
1054 hint=_("use 'hg update' to switch to it"))
1055
1055
1056 repo.dirstate.setbranch(label)
1056 repo.dirstate.setbranch(label)
1057 ui.status(_('marked working directory as branch %s\n') % label)
1057 ui.status(_('marked working directory as branch %s\n') % label)
1058
1058
1059 # find any open named branches aside from default
1059 # find any open named branches aside from default
1060 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1060 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1061 if n != "default" and not c]
1061 if n != "default" and not c]
1062 if not others:
1062 if not others:
1063 ui.status(_('(branches are permanent and global, '
1063 ui.status(_('(branches are permanent and global, '
1064 'did you want a bookmark?)\n'))
1064 'did you want a bookmark?)\n'))
1065
1065
1066 @command('branches',
1066 @command('branches',
1067 [('a', 'active', False,
1067 [('a', 'active', False,
1068 _('show only branches that have unmerged heads (DEPRECATED)')),
1068 _('show only branches that have unmerged heads (DEPRECATED)')),
1069 ('c', 'closed', False, _('show normal and closed branches')),
1069 ('c', 'closed', False, _('show normal and closed branches')),
1070 ] + formatteropts,
1070 ] + formatteropts,
1071 _('[-c]'),
1071 _('[-c]'),
1072 intents={INTENT_READONLY})
1072 intents={INTENT_READONLY})
1073 def branches(ui, repo, active=False, closed=False, **opts):
1073 def branches(ui, repo, active=False, closed=False, **opts):
1074 """list repository named branches
1074 """list repository named branches
1075
1075
1076 List the repository's named branches, indicating which ones are
1076 List the repository's named branches, indicating which ones are
1077 inactive. If -c/--closed is specified, also list branches which have
1077 inactive. If -c/--closed is specified, also list branches which have
1078 been marked closed (see :hg:`commit --close-branch`).
1078 been marked closed (see :hg:`commit --close-branch`).
1079
1079
1080 Use the command :hg:`update` to switch to an existing branch.
1080 Use the command :hg:`update` to switch to an existing branch.
1081
1081
1082 Returns 0.
1082 Returns 0.
1083 """
1083 """
1084
1084
1085 opts = pycompat.byteskwargs(opts)
1085 opts = pycompat.byteskwargs(opts)
1086 ui.pager('branches')
1086 ui.pager('branches')
1087 fm = ui.formatter('branches', opts)
1087 fm = ui.formatter('branches', opts)
1088 hexfunc = fm.hexfunc
1088 hexfunc = fm.hexfunc
1089
1089
1090 allheads = set(repo.heads())
1090 allheads = set(repo.heads())
1091 branches = []
1091 branches = []
1092 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1092 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1093 isactive = False
1093 isactive = False
1094 if not isclosed:
1094 if not isclosed:
1095 openheads = set(repo.branchmap().iteropen(heads))
1095 openheads = set(repo.branchmap().iteropen(heads))
1096 isactive = bool(openheads & allheads)
1096 isactive = bool(openheads & allheads)
1097 branches.append((tag, repo[tip], isactive, not isclosed))
1097 branches.append((tag, repo[tip], isactive, not isclosed))
1098 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1098 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1099 reverse=True)
1099 reverse=True)
1100
1100
1101 for tag, ctx, isactive, isopen in branches:
1101 for tag, ctx, isactive, isopen in branches:
1102 if active and not isactive:
1102 if active and not isactive:
1103 continue
1103 continue
1104 if isactive:
1104 if isactive:
1105 label = 'branches.active'
1105 label = 'branches.active'
1106 notice = ''
1106 notice = ''
1107 elif not isopen:
1107 elif not isopen:
1108 if not closed:
1108 if not closed:
1109 continue
1109 continue
1110 label = 'branches.closed'
1110 label = 'branches.closed'
1111 notice = _(' (closed)')
1111 notice = _(' (closed)')
1112 else:
1112 else:
1113 label = 'branches.inactive'
1113 label = 'branches.inactive'
1114 notice = _(' (inactive)')
1114 notice = _(' (inactive)')
1115 current = (tag == repo.dirstate.branch())
1115 current = (tag == repo.dirstate.branch())
1116 if current:
1116 if current:
1117 label = 'branches.current'
1117 label = 'branches.current'
1118
1118
1119 fm.startitem()
1119 fm.startitem()
1120 fm.write('branch', '%s', tag, label=label)
1120 fm.write('branch', '%s', tag, label=label)
1121 rev = ctx.rev()
1121 rev = ctx.rev()
1122 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1122 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1123 fmt = ' ' * padsize + ' %d:%s'
1123 fmt = ' ' * padsize + ' %d:%s'
1124 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1124 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1125 label='log.changeset changeset.%s' % ctx.phasestr())
1125 label='log.changeset changeset.%s' % ctx.phasestr())
1126 fm.context(ctx=ctx)
1126 fm.context(ctx=ctx)
1127 fm.data(active=isactive, closed=not isopen, current=current)
1127 fm.data(active=isactive, closed=not isopen, current=current)
1128 if not ui.quiet:
1128 if not ui.quiet:
1129 fm.plain(notice)
1129 fm.plain(notice)
1130 fm.plain('\n')
1130 fm.plain('\n')
1131 fm.end()
1131 fm.end()
1132
1132
1133 @command('bundle',
1133 @command('bundle',
1134 [('f', 'force', None, _('run even when the destination is unrelated')),
1134 [('f', 'force', None, _('run even when the destination is unrelated')),
1135 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1135 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1136 _('REV')),
1136 _('REV')),
1137 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1137 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1138 _('BRANCH')),
1138 _('BRANCH')),
1139 ('', 'base', [],
1139 ('', 'base', [],
1140 _('a base changeset assumed to be available at the destination'),
1140 _('a base changeset assumed to be available at the destination'),
1141 _('REV')),
1141 _('REV')),
1142 ('a', 'all', None, _('bundle all changesets in the repository')),
1142 ('a', 'all', None, _('bundle all changesets in the repository')),
1143 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1143 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1144 ] + remoteopts,
1144 ] + remoteopts,
1145 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1145 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1146 def bundle(ui, repo, fname, dest=None, **opts):
1146 def bundle(ui, repo, fname, dest=None, **opts):
1147 """create a bundle file
1147 """create a bundle file
1148
1148
1149 Generate a bundle file containing data to be transferred to another
1149 Generate a bundle file containing data to be transferred to another
1150 repository.
1150 repository.
1151
1151
1152 To create a bundle containing all changesets, use -a/--all
1152 To create a bundle containing all changesets, use -a/--all
1153 (or --base null). Otherwise, hg assumes the destination will have
1153 (or --base null). Otherwise, hg assumes the destination will have
1154 all the nodes you specify with --base parameters. Otherwise, hg
1154 all the nodes you specify with --base parameters. Otherwise, hg
1155 will assume the repository has all the nodes in destination, or
1155 will assume the repository has all the nodes in destination, or
1156 default-push/default if no destination is specified, where destination
1156 default-push/default if no destination is specified, where destination
1157 is the repository you provide through DEST option.
1157 is the repository you provide through DEST option.
1158
1158
1159 You can change bundle format with the -t/--type option. See
1159 You can change bundle format with the -t/--type option. See
1160 :hg:`help bundlespec` for documentation on this format. By default,
1160 :hg:`help bundlespec` for documentation on this format. By default,
1161 the most appropriate format is used and compression defaults to
1161 the most appropriate format is used and compression defaults to
1162 bzip2.
1162 bzip2.
1163
1163
1164 The bundle file can then be transferred using conventional means
1164 The bundle file can then be transferred using conventional means
1165 and applied to another repository with the unbundle or pull
1165 and applied to another repository with the unbundle or pull
1166 command. This is useful when direct push and pull are not
1166 command. This is useful when direct push and pull are not
1167 available or when exporting an entire repository is undesirable.
1167 available or when exporting an entire repository is undesirable.
1168
1168
1169 Applying bundles preserves all changeset contents including
1169 Applying bundles preserves all changeset contents including
1170 permissions, copy/rename information, and revision history.
1170 permissions, copy/rename information, and revision history.
1171
1171
1172 Returns 0 on success, 1 if no changes found.
1172 Returns 0 on success, 1 if no changes found.
1173 """
1173 """
1174 opts = pycompat.byteskwargs(opts)
1174 opts = pycompat.byteskwargs(opts)
1175 revs = None
1175 revs = None
1176 if 'rev' in opts:
1176 if 'rev' in opts:
1177 revstrings = opts['rev']
1177 revstrings = opts['rev']
1178 revs = scmutil.revrange(repo, revstrings)
1178 revs = scmutil.revrange(repo, revstrings)
1179 if revstrings and not revs:
1179 if revstrings and not revs:
1180 raise error.Abort(_('no commits to bundle'))
1180 raise error.Abort(_('no commits to bundle'))
1181
1181
1182 bundletype = opts.get('type', 'bzip2').lower()
1182 bundletype = opts.get('type', 'bzip2').lower()
1183 try:
1183 try:
1184 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1184 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1185 except error.UnsupportedBundleSpecification as e:
1185 except error.UnsupportedBundleSpecification as e:
1186 raise error.Abort(pycompat.bytestr(e),
1186 raise error.Abort(pycompat.bytestr(e),
1187 hint=_("see 'hg help bundlespec' for supported "
1187 hint=_("see 'hg help bundlespec' for supported "
1188 "values for --type"))
1188 "values for --type"))
1189 cgversion = bundlespec.contentopts["cg.version"]
1189 cgversion = bundlespec.contentopts["cg.version"]
1190
1190
1191 # Packed bundles are a pseudo bundle format for now.
1191 # Packed bundles are a pseudo bundle format for now.
1192 if cgversion == 's1':
1192 if cgversion == 's1':
1193 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1193 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1194 hint=_("use 'hg debugcreatestreamclonebundle'"))
1194 hint=_("use 'hg debugcreatestreamclonebundle'"))
1195
1195
1196 if opts.get('all'):
1196 if opts.get('all'):
1197 if dest:
1197 if dest:
1198 raise error.Abort(_("--all is incompatible with specifying "
1198 raise error.Abort(_("--all is incompatible with specifying "
1199 "a destination"))
1199 "a destination"))
1200 if opts.get('base'):
1200 if opts.get('base'):
1201 ui.warn(_("ignoring --base because --all was specified\n"))
1201 ui.warn(_("ignoring --base because --all was specified\n"))
1202 base = ['null']
1202 base = ['null']
1203 else:
1203 else:
1204 base = scmutil.revrange(repo, opts.get('base'))
1204 base = scmutil.revrange(repo, opts.get('base'))
1205 if cgversion not in changegroup.supportedoutgoingversions(repo):
1205 if cgversion not in changegroup.supportedoutgoingversions(repo):
1206 raise error.Abort(_("repository does not support bundle version %s") %
1206 raise error.Abort(_("repository does not support bundle version %s") %
1207 cgversion)
1207 cgversion)
1208
1208
1209 if base:
1209 if base:
1210 if dest:
1210 if dest:
1211 raise error.Abort(_("--base is incompatible with specifying "
1211 raise error.Abort(_("--base is incompatible with specifying "
1212 "a destination"))
1212 "a destination"))
1213 common = [repo[rev].node() for rev in base]
1213 common = [repo[rev].node() for rev in base]
1214 heads = [repo[r].node() for r in revs] if revs else None
1214 heads = [repo[r].node() for r in revs] if revs else None
1215 outgoing = discovery.outgoing(repo, common, heads)
1215 outgoing = discovery.outgoing(repo, common, heads)
1216 else:
1216 else:
1217 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1217 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1218 dest, branches = hg.parseurl(dest, opts.get('branch'))
1218 dest, branches = hg.parseurl(dest, opts.get('branch'))
1219 other = hg.peer(repo, opts, dest)
1219 other = hg.peer(repo, opts, dest)
1220 revs = [repo[r].hex() for r in revs]
1220 revs = [repo[r].hex() for r in revs]
1221 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1221 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1222 heads = revs and map(repo.lookup, revs) or revs
1222 heads = revs and map(repo.lookup, revs) or revs
1223 outgoing = discovery.findcommonoutgoing(repo, other,
1223 outgoing = discovery.findcommonoutgoing(repo, other,
1224 onlyheads=heads,
1224 onlyheads=heads,
1225 force=opts.get('force'),
1225 force=opts.get('force'),
1226 portable=True)
1226 portable=True)
1227
1227
1228 if not outgoing.missing:
1228 if not outgoing.missing:
1229 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1229 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1230 return 1
1230 return 1
1231
1231
1232 if cgversion == '01': #bundle1
1232 if cgversion == '01': #bundle1
1233 bversion = 'HG10' + bundlespec.wirecompression
1233 bversion = 'HG10' + bundlespec.wirecompression
1234 bcompression = None
1234 bcompression = None
1235 elif cgversion in ('02', '03'):
1235 elif cgversion in ('02', '03'):
1236 bversion = 'HG20'
1236 bversion = 'HG20'
1237 bcompression = bundlespec.wirecompression
1237 bcompression = bundlespec.wirecompression
1238 else:
1238 else:
1239 raise error.ProgrammingError(
1239 raise error.ProgrammingError(
1240 'bundle: unexpected changegroup version %s' % cgversion)
1240 'bundle: unexpected changegroup version %s' % cgversion)
1241
1241
1242 # TODO compression options should be derived from bundlespec parsing.
1242 # TODO compression options should be derived from bundlespec parsing.
1243 # This is a temporary hack to allow adjusting bundle compression
1243 # This is a temporary hack to allow adjusting bundle compression
1244 # level without a) formalizing the bundlespec changes to declare it
1244 # level without a) formalizing the bundlespec changes to declare it
1245 # b) introducing a command flag.
1245 # b) introducing a command flag.
1246 compopts = {}
1246 compopts = {}
1247 complevel = ui.configint('experimental',
1247 complevel = ui.configint('experimental',
1248 'bundlecomplevel.' + bundlespec.compression)
1248 'bundlecomplevel.' + bundlespec.compression)
1249 if complevel is None:
1249 if complevel is None:
1250 complevel = ui.configint('experimental', 'bundlecomplevel')
1250 complevel = ui.configint('experimental', 'bundlecomplevel')
1251 if complevel is not None:
1251 if complevel is not None:
1252 compopts['level'] = complevel
1252 compopts['level'] = complevel
1253
1253
1254 # Allow overriding the bundling of obsmarker in phases through
1254 # Allow overriding the bundling of obsmarker in phases through
1255 # configuration while we don't have a bundle version that include them
1255 # configuration while we don't have a bundle version that include them
1256 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1256 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1257 bundlespec.contentopts['obsolescence'] = True
1257 bundlespec.contentopts['obsolescence'] = True
1258 if repo.ui.configbool('experimental', 'bundle-phases'):
1258 if repo.ui.configbool('experimental', 'bundle-phases'):
1259 bundlespec.contentopts['phases'] = True
1259 bundlespec.contentopts['phases'] = True
1260
1260
1261 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1261 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1262 bundlespec.contentopts, compression=bcompression,
1262 bundlespec.contentopts, compression=bcompression,
1263 compopts=compopts)
1263 compopts=compopts)
1264
1264
1265 @command('cat',
1265 @command('cat',
1266 [('o', 'output', '',
1266 [('o', 'output', '',
1267 _('print output to file with formatted name'), _('FORMAT')),
1267 _('print output to file with formatted name'), _('FORMAT')),
1268 ('r', 'rev', '', _('print the given revision'), _('REV')),
1268 ('r', 'rev', '', _('print the given revision'), _('REV')),
1269 ('', 'decode', None, _('apply any matching decode filter')),
1269 ('', 'decode', None, _('apply any matching decode filter')),
1270 ] + walkopts + formatteropts,
1270 ] + walkopts + formatteropts,
1271 _('[OPTION]... FILE...'),
1271 _('[OPTION]... FILE...'),
1272 inferrepo=True,
1272 inferrepo=True,
1273 intents={INTENT_READONLY})
1273 intents={INTENT_READONLY})
1274 def cat(ui, repo, file1, *pats, **opts):
1274 def cat(ui, repo, file1, *pats, **opts):
1275 """output the current or given revision of files
1275 """output the current or given revision of files
1276
1276
1277 Print the specified files as they were at the given revision. If
1277 Print the specified files as they were at the given revision. If
1278 no revision is given, the parent of the working directory is used.
1278 no revision is given, the parent of the working directory is used.
1279
1279
1280 Output may be to a file, in which case the name of the file is
1280 Output may be to a file, in which case the name of the file is
1281 given using a template string. See :hg:`help templates`. In addition
1281 given using a template string. See :hg:`help templates`. In addition
1282 to the common template keywords, the following formatting rules are
1282 to the common template keywords, the following formatting rules are
1283 supported:
1283 supported:
1284
1284
1285 :``%%``: literal "%" character
1285 :``%%``: literal "%" character
1286 :``%s``: basename of file being printed
1286 :``%s``: basename of file being printed
1287 :``%d``: dirname of file being printed, or '.' if in repository root
1287 :``%d``: dirname of file being printed, or '.' if in repository root
1288 :``%p``: root-relative path name of file being printed
1288 :``%p``: root-relative path name of file being printed
1289 :``%H``: changeset hash (40 hexadecimal digits)
1289 :``%H``: changeset hash (40 hexadecimal digits)
1290 :``%R``: changeset revision number
1290 :``%R``: changeset revision number
1291 :``%h``: short-form changeset hash (12 hexadecimal digits)
1291 :``%h``: short-form changeset hash (12 hexadecimal digits)
1292 :``%r``: zero-padded changeset revision number
1292 :``%r``: zero-padded changeset revision number
1293 :``%b``: basename of the exporting repository
1293 :``%b``: basename of the exporting repository
1294 :``\\``: literal "\\" character
1294 :``\\``: literal "\\" character
1295
1295
1296 Returns 0 on success.
1296 Returns 0 on success.
1297 """
1297 """
1298 opts = pycompat.byteskwargs(opts)
1298 opts = pycompat.byteskwargs(opts)
1299 rev = opts.get('rev')
1299 rev = opts.get('rev')
1300 if rev:
1300 if rev:
1301 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1301 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1302 ctx = scmutil.revsingle(repo, rev)
1302 ctx = scmutil.revsingle(repo, rev)
1303 m = scmutil.match(ctx, (file1,) + pats, opts)
1303 m = scmutil.match(ctx, (file1,) + pats, opts)
1304 fntemplate = opts.pop('output', '')
1304 fntemplate = opts.pop('output', '')
1305 if cmdutil.isstdiofilename(fntemplate):
1305 if cmdutil.isstdiofilename(fntemplate):
1306 fntemplate = ''
1306 fntemplate = ''
1307
1307
1308 if fntemplate:
1308 if fntemplate:
1309 fm = formatter.nullformatter(ui, 'cat', opts)
1309 fm = formatter.nullformatter(ui, 'cat', opts)
1310 else:
1310 else:
1311 ui.pager('cat')
1311 ui.pager('cat')
1312 fm = ui.formatter('cat', opts)
1312 fm = ui.formatter('cat', opts)
1313 with fm:
1313 with fm:
1314 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1314 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1315 **pycompat.strkwargs(opts))
1315 **pycompat.strkwargs(opts))
1316
1316
1317 @command('^clone',
1317 @command('^clone',
1318 [('U', 'noupdate', None, _('the clone will include an empty working '
1318 [('U', 'noupdate', None, _('the clone will include an empty working '
1319 'directory (only a repository)')),
1319 'directory (only a repository)')),
1320 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1320 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1321 _('REV')),
1321 _('REV')),
1322 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1322 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1323 ' and its ancestors'), _('REV')),
1323 ' and its ancestors'), _('REV')),
1324 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1324 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1325 ' changesets and their ancestors'), _('BRANCH')),
1325 ' changesets and their ancestors'), _('BRANCH')),
1326 ('', 'pull', None, _('use pull protocol to copy metadata')),
1326 ('', 'pull', None, _('use pull protocol to copy metadata')),
1327 ('', 'uncompressed', None,
1327 ('', 'uncompressed', None,
1328 _('an alias to --stream (DEPRECATED)')),
1328 _('an alias to --stream (DEPRECATED)')),
1329 ('', 'stream', None,
1329 ('', 'stream', None,
1330 _('clone with minimal data processing')),
1330 _('clone with minimal data processing')),
1331 ] + remoteopts,
1331 ] + remoteopts,
1332 _('[OPTION]... SOURCE [DEST]'),
1332 _('[OPTION]... SOURCE [DEST]'),
1333 norepo=True)
1333 norepo=True)
1334 def clone(ui, source, dest=None, **opts):
1334 def clone(ui, source, dest=None, **opts):
1335 """make a copy of an existing repository
1335 """make a copy of an existing repository
1336
1336
1337 Create a copy of an existing repository in a new directory.
1337 Create a copy of an existing repository in a new directory.
1338
1338
1339 If no destination directory name is specified, it defaults to the
1339 If no destination directory name is specified, it defaults to the
1340 basename of the source.
1340 basename of the source.
1341
1341
1342 The location of the source is added to the new repository's
1342 The location of the source is added to the new repository's
1343 ``.hg/hgrc`` file, as the default to be used for future pulls.
1343 ``.hg/hgrc`` file, as the default to be used for future pulls.
1344
1344
1345 Only local paths and ``ssh://`` URLs are supported as
1345 Only local paths and ``ssh://`` URLs are supported as
1346 destinations. For ``ssh://`` destinations, no working directory or
1346 destinations. For ``ssh://`` destinations, no working directory or
1347 ``.hg/hgrc`` will be created on the remote side.
1347 ``.hg/hgrc`` will be created on the remote side.
1348
1348
1349 If the source repository has a bookmark called '@' set, that
1349 If the source repository has a bookmark called '@' set, that
1350 revision will be checked out in the new repository by default.
1350 revision will be checked out in the new repository by default.
1351
1351
1352 To check out a particular version, use -u/--update, or
1352 To check out a particular version, use -u/--update, or
1353 -U/--noupdate to create a clone with no working directory.
1353 -U/--noupdate to create a clone with no working directory.
1354
1354
1355 To pull only a subset of changesets, specify one or more revisions
1355 To pull only a subset of changesets, specify one or more revisions
1356 identifiers with -r/--rev or branches with -b/--branch. The
1356 identifiers with -r/--rev or branches with -b/--branch. The
1357 resulting clone will contain only the specified changesets and
1357 resulting clone will contain only the specified changesets and
1358 their ancestors. These options (or 'clone src#rev dest') imply
1358 their ancestors. These options (or 'clone src#rev dest') imply
1359 --pull, even for local source repositories.
1359 --pull, even for local source repositories.
1360
1360
1361 In normal clone mode, the remote normalizes repository data into a common
1361 In normal clone mode, the remote normalizes repository data into a common
1362 exchange format and the receiving end translates this data into its local
1362 exchange format and the receiving end translates this data into its local
1363 storage format. --stream activates a different clone mode that essentially
1363 storage format. --stream activates a different clone mode that essentially
1364 copies repository files from the remote with minimal data processing. This
1364 copies repository files from the remote with minimal data processing. This
1365 significantly reduces the CPU cost of a clone both remotely and locally.
1365 significantly reduces the CPU cost of a clone both remotely and locally.
1366 However, it often increases the transferred data size by 30-40%. This can
1366 However, it often increases the transferred data size by 30-40%. This can
1367 result in substantially faster clones where I/O throughput is plentiful,
1367 result in substantially faster clones where I/O throughput is plentiful,
1368 especially for larger repositories. A side-effect of --stream clones is
1368 especially for larger repositories. A side-effect of --stream clones is
1369 that storage settings and requirements on the remote are applied locally:
1369 that storage settings and requirements on the remote are applied locally:
1370 a modern client may inherit legacy or inefficient storage used by the
1370 a modern client may inherit legacy or inefficient storage used by the
1371 remote or a legacy Mercurial client may not be able to clone from a
1371 remote or a legacy Mercurial client may not be able to clone from a
1372 modern Mercurial remote.
1372 modern Mercurial remote.
1373
1373
1374 .. note::
1374 .. note::
1375
1375
1376 Specifying a tag will include the tagged changeset but not the
1376 Specifying a tag will include the tagged changeset but not the
1377 changeset containing the tag.
1377 changeset containing the tag.
1378
1378
1379 .. container:: verbose
1379 .. container:: verbose
1380
1380
1381 For efficiency, hardlinks are used for cloning whenever the
1381 For efficiency, hardlinks are used for cloning whenever the
1382 source and destination are on the same filesystem (note this
1382 source and destination are on the same filesystem (note this
1383 applies only to the repository data, not to the working
1383 applies only to the repository data, not to the working
1384 directory). Some filesystems, such as AFS, implement hardlinking
1384 directory). Some filesystems, such as AFS, implement hardlinking
1385 incorrectly, but do not report errors. In these cases, use the
1385 incorrectly, but do not report errors. In these cases, use the
1386 --pull option to avoid hardlinking.
1386 --pull option to avoid hardlinking.
1387
1387
1388 Mercurial will update the working directory to the first applicable
1388 Mercurial will update the working directory to the first applicable
1389 revision from this list:
1389 revision from this list:
1390
1390
1391 a) null if -U or the source repository has no changesets
1391 a) null if -U or the source repository has no changesets
1392 b) if -u . and the source repository is local, the first parent of
1392 b) if -u . and the source repository is local, the first parent of
1393 the source repository's working directory
1393 the source repository's working directory
1394 c) the changeset specified with -u (if a branch name, this means the
1394 c) the changeset specified with -u (if a branch name, this means the
1395 latest head of that branch)
1395 latest head of that branch)
1396 d) the changeset specified with -r
1396 d) the changeset specified with -r
1397 e) the tipmost head specified with -b
1397 e) the tipmost head specified with -b
1398 f) the tipmost head specified with the url#branch source syntax
1398 f) the tipmost head specified with the url#branch source syntax
1399 g) the revision marked with the '@' bookmark, if present
1399 g) the revision marked with the '@' bookmark, if present
1400 h) the tipmost head of the default branch
1400 h) the tipmost head of the default branch
1401 i) tip
1401 i) tip
1402
1402
1403 When cloning from servers that support it, Mercurial may fetch
1403 When cloning from servers that support it, Mercurial may fetch
1404 pre-generated data from a server-advertised URL or inline from the
1404 pre-generated data from a server-advertised URL or inline from the
1405 same stream. When this is done, hooks operating on incoming changesets
1405 same stream. When this is done, hooks operating on incoming changesets
1406 and changegroups may fire more than once, once for each pre-generated
1406 and changegroups may fire more than once, once for each pre-generated
1407 bundle and as well as for any additional remaining data. In addition,
1407 bundle and as well as for any additional remaining data. In addition,
1408 if an error occurs, the repository may be rolled back to a partial
1408 if an error occurs, the repository may be rolled back to a partial
1409 clone. This behavior may change in future releases.
1409 clone. This behavior may change in future releases.
1410 See :hg:`help -e clonebundles` for more.
1410 See :hg:`help -e clonebundles` for more.
1411
1411
1412 Examples:
1412 Examples:
1413
1413
1414 - clone a remote repository to a new directory named hg/::
1414 - clone a remote repository to a new directory named hg/::
1415
1415
1416 hg clone https://www.mercurial-scm.org/repo/hg/
1416 hg clone https://www.mercurial-scm.org/repo/hg/
1417
1417
1418 - create a lightweight local clone::
1418 - create a lightweight local clone::
1419
1419
1420 hg clone project/ project-feature/
1420 hg clone project/ project-feature/
1421
1421
1422 - clone from an absolute path on an ssh server (note double-slash)::
1422 - clone from an absolute path on an ssh server (note double-slash)::
1423
1423
1424 hg clone ssh://user@server//home/projects/alpha/
1424 hg clone ssh://user@server//home/projects/alpha/
1425
1425
1426 - do a streaming clone while checking out a specified version::
1426 - do a streaming clone while checking out a specified version::
1427
1427
1428 hg clone --stream http://server/repo -u 1.5
1428 hg clone --stream http://server/repo -u 1.5
1429
1429
1430 - create a repository without changesets after a particular revision::
1430 - create a repository without changesets after a particular revision::
1431
1431
1432 hg clone -r 04e544 experimental/ good/
1432 hg clone -r 04e544 experimental/ good/
1433
1433
1434 - clone (and track) a particular named branch::
1434 - clone (and track) a particular named branch::
1435
1435
1436 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1436 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1437
1437
1438 See :hg:`help urls` for details on specifying URLs.
1438 See :hg:`help urls` for details on specifying URLs.
1439
1439
1440 Returns 0 on success.
1440 Returns 0 on success.
1441 """
1441 """
1442 opts = pycompat.byteskwargs(opts)
1442 opts = pycompat.byteskwargs(opts)
1443 if opts.get('noupdate') and opts.get('updaterev'):
1443 if opts.get('noupdate') and opts.get('updaterev'):
1444 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1444 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1445
1445
1446 r = hg.clone(ui, opts, source, dest,
1446 r = hg.clone(ui, opts, source, dest,
1447 pull=opts.get('pull'),
1447 pull=opts.get('pull'),
1448 stream=opts.get('stream') or opts.get('uncompressed'),
1448 stream=opts.get('stream') or opts.get('uncompressed'),
1449 revs=opts.get('rev'),
1449 revs=opts.get('rev'),
1450 update=opts.get('updaterev') or not opts.get('noupdate'),
1450 update=opts.get('updaterev') or not opts.get('noupdate'),
1451 branch=opts.get('branch'),
1451 branch=opts.get('branch'),
1452 shareopts=opts.get('shareopts'))
1452 shareopts=opts.get('shareopts'))
1453
1453
1454 return r is None
1454 return r is None
1455
1455
1456 @command('^commit|ci',
1456 @command('^commit|ci',
1457 [('A', 'addremove', None,
1457 [('A', 'addremove', None,
1458 _('mark new/missing files as added/removed before committing')),
1458 _('mark new/missing files as added/removed before committing')),
1459 ('', 'close-branch', None,
1459 ('', 'close-branch', None,
1460 _('mark a branch head as closed')),
1460 _('mark a branch head as closed')),
1461 ('', 'amend', None, _('amend the parent of the working directory')),
1461 ('', 'amend', None, _('amend the parent of the working directory')),
1462 ('s', 'secret', None, _('use the secret phase for committing')),
1462 ('s', 'secret', None, _('use the secret phase for committing')),
1463 ('e', 'edit', None, _('invoke editor on commit messages')),
1463 ('e', 'edit', None, _('invoke editor on commit messages')),
1464 ('i', 'interactive', None, _('use interactive mode')),
1464 ('i', 'interactive', None, _('use interactive mode')),
1465 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1465 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1466 _('[OPTION]... [FILE]...'),
1466 _('[OPTION]... [FILE]...'),
1467 inferrepo=True)
1467 inferrepo=True)
1468 def commit(ui, repo, *pats, **opts):
1468 def commit(ui, repo, *pats, **opts):
1469 """commit the specified files or all outstanding changes
1469 """commit the specified files or all outstanding changes
1470
1470
1471 Commit changes to the given files into the repository. Unlike a
1471 Commit changes to the given files into the repository. Unlike a
1472 centralized SCM, this operation is a local operation. See
1472 centralized SCM, this operation is a local operation. See
1473 :hg:`push` for a way to actively distribute your changes.
1473 :hg:`push` for a way to actively distribute your changes.
1474
1474
1475 If a list of files is omitted, all changes reported by :hg:`status`
1475 If a list of files is omitted, all changes reported by :hg:`status`
1476 will be committed.
1476 will be committed.
1477
1477
1478 If you are committing the result of a merge, do not provide any
1478 If you are committing the result of a merge, do not provide any
1479 filenames or -I/-X filters.
1479 filenames or -I/-X filters.
1480
1480
1481 If no commit message is specified, Mercurial starts your
1481 If no commit message is specified, Mercurial starts your
1482 configured editor where you can enter a message. In case your
1482 configured editor where you can enter a message. In case your
1483 commit fails, you will find a backup of your message in
1483 commit fails, you will find a backup of your message in
1484 ``.hg/last-message.txt``.
1484 ``.hg/last-message.txt``.
1485
1485
1486 The --close-branch flag can be used to mark the current branch
1486 The --close-branch flag can be used to mark the current branch
1487 head closed. When all heads of a branch are closed, the branch
1487 head closed. When all heads of a branch are closed, the branch
1488 will be considered closed and no longer listed.
1488 will be considered closed and no longer listed.
1489
1489
1490 The --amend flag can be used to amend the parent of the
1490 The --amend flag can be used to amend the parent of the
1491 working directory with a new commit that contains the changes
1491 working directory with a new commit that contains the changes
1492 in the parent in addition to those currently reported by :hg:`status`,
1492 in the parent in addition to those currently reported by :hg:`status`,
1493 if there are any. The old commit is stored in a backup bundle in
1493 if there are any. The old commit is stored in a backup bundle in
1494 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1494 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1495 on how to restore it).
1495 on how to restore it).
1496
1496
1497 Message, user and date are taken from the amended commit unless
1497 Message, user and date are taken from the amended commit unless
1498 specified. When a message isn't specified on the command line,
1498 specified. When a message isn't specified on the command line,
1499 the editor will open with the message of the amended commit.
1499 the editor will open with the message of the amended commit.
1500
1500
1501 It is not possible to amend public changesets (see :hg:`help phases`)
1501 It is not possible to amend public changesets (see :hg:`help phases`)
1502 or changesets that have children.
1502 or changesets that have children.
1503
1503
1504 See :hg:`help dates` for a list of formats valid for -d/--date.
1504 See :hg:`help dates` for a list of formats valid for -d/--date.
1505
1505
1506 Returns 0 on success, 1 if nothing changed.
1506 Returns 0 on success, 1 if nothing changed.
1507
1507
1508 .. container:: verbose
1508 .. container:: verbose
1509
1509
1510 Examples:
1510 Examples:
1511
1511
1512 - commit all files ending in .py::
1512 - commit all files ending in .py::
1513
1513
1514 hg commit --include "set:**.py"
1514 hg commit --include "set:**.py"
1515
1515
1516 - commit all non-binary files::
1516 - commit all non-binary files::
1517
1517
1518 hg commit --exclude "set:binary()"
1518 hg commit --exclude "set:binary()"
1519
1519
1520 - amend the current commit and set the date to now::
1520 - amend the current commit and set the date to now::
1521
1521
1522 hg commit --amend --date now
1522 hg commit --amend --date now
1523 """
1523 """
1524 with repo.wlock(), repo.lock():
1524 with repo.wlock(), repo.lock():
1525 return _docommit(ui, repo, *pats, **opts)
1525 return _docommit(ui, repo, *pats, **opts)
1526
1526
1527 def _docommit(ui, repo, *pats, **opts):
1527 def _docommit(ui, repo, *pats, **opts):
1528 if opts.get(r'interactive'):
1528 if opts.get(r'interactive'):
1529 opts.pop(r'interactive')
1529 opts.pop(r'interactive')
1530 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1530 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1531 cmdutil.recordfilter, *pats,
1531 cmdutil.recordfilter, *pats,
1532 **opts)
1532 **opts)
1533 # ret can be 0 (no changes to record) or the value returned by
1533 # ret can be 0 (no changes to record) or the value returned by
1534 # commit(), 1 if nothing changed or None on success.
1534 # commit(), 1 if nothing changed or None on success.
1535 return 1 if ret == 0 else ret
1535 return 1 if ret == 0 else ret
1536
1536
1537 opts = pycompat.byteskwargs(opts)
1537 opts = pycompat.byteskwargs(opts)
1538 if opts.get('subrepos'):
1538 if opts.get('subrepos'):
1539 if opts.get('amend'):
1539 if opts.get('amend'):
1540 raise error.Abort(_('cannot amend with --subrepos'))
1540 raise error.Abort(_('cannot amend with --subrepos'))
1541 # Let --subrepos on the command line override config setting.
1541 # Let --subrepos on the command line override config setting.
1542 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1542 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1543
1543
1544 cmdutil.checkunfinished(repo, commit=True)
1544 cmdutil.checkunfinished(repo, commit=True)
1545
1545
1546 branch = repo[None].branch()
1546 branch = repo[None].branch()
1547 bheads = repo.branchheads(branch)
1547 bheads = repo.branchheads(branch)
1548
1548
1549 extra = {}
1549 extra = {}
1550 if opts.get('close_branch'):
1550 if opts.get('close_branch'):
1551 extra['close'] = '1'
1551 extra['close'] = '1'
1552
1552
1553 if not bheads:
1553 if not bheads:
1554 raise error.Abort(_('can only close branch heads'))
1554 raise error.Abort(_('can only close branch heads'))
1555 elif opts.get('amend'):
1555 elif opts.get('amend'):
1556 if repo[None].parents()[0].p1().branch() != branch and \
1556 if repo[None].parents()[0].p1().branch() != branch and \
1557 repo[None].parents()[0].p2().branch() != branch:
1557 repo[None].parents()[0].p2().branch() != branch:
1558 raise error.Abort(_('can only close branch heads'))
1558 raise error.Abort(_('can only close branch heads'))
1559
1559
1560 if opts.get('amend'):
1560 if opts.get('amend'):
1561 if ui.configbool('ui', 'commitsubrepos'):
1561 if ui.configbool('ui', 'commitsubrepos'):
1562 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1562 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1563
1563
1564 old = repo['.']
1564 old = repo['.']
1565 rewriteutil.precheck(repo, [old.rev()], 'amend')
1565 rewriteutil.precheck(repo, [old.rev()], 'amend')
1566
1566
1567 # Currently histedit gets confused if an amend happens while histedit
1567 # Currently histedit gets confused if an amend happens while histedit
1568 # is in progress. Since we have a checkunfinished command, we are
1568 # is in progress. Since we have a checkunfinished command, we are
1569 # temporarily honoring it.
1569 # temporarily honoring it.
1570 #
1570 #
1571 # Note: eventually this guard will be removed. Please do not expect
1571 # Note: eventually this guard will be removed. Please do not expect
1572 # this behavior to remain.
1572 # this behavior to remain.
1573 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1573 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1574 cmdutil.checkunfinished(repo)
1574 cmdutil.checkunfinished(repo)
1575
1575
1576 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1576 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1577 if node == old.node():
1577 if node == old.node():
1578 ui.status(_("nothing changed\n"))
1578 ui.status(_("nothing changed\n"))
1579 return 1
1579 return 1
1580 else:
1580 else:
1581 def commitfunc(ui, repo, message, match, opts):
1581 def commitfunc(ui, repo, message, match, opts):
1582 overrides = {}
1582 overrides = {}
1583 if opts.get('secret'):
1583 if opts.get('secret'):
1584 overrides[('phases', 'new-commit')] = 'secret'
1584 overrides[('phases', 'new-commit')] = 'secret'
1585
1585
1586 baseui = repo.baseui
1586 baseui = repo.baseui
1587 with baseui.configoverride(overrides, 'commit'):
1587 with baseui.configoverride(overrides, 'commit'):
1588 with ui.configoverride(overrides, 'commit'):
1588 with ui.configoverride(overrides, 'commit'):
1589 editform = cmdutil.mergeeditform(repo[None],
1589 editform = cmdutil.mergeeditform(repo[None],
1590 'commit.normal')
1590 'commit.normal')
1591 editor = cmdutil.getcommiteditor(
1591 editor = cmdutil.getcommiteditor(
1592 editform=editform, **pycompat.strkwargs(opts))
1592 editform=editform, **pycompat.strkwargs(opts))
1593 return repo.commit(message,
1593 return repo.commit(message,
1594 opts.get('user'),
1594 opts.get('user'),
1595 opts.get('date'),
1595 opts.get('date'),
1596 match,
1596 match,
1597 editor=editor,
1597 editor=editor,
1598 extra=extra)
1598 extra=extra)
1599
1599
1600 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1600 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1601
1601
1602 if not node:
1602 if not node:
1603 stat = cmdutil.postcommitstatus(repo, pats, opts)
1603 stat = cmdutil.postcommitstatus(repo, pats, opts)
1604 if stat[3]:
1604 if stat[3]:
1605 ui.status(_("nothing changed (%d missing files, see "
1605 ui.status(_("nothing changed (%d missing files, see "
1606 "'hg status')\n") % len(stat[3]))
1606 "'hg status')\n") % len(stat[3]))
1607 else:
1607 else:
1608 ui.status(_("nothing changed\n"))
1608 ui.status(_("nothing changed\n"))
1609 return 1
1609 return 1
1610
1610
1611 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1611 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1612
1612
1613 @command('config|showconfig|debugconfig',
1613 @command('config|showconfig|debugconfig',
1614 [('u', 'untrusted', None, _('show untrusted configuration options')),
1614 [('u', 'untrusted', None, _('show untrusted configuration options')),
1615 ('e', 'edit', None, _('edit user config')),
1615 ('e', 'edit', None, _('edit user config')),
1616 ('l', 'local', None, _('edit repository config')),
1616 ('l', 'local', None, _('edit repository config')),
1617 ('g', 'global', None, _('edit global config'))] + formatteropts,
1617 ('g', 'global', None, _('edit global config'))] + formatteropts,
1618 _('[-u] [NAME]...'),
1618 _('[-u] [NAME]...'),
1619 optionalrepo=True,
1619 optionalrepo=True,
1620 intents={INTENT_READONLY})
1620 intents={INTENT_READONLY})
1621 def config(ui, repo, *values, **opts):
1621 def config(ui, repo, *values, **opts):
1622 """show combined config settings from all hgrc files
1622 """show combined config settings from all hgrc files
1623
1623
1624 With no arguments, print names and values of all config items.
1624 With no arguments, print names and values of all config items.
1625
1625
1626 With one argument of the form section.name, print just the value
1626 With one argument of the form section.name, print just the value
1627 of that config item.
1627 of that config item.
1628
1628
1629 With multiple arguments, print names and values of all config
1629 With multiple arguments, print names and values of all config
1630 items with matching section names or section.names.
1630 items with matching section names or section.names.
1631
1631
1632 With --edit, start an editor on the user-level config file. With
1632 With --edit, start an editor on the user-level config file. With
1633 --global, edit the system-wide config file. With --local, edit the
1633 --global, edit the system-wide config file. With --local, edit the
1634 repository-level config file.
1634 repository-level config file.
1635
1635
1636 With --debug, the source (filename and line number) is printed
1636 With --debug, the source (filename and line number) is printed
1637 for each config item.
1637 for each config item.
1638
1638
1639 See :hg:`help config` for more information about config files.
1639 See :hg:`help config` for more information about config files.
1640
1640
1641 Returns 0 on success, 1 if NAME does not exist.
1641 Returns 0 on success, 1 if NAME does not exist.
1642
1642
1643 """
1643 """
1644
1644
1645 opts = pycompat.byteskwargs(opts)
1645 opts = pycompat.byteskwargs(opts)
1646 if opts.get('edit') or opts.get('local') or opts.get('global'):
1646 if opts.get('edit') or opts.get('local') or opts.get('global'):
1647 if opts.get('local') and opts.get('global'):
1647 if opts.get('local') and opts.get('global'):
1648 raise error.Abort(_("can't use --local and --global together"))
1648 raise error.Abort(_("can't use --local and --global together"))
1649
1649
1650 if opts.get('local'):
1650 if opts.get('local'):
1651 if not repo:
1651 if not repo:
1652 raise error.Abort(_("can't use --local outside a repository"))
1652 raise error.Abort(_("can't use --local outside a repository"))
1653 paths = [repo.vfs.join('hgrc')]
1653 paths = [repo.vfs.join('hgrc')]
1654 elif opts.get('global'):
1654 elif opts.get('global'):
1655 paths = rcutil.systemrcpath()
1655 paths = rcutil.systemrcpath()
1656 else:
1656 else:
1657 paths = rcutil.userrcpath()
1657 paths = rcutil.userrcpath()
1658
1658
1659 for f in paths:
1659 for f in paths:
1660 if os.path.exists(f):
1660 if os.path.exists(f):
1661 break
1661 break
1662 else:
1662 else:
1663 if opts.get('global'):
1663 if opts.get('global'):
1664 samplehgrc = uimod.samplehgrcs['global']
1664 samplehgrc = uimod.samplehgrcs['global']
1665 elif opts.get('local'):
1665 elif opts.get('local'):
1666 samplehgrc = uimod.samplehgrcs['local']
1666 samplehgrc = uimod.samplehgrcs['local']
1667 else:
1667 else:
1668 samplehgrc = uimod.samplehgrcs['user']
1668 samplehgrc = uimod.samplehgrcs['user']
1669
1669
1670 f = paths[0]
1670 f = paths[0]
1671 fp = open(f, "wb")
1671 fp = open(f, "wb")
1672 fp.write(util.tonativeeol(samplehgrc))
1672 fp.write(util.tonativeeol(samplehgrc))
1673 fp.close()
1673 fp.close()
1674
1674
1675 editor = ui.geteditor()
1675 editor = ui.geteditor()
1676 ui.system("%s \"%s\"" % (editor, f),
1676 ui.system("%s \"%s\"" % (editor, f),
1677 onerr=error.Abort, errprefix=_("edit failed"),
1677 onerr=error.Abort, errprefix=_("edit failed"),
1678 blockedtag='config_edit')
1678 blockedtag='config_edit')
1679 return
1679 return
1680 ui.pager('config')
1680 ui.pager('config')
1681 fm = ui.formatter('config', opts)
1681 fm = ui.formatter('config', opts)
1682 for t, f in rcutil.rccomponents():
1682 for t, f in rcutil.rccomponents():
1683 if t == 'path':
1683 if t == 'path':
1684 ui.debug('read config from: %s\n' % f)
1684 ui.debug('read config from: %s\n' % f)
1685 elif t == 'items':
1685 elif t == 'items':
1686 for section, name, value, source in f:
1686 for section, name, value, source in f:
1687 ui.debug('set config by: %s\n' % source)
1687 ui.debug('set config by: %s\n' % source)
1688 else:
1688 else:
1689 raise error.ProgrammingError('unknown rctype: %s' % t)
1689 raise error.ProgrammingError('unknown rctype: %s' % t)
1690 untrusted = bool(opts.get('untrusted'))
1690 untrusted = bool(opts.get('untrusted'))
1691
1691
1692 selsections = selentries = []
1692 selsections = selentries = []
1693 if values:
1693 if values:
1694 selsections = [v for v in values if '.' not in v]
1694 selsections = [v for v in values if '.' not in v]
1695 selentries = [v for v in values if '.' in v]
1695 selentries = [v for v in values if '.' in v]
1696 uniquesel = (len(selentries) == 1 and not selsections)
1696 uniquesel = (len(selentries) == 1 and not selsections)
1697 selsections = set(selsections)
1697 selsections = set(selsections)
1698 selentries = set(selentries)
1698 selentries = set(selentries)
1699
1699
1700 matched = False
1700 matched = False
1701 for section, name, value in ui.walkconfig(untrusted=untrusted):
1701 for section, name, value in ui.walkconfig(untrusted=untrusted):
1702 source = ui.configsource(section, name, untrusted)
1702 source = ui.configsource(section, name, untrusted)
1703 value = pycompat.bytestr(value)
1703 value = pycompat.bytestr(value)
1704 if fm.isplain():
1704 if fm.isplain():
1705 source = source or 'none'
1705 source = source or 'none'
1706 value = value.replace('\n', '\\n')
1706 value = value.replace('\n', '\\n')
1707 entryname = section + '.' + name
1707 entryname = section + '.' + name
1708 if values and not (section in selsections or entryname in selentries):
1708 if values and not (section in selsections or entryname in selentries):
1709 continue
1709 continue
1710 fm.startitem()
1710 fm.startitem()
1711 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1711 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1712 if uniquesel:
1712 if uniquesel:
1713 fm.data(name=entryname)
1713 fm.data(name=entryname)
1714 fm.write('value', '%s\n', value)
1714 fm.write('value', '%s\n', value)
1715 else:
1715 else:
1716 fm.write('name value', '%s=%s\n', entryname, value)
1716 fm.write('name value', '%s=%s\n', entryname, value)
1717 matched = True
1717 matched = True
1718 fm.end()
1718 fm.end()
1719 if matched:
1719 if matched:
1720 return 0
1720 return 0
1721 return 1
1721 return 1
1722
1722
1723 @command('copy|cp',
1723 @command('copy|cp',
1724 [('A', 'after', None, _('record a copy that has already occurred')),
1724 [('A', 'after', None, _('record a copy that has already occurred')),
1725 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1725 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1726 ] + walkopts + dryrunopts,
1726 ] + walkopts + dryrunopts,
1727 _('[OPTION]... [SOURCE]... DEST'))
1727 _('[OPTION]... [SOURCE]... DEST'))
1728 def copy(ui, repo, *pats, **opts):
1728 def copy(ui, repo, *pats, **opts):
1729 """mark files as copied for the next commit
1729 """mark files as copied for the next commit
1730
1730
1731 Mark dest as having copies of source files. If dest is a
1731 Mark dest as having copies of source files. If dest is a
1732 directory, copies are put in that directory. If dest is a file,
1732 directory, copies are put in that directory. If dest is a file,
1733 the source must be a single file.
1733 the source must be a single file.
1734
1734
1735 By default, this command copies the contents of files as they
1735 By default, this command copies the contents of files as they
1736 exist in the working directory. If invoked with -A/--after, the
1736 exist in the working directory. If invoked with -A/--after, the
1737 operation is recorded, but no copying is performed.
1737 operation is recorded, but no copying is performed.
1738
1738
1739 This command takes effect with the next commit. To undo a copy
1739 This command takes effect with the next commit. To undo a copy
1740 before that, see :hg:`revert`.
1740 before that, see :hg:`revert`.
1741
1741
1742 Returns 0 on success, 1 if errors are encountered.
1742 Returns 0 on success, 1 if errors are encountered.
1743 """
1743 """
1744 opts = pycompat.byteskwargs(opts)
1744 opts = pycompat.byteskwargs(opts)
1745 with repo.wlock(False):
1745 with repo.wlock(False):
1746 return cmdutil.copy(ui, repo, pats, opts)
1746 return cmdutil.copy(ui, repo, pats, opts)
1747
1747
1748 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1748 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1749 def debugcommands(ui, cmd='', *args):
1749 def debugcommands(ui, cmd='', *args):
1750 """list all available commands and options"""
1750 """list all available commands and options"""
1751 for cmd, vals in sorted(table.iteritems()):
1751 for cmd, vals in sorted(table.iteritems()):
1752 cmd = cmd.split('|')[0].strip('^')
1752 cmd = cmd.split('|')[0].strip('^')
1753 opts = ', '.join([i[1] for i in vals[1]])
1753 opts = ', '.join([i[1] for i in vals[1]])
1754 ui.write('%s: %s\n' % (cmd, opts))
1754 ui.write('%s: %s\n' % (cmd, opts))
1755
1755
1756 @command('debugcomplete',
1756 @command('debugcomplete',
1757 [('o', 'options', None, _('show the command options'))],
1757 [('o', 'options', None, _('show the command options'))],
1758 _('[-o] CMD'),
1758 _('[-o] CMD'),
1759 norepo=True)
1759 norepo=True)
1760 def debugcomplete(ui, cmd='', **opts):
1760 def debugcomplete(ui, cmd='', **opts):
1761 """returns the completion list associated with the given command"""
1761 """returns the completion list associated with the given command"""
1762
1762
1763 if opts.get(r'options'):
1763 if opts.get(r'options'):
1764 options = []
1764 options = []
1765 otables = [globalopts]
1765 otables = [globalopts]
1766 if cmd:
1766 if cmd:
1767 aliases, entry = cmdutil.findcmd(cmd, table, False)
1767 aliases, entry = cmdutil.findcmd(cmd, table, False)
1768 otables.append(entry[1])
1768 otables.append(entry[1])
1769 for t in otables:
1769 for t in otables:
1770 for o in t:
1770 for o in t:
1771 if "(DEPRECATED)" in o[3]:
1771 if "(DEPRECATED)" in o[3]:
1772 continue
1772 continue
1773 if o[0]:
1773 if o[0]:
1774 options.append('-%s' % o[0])
1774 options.append('-%s' % o[0])
1775 options.append('--%s' % o[1])
1775 options.append('--%s' % o[1])
1776 ui.write("%s\n" % "\n".join(options))
1776 ui.write("%s\n" % "\n".join(options))
1777 return
1777 return
1778
1778
1779 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1779 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1780 if ui.verbose:
1780 if ui.verbose:
1781 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1781 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1782 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1782 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1783
1783
1784 @command('^diff',
1784 @command('^diff',
1785 [('r', 'rev', [], _('revision'), _('REV')),
1785 [('r', 'rev', [], _('revision'), _('REV')),
1786 ('c', 'change', '', _('change made by revision'), _('REV'))
1786 ('c', 'change', '', _('change made by revision'), _('REV'))
1787 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1787 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1788 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1788 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1789 inferrepo=True,
1789 inferrepo=True,
1790 intents={INTENT_READONLY})
1790 intents={INTENT_READONLY})
1791 def diff(ui, repo, *pats, **opts):
1791 def diff(ui, repo, *pats, **opts):
1792 """diff repository (or selected files)
1792 """diff repository (or selected files)
1793
1793
1794 Show differences between revisions for the specified files.
1794 Show differences between revisions for the specified files.
1795
1795
1796 Differences between files are shown using the unified diff format.
1796 Differences between files are shown using the unified diff format.
1797
1797
1798 .. note::
1798 .. note::
1799
1799
1800 :hg:`diff` may generate unexpected results for merges, as it will
1800 :hg:`diff` may generate unexpected results for merges, as it will
1801 default to comparing against the working directory's first
1801 default to comparing against the working directory's first
1802 parent changeset if no revisions are specified.
1802 parent changeset if no revisions are specified.
1803
1803
1804 When two revision arguments are given, then changes are shown
1804 When two revision arguments are given, then changes are shown
1805 between those revisions. If only one revision is specified then
1805 between those revisions. If only one revision is specified then
1806 that revision is compared to the working directory, and, when no
1806 that revision is compared to the working directory, and, when no
1807 revisions are specified, the working directory files are compared
1807 revisions are specified, the working directory files are compared
1808 to its first parent.
1808 to its first parent.
1809
1809
1810 Alternatively you can specify -c/--change with a revision to see
1810 Alternatively you can specify -c/--change with a revision to see
1811 the changes in that changeset relative to its first parent.
1811 the changes in that changeset relative to its first parent.
1812
1812
1813 Without the -a/--text option, diff will avoid generating diffs of
1813 Without the -a/--text option, diff will avoid generating diffs of
1814 files it detects as binary. With -a, diff will generate a diff
1814 files it detects as binary. With -a, diff will generate a diff
1815 anyway, probably with undesirable results.
1815 anyway, probably with undesirable results.
1816
1816
1817 Use the -g/--git option to generate diffs in the git extended diff
1817 Use the -g/--git option to generate diffs in the git extended diff
1818 format. For more information, read :hg:`help diffs`.
1818 format. For more information, read :hg:`help diffs`.
1819
1819
1820 .. container:: verbose
1820 .. container:: verbose
1821
1821
1822 Examples:
1822 Examples:
1823
1823
1824 - compare a file in the current working directory to its parent::
1824 - compare a file in the current working directory to its parent::
1825
1825
1826 hg diff foo.c
1826 hg diff foo.c
1827
1827
1828 - compare two historical versions of a directory, with rename info::
1828 - compare two historical versions of a directory, with rename info::
1829
1829
1830 hg diff --git -r 1.0:1.2 lib/
1830 hg diff --git -r 1.0:1.2 lib/
1831
1831
1832 - get change stats relative to the last change on some date::
1832 - get change stats relative to the last change on some date::
1833
1833
1834 hg diff --stat -r "date('may 2')"
1834 hg diff --stat -r "date('may 2')"
1835
1835
1836 - diff all newly-added files that contain a keyword::
1836 - diff all newly-added files that contain a keyword::
1837
1837
1838 hg diff "set:added() and grep(GNU)"
1838 hg diff "set:added() and grep(GNU)"
1839
1839
1840 - compare a revision and its parents::
1840 - compare a revision and its parents::
1841
1841
1842 hg diff -c 9353 # compare against first parent
1842 hg diff -c 9353 # compare against first parent
1843 hg diff -r 9353^:9353 # same using revset syntax
1843 hg diff -r 9353^:9353 # same using revset syntax
1844 hg diff -r 9353^2:9353 # compare against the second parent
1844 hg diff -r 9353^2:9353 # compare against the second parent
1845
1845
1846 Returns 0 on success.
1846 Returns 0 on success.
1847 """
1847 """
1848
1848
1849 opts = pycompat.byteskwargs(opts)
1849 opts = pycompat.byteskwargs(opts)
1850 revs = opts.get('rev')
1850 revs = opts.get('rev')
1851 change = opts.get('change')
1851 change = opts.get('change')
1852 stat = opts.get('stat')
1852 stat = opts.get('stat')
1853 reverse = opts.get('reverse')
1853 reverse = opts.get('reverse')
1854
1854
1855 if revs and change:
1855 if revs and change:
1856 msg = _('cannot specify --rev and --change at the same time')
1856 msg = _('cannot specify --rev and --change at the same time')
1857 raise error.Abort(msg)
1857 raise error.Abort(msg)
1858 elif change:
1858 elif change:
1859 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1859 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1860 ctx2 = scmutil.revsingle(repo, change, None)
1860 ctx2 = scmutil.revsingle(repo, change, None)
1861 ctx1 = ctx2.p1()
1861 ctx1 = ctx2.p1()
1862 else:
1862 else:
1863 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1863 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1864 ctx1, ctx2 = scmutil.revpair(repo, revs)
1864 ctx1, ctx2 = scmutil.revpair(repo, revs)
1865 node1, node2 = ctx1.node(), ctx2.node()
1865 node1, node2 = ctx1.node(), ctx2.node()
1866
1866
1867 if reverse:
1867 if reverse:
1868 node1, node2 = node2, node1
1868 node1, node2 = node2, node1
1869
1869
1870 diffopts = patch.diffallopts(ui, opts)
1870 diffopts = patch.diffallopts(ui, opts)
1871 m = scmutil.match(ctx2, pats, opts)
1871 m = scmutil.match(ctx2, pats, opts)
1872 ui.pager('diff')
1872 ui.pager('diff')
1873 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1873 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1874 listsubrepos=opts.get('subrepos'),
1874 listsubrepos=opts.get('subrepos'),
1875 root=opts.get('root'))
1875 root=opts.get('root'))
1876
1876
1877 @command('^export',
1877 @command('^export',
1878 [('B', 'bookmark', '',
1878 [('B', 'bookmark', '',
1879 _('export changes only reachable by given bookmark')),
1879 _('export changes only reachable by given bookmark')),
1880 ('o', 'output', '',
1880 ('o', 'output', '',
1881 _('print output to file with formatted name'), _('FORMAT')),
1881 _('print output to file with formatted name'), _('FORMAT')),
1882 ('', 'switch-parent', None, _('diff against the second parent')),
1882 ('', 'switch-parent', None, _('diff against the second parent')),
1883 ('r', 'rev', [], _('revisions to export'), _('REV')),
1883 ('r', 'rev', [], _('revisions to export'), _('REV')),
1884 ] + diffopts + formatteropts,
1884 ] + diffopts + formatteropts,
1885 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
1885 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
1886 intents={INTENT_READONLY})
1886 intents={INTENT_READONLY})
1887 def export(ui, repo, *changesets, **opts):
1887 def export(ui, repo, *changesets, **opts):
1888 """dump the header and diffs for one or more changesets
1888 """dump the header and diffs for one or more changesets
1889
1889
1890 Print the changeset header and diffs for one or more revisions.
1890 Print the changeset header and diffs for one or more revisions.
1891 If no revision is given, the parent of the working directory is used.
1891 If no revision is given, the parent of the working directory is used.
1892
1892
1893 The information shown in the changeset header is: author, date,
1893 The information shown in the changeset header is: author, date,
1894 branch name (if non-default), changeset hash, parent(s) and commit
1894 branch name (if non-default), changeset hash, parent(s) and commit
1895 comment.
1895 comment.
1896
1896
1897 .. note::
1897 .. note::
1898
1898
1899 :hg:`export` may generate unexpected diff output for merge
1899 :hg:`export` may generate unexpected diff output for merge
1900 changesets, as it will compare the merge changeset against its
1900 changesets, as it will compare the merge changeset against its
1901 first parent only.
1901 first parent only.
1902
1902
1903 Output may be to a file, in which case the name of the file is
1903 Output may be to a file, in which case the name of the file is
1904 given using a template string. See :hg:`help templates`. In addition
1904 given using a template string. See :hg:`help templates`. In addition
1905 to the common template keywords, the following formatting rules are
1905 to the common template keywords, the following formatting rules are
1906 supported:
1906 supported:
1907
1907
1908 :``%%``: literal "%" character
1908 :``%%``: literal "%" character
1909 :``%H``: changeset hash (40 hexadecimal digits)
1909 :``%H``: changeset hash (40 hexadecimal digits)
1910 :``%N``: number of patches being generated
1910 :``%N``: number of patches being generated
1911 :``%R``: changeset revision number
1911 :``%R``: changeset revision number
1912 :``%b``: basename of the exporting repository
1912 :``%b``: basename of the exporting repository
1913 :``%h``: short-form changeset hash (12 hexadecimal digits)
1913 :``%h``: short-form changeset hash (12 hexadecimal digits)
1914 :``%m``: first line of the commit message (only alphanumeric characters)
1914 :``%m``: first line of the commit message (only alphanumeric characters)
1915 :``%n``: zero-padded sequence number, starting at 1
1915 :``%n``: zero-padded sequence number, starting at 1
1916 :``%r``: zero-padded changeset revision number
1916 :``%r``: zero-padded changeset revision number
1917 :``\\``: literal "\\" character
1917 :``\\``: literal "\\" character
1918
1918
1919 Without the -a/--text option, export will avoid generating diffs
1919 Without the -a/--text option, export will avoid generating diffs
1920 of files it detects as binary. With -a, export will generate a
1920 of files it detects as binary. With -a, export will generate a
1921 diff anyway, probably with undesirable results.
1921 diff anyway, probably with undesirable results.
1922
1922
1923 With -B/--bookmark changesets reachable by the given bookmark are
1923 With -B/--bookmark changesets reachable by the given bookmark are
1924 selected.
1924 selected.
1925
1925
1926 Use the -g/--git option to generate diffs in the git extended diff
1926 Use the -g/--git option to generate diffs in the git extended diff
1927 format. See :hg:`help diffs` for more information.
1927 format. See :hg:`help diffs` for more information.
1928
1928
1929 With the --switch-parent option, the diff will be against the
1929 With the --switch-parent option, the diff will be against the
1930 second parent. It can be useful to review a merge.
1930 second parent. It can be useful to review a merge.
1931
1931
1932 .. container:: verbose
1932 .. container:: verbose
1933
1933
1934 Examples:
1934 Examples:
1935
1935
1936 - use export and import to transplant a bugfix to the current
1936 - use export and import to transplant a bugfix to the current
1937 branch::
1937 branch::
1938
1938
1939 hg export -r 9353 | hg import -
1939 hg export -r 9353 | hg import -
1940
1940
1941 - export all the changesets between two revisions to a file with
1941 - export all the changesets between two revisions to a file with
1942 rename information::
1942 rename information::
1943
1943
1944 hg export --git -r 123:150 > changes.txt
1944 hg export --git -r 123:150 > changes.txt
1945
1945
1946 - split outgoing changes into a series of patches with
1946 - split outgoing changes into a series of patches with
1947 descriptive names::
1947 descriptive names::
1948
1948
1949 hg export -r "outgoing()" -o "%n-%m.patch"
1949 hg export -r "outgoing()" -o "%n-%m.patch"
1950
1950
1951 Returns 0 on success.
1951 Returns 0 on success.
1952 """
1952 """
1953 opts = pycompat.byteskwargs(opts)
1953 opts = pycompat.byteskwargs(opts)
1954 bookmark = opts.get('bookmark')
1954 bookmark = opts.get('bookmark')
1955 changesets += tuple(opts.get('rev', []))
1955 changesets += tuple(opts.get('rev', []))
1956
1956
1957 if bookmark and changesets:
1957 if bookmark and changesets:
1958 raise error.Abort(_("-r and -B are mutually exclusive"))
1958 raise error.Abort(_("-r and -B are mutually exclusive"))
1959
1959
1960 if bookmark:
1960 if bookmark:
1961 if bookmark not in repo._bookmarks:
1961 if bookmark not in repo._bookmarks:
1962 raise error.Abort(_("bookmark '%s' not found") % bookmark)
1962 raise error.Abort(_("bookmark '%s' not found") % bookmark)
1963
1963
1964 revs = scmutil.bookmarkrevs(repo, bookmark)
1964 revs = scmutil.bookmarkrevs(repo, bookmark)
1965 else:
1965 else:
1966 if not changesets:
1966 if not changesets:
1967 changesets = ['.']
1967 changesets = ['.']
1968
1968
1969 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1969 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
1970 revs = scmutil.revrange(repo, changesets)
1970 revs = scmutil.revrange(repo, changesets)
1971
1971
1972 if not revs:
1972 if not revs:
1973 raise error.Abort(_("export requires at least one changeset"))
1973 raise error.Abort(_("export requires at least one changeset"))
1974 if len(revs) > 1:
1974 if len(revs) > 1:
1975 ui.note(_('exporting patches:\n'))
1975 ui.note(_('exporting patches:\n'))
1976 else:
1976 else:
1977 ui.note(_('exporting patch:\n'))
1977 ui.note(_('exporting patch:\n'))
1978
1978
1979 fntemplate = opts.get('output')
1979 fntemplate = opts.get('output')
1980 if cmdutil.isstdiofilename(fntemplate):
1980 if cmdutil.isstdiofilename(fntemplate):
1981 fntemplate = ''
1981 fntemplate = ''
1982
1982
1983 if fntemplate:
1983 if fntemplate:
1984 fm = formatter.nullformatter(ui, 'export', opts)
1984 fm = formatter.nullformatter(ui, 'export', opts)
1985 else:
1985 else:
1986 ui.pager('export')
1986 ui.pager('export')
1987 fm = ui.formatter('export', opts)
1987 fm = ui.formatter('export', opts)
1988 with fm:
1988 with fm:
1989 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
1989 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
1990 switch_parent=opts.get('switch_parent'),
1990 switch_parent=opts.get('switch_parent'),
1991 opts=patch.diffallopts(ui, opts))
1991 opts=patch.diffallopts(ui, opts))
1992
1992
1993 @command('files',
1993 @command('files',
1994 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1994 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1995 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1995 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1996 ] + walkopts + formatteropts + subrepoopts,
1996 ] + walkopts + formatteropts + subrepoopts,
1997 _('[OPTION]... [FILE]...'),
1997 _('[OPTION]... [FILE]...'),
1998 intents={INTENT_READONLY})
1998 intents={INTENT_READONLY})
1999 def files(ui, repo, *pats, **opts):
1999 def files(ui, repo, *pats, **opts):
2000 """list tracked files
2000 """list tracked files
2001
2001
2002 Print files under Mercurial control in the working directory or
2002 Print files under Mercurial control in the working directory or
2003 specified revision for given files (excluding removed files).
2003 specified revision for given files (excluding removed files).
2004 Files can be specified as filenames or filesets.
2004 Files can be specified as filenames or filesets.
2005
2005
2006 If no files are given to match, this command prints the names
2006 If no files are given to match, this command prints the names
2007 of all files under Mercurial control.
2007 of all files under Mercurial control.
2008
2008
2009 .. container:: verbose
2009 .. container:: verbose
2010
2010
2011 Examples:
2011 Examples:
2012
2012
2013 - list all files under the current directory::
2013 - list all files under the current directory::
2014
2014
2015 hg files .
2015 hg files .
2016
2016
2017 - shows sizes and flags for current revision::
2017 - shows sizes and flags for current revision::
2018
2018
2019 hg files -vr .
2019 hg files -vr .
2020
2020
2021 - list all files named README::
2021 - list all files named README::
2022
2022
2023 hg files -I "**/README"
2023 hg files -I "**/README"
2024
2024
2025 - list all binary files::
2025 - list all binary files::
2026
2026
2027 hg files "set:binary()"
2027 hg files "set:binary()"
2028
2028
2029 - find files containing a regular expression::
2029 - find files containing a regular expression::
2030
2030
2031 hg files "set:grep('bob')"
2031 hg files "set:grep('bob')"
2032
2032
2033 - search tracked file contents with xargs and grep::
2033 - search tracked file contents with xargs and grep::
2034
2034
2035 hg files -0 | xargs -0 grep foo
2035 hg files -0 | xargs -0 grep foo
2036
2036
2037 See :hg:`help patterns` and :hg:`help filesets` for more information
2037 See :hg:`help patterns` and :hg:`help filesets` for more information
2038 on specifying file patterns.
2038 on specifying file patterns.
2039
2039
2040 Returns 0 if a match is found, 1 otherwise.
2040 Returns 0 if a match is found, 1 otherwise.
2041
2041
2042 """
2042 """
2043
2043
2044 opts = pycompat.byteskwargs(opts)
2044 opts = pycompat.byteskwargs(opts)
2045 rev = opts.get('rev')
2045 rev = opts.get('rev')
2046 if rev:
2046 if rev:
2047 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2047 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2048 ctx = scmutil.revsingle(repo, rev, None)
2048 ctx = scmutil.revsingle(repo, rev, None)
2049
2049
2050 end = '\n'
2050 end = '\n'
2051 if opts.get('print0'):
2051 if opts.get('print0'):
2052 end = '\0'
2052 end = '\0'
2053 fmt = '%s' + end
2053 fmt = '%s' + end
2054
2054
2055 m = scmutil.match(ctx, pats, opts)
2055 m = scmutil.match(ctx, pats, opts)
2056 ui.pager('files')
2056 ui.pager('files')
2057 with ui.formatter('files', opts) as fm:
2057 with ui.formatter('files', opts) as fm:
2058 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2058 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2059
2059
2060 @command(
2060 @command(
2061 '^forget',
2061 '^forget',
2062 [('i', 'interactive', None, _('use interactive mode')),
2062 [('i', 'interactive', None, _('use interactive mode')),
2063 ] + walkopts + dryrunopts,
2063 ] + walkopts + dryrunopts,
2064 _('[OPTION]... FILE...'), inferrepo=True)
2064 _('[OPTION]... FILE...'), inferrepo=True)
2065 def forget(ui, repo, *pats, **opts):
2065 def forget(ui, repo, *pats, **opts):
2066 """forget the specified files on the next commit
2066 """forget the specified files on the next commit
2067
2067
2068 Mark the specified files so they will no longer be tracked
2068 Mark the specified files so they will no longer be tracked
2069 after the next commit.
2069 after the next commit.
2070
2070
2071 This only removes files from the current branch, not from the
2071 This only removes files from the current branch, not from the
2072 entire project history, and it does not delete them from the
2072 entire project history, and it does not delete them from the
2073 working directory.
2073 working directory.
2074
2074
2075 To delete the file from the working directory, see :hg:`remove`.
2075 To delete the file from the working directory, see :hg:`remove`.
2076
2076
2077 To undo a forget before the next commit, see :hg:`add`.
2077 To undo a forget before the next commit, see :hg:`add`.
2078
2078
2079 .. container:: verbose
2079 .. container:: verbose
2080
2080
2081 Examples:
2081 Examples:
2082
2082
2083 - forget newly-added binary files::
2083 - forget newly-added binary files::
2084
2084
2085 hg forget "set:added() and binary()"
2085 hg forget "set:added() and binary()"
2086
2086
2087 - forget files that would be excluded by .hgignore::
2087 - forget files that would be excluded by .hgignore::
2088
2088
2089 hg forget "set:hgignore()"
2089 hg forget "set:hgignore()"
2090
2090
2091 Returns 0 on success.
2091 Returns 0 on success.
2092 """
2092 """
2093
2093
2094 opts = pycompat.byteskwargs(opts)
2094 opts = pycompat.byteskwargs(opts)
2095 if not pats:
2095 if not pats:
2096 raise error.Abort(_('no files specified'))
2096 raise error.Abort(_('no files specified'))
2097
2097
2098 m = scmutil.match(repo[None], pats, opts)
2098 m = scmutil.match(repo[None], pats, opts)
2099 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2099 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2100 rejected = cmdutil.forget(ui, repo, m, prefix="",
2100 rejected = cmdutil.forget(ui, repo, m, prefix="",
2101 explicitonly=False, dryrun=dryrun,
2101 explicitonly=False, dryrun=dryrun,
2102 interactive=interactive)[0]
2102 interactive=interactive)[0]
2103 return rejected and 1 or 0
2103 return rejected and 1 or 0
2104
2104
2105 @command(
2105 @command(
2106 'graft',
2106 'graft',
2107 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2107 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2108 ('c', 'continue', False, _('resume interrupted graft')),
2108 ('c', 'continue', False, _('resume interrupted graft')),
2109 ('', 'stop', False, _('stop interrupted graft')),
2109 ('', 'stop', False, _('stop interrupted graft')),
2110 ('e', 'edit', False, _('invoke editor on commit messages')),
2110 ('e', 'edit', False, _('invoke editor on commit messages')),
2111 ('', 'log', None, _('append graft info to log message')),
2111 ('', 'log', None, _('append graft info to log message')),
2112 ('f', 'force', False, _('force graft')),
2112 ('f', 'force', False, _('force graft')),
2113 ('D', 'currentdate', False,
2113 ('D', 'currentdate', False,
2114 _('record the current date as commit date')),
2114 _('record the current date as commit date')),
2115 ('U', 'currentuser', False,
2115 ('U', 'currentuser', False,
2116 _('record the current user as committer'), _('DATE'))]
2116 _('record the current user as committer'), _('DATE'))]
2117 + commitopts2 + mergetoolopts + dryrunopts,
2117 + commitopts2 + mergetoolopts + dryrunopts,
2118 _('[OPTION]... [-r REV]... REV...'))
2118 _('[OPTION]... [-r REV]... REV...'))
2119 def graft(ui, repo, *revs, **opts):
2119 def graft(ui, repo, *revs, **opts):
2120 '''copy changes from other branches onto the current branch
2120 '''copy changes from other branches onto the current branch
2121
2121
2122 This command uses Mercurial's merge logic to copy individual
2122 This command uses Mercurial's merge logic to copy individual
2123 changes from other branches without merging branches in the
2123 changes from other branches without merging branches in the
2124 history graph. This is sometimes known as 'backporting' or
2124 history graph. This is sometimes known as 'backporting' or
2125 'cherry-picking'. By default, graft will copy user, date, and
2125 'cherry-picking'. By default, graft will copy user, date, and
2126 description from the source changesets.
2126 description from the source changesets.
2127
2127
2128 Changesets that are ancestors of the current revision, that have
2128 Changesets that are ancestors of the current revision, that have
2129 already been grafted, or that are merges will be skipped.
2129 already been grafted, or that are merges will be skipped.
2130
2130
2131 If --log is specified, log messages will have a comment appended
2131 If --log is specified, log messages will have a comment appended
2132 of the form::
2132 of the form::
2133
2133
2134 (grafted from CHANGESETHASH)
2134 (grafted from CHANGESETHASH)
2135
2135
2136 If --force is specified, revisions will be grafted even if they
2136 If --force is specified, revisions will be grafted even if they
2137 are already ancestors of, or have been grafted to, the destination.
2137 are already ancestors of, or have been grafted to, the destination.
2138 This is useful when the revisions have since been backed out.
2138 This is useful when the revisions have since been backed out.
2139
2139
2140 If a graft merge results in conflicts, the graft process is
2140 If a graft merge results in conflicts, the graft process is
2141 interrupted so that the current merge can be manually resolved.
2141 interrupted so that the current merge can be manually resolved.
2142 Once all conflicts are addressed, the graft process can be
2142 Once all conflicts are addressed, the graft process can be
2143 continued with the -c/--continue option.
2143 continued with the -c/--continue option.
2144
2144
2145 The -c/--continue option reapplies all the earlier options.
2145 The -c/--continue option reapplies all the earlier options.
2146
2146
2147 .. container:: verbose
2147 .. container:: verbose
2148
2148
2149 Examples:
2149 Examples:
2150
2150
2151 - copy a single change to the stable branch and edit its description::
2151 - copy a single change to the stable branch and edit its description::
2152
2152
2153 hg update stable
2153 hg update stable
2154 hg graft --edit 9393
2154 hg graft --edit 9393
2155
2155
2156 - graft a range of changesets with one exception, updating dates::
2156 - graft a range of changesets with one exception, updating dates::
2157
2157
2158 hg graft -D "2085::2093 and not 2091"
2158 hg graft -D "2085::2093 and not 2091"
2159
2159
2160 - continue a graft after resolving conflicts::
2160 - continue a graft after resolving conflicts::
2161
2161
2162 hg graft -c
2162 hg graft -c
2163
2163
2164 - show the source of a grafted changeset::
2164 - show the source of a grafted changeset::
2165
2165
2166 hg log --debug -r .
2166 hg log --debug -r .
2167
2167
2168 - show revisions sorted by date::
2168 - show revisions sorted by date::
2169
2169
2170 hg log -r "sort(all(), date)"
2170 hg log -r "sort(all(), date)"
2171
2171
2172 See :hg:`help revisions` for more about specifying revisions.
2172 See :hg:`help revisions` for more about specifying revisions.
2173
2173
2174 Returns 0 on successful completion.
2174 Returns 0 on successful completion.
2175 '''
2175 '''
2176 with repo.wlock():
2176 with repo.wlock():
2177 return _dograft(ui, repo, *revs, **opts)
2177 return _dograft(ui, repo, *revs, **opts)
2178
2178
2179 def _dograft(ui, repo, *revs, **opts):
2179 def _dograft(ui, repo, *revs, **opts):
2180 opts = pycompat.byteskwargs(opts)
2180 opts = pycompat.byteskwargs(opts)
2181 if revs and opts.get('rev'):
2181 if revs and opts.get('rev'):
2182 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2182 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2183 'revision ordering!\n'))
2183 'revision ordering!\n'))
2184
2184
2185 revs = list(revs)
2185 revs = list(revs)
2186 revs.extend(opts.get('rev'))
2186 revs.extend(opts.get('rev'))
2187 # a dict of data to be stored in state file
2187 # a dict of data to be stored in state file
2188 statedata = {}
2188 statedata = {}
2189
2189
2190 if not opts.get('user') and opts.get('currentuser'):
2190 if not opts.get('user') and opts.get('currentuser'):
2191 opts['user'] = ui.username()
2191 opts['user'] = ui.username()
2192 if not opts.get('date') and opts.get('currentdate'):
2192 if not opts.get('date') and opts.get('currentdate'):
2193 opts['date'] = "%d %d" % dateutil.makedate()
2193 opts['date'] = "%d %d" % dateutil.makedate()
2194
2194
2195 editor = cmdutil.getcommiteditor(editform='graft',
2195 editor = cmdutil.getcommiteditor(editform='graft',
2196 **pycompat.strkwargs(opts))
2196 **pycompat.strkwargs(opts))
2197
2197
2198 cont = False
2198 cont = False
2199 graftstate = statemod.cmdstate(repo, 'graftstate')
2199 graftstate = statemod.cmdstate(repo, 'graftstate')
2200 if opts.get('stop'):
2200 if opts.get('stop'):
2201 if opts.get('continue'):
2201 if opts.get('continue'):
2202 raise error.Abort(_("cannot use '--continue' and "
2202 raise error.Abort(_("cannot use '--continue' and "
2203 "'--stop' together"))
2203 "'--stop' together"))
2204 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2204 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2205 opts.get('date'), opts.get('currentdate'),
2205 opts.get('date'), opts.get('currentdate'),
2206 opts.get('currentuser'), opts.get('rev'))):
2206 opts.get('currentuser'), opts.get('rev'))):
2207 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2207 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2208 return _stopgraft(ui, repo, graftstate)
2208 return _stopgraft(ui, repo, graftstate)
2209 if opts.get('continue'):
2209 if opts.get('continue'):
2210 cont = True
2210 cont = True
2211 if revs:
2211 if revs:
2212 raise error.Abort(_("can't specify --continue and revisions"))
2212 raise error.Abort(_("can't specify --continue and revisions"))
2213 # read in unfinished revisions
2213 # read in unfinished revisions
2214 if graftstate.exists():
2214 if graftstate.exists():
2215 statedata = _readgraftstate(repo, graftstate)
2215 statedata = _readgraftstate(repo, graftstate)
2216 if statedata.get('date'):
2216 if statedata.get('date'):
2217 opts['date'] = statedata['date']
2217 opts['date'] = statedata['date']
2218 if statedata.get('user'):
2218 if statedata.get('user'):
2219 opts['user'] = statedata['user']
2219 opts['user'] = statedata['user']
2220 if statedata.get('log'):
2220 if statedata.get('log'):
2221 opts['log'] = True
2221 opts['log'] = True
2222 nodes = statedata['nodes']
2222 nodes = statedata['nodes']
2223 revs = [repo[node].rev() for node in nodes]
2223 revs = [repo[node].rev() for node in nodes]
2224 else:
2224 else:
2225 cmdutil.wrongtooltocontinue(repo, _('graft'))
2225 cmdutil.wrongtooltocontinue(repo, _('graft'))
2226 else:
2226 else:
2227 if not revs:
2227 if not revs:
2228 raise error.Abort(_('no revisions specified'))
2228 raise error.Abort(_('no revisions specified'))
2229 cmdutil.checkunfinished(repo)
2229 cmdutil.checkunfinished(repo)
2230 cmdutil.bailifchanged(repo)
2230 cmdutil.bailifchanged(repo)
2231 revs = scmutil.revrange(repo, revs)
2231 revs = scmutil.revrange(repo, revs)
2232
2232
2233 skipped = set()
2233 skipped = set()
2234 # check for merges
2234 # check for merges
2235 for rev in repo.revs('%ld and merge()', revs):
2235 for rev in repo.revs('%ld and merge()', revs):
2236 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2236 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2237 skipped.add(rev)
2237 skipped.add(rev)
2238 revs = [r for r in revs if r not in skipped]
2238 revs = [r for r in revs if r not in skipped]
2239 if not revs:
2239 if not revs:
2240 return -1
2240 return -1
2241
2241
2242 # Don't check in the --continue case, in effect retaining --force across
2242 # Don't check in the --continue case, in effect retaining --force across
2243 # --continues. That's because without --force, any revisions we decided to
2243 # --continues. That's because without --force, any revisions we decided to
2244 # skip would have been filtered out here, so they wouldn't have made their
2244 # skip would have been filtered out here, so they wouldn't have made their
2245 # way to the graftstate. With --force, any revisions we would have otherwise
2245 # way to the graftstate. With --force, any revisions we would have otherwise
2246 # skipped would not have been filtered out, and if they hadn't been applied
2246 # skipped would not have been filtered out, and if they hadn't been applied
2247 # already, they'd have been in the graftstate.
2247 # already, they'd have been in the graftstate.
2248 if not (cont or opts.get('force')):
2248 if not (cont or opts.get('force')):
2249 # check for ancestors of dest branch
2249 # check for ancestors of dest branch
2250 crev = repo['.'].rev()
2250 crev = repo['.'].rev()
2251 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2251 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2252 # XXX make this lazy in the future
2252 # XXX make this lazy in the future
2253 # don't mutate while iterating, create a copy
2253 # don't mutate while iterating, create a copy
2254 for rev in list(revs):
2254 for rev in list(revs):
2255 if rev in ancestors:
2255 if rev in ancestors:
2256 ui.warn(_('skipping ancestor revision %d:%s\n') %
2256 ui.warn(_('skipping ancestor revision %d:%s\n') %
2257 (rev, repo[rev]))
2257 (rev, repo[rev]))
2258 # XXX remove on list is slow
2258 # XXX remove on list is slow
2259 revs.remove(rev)
2259 revs.remove(rev)
2260 if not revs:
2260 if not revs:
2261 return -1
2261 return -1
2262
2262
2263 # analyze revs for earlier grafts
2263 # analyze revs for earlier grafts
2264 ids = {}
2264 ids = {}
2265 for ctx in repo.set("%ld", revs):
2265 for ctx in repo.set("%ld", revs):
2266 ids[ctx.hex()] = ctx.rev()
2266 ids[ctx.hex()] = ctx.rev()
2267 n = ctx.extra().get('source')
2267 n = ctx.extra().get('source')
2268 if n:
2268 if n:
2269 ids[n] = ctx.rev()
2269 ids[n] = ctx.rev()
2270
2270
2271 # check ancestors for earlier grafts
2271 # check ancestors for earlier grafts
2272 ui.debug('scanning for duplicate grafts\n')
2272 ui.debug('scanning for duplicate grafts\n')
2273
2273
2274 # The only changesets we can be sure doesn't contain grafts of any
2274 # The only changesets we can be sure doesn't contain grafts of any
2275 # revs, are the ones that are common ancestors of *all* revs:
2275 # revs, are the ones that are common ancestors of *all* revs:
2276 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2276 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2277 ctx = repo[rev]
2277 ctx = repo[rev]
2278 n = ctx.extra().get('source')
2278 n = ctx.extra().get('source')
2279 if n in ids:
2279 if n in ids:
2280 try:
2280 try:
2281 r = repo[n].rev()
2281 r = repo[n].rev()
2282 except error.RepoLookupError:
2282 except error.RepoLookupError:
2283 r = None
2283 r = None
2284 if r in revs:
2284 if r in revs:
2285 ui.warn(_('skipping revision %d:%s '
2285 ui.warn(_('skipping revision %d:%s '
2286 '(already grafted to %d:%s)\n')
2286 '(already grafted to %d:%s)\n')
2287 % (r, repo[r], rev, ctx))
2287 % (r, repo[r], rev, ctx))
2288 revs.remove(r)
2288 revs.remove(r)
2289 elif ids[n] in revs:
2289 elif ids[n] in revs:
2290 if r is None:
2290 if r is None:
2291 ui.warn(_('skipping already grafted revision %d:%s '
2291 ui.warn(_('skipping already grafted revision %d:%s '
2292 '(%d:%s also has unknown origin %s)\n')
2292 '(%d:%s also has unknown origin %s)\n')
2293 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2293 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2294 else:
2294 else:
2295 ui.warn(_('skipping already grafted revision %d:%s '
2295 ui.warn(_('skipping already grafted revision %d:%s '
2296 '(%d:%s also has origin %d:%s)\n')
2296 '(%d:%s also has origin %d:%s)\n')
2297 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2297 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2298 revs.remove(ids[n])
2298 revs.remove(ids[n])
2299 elif ctx.hex() in ids:
2299 elif ctx.hex() in ids:
2300 r = ids[ctx.hex()]
2300 r = ids[ctx.hex()]
2301 ui.warn(_('skipping already grafted revision %d:%s '
2301 ui.warn(_('skipping already grafted revision %d:%s '
2302 '(was grafted from %d:%s)\n') %
2302 '(was grafted from %d:%s)\n') %
2303 (r, repo[r], rev, ctx))
2303 (r, repo[r], rev, ctx))
2304 revs.remove(r)
2304 revs.remove(r)
2305 if not revs:
2305 if not revs:
2306 return -1
2306 return -1
2307
2307
2308 for pos, ctx in enumerate(repo.set("%ld", revs)):
2308 for pos, ctx in enumerate(repo.set("%ld", revs)):
2309 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2309 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2310 ctx.description().split('\n', 1)[0])
2310 ctx.description().split('\n', 1)[0])
2311 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2311 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2312 if names:
2312 if names:
2313 desc += ' (%s)' % ' '.join(names)
2313 desc += ' (%s)' % ' '.join(names)
2314 ui.status(_('grafting %s\n') % desc)
2314 ui.status(_('grafting %s\n') % desc)
2315 if opts.get('dry_run'):
2315 if opts.get('dry_run'):
2316 continue
2316 continue
2317
2317
2318 source = ctx.extra().get('source')
2318 source = ctx.extra().get('source')
2319 extra = {}
2319 extra = {}
2320 if source:
2320 if source:
2321 extra['source'] = source
2321 extra['source'] = source
2322 extra['intermediate-source'] = ctx.hex()
2322 extra['intermediate-source'] = ctx.hex()
2323 else:
2323 else:
2324 extra['source'] = ctx.hex()
2324 extra['source'] = ctx.hex()
2325 user = ctx.user()
2325 user = ctx.user()
2326 if opts.get('user'):
2326 if opts.get('user'):
2327 user = opts['user']
2327 user = opts['user']
2328 statedata['user'] = user
2328 statedata['user'] = user
2329 date = ctx.date()
2329 date = ctx.date()
2330 if opts.get('date'):
2330 if opts.get('date'):
2331 date = opts['date']
2331 date = opts['date']
2332 statedata['date'] = date
2332 statedata['date'] = date
2333 message = ctx.description()
2333 message = ctx.description()
2334 if opts.get('log'):
2334 if opts.get('log'):
2335 message += '\n(grafted from %s)' % ctx.hex()
2335 message += '\n(grafted from %s)' % ctx.hex()
2336 statedata['log'] = True
2336 statedata['log'] = True
2337
2337
2338 # we don't merge the first commit when continuing
2338 # we don't merge the first commit when continuing
2339 if not cont:
2339 if not cont:
2340 # perform the graft merge with p1(rev) as 'ancestor'
2340 # perform the graft merge with p1(rev) as 'ancestor'
2341 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2341 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2342 with ui.configoverride(overrides, 'graft'):
2342 with ui.configoverride(overrides, 'graft'):
2343 stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'graft'])
2343 stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'graft'])
2344 # report any conflicts
2344 # report any conflicts
2345 if stats.unresolvedcount > 0:
2345 if stats.unresolvedcount > 0:
2346 # write out state for --continue
2346 # write out state for --continue
2347 nodes = [repo[rev].hex() for rev in revs[pos:]]
2347 nodes = [repo[rev].hex() for rev in revs[pos:]]
2348 statedata['nodes'] = nodes
2348 statedata['nodes'] = nodes
2349 stateversion = 1
2349 stateversion = 1
2350 graftstate.save(stateversion, statedata)
2350 graftstate.save(stateversion, statedata)
2351 hint = _("use 'hg resolve' and 'hg graft --continue'")
2351 hint = _("use 'hg resolve' and 'hg graft --continue'")
2352 raise error.Abort(
2352 raise error.Abort(
2353 _("unresolved conflicts, can't continue"),
2353 _("unresolved conflicts, can't continue"),
2354 hint=hint)
2354 hint=hint)
2355 else:
2355 else:
2356 cont = False
2356 cont = False
2357
2357
2358 # commit
2358 # commit
2359 node = repo.commit(text=message, user=user,
2359 node = repo.commit(text=message, user=user,
2360 date=date, extra=extra, editor=editor)
2360 date=date, extra=extra, editor=editor)
2361 if node is None:
2361 if node is None:
2362 ui.warn(
2362 ui.warn(
2363 _('note: graft of %d:%s created no changes to commit\n') %
2363 _('note: graft of %d:%s created no changes to commit\n') %
2364 (ctx.rev(), ctx))
2364 (ctx.rev(), ctx))
2365
2365
2366 # remove state when we complete successfully
2366 # remove state when we complete successfully
2367 if not opts.get('dry_run'):
2367 if not opts.get('dry_run'):
2368 graftstate.delete()
2368 graftstate.delete()
2369
2369
2370 return 0
2370 return 0
2371
2371
2372 def _readgraftstate(repo, graftstate):
2372 def _readgraftstate(repo, graftstate):
2373 """read the graft state file and return a dict of the data stored in it"""
2373 """read the graft state file and return a dict of the data stored in it"""
2374 try:
2374 try:
2375 return graftstate.read()
2375 return graftstate.read()
2376 except error.CorruptedState:
2376 except error.CorruptedState:
2377 nodes = repo.vfs.read('graftstate').splitlines()
2377 nodes = repo.vfs.read('graftstate').splitlines()
2378 return {'nodes': nodes}
2378 return {'nodes': nodes}
2379
2379
2380 def _stopgraft(ui, repo, graftstate):
2380 def _stopgraft(ui, repo, graftstate):
2381 """stop the interrupted graft"""
2381 """stop the interrupted graft"""
2382 if not graftstate.exists():
2382 if not graftstate.exists():
2383 raise error.Abort(_("no interrupted graft found"))
2383 raise error.Abort(_("no interrupted graft found"))
2384 pctx = repo['.']
2384 pctx = repo['.']
2385 hg.updaterepo(repo, pctx.node(), True)
2385 hg.updaterepo(repo, pctx.node(), True)
2386 graftstate.delete()
2386 graftstate.delete()
2387 ui.status(_("stopped the interrupted graft\n"))
2387 ui.status(_("stopped the interrupted graft\n"))
2388 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2388 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2389 return 0
2389 return 0
2390
2390
2391 @command('grep',
2391 @command('grep',
2392 [('0', 'print0', None, _('end fields with NUL')),
2392 [('0', 'print0', None, _('end fields with NUL')),
2393 ('', 'all', None, _('print all revisions that match')),
2393 ('', 'all', None, _('print all revisions that match')),
2394 ('', 'diff', None, _('print all revisions when the term was introduced '
2394 ('', 'diff', None, _('print all revisions when the term was introduced '
2395 'or removed')),
2395 'or removed')),
2396 ('a', 'text', None, _('treat all files as text')),
2396 ('a', 'text', None, _('treat all files as text')),
2397 ('f', 'follow', None,
2397 ('f', 'follow', None,
2398 _('follow changeset history,'
2398 _('follow changeset history,'
2399 ' or file history across copies and renames')),
2399 ' or file history across copies and renames')),
2400 ('i', 'ignore-case', None, _('ignore case when matching')),
2400 ('i', 'ignore-case', None, _('ignore case when matching')),
2401 ('l', 'files-with-matches', None,
2401 ('l', 'files-with-matches', None,
2402 _('print only filenames and revisions that match')),
2402 _('print only filenames and revisions that match')),
2403 ('n', 'line-number', None, _('print matching line numbers')),
2403 ('n', 'line-number', None, _('print matching line numbers')),
2404 ('r', 'rev', [],
2404 ('r', 'rev', [],
2405 _('only search files changed within revision range'), _('REV')),
2405 _('only search files changed within revision range'), _('REV')),
2406 ('', 'allfiles', False,
2406 ('', 'allfiles', False,
2407 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2407 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2408 ('u', 'user', None, _('list the author (long with -v)')),
2408 ('u', 'user', None, _('list the author (long with -v)')),
2409 ('d', 'date', None, _('list the date (short with -q)')),
2409 ('d', 'date', None, _('list the date (short with -q)')),
2410 ] + formatteropts + walkopts,
2410 ] + formatteropts + walkopts,
2411 _('[OPTION]... PATTERN [FILE]...'),
2411 _('[OPTION]... PATTERN [FILE]...'),
2412 inferrepo=True,
2412 inferrepo=True,
2413 intents={INTENT_READONLY})
2413 intents={INTENT_READONLY})
2414 def grep(ui, repo, pattern, *pats, **opts):
2414 def grep(ui, repo, pattern, *pats, **opts):
2415 """search revision history for a pattern in specified files
2415 """search revision history for a pattern in specified files
2416
2416
2417 Search revision history for a regular expression in the specified
2417 Search revision history for a regular expression in the specified
2418 files or the entire project.
2418 files or the entire project.
2419
2419
2420 By default, grep prints the most recent revision number for each
2420 By default, grep prints the most recent revision number for each
2421 file in which it finds a match. To get it to print every revision
2421 file in which it finds a match. To get it to print every revision
2422 that contains a change in match status ("-" for a match that becomes
2422 that contains a change in match status ("-" for a match that becomes
2423 a non-match, or "+" for a non-match that becomes a match), use the
2423 a non-match, or "+" for a non-match that becomes a match), use the
2424 --diff/--all flag.
2424 --diff/--all flag.
2425
2425
2426 PATTERN can be any Python (roughly Perl-compatible) regular
2426 PATTERN can be any Python (roughly Perl-compatible) regular
2427 expression.
2427 expression.
2428
2428
2429 If no FILEs are specified (and -f/--follow isn't set), all files in
2429 If no FILEs are specified (and -f/--follow isn't set), all files in
2430 the repository are searched, including those that don't exist in the
2430 the repository are searched, including those that don't exist in the
2431 current branch or have been deleted in a prior changeset.
2431 current branch or have been deleted in a prior changeset.
2432
2432
2433 Returns 0 if a match is found, 1 otherwise.
2433 Returns 0 if a match is found, 1 otherwise.
2434 """
2434 """
2435 opts = pycompat.byteskwargs(opts)
2435 opts = pycompat.byteskwargs(opts)
2436 diff = opts.get('all') or opts.get('diff')
2436 diff = opts.get('all') or opts.get('diff')
2437 reflags = re.M
2437 reflags = re.M
2438 if opts.get('ignore_case'):
2438 if opts.get('ignore_case'):
2439 reflags |= re.I
2439 reflags |= re.I
2440 try:
2440 try:
2441 regexp = util.re.compile(pattern, reflags)
2441 regexp = util.re.compile(pattern, reflags)
2442 except re.error as inst:
2442 except re.error as inst:
2443 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2443 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2444 return 1
2444 return 1
2445 sep, eol = ':', '\n'
2445 sep, eol = ':', '\n'
2446 if opts.get('print0'):
2446 if opts.get('print0'):
2447 sep = eol = '\0'
2447 sep = eol = '\0'
2448
2448
2449 getfile = util.lrucachefunc(repo.file)
2449 getfile = util.lrucachefunc(repo.file)
2450
2450
2451 def matchlines(body):
2451 def matchlines(body):
2452 begin = 0
2452 begin = 0
2453 linenum = 0
2453 linenum = 0
2454 while begin < len(body):
2454 while begin < len(body):
2455 match = regexp.search(body, begin)
2455 match = regexp.search(body, begin)
2456 if not match:
2456 if not match:
2457 break
2457 break
2458 mstart, mend = match.span()
2458 mstart, mend = match.span()
2459 linenum += body.count('\n', begin, mstart) + 1
2459 linenum += body.count('\n', begin, mstart) + 1
2460 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2460 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2461 begin = body.find('\n', mend) + 1 or len(body) + 1
2461 begin = body.find('\n', mend) + 1 or len(body) + 1
2462 lend = begin - 1
2462 lend = begin - 1
2463 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2463 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2464
2464
2465 class linestate(object):
2465 class linestate(object):
2466 def __init__(self, line, linenum, colstart, colend):
2466 def __init__(self, line, linenum, colstart, colend):
2467 self.line = line
2467 self.line = line
2468 self.linenum = linenum
2468 self.linenum = linenum
2469 self.colstart = colstart
2469 self.colstart = colstart
2470 self.colend = colend
2470 self.colend = colend
2471
2471
2472 def __hash__(self):
2472 def __hash__(self):
2473 return hash((self.linenum, self.line))
2473 return hash((self.linenum, self.line))
2474
2474
2475 def __eq__(self, other):
2475 def __eq__(self, other):
2476 return self.line == other.line
2476 return self.line == other.line
2477
2477
2478 def findpos(self):
2478 def findpos(self):
2479 """Iterate all (start, end) indices of matches"""
2479 """Iterate all (start, end) indices of matches"""
2480 yield self.colstart, self.colend
2480 yield self.colstart, self.colend
2481 p = self.colend
2481 p = self.colend
2482 while p < len(self.line):
2482 while p < len(self.line):
2483 m = regexp.search(self.line, p)
2483 m = regexp.search(self.line, p)
2484 if not m:
2484 if not m:
2485 break
2485 break
2486 yield m.span()
2486 yield m.span()
2487 p = m.end()
2487 p = m.end()
2488
2488
2489 matches = {}
2489 matches = {}
2490 copies = {}
2490 copies = {}
2491 def grepbody(fn, rev, body):
2491 def grepbody(fn, rev, body):
2492 matches[rev].setdefault(fn, [])
2492 matches[rev].setdefault(fn, [])
2493 m = matches[rev][fn]
2493 m = matches[rev][fn]
2494 for lnum, cstart, cend, line in matchlines(body):
2494 for lnum, cstart, cend, line in matchlines(body):
2495 s = linestate(line, lnum, cstart, cend)
2495 s = linestate(line, lnum, cstart, cend)
2496 m.append(s)
2496 m.append(s)
2497
2497
2498 def difflinestates(a, b):
2498 def difflinestates(a, b):
2499 sm = difflib.SequenceMatcher(None, a, b)
2499 sm = difflib.SequenceMatcher(None, a, b)
2500 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2500 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2501 if tag == 'insert':
2501 if tag == 'insert':
2502 for i in xrange(blo, bhi):
2502 for i in xrange(blo, bhi):
2503 yield ('+', b[i])
2503 yield ('+', b[i])
2504 elif tag == 'delete':
2504 elif tag == 'delete':
2505 for i in xrange(alo, ahi):
2505 for i in xrange(alo, ahi):
2506 yield ('-', a[i])
2506 yield ('-', a[i])
2507 elif tag == 'replace':
2507 elif tag == 'replace':
2508 for i in xrange(alo, ahi):
2508 for i in xrange(alo, ahi):
2509 yield ('-', a[i])
2509 yield ('-', a[i])
2510 for i in xrange(blo, bhi):
2510 for i in xrange(blo, bhi):
2511 yield ('+', b[i])
2511 yield ('+', b[i])
2512
2512
2513 def display(fm, fn, ctx, pstates, states):
2513 def display(fm, fn, ctx, pstates, states):
2514 rev = scmutil.intrev(ctx)
2514 rev = scmutil.intrev(ctx)
2515 if fm.isplain():
2515 if fm.isplain():
2516 formatuser = ui.shortuser
2516 formatuser = ui.shortuser
2517 else:
2517 else:
2518 formatuser = str
2518 formatuser = str
2519 if ui.quiet:
2519 if ui.quiet:
2520 datefmt = '%Y-%m-%d'
2520 datefmt = '%Y-%m-%d'
2521 else:
2521 else:
2522 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2522 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2523 found = False
2523 found = False
2524 @util.cachefunc
2524 @util.cachefunc
2525 def binary():
2525 def binary():
2526 flog = getfile(fn)
2526 flog = getfile(fn)
2527 try:
2527 try:
2528 return stringutil.binary(flog.read(ctx.filenode(fn)))
2528 return stringutil.binary(flog.read(ctx.filenode(fn)))
2529 except error.WdirUnsupported:
2529 except error.WdirUnsupported:
2530 return ctx[fn].isbinary()
2530 return ctx[fn].isbinary()
2531
2531
2532 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2532 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2533 if diff:
2533 if diff:
2534 iter = difflinestates(pstates, states)
2534 iter = difflinestates(pstates, states)
2535 else:
2535 else:
2536 iter = [('', l) for l in states]
2536 iter = [('', l) for l in states]
2537 for change, l in iter:
2537 for change, l in iter:
2538 fm.startitem()
2538 fm.startitem()
2539 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2539 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
2540
2540
2541 cols = [
2541 cols = [
2542 ('filename', fn, True),
2542 ('filename', fn, True),
2543 ('rev', rev, True),
2543 ('rev', rev, True),
2544 ('linenumber', l.linenum, opts.get('line_number')),
2544 ('linenumber', l.linenum, opts.get('line_number')),
2545 ]
2545 ]
2546 if diff:
2546 if diff:
2547 cols.append(('change', change, True))
2547 cols.append(('change', change, True))
2548 cols.extend([
2548 cols.extend([
2549 ('user', formatuser(ctx.user()), opts.get('user')),
2549 ('user', formatuser(ctx.user()), opts.get('user')),
2550 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2550 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2551 ])
2551 ])
2552 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2552 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2553 for name, data, cond in cols:
2553 for name, data, cond in cols:
2554 field = fieldnamemap.get(name, name)
2554 field = fieldnamemap.get(name, name)
2555 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2555 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2556 if cond and name != lastcol:
2556 if cond and name != lastcol:
2557 fm.plain(sep, label='grep.sep')
2557 fm.plain(sep, label='grep.sep')
2558 if not opts.get('files_with_matches'):
2558 if not opts.get('files_with_matches'):
2559 fm.plain(sep, label='grep.sep')
2559 fm.plain(sep, label='grep.sep')
2560 if not opts.get('text') and binary():
2560 if not opts.get('text') and binary():
2561 fm.plain(_(" Binary file matches"))
2561 fm.plain(_(" Binary file matches"))
2562 else:
2562 else:
2563 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2563 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2564 fm.plain(eol)
2564 fm.plain(eol)
2565 found = True
2565 found = True
2566 if opts.get('files_with_matches'):
2566 if opts.get('files_with_matches'):
2567 break
2567 break
2568 return found
2568 return found
2569
2569
2570 def displaymatches(fm, l):
2570 def displaymatches(fm, l):
2571 p = 0
2571 p = 0
2572 for s, e in l.findpos():
2572 for s, e in l.findpos():
2573 if p < s:
2573 if p < s:
2574 fm.startitem()
2574 fm.startitem()
2575 fm.write('text', '%s', l.line[p:s])
2575 fm.write('text', '%s', l.line[p:s])
2576 fm.data(matched=False)
2576 fm.data(matched=False)
2577 fm.startitem()
2577 fm.startitem()
2578 fm.write('text', '%s', l.line[s:e], label='grep.match')
2578 fm.write('text', '%s', l.line[s:e], label='grep.match')
2579 fm.data(matched=True)
2579 fm.data(matched=True)
2580 p = e
2580 p = e
2581 if p < len(l.line):
2581 if p < len(l.line):
2582 fm.startitem()
2582 fm.startitem()
2583 fm.write('text', '%s', l.line[p:])
2583 fm.write('text', '%s', l.line[p:])
2584 fm.data(matched=False)
2584 fm.data(matched=False)
2585 fm.end()
2585 fm.end()
2586
2586
2587 skip = {}
2587 skip = {}
2588 revfiles = {}
2588 revfiles = {}
2589 match = scmutil.match(repo[None], pats, opts)
2589 match = scmutil.match(repo[None], pats, opts)
2590 found = False
2590 found = False
2591 follow = opts.get('follow')
2591 follow = opts.get('follow')
2592
2592
2593 def prep(ctx, fns):
2593 def prep(ctx, fns):
2594 rev = ctx.rev()
2594 rev = ctx.rev()
2595 pctx = ctx.p1()
2595 pctx = ctx.p1()
2596 parent = pctx.rev()
2596 parent = pctx.rev()
2597 matches.setdefault(rev, {})
2597 matches.setdefault(rev, {})
2598 matches.setdefault(parent, {})
2598 matches.setdefault(parent, {})
2599 files = revfiles.setdefault(rev, [])
2599 files = revfiles.setdefault(rev, [])
2600 for fn in fns:
2600 for fn in fns:
2601 flog = getfile(fn)
2601 flog = getfile(fn)
2602 try:
2602 try:
2603 fnode = ctx.filenode(fn)
2603 fnode = ctx.filenode(fn)
2604 except error.LookupError:
2604 except error.LookupError:
2605 continue
2605 continue
2606 try:
2606 try:
2607 copied = flog.renamed(fnode)
2607 copied = flog.renamed(fnode)
2608 except error.WdirUnsupported:
2608 except error.WdirUnsupported:
2609 copied = ctx[fn].renamed()
2609 copied = ctx[fn].renamed()
2610 copy = follow and copied and copied[0]
2610 copy = follow and copied and copied[0]
2611 if copy:
2611 if copy:
2612 copies.setdefault(rev, {})[fn] = copy
2612 copies.setdefault(rev, {})[fn] = copy
2613 if fn in skip:
2613 if fn in skip:
2614 if copy:
2614 if copy:
2615 skip[copy] = True
2615 skip[copy] = True
2616 continue
2616 continue
2617 files.append(fn)
2617 files.append(fn)
2618
2618
2619 if fn not in matches[rev]:
2619 if fn not in matches[rev]:
2620 try:
2620 try:
2621 content = flog.read(fnode)
2621 content = flog.read(fnode)
2622 except error.WdirUnsupported:
2622 except error.WdirUnsupported:
2623 content = ctx[fn].data()
2623 content = ctx[fn].data()
2624 grepbody(fn, rev, content)
2624 grepbody(fn, rev, content)
2625
2625
2626 pfn = copy or fn
2626 pfn = copy or fn
2627 if pfn not in matches[parent]:
2627 if pfn not in matches[parent]:
2628 try:
2628 try:
2629 fnode = pctx.filenode(pfn)
2629 fnode = pctx.filenode(pfn)
2630 grepbody(pfn, parent, flog.read(fnode))
2630 grepbody(pfn, parent, flog.read(fnode))
2631 except error.LookupError:
2631 except error.LookupError:
2632 pass
2632 pass
2633
2633
2634 ui.pager('grep')
2634 ui.pager('grep')
2635 fm = ui.formatter('grep', opts)
2635 fm = ui.formatter('grep', opts)
2636 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2636 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2637 rev = ctx.rev()
2637 rev = ctx.rev()
2638 parent = ctx.p1().rev()
2638 parent = ctx.p1().rev()
2639 for fn in sorted(revfiles.get(rev, [])):
2639 for fn in sorted(revfiles.get(rev, [])):
2640 states = matches[rev][fn]
2640 states = matches[rev][fn]
2641 copy = copies.get(rev, {}).get(fn)
2641 copy = copies.get(rev, {}).get(fn)
2642 if fn in skip:
2642 if fn in skip:
2643 if copy:
2643 if copy:
2644 skip[copy] = True
2644 skip[copy] = True
2645 continue
2645 continue
2646 pstates = matches.get(parent, {}).get(copy or fn, [])
2646 pstates = matches.get(parent, {}).get(copy or fn, [])
2647 if pstates or states:
2647 if pstates or states:
2648 r = display(fm, fn, ctx, pstates, states)
2648 r = display(fm, fn, ctx, pstates, states)
2649 found = found or r
2649 found = found or r
2650 if r and not diff:
2650 if r and not diff:
2651 skip[fn] = True
2651 skip[fn] = True
2652 if copy:
2652 if copy:
2653 skip[copy] = True
2653 skip[copy] = True
2654 del revfiles[rev]
2654 del revfiles[rev]
2655 # We will keep the matches dict for the duration of the window
2655 # We will keep the matches dict for the duration of the window
2656 # clear the matches dict once the window is over
2656 # clear the matches dict once the window is over
2657 if not revfiles:
2657 if not revfiles:
2658 matches.clear()
2658 matches.clear()
2659 fm.end()
2659 fm.end()
2660
2660
2661 return not found
2661 return not found
2662
2662
2663 @command('heads',
2663 @command('heads',
2664 [('r', 'rev', '',
2664 [('r', 'rev', '',
2665 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2665 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2666 ('t', 'topo', False, _('show topological heads only')),
2666 ('t', 'topo', False, _('show topological heads only')),
2667 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2667 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2668 ('c', 'closed', False, _('show normal and closed branch heads')),
2668 ('c', 'closed', False, _('show normal and closed branch heads')),
2669 ] + templateopts,
2669 ] + templateopts,
2670 _('[-ct] [-r STARTREV] [REV]...'),
2670 _('[-ct] [-r STARTREV] [REV]...'),
2671 intents={INTENT_READONLY})
2671 intents={INTENT_READONLY})
2672 def heads(ui, repo, *branchrevs, **opts):
2672 def heads(ui, repo, *branchrevs, **opts):
2673 """show branch heads
2673 """show branch heads
2674
2674
2675 With no arguments, show all open branch heads in the repository.
2675 With no arguments, show all open branch heads in the repository.
2676 Branch heads are changesets that have no descendants on the
2676 Branch heads are changesets that have no descendants on the
2677 same branch. They are where development generally takes place and
2677 same branch. They are where development generally takes place and
2678 are the usual targets for update and merge operations.
2678 are the usual targets for update and merge operations.
2679
2679
2680 If one or more REVs are given, only open branch heads on the
2680 If one or more REVs are given, only open branch heads on the
2681 branches associated with the specified changesets are shown. This
2681 branches associated with the specified changesets are shown. This
2682 means that you can use :hg:`heads .` to see the heads on the
2682 means that you can use :hg:`heads .` to see the heads on the
2683 currently checked-out branch.
2683 currently checked-out branch.
2684
2684
2685 If -c/--closed is specified, also show branch heads marked closed
2685 If -c/--closed is specified, also show branch heads marked closed
2686 (see :hg:`commit --close-branch`).
2686 (see :hg:`commit --close-branch`).
2687
2687
2688 If STARTREV is specified, only those heads that are descendants of
2688 If STARTREV is specified, only those heads that are descendants of
2689 STARTREV will be displayed.
2689 STARTREV will be displayed.
2690
2690
2691 If -t/--topo is specified, named branch mechanics will be ignored and only
2691 If -t/--topo is specified, named branch mechanics will be ignored and only
2692 topological heads (changesets with no children) will be shown.
2692 topological heads (changesets with no children) will be shown.
2693
2693
2694 Returns 0 if matching heads are found, 1 if not.
2694 Returns 0 if matching heads are found, 1 if not.
2695 """
2695 """
2696
2696
2697 opts = pycompat.byteskwargs(opts)
2697 opts = pycompat.byteskwargs(opts)
2698 start = None
2698 start = None
2699 rev = opts.get('rev')
2699 rev = opts.get('rev')
2700 if rev:
2700 if rev:
2701 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2701 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2702 start = scmutil.revsingle(repo, rev, None).node()
2702 start = scmutil.revsingle(repo, rev, None).node()
2703
2703
2704 if opts.get('topo'):
2704 if opts.get('topo'):
2705 heads = [repo[h] for h in repo.heads(start)]
2705 heads = [repo[h] for h in repo.heads(start)]
2706 else:
2706 else:
2707 heads = []
2707 heads = []
2708 for branch in repo.branchmap():
2708 for branch in repo.branchmap():
2709 heads += repo.branchheads(branch, start, opts.get('closed'))
2709 heads += repo.branchheads(branch, start, opts.get('closed'))
2710 heads = [repo[h] for h in heads]
2710 heads = [repo[h] for h in heads]
2711
2711
2712 if branchrevs:
2712 if branchrevs:
2713 branches = set(repo[r].branch()
2713 branches = set(repo[r].branch()
2714 for r in scmutil.revrange(repo, branchrevs))
2714 for r in scmutil.revrange(repo, branchrevs))
2715 heads = [h for h in heads if h.branch() in branches]
2715 heads = [h for h in heads if h.branch() in branches]
2716
2716
2717 if opts.get('active') and branchrevs:
2717 if opts.get('active') and branchrevs:
2718 dagheads = repo.heads(start)
2718 dagheads = repo.heads(start)
2719 heads = [h for h in heads if h.node() in dagheads]
2719 heads = [h for h in heads if h.node() in dagheads]
2720
2720
2721 if branchrevs:
2721 if branchrevs:
2722 haveheads = set(h.branch() for h in heads)
2722 haveheads = set(h.branch() for h in heads)
2723 if branches - haveheads:
2723 if branches - haveheads:
2724 headless = ', '.join(b for b in branches - haveheads)
2724 headless = ', '.join(b for b in branches - haveheads)
2725 msg = _('no open branch heads found on branches %s')
2725 msg = _('no open branch heads found on branches %s')
2726 if opts.get('rev'):
2726 if opts.get('rev'):
2727 msg += _(' (started at %s)') % opts['rev']
2727 msg += _(' (started at %s)') % opts['rev']
2728 ui.warn((msg + '\n') % headless)
2728 ui.warn((msg + '\n') % headless)
2729
2729
2730 if not heads:
2730 if not heads:
2731 return 1
2731 return 1
2732
2732
2733 ui.pager('heads')
2733 ui.pager('heads')
2734 heads = sorted(heads, key=lambda x: -x.rev())
2734 heads = sorted(heads, key=lambda x: -x.rev())
2735 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2735 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
2736 for ctx in heads:
2736 for ctx in heads:
2737 displayer.show(ctx)
2737 displayer.show(ctx)
2738 displayer.close()
2738 displayer.close()
2739
2739
2740 @command('help',
2740 @command('help',
2741 [('e', 'extension', None, _('show only help for extensions')),
2741 [('e', 'extension', None, _('show only help for extensions')),
2742 ('c', 'command', None, _('show only help for commands')),
2742 ('c', 'command', None, _('show only help for commands')),
2743 ('k', 'keyword', None, _('show topics matching keyword')),
2743 ('k', 'keyword', None, _('show topics matching keyword')),
2744 ('s', 'system', [], _('show help for specific platform(s)')),
2744 ('s', 'system', [], _('show help for specific platform(s)')),
2745 ],
2745 ],
2746 _('[-ecks] [TOPIC]'),
2746 _('[-ecks] [TOPIC]'),
2747 norepo=True,
2747 norepo=True,
2748 intents={INTENT_READONLY})
2748 intents={INTENT_READONLY})
2749 def help_(ui, name=None, **opts):
2749 def help_(ui, name=None, **opts):
2750 """show help for a given topic or a help overview
2750 """show help for a given topic or a help overview
2751
2751
2752 With no arguments, print a list of commands with short help messages.
2752 With no arguments, print a list of commands with short help messages.
2753
2753
2754 Given a topic, extension, or command name, print help for that
2754 Given a topic, extension, or command name, print help for that
2755 topic.
2755 topic.
2756
2756
2757 Returns 0 if successful.
2757 Returns 0 if successful.
2758 """
2758 """
2759
2759
2760 keep = opts.get(r'system') or []
2760 keep = opts.get(r'system') or []
2761 if len(keep) == 0:
2761 if len(keep) == 0:
2762 if pycompat.sysplatform.startswith('win'):
2762 if pycompat.sysplatform.startswith('win'):
2763 keep.append('windows')
2763 keep.append('windows')
2764 elif pycompat.sysplatform == 'OpenVMS':
2764 elif pycompat.sysplatform == 'OpenVMS':
2765 keep.append('vms')
2765 keep.append('vms')
2766 elif pycompat.sysplatform == 'plan9':
2766 elif pycompat.sysplatform == 'plan9':
2767 keep.append('plan9')
2767 keep.append('plan9')
2768 else:
2768 else:
2769 keep.append('unix')
2769 keep.append('unix')
2770 keep.append(pycompat.sysplatform.lower())
2770 keep.append(pycompat.sysplatform.lower())
2771 if ui.verbose:
2771 if ui.verbose:
2772 keep.append('verbose')
2772 keep.append('verbose')
2773
2773
2774 commands = sys.modules[__name__]
2774 commands = sys.modules[__name__]
2775 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2775 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2776 ui.pager('help')
2776 ui.pager('help')
2777 ui.write(formatted)
2777 ui.write(formatted)
2778
2778
2779
2779
2780 @command('identify|id',
2780 @command('identify|id',
2781 [('r', 'rev', '',
2781 [('r', 'rev', '',
2782 _('identify the specified revision'), _('REV')),
2782 _('identify the specified revision'), _('REV')),
2783 ('n', 'num', None, _('show local revision number')),
2783 ('n', 'num', None, _('show local revision number')),
2784 ('i', 'id', None, _('show global revision id')),
2784 ('i', 'id', None, _('show global revision id')),
2785 ('b', 'branch', None, _('show branch')),
2785 ('b', 'branch', None, _('show branch')),
2786 ('t', 'tags', None, _('show tags')),
2786 ('t', 'tags', None, _('show tags')),
2787 ('B', 'bookmarks', None, _('show bookmarks')),
2787 ('B', 'bookmarks', None, _('show bookmarks')),
2788 ] + remoteopts + formatteropts,
2788 ] + remoteopts + formatteropts,
2789 _('[-nibtB] [-r REV] [SOURCE]'),
2789 _('[-nibtB] [-r REV] [SOURCE]'),
2790 optionalrepo=True,
2790 optionalrepo=True,
2791 intents={INTENT_READONLY})
2791 intents={INTENT_READONLY})
2792 def identify(ui, repo, source=None, rev=None,
2792 def identify(ui, repo, source=None, rev=None,
2793 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2793 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2794 """identify the working directory or specified revision
2794 """identify the working directory or specified revision
2795
2795
2796 Print a summary identifying the repository state at REV using one or
2796 Print a summary identifying the repository state at REV using one or
2797 two parent hash identifiers, followed by a "+" if the working
2797 two parent hash identifiers, followed by a "+" if the working
2798 directory has uncommitted changes, the branch name (if not default),
2798 directory has uncommitted changes, the branch name (if not default),
2799 a list of tags, and a list of bookmarks.
2799 a list of tags, and a list of bookmarks.
2800
2800
2801 When REV is not given, print a summary of the current state of the
2801 When REV is not given, print a summary of the current state of the
2802 repository including the working directory. Specify -r. to get information
2802 repository including the working directory. Specify -r. to get information
2803 of the working directory parent without scanning uncommitted changes.
2803 of the working directory parent without scanning uncommitted changes.
2804
2804
2805 Specifying a path to a repository root or Mercurial bundle will
2805 Specifying a path to a repository root or Mercurial bundle will
2806 cause lookup to operate on that repository/bundle.
2806 cause lookup to operate on that repository/bundle.
2807
2807
2808 .. container:: verbose
2808 .. container:: verbose
2809
2809
2810 Examples:
2810 Examples:
2811
2811
2812 - generate a build identifier for the working directory::
2812 - generate a build identifier for the working directory::
2813
2813
2814 hg id --id > build-id.dat
2814 hg id --id > build-id.dat
2815
2815
2816 - find the revision corresponding to a tag::
2816 - find the revision corresponding to a tag::
2817
2817
2818 hg id -n -r 1.3
2818 hg id -n -r 1.3
2819
2819
2820 - check the most recent revision of a remote repository::
2820 - check the most recent revision of a remote repository::
2821
2821
2822 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2822 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2823
2823
2824 See :hg:`log` for generating more information about specific revisions,
2824 See :hg:`log` for generating more information about specific revisions,
2825 including full hash identifiers.
2825 including full hash identifiers.
2826
2826
2827 Returns 0 if successful.
2827 Returns 0 if successful.
2828 """
2828 """
2829
2829
2830 opts = pycompat.byteskwargs(opts)
2830 opts = pycompat.byteskwargs(opts)
2831 if not repo and not source:
2831 if not repo and not source:
2832 raise error.Abort(_("there is no Mercurial repository here "
2832 raise error.Abort(_("there is no Mercurial repository here "
2833 "(.hg not found)"))
2833 "(.hg not found)"))
2834
2834
2835 if ui.debugflag:
2835 if ui.debugflag:
2836 hexfunc = hex
2836 hexfunc = hex
2837 else:
2837 else:
2838 hexfunc = short
2838 hexfunc = short
2839 default = not (num or id or branch or tags or bookmarks)
2839 default = not (num or id or branch or tags or bookmarks)
2840 output = []
2840 output = []
2841 revs = []
2841 revs = []
2842
2842
2843 if source:
2843 if source:
2844 source, branches = hg.parseurl(ui.expandpath(source))
2844 source, branches = hg.parseurl(ui.expandpath(source))
2845 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2845 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2846 repo = peer.local()
2846 repo = peer.local()
2847 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2847 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2848
2848
2849 fm = ui.formatter('identify', opts)
2849 fm = ui.formatter('identify', opts)
2850 fm.startitem()
2850 fm.startitem()
2851
2851
2852 if not repo:
2852 if not repo:
2853 if num or branch or tags:
2853 if num or branch or tags:
2854 raise error.Abort(
2854 raise error.Abort(
2855 _("can't query remote revision number, branch, or tags"))
2855 _("can't query remote revision number, branch, or tags"))
2856 if not rev and revs:
2856 if not rev and revs:
2857 rev = revs[0]
2857 rev = revs[0]
2858 if not rev:
2858 if not rev:
2859 rev = "tip"
2859 rev = "tip"
2860
2860
2861 remoterev = peer.lookup(rev)
2861 remoterev = peer.lookup(rev)
2862 hexrev = hexfunc(remoterev)
2862 hexrev = hexfunc(remoterev)
2863 if default or id:
2863 if default or id:
2864 output = [hexrev]
2864 output = [hexrev]
2865 fm.data(id=hexrev)
2865 fm.data(id=hexrev)
2866
2866
2867 def getbms():
2867 def getbms():
2868 bms = []
2868 bms = []
2869
2869
2870 if 'bookmarks' in peer.listkeys('namespaces'):
2870 if 'bookmarks' in peer.listkeys('namespaces'):
2871 hexremoterev = hex(remoterev)
2871 hexremoterev = hex(remoterev)
2872 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2872 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2873 if bmr == hexremoterev]
2873 if bmr == hexremoterev]
2874
2874
2875 return sorted(bms)
2875 return sorted(bms)
2876
2876
2877 bms = getbms()
2877 bms = getbms()
2878 if bookmarks:
2878 if bookmarks:
2879 output.extend(bms)
2879 output.extend(bms)
2880 elif default and not ui.quiet:
2880 elif default and not ui.quiet:
2881 # multiple bookmarks for a single parent separated by '/'
2881 # multiple bookmarks for a single parent separated by '/'
2882 bm = '/'.join(bms)
2882 bm = '/'.join(bms)
2883 if bm:
2883 if bm:
2884 output.append(bm)
2884 output.append(bm)
2885
2885
2886 fm.data(node=hex(remoterev))
2886 fm.data(node=hex(remoterev))
2887 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2887 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2888 else:
2888 else:
2889 if rev:
2889 if rev:
2890 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2890 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2891 ctx = scmutil.revsingle(repo, rev, None)
2891 ctx = scmutil.revsingle(repo, rev, None)
2892
2892
2893 if ctx.rev() is None:
2893 if ctx.rev() is None:
2894 ctx = repo[None]
2894 ctx = repo[None]
2895 parents = ctx.parents()
2895 parents = ctx.parents()
2896 taglist = []
2896 taglist = []
2897 for p in parents:
2897 for p in parents:
2898 taglist.extend(p.tags())
2898 taglist.extend(p.tags())
2899
2899
2900 dirty = ""
2900 dirty = ""
2901 if ctx.dirty(missing=True, merge=False, branch=False):
2901 if ctx.dirty(missing=True, merge=False, branch=False):
2902 dirty = '+'
2902 dirty = '+'
2903 fm.data(dirty=dirty)
2903 fm.data(dirty=dirty)
2904
2904
2905 hexoutput = [hexfunc(p.node()) for p in parents]
2905 hexoutput = [hexfunc(p.node()) for p in parents]
2906 if default or id:
2906 if default or id:
2907 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2907 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2908 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2908 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2909
2909
2910 if num:
2910 if num:
2911 numoutput = ["%d" % p.rev() for p in parents]
2911 numoutput = ["%d" % p.rev() for p in parents]
2912 output.append("%s%s" % ('+'.join(numoutput), dirty))
2912 output.append("%s%s" % ('+'.join(numoutput), dirty))
2913
2913
2914 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
2914 fn = fm.nested('parents', tmpl='{rev}:{node|formatnode}', sep=' ')
2915 for p in parents:
2915 for p in parents:
2916 fn.startitem()
2916 fn.startitem()
2917 fn.data(rev=p.rev())
2917 fn.data(rev=p.rev())
2918 fn.data(node=p.hex())
2918 fn.data(node=p.hex())
2919 fn.context(ctx=p)
2919 fn.context(ctx=p)
2920 fn.end()
2920 fn.end()
2921 else:
2921 else:
2922 hexoutput = hexfunc(ctx.node())
2922 hexoutput = hexfunc(ctx.node())
2923 if default or id:
2923 if default or id:
2924 output = [hexoutput]
2924 output = [hexoutput]
2925 fm.data(id=hexoutput)
2925 fm.data(id=hexoutput)
2926
2926
2927 if num:
2927 if num:
2928 output.append(pycompat.bytestr(ctx.rev()))
2928 output.append(pycompat.bytestr(ctx.rev()))
2929 taglist = ctx.tags()
2929 taglist = ctx.tags()
2930
2930
2931 if default and not ui.quiet:
2931 if default and not ui.quiet:
2932 b = ctx.branch()
2932 b = ctx.branch()
2933 if b != 'default':
2933 if b != 'default':
2934 output.append("(%s)" % b)
2934 output.append("(%s)" % b)
2935
2935
2936 # multiple tags for a single parent separated by '/'
2936 # multiple tags for a single parent separated by '/'
2937 t = '/'.join(taglist)
2937 t = '/'.join(taglist)
2938 if t:
2938 if t:
2939 output.append(t)
2939 output.append(t)
2940
2940
2941 # multiple bookmarks for a single parent separated by '/'
2941 # multiple bookmarks for a single parent separated by '/'
2942 bm = '/'.join(ctx.bookmarks())
2942 bm = '/'.join(ctx.bookmarks())
2943 if bm:
2943 if bm:
2944 output.append(bm)
2944 output.append(bm)
2945 else:
2945 else:
2946 if branch:
2946 if branch:
2947 output.append(ctx.branch())
2947 output.append(ctx.branch())
2948
2948
2949 if tags:
2949 if tags:
2950 output.extend(taglist)
2950 output.extend(taglist)
2951
2951
2952 if bookmarks:
2952 if bookmarks:
2953 output.extend(ctx.bookmarks())
2953 output.extend(ctx.bookmarks())
2954
2954
2955 fm.data(node=ctx.hex())
2955 fm.data(node=ctx.hex())
2956 fm.data(branch=ctx.branch())
2956 fm.data(branch=ctx.branch())
2957 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2957 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2958 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2958 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2959 fm.context(ctx=ctx)
2959 fm.context(ctx=ctx)
2960
2960
2961 fm.plain("%s\n" % ' '.join(output))
2961 fm.plain("%s\n" % ' '.join(output))
2962 fm.end()
2962 fm.end()
2963
2963
2964 @command('import|patch',
2964 @command('import|patch',
2965 [('p', 'strip', 1,
2965 [('p', 'strip', 1,
2966 _('directory strip option for patch. This has the same '
2966 _('directory strip option for patch. This has the same '
2967 'meaning as the corresponding patch option'), _('NUM')),
2967 'meaning as the corresponding patch option'), _('NUM')),
2968 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2968 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2969 ('e', 'edit', False, _('invoke editor on commit messages')),
2969 ('e', 'edit', False, _('invoke editor on commit messages')),
2970 ('f', 'force', None,
2970 ('f', 'force', None,
2971 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2971 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2972 ('', 'no-commit', None,
2972 ('', 'no-commit', None,
2973 _("don't commit, just update the working directory")),
2973 _("don't commit, just update the working directory")),
2974 ('', 'bypass', None,
2974 ('', 'bypass', None,
2975 _("apply patch without touching the working directory")),
2975 _("apply patch without touching the working directory")),
2976 ('', 'partial', None,
2976 ('', 'partial', None,
2977 _('commit even if some hunks fail')),
2977 _('commit even if some hunks fail')),
2978 ('', 'exact', None,
2978 ('', 'exact', None,
2979 _('abort if patch would apply lossily')),
2979 _('abort if patch would apply lossily')),
2980 ('', 'prefix', '',
2980 ('', 'prefix', '',
2981 _('apply patch to subdirectory'), _('DIR')),
2981 _('apply patch to subdirectory'), _('DIR')),
2982 ('', 'import-branch', None,
2982 ('', 'import-branch', None,
2983 _('use any branch information in patch (implied by --exact)'))] +
2983 _('use any branch information in patch (implied by --exact)'))] +
2984 commitopts + commitopts2 + similarityopts,
2984 commitopts + commitopts2 + similarityopts,
2985 _('[OPTION]... PATCH...'))
2985 _('[OPTION]... PATCH...'))
2986 def import_(ui, repo, patch1=None, *patches, **opts):
2986 def import_(ui, repo, patch1=None, *patches, **opts):
2987 """import an ordered set of patches
2987 """import an ordered set of patches
2988
2988
2989 Import a list of patches and commit them individually (unless
2989 Import a list of patches and commit them individually (unless
2990 --no-commit is specified).
2990 --no-commit is specified).
2991
2991
2992 To read a patch from standard input (stdin), use "-" as the patch
2992 To read a patch from standard input (stdin), use "-" as the patch
2993 name. If a URL is specified, the patch will be downloaded from
2993 name. If a URL is specified, the patch will be downloaded from
2994 there.
2994 there.
2995
2995
2996 Import first applies changes to the working directory (unless
2996 Import first applies changes to the working directory (unless
2997 --bypass is specified), import will abort if there are outstanding
2997 --bypass is specified), import will abort if there are outstanding
2998 changes.
2998 changes.
2999
2999
3000 Use --bypass to apply and commit patches directly to the
3000 Use --bypass to apply and commit patches directly to the
3001 repository, without affecting the working directory. Without
3001 repository, without affecting the working directory. Without
3002 --exact, patches will be applied on top of the working directory
3002 --exact, patches will be applied on top of the working directory
3003 parent revision.
3003 parent revision.
3004
3004
3005 You can import a patch straight from a mail message. Even patches
3005 You can import a patch straight from a mail message. Even patches
3006 as attachments work (to use the body part, it must have type
3006 as attachments work (to use the body part, it must have type
3007 text/plain or text/x-patch). From and Subject headers of email
3007 text/plain or text/x-patch). From and Subject headers of email
3008 message are used as default committer and commit message. All
3008 message are used as default committer and commit message. All
3009 text/plain body parts before first diff are added to the commit
3009 text/plain body parts before first diff are added to the commit
3010 message.
3010 message.
3011
3011
3012 If the imported patch was generated by :hg:`export`, user and
3012 If the imported patch was generated by :hg:`export`, user and
3013 description from patch override values from message headers and
3013 description from patch override values from message headers and
3014 body. Values given on command line with -m/--message and -u/--user
3014 body. Values given on command line with -m/--message and -u/--user
3015 override these.
3015 override these.
3016
3016
3017 If --exact is specified, import will set the working directory to
3017 If --exact is specified, import will set the working directory to
3018 the parent of each patch before applying it, and will abort if the
3018 the parent of each patch before applying it, and will abort if the
3019 resulting changeset has a different ID than the one recorded in
3019 resulting changeset has a different ID than the one recorded in
3020 the patch. This will guard against various ways that portable
3020 the patch. This will guard against various ways that portable
3021 patch formats and mail systems might fail to transfer Mercurial
3021 patch formats and mail systems might fail to transfer Mercurial
3022 data or metadata. See :hg:`bundle` for lossless transmission.
3022 data or metadata. See :hg:`bundle` for lossless transmission.
3023
3023
3024 Use --partial to ensure a changeset will be created from the patch
3024 Use --partial to ensure a changeset will be created from the patch
3025 even if some hunks fail to apply. Hunks that fail to apply will be
3025 even if some hunks fail to apply. Hunks that fail to apply will be
3026 written to a <target-file>.rej file. Conflicts can then be resolved
3026 written to a <target-file>.rej file. Conflicts can then be resolved
3027 by hand before :hg:`commit --amend` is run to update the created
3027 by hand before :hg:`commit --amend` is run to update the created
3028 changeset. This flag exists to let people import patches that
3028 changeset. This flag exists to let people import patches that
3029 partially apply without losing the associated metadata (author,
3029 partially apply without losing the associated metadata (author,
3030 date, description, ...).
3030 date, description, ...).
3031
3031
3032 .. note::
3032 .. note::
3033
3033
3034 When no hunks apply cleanly, :hg:`import --partial` will create
3034 When no hunks apply cleanly, :hg:`import --partial` will create
3035 an empty changeset, importing only the patch metadata.
3035 an empty changeset, importing only the patch metadata.
3036
3036
3037 With -s/--similarity, hg will attempt to discover renames and
3037 With -s/--similarity, hg will attempt to discover renames and
3038 copies in the patch in the same way as :hg:`addremove`.
3038 copies in the patch in the same way as :hg:`addremove`.
3039
3039
3040 It is possible to use external patch programs to perform the patch
3040 It is possible to use external patch programs to perform the patch
3041 by setting the ``ui.patch`` configuration option. For the default
3041 by setting the ``ui.patch`` configuration option. For the default
3042 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3042 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3043 See :hg:`help config` for more information about configuration
3043 See :hg:`help config` for more information about configuration
3044 files and how to use these options.
3044 files and how to use these options.
3045
3045
3046 See :hg:`help dates` for a list of formats valid for -d/--date.
3046 See :hg:`help dates` for a list of formats valid for -d/--date.
3047
3047
3048 .. container:: verbose
3048 .. container:: verbose
3049
3049
3050 Examples:
3050 Examples:
3051
3051
3052 - import a traditional patch from a website and detect renames::
3052 - import a traditional patch from a website and detect renames::
3053
3053
3054 hg import -s 80 http://example.com/bugfix.patch
3054 hg import -s 80 http://example.com/bugfix.patch
3055
3055
3056 - import a changeset from an hgweb server::
3056 - import a changeset from an hgweb server::
3057
3057
3058 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3058 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3059
3059
3060 - import all the patches in an Unix-style mbox::
3060 - import all the patches in an Unix-style mbox::
3061
3061
3062 hg import incoming-patches.mbox
3062 hg import incoming-patches.mbox
3063
3063
3064 - import patches from stdin::
3064 - import patches from stdin::
3065
3065
3066 hg import -
3066 hg import -
3067
3067
3068 - attempt to exactly restore an exported changeset (not always
3068 - attempt to exactly restore an exported changeset (not always
3069 possible)::
3069 possible)::
3070
3070
3071 hg import --exact proposed-fix.patch
3071 hg import --exact proposed-fix.patch
3072
3072
3073 - use an external tool to apply a patch which is too fuzzy for
3073 - use an external tool to apply a patch which is too fuzzy for
3074 the default internal tool.
3074 the default internal tool.
3075
3075
3076 hg import --config ui.patch="patch --merge" fuzzy.patch
3076 hg import --config ui.patch="patch --merge" fuzzy.patch
3077
3077
3078 - change the default fuzzing from 2 to a less strict 7
3078 - change the default fuzzing from 2 to a less strict 7
3079
3079
3080 hg import --config ui.fuzz=7 fuzz.patch
3080 hg import --config ui.fuzz=7 fuzz.patch
3081
3081
3082 Returns 0 on success, 1 on partial success (see --partial).
3082 Returns 0 on success, 1 on partial success (see --partial).
3083 """
3083 """
3084
3084
3085 opts = pycompat.byteskwargs(opts)
3085 opts = pycompat.byteskwargs(opts)
3086 if not patch1:
3086 if not patch1:
3087 raise error.Abort(_('need at least one patch to import'))
3087 raise error.Abort(_('need at least one patch to import'))
3088
3088
3089 patches = (patch1,) + patches
3089 patches = (patch1,) + patches
3090
3090
3091 date = opts.get('date')
3091 date = opts.get('date')
3092 if date:
3092 if date:
3093 opts['date'] = dateutil.parsedate(date)
3093 opts['date'] = dateutil.parsedate(date)
3094
3094
3095 exact = opts.get('exact')
3095 exact = opts.get('exact')
3096 update = not opts.get('bypass')
3096 update = not opts.get('bypass')
3097 if not update and opts.get('no_commit'):
3097 if not update and opts.get('no_commit'):
3098 raise error.Abort(_('cannot use --no-commit with --bypass'))
3098 raise error.Abort(_('cannot use --no-commit with --bypass'))
3099 try:
3099 try:
3100 sim = float(opts.get('similarity') or 0)
3100 sim = float(opts.get('similarity') or 0)
3101 except ValueError:
3101 except ValueError:
3102 raise error.Abort(_('similarity must be a number'))
3102 raise error.Abort(_('similarity must be a number'))
3103 if sim < 0 or sim > 100:
3103 if sim < 0 or sim > 100:
3104 raise error.Abort(_('similarity must be between 0 and 100'))
3104 raise error.Abort(_('similarity must be between 0 and 100'))
3105 if sim and not update:
3105 if sim and not update:
3106 raise error.Abort(_('cannot use --similarity with --bypass'))
3106 raise error.Abort(_('cannot use --similarity with --bypass'))
3107 if exact:
3107 if exact:
3108 if opts.get('edit'):
3108 if opts.get('edit'):
3109 raise error.Abort(_('cannot use --exact with --edit'))
3109 raise error.Abort(_('cannot use --exact with --edit'))
3110 if opts.get('prefix'):
3110 if opts.get('prefix'):
3111 raise error.Abort(_('cannot use --exact with --prefix'))
3111 raise error.Abort(_('cannot use --exact with --prefix'))
3112
3112
3113 base = opts["base"]
3113 base = opts["base"]
3114 msgs = []
3114 msgs = []
3115 ret = 0
3115 ret = 0
3116
3116
3117 with repo.wlock():
3117 with repo.wlock():
3118 if update:
3118 if update:
3119 cmdutil.checkunfinished(repo)
3119 cmdutil.checkunfinished(repo)
3120 if (exact or not opts.get('force')):
3120 if (exact or not opts.get('force')):
3121 cmdutil.bailifchanged(repo)
3121 cmdutil.bailifchanged(repo)
3122
3122
3123 if not opts.get('no_commit'):
3123 if not opts.get('no_commit'):
3124 lock = repo.lock
3124 lock = repo.lock
3125 tr = lambda: repo.transaction('import')
3125 tr = lambda: repo.transaction('import')
3126 dsguard = util.nullcontextmanager
3126 dsguard = util.nullcontextmanager
3127 else:
3127 else:
3128 lock = util.nullcontextmanager
3128 lock = util.nullcontextmanager
3129 tr = util.nullcontextmanager
3129 tr = util.nullcontextmanager
3130 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3130 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3131 with lock(), tr(), dsguard():
3131 with lock(), tr(), dsguard():
3132 parents = repo[None].parents()
3132 parents = repo[None].parents()
3133 for patchurl in patches:
3133 for patchurl in patches:
3134 if patchurl == '-':
3134 if patchurl == '-':
3135 ui.status(_('applying patch from stdin\n'))
3135 ui.status(_('applying patch from stdin\n'))
3136 patchfile = ui.fin
3136 patchfile = ui.fin
3137 patchurl = 'stdin' # for error message
3137 patchurl = 'stdin' # for error message
3138 else:
3138 else:
3139 patchurl = os.path.join(base, patchurl)
3139 patchurl = os.path.join(base, patchurl)
3140 ui.status(_('applying %s\n') % patchurl)
3140 ui.status(_('applying %s\n') % patchurl)
3141 patchfile = hg.openpath(ui, patchurl)
3141 patchfile = hg.openpath(ui, patchurl)
3142
3142
3143 haspatch = False
3143 haspatch = False
3144 for hunk in patch.split(patchfile):
3144 for hunk in patch.split(patchfile):
3145 with patch.extract(ui, hunk) as patchdata:
3145 with patch.extract(ui, hunk) as patchdata:
3146 msg, node, rej = cmdutil.tryimportone(ui, repo,
3146 msg, node, rej = cmdutil.tryimportone(ui, repo,
3147 patchdata,
3147 patchdata,
3148 parents, opts,
3148 parents, opts,
3149 msgs, hg.clean)
3149 msgs, hg.clean)
3150 if msg:
3150 if msg:
3151 haspatch = True
3151 haspatch = True
3152 ui.note(msg + '\n')
3152 ui.note(msg + '\n')
3153 if update or exact:
3153 if update or exact:
3154 parents = repo[None].parents()
3154 parents = repo[None].parents()
3155 else:
3155 else:
3156 parents = [repo[node]]
3156 parents = [repo[node]]
3157 if rej:
3157 if rej:
3158 ui.write_err(_("patch applied partially\n"))
3158 ui.write_err(_("patch applied partially\n"))
3159 ui.write_err(_("(fix the .rej files and run "
3159 ui.write_err(_("(fix the .rej files and run "
3160 "`hg commit --amend`)\n"))
3160 "`hg commit --amend`)\n"))
3161 ret = 1
3161 ret = 1
3162 break
3162 break
3163
3163
3164 if not haspatch:
3164 if not haspatch:
3165 raise error.Abort(_('%s: no diffs found') % patchurl)
3165 raise error.Abort(_('%s: no diffs found') % patchurl)
3166
3166
3167 if msgs:
3167 if msgs:
3168 repo.savecommitmessage('\n* * *\n'.join(msgs))
3168 repo.savecommitmessage('\n* * *\n'.join(msgs))
3169 return ret
3169 return ret
3170
3170
3171 @command('incoming|in',
3171 @command('incoming|in',
3172 [('f', 'force', None,
3172 [('f', 'force', None,
3173 _('run even if remote repository is unrelated')),
3173 _('run even if remote repository is unrelated')),
3174 ('n', 'newest-first', None, _('show newest record first')),
3174 ('n', 'newest-first', None, _('show newest record first')),
3175 ('', 'bundle', '',
3175 ('', 'bundle', '',
3176 _('file to store the bundles into'), _('FILE')),
3176 _('file to store the bundles into'), _('FILE')),
3177 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3177 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3178 ('B', 'bookmarks', False, _("compare bookmarks")),
3178 ('B', 'bookmarks', False, _("compare bookmarks")),
3179 ('b', 'branch', [],
3179 ('b', 'branch', [],
3180 _('a specific branch you would like to pull'), _('BRANCH')),
3180 _('a specific branch you would like to pull'), _('BRANCH')),
3181 ] + logopts + remoteopts + subrepoopts,
3181 ] + logopts + remoteopts + subrepoopts,
3182 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3182 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3183 def incoming(ui, repo, source="default", **opts):
3183 def incoming(ui, repo, source="default", **opts):
3184 """show new changesets found in source
3184 """show new changesets found in source
3185
3185
3186 Show new changesets found in the specified path/URL or the default
3186 Show new changesets found in the specified path/URL or the default
3187 pull location. These are the changesets that would have been pulled
3187 pull location. These are the changesets that would have been pulled
3188 by :hg:`pull` at the time you issued this command.
3188 by :hg:`pull` at the time you issued this command.
3189
3189
3190 See pull for valid source format details.
3190 See pull for valid source format details.
3191
3191
3192 .. container:: verbose
3192 .. container:: verbose
3193
3193
3194 With -B/--bookmarks, the result of bookmark comparison between
3194 With -B/--bookmarks, the result of bookmark comparison between
3195 local and remote repositories is displayed. With -v/--verbose,
3195 local and remote repositories is displayed. With -v/--verbose,
3196 status is also displayed for each bookmark like below::
3196 status is also displayed for each bookmark like below::
3197
3197
3198 BM1 01234567890a added
3198 BM1 01234567890a added
3199 BM2 1234567890ab advanced
3199 BM2 1234567890ab advanced
3200 BM3 234567890abc diverged
3200 BM3 234567890abc diverged
3201 BM4 34567890abcd changed
3201 BM4 34567890abcd changed
3202
3202
3203 The action taken locally when pulling depends on the
3203 The action taken locally when pulling depends on the
3204 status of each bookmark:
3204 status of each bookmark:
3205
3205
3206 :``added``: pull will create it
3206 :``added``: pull will create it
3207 :``advanced``: pull will update it
3207 :``advanced``: pull will update it
3208 :``diverged``: pull will create a divergent bookmark
3208 :``diverged``: pull will create a divergent bookmark
3209 :``changed``: result depends on remote changesets
3209 :``changed``: result depends on remote changesets
3210
3210
3211 From the point of view of pulling behavior, bookmark
3211 From the point of view of pulling behavior, bookmark
3212 existing only in the remote repository are treated as ``added``,
3212 existing only in the remote repository are treated as ``added``,
3213 even if it is in fact locally deleted.
3213 even if it is in fact locally deleted.
3214
3214
3215 .. container:: verbose
3215 .. container:: verbose
3216
3216
3217 For remote repository, using --bundle avoids downloading the
3217 For remote repository, using --bundle avoids downloading the
3218 changesets twice if the incoming is followed by a pull.
3218 changesets twice if the incoming is followed by a pull.
3219
3219
3220 Examples:
3220 Examples:
3221
3221
3222 - show incoming changes with patches and full description::
3222 - show incoming changes with patches and full description::
3223
3223
3224 hg incoming -vp
3224 hg incoming -vp
3225
3225
3226 - show incoming changes excluding merges, store a bundle::
3226 - show incoming changes excluding merges, store a bundle::
3227
3227
3228 hg in -vpM --bundle incoming.hg
3228 hg in -vpM --bundle incoming.hg
3229 hg pull incoming.hg
3229 hg pull incoming.hg
3230
3230
3231 - briefly list changes inside a bundle::
3231 - briefly list changes inside a bundle::
3232
3232
3233 hg in changes.hg -T "{desc|firstline}\\n"
3233 hg in changes.hg -T "{desc|firstline}\\n"
3234
3234
3235 Returns 0 if there are incoming changes, 1 otherwise.
3235 Returns 0 if there are incoming changes, 1 otherwise.
3236 """
3236 """
3237 opts = pycompat.byteskwargs(opts)
3237 opts = pycompat.byteskwargs(opts)
3238 if opts.get('graph'):
3238 if opts.get('graph'):
3239 logcmdutil.checkunsupportedgraphflags([], opts)
3239 logcmdutil.checkunsupportedgraphflags([], opts)
3240 def display(other, chlist, displayer):
3240 def display(other, chlist, displayer):
3241 revdag = logcmdutil.graphrevs(other, chlist, opts)
3241 revdag = logcmdutil.graphrevs(other, chlist, opts)
3242 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3242 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3243 graphmod.asciiedges)
3243 graphmod.asciiedges)
3244
3244
3245 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3245 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3246 return 0
3246 return 0
3247
3247
3248 if opts.get('bundle') and opts.get('subrepos'):
3248 if opts.get('bundle') and opts.get('subrepos'):
3249 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3249 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3250
3250
3251 if opts.get('bookmarks'):
3251 if opts.get('bookmarks'):
3252 source, branches = hg.parseurl(ui.expandpath(source),
3252 source, branches = hg.parseurl(ui.expandpath(source),
3253 opts.get('branch'))
3253 opts.get('branch'))
3254 other = hg.peer(repo, opts, source)
3254 other = hg.peer(repo, opts, source)
3255 if 'bookmarks' not in other.listkeys('namespaces'):
3255 if 'bookmarks' not in other.listkeys('namespaces'):
3256 ui.warn(_("remote doesn't support bookmarks\n"))
3256 ui.warn(_("remote doesn't support bookmarks\n"))
3257 return 0
3257 return 0
3258 ui.pager('incoming')
3258 ui.pager('incoming')
3259 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3259 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3260 return bookmarks.incoming(ui, repo, other)
3260 return bookmarks.incoming(ui, repo, other)
3261
3261
3262 repo._subtoppath = ui.expandpath(source)
3262 repo._subtoppath = ui.expandpath(source)
3263 try:
3263 try:
3264 return hg.incoming(ui, repo, source, opts)
3264 return hg.incoming(ui, repo, source, opts)
3265 finally:
3265 finally:
3266 del repo._subtoppath
3266 del repo._subtoppath
3267
3267
3268
3268
3269 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3269 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3270 norepo=True)
3270 norepo=True)
3271 def init(ui, dest=".", **opts):
3271 def init(ui, dest=".", **opts):
3272 """create a new repository in the given directory
3272 """create a new repository in the given directory
3273
3273
3274 Initialize a new repository in the given directory. If the given
3274 Initialize a new repository in the given directory. If the given
3275 directory does not exist, it will be created.
3275 directory does not exist, it will be created.
3276
3276
3277 If no directory is given, the current directory is used.
3277 If no directory is given, the current directory is used.
3278
3278
3279 It is possible to specify an ``ssh://`` URL as the destination.
3279 It is possible to specify an ``ssh://`` URL as the destination.
3280 See :hg:`help urls` for more information.
3280 See :hg:`help urls` for more information.
3281
3281
3282 Returns 0 on success.
3282 Returns 0 on success.
3283 """
3283 """
3284 opts = pycompat.byteskwargs(opts)
3284 opts = pycompat.byteskwargs(opts)
3285 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3285 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3286
3286
3287 @command('locate',
3287 @command('locate',
3288 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3288 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3289 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3289 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3290 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3290 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3291 ] + walkopts,
3291 ] + walkopts,
3292 _('[OPTION]... [PATTERN]...'))
3292 _('[OPTION]... [PATTERN]...'))
3293 def locate(ui, repo, *pats, **opts):
3293 def locate(ui, repo, *pats, **opts):
3294 """locate files matching specific patterns (DEPRECATED)
3294 """locate files matching specific patterns (DEPRECATED)
3295
3295
3296 Print files under Mercurial control in the working directory whose
3296 Print files under Mercurial control in the working directory whose
3297 names match the given patterns.
3297 names match the given patterns.
3298
3298
3299 By default, this command searches all directories in the working
3299 By default, this command searches all directories in the working
3300 directory. To search just the current directory and its
3300 directory. To search just the current directory and its
3301 subdirectories, use "--include .".
3301 subdirectories, use "--include .".
3302
3302
3303 If no patterns are given to match, this command prints the names
3303 If no patterns are given to match, this command prints the names
3304 of all files under Mercurial control in the working directory.
3304 of all files under Mercurial control in the working directory.
3305
3305
3306 If you want to feed the output of this command into the "xargs"
3306 If you want to feed the output of this command into the "xargs"
3307 command, use the -0 option to both this command and "xargs". This
3307 command, use the -0 option to both this command and "xargs". This
3308 will avoid the problem of "xargs" treating single filenames that
3308 will avoid the problem of "xargs" treating single filenames that
3309 contain whitespace as multiple filenames.
3309 contain whitespace as multiple filenames.
3310
3310
3311 See :hg:`help files` for a more versatile command.
3311 See :hg:`help files` for a more versatile command.
3312
3312
3313 Returns 0 if a match is found, 1 otherwise.
3313 Returns 0 if a match is found, 1 otherwise.
3314 """
3314 """
3315 opts = pycompat.byteskwargs(opts)
3315 opts = pycompat.byteskwargs(opts)
3316 if opts.get('print0'):
3316 if opts.get('print0'):
3317 end = '\0'
3317 end = '\0'
3318 else:
3318 else:
3319 end = '\n'
3319 end = '\n'
3320 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3320 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3321
3321
3322 ret = 1
3322 ret = 1
3323 m = scmutil.match(ctx, pats, opts, default='relglob',
3323 m = scmutil.match(ctx, pats, opts, default='relglob',
3324 badfn=lambda x, y: False)
3324 badfn=lambda x, y: False)
3325
3325
3326 ui.pager('locate')
3326 ui.pager('locate')
3327 if ctx.rev() is None:
3327 if ctx.rev() is None:
3328 # When run on the working copy, "locate" includes removed files, so
3328 # When run on the working copy, "locate" includes removed files, so
3329 # we get the list of files from the dirstate.
3329 # we get the list of files from the dirstate.
3330 filesgen = sorted(repo.dirstate.matches(m))
3330 filesgen = sorted(repo.dirstate.matches(m))
3331 else:
3331 else:
3332 filesgen = ctx.matches(m)
3332 filesgen = ctx.matches(m)
3333 for abs in filesgen:
3333 for abs in filesgen:
3334 if opts.get('fullpath'):
3334 if opts.get('fullpath'):
3335 ui.write(repo.wjoin(abs), end)
3335 ui.write(repo.wjoin(abs), end)
3336 else:
3336 else:
3337 ui.write(((pats and m.rel(abs)) or abs), end)
3337 ui.write(((pats and m.rel(abs)) or abs), end)
3338 ret = 0
3338 ret = 0
3339
3339
3340 return ret
3340 return ret
3341
3341
3342 @command('^log|history',
3342 @command('^log|history',
3343 [('f', 'follow', None,
3343 [('f', 'follow', None,
3344 _('follow changeset history, or file history across copies and renames')),
3344 _('follow changeset history, or file history across copies and renames')),
3345 ('', 'follow-first', None,
3345 ('', 'follow-first', None,
3346 _('only follow the first parent of merge changesets (DEPRECATED)')),
3346 _('only follow the first parent of merge changesets (DEPRECATED)')),
3347 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3347 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3348 ('C', 'copies', None, _('show copied files')),
3348 ('C', 'copies', None, _('show copied files')),
3349 ('k', 'keyword', [],
3349 ('k', 'keyword', [],
3350 _('do case-insensitive search for a given text'), _('TEXT')),
3350 _('do case-insensitive search for a given text'), _('TEXT')),
3351 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3351 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3352 ('L', 'line-range', [],
3352 ('L', 'line-range', [],
3353 _('follow line range of specified file (EXPERIMENTAL)'),
3353 _('follow line range of specified file (EXPERIMENTAL)'),
3354 _('FILE,RANGE')),
3354 _('FILE,RANGE')),
3355 ('', 'removed', None, _('include revisions where files were removed')),
3355 ('', 'removed', None, _('include revisions where files were removed')),
3356 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3356 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3357 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3357 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3358 ('', 'only-branch', [],
3358 ('', 'only-branch', [],
3359 _('show only changesets within the given named branch (DEPRECATED)'),
3359 _('show only changesets within the given named branch (DEPRECATED)'),
3360 _('BRANCH')),
3360 _('BRANCH')),
3361 ('b', 'branch', [],
3361 ('b', 'branch', [],
3362 _('show changesets within the given named branch'), _('BRANCH')),
3362 _('show changesets within the given named branch'), _('BRANCH')),
3363 ('P', 'prune', [],
3363 ('P', 'prune', [],
3364 _('do not display revision or any of its ancestors'), _('REV')),
3364 _('do not display revision or any of its ancestors'), _('REV')),
3365 ] + logopts + walkopts,
3365 ] + logopts + walkopts,
3366 _('[OPTION]... [FILE]'),
3366 _('[OPTION]... [FILE]'),
3367 inferrepo=True,
3367 inferrepo=True,
3368 intents={INTENT_READONLY})
3368 intents={INTENT_READONLY})
3369 def log(ui, repo, *pats, **opts):
3369 def log(ui, repo, *pats, **opts):
3370 """show revision history of entire repository or files
3370 """show revision history of entire repository or files
3371
3371
3372 Print the revision history of the specified files or the entire
3372 Print the revision history of the specified files or the entire
3373 project.
3373 project.
3374
3374
3375 If no revision range is specified, the default is ``tip:0`` unless
3375 If no revision range is specified, the default is ``tip:0`` unless
3376 --follow is set, in which case the working directory parent is
3376 --follow is set, in which case the working directory parent is
3377 used as the starting revision.
3377 used as the starting revision.
3378
3378
3379 File history is shown without following rename or copy history of
3379 File history is shown without following rename or copy history of
3380 files. Use -f/--follow with a filename to follow history across
3380 files. Use -f/--follow with a filename to follow history across
3381 renames and copies. --follow without a filename will only show
3381 renames and copies. --follow without a filename will only show
3382 ancestors of the starting revision.
3382 ancestors of the starting revision.
3383
3383
3384 By default this command prints revision number and changeset id,
3384 By default this command prints revision number and changeset id,
3385 tags, non-trivial parents, user, date and time, and a summary for
3385 tags, non-trivial parents, user, date and time, and a summary for
3386 each commit. When the -v/--verbose switch is used, the list of
3386 each commit. When the -v/--verbose switch is used, the list of
3387 changed files and full commit message are shown.
3387 changed files and full commit message are shown.
3388
3388
3389 With --graph the revisions are shown as an ASCII art DAG with the most
3389 With --graph the revisions are shown as an ASCII art DAG with the most
3390 recent changeset at the top.
3390 recent changeset at the top.
3391 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3391 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3392 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3392 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3393 changeset from the lines below is a parent of the 'o' merge on the same
3393 changeset from the lines below is a parent of the 'o' merge on the same
3394 line.
3394 line.
3395 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3395 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3396 of a '|' indicates one or more revisions in a path are omitted.
3396 of a '|' indicates one or more revisions in a path are omitted.
3397
3397
3398 .. container:: verbose
3398 .. container:: verbose
3399
3399
3400 Use -L/--line-range FILE,M:N options to follow the history of lines
3400 Use -L/--line-range FILE,M:N options to follow the history of lines
3401 from M to N in FILE. With -p/--patch only diff hunks affecting
3401 from M to N in FILE. With -p/--patch only diff hunks affecting
3402 specified line range will be shown. This option requires --follow;
3402 specified line range will be shown. This option requires --follow;
3403 it can be specified multiple times. Currently, this option is not
3403 it can be specified multiple times. Currently, this option is not
3404 compatible with --graph. This option is experimental.
3404 compatible with --graph. This option is experimental.
3405
3405
3406 .. note::
3406 .. note::
3407
3407
3408 :hg:`log --patch` may generate unexpected diff output for merge
3408 :hg:`log --patch` may generate unexpected diff output for merge
3409 changesets, as it will only compare the merge changeset against
3409 changesets, as it will only compare the merge changeset against
3410 its first parent. Also, only files different from BOTH parents
3410 its first parent. Also, only files different from BOTH parents
3411 will appear in files:.
3411 will appear in files:.
3412
3412
3413 .. note::
3413 .. note::
3414
3414
3415 For performance reasons, :hg:`log FILE` may omit duplicate changes
3415 For performance reasons, :hg:`log FILE` may omit duplicate changes
3416 made on branches and will not show removals or mode changes. To
3416 made on branches and will not show removals or mode changes. To
3417 see all such changes, use the --removed switch.
3417 see all such changes, use the --removed switch.
3418
3418
3419 .. container:: verbose
3419 .. container:: verbose
3420
3420
3421 .. note::
3421 .. note::
3422
3422
3423 The history resulting from -L/--line-range options depends on diff
3423 The history resulting from -L/--line-range options depends on diff
3424 options; for instance if white-spaces are ignored, respective changes
3424 options; for instance if white-spaces are ignored, respective changes
3425 with only white-spaces in specified line range will not be listed.
3425 with only white-spaces in specified line range will not be listed.
3426
3426
3427 .. container:: verbose
3427 .. container:: verbose
3428
3428
3429 Some examples:
3429 Some examples:
3430
3430
3431 - changesets with full descriptions and file lists::
3431 - changesets with full descriptions and file lists::
3432
3432
3433 hg log -v
3433 hg log -v
3434
3434
3435 - changesets ancestral to the working directory::
3435 - changesets ancestral to the working directory::
3436
3436
3437 hg log -f
3437 hg log -f
3438
3438
3439 - last 10 commits on the current branch::
3439 - last 10 commits on the current branch::
3440
3440
3441 hg log -l 10 -b .
3441 hg log -l 10 -b .
3442
3442
3443 - changesets showing all modifications of a file, including removals::
3443 - changesets showing all modifications of a file, including removals::
3444
3444
3445 hg log --removed file.c
3445 hg log --removed file.c
3446
3446
3447 - all changesets that touch a directory, with diffs, excluding merges::
3447 - all changesets that touch a directory, with diffs, excluding merges::
3448
3448
3449 hg log -Mp lib/
3449 hg log -Mp lib/
3450
3450
3451 - all revision numbers that match a keyword::
3451 - all revision numbers that match a keyword::
3452
3452
3453 hg log -k bug --template "{rev}\\n"
3453 hg log -k bug --template "{rev}\\n"
3454
3454
3455 - the full hash identifier of the working directory parent::
3455 - the full hash identifier of the working directory parent::
3456
3456
3457 hg log -r . --template "{node}\\n"
3457 hg log -r . --template "{node}\\n"
3458
3458
3459 - list available log templates::
3459 - list available log templates::
3460
3460
3461 hg log -T list
3461 hg log -T list
3462
3462
3463 - check if a given changeset is included in a tagged release::
3463 - check if a given changeset is included in a tagged release::
3464
3464
3465 hg log -r "a21ccf and ancestor(1.9)"
3465 hg log -r "a21ccf and ancestor(1.9)"
3466
3466
3467 - find all changesets by some user in a date range::
3467 - find all changesets by some user in a date range::
3468
3468
3469 hg log -k alice -d "may 2008 to jul 2008"
3469 hg log -k alice -d "may 2008 to jul 2008"
3470
3470
3471 - summary of all changesets after the last tag::
3471 - summary of all changesets after the last tag::
3472
3472
3473 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3473 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3474
3474
3475 - changesets touching lines 13 to 23 for file.c::
3475 - changesets touching lines 13 to 23 for file.c::
3476
3476
3477 hg log -L file.c,13:23
3477 hg log -L file.c,13:23
3478
3478
3479 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3479 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3480 main.c with patch::
3480 main.c with patch::
3481
3481
3482 hg log -L file.c,13:23 -L main.c,2:6 -p
3482 hg log -L file.c,13:23 -L main.c,2:6 -p
3483
3483
3484 See :hg:`help dates` for a list of formats valid for -d/--date.
3484 See :hg:`help dates` for a list of formats valid for -d/--date.
3485
3485
3486 See :hg:`help revisions` for more about specifying and ordering
3486 See :hg:`help revisions` for more about specifying and ordering
3487 revisions.
3487 revisions.
3488
3488
3489 See :hg:`help templates` for more about pre-packaged styles and
3489 See :hg:`help templates` for more about pre-packaged styles and
3490 specifying custom templates. The default template used by the log
3490 specifying custom templates. The default template used by the log
3491 command can be customized via the ``ui.logtemplate`` configuration
3491 command can be customized via the ``ui.logtemplate`` configuration
3492 setting.
3492 setting.
3493
3493
3494 Returns 0 on success.
3494 Returns 0 on success.
3495
3495
3496 """
3496 """
3497 opts = pycompat.byteskwargs(opts)
3497 opts = pycompat.byteskwargs(opts)
3498 linerange = opts.get('line_range')
3498 linerange = opts.get('line_range')
3499
3499
3500 if linerange and not opts.get('follow'):
3500 if linerange and not opts.get('follow'):
3501 raise error.Abort(_('--line-range requires --follow'))
3501 raise error.Abort(_('--line-range requires --follow'))
3502
3502
3503 if linerange and pats:
3503 if linerange and pats:
3504 # TODO: take pats as patterns with no line-range filter
3504 # TODO: take pats as patterns with no line-range filter
3505 raise error.Abort(
3505 raise error.Abort(
3506 _('FILE arguments are not compatible with --line-range option')
3506 _('FILE arguments are not compatible with --line-range option')
3507 )
3507 )
3508
3508
3509 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3509 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3510 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3510 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3511 if linerange:
3511 if linerange:
3512 # TODO: should follow file history from logcmdutil._initialrevs(),
3512 # TODO: should follow file history from logcmdutil._initialrevs(),
3513 # then filter the result by logcmdutil._makerevset() and --limit
3513 # then filter the result by logcmdutil._makerevset() and --limit
3514 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3514 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3515
3515
3516 getrenamed = None
3516 getrenamed = None
3517 if opts.get('copies'):
3517 if opts.get('copies'):
3518 endrev = None
3518 endrev = None
3519 if revs:
3519 if revs:
3520 endrev = revs.max() + 1
3520 endrev = revs.max() + 1
3521 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3521 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3522
3522
3523 ui.pager('log')
3523 ui.pager('log')
3524 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3524 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3525 buffered=True)
3525 buffered=True)
3526 if opts.get('graph'):
3526 if opts.get('graph'):
3527 displayfn = logcmdutil.displaygraphrevs
3527 displayfn = logcmdutil.displaygraphrevs
3528 else:
3528 else:
3529 displayfn = logcmdutil.displayrevs
3529 displayfn = logcmdutil.displayrevs
3530 displayfn(ui, repo, revs, displayer, getrenamed)
3530 displayfn(ui, repo, revs, displayer, getrenamed)
3531
3531
3532 @command('manifest',
3532 @command('manifest',
3533 [('r', 'rev', '', _('revision to display'), _('REV')),
3533 [('r', 'rev', '', _('revision to display'), _('REV')),
3534 ('', 'all', False, _("list files from all revisions"))]
3534 ('', 'all', False, _("list files from all revisions"))]
3535 + formatteropts,
3535 + formatteropts,
3536 _('[-r REV]'),
3536 _('[-r REV]'),
3537 intents={INTENT_READONLY})
3537 intents={INTENT_READONLY})
3538 def manifest(ui, repo, node=None, rev=None, **opts):
3538 def manifest(ui, repo, node=None, rev=None, **opts):
3539 """output the current or given revision of the project manifest
3539 """output the current or given revision of the project manifest
3540
3540
3541 Print a list of version controlled files for the given revision.
3541 Print a list of version controlled files for the given revision.
3542 If no revision is given, the first parent of the working directory
3542 If no revision is given, the first parent of the working directory
3543 is used, or the null revision if no revision is checked out.
3543 is used, or the null revision if no revision is checked out.
3544
3544
3545 With -v, print file permissions, symlink and executable bits.
3545 With -v, print file permissions, symlink and executable bits.
3546 With --debug, print file revision hashes.
3546 With --debug, print file revision hashes.
3547
3547
3548 If option --all is specified, the list of all files from all revisions
3548 If option --all is specified, the list of all files from all revisions
3549 is printed. This includes deleted and renamed files.
3549 is printed. This includes deleted and renamed files.
3550
3550
3551 Returns 0 on success.
3551 Returns 0 on success.
3552 """
3552 """
3553 opts = pycompat.byteskwargs(opts)
3553 opts = pycompat.byteskwargs(opts)
3554 fm = ui.formatter('manifest', opts)
3554 fm = ui.formatter('manifest', opts)
3555
3555
3556 if opts.get('all'):
3556 if opts.get('all'):
3557 if rev or node:
3557 if rev or node:
3558 raise error.Abort(_("can't specify a revision with --all"))
3558 raise error.Abort(_("can't specify a revision with --all"))
3559
3559
3560 res = set()
3560 res = set()
3561 for rev in repo:
3561 for rev in repo:
3562 ctx = repo[rev]
3562 ctx = repo[rev]
3563 res |= set(ctx.files())
3563 res |= set(ctx.files())
3564
3564
3565 ui.pager('manifest')
3565 ui.pager('manifest')
3566 for f in sorted(res):
3566 for f in sorted(res):
3567 fm.startitem()
3567 fm.startitem()
3568 fm.write("path", '%s\n', f)
3568 fm.write("path", '%s\n', f)
3569 fm.end()
3569 fm.end()
3570 return
3570 return
3571
3571
3572 if rev and node:
3572 if rev and node:
3573 raise error.Abort(_("please specify just one revision"))
3573 raise error.Abort(_("please specify just one revision"))
3574
3574
3575 if not node:
3575 if not node:
3576 node = rev
3576 node = rev
3577
3577
3578 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3578 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3579 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3579 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3580 if node:
3580 if node:
3581 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3581 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3582 ctx = scmutil.revsingle(repo, node)
3582 ctx = scmutil.revsingle(repo, node)
3583 mf = ctx.manifest()
3583 mf = ctx.manifest()
3584 ui.pager('manifest')
3584 ui.pager('manifest')
3585 for f in ctx:
3585 for f in ctx:
3586 fm.startitem()
3586 fm.startitem()
3587 fl = ctx[f].flags()
3587 fl = ctx[f].flags()
3588 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3588 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3589 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3589 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3590 fm.write('path', '%s\n', f)
3590 fm.write('path', '%s\n', f)
3591 fm.end()
3591 fm.end()
3592
3592
3593 @command('^merge',
3593 @command('^merge',
3594 [('f', 'force', None,
3594 [('f', 'force', None,
3595 _('force a merge including outstanding changes (DEPRECATED)')),
3595 _('force a merge including outstanding changes (DEPRECATED)')),
3596 ('r', 'rev', '', _('revision to merge'), _('REV')),
3596 ('r', 'rev', '', _('revision to merge'), _('REV')),
3597 ('P', 'preview', None,
3597 ('P', 'preview', None,
3598 _('review revisions to merge (no merge is performed)')),
3598 _('review revisions to merge (no merge is performed)')),
3599 ('', 'abort', None, _('abort the ongoing merge')),
3599 ('', 'abort', None, _('abort the ongoing merge')),
3600 ] + mergetoolopts,
3600 ] + mergetoolopts,
3601 _('[-P] [[-r] REV]'))
3601 _('[-P] [[-r] REV]'))
3602 def merge(ui, repo, node=None, **opts):
3602 def merge(ui, repo, node=None, **opts):
3603 """merge another revision into working directory
3603 """merge another revision into working directory
3604
3604
3605 The current working directory is updated with all changes made in
3605 The current working directory is updated with all changes made in
3606 the requested revision since the last common predecessor revision.
3606 the requested revision since the last common predecessor revision.
3607
3607
3608 Files that changed between either parent are marked as changed for
3608 Files that changed between either parent are marked as changed for
3609 the next commit and a commit must be performed before any further
3609 the next commit and a commit must be performed before any further
3610 updates to the repository are allowed. The next commit will have
3610 updates to the repository are allowed. The next commit will have
3611 two parents.
3611 two parents.
3612
3612
3613 ``--tool`` can be used to specify the merge tool used for file
3613 ``--tool`` can be used to specify the merge tool used for file
3614 merges. It overrides the HGMERGE environment variable and your
3614 merges. It overrides the HGMERGE environment variable and your
3615 configuration files. See :hg:`help merge-tools` for options.
3615 configuration files. See :hg:`help merge-tools` for options.
3616
3616
3617 If no revision is specified, the working directory's parent is a
3617 If no revision is specified, the working directory's parent is a
3618 head revision, and the current branch contains exactly one other
3618 head revision, and the current branch contains exactly one other
3619 head, the other head is merged with by default. Otherwise, an
3619 head, the other head is merged with by default. Otherwise, an
3620 explicit revision with which to merge with must be provided.
3620 explicit revision with which to merge with must be provided.
3621
3621
3622 See :hg:`help resolve` for information on handling file conflicts.
3622 See :hg:`help resolve` for information on handling file conflicts.
3623
3623
3624 To undo an uncommitted merge, use :hg:`merge --abort` which
3624 To undo an uncommitted merge, use :hg:`merge --abort` which
3625 will check out a clean copy of the original merge parent, losing
3625 will check out a clean copy of the original merge parent, losing
3626 all changes.
3626 all changes.
3627
3627
3628 Returns 0 on success, 1 if there are unresolved files.
3628 Returns 0 on success, 1 if there are unresolved files.
3629 """
3629 """
3630
3630
3631 opts = pycompat.byteskwargs(opts)
3631 opts = pycompat.byteskwargs(opts)
3632 abort = opts.get('abort')
3632 abort = opts.get('abort')
3633 if abort and repo.dirstate.p2() == nullid:
3633 if abort and repo.dirstate.p2() == nullid:
3634 cmdutil.wrongtooltocontinue(repo, _('merge'))
3634 cmdutil.wrongtooltocontinue(repo, _('merge'))
3635 if abort:
3635 if abort:
3636 if node:
3636 if node:
3637 raise error.Abort(_("cannot specify a node with --abort"))
3637 raise error.Abort(_("cannot specify a node with --abort"))
3638 if opts.get('rev'):
3638 if opts.get('rev'):
3639 raise error.Abort(_("cannot specify both --rev and --abort"))
3639 raise error.Abort(_("cannot specify both --rev and --abort"))
3640 if opts.get('preview'):
3640 if opts.get('preview'):
3641 raise error.Abort(_("cannot specify --preview with --abort"))
3641 raise error.Abort(_("cannot specify --preview with --abort"))
3642 if opts.get('rev') and node:
3642 if opts.get('rev') and node:
3643 raise error.Abort(_("please specify just one revision"))
3643 raise error.Abort(_("please specify just one revision"))
3644 if not node:
3644 if not node:
3645 node = opts.get('rev')
3645 node = opts.get('rev')
3646
3646
3647 if node:
3647 if node:
3648 node = scmutil.revsingle(repo, node).node()
3648 node = scmutil.revsingle(repo, node).node()
3649
3649
3650 if not node and not abort:
3650 if not node and not abort:
3651 node = repo[destutil.destmerge(repo)].node()
3651 node = repo[destutil.destmerge(repo)].node()
3652
3652
3653 if opts.get('preview'):
3653 if opts.get('preview'):
3654 # find nodes that are ancestors of p2 but not of p1
3654 # find nodes that are ancestors of p2 but not of p1
3655 p1 = repo.lookup('.')
3655 p1 = repo.lookup('.')
3656 p2 = node
3656 p2 = node
3657 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3657 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3658
3658
3659 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3659 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3660 for node in nodes:
3660 for node in nodes:
3661 displayer.show(repo[node])
3661 displayer.show(repo[node])
3662 displayer.close()
3662 displayer.close()
3663 return 0
3663 return 0
3664
3664
3665 # ui.forcemerge is an internal variable, do not document
3665 # ui.forcemerge is an internal variable, do not document
3666 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
3666 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
3667 with ui.configoverride(overrides, 'merge'):
3667 with ui.configoverride(overrides, 'merge'):
3668 force = opts.get('force')
3668 force = opts.get('force')
3669 labels = ['working copy', 'merge rev']
3669 labels = ['working copy', 'merge rev']
3670 return hg.merge(repo, node, force=force, mergeforce=force,
3670 return hg.merge(repo, node, force=force, mergeforce=force,
3671 labels=labels, abort=abort)
3671 labels=labels, abort=abort)
3672
3672
3673 @command('outgoing|out',
3673 @command('outgoing|out',
3674 [('f', 'force', None, _('run even when the destination is unrelated')),
3674 [('f', 'force', None, _('run even when the destination is unrelated')),
3675 ('r', 'rev', [],
3675 ('r', 'rev', [],
3676 _('a changeset intended to be included in the destination'), _('REV')),
3676 _('a changeset intended to be included in the destination'), _('REV')),
3677 ('n', 'newest-first', None, _('show newest record first')),
3677 ('n', 'newest-first', None, _('show newest record first')),
3678 ('B', 'bookmarks', False, _('compare bookmarks')),
3678 ('B', 'bookmarks', False, _('compare bookmarks')),
3679 ('b', 'branch', [], _('a specific branch you would like to push'),
3679 ('b', 'branch', [], _('a specific branch you would like to push'),
3680 _('BRANCH')),
3680 _('BRANCH')),
3681 ] + logopts + remoteopts + subrepoopts,
3681 ] + logopts + remoteopts + subrepoopts,
3682 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3682 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3683 def outgoing(ui, repo, dest=None, **opts):
3683 def outgoing(ui, repo, dest=None, **opts):
3684 """show changesets not found in the destination
3684 """show changesets not found in the destination
3685
3685
3686 Show changesets not found in the specified destination repository
3686 Show changesets not found in the specified destination repository
3687 or the default push location. These are the changesets that would
3687 or the default push location. These are the changesets that would
3688 be pushed if a push was requested.
3688 be pushed if a push was requested.
3689
3689
3690 See pull for details of valid destination formats.
3690 See pull for details of valid destination formats.
3691
3691
3692 .. container:: verbose
3692 .. container:: verbose
3693
3693
3694 With -B/--bookmarks, the result of bookmark comparison between
3694 With -B/--bookmarks, the result of bookmark comparison between
3695 local and remote repositories is displayed. With -v/--verbose,
3695 local and remote repositories is displayed. With -v/--verbose,
3696 status is also displayed for each bookmark like below::
3696 status is also displayed for each bookmark like below::
3697
3697
3698 BM1 01234567890a added
3698 BM1 01234567890a added
3699 BM2 deleted
3699 BM2 deleted
3700 BM3 234567890abc advanced
3700 BM3 234567890abc advanced
3701 BM4 34567890abcd diverged
3701 BM4 34567890abcd diverged
3702 BM5 4567890abcde changed
3702 BM5 4567890abcde changed
3703
3703
3704 The action taken when pushing depends on the
3704 The action taken when pushing depends on the
3705 status of each bookmark:
3705 status of each bookmark:
3706
3706
3707 :``added``: push with ``-B`` will create it
3707 :``added``: push with ``-B`` will create it
3708 :``deleted``: push with ``-B`` will delete it
3708 :``deleted``: push with ``-B`` will delete it
3709 :``advanced``: push will update it
3709 :``advanced``: push will update it
3710 :``diverged``: push with ``-B`` will update it
3710 :``diverged``: push with ``-B`` will update it
3711 :``changed``: push with ``-B`` will update it
3711 :``changed``: push with ``-B`` will update it
3712
3712
3713 From the point of view of pushing behavior, bookmarks
3713 From the point of view of pushing behavior, bookmarks
3714 existing only in the remote repository are treated as
3714 existing only in the remote repository are treated as
3715 ``deleted``, even if it is in fact added remotely.
3715 ``deleted``, even if it is in fact added remotely.
3716
3716
3717 Returns 0 if there are outgoing changes, 1 otherwise.
3717 Returns 0 if there are outgoing changes, 1 otherwise.
3718 """
3718 """
3719 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3719 # hg._outgoing() needs to re-resolve the path in order to handle #branch
3720 # style URLs, so don't overwrite dest.
3720 # style URLs, so don't overwrite dest.
3721 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3721 path = ui.paths.getpath(dest, default=('default-push', 'default'))
3722 if not path:
3722 if not path:
3723 raise error.Abort(_('default repository not configured!'),
3723 raise error.Abort(_('default repository not configured!'),
3724 hint=_("see 'hg help config.paths'"))
3724 hint=_("see 'hg help config.paths'"))
3725
3725
3726 opts = pycompat.byteskwargs(opts)
3726 opts = pycompat.byteskwargs(opts)
3727 if opts.get('graph'):
3727 if opts.get('graph'):
3728 logcmdutil.checkunsupportedgraphflags([], opts)
3728 logcmdutil.checkunsupportedgraphflags([], opts)
3729 o, other = hg._outgoing(ui, repo, dest, opts)
3729 o, other = hg._outgoing(ui, repo, dest, opts)
3730 if not o:
3730 if not o:
3731 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3731 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3732 return
3732 return
3733
3733
3734 revdag = logcmdutil.graphrevs(repo, o, opts)
3734 revdag = logcmdutil.graphrevs(repo, o, opts)
3735 ui.pager('outgoing')
3735 ui.pager('outgoing')
3736 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3736 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
3737 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3737 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3738 graphmod.asciiedges)
3738 graphmod.asciiedges)
3739 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3739 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3740 return 0
3740 return 0
3741
3741
3742 if opts.get('bookmarks'):
3742 if opts.get('bookmarks'):
3743 dest = path.pushloc or path.loc
3743 dest = path.pushloc or path.loc
3744 other = hg.peer(repo, opts, dest)
3744 other = hg.peer(repo, opts, dest)
3745 if 'bookmarks' not in other.listkeys('namespaces'):
3745 if 'bookmarks' not in other.listkeys('namespaces'):
3746 ui.warn(_("remote doesn't support bookmarks\n"))
3746 ui.warn(_("remote doesn't support bookmarks\n"))
3747 return 0
3747 return 0
3748 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3748 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3749 ui.pager('outgoing')
3749 ui.pager('outgoing')
3750 return bookmarks.outgoing(ui, repo, other)
3750 return bookmarks.outgoing(ui, repo, other)
3751
3751
3752 repo._subtoppath = path.pushloc or path.loc
3752 repo._subtoppath = path.pushloc or path.loc
3753 try:
3753 try:
3754 return hg.outgoing(ui, repo, dest, opts)
3754 return hg.outgoing(ui, repo, dest, opts)
3755 finally:
3755 finally:
3756 del repo._subtoppath
3756 del repo._subtoppath
3757
3757
3758 @command('parents',
3758 @command('parents',
3759 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3759 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3760 ] + templateopts,
3760 ] + templateopts,
3761 _('[-r REV] [FILE]'),
3761 _('[-r REV] [FILE]'),
3762 inferrepo=True)
3762 inferrepo=True)
3763 def parents(ui, repo, file_=None, **opts):
3763 def parents(ui, repo, file_=None, **opts):
3764 """show the parents of the working directory or revision (DEPRECATED)
3764 """show the parents of the working directory or revision (DEPRECATED)
3765
3765
3766 Print the working directory's parent revisions. If a revision is
3766 Print the working directory's parent revisions. If a revision is
3767 given via -r/--rev, the parent of that revision will be printed.
3767 given via -r/--rev, the parent of that revision will be printed.
3768 If a file argument is given, the revision in which the file was
3768 If a file argument is given, the revision in which the file was
3769 last changed (before the working directory revision or the
3769 last changed (before the working directory revision or the
3770 argument to --rev if given) is printed.
3770 argument to --rev if given) is printed.
3771
3771
3772 This command is equivalent to::
3772 This command is equivalent to::
3773
3773
3774 hg log -r "p1()+p2()" or
3774 hg log -r "p1()+p2()" or
3775 hg log -r "p1(REV)+p2(REV)" or
3775 hg log -r "p1(REV)+p2(REV)" or
3776 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3776 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3777 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3777 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3778
3778
3779 See :hg:`summary` and :hg:`help revsets` for related information.
3779 See :hg:`summary` and :hg:`help revsets` for related information.
3780
3780
3781 Returns 0 on success.
3781 Returns 0 on success.
3782 """
3782 """
3783
3783
3784 opts = pycompat.byteskwargs(opts)
3784 opts = pycompat.byteskwargs(opts)
3785 rev = opts.get('rev')
3785 rev = opts.get('rev')
3786 if rev:
3786 if rev:
3787 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3787 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3788 ctx = scmutil.revsingle(repo, rev, None)
3788 ctx = scmutil.revsingle(repo, rev, None)
3789
3789
3790 if file_:
3790 if file_:
3791 m = scmutil.match(ctx, (file_,), opts)
3791 m = scmutil.match(ctx, (file_,), opts)
3792 if m.anypats() or len(m.files()) != 1:
3792 if m.anypats() or len(m.files()) != 1:
3793 raise error.Abort(_('can only specify an explicit filename'))
3793 raise error.Abort(_('can only specify an explicit filename'))
3794 file_ = m.files()[0]
3794 file_ = m.files()[0]
3795 filenodes = []
3795 filenodes = []
3796 for cp in ctx.parents():
3796 for cp in ctx.parents():
3797 if not cp:
3797 if not cp:
3798 continue
3798 continue
3799 try:
3799 try:
3800 filenodes.append(cp.filenode(file_))
3800 filenodes.append(cp.filenode(file_))
3801 except error.LookupError:
3801 except error.LookupError:
3802 pass
3802 pass
3803 if not filenodes:
3803 if not filenodes:
3804 raise error.Abort(_("'%s' not found in manifest!") % file_)
3804 raise error.Abort(_("'%s' not found in manifest!") % file_)
3805 p = []
3805 p = []
3806 for fn in filenodes:
3806 for fn in filenodes:
3807 fctx = repo.filectx(file_, fileid=fn)
3807 fctx = repo.filectx(file_, fileid=fn)
3808 p.append(fctx.node())
3808 p.append(fctx.node())
3809 else:
3809 else:
3810 p = [cp.node() for cp in ctx.parents()]
3810 p = [cp.node() for cp in ctx.parents()]
3811
3811
3812 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3812 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3813 for n in p:
3813 for n in p:
3814 if n != nullid:
3814 if n != nullid:
3815 displayer.show(repo[n])
3815 displayer.show(repo[n])
3816 displayer.close()
3816 displayer.close()
3817
3817
3818 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3818 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
3819 intents={INTENT_READONLY})
3819 intents={INTENT_READONLY})
3820 def paths(ui, repo, search=None, **opts):
3820 def paths(ui, repo, search=None, **opts):
3821 """show aliases for remote repositories
3821 """show aliases for remote repositories
3822
3822
3823 Show definition of symbolic path name NAME. If no name is given,
3823 Show definition of symbolic path name NAME. If no name is given,
3824 show definition of all available names.
3824 show definition of all available names.
3825
3825
3826 Option -q/--quiet suppresses all output when searching for NAME
3826 Option -q/--quiet suppresses all output when searching for NAME
3827 and shows only the path names when listing all definitions.
3827 and shows only the path names when listing all definitions.
3828
3828
3829 Path names are defined in the [paths] section of your
3829 Path names are defined in the [paths] section of your
3830 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3830 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3831 repository, ``.hg/hgrc`` is used, too.
3831 repository, ``.hg/hgrc`` is used, too.
3832
3832
3833 The path names ``default`` and ``default-push`` have a special
3833 The path names ``default`` and ``default-push`` have a special
3834 meaning. When performing a push or pull operation, they are used
3834 meaning. When performing a push or pull operation, they are used
3835 as fallbacks if no location is specified on the command-line.
3835 as fallbacks if no location is specified on the command-line.
3836 When ``default-push`` is set, it will be used for push and
3836 When ``default-push`` is set, it will be used for push and
3837 ``default`` will be used for pull; otherwise ``default`` is used
3837 ``default`` will be used for pull; otherwise ``default`` is used
3838 as the fallback for both. When cloning a repository, the clone
3838 as the fallback for both. When cloning a repository, the clone
3839 source is written as ``default`` in ``.hg/hgrc``.
3839 source is written as ``default`` in ``.hg/hgrc``.
3840
3840
3841 .. note::
3841 .. note::
3842
3842
3843 ``default`` and ``default-push`` apply to all inbound (e.g.
3843 ``default`` and ``default-push`` apply to all inbound (e.g.
3844 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3844 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3845 and :hg:`bundle`) operations.
3845 and :hg:`bundle`) operations.
3846
3846
3847 See :hg:`help urls` for more information.
3847 See :hg:`help urls` for more information.
3848
3848
3849 Returns 0 on success.
3849 Returns 0 on success.
3850 """
3850 """
3851
3851
3852 opts = pycompat.byteskwargs(opts)
3852 opts = pycompat.byteskwargs(opts)
3853 ui.pager('paths')
3853 ui.pager('paths')
3854 if search:
3854 if search:
3855 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3855 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3856 if name == search]
3856 if name == search]
3857 else:
3857 else:
3858 pathitems = sorted(ui.paths.iteritems())
3858 pathitems = sorted(ui.paths.iteritems())
3859
3859
3860 fm = ui.formatter('paths', opts)
3860 fm = ui.formatter('paths', opts)
3861 if fm.isplain():
3861 if fm.isplain():
3862 hidepassword = util.hidepassword
3862 hidepassword = util.hidepassword
3863 else:
3863 else:
3864 hidepassword = bytes
3864 hidepassword = bytes
3865 if ui.quiet:
3865 if ui.quiet:
3866 namefmt = '%s\n'
3866 namefmt = '%s\n'
3867 else:
3867 else:
3868 namefmt = '%s = '
3868 namefmt = '%s = '
3869 showsubopts = not search and not ui.quiet
3869 showsubopts = not search and not ui.quiet
3870
3870
3871 for name, path in pathitems:
3871 for name, path in pathitems:
3872 fm.startitem()
3872 fm.startitem()
3873 fm.condwrite(not search, 'name', namefmt, name)
3873 fm.condwrite(not search, 'name', namefmt, name)
3874 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3874 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3875 for subopt, value in sorted(path.suboptions.items()):
3875 for subopt, value in sorted(path.suboptions.items()):
3876 assert subopt not in ('name', 'url')
3876 assert subopt not in ('name', 'url')
3877 if showsubopts:
3877 if showsubopts:
3878 fm.plain('%s:%s = ' % (name, subopt))
3878 fm.plain('%s:%s = ' % (name, subopt))
3879 fm.condwrite(showsubopts, subopt, '%s\n', value)
3879 fm.condwrite(showsubopts, subopt, '%s\n', value)
3880
3880
3881 fm.end()
3881 fm.end()
3882
3882
3883 if search and not pathitems:
3883 if search and not pathitems:
3884 if not ui.quiet:
3884 if not ui.quiet:
3885 ui.warn(_("not found!\n"))
3885 ui.warn(_("not found!\n"))
3886 return 1
3886 return 1
3887 else:
3887 else:
3888 return 0
3888 return 0
3889
3889
3890 @command('phase',
3890 @command('phase',
3891 [('p', 'public', False, _('set changeset phase to public')),
3891 [('p', 'public', False, _('set changeset phase to public')),
3892 ('d', 'draft', False, _('set changeset phase to draft')),
3892 ('d', 'draft', False, _('set changeset phase to draft')),
3893 ('s', 'secret', False, _('set changeset phase to secret')),
3893 ('s', 'secret', False, _('set changeset phase to secret')),
3894 ('f', 'force', False, _('allow to move boundary backward')),
3894 ('f', 'force', False, _('allow to move boundary backward')),
3895 ('r', 'rev', [], _('target revision'), _('REV')),
3895 ('r', 'rev', [], _('target revision'), _('REV')),
3896 ],
3896 ],
3897 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3897 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3898 def phase(ui, repo, *revs, **opts):
3898 def phase(ui, repo, *revs, **opts):
3899 """set or show the current phase name
3899 """set or show the current phase name
3900
3900
3901 With no argument, show the phase name of the current revision(s).
3901 With no argument, show the phase name of the current revision(s).
3902
3902
3903 With one of -p/--public, -d/--draft or -s/--secret, change the
3903 With one of -p/--public, -d/--draft or -s/--secret, change the
3904 phase value of the specified revisions.
3904 phase value of the specified revisions.
3905
3905
3906 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3906 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
3907 lower phase to a higher phase. Phases are ordered as follows::
3907 lower phase to a higher phase. Phases are ordered as follows::
3908
3908
3909 public < draft < secret
3909 public < draft < secret
3910
3910
3911 Returns 0 on success, 1 if some phases could not be changed.
3911 Returns 0 on success, 1 if some phases could not be changed.
3912
3912
3913 (For more information about the phases concept, see :hg:`help phases`.)
3913 (For more information about the phases concept, see :hg:`help phases`.)
3914 """
3914 """
3915 opts = pycompat.byteskwargs(opts)
3915 opts = pycompat.byteskwargs(opts)
3916 # search for a unique phase argument
3916 # search for a unique phase argument
3917 targetphase = None
3917 targetphase = None
3918 for idx, name in enumerate(phases.phasenames):
3918 for idx, name in enumerate(phases.phasenames):
3919 if opts[name]:
3919 if opts[name]:
3920 if targetphase is not None:
3920 if targetphase is not None:
3921 raise error.Abort(_('only one phase can be specified'))
3921 raise error.Abort(_('only one phase can be specified'))
3922 targetphase = idx
3922 targetphase = idx
3923
3923
3924 # look for specified revision
3924 # look for specified revision
3925 revs = list(revs)
3925 revs = list(revs)
3926 revs.extend(opts['rev'])
3926 revs.extend(opts['rev'])
3927 if not revs:
3927 if not revs:
3928 # display both parents as the second parent phase can influence
3928 # display both parents as the second parent phase can influence
3929 # the phase of a merge commit
3929 # the phase of a merge commit
3930 revs = [c.rev() for c in repo[None].parents()]
3930 revs = [c.rev() for c in repo[None].parents()]
3931
3931
3932 revs = scmutil.revrange(repo, revs)
3932 revs = scmutil.revrange(repo, revs)
3933
3933
3934 ret = 0
3934 ret = 0
3935 if targetphase is None:
3935 if targetphase is None:
3936 # display
3936 # display
3937 for r in revs:
3937 for r in revs:
3938 ctx = repo[r]
3938 ctx = repo[r]
3939 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3939 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3940 else:
3940 else:
3941 with repo.lock(), repo.transaction("phase") as tr:
3941 with repo.lock(), repo.transaction("phase") as tr:
3942 # set phase
3942 # set phase
3943 if not revs:
3943 if not revs:
3944 raise error.Abort(_('empty revision set'))
3944 raise error.Abort(_('empty revision set'))
3945 nodes = [repo[r].node() for r in revs]
3945 nodes = [repo[r].node() for r in revs]
3946 # moving revision from public to draft may hide them
3946 # moving revision from public to draft may hide them
3947 # We have to check result on an unfiltered repository
3947 # We have to check result on an unfiltered repository
3948 unfi = repo.unfiltered()
3948 unfi = repo.unfiltered()
3949 getphase = unfi._phasecache.phase
3949 getphase = unfi._phasecache.phase
3950 olddata = [getphase(unfi, r) for r in unfi]
3950 olddata = [getphase(unfi, r) for r in unfi]
3951 phases.advanceboundary(repo, tr, targetphase, nodes)
3951 phases.advanceboundary(repo, tr, targetphase, nodes)
3952 if opts['force']:
3952 if opts['force']:
3953 phases.retractboundary(repo, tr, targetphase, nodes)
3953 phases.retractboundary(repo, tr, targetphase, nodes)
3954 getphase = unfi._phasecache.phase
3954 getphase = unfi._phasecache.phase
3955 newdata = [getphase(unfi, r) for r in unfi]
3955 newdata = [getphase(unfi, r) for r in unfi]
3956 changes = sum(newdata[r] != olddata[r] for r in unfi)
3956 changes = sum(newdata[r] != olddata[r] for r in unfi)
3957 cl = unfi.changelog
3957 cl = unfi.changelog
3958 rejected = [n for n in nodes
3958 rejected = [n for n in nodes
3959 if newdata[cl.rev(n)] < targetphase]
3959 if newdata[cl.rev(n)] < targetphase]
3960 if rejected:
3960 if rejected:
3961 ui.warn(_('cannot move %i changesets to a higher '
3961 ui.warn(_('cannot move %i changesets to a higher '
3962 'phase, use --force\n') % len(rejected))
3962 'phase, use --force\n') % len(rejected))
3963 ret = 1
3963 ret = 1
3964 if changes:
3964 if changes:
3965 msg = _('phase changed for %i changesets\n') % changes
3965 msg = _('phase changed for %i changesets\n') % changes
3966 if ret:
3966 if ret:
3967 ui.status(msg)
3967 ui.status(msg)
3968 else:
3968 else:
3969 ui.note(msg)
3969 ui.note(msg)
3970 else:
3970 else:
3971 ui.warn(_('no phases changed\n'))
3971 ui.warn(_('no phases changed\n'))
3972 return ret
3972 return ret
3973
3973
3974 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3974 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3975 """Run after a changegroup has been added via pull/unbundle
3975 """Run after a changegroup has been added via pull/unbundle
3976
3976
3977 This takes arguments below:
3977 This takes arguments below:
3978
3978
3979 :modheads: change of heads by pull/unbundle
3979 :modheads: change of heads by pull/unbundle
3980 :optupdate: updating working directory is needed or not
3980 :optupdate: updating working directory is needed or not
3981 :checkout: update destination revision (or None to default destination)
3981 :checkout: update destination revision (or None to default destination)
3982 :brev: a name, which might be a bookmark to be activated after updating
3982 :brev: a name, which might be a bookmark to be activated after updating
3983 """
3983 """
3984 if modheads == 0:
3984 if modheads == 0:
3985 return
3985 return
3986 if optupdate:
3986 if optupdate:
3987 try:
3987 try:
3988 return hg.updatetotally(ui, repo, checkout, brev)
3988 return hg.updatetotally(ui, repo, checkout, brev)
3989 except error.UpdateAbort as inst:
3989 except error.UpdateAbort as inst:
3990 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
3990 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
3991 hint = inst.hint
3991 hint = inst.hint
3992 raise error.UpdateAbort(msg, hint=hint)
3992 raise error.UpdateAbort(msg, hint=hint)
3993 if modheads > 1:
3993 if modheads > 1:
3994 currentbranchheads = len(repo.branchheads())
3994 currentbranchheads = len(repo.branchheads())
3995 if currentbranchheads == modheads:
3995 if currentbranchheads == modheads:
3996 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3996 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3997 elif currentbranchheads > 1:
3997 elif currentbranchheads > 1:
3998 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3998 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3999 "merge)\n"))
3999 "merge)\n"))
4000 else:
4000 else:
4001 ui.status(_("(run 'hg heads' to see heads)\n"))
4001 ui.status(_("(run 'hg heads' to see heads)\n"))
4002 elif not ui.configbool('commands', 'update.requiredest'):
4002 elif not ui.configbool('commands', 'update.requiredest'):
4003 ui.status(_("(run 'hg update' to get a working copy)\n"))
4003 ui.status(_("(run 'hg update' to get a working copy)\n"))
4004
4004
4005 @command('^pull',
4005 @command('^pull',
4006 [('u', 'update', None,
4006 [('u', 'update', None,
4007 _('update to new branch head if new descendants were pulled')),
4007 _('update to new branch head if new descendants were pulled')),
4008 ('f', 'force', None, _('run even when remote repository is unrelated')),
4008 ('f', 'force', None, _('run even when remote repository is unrelated')),
4009 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4009 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4010 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4010 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4011 ('b', 'branch', [], _('a specific branch you would like to pull'),
4011 ('b', 'branch', [], _('a specific branch you would like to pull'),
4012 _('BRANCH')),
4012 _('BRANCH')),
4013 ] + remoteopts,
4013 ] + remoteopts,
4014 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4014 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4015 def pull(ui, repo, source="default", **opts):
4015 def pull(ui, repo, source="default", **opts):
4016 """pull changes from the specified source
4016 """pull changes from the specified source
4017
4017
4018 Pull changes from a remote repository to a local one.
4018 Pull changes from a remote repository to a local one.
4019
4019
4020 This finds all changes from the repository at the specified path
4020 This finds all changes from the repository at the specified path
4021 or URL and adds them to a local repository (the current one unless
4021 or URL and adds them to a local repository (the current one unless
4022 -R is specified). By default, this does not update the copy of the
4022 -R is specified). By default, this does not update the copy of the
4023 project in the working directory.
4023 project in the working directory.
4024
4024
4025 When cloning from servers that support it, Mercurial may fetch
4025 When cloning from servers that support it, Mercurial may fetch
4026 pre-generated data. When this is done, hooks operating on incoming
4026 pre-generated data. When this is done, hooks operating on incoming
4027 changesets and changegroups may fire more than once, once for each
4027 changesets and changegroups may fire more than once, once for each
4028 pre-generated bundle and as well as for any additional remaining
4028 pre-generated bundle and as well as for any additional remaining
4029 data. See :hg:`help -e clonebundles` for more.
4029 data. See :hg:`help -e clonebundles` for more.
4030
4030
4031 Use :hg:`incoming` if you want to see what would have been added
4031 Use :hg:`incoming` if you want to see what would have been added
4032 by a pull at the time you issued this command. If you then decide
4032 by a pull at the time you issued this command. If you then decide
4033 to add those changes to the repository, you should use :hg:`pull
4033 to add those changes to the repository, you should use :hg:`pull
4034 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4034 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4035
4035
4036 If SOURCE is omitted, the 'default' path will be used.
4036 If SOURCE is omitted, the 'default' path will be used.
4037 See :hg:`help urls` for more information.
4037 See :hg:`help urls` for more information.
4038
4038
4039 Specifying bookmark as ``.`` is equivalent to specifying the active
4039 Specifying bookmark as ``.`` is equivalent to specifying the active
4040 bookmark's name.
4040 bookmark's name.
4041
4041
4042 Returns 0 on success, 1 if an update had unresolved files.
4042 Returns 0 on success, 1 if an update had unresolved files.
4043 """
4043 """
4044
4044
4045 opts = pycompat.byteskwargs(opts)
4045 opts = pycompat.byteskwargs(opts)
4046 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4046 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4047 msg = _('update destination required by configuration')
4047 msg = _('update destination required by configuration')
4048 hint = _('use hg pull followed by hg update DEST')
4048 hint = _('use hg pull followed by hg update DEST')
4049 raise error.Abort(msg, hint=hint)
4049 raise error.Abort(msg, hint=hint)
4050
4050
4051 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4051 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4052 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4052 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4053 other = hg.peer(repo, opts, source)
4053 other = hg.peer(repo, opts, source)
4054 try:
4054 try:
4055 revs, checkout = hg.addbranchrevs(repo, other, branches,
4055 revs, checkout = hg.addbranchrevs(repo, other, branches,
4056 opts.get('rev'))
4056 opts.get('rev'))
4057
4057
4058
4058
4059 pullopargs = {}
4059 pullopargs = {}
4060 if opts.get('bookmark'):
4060 if opts.get('bookmark'):
4061 if not revs:
4061 if not revs:
4062 revs = []
4062 revs = []
4063 # The list of bookmark used here is not the one used to actually
4063 # The list of bookmark used here is not the one used to actually
4064 # update the bookmark name. This can result in the revision pulled
4064 # update the bookmark name. This can result in the revision pulled
4065 # not ending up with the name of the bookmark because of a race
4065 # not ending up with the name of the bookmark because of a race
4066 # condition on the server. (See issue 4689 for details)
4066 # condition on the server. (See issue 4689 for details)
4067 remotebookmarks = other.listkeys('bookmarks')
4067 remotebookmarks = other.listkeys('bookmarks')
4068 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4068 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4069 pullopargs['remotebookmarks'] = remotebookmarks
4069 pullopargs['remotebookmarks'] = remotebookmarks
4070 for b in opts['bookmark']:
4070 for b in opts['bookmark']:
4071 b = repo._bookmarks.expandname(b)
4071 b = repo._bookmarks.expandname(b)
4072 if b not in remotebookmarks:
4072 if b not in remotebookmarks:
4073 raise error.Abort(_('remote bookmark %s not found!') % b)
4073 raise error.Abort(_('remote bookmark %s not found!') % b)
4074 revs.append(hex(remotebookmarks[b]))
4074 revs.append(hex(remotebookmarks[b]))
4075
4075
4076 if revs:
4076 if revs:
4077 try:
4077 try:
4078 # When 'rev' is a bookmark name, we cannot guarantee that it
4078 # When 'rev' is a bookmark name, we cannot guarantee that it
4079 # will be updated with that name because of a race condition
4079 # will be updated with that name because of a race condition
4080 # server side. (See issue 4689 for details)
4080 # server side. (See issue 4689 for details)
4081 oldrevs = revs
4081 oldrevs = revs
4082 revs = [] # actually, nodes
4082 revs = [] # actually, nodes
4083 for r in oldrevs:
4083 for r in oldrevs:
4084 with other.commandexecutor() as e:
4084 with other.commandexecutor() as e:
4085 node = e.callcommand('lookup', {'key': r}).result()
4085 node = e.callcommand('lookup', {'key': r}).result()
4086
4086
4087 revs.append(node)
4087 revs.append(node)
4088 if r == checkout:
4088 if r == checkout:
4089 checkout = node
4089 checkout = node
4090 except error.CapabilityError:
4090 except error.CapabilityError:
4091 err = _("other repository doesn't support revision lookup, "
4091 err = _("other repository doesn't support revision lookup, "
4092 "so a rev cannot be specified.")
4092 "so a rev cannot be specified.")
4093 raise error.Abort(err)
4093 raise error.Abort(err)
4094
4094
4095 wlock = util.nullcontextmanager()
4095 wlock = util.nullcontextmanager()
4096 if opts.get('update'):
4096 if opts.get('update'):
4097 wlock = repo.wlock()
4097 wlock = repo.wlock()
4098 with wlock:
4098 with wlock:
4099 pullopargs.update(opts.get('opargs', {}))
4099 pullopargs.update(opts.get('opargs', {}))
4100 modheads = exchange.pull(repo, other, heads=revs,
4100 modheads = exchange.pull(repo, other, heads=revs,
4101 force=opts.get('force'),
4101 force=opts.get('force'),
4102 bookmarks=opts.get('bookmark', ()),
4102 bookmarks=opts.get('bookmark', ()),
4103 opargs=pullopargs).cgresult
4103 opargs=pullopargs).cgresult
4104
4104
4105 # brev is a name, which might be a bookmark to be activated at
4105 # brev is a name, which might be a bookmark to be activated at
4106 # the end of the update. In other words, it is an explicit
4106 # the end of the update. In other words, it is an explicit
4107 # destination of the update
4107 # destination of the update
4108 brev = None
4108 brev = None
4109
4109
4110 if checkout:
4110 if checkout:
4111 checkout = repo.changelog.rev(checkout)
4111 checkout = repo.changelog.rev(checkout)
4112
4112
4113 # order below depends on implementation of
4113 # order below depends on implementation of
4114 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4114 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4115 # because 'checkout' is determined without it.
4115 # because 'checkout' is determined without it.
4116 if opts.get('rev'):
4116 if opts.get('rev'):
4117 brev = opts['rev'][0]
4117 brev = opts['rev'][0]
4118 elif opts.get('branch'):
4118 elif opts.get('branch'):
4119 brev = opts['branch'][0]
4119 brev = opts['branch'][0]
4120 else:
4120 else:
4121 brev = branches[0]
4121 brev = branches[0]
4122 repo._subtoppath = source
4122 repo._subtoppath = source
4123 try:
4123 try:
4124 ret = postincoming(ui, repo, modheads, opts.get('update'),
4124 ret = postincoming(ui, repo, modheads, opts.get('update'),
4125 checkout, brev)
4125 checkout, brev)
4126
4126
4127 finally:
4127 finally:
4128 del repo._subtoppath
4128 del repo._subtoppath
4129
4129
4130 finally:
4130 finally:
4131 other.close()
4131 other.close()
4132 return ret
4132 return ret
4133
4133
4134 @command('^push',
4134 @command('^push',
4135 [('f', 'force', None, _('force push')),
4135 [('f', 'force', None, _('force push')),
4136 ('r', 'rev', [],
4136 ('r', 'rev', [],
4137 _('a changeset intended to be included in the destination'),
4137 _('a changeset intended to be included in the destination'),
4138 _('REV')),
4138 _('REV')),
4139 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4139 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4140 ('b', 'branch', [],
4140 ('b', 'branch', [],
4141 _('a specific branch you would like to push'), _('BRANCH')),
4141 _('a specific branch you would like to push'), _('BRANCH')),
4142 ('', 'new-branch', False, _('allow pushing a new branch')),
4142 ('', 'new-branch', False, _('allow pushing a new branch')),
4143 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4143 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4144 ] + remoteopts,
4144 ] + remoteopts,
4145 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4145 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4146 def push(ui, repo, dest=None, **opts):
4146 def push(ui, repo, dest=None, **opts):
4147 """push changes to the specified destination
4147 """push changes to the specified destination
4148
4148
4149 Push changesets from the local repository to the specified
4149 Push changesets from the local repository to the specified
4150 destination.
4150 destination.
4151
4151
4152 This operation is symmetrical to pull: it is identical to a pull
4152 This operation is symmetrical to pull: it is identical to a pull
4153 in the destination repository from the current one.
4153 in the destination repository from the current one.
4154
4154
4155 By default, push will not allow creation of new heads at the
4155 By default, push will not allow creation of new heads at the
4156 destination, since multiple heads would make it unclear which head
4156 destination, since multiple heads would make it unclear which head
4157 to use. In this situation, it is recommended to pull and merge
4157 to use. In this situation, it is recommended to pull and merge
4158 before pushing.
4158 before pushing.
4159
4159
4160 Use --new-branch if you want to allow push to create a new named
4160 Use --new-branch if you want to allow push to create a new named
4161 branch that is not present at the destination. This allows you to
4161 branch that is not present at the destination. This allows you to
4162 only create a new branch without forcing other changes.
4162 only create a new branch without forcing other changes.
4163
4163
4164 .. note::
4164 .. note::
4165
4165
4166 Extra care should be taken with the -f/--force option,
4166 Extra care should be taken with the -f/--force option,
4167 which will push all new heads on all branches, an action which will
4167 which will push all new heads on all branches, an action which will
4168 almost always cause confusion for collaborators.
4168 almost always cause confusion for collaborators.
4169
4169
4170 If -r/--rev is used, the specified revision and all its ancestors
4170 If -r/--rev is used, the specified revision and all its ancestors
4171 will be pushed to the remote repository.
4171 will be pushed to the remote repository.
4172
4172
4173 If -B/--bookmark is used, the specified bookmarked revision, its
4173 If -B/--bookmark is used, the specified bookmarked revision, its
4174 ancestors, and the bookmark will be pushed to the remote
4174 ancestors, and the bookmark will be pushed to the remote
4175 repository. Specifying ``.`` is equivalent to specifying the active
4175 repository. Specifying ``.`` is equivalent to specifying the active
4176 bookmark's name.
4176 bookmark's name.
4177
4177
4178 Please see :hg:`help urls` for important details about ``ssh://``
4178 Please see :hg:`help urls` for important details about ``ssh://``
4179 URLs. If DESTINATION is omitted, a default path will be used.
4179 URLs. If DESTINATION is omitted, a default path will be used.
4180
4180
4181 .. container:: verbose
4181 .. container:: verbose
4182
4182
4183 The --pushvars option sends strings to the server that become
4183 The --pushvars option sends strings to the server that become
4184 environment variables prepended with ``HG_USERVAR_``. For example,
4184 environment variables prepended with ``HG_USERVAR_``. For example,
4185 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4185 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4186 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4186 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4187
4187
4188 pushvars can provide for user-overridable hooks as well as set debug
4188 pushvars can provide for user-overridable hooks as well as set debug
4189 levels. One example is having a hook that blocks commits containing
4189 levels. One example is having a hook that blocks commits containing
4190 conflict markers, but enables the user to override the hook if the file
4190 conflict markers, but enables the user to override the hook if the file
4191 is using conflict markers for testing purposes or the file format has
4191 is using conflict markers for testing purposes or the file format has
4192 strings that look like conflict markers.
4192 strings that look like conflict markers.
4193
4193
4194 By default, servers will ignore `--pushvars`. To enable it add the
4194 By default, servers will ignore `--pushvars`. To enable it add the
4195 following to your configuration file::
4195 following to your configuration file::
4196
4196
4197 [push]
4197 [push]
4198 pushvars.server = true
4198 pushvars.server = true
4199
4199
4200 Returns 0 if push was successful, 1 if nothing to push.
4200 Returns 0 if push was successful, 1 if nothing to push.
4201 """
4201 """
4202
4202
4203 opts = pycompat.byteskwargs(opts)
4203 opts = pycompat.byteskwargs(opts)
4204 if opts.get('bookmark'):
4204 if opts.get('bookmark'):
4205 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4205 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4206 for b in opts['bookmark']:
4206 for b in opts['bookmark']:
4207 # translate -B options to -r so changesets get pushed
4207 # translate -B options to -r so changesets get pushed
4208 b = repo._bookmarks.expandname(b)
4208 b = repo._bookmarks.expandname(b)
4209 if b in repo._bookmarks:
4209 if b in repo._bookmarks:
4210 opts.setdefault('rev', []).append(b)
4210 opts.setdefault('rev', []).append(b)
4211 else:
4211 else:
4212 # if we try to push a deleted bookmark, translate it to null
4212 # if we try to push a deleted bookmark, translate it to null
4213 # this lets simultaneous -r, -b options continue working
4213 # this lets simultaneous -r, -b options continue working
4214 opts.setdefault('rev', []).append("null")
4214 opts.setdefault('rev', []).append("null")
4215
4215
4216 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4216 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4217 if not path:
4217 if not path:
4218 raise error.Abort(_('default repository not configured!'),
4218 raise error.Abort(_('default repository not configured!'),
4219 hint=_("see 'hg help config.paths'"))
4219 hint=_("see 'hg help config.paths'"))
4220 dest = path.pushloc or path.loc
4220 dest = path.pushloc or path.loc
4221 branches = (path.branch, opts.get('branch') or [])
4221 branches = (path.branch, opts.get('branch') or [])
4222 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4222 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4223 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4223 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4224 other = hg.peer(repo, opts, dest)
4224 other = hg.peer(repo, opts, dest)
4225
4225
4226 if revs:
4226 if revs:
4227 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4227 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4228 if not revs:
4228 if not revs:
4229 raise error.Abort(_("specified revisions evaluate to an empty set"),
4229 raise error.Abort(_("specified revisions evaluate to an empty set"),
4230 hint=_("use different revision arguments"))
4230 hint=_("use different revision arguments"))
4231 elif path.pushrev:
4231 elif path.pushrev:
4232 # It doesn't make any sense to specify ancestor revisions. So limit
4232 # It doesn't make any sense to specify ancestor revisions. So limit
4233 # to DAG heads to make discovery simpler.
4233 # to DAG heads to make discovery simpler.
4234 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4234 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4235 revs = scmutil.revrange(repo, [expr])
4235 revs = scmutil.revrange(repo, [expr])
4236 revs = [repo[rev].node() for rev in revs]
4236 revs = [repo[rev].node() for rev in revs]
4237 if not revs:
4237 if not revs:
4238 raise error.Abort(_('default push revset for path evaluates to an '
4238 raise error.Abort(_('default push revset for path evaluates to an '
4239 'empty set'))
4239 'empty set'))
4240
4240
4241 repo._subtoppath = dest
4241 repo._subtoppath = dest
4242 try:
4242 try:
4243 # push subrepos depth-first for coherent ordering
4243 # push subrepos depth-first for coherent ordering
4244 c = repo['.']
4244 c = repo['.']
4245 subs = c.substate # only repos that are committed
4245 subs = c.substate # only repos that are committed
4246 for s in sorted(subs):
4246 for s in sorted(subs):
4247 result = c.sub(s).push(opts)
4247 result = c.sub(s).push(opts)
4248 if result == 0:
4248 if result == 0:
4249 return not result
4249 return not result
4250 finally:
4250 finally:
4251 del repo._subtoppath
4251 del repo._subtoppath
4252
4252
4253 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4253 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4254 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4254 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4255
4255
4256 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4256 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4257 newbranch=opts.get('new_branch'),
4257 newbranch=opts.get('new_branch'),
4258 bookmarks=opts.get('bookmark', ()),
4258 bookmarks=opts.get('bookmark', ()),
4259 opargs=opargs)
4259 opargs=opargs)
4260
4260
4261 result = not pushop.cgresult
4261 result = not pushop.cgresult
4262
4262
4263 if pushop.bkresult is not None:
4263 if pushop.bkresult is not None:
4264 if pushop.bkresult == 2:
4264 if pushop.bkresult == 2:
4265 result = 2
4265 result = 2
4266 elif not result and pushop.bkresult:
4266 elif not result and pushop.bkresult:
4267 result = 2
4267 result = 2
4268
4268
4269 return result
4269 return result
4270
4270
4271 @command('recover', [])
4271 @command('recover', [])
4272 def recover(ui, repo):
4272 def recover(ui, repo):
4273 """roll back an interrupted transaction
4273 """roll back an interrupted transaction
4274
4274
4275 Recover from an interrupted commit or pull.
4275 Recover from an interrupted commit or pull.
4276
4276
4277 This command tries to fix the repository status after an
4277 This command tries to fix the repository status after an
4278 interrupted operation. It should only be necessary when Mercurial
4278 interrupted operation. It should only be necessary when Mercurial
4279 suggests it.
4279 suggests it.
4280
4280
4281 Returns 0 if successful, 1 if nothing to recover or verify fails.
4281 Returns 0 if successful, 1 if nothing to recover or verify fails.
4282 """
4282 """
4283 if repo.recover():
4283 if repo.recover():
4284 return hg.verify(repo)
4284 return hg.verify(repo)
4285 return 1
4285 return 1
4286
4286
4287 @command('^remove|rm',
4287 @command('^remove|rm',
4288 [('A', 'after', None, _('record delete for missing files')),
4288 [('A', 'after', None, _('record delete for missing files')),
4289 ('f', 'force', None,
4289 ('f', 'force', None,
4290 _('forget added files, delete modified files')),
4290 _('forget added files, delete modified files')),
4291 ] + subrepoopts + walkopts + dryrunopts,
4291 ] + subrepoopts + walkopts + dryrunopts,
4292 _('[OPTION]... FILE...'),
4292 _('[OPTION]... FILE...'),
4293 inferrepo=True)
4293 inferrepo=True)
4294 def remove(ui, repo, *pats, **opts):
4294 def remove(ui, repo, *pats, **opts):
4295 """remove the specified files on the next commit
4295 """remove the specified files on the next commit
4296
4296
4297 Schedule the indicated files for removal from the current branch.
4297 Schedule the indicated files for removal from the current branch.
4298
4298
4299 This command schedules the files to be removed at the next commit.
4299 This command schedules the files to be removed at the next commit.
4300 To undo a remove before that, see :hg:`revert`. To undo added
4300 To undo a remove before that, see :hg:`revert`. To undo added
4301 files, see :hg:`forget`.
4301 files, see :hg:`forget`.
4302
4302
4303 .. container:: verbose
4303 .. container:: verbose
4304
4304
4305 -A/--after can be used to remove only files that have already
4305 -A/--after can be used to remove only files that have already
4306 been deleted, -f/--force can be used to force deletion, and -Af
4306 been deleted, -f/--force can be used to force deletion, and -Af
4307 can be used to remove files from the next revision without
4307 can be used to remove files from the next revision without
4308 deleting them from the working directory.
4308 deleting them from the working directory.
4309
4309
4310 The following table details the behavior of remove for different
4310 The following table details the behavior of remove for different
4311 file states (columns) and option combinations (rows). The file
4311 file states (columns) and option combinations (rows). The file
4312 states are Added [A], Clean [C], Modified [M] and Missing [!]
4312 states are Added [A], Clean [C], Modified [M] and Missing [!]
4313 (as reported by :hg:`status`). The actions are Warn, Remove
4313 (as reported by :hg:`status`). The actions are Warn, Remove
4314 (from branch) and Delete (from disk):
4314 (from branch) and Delete (from disk):
4315
4315
4316 ========= == == == ==
4316 ========= == == == ==
4317 opt/state A C M !
4317 opt/state A C M !
4318 ========= == == == ==
4318 ========= == == == ==
4319 none W RD W R
4319 none W RD W R
4320 -f R RD RD R
4320 -f R RD RD R
4321 -A W W W R
4321 -A W W W R
4322 -Af R R R R
4322 -Af R R R R
4323 ========= == == == ==
4323 ========= == == == ==
4324
4324
4325 .. note::
4325 .. note::
4326
4326
4327 :hg:`remove` never deletes files in Added [A] state from the
4327 :hg:`remove` never deletes files in Added [A] state from the
4328 working directory, not even if ``--force`` is specified.
4328 working directory, not even if ``--force`` is specified.
4329
4329
4330 Returns 0 on success, 1 if any warnings encountered.
4330 Returns 0 on success, 1 if any warnings encountered.
4331 """
4331 """
4332
4332
4333 opts = pycompat.byteskwargs(opts)
4333 opts = pycompat.byteskwargs(opts)
4334 after, force = opts.get('after'), opts.get('force')
4334 after, force = opts.get('after'), opts.get('force')
4335 dryrun = opts.get('dry_run')
4335 dryrun = opts.get('dry_run')
4336 if not pats and not after:
4336 if not pats and not after:
4337 raise error.Abort(_('no files specified'))
4337 raise error.Abort(_('no files specified'))
4338
4338
4339 m = scmutil.match(repo[None], pats, opts)
4339 m = scmutil.match(repo[None], pats, opts)
4340 subrepos = opts.get('subrepos')
4340 subrepos = opts.get('subrepos')
4341 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4341 return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
4342 dryrun=dryrun)
4342 dryrun=dryrun)
4343
4343
4344 @command('rename|move|mv',
4344 @command('rename|move|mv',
4345 [('A', 'after', None, _('record a rename that has already occurred')),
4345 [('A', 'after', None, _('record a rename that has already occurred')),
4346 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4346 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4347 ] + walkopts + dryrunopts,
4347 ] + walkopts + dryrunopts,
4348 _('[OPTION]... SOURCE... DEST'))
4348 _('[OPTION]... SOURCE... DEST'))
4349 def rename(ui, repo, *pats, **opts):
4349 def rename(ui, repo, *pats, **opts):
4350 """rename files; equivalent of copy + remove
4350 """rename files; equivalent of copy + remove
4351
4351
4352 Mark dest as copies of sources; mark sources for deletion. If dest
4352 Mark dest as copies of sources; mark sources for deletion. If dest
4353 is a directory, copies are put in that directory. If dest is a
4353 is a directory, copies are put in that directory. If dest is a
4354 file, there can only be one source.
4354 file, there can only be one source.
4355
4355
4356 By default, this command copies the contents of files as they
4356 By default, this command copies the contents of files as they
4357 exist in the working directory. If invoked with -A/--after, the
4357 exist in the working directory. If invoked with -A/--after, the
4358 operation is recorded, but no copying is performed.
4358 operation is recorded, but no copying is performed.
4359
4359
4360 This command takes effect at the next commit. To undo a rename
4360 This command takes effect at the next commit. To undo a rename
4361 before that, see :hg:`revert`.
4361 before that, see :hg:`revert`.
4362
4362
4363 Returns 0 on success, 1 if errors are encountered.
4363 Returns 0 on success, 1 if errors are encountered.
4364 """
4364 """
4365 opts = pycompat.byteskwargs(opts)
4365 opts = pycompat.byteskwargs(opts)
4366 with repo.wlock(False):
4366 with repo.wlock(False):
4367 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4367 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4368
4368
4369 @command('resolve',
4369 @command('resolve',
4370 [('a', 'all', None, _('select all unresolved files')),
4370 [('a', 'all', None, _('select all unresolved files')),
4371 ('l', 'list', None, _('list state of files needing merge')),
4371 ('l', 'list', None, _('list state of files needing merge')),
4372 ('m', 'mark', None, _('mark files as resolved')),
4372 ('m', 'mark', None, _('mark files as resolved')),
4373 ('u', 'unmark', None, _('mark files as unresolved')),
4373 ('u', 'unmark', None, _('mark files as unresolved')),
4374 ('n', 'no-status', None, _('hide status prefix'))]
4374 ('n', 'no-status', None, _('hide status prefix'))]
4375 + mergetoolopts + walkopts + formatteropts,
4375 + mergetoolopts + walkopts + formatteropts,
4376 _('[OPTION]... [FILE]...'),
4376 _('[OPTION]... [FILE]...'),
4377 inferrepo=True)
4377 inferrepo=True)
4378 def resolve(ui, repo, *pats, **opts):
4378 def resolve(ui, repo, *pats, **opts):
4379 """redo merges or set/view the merge status of files
4379 """redo merges or set/view the merge status of files
4380
4380
4381 Merges with unresolved conflicts are often the result of
4381 Merges with unresolved conflicts are often the result of
4382 non-interactive merging using the ``internal:merge`` configuration
4382 non-interactive merging using the ``internal:merge`` configuration
4383 setting, or a command-line merge tool like ``diff3``. The resolve
4383 setting, or a command-line merge tool like ``diff3``. The resolve
4384 command is used to manage the files involved in a merge, after
4384 command is used to manage the files involved in a merge, after
4385 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4385 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4386 working directory must have two parents). See :hg:`help
4386 working directory must have two parents). See :hg:`help
4387 merge-tools` for information on configuring merge tools.
4387 merge-tools` for information on configuring merge tools.
4388
4388
4389 The resolve command can be used in the following ways:
4389 The resolve command can be used in the following ways:
4390
4390
4391 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4391 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4392 files, discarding any previous merge attempts. Re-merging is not
4392 files, discarding any previous merge attempts. Re-merging is not
4393 performed for files already marked as resolved. Use ``--all/-a``
4393 performed for files already marked as resolved. Use ``--all/-a``
4394 to select all unresolved files. ``--tool`` can be used to specify
4394 to select all unresolved files. ``--tool`` can be used to specify
4395 the merge tool used for the given files. It overrides the HGMERGE
4395 the merge tool used for the given files. It overrides the HGMERGE
4396 environment variable and your configuration files. Previous file
4396 environment variable and your configuration files. Previous file
4397 contents are saved with a ``.orig`` suffix.
4397 contents are saved with a ``.orig`` suffix.
4398
4398
4399 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4399 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4400 (e.g. after having manually fixed-up the files). The default is
4400 (e.g. after having manually fixed-up the files). The default is
4401 to mark all unresolved files.
4401 to mark all unresolved files.
4402
4402
4403 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4403 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4404 default is to mark all resolved files.
4404 default is to mark all resolved files.
4405
4405
4406 - :hg:`resolve -l`: list files which had or still have conflicts.
4406 - :hg:`resolve -l`: list files which had or still have conflicts.
4407 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4407 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4408 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4408 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4409 the list. See :hg:`help filesets` for details.
4409 the list. See :hg:`help filesets` for details.
4410
4410
4411 .. note::
4411 .. note::
4412
4412
4413 Mercurial will not let you commit files with unresolved merge
4413 Mercurial will not let you commit files with unresolved merge
4414 conflicts. You must use :hg:`resolve -m ...` before you can
4414 conflicts. You must use :hg:`resolve -m ...` before you can
4415 commit after a conflicting merge.
4415 commit after a conflicting merge.
4416
4416
4417 Returns 0 on success, 1 if any files fail a resolve attempt.
4417 Returns 0 on success, 1 if any files fail a resolve attempt.
4418 """
4418 """
4419
4419
4420 opts = pycompat.byteskwargs(opts)
4420 opts = pycompat.byteskwargs(opts)
4421 flaglist = 'all mark unmark list no_status'.split()
4421 flaglist = 'all mark unmark list no_status'.split()
4422 all, mark, unmark, show, nostatus = \
4422 all, mark, unmark, show, nostatus = \
4423 [opts.get(o) for o in flaglist]
4423 [opts.get(o) for o in flaglist]
4424
4424
4425 if (show and (mark or unmark)) or (mark and unmark):
4425 if (show and (mark or unmark)) or (mark and unmark):
4426 raise error.Abort(_("too many options specified"))
4426 raise error.Abort(_("too many options specified"))
4427 if pats and all:
4427 if pats and all:
4428 raise error.Abort(_("can't specify --all and patterns"))
4428 raise error.Abort(_("can't specify --all and patterns"))
4429 if not (all or pats or show or mark or unmark):
4429 if not (all or pats or show or mark or unmark):
4430 raise error.Abort(_('no files or directories specified'),
4430 raise error.Abort(_('no files or directories specified'),
4431 hint=('use --all to re-merge all unresolved files'))
4431 hint=('use --all to re-merge all unresolved files'))
4432
4432
4433 if show:
4433 if show:
4434 ui.pager('resolve')
4434 ui.pager('resolve')
4435 fm = ui.formatter('resolve', opts)
4435 fm = ui.formatter('resolve', opts)
4436 ms = mergemod.mergestate.read(repo)
4436 ms = mergemod.mergestate.read(repo)
4437 m = scmutil.match(repo[None], pats, opts)
4437 m = scmutil.match(repo[None], pats, opts)
4438
4438
4439 # Labels and keys based on merge state. Unresolved path conflicts show
4439 # Labels and keys based on merge state. Unresolved path conflicts show
4440 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4440 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4441 # resolved conflicts.
4441 # resolved conflicts.
4442 mergestateinfo = {
4442 mergestateinfo = {
4443 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4443 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4444 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4444 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4445 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4445 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4446 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4446 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4447 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4447 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4448 'D'),
4448 'D'),
4449 }
4449 }
4450
4450
4451 for f in ms:
4451 for f in ms:
4452 if not m(f):
4452 if not m(f):
4453 continue
4453 continue
4454
4454
4455 label, key = mergestateinfo[ms[f]]
4455 label, key = mergestateinfo[ms[f]]
4456 fm.startitem()
4456 fm.startitem()
4457 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4457 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4458 fm.write('path', '%s\n', f, label=label)
4458 fm.write('path', '%s\n', f, label=label)
4459 fm.end()
4459 fm.end()
4460 return 0
4460 return 0
4461
4461
4462 with repo.wlock():
4462 with repo.wlock():
4463 ms = mergemod.mergestate.read(repo)
4463 ms = mergemod.mergestate.read(repo)
4464
4464
4465 if not (ms.active() or repo.dirstate.p2() != nullid):
4465 if not (ms.active() or repo.dirstate.p2() != nullid):
4466 raise error.Abort(
4466 raise error.Abort(
4467 _('resolve command not applicable when not merging'))
4467 _('resolve command not applicable when not merging'))
4468
4468
4469 wctx = repo[None]
4469 wctx = repo[None]
4470
4470
4471 if (ms.mergedriver
4471 if (ms.mergedriver
4472 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4472 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4473 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4473 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4474 ms.commit()
4474 ms.commit()
4475 # allow mark and unmark to go through
4475 # allow mark and unmark to go through
4476 if not mark and not unmark and not proceed:
4476 if not mark and not unmark and not proceed:
4477 return 1
4477 return 1
4478
4478
4479 m = scmutil.match(wctx, pats, opts)
4479 m = scmutil.match(wctx, pats, opts)
4480 ret = 0
4480 ret = 0
4481 didwork = False
4481 didwork = False
4482 runconclude = False
4482 runconclude = False
4483
4483
4484 tocomplete = []
4484 tocomplete = []
4485 for f in ms:
4485 for f in ms:
4486 if not m(f):
4486 if not m(f):
4487 continue
4487 continue
4488
4488
4489 didwork = True
4489 didwork = True
4490
4490
4491 # don't let driver-resolved files be marked, and run the conclude
4491 # don't let driver-resolved files be marked, and run the conclude
4492 # step if asked to resolve
4492 # step if asked to resolve
4493 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4493 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4494 exact = m.exact(f)
4494 exact = m.exact(f)
4495 if mark:
4495 if mark:
4496 if exact:
4496 if exact:
4497 ui.warn(_('not marking %s as it is driver-resolved\n')
4497 ui.warn(_('not marking %s as it is driver-resolved\n')
4498 % f)
4498 % f)
4499 elif unmark:
4499 elif unmark:
4500 if exact:
4500 if exact:
4501 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4501 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4502 % f)
4502 % f)
4503 else:
4503 else:
4504 runconclude = True
4504 runconclude = True
4505 continue
4505 continue
4506
4506
4507 # path conflicts must be resolved manually
4507 # path conflicts must be resolved manually
4508 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4508 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4509 mergemod.MERGE_RECORD_RESOLVED_PATH):
4509 mergemod.MERGE_RECORD_RESOLVED_PATH):
4510 if mark:
4510 if mark:
4511 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4511 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4512 elif unmark:
4512 elif unmark:
4513 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4513 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4514 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4514 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4515 ui.warn(_('%s: path conflict must be resolved manually\n')
4515 ui.warn(_('%s: path conflict must be resolved manually\n')
4516 % f)
4516 % f)
4517 continue
4517 continue
4518
4518
4519 if mark:
4519 if mark:
4520 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4520 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4521 elif unmark:
4521 elif unmark:
4522 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4522 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4523 else:
4523 else:
4524 # backup pre-resolve (merge uses .orig for its own purposes)
4524 # backup pre-resolve (merge uses .orig for its own purposes)
4525 a = repo.wjoin(f)
4525 a = repo.wjoin(f)
4526 try:
4526 try:
4527 util.copyfile(a, a + ".resolve")
4527 util.copyfile(a, a + ".resolve")
4528 except (IOError, OSError) as inst:
4528 except (IOError, OSError) as inst:
4529 if inst.errno != errno.ENOENT:
4529 if inst.errno != errno.ENOENT:
4530 raise
4530 raise
4531
4531
4532 try:
4532 try:
4533 # preresolve file
4533 # preresolve file
4534 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4534 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4535 with ui.configoverride(overrides, 'resolve'):
4535 with ui.configoverride(overrides, 'resolve'):
4536 complete, r = ms.preresolve(f, wctx)
4536 complete, r = ms.preresolve(f, wctx)
4537 if not complete:
4537 if not complete:
4538 tocomplete.append(f)
4538 tocomplete.append(f)
4539 elif r:
4539 elif r:
4540 ret = 1
4540 ret = 1
4541 finally:
4541 finally:
4542 ms.commit()
4542 ms.commit()
4543
4543
4544 # replace filemerge's .orig file with our resolve file, but only
4544 # replace filemerge's .orig file with our resolve file, but only
4545 # for merges that are complete
4545 # for merges that are complete
4546 if complete:
4546 if complete:
4547 try:
4547 try:
4548 util.rename(a + ".resolve",
4548 util.rename(a + ".resolve",
4549 scmutil.origpath(ui, repo, a))
4549 scmutil.origpath(ui, repo, a))
4550 except OSError as inst:
4550 except OSError as inst:
4551 if inst.errno != errno.ENOENT:
4551 if inst.errno != errno.ENOENT:
4552 raise
4552 raise
4553
4553
4554 for f in tocomplete:
4554 for f in tocomplete:
4555 try:
4555 try:
4556 # resolve file
4556 # resolve file
4557 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4557 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4558 with ui.configoverride(overrides, 'resolve'):
4558 with ui.configoverride(overrides, 'resolve'):
4559 r = ms.resolve(f, wctx)
4559 r = ms.resolve(f, wctx)
4560 if r:
4560 if r:
4561 ret = 1
4561 ret = 1
4562 finally:
4562 finally:
4563 ms.commit()
4563 ms.commit()
4564
4564
4565 # replace filemerge's .orig file with our resolve file
4565 # replace filemerge's .orig file with our resolve file
4566 a = repo.wjoin(f)
4566 a = repo.wjoin(f)
4567 try:
4567 try:
4568 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4568 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4569 except OSError as inst:
4569 except OSError as inst:
4570 if inst.errno != errno.ENOENT:
4570 if inst.errno != errno.ENOENT:
4571 raise
4571 raise
4572
4572
4573 ms.commit()
4573 ms.commit()
4574 ms.recordactions()
4574 ms.recordactions()
4575
4575
4576 if not didwork and pats:
4576 if not didwork and pats:
4577 hint = None
4577 hint = None
4578 if not any([p for p in pats if p.find(':') >= 0]):
4578 if not any([p for p in pats if p.find(':') >= 0]):
4579 pats = ['path:%s' % p for p in pats]
4579 pats = ['path:%s' % p for p in pats]
4580 m = scmutil.match(wctx, pats, opts)
4580 m = scmutil.match(wctx, pats, opts)
4581 for f in ms:
4581 for f in ms:
4582 if not m(f):
4582 if not m(f):
4583 continue
4583 continue
4584 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4584 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4585 if opts.get(o)])
4585 if opts.get(o)])
4586 hint = _("(try: hg resolve %s%s)\n") % (
4586 hint = _("(try: hg resolve %s%s)\n") % (
4587 flags,
4587 flags,
4588 ' '.join(pats))
4588 ' '.join(pats))
4589 break
4589 break
4590 ui.warn(_("arguments do not match paths that need resolving\n"))
4590 ui.warn(_("arguments do not match paths that need resolving\n"))
4591 if hint:
4591 if hint:
4592 ui.warn(hint)
4592 ui.warn(hint)
4593 elif ms.mergedriver and ms.mdstate() != 's':
4593 elif ms.mergedriver and ms.mdstate() != 's':
4594 # run conclude step when either a driver-resolved file is requested
4594 # run conclude step when either a driver-resolved file is requested
4595 # or there are no driver-resolved files
4595 # or there are no driver-resolved files
4596 # we can't use 'ret' to determine whether any files are unresolved
4596 # we can't use 'ret' to determine whether any files are unresolved
4597 # because we might not have tried to resolve some
4597 # because we might not have tried to resolve some
4598 if ((runconclude or not list(ms.driverresolved()))
4598 if ((runconclude or not list(ms.driverresolved()))
4599 and not list(ms.unresolved())):
4599 and not list(ms.unresolved())):
4600 proceed = mergemod.driverconclude(repo, ms, wctx)
4600 proceed = mergemod.driverconclude(repo, ms, wctx)
4601 ms.commit()
4601 ms.commit()
4602 if not proceed:
4602 if not proceed:
4603 return 1
4603 return 1
4604
4604
4605 # Nudge users into finishing an unfinished operation
4605 # Nudge users into finishing an unfinished operation
4606 unresolvedf = list(ms.unresolved())
4606 unresolvedf = list(ms.unresolved())
4607 driverresolvedf = list(ms.driverresolved())
4607 driverresolvedf = list(ms.driverresolved())
4608 if not unresolvedf and not driverresolvedf:
4608 if not unresolvedf and not driverresolvedf:
4609 ui.status(_('(no more unresolved files)\n'))
4609 ui.status(_('(no more unresolved files)\n'))
4610 cmdutil.checkafterresolved(repo)
4610 cmdutil.checkafterresolved(repo)
4611 elif not unresolvedf:
4611 elif not unresolvedf:
4612 ui.status(_('(no more unresolved files -- '
4612 ui.status(_('(no more unresolved files -- '
4613 'run "hg resolve --all" to conclude)\n'))
4613 'run "hg resolve --all" to conclude)\n'))
4614
4614
4615 return ret
4615 return ret
4616
4616
4617 @command('revert',
4617 @command('revert',
4618 [('a', 'all', None, _('revert all changes when no arguments given')),
4618 [('a', 'all', None, _('revert all changes when no arguments given')),
4619 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4619 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4620 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4620 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4621 ('C', 'no-backup', None, _('do not save backup copies of files')),
4621 ('C', 'no-backup', None, _('do not save backup copies of files')),
4622 ('i', 'interactive', None, _('interactively select the changes')),
4622 ('i', 'interactive', None, _('interactively select the changes')),
4623 ] + walkopts + dryrunopts,
4623 ] + walkopts + dryrunopts,
4624 _('[OPTION]... [-r REV] [NAME]...'))
4624 _('[OPTION]... [-r REV] [NAME]...'))
4625 def revert(ui, repo, *pats, **opts):
4625 def revert(ui, repo, *pats, **opts):
4626 """restore files to their checkout state
4626 """restore files to their checkout state
4627
4627
4628 .. note::
4628 .. note::
4629
4629
4630 To check out earlier revisions, you should use :hg:`update REV`.
4630 To check out earlier revisions, you should use :hg:`update REV`.
4631 To cancel an uncommitted merge (and lose your changes),
4631 To cancel an uncommitted merge (and lose your changes),
4632 use :hg:`merge --abort`.
4632 use :hg:`merge --abort`.
4633
4633
4634 With no revision specified, revert the specified files or directories
4634 With no revision specified, revert the specified files or directories
4635 to the contents they had in the parent of the working directory.
4635 to the contents they had in the parent of the working directory.
4636 This restores the contents of files to an unmodified
4636 This restores the contents of files to an unmodified
4637 state and unschedules adds, removes, copies, and renames. If the
4637 state and unschedules adds, removes, copies, and renames. If the
4638 working directory has two parents, you must explicitly specify a
4638 working directory has two parents, you must explicitly specify a
4639 revision.
4639 revision.
4640
4640
4641 Using the -r/--rev or -d/--date options, revert the given files or
4641 Using the -r/--rev or -d/--date options, revert the given files or
4642 directories to their states as of a specific revision. Because
4642 directories to their states as of a specific revision. Because
4643 revert does not change the working directory parents, this will
4643 revert does not change the working directory parents, this will
4644 cause these files to appear modified. This can be helpful to "back
4644 cause these files to appear modified. This can be helpful to "back
4645 out" some or all of an earlier change. See :hg:`backout` for a
4645 out" some or all of an earlier change. See :hg:`backout` for a
4646 related method.
4646 related method.
4647
4647
4648 Modified files are saved with a .orig suffix before reverting.
4648 Modified files are saved with a .orig suffix before reverting.
4649 To disable these backups, use --no-backup. It is possible to store
4649 To disable these backups, use --no-backup. It is possible to store
4650 the backup files in a custom directory relative to the root of the
4650 the backup files in a custom directory relative to the root of the
4651 repository by setting the ``ui.origbackuppath`` configuration
4651 repository by setting the ``ui.origbackuppath`` configuration
4652 option.
4652 option.
4653
4653
4654 See :hg:`help dates` for a list of formats valid for -d/--date.
4654 See :hg:`help dates` for a list of formats valid for -d/--date.
4655
4655
4656 See :hg:`help backout` for a way to reverse the effect of an
4656 See :hg:`help backout` for a way to reverse the effect of an
4657 earlier changeset.
4657 earlier changeset.
4658
4658
4659 Returns 0 on success.
4659 Returns 0 on success.
4660 """
4660 """
4661
4661
4662 opts = pycompat.byteskwargs(opts)
4662 opts = pycompat.byteskwargs(opts)
4663 if opts.get("date"):
4663 if opts.get("date"):
4664 if opts.get("rev"):
4664 if opts.get("rev"):
4665 raise error.Abort(_("you can't specify a revision and a date"))
4665 raise error.Abort(_("you can't specify a revision and a date"))
4666 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4666 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4667
4667
4668 parent, p2 = repo.dirstate.parents()
4668 parent, p2 = repo.dirstate.parents()
4669 if not opts.get('rev') and p2 != nullid:
4669 if not opts.get('rev') and p2 != nullid:
4670 # revert after merge is a trap for new users (issue2915)
4670 # revert after merge is a trap for new users (issue2915)
4671 raise error.Abort(_('uncommitted merge with no revision specified'),
4671 raise error.Abort(_('uncommitted merge with no revision specified'),
4672 hint=_("use 'hg update' or see 'hg help revert'"))
4672 hint=_("use 'hg update' or see 'hg help revert'"))
4673
4673
4674 rev = opts.get('rev')
4674 rev = opts.get('rev')
4675 if rev:
4675 if rev:
4676 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4676 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4677 ctx = scmutil.revsingle(repo, rev)
4677 ctx = scmutil.revsingle(repo, rev)
4678
4678
4679 if (not (pats or opts.get('include') or opts.get('exclude') or
4679 if (not (pats or opts.get('include') or opts.get('exclude') or
4680 opts.get('all') or opts.get('interactive'))):
4680 opts.get('all') or opts.get('interactive'))):
4681 msg = _("no files or directories specified")
4681 msg = _("no files or directories specified")
4682 if p2 != nullid:
4682 if p2 != nullid:
4683 hint = _("uncommitted merge, use --all to discard all changes,"
4683 hint = _("uncommitted merge, use --all to discard all changes,"
4684 " or 'hg update -C .' to abort the merge")
4684 " or 'hg update -C .' to abort the merge")
4685 raise error.Abort(msg, hint=hint)
4685 raise error.Abort(msg, hint=hint)
4686 dirty = any(repo.status())
4686 dirty = any(repo.status())
4687 node = ctx.node()
4687 node = ctx.node()
4688 if node != parent:
4688 if node != parent:
4689 if dirty:
4689 if dirty:
4690 hint = _("uncommitted changes, use --all to discard all"
4690 hint = _("uncommitted changes, use --all to discard all"
4691 " changes, or 'hg update %s' to update") % ctx.rev()
4691 " changes, or 'hg update %s' to update") % ctx.rev()
4692 else:
4692 else:
4693 hint = _("use --all to revert all files,"
4693 hint = _("use --all to revert all files,"
4694 " or 'hg update %s' to update") % ctx.rev()
4694 " or 'hg update %s' to update") % ctx.rev()
4695 elif dirty:
4695 elif dirty:
4696 hint = _("uncommitted changes, use --all to discard all changes")
4696 hint = _("uncommitted changes, use --all to discard all changes")
4697 else:
4697 else:
4698 hint = _("use --all to revert all files")
4698 hint = _("use --all to revert all files")
4699 raise error.Abort(msg, hint=hint)
4699 raise error.Abort(msg, hint=hint)
4700
4700
4701 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4701 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
4702 **pycompat.strkwargs(opts))
4702 **pycompat.strkwargs(opts))
4703
4703
4704 @command('rollback', dryrunopts +
4704 @command('rollback', dryrunopts +
4705 [('f', 'force', False, _('ignore safety measures'))])
4705 [('f', 'force', False, _('ignore safety measures'))])
4706 def rollback(ui, repo, **opts):
4706 def rollback(ui, repo, **opts):
4707 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4707 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4708
4708
4709 Please use :hg:`commit --amend` instead of rollback to correct
4709 Please use :hg:`commit --amend` instead of rollback to correct
4710 mistakes in the last commit.
4710 mistakes in the last commit.
4711
4711
4712 This command should be used with care. There is only one level of
4712 This command should be used with care. There is only one level of
4713 rollback, and there is no way to undo a rollback. It will also
4713 rollback, and there is no way to undo a rollback. It will also
4714 restore the dirstate at the time of the last transaction, losing
4714 restore the dirstate at the time of the last transaction, losing
4715 any dirstate changes since that time. This command does not alter
4715 any dirstate changes since that time. This command does not alter
4716 the working directory.
4716 the working directory.
4717
4717
4718 Transactions are used to encapsulate the effects of all commands
4718 Transactions are used to encapsulate the effects of all commands
4719 that create new changesets or propagate existing changesets into a
4719 that create new changesets or propagate existing changesets into a
4720 repository.
4720 repository.
4721
4721
4722 .. container:: verbose
4722 .. container:: verbose
4723
4723
4724 For example, the following commands are transactional, and their
4724 For example, the following commands are transactional, and their
4725 effects can be rolled back:
4725 effects can be rolled back:
4726
4726
4727 - commit
4727 - commit
4728 - import
4728 - import
4729 - pull
4729 - pull
4730 - push (with this repository as the destination)
4730 - push (with this repository as the destination)
4731 - unbundle
4731 - unbundle
4732
4732
4733 To avoid permanent data loss, rollback will refuse to rollback a
4733 To avoid permanent data loss, rollback will refuse to rollback a
4734 commit transaction if it isn't checked out. Use --force to
4734 commit transaction if it isn't checked out. Use --force to
4735 override this protection.
4735 override this protection.
4736
4736
4737 The rollback command can be entirely disabled by setting the
4737 The rollback command can be entirely disabled by setting the
4738 ``ui.rollback`` configuration setting to false. If you're here
4738 ``ui.rollback`` configuration setting to false. If you're here
4739 because you want to use rollback and it's disabled, you can
4739 because you want to use rollback and it's disabled, you can
4740 re-enable the command by setting ``ui.rollback`` to true.
4740 re-enable the command by setting ``ui.rollback`` to true.
4741
4741
4742 This command is not intended for use on public repositories. Once
4742 This command is not intended for use on public repositories. Once
4743 changes are visible for pull by other users, rolling a transaction
4743 changes are visible for pull by other users, rolling a transaction
4744 back locally is ineffective (someone else may already have pulled
4744 back locally is ineffective (someone else may already have pulled
4745 the changes). Furthermore, a race is possible with readers of the
4745 the changes). Furthermore, a race is possible with readers of the
4746 repository; for example an in-progress pull from the repository
4746 repository; for example an in-progress pull from the repository
4747 may fail if a rollback is performed.
4747 may fail if a rollback is performed.
4748
4748
4749 Returns 0 on success, 1 if no rollback data is available.
4749 Returns 0 on success, 1 if no rollback data is available.
4750 """
4750 """
4751 if not ui.configbool('ui', 'rollback'):
4751 if not ui.configbool('ui', 'rollback'):
4752 raise error.Abort(_('rollback is disabled because it is unsafe'),
4752 raise error.Abort(_('rollback is disabled because it is unsafe'),
4753 hint=('see `hg help -v rollback` for information'))
4753 hint=('see `hg help -v rollback` for information'))
4754 return repo.rollback(dryrun=opts.get(r'dry_run'),
4754 return repo.rollback(dryrun=opts.get(r'dry_run'),
4755 force=opts.get(r'force'))
4755 force=opts.get(r'force'))
4756
4756
4757 @command('root', [], intents={INTENT_READONLY})
4757 @command('root', [], intents={INTENT_READONLY})
4758 def root(ui, repo):
4758 def root(ui, repo):
4759 """print the root (top) of the current working directory
4759 """print the root (top) of the current working directory
4760
4760
4761 Print the root directory of the current repository.
4761 Print the root directory of the current repository.
4762
4762
4763 Returns 0 on success.
4763 Returns 0 on success.
4764 """
4764 """
4765 ui.write(repo.root + "\n")
4765 ui.write(repo.root + "\n")
4766
4766
4767 @command('^serve',
4767 @command('^serve',
4768 [('A', 'accesslog', '', _('name of access log file to write to'),
4768 [('A', 'accesslog', '', _('name of access log file to write to'),
4769 _('FILE')),
4769 _('FILE')),
4770 ('d', 'daemon', None, _('run server in background')),
4770 ('d', 'daemon', None, _('run server in background')),
4771 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4771 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4772 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4772 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4773 # use string type, then we can check if something was passed
4773 # use string type, then we can check if something was passed
4774 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4774 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4775 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4775 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4776 _('ADDR')),
4776 _('ADDR')),
4777 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4777 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4778 _('PREFIX')),
4778 _('PREFIX')),
4779 ('n', 'name', '',
4779 ('n', 'name', '',
4780 _('name to show in web pages (default: working directory)'), _('NAME')),
4780 _('name to show in web pages (default: working directory)'), _('NAME')),
4781 ('', 'web-conf', '',
4781 ('', 'web-conf', '',
4782 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4782 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4783 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4783 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4784 _('FILE')),
4784 _('FILE')),
4785 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4785 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4786 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4786 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4787 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4787 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4788 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4788 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4789 ('', 'style', '', _('template style to use'), _('STYLE')),
4789 ('', 'style', '', _('template style to use'), _('STYLE')),
4790 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4790 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4791 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4791 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
4792 ('', 'print-url', None, _('start and print only the URL'))]
4792 ('', 'print-url', None, _('start and print only the URL'))]
4793 + subrepoopts,
4793 + subrepoopts,
4794 _('[OPTION]...'),
4794 _('[OPTION]...'),
4795 optionalrepo=True)
4795 optionalrepo=True)
4796 def serve(ui, repo, **opts):
4796 def serve(ui, repo, **opts):
4797 """start stand-alone webserver
4797 """start stand-alone webserver
4798
4798
4799 Start a local HTTP repository browser and pull server. You can use
4799 Start a local HTTP repository browser and pull server. You can use
4800 this for ad-hoc sharing and browsing of repositories. It is
4800 this for ad-hoc sharing and browsing of repositories. It is
4801 recommended to use a real web server to serve a repository for
4801 recommended to use a real web server to serve a repository for
4802 longer periods of time.
4802 longer periods of time.
4803
4803
4804 Please note that the server does not implement access control.
4804 Please note that the server does not implement access control.
4805 This means that, by default, anybody can read from the server and
4805 This means that, by default, anybody can read from the server and
4806 nobody can write to it by default. Set the ``web.allow-push``
4806 nobody can write to it by default. Set the ``web.allow-push``
4807 option to ``*`` to allow everybody to push to the server. You
4807 option to ``*`` to allow everybody to push to the server. You
4808 should use a real web server if you need to authenticate users.
4808 should use a real web server if you need to authenticate users.
4809
4809
4810 By default, the server logs accesses to stdout and errors to
4810 By default, the server logs accesses to stdout and errors to
4811 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4811 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4812 files.
4812 files.
4813
4813
4814 To have the server choose a free port number to listen on, specify
4814 To have the server choose a free port number to listen on, specify
4815 a port number of 0; in this case, the server will print the port
4815 a port number of 0; in this case, the server will print the port
4816 number it uses.
4816 number it uses.
4817
4817
4818 Returns 0 on success.
4818 Returns 0 on success.
4819 """
4819 """
4820
4820
4821 opts = pycompat.byteskwargs(opts)
4821 opts = pycompat.byteskwargs(opts)
4822 if opts["stdio"] and opts["cmdserver"]:
4822 if opts["stdio"] and opts["cmdserver"]:
4823 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4823 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4824 if opts["print_url"] and ui.verbose:
4824 if opts["print_url"] and ui.verbose:
4825 raise error.Abort(_("cannot use --print-url with --verbose"))
4825 raise error.Abort(_("cannot use --print-url with --verbose"))
4826
4826
4827 if opts["stdio"]:
4827 if opts["stdio"]:
4828 if repo is None:
4828 if repo is None:
4829 raise error.RepoError(_("there is no Mercurial repository here"
4829 raise error.RepoError(_("there is no Mercurial repository here"
4830 " (.hg not found)"))
4830 " (.hg not found)"))
4831 s = wireprotoserver.sshserver(ui, repo)
4831 s = wireprotoserver.sshserver(ui, repo)
4832 s.serve_forever()
4832 s.serve_forever()
4833
4833
4834 service = server.createservice(ui, repo, opts)
4834 service = server.createservice(ui, repo, opts)
4835 return server.runservice(opts, initfn=service.init, runfn=service.run)
4835 return server.runservice(opts, initfn=service.init, runfn=service.run)
4836
4836
4837 _NOTTERSE = 'nothing'
4837 _NOTTERSE = 'nothing'
4838
4838
4839 @command('^status|st',
4839 @command('^status|st',
4840 [('A', 'all', None, _('show status of all files')),
4840 [('A', 'all', None, _('show status of all files')),
4841 ('m', 'modified', None, _('show only modified files')),
4841 ('m', 'modified', None, _('show only modified files')),
4842 ('a', 'added', None, _('show only added files')),
4842 ('a', 'added', None, _('show only added files')),
4843 ('r', 'removed', None, _('show only removed files')),
4843 ('r', 'removed', None, _('show only removed files')),
4844 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4844 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4845 ('c', 'clean', None, _('show only files without changes')),
4845 ('c', 'clean', None, _('show only files without changes')),
4846 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4846 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4847 ('i', 'ignored', None, _('show only ignored files')),
4847 ('i', 'ignored', None, _('show only ignored files')),
4848 ('n', 'no-status', None, _('hide status prefix')),
4848 ('n', 'no-status', None, _('hide status prefix')),
4849 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
4849 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
4850 ('C', 'copies', None, _('show source of copied files')),
4850 ('C', 'copies', None, _('show source of copied files')),
4851 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4851 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4852 ('', 'rev', [], _('show difference from revision'), _('REV')),
4852 ('', 'rev', [], _('show difference from revision'), _('REV')),
4853 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4853 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4854 ] + walkopts + subrepoopts + formatteropts,
4854 ] + walkopts + subrepoopts + formatteropts,
4855 _('[OPTION]... [FILE]...'),
4855 _('[OPTION]... [FILE]...'),
4856 inferrepo=True,
4856 inferrepo=True,
4857 intents={INTENT_READONLY})
4857 intents={INTENT_READONLY})
4858 def status(ui, repo, *pats, **opts):
4858 def status(ui, repo, *pats, **opts):
4859 """show changed files in the working directory
4859 """show changed files in the working directory
4860
4860
4861 Show status of files in the repository. If names are given, only
4861 Show status of files in the repository. If names are given, only
4862 files that match are shown. Files that are clean or ignored or
4862 files that match are shown. Files that are clean or ignored or
4863 the source of a copy/move operation, are not listed unless
4863 the source of a copy/move operation, are not listed unless
4864 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4864 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4865 Unless options described with "show only ..." are given, the
4865 Unless options described with "show only ..." are given, the
4866 options -mardu are used.
4866 options -mardu are used.
4867
4867
4868 Option -q/--quiet hides untracked (unknown and ignored) files
4868 Option -q/--quiet hides untracked (unknown and ignored) files
4869 unless explicitly requested with -u/--unknown or -i/--ignored.
4869 unless explicitly requested with -u/--unknown or -i/--ignored.
4870
4870
4871 .. note::
4871 .. note::
4872
4872
4873 :hg:`status` may appear to disagree with diff if permissions have
4873 :hg:`status` may appear to disagree with diff if permissions have
4874 changed or a merge has occurred. The standard diff format does
4874 changed or a merge has occurred. The standard diff format does
4875 not report permission changes and diff only reports changes
4875 not report permission changes and diff only reports changes
4876 relative to one merge parent.
4876 relative to one merge parent.
4877
4877
4878 If one revision is given, it is used as the base revision.
4878 If one revision is given, it is used as the base revision.
4879 If two revisions are given, the differences between them are
4879 If two revisions are given, the differences between them are
4880 shown. The --change option can also be used as a shortcut to list
4880 shown. The --change option can also be used as a shortcut to list
4881 the changed files of a revision from its first parent.
4881 the changed files of a revision from its first parent.
4882
4882
4883 The codes used to show the status of files are::
4883 The codes used to show the status of files are::
4884
4884
4885 M = modified
4885 M = modified
4886 A = added
4886 A = added
4887 R = removed
4887 R = removed
4888 C = clean
4888 C = clean
4889 ! = missing (deleted by non-hg command, but still tracked)
4889 ! = missing (deleted by non-hg command, but still tracked)
4890 ? = not tracked
4890 ? = not tracked
4891 I = ignored
4891 I = ignored
4892 = origin of the previous file (with --copies)
4892 = origin of the previous file (with --copies)
4893
4893
4894 .. container:: verbose
4894 .. container:: verbose
4895
4895
4896 The -t/--terse option abbreviates the output by showing only the directory
4896 The -t/--terse option abbreviates the output by showing only the directory
4897 name if all the files in it share the same status. The option takes an
4897 name if all the files in it share the same status. The option takes an
4898 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4898 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
4899 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4899 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
4900 for 'ignored' and 'c' for clean.
4900 for 'ignored' and 'c' for clean.
4901
4901
4902 It abbreviates only those statuses which are passed. Note that clean and
4902 It abbreviates only those statuses which are passed. Note that clean and
4903 ignored files are not displayed with '--terse ic' unless the -c/--clean
4903 ignored files are not displayed with '--terse ic' unless the -c/--clean
4904 and -i/--ignored options are also used.
4904 and -i/--ignored options are also used.
4905
4905
4906 The -v/--verbose option shows information when the repository is in an
4906 The -v/--verbose option shows information when the repository is in an
4907 unfinished merge, shelve, rebase state etc. You can have this behavior
4907 unfinished merge, shelve, rebase state etc. You can have this behavior
4908 turned on by default by enabling the ``commands.status.verbose`` option.
4908 turned on by default by enabling the ``commands.status.verbose`` option.
4909
4909
4910 You can skip displaying some of these states by setting
4910 You can skip displaying some of these states by setting
4911 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4911 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
4912 'histedit', 'merge', 'rebase', or 'unshelve'.
4912 'histedit', 'merge', 'rebase', or 'unshelve'.
4913
4913
4914 Examples:
4914 Examples:
4915
4915
4916 - show changes in the working directory relative to a
4916 - show changes in the working directory relative to a
4917 changeset::
4917 changeset::
4918
4918
4919 hg status --rev 9353
4919 hg status --rev 9353
4920
4920
4921 - show changes in the working directory relative to the
4921 - show changes in the working directory relative to the
4922 current directory (see :hg:`help patterns` for more information)::
4922 current directory (see :hg:`help patterns` for more information)::
4923
4923
4924 hg status re:
4924 hg status re:
4925
4925
4926 - show all changes including copies in an existing changeset::
4926 - show all changes including copies in an existing changeset::
4927
4927
4928 hg status --copies --change 9353
4928 hg status --copies --change 9353
4929
4929
4930 - get a NUL separated list of added files, suitable for xargs::
4930 - get a NUL separated list of added files, suitable for xargs::
4931
4931
4932 hg status -an0
4932 hg status -an0
4933
4933
4934 - show more information about the repository status, abbreviating
4934 - show more information about the repository status, abbreviating
4935 added, removed, modified, deleted, and untracked paths::
4935 added, removed, modified, deleted, and untracked paths::
4936
4936
4937 hg status -v -t mardu
4937 hg status -v -t mardu
4938
4938
4939 Returns 0 on success.
4939 Returns 0 on success.
4940
4940
4941 """
4941 """
4942
4942
4943 opts = pycompat.byteskwargs(opts)
4943 opts = pycompat.byteskwargs(opts)
4944 revs = opts.get('rev')
4944 revs = opts.get('rev')
4945 change = opts.get('change')
4945 change = opts.get('change')
4946 terse = opts.get('terse')
4946 terse = opts.get('terse')
4947 if terse is _NOTTERSE:
4947 if terse is _NOTTERSE:
4948 if revs:
4948 if revs:
4949 terse = ''
4949 terse = ''
4950 else:
4950 else:
4951 terse = ui.config('commands', 'status.terse')
4951 terse = ui.config('commands', 'status.terse')
4952
4952
4953 if revs and change:
4953 if revs and change:
4954 msg = _('cannot specify --rev and --change at the same time')
4954 msg = _('cannot specify --rev and --change at the same time')
4955 raise error.Abort(msg)
4955 raise error.Abort(msg)
4956 elif revs and terse:
4956 elif revs and terse:
4957 msg = _('cannot use --terse with --rev')
4957 msg = _('cannot use --terse with --rev')
4958 raise error.Abort(msg)
4958 raise error.Abort(msg)
4959 elif change:
4959 elif change:
4960 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4960 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
4961 ctx2 = scmutil.revsingle(repo, change, None)
4961 ctx2 = scmutil.revsingle(repo, change, None)
4962 ctx1 = ctx2.p1()
4962 ctx1 = ctx2.p1()
4963 else:
4963 else:
4964 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4964 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
4965 ctx1, ctx2 = scmutil.revpair(repo, revs)
4965 ctx1, ctx2 = scmutil.revpair(repo, revs)
4966
4966
4967 if pats or ui.configbool('commands', 'status.relative'):
4967 if pats or ui.configbool('commands', 'status.relative'):
4968 cwd = repo.getcwd()
4968 cwd = repo.getcwd()
4969 else:
4969 else:
4970 cwd = ''
4970 cwd = ''
4971
4971
4972 if opts.get('print0'):
4972 if opts.get('print0'):
4973 end = '\0'
4973 end = '\0'
4974 else:
4974 else:
4975 end = '\n'
4975 end = '\n'
4976 copy = {}
4976 copy = {}
4977 states = 'modified added removed deleted unknown ignored clean'.split()
4977 states = 'modified added removed deleted unknown ignored clean'.split()
4978 show = [k for k in states if opts.get(k)]
4978 show = [k for k in states if opts.get(k)]
4979 if opts.get('all'):
4979 if opts.get('all'):
4980 show += ui.quiet and (states[:4] + ['clean']) or states
4980 show += ui.quiet and (states[:4] + ['clean']) or states
4981
4981
4982 if not show:
4982 if not show:
4983 if ui.quiet:
4983 if ui.quiet:
4984 show = states[:4]
4984 show = states[:4]
4985 else:
4985 else:
4986 show = states[:5]
4986 show = states[:5]
4987
4987
4988 m = scmutil.match(ctx2, pats, opts)
4988 m = scmutil.match(ctx2, pats, opts)
4989 if terse:
4989 if terse:
4990 # we need to compute clean and unknown to terse
4990 # we need to compute clean and unknown to terse
4991 stat = repo.status(ctx1.node(), ctx2.node(), m,
4991 stat = repo.status(ctx1.node(), ctx2.node(), m,
4992 'ignored' in show or 'i' in terse,
4992 'ignored' in show or 'i' in terse,
4993 True, True, opts.get('subrepos'))
4993 True, True, opts.get('subrepos'))
4994
4994
4995 stat = cmdutil.tersedir(stat, terse)
4995 stat = cmdutil.tersedir(stat, terse)
4996 else:
4996 else:
4997 stat = repo.status(ctx1.node(), ctx2.node(), m,
4997 stat = repo.status(ctx1.node(), ctx2.node(), m,
4998 'ignored' in show, 'clean' in show,
4998 'ignored' in show, 'clean' in show,
4999 'unknown' in show, opts.get('subrepos'))
4999 'unknown' in show, opts.get('subrepos'))
5000
5000
5001 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5001 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5002
5002
5003 if (opts.get('all') or opts.get('copies')
5003 if (opts.get('all') or opts.get('copies')
5004 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5004 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5005 copy = copies.pathcopies(ctx1, ctx2, m)
5005 copy = copies.pathcopies(ctx1, ctx2, m)
5006
5006
5007 ui.pager('status')
5007 ui.pager('status')
5008 fm = ui.formatter('status', opts)
5008 fm = ui.formatter('status', opts)
5009 fmt = '%s' + end
5009 fmt = '%s' + end
5010 showchar = not opts.get('no_status')
5010 showchar = not opts.get('no_status')
5011
5011
5012 for state, char, files in changestates:
5012 for state, char, files in changestates:
5013 if state in show:
5013 if state in show:
5014 label = 'status.' + state
5014 label = 'status.' + state
5015 for f in files:
5015 for f in files:
5016 fm.startitem()
5016 fm.startitem()
5017 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5017 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5018 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5018 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5019 if f in copy:
5019 if f in copy:
5020 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5020 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5021 label='status.copied')
5021 label='status.copied')
5022
5022
5023 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5023 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5024 and not ui.plain()):
5024 and not ui.plain()):
5025 cmdutil.morestatus(repo, fm)
5025 cmdutil.morestatus(repo, fm)
5026 fm.end()
5026 fm.end()
5027
5027
5028 @command('^summary|sum',
5028 @command('^summary|sum',
5029 [('', 'remote', None, _('check for push and pull'))],
5029 [('', 'remote', None, _('check for push and pull'))],
5030 '[--remote]',
5030 '[--remote]',
5031 intents={INTENT_READONLY})
5031 intents={INTENT_READONLY})
5032 def summary(ui, repo, **opts):
5032 def summary(ui, repo, **opts):
5033 """summarize working directory state
5033 """summarize working directory state
5034
5034
5035 This generates a brief summary of the working directory state,
5035 This generates a brief summary of the working directory state,
5036 including parents, branch, commit status, phase and available updates.
5036 including parents, branch, commit status, phase and available updates.
5037
5037
5038 With the --remote option, this will check the default paths for
5038 With the --remote option, this will check the default paths for
5039 incoming and outgoing changes. This can be time-consuming.
5039 incoming and outgoing changes. This can be time-consuming.
5040
5040
5041 Returns 0 on success.
5041 Returns 0 on success.
5042 """
5042 """
5043
5043
5044 opts = pycompat.byteskwargs(opts)
5044 opts = pycompat.byteskwargs(opts)
5045 ui.pager('summary')
5045 ui.pager('summary')
5046 ctx = repo[None]
5046 ctx = repo[None]
5047 parents = ctx.parents()
5047 parents = ctx.parents()
5048 pnode = parents[0].node()
5048 pnode = parents[0].node()
5049 marks = []
5049 marks = []
5050
5050
5051 ms = None
5051 ms = None
5052 try:
5052 try:
5053 ms = mergemod.mergestate.read(repo)
5053 ms = mergemod.mergestate.read(repo)
5054 except error.UnsupportedMergeRecords as e:
5054 except error.UnsupportedMergeRecords as e:
5055 s = ' '.join(e.recordtypes)
5055 s = ' '.join(e.recordtypes)
5056 ui.warn(
5056 ui.warn(
5057 _('warning: merge state has unsupported record types: %s\n') % s)
5057 _('warning: merge state has unsupported record types: %s\n') % s)
5058 unresolved = []
5058 unresolved = []
5059 else:
5059 else:
5060 unresolved = list(ms.unresolved())
5060 unresolved = list(ms.unresolved())
5061
5061
5062 for p in parents:
5062 for p in parents:
5063 # label with log.changeset (instead of log.parent) since this
5063 # label with log.changeset (instead of log.parent) since this
5064 # shows a working directory parent *changeset*:
5064 # shows a working directory parent *changeset*:
5065 # i18n: column positioning for "hg summary"
5065 # i18n: column positioning for "hg summary"
5066 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5066 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5067 label=logcmdutil.changesetlabels(p))
5067 label=logcmdutil.changesetlabels(p))
5068 ui.write(' '.join(p.tags()), label='log.tag')
5068 ui.write(' '.join(p.tags()), label='log.tag')
5069 if p.bookmarks():
5069 if p.bookmarks():
5070 marks.extend(p.bookmarks())
5070 marks.extend(p.bookmarks())
5071 if p.rev() == -1:
5071 if p.rev() == -1:
5072 if not len(repo):
5072 if not len(repo):
5073 ui.write(_(' (empty repository)'))
5073 ui.write(_(' (empty repository)'))
5074 else:
5074 else:
5075 ui.write(_(' (no revision checked out)'))
5075 ui.write(_(' (no revision checked out)'))
5076 if p.obsolete():
5076 if p.obsolete():
5077 ui.write(_(' (obsolete)'))
5077 ui.write(_(' (obsolete)'))
5078 if p.isunstable():
5078 if p.isunstable():
5079 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5079 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5080 for instability in p.instabilities())
5080 for instability in p.instabilities())
5081 ui.write(' ('
5081 ui.write(' ('
5082 + ', '.join(instabilities)
5082 + ', '.join(instabilities)
5083 + ')')
5083 + ')')
5084 ui.write('\n')
5084 ui.write('\n')
5085 if p.description():
5085 if p.description():
5086 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5086 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5087 label='log.summary')
5087 label='log.summary')
5088
5088
5089 branch = ctx.branch()
5089 branch = ctx.branch()
5090 bheads = repo.branchheads(branch)
5090 bheads = repo.branchheads(branch)
5091 # i18n: column positioning for "hg summary"
5091 # i18n: column positioning for "hg summary"
5092 m = _('branch: %s\n') % branch
5092 m = _('branch: %s\n') % branch
5093 if branch != 'default':
5093 if branch != 'default':
5094 ui.write(m, label='log.branch')
5094 ui.write(m, label='log.branch')
5095 else:
5095 else:
5096 ui.status(m, label='log.branch')
5096 ui.status(m, label='log.branch')
5097
5097
5098 if marks:
5098 if marks:
5099 active = repo._activebookmark
5099 active = repo._activebookmark
5100 # i18n: column positioning for "hg summary"
5100 # i18n: column positioning for "hg summary"
5101 ui.write(_('bookmarks:'), label='log.bookmark')
5101 ui.write(_('bookmarks:'), label='log.bookmark')
5102 if active is not None:
5102 if active is not None:
5103 if active in marks:
5103 if active in marks:
5104 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5104 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5105 marks.remove(active)
5105 marks.remove(active)
5106 else:
5106 else:
5107 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5107 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5108 for m in marks:
5108 for m in marks:
5109 ui.write(' ' + m, label='log.bookmark')
5109 ui.write(' ' + m, label='log.bookmark')
5110 ui.write('\n', label='log.bookmark')
5110 ui.write('\n', label='log.bookmark')
5111
5111
5112 status = repo.status(unknown=True)
5112 status = repo.status(unknown=True)
5113
5113
5114 c = repo.dirstate.copies()
5114 c = repo.dirstate.copies()
5115 copied, renamed = [], []
5115 copied, renamed = [], []
5116 for d, s in c.iteritems():
5116 for d, s in c.iteritems():
5117 if s in status.removed:
5117 if s in status.removed:
5118 status.removed.remove(s)
5118 status.removed.remove(s)
5119 renamed.append(d)
5119 renamed.append(d)
5120 else:
5120 else:
5121 copied.append(d)
5121 copied.append(d)
5122 if d in status.added:
5122 if d in status.added:
5123 status.added.remove(d)
5123 status.added.remove(d)
5124
5124
5125 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5125 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5126
5126
5127 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5127 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5128 (ui.label(_('%d added'), 'status.added'), status.added),
5128 (ui.label(_('%d added'), 'status.added'), status.added),
5129 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5129 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5130 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5130 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5131 (ui.label(_('%d copied'), 'status.copied'), copied),
5131 (ui.label(_('%d copied'), 'status.copied'), copied),
5132 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5132 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5133 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5133 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5134 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5134 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5135 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5135 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5136 t = []
5136 t = []
5137 for l, s in labels:
5137 for l, s in labels:
5138 if s:
5138 if s:
5139 t.append(l % len(s))
5139 t.append(l % len(s))
5140
5140
5141 t = ', '.join(t)
5141 t = ', '.join(t)
5142 cleanworkdir = False
5142 cleanworkdir = False
5143
5143
5144 if repo.vfs.exists('graftstate'):
5144 if repo.vfs.exists('graftstate'):
5145 t += _(' (graft in progress)')
5145 t += _(' (graft in progress)')
5146 if repo.vfs.exists('updatestate'):
5146 if repo.vfs.exists('updatestate'):
5147 t += _(' (interrupted update)')
5147 t += _(' (interrupted update)')
5148 elif len(parents) > 1:
5148 elif len(parents) > 1:
5149 t += _(' (merge)')
5149 t += _(' (merge)')
5150 elif branch != parents[0].branch():
5150 elif branch != parents[0].branch():
5151 t += _(' (new branch)')
5151 t += _(' (new branch)')
5152 elif (parents[0].closesbranch() and
5152 elif (parents[0].closesbranch() and
5153 pnode in repo.branchheads(branch, closed=True)):
5153 pnode in repo.branchheads(branch, closed=True)):
5154 t += _(' (head closed)')
5154 t += _(' (head closed)')
5155 elif not (status.modified or status.added or status.removed or renamed or
5155 elif not (status.modified or status.added or status.removed or renamed or
5156 copied or subs):
5156 copied or subs):
5157 t += _(' (clean)')
5157 t += _(' (clean)')
5158 cleanworkdir = True
5158 cleanworkdir = True
5159 elif pnode not in bheads:
5159 elif pnode not in bheads:
5160 t += _(' (new branch head)')
5160 t += _(' (new branch head)')
5161
5161
5162 if parents:
5162 if parents:
5163 pendingphase = max(p.phase() for p in parents)
5163 pendingphase = max(p.phase() for p in parents)
5164 else:
5164 else:
5165 pendingphase = phases.public
5165 pendingphase = phases.public
5166
5166
5167 if pendingphase > phases.newcommitphase(ui):
5167 if pendingphase > phases.newcommitphase(ui):
5168 t += ' (%s)' % phases.phasenames[pendingphase]
5168 t += ' (%s)' % phases.phasenames[pendingphase]
5169
5169
5170 if cleanworkdir:
5170 if cleanworkdir:
5171 # i18n: column positioning for "hg summary"
5171 # i18n: column positioning for "hg summary"
5172 ui.status(_('commit: %s\n') % t.strip())
5172 ui.status(_('commit: %s\n') % t.strip())
5173 else:
5173 else:
5174 # i18n: column positioning for "hg summary"
5174 # i18n: column positioning for "hg summary"
5175 ui.write(_('commit: %s\n') % t.strip())
5175 ui.write(_('commit: %s\n') % t.strip())
5176
5176
5177 # all ancestors of branch heads - all ancestors of parent = new csets
5177 # all ancestors of branch heads - all ancestors of parent = new csets
5178 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5178 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5179 bheads))
5179 bheads))
5180
5180
5181 if new == 0:
5181 if new == 0:
5182 # i18n: column positioning for "hg summary"
5182 # i18n: column positioning for "hg summary"
5183 ui.status(_('update: (current)\n'))
5183 ui.status(_('update: (current)\n'))
5184 elif pnode not in bheads:
5184 elif pnode not in bheads:
5185 # i18n: column positioning for "hg summary"
5185 # i18n: column positioning for "hg summary"
5186 ui.write(_('update: %d new changesets (update)\n') % new)
5186 ui.write(_('update: %d new changesets (update)\n') % new)
5187 else:
5187 else:
5188 # i18n: column positioning for "hg summary"
5188 # i18n: column positioning for "hg summary"
5189 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5189 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5190 (new, len(bheads)))
5190 (new, len(bheads)))
5191
5191
5192 t = []
5192 t = []
5193 draft = len(repo.revs('draft()'))
5193 draft = len(repo.revs('draft()'))
5194 if draft:
5194 if draft:
5195 t.append(_('%d draft') % draft)
5195 t.append(_('%d draft') % draft)
5196 secret = len(repo.revs('secret()'))
5196 secret = len(repo.revs('secret()'))
5197 if secret:
5197 if secret:
5198 t.append(_('%d secret') % secret)
5198 t.append(_('%d secret') % secret)
5199
5199
5200 if draft or secret:
5200 if draft or secret:
5201 ui.status(_('phases: %s\n') % ', '.join(t))
5201 ui.status(_('phases: %s\n') % ', '.join(t))
5202
5202
5203 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5203 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5204 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5204 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5205 numtrouble = len(repo.revs(trouble + "()"))
5205 numtrouble = len(repo.revs(trouble + "()"))
5206 # We write all the possibilities to ease translation
5206 # We write all the possibilities to ease translation
5207 troublemsg = {
5207 troublemsg = {
5208 "orphan": _("orphan: %d changesets"),
5208 "orphan": _("orphan: %d changesets"),
5209 "contentdivergent": _("content-divergent: %d changesets"),
5209 "contentdivergent": _("content-divergent: %d changesets"),
5210 "phasedivergent": _("phase-divergent: %d changesets"),
5210 "phasedivergent": _("phase-divergent: %d changesets"),
5211 }
5211 }
5212 if numtrouble > 0:
5212 if numtrouble > 0:
5213 ui.status(troublemsg[trouble] % numtrouble + "\n")
5213 ui.status(troublemsg[trouble] % numtrouble + "\n")
5214
5214
5215 cmdutil.summaryhooks(ui, repo)
5215 cmdutil.summaryhooks(ui, repo)
5216
5216
5217 if opts.get('remote'):
5217 if opts.get('remote'):
5218 needsincoming, needsoutgoing = True, True
5218 needsincoming, needsoutgoing = True, True
5219 else:
5219 else:
5220 needsincoming, needsoutgoing = False, False
5220 needsincoming, needsoutgoing = False, False
5221 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5221 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5222 if i:
5222 if i:
5223 needsincoming = True
5223 needsincoming = True
5224 if o:
5224 if o:
5225 needsoutgoing = True
5225 needsoutgoing = True
5226 if not needsincoming and not needsoutgoing:
5226 if not needsincoming and not needsoutgoing:
5227 return
5227 return
5228
5228
5229 def getincoming():
5229 def getincoming():
5230 source, branches = hg.parseurl(ui.expandpath('default'))
5230 source, branches = hg.parseurl(ui.expandpath('default'))
5231 sbranch = branches[0]
5231 sbranch = branches[0]
5232 try:
5232 try:
5233 other = hg.peer(repo, {}, source)
5233 other = hg.peer(repo, {}, source)
5234 except error.RepoError:
5234 except error.RepoError:
5235 if opts.get('remote'):
5235 if opts.get('remote'):
5236 raise
5236 raise
5237 return source, sbranch, None, None, None
5237 return source, sbranch, None, None, None
5238 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5238 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5239 if revs:
5239 if revs:
5240 revs = [other.lookup(rev) for rev in revs]
5240 revs = [other.lookup(rev) for rev in revs]
5241 ui.debug('comparing with %s\n' % util.hidepassword(source))
5241 ui.debug('comparing with %s\n' % util.hidepassword(source))
5242 repo.ui.pushbuffer()
5242 repo.ui.pushbuffer()
5243 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5243 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5244 repo.ui.popbuffer()
5244 repo.ui.popbuffer()
5245 return source, sbranch, other, commoninc, commoninc[1]
5245 return source, sbranch, other, commoninc, commoninc[1]
5246
5246
5247 if needsincoming:
5247 if needsincoming:
5248 source, sbranch, sother, commoninc, incoming = getincoming()
5248 source, sbranch, sother, commoninc, incoming = getincoming()
5249 else:
5249 else:
5250 source = sbranch = sother = commoninc = incoming = None
5250 source = sbranch = sother = commoninc = incoming = None
5251
5251
5252 def getoutgoing():
5252 def getoutgoing():
5253 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5253 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5254 dbranch = branches[0]
5254 dbranch = branches[0]
5255 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5255 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5256 if source != dest:
5256 if source != dest:
5257 try:
5257 try:
5258 dother = hg.peer(repo, {}, dest)
5258 dother = hg.peer(repo, {}, dest)
5259 except error.RepoError:
5259 except error.RepoError:
5260 if opts.get('remote'):
5260 if opts.get('remote'):
5261 raise
5261 raise
5262 return dest, dbranch, None, None
5262 return dest, dbranch, None, None
5263 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5263 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5264 elif sother is None:
5264 elif sother is None:
5265 # there is no explicit destination peer, but source one is invalid
5265 # there is no explicit destination peer, but source one is invalid
5266 return dest, dbranch, None, None
5266 return dest, dbranch, None, None
5267 else:
5267 else:
5268 dother = sother
5268 dother = sother
5269 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5269 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5270 common = None
5270 common = None
5271 else:
5271 else:
5272 common = commoninc
5272 common = commoninc
5273 if revs:
5273 if revs:
5274 revs = [repo.lookup(rev) for rev in revs]
5274 revs = [repo.lookup(rev) for rev in revs]
5275 repo.ui.pushbuffer()
5275 repo.ui.pushbuffer()
5276 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5276 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5277 commoninc=common)
5277 commoninc=common)
5278 repo.ui.popbuffer()
5278 repo.ui.popbuffer()
5279 return dest, dbranch, dother, outgoing
5279 return dest, dbranch, dother, outgoing
5280
5280
5281 if needsoutgoing:
5281 if needsoutgoing:
5282 dest, dbranch, dother, outgoing = getoutgoing()
5282 dest, dbranch, dother, outgoing = getoutgoing()
5283 else:
5283 else:
5284 dest = dbranch = dother = outgoing = None
5284 dest = dbranch = dother = outgoing = None
5285
5285
5286 if opts.get('remote'):
5286 if opts.get('remote'):
5287 t = []
5287 t = []
5288 if incoming:
5288 if incoming:
5289 t.append(_('1 or more incoming'))
5289 t.append(_('1 or more incoming'))
5290 o = outgoing.missing
5290 o = outgoing.missing
5291 if o:
5291 if o:
5292 t.append(_('%d outgoing') % len(o))
5292 t.append(_('%d outgoing') % len(o))
5293 other = dother or sother
5293 other = dother or sother
5294 if 'bookmarks' in other.listkeys('namespaces'):
5294 if 'bookmarks' in other.listkeys('namespaces'):
5295 counts = bookmarks.summary(repo, other)
5295 counts = bookmarks.summary(repo, other)
5296 if counts[0] > 0:
5296 if counts[0] > 0:
5297 t.append(_('%d incoming bookmarks') % counts[0])
5297 t.append(_('%d incoming bookmarks') % counts[0])
5298 if counts[1] > 0:
5298 if counts[1] > 0:
5299 t.append(_('%d outgoing bookmarks') % counts[1])
5299 t.append(_('%d outgoing bookmarks') % counts[1])
5300
5300
5301 if t:
5301 if t:
5302 # i18n: column positioning for "hg summary"
5302 # i18n: column positioning for "hg summary"
5303 ui.write(_('remote: %s\n') % (', '.join(t)))
5303 ui.write(_('remote: %s\n') % (', '.join(t)))
5304 else:
5304 else:
5305 # i18n: column positioning for "hg summary"
5305 # i18n: column positioning for "hg summary"
5306 ui.status(_('remote: (synced)\n'))
5306 ui.status(_('remote: (synced)\n'))
5307
5307
5308 cmdutil.summaryremotehooks(ui, repo, opts,
5308 cmdutil.summaryremotehooks(ui, repo, opts,
5309 ((source, sbranch, sother, commoninc),
5309 ((source, sbranch, sother, commoninc),
5310 (dest, dbranch, dother, outgoing)))
5310 (dest, dbranch, dother, outgoing)))
5311
5311
5312 @command('tag',
5312 @command('tag',
5313 [('f', 'force', None, _('force tag')),
5313 [('f', 'force', None, _('force tag')),
5314 ('l', 'local', None, _('make the tag local')),
5314 ('l', 'local', None, _('make the tag local')),
5315 ('r', 'rev', '', _('revision to tag'), _('REV')),
5315 ('r', 'rev', '', _('revision to tag'), _('REV')),
5316 ('', 'remove', None, _('remove a tag')),
5316 ('', 'remove', None, _('remove a tag')),
5317 # -l/--local is already there, commitopts cannot be used
5317 # -l/--local is already there, commitopts cannot be used
5318 ('e', 'edit', None, _('invoke editor on commit messages')),
5318 ('e', 'edit', None, _('invoke editor on commit messages')),
5319 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5319 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5320 ] + commitopts2,
5320 ] + commitopts2,
5321 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5321 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5322 def tag(ui, repo, name1, *names, **opts):
5322 def tag(ui, repo, name1, *names, **opts):
5323 """add one or more tags for the current or given revision
5323 """add one or more tags for the current or given revision
5324
5324
5325 Name a particular revision using <name>.
5325 Name a particular revision using <name>.
5326
5326
5327 Tags are used to name particular revisions of the repository and are
5327 Tags are used to name particular revisions of the repository and are
5328 very useful to compare different revisions, to go back to significant
5328 very useful to compare different revisions, to go back to significant
5329 earlier versions or to mark branch points as releases, etc. Changing
5329 earlier versions or to mark branch points as releases, etc. Changing
5330 an existing tag is normally disallowed; use -f/--force to override.
5330 an existing tag is normally disallowed; use -f/--force to override.
5331
5331
5332 If no revision is given, the parent of the working directory is
5332 If no revision is given, the parent of the working directory is
5333 used.
5333 used.
5334
5334
5335 To facilitate version control, distribution, and merging of tags,
5335 To facilitate version control, distribution, and merging of tags,
5336 they are stored as a file named ".hgtags" which is managed similarly
5336 they are stored as a file named ".hgtags" which is managed similarly
5337 to other project files and can be hand-edited if necessary. This
5337 to other project files and can be hand-edited if necessary. This
5338 also means that tagging creates a new commit. The file
5338 also means that tagging creates a new commit. The file
5339 ".hg/localtags" is used for local tags (not shared among
5339 ".hg/localtags" is used for local tags (not shared among
5340 repositories).
5340 repositories).
5341
5341
5342 Tag commits are usually made at the head of a branch. If the parent
5342 Tag commits are usually made at the head of a branch. If the parent
5343 of the working directory is not a branch head, :hg:`tag` aborts; use
5343 of the working directory is not a branch head, :hg:`tag` aborts; use
5344 -f/--force to force the tag commit to be based on a non-head
5344 -f/--force to force the tag commit to be based on a non-head
5345 changeset.
5345 changeset.
5346
5346
5347 See :hg:`help dates` for a list of formats valid for -d/--date.
5347 See :hg:`help dates` for a list of formats valid for -d/--date.
5348
5348
5349 Since tag names have priority over branch names during revision
5349 Since tag names have priority over branch names during revision
5350 lookup, using an existing branch name as a tag name is discouraged.
5350 lookup, using an existing branch name as a tag name is discouraged.
5351
5351
5352 Returns 0 on success.
5352 Returns 0 on success.
5353 """
5353 """
5354 opts = pycompat.byteskwargs(opts)
5354 opts = pycompat.byteskwargs(opts)
5355 with repo.wlock(), repo.lock():
5355 with repo.wlock(), repo.lock():
5356 rev_ = "."
5356 rev_ = "."
5357 names = [t.strip() for t in (name1,) + names]
5357 names = [t.strip() for t in (name1,) + names]
5358 if len(names) != len(set(names)):
5358 if len(names) != len(set(names)):
5359 raise error.Abort(_('tag names must be unique'))
5359 raise error.Abort(_('tag names must be unique'))
5360 for n in names:
5360 for n in names:
5361 scmutil.checknewlabel(repo, n, 'tag')
5361 scmutil.checknewlabel(repo, n, 'tag')
5362 if not n:
5362 if not n:
5363 raise error.Abort(_('tag names cannot consist entirely of '
5363 raise error.Abort(_('tag names cannot consist entirely of '
5364 'whitespace'))
5364 'whitespace'))
5365 if opts.get('rev') and opts.get('remove'):
5365 if opts.get('rev') and opts.get('remove'):
5366 raise error.Abort(_("--rev and --remove are incompatible"))
5366 raise error.Abort(_("--rev and --remove are incompatible"))
5367 if opts.get('rev'):
5367 if opts.get('rev'):
5368 rev_ = opts['rev']
5368 rev_ = opts['rev']
5369 message = opts.get('message')
5369 message = opts.get('message')
5370 if opts.get('remove'):
5370 if opts.get('remove'):
5371 if opts.get('local'):
5371 if opts.get('local'):
5372 expectedtype = 'local'
5372 expectedtype = 'local'
5373 else:
5373 else:
5374 expectedtype = 'global'
5374 expectedtype = 'global'
5375
5375
5376 for n in names:
5376 for n in names:
5377 if not repo.tagtype(n):
5377 if not repo.tagtype(n):
5378 raise error.Abort(_("tag '%s' does not exist") % n)
5378 raise error.Abort(_("tag '%s' does not exist") % n)
5379 if repo.tagtype(n) != expectedtype:
5379 if repo.tagtype(n) != expectedtype:
5380 if expectedtype == 'global':
5380 if expectedtype == 'global':
5381 raise error.Abort(_("tag '%s' is not a global tag") % n)
5381 raise error.Abort(_("tag '%s' is not a global tag") % n)
5382 else:
5382 else:
5383 raise error.Abort(_("tag '%s' is not a local tag") % n)
5383 raise error.Abort(_("tag '%s' is not a local tag") % n)
5384 rev_ = 'null'
5384 rev_ = 'null'
5385 if not message:
5385 if not message:
5386 # we don't translate commit messages
5386 # we don't translate commit messages
5387 message = 'Removed tag %s' % ', '.join(names)
5387 message = 'Removed tag %s' % ', '.join(names)
5388 elif not opts.get('force'):
5388 elif not opts.get('force'):
5389 for n in names:
5389 for n in names:
5390 if n in repo.tags():
5390 if n in repo.tags():
5391 raise error.Abort(_("tag '%s' already exists "
5391 raise error.Abort(_("tag '%s' already exists "
5392 "(use -f to force)") % n)
5392 "(use -f to force)") % n)
5393 if not opts.get('local'):
5393 if not opts.get('local'):
5394 p1, p2 = repo.dirstate.parents()
5394 p1, p2 = repo.dirstate.parents()
5395 if p2 != nullid:
5395 if p2 != nullid:
5396 raise error.Abort(_('uncommitted merge'))
5396 raise error.Abort(_('uncommitted merge'))
5397 bheads = repo.branchheads()
5397 bheads = repo.branchheads()
5398 if not opts.get('force') and bheads and p1 not in bheads:
5398 if not opts.get('force') and bheads and p1 not in bheads:
5399 raise error.Abort(_('working directory is not at a branch head '
5399 raise error.Abort(_('working directory is not at a branch head '
5400 '(use -f to force)'))
5400 '(use -f to force)'))
5401 node = scmutil.revsingle(repo, rev_).node()
5401 node = scmutil.revsingle(repo, rev_).node()
5402
5402
5403 if not message:
5403 if not message:
5404 # we don't translate commit messages
5404 # we don't translate commit messages
5405 message = ('Added tag %s for changeset %s' %
5405 message = ('Added tag %s for changeset %s' %
5406 (', '.join(names), short(node)))
5406 (', '.join(names), short(node)))
5407
5407
5408 date = opts.get('date')
5408 date = opts.get('date')
5409 if date:
5409 if date:
5410 date = dateutil.parsedate(date)
5410 date = dateutil.parsedate(date)
5411
5411
5412 if opts.get('remove'):
5412 if opts.get('remove'):
5413 editform = 'tag.remove'
5413 editform = 'tag.remove'
5414 else:
5414 else:
5415 editform = 'tag.add'
5415 editform = 'tag.add'
5416 editor = cmdutil.getcommiteditor(editform=editform,
5416 editor = cmdutil.getcommiteditor(editform=editform,
5417 **pycompat.strkwargs(opts))
5417 **pycompat.strkwargs(opts))
5418
5418
5419 # don't allow tagging the null rev
5419 # don't allow tagging the null rev
5420 if (not opts.get('remove') and
5420 if (not opts.get('remove') and
5421 scmutil.revsingle(repo, rev_).rev() == nullrev):
5421 scmutil.revsingle(repo, rev_).rev() == nullrev):
5422 raise error.Abort(_("cannot tag null revision"))
5422 raise error.Abort(_("cannot tag null revision"))
5423
5423
5424 tagsmod.tag(repo, names, node, message, opts.get('local'),
5424 tagsmod.tag(repo, names, node, message, opts.get('local'),
5425 opts.get('user'), date, editor=editor)
5425 opts.get('user'), date, editor=editor)
5426
5426
5427 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5427 @command('tags', formatteropts, '', intents={INTENT_READONLY})
5428 def tags(ui, repo, **opts):
5428 def tags(ui, repo, **opts):
5429 """list repository tags
5429 """list repository tags
5430
5430
5431 This lists both regular and local tags. When the -v/--verbose
5431 This lists both regular and local tags. When the -v/--verbose
5432 switch is used, a third column "local" is printed for local tags.
5432 switch is used, a third column "local" is printed for local tags.
5433 When the -q/--quiet switch is used, only the tag name is printed.
5433 When the -q/--quiet switch is used, only the tag name is printed.
5434
5434
5435 Returns 0 on success.
5435 Returns 0 on success.
5436 """
5436 """
5437
5437
5438 opts = pycompat.byteskwargs(opts)
5438 opts = pycompat.byteskwargs(opts)
5439 ui.pager('tags')
5439 ui.pager('tags')
5440 fm = ui.formatter('tags', opts)
5440 fm = ui.formatter('tags', opts)
5441 contexthint = fm.contexthint('tag rev node type')
5441 hexfunc = fm.hexfunc
5442 hexfunc = fm.hexfunc
5442 tagtype = ""
5443 tagtype = ""
5443
5444
5444 for t, n in reversed(repo.tagslist()):
5445 for t, n in reversed(repo.tagslist()):
5445 hn = hexfunc(n)
5446 hn = hexfunc(n)
5446 label = 'tags.normal'
5447 label = 'tags.normal'
5447 tagtype = ''
5448 tagtype = ''
5448 if repo.tagtype(t) == 'local':
5449 if repo.tagtype(t) == 'local':
5449 label = 'tags.local'
5450 label = 'tags.local'
5450 tagtype = 'local'
5451 tagtype = 'local'
5451
5452
5452 fm.startitem()
5453 fm.startitem()
5454 if 'ctx' in contexthint:
5455 fm.context(ctx=repo[n])
5453 fm.write('tag', '%s', t, label=label)
5456 fm.write('tag', '%s', t, label=label)
5454 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5457 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5455 fm.condwrite(not ui.quiet, 'rev node', fmt,
5458 fm.condwrite(not ui.quiet, 'rev node', fmt,
5456 repo.changelog.rev(n), hn, label=label)
5459 repo.changelog.rev(n), hn, label=label)
5457 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5460 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5458 tagtype, label=label)
5461 tagtype, label=label)
5459 fm.plain('\n')
5462 fm.plain('\n')
5460 fm.end()
5463 fm.end()
5461
5464
5462 @command('tip',
5465 @command('tip',
5463 [('p', 'patch', None, _('show patch')),
5466 [('p', 'patch', None, _('show patch')),
5464 ('g', 'git', None, _('use git extended diff format')),
5467 ('g', 'git', None, _('use git extended diff format')),
5465 ] + templateopts,
5468 ] + templateopts,
5466 _('[-p] [-g]'))
5469 _('[-p] [-g]'))
5467 def tip(ui, repo, **opts):
5470 def tip(ui, repo, **opts):
5468 """show the tip revision (DEPRECATED)
5471 """show the tip revision (DEPRECATED)
5469
5472
5470 The tip revision (usually just called the tip) is the changeset
5473 The tip revision (usually just called the tip) is the changeset
5471 most recently added to the repository (and therefore the most
5474 most recently added to the repository (and therefore the most
5472 recently changed head).
5475 recently changed head).
5473
5476
5474 If you have just made a commit, that commit will be the tip. If
5477 If you have just made a commit, that commit will be the tip. If
5475 you have just pulled changes from another repository, the tip of
5478 you have just pulled changes from another repository, the tip of
5476 that repository becomes the current tip. The "tip" tag is special
5479 that repository becomes the current tip. The "tip" tag is special
5477 and cannot be renamed or assigned to a different changeset.
5480 and cannot be renamed or assigned to a different changeset.
5478
5481
5479 This command is deprecated, please use :hg:`heads` instead.
5482 This command is deprecated, please use :hg:`heads` instead.
5480
5483
5481 Returns 0 on success.
5484 Returns 0 on success.
5482 """
5485 """
5483 opts = pycompat.byteskwargs(opts)
5486 opts = pycompat.byteskwargs(opts)
5484 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5487 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5485 displayer.show(repo['tip'])
5488 displayer.show(repo['tip'])
5486 displayer.close()
5489 displayer.close()
5487
5490
5488 @command('unbundle',
5491 @command('unbundle',
5489 [('u', 'update', None,
5492 [('u', 'update', None,
5490 _('update to new branch head if changesets were unbundled'))],
5493 _('update to new branch head if changesets were unbundled'))],
5491 _('[-u] FILE...'))
5494 _('[-u] FILE...'))
5492 def unbundle(ui, repo, fname1, *fnames, **opts):
5495 def unbundle(ui, repo, fname1, *fnames, **opts):
5493 """apply one or more bundle files
5496 """apply one or more bundle files
5494
5497
5495 Apply one or more bundle files generated by :hg:`bundle`.
5498 Apply one or more bundle files generated by :hg:`bundle`.
5496
5499
5497 Returns 0 on success, 1 if an update has unresolved files.
5500 Returns 0 on success, 1 if an update has unresolved files.
5498 """
5501 """
5499 fnames = (fname1,) + fnames
5502 fnames = (fname1,) + fnames
5500
5503
5501 with repo.lock():
5504 with repo.lock():
5502 for fname in fnames:
5505 for fname in fnames:
5503 f = hg.openpath(ui, fname)
5506 f = hg.openpath(ui, fname)
5504 gen = exchange.readbundle(ui, f, fname)
5507 gen = exchange.readbundle(ui, f, fname)
5505 if isinstance(gen, streamclone.streamcloneapplier):
5508 if isinstance(gen, streamclone.streamcloneapplier):
5506 raise error.Abort(
5509 raise error.Abort(
5507 _('packed bundles cannot be applied with '
5510 _('packed bundles cannot be applied with '
5508 '"hg unbundle"'),
5511 '"hg unbundle"'),
5509 hint=_('use "hg debugapplystreamclonebundle"'))
5512 hint=_('use "hg debugapplystreamclonebundle"'))
5510 url = 'bundle:' + fname
5513 url = 'bundle:' + fname
5511 try:
5514 try:
5512 txnname = 'unbundle'
5515 txnname = 'unbundle'
5513 if not isinstance(gen, bundle2.unbundle20):
5516 if not isinstance(gen, bundle2.unbundle20):
5514 txnname = 'unbundle\n%s' % util.hidepassword(url)
5517 txnname = 'unbundle\n%s' % util.hidepassword(url)
5515 with repo.transaction(txnname) as tr:
5518 with repo.transaction(txnname) as tr:
5516 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5519 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5517 url=url)
5520 url=url)
5518 except error.BundleUnknownFeatureError as exc:
5521 except error.BundleUnknownFeatureError as exc:
5519 raise error.Abort(
5522 raise error.Abort(
5520 _('%s: unknown bundle feature, %s') % (fname, exc),
5523 _('%s: unknown bundle feature, %s') % (fname, exc),
5521 hint=_("see https://mercurial-scm.org/"
5524 hint=_("see https://mercurial-scm.org/"
5522 "wiki/BundleFeature for more "
5525 "wiki/BundleFeature for more "
5523 "information"))
5526 "information"))
5524 modheads = bundle2.combinechangegroupresults(op)
5527 modheads = bundle2.combinechangegroupresults(op)
5525
5528
5526 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5529 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5527
5530
5528 @command('^update|up|checkout|co',
5531 @command('^update|up|checkout|co',
5529 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5532 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5530 ('c', 'check', None, _('require clean working directory')),
5533 ('c', 'check', None, _('require clean working directory')),
5531 ('m', 'merge', None, _('merge uncommitted changes')),
5534 ('m', 'merge', None, _('merge uncommitted changes')),
5532 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5535 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5533 ('r', 'rev', '', _('revision'), _('REV'))
5536 ('r', 'rev', '', _('revision'), _('REV'))
5534 ] + mergetoolopts,
5537 ] + mergetoolopts,
5535 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5538 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5536 def update(ui, repo, node=None, **opts):
5539 def update(ui, repo, node=None, **opts):
5537 """update working directory (or switch revisions)
5540 """update working directory (or switch revisions)
5538
5541
5539 Update the repository's working directory to the specified
5542 Update the repository's working directory to the specified
5540 changeset. If no changeset is specified, update to the tip of the
5543 changeset. If no changeset is specified, update to the tip of the
5541 current named branch and move the active bookmark (see :hg:`help
5544 current named branch and move the active bookmark (see :hg:`help
5542 bookmarks`).
5545 bookmarks`).
5543
5546
5544 Update sets the working directory's parent revision to the specified
5547 Update sets the working directory's parent revision to the specified
5545 changeset (see :hg:`help parents`).
5548 changeset (see :hg:`help parents`).
5546
5549
5547 If the changeset is not a descendant or ancestor of the working
5550 If the changeset is not a descendant or ancestor of the working
5548 directory's parent and there are uncommitted changes, the update is
5551 directory's parent and there are uncommitted changes, the update is
5549 aborted. With the -c/--check option, the working directory is checked
5552 aborted. With the -c/--check option, the working directory is checked
5550 for uncommitted changes; if none are found, the working directory is
5553 for uncommitted changes; if none are found, the working directory is
5551 updated to the specified changeset.
5554 updated to the specified changeset.
5552
5555
5553 .. container:: verbose
5556 .. container:: verbose
5554
5557
5555 The -C/--clean, -c/--check, and -m/--merge options control what
5558 The -C/--clean, -c/--check, and -m/--merge options control what
5556 happens if the working directory contains uncommitted changes.
5559 happens if the working directory contains uncommitted changes.
5557 At most of one of them can be specified.
5560 At most of one of them can be specified.
5558
5561
5559 1. If no option is specified, and if
5562 1. If no option is specified, and if
5560 the requested changeset is an ancestor or descendant of
5563 the requested changeset is an ancestor or descendant of
5561 the working directory's parent, the uncommitted changes
5564 the working directory's parent, the uncommitted changes
5562 are merged into the requested changeset and the merged
5565 are merged into the requested changeset and the merged
5563 result is left uncommitted. If the requested changeset is
5566 result is left uncommitted. If the requested changeset is
5564 not an ancestor or descendant (that is, it is on another
5567 not an ancestor or descendant (that is, it is on another
5565 branch), the update is aborted and the uncommitted changes
5568 branch), the update is aborted and the uncommitted changes
5566 are preserved.
5569 are preserved.
5567
5570
5568 2. With the -m/--merge option, the update is allowed even if the
5571 2. With the -m/--merge option, the update is allowed even if the
5569 requested changeset is not an ancestor or descendant of
5572 requested changeset is not an ancestor or descendant of
5570 the working directory's parent.
5573 the working directory's parent.
5571
5574
5572 3. With the -c/--check option, the update is aborted and the
5575 3. With the -c/--check option, the update is aborted and the
5573 uncommitted changes are preserved.
5576 uncommitted changes are preserved.
5574
5577
5575 4. With the -C/--clean option, uncommitted changes are discarded and
5578 4. With the -C/--clean option, uncommitted changes are discarded and
5576 the working directory is updated to the requested changeset.
5579 the working directory is updated to the requested changeset.
5577
5580
5578 To cancel an uncommitted merge (and lose your changes), use
5581 To cancel an uncommitted merge (and lose your changes), use
5579 :hg:`merge --abort`.
5582 :hg:`merge --abort`.
5580
5583
5581 Use null as the changeset to remove the working directory (like
5584 Use null as the changeset to remove the working directory (like
5582 :hg:`clone -U`).
5585 :hg:`clone -U`).
5583
5586
5584 If you want to revert just one file to an older revision, use
5587 If you want to revert just one file to an older revision, use
5585 :hg:`revert [-r REV] NAME`.
5588 :hg:`revert [-r REV] NAME`.
5586
5589
5587 See :hg:`help dates` for a list of formats valid for -d/--date.
5590 See :hg:`help dates` for a list of formats valid for -d/--date.
5588
5591
5589 Returns 0 on success, 1 if there are unresolved files.
5592 Returns 0 on success, 1 if there are unresolved files.
5590 """
5593 """
5591 rev = opts.get(r'rev')
5594 rev = opts.get(r'rev')
5592 date = opts.get(r'date')
5595 date = opts.get(r'date')
5593 clean = opts.get(r'clean')
5596 clean = opts.get(r'clean')
5594 check = opts.get(r'check')
5597 check = opts.get(r'check')
5595 merge = opts.get(r'merge')
5598 merge = opts.get(r'merge')
5596 if rev and node:
5599 if rev and node:
5597 raise error.Abort(_("please specify just one revision"))
5600 raise error.Abort(_("please specify just one revision"))
5598
5601
5599 if ui.configbool('commands', 'update.requiredest'):
5602 if ui.configbool('commands', 'update.requiredest'):
5600 if not node and not rev and not date:
5603 if not node and not rev and not date:
5601 raise error.Abort(_('you must specify a destination'),
5604 raise error.Abort(_('you must specify a destination'),
5602 hint=_('for example: hg update ".::"'))
5605 hint=_('for example: hg update ".::"'))
5603
5606
5604 if rev is None or rev == '':
5607 if rev is None or rev == '':
5605 rev = node
5608 rev = node
5606
5609
5607 if date and rev is not None:
5610 if date and rev is not None:
5608 raise error.Abort(_("you can't specify a revision and a date"))
5611 raise error.Abort(_("you can't specify a revision and a date"))
5609
5612
5610 if len([x for x in (clean, check, merge) if x]) > 1:
5613 if len([x for x in (clean, check, merge) if x]) > 1:
5611 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5614 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5612 "or -m/--merge"))
5615 "or -m/--merge"))
5613
5616
5614 updatecheck = None
5617 updatecheck = None
5615 if check:
5618 if check:
5616 updatecheck = 'abort'
5619 updatecheck = 'abort'
5617 elif merge:
5620 elif merge:
5618 updatecheck = 'none'
5621 updatecheck = 'none'
5619
5622
5620 with repo.wlock():
5623 with repo.wlock():
5621 cmdutil.clearunfinished(repo)
5624 cmdutil.clearunfinished(repo)
5622
5625
5623 if date:
5626 if date:
5624 rev = cmdutil.finddate(ui, repo, date)
5627 rev = cmdutil.finddate(ui, repo, date)
5625
5628
5626 # if we defined a bookmark, we have to remember the original name
5629 # if we defined a bookmark, we have to remember the original name
5627 brev = rev
5630 brev = rev
5628 if rev:
5631 if rev:
5629 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5632 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5630 ctx = scmutil.revsingle(repo, rev, rev)
5633 ctx = scmutil.revsingle(repo, rev, rev)
5631 rev = ctx.rev()
5634 rev = ctx.rev()
5632 hidden = ctx.hidden()
5635 hidden = ctx.hidden()
5633 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
5636 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
5634 with ui.configoverride(overrides, 'update'):
5637 with ui.configoverride(overrides, 'update'):
5635 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5638 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5636 updatecheck=updatecheck)
5639 updatecheck=updatecheck)
5637 if hidden:
5640 if hidden:
5638 ctxstr = ctx.hex()[:12]
5641 ctxstr = ctx.hex()[:12]
5639 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5642 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5640
5643
5641 if ctx.obsolete():
5644 if ctx.obsolete():
5642 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5645 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5643 ui.warn("(%s)\n" % obsfatemsg)
5646 ui.warn("(%s)\n" % obsfatemsg)
5644 return ret
5647 return ret
5645
5648
5646 @command('verify', [])
5649 @command('verify', [])
5647 def verify(ui, repo):
5650 def verify(ui, repo):
5648 """verify the integrity of the repository
5651 """verify the integrity of the repository
5649
5652
5650 Verify the integrity of the current repository.
5653 Verify the integrity of the current repository.
5651
5654
5652 This will perform an extensive check of the repository's
5655 This will perform an extensive check of the repository's
5653 integrity, validating the hashes and checksums of each entry in
5656 integrity, validating the hashes and checksums of each entry in
5654 the changelog, manifest, and tracked files, as well as the
5657 the changelog, manifest, and tracked files, as well as the
5655 integrity of their crosslinks and indices.
5658 integrity of their crosslinks and indices.
5656
5659
5657 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5660 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5658 for more information about recovery from corruption of the
5661 for more information about recovery from corruption of the
5659 repository.
5662 repository.
5660
5663
5661 Returns 0 on success, 1 if errors are encountered.
5664 Returns 0 on success, 1 if errors are encountered.
5662 """
5665 """
5663 return hg.verify(repo)
5666 return hg.verify(repo)
5664
5667
5665 @command('version', [] + formatteropts, norepo=True,
5668 @command('version', [] + formatteropts, norepo=True,
5666 intents={INTENT_READONLY})
5669 intents={INTENT_READONLY})
5667 def version_(ui, **opts):
5670 def version_(ui, **opts):
5668 """output version and copyright information"""
5671 """output version and copyright information"""
5669 opts = pycompat.byteskwargs(opts)
5672 opts = pycompat.byteskwargs(opts)
5670 if ui.verbose:
5673 if ui.verbose:
5671 ui.pager('version')
5674 ui.pager('version')
5672 fm = ui.formatter("version", opts)
5675 fm = ui.formatter("version", opts)
5673 fm.startitem()
5676 fm.startitem()
5674 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5677 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5675 util.version())
5678 util.version())
5676 license = _(
5679 license = _(
5677 "(see https://mercurial-scm.org for more information)\n"
5680 "(see https://mercurial-scm.org for more information)\n"
5678 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5681 "\nCopyright (C) 2005-2018 Matt Mackall and others\n"
5679 "This is free software; see the source for copying conditions. "
5682 "This is free software; see the source for copying conditions. "
5680 "There is NO\nwarranty; "
5683 "There is NO\nwarranty; "
5681 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5684 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5682 )
5685 )
5683 if not ui.quiet:
5686 if not ui.quiet:
5684 fm.plain(license)
5687 fm.plain(license)
5685
5688
5686 if ui.verbose:
5689 if ui.verbose:
5687 fm.plain(_("\nEnabled extensions:\n\n"))
5690 fm.plain(_("\nEnabled extensions:\n\n"))
5688 # format names and versions into columns
5691 # format names and versions into columns
5689 names = []
5692 names = []
5690 vers = []
5693 vers = []
5691 isinternals = []
5694 isinternals = []
5692 for name, module in extensions.extensions():
5695 for name, module in extensions.extensions():
5693 names.append(name)
5696 names.append(name)
5694 vers.append(extensions.moduleversion(module) or None)
5697 vers.append(extensions.moduleversion(module) or None)
5695 isinternals.append(extensions.ismoduleinternal(module))
5698 isinternals.append(extensions.ismoduleinternal(module))
5696 fn = fm.nested("extensions", tmpl='{name}\n')
5699 fn = fm.nested("extensions", tmpl='{name}\n')
5697 if names:
5700 if names:
5698 namefmt = " %%-%ds " % max(len(n) for n in names)
5701 namefmt = " %%-%ds " % max(len(n) for n in names)
5699 places = [_("external"), _("internal")]
5702 places = [_("external"), _("internal")]
5700 for n, v, p in zip(names, vers, isinternals):
5703 for n, v, p in zip(names, vers, isinternals):
5701 fn.startitem()
5704 fn.startitem()
5702 fn.condwrite(ui.verbose, "name", namefmt, n)
5705 fn.condwrite(ui.verbose, "name", namefmt, n)
5703 if ui.verbose:
5706 if ui.verbose:
5704 fn.plain("%s " % places[p])
5707 fn.plain("%s " % places[p])
5705 fn.data(bundled=p)
5708 fn.data(bundled=p)
5706 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5709 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5707 if ui.verbose:
5710 if ui.verbose:
5708 fn.plain("\n")
5711 fn.plain("\n")
5709 fn.end()
5712 fn.end()
5710 fm.end()
5713 fm.end()
5711
5714
5712 def loadcmdtable(ui, name, cmdtable):
5715 def loadcmdtable(ui, name, cmdtable):
5713 """Load command functions from specified cmdtable
5716 """Load command functions from specified cmdtable
5714 """
5717 """
5715 overrides = [cmd for cmd in cmdtable if cmd in table]
5718 overrides = [cmd for cmd in cmdtable if cmd in table]
5716 if overrides:
5719 if overrides:
5717 ui.warn(_("extension '%s' overrides commands: %s\n")
5720 ui.warn(_("extension '%s' overrides commands: %s\n")
5718 % (name, " ".join(overrides)))
5721 % (name, " ".join(overrides)))
5719 table.update(cmdtable)
5722 table.update(cmdtable)
@@ -1,744 +1,765 b''
1 setup
1 setup
2
2
3 $ cat >> $HGRCPATH << EOF
3 $ cat >> $HGRCPATH << EOF
4 > [extensions]
4 > [extensions]
5 > blackbox=
5 > blackbox=
6 > mock=$TESTDIR/mockblackbox.py
6 > mock=$TESTDIR/mockblackbox.py
7 > EOF
7 > EOF
8
8
9 Helper functions:
9 Helper functions:
10
10
11 $ cacheexists() {
11 $ cacheexists() {
12 > [ -f .hg/cache/tags2-visible ] && echo "tag cache exists" || echo "no tag cache"
12 > [ -f .hg/cache/tags2-visible ] && echo "tag cache exists" || echo "no tag cache"
13 > }
13 > }
14
14
15 $ fnodescacheexists() {
15 $ fnodescacheexists() {
16 > [ -f .hg/cache/hgtagsfnodes1 ] && echo "fnodes cache exists" || echo "no fnodes cache"
16 > [ -f .hg/cache/hgtagsfnodes1 ] && echo "fnodes cache exists" || echo "no fnodes cache"
17 > }
17 > }
18
18
19 $ dumptags() {
19 $ dumptags() {
20 > rev=$1
20 > rev=$1
21 > echo "rev $rev: .hgtags:"
21 > echo "rev $rev: .hgtags:"
22 > hg cat -r$rev .hgtags
22 > hg cat -r$rev .hgtags
23 > }
23 > }
24
24
25 # XXX need to test that the tag cache works when we strip an old head
25 # XXX need to test that the tag cache works when we strip an old head
26 # and add a new one rooted off non-tip: i.e. node and rev of tip are the
26 # and add a new one rooted off non-tip: i.e. node and rev of tip are the
27 # same, but stuff has changed behind tip.
27 # same, but stuff has changed behind tip.
28
28
29 Setup:
29 Setup:
30
30
31 $ hg init t
31 $ hg init t
32 $ cd t
32 $ cd t
33 $ cacheexists
33 $ cacheexists
34 no tag cache
34 no tag cache
35 $ fnodescacheexists
35 $ fnodescacheexists
36 no fnodes cache
36 no fnodes cache
37 $ hg id
37 $ hg id
38 000000000000 tip
38 000000000000 tip
39 $ cacheexists
39 $ cacheexists
40 no tag cache
40 no tag cache
41 $ fnodescacheexists
41 $ fnodescacheexists
42 no fnodes cache
42 no fnodes cache
43 $ echo a > a
43 $ echo a > a
44 $ hg add a
44 $ hg add a
45 $ hg commit -m "test"
45 $ hg commit -m "test"
46 $ hg co
46 $ hg co
47 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
47 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
48 $ hg identify
48 $ hg identify
49 acb14030fe0a tip
49 acb14030fe0a tip
50 $ hg identify -r 'wdir()'
50 $ hg identify -r 'wdir()'
51 acb14030fe0a tip
51 acb14030fe0a tip
52 $ cacheexists
52 $ cacheexists
53 tag cache exists
53 tag cache exists
54 No fnodes cache because .hgtags file doesn't exist
54 No fnodes cache because .hgtags file doesn't exist
55 (this is an implementation detail)
55 (this is an implementation detail)
56 $ fnodescacheexists
56 $ fnodescacheexists
57 no fnodes cache
57 no fnodes cache
58
58
59 Try corrupting the cache
59 Try corrupting the cache
60
60
61 $ printf 'a b' > .hg/cache/tags2-visible
61 $ printf 'a b' > .hg/cache/tags2-visible
62 $ hg identify
62 $ hg identify
63 acb14030fe0a tip
63 acb14030fe0a tip
64 $ cacheexists
64 $ cacheexists
65 tag cache exists
65 tag cache exists
66 $ fnodescacheexists
66 $ fnodescacheexists
67 no fnodes cache
67 no fnodes cache
68 $ hg identify
68 $ hg identify
69 acb14030fe0a tip
69 acb14030fe0a tip
70
70
71 Create local tag with long name:
71 Create local tag with long name:
72
72
73 $ T=`hg identify --debug --id`
73 $ T=`hg identify --debug --id`
74 $ hg tag -l "This is a local tag with a really long name!"
74 $ hg tag -l "This is a local tag with a really long name!"
75 $ hg tags
75 $ hg tags
76 tip 0:acb14030fe0a
76 tip 0:acb14030fe0a
77 This is a local tag with a really long name! 0:acb14030fe0a
77 This is a local tag with a really long name! 0:acb14030fe0a
78 $ rm .hg/localtags
78 $ rm .hg/localtags
79
79
80 Create a tag behind hg's back:
80 Create a tag behind hg's back:
81
81
82 $ echo "$T first" > .hgtags
82 $ echo "$T first" > .hgtags
83 $ cat .hgtags
83 $ cat .hgtags
84 acb14030fe0a21b60322c440ad2d20cf7685a376 first
84 acb14030fe0a21b60322c440ad2d20cf7685a376 first
85 $ hg add .hgtags
85 $ hg add .hgtags
86 $ hg commit -m "add tags"
86 $ hg commit -m "add tags"
87 $ hg tags
87 $ hg tags
88 tip 1:b9154636be93
88 tip 1:b9154636be93
89 first 0:acb14030fe0a
89 first 0:acb14030fe0a
90 $ hg identify
90 $ hg identify
91 b9154636be93 tip
91 b9154636be93 tip
92
92
93 We should have a fnodes cache now that we have a real tag
93 We should have a fnodes cache now that we have a real tag
94 The cache should have an empty entry for rev 0 and a valid entry for rev 1.
94 The cache should have an empty entry for rev 0 and a valid entry for rev 1.
95
95
96
96
97 $ fnodescacheexists
97 $ fnodescacheexists
98 fnodes cache exists
98 fnodes cache exists
99 $ f --size --hexdump .hg/cache/hgtagsfnodes1
99 $ f --size --hexdump .hg/cache/hgtagsfnodes1
100 .hg/cache/hgtagsfnodes1: size=48
100 .hg/cache/hgtagsfnodes1: size=48
101 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
101 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
102 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
102 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
103 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
103 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
104
104
105 Repeat with cold tag cache:
105 Repeat with cold tag cache:
106
106
107 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
107 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
108 $ hg identify
108 $ hg identify
109 b9154636be93 tip
109 b9154636be93 tip
110
110
111 $ fnodescacheexists
111 $ fnodescacheexists
112 fnodes cache exists
112 fnodes cache exists
113 $ f --size --hexdump .hg/cache/hgtagsfnodes1
113 $ f --size --hexdump .hg/cache/hgtagsfnodes1
114 .hg/cache/hgtagsfnodes1: size=48
114 .hg/cache/hgtagsfnodes1: size=48
115 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
115 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
116 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
116 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
117 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
117 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
118
118
119 And again, but now unable to write tag cache or lock file:
119 And again, but now unable to write tag cache or lock file:
120
120
121 #if unix-permissions no-fsmonitor
121 #if unix-permissions no-fsmonitor
122
122
123 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
123 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
124 $ chmod 555 .hg/cache
124 $ chmod 555 .hg/cache
125 $ hg identify
125 $ hg identify
126 b9154636be93 tip
126 b9154636be93 tip
127 $ chmod 755 .hg/cache
127 $ chmod 755 .hg/cache
128
128
129 (this block should be protected by no-fsmonitor, because "chmod 555 .hg"
129 (this block should be protected by no-fsmonitor, because "chmod 555 .hg"
130 makes watchman fail at accessing to files under .hg)
130 makes watchman fail at accessing to files under .hg)
131
131
132 $ chmod 555 .hg
132 $ chmod 555 .hg
133 $ hg identify
133 $ hg identify
134 b9154636be93 tip
134 b9154636be93 tip
135 $ chmod 755 .hg
135 $ chmod 755 .hg
136 #endif
136 #endif
137
137
138 Tag cache debug info written to blackbox log
138 Tag cache debug info written to blackbox log
139
139
140 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
140 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
141 $ hg identify
141 $ hg identify
142 b9154636be93 tip
142 b9154636be93 tip
143 $ hg blackbox -l 6
143 $ hg blackbox -l 6
144 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify
144 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify
145 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> writing 48 bytes to cache/hgtagsfnodes1
145 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> writing 48 bytes to cache/hgtagsfnodes1
146 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> 0/1 cache hits/lookups in * seconds (glob)
146 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> 0/1 cache hits/lookups in * seconds (glob)
147 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> writing .hg/cache/tags2-visible with 1 tags
147 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> writing .hg/cache/tags2-visible with 1 tags
148 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify exited 0 after * seconds (glob)
148 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify exited 0 after * seconds (glob)
149 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> blackbox -l 6
149 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> blackbox -l 6
150
150
151 Failure to acquire lock results in no write
151 Failure to acquire lock results in no write
152
152
153 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
153 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
154 $ echo 'foo:1' > .hg/wlock
154 $ echo 'foo:1' > .hg/wlock
155 $ hg identify
155 $ hg identify
156 b9154636be93 tip
156 b9154636be93 tip
157 $ hg blackbox -l 6
157 $ hg blackbox -l 6
158 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify
158 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify
159 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> not writing .hg/cache/hgtagsfnodes1 because lock cannot be acquired
159 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> not writing .hg/cache/hgtagsfnodes1 because lock cannot be acquired
160 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> 0/1 cache hits/lookups in * seconds (glob)
160 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> 0/1 cache hits/lookups in * seconds (glob)
161 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> writing .hg/cache/tags2-visible with 1 tags
161 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> writing .hg/cache/tags2-visible with 1 tags
162 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify exited 0 after * seconds (glob)
162 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> identify exited 0 after * seconds (glob)
163 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> blackbox -l 6
163 1970/01/01 00:00:00 bob @b9154636be938d3d431e75a7c906504a079bfe07 (5000)> blackbox -l 6
164
164
165 $ fnodescacheexists
165 $ fnodescacheexists
166 no fnodes cache
166 no fnodes cache
167
167
168 $ rm .hg/wlock
168 $ rm .hg/wlock
169
169
170 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
170 $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
171 $ hg identify
171 $ hg identify
172 b9154636be93 tip
172 b9154636be93 tip
173
173
174 Create a branch:
174 Create a branch:
175
175
176 $ echo bb > a
176 $ echo bb > a
177 $ hg status
177 $ hg status
178 M a
178 M a
179 $ hg identify
179 $ hg identify
180 b9154636be93+ tip
180 b9154636be93+ tip
181 $ hg co first
181 $ hg co first
182 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
182 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
183 $ hg id
183 $ hg id
184 acb14030fe0a+ first
184 acb14030fe0a+ first
185 $ hg id -r 'wdir()'
185 $ hg id -r 'wdir()'
186 acb14030fe0a+ first
186 acb14030fe0a+ first
187 $ hg -v id
187 $ hg -v id
188 acb14030fe0a+ first
188 acb14030fe0a+ first
189 $ hg status
189 $ hg status
190 M a
190 M a
191 $ echo 1 > b
191 $ echo 1 > b
192 $ hg add b
192 $ hg add b
193 $ hg commit -m "branch"
193 $ hg commit -m "branch"
194 created new head
194 created new head
195
195
196 Creating a new commit shouldn't append the .hgtags fnodes cache until
196 Creating a new commit shouldn't append the .hgtags fnodes cache until
197 tags info is accessed
197 tags info is accessed
198
198
199 $ f --size --hexdump .hg/cache/hgtagsfnodes1
199 $ f --size --hexdump .hg/cache/hgtagsfnodes1
200 .hg/cache/hgtagsfnodes1: size=48
200 .hg/cache/hgtagsfnodes1: size=48
201 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
201 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
202 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
202 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
203 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
203 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
204
204
205 $ hg id
205 $ hg id
206 c8edf04160c7 tip
206 c8edf04160c7 tip
207
207
208 First 4 bytes of record 3 are changeset fragment
208 First 4 bytes of record 3 are changeset fragment
209
209
210 $ f --size --hexdump .hg/cache/hgtagsfnodes1
210 $ f --size --hexdump .hg/cache/hgtagsfnodes1
211 .hg/cache/hgtagsfnodes1: size=72
211 .hg/cache/hgtagsfnodes1: size=72
212 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
212 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
213 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
213 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
214 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
214 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
215 0030: c8 ed f0 41 00 00 00 00 00 00 00 00 00 00 00 00 |...A............|
215 0030: c8 ed f0 41 00 00 00 00 00 00 00 00 00 00 00 00 |...A............|
216 0040: 00 00 00 00 00 00 00 00 |........|
216 0040: 00 00 00 00 00 00 00 00 |........|
217
217
218 Merge the two heads:
218 Merge the two heads:
219
219
220 $ hg merge 1
220 $ hg merge 1
221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
222 (branch merge, don't forget to commit)
222 (branch merge, don't forget to commit)
223 $ hg blackbox -l3
223 $ hg blackbox -l3
224 1970/01/01 00:00:00 bob @c8edf04160c7f731e4589d66ab3ab3486a64ac28 (5000)> merge 1
224 1970/01/01 00:00:00 bob @c8edf04160c7f731e4589d66ab3ab3486a64ac28 (5000)> merge 1
225 1970/01/01 00:00:00 bob @c8edf04160c7f731e4589d66ab3ab3486a64ac28+b9154636be938d3d431e75a7c906504a079bfe07 (5000)> merge 1 exited 0 after * seconds (glob)
225 1970/01/01 00:00:00 bob @c8edf04160c7f731e4589d66ab3ab3486a64ac28+b9154636be938d3d431e75a7c906504a079bfe07 (5000)> merge 1 exited 0 after * seconds (glob)
226 1970/01/01 00:00:00 bob @c8edf04160c7f731e4589d66ab3ab3486a64ac28+b9154636be938d3d431e75a7c906504a079bfe07 (5000)> blackbox -l3
226 1970/01/01 00:00:00 bob @c8edf04160c7f731e4589d66ab3ab3486a64ac28+b9154636be938d3d431e75a7c906504a079bfe07 (5000)> blackbox -l3
227 $ hg id
227 $ hg id
228 c8edf04160c7+b9154636be93+ tip
228 c8edf04160c7+b9154636be93+ tip
229 $ hg status
229 $ hg status
230 M .hgtags
230 M .hgtags
231 $ hg commit -m "merge"
231 $ hg commit -m "merge"
232
232
233 Create a fake head, make sure tag not visible afterwards:
233 Create a fake head, make sure tag not visible afterwards:
234
234
235 $ cp .hgtags tags
235 $ cp .hgtags tags
236 $ hg tag last
236 $ hg tag last
237 $ hg rm .hgtags
237 $ hg rm .hgtags
238 $ hg commit -m "remove"
238 $ hg commit -m "remove"
239
239
240 $ mv tags .hgtags
240 $ mv tags .hgtags
241 $ hg add .hgtags
241 $ hg add .hgtags
242 $ hg commit -m "readd"
242 $ hg commit -m "readd"
243 $
243 $
244 $ hg tags
244 $ hg tags
245 tip 6:35ff301afafe
245 tip 6:35ff301afafe
246 first 0:acb14030fe0a
246 first 0:acb14030fe0a
247
247
248 Add invalid tags:
248 Add invalid tags:
249
249
250 $ echo "spam" >> .hgtags
250 $ echo "spam" >> .hgtags
251 $ echo >> .hgtags
251 $ echo >> .hgtags
252 $ echo "foo bar" >> .hgtags
252 $ echo "foo bar" >> .hgtags
253 $ echo "a5a5 invalid" >> .hg/localtags
253 $ echo "a5a5 invalid" >> .hg/localtags
254 $ cat .hgtags
254 $ cat .hgtags
255 acb14030fe0a21b60322c440ad2d20cf7685a376 first
255 acb14030fe0a21b60322c440ad2d20cf7685a376 first
256 spam
256 spam
257
257
258 foo bar
258 foo bar
259 $ hg commit -m "tags"
259 $ hg commit -m "tags"
260
260
261 Report tag parse error on other head:
261 Report tag parse error on other head:
262
262
263 $ hg up 3
263 $ hg up 3
264 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
264 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
265 $ echo 'x y' >> .hgtags
265 $ echo 'x y' >> .hgtags
266 $ hg commit -m "head"
266 $ hg commit -m "head"
267 created new head
267 created new head
268
268
269 $ hg tags --debug
269 $ hg tags --debug
270 .hgtags@75d9f02dfe28, line 2: cannot parse entry
270 .hgtags@75d9f02dfe28, line 2: cannot parse entry
271 .hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed
271 .hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed
272 .hgtags@c4be69a18c11, line 2: node 'x' is not well formed
272 .hgtags@c4be69a18c11, line 2: node 'x' is not well formed
273 tip 8:c4be69a18c11e8bc3a5fdbb576017c25f7d84663
273 tip 8:c4be69a18c11e8bc3a5fdbb576017c25f7d84663
274 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376
274 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376
275 $ hg tip
275 $ hg tip
276 changeset: 8:c4be69a18c11
276 changeset: 8:c4be69a18c11
277 tag: tip
277 tag: tip
278 parent: 3:ac5e980c4dc0
278 parent: 3:ac5e980c4dc0
279 user: test
279 user: test
280 date: Thu Jan 01 00:00:00 1970 +0000
280 date: Thu Jan 01 00:00:00 1970 +0000
281 summary: head
281 summary: head
282
282
283
283
284 Test tag precedence rules:
284 Test tag precedence rules:
285
285
286 $ cd ..
286 $ cd ..
287 $ hg init t2
287 $ hg init t2
288 $ cd t2
288 $ cd t2
289 $ echo foo > foo
289 $ echo foo > foo
290 $ hg add foo
290 $ hg add foo
291 $ hg ci -m 'add foo' # rev 0
291 $ hg ci -m 'add foo' # rev 0
292 $ hg tag bar # rev 1
292 $ hg tag bar # rev 1
293 $ echo >> foo
293 $ echo >> foo
294 $ hg ci -m 'change foo 1' # rev 2
294 $ hg ci -m 'change foo 1' # rev 2
295 $ hg up -C 1
295 $ hg up -C 1
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
297 $ hg tag -r 1 -f bar # rev 3
297 $ hg tag -r 1 -f bar # rev 3
298 $ hg up -C 1
298 $ hg up -C 1
299 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
299 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
300 $ echo >> foo
300 $ echo >> foo
301 $ hg ci -m 'change foo 2' # rev 4
301 $ hg ci -m 'change foo 2' # rev 4
302 created new head
302 created new head
303 $ hg tags
303 $ hg tags
304 tip 4:0c192d7d5e6b
304 tip 4:0c192d7d5e6b
305 bar 1:78391a272241
305 bar 1:78391a272241
306
306
307 Repeat in case of cache effects:
307 Repeat in case of cache effects:
308
308
309 $ hg tags
309 $ hg tags
310 tip 4:0c192d7d5e6b
310 tip 4:0c192d7d5e6b
311 bar 1:78391a272241
311 bar 1:78391a272241
312
312
313 Detailed dump of tag info:
313 Detailed dump of tag info:
314
314
315 $ hg heads -q # expect 4, 3, 2
315 $ hg heads -q # expect 4, 3, 2
316 4:0c192d7d5e6b
316 4:0c192d7d5e6b
317 3:6fa450212aeb
317 3:6fa450212aeb
318 2:7a94127795a3
318 2:7a94127795a3
319 $ dumptags 2
319 $ dumptags 2
320 rev 2: .hgtags:
320 rev 2: .hgtags:
321 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
321 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
322 $ dumptags 3
322 $ dumptags 3
323 rev 3: .hgtags:
323 rev 3: .hgtags:
324 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
324 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
325 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
325 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
326 78391a272241d70354aa14c874552cad6b51bb42 bar
326 78391a272241d70354aa14c874552cad6b51bb42 bar
327 $ dumptags 4
327 $ dumptags 4
328 rev 4: .hgtags:
328 rev 4: .hgtags:
329 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
329 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
330
330
331 Dump cache:
331 Dump cache:
332
332
333 $ cat .hg/cache/tags2-visible
333 $ cat .hg/cache/tags2-visible
334 4 0c192d7d5e6b78a714de54a2e9627952a877e25a
334 4 0c192d7d5e6b78a714de54a2e9627952a877e25a
335 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
335 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
336 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
336 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
337 78391a272241d70354aa14c874552cad6b51bb42 bar
337 78391a272241d70354aa14c874552cad6b51bb42 bar
338
338
339 $ f --size --hexdump .hg/cache/hgtagsfnodes1
339 $ f --size --hexdump .hg/cache/hgtagsfnodes1
340 .hg/cache/hgtagsfnodes1: size=120
340 .hg/cache/hgtagsfnodes1: size=120
341 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
341 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
342 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
342 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
343 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
343 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
344 0030: 7a 94 12 77 0c 04 f2 a8 af 31 de 17 fa b7 42 28 |z..w.....1....B(|
344 0030: 7a 94 12 77 0c 04 f2 a8 af 31 de 17 fa b7 42 28 |z..w.....1....B(|
345 0040: 78 ee 5a 2d ad bc 94 3d 6f a4 50 21 7d 3b 71 8c |x.Z-...=o.P!};q.|
345 0040: 78 ee 5a 2d ad bc 94 3d 6f a4 50 21 7d 3b 71 8c |x.Z-...=o.P!};q.|
346 0050: 96 4e f3 7b 89 e5 50 eb da fd 57 89 e7 6c e1 b0 |.N.{..P...W..l..|
346 0050: 96 4e f3 7b 89 e5 50 eb da fd 57 89 e7 6c e1 b0 |.N.{..P...W..l..|
347 0060: 0c 19 2d 7d 0c 04 f2 a8 af 31 de 17 fa b7 42 28 |..-}.....1....B(|
347 0060: 0c 19 2d 7d 0c 04 f2 a8 af 31 de 17 fa b7 42 28 |..-}.....1....B(|
348 0070: 78 ee 5a 2d ad bc 94 3d |x.Z-...=|
348 0070: 78 ee 5a 2d ad bc 94 3d |x.Z-...=|
349
349
350 Corrupt the .hgtags fnodes cache
350 Corrupt the .hgtags fnodes cache
351 Extra junk data at the end should get overwritten on next cache update
351 Extra junk data at the end should get overwritten on next cache update
352
352
353 $ echo extra >> .hg/cache/hgtagsfnodes1
353 $ echo extra >> .hg/cache/hgtagsfnodes1
354 $ echo dummy1 > foo
354 $ echo dummy1 > foo
355 $ hg commit -m throwaway1
355 $ hg commit -m throwaway1
356
356
357 $ hg tags
357 $ hg tags
358 tip 5:8dbfe60eff30
358 tip 5:8dbfe60eff30
359 bar 1:78391a272241
359 bar 1:78391a272241
360
360
361 $ hg blackbox -l 6
361 $ hg blackbox -l 6
362 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> tags
362 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> tags
363 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> writing 24 bytes to cache/hgtagsfnodes1
363 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> writing 24 bytes to cache/hgtagsfnodes1
364 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> 2/3 cache hits/lookups in * seconds (glob)
364 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> 2/3 cache hits/lookups in * seconds (glob)
365 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> writing .hg/cache/tags2-visible with 1 tags
365 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> writing .hg/cache/tags2-visible with 1 tags
366 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> tags exited 0 after * seconds (glob)
366 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> tags exited 0 after * seconds (glob)
367 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> blackbox -l 6
367 1970/01/01 00:00:00 bob @8dbfe60eff306a54259cfe007db9e330e7ecf866 (5000)> blackbox -l 6
368
368
369 #if unix-permissions no-root
369 #if unix-permissions no-root
370 Errors writing to .hgtags fnodes cache are silently ignored
370 Errors writing to .hgtags fnodes cache are silently ignored
371
371
372 $ echo dummy2 > foo
372 $ echo dummy2 > foo
373 $ hg commit -m throwaway2
373 $ hg commit -m throwaway2
374
374
375 $ chmod a-w .hg/cache/hgtagsfnodes1
375 $ chmod a-w .hg/cache/hgtagsfnodes1
376 $ rm -f .hg/cache/tags2-visible
376 $ rm -f .hg/cache/tags2-visible
377
377
378 $ hg tags
378 $ hg tags
379 tip 6:b968051b5cf3
379 tip 6:b968051b5cf3
380 bar 1:78391a272241
380 bar 1:78391a272241
381
381
382 $ hg blackbox -l 6
382 $ hg blackbox -l 6
383 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags
383 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags
384 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> couldn't write cache/hgtagsfnodes1: [Errno *] * (glob)
384 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> couldn't write cache/hgtagsfnodes1: [Errno *] * (glob)
385 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 2/3 cache hits/lookups in * seconds (glob)
385 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 2/3 cache hits/lookups in * seconds (glob)
386 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags
386 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags
387 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)
387 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)
388 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> blackbox -l 6
388 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> blackbox -l 6
389
389
390 $ chmod a+w .hg/cache/hgtagsfnodes1
390 $ chmod a+w .hg/cache/hgtagsfnodes1
391
391
392 $ rm -f .hg/cache/tags2-visible
392 $ rm -f .hg/cache/tags2-visible
393 $ hg tags
393 $ hg tags
394 tip 6:b968051b5cf3
394 tip 6:b968051b5cf3
395 bar 1:78391a272241
395 bar 1:78391a272241
396
396
397 $ hg blackbox -l 6
397 $ hg blackbox -l 6
398 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags
398 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags
399 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing 24 bytes to cache/hgtagsfnodes1
399 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing 24 bytes to cache/hgtagsfnodes1
400 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 2/3 cache hits/lookups in * seconds (glob)
400 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 2/3 cache hits/lookups in * seconds (glob)
401 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags
401 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags
402 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)
402 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)
403 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> blackbox -l 6
403 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> blackbox -l 6
404
404
405 $ f --size .hg/cache/hgtagsfnodes1
405 $ f --size .hg/cache/hgtagsfnodes1
406 .hg/cache/hgtagsfnodes1: size=168
406 .hg/cache/hgtagsfnodes1: size=168
407
407
408 $ hg -q --config extensions.strip= strip -r 6 --no-backup
408 $ hg -q --config extensions.strip= strip -r 6 --no-backup
409 #endif
409 #endif
410
410
411 Stripping doesn't truncate the tags cache until new data is available
411 Stripping doesn't truncate the tags cache until new data is available
412
412
413 $ rm -f .hg/cache/hgtagsfnodes1 .hg/cache/tags2-visible
413 $ rm -f .hg/cache/hgtagsfnodes1 .hg/cache/tags2-visible
414 $ hg tags
414 $ hg tags
415 tip 5:8dbfe60eff30
415 tip 5:8dbfe60eff30
416 bar 1:78391a272241
416 bar 1:78391a272241
417
417
418 $ f --size .hg/cache/hgtagsfnodes1
418 $ f --size .hg/cache/hgtagsfnodes1
419 .hg/cache/hgtagsfnodes1: size=144
419 .hg/cache/hgtagsfnodes1: size=144
420
420
421 $ hg -q --config extensions.strip= strip -r 5 --no-backup
421 $ hg -q --config extensions.strip= strip -r 5 --no-backup
422 $ hg tags
422 $ hg tags
423 tip 4:0c192d7d5e6b
423 tip 4:0c192d7d5e6b
424 bar 1:78391a272241
424 bar 1:78391a272241
425
425
426 $ hg blackbox -l 5
426 $ hg blackbox -l 5
427 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing 24 bytes to cache/hgtagsfnodes1
427 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing 24 bytes to cache/hgtagsfnodes1
428 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> 2/3 cache hits/lookups in * seconds (glob)
428 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> 2/3 cache hits/lookups in * seconds (glob)
429 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing .hg/cache/tags2-visible with 1 tags
429 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing .hg/cache/tags2-visible with 1 tags
430 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> tags exited 0 after * seconds (glob)
430 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> tags exited 0 after * seconds (glob)
431 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> blackbox -l 5
431 1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> blackbox -l 5
432
432
433 $ f --size .hg/cache/hgtagsfnodes1
433 $ f --size .hg/cache/hgtagsfnodes1
434 .hg/cache/hgtagsfnodes1: size=120
434 .hg/cache/hgtagsfnodes1: size=120
435
435
436 $ echo dummy > foo
436 $ echo dummy > foo
437 $ hg commit -m throwaway3
437 $ hg commit -m throwaway3
438
438
439 $ hg tags
439 $ hg tags
440 tip 5:035f65efb448
440 tip 5:035f65efb448
441 bar 1:78391a272241
441 bar 1:78391a272241
442
442
443 $ hg blackbox -l 6
443 $ hg blackbox -l 6
444 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> tags
444 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> tags
445 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing 24 bytes to cache/hgtagsfnodes1
445 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing 24 bytes to cache/hgtagsfnodes1
446 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> 2/3 cache hits/lookups in * seconds (glob)
446 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> 2/3 cache hits/lookups in * seconds (glob)
447 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing .hg/cache/tags2-visible with 1 tags
447 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing .hg/cache/tags2-visible with 1 tags
448 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> tags exited 0 after * seconds (glob)
448 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> tags exited 0 after * seconds (glob)
449 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> blackbox -l 6
449 1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> blackbox -l 6
450 $ f --size .hg/cache/hgtagsfnodes1
450 $ f --size .hg/cache/hgtagsfnodes1
451 .hg/cache/hgtagsfnodes1: size=144
451 .hg/cache/hgtagsfnodes1: size=144
452
452
453 $ hg -q --config extensions.strip= strip -r 5 --no-backup
453 $ hg -q --config extensions.strip= strip -r 5 --no-backup
454
454
455 Test tag removal:
455 Test tag removal:
456
456
457 $ hg tag --remove bar # rev 5
457 $ hg tag --remove bar # rev 5
458 $ hg tip -vp
458 $ hg tip -vp
459 changeset: 5:5f6e8655b1c7
459 changeset: 5:5f6e8655b1c7
460 tag: tip
460 tag: tip
461 user: test
461 user: test
462 date: Thu Jan 01 00:00:00 1970 +0000
462 date: Thu Jan 01 00:00:00 1970 +0000
463 files: .hgtags
463 files: .hgtags
464 description:
464 description:
465 Removed tag bar
465 Removed tag bar
466
466
467
467
468 diff -r 0c192d7d5e6b -r 5f6e8655b1c7 .hgtags
468 diff -r 0c192d7d5e6b -r 5f6e8655b1c7 .hgtags
469 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
469 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
470 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
470 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
471 @@ -1,1 +1,3 @@
471 @@ -1,1 +1,3 @@
472 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
472 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
473 +78391a272241d70354aa14c874552cad6b51bb42 bar
473 +78391a272241d70354aa14c874552cad6b51bb42 bar
474 +0000000000000000000000000000000000000000 bar
474 +0000000000000000000000000000000000000000 bar
475
475
476 $ hg tags
476 $ hg tags
477 tip 5:5f6e8655b1c7
477 tip 5:5f6e8655b1c7
478 $ hg tags # again, try to expose cache bugs
478 $ hg tags # again, try to expose cache bugs
479 tip 5:5f6e8655b1c7
479 tip 5:5f6e8655b1c7
480
480
481 Remove nonexistent tag:
481 Remove nonexistent tag:
482
482
483 $ hg tag --remove foobar
483 $ hg tag --remove foobar
484 abort: tag 'foobar' does not exist
484 abort: tag 'foobar' does not exist
485 [255]
485 [255]
486 $ hg tip
486 $ hg tip
487 changeset: 5:5f6e8655b1c7
487 changeset: 5:5f6e8655b1c7
488 tag: tip
488 tag: tip
489 user: test
489 user: test
490 date: Thu Jan 01 00:00:00 1970 +0000
490 date: Thu Jan 01 00:00:00 1970 +0000
491 summary: Removed tag bar
491 summary: Removed tag bar
492
492
493
493
494 Undo a tag with rollback:
494 Undo a tag with rollback:
495
495
496 $ hg rollback # destroy rev 5 (restore bar)
496 $ hg rollback # destroy rev 5 (restore bar)
497 repository tip rolled back to revision 4 (undo commit)
497 repository tip rolled back to revision 4 (undo commit)
498 working directory now based on revision 4
498 working directory now based on revision 4
499 $ hg tags
499 $ hg tags
500 tip 4:0c192d7d5e6b
500 tip 4:0c192d7d5e6b
501 bar 1:78391a272241
501 bar 1:78391a272241
502 $ hg tags
502 $ hg tags
503 tip 4:0c192d7d5e6b
503 tip 4:0c192d7d5e6b
504 bar 1:78391a272241
504 bar 1:78391a272241
505
505
506 Test tag rank:
506 Test tag rank:
507
507
508 $ cd ..
508 $ cd ..
509 $ hg init t3
509 $ hg init t3
510 $ cd t3
510 $ cd t3
511 $ echo foo > foo
511 $ echo foo > foo
512 $ hg add foo
512 $ hg add foo
513 $ hg ci -m 'add foo' # rev 0
513 $ hg ci -m 'add foo' # rev 0
514 $ hg tag -f bar # rev 1 bar -> 0
514 $ hg tag -f bar # rev 1 bar -> 0
515 $ hg tag -f bar # rev 2 bar -> 1
515 $ hg tag -f bar # rev 2 bar -> 1
516 $ hg tag -fr 0 bar # rev 3 bar -> 0
516 $ hg tag -fr 0 bar # rev 3 bar -> 0
517 $ hg tag -fr 1 bar # rev 4 bar -> 1
517 $ hg tag -fr 1 bar # rev 4 bar -> 1
518 $ hg tag -fr 0 bar # rev 5 bar -> 0
518 $ hg tag -fr 0 bar # rev 5 bar -> 0
519 $ hg tags
519 $ hg tags
520 tip 5:85f05169d91d
520 tip 5:85f05169d91d
521 bar 0:bbd179dfa0a7
521 bar 0:bbd179dfa0a7
522 $ hg co 3
522 $ hg co 3
523 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
523 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
524 $ echo barbar > foo
524 $ echo barbar > foo
525 $ hg ci -m 'change foo' # rev 6
525 $ hg ci -m 'change foo' # rev 6
526 created new head
526 created new head
527 $ hg tags
527 $ hg tags
528 tip 6:735c3ca72986
528 tip 6:735c3ca72986
529 bar 0:bbd179dfa0a7
529 bar 0:bbd179dfa0a7
530
530
531 Don't allow moving tag without -f:
531 Don't allow moving tag without -f:
532
532
533 $ hg tag -r 3 bar
533 $ hg tag -r 3 bar
534 abort: tag 'bar' already exists (use -f to force)
534 abort: tag 'bar' already exists (use -f to force)
535 [255]
535 [255]
536 $ hg tags
536 $ hg tags
537 tip 6:735c3ca72986
537 tip 6:735c3ca72986
538 bar 0:bbd179dfa0a7
538 bar 0:bbd179dfa0a7
539
539
540 Strip 1: expose an old head:
540 Strip 1: expose an old head:
541
541
542 $ hg --config extensions.mq= strip 5
542 $ hg --config extensions.mq= strip 5
543 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
543 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
544 $ hg tags # partly stale cache
544 $ hg tags # partly stale cache
545 tip 5:735c3ca72986
545 tip 5:735c3ca72986
546 bar 1:78391a272241
546 bar 1:78391a272241
547 $ hg tags # up-to-date cache
547 $ hg tags # up-to-date cache
548 tip 5:735c3ca72986
548 tip 5:735c3ca72986
549 bar 1:78391a272241
549 bar 1:78391a272241
550
550
551 Strip 2: destroy whole branch, no old head exposed
551 Strip 2: destroy whole branch, no old head exposed
552
552
553 $ hg --config extensions.mq= strip 4
553 $ hg --config extensions.mq= strip 4
554 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
554 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
555 $ hg tags # partly stale
555 $ hg tags # partly stale
556 tip 4:735c3ca72986
556 tip 4:735c3ca72986
557 bar 0:bbd179dfa0a7
557 bar 0:bbd179dfa0a7
558 $ rm -f .hg/cache/tags2-visible
558 $ rm -f .hg/cache/tags2-visible
559 $ hg tags # cold cache
559 $ hg tags # cold cache
560 tip 4:735c3ca72986
560 tip 4:735c3ca72986
561 bar 0:bbd179dfa0a7
561 bar 0:bbd179dfa0a7
562
562
563 Test tag rank with 3 heads:
563 Test tag rank with 3 heads:
564
564
565 $ cd ..
565 $ cd ..
566 $ hg init t4
566 $ hg init t4
567 $ cd t4
567 $ cd t4
568 $ echo foo > foo
568 $ echo foo > foo
569 $ hg add
569 $ hg add
570 adding foo
570 adding foo
571 $ hg ci -m 'add foo' # rev 0
571 $ hg ci -m 'add foo' # rev 0
572 $ hg tag bar # rev 1 bar -> 0
572 $ hg tag bar # rev 1 bar -> 0
573 $ hg tag -f bar # rev 2 bar -> 1
573 $ hg tag -f bar # rev 2 bar -> 1
574 $ hg up -qC 0
574 $ hg up -qC 0
575 $ hg tag -fr 2 bar # rev 3 bar -> 2
575 $ hg tag -fr 2 bar # rev 3 bar -> 2
576 $ hg tags
576 $ hg tags
577 tip 3:197c21bbbf2c
577 tip 3:197c21bbbf2c
578 bar 2:6fa450212aeb
578 bar 2:6fa450212aeb
579 $ hg up -qC 0
579 $ hg up -qC 0
580 $ hg tag -m 'retag rev 0' -fr 0 bar # rev 4 bar -> 0, but bar stays at 2
580 $ hg tag -m 'retag rev 0' -fr 0 bar # rev 4 bar -> 0, but bar stays at 2
581
581
582 Bar should still point to rev 2:
582 Bar should still point to rev 2:
583
583
584 $ hg tags
584 $ hg tags
585 tip 4:3b4b14ed0202
585 tip 4:3b4b14ed0202
586 bar 2:6fa450212aeb
586 bar 2:6fa450212aeb
587
587
588 Test that removing global/local tags does not get confused when trying
588 Test that removing global/local tags does not get confused when trying
589 to remove a tag of type X which actually only exists as a type Y:
589 to remove a tag of type X which actually only exists as a type Y:
590
590
591 $ cd ..
591 $ cd ..
592 $ hg init t5
592 $ hg init t5
593 $ cd t5
593 $ cd t5
594 $ echo foo > foo
594 $ echo foo > foo
595 $ hg add
595 $ hg add
596 adding foo
596 adding foo
597 $ hg ci -m 'add foo' # rev 0
597 $ hg ci -m 'add foo' # rev 0
598
598
599 $ hg tag -r 0 -l localtag
599 $ hg tag -r 0 -l localtag
600 $ hg tag --remove localtag
600 $ hg tag --remove localtag
601 abort: tag 'localtag' is not a global tag
601 abort: tag 'localtag' is not a global tag
602 [255]
602 [255]
603 $
603 $
604 $ hg tag -r 0 globaltag
604 $ hg tag -r 0 globaltag
605 $ hg tag --remove -l globaltag
605 $ hg tag --remove -l globaltag
606 abort: tag 'globaltag' is not a local tag
606 abort: tag 'globaltag' is not a local tag
607 [255]
607 [255]
608 $ hg tags -v
608 $ hg tags -v
609 tip 1:a0b6fe111088
609 tip 1:a0b6fe111088
610 localtag 0:bbd179dfa0a7 local
610 localtag 0:bbd179dfa0a7 local
611 globaltag 0:bbd179dfa0a7
611 globaltag 0:bbd179dfa0a7
612
612
613 Templated output:
614
615 (immediate values)
616
617 $ hg tags -T '{pad(tag, 9)} {rev}:{node} ({type})\n'
618 tip 1:a0b6fe111088c8c29567d3876cc466aa02927cae ()
619 localtag 0:bbd179dfa0a71671c253b3ae0aa1513b60d199fa (local)
620 globaltag 0:bbd179dfa0a71671c253b3ae0aa1513b60d199fa ()
621
622 (ctx/revcache dependent)
623
624 $ hg tags -T '{pad(tag, 9)} {rev} {file_adds}\n'
625 tip 1 .hgtags
626 localtag 0 foo
627 globaltag 0 foo
628
629 $ hg tags -T '{pad(tag, 9)} {rev}:{node|shortest}\n'
630 tip 1:a0b6
631 localtag 0:bbd1
632 globaltag 0:bbd1
633
613 Test for issue3911
634 Test for issue3911
614
635
615 $ hg tag -r 0 -l localtag2
636 $ hg tag -r 0 -l localtag2
616 $ hg tag -l --remove localtag2
637 $ hg tag -l --remove localtag2
617 $ hg tags -v
638 $ hg tags -v
618 tip 1:a0b6fe111088
639 tip 1:a0b6fe111088
619 localtag 0:bbd179dfa0a7 local
640 localtag 0:bbd179dfa0a7 local
620 globaltag 0:bbd179dfa0a7
641 globaltag 0:bbd179dfa0a7
621
642
622 $ hg tag -r 1 -f localtag
643 $ hg tag -r 1 -f localtag
623 $ hg tags -v
644 $ hg tags -v
624 tip 2:5c70a037bb37
645 tip 2:5c70a037bb37
625 localtag 1:a0b6fe111088
646 localtag 1:a0b6fe111088
626 globaltag 0:bbd179dfa0a7
647 globaltag 0:bbd179dfa0a7
627
648
628 $ hg tags -v
649 $ hg tags -v
629 tip 2:5c70a037bb37
650 tip 2:5c70a037bb37
630 localtag 1:a0b6fe111088
651 localtag 1:a0b6fe111088
631 globaltag 0:bbd179dfa0a7
652 globaltag 0:bbd179dfa0a7
632
653
633 $ hg tag -r 1 localtag2
654 $ hg tag -r 1 localtag2
634 $ hg tags -v
655 $ hg tags -v
635 tip 3:bbfb8cd42be2
656 tip 3:bbfb8cd42be2
636 localtag2 1:a0b6fe111088
657 localtag2 1:a0b6fe111088
637 localtag 1:a0b6fe111088
658 localtag 1:a0b6fe111088
638 globaltag 0:bbd179dfa0a7
659 globaltag 0:bbd179dfa0a7
639
660
640 $ hg tags -v
661 $ hg tags -v
641 tip 3:bbfb8cd42be2
662 tip 3:bbfb8cd42be2
642 localtag2 1:a0b6fe111088
663 localtag2 1:a0b6fe111088
643 localtag 1:a0b6fe111088
664 localtag 1:a0b6fe111088
644 globaltag 0:bbd179dfa0a7
665 globaltag 0:bbd179dfa0a7
645
666
646 $ cd ..
667 $ cd ..
647
668
648 Create a repository with tags data to test .hgtags fnodes transfer
669 Create a repository with tags data to test .hgtags fnodes transfer
649
670
650 $ hg init tagsserver
671 $ hg init tagsserver
651 $ cd tagsserver
672 $ cd tagsserver
652 $ touch foo
673 $ touch foo
653 $ hg -q commit -A -m initial
674 $ hg -q commit -A -m initial
654 $ hg tag -m 'tag 0.1' 0.1
675 $ hg tag -m 'tag 0.1' 0.1
655 $ echo second > foo
676 $ echo second > foo
656 $ hg commit -m second
677 $ hg commit -m second
657 $ hg tag -m 'tag 0.2' 0.2
678 $ hg tag -m 'tag 0.2' 0.2
658 $ hg tags
679 $ hg tags
659 tip 3:40f0358cb314
680 tip 3:40f0358cb314
660 0.2 2:f63cc8fe54e4
681 0.2 2:f63cc8fe54e4
661 0.1 0:96ee1d7354c4
682 0.1 0:96ee1d7354c4
662 $ cd ..
683 $ cd ..
663
684
664 Cloning should pull down hgtags fnodes mappings and write the cache file
685 Cloning should pull down hgtags fnodes mappings and write the cache file
665
686
666 $ hg clone --pull tagsserver tagsclient
687 $ hg clone --pull tagsserver tagsclient
667 requesting all changes
688 requesting all changes
668 adding changesets
689 adding changesets
669 adding manifests
690 adding manifests
670 adding file changes
691 adding file changes
671 added 4 changesets with 4 changes to 2 files
692 added 4 changesets with 4 changes to 2 files
672 new changesets 96ee1d7354c4:40f0358cb314
693 new changesets 96ee1d7354c4:40f0358cb314
673 updating to branch default
694 updating to branch default
674 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
695 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
675
696
676 Missing tags2* files means the cache wasn't written through the normal mechanism.
697 Missing tags2* files means the cache wasn't written through the normal mechanism.
677
698
678 $ ls tagsclient/.hg/cache
699 $ ls tagsclient/.hg/cache
679 branch2-base
700 branch2-base
680 checkisexec (execbit !)
701 checkisexec (execbit !)
681 checklink (symlink !)
702 checklink (symlink !)
682 checklink-target (symlink !)
703 checklink-target (symlink !)
683 hgtagsfnodes1
704 hgtagsfnodes1
684 rbc-names-v1
705 rbc-names-v1
685 rbc-revs-v1
706 rbc-revs-v1
686
707
687 Cache should contain the head only, even though other nodes have tags data
708 Cache should contain the head only, even though other nodes have tags data
688
709
689 $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1
710 $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1
690 tagsclient/.hg/cache/hgtagsfnodes1: size=96
711 tagsclient/.hg/cache/hgtagsfnodes1: size=96
691 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
712 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
692 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
713 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
693 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
714 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
694 0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
715 0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
695 0040: ff ff ff ff ff ff ff ff 40 f0 35 8c 19 e0 a7 d3 |........@.5.....|
716 0040: ff ff ff ff ff ff ff ff 40 f0 35 8c 19 e0 a7 d3 |........@.5.....|
696 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.|
717 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.|
697
718
698 Running hg tags should produce tags2* file and not change cache
719 Running hg tags should produce tags2* file and not change cache
699
720
700 $ hg -R tagsclient tags
721 $ hg -R tagsclient tags
701 tip 3:40f0358cb314
722 tip 3:40f0358cb314
702 0.2 2:f63cc8fe54e4
723 0.2 2:f63cc8fe54e4
703 0.1 0:96ee1d7354c4
724 0.1 0:96ee1d7354c4
704
725
705 $ ls tagsclient/.hg/cache
726 $ ls tagsclient/.hg/cache
706 branch2-base
727 branch2-base
707 checkisexec (execbit !)
728 checkisexec (execbit !)
708 checklink (symlink !)
729 checklink (symlink !)
709 checklink-target (symlink !)
730 checklink-target (symlink !)
710 hgtagsfnodes1
731 hgtagsfnodes1
711 rbc-names-v1
732 rbc-names-v1
712 rbc-revs-v1
733 rbc-revs-v1
713 tags2-visible
734 tags2-visible
714
735
715 $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1
736 $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1
716 tagsclient/.hg/cache/hgtagsfnodes1: size=96
737 tagsclient/.hg/cache/hgtagsfnodes1: size=96
717 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
738 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
718 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
739 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
719 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
740 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
720 0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
741 0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
721 0040: ff ff ff ff ff ff ff ff 40 f0 35 8c 19 e0 a7 d3 |........@.5.....|
742 0040: ff ff ff ff ff ff ff ff 40 f0 35 8c 19 e0 a7 d3 |........@.5.....|
722 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.|
743 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.|
723
744
724 Check that the bundle includes cache data
745 Check that the bundle includes cache data
725
746
726 $ hg -R tagsclient bundle --all ./test-cache-in-bundle-all-rev.hg
747 $ hg -R tagsclient bundle --all ./test-cache-in-bundle-all-rev.hg
727 4 changesets found
748 4 changesets found
728 $ hg debugbundle ./test-cache-in-bundle-all-rev.hg
749 $ hg debugbundle ./test-cache-in-bundle-all-rev.hg
729 Stream params: {Compression: BZ}
750 Stream params: {Compression: BZ}
730 changegroup -- {nbchanges: 4, version: 02} (mandatory: True)
751 changegroup -- {nbchanges: 4, version: 02} (mandatory: True)
731 96ee1d7354c4ad7372047672c36a1f561e3a6a4c
752 96ee1d7354c4ad7372047672c36a1f561e3a6a4c
732 c4dab0c2fd337eb9191f80c3024830a4889a8f34
753 c4dab0c2fd337eb9191f80c3024830a4889a8f34
733 f63cc8fe54e4d326f8d692805d70e092f851ddb1
754 f63cc8fe54e4d326f8d692805d70e092f851ddb1
734 40f0358cb314c824a5929ee527308d90e023bc10
755 40f0358cb314c824a5929ee527308d90e023bc10
735 hgtagsfnodes -- {} (mandatory: True)
756 hgtagsfnodes -- {} (mandatory: True)
736 cache:rev-branch-cache -- {} (mandatory: False)
757 cache:rev-branch-cache -- {} (mandatory: False)
737
758
738 Check that local clone includes cache data
759 Check that local clone includes cache data
739
760
740 $ hg clone tagsclient tags-local-clone
761 $ hg clone tagsclient tags-local-clone
741 updating to branch default
762 updating to branch default
742 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
763 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
743 $ (cd tags-local-clone/.hg/cache/; ls -1 tag*)
764 $ (cd tags-local-clone/.hg/cache/; ls -1 tag*)
744 tags2-visible
765 tags2-visible
General Comments 0
You need to be logged in to leave comments. Login now