##// END OF EJS Templates
py3: use pycompat.bytestr instead of str
Pulkit Goyal -
r33105:a5e1393f default
parent child Browse files
Show More
@@ -1,5426 +1,5426 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 )
22 )
23 from . import (
23 from . import (
24 archival,
24 archival,
25 bookmarks,
25 bookmarks,
26 bundle2,
26 bundle2,
27 changegroup,
27 changegroup,
28 cmdutil,
28 cmdutil,
29 copies,
29 copies,
30 debugcommands as debugcommandsmod,
30 debugcommands as debugcommandsmod,
31 destutil,
31 destutil,
32 dirstateguard,
32 dirstateguard,
33 discovery,
33 discovery,
34 encoding,
34 encoding,
35 error,
35 error,
36 exchange,
36 exchange,
37 extensions,
37 extensions,
38 formatter,
38 formatter,
39 graphmod,
39 graphmod,
40 hbisect,
40 hbisect,
41 help,
41 help,
42 hg,
42 hg,
43 lock as lockmod,
43 lock as lockmod,
44 merge as mergemod,
44 merge as mergemod,
45 obsolete,
45 obsolete,
46 patch,
46 patch,
47 phases,
47 phases,
48 pycompat,
48 pycompat,
49 rcutil,
49 rcutil,
50 registrar,
50 registrar,
51 revsetlang,
51 revsetlang,
52 scmutil,
52 scmutil,
53 server,
53 server,
54 sshserver,
54 sshserver,
55 streamclone,
55 streamclone,
56 tags as tagsmod,
56 tags as tagsmod,
57 templatekw,
57 templatekw,
58 ui as uimod,
58 ui as uimod,
59 util,
59 util,
60 )
60 )
61
61
62 release = lockmod.release
62 release = lockmod.release
63
63
64 table = {}
64 table = {}
65 table.update(debugcommandsmod.command._table)
65 table.update(debugcommandsmod.command._table)
66
66
67 command = registrar.command(table)
67 command = registrar.command(table)
68
68
69 # common command options
69 # common command options
70
70
71 globalopts = [
71 globalopts = [
72 ('R', 'repository', '',
72 ('R', 'repository', '',
73 _('repository root directory or name of overlay bundle file'),
73 _('repository root directory or name of overlay bundle file'),
74 _('REPO')),
74 _('REPO')),
75 ('', 'cwd', '',
75 ('', 'cwd', '',
76 _('change working directory'), _('DIR')),
76 _('change working directory'), _('DIR')),
77 ('y', 'noninteractive', None,
77 ('y', 'noninteractive', None,
78 _('do not prompt, automatically pick the first choice for all prompts')),
78 _('do not prompt, automatically pick the first choice for all prompts')),
79 ('q', 'quiet', None, _('suppress output')),
79 ('q', 'quiet', None, _('suppress output')),
80 ('v', 'verbose', None, _('enable additional output')),
80 ('v', 'verbose', None, _('enable additional output')),
81 ('', 'color', '',
81 ('', 'color', '',
82 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
82 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
83 # and should not be translated
83 # and should not be translated
84 _("when to colorize (boolean, always, auto, never, or debug)"),
84 _("when to colorize (boolean, always, auto, never, or debug)"),
85 _('TYPE')),
85 _('TYPE')),
86 ('', 'config', [],
86 ('', 'config', [],
87 _('set/override config option (use \'section.name=value\')'),
87 _('set/override config option (use \'section.name=value\')'),
88 _('CONFIG')),
88 _('CONFIG')),
89 ('', 'debug', None, _('enable debugging output')),
89 ('', 'debug', None, _('enable debugging output')),
90 ('', 'debugger', None, _('start debugger')),
90 ('', 'debugger', None, _('start debugger')),
91 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
91 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
92 _('ENCODE')),
92 _('ENCODE')),
93 ('', 'encodingmode', encoding.encodingmode,
93 ('', 'encodingmode', encoding.encodingmode,
94 _('set the charset encoding mode'), _('MODE')),
94 _('set the charset encoding mode'), _('MODE')),
95 ('', 'traceback', None, _('always print a traceback on exception')),
95 ('', 'traceback', None, _('always print a traceback on exception')),
96 ('', 'time', None, _('time how long the command takes')),
96 ('', 'time', None, _('time how long the command takes')),
97 ('', 'profile', None, _('print command execution profile')),
97 ('', 'profile', None, _('print command execution profile')),
98 ('', 'version', None, _('output version information and exit')),
98 ('', 'version', None, _('output version information and exit')),
99 ('h', 'help', None, _('display help and exit')),
99 ('h', 'help', None, _('display help and exit')),
100 ('', 'hidden', False, _('consider hidden changesets')),
100 ('', 'hidden', False, _('consider hidden changesets')),
101 ('', 'pager', 'auto',
101 ('', 'pager', 'auto',
102 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
102 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
103 ]
103 ]
104
104
105 dryrunopts = cmdutil.dryrunopts
105 dryrunopts = cmdutil.dryrunopts
106 remoteopts = cmdutil.remoteopts
106 remoteopts = cmdutil.remoteopts
107 walkopts = cmdutil.walkopts
107 walkopts = cmdutil.walkopts
108 commitopts = cmdutil.commitopts
108 commitopts = cmdutil.commitopts
109 commitopts2 = cmdutil.commitopts2
109 commitopts2 = cmdutil.commitopts2
110 formatteropts = cmdutil.formatteropts
110 formatteropts = cmdutil.formatteropts
111 templateopts = cmdutil.templateopts
111 templateopts = cmdutil.templateopts
112 logopts = cmdutil.logopts
112 logopts = cmdutil.logopts
113 diffopts = cmdutil.diffopts
113 diffopts = cmdutil.diffopts
114 diffwsopts = cmdutil.diffwsopts
114 diffwsopts = cmdutil.diffwsopts
115 diffopts2 = cmdutil.diffopts2
115 diffopts2 = cmdutil.diffopts2
116 mergetoolopts = cmdutil.mergetoolopts
116 mergetoolopts = cmdutil.mergetoolopts
117 similarityopts = cmdutil.similarityopts
117 similarityopts = cmdutil.similarityopts
118 subrepoopts = cmdutil.subrepoopts
118 subrepoopts = cmdutil.subrepoopts
119 debugrevlogopts = cmdutil.debugrevlogopts
119 debugrevlogopts = cmdutil.debugrevlogopts
120
120
121 # Commands start here, listed alphabetically
121 # Commands start here, listed alphabetically
122
122
123 @command('^add',
123 @command('^add',
124 walkopts + subrepoopts + dryrunopts,
124 walkopts + subrepoopts + dryrunopts,
125 _('[OPTION]... [FILE]...'),
125 _('[OPTION]... [FILE]...'),
126 inferrepo=True)
126 inferrepo=True)
127 def add(ui, repo, *pats, **opts):
127 def add(ui, repo, *pats, **opts):
128 """add the specified files on the next commit
128 """add the specified files on the next commit
129
129
130 Schedule files to be version controlled and added to the
130 Schedule files to be version controlled and added to the
131 repository.
131 repository.
132
132
133 The files will be added to the repository at the next commit. To
133 The files will be added to the repository at the next commit. To
134 undo an add before that, see :hg:`forget`.
134 undo an add before that, see :hg:`forget`.
135
135
136 If no names are given, add all files to the repository (except
136 If no names are given, add all files to the repository (except
137 files matching ``.hgignore``).
137 files matching ``.hgignore``).
138
138
139 .. container:: verbose
139 .. container:: verbose
140
140
141 Examples:
141 Examples:
142
142
143 - New (unknown) files are added
143 - New (unknown) files are added
144 automatically by :hg:`add`::
144 automatically by :hg:`add`::
145
145
146 $ ls
146 $ ls
147 foo.c
147 foo.c
148 $ hg status
148 $ hg status
149 ? foo.c
149 ? foo.c
150 $ hg add
150 $ hg add
151 adding foo.c
151 adding foo.c
152 $ hg status
152 $ hg status
153 A foo.c
153 A foo.c
154
154
155 - Specific files to be added can be specified::
155 - Specific files to be added can be specified::
156
156
157 $ ls
157 $ ls
158 bar.c foo.c
158 bar.c foo.c
159 $ hg status
159 $ hg status
160 ? bar.c
160 ? bar.c
161 ? foo.c
161 ? foo.c
162 $ hg add bar.c
162 $ hg add bar.c
163 $ hg status
163 $ hg status
164 A bar.c
164 A bar.c
165 ? foo.c
165 ? foo.c
166
166
167 Returns 0 if all files are successfully added.
167 Returns 0 if all files are successfully added.
168 """
168 """
169
169
170 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
170 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
171 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
171 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
172 return rejected and 1 or 0
172 return rejected and 1 or 0
173
173
174 @command('addremove',
174 @command('addremove',
175 similarityopts + subrepoopts + walkopts + dryrunopts,
175 similarityopts + subrepoopts + walkopts + dryrunopts,
176 _('[OPTION]... [FILE]...'),
176 _('[OPTION]... [FILE]...'),
177 inferrepo=True)
177 inferrepo=True)
178 def addremove(ui, repo, *pats, **opts):
178 def addremove(ui, repo, *pats, **opts):
179 """add all new files, delete all missing files
179 """add all new files, delete all missing files
180
180
181 Add all new files and remove all missing files from the
181 Add all new files and remove all missing files from the
182 repository.
182 repository.
183
183
184 Unless names are given, new files are ignored if they match any of
184 Unless names are given, new files are ignored if they match any of
185 the patterns in ``.hgignore``. As with add, these changes take
185 the patterns in ``.hgignore``. As with add, these changes take
186 effect at the next commit.
186 effect at the next commit.
187
187
188 Use the -s/--similarity option to detect renamed files. This
188 Use the -s/--similarity option to detect renamed files. This
189 option takes a percentage between 0 (disabled) and 100 (files must
189 option takes a percentage between 0 (disabled) and 100 (files must
190 be identical) as its parameter. With a parameter greater than 0,
190 be identical) as its parameter. With a parameter greater than 0,
191 this compares every removed file with every added file and records
191 this compares every removed file with every added file and records
192 those similar enough as renames. Detecting renamed files this way
192 those similar enough as renames. Detecting renamed files this way
193 can be expensive. After using this option, :hg:`status -C` can be
193 can be expensive. After using this option, :hg:`status -C` can be
194 used to check which files were identified as moved or renamed. If
194 used to check which files were identified as moved or renamed. If
195 not specified, -s/--similarity defaults to 100 and only renames of
195 not specified, -s/--similarity defaults to 100 and only renames of
196 identical files are detected.
196 identical files are detected.
197
197
198 .. container:: verbose
198 .. container:: verbose
199
199
200 Examples:
200 Examples:
201
201
202 - A number of files (bar.c and foo.c) are new,
202 - A number of files (bar.c and foo.c) are new,
203 while foobar.c has been removed (without using :hg:`remove`)
203 while foobar.c has been removed (without using :hg:`remove`)
204 from the repository::
204 from the repository::
205
205
206 $ ls
206 $ ls
207 bar.c foo.c
207 bar.c foo.c
208 $ hg status
208 $ hg status
209 ! foobar.c
209 ! foobar.c
210 ? bar.c
210 ? bar.c
211 ? foo.c
211 ? foo.c
212 $ hg addremove
212 $ hg addremove
213 adding bar.c
213 adding bar.c
214 adding foo.c
214 adding foo.c
215 removing foobar.c
215 removing foobar.c
216 $ hg status
216 $ hg status
217 A bar.c
217 A bar.c
218 A foo.c
218 A foo.c
219 R foobar.c
219 R foobar.c
220
220
221 - A file foobar.c was moved to foo.c without using :hg:`rename`.
221 - A file foobar.c was moved to foo.c without using :hg:`rename`.
222 Afterwards, it was edited slightly::
222 Afterwards, it was edited slightly::
223
223
224 $ ls
224 $ ls
225 foo.c
225 foo.c
226 $ hg status
226 $ hg status
227 ! foobar.c
227 ! foobar.c
228 ? foo.c
228 ? foo.c
229 $ hg addremove --similarity 90
229 $ hg addremove --similarity 90
230 removing foobar.c
230 removing foobar.c
231 adding foo.c
231 adding foo.c
232 recording removal of foobar.c as rename to foo.c (94% similar)
232 recording removal of foobar.c as rename to foo.c (94% similar)
233 $ hg status -C
233 $ hg status -C
234 A foo.c
234 A foo.c
235 foobar.c
235 foobar.c
236 R foobar.c
236 R foobar.c
237
237
238 Returns 0 if all files are successfully added.
238 Returns 0 if all files are successfully added.
239 """
239 """
240 opts = pycompat.byteskwargs(opts)
240 opts = pycompat.byteskwargs(opts)
241 try:
241 try:
242 sim = float(opts.get('similarity') or 100)
242 sim = float(opts.get('similarity') or 100)
243 except ValueError:
243 except ValueError:
244 raise error.Abort(_('similarity must be a number'))
244 raise error.Abort(_('similarity must be a number'))
245 if sim < 0 or sim > 100:
245 if sim < 0 or sim > 100:
246 raise error.Abort(_('similarity must be between 0 and 100'))
246 raise error.Abort(_('similarity must be between 0 and 100'))
247 matcher = scmutil.match(repo[None], pats, opts)
247 matcher = scmutil.match(repo[None], pats, opts)
248 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
248 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
249
249
250 @command('^annotate|blame',
250 @command('^annotate|blame',
251 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
251 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
252 ('', 'follow', None,
252 ('', 'follow', None,
253 _('follow copies/renames and list the filename (DEPRECATED)')),
253 _('follow copies/renames and list the filename (DEPRECATED)')),
254 ('', 'no-follow', None, _("don't follow copies and renames")),
254 ('', 'no-follow', None, _("don't follow copies and renames")),
255 ('a', 'text', None, _('treat all files as text')),
255 ('a', 'text', None, _('treat all files as text')),
256 ('u', 'user', None, _('list the author (long with -v)')),
256 ('u', 'user', None, _('list the author (long with -v)')),
257 ('f', 'file', None, _('list the filename')),
257 ('f', 'file', None, _('list the filename')),
258 ('d', 'date', None, _('list the date (short with -q)')),
258 ('d', 'date', None, _('list the date (short with -q)')),
259 ('n', 'number', None, _('list the revision number (default)')),
259 ('n', 'number', None, _('list the revision number (default)')),
260 ('c', 'changeset', None, _('list the changeset')),
260 ('c', 'changeset', None, _('list the changeset')),
261 ('l', 'line-number', None, _('show line number at the first appearance')),
261 ('l', 'line-number', None, _('show line number at the first appearance')),
262 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
262 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
263 ] + diffwsopts + walkopts + formatteropts,
263 ] + diffwsopts + walkopts + formatteropts,
264 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
264 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
265 inferrepo=True)
265 inferrepo=True)
266 def annotate(ui, repo, *pats, **opts):
266 def annotate(ui, repo, *pats, **opts):
267 """show changeset information by line for each file
267 """show changeset information by line for each file
268
268
269 List changes in files, showing the revision id responsible for
269 List changes in files, showing the revision id responsible for
270 each line.
270 each line.
271
271
272 This command is useful for discovering when a change was made and
272 This command is useful for discovering when a change was made and
273 by whom.
273 by whom.
274
274
275 If you include --file, --user, or --date, the revision number is
275 If you include --file, --user, or --date, the revision number is
276 suppressed unless you also include --number.
276 suppressed unless you also include --number.
277
277
278 Without the -a/--text option, annotate will avoid processing files
278 Without the -a/--text option, annotate will avoid processing files
279 it detects as binary. With -a, annotate will annotate the file
279 it detects as binary. With -a, annotate will annotate the file
280 anyway, although the results will probably be neither useful
280 anyway, although the results will probably be neither useful
281 nor desirable.
281 nor desirable.
282
282
283 Returns 0 on success.
283 Returns 0 on success.
284 """
284 """
285 opts = pycompat.byteskwargs(opts)
285 opts = pycompat.byteskwargs(opts)
286 if not pats:
286 if not pats:
287 raise error.Abort(_('at least one filename or pattern is required'))
287 raise error.Abort(_('at least one filename or pattern is required'))
288
288
289 if opts.get('follow'):
289 if opts.get('follow'):
290 # --follow is deprecated and now just an alias for -f/--file
290 # --follow is deprecated and now just an alias for -f/--file
291 # to mimic the behavior of Mercurial before version 1.5
291 # to mimic the behavior of Mercurial before version 1.5
292 opts['file'] = True
292 opts['file'] = True
293
293
294 ctx = scmutil.revsingle(repo, opts.get('rev'))
294 ctx = scmutil.revsingle(repo, opts.get('rev'))
295
295
296 rootfm = ui.formatter('annotate', opts)
296 rootfm = ui.formatter('annotate', opts)
297 if ui.quiet:
297 if ui.quiet:
298 datefunc = util.shortdate
298 datefunc = util.shortdate
299 else:
299 else:
300 datefunc = util.datestr
300 datefunc = util.datestr
301 if ctx.rev() is None:
301 if ctx.rev() is None:
302 def hexfn(node):
302 def hexfn(node):
303 if node is None:
303 if node is None:
304 return None
304 return None
305 else:
305 else:
306 return rootfm.hexfunc(node)
306 return rootfm.hexfunc(node)
307 if opts.get('changeset'):
307 if opts.get('changeset'):
308 # omit "+" suffix which is appended to node hex
308 # omit "+" suffix which is appended to node hex
309 def formatrev(rev):
309 def formatrev(rev):
310 if rev is None:
310 if rev is None:
311 return '%d' % ctx.p1().rev()
311 return '%d' % ctx.p1().rev()
312 else:
312 else:
313 return '%d' % rev
313 return '%d' % rev
314 else:
314 else:
315 def formatrev(rev):
315 def formatrev(rev):
316 if rev is None:
316 if rev is None:
317 return '%d+' % ctx.p1().rev()
317 return '%d+' % ctx.p1().rev()
318 else:
318 else:
319 return '%d ' % rev
319 return '%d ' % rev
320 def formathex(hex):
320 def formathex(hex):
321 if hex is None:
321 if hex is None:
322 return '%s+' % rootfm.hexfunc(ctx.p1().node())
322 return '%s+' % rootfm.hexfunc(ctx.p1().node())
323 else:
323 else:
324 return '%s ' % hex
324 return '%s ' % hex
325 else:
325 else:
326 hexfn = rootfm.hexfunc
326 hexfn = rootfm.hexfunc
327 formatrev = formathex = str
327 formatrev = formathex = pycompat.bytestr
328
328
329 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
329 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
330 ('number', ' ', lambda x: x[0].rev(), formatrev),
330 ('number', ' ', lambda x: x[0].rev(), formatrev),
331 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
331 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
332 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
332 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
333 ('file', ' ', lambda x: x[0].path(), str),
333 ('file', ' ', lambda x: x[0].path(), str),
334 ('line_number', ':', lambda x: x[1], str),
334 ('line_number', ':', lambda x: x[1], str),
335 ]
335 ]
336 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
336 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
337
337
338 if (not opts.get('user') and not opts.get('changeset')
338 if (not opts.get('user') and not opts.get('changeset')
339 and not opts.get('date') and not opts.get('file')):
339 and not opts.get('date') and not opts.get('file')):
340 opts['number'] = True
340 opts['number'] = True
341
341
342 linenumber = opts.get('line_number') is not None
342 linenumber = opts.get('line_number') is not None
343 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
343 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
344 raise error.Abort(_('at least one of -n/-c is required for -l'))
344 raise error.Abort(_('at least one of -n/-c is required for -l'))
345
345
346 ui.pager('annotate')
346 ui.pager('annotate')
347
347
348 if rootfm.isplain():
348 if rootfm.isplain():
349 def makefunc(get, fmt):
349 def makefunc(get, fmt):
350 return lambda x: fmt(get(x))
350 return lambda x: fmt(get(x))
351 else:
351 else:
352 def makefunc(get, fmt):
352 def makefunc(get, fmt):
353 return get
353 return get
354 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
354 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
355 if opts.get(op)]
355 if opts.get(op)]
356 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
356 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
357 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
357 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
358 if opts.get(op))
358 if opts.get(op))
359
359
360 def bad(x, y):
360 def bad(x, y):
361 raise error.Abort("%s: %s" % (x, y))
361 raise error.Abort("%s: %s" % (x, y))
362
362
363 m = scmutil.match(ctx, pats, opts, badfn=bad)
363 m = scmutil.match(ctx, pats, opts, badfn=bad)
364
364
365 follow = not opts.get('no_follow')
365 follow = not opts.get('no_follow')
366 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
366 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
367 whitespace=True)
367 whitespace=True)
368 skiprevs = opts.get('skip')
368 skiprevs = opts.get('skip')
369 if skiprevs:
369 if skiprevs:
370 skiprevs = scmutil.revrange(repo, skiprevs)
370 skiprevs = scmutil.revrange(repo, skiprevs)
371
371
372 for abs in ctx.walk(m):
372 for abs in ctx.walk(m):
373 fctx = ctx[abs]
373 fctx = ctx[abs]
374 rootfm.startitem()
374 rootfm.startitem()
375 rootfm.data(abspath=abs, path=m.rel(abs))
375 rootfm.data(abspath=abs, path=m.rel(abs))
376 if not opts.get('text') and fctx.isbinary():
376 if not opts.get('text') and fctx.isbinary():
377 rootfm.plain(_("%s: binary file\n")
377 rootfm.plain(_("%s: binary file\n")
378 % ((pats and m.rel(abs)) or abs))
378 % ((pats and m.rel(abs)) or abs))
379 continue
379 continue
380
380
381 fm = rootfm.nested('lines')
381 fm = rootfm.nested('lines')
382 lines = fctx.annotate(follow=follow, linenumber=linenumber,
382 lines = fctx.annotate(follow=follow, linenumber=linenumber,
383 skiprevs=skiprevs, diffopts=diffopts)
383 skiprevs=skiprevs, diffopts=diffopts)
384 if not lines:
384 if not lines:
385 fm.end()
385 fm.end()
386 continue
386 continue
387 formats = []
387 formats = []
388 pieces = []
388 pieces = []
389
389
390 for f, sep in funcmap:
390 for f, sep in funcmap:
391 l = [f(n) for n, dummy in lines]
391 l = [f(n) for n, dummy in lines]
392 if fm.isplain():
392 if fm.isplain():
393 sizes = [encoding.colwidth(x) for x in l]
393 sizes = [encoding.colwidth(x) for x in l]
394 ml = max(sizes)
394 ml = max(sizes)
395 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
395 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
396 else:
396 else:
397 formats.append(['%s' for x in l])
397 formats.append(['%s' for x in l])
398 pieces.append(l)
398 pieces.append(l)
399
399
400 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
400 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
401 fm.startitem()
401 fm.startitem()
402 fm.write(fields, "".join(f), *p)
402 fm.write(fields, "".join(f), *p)
403 fm.write('line', ": %s", l[1])
403 fm.write('line', ": %s", l[1])
404
404
405 if not lines[-1][1].endswith('\n'):
405 if not lines[-1][1].endswith('\n'):
406 fm.plain('\n')
406 fm.plain('\n')
407 fm.end()
407 fm.end()
408
408
409 rootfm.end()
409 rootfm.end()
410
410
411 @command('archive',
411 @command('archive',
412 [('', 'no-decode', None, _('do not pass files through decoders')),
412 [('', 'no-decode', None, _('do not pass files through decoders')),
413 ('p', 'prefix', '', _('directory prefix for files in archive'),
413 ('p', 'prefix', '', _('directory prefix for files in archive'),
414 _('PREFIX')),
414 _('PREFIX')),
415 ('r', 'rev', '', _('revision to distribute'), _('REV')),
415 ('r', 'rev', '', _('revision to distribute'), _('REV')),
416 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
416 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
417 ] + subrepoopts + walkopts,
417 ] + subrepoopts + walkopts,
418 _('[OPTION]... DEST'))
418 _('[OPTION]... DEST'))
419 def archive(ui, repo, dest, **opts):
419 def archive(ui, repo, dest, **opts):
420 '''create an unversioned archive of a repository revision
420 '''create an unversioned archive of a repository revision
421
421
422 By default, the revision used is the parent of the working
422 By default, the revision used is the parent of the working
423 directory; use -r/--rev to specify a different revision.
423 directory; use -r/--rev to specify a different revision.
424
424
425 The archive type is automatically detected based on file
425 The archive type is automatically detected based on file
426 extension (to override, use -t/--type).
426 extension (to override, use -t/--type).
427
427
428 .. container:: verbose
428 .. container:: verbose
429
429
430 Examples:
430 Examples:
431
431
432 - create a zip file containing the 1.0 release::
432 - create a zip file containing the 1.0 release::
433
433
434 hg archive -r 1.0 project-1.0.zip
434 hg archive -r 1.0 project-1.0.zip
435
435
436 - create a tarball excluding .hg files::
436 - create a tarball excluding .hg files::
437
437
438 hg archive project.tar.gz -X ".hg*"
438 hg archive project.tar.gz -X ".hg*"
439
439
440 Valid types are:
440 Valid types are:
441
441
442 :``files``: a directory full of files (default)
442 :``files``: a directory full of files (default)
443 :``tar``: tar archive, uncompressed
443 :``tar``: tar archive, uncompressed
444 :``tbz2``: tar archive, compressed using bzip2
444 :``tbz2``: tar archive, compressed using bzip2
445 :``tgz``: tar archive, compressed using gzip
445 :``tgz``: tar archive, compressed using gzip
446 :``uzip``: zip archive, uncompressed
446 :``uzip``: zip archive, uncompressed
447 :``zip``: zip archive, compressed using deflate
447 :``zip``: zip archive, compressed using deflate
448
448
449 The exact name of the destination archive or directory is given
449 The exact name of the destination archive or directory is given
450 using a format string; see :hg:`help export` for details.
450 using a format string; see :hg:`help export` for details.
451
451
452 Each member added to an archive file has a directory prefix
452 Each member added to an archive file has a directory prefix
453 prepended. Use -p/--prefix to specify a format string for the
453 prepended. Use -p/--prefix to specify a format string for the
454 prefix. The default is the basename of the archive, with suffixes
454 prefix. The default is the basename of the archive, with suffixes
455 removed.
455 removed.
456
456
457 Returns 0 on success.
457 Returns 0 on success.
458 '''
458 '''
459
459
460 opts = pycompat.byteskwargs(opts)
460 opts = pycompat.byteskwargs(opts)
461 ctx = scmutil.revsingle(repo, opts.get('rev'))
461 ctx = scmutil.revsingle(repo, opts.get('rev'))
462 if not ctx:
462 if not ctx:
463 raise error.Abort(_('no working directory: please specify a revision'))
463 raise error.Abort(_('no working directory: please specify a revision'))
464 node = ctx.node()
464 node = ctx.node()
465 dest = cmdutil.makefilename(repo, dest, node)
465 dest = cmdutil.makefilename(repo, dest, node)
466 if os.path.realpath(dest) == repo.root:
466 if os.path.realpath(dest) == repo.root:
467 raise error.Abort(_('repository root cannot be destination'))
467 raise error.Abort(_('repository root cannot be destination'))
468
468
469 kind = opts.get('type') or archival.guesskind(dest) or 'files'
469 kind = opts.get('type') or archival.guesskind(dest) or 'files'
470 prefix = opts.get('prefix')
470 prefix = opts.get('prefix')
471
471
472 if dest == '-':
472 if dest == '-':
473 if kind == 'files':
473 if kind == 'files':
474 raise error.Abort(_('cannot archive plain files to stdout'))
474 raise error.Abort(_('cannot archive plain files to stdout'))
475 dest = cmdutil.makefileobj(repo, dest)
475 dest = cmdutil.makefileobj(repo, dest)
476 if not prefix:
476 if not prefix:
477 prefix = os.path.basename(repo.root) + '-%h'
477 prefix = os.path.basename(repo.root) + '-%h'
478
478
479 prefix = cmdutil.makefilename(repo, prefix, node)
479 prefix = cmdutil.makefilename(repo, prefix, node)
480 matchfn = scmutil.match(ctx, [], opts)
480 matchfn = scmutil.match(ctx, [], opts)
481 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
481 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
482 matchfn, prefix, subrepos=opts.get('subrepos'))
482 matchfn, prefix, subrepos=opts.get('subrepos'))
483
483
484 @command('backout',
484 @command('backout',
485 [('', 'merge', None, _('merge with old dirstate parent after backout')),
485 [('', 'merge', None, _('merge with old dirstate parent after backout')),
486 ('', 'commit', None,
486 ('', 'commit', None,
487 _('commit if no conflicts were encountered (DEPRECATED)')),
487 _('commit if no conflicts were encountered (DEPRECATED)')),
488 ('', 'no-commit', None, _('do not commit')),
488 ('', 'no-commit', None, _('do not commit')),
489 ('', 'parent', '',
489 ('', 'parent', '',
490 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
490 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
491 ('r', 'rev', '', _('revision to backout'), _('REV')),
491 ('r', 'rev', '', _('revision to backout'), _('REV')),
492 ('e', 'edit', False, _('invoke editor on commit messages')),
492 ('e', 'edit', False, _('invoke editor on commit messages')),
493 ] + mergetoolopts + walkopts + commitopts + commitopts2,
493 ] + mergetoolopts + walkopts + commitopts + commitopts2,
494 _('[OPTION]... [-r] REV'))
494 _('[OPTION]... [-r] REV'))
495 def backout(ui, repo, node=None, rev=None, **opts):
495 def backout(ui, repo, node=None, rev=None, **opts):
496 '''reverse effect of earlier changeset
496 '''reverse effect of earlier changeset
497
497
498 Prepare a new changeset with the effect of REV undone in the
498 Prepare a new changeset with the effect of REV undone in the
499 current working directory. If no conflicts were encountered,
499 current working directory. If no conflicts were encountered,
500 it will be committed immediately.
500 it will be committed immediately.
501
501
502 If REV is the parent of the working directory, then this new changeset
502 If REV is the parent of the working directory, then this new changeset
503 is committed automatically (unless --no-commit is specified).
503 is committed automatically (unless --no-commit is specified).
504
504
505 .. note::
505 .. note::
506
506
507 :hg:`backout` cannot be used to fix either an unwanted or
507 :hg:`backout` cannot be used to fix either an unwanted or
508 incorrect merge.
508 incorrect merge.
509
509
510 .. container:: verbose
510 .. container:: verbose
511
511
512 Examples:
512 Examples:
513
513
514 - Reverse the effect of the parent of the working directory.
514 - Reverse the effect of the parent of the working directory.
515 This backout will be committed immediately::
515 This backout will be committed immediately::
516
516
517 hg backout -r .
517 hg backout -r .
518
518
519 - Reverse the effect of previous bad revision 23::
519 - Reverse the effect of previous bad revision 23::
520
520
521 hg backout -r 23
521 hg backout -r 23
522
522
523 - Reverse the effect of previous bad revision 23 and
523 - Reverse the effect of previous bad revision 23 and
524 leave changes uncommitted::
524 leave changes uncommitted::
525
525
526 hg backout -r 23 --no-commit
526 hg backout -r 23 --no-commit
527 hg commit -m "Backout revision 23"
527 hg commit -m "Backout revision 23"
528
528
529 By default, the pending changeset will have one parent,
529 By default, the pending changeset will have one parent,
530 maintaining a linear history. With --merge, the pending
530 maintaining a linear history. With --merge, the pending
531 changeset will instead have two parents: the old parent of the
531 changeset will instead have two parents: the old parent of the
532 working directory and a new child of REV that simply undoes REV.
532 working directory and a new child of REV that simply undoes REV.
533
533
534 Before version 1.7, the behavior without --merge was equivalent
534 Before version 1.7, the behavior without --merge was equivalent
535 to specifying --merge followed by :hg:`update --clean .` to
535 to specifying --merge followed by :hg:`update --clean .` to
536 cancel the merge and leave the child of REV as a head to be
536 cancel the merge and leave the child of REV as a head to be
537 merged separately.
537 merged separately.
538
538
539 See :hg:`help dates` for a list of formats valid for -d/--date.
539 See :hg:`help dates` for a list of formats valid for -d/--date.
540
540
541 See :hg:`help revert` for a way to restore files to the state
541 See :hg:`help revert` for a way to restore files to the state
542 of another revision.
542 of another revision.
543
543
544 Returns 0 on success, 1 if nothing to backout or there are unresolved
544 Returns 0 on success, 1 if nothing to backout or there are unresolved
545 files.
545 files.
546 '''
546 '''
547 wlock = lock = None
547 wlock = lock = None
548 try:
548 try:
549 wlock = repo.wlock()
549 wlock = repo.wlock()
550 lock = repo.lock()
550 lock = repo.lock()
551 return _dobackout(ui, repo, node, rev, **opts)
551 return _dobackout(ui, repo, node, rev, **opts)
552 finally:
552 finally:
553 release(lock, wlock)
553 release(lock, wlock)
554
554
555 def _dobackout(ui, repo, node=None, rev=None, **opts):
555 def _dobackout(ui, repo, node=None, rev=None, **opts):
556 opts = pycompat.byteskwargs(opts)
556 opts = pycompat.byteskwargs(opts)
557 if opts.get('commit') and opts.get('no_commit'):
557 if opts.get('commit') and opts.get('no_commit'):
558 raise error.Abort(_("cannot use --commit with --no-commit"))
558 raise error.Abort(_("cannot use --commit with --no-commit"))
559 if opts.get('merge') and opts.get('no_commit'):
559 if opts.get('merge') and opts.get('no_commit'):
560 raise error.Abort(_("cannot use --merge with --no-commit"))
560 raise error.Abort(_("cannot use --merge with --no-commit"))
561
561
562 if rev and node:
562 if rev and node:
563 raise error.Abort(_("please specify just one revision"))
563 raise error.Abort(_("please specify just one revision"))
564
564
565 if not rev:
565 if not rev:
566 rev = node
566 rev = node
567
567
568 if not rev:
568 if not rev:
569 raise error.Abort(_("please specify a revision to backout"))
569 raise error.Abort(_("please specify a revision to backout"))
570
570
571 date = opts.get('date')
571 date = opts.get('date')
572 if date:
572 if date:
573 opts['date'] = util.parsedate(date)
573 opts['date'] = util.parsedate(date)
574
574
575 cmdutil.checkunfinished(repo)
575 cmdutil.checkunfinished(repo)
576 cmdutil.bailifchanged(repo)
576 cmdutil.bailifchanged(repo)
577 node = scmutil.revsingle(repo, rev).node()
577 node = scmutil.revsingle(repo, rev).node()
578
578
579 op1, op2 = repo.dirstate.parents()
579 op1, op2 = repo.dirstate.parents()
580 if not repo.changelog.isancestor(node, op1):
580 if not repo.changelog.isancestor(node, op1):
581 raise error.Abort(_('cannot backout change that is not an ancestor'))
581 raise error.Abort(_('cannot backout change that is not an ancestor'))
582
582
583 p1, p2 = repo.changelog.parents(node)
583 p1, p2 = repo.changelog.parents(node)
584 if p1 == nullid:
584 if p1 == nullid:
585 raise error.Abort(_('cannot backout a change with no parents'))
585 raise error.Abort(_('cannot backout a change with no parents'))
586 if p2 != nullid:
586 if p2 != nullid:
587 if not opts.get('parent'):
587 if not opts.get('parent'):
588 raise error.Abort(_('cannot backout a merge changeset'))
588 raise error.Abort(_('cannot backout a merge changeset'))
589 p = repo.lookup(opts['parent'])
589 p = repo.lookup(opts['parent'])
590 if p not in (p1, p2):
590 if p not in (p1, p2):
591 raise error.Abort(_('%s is not a parent of %s') %
591 raise error.Abort(_('%s is not a parent of %s') %
592 (short(p), short(node)))
592 (short(p), short(node)))
593 parent = p
593 parent = p
594 else:
594 else:
595 if opts.get('parent'):
595 if opts.get('parent'):
596 raise error.Abort(_('cannot use --parent on non-merge changeset'))
596 raise error.Abort(_('cannot use --parent on non-merge changeset'))
597 parent = p1
597 parent = p1
598
598
599 # the backout should appear on the same branch
599 # the backout should appear on the same branch
600 branch = repo.dirstate.branch()
600 branch = repo.dirstate.branch()
601 bheads = repo.branchheads(branch)
601 bheads = repo.branchheads(branch)
602 rctx = scmutil.revsingle(repo, hex(parent))
602 rctx = scmutil.revsingle(repo, hex(parent))
603 if not opts.get('merge') and op1 != node:
603 if not opts.get('merge') and op1 != node:
604 dsguard = dirstateguard.dirstateguard(repo, 'backout')
604 dsguard = dirstateguard.dirstateguard(repo, 'backout')
605 try:
605 try:
606 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
606 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
607 'backout')
607 'backout')
608 stats = mergemod.update(repo, parent, True, True, node, False)
608 stats = mergemod.update(repo, parent, True, True, node, False)
609 repo.setparents(op1, op2)
609 repo.setparents(op1, op2)
610 dsguard.close()
610 dsguard.close()
611 hg._showstats(repo, stats)
611 hg._showstats(repo, stats)
612 if stats[3]:
612 if stats[3]:
613 repo.ui.status(_("use 'hg resolve' to retry unresolved "
613 repo.ui.status(_("use 'hg resolve' to retry unresolved "
614 "file merges\n"))
614 "file merges\n"))
615 return 1
615 return 1
616 finally:
616 finally:
617 ui.setconfig('ui', 'forcemerge', '', '')
617 ui.setconfig('ui', 'forcemerge', '', '')
618 lockmod.release(dsguard)
618 lockmod.release(dsguard)
619 else:
619 else:
620 hg.clean(repo, node, show_stats=False)
620 hg.clean(repo, node, show_stats=False)
621 repo.dirstate.setbranch(branch)
621 repo.dirstate.setbranch(branch)
622 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
622 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
623
623
624 if opts.get('no_commit'):
624 if opts.get('no_commit'):
625 msg = _("changeset %s backed out, "
625 msg = _("changeset %s backed out, "
626 "don't forget to commit.\n")
626 "don't forget to commit.\n")
627 ui.status(msg % short(node))
627 ui.status(msg % short(node))
628 return 0
628 return 0
629
629
630 def commitfunc(ui, repo, message, match, opts):
630 def commitfunc(ui, repo, message, match, opts):
631 editform = 'backout'
631 editform = 'backout'
632 e = cmdutil.getcommiteditor(editform=editform,
632 e = cmdutil.getcommiteditor(editform=editform,
633 **pycompat.strkwargs(opts))
633 **pycompat.strkwargs(opts))
634 if not message:
634 if not message:
635 # we don't translate commit messages
635 # we don't translate commit messages
636 message = "Backed out changeset %s" % short(node)
636 message = "Backed out changeset %s" % short(node)
637 e = cmdutil.getcommiteditor(edit=True, editform=editform)
637 e = cmdutil.getcommiteditor(edit=True, editform=editform)
638 return repo.commit(message, opts.get('user'), opts.get('date'),
638 return repo.commit(message, opts.get('user'), opts.get('date'),
639 match, editor=e)
639 match, editor=e)
640 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
640 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
641 if not newnode:
641 if not newnode:
642 ui.status(_("nothing changed\n"))
642 ui.status(_("nothing changed\n"))
643 return 1
643 return 1
644 cmdutil.commitstatus(repo, newnode, branch, bheads)
644 cmdutil.commitstatus(repo, newnode, branch, bheads)
645
645
646 def nice(node):
646 def nice(node):
647 return '%d:%s' % (repo.changelog.rev(node), short(node))
647 return '%d:%s' % (repo.changelog.rev(node), short(node))
648 ui.status(_('changeset %s backs out changeset %s\n') %
648 ui.status(_('changeset %s backs out changeset %s\n') %
649 (nice(repo.changelog.tip()), nice(node)))
649 (nice(repo.changelog.tip()), nice(node)))
650 if opts.get('merge') and op1 != node:
650 if opts.get('merge') and op1 != node:
651 hg.clean(repo, op1, show_stats=False)
651 hg.clean(repo, op1, show_stats=False)
652 ui.status(_('merging with changeset %s\n')
652 ui.status(_('merging with changeset %s\n')
653 % nice(repo.changelog.tip()))
653 % nice(repo.changelog.tip()))
654 try:
654 try:
655 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
655 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
656 'backout')
656 'backout')
657 return hg.merge(repo, hex(repo.changelog.tip()))
657 return hg.merge(repo, hex(repo.changelog.tip()))
658 finally:
658 finally:
659 ui.setconfig('ui', 'forcemerge', '', '')
659 ui.setconfig('ui', 'forcemerge', '', '')
660 return 0
660 return 0
661
661
662 @command('bisect',
662 @command('bisect',
663 [('r', 'reset', False, _('reset bisect state')),
663 [('r', 'reset', False, _('reset bisect state')),
664 ('g', 'good', False, _('mark changeset good')),
664 ('g', 'good', False, _('mark changeset good')),
665 ('b', 'bad', False, _('mark changeset bad')),
665 ('b', 'bad', False, _('mark changeset bad')),
666 ('s', 'skip', False, _('skip testing changeset')),
666 ('s', 'skip', False, _('skip testing changeset')),
667 ('e', 'extend', False, _('extend the bisect range')),
667 ('e', 'extend', False, _('extend the bisect range')),
668 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
668 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
669 ('U', 'noupdate', False, _('do not update to target'))],
669 ('U', 'noupdate', False, _('do not update to target'))],
670 _("[-gbsr] [-U] [-c CMD] [REV]"))
670 _("[-gbsr] [-U] [-c CMD] [REV]"))
671 def bisect(ui, repo, rev=None, extra=None, command=None,
671 def bisect(ui, repo, rev=None, extra=None, command=None,
672 reset=None, good=None, bad=None, skip=None, extend=None,
672 reset=None, good=None, bad=None, skip=None, extend=None,
673 noupdate=None):
673 noupdate=None):
674 """subdivision search of changesets
674 """subdivision search of changesets
675
675
676 This command helps to find changesets which introduce problems. To
676 This command helps to find changesets which introduce problems. To
677 use, mark the earliest changeset you know exhibits the problem as
677 use, mark the earliest changeset you know exhibits the problem as
678 bad, then mark the latest changeset which is free from the problem
678 bad, then mark the latest changeset which is free from the problem
679 as good. Bisect will update your working directory to a revision
679 as good. Bisect will update your working directory to a revision
680 for testing (unless the -U/--noupdate option is specified). Once
680 for testing (unless the -U/--noupdate option is specified). Once
681 you have performed tests, mark the working directory as good or
681 you have performed tests, mark the working directory as good or
682 bad, and bisect will either update to another candidate changeset
682 bad, and bisect will either update to another candidate changeset
683 or announce that it has found the bad revision.
683 or announce that it has found the bad revision.
684
684
685 As a shortcut, you can also use the revision argument to mark a
685 As a shortcut, you can also use the revision argument to mark a
686 revision as good or bad without checking it out first.
686 revision as good or bad without checking it out first.
687
687
688 If you supply a command, it will be used for automatic bisection.
688 If you supply a command, it will be used for automatic bisection.
689 The environment variable HG_NODE will contain the ID of the
689 The environment variable HG_NODE will contain the ID of the
690 changeset being tested. The exit status of the command will be
690 changeset being tested. The exit status of the command will be
691 used to mark revisions as good or bad: status 0 means good, 125
691 used to mark revisions as good or bad: status 0 means good, 125
692 means to skip the revision, 127 (command not found) will abort the
692 means to skip the revision, 127 (command not found) will abort the
693 bisection, and any other non-zero exit status means the revision
693 bisection, and any other non-zero exit status means the revision
694 is bad.
694 is bad.
695
695
696 .. container:: verbose
696 .. container:: verbose
697
697
698 Some examples:
698 Some examples:
699
699
700 - start a bisection with known bad revision 34, and good revision 12::
700 - start a bisection with known bad revision 34, and good revision 12::
701
701
702 hg bisect --bad 34
702 hg bisect --bad 34
703 hg bisect --good 12
703 hg bisect --good 12
704
704
705 - advance the current bisection by marking current revision as good or
705 - advance the current bisection by marking current revision as good or
706 bad::
706 bad::
707
707
708 hg bisect --good
708 hg bisect --good
709 hg bisect --bad
709 hg bisect --bad
710
710
711 - mark the current revision, or a known revision, to be skipped (e.g. if
711 - mark the current revision, or a known revision, to be skipped (e.g. if
712 that revision is not usable because of another issue)::
712 that revision is not usable because of another issue)::
713
713
714 hg bisect --skip
714 hg bisect --skip
715 hg bisect --skip 23
715 hg bisect --skip 23
716
716
717 - skip all revisions that do not touch directories ``foo`` or ``bar``::
717 - skip all revisions that do not touch directories ``foo`` or ``bar``::
718
718
719 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
719 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
720
720
721 - forget the current bisection::
721 - forget the current bisection::
722
722
723 hg bisect --reset
723 hg bisect --reset
724
724
725 - use 'make && make tests' to automatically find the first broken
725 - use 'make && make tests' to automatically find the first broken
726 revision::
726 revision::
727
727
728 hg bisect --reset
728 hg bisect --reset
729 hg bisect --bad 34
729 hg bisect --bad 34
730 hg bisect --good 12
730 hg bisect --good 12
731 hg bisect --command "make && make tests"
731 hg bisect --command "make && make tests"
732
732
733 - see all changesets whose states are already known in the current
733 - see all changesets whose states are already known in the current
734 bisection::
734 bisection::
735
735
736 hg log -r "bisect(pruned)"
736 hg log -r "bisect(pruned)"
737
737
738 - see the changeset currently being bisected (especially useful
738 - see the changeset currently being bisected (especially useful
739 if running with -U/--noupdate)::
739 if running with -U/--noupdate)::
740
740
741 hg log -r "bisect(current)"
741 hg log -r "bisect(current)"
742
742
743 - see all changesets that took part in the current bisection::
743 - see all changesets that took part in the current bisection::
744
744
745 hg log -r "bisect(range)"
745 hg log -r "bisect(range)"
746
746
747 - you can even get a nice graph::
747 - you can even get a nice graph::
748
748
749 hg log --graph -r "bisect(range)"
749 hg log --graph -r "bisect(range)"
750
750
751 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
751 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
752
752
753 Returns 0 on success.
753 Returns 0 on success.
754 """
754 """
755 # backward compatibility
755 # backward compatibility
756 if rev in "good bad reset init".split():
756 if rev in "good bad reset init".split():
757 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
757 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
758 cmd, rev, extra = rev, extra, None
758 cmd, rev, extra = rev, extra, None
759 if cmd == "good":
759 if cmd == "good":
760 good = True
760 good = True
761 elif cmd == "bad":
761 elif cmd == "bad":
762 bad = True
762 bad = True
763 else:
763 else:
764 reset = True
764 reset = True
765 elif extra:
765 elif extra:
766 raise error.Abort(_('incompatible arguments'))
766 raise error.Abort(_('incompatible arguments'))
767
767
768 incompatibles = {
768 incompatibles = {
769 '--bad': bad,
769 '--bad': bad,
770 '--command': bool(command),
770 '--command': bool(command),
771 '--extend': extend,
771 '--extend': extend,
772 '--good': good,
772 '--good': good,
773 '--reset': reset,
773 '--reset': reset,
774 '--skip': skip,
774 '--skip': skip,
775 }
775 }
776
776
777 enabled = [x for x in incompatibles if incompatibles[x]]
777 enabled = [x for x in incompatibles if incompatibles[x]]
778
778
779 if len(enabled) > 1:
779 if len(enabled) > 1:
780 raise error.Abort(_('%s and %s are incompatible') %
780 raise error.Abort(_('%s and %s are incompatible') %
781 tuple(sorted(enabled)[0:2]))
781 tuple(sorted(enabled)[0:2]))
782
782
783 if reset:
783 if reset:
784 hbisect.resetstate(repo)
784 hbisect.resetstate(repo)
785 return
785 return
786
786
787 state = hbisect.load_state(repo)
787 state = hbisect.load_state(repo)
788
788
789 # update state
789 # update state
790 if good or bad or skip:
790 if good or bad or skip:
791 if rev:
791 if rev:
792 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
792 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
793 else:
793 else:
794 nodes = [repo.lookup('.')]
794 nodes = [repo.lookup('.')]
795 if good:
795 if good:
796 state['good'] += nodes
796 state['good'] += nodes
797 elif bad:
797 elif bad:
798 state['bad'] += nodes
798 state['bad'] += nodes
799 elif skip:
799 elif skip:
800 state['skip'] += nodes
800 state['skip'] += nodes
801 hbisect.save_state(repo, state)
801 hbisect.save_state(repo, state)
802 if not (state['good'] and state['bad']):
802 if not (state['good'] and state['bad']):
803 return
803 return
804
804
805 def mayupdate(repo, node, show_stats=True):
805 def mayupdate(repo, node, show_stats=True):
806 """common used update sequence"""
806 """common used update sequence"""
807 if noupdate:
807 if noupdate:
808 return
808 return
809 cmdutil.checkunfinished(repo)
809 cmdutil.checkunfinished(repo)
810 cmdutil.bailifchanged(repo)
810 cmdutil.bailifchanged(repo)
811 return hg.clean(repo, node, show_stats=show_stats)
811 return hg.clean(repo, node, show_stats=show_stats)
812
812
813 displayer = cmdutil.show_changeset(ui, repo, {})
813 displayer = cmdutil.show_changeset(ui, repo, {})
814
814
815 if command:
815 if command:
816 changesets = 1
816 changesets = 1
817 if noupdate:
817 if noupdate:
818 try:
818 try:
819 node = state['current'][0]
819 node = state['current'][0]
820 except LookupError:
820 except LookupError:
821 raise error.Abort(_('current bisect revision is unknown - '
821 raise error.Abort(_('current bisect revision is unknown - '
822 'start a new bisect to fix'))
822 'start a new bisect to fix'))
823 else:
823 else:
824 node, p2 = repo.dirstate.parents()
824 node, p2 = repo.dirstate.parents()
825 if p2 != nullid:
825 if p2 != nullid:
826 raise error.Abort(_('current bisect revision is a merge'))
826 raise error.Abort(_('current bisect revision is a merge'))
827 if rev:
827 if rev:
828 node = repo[scmutil.revsingle(repo, rev, node)].node()
828 node = repo[scmutil.revsingle(repo, rev, node)].node()
829 try:
829 try:
830 while changesets:
830 while changesets:
831 # update state
831 # update state
832 state['current'] = [node]
832 state['current'] = [node]
833 hbisect.save_state(repo, state)
833 hbisect.save_state(repo, state)
834 status = ui.system(command, environ={'HG_NODE': hex(node)},
834 status = ui.system(command, environ={'HG_NODE': hex(node)},
835 blockedtag='bisect_check')
835 blockedtag='bisect_check')
836 if status == 125:
836 if status == 125:
837 transition = "skip"
837 transition = "skip"
838 elif status == 0:
838 elif status == 0:
839 transition = "good"
839 transition = "good"
840 # status < 0 means process was killed
840 # status < 0 means process was killed
841 elif status == 127:
841 elif status == 127:
842 raise error.Abort(_("failed to execute %s") % command)
842 raise error.Abort(_("failed to execute %s") % command)
843 elif status < 0:
843 elif status < 0:
844 raise error.Abort(_("%s killed") % command)
844 raise error.Abort(_("%s killed") % command)
845 else:
845 else:
846 transition = "bad"
846 transition = "bad"
847 state[transition].append(node)
847 state[transition].append(node)
848 ctx = repo[node]
848 ctx = repo[node]
849 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
849 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
850 hbisect.checkstate(state)
850 hbisect.checkstate(state)
851 # bisect
851 # bisect
852 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
852 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
853 # update to next check
853 # update to next check
854 node = nodes[0]
854 node = nodes[0]
855 mayupdate(repo, node, show_stats=False)
855 mayupdate(repo, node, show_stats=False)
856 finally:
856 finally:
857 state['current'] = [node]
857 state['current'] = [node]
858 hbisect.save_state(repo, state)
858 hbisect.save_state(repo, state)
859 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
859 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
860 return
860 return
861
861
862 hbisect.checkstate(state)
862 hbisect.checkstate(state)
863
863
864 # actually bisect
864 # actually bisect
865 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
865 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
866 if extend:
866 if extend:
867 if not changesets:
867 if not changesets:
868 extendnode = hbisect.extendrange(repo, state, nodes, good)
868 extendnode = hbisect.extendrange(repo, state, nodes, good)
869 if extendnode is not None:
869 if extendnode is not None:
870 ui.write(_("Extending search to changeset %d:%s\n")
870 ui.write(_("Extending search to changeset %d:%s\n")
871 % (extendnode.rev(), extendnode))
871 % (extendnode.rev(), extendnode))
872 state['current'] = [extendnode.node()]
872 state['current'] = [extendnode.node()]
873 hbisect.save_state(repo, state)
873 hbisect.save_state(repo, state)
874 return mayupdate(repo, extendnode.node())
874 return mayupdate(repo, extendnode.node())
875 raise error.Abort(_("nothing to extend"))
875 raise error.Abort(_("nothing to extend"))
876
876
877 if changesets == 0:
877 if changesets == 0:
878 hbisect.printresult(ui, repo, state, displayer, nodes, good)
878 hbisect.printresult(ui, repo, state, displayer, nodes, good)
879 else:
879 else:
880 assert len(nodes) == 1 # only a single node can be tested next
880 assert len(nodes) == 1 # only a single node can be tested next
881 node = nodes[0]
881 node = nodes[0]
882 # compute the approximate number of remaining tests
882 # compute the approximate number of remaining tests
883 tests, size = 0, 2
883 tests, size = 0, 2
884 while size <= changesets:
884 while size <= changesets:
885 tests, size = tests + 1, size * 2
885 tests, size = tests + 1, size * 2
886 rev = repo.changelog.rev(node)
886 rev = repo.changelog.rev(node)
887 ui.write(_("Testing changeset %d:%s "
887 ui.write(_("Testing changeset %d:%s "
888 "(%d changesets remaining, ~%d tests)\n")
888 "(%d changesets remaining, ~%d tests)\n")
889 % (rev, short(node), changesets, tests))
889 % (rev, short(node), changesets, tests))
890 state['current'] = [node]
890 state['current'] = [node]
891 hbisect.save_state(repo, state)
891 hbisect.save_state(repo, state)
892 return mayupdate(repo, node)
892 return mayupdate(repo, node)
893
893
894 @command('bookmarks|bookmark',
894 @command('bookmarks|bookmark',
895 [('f', 'force', False, _('force')),
895 [('f', 'force', False, _('force')),
896 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
896 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
897 ('d', 'delete', False, _('delete a given bookmark')),
897 ('d', 'delete', False, _('delete a given bookmark')),
898 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
898 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
899 ('i', 'inactive', False, _('mark a bookmark inactive')),
899 ('i', 'inactive', False, _('mark a bookmark inactive')),
900 ] + formatteropts,
900 ] + formatteropts,
901 _('hg bookmarks [OPTIONS]... [NAME]...'))
901 _('hg bookmarks [OPTIONS]... [NAME]...'))
902 def bookmark(ui, repo, *names, **opts):
902 def bookmark(ui, repo, *names, **opts):
903 '''create a new bookmark or list existing bookmarks
903 '''create a new bookmark or list existing bookmarks
904
904
905 Bookmarks are labels on changesets to help track lines of development.
905 Bookmarks are labels on changesets to help track lines of development.
906 Bookmarks are unversioned and can be moved, renamed and deleted.
906 Bookmarks are unversioned and can be moved, renamed and deleted.
907 Deleting or moving a bookmark has no effect on the associated changesets.
907 Deleting or moving a bookmark has no effect on the associated changesets.
908
908
909 Creating or updating to a bookmark causes it to be marked as 'active'.
909 Creating or updating to a bookmark causes it to be marked as 'active'.
910 The active bookmark is indicated with a '*'.
910 The active bookmark is indicated with a '*'.
911 When a commit is made, the active bookmark will advance to the new commit.
911 When a commit is made, the active bookmark will advance to the new commit.
912 A plain :hg:`update` will also advance an active bookmark, if possible.
912 A plain :hg:`update` will also advance an active bookmark, if possible.
913 Updating away from a bookmark will cause it to be deactivated.
913 Updating away from a bookmark will cause it to be deactivated.
914
914
915 Bookmarks can be pushed and pulled between repositories (see
915 Bookmarks can be pushed and pulled between repositories (see
916 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
916 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
917 diverged, a new 'divergent bookmark' of the form 'name@path' will
917 diverged, a new 'divergent bookmark' of the form 'name@path' will
918 be created. Using :hg:`merge` will resolve the divergence.
918 be created. Using :hg:`merge` will resolve the divergence.
919
919
920 A bookmark named '@' has the special property that :hg:`clone` will
920 A bookmark named '@' has the special property that :hg:`clone` will
921 check it out by default if it exists.
921 check it out by default if it exists.
922
922
923 .. container:: verbose
923 .. container:: verbose
924
924
925 Examples:
925 Examples:
926
926
927 - create an active bookmark for a new line of development::
927 - create an active bookmark for a new line of development::
928
928
929 hg book new-feature
929 hg book new-feature
930
930
931 - create an inactive bookmark as a place marker::
931 - create an inactive bookmark as a place marker::
932
932
933 hg book -i reviewed
933 hg book -i reviewed
934
934
935 - create an inactive bookmark on another changeset::
935 - create an inactive bookmark on another changeset::
936
936
937 hg book -r .^ tested
937 hg book -r .^ tested
938
938
939 - rename bookmark turkey to dinner::
939 - rename bookmark turkey to dinner::
940
940
941 hg book -m turkey dinner
941 hg book -m turkey dinner
942
942
943 - move the '@' bookmark from another branch::
943 - move the '@' bookmark from another branch::
944
944
945 hg book -f @
945 hg book -f @
946 '''
946 '''
947 force = opts.get(r'force')
947 force = opts.get(r'force')
948 rev = opts.get(r'rev')
948 rev = opts.get(r'rev')
949 delete = opts.get(r'delete')
949 delete = opts.get(r'delete')
950 rename = opts.get(r'rename')
950 rename = opts.get(r'rename')
951 inactive = opts.get(r'inactive')
951 inactive = opts.get(r'inactive')
952
952
953 if delete and rename:
953 if delete and rename:
954 raise error.Abort(_("--delete and --rename are incompatible"))
954 raise error.Abort(_("--delete and --rename are incompatible"))
955 if delete and rev:
955 if delete and rev:
956 raise error.Abort(_("--rev is incompatible with --delete"))
956 raise error.Abort(_("--rev is incompatible with --delete"))
957 if rename and rev:
957 if rename and rev:
958 raise error.Abort(_("--rev is incompatible with --rename"))
958 raise error.Abort(_("--rev is incompatible with --rename"))
959 if not names and (delete or rev):
959 if not names and (delete or rev):
960 raise error.Abort(_("bookmark name required"))
960 raise error.Abort(_("bookmark name required"))
961
961
962 if delete or rename or names or inactive:
962 if delete or rename or names or inactive:
963 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
963 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
964 if delete:
964 if delete:
965 bookmarks.delete(repo, tr, names)
965 bookmarks.delete(repo, tr, names)
966 elif rename:
966 elif rename:
967 if not names:
967 if not names:
968 raise error.Abort(_("new bookmark name required"))
968 raise error.Abort(_("new bookmark name required"))
969 elif len(names) > 1:
969 elif len(names) > 1:
970 raise error.Abort(_("only one new bookmark name allowed"))
970 raise error.Abort(_("only one new bookmark name allowed"))
971 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
971 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
972 elif names:
972 elif names:
973 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
973 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
974 elif inactive:
974 elif inactive:
975 if len(repo._bookmarks) == 0:
975 if len(repo._bookmarks) == 0:
976 ui.status(_("no bookmarks set\n"))
976 ui.status(_("no bookmarks set\n"))
977 elif not repo._activebookmark:
977 elif not repo._activebookmark:
978 ui.status(_("no active bookmark\n"))
978 ui.status(_("no active bookmark\n"))
979 else:
979 else:
980 bookmarks.deactivate(repo)
980 bookmarks.deactivate(repo)
981 else: # show bookmarks
981 else: # show bookmarks
982 bookmarks.printbookmarks(ui, repo, **opts)
982 bookmarks.printbookmarks(ui, repo, **opts)
983
983
984 @command('branch',
984 @command('branch',
985 [('f', 'force', None,
985 [('f', 'force', None,
986 _('set branch name even if it shadows an existing branch')),
986 _('set branch name even if it shadows an existing branch')),
987 ('C', 'clean', None, _('reset branch name to parent branch name'))],
987 ('C', 'clean', None, _('reset branch name to parent branch name'))],
988 _('[-fC] [NAME]'))
988 _('[-fC] [NAME]'))
989 def branch(ui, repo, label=None, **opts):
989 def branch(ui, repo, label=None, **opts):
990 """set or show the current branch name
990 """set or show the current branch name
991
991
992 .. note::
992 .. note::
993
993
994 Branch names are permanent and global. Use :hg:`bookmark` to create a
994 Branch names are permanent and global. Use :hg:`bookmark` to create a
995 light-weight bookmark instead. See :hg:`help glossary` for more
995 light-weight bookmark instead. See :hg:`help glossary` for more
996 information about named branches and bookmarks.
996 information about named branches and bookmarks.
997
997
998 With no argument, show the current branch name. With one argument,
998 With no argument, show the current branch name. With one argument,
999 set the working directory branch name (the branch will not exist
999 set the working directory branch name (the branch will not exist
1000 in the repository until the next commit). Standard practice
1000 in the repository until the next commit). Standard practice
1001 recommends that primary development take place on the 'default'
1001 recommends that primary development take place on the 'default'
1002 branch.
1002 branch.
1003
1003
1004 Unless -f/--force is specified, branch will not let you set a
1004 Unless -f/--force is specified, branch will not let you set a
1005 branch name that already exists.
1005 branch name that already exists.
1006
1006
1007 Use -C/--clean to reset the working directory branch to that of
1007 Use -C/--clean to reset the working directory branch to that of
1008 the parent of the working directory, negating a previous branch
1008 the parent of the working directory, negating a previous branch
1009 change.
1009 change.
1010
1010
1011 Use the command :hg:`update` to switch to an existing branch. Use
1011 Use the command :hg:`update` to switch to an existing branch. Use
1012 :hg:`commit --close-branch` to mark this branch head as closed.
1012 :hg:`commit --close-branch` to mark this branch head as closed.
1013 When all heads of a branch are closed, the branch will be
1013 When all heads of a branch are closed, the branch will be
1014 considered closed.
1014 considered closed.
1015
1015
1016 Returns 0 on success.
1016 Returns 0 on success.
1017 """
1017 """
1018 opts = pycompat.byteskwargs(opts)
1018 opts = pycompat.byteskwargs(opts)
1019 if label:
1019 if label:
1020 label = label.strip()
1020 label = label.strip()
1021
1021
1022 if not opts.get('clean') and not label:
1022 if not opts.get('clean') and not label:
1023 ui.write("%s\n" % repo.dirstate.branch())
1023 ui.write("%s\n" % repo.dirstate.branch())
1024 return
1024 return
1025
1025
1026 with repo.wlock():
1026 with repo.wlock():
1027 if opts.get('clean'):
1027 if opts.get('clean'):
1028 label = repo[None].p1().branch()
1028 label = repo[None].p1().branch()
1029 repo.dirstate.setbranch(label)
1029 repo.dirstate.setbranch(label)
1030 ui.status(_('reset working directory to branch %s\n') % label)
1030 ui.status(_('reset working directory to branch %s\n') % label)
1031 elif label:
1031 elif label:
1032 if not opts.get('force') and label in repo.branchmap():
1032 if not opts.get('force') and label in repo.branchmap():
1033 if label not in [p.branch() for p in repo[None].parents()]:
1033 if label not in [p.branch() for p in repo[None].parents()]:
1034 raise error.Abort(_('a branch of the same name already'
1034 raise error.Abort(_('a branch of the same name already'
1035 ' exists'),
1035 ' exists'),
1036 # i18n: "it" refers to an existing branch
1036 # i18n: "it" refers to an existing branch
1037 hint=_("use 'hg update' to switch to it"))
1037 hint=_("use 'hg update' to switch to it"))
1038 scmutil.checknewlabel(repo, label, 'branch')
1038 scmutil.checknewlabel(repo, label, 'branch')
1039 repo.dirstate.setbranch(label)
1039 repo.dirstate.setbranch(label)
1040 ui.status(_('marked working directory as branch %s\n') % label)
1040 ui.status(_('marked working directory as branch %s\n') % label)
1041
1041
1042 # find any open named branches aside from default
1042 # find any open named branches aside from default
1043 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1043 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1044 if n != "default" and not c]
1044 if n != "default" and not c]
1045 if not others:
1045 if not others:
1046 ui.status(_('(branches are permanent and global, '
1046 ui.status(_('(branches are permanent and global, '
1047 'did you want a bookmark?)\n'))
1047 'did you want a bookmark?)\n'))
1048
1048
1049 @command('branches',
1049 @command('branches',
1050 [('a', 'active', False,
1050 [('a', 'active', False,
1051 _('show only branches that have unmerged heads (DEPRECATED)')),
1051 _('show only branches that have unmerged heads (DEPRECATED)')),
1052 ('c', 'closed', False, _('show normal and closed branches')),
1052 ('c', 'closed', False, _('show normal and closed branches')),
1053 ] + formatteropts,
1053 ] + formatteropts,
1054 _('[-c]'))
1054 _('[-c]'))
1055 def branches(ui, repo, active=False, closed=False, **opts):
1055 def branches(ui, repo, active=False, closed=False, **opts):
1056 """list repository named branches
1056 """list repository named branches
1057
1057
1058 List the repository's named branches, indicating which ones are
1058 List the repository's named branches, indicating which ones are
1059 inactive. If -c/--closed is specified, also list branches which have
1059 inactive. If -c/--closed is specified, also list branches which have
1060 been marked closed (see :hg:`commit --close-branch`).
1060 been marked closed (see :hg:`commit --close-branch`).
1061
1061
1062 Use the command :hg:`update` to switch to an existing branch.
1062 Use the command :hg:`update` to switch to an existing branch.
1063
1063
1064 Returns 0.
1064 Returns 0.
1065 """
1065 """
1066
1066
1067 opts = pycompat.byteskwargs(opts)
1067 opts = pycompat.byteskwargs(opts)
1068 ui.pager('branches')
1068 ui.pager('branches')
1069 fm = ui.formatter('branches', opts)
1069 fm = ui.formatter('branches', opts)
1070 hexfunc = fm.hexfunc
1070 hexfunc = fm.hexfunc
1071
1071
1072 allheads = set(repo.heads())
1072 allheads = set(repo.heads())
1073 branches = []
1073 branches = []
1074 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1074 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1075 isactive = not isclosed and bool(set(heads) & allheads)
1075 isactive = not isclosed and bool(set(heads) & allheads)
1076 branches.append((tag, repo[tip], isactive, not isclosed))
1076 branches.append((tag, repo[tip], isactive, not isclosed))
1077 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1077 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1078 reverse=True)
1078 reverse=True)
1079
1079
1080 for tag, ctx, isactive, isopen in branches:
1080 for tag, ctx, isactive, isopen in branches:
1081 if active and not isactive:
1081 if active and not isactive:
1082 continue
1082 continue
1083 if isactive:
1083 if isactive:
1084 label = 'branches.active'
1084 label = 'branches.active'
1085 notice = ''
1085 notice = ''
1086 elif not isopen:
1086 elif not isopen:
1087 if not closed:
1087 if not closed:
1088 continue
1088 continue
1089 label = 'branches.closed'
1089 label = 'branches.closed'
1090 notice = _(' (closed)')
1090 notice = _(' (closed)')
1091 else:
1091 else:
1092 label = 'branches.inactive'
1092 label = 'branches.inactive'
1093 notice = _(' (inactive)')
1093 notice = _(' (inactive)')
1094 current = (tag == repo.dirstate.branch())
1094 current = (tag == repo.dirstate.branch())
1095 if current:
1095 if current:
1096 label = 'branches.current'
1096 label = 'branches.current'
1097
1097
1098 fm.startitem()
1098 fm.startitem()
1099 fm.write('branch', '%s', tag, label=label)
1099 fm.write('branch', '%s', tag, label=label)
1100 rev = ctx.rev()
1100 rev = ctx.rev()
1101 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1101 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1102 fmt = ' ' * padsize + ' %d:%s'
1102 fmt = ' ' * padsize + ' %d:%s'
1103 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1103 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1104 label='log.changeset changeset.%s' % ctx.phasestr())
1104 label='log.changeset changeset.%s' % ctx.phasestr())
1105 fm.context(ctx=ctx)
1105 fm.context(ctx=ctx)
1106 fm.data(active=isactive, closed=not isopen, current=current)
1106 fm.data(active=isactive, closed=not isopen, current=current)
1107 if not ui.quiet:
1107 if not ui.quiet:
1108 fm.plain(notice)
1108 fm.plain(notice)
1109 fm.plain('\n')
1109 fm.plain('\n')
1110 fm.end()
1110 fm.end()
1111
1111
1112 @command('bundle',
1112 @command('bundle',
1113 [('f', 'force', None, _('run even when the destination is unrelated')),
1113 [('f', 'force', None, _('run even when the destination is unrelated')),
1114 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1114 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1115 _('REV')),
1115 _('REV')),
1116 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1116 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1117 _('BRANCH')),
1117 _('BRANCH')),
1118 ('', 'base', [],
1118 ('', 'base', [],
1119 _('a base changeset assumed to be available at the destination'),
1119 _('a base changeset assumed to be available at the destination'),
1120 _('REV')),
1120 _('REV')),
1121 ('a', 'all', None, _('bundle all changesets in the repository')),
1121 ('a', 'all', None, _('bundle all changesets in the repository')),
1122 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1122 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1123 ] + remoteopts,
1123 ] + remoteopts,
1124 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1124 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1125 def bundle(ui, repo, fname, dest=None, **opts):
1125 def bundle(ui, repo, fname, dest=None, **opts):
1126 """create a bundle file
1126 """create a bundle file
1127
1127
1128 Generate a bundle file containing data to be added to a repository.
1128 Generate a bundle file containing data to be added to a repository.
1129
1129
1130 To create a bundle containing all changesets, use -a/--all
1130 To create a bundle containing all changesets, use -a/--all
1131 (or --base null). Otherwise, hg assumes the destination will have
1131 (or --base null). Otherwise, hg assumes the destination will have
1132 all the nodes you specify with --base parameters. Otherwise, hg
1132 all the nodes you specify with --base parameters. Otherwise, hg
1133 will assume the repository has all the nodes in destination, or
1133 will assume the repository has all the nodes in destination, or
1134 default-push/default if no destination is specified.
1134 default-push/default if no destination is specified.
1135
1135
1136 You can change bundle format with the -t/--type option. See
1136 You can change bundle format with the -t/--type option. See
1137 :hg:`help bundlespec` for documentation on this format. By default,
1137 :hg:`help bundlespec` for documentation on this format. By default,
1138 the most appropriate format is used and compression defaults to
1138 the most appropriate format is used and compression defaults to
1139 bzip2.
1139 bzip2.
1140
1140
1141 The bundle file can then be transferred using conventional means
1141 The bundle file can then be transferred using conventional means
1142 and applied to another repository with the unbundle or pull
1142 and applied to another repository with the unbundle or pull
1143 command. This is useful when direct push and pull are not
1143 command. This is useful when direct push and pull are not
1144 available or when exporting an entire repository is undesirable.
1144 available or when exporting an entire repository is undesirable.
1145
1145
1146 Applying bundles preserves all changeset contents including
1146 Applying bundles preserves all changeset contents including
1147 permissions, copy/rename information, and revision history.
1147 permissions, copy/rename information, and revision history.
1148
1148
1149 Returns 0 on success, 1 if no changes found.
1149 Returns 0 on success, 1 if no changes found.
1150 """
1150 """
1151 opts = pycompat.byteskwargs(opts)
1151 opts = pycompat.byteskwargs(opts)
1152 revs = None
1152 revs = None
1153 if 'rev' in opts:
1153 if 'rev' in opts:
1154 revstrings = opts['rev']
1154 revstrings = opts['rev']
1155 revs = scmutil.revrange(repo, revstrings)
1155 revs = scmutil.revrange(repo, revstrings)
1156 if revstrings and not revs:
1156 if revstrings and not revs:
1157 raise error.Abort(_('no commits to bundle'))
1157 raise error.Abort(_('no commits to bundle'))
1158
1158
1159 bundletype = opts.get('type', 'bzip2').lower()
1159 bundletype = opts.get('type', 'bzip2').lower()
1160 try:
1160 try:
1161 bcompression, cgversion, params = exchange.parsebundlespec(
1161 bcompression, cgversion, params = exchange.parsebundlespec(
1162 repo, bundletype, strict=False)
1162 repo, bundletype, strict=False)
1163 except error.UnsupportedBundleSpecification as e:
1163 except error.UnsupportedBundleSpecification as e:
1164 raise error.Abort(str(e),
1164 raise error.Abort(str(e),
1165 hint=_("see 'hg help bundlespec' for supported "
1165 hint=_("see 'hg help bundlespec' for supported "
1166 "values for --type"))
1166 "values for --type"))
1167
1167
1168 # Packed bundles are a pseudo bundle format for now.
1168 # Packed bundles are a pseudo bundle format for now.
1169 if cgversion == 's1':
1169 if cgversion == 's1':
1170 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1170 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1171 hint=_("use 'hg debugcreatestreamclonebundle'"))
1171 hint=_("use 'hg debugcreatestreamclonebundle'"))
1172
1172
1173 if opts.get('all'):
1173 if opts.get('all'):
1174 if dest:
1174 if dest:
1175 raise error.Abort(_("--all is incompatible with specifying "
1175 raise error.Abort(_("--all is incompatible with specifying "
1176 "a destination"))
1176 "a destination"))
1177 if opts.get('base'):
1177 if opts.get('base'):
1178 ui.warn(_("ignoring --base because --all was specified\n"))
1178 ui.warn(_("ignoring --base because --all was specified\n"))
1179 base = ['null']
1179 base = ['null']
1180 else:
1180 else:
1181 base = scmutil.revrange(repo, opts.get('base'))
1181 base = scmutil.revrange(repo, opts.get('base'))
1182 if cgversion not in changegroup.supportedoutgoingversions(repo):
1182 if cgversion not in changegroup.supportedoutgoingversions(repo):
1183 raise error.Abort(_("repository does not support bundle version %s") %
1183 raise error.Abort(_("repository does not support bundle version %s") %
1184 cgversion)
1184 cgversion)
1185
1185
1186 if base:
1186 if base:
1187 if dest:
1187 if dest:
1188 raise error.Abort(_("--base is incompatible with specifying "
1188 raise error.Abort(_("--base is incompatible with specifying "
1189 "a destination"))
1189 "a destination"))
1190 common = [repo.lookup(rev) for rev in base]
1190 common = [repo.lookup(rev) for rev in base]
1191 heads = revs and map(repo.lookup, revs) or None
1191 heads = revs and map(repo.lookup, revs) or None
1192 outgoing = discovery.outgoing(repo, common, heads)
1192 outgoing = discovery.outgoing(repo, common, heads)
1193 else:
1193 else:
1194 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1194 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1195 dest, branches = hg.parseurl(dest, opts.get('branch'))
1195 dest, branches = hg.parseurl(dest, opts.get('branch'))
1196 other = hg.peer(repo, opts, dest)
1196 other = hg.peer(repo, opts, dest)
1197 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1197 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1198 heads = revs and map(repo.lookup, revs) or revs
1198 heads = revs and map(repo.lookup, revs) or revs
1199 outgoing = discovery.findcommonoutgoing(repo, other,
1199 outgoing = discovery.findcommonoutgoing(repo, other,
1200 onlyheads=heads,
1200 onlyheads=heads,
1201 force=opts.get('force'),
1201 force=opts.get('force'),
1202 portable=True)
1202 portable=True)
1203
1203
1204 if not outgoing.missing:
1204 if not outgoing.missing:
1205 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1205 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1206 return 1
1206 return 1
1207
1207
1208 if cgversion == '01': #bundle1
1208 if cgversion == '01': #bundle1
1209 if bcompression is None:
1209 if bcompression is None:
1210 bcompression = 'UN'
1210 bcompression = 'UN'
1211 bversion = 'HG10' + bcompression
1211 bversion = 'HG10' + bcompression
1212 bcompression = None
1212 bcompression = None
1213 elif cgversion in ('02', '03'):
1213 elif cgversion in ('02', '03'):
1214 bversion = 'HG20'
1214 bversion = 'HG20'
1215 else:
1215 else:
1216 raise error.ProgrammingError(
1216 raise error.ProgrammingError(
1217 'bundle: unexpected changegroup version %s' % cgversion)
1217 'bundle: unexpected changegroup version %s' % cgversion)
1218
1218
1219 # TODO compression options should be derived from bundlespec parsing.
1219 # TODO compression options should be derived from bundlespec parsing.
1220 # This is a temporary hack to allow adjusting bundle compression
1220 # This is a temporary hack to allow adjusting bundle compression
1221 # level without a) formalizing the bundlespec changes to declare it
1221 # level without a) formalizing the bundlespec changes to declare it
1222 # b) introducing a command flag.
1222 # b) introducing a command flag.
1223 compopts = {}
1223 compopts = {}
1224 complevel = ui.configint('experimental', 'bundlecomplevel')
1224 complevel = ui.configint('experimental', 'bundlecomplevel')
1225 if complevel is not None:
1225 if complevel is not None:
1226 compopts['level'] = complevel
1226 compopts['level'] = complevel
1227
1227
1228
1228
1229 contentopts = {'cg.version': cgversion}
1229 contentopts = {'cg.version': cgversion}
1230 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker', False):
1230 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker', False):
1231 contentopts['obsolescence'] = True
1231 contentopts['obsolescence'] = True
1232 if repo.ui.configbool('experimental', 'bundle-phases', False):
1232 if repo.ui.configbool('experimental', 'bundle-phases', False):
1233 contentopts['phases'] = True
1233 contentopts['phases'] = True
1234 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1234 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1235 contentopts, compression=bcompression,
1235 contentopts, compression=bcompression,
1236 compopts=compopts)
1236 compopts=compopts)
1237
1237
1238 @command('cat',
1238 @command('cat',
1239 [('o', 'output', '',
1239 [('o', 'output', '',
1240 _('print output to file with formatted name'), _('FORMAT')),
1240 _('print output to file with formatted name'), _('FORMAT')),
1241 ('r', 'rev', '', _('print the given revision'), _('REV')),
1241 ('r', 'rev', '', _('print the given revision'), _('REV')),
1242 ('', 'decode', None, _('apply any matching decode filter')),
1242 ('', 'decode', None, _('apply any matching decode filter')),
1243 ] + walkopts + formatteropts,
1243 ] + walkopts + formatteropts,
1244 _('[OPTION]... FILE...'),
1244 _('[OPTION]... FILE...'),
1245 inferrepo=True)
1245 inferrepo=True)
1246 def cat(ui, repo, file1, *pats, **opts):
1246 def cat(ui, repo, file1, *pats, **opts):
1247 """output the current or given revision of files
1247 """output the current or given revision of files
1248
1248
1249 Print the specified files as they were at the given revision. If
1249 Print the specified files as they were at the given revision. If
1250 no revision is given, the parent of the working directory is used.
1250 no revision is given, the parent of the working directory is used.
1251
1251
1252 Output may be to a file, in which case the name of the file is
1252 Output may be to a file, in which case the name of the file is
1253 given using a format string. The formatting rules as follows:
1253 given using a format string. The formatting rules as follows:
1254
1254
1255 :``%%``: literal "%" character
1255 :``%%``: literal "%" character
1256 :``%s``: basename of file being printed
1256 :``%s``: basename of file being printed
1257 :``%d``: dirname of file being printed, or '.' if in repository root
1257 :``%d``: dirname of file being printed, or '.' if in repository root
1258 :``%p``: root-relative path name of file being printed
1258 :``%p``: root-relative path name of file being printed
1259 :``%H``: changeset hash (40 hexadecimal digits)
1259 :``%H``: changeset hash (40 hexadecimal digits)
1260 :``%R``: changeset revision number
1260 :``%R``: changeset revision number
1261 :``%h``: short-form changeset hash (12 hexadecimal digits)
1261 :``%h``: short-form changeset hash (12 hexadecimal digits)
1262 :``%r``: zero-padded changeset revision number
1262 :``%r``: zero-padded changeset revision number
1263 :``%b``: basename of the exporting repository
1263 :``%b``: basename of the exporting repository
1264
1264
1265 Returns 0 on success.
1265 Returns 0 on success.
1266 """
1266 """
1267 ctx = scmutil.revsingle(repo, opts.get('rev'))
1267 ctx = scmutil.revsingle(repo, opts.get('rev'))
1268 m = scmutil.match(ctx, (file1,) + pats, opts)
1268 m = scmutil.match(ctx, (file1,) + pats, opts)
1269 fntemplate = opts.pop('output', '')
1269 fntemplate = opts.pop('output', '')
1270 if cmdutil.isstdiofilename(fntemplate):
1270 if cmdutil.isstdiofilename(fntemplate):
1271 fntemplate = ''
1271 fntemplate = ''
1272
1272
1273 if fntemplate:
1273 if fntemplate:
1274 fm = formatter.nullformatter(ui, 'cat')
1274 fm = formatter.nullformatter(ui, 'cat')
1275 else:
1275 else:
1276 ui.pager('cat')
1276 ui.pager('cat')
1277 fm = ui.formatter('cat', opts)
1277 fm = ui.formatter('cat', opts)
1278 with fm:
1278 with fm:
1279 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts)
1279 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts)
1280
1280
1281 @command('^clone',
1281 @command('^clone',
1282 [('U', 'noupdate', None, _('the clone will include an empty working '
1282 [('U', 'noupdate', None, _('the clone will include an empty working '
1283 'directory (only a repository)')),
1283 'directory (only a repository)')),
1284 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1284 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1285 _('REV')),
1285 _('REV')),
1286 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1286 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1287 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1287 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1288 ('', 'pull', None, _('use pull protocol to copy metadata')),
1288 ('', 'pull', None, _('use pull protocol to copy metadata')),
1289 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1289 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1290 ] + remoteopts,
1290 ] + remoteopts,
1291 _('[OPTION]... SOURCE [DEST]'),
1291 _('[OPTION]... SOURCE [DEST]'),
1292 norepo=True)
1292 norepo=True)
1293 def clone(ui, source, dest=None, **opts):
1293 def clone(ui, source, dest=None, **opts):
1294 """make a copy of an existing repository
1294 """make a copy of an existing repository
1295
1295
1296 Create a copy of an existing repository in a new directory.
1296 Create a copy of an existing repository in a new directory.
1297
1297
1298 If no destination directory name is specified, it defaults to the
1298 If no destination directory name is specified, it defaults to the
1299 basename of the source.
1299 basename of the source.
1300
1300
1301 The location of the source is added to the new repository's
1301 The location of the source is added to the new repository's
1302 ``.hg/hgrc`` file, as the default to be used for future pulls.
1302 ``.hg/hgrc`` file, as the default to be used for future pulls.
1303
1303
1304 Only local paths and ``ssh://`` URLs are supported as
1304 Only local paths and ``ssh://`` URLs are supported as
1305 destinations. For ``ssh://`` destinations, no working directory or
1305 destinations. For ``ssh://`` destinations, no working directory or
1306 ``.hg/hgrc`` will be created on the remote side.
1306 ``.hg/hgrc`` will be created on the remote side.
1307
1307
1308 If the source repository has a bookmark called '@' set, that
1308 If the source repository has a bookmark called '@' set, that
1309 revision will be checked out in the new repository by default.
1309 revision will be checked out in the new repository by default.
1310
1310
1311 To check out a particular version, use -u/--update, or
1311 To check out a particular version, use -u/--update, or
1312 -U/--noupdate to create a clone with no working directory.
1312 -U/--noupdate to create a clone with no working directory.
1313
1313
1314 To pull only a subset of changesets, specify one or more revisions
1314 To pull only a subset of changesets, specify one or more revisions
1315 identifiers with -r/--rev or branches with -b/--branch. The
1315 identifiers with -r/--rev or branches with -b/--branch. The
1316 resulting clone will contain only the specified changesets and
1316 resulting clone will contain only the specified changesets and
1317 their ancestors. These options (or 'clone src#rev dest') imply
1317 their ancestors. These options (or 'clone src#rev dest') imply
1318 --pull, even for local source repositories.
1318 --pull, even for local source repositories.
1319
1319
1320 .. note::
1320 .. note::
1321
1321
1322 Specifying a tag will include the tagged changeset but not the
1322 Specifying a tag will include the tagged changeset but not the
1323 changeset containing the tag.
1323 changeset containing the tag.
1324
1324
1325 .. container:: verbose
1325 .. container:: verbose
1326
1326
1327 For efficiency, hardlinks are used for cloning whenever the
1327 For efficiency, hardlinks are used for cloning whenever the
1328 source and destination are on the same filesystem (note this
1328 source and destination are on the same filesystem (note this
1329 applies only to the repository data, not to the working
1329 applies only to the repository data, not to the working
1330 directory). Some filesystems, such as AFS, implement hardlinking
1330 directory). Some filesystems, such as AFS, implement hardlinking
1331 incorrectly, but do not report errors. In these cases, use the
1331 incorrectly, but do not report errors. In these cases, use the
1332 --pull option to avoid hardlinking.
1332 --pull option to avoid hardlinking.
1333
1333
1334 In some cases, you can clone repositories and the working
1334 In some cases, you can clone repositories and the working
1335 directory using full hardlinks with ::
1335 directory using full hardlinks with ::
1336
1336
1337 $ cp -al REPO REPOCLONE
1337 $ cp -al REPO REPOCLONE
1338
1338
1339 This is the fastest way to clone, but it is not always safe. The
1339 This is the fastest way to clone, but it is not always safe. The
1340 operation is not atomic (making sure REPO is not modified during
1340 operation is not atomic (making sure REPO is not modified during
1341 the operation is up to you) and you have to make sure your
1341 the operation is up to you) and you have to make sure your
1342 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1342 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1343 so). Also, this is not compatible with certain extensions that
1343 so). Also, this is not compatible with certain extensions that
1344 place their metadata under the .hg directory, such as mq.
1344 place their metadata under the .hg directory, such as mq.
1345
1345
1346 Mercurial will update the working directory to the first applicable
1346 Mercurial will update the working directory to the first applicable
1347 revision from this list:
1347 revision from this list:
1348
1348
1349 a) null if -U or the source repository has no changesets
1349 a) null if -U or the source repository has no changesets
1350 b) if -u . and the source repository is local, the first parent of
1350 b) if -u . and the source repository is local, the first parent of
1351 the source repository's working directory
1351 the source repository's working directory
1352 c) the changeset specified with -u (if a branch name, this means the
1352 c) the changeset specified with -u (if a branch name, this means the
1353 latest head of that branch)
1353 latest head of that branch)
1354 d) the changeset specified with -r
1354 d) the changeset specified with -r
1355 e) the tipmost head specified with -b
1355 e) the tipmost head specified with -b
1356 f) the tipmost head specified with the url#branch source syntax
1356 f) the tipmost head specified with the url#branch source syntax
1357 g) the revision marked with the '@' bookmark, if present
1357 g) the revision marked with the '@' bookmark, if present
1358 h) the tipmost head of the default branch
1358 h) the tipmost head of the default branch
1359 i) tip
1359 i) tip
1360
1360
1361 When cloning from servers that support it, Mercurial may fetch
1361 When cloning from servers that support it, Mercurial may fetch
1362 pre-generated data from a server-advertised URL. When this is done,
1362 pre-generated data from a server-advertised URL. When this is done,
1363 hooks operating on incoming changesets and changegroups may fire twice,
1363 hooks operating on incoming changesets and changegroups may fire twice,
1364 once for the bundle fetched from the URL and another for any additional
1364 once for the bundle fetched from the URL and another for any additional
1365 data not fetched from this URL. In addition, if an error occurs, the
1365 data not fetched from this URL. In addition, if an error occurs, the
1366 repository may be rolled back to a partial clone. This behavior may
1366 repository may be rolled back to a partial clone. This behavior may
1367 change in future releases. See :hg:`help -e clonebundles` for more.
1367 change in future releases. See :hg:`help -e clonebundles` for more.
1368
1368
1369 Examples:
1369 Examples:
1370
1370
1371 - clone a remote repository to a new directory named hg/::
1371 - clone a remote repository to a new directory named hg/::
1372
1372
1373 hg clone https://www.mercurial-scm.org/repo/hg/
1373 hg clone https://www.mercurial-scm.org/repo/hg/
1374
1374
1375 - create a lightweight local clone::
1375 - create a lightweight local clone::
1376
1376
1377 hg clone project/ project-feature/
1377 hg clone project/ project-feature/
1378
1378
1379 - clone from an absolute path on an ssh server (note double-slash)::
1379 - clone from an absolute path on an ssh server (note double-slash)::
1380
1380
1381 hg clone ssh://user@server//home/projects/alpha/
1381 hg clone ssh://user@server//home/projects/alpha/
1382
1382
1383 - do a high-speed clone over a LAN while checking out a
1383 - do a high-speed clone over a LAN while checking out a
1384 specified version::
1384 specified version::
1385
1385
1386 hg clone --uncompressed http://server/repo -u 1.5
1386 hg clone --uncompressed http://server/repo -u 1.5
1387
1387
1388 - create a repository without changesets after a particular revision::
1388 - create a repository without changesets after a particular revision::
1389
1389
1390 hg clone -r 04e544 experimental/ good/
1390 hg clone -r 04e544 experimental/ good/
1391
1391
1392 - clone (and track) a particular named branch::
1392 - clone (and track) a particular named branch::
1393
1393
1394 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1394 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1395
1395
1396 See :hg:`help urls` for details on specifying URLs.
1396 See :hg:`help urls` for details on specifying URLs.
1397
1397
1398 Returns 0 on success.
1398 Returns 0 on success.
1399 """
1399 """
1400 opts = pycompat.byteskwargs(opts)
1400 opts = pycompat.byteskwargs(opts)
1401 if opts.get('noupdate') and opts.get('updaterev'):
1401 if opts.get('noupdate') and opts.get('updaterev'):
1402 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1402 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1403
1403
1404 r = hg.clone(ui, opts, source, dest,
1404 r = hg.clone(ui, opts, source, dest,
1405 pull=opts.get('pull'),
1405 pull=opts.get('pull'),
1406 stream=opts.get('uncompressed'),
1406 stream=opts.get('uncompressed'),
1407 rev=opts.get('rev'),
1407 rev=opts.get('rev'),
1408 update=opts.get('updaterev') or not opts.get('noupdate'),
1408 update=opts.get('updaterev') or not opts.get('noupdate'),
1409 branch=opts.get('branch'),
1409 branch=opts.get('branch'),
1410 shareopts=opts.get('shareopts'))
1410 shareopts=opts.get('shareopts'))
1411
1411
1412 return r is None
1412 return r is None
1413
1413
1414 @command('^commit|ci',
1414 @command('^commit|ci',
1415 [('A', 'addremove', None,
1415 [('A', 'addremove', None,
1416 _('mark new/missing files as added/removed before committing')),
1416 _('mark new/missing files as added/removed before committing')),
1417 ('', 'close-branch', None,
1417 ('', 'close-branch', None,
1418 _('mark a branch head as closed')),
1418 _('mark a branch head as closed')),
1419 ('', 'amend', None, _('amend the parent of the working directory')),
1419 ('', 'amend', None, _('amend the parent of the working directory')),
1420 ('s', 'secret', None, _('use the secret phase for committing')),
1420 ('s', 'secret', None, _('use the secret phase for committing')),
1421 ('e', 'edit', None, _('invoke editor on commit messages')),
1421 ('e', 'edit', None, _('invoke editor on commit messages')),
1422 ('i', 'interactive', None, _('use interactive mode')),
1422 ('i', 'interactive', None, _('use interactive mode')),
1423 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1423 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1424 _('[OPTION]... [FILE]...'),
1424 _('[OPTION]... [FILE]...'),
1425 inferrepo=True)
1425 inferrepo=True)
1426 def commit(ui, repo, *pats, **opts):
1426 def commit(ui, repo, *pats, **opts):
1427 """commit the specified files or all outstanding changes
1427 """commit the specified files or all outstanding changes
1428
1428
1429 Commit changes to the given files into the repository. Unlike a
1429 Commit changes to the given files into the repository. Unlike a
1430 centralized SCM, this operation is a local operation. See
1430 centralized SCM, this operation is a local operation. See
1431 :hg:`push` for a way to actively distribute your changes.
1431 :hg:`push` for a way to actively distribute your changes.
1432
1432
1433 If a list of files is omitted, all changes reported by :hg:`status`
1433 If a list of files is omitted, all changes reported by :hg:`status`
1434 will be committed.
1434 will be committed.
1435
1435
1436 If you are committing the result of a merge, do not provide any
1436 If you are committing the result of a merge, do not provide any
1437 filenames or -I/-X filters.
1437 filenames or -I/-X filters.
1438
1438
1439 If no commit message is specified, Mercurial starts your
1439 If no commit message is specified, Mercurial starts your
1440 configured editor where you can enter a message. In case your
1440 configured editor where you can enter a message. In case your
1441 commit fails, you will find a backup of your message in
1441 commit fails, you will find a backup of your message in
1442 ``.hg/last-message.txt``.
1442 ``.hg/last-message.txt``.
1443
1443
1444 The --close-branch flag can be used to mark the current branch
1444 The --close-branch flag can be used to mark the current branch
1445 head closed. When all heads of a branch are closed, the branch
1445 head closed. When all heads of a branch are closed, the branch
1446 will be considered closed and no longer listed.
1446 will be considered closed and no longer listed.
1447
1447
1448 The --amend flag can be used to amend the parent of the
1448 The --amend flag can be used to amend the parent of the
1449 working directory with a new commit that contains the changes
1449 working directory with a new commit that contains the changes
1450 in the parent in addition to those currently reported by :hg:`status`,
1450 in the parent in addition to those currently reported by :hg:`status`,
1451 if there are any. The old commit is stored in a backup bundle in
1451 if there are any. The old commit is stored in a backup bundle in
1452 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1452 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1453 on how to restore it).
1453 on how to restore it).
1454
1454
1455 Message, user and date are taken from the amended commit unless
1455 Message, user and date are taken from the amended commit unless
1456 specified. When a message isn't specified on the command line,
1456 specified. When a message isn't specified on the command line,
1457 the editor will open with the message of the amended commit.
1457 the editor will open with the message of the amended commit.
1458
1458
1459 It is not possible to amend public changesets (see :hg:`help phases`)
1459 It is not possible to amend public changesets (see :hg:`help phases`)
1460 or changesets that have children.
1460 or changesets that have children.
1461
1461
1462 See :hg:`help dates` for a list of formats valid for -d/--date.
1462 See :hg:`help dates` for a list of formats valid for -d/--date.
1463
1463
1464 Returns 0 on success, 1 if nothing changed.
1464 Returns 0 on success, 1 if nothing changed.
1465
1465
1466 .. container:: verbose
1466 .. container:: verbose
1467
1467
1468 Examples:
1468 Examples:
1469
1469
1470 - commit all files ending in .py::
1470 - commit all files ending in .py::
1471
1471
1472 hg commit --include "set:**.py"
1472 hg commit --include "set:**.py"
1473
1473
1474 - commit all non-binary files::
1474 - commit all non-binary files::
1475
1475
1476 hg commit --exclude "set:binary()"
1476 hg commit --exclude "set:binary()"
1477
1477
1478 - amend the current commit and set the date to now::
1478 - amend the current commit and set the date to now::
1479
1479
1480 hg commit --amend --date now
1480 hg commit --amend --date now
1481 """
1481 """
1482 wlock = lock = None
1482 wlock = lock = None
1483 try:
1483 try:
1484 wlock = repo.wlock()
1484 wlock = repo.wlock()
1485 lock = repo.lock()
1485 lock = repo.lock()
1486 return _docommit(ui, repo, *pats, **opts)
1486 return _docommit(ui, repo, *pats, **opts)
1487 finally:
1487 finally:
1488 release(lock, wlock)
1488 release(lock, wlock)
1489
1489
1490 def _docommit(ui, repo, *pats, **opts):
1490 def _docommit(ui, repo, *pats, **opts):
1491 if opts.get(r'interactive'):
1491 if opts.get(r'interactive'):
1492 opts.pop(r'interactive')
1492 opts.pop(r'interactive')
1493 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1493 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1494 cmdutil.recordfilter, *pats,
1494 cmdutil.recordfilter, *pats,
1495 **opts)
1495 **opts)
1496 # ret can be 0 (no changes to record) or the value returned by
1496 # ret can be 0 (no changes to record) or the value returned by
1497 # commit(), 1 if nothing changed or None on success.
1497 # commit(), 1 if nothing changed or None on success.
1498 return 1 if ret == 0 else ret
1498 return 1 if ret == 0 else ret
1499
1499
1500 opts = pycompat.byteskwargs(opts)
1500 opts = pycompat.byteskwargs(opts)
1501 if opts.get('subrepos'):
1501 if opts.get('subrepos'):
1502 if opts.get('amend'):
1502 if opts.get('amend'):
1503 raise error.Abort(_('cannot amend with --subrepos'))
1503 raise error.Abort(_('cannot amend with --subrepos'))
1504 # Let --subrepos on the command line override config setting.
1504 # Let --subrepos on the command line override config setting.
1505 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1505 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1506
1506
1507 cmdutil.checkunfinished(repo, commit=True)
1507 cmdutil.checkunfinished(repo, commit=True)
1508
1508
1509 branch = repo[None].branch()
1509 branch = repo[None].branch()
1510 bheads = repo.branchheads(branch)
1510 bheads = repo.branchheads(branch)
1511
1511
1512 extra = {}
1512 extra = {}
1513 if opts.get('close_branch'):
1513 if opts.get('close_branch'):
1514 extra['close'] = 1
1514 extra['close'] = 1
1515
1515
1516 if not bheads:
1516 if not bheads:
1517 raise error.Abort(_('can only close branch heads'))
1517 raise error.Abort(_('can only close branch heads'))
1518 elif opts.get('amend'):
1518 elif opts.get('amend'):
1519 if repo[None].parents()[0].p1().branch() != branch and \
1519 if repo[None].parents()[0].p1().branch() != branch and \
1520 repo[None].parents()[0].p2().branch() != branch:
1520 repo[None].parents()[0].p2().branch() != branch:
1521 raise error.Abort(_('can only close branch heads'))
1521 raise error.Abort(_('can only close branch heads'))
1522
1522
1523 if opts.get('amend'):
1523 if opts.get('amend'):
1524 if ui.configbool('ui', 'commitsubrepos'):
1524 if ui.configbool('ui', 'commitsubrepos'):
1525 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1525 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1526
1526
1527 old = repo['.']
1527 old = repo['.']
1528 if not old.mutable():
1528 if not old.mutable():
1529 raise error.Abort(_('cannot amend public changesets'))
1529 raise error.Abort(_('cannot amend public changesets'))
1530 if len(repo[None].parents()) > 1:
1530 if len(repo[None].parents()) > 1:
1531 raise error.Abort(_('cannot amend while merging'))
1531 raise error.Abort(_('cannot amend while merging'))
1532 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1532 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1533 if not allowunstable and old.children():
1533 if not allowunstable and old.children():
1534 raise error.Abort(_('cannot amend changeset with children'))
1534 raise error.Abort(_('cannot amend changeset with children'))
1535
1535
1536 # Currently histedit gets confused if an amend happens while histedit
1536 # Currently histedit gets confused if an amend happens while histedit
1537 # is in progress. Since we have a checkunfinished command, we are
1537 # is in progress. Since we have a checkunfinished command, we are
1538 # temporarily honoring it.
1538 # temporarily honoring it.
1539 #
1539 #
1540 # Note: eventually this guard will be removed. Please do not expect
1540 # Note: eventually this guard will be removed. Please do not expect
1541 # this behavior to remain.
1541 # this behavior to remain.
1542 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1542 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1543 cmdutil.checkunfinished(repo)
1543 cmdutil.checkunfinished(repo)
1544
1544
1545 # commitfunc is used only for temporary amend commit by cmdutil.amend
1545 # commitfunc is used only for temporary amend commit by cmdutil.amend
1546 def commitfunc(ui, repo, message, match, opts):
1546 def commitfunc(ui, repo, message, match, opts):
1547 return repo.commit(message,
1547 return repo.commit(message,
1548 opts.get('user') or old.user(),
1548 opts.get('user') or old.user(),
1549 opts.get('date') or old.date(),
1549 opts.get('date') or old.date(),
1550 match,
1550 match,
1551 extra=extra)
1551 extra=extra)
1552
1552
1553 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1553 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1554 if node == old.node():
1554 if node == old.node():
1555 ui.status(_("nothing changed\n"))
1555 ui.status(_("nothing changed\n"))
1556 return 1
1556 return 1
1557 else:
1557 else:
1558 def commitfunc(ui, repo, message, match, opts):
1558 def commitfunc(ui, repo, message, match, opts):
1559 overrides = {}
1559 overrides = {}
1560 if opts.get('secret'):
1560 if opts.get('secret'):
1561 overrides[('phases', 'new-commit')] = 'secret'
1561 overrides[('phases', 'new-commit')] = 'secret'
1562
1562
1563 baseui = repo.baseui
1563 baseui = repo.baseui
1564 with baseui.configoverride(overrides, 'commit'):
1564 with baseui.configoverride(overrides, 'commit'):
1565 with ui.configoverride(overrides, 'commit'):
1565 with ui.configoverride(overrides, 'commit'):
1566 editform = cmdutil.mergeeditform(repo[None],
1566 editform = cmdutil.mergeeditform(repo[None],
1567 'commit.normal')
1567 'commit.normal')
1568 editor = cmdutil.getcommiteditor(
1568 editor = cmdutil.getcommiteditor(
1569 editform=editform, **pycompat.strkwargs(opts))
1569 editform=editform, **pycompat.strkwargs(opts))
1570 return repo.commit(message,
1570 return repo.commit(message,
1571 opts.get('user'),
1571 opts.get('user'),
1572 opts.get('date'),
1572 opts.get('date'),
1573 match,
1573 match,
1574 editor=editor,
1574 editor=editor,
1575 extra=extra)
1575 extra=extra)
1576
1576
1577 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1577 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1578
1578
1579 if not node:
1579 if not node:
1580 stat = cmdutil.postcommitstatus(repo, pats, opts)
1580 stat = cmdutil.postcommitstatus(repo, pats, opts)
1581 if stat[3]:
1581 if stat[3]:
1582 ui.status(_("nothing changed (%d missing files, see "
1582 ui.status(_("nothing changed (%d missing files, see "
1583 "'hg status')\n") % len(stat[3]))
1583 "'hg status')\n") % len(stat[3]))
1584 else:
1584 else:
1585 ui.status(_("nothing changed\n"))
1585 ui.status(_("nothing changed\n"))
1586 return 1
1586 return 1
1587
1587
1588 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1588 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1589
1589
1590 @command('config|showconfig|debugconfig',
1590 @command('config|showconfig|debugconfig',
1591 [('u', 'untrusted', None, _('show untrusted configuration options')),
1591 [('u', 'untrusted', None, _('show untrusted configuration options')),
1592 ('e', 'edit', None, _('edit user config')),
1592 ('e', 'edit', None, _('edit user config')),
1593 ('l', 'local', None, _('edit repository config')),
1593 ('l', 'local', None, _('edit repository config')),
1594 ('g', 'global', None, _('edit global config'))] + formatteropts,
1594 ('g', 'global', None, _('edit global config'))] + formatteropts,
1595 _('[-u] [NAME]...'),
1595 _('[-u] [NAME]...'),
1596 optionalrepo=True)
1596 optionalrepo=True)
1597 def config(ui, repo, *values, **opts):
1597 def config(ui, repo, *values, **opts):
1598 """show combined config settings from all hgrc files
1598 """show combined config settings from all hgrc files
1599
1599
1600 With no arguments, print names and values of all config items.
1600 With no arguments, print names and values of all config items.
1601
1601
1602 With one argument of the form section.name, print just the value
1602 With one argument of the form section.name, print just the value
1603 of that config item.
1603 of that config item.
1604
1604
1605 With multiple arguments, print names and values of all config
1605 With multiple arguments, print names and values of all config
1606 items with matching section names.
1606 items with matching section names.
1607
1607
1608 With --edit, start an editor on the user-level config file. With
1608 With --edit, start an editor on the user-level config file. With
1609 --global, edit the system-wide config file. With --local, edit the
1609 --global, edit the system-wide config file. With --local, edit the
1610 repository-level config file.
1610 repository-level config file.
1611
1611
1612 With --debug, the source (filename and line number) is printed
1612 With --debug, the source (filename and line number) is printed
1613 for each config item.
1613 for each config item.
1614
1614
1615 See :hg:`help config` for more information about config files.
1615 See :hg:`help config` for more information about config files.
1616
1616
1617 Returns 0 on success, 1 if NAME does not exist.
1617 Returns 0 on success, 1 if NAME does not exist.
1618
1618
1619 """
1619 """
1620
1620
1621 opts = pycompat.byteskwargs(opts)
1621 opts = pycompat.byteskwargs(opts)
1622 if opts.get('edit') or opts.get('local') or opts.get('global'):
1622 if opts.get('edit') or opts.get('local') or opts.get('global'):
1623 if opts.get('local') and opts.get('global'):
1623 if opts.get('local') and opts.get('global'):
1624 raise error.Abort(_("can't use --local and --global together"))
1624 raise error.Abort(_("can't use --local and --global together"))
1625
1625
1626 if opts.get('local'):
1626 if opts.get('local'):
1627 if not repo:
1627 if not repo:
1628 raise error.Abort(_("can't use --local outside a repository"))
1628 raise error.Abort(_("can't use --local outside a repository"))
1629 paths = [repo.vfs.join('hgrc')]
1629 paths = [repo.vfs.join('hgrc')]
1630 elif opts.get('global'):
1630 elif opts.get('global'):
1631 paths = rcutil.systemrcpath()
1631 paths = rcutil.systemrcpath()
1632 else:
1632 else:
1633 paths = rcutil.userrcpath()
1633 paths = rcutil.userrcpath()
1634
1634
1635 for f in paths:
1635 for f in paths:
1636 if os.path.exists(f):
1636 if os.path.exists(f):
1637 break
1637 break
1638 else:
1638 else:
1639 if opts.get('global'):
1639 if opts.get('global'):
1640 samplehgrc = uimod.samplehgrcs['global']
1640 samplehgrc = uimod.samplehgrcs['global']
1641 elif opts.get('local'):
1641 elif opts.get('local'):
1642 samplehgrc = uimod.samplehgrcs['local']
1642 samplehgrc = uimod.samplehgrcs['local']
1643 else:
1643 else:
1644 samplehgrc = uimod.samplehgrcs['user']
1644 samplehgrc = uimod.samplehgrcs['user']
1645
1645
1646 f = paths[0]
1646 f = paths[0]
1647 fp = open(f, "w")
1647 fp = open(f, "w")
1648 fp.write(samplehgrc)
1648 fp.write(samplehgrc)
1649 fp.close()
1649 fp.close()
1650
1650
1651 editor = ui.geteditor()
1651 editor = ui.geteditor()
1652 ui.system("%s \"%s\"" % (editor, f),
1652 ui.system("%s \"%s\"" % (editor, f),
1653 onerr=error.Abort, errprefix=_("edit failed"),
1653 onerr=error.Abort, errprefix=_("edit failed"),
1654 blockedtag='config_edit')
1654 blockedtag='config_edit')
1655 return
1655 return
1656 ui.pager('config')
1656 ui.pager('config')
1657 fm = ui.formatter('config', opts)
1657 fm = ui.formatter('config', opts)
1658 for t, f in rcutil.rccomponents():
1658 for t, f in rcutil.rccomponents():
1659 if t == 'path':
1659 if t == 'path':
1660 ui.debug('read config from: %s\n' % f)
1660 ui.debug('read config from: %s\n' % f)
1661 elif t == 'items':
1661 elif t == 'items':
1662 for section, name, value, source in f:
1662 for section, name, value, source in f:
1663 ui.debug('set config by: %s\n' % source)
1663 ui.debug('set config by: %s\n' % source)
1664 else:
1664 else:
1665 raise error.ProgrammingError('unknown rctype: %s' % t)
1665 raise error.ProgrammingError('unknown rctype: %s' % t)
1666 untrusted = bool(opts.get('untrusted'))
1666 untrusted = bool(opts.get('untrusted'))
1667 if values:
1667 if values:
1668 sections = [v for v in values if '.' not in v]
1668 sections = [v for v in values if '.' not in v]
1669 items = [v for v in values if '.' in v]
1669 items = [v for v in values if '.' in v]
1670 if len(items) > 1 or items and sections:
1670 if len(items) > 1 or items and sections:
1671 raise error.Abort(_('only one config item permitted'))
1671 raise error.Abort(_('only one config item permitted'))
1672 matched = False
1672 matched = False
1673 for section, name, value in ui.walkconfig(untrusted=untrusted):
1673 for section, name, value in ui.walkconfig(untrusted=untrusted):
1674 source = ui.configsource(section, name, untrusted)
1674 source = ui.configsource(section, name, untrusted)
1675 value = pycompat.bytestr(value)
1675 value = pycompat.bytestr(value)
1676 if fm.isplain():
1676 if fm.isplain():
1677 source = source or 'none'
1677 source = source or 'none'
1678 value = value.replace('\n', '\\n')
1678 value = value.replace('\n', '\\n')
1679 entryname = section + '.' + name
1679 entryname = section + '.' + name
1680 if values:
1680 if values:
1681 for v in values:
1681 for v in values:
1682 if v == section:
1682 if v == section:
1683 fm.startitem()
1683 fm.startitem()
1684 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1684 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1685 fm.write('name value', '%s=%s\n', entryname, value)
1685 fm.write('name value', '%s=%s\n', entryname, value)
1686 matched = True
1686 matched = True
1687 elif v == entryname:
1687 elif v == entryname:
1688 fm.startitem()
1688 fm.startitem()
1689 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1689 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1690 fm.write('value', '%s\n', value)
1690 fm.write('value', '%s\n', value)
1691 fm.data(name=entryname)
1691 fm.data(name=entryname)
1692 matched = True
1692 matched = True
1693 else:
1693 else:
1694 fm.startitem()
1694 fm.startitem()
1695 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1695 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1696 fm.write('name value', '%s=%s\n', entryname, value)
1696 fm.write('name value', '%s=%s\n', entryname, value)
1697 matched = True
1697 matched = True
1698 fm.end()
1698 fm.end()
1699 if matched:
1699 if matched:
1700 return 0
1700 return 0
1701 return 1
1701 return 1
1702
1702
1703 @command('copy|cp',
1703 @command('copy|cp',
1704 [('A', 'after', None, _('record a copy that has already occurred')),
1704 [('A', 'after', None, _('record a copy that has already occurred')),
1705 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1705 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1706 ] + walkopts + dryrunopts,
1706 ] + walkopts + dryrunopts,
1707 _('[OPTION]... [SOURCE]... DEST'))
1707 _('[OPTION]... [SOURCE]... DEST'))
1708 def copy(ui, repo, *pats, **opts):
1708 def copy(ui, repo, *pats, **opts):
1709 """mark files as copied for the next commit
1709 """mark files as copied for the next commit
1710
1710
1711 Mark dest as having copies of source files. If dest is a
1711 Mark dest as having copies of source files. If dest is a
1712 directory, copies are put in that directory. If dest is a file,
1712 directory, copies are put in that directory. If dest is a file,
1713 the source must be a single file.
1713 the source must be a single file.
1714
1714
1715 By default, this command copies the contents of files as they
1715 By default, this command copies the contents of files as they
1716 exist in the working directory. If invoked with -A/--after, the
1716 exist in the working directory. If invoked with -A/--after, the
1717 operation is recorded, but no copying is performed.
1717 operation is recorded, but no copying is performed.
1718
1718
1719 This command takes effect with the next commit. To undo a copy
1719 This command takes effect with the next commit. To undo a copy
1720 before that, see :hg:`revert`.
1720 before that, see :hg:`revert`.
1721
1721
1722 Returns 0 on success, 1 if errors are encountered.
1722 Returns 0 on success, 1 if errors are encountered.
1723 """
1723 """
1724 opts = pycompat.byteskwargs(opts)
1724 opts = pycompat.byteskwargs(opts)
1725 with repo.wlock(False):
1725 with repo.wlock(False):
1726 return cmdutil.copy(ui, repo, pats, opts)
1726 return cmdutil.copy(ui, repo, pats, opts)
1727
1727
1728 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1728 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1729 def debugcommands(ui, cmd='', *args):
1729 def debugcommands(ui, cmd='', *args):
1730 """list all available commands and options"""
1730 """list all available commands and options"""
1731 for cmd, vals in sorted(table.iteritems()):
1731 for cmd, vals in sorted(table.iteritems()):
1732 cmd = cmd.split('|')[0].strip('^')
1732 cmd = cmd.split('|')[0].strip('^')
1733 opts = ', '.join([i[1] for i in vals[1]])
1733 opts = ', '.join([i[1] for i in vals[1]])
1734 ui.write('%s: %s\n' % (cmd, opts))
1734 ui.write('%s: %s\n' % (cmd, opts))
1735
1735
1736 @command('debugcomplete',
1736 @command('debugcomplete',
1737 [('o', 'options', None, _('show the command options'))],
1737 [('o', 'options', None, _('show the command options'))],
1738 _('[-o] CMD'),
1738 _('[-o] CMD'),
1739 norepo=True)
1739 norepo=True)
1740 def debugcomplete(ui, cmd='', **opts):
1740 def debugcomplete(ui, cmd='', **opts):
1741 """returns the completion list associated with the given command"""
1741 """returns the completion list associated with the given command"""
1742
1742
1743 if opts.get('options'):
1743 if opts.get('options'):
1744 options = []
1744 options = []
1745 otables = [globalopts]
1745 otables = [globalopts]
1746 if cmd:
1746 if cmd:
1747 aliases, entry = cmdutil.findcmd(cmd, table, False)
1747 aliases, entry = cmdutil.findcmd(cmd, table, False)
1748 otables.append(entry[1])
1748 otables.append(entry[1])
1749 for t in otables:
1749 for t in otables:
1750 for o in t:
1750 for o in t:
1751 if "(DEPRECATED)" in o[3]:
1751 if "(DEPRECATED)" in o[3]:
1752 continue
1752 continue
1753 if o[0]:
1753 if o[0]:
1754 options.append('-%s' % o[0])
1754 options.append('-%s' % o[0])
1755 options.append('--%s' % o[1])
1755 options.append('--%s' % o[1])
1756 ui.write("%s\n" % "\n".join(options))
1756 ui.write("%s\n" % "\n".join(options))
1757 return
1757 return
1758
1758
1759 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1759 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1760 if ui.verbose:
1760 if ui.verbose:
1761 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1761 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1762 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1762 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1763
1763
1764 @command('^diff',
1764 @command('^diff',
1765 [('r', 'rev', [], _('revision'), _('REV')),
1765 [('r', 'rev', [], _('revision'), _('REV')),
1766 ('c', 'change', '', _('change made by revision'), _('REV'))
1766 ('c', 'change', '', _('change made by revision'), _('REV'))
1767 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1767 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1768 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1768 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1769 inferrepo=True)
1769 inferrepo=True)
1770 def diff(ui, repo, *pats, **opts):
1770 def diff(ui, repo, *pats, **opts):
1771 """diff repository (or selected files)
1771 """diff repository (or selected files)
1772
1772
1773 Show differences between revisions for the specified files.
1773 Show differences between revisions for the specified files.
1774
1774
1775 Differences between files are shown using the unified diff format.
1775 Differences between files are shown using the unified diff format.
1776
1776
1777 .. note::
1777 .. note::
1778
1778
1779 :hg:`diff` may generate unexpected results for merges, as it will
1779 :hg:`diff` may generate unexpected results for merges, as it will
1780 default to comparing against the working directory's first
1780 default to comparing against the working directory's first
1781 parent changeset if no revisions are specified.
1781 parent changeset if no revisions are specified.
1782
1782
1783 When two revision arguments are given, then changes are shown
1783 When two revision arguments are given, then changes are shown
1784 between those revisions. If only one revision is specified then
1784 between those revisions. If only one revision is specified then
1785 that revision is compared to the working directory, and, when no
1785 that revision is compared to the working directory, and, when no
1786 revisions are specified, the working directory files are compared
1786 revisions are specified, the working directory files are compared
1787 to its first parent.
1787 to its first parent.
1788
1788
1789 Alternatively you can specify -c/--change with a revision to see
1789 Alternatively you can specify -c/--change with a revision to see
1790 the changes in that changeset relative to its first parent.
1790 the changes in that changeset relative to its first parent.
1791
1791
1792 Without the -a/--text option, diff will avoid generating diffs of
1792 Without the -a/--text option, diff will avoid generating diffs of
1793 files it detects as binary. With -a, diff will generate a diff
1793 files it detects as binary. With -a, diff will generate a diff
1794 anyway, probably with undesirable results.
1794 anyway, probably with undesirable results.
1795
1795
1796 Use the -g/--git option to generate diffs in the git extended diff
1796 Use the -g/--git option to generate diffs in the git extended diff
1797 format. For more information, read :hg:`help diffs`.
1797 format. For more information, read :hg:`help diffs`.
1798
1798
1799 .. container:: verbose
1799 .. container:: verbose
1800
1800
1801 Examples:
1801 Examples:
1802
1802
1803 - compare a file in the current working directory to its parent::
1803 - compare a file in the current working directory to its parent::
1804
1804
1805 hg diff foo.c
1805 hg diff foo.c
1806
1806
1807 - compare two historical versions of a directory, with rename info::
1807 - compare two historical versions of a directory, with rename info::
1808
1808
1809 hg diff --git -r 1.0:1.2 lib/
1809 hg diff --git -r 1.0:1.2 lib/
1810
1810
1811 - get change stats relative to the last change on some date::
1811 - get change stats relative to the last change on some date::
1812
1812
1813 hg diff --stat -r "date('may 2')"
1813 hg diff --stat -r "date('may 2')"
1814
1814
1815 - diff all newly-added files that contain a keyword::
1815 - diff all newly-added files that contain a keyword::
1816
1816
1817 hg diff "set:added() and grep(GNU)"
1817 hg diff "set:added() and grep(GNU)"
1818
1818
1819 - compare a revision and its parents::
1819 - compare a revision and its parents::
1820
1820
1821 hg diff -c 9353 # compare against first parent
1821 hg diff -c 9353 # compare against first parent
1822 hg diff -r 9353^:9353 # same using revset syntax
1822 hg diff -r 9353^:9353 # same using revset syntax
1823 hg diff -r 9353^2:9353 # compare against the second parent
1823 hg diff -r 9353^2:9353 # compare against the second parent
1824
1824
1825 Returns 0 on success.
1825 Returns 0 on success.
1826 """
1826 """
1827
1827
1828 opts = pycompat.byteskwargs(opts)
1828 opts = pycompat.byteskwargs(opts)
1829 revs = opts.get('rev')
1829 revs = opts.get('rev')
1830 change = opts.get('change')
1830 change = opts.get('change')
1831 stat = opts.get('stat')
1831 stat = opts.get('stat')
1832 reverse = opts.get('reverse')
1832 reverse = opts.get('reverse')
1833
1833
1834 if revs and change:
1834 if revs and change:
1835 msg = _('cannot specify --rev and --change at the same time')
1835 msg = _('cannot specify --rev and --change at the same time')
1836 raise error.Abort(msg)
1836 raise error.Abort(msg)
1837 elif change:
1837 elif change:
1838 node2 = scmutil.revsingle(repo, change, None).node()
1838 node2 = scmutil.revsingle(repo, change, None).node()
1839 node1 = repo[node2].p1().node()
1839 node1 = repo[node2].p1().node()
1840 else:
1840 else:
1841 node1, node2 = scmutil.revpair(repo, revs)
1841 node1, node2 = scmutil.revpair(repo, revs)
1842
1842
1843 if reverse:
1843 if reverse:
1844 node1, node2 = node2, node1
1844 node1, node2 = node2, node1
1845
1845
1846 diffopts = patch.diffallopts(ui, opts)
1846 diffopts = patch.diffallopts(ui, opts)
1847 m = scmutil.match(repo[node2], pats, opts)
1847 m = scmutil.match(repo[node2], pats, opts)
1848 ui.pager('diff')
1848 ui.pager('diff')
1849 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1849 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1850 listsubrepos=opts.get('subrepos'),
1850 listsubrepos=opts.get('subrepos'),
1851 root=opts.get('root'))
1851 root=opts.get('root'))
1852
1852
1853 @command('^export',
1853 @command('^export',
1854 [('o', 'output', '',
1854 [('o', 'output', '',
1855 _('print output to file with formatted name'), _('FORMAT')),
1855 _('print output to file with formatted name'), _('FORMAT')),
1856 ('', 'switch-parent', None, _('diff against the second parent')),
1856 ('', 'switch-parent', None, _('diff against the second parent')),
1857 ('r', 'rev', [], _('revisions to export'), _('REV')),
1857 ('r', 'rev', [], _('revisions to export'), _('REV')),
1858 ] + diffopts,
1858 ] + diffopts,
1859 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1859 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1860 def export(ui, repo, *changesets, **opts):
1860 def export(ui, repo, *changesets, **opts):
1861 """dump the header and diffs for one or more changesets
1861 """dump the header and diffs for one or more changesets
1862
1862
1863 Print the changeset header and diffs for one or more revisions.
1863 Print the changeset header and diffs for one or more revisions.
1864 If no revision is given, the parent of the working directory is used.
1864 If no revision is given, the parent of the working directory is used.
1865
1865
1866 The information shown in the changeset header is: author, date,
1866 The information shown in the changeset header is: author, date,
1867 branch name (if non-default), changeset hash, parent(s) and commit
1867 branch name (if non-default), changeset hash, parent(s) and commit
1868 comment.
1868 comment.
1869
1869
1870 .. note::
1870 .. note::
1871
1871
1872 :hg:`export` may generate unexpected diff output for merge
1872 :hg:`export` may generate unexpected diff output for merge
1873 changesets, as it will compare the merge changeset against its
1873 changesets, as it will compare the merge changeset against its
1874 first parent only.
1874 first parent only.
1875
1875
1876 Output may be to a file, in which case the name of the file is
1876 Output may be to a file, in which case the name of the file is
1877 given using a format string. The formatting rules are as follows:
1877 given using a format string. The formatting rules are as follows:
1878
1878
1879 :``%%``: literal "%" character
1879 :``%%``: literal "%" character
1880 :``%H``: changeset hash (40 hexadecimal digits)
1880 :``%H``: changeset hash (40 hexadecimal digits)
1881 :``%N``: number of patches being generated
1881 :``%N``: number of patches being generated
1882 :``%R``: changeset revision number
1882 :``%R``: changeset revision number
1883 :``%b``: basename of the exporting repository
1883 :``%b``: basename of the exporting repository
1884 :``%h``: short-form changeset hash (12 hexadecimal digits)
1884 :``%h``: short-form changeset hash (12 hexadecimal digits)
1885 :``%m``: first line of the commit message (only alphanumeric characters)
1885 :``%m``: first line of the commit message (only alphanumeric characters)
1886 :``%n``: zero-padded sequence number, starting at 1
1886 :``%n``: zero-padded sequence number, starting at 1
1887 :``%r``: zero-padded changeset revision number
1887 :``%r``: zero-padded changeset revision number
1888
1888
1889 Without the -a/--text option, export will avoid generating diffs
1889 Without the -a/--text option, export will avoid generating diffs
1890 of files it detects as binary. With -a, export will generate a
1890 of files it detects as binary. With -a, export will generate a
1891 diff anyway, probably with undesirable results.
1891 diff anyway, probably with undesirable results.
1892
1892
1893 Use the -g/--git option to generate diffs in the git extended diff
1893 Use the -g/--git option to generate diffs in the git extended diff
1894 format. See :hg:`help diffs` for more information.
1894 format. See :hg:`help diffs` for more information.
1895
1895
1896 With the --switch-parent option, the diff will be against the
1896 With the --switch-parent option, the diff will be against the
1897 second parent. It can be useful to review a merge.
1897 second parent. It can be useful to review a merge.
1898
1898
1899 .. container:: verbose
1899 .. container:: verbose
1900
1900
1901 Examples:
1901 Examples:
1902
1902
1903 - use export and import to transplant a bugfix to the current
1903 - use export and import to transplant a bugfix to the current
1904 branch::
1904 branch::
1905
1905
1906 hg export -r 9353 | hg import -
1906 hg export -r 9353 | hg import -
1907
1907
1908 - export all the changesets between two revisions to a file with
1908 - export all the changesets between two revisions to a file with
1909 rename information::
1909 rename information::
1910
1910
1911 hg export --git -r 123:150 > changes.txt
1911 hg export --git -r 123:150 > changes.txt
1912
1912
1913 - split outgoing changes into a series of patches with
1913 - split outgoing changes into a series of patches with
1914 descriptive names::
1914 descriptive names::
1915
1915
1916 hg export -r "outgoing()" -o "%n-%m.patch"
1916 hg export -r "outgoing()" -o "%n-%m.patch"
1917
1917
1918 Returns 0 on success.
1918 Returns 0 on success.
1919 """
1919 """
1920 opts = pycompat.byteskwargs(opts)
1920 opts = pycompat.byteskwargs(opts)
1921 changesets += tuple(opts.get('rev', []))
1921 changesets += tuple(opts.get('rev', []))
1922 if not changesets:
1922 if not changesets:
1923 changesets = ['.']
1923 changesets = ['.']
1924 revs = scmutil.revrange(repo, changesets)
1924 revs = scmutil.revrange(repo, changesets)
1925 if not revs:
1925 if not revs:
1926 raise error.Abort(_("export requires at least one changeset"))
1926 raise error.Abort(_("export requires at least one changeset"))
1927 if len(revs) > 1:
1927 if len(revs) > 1:
1928 ui.note(_('exporting patches:\n'))
1928 ui.note(_('exporting patches:\n'))
1929 else:
1929 else:
1930 ui.note(_('exporting patch:\n'))
1930 ui.note(_('exporting patch:\n'))
1931 ui.pager('export')
1931 ui.pager('export')
1932 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1932 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1933 switch_parent=opts.get('switch_parent'),
1933 switch_parent=opts.get('switch_parent'),
1934 opts=patch.diffallopts(ui, opts))
1934 opts=patch.diffallopts(ui, opts))
1935
1935
1936 @command('files',
1936 @command('files',
1937 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1937 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1938 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1938 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1939 ] + walkopts + formatteropts + subrepoopts,
1939 ] + walkopts + formatteropts + subrepoopts,
1940 _('[OPTION]... [FILE]...'))
1940 _('[OPTION]... [FILE]...'))
1941 def files(ui, repo, *pats, **opts):
1941 def files(ui, repo, *pats, **opts):
1942 """list tracked files
1942 """list tracked files
1943
1943
1944 Print files under Mercurial control in the working directory or
1944 Print files under Mercurial control in the working directory or
1945 specified revision for given files (excluding removed files).
1945 specified revision for given files (excluding removed files).
1946 Files can be specified as filenames or filesets.
1946 Files can be specified as filenames or filesets.
1947
1947
1948 If no files are given to match, this command prints the names
1948 If no files are given to match, this command prints the names
1949 of all files under Mercurial control.
1949 of all files under Mercurial control.
1950
1950
1951 .. container:: verbose
1951 .. container:: verbose
1952
1952
1953 Examples:
1953 Examples:
1954
1954
1955 - list all files under the current directory::
1955 - list all files under the current directory::
1956
1956
1957 hg files .
1957 hg files .
1958
1958
1959 - shows sizes and flags for current revision::
1959 - shows sizes and flags for current revision::
1960
1960
1961 hg files -vr .
1961 hg files -vr .
1962
1962
1963 - list all files named README::
1963 - list all files named README::
1964
1964
1965 hg files -I "**/README"
1965 hg files -I "**/README"
1966
1966
1967 - list all binary files::
1967 - list all binary files::
1968
1968
1969 hg files "set:binary()"
1969 hg files "set:binary()"
1970
1970
1971 - find files containing a regular expression::
1971 - find files containing a regular expression::
1972
1972
1973 hg files "set:grep('bob')"
1973 hg files "set:grep('bob')"
1974
1974
1975 - search tracked file contents with xargs and grep::
1975 - search tracked file contents with xargs and grep::
1976
1976
1977 hg files -0 | xargs -0 grep foo
1977 hg files -0 | xargs -0 grep foo
1978
1978
1979 See :hg:`help patterns` and :hg:`help filesets` for more information
1979 See :hg:`help patterns` and :hg:`help filesets` for more information
1980 on specifying file patterns.
1980 on specifying file patterns.
1981
1981
1982 Returns 0 if a match is found, 1 otherwise.
1982 Returns 0 if a match is found, 1 otherwise.
1983
1983
1984 """
1984 """
1985
1985
1986 opts = pycompat.byteskwargs(opts)
1986 opts = pycompat.byteskwargs(opts)
1987 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1987 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1988
1988
1989 end = '\n'
1989 end = '\n'
1990 if opts.get('print0'):
1990 if opts.get('print0'):
1991 end = '\0'
1991 end = '\0'
1992 fmt = '%s' + end
1992 fmt = '%s' + end
1993
1993
1994 m = scmutil.match(ctx, pats, opts)
1994 m = scmutil.match(ctx, pats, opts)
1995 ui.pager('files')
1995 ui.pager('files')
1996 with ui.formatter('files', opts) as fm:
1996 with ui.formatter('files', opts) as fm:
1997 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
1997 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
1998
1998
1999 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
1999 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2000 def forget(ui, repo, *pats, **opts):
2000 def forget(ui, repo, *pats, **opts):
2001 """forget the specified files on the next commit
2001 """forget the specified files on the next commit
2002
2002
2003 Mark the specified files so they will no longer be tracked
2003 Mark the specified files so they will no longer be tracked
2004 after the next commit.
2004 after the next commit.
2005
2005
2006 This only removes files from the current branch, not from the
2006 This only removes files from the current branch, not from the
2007 entire project history, and it does not delete them from the
2007 entire project history, and it does not delete them from the
2008 working directory.
2008 working directory.
2009
2009
2010 To delete the file from the working directory, see :hg:`remove`.
2010 To delete the file from the working directory, see :hg:`remove`.
2011
2011
2012 To undo a forget before the next commit, see :hg:`add`.
2012 To undo a forget before the next commit, see :hg:`add`.
2013
2013
2014 .. container:: verbose
2014 .. container:: verbose
2015
2015
2016 Examples:
2016 Examples:
2017
2017
2018 - forget newly-added binary files::
2018 - forget newly-added binary files::
2019
2019
2020 hg forget "set:added() and binary()"
2020 hg forget "set:added() and binary()"
2021
2021
2022 - forget files that would be excluded by .hgignore::
2022 - forget files that would be excluded by .hgignore::
2023
2023
2024 hg forget "set:hgignore()"
2024 hg forget "set:hgignore()"
2025
2025
2026 Returns 0 on success.
2026 Returns 0 on success.
2027 """
2027 """
2028
2028
2029 opts = pycompat.byteskwargs(opts)
2029 opts = pycompat.byteskwargs(opts)
2030 if not pats:
2030 if not pats:
2031 raise error.Abort(_('no files specified'))
2031 raise error.Abort(_('no files specified'))
2032
2032
2033 m = scmutil.match(repo[None], pats, opts)
2033 m = scmutil.match(repo[None], pats, opts)
2034 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2034 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2035 return rejected and 1 or 0
2035 return rejected and 1 or 0
2036
2036
2037 @command(
2037 @command(
2038 'graft',
2038 'graft',
2039 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2039 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2040 ('c', 'continue', False, _('resume interrupted graft')),
2040 ('c', 'continue', False, _('resume interrupted graft')),
2041 ('e', 'edit', False, _('invoke editor on commit messages')),
2041 ('e', 'edit', False, _('invoke editor on commit messages')),
2042 ('', 'log', None, _('append graft info to log message')),
2042 ('', 'log', None, _('append graft info to log message')),
2043 ('f', 'force', False, _('force graft')),
2043 ('f', 'force', False, _('force graft')),
2044 ('D', 'currentdate', False,
2044 ('D', 'currentdate', False,
2045 _('record the current date as commit date')),
2045 _('record the current date as commit date')),
2046 ('U', 'currentuser', False,
2046 ('U', 'currentuser', False,
2047 _('record the current user as committer'), _('DATE'))]
2047 _('record the current user as committer'), _('DATE'))]
2048 + commitopts2 + mergetoolopts + dryrunopts,
2048 + commitopts2 + mergetoolopts + dryrunopts,
2049 _('[OPTION]... [-r REV]... REV...'))
2049 _('[OPTION]... [-r REV]... REV...'))
2050 def graft(ui, repo, *revs, **opts):
2050 def graft(ui, repo, *revs, **opts):
2051 '''copy changes from other branches onto the current branch
2051 '''copy changes from other branches onto the current branch
2052
2052
2053 This command uses Mercurial's merge logic to copy individual
2053 This command uses Mercurial's merge logic to copy individual
2054 changes from other branches without merging branches in the
2054 changes from other branches without merging branches in the
2055 history graph. This is sometimes known as 'backporting' or
2055 history graph. This is sometimes known as 'backporting' or
2056 'cherry-picking'. By default, graft will copy user, date, and
2056 'cherry-picking'. By default, graft will copy user, date, and
2057 description from the source changesets.
2057 description from the source changesets.
2058
2058
2059 Changesets that are ancestors of the current revision, that have
2059 Changesets that are ancestors of the current revision, that have
2060 already been grafted, or that are merges will be skipped.
2060 already been grafted, or that are merges will be skipped.
2061
2061
2062 If --log is specified, log messages will have a comment appended
2062 If --log is specified, log messages will have a comment appended
2063 of the form::
2063 of the form::
2064
2064
2065 (grafted from CHANGESETHASH)
2065 (grafted from CHANGESETHASH)
2066
2066
2067 If --force is specified, revisions will be grafted even if they
2067 If --force is specified, revisions will be grafted even if they
2068 are already ancestors of or have been grafted to the destination.
2068 are already ancestors of or have been grafted to the destination.
2069 This is useful when the revisions have since been backed out.
2069 This is useful when the revisions have since been backed out.
2070
2070
2071 If a graft merge results in conflicts, the graft process is
2071 If a graft merge results in conflicts, the graft process is
2072 interrupted so that the current merge can be manually resolved.
2072 interrupted so that the current merge can be manually resolved.
2073 Once all conflicts are addressed, the graft process can be
2073 Once all conflicts are addressed, the graft process can be
2074 continued with the -c/--continue option.
2074 continued with the -c/--continue option.
2075
2075
2076 .. note::
2076 .. note::
2077
2077
2078 The -c/--continue option does not reapply earlier options, except
2078 The -c/--continue option does not reapply earlier options, except
2079 for --force.
2079 for --force.
2080
2080
2081 .. container:: verbose
2081 .. container:: verbose
2082
2082
2083 Examples:
2083 Examples:
2084
2084
2085 - copy a single change to the stable branch and edit its description::
2085 - copy a single change to the stable branch and edit its description::
2086
2086
2087 hg update stable
2087 hg update stable
2088 hg graft --edit 9393
2088 hg graft --edit 9393
2089
2089
2090 - graft a range of changesets with one exception, updating dates::
2090 - graft a range of changesets with one exception, updating dates::
2091
2091
2092 hg graft -D "2085::2093 and not 2091"
2092 hg graft -D "2085::2093 and not 2091"
2093
2093
2094 - continue a graft after resolving conflicts::
2094 - continue a graft after resolving conflicts::
2095
2095
2096 hg graft -c
2096 hg graft -c
2097
2097
2098 - show the source of a grafted changeset::
2098 - show the source of a grafted changeset::
2099
2099
2100 hg log --debug -r .
2100 hg log --debug -r .
2101
2101
2102 - show revisions sorted by date::
2102 - show revisions sorted by date::
2103
2103
2104 hg log -r "sort(all(), date)"
2104 hg log -r "sort(all(), date)"
2105
2105
2106 See :hg:`help revisions` for more about specifying revisions.
2106 See :hg:`help revisions` for more about specifying revisions.
2107
2107
2108 Returns 0 on successful completion.
2108 Returns 0 on successful completion.
2109 '''
2109 '''
2110 with repo.wlock():
2110 with repo.wlock():
2111 return _dograft(ui, repo, *revs, **opts)
2111 return _dograft(ui, repo, *revs, **opts)
2112
2112
2113 def _dograft(ui, repo, *revs, **opts):
2113 def _dograft(ui, repo, *revs, **opts):
2114 opts = pycompat.byteskwargs(opts)
2114 opts = pycompat.byteskwargs(opts)
2115 if revs and opts.get('rev'):
2115 if revs and opts.get('rev'):
2116 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2116 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2117 'revision ordering!\n'))
2117 'revision ordering!\n'))
2118
2118
2119 revs = list(revs)
2119 revs = list(revs)
2120 revs.extend(opts.get('rev'))
2120 revs.extend(opts.get('rev'))
2121
2121
2122 if not opts.get('user') and opts.get('currentuser'):
2122 if not opts.get('user') and opts.get('currentuser'):
2123 opts['user'] = ui.username()
2123 opts['user'] = ui.username()
2124 if not opts.get('date') and opts.get('currentdate'):
2124 if not opts.get('date') and opts.get('currentdate'):
2125 opts['date'] = "%d %d" % util.makedate()
2125 opts['date'] = "%d %d" % util.makedate()
2126
2126
2127 editor = cmdutil.getcommiteditor(editform='graft',
2127 editor = cmdutil.getcommiteditor(editform='graft',
2128 **pycompat.strkwargs(opts))
2128 **pycompat.strkwargs(opts))
2129
2129
2130 cont = False
2130 cont = False
2131 if opts.get('continue'):
2131 if opts.get('continue'):
2132 cont = True
2132 cont = True
2133 if revs:
2133 if revs:
2134 raise error.Abort(_("can't specify --continue and revisions"))
2134 raise error.Abort(_("can't specify --continue and revisions"))
2135 # read in unfinished revisions
2135 # read in unfinished revisions
2136 try:
2136 try:
2137 nodes = repo.vfs.read('graftstate').splitlines()
2137 nodes = repo.vfs.read('graftstate').splitlines()
2138 revs = [repo[node].rev() for node in nodes]
2138 revs = [repo[node].rev() for node in nodes]
2139 except IOError as inst:
2139 except IOError as inst:
2140 if inst.errno != errno.ENOENT:
2140 if inst.errno != errno.ENOENT:
2141 raise
2141 raise
2142 cmdutil.wrongtooltocontinue(repo, _('graft'))
2142 cmdutil.wrongtooltocontinue(repo, _('graft'))
2143 else:
2143 else:
2144 cmdutil.checkunfinished(repo)
2144 cmdutil.checkunfinished(repo)
2145 cmdutil.bailifchanged(repo)
2145 cmdutil.bailifchanged(repo)
2146 if not revs:
2146 if not revs:
2147 raise error.Abort(_('no revisions specified'))
2147 raise error.Abort(_('no revisions specified'))
2148 revs = scmutil.revrange(repo, revs)
2148 revs = scmutil.revrange(repo, revs)
2149
2149
2150 skipped = set()
2150 skipped = set()
2151 # check for merges
2151 # check for merges
2152 for rev in repo.revs('%ld and merge()', revs):
2152 for rev in repo.revs('%ld and merge()', revs):
2153 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2153 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2154 skipped.add(rev)
2154 skipped.add(rev)
2155 revs = [r for r in revs if r not in skipped]
2155 revs = [r for r in revs if r not in skipped]
2156 if not revs:
2156 if not revs:
2157 return -1
2157 return -1
2158
2158
2159 # Don't check in the --continue case, in effect retaining --force across
2159 # Don't check in the --continue case, in effect retaining --force across
2160 # --continues. That's because without --force, any revisions we decided to
2160 # --continues. That's because without --force, any revisions we decided to
2161 # skip would have been filtered out here, so they wouldn't have made their
2161 # skip would have been filtered out here, so they wouldn't have made their
2162 # way to the graftstate. With --force, any revisions we would have otherwise
2162 # way to the graftstate. With --force, any revisions we would have otherwise
2163 # skipped would not have been filtered out, and if they hadn't been applied
2163 # skipped would not have been filtered out, and if they hadn't been applied
2164 # already, they'd have been in the graftstate.
2164 # already, they'd have been in the graftstate.
2165 if not (cont or opts.get('force')):
2165 if not (cont or opts.get('force')):
2166 # check for ancestors of dest branch
2166 # check for ancestors of dest branch
2167 crev = repo['.'].rev()
2167 crev = repo['.'].rev()
2168 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2168 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2169 # XXX make this lazy in the future
2169 # XXX make this lazy in the future
2170 # don't mutate while iterating, create a copy
2170 # don't mutate while iterating, create a copy
2171 for rev in list(revs):
2171 for rev in list(revs):
2172 if rev in ancestors:
2172 if rev in ancestors:
2173 ui.warn(_('skipping ancestor revision %d:%s\n') %
2173 ui.warn(_('skipping ancestor revision %d:%s\n') %
2174 (rev, repo[rev]))
2174 (rev, repo[rev]))
2175 # XXX remove on list is slow
2175 # XXX remove on list is slow
2176 revs.remove(rev)
2176 revs.remove(rev)
2177 if not revs:
2177 if not revs:
2178 return -1
2178 return -1
2179
2179
2180 # analyze revs for earlier grafts
2180 # analyze revs for earlier grafts
2181 ids = {}
2181 ids = {}
2182 for ctx in repo.set("%ld", revs):
2182 for ctx in repo.set("%ld", revs):
2183 ids[ctx.hex()] = ctx.rev()
2183 ids[ctx.hex()] = ctx.rev()
2184 n = ctx.extra().get('source')
2184 n = ctx.extra().get('source')
2185 if n:
2185 if n:
2186 ids[n] = ctx.rev()
2186 ids[n] = ctx.rev()
2187
2187
2188 # check ancestors for earlier grafts
2188 # check ancestors for earlier grafts
2189 ui.debug('scanning for duplicate grafts\n')
2189 ui.debug('scanning for duplicate grafts\n')
2190
2190
2191 # The only changesets we can be sure doesn't contain grafts of any
2191 # The only changesets we can be sure doesn't contain grafts of any
2192 # revs, are the ones that are common ancestors of *all* revs:
2192 # revs, are the ones that are common ancestors of *all* revs:
2193 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2193 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2194 ctx = repo[rev]
2194 ctx = repo[rev]
2195 n = ctx.extra().get('source')
2195 n = ctx.extra().get('source')
2196 if n in ids:
2196 if n in ids:
2197 try:
2197 try:
2198 r = repo[n].rev()
2198 r = repo[n].rev()
2199 except error.RepoLookupError:
2199 except error.RepoLookupError:
2200 r = None
2200 r = None
2201 if r in revs:
2201 if r in revs:
2202 ui.warn(_('skipping revision %d:%s '
2202 ui.warn(_('skipping revision %d:%s '
2203 '(already grafted to %d:%s)\n')
2203 '(already grafted to %d:%s)\n')
2204 % (r, repo[r], rev, ctx))
2204 % (r, repo[r], rev, ctx))
2205 revs.remove(r)
2205 revs.remove(r)
2206 elif ids[n] in revs:
2206 elif ids[n] in revs:
2207 if r is None:
2207 if r is None:
2208 ui.warn(_('skipping already grafted revision %d:%s '
2208 ui.warn(_('skipping already grafted revision %d:%s '
2209 '(%d:%s also has unknown origin %s)\n')
2209 '(%d:%s also has unknown origin %s)\n')
2210 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2210 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2211 else:
2211 else:
2212 ui.warn(_('skipping already grafted revision %d:%s '
2212 ui.warn(_('skipping already grafted revision %d:%s '
2213 '(%d:%s also has origin %d:%s)\n')
2213 '(%d:%s also has origin %d:%s)\n')
2214 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2214 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2215 revs.remove(ids[n])
2215 revs.remove(ids[n])
2216 elif ctx.hex() in ids:
2216 elif ctx.hex() in ids:
2217 r = ids[ctx.hex()]
2217 r = ids[ctx.hex()]
2218 ui.warn(_('skipping already grafted revision %d:%s '
2218 ui.warn(_('skipping already grafted revision %d:%s '
2219 '(was grafted from %d:%s)\n') %
2219 '(was grafted from %d:%s)\n') %
2220 (r, repo[r], rev, ctx))
2220 (r, repo[r], rev, ctx))
2221 revs.remove(r)
2221 revs.remove(r)
2222 if not revs:
2222 if not revs:
2223 return -1
2223 return -1
2224
2224
2225 for pos, ctx in enumerate(repo.set("%ld", revs)):
2225 for pos, ctx in enumerate(repo.set("%ld", revs)):
2226 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2226 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2227 ctx.description().split('\n', 1)[0])
2227 ctx.description().split('\n', 1)[0])
2228 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2228 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2229 if names:
2229 if names:
2230 desc += ' (%s)' % ' '.join(names)
2230 desc += ' (%s)' % ' '.join(names)
2231 ui.status(_('grafting %s\n') % desc)
2231 ui.status(_('grafting %s\n') % desc)
2232 if opts.get('dry_run'):
2232 if opts.get('dry_run'):
2233 continue
2233 continue
2234
2234
2235 source = ctx.extra().get('source')
2235 source = ctx.extra().get('source')
2236 extra = {}
2236 extra = {}
2237 if source:
2237 if source:
2238 extra['source'] = source
2238 extra['source'] = source
2239 extra['intermediate-source'] = ctx.hex()
2239 extra['intermediate-source'] = ctx.hex()
2240 else:
2240 else:
2241 extra['source'] = ctx.hex()
2241 extra['source'] = ctx.hex()
2242 user = ctx.user()
2242 user = ctx.user()
2243 if opts.get('user'):
2243 if opts.get('user'):
2244 user = opts['user']
2244 user = opts['user']
2245 date = ctx.date()
2245 date = ctx.date()
2246 if opts.get('date'):
2246 if opts.get('date'):
2247 date = opts['date']
2247 date = opts['date']
2248 message = ctx.description()
2248 message = ctx.description()
2249 if opts.get('log'):
2249 if opts.get('log'):
2250 message += '\n(grafted from %s)' % ctx.hex()
2250 message += '\n(grafted from %s)' % ctx.hex()
2251
2251
2252 # we don't merge the first commit when continuing
2252 # we don't merge the first commit when continuing
2253 if not cont:
2253 if not cont:
2254 # perform the graft merge with p1(rev) as 'ancestor'
2254 # perform the graft merge with p1(rev) as 'ancestor'
2255 try:
2255 try:
2256 # ui.forcemerge is an internal variable, do not document
2256 # ui.forcemerge is an internal variable, do not document
2257 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2257 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2258 'graft')
2258 'graft')
2259 stats = mergemod.graft(repo, ctx, ctx.p1(),
2259 stats = mergemod.graft(repo, ctx, ctx.p1(),
2260 ['local', 'graft'])
2260 ['local', 'graft'])
2261 finally:
2261 finally:
2262 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2262 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2263 # report any conflicts
2263 # report any conflicts
2264 if stats and stats[3] > 0:
2264 if stats and stats[3] > 0:
2265 # write out state for --continue
2265 # write out state for --continue
2266 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2266 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2267 repo.vfs.write('graftstate', ''.join(nodelines))
2267 repo.vfs.write('graftstate', ''.join(nodelines))
2268 extra = ''
2268 extra = ''
2269 if opts.get('user'):
2269 if opts.get('user'):
2270 extra += ' --user %s' % util.shellquote(opts['user'])
2270 extra += ' --user %s' % util.shellquote(opts['user'])
2271 if opts.get('date'):
2271 if opts.get('date'):
2272 extra += ' --date %s' % util.shellquote(opts['date'])
2272 extra += ' --date %s' % util.shellquote(opts['date'])
2273 if opts.get('log'):
2273 if opts.get('log'):
2274 extra += ' --log'
2274 extra += ' --log'
2275 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2275 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2276 raise error.Abort(
2276 raise error.Abort(
2277 _("unresolved conflicts, can't continue"),
2277 _("unresolved conflicts, can't continue"),
2278 hint=hint)
2278 hint=hint)
2279 else:
2279 else:
2280 cont = False
2280 cont = False
2281
2281
2282 # commit
2282 # commit
2283 node = repo.commit(text=message, user=user,
2283 node = repo.commit(text=message, user=user,
2284 date=date, extra=extra, editor=editor)
2284 date=date, extra=extra, editor=editor)
2285 if node is None:
2285 if node is None:
2286 ui.warn(
2286 ui.warn(
2287 _('note: graft of %d:%s created no changes to commit\n') %
2287 _('note: graft of %d:%s created no changes to commit\n') %
2288 (ctx.rev(), ctx))
2288 (ctx.rev(), ctx))
2289
2289
2290 # remove state when we complete successfully
2290 # remove state when we complete successfully
2291 if not opts.get('dry_run'):
2291 if not opts.get('dry_run'):
2292 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2292 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2293
2293
2294 return 0
2294 return 0
2295
2295
2296 @command('grep',
2296 @command('grep',
2297 [('0', 'print0', None, _('end fields with NUL')),
2297 [('0', 'print0', None, _('end fields with NUL')),
2298 ('', 'all', None, _('print all revisions that match')),
2298 ('', 'all', None, _('print all revisions that match')),
2299 ('a', 'text', None, _('treat all files as text')),
2299 ('a', 'text', None, _('treat all files as text')),
2300 ('f', 'follow', None,
2300 ('f', 'follow', None,
2301 _('follow changeset history,'
2301 _('follow changeset history,'
2302 ' or file history across copies and renames')),
2302 ' or file history across copies and renames')),
2303 ('i', 'ignore-case', None, _('ignore case when matching')),
2303 ('i', 'ignore-case', None, _('ignore case when matching')),
2304 ('l', 'files-with-matches', None,
2304 ('l', 'files-with-matches', None,
2305 _('print only filenames and revisions that match')),
2305 _('print only filenames and revisions that match')),
2306 ('n', 'line-number', None, _('print matching line numbers')),
2306 ('n', 'line-number', None, _('print matching line numbers')),
2307 ('r', 'rev', [],
2307 ('r', 'rev', [],
2308 _('only search files changed within revision range'), _('REV')),
2308 _('only search files changed within revision range'), _('REV')),
2309 ('u', 'user', None, _('list the author (long with -v)')),
2309 ('u', 'user', None, _('list the author (long with -v)')),
2310 ('d', 'date', None, _('list the date (short with -q)')),
2310 ('d', 'date', None, _('list the date (short with -q)')),
2311 ] + formatteropts + walkopts,
2311 ] + formatteropts + walkopts,
2312 _('[OPTION]... PATTERN [FILE]...'),
2312 _('[OPTION]... PATTERN [FILE]...'),
2313 inferrepo=True)
2313 inferrepo=True)
2314 def grep(ui, repo, pattern, *pats, **opts):
2314 def grep(ui, repo, pattern, *pats, **opts):
2315 """search revision history for a pattern in specified files
2315 """search revision history for a pattern in specified files
2316
2316
2317 Search revision history for a regular expression in the specified
2317 Search revision history for a regular expression in the specified
2318 files or the entire project.
2318 files or the entire project.
2319
2319
2320 By default, grep prints the most recent revision number for each
2320 By default, grep prints the most recent revision number for each
2321 file in which it finds a match. To get it to print every revision
2321 file in which it finds a match. To get it to print every revision
2322 that contains a change in match status ("-" for a match that becomes
2322 that contains a change in match status ("-" for a match that becomes
2323 a non-match, or "+" for a non-match that becomes a match), use the
2323 a non-match, or "+" for a non-match that becomes a match), use the
2324 --all flag.
2324 --all flag.
2325
2325
2326 PATTERN can be any Python (roughly Perl-compatible) regular
2326 PATTERN can be any Python (roughly Perl-compatible) regular
2327 expression.
2327 expression.
2328
2328
2329 If no FILEs are specified (and -f/--follow isn't set), all files in
2329 If no FILEs are specified (and -f/--follow isn't set), all files in
2330 the repository are searched, including those that don't exist in the
2330 the repository are searched, including those that don't exist in the
2331 current branch or have been deleted in a prior changeset.
2331 current branch or have been deleted in a prior changeset.
2332
2332
2333 Returns 0 if a match is found, 1 otherwise.
2333 Returns 0 if a match is found, 1 otherwise.
2334 """
2334 """
2335 opts = pycompat.byteskwargs(opts)
2335 opts = pycompat.byteskwargs(opts)
2336 reflags = re.M
2336 reflags = re.M
2337 if opts.get('ignore_case'):
2337 if opts.get('ignore_case'):
2338 reflags |= re.I
2338 reflags |= re.I
2339 try:
2339 try:
2340 regexp = util.re.compile(pattern, reflags)
2340 regexp = util.re.compile(pattern, reflags)
2341 except re.error as inst:
2341 except re.error as inst:
2342 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2342 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2343 return 1
2343 return 1
2344 sep, eol = ':', '\n'
2344 sep, eol = ':', '\n'
2345 if opts.get('print0'):
2345 if opts.get('print0'):
2346 sep = eol = '\0'
2346 sep = eol = '\0'
2347
2347
2348 getfile = util.lrucachefunc(repo.file)
2348 getfile = util.lrucachefunc(repo.file)
2349
2349
2350 def matchlines(body):
2350 def matchlines(body):
2351 begin = 0
2351 begin = 0
2352 linenum = 0
2352 linenum = 0
2353 while begin < len(body):
2353 while begin < len(body):
2354 match = regexp.search(body, begin)
2354 match = regexp.search(body, begin)
2355 if not match:
2355 if not match:
2356 break
2356 break
2357 mstart, mend = match.span()
2357 mstart, mend = match.span()
2358 linenum += body.count('\n', begin, mstart) + 1
2358 linenum += body.count('\n', begin, mstart) + 1
2359 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2359 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2360 begin = body.find('\n', mend) + 1 or len(body) + 1
2360 begin = body.find('\n', mend) + 1 or len(body) + 1
2361 lend = begin - 1
2361 lend = begin - 1
2362 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2362 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2363
2363
2364 class linestate(object):
2364 class linestate(object):
2365 def __init__(self, line, linenum, colstart, colend):
2365 def __init__(self, line, linenum, colstart, colend):
2366 self.line = line
2366 self.line = line
2367 self.linenum = linenum
2367 self.linenum = linenum
2368 self.colstart = colstart
2368 self.colstart = colstart
2369 self.colend = colend
2369 self.colend = colend
2370
2370
2371 def __hash__(self):
2371 def __hash__(self):
2372 return hash((self.linenum, self.line))
2372 return hash((self.linenum, self.line))
2373
2373
2374 def __eq__(self, other):
2374 def __eq__(self, other):
2375 return self.line == other.line
2375 return self.line == other.line
2376
2376
2377 def findpos(self):
2377 def findpos(self):
2378 """Iterate all (start, end) indices of matches"""
2378 """Iterate all (start, end) indices of matches"""
2379 yield self.colstart, self.colend
2379 yield self.colstart, self.colend
2380 p = self.colend
2380 p = self.colend
2381 while p < len(self.line):
2381 while p < len(self.line):
2382 m = regexp.search(self.line, p)
2382 m = regexp.search(self.line, p)
2383 if not m:
2383 if not m:
2384 break
2384 break
2385 yield m.span()
2385 yield m.span()
2386 p = m.end()
2386 p = m.end()
2387
2387
2388 matches = {}
2388 matches = {}
2389 copies = {}
2389 copies = {}
2390 def grepbody(fn, rev, body):
2390 def grepbody(fn, rev, body):
2391 matches[rev].setdefault(fn, [])
2391 matches[rev].setdefault(fn, [])
2392 m = matches[rev][fn]
2392 m = matches[rev][fn]
2393 for lnum, cstart, cend, line in matchlines(body):
2393 for lnum, cstart, cend, line in matchlines(body):
2394 s = linestate(line, lnum, cstart, cend)
2394 s = linestate(line, lnum, cstart, cend)
2395 m.append(s)
2395 m.append(s)
2396
2396
2397 def difflinestates(a, b):
2397 def difflinestates(a, b):
2398 sm = difflib.SequenceMatcher(None, a, b)
2398 sm = difflib.SequenceMatcher(None, a, b)
2399 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2399 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2400 if tag == 'insert':
2400 if tag == 'insert':
2401 for i in xrange(blo, bhi):
2401 for i in xrange(blo, bhi):
2402 yield ('+', b[i])
2402 yield ('+', b[i])
2403 elif tag == 'delete':
2403 elif tag == 'delete':
2404 for i in xrange(alo, ahi):
2404 for i in xrange(alo, ahi):
2405 yield ('-', a[i])
2405 yield ('-', a[i])
2406 elif tag == 'replace':
2406 elif tag == 'replace':
2407 for i in xrange(alo, ahi):
2407 for i in xrange(alo, ahi):
2408 yield ('-', a[i])
2408 yield ('-', a[i])
2409 for i in xrange(blo, bhi):
2409 for i in xrange(blo, bhi):
2410 yield ('+', b[i])
2410 yield ('+', b[i])
2411
2411
2412 def display(fm, fn, ctx, pstates, states):
2412 def display(fm, fn, ctx, pstates, states):
2413 rev = ctx.rev()
2413 rev = ctx.rev()
2414 if fm.isplain():
2414 if fm.isplain():
2415 formatuser = ui.shortuser
2415 formatuser = ui.shortuser
2416 else:
2416 else:
2417 formatuser = str
2417 formatuser = str
2418 if ui.quiet:
2418 if ui.quiet:
2419 datefmt = '%Y-%m-%d'
2419 datefmt = '%Y-%m-%d'
2420 else:
2420 else:
2421 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2421 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2422 found = False
2422 found = False
2423 @util.cachefunc
2423 @util.cachefunc
2424 def binary():
2424 def binary():
2425 flog = getfile(fn)
2425 flog = getfile(fn)
2426 return util.binary(flog.read(ctx.filenode(fn)))
2426 return util.binary(flog.read(ctx.filenode(fn)))
2427
2427
2428 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2428 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2429 if opts.get('all'):
2429 if opts.get('all'):
2430 iter = difflinestates(pstates, states)
2430 iter = difflinestates(pstates, states)
2431 else:
2431 else:
2432 iter = [('', l) for l in states]
2432 iter = [('', l) for l in states]
2433 for change, l in iter:
2433 for change, l in iter:
2434 fm.startitem()
2434 fm.startitem()
2435 fm.data(node=fm.hexfunc(ctx.node()))
2435 fm.data(node=fm.hexfunc(ctx.node()))
2436 cols = [
2436 cols = [
2437 ('filename', fn, True),
2437 ('filename', fn, True),
2438 ('rev', rev, True),
2438 ('rev', rev, True),
2439 ('linenumber', l.linenum, opts.get('line_number')),
2439 ('linenumber', l.linenum, opts.get('line_number')),
2440 ]
2440 ]
2441 if opts.get('all'):
2441 if opts.get('all'):
2442 cols.append(('change', change, True))
2442 cols.append(('change', change, True))
2443 cols.extend([
2443 cols.extend([
2444 ('user', formatuser(ctx.user()), opts.get('user')),
2444 ('user', formatuser(ctx.user()), opts.get('user')),
2445 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2445 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2446 ])
2446 ])
2447 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2447 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2448 for name, data, cond in cols:
2448 for name, data, cond in cols:
2449 field = fieldnamemap.get(name, name)
2449 field = fieldnamemap.get(name, name)
2450 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2450 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2451 if cond and name != lastcol:
2451 if cond and name != lastcol:
2452 fm.plain(sep, label='grep.sep')
2452 fm.plain(sep, label='grep.sep')
2453 if not opts.get('files_with_matches'):
2453 if not opts.get('files_with_matches'):
2454 fm.plain(sep, label='grep.sep')
2454 fm.plain(sep, label='grep.sep')
2455 if not opts.get('text') and binary():
2455 if not opts.get('text') and binary():
2456 fm.plain(_(" Binary file matches"))
2456 fm.plain(_(" Binary file matches"))
2457 else:
2457 else:
2458 displaymatches(fm.nested('texts'), l)
2458 displaymatches(fm.nested('texts'), l)
2459 fm.plain(eol)
2459 fm.plain(eol)
2460 found = True
2460 found = True
2461 if opts.get('files_with_matches'):
2461 if opts.get('files_with_matches'):
2462 break
2462 break
2463 return found
2463 return found
2464
2464
2465 def displaymatches(fm, l):
2465 def displaymatches(fm, l):
2466 p = 0
2466 p = 0
2467 for s, e in l.findpos():
2467 for s, e in l.findpos():
2468 if p < s:
2468 if p < s:
2469 fm.startitem()
2469 fm.startitem()
2470 fm.write('text', '%s', l.line[p:s])
2470 fm.write('text', '%s', l.line[p:s])
2471 fm.data(matched=False)
2471 fm.data(matched=False)
2472 fm.startitem()
2472 fm.startitem()
2473 fm.write('text', '%s', l.line[s:e], label='grep.match')
2473 fm.write('text', '%s', l.line[s:e], label='grep.match')
2474 fm.data(matched=True)
2474 fm.data(matched=True)
2475 p = e
2475 p = e
2476 if p < len(l.line):
2476 if p < len(l.line):
2477 fm.startitem()
2477 fm.startitem()
2478 fm.write('text', '%s', l.line[p:])
2478 fm.write('text', '%s', l.line[p:])
2479 fm.data(matched=False)
2479 fm.data(matched=False)
2480 fm.end()
2480 fm.end()
2481
2481
2482 skip = {}
2482 skip = {}
2483 revfiles = {}
2483 revfiles = {}
2484 matchfn = scmutil.match(repo[None], pats, opts)
2484 matchfn = scmutil.match(repo[None], pats, opts)
2485 found = False
2485 found = False
2486 follow = opts.get('follow')
2486 follow = opts.get('follow')
2487
2487
2488 def prep(ctx, fns):
2488 def prep(ctx, fns):
2489 rev = ctx.rev()
2489 rev = ctx.rev()
2490 pctx = ctx.p1()
2490 pctx = ctx.p1()
2491 parent = pctx.rev()
2491 parent = pctx.rev()
2492 matches.setdefault(rev, {})
2492 matches.setdefault(rev, {})
2493 matches.setdefault(parent, {})
2493 matches.setdefault(parent, {})
2494 files = revfiles.setdefault(rev, [])
2494 files = revfiles.setdefault(rev, [])
2495 for fn in fns:
2495 for fn in fns:
2496 flog = getfile(fn)
2496 flog = getfile(fn)
2497 try:
2497 try:
2498 fnode = ctx.filenode(fn)
2498 fnode = ctx.filenode(fn)
2499 except error.LookupError:
2499 except error.LookupError:
2500 continue
2500 continue
2501
2501
2502 copied = flog.renamed(fnode)
2502 copied = flog.renamed(fnode)
2503 copy = follow and copied and copied[0]
2503 copy = follow and copied and copied[0]
2504 if copy:
2504 if copy:
2505 copies.setdefault(rev, {})[fn] = copy
2505 copies.setdefault(rev, {})[fn] = copy
2506 if fn in skip:
2506 if fn in skip:
2507 if copy:
2507 if copy:
2508 skip[copy] = True
2508 skip[copy] = True
2509 continue
2509 continue
2510 files.append(fn)
2510 files.append(fn)
2511
2511
2512 if fn not in matches[rev]:
2512 if fn not in matches[rev]:
2513 grepbody(fn, rev, flog.read(fnode))
2513 grepbody(fn, rev, flog.read(fnode))
2514
2514
2515 pfn = copy or fn
2515 pfn = copy or fn
2516 if pfn not in matches[parent]:
2516 if pfn not in matches[parent]:
2517 try:
2517 try:
2518 fnode = pctx.filenode(pfn)
2518 fnode = pctx.filenode(pfn)
2519 grepbody(pfn, parent, flog.read(fnode))
2519 grepbody(pfn, parent, flog.read(fnode))
2520 except error.LookupError:
2520 except error.LookupError:
2521 pass
2521 pass
2522
2522
2523 ui.pager('grep')
2523 ui.pager('grep')
2524 fm = ui.formatter('grep', opts)
2524 fm = ui.formatter('grep', opts)
2525 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2525 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2526 rev = ctx.rev()
2526 rev = ctx.rev()
2527 parent = ctx.p1().rev()
2527 parent = ctx.p1().rev()
2528 for fn in sorted(revfiles.get(rev, [])):
2528 for fn in sorted(revfiles.get(rev, [])):
2529 states = matches[rev][fn]
2529 states = matches[rev][fn]
2530 copy = copies.get(rev, {}).get(fn)
2530 copy = copies.get(rev, {}).get(fn)
2531 if fn in skip:
2531 if fn in skip:
2532 if copy:
2532 if copy:
2533 skip[copy] = True
2533 skip[copy] = True
2534 continue
2534 continue
2535 pstates = matches.get(parent, {}).get(copy or fn, [])
2535 pstates = matches.get(parent, {}).get(copy or fn, [])
2536 if pstates or states:
2536 if pstates or states:
2537 r = display(fm, fn, ctx, pstates, states)
2537 r = display(fm, fn, ctx, pstates, states)
2538 found = found or r
2538 found = found or r
2539 if r and not opts.get('all'):
2539 if r and not opts.get('all'):
2540 skip[fn] = True
2540 skip[fn] = True
2541 if copy:
2541 if copy:
2542 skip[copy] = True
2542 skip[copy] = True
2543 del matches[rev]
2543 del matches[rev]
2544 del revfiles[rev]
2544 del revfiles[rev]
2545 fm.end()
2545 fm.end()
2546
2546
2547 return not found
2547 return not found
2548
2548
2549 @command('heads',
2549 @command('heads',
2550 [('r', 'rev', '',
2550 [('r', 'rev', '',
2551 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2551 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2552 ('t', 'topo', False, _('show topological heads only')),
2552 ('t', 'topo', False, _('show topological heads only')),
2553 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2553 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2554 ('c', 'closed', False, _('show normal and closed branch heads')),
2554 ('c', 'closed', False, _('show normal and closed branch heads')),
2555 ] + templateopts,
2555 ] + templateopts,
2556 _('[-ct] [-r STARTREV] [REV]...'))
2556 _('[-ct] [-r STARTREV] [REV]...'))
2557 def heads(ui, repo, *branchrevs, **opts):
2557 def heads(ui, repo, *branchrevs, **opts):
2558 """show branch heads
2558 """show branch heads
2559
2559
2560 With no arguments, show all open branch heads in the repository.
2560 With no arguments, show all open branch heads in the repository.
2561 Branch heads are changesets that have no descendants on the
2561 Branch heads are changesets that have no descendants on the
2562 same branch. They are where development generally takes place and
2562 same branch. They are where development generally takes place and
2563 are the usual targets for update and merge operations.
2563 are the usual targets for update and merge operations.
2564
2564
2565 If one or more REVs are given, only open branch heads on the
2565 If one or more REVs are given, only open branch heads on the
2566 branches associated with the specified changesets are shown. This
2566 branches associated with the specified changesets are shown. This
2567 means that you can use :hg:`heads .` to see the heads on the
2567 means that you can use :hg:`heads .` to see the heads on the
2568 currently checked-out branch.
2568 currently checked-out branch.
2569
2569
2570 If -c/--closed is specified, also show branch heads marked closed
2570 If -c/--closed is specified, also show branch heads marked closed
2571 (see :hg:`commit --close-branch`).
2571 (see :hg:`commit --close-branch`).
2572
2572
2573 If STARTREV is specified, only those heads that are descendants of
2573 If STARTREV is specified, only those heads that are descendants of
2574 STARTREV will be displayed.
2574 STARTREV will be displayed.
2575
2575
2576 If -t/--topo is specified, named branch mechanics will be ignored and only
2576 If -t/--topo is specified, named branch mechanics will be ignored and only
2577 topological heads (changesets with no children) will be shown.
2577 topological heads (changesets with no children) will be shown.
2578
2578
2579 Returns 0 if matching heads are found, 1 if not.
2579 Returns 0 if matching heads are found, 1 if not.
2580 """
2580 """
2581
2581
2582 opts = pycompat.byteskwargs(opts)
2582 opts = pycompat.byteskwargs(opts)
2583 start = None
2583 start = None
2584 if 'rev' in opts:
2584 if 'rev' in opts:
2585 start = scmutil.revsingle(repo, opts['rev'], None).node()
2585 start = scmutil.revsingle(repo, opts['rev'], None).node()
2586
2586
2587 if opts.get('topo'):
2587 if opts.get('topo'):
2588 heads = [repo[h] for h in repo.heads(start)]
2588 heads = [repo[h] for h in repo.heads(start)]
2589 else:
2589 else:
2590 heads = []
2590 heads = []
2591 for branch in repo.branchmap():
2591 for branch in repo.branchmap():
2592 heads += repo.branchheads(branch, start, opts.get('closed'))
2592 heads += repo.branchheads(branch, start, opts.get('closed'))
2593 heads = [repo[h] for h in heads]
2593 heads = [repo[h] for h in heads]
2594
2594
2595 if branchrevs:
2595 if branchrevs:
2596 branches = set(repo[br].branch() for br in branchrevs)
2596 branches = set(repo[br].branch() for br in branchrevs)
2597 heads = [h for h in heads if h.branch() in branches]
2597 heads = [h for h in heads if h.branch() in branches]
2598
2598
2599 if opts.get('active') and branchrevs:
2599 if opts.get('active') and branchrevs:
2600 dagheads = repo.heads(start)
2600 dagheads = repo.heads(start)
2601 heads = [h for h in heads if h.node() in dagheads]
2601 heads = [h for h in heads if h.node() in dagheads]
2602
2602
2603 if branchrevs:
2603 if branchrevs:
2604 haveheads = set(h.branch() for h in heads)
2604 haveheads = set(h.branch() for h in heads)
2605 if branches - haveheads:
2605 if branches - haveheads:
2606 headless = ', '.join(b for b in branches - haveheads)
2606 headless = ', '.join(b for b in branches - haveheads)
2607 msg = _('no open branch heads found on branches %s')
2607 msg = _('no open branch heads found on branches %s')
2608 if opts.get('rev'):
2608 if opts.get('rev'):
2609 msg += _(' (started at %s)') % opts['rev']
2609 msg += _(' (started at %s)') % opts['rev']
2610 ui.warn((msg + '\n') % headless)
2610 ui.warn((msg + '\n') % headless)
2611
2611
2612 if not heads:
2612 if not heads:
2613 return 1
2613 return 1
2614
2614
2615 ui.pager('heads')
2615 ui.pager('heads')
2616 heads = sorted(heads, key=lambda x: -x.rev())
2616 heads = sorted(heads, key=lambda x: -x.rev())
2617 displayer = cmdutil.show_changeset(ui, repo, opts)
2617 displayer = cmdutil.show_changeset(ui, repo, opts)
2618 for ctx in heads:
2618 for ctx in heads:
2619 displayer.show(ctx)
2619 displayer.show(ctx)
2620 displayer.close()
2620 displayer.close()
2621
2621
2622 @command('help',
2622 @command('help',
2623 [('e', 'extension', None, _('show only help for extensions')),
2623 [('e', 'extension', None, _('show only help for extensions')),
2624 ('c', 'command', None, _('show only help for commands')),
2624 ('c', 'command', None, _('show only help for commands')),
2625 ('k', 'keyword', None, _('show topics matching keyword')),
2625 ('k', 'keyword', None, _('show topics matching keyword')),
2626 ('s', 'system', [], _('show help for specific platform(s)')),
2626 ('s', 'system', [], _('show help for specific platform(s)')),
2627 ],
2627 ],
2628 _('[-ecks] [TOPIC]'),
2628 _('[-ecks] [TOPIC]'),
2629 norepo=True)
2629 norepo=True)
2630 def help_(ui, name=None, **opts):
2630 def help_(ui, name=None, **opts):
2631 """show help for a given topic or a help overview
2631 """show help for a given topic or a help overview
2632
2632
2633 With no arguments, print a list of commands with short help messages.
2633 With no arguments, print a list of commands with short help messages.
2634
2634
2635 Given a topic, extension, or command name, print help for that
2635 Given a topic, extension, or command name, print help for that
2636 topic.
2636 topic.
2637
2637
2638 Returns 0 if successful.
2638 Returns 0 if successful.
2639 """
2639 """
2640
2640
2641 keep = opts.get(r'system') or []
2641 keep = opts.get(r'system') or []
2642 if len(keep) == 0:
2642 if len(keep) == 0:
2643 if pycompat.sysplatform.startswith('win'):
2643 if pycompat.sysplatform.startswith('win'):
2644 keep.append('windows')
2644 keep.append('windows')
2645 elif pycompat.sysplatform == 'OpenVMS':
2645 elif pycompat.sysplatform == 'OpenVMS':
2646 keep.append('vms')
2646 keep.append('vms')
2647 elif pycompat.sysplatform == 'plan9':
2647 elif pycompat.sysplatform == 'plan9':
2648 keep.append('plan9')
2648 keep.append('plan9')
2649 else:
2649 else:
2650 keep.append('unix')
2650 keep.append('unix')
2651 keep.append(pycompat.sysplatform.lower())
2651 keep.append(pycompat.sysplatform.lower())
2652 if ui.verbose:
2652 if ui.verbose:
2653 keep.append('verbose')
2653 keep.append('verbose')
2654
2654
2655 commands = sys.modules[__name__]
2655 commands = sys.modules[__name__]
2656 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2656 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2657 ui.pager('help')
2657 ui.pager('help')
2658 ui.write(formatted)
2658 ui.write(formatted)
2659
2659
2660
2660
2661 @command('identify|id',
2661 @command('identify|id',
2662 [('r', 'rev', '',
2662 [('r', 'rev', '',
2663 _('identify the specified revision'), _('REV')),
2663 _('identify the specified revision'), _('REV')),
2664 ('n', 'num', None, _('show local revision number')),
2664 ('n', 'num', None, _('show local revision number')),
2665 ('i', 'id', None, _('show global revision id')),
2665 ('i', 'id', None, _('show global revision id')),
2666 ('b', 'branch', None, _('show branch')),
2666 ('b', 'branch', None, _('show branch')),
2667 ('t', 'tags', None, _('show tags')),
2667 ('t', 'tags', None, _('show tags')),
2668 ('B', 'bookmarks', None, _('show bookmarks')),
2668 ('B', 'bookmarks', None, _('show bookmarks')),
2669 ] + remoteopts + formatteropts,
2669 ] + remoteopts + formatteropts,
2670 _('[-nibtB] [-r REV] [SOURCE]'),
2670 _('[-nibtB] [-r REV] [SOURCE]'),
2671 optionalrepo=True)
2671 optionalrepo=True)
2672 def identify(ui, repo, source=None, rev=None,
2672 def identify(ui, repo, source=None, rev=None,
2673 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2673 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2674 """identify the working directory or specified revision
2674 """identify the working directory or specified revision
2675
2675
2676 Print a summary identifying the repository state at REV using one or
2676 Print a summary identifying the repository state at REV using one or
2677 two parent hash identifiers, followed by a "+" if the working
2677 two parent hash identifiers, followed by a "+" if the working
2678 directory has uncommitted changes, the branch name (if not default),
2678 directory has uncommitted changes, the branch name (if not default),
2679 a list of tags, and a list of bookmarks.
2679 a list of tags, and a list of bookmarks.
2680
2680
2681 When REV is not given, print a summary of the current state of the
2681 When REV is not given, print a summary of the current state of the
2682 repository.
2682 repository.
2683
2683
2684 Specifying a path to a repository root or Mercurial bundle will
2684 Specifying a path to a repository root or Mercurial bundle will
2685 cause lookup to operate on that repository/bundle.
2685 cause lookup to operate on that repository/bundle.
2686
2686
2687 .. container:: verbose
2687 .. container:: verbose
2688
2688
2689 Examples:
2689 Examples:
2690
2690
2691 - generate a build identifier for the working directory::
2691 - generate a build identifier for the working directory::
2692
2692
2693 hg id --id > build-id.dat
2693 hg id --id > build-id.dat
2694
2694
2695 - find the revision corresponding to a tag::
2695 - find the revision corresponding to a tag::
2696
2696
2697 hg id -n -r 1.3
2697 hg id -n -r 1.3
2698
2698
2699 - check the most recent revision of a remote repository::
2699 - check the most recent revision of a remote repository::
2700
2700
2701 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2701 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2702
2702
2703 See :hg:`log` for generating more information about specific revisions,
2703 See :hg:`log` for generating more information about specific revisions,
2704 including full hash identifiers.
2704 including full hash identifiers.
2705
2705
2706 Returns 0 if successful.
2706 Returns 0 if successful.
2707 """
2707 """
2708
2708
2709 opts = pycompat.byteskwargs(opts)
2709 opts = pycompat.byteskwargs(opts)
2710 if not repo and not source:
2710 if not repo and not source:
2711 raise error.Abort(_("there is no Mercurial repository here "
2711 raise error.Abort(_("there is no Mercurial repository here "
2712 "(.hg not found)"))
2712 "(.hg not found)"))
2713
2713
2714 if ui.debugflag:
2714 if ui.debugflag:
2715 hexfunc = hex
2715 hexfunc = hex
2716 else:
2716 else:
2717 hexfunc = short
2717 hexfunc = short
2718 default = not (num or id or branch or tags or bookmarks)
2718 default = not (num or id or branch or tags or bookmarks)
2719 output = []
2719 output = []
2720 revs = []
2720 revs = []
2721
2721
2722 if source:
2722 if source:
2723 source, branches = hg.parseurl(ui.expandpath(source))
2723 source, branches = hg.parseurl(ui.expandpath(source))
2724 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2724 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2725 repo = peer.local()
2725 repo = peer.local()
2726 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2726 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2727
2727
2728 fm = ui.formatter('identify', opts)
2728 fm = ui.formatter('identify', opts)
2729 fm.startitem()
2729 fm.startitem()
2730
2730
2731 if not repo:
2731 if not repo:
2732 if num or branch or tags:
2732 if num or branch or tags:
2733 raise error.Abort(
2733 raise error.Abort(
2734 _("can't query remote revision number, branch, or tags"))
2734 _("can't query remote revision number, branch, or tags"))
2735 if not rev and revs:
2735 if not rev and revs:
2736 rev = revs[0]
2736 rev = revs[0]
2737 if not rev:
2737 if not rev:
2738 rev = "tip"
2738 rev = "tip"
2739
2739
2740 remoterev = peer.lookup(rev)
2740 remoterev = peer.lookup(rev)
2741 hexrev = hexfunc(remoterev)
2741 hexrev = hexfunc(remoterev)
2742 if default or id:
2742 if default or id:
2743 output = [hexrev]
2743 output = [hexrev]
2744 fm.data(id=hexrev)
2744 fm.data(id=hexrev)
2745
2745
2746 def getbms():
2746 def getbms():
2747 bms = []
2747 bms = []
2748
2748
2749 if 'bookmarks' in peer.listkeys('namespaces'):
2749 if 'bookmarks' in peer.listkeys('namespaces'):
2750 hexremoterev = hex(remoterev)
2750 hexremoterev = hex(remoterev)
2751 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2751 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2752 if bmr == hexremoterev]
2752 if bmr == hexremoterev]
2753
2753
2754 return sorted(bms)
2754 return sorted(bms)
2755
2755
2756 bms = getbms()
2756 bms = getbms()
2757 if bookmarks:
2757 if bookmarks:
2758 output.extend(bms)
2758 output.extend(bms)
2759 elif default and not ui.quiet:
2759 elif default and not ui.quiet:
2760 # multiple bookmarks for a single parent separated by '/'
2760 # multiple bookmarks for a single parent separated by '/'
2761 bm = '/'.join(bms)
2761 bm = '/'.join(bms)
2762 if bm:
2762 if bm:
2763 output.append(bm)
2763 output.append(bm)
2764
2764
2765 fm.data(node=hex(remoterev))
2765 fm.data(node=hex(remoterev))
2766 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2766 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2767 else:
2767 else:
2768 ctx = scmutil.revsingle(repo, rev, None)
2768 ctx = scmutil.revsingle(repo, rev, None)
2769
2769
2770 if ctx.rev() is None:
2770 if ctx.rev() is None:
2771 ctx = repo[None]
2771 ctx = repo[None]
2772 parents = ctx.parents()
2772 parents = ctx.parents()
2773 taglist = []
2773 taglist = []
2774 for p in parents:
2774 for p in parents:
2775 taglist.extend(p.tags())
2775 taglist.extend(p.tags())
2776
2776
2777 dirty = ""
2777 dirty = ""
2778 if (any(repo.status())
2778 if (any(repo.status())
2779 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2779 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2780 dirty = '+'
2780 dirty = '+'
2781 fm.data(dirty=dirty)
2781 fm.data(dirty=dirty)
2782
2782
2783 hexoutput = [hexfunc(p.node()) for p in parents]
2783 hexoutput = [hexfunc(p.node()) for p in parents]
2784 if default or id:
2784 if default or id:
2785 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2785 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2786 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2786 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2787
2787
2788 if num:
2788 if num:
2789 numoutput = ["%d" % p.rev() for p in parents]
2789 numoutput = ["%d" % p.rev() for p in parents]
2790 output.append("%s%s" % ('+'.join(numoutput), dirty))
2790 output.append("%s%s" % ('+'.join(numoutput), dirty))
2791
2791
2792 fn = fm.nested('parents')
2792 fn = fm.nested('parents')
2793 for p in parents:
2793 for p in parents:
2794 fn.startitem()
2794 fn.startitem()
2795 fn.data(rev=p.rev())
2795 fn.data(rev=p.rev())
2796 fn.data(node=p.hex())
2796 fn.data(node=p.hex())
2797 fn.context(ctx=p)
2797 fn.context(ctx=p)
2798 fn.end()
2798 fn.end()
2799 else:
2799 else:
2800 hexoutput = hexfunc(ctx.node())
2800 hexoutput = hexfunc(ctx.node())
2801 if default or id:
2801 if default or id:
2802 output = [hexoutput]
2802 output = [hexoutput]
2803 fm.data(id=hexoutput)
2803 fm.data(id=hexoutput)
2804
2804
2805 if num:
2805 if num:
2806 output.append(pycompat.bytestr(ctx.rev()))
2806 output.append(pycompat.bytestr(ctx.rev()))
2807 taglist = ctx.tags()
2807 taglist = ctx.tags()
2808
2808
2809 if default and not ui.quiet:
2809 if default and not ui.quiet:
2810 b = ctx.branch()
2810 b = ctx.branch()
2811 if b != 'default':
2811 if b != 'default':
2812 output.append("(%s)" % b)
2812 output.append("(%s)" % b)
2813
2813
2814 # multiple tags for a single parent separated by '/'
2814 # multiple tags for a single parent separated by '/'
2815 t = '/'.join(taglist)
2815 t = '/'.join(taglist)
2816 if t:
2816 if t:
2817 output.append(t)
2817 output.append(t)
2818
2818
2819 # multiple bookmarks for a single parent separated by '/'
2819 # multiple bookmarks for a single parent separated by '/'
2820 bm = '/'.join(ctx.bookmarks())
2820 bm = '/'.join(ctx.bookmarks())
2821 if bm:
2821 if bm:
2822 output.append(bm)
2822 output.append(bm)
2823 else:
2823 else:
2824 if branch:
2824 if branch:
2825 output.append(ctx.branch())
2825 output.append(ctx.branch())
2826
2826
2827 if tags:
2827 if tags:
2828 output.extend(taglist)
2828 output.extend(taglist)
2829
2829
2830 if bookmarks:
2830 if bookmarks:
2831 output.extend(ctx.bookmarks())
2831 output.extend(ctx.bookmarks())
2832
2832
2833 fm.data(node=ctx.hex())
2833 fm.data(node=ctx.hex())
2834 fm.data(branch=ctx.branch())
2834 fm.data(branch=ctx.branch())
2835 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2835 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2836 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2836 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2837 fm.context(ctx=ctx)
2837 fm.context(ctx=ctx)
2838
2838
2839 fm.plain("%s\n" % ' '.join(output))
2839 fm.plain("%s\n" % ' '.join(output))
2840 fm.end()
2840 fm.end()
2841
2841
2842 @command('import|patch',
2842 @command('import|patch',
2843 [('p', 'strip', 1,
2843 [('p', 'strip', 1,
2844 _('directory strip option for patch. This has the same '
2844 _('directory strip option for patch. This has the same '
2845 'meaning as the corresponding patch option'), _('NUM')),
2845 'meaning as the corresponding patch option'), _('NUM')),
2846 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2846 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2847 ('e', 'edit', False, _('invoke editor on commit messages')),
2847 ('e', 'edit', False, _('invoke editor on commit messages')),
2848 ('f', 'force', None,
2848 ('f', 'force', None,
2849 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2849 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2850 ('', 'no-commit', None,
2850 ('', 'no-commit', None,
2851 _("don't commit, just update the working directory")),
2851 _("don't commit, just update the working directory")),
2852 ('', 'bypass', None,
2852 ('', 'bypass', None,
2853 _("apply patch without touching the working directory")),
2853 _("apply patch without touching the working directory")),
2854 ('', 'partial', None,
2854 ('', 'partial', None,
2855 _('commit even if some hunks fail')),
2855 _('commit even if some hunks fail')),
2856 ('', 'exact', None,
2856 ('', 'exact', None,
2857 _('abort if patch would apply lossily')),
2857 _('abort if patch would apply lossily')),
2858 ('', 'prefix', '',
2858 ('', 'prefix', '',
2859 _('apply patch to subdirectory'), _('DIR')),
2859 _('apply patch to subdirectory'), _('DIR')),
2860 ('', 'import-branch', None,
2860 ('', 'import-branch', None,
2861 _('use any branch information in patch (implied by --exact)'))] +
2861 _('use any branch information in patch (implied by --exact)'))] +
2862 commitopts + commitopts2 + similarityopts,
2862 commitopts + commitopts2 + similarityopts,
2863 _('[OPTION]... PATCH...'))
2863 _('[OPTION]... PATCH...'))
2864 def import_(ui, repo, patch1=None, *patches, **opts):
2864 def import_(ui, repo, patch1=None, *patches, **opts):
2865 """import an ordered set of patches
2865 """import an ordered set of patches
2866
2866
2867 Import a list of patches and commit them individually (unless
2867 Import a list of patches and commit them individually (unless
2868 --no-commit is specified).
2868 --no-commit is specified).
2869
2869
2870 To read a patch from standard input (stdin), use "-" as the patch
2870 To read a patch from standard input (stdin), use "-" as the patch
2871 name. If a URL is specified, the patch will be downloaded from
2871 name. If a URL is specified, the patch will be downloaded from
2872 there.
2872 there.
2873
2873
2874 Import first applies changes to the working directory (unless
2874 Import first applies changes to the working directory (unless
2875 --bypass is specified), import will abort if there are outstanding
2875 --bypass is specified), import will abort if there are outstanding
2876 changes.
2876 changes.
2877
2877
2878 Use --bypass to apply and commit patches directly to the
2878 Use --bypass to apply and commit patches directly to the
2879 repository, without affecting the working directory. Without
2879 repository, without affecting the working directory. Without
2880 --exact, patches will be applied on top of the working directory
2880 --exact, patches will be applied on top of the working directory
2881 parent revision.
2881 parent revision.
2882
2882
2883 You can import a patch straight from a mail message. Even patches
2883 You can import a patch straight from a mail message. Even patches
2884 as attachments work (to use the body part, it must have type
2884 as attachments work (to use the body part, it must have type
2885 text/plain or text/x-patch). From and Subject headers of email
2885 text/plain or text/x-patch). From and Subject headers of email
2886 message are used as default committer and commit message. All
2886 message are used as default committer and commit message. All
2887 text/plain body parts before first diff are added to the commit
2887 text/plain body parts before first diff are added to the commit
2888 message.
2888 message.
2889
2889
2890 If the imported patch was generated by :hg:`export`, user and
2890 If the imported patch was generated by :hg:`export`, user and
2891 description from patch override values from message headers and
2891 description from patch override values from message headers and
2892 body. Values given on command line with -m/--message and -u/--user
2892 body. Values given on command line with -m/--message and -u/--user
2893 override these.
2893 override these.
2894
2894
2895 If --exact is specified, import will set the working directory to
2895 If --exact is specified, import will set the working directory to
2896 the parent of each patch before applying it, and will abort if the
2896 the parent of each patch before applying it, and will abort if the
2897 resulting changeset has a different ID than the one recorded in
2897 resulting changeset has a different ID than the one recorded in
2898 the patch. This will guard against various ways that portable
2898 the patch. This will guard against various ways that portable
2899 patch formats and mail systems might fail to transfer Mercurial
2899 patch formats and mail systems might fail to transfer Mercurial
2900 data or metadata. See :hg:`bundle` for lossless transmission.
2900 data or metadata. See :hg:`bundle` for lossless transmission.
2901
2901
2902 Use --partial to ensure a changeset will be created from the patch
2902 Use --partial to ensure a changeset will be created from the patch
2903 even if some hunks fail to apply. Hunks that fail to apply will be
2903 even if some hunks fail to apply. Hunks that fail to apply will be
2904 written to a <target-file>.rej file. Conflicts can then be resolved
2904 written to a <target-file>.rej file. Conflicts can then be resolved
2905 by hand before :hg:`commit --amend` is run to update the created
2905 by hand before :hg:`commit --amend` is run to update the created
2906 changeset. This flag exists to let people import patches that
2906 changeset. This flag exists to let people import patches that
2907 partially apply without losing the associated metadata (author,
2907 partially apply without losing the associated metadata (author,
2908 date, description, ...).
2908 date, description, ...).
2909
2909
2910 .. note::
2910 .. note::
2911
2911
2912 When no hunks apply cleanly, :hg:`import --partial` will create
2912 When no hunks apply cleanly, :hg:`import --partial` will create
2913 an empty changeset, importing only the patch metadata.
2913 an empty changeset, importing only the patch metadata.
2914
2914
2915 With -s/--similarity, hg will attempt to discover renames and
2915 With -s/--similarity, hg will attempt to discover renames and
2916 copies in the patch in the same way as :hg:`addremove`.
2916 copies in the patch in the same way as :hg:`addremove`.
2917
2917
2918 It is possible to use external patch programs to perform the patch
2918 It is possible to use external patch programs to perform the patch
2919 by setting the ``ui.patch`` configuration option. For the default
2919 by setting the ``ui.patch`` configuration option. For the default
2920 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2920 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2921 See :hg:`help config` for more information about configuration
2921 See :hg:`help config` for more information about configuration
2922 files and how to use these options.
2922 files and how to use these options.
2923
2923
2924 See :hg:`help dates` for a list of formats valid for -d/--date.
2924 See :hg:`help dates` for a list of formats valid for -d/--date.
2925
2925
2926 .. container:: verbose
2926 .. container:: verbose
2927
2927
2928 Examples:
2928 Examples:
2929
2929
2930 - import a traditional patch from a website and detect renames::
2930 - import a traditional patch from a website and detect renames::
2931
2931
2932 hg import -s 80 http://example.com/bugfix.patch
2932 hg import -s 80 http://example.com/bugfix.patch
2933
2933
2934 - import a changeset from an hgweb server::
2934 - import a changeset from an hgweb server::
2935
2935
2936 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2936 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2937
2937
2938 - import all the patches in an Unix-style mbox::
2938 - import all the patches in an Unix-style mbox::
2939
2939
2940 hg import incoming-patches.mbox
2940 hg import incoming-patches.mbox
2941
2941
2942 - import patches from stdin::
2942 - import patches from stdin::
2943
2943
2944 hg import -
2944 hg import -
2945
2945
2946 - attempt to exactly restore an exported changeset (not always
2946 - attempt to exactly restore an exported changeset (not always
2947 possible)::
2947 possible)::
2948
2948
2949 hg import --exact proposed-fix.patch
2949 hg import --exact proposed-fix.patch
2950
2950
2951 - use an external tool to apply a patch which is too fuzzy for
2951 - use an external tool to apply a patch which is too fuzzy for
2952 the default internal tool.
2952 the default internal tool.
2953
2953
2954 hg import --config ui.patch="patch --merge" fuzzy.patch
2954 hg import --config ui.patch="patch --merge" fuzzy.patch
2955
2955
2956 - change the default fuzzing from 2 to a less strict 7
2956 - change the default fuzzing from 2 to a less strict 7
2957
2957
2958 hg import --config ui.fuzz=7 fuzz.patch
2958 hg import --config ui.fuzz=7 fuzz.patch
2959
2959
2960 Returns 0 on success, 1 on partial success (see --partial).
2960 Returns 0 on success, 1 on partial success (see --partial).
2961 """
2961 """
2962
2962
2963 opts = pycompat.byteskwargs(opts)
2963 opts = pycompat.byteskwargs(opts)
2964 if not patch1:
2964 if not patch1:
2965 raise error.Abort(_('need at least one patch to import'))
2965 raise error.Abort(_('need at least one patch to import'))
2966
2966
2967 patches = (patch1,) + patches
2967 patches = (patch1,) + patches
2968
2968
2969 date = opts.get('date')
2969 date = opts.get('date')
2970 if date:
2970 if date:
2971 opts['date'] = util.parsedate(date)
2971 opts['date'] = util.parsedate(date)
2972
2972
2973 exact = opts.get('exact')
2973 exact = opts.get('exact')
2974 update = not opts.get('bypass')
2974 update = not opts.get('bypass')
2975 if not update and opts.get('no_commit'):
2975 if not update and opts.get('no_commit'):
2976 raise error.Abort(_('cannot use --no-commit with --bypass'))
2976 raise error.Abort(_('cannot use --no-commit with --bypass'))
2977 try:
2977 try:
2978 sim = float(opts.get('similarity') or 0)
2978 sim = float(opts.get('similarity') or 0)
2979 except ValueError:
2979 except ValueError:
2980 raise error.Abort(_('similarity must be a number'))
2980 raise error.Abort(_('similarity must be a number'))
2981 if sim < 0 or sim > 100:
2981 if sim < 0 or sim > 100:
2982 raise error.Abort(_('similarity must be between 0 and 100'))
2982 raise error.Abort(_('similarity must be between 0 and 100'))
2983 if sim and not update:
2983 if sim and not update:
2984 raise error.Abort(_('cannot use --similarity with --bypass'))
2984 raise error.Abort(_('cannot use --similarity with --bypass'))
2985 if exact:
2985 if exact:
2986 if opts.get('edit'):
2986 if opts.get('edit'):
2987 raise error.Abort(_('cannot use --exact with --edit'))
2987 raise error.Abort(_('cannot use --exact with --edit'))
2988 if opts.get('prefix'):
2988 if opts.get('prefix'):
2989 raise error.Abort(_('cannot use --exact with --prefix'))
2989 raise error.Abort(_('cannot use --exact with --prefix'))
2990
2990
2991 base = opts["base"]
2991 base = opts["base"]
2992 wlock = dsguard = lock = tr = None
2992 wlock = dsguard = lock = tr = None
2993 msgs = []
2993 msgs = []
2994 ret = 0
2994 ret = 0
2995
2995
2996
2996
2997 try:
2997 try:
2998 wlock = repo.wlock()
2998 wlock = repo.wlock()
2999
2999
3000 if update:
3000 if update:
3001 cmdutil.checkunfinished(repo)
3001 cmdutil.checkunfinished(repo)
3002 if (exact or not opts.get('force')):
3002 if (exact or not opts.get('force')):
3003 cmdutil.bailifchanged(repo)
3003 cmdutil.bailifchanged(repo)
3004
3004
3005 if not opts.get('no_commit'):
3005 if not opts.get('no_commit'):
3006 lock = repo.lock()
3006 lock = repo.lock()
3007 tr = repo.transaction('import')
3007 tr = repo.transaction('import')
3008 else:
3008 else:
3009 dsguard = dirstateguard.dirstateguard(repo, 'import')
3009 dsguard = dirstateguard.dirstateguard(repo, 'import')
3010 parents = repo[None].parents()
3010 parents = repo[None].parents()
3011 for patchurl in patches:
3011 for patchurl in patches:
3012 if patchurl == '-':
3012 if patchurl == '-':
3013 ui.status(_('applying patch from stdin\n'))
3013 ui.status(_('applying patch from stdin\n'))
3014 patchfile = ui.fin
3014 patchfile = ui.fin
3015 patchurl = 'stdin' # for error message
3015 patchurl = 'stdin' # for error message
3016 else:
3016 else:
3017 patchurl = os.path.join(base, patchurl)
3017 patchurl = os.path.join(base, patchurl)
3018 ui.status(_('applying %s\n') % patchurl)
3018 ui.status(_('applying %s\n') % patchurl)
3019 patchfile = hg.openpath(ui, patchurl)
3019 patchfile = hg.openpath(ui, patchurl)
3020
3020
3021 haspatch = False
3021 haspatch = False
3022 for hunk in patch.split(patchfile):
3022 for hunk in patch.split(patchfile):
3023 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3023 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3024 parents, opts,
3024 parents, opts,
3025 msgs, hg.clean)
3025 msgs, hg.clean)
3026 if msg:
3026 if msg:
3027 haspatch = True
3027 haspatch = True
3028 ui.note(msg + '\n')
3028 ui.note(msg + '\n')
3029 if update or exact:
3029 if update or exact:
3030 parents = repo[None].parents()
3030 parents = repo[None].parents()
3031 else:
3031 else:
3032 parents = [repo[node]]
3032 parents = [repo[node]]
3033 if rej:
3033 if rej:
3034 ui.write_err(_("patch applied partially\n"))
3034 ui.write_err(_("patch applied partially\n"))
3035 ui.write_err(_("(fix the .rej files and run "
3035 ui.write_err(_("(fix the .rej files and run "
3036 "`hg commit --amend`)\n"))
3036 "`hg commit --amend`)\n"))
3037 ret = 1
3037 ret = 1
3038 break
3038 break
3039
3039
3040 if not haspatch:
3040 if not haspatch:
3041 raise error.Abort(_('%s: no diffs found') % patchurl)
3041 raise error.Abort(_('%s: no diffs found') % patchurl)
3042
3042
3043 if tr:
3043 if tr:
3044 tr.close()
3044 tr.close()
3045 if msgs:
3045 if msgs:
3046 repo.savecommitmessage('\n* * *\n'.join(msgs))
3046 repo.savecommitmessage('\n* * *\n'.join(msgs))
3047 if dsguard:
3047 if dsguard:
3048 dsguard.close()
3048 dsguard.close()
3049 return ret
3049 return ret
3050 finally:
3050 finally:
3051 if tr:
3051 if tr:
3052 tr.release()
3052 tr.release()
3053 release(lock, dsguard, wlock)
3053 release(lock, dsguard, wlock)
3054
3054
3055 @command('incoming|in',
3055 @command('incoming|in',
3056 [('f', 'force', None,
3056 [('f', 'force', None,
3057 _('run even if remote repository is unrelated')),
3057 _('run even if remote repository is unrelated')),
3058 ('n', 'newest-first', None, _('show newest record first')),
3058 ('n', 'newest-first', None, _('show newest record first')),
3059 ('', 'bundle', '',
3059 ('', 'bundle', '',
3060 _('file to store the bundles into'), _('FILE')),
3060 _('file to store the bundles into'), _('FILE')),
3061 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3061 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3062 ('B', 'bookmarks', False, _("compare bookmarks")),
3062 ('B', 'bookmarks', False, _("compare bookmarks")),
3063 ('b', 'branch', [],
3063 ('b', 'branch', [],
3064 _('a specific branch you would like to pull'), _('BRANCH')),
3064 _('a specific branch you would like to pull'), _('BRANCH')),
3065 ] + logopts + remoteopts + subrepoopts,
3065 ] + logopts + remoteopts + subrepoopts,
3066 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3066 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3067 def incoming(ui, repo, source="default", **opts):
3067 def incoming(ui, repo, source="default", **opts):
3068 """show new changesets found in source
3068 """show new changesets found in source
3069
3069
3070 Show new changesets found in the specified path/URL or the default
3070 Show new changesets found in the specified path/URL or the default
3071 pull location. These are the changesets that would have been pulled
3071 pull location. These are the changesets that would have been pulled
3072 if a pull at the time you issued this command.
3072 if a pull at the time you issued this command.
3073
3073
3074 See pull for valid source format details.
3074 See pull for valid source format details.
3075
3075
3076 .. container:: verbose
3076 .. container:: verbose
3077
3077
3078 With -B/--bookmarks, the result of bookmark comparison between
3078 With -B/--bookmarks, the result of bookmark comparison between
3079 local and remote repositories is displayed. With -v/--verbose,
3079 local and remote repositories is displayed. With -v/--verbose,
3080 status is also displayed for each bookmark like below::
3080 status is also displayed for each bookmark like below::
3081
3081
3082 BM1 01234567890a added
3082 BM1 01234567890a added
3083 BM2 1234567890ab advanced
3083 BM2 1234567890ab advanced
3084 BM3 234567890abc diverged
3084 BM3 234567890abc diverged
3085 BM4 34567890abcd changed
3085 BM4 34567890abcd changed
3086
3086
3087 The action taken locally when pulling depends on the
3087 The action taken locally when pulling depends on the
3088 status of each bookmark:
3088 status of each bookmark:
3089
3089
3090 :``added``: pull will create it
3090 :``added``: pull will create it
3091 :``advanced``: pull will update it
3091 :``advanced``: pull will update it
3092 :``diverged``: pull will create a divergent bookmark
3092 :``diverged``: pull will create a divergent bookmark
3093 :``changed``: result depends on remote changesets
3093 :``changed``: result depends on remote changesets
3094
3094
3095 From the point of view of pulling behavior, bookmark
3095 From the point of view of pulling behavior, bookmark
3096 existing only in the remote repository are treated as ``added``,
3096 existing only in the remote repository are treated as ``added``,
3097 even if it is in fact locally deleted.
3097 even if it is in fact locally deleted.
3098
3098
3099 .. container:: verbose
3099 .. container:: verbose
3100
3100
3101 For remote repository, using --bundle avoids downloading the
3101 For remote repository, using --bundle avoids downloading the
3102 changesets twice if the incoming is followed by a pull.
3102 changesets twice if the incoming is followed by a pull.
3103
3103
3104 Examples:
3104 Examples:
3105
3105
3106 - show incoming changes with patches and full description::
3106 - show incoming changes with patches and full description::
3107
3107
3108 hg incoming -vp
3108 hg incoming -vp
3109
3109
3110 - show incoming changes excluding merges, store a bundle::
3110 - show incoming changes excluding merges, store a bundle::
3111
3111
3112 hg in -vpM --bundle incoming.hg
3112 hg in -vpM --bundle incoming.hg
3113 hg pull incoming.hg
3113 hg pull incoming.hg
3114
3114
3115 - briefly list changes inside a bundle::
3115 - briefly list changes inside a bundle::
3116
3116
3117 hg in changes.hg -T "{desc|firstline}\\n"
3117 hg in changes.hg -T "{desc|firstline}\\n"
3118
3118
3119 Returns 0 if there are incoming changes, 1 otherwise.
3119 Returns 0 if there are incoming changes, 1 otherwise.
3120 """
3120 """
3121 opts = pycompat.byteskwargs(opts)
3121 opts = pycompat.byteskwargs(opts)
3122 if opts.get('graph'):
3122 if opts.get('graph'):
3123 cmdutil.checkunsupportedgraphflags([], opts)
3123 cmdutil.checkunsupportedgraphflags([], opts)
3124 def display(other, chlist, displayer):
3124 def display(other, chlist, displayer):
3125 revdag = cmdutil.graphrevs(other, chlist, opts)
3125 revdag = cmdutil.graphrevs(other, chlist, opts)
3126 cmdutil.displaygraph(ui, repo, revdag, displayer,
3126 cmdutil.displaygraph(ui, repo, revdag, displayer,
3127 graphmod.asciiedges)
3127 graphmod.asciiedges)
3128
3128
3129 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3129 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3130 return 0
3130 return 0
3131
3131
3132 if opts.get('bundle') and opts.get('subrepos'):
3132 if opts.get('bundle') and opts.get('subrepos'):
3133 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3133 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3134
3134
3135 if opts.get('bookmarks'):
3135 if opts.get('bookmarks'):
3136 source, branches = hg.parseurl(ui.expandpath(source),
3136 source, branches = hg.parseurl(ui.expandpath(source),
3137 opts.get('branch'))
3137 opts.get('branch'))
3138 other = hg.peer(repo, opts, source)
3138 other = hg.peer(repo, opts, source)
3139 if 'bookmarks' not in other.listkeys('namespaces'):
3139 if 'bookmarks' not in other.listkeys('namespaces'):
3140 ui.warn(_("remote doesn't support bookmarks\n"))
3140 ui.warn(_("remote doesn't support bookmarks\n"))
3141 return 0
3141 return 0
3142 ui.pager('incoming')
3142 ui.pager('incoming')
3143 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3143 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3144 return bookmarks.incoming(ui, repo, other)
3144 return bookmarks.incoming(ui, repo, other)
3145
3145
3146 repo._subtoppath = ui.expandpath(source)
3146 repo._subtoppath = ui.expandpath(source)
3147 try:
3147 try:
3148 return hg.incoming(ui, repo, source, opts)
3148 return hg.incoming(ui, repo, source, opts)
3149 finally:
3149 finally:
3150 del repo._subtoppath
3150 del repo._subtoppath
3151
3151
3152
3152
3153 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3153 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3154 norepo=True)
3154 norepo=True)
3155 def init(ui, dest=".", **opts):
3155 def init(ui, dest=".", **opts):
3156 """create a new repository in the given directory
3156 """create a new repository in the given directory
3157
3157
3158 Initialize a new repository in the given directory. If the given
3158 Initialize a new repository in the given directory. If the given
3159 directory does not exist, it will be created.
3159 directory does not exist, it will be created.
3160
3160
3161 If no directory is given, the current directory is used.
3161 If no directory is given, the current directory is used.
3162
3162
3163 It is possible to specify an ``ssh://`` URL as the destination.
3163 It is possible to specify an ``ssh://`` URL as the destination.
3164 See :hg:`help urls` for more information.
3164 See :hg:`help urls` for more information.
3165
3165
3166 Returns 0 on success.
3166 Returns 0 on success.
3167 """
3167 """
3168 opts = pycompat.byteskwargs(opts)
3168 opts = pycompat.byteskwargs(opts)
3169 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3169 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3170
3170
3171 @command('locate',
3171 @command('locate',
3172 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3172 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3173 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3173 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3174 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3174 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3175 ] + walkopts,
3175 ] + walkopts,
3176 _('[OPTION]... [PATTERN]...'))
3176 _('[OPTION]... [PATTERN]...'))
3177 def locate(ui, repo, *pats, **opts):
3177 def locate(ui, repo, *pats, **opts):
3178 """locate files matching specific patterns (DEPRECATED)
3178 """locate files matching specific patterns (DEPRECATED)
3179
3179
3180 Print files under Mercurial control in the working directory whose
3180 Print files under Mercurial control in the working directory whose
3181 names match the given patterns.
3181 names match the given patterns.
3182
3182
3183 By default, this command searches all directories in the working
3183 By default, this command searches all directories in the working
3184 directory. To search just the current directory and its
3184 directory. To search just the current directory and its
3185 subdirectories, use "--include .".
3185 subdirectories, use "--include .".
3186
3186
3187 If no patterns are given to match, this command prints the names
3187 If no patterns are given to match, this command prints the names
3188 of all files under Mercurial control in the working directory.
3188 of all files under Mercurial control in the working directory.
3189
3189
3190 If you want to feed the output of this command into the "xargs"
3190 If you want to feed the output of this command into the "xargs"
3191 command, use the -0 option to both this command and "xargs". This
3191 command, use the -0 option to both this command and "xargs". This
3192 will avoid the problem of "xargs" treating single filenames that
3192 will avoid the problem of "xargs" treating single filenames that
3193 contain whitespace as multiple filenames.
3193 contain whitespace as multiple filenames.
3194
3194
3195 See :hg:`help files` for a more versatile command.
3195 See :hg:`help files` for a more versatile command.
3196
3196
3197 Returns 0 if a match is found, 1 otherwise.
3197 Returns 0 if a match is found, 1 otherwise.
3198 """
3198 """
3199 opts = pycompat.byteskwargs(opts)
3199 opts = pycompat.byteskwargs(opts)
3200 if opts.get('print0'):
3200 if opts.get('print0'):
3201 end = '\0'
3201 end = '\0'
3202 else:
3202 else:
3203 end = '\n'
3203 end = '\n'
3204 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3204 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3205
3205
3206 ret = 1
3206 ret = 1
3207 ctx = repo[rev]
3207 ctx = repo[rev]
3208 m = scmutil.match(ctx, pats, opts, default='relglob',
3208 m = scmutil.match(ctx, pats, opts, default='relglob',
3209 badfn=lambda x, y: False)
3209 badfn=lambda x, y: False)
3210
3210
3211 ui.pager('locate')
3211 ui.pager('locate')
3212 for abs in ctx.matches(m):
3212 for abs in ctx.matches(m):
3213 if opts.get('fullpath'):
3213 if opts.get('fullpath'):
3214 ui.write(repo.wjoin(abs), end)
3214 ui.write(repo.wjoin(abs), end)
3215 else:
3215 else:
3216 ui.write(((pats and m.rel(abs)) or abs), end)
3216 ui.write(((pats and m.rel(abs)) or abs), end)
3217 ret = 0
3217 ret = 0
3218
3218
3219 return ret
3219 return ret
3220
3220
3221 @command('^log|history',
3221 @command('^log|history',
3222 [('f', 'follow', None,
3222 [('f', 'follow', None,
3223 _('follow changeset history, or file history across copies and renames')),
3223 _('follow changeset history, or file history across copies and renames')),
3224 ('', 'follow-first', None,
3224 ('', 'follow-first', None,
3225 _('only follow the first parent of merge changesets (DEPRECATED)')),
3225 _('only follow the first parent of merge changesets (DEPRECATED)')),
3226 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3226 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3227 ('C', 'copies', None, _('show copied files')),
3227 ('C', 'copies', None, _('show copied files')),
3228 ('k', 'keyword', [],
3228 ('k', 'keyword', [],
3229 _('do case-insensitive search for a given text'), _('TEXT')),
3229 _('do case-insensitive search for a given text'), _('TEXT')),
3230 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3230 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3231 ('', 'removed', None, _('include revisions where files were removed')),
3231 ('', 'removed', None, _('include revisions where files were removed')),
3232 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3232 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3233 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3233 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3234 ('', 'only-branch', [],
3234 ('', 'only-branch', [],
3235 _('show only changesets within the given named branch (DEPRECATED)'),
3235 _('show only changesets within the given named branch (DEPRECATED)'),
3236 _('BRANCH')),
3236 _('BRANCH')),
3237 ('b', 'branch', [],
3237 ('b', 'branch', [],
3238 _('show changesets within the given named branch'), _('BRANCH')),
3238 _('show changesets within the given named branch'), _('BRANCH')),
3239 ('P', 'prune', [],
3239 ('P', 'prune', [],
3240 _('do not display revision or any of its ancestors'), _('REV')),
3240 _('do not display revision or any of its ancestors'), _('REV')),
3241 ] + logopts + walkopts,
3241 ] + logopts + walkopts,
3242 _('[OPTION]... [FILE]'),
3242 _('[OPTION]... [FILE]'),
3243 inferrepo=True)
3243 inferrepo=True)
3244 def log(ui, repo, *pats, **opts):
3244 def log(ui, repo, *pats, **opts):
3245 """show revision history of entire repository or files
3245 """show revision history of entire repository or files
3246
3246
3247 Print the revision history of the specified files or the entire
3247 Print the revision history of the specified files or the entire
3248 project.
3248 project.
3249
3249
3250 If no revision range is specified, the default is ``tip:0`` unless
3250 If no revision range is specified, the default is ``tip:0`` unless
3251 --follow is set, in which case the working directory parent is
3251 --follow is set, in which case the working directory parent is
3252 used as the starting revision.
3252 used as the starting revision.
3253
3253
3254 File history is shown without following rename or copy history of
3254 File history is shown without following rename or copy history of
3255 files. Use -f/--follow with a filename to follow history across
3255 files. Use -f/--follow with a filename to follow history across
3256 renames and copies. --follow without a filename will only show
3256 renames and copies. --follow without a filename will only show
3257 ancestors or descendants of the starting revision.
3257 ancestors or descendants of the starting revision.
3258
3258
3259 By default this command prints revision number and changeset id,
3259 By default this command prints revision number and changeset id,
3260 tags, non-trivial parents, user, date and time, and a summary for
3260 tags, non-trivial parents, user, date and time, and a summary for
3261 each commit. When the -v/--verbose switch is used, the list of
3261 each commit. When the -v/--verbose switch is used, the list of
3262 changed files and full commit message are shown.
3262 changed files and full commit message are shown.
3263
3263
3264 With --graph the revisions are shown as an ASCII art DAG with the most
3264 With --graph the revisions are shown as an ASCII art DAG with the most
3265 recent changeset at the top.
3265 recent changeset at the top.
3266 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3266 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3267 and '+' represents a fork where the changeset from the lines below is a
3267 and '+' represents a fork where the changeset from the lines below is a
3268 parent of the 'o' merge on the same line.
3268 parent of the 'o' merge on the same line.
3269 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3269 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3270 of a '|' indicates one or more revisions in a path are omitted.
3270 of a '|' indicates one or more revisions in a path are omitted.
3271
3271
3272 .. note::
3272 .. note::
3273
3273
3274 :hg:`log --patch` may generate unexpected diff output for merge
3274 :hg:`log --patch` may generate unexpected diff output for merge
3275 changesets, as it will only compare the merge changeset against
3275 changesets, as it will only compare the merge changeset against
3276 its first parent. Also, only files different from BOTH parents
3276 its first parent. Also, only files different from BOTH parents
3277 will appear in files:.
3277 will appear in files:.
3278
3278
3279 .. note::
3279 .. note::
3280
3280
3281 For performance reasons, :hg:`log FILE` may omit duplicate changes
3281 For performance reasons, :hg:`log FILE` may omit duplicate changes
3282 made on branches and will not show removals or mode changes. To
3282 made on branches and will not show removals or mode changes. To
3283 see all such changes, use the --removed switch.
3283 see all such changes, use the --removed switch.
3284
3284
3285 .. container:: verbose
3285 .. container:: verbose
3286
3286
3287 Some examples:
3287 Some examples:
3288
3288
3289 - changesets with full descriptions and file lists::
3289 - changesets with full descriptions and file lists::
3290
3290
3291 hg log -v
3291 hg log -v
3292
3292
3293 - changesets ancestral to the working directory::
3293 - changesets ancestral to the working directory::
3294
3294
3295 hg log -f
3295 hg log -f
3296
3296
3297 - last 10 commits on the current branch::
3297 - last 10 commits on the current branch::
3298
3298
3299 hg log -l 10 -b .
3299 hg log -l 10 -b .
3300
3300
3301 - changesets showing all modifications of a file, including removals::
3301 - changesets showing all modifications of a file, including removals::
3302
3302
3303 hg log --removed file.c
3303 hg log --removed file.c
3304
3304
3305 - all changesets that touch a directory, with diffs, excluding merges::
3305 - all changesets that touch a directory, with diffs, excluding merges::
3306
3306
3307 hg log -Mp lib/
3307 hg log -Mp lib/
3308
3308
3309 - all revision numbers that match a keyword::
3309 - all revision numbers that match a keyword::
3310
3310
3311 hg log -k bug --template "{rev}\\n"
3311 hg log -k bug --template "{rev}\\n"
3312
3312
3313 - the full hash identifier of the working directory parent::
3313 - the full hash identifier of the working directory parent::
3314
3314
3315 hg log -r . --template "{node}\\n"
3315 hg log -r . --template "{node}\\n"
3316
3316
3317 - list available log templates::
3317 - list available log templates::
3318
3318
3319 hg log -T list
3319 hg log -T list
3320
3320
3321 - check if a given changeset is included in a tagged release::
3321 - check if a given changeset is included in a tagged release::
3322
3322
3323 hg log -r "a21ccf and ancestor(1.9)"
3323 hg log -r "a21ccf and ancestor(1.9)"
3324
3324
3325 - find all changesets by some user in a date range::
3325 - find all changesets by some user in a date range::
3326
3326
3327 hg log -k alice -d "may 2008 to jul 2008"
3327 hg log -k alice -d "may 2008 to jul 2008"
3328
3328
3329 - summary of all changesets after the last tag::
3329 - summary of all changesets after the last tag::
3330
3330
3331 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3331 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3332
3332
3333 See :hg:`help dates` for a list of formats valid for -d/--date.
3333 See :hg:`help dates` for a list of formats valid for -d/--date.
3334
3334
3335 See :hg:`help revisions` for more about specifying and ordering
3335 See :hg:`help revisions` for more about specifying and ordering
3336 revisions.
3336 revisions.
3337
3337
3338 See :hg:`help templates` for more about pre-packaged styles and
3338 See :hg:`help templates` for more about pre-packaged styles and
3339 specifying custom templates.
3339 specifying custom templates.
3340
3340
3341 Returns 0 on success.
3341 Returns 0 on success.
3342
3342
3343 """
3343 """
3344 opts = pycompat.byteskwargs(opts)
3344 opts = pycompat.byteskwargs(opts)
3345 if opts.get('follow') and opts.get('rev'):
3345 if opts.get('follow') and opts.get('rev'):
3346 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3346 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3347 del opts['follow']
3347 del opts['follow']
3348
3348
3349 if opts.get('graph'):
3349 if opts.get('graph'):
3350 return cmdutil.graphlog(ui, repo, pats, opts)
3350 return cmdutil.graphlog(ui, repo, pats, opts)
3351
3351
3352 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3352 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3353 limit = cmdutil.loglimit(opts)
3353 limit = cmdutil.loglimit(opts)
3354 count = 0
3354 count = 0
3355
3355
3356 getrenamed = None
3356 getrenamed = None
3357 if opts.get('copies'):
3357 if opts.get('copies'):
3358 endrev = None
3358 endrev = None
3359 if opts.get('rev'):
3359 if opts.get('rev'):
3360 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3360 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3361 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3361 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3362
3362
3363 ui.pager('log')
3363 ui.pager('log')
3364 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3364 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3365 for rev in revs:
3365 for rev in revs:
3366 if count == limit:
3366 if count == limit:
3367 break
3367 break
3368 ctx = repo[rev]
3368 ctx = repo[rev]
3369 copies = None
3369 copies = None
3370 if getrenamed is not None and rev:
3370 if getrenamed is not None and rev:
3371 copies = []
3371 copies = []
3372 for fn in ctx.files():
3372 for fn in ctx.files():
3373 rename = getrenamed(fn, rev)
3373 rename = getrenamed(fn, rev)
3374 if rename:
3374 if rename:
3375 copies.append((fn, rename[0]))
3375 copies.append((fn, rename[0]))
3376 if filematcher:
3376 if filematcher:
3377 revmatchfn = filematcher(ctx.rev())
3377 revmatchfn = filematcher(ctx.rev())
3378 else:
3378 else:
3379 revmatchfn = None
3379 revmatchfn = None
3380 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3380 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3381 if displayer.flush(ctx):
3381 if displayer.flush(ctx):
3382 count += 1
3382 count += 1
3383
3383
3384 displayer.close()
3384 displayer.close()
3385
3385
3386 @command('manifest',
3386 @command('manifest',
3387 [('r', 'rev', '', _('revision to display'), _('REV')),
3387 [('r', 'rev', '', _('revision to display'), _('REV')),
3388 ('', 'all', False, _("list files from all revisions"))]
3388 ('', 'all', False, _("list files from all revisions"))]
3389 + formatteropts,
3389 + formatteropts,
3390 _('[-r REV]'))
3390 _('[-r REV]'))
3391 def manifest(ui, repo, node=None, rev=None, **opts):
3391 def manifest(ui, repo, node=None, rev=None, **opts):
3392 """output the current or given revision of the project manifest
3392 """output the current or given revision of the project manifest
3393
3393
3394 Print a list of version controlled files for the given revision.
3394 Print a list of version controlled files for the given revision.
3395 If no revision is given, the first parent of the working directory
3395 If no revision is given, the first parent of the working directory
3396 is used, or the null revision if no revision is checked out.
3396 is used, or the null revision if no revision is checked out.
3397
3397
3398 With -v, print file permissions, symlink and executable bits.
3398 With -v, print file permissions, symlink and executable bits.
3399 With --debug, print file revision hashes.
3399 With --debug, print file revision hashes.
3400
3400
3401 If option --all is specified, the list of all files from all revisions
3401 If option --all is specified, the list of all files from all revisions
3402 is printed. This includes deleted and renamed files.
3402 is printed. This includes deleted and renamed files.
3403
3403
3404 Returns 0 on success.
3404 Returns 0 on success.
3405 """
3405 """
3406 opts = pycompat.byteskwargs(opts)
3406 opts = pycompat.byteskwargs(opts)
3407 fm = ui.formatter('manifest', opts)
3407 fm = ui.formatter('manifest', opts)
3408
3408
3409 if opts.get('all'):
3409 if opts.get('all'):
3410 if rev or node:
3410 if rev or node:
3411 raise error.Abort(_("can't specify a revision with --all"))
3411 raise error.Abort(_("can't specify a revision with --all"))
3412
3412
3413 res = []
3413 res = []
3414 prefix = "data/"
3414 prefix = "data/"
3415 suffix = ".i"
3415 suffix = ".i"
3416 plen = len(prefix)
3416 plen = len(prefix)
3417 slen = len(suffix)
3417 slen = len(suffix)
3418 with repo.lock():
3418 with repo.lock():
3419 for fn, b, size in repo.store.datafiles():
3419 for fn, b, size in repo.store.datafiles():
3420 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3420 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3421 res.append(fn[plen:-slen])
3421 res.append(fn[plen:-slen])
3422 ui.pager('manifest')
3422 ui.pager('manifest')
3423 for f in res:
3423 for f in res:
3424 fm.startitem()
3424 fm.startitem()
3425 fm.write("path", '%s\n', f)
3425 fm.write("path", '%s\n', f)
3426 fm.end()
3426 fm.end()
3427 return
3427 return
3428
3428
3429 if rev and node:
3429 if rev and node:
3430 raise error.Abort(_("please specify just one revision"))
3430 raise error.Abort(_("please specify just one revision"))
3431
3431
3432 if not node:
3432 if not node:
3433 node = rev
3433 node = rev
3434
3434
3435 char = {'l': '@', 'x': '*', '': ''}
3435 char = {'l': '@', 'x': '*', '': ''}
3436 mode = {'l': '644', 'x': '755', '': '644'}
3436 mode = {'l': '644', 'x': '755', '': '644'}
3437 ctx = scmutil.revsingle(repo, node)
3437 ctx = scmutil.revsingle(repo, node)
3438 mf = ctx.manifest()
3438 mf = ctx.manifest()
3439 ui.pager('manifest')
3439 ui.pager('manifest')
3440 for f in ctx:
3440 for f in ctx:
3441 fm.startitem()
3441 fm.startitem()
3442 fl = ctx[f].flags()
3442 fl = ctx[f].flags()
3443 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3443 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3444 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3444 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3445 fm.write('path', '%s\n', f)
3445 fm.write('path', '%s\n', f)
3446 fm.end()
3446 fm.end()
3447
3447
3448 @command('^merge',
3448 @command('^merge',
3449 [('f', 'force', None,
3449 [('f', 'force', None,
3450 _('force a merge including outstanding changes (DEPRECATED)')),
3450 _('force a merge including outstanding changes (DEPRECATED)')),
3451 ('r', 'rev', '', _('revision to merge'), _('REV')),
3451 ('r', 'rev', '', _('revision to merge'), _('REV')),
3452 ('P', 'preview', None,
3452 ('P', 'preview', None,
3453 _('review revisions to merge (no merge is performed)'))
3453 _('review revisions to merge (no merge is performed)'))
3454 ] + mergetoolopts,
3454 ] + mergetoolopts,
3455 _('[-P] [[-r] REV]'))
3455 _('[-P] [[-r] REV]'))
3456 def merge(ui, repo, node=None, **opts):
3456 def merge(ui, repo, node=None, **opts):
3457 """merge another revision into working directory
3457 """merge another revision into working directory
3458
3458
3459 The current working directory is updated with all changes made in
3459 The current working directory is updated with all changes made in
3460 the requested revision since the last common predecessor revision.
3460 the requested revision since the last common predecessor revision.
3461
3461
3462 Files that changed between either parent are marked as changed for
3462 Files that changed between either parent are marked as changed for
3463 the next commit and a commit must be performed before any further
3463 the next commit and a commit must be performed before any further
3464 updates to the repository are allowed. The next commit will have
3464 updates to the repository are allowed. The next commit will have
3465 two parents.
3465 two parents.
3466
3466
3467 ``--tool`` can be used to specify the merge tool used for file
3467 ``--tool`` can be used to specify the merge tool used for file
3468 merges. It overrides the HGMERGE environment variable and your
3468 merges. It overrides the HGMERGE environment variable and your
3469 configuration files. See :hg:`help merge-tools` for options.
3469 configuration files. See :hg:`help merge-tools` for options.
3470
3470
3471 If no revision is specified, the working directory's parent is a
3471 If no revision is specified, the working directory's parent is a
3472 head revision, and the current branch contains exactly one other
3472 head revision, and the current branch contains exactly one other
3473 head, the other head is merged with by default. Otherwise, an
3473 head, the other head is merged with by default. Otherwise, an
3474 explicit revision with which to merge with must be provided.
3474 explicit revision with which to merge with must be provided.
3475
3475
3476 See :hg:`help resolve` for information on handling file conflicts.
3476 See :hg:`help resolve` for information on handling file conflicts.
3477
3477
3478 To undo an uncommitted merge, use :hg:`update --clean .` which
3478 To undo an uncommitted merge, use :hg:`update --clean .` which
3479 will check out a clean copy of the original merge parent, losing
3479 will check out a clean copy of the original merge parent, losing
3480 all changes.
3480 all changes.
3481
3481
3482 Returns 0 on success, 1 if there are unresolved files.
3482 Returns 0 on success, 1 if there are unresolved files.
3483 """
3483 """
3484
3484
3485 opts = pycompat.byteskwargs(opts)
3485 opts = pycompat.byteskwargs(opts)
3486 if opts.get('rev') and node:
3486 if opts.get('rev') and node:
3487 raise error.Abort(_("please specify just one revision"))
3487 raise error.Abort(_("please specify just one revision"))
3488 if not node:
3488 if not node:
3489 node = opts.get('rev')
3489 node = opts.get('rev')
3490
3490
3491 if node:
3491 if node:
3492 node = scmutil.revsingle(repo, node).node()
3492 node = scmutil.revsingle(repo, node).node()
3493
3493
3494 if not node:
3494 if not node:
3495 node = repo[destutil.destmerge(repo)].node()
3495 node = repo[destutil.destmerge(repo)].node()
3496
3496
3497 if opts.get('preview'):
3497 if opts.get('preview'):
3498 # find nodes that are ancestors of p2 but not of p1
3498 # find nodes that are ancestors of p2 but not of p1
3499 p1 = repo.lookup('.')
3499 p1 = repo.lookup('.')
3500 p2 = repo.lookup(node)
3500 p2 = repo.lookup(node)
3501 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3501 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3502
3502
3503 displayer = cmdutil.show_changeset(ui, repo, opts)
3503 displayer = cmdutil.show_changeset(ui, repo, opts)
3504 for node in nodes:
3504 for node in nodes:
3505 displayer.show(repo[node])
3505 displayer.show(repo[node])
3506 displayer.close()
3506 displayer.close()
3507 return 0
3507 return 0
3508
3508
3509 try:
3509 try:
3510 # ui.forcemerge is an internal variable, do not document
3510 # ui.forcemerge is an internal variable, do not document
3511 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3511 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3512 force = opts.get('force')
3512 force = opts.get('force')
3513 labels = ['working copy', 'merge rev']
3513 labels = ['working copy', 'merge rev']
3514 return hg.merge(repo, node, force=force, mergeforce=force,
3514 return hg.merge(repo, node, force=force, mergeforce=force,
3515 labels=labels)
3515 labels=labels)
3516 finally:
3516 finally:
3517 ui.setconfig('ui', 'forcemerge', '', 'merge')
3517 ui.setconfig('ui', 'forcemerge', '', 'merge')
3518
3518
3519 @command('outgoing|out',
3519 @command('outgoing|out',
3520 [('f', 'force', None, _('run even when the destination is unrelated')),
3520 [('f', 'force', None, _('run even when the destination is unrelated')),
3521 ('r', 'rev', [],
3521 ('r', 'rev', [],
3522 _('a changeset intended to be included in the destination'), _('REV')),
3522 _('a changeset intended to be included in the destination'), _('REV')),
3523 ('n', 'newest-first', None, _('show newest record first')),
3523 ('n', 'newest-first', None, _('show newest record first')),
3524 ('B', 'bookmarks', False, _('compare bookmarks')),
3524 ('B', 'bookmarks', False, _('compare bookmarks')),
3525 ('b', 'branch', [], _('a specific branch you would like to push'),
3525 ('b', 'branch', [], _('a specific branch you would like to push'),
3526 _('BRANCH')),
3526 _('BRANCH')),
3527 ] + logopts + remoteopts + subrepoopts,
3527 ] + logopts + remoteopts + subrepoopts,
3528 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3528 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3529 def outgoing(ui, repo, dest=None, **opts):
3529 def outgoing(ui, repo, dest=None, **opts):
3530 """show changesets not found in the destination
3530 """show changesets not found in the destination
3531
3531
3532 Show changesets not found in the specified destination repository
3532 Show changesets not found in the specified destination repository
3533 or the default push location. These are the changesets that would
3533 or the default push location. These are the changesets that would
3534 be pushed if a push was requested.
3534 be pushed if a push was requested.
3535
3535
3536 See pull for details of valid destination formats.
3536 See pull for details of valid destination formats.
3537
3537
3538 .. container:: verbose
3538 .. container:: verbose
3539
3539
3540 With -B/--bookmarks, the result of bookmark comparison between
3540 With -B/--bookmarks, the result of bookmark comparison between
3541 local and remote repositories is displayed. With -v/--verbose,
3541 local and remote repositories is displayed. With -v/--verbose,
3542 status is also displayed for each bookmark like below::
3542 status is also displayed for each bookmark like below::
3543
3543
3544 BM1 01234567890a added
3544 BM1 01234567890a added
3545 BM2 deleted
3545 BM2 deleted
3546 BM3 234567890abc advanced
3546 BM3 234567890abc advanced
3547 BM4 34567890abcd diverged
3547 BM4 34567890abcd diverged
3548 BM5 4567890abcde changed
3548 BM5 4567890abcde changed
3549
3549
3550 The action taken when pushing depends on the
3550 The action taken when pushing depends on the
3551 status of each bookmark:
3551 status of each bookmark:
3552
3552
3553 :``added``: push with ``-B`` will create it
3553 :``added``: push with ``-B`` will create it
3554 :``deleted``: push with ``-B`` will delete it
3554 :``deleted``: push with ``-B`` will delete it
3555 :``advanced``: push will update it
3555 :``advanced``: push will update it
3556 :``diverged``: push with ``-B`` will update it
3556 :``diverged``: push with ``-B`` will update it
3557 :``changed``: push with ``-B`` will update it
3557 :``changed``: push with ``-B`` will update it
3558
3558
3559 From the point of view of pushing behavior, bookmarks
3559 From the point of view of pushing behavior, bookmarks
3560 existing only in the remote repository are treated as
3560 existing only in the remote repository are treated as
3561 ``deleted``, even if it is in fact added remotely.
3561 ``deleted``, even if it is in fact added remotely.
3562
3562
3563 Returns 0 if there are outgoing changes, 1 otherwise.
3563 Returns 0 if there are outgoing changes, 1 otherwise.
3564 """
3564 """
3565 opts = pycompat.byteskwargs(opts)
3565 opts = pycompat.byteskwargs(opts)
3566 if opts.get('graph'):
3566 if opts.get('graph'):
3567 cmdutil.checkunsupportedgraphflags([], opts)
3567 cmdutil.checkunsupportedgraphflags([], opts)
3568 o, other = hg._outgoing(ui, repo, dest, opts)
3568 o, other = hg._outgoing(ui, repo, dest, opts)
3569 if not o:
3569 if not o:
3570 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3570 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3571 return
3571 return
3572
3572
3573 revdag = cmdutil.graphrevs(repo, o, opts)
3573 revdag = cmdutil.graphrevs(repo, o, opts)
3574 ui.pager('outgoing')
3574 ui.pager('outgoing')
3575 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3575 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3576 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3576 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3577 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3577 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3578 return 0
3578 return 0
3579
3579
3580 if opts.get('bookmarks'):
3580 if opts.get('bookmarks'):
3581 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3581 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3582 dest, branches = hg.parseurl(dest, opts.get('branch'))
3582 dest, branches = hg.parseurl(dest, opts.get('branch'))
3583 other = hg.peer(repo, opts, dest)
3583 other = hg.peer(repo, opts, dest)
3584 if 'bookmarks' not in other.listkeys('namespaces'):
3584 if 'bookmarks' not in other.listkeys('namespaces'):
3585 ui.warn(_("remote doesn't support bookmarks\n"))
3585 ui.warn(_("remote doesn't support bookmarks\n"))
3586 return 0
3586 return 0
3587 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3587 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3588 ui.pager('outgoing')
3588 ui.pager('outgoing')
3589 return bookmarks.outgoing(ui, repo, other)
3589 return bookmarks.outgoing(ui, repo, other)
3590
3590
3591 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3591 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3592 try:
3592 try:
3593 return hg.outgoing(ui, repo, dest, opts)
3593 return hg.outgoing(ui, repo, dest, opts)
3594 finally:
3594 finally:
3595 del repo._subtoppath
3595 del repo._subtoppath
3596
3596
3597 @command('parents',
3597 @command('parents',
3598 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3598 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3599 ] + templateopts,
3599 ] + templateopts,
3600 _('[-r REV] [FILE]'),
3600 _('[-r REV] [FILE]'),
3601 inferrepo=True)
3601 inferrepo=True)
3602 def parents(ui, repo, file_=None, **opts):
3602 def parents(ui, repo, file_=None, **opts):
3603 """show the parents of the working directory or revision (DEPRECATED)
3603 """show the parents of the working directory or revision (DEPRECATED)
3604
3604
3605 Print the working directory's parent revisions. If a revision is
3605 Print the working directory's parent revisions. If a revision is
3606 given via -r/--rev, the parent of that revision will be printed.
3606 given via -r/--rev, the parent of that revision will be printed.
3607 If a file argument is given, the revision in which the file was
3607 If a file argument is given, the revision in which the file was
3608 last changed (before the working directory revision or the
3608 last changed (before the working directory revision or the
3609 argument to --rev if given) is printed.
3609 argument to --rev if given) is printed.
3610
3610
3611 This command is equivalent to::
3611 This command is equivalent to::
3612
3612
3613 hg log -r "p1()+p2()" or
3613 hg log -r "p1()+p2()" or
3614 hg log -r "p1(REV)+p2(REV)" or
3614 hg log -r "p1(REV)+p2(REV)" or
3615 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3615 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3616 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3616 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3617
3617
3618 See :hg:`summary` and :hg:`help revsets` for related information.
3618 See :hg:`summary` and :hg:`help revsets` for related information.
3619
3619
3620 Returns 0 on success.
3620 Returns 0 on success.
3621 """
3621 """
3622
3622
3623 opts = pycompat.byteskwargs(opts)
3623 opts = pycompat.byteskwargs(opts)
3624 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3624 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3625
3625
3626 if file_:
3626 if file_:
3627 m = scmutil.match(ctx, (file_,), opts)
3627 m = scmutil.match(ctx, (file_,), opts)
3628 if m.anypats() or len(m.files()) != 1:
3628 if m.anypats() or len(m.files()) != 1:
3629 raise error.Abort(_('can only specify an explicit filename'))
3629 raise error.Abort(_('can only specify an explicit filename'))
3630 file_ = m.files()[0]
3630 file_ = m.files()[0]
3631 filenodes = []
3631 filenodes = []
3632 for cp in ctx.parents():
3632 for cp in ctx.parents():
3633 if not cp:
3633 if not cp:
3634 continue
3634 continue
3635 try:
3635 try:
3636 filenodes.append(cp.filenode(file_))
3636 filenodes.append(cp.filenode(file_))
3637 except error.LookupError:
3637 except error.LookupError:
3638 pass
3638 pass
3639 if not filenodes:
3639 if not filenodes:
3640 raise error.Abort(_("'%s' not found in manifest!") % file_)
3640 raise error.Abort(_("'%s' not found in manifest!") % file_)
3641 p = []
3641 p = []
3642 for fn in filenodes:
3642 for fn in filenodes:
3643 fctx = repo.filectx(file_, fileid=fn)
3643 fctx = repo.filectx(file_, fileid=fn)
3644 p.append(fctx.node())
3644 p.append(fctx.node())
3645 else:
3645 else:
3646 p = [cp.node() for cp in ctx.parents()]
3646 p = [cp.node() for cp in ctx.parents()]
3647
3647
3648 displayer = cmdutil.show_changeset(ui, repo, opts)
3648 displayer = cmdutil.show_changeset(ui, repo, opts)
3649 for n in p:
3649 for n in p:
3650 if n != nullid:
3650 if n != nullid:
3651 displayer.show(repo[n])
3651 displayer.show(repo[n])
3652 displayer.close()
3652 displayer.close()
3653
3653
3654 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3654 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3655 def paths(ui, repo, search=None, **opts):
3655 def paths(ui, repo, search=None, **opts):
3656 """show aliases for remote repositories
3656 """show aliases for remote repositories
3657
3657
3658 Show definition of symbolic path name NAME. If no name is given,
3658 Show definition of symbolic path name NAME. If no name is given,
3659 show definition of all available names.
3659 show definition of all available names.
3660
3660
3661 Option -q/--quiet suppresses all output when searching for NAME
3661 Option -q/--quiet suppresses all output when searching for NAME
3662 and shows only the path names when listing all definitions.
3662 and shows only the path names when listing all definitions.
3663
3663
3664 Path names are defined in the [paths] section of your
3664 Path names are defined in the [paths] section of your
3665 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3665 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3666 repository, ``.hg/hgrc`` is used, too.
3666 repository, ``.hg/hgrc`` is used, too.
3667
3667
3668 The path names ``default`` and ``default-push`` have a special
3668 The path names ``default`` and ``default-push`` have a special
3669 meaning. When performing a push or pull operation, they are used
3669 meaning. When performing a push or pull operation, they are used
3670 as fallbacks if no location is specified on the command-line.
3670 as fallbacks if no location is specified on the command-line.
3671 When ``default-push`` is set, it will be used for push and
3671 When ``default-push`` is set, it will be used for push and
3672 ``default`` will be used for pull; otherwise ``default`` is used
3672 ``default`` will be used for pull; otherwise ``default`` is used
3673 as the fallback for both. When cloning a repository, the clone
3673 as the fallback for both. When cloning a repository, the clone
3674 source is written as ``default`` in ``.hg/hgrc``.
3674 source is written as ``default`` in ``.hg/hgrc``.
3675
3675
3676 .. note::
3676 .. note::
3677
3677
3678 ``default`` and ``default-push`` apply to all inbound (e.g.
3678 ``default`` and ``default-push`` apply to all inbound (e.g.
3679 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3679 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3680 and :hg:`bundle`) operations.
3680 and :hg:`bundle`) operations.
3681
3681
3682 See :hg:`help urls` for more information.
3682 See :hg:`help urls` for more information.
3683
3683
3684 Returns 0 on success.
3684 Returns 0 on success.
3685 """
3685 """
3686
3686
3687 opts = pycompat.byteskwargs(opts)
3687 opts = pycompat.byteskwargs(opts)
3688 ui.pager('paths')
3688 ui.pager('paths')
3689 if search:
3689 if search:
3690 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3690 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3691 if name == search]
3691 if name == search]
3692 else:
3692 else:
3693 pathitems = sorted(ui.paths.iteritems())
3693 pathitems = sorted(ui.paths.iteritems())
3694
3694
3695 fm = ui.formatter('paths', opts)
3695 fm = ui.formatter('paths', opts)
3696 if fm.isplain():
3696 if fm.isplain():
3697 hidepassword = util.hidepassword
3697 hidepassword = util.hidepassword
3698 else:
3698 else:
3699 hidepassword = str
3699 hidepassword = str
3700 if ui.quiet:
3700 if ui.quiet:
3701 namefmt = '%s\n'
3701 namefmt = '%s\n'
3702 else:
3702 else:
3703 namefmt = '%s = '
3703 namefmt = '%s = '
3704 showsubopts = not search and not ui.quiet
3704 showsubopts = not search and not ui.quiet
3705
3705
3706 for name, path in pathitems:
3706 for name, path in pathitems:
3707 fm.startitem()
3707 fm.startitem()
3708 fm.condwrite(not search, 'name', namefmt, name)
3708 fm.condwrite(not search, 'name', namefmt, name)
3709 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3709 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3710 for subopt, value in sorted(path.suboptions.items()):
3710 for subopt, value in sorted(path.suboptions.items()):
3711 assert subopt not in ('name', 'url')
3711 assert subopt not in ('name', 'url')
3712 if showsubopts:
3712 if showsubopts:
3713 fm.plain('%s:%s = ' % (name, subopt))
3713 fm.plain('%s:%s = ' % (name, subopt))
3714 fm.condwrite(showsubopts, subopt, '%s\n', value)
3714 fm.condwrite(showsubopts, subopt, '%s\n', value)
3715
3715
3716 fm.end()
3716 fm.end()
3717
3717
3718 if search and not pathitems:
3718 if search and not pathitems:
3719 if not ui.quiet:
3719 if not ui.quiet:
3720 ui.warn(_("not found!\n"))
3720 ui.warn(_("not found!\n"))
3721 return 1
3721 return 1
3722 else:
3722 else:
3723 return 0
3723 return 0
3724
3724
3725 @command('phase',
3725 @command('phase',
3726 [('p', 'public', False, _('set changeset phase to public')),
3726 [('p', 'public', False, _('set changeset phase to public')),
3727 ('d', 'draft', False, _('set changeset phase to draft')),
3727 ('d', 'draft', False, _('set changeset phase to draft')),
3728 ('s', 'secret', False, _('set changeset phase to secret')),
3728 ('s', 'secret', False, _('set changeset phase to secret')),
3729 ('f', 'force', False, _('allow to move boundary backward')),
3729 ('f', 'force', False, _('allow to move boundary backward')),
3730 ('r', 'rev', [], _('target revision'), _('REV')),
3730 ('r', 'rev', [], _('target revision'), _('REV')),
3731 ],
3731 ],
3732 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3732 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3733 def phase(ui, repo, *revs, **opts):
3733 def phase(ui, repo, *revs, **opts):
3734 """set or show the current phase name
3734 """set or show the current phase name
3735
3735
3736 With no argument, show the phase name of the current revision(s).
3736 With no argument, show the phase name of the current revision(s).
3737
3737
3738 With one of -p/--public, -d/--draft or -s/--secret, change the
3738 With one of -p/--public, -d/--draft or -s/--secret, change the
3739 phase value of the specified revisions.
3739 phase value of the specified revisions.
3740
3740
3741 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3741 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3742 lower phase to an higher phase. Phases are ordered as follows::
3742 lower phase to an higher phase. Phases are ordered as follows::
3743
3743
3744 public < draft < secret
3744 public < draft < secret
3745
3745
3746 Returns 0 on success, 1 if some phases could not be changed.
3746 Returns 0 on success, 1 if some phases could not be changed.
3747
3747
3748 (For more information about the phases concept, see :hg:`help phases`.)
3748 (For more information about the phases concept, see :hg:`help phases`.)
3749 """
3749 """
3750 opts = pycompat.byteskwargs(opts)
3750 opts = pycompat.byteskwargs(opts)
3751 # search for a unique phase argument
3751 # search for a unique phase argument
3752 targetphase = None
3752 targetphase = None
3753 for idx, name in enumerate(phases.phasenames):
3753 for idx, name in enumerate(phases.phasenames):
3754 if opts[name]:
3754 if opts[name]:
3755 if targetphase is not None:
3755 if targetphase is not None:
3756 raise error.Abort(_('only one phase can be specified'))
3756 raise error.Abort(_('only one phase can be specified'))
3757 targetphase = idx
3757 targetphase = idx
3758
3758
3759 # look for specified revision
3759 # look for specified revision
3760 revs = list(revs)
3760 revs = list(revs)
3761 revs.extend(opts['rev'])
3761 revs.extend(opts['rev'])
3762 if not revs:
3762 if not revs:
3763 # display both parents as the second parent phase can influence
3763 # display both parents as the second parent phase can influence
3764 # the phase of a merge commit
3764 # the phase of a merge commit
3765 revs = [c.rev() for c in repo[None].parents()]
3765 revs = [c.rev() for c in repo[None].parents()]
3766
3766
3767 revs = scmutil.revrange(repo, revs)
3767 revs = scmutil.revrange(repo, revs)
3768
3768
3769 lock = None
3769 lock = None
3770 ret = 0
3770 ret = 0
3771 if targetphase is None:
3771 if targetphase is None:
3772 # display
3772 # display
3773 for r in revs:
3773 for r in revs:
3774 ctx = repo[r]
3774 ctx = repo[r]
3775 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3775 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3776 else:
3776 else:
3777 tr = None
3777 tr = None
3778 lock = repo.lock()
3778 lock = repo.lock()
3779 try:
3779 try:
3780 tr = repo.transaction("phase")
3780 tr = repo.transaction("phase")
3781 # set phase
3781 # set phase
3782 if not revs:
3782 if not revs:
3783 raise error.Abort(_('empty revision set'))
3783 raise error.Abort(_('empty revision set'))
3784 nodes = [repo[r].node() for r in revs]
3784 nodes = [repo[r].node() for r in revs]
3785 # moving revision from public to draft may hide them
3785 # moving revision from public to draft may hide them
3786 # We have to check result on an unfiltered repository
3786 # We have to check result on an unfiltered repository
3787 unfi = repo.unfiltered()
3787 unfi = repo.unfiltered()
3788 getphase = unfi._phasecache.phase
3788 getphase = unfi._phasecache.phase
3789 olddata = [getphase(unfi, r) for r in unfi]
3789 olddata = [getphase(unfi, r) for r in unfi]
3790 phases.advanceboundary(repo, tr, targetphase, nodes)
3790 phases.advanceboundary(repo, tr, targetphase, nodes)
3791 if opts['force']:
3791 if opts['force']:
3792 phases.retractboundary(repo, tr, targetphase, nodes)
3792 phases.retractboundary(repo, tr, targetphase, nodes)
3793 tr.close()
3793 tr.close()
3794 finally:
3794 finally:
3795 if tr is not None:
3795 if tr is not None:
3796 tr.release()
3796 tr.release()
3797 lock.release()
3797 lock.release()
3798 getphase = unfi._phasecache.phase
3798 getphase = unfi._phasecache.phase
3799 newdata = [getphase(unfi, r) for r in unfi]
3799 newdata = [getphase(unfi, r) for r in unfi]
3800 changes = sum(newdata[r] != olddata[r] for r in unfi)
3800 changes = sum(newdata[r] != olddata[r] for r in unfi)
3801 cl = unfi.changelog
3801 cl = unfi.changelog
3802 rejected = [n for n in nodes
3802 rejected = [n for n in nodes
3803 if newdata[cl.rev(n)] < targetphase]
3803 if newdata[cl.rev(n)] < targetphase]
3804 if rejected:
3804 if rejected:
3805 ui.warn(_('cannot move %i changesets to a higher '
3805 ui.warn(_('cannot move %i changesets to a higher '
3806 'phase, use --force\n') % len(rejected))
3806 'phase, use --force\n') % len(rejected))
3807 ret = 1
3807 ret = 1
3808 if changes:
3808 if changes:
3809 msg = _('phase changed for %i changesets\n') % changes
3809 msg = _('phase changed for %i changesets\n') % changes
3810 if ret:
3810 if ret:
3811 ui.status(msg)
3811 ui.status(msg)
3812 else:
3812 else:
3813 ui.note(msg)
3813 ui.note(msg)
3814 else:
3814 else:
3815 ui.warn(_('no phases changed\n'))
3815 ui.warn(_('no phases changed\n'))
3816 return ret
3816 return ret
3817
3817
3818 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3818 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3819 """Run after a changegroup has been added via pull/unbundle
3819 """Run after a changegroup has been added via pull/unbundle
3820
3820
3821 This takes arguments below:
3821 This takes arguments below:
3822
3822
3823 :modheads: change of heads by pull/unbundle
3823 :modheads: change of heads by pull/unbundle
3824 :optupdate: updating working directory is needed or not
3824 :optupdate: updating working directory is needed or not
3825 :checkout: update destination revision (or None to default destination)
3825 :checkout: update destination revision (or None to default destination)
3826 :brev: a name, which might be a bookmark to be activated after updating
3826 :brev: a name, which might be a bookmark to be activated after updating
3827 """
3827 """
3828 if modheads == 0:
3828 if modheads == 0:
3829 return
3829 return
3830 if optupdate:
3830 if optupdate:
3831 try:
3831 try:
3832 return hg.updatetotally(ui, repo, checkout, brev)
3832 return hg.updatetotally(ui, repo, checkout, brev)
3833 except error.UpdateAbort as inst:
3833 except error.UpdateAbort as inst:
3834 msg = _("not updating: %s") % str(inst)
3834 msg = _("not updating: %s") % str(inst)
3835 hint = inst.hint
3835 hint = inst.hint
3836 raise error.UpdateAbort(msg, hint=hint)
3836 raise error.UpdateAbort(msg, hint=hint)
3837 if modheads > 1:
3837 if modheads > 1:
3838 currentbranchheads = len(repo.branchheads())
3838 currentbranchheads = len(repo.branchheads())
3839 if currentbranchheads == modheads:
3839 if currentbranchheads == modheads:
3840 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3840 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3841 elif currentbranchheads > 1:
3841 elif currentbranchheads > 1:
3842 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3842 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3843 "merge)\n"))
3843 "merge)\n"))
3844 else:
3844 else:
3845 ui.status(_("(run 'hg heads' to see heads)\n"))
3845 ui.status(_("(run 'hg heads' to see heads)\n"))
3846 else:
3846 else:
3847 ui.status(_("(run 'hg update' to get a working copy)\n"))
3847 ui.status(_("(run 'hg update' to get a working copy)\n"))
3848
3848
3849 @command('^pull',
3849 @command('^pull',
3850 [('u', 'update', None,
3850 [('u', 'update', None,
3851 _('update to new branch head if changesets were pulled')),
3851 _('update to new branch head if changesets were pulled')),
3852 ('f', 'force', None, _('run even when remote repository is unrelated')),
3852 ('f', 'force', None, _('run even when remote repository is unrelated')),
3853 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3853 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3854 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3854 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3855 ('b', 'branch', [], _('a specific branch you would like to pull'),
3855 ('b', 'branch', [], _('a specific branch you would like to pull'),
3856 _('BRANCH')),
3856 _('BRANCH')),
3857 ] + remoteopts,
3857 ] + remoteopts,
3858 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3858 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3859 def pull(ui, repo, source="default", **opts):
3859 def pull(ui, repo, source="default", **opts):
3860 """pull changes from the specified source
3860 """pull changes from the specified source
3861
3861
3862 Pull changes from a remote repository to a local one.
3862 Pull changes from a remote repository to a local one.
3863
3863
3864 This finds all changes from the repository at the specified path
3864 This finds all changes from the repository at the specified path
3865 or URL and adds them to a local repository (the current one unless
3865 or URL and adds them to a local repository (the current one unless
3866 -R is specified). By default, this does not update the copy of the
3866 -R is specified). By default, this does not update the copy of the
3867 project in the working directory.
3867 project in the working directory.
3868
3868
3869 Use :hg:`incoming` if you want to see what would have been added
3869 Use :hg:`incoming` if you want to see what would have been added
3870 by a pull at the time you issued this command. If you then decide
3870 by a pull at the time you issued this command. If you then decide
3871 to add those changes to the repository, you should use :hg:`pull
3871 to add those changes to the repository, you should use :hg:`pull
3872 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3872 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3873
3873
3874 If SOURCE is omitted, the 'default' path will be used.
3874 If SOURCE is omitted, the 'default' path will be used.
3875 See :hg:`help urls` for more information.
3875 See :hg:`help urls` for more information.
3876
3876
3877 Specifying bookmark as ``.`` is equivalent to specifying the active
3877 Specifying bookmark as ``.`` is equivalent to specifying the active
3878 bookmark's name.
3878 bookmark's name.
3879
3879
3880 Returns 0 on success, 1 if an update had unresolved files.
3880 Returns 0 on success, 1 if an update had unresolved files.
3881 """
3881 """
3882
3882
3883 opts = pycompat.byteskwargs(opts)
3883 opts = pycompat.byteskwargs(opts)
3884 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3884 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3885 msg = _('update destination required by configuration')
3885 msg = _('update destination required by configuration')
3886 hint = _('use hg pull followed by hg update DEST')
3886 hint = _('use hg pull followed by hg update DEST')
3887 raise error.Abort(msg, hint=hint)
3887 raise error.Abort(msg, hint=hint)
3888
3888
3889 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3889 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3890 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3890 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3891 other = hg.peer(repo, opts, source)
3891 other = hg.peer(repo, opts, source)
3892 try:
3892 try:
3893 revs, checkout = hg.addbranchrevs(repo, other, branches,
3893 revs, checkout = hg.addbranchrevs(repo, other, branches,
3894 opts.get('rev'))
3894 opts.get('rev'))
3895
3895
3896
3896
3897 pullopargs = {}
3897 pullopargs = {}
3898 if opts.get('bookmark'):
3898 if opts.get('bookmark'):
3899 if not revs:
3899 if not revs:
3900 revs = []
3900 revs = []
3901 # The list of bookmark used here is not the one used to actually
3901 # The list of bookmark used here is not the one used to actually
3902 # update the bookmark name. This can result in the revision pulled
3902 # update the bookmark name. This can result in the revision pulled
3903 # not ending up with the name of the bookmark because of a race
3903 # not ending up with the name of the bookmark because of a race
3904 # condition on the server. (See issue 4689 for details)
3904 # condition on the server. (See issue 4689 for details)
3905 remotebookmarks = other.listkeys('bookmarks')
3905 remotebookmarks = other.listkeys('bookmarks')
3906 pullopargs['remotebookmarks'] = remotebookmarks
3906 pullopargs['remotebookmarks'] = remotebookmarks
3907 for b in opts['bookmark']:
3907 for b in opts['bookmark']:
3908 b = repo._bookmarks.expandname(b)
3908 b = repo._bookmarks.expandname(b)
3909 if b not in remotebookmarks:
3909 if b not in remotebookmarks:
3910 raise error.Abort(_('remote bookmark %s not found!') % b)
3910 raise error.Abort(_('remote bookmark %s not found!') % b)
3911 revs.append(remotebookmarks[b])
3911 revs.append(remotebookmarks[b])
3912
3912
3913 if revs:
3913 if revs:
3914 try:
3914 try:
3915 # When 'rev' is a bookmark name, we cannot guarantee that it
3915 # When 'rev' is a bookmark name, we cannot guarantee that it
3916 # will be updated with that name because of a race condition
3916 # will be updated with that name because of a race condition
3917 # server side. (See issue 4689 for details)
3917 # server side. (See issue 4689 for details)
3918 oldrevs = revs
3918 oldrevs = revs
3919 revs = [] # actually, nodes
3919 revs = [] # actually, nodes
3920 for r in oldrevs:
3920 for r in oldrevs:
3921 node = other.lookup(r)
3921 node = other.lookup(r)
3922 revs.append(node)
3922 revs.append(node)
3923 if r == checkout:
3923 if r == checkout:
3924 checkout = node
3924 checkout = node
3925 except error.CapabilityError:
3925 except error.CapabilityError:
3926 err = _("other repository doesn't support revision lookup, "
3926 err = _("other repository doesn't support revision lookup, "
3927 "so a rev cannot be specified.")
3927 "so a rev cannot be specified.")
3928 raise error.Abort(err)
3928 raise error.Abort(err)
3929
3929
3930 pullopargs.update(opts.get('opargs', {}))
3930 pullopargs.update(opts.get('opargs', {}))
3931 modheads = exchange.pull(repo, other, heads=revs,
3931 modheads = exchange.pull(repo, other, heads=revs,
3932 force=opts.get('force'),
3932 force=opts.get('force'),
3933 bookmarks=opts.get('bookmark', ()),
3933 bookmarks=opts.get('bookmark', ()),
3934 opargs=pullopargs).cgresult
3934 opargs=pullopargs).cgresult
3935
3935
3936 # brev is a name, which might be a bookmark to be activated at
3936 # brev is a name, which might be a bookmark to be activated at
3937 # the end of the update. In other words, it is an explicit
3937 # the end of the update. In other words, it is an explicit
3938 # destination of the update
3938 # destination of the update
3939 brev = None
3939 brev = None
3940
3940
3941 if checkout:
3941 if checkout:
3942 checkout = str(repo.changelog.rev(checkout))
3942 checkout = str(repo.changelog.rev(checkout))
3943
3943
3944 # order below depends on implementation of
3944 # order below depends on implementation of
3945 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3945 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3946 # because 'checkout' is determined without it.
3946 # because 'checkout' is determined without it.
3947 if opts.get('rev'):
3947 if opts.get('rev'):
3948 brev = opts['rev'][0]
3948 brev = opts['rev'][0]
3949 elif opts.get('branch'):
3949 elif opts.get('branch'):
3950 brev = opts['branch'][0]
3950 brev = opts['branch'][0]
3951 else:
3951 else:
3952 brev = branches[0]
3952 brev = branches[0]
3953 repo._subtoppath = source
3953 repo._subtoppath = source
3954 try:
3954 try:
3955 ret = postincoming(ui, repo, modheads, opts.get('update'),
3955 ret = postincoming(ui, repo, modheads, opts.get('update'),
3956 checkout, brev)
3956 checkout, brev)
3957
3957
3958 finally:
3958 finally:
3959 del repo._subtoppath
3959 del repo._subtoppath
3960
3960
3961 finally:
3961 finally:
3962 other.close()
3962 other.close()
3963 return ret
3963 return ret
3964
3964
3965 @command('^push',
3965 @command('^push',
3966 [('f', 'force', None, _('force push')),
3966 [('f', 'force', None, _('force push')),
3967 ('r', 'rev', [],
3967 ('r', 'rev', [],
3968 _('a changeset intended to be included in the destination'),
3968 _('a changeset intended to be included in the destination'),
3969 _('REV')),
3969 _('REV')),
3970 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
3970 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
3971 ('b', 'branch', [],
3971 ('b', 'branch', [],
3972 _('a specific branch you would like to push'), _('BRANCH')),
3972 _('a specific branch you would like to push'), _('BRANCH')),
3973 ('', 'new-branch', False, _('allow pushing a new branch')),
3973 ('', 'new-branch', False, _('allow pushing a new branch')),
3974 ] + remoteopts,
3974 ] + remoteopts,
3975 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
3975 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
3976 def push(ui, repo, dest=None, **opts):
3976 def push(ui, repo, dest=None, **opts):
3977 """push changes to the specified destination
3977 """push changes to the specified destination
3978
3978
3979 Push changesets from the local repository to the specified
3979 Push changesets from the local repository to the specified
3980 destination.
3980 destination.
3981
3981
3982 This operation is symmetrical to pull: it is identical to a pull
3982 This operation is symmetrical to pull: it is identical to a pull
3983 in the destination repository from the current one.
3983 in the destination repository from the current one.
3984
3984
3985 By default, push will not allow creation of new heads at the
3985 By default, push will not allow creation of new heads at the
3986 destination, since multiple heads would make it unclear which head
3986 destination, since multiple heads would make it unclear which head
3987 to use. In this situation, it is recommended to pull and merge
3987 to use. In this situation, it is recommended to pull and merge
3988 before pushing.
3988 before pushing.
3989
3989
3990 Use --new-branch if you want to allow push to create a new named
3990 Use --new-branch if you want to allow push to create a new named
3991 branch that is not present at the destination. This allows you to
3991 branch that is not present at the destination. This allows you to
3992 only create a new branch without forcing other changes.
3992 only create a new branch without forcing other changes.
3993
3993
3994 .. note::
3994 .. note::
3995
3995
3996 Extra care should be taken with the -f/--force option,
3996 Extra care should be taken with the -f/--force option,
3997 which will push all new heads on all branches, an action which will
3997 which will push all new heads on all branches, an action which will
3998 almost always cause confusion for collaborators.
3998 almost always cause confusion for collaborators.
3999
3999
4000 If -r/--rev is used, the specified revision and all its ancestors
4000 If -r/--rev is used, the specified revision and all its ancestors
4001 will be pushed to the remote repository.
4001 will be pushed to the remote repository.
4002
4002
4003 If -B/--bookmark is used, the specified bookmarked revision, its
4003 If -B/--bookmark is used, the specified bookmarked revision, its
4004 ancestors, and the bookmark will be pushed to the remote
4004 ancestors, and the bookmark will be pushed to the remote
4005 repository. Specifying ``.`` is equivalent to specifying the active
4005 repository. Specifying ``.`` is equivalent to specifying the active
4006 bookmark's name.
4006 bookmark's name.
4007
4007
4008 Please see :hg:`help urls` for important details about ``ssh://``
4008 Please see :hg:`help urls` for important details about ``ssh://``
4009 URLs. If DESTINATION is omitted, a default path will be used.
4009 URLs. If DESTINATION is omitted, a default path will be used.
4010
4010
4011 Returns 0 if push was successful, 1 if nothing to push.
4011 Returns 0 if push was successful, 1 if nothing to push.
4012 """
4012 """
4013
4013
4014 opts = pycompat.byteskwargs(opts)
4014 opts = pycompat.byteskwargs(opts)
4015 if opts.get('bookmark'):
4015 if opts.get('bookmark'):
4016 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4016 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4017 for b in opts['bookmark']:
4017 for b in opts['bookmark']:
4018 # translate -B options to -r so changesets get pushed
4018 # translate -B options to -r so changesets get pushed
4019 b = repo._bookmarks.expandname(b)
4019 b = repo._bookmarks.expandname(b)
4020 if b in repo._bookmarks:
4020 if b in repo._bookmarks:
4021 opts.setdefault('rev', []).append(b)
4021 opts.setdefault('rev', []).append(b)
4022 else:
4022 else:
4023 # if we try to push a deleted bookmark, translate it to null
4023 # if we try to push a deleted bookmark, translate it to null
4024 # this lets simultaneous -r, -b options continue working
4024 # this lets simultaneous -r, -b options continue working
4025 opts.setdefault('rev', []).append("null")
4025 opts.setdefault('rev', []).append("null")
4026
4026
4027 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4027 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4028 if not path:
4028 if not path:
4029 raise error.Abort(_('default repository not configured!'),
4029 raise error.Abort(_('default repository not configured!'),
4030 hint=_("see 'hg help config.paths'"))
4030 hint=_("see 'hg help config.paths'"))
4031 dest = path.pushloc or path.loc
4031 dest = path.pushloc or path.loc
4032 branches = (path.branch, opts.get('branch') or [])
4032 branches = (path.branch, opts.get('branch') or [])
4033 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4033 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4034 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4034 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4035 other = hg.peer(repo, opts, dest)
4035 other = hg.peer(repo, opts, dest)
4036
4036
4037 if revs:
4037 if revs:
4038 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4038 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4039 if not revs:
4039 if not revs:
4040 raise error.Abort(_("specified revisions evaluate to an empty set"),
4040 raise error.Abort(_("specified revisions evaluate to an empty set"),
4041 hint=_("use different revision arguments"))
4041 hint=_("use different revision arguments"))
4042 elif path.pushrev:
4042 elif path.pushrev:
4043 # It doesn't make any sense to specify ancestor revisions. So limit
4043 # It doesn't make any sense to specify ancestor revisions. So limit
4044 # to DAG heads to make discovery simpler.
4044 # to DAG heads to make discovery simpler.
4045 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4045 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4046 revs = scmutil.revrange(repo, [expr])
4046 revs = scmutil.revrange(repo, [expr])
4047 revs = [repo[rev].node() for rev in revs]
4047 revs = [repo[rev].node() for rev in revs]
4048 if not revs:
4048 if not revs:
4049 raise error.Abort(_('default push revset for path evaluates to an '
4049 raise error.Abort(_('default push revset for path evaluates to an '
4050 'empty set'))
4050 'empty set'))
4051
4051
4052 repo._subtoppath = dest
4052 repo._subtoppath = dest
4053 try:
4053 try:
4054 # push subrepos depth-first for coherent ordering
4054 # push subrepos depth-first for coherent ordering
4055 c = repo['']
4055 c = repo['']
4056 subs = c.substate # only repos that are committed
4056 subs = c.substate # only repos that are committed
4057 for s in sorted(subs):
4057 for s in sorted(subs):
4058 result = c.sub(s).push(opts)
4058 result = c.sub(s).push(opts)
4059 if result == 0:
4059 if result == 0:
4060 return not result
4060 return not result
4061 finally:
4061 finally:
4062 del repo._subtoppath
4062 del repo._subtoppath
4063 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4063 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4064 newbranch=opts.get('new_branch'),
4064 newbranch=opts.get('new_branch'),
4065 bookmarks=opts.get('bookmark', ()),
4065 bookmarks=opts.get('bookmark', ()),
4066 opargs=opts.get('opargs'))
4066 opargs=opts.get('opargs'))
4067
4067
4068 result = not pushop.cgresult
4068 result = not pushop.cgresult
4069
4069
4070 if pushop.bkresult is not None:
4070 if pushop.bkresult is not None:
4071 if pushop.bkresult == 2:
4071 if pushop.bkresult == 2:
4072 result = 2
4072 result = 2
4073 elif not result and pushop.bkresult:
4073 elif not result and pushop.bkresult:
4074 result = 2
4074 result = 2
4075
4075
4076 return result
4076 return result
4077
4077
4078 @command('recover', [])
4078 @command('recover', [])
4079 def recover(ui, repo):
4079 def recover(ui, repo):
4080 """roll back an interrupted transaction
4080 """roll back an interrupted transaction
4081
4081
4082 Recover from an interrupted commit or pull.
4082 Recover from an interrupted commit or pull.
4083
4083
4084 This command tries to fix the repository status after an
4084 This command tries to fix the repository status after an
4085 interrupted operation. It should only be necessary when Mercurial
4085 interrupted operation. It should only be necessary when Mercurial
4086 suggests it.
4086 suggests it.
4087
4087
4088 Returns 0 if successful, 1 if nothing to recover or verify fails.
4088 Returns 0 if successful, 1 if nothing to recover or verify fails.
4089 """
4089 """
4090 if repo.recover():
4090 if repo.recover():
4091 return hg.verify(repo)
4091 return hg.verify(repo)
4092 return 1
4092 return 1
4093
4093
4094 @command('^remove|rm',
4094 @command('^remove|rm',
4095 [('A', 'after', None, _('record delete for missing files')),
4095 [('A', 'after', None, _('record delete for missing files')),
4096 ('f', 'force', None,
4096 ('f', 'force', None,
4097 _('forget added files, delete modified files')),
4097 _('forget added files, delete modified files')),
4098 ] + subrepoopts + walkopts,
4098 ] + subrepoopts + walkopts,
4099 _('[OPTION]... FILE...'),
4099 _('[OPTION]... FILE...'),
4100 inferrepo=True)
4100 inferrepo=True)
4101 def remove(ui, repo, *pats, **opts):
4101 def remove(ui, repo, *pats, **opts):
4102 """remove the specified files on the next commit
4102 """remove the specified files on the next commit
4103
4103
4104 Schedule the indicated files for removal from the current branch.
4104 Schedule the indicated files for removal from the current branch.
4105
4105
4106 This command schedules the files to be removed at the next commit.
4106 This command schedules the files to be removed at the next commit.
4107 To undo a remove before that, see :hg:`revert`. To undo added
4107 To undo a remove before that, see :hg:`revert`. To undo added
4108 files, see :hg:`forget`.
4108 files, see :hg:`forget`.
4109
4109
4110 .. container:: verbose
4110 .. container:: verbose
4111
4111
4112 -A/--after can be used to remove only files that have already
4112 -A/--after can be used to remove only files that have already
4113 been deleted, -f/--force can be used to force deletion, and -Af
4113 been deleted, -f/--force can be used to force deletion, and -Af
4114 can be used to remove files from the next revision without
4114 can be used to remove files from the next revision without
4115 deleting them from the working directory.
4115 deleting them from the working directory.
4116
4116
4117 The following table details the behavior of remove for different
4117 The following table details the behavior of remove for different
4118 file states (columns) and option combinations (rows). The file
4118 file states (columns) and option combinations (rows). The file
4119 states are Added [A], Clean [C], Modified [M] and Missing [!]
4119 states are Added [A], Clean [C], Modified [M] and Missing [!]
4120 (as reported by :hg:`status`). The actions are Warn, Remove
4120 (as reported by :hg:`status`). The actions are Warn, Remove
4121 (from branch) and Delete (from disk):
4121 (from branch) and Delete (from disk):
4122
4122
4123 ========= == == == ==
4123 ========= == == == ==
4124 opt/state A C M !
4124 opt/state A C M !
4125 ========= == == == ==
4125 ========= == == == ==
4126 none W RD W R
4126 none W RD W R
4127 -f R RD RD R
4127 -f R RD RD R
4128 -A W W W R
4128 -A W W W R
4129 -Af R R R R
4129 -Af R R R R
4130 ========= == == == ==
4130 ========= == == == ==
4131
4131
4132 .. note::
4132 .. note::
4133
4133
4134 :hg:`remove` never deletes files in Added [A] state from the
4134 :hg:`remove` never deletes files in Added [A] state from the
4135 working directory, not even if ``--force`` is specified.
4135 working directory, not even if ``--force`` is specified.
4136
4136
4137 Returns 0 on success, 1 if any warnings encountered.
4137 Returns 0 on success, 1 if any warnings encountered.
4138 """
4138 """
4139
4139
4140 opts = pycompat.byteskwargs(opts)
4140 opts = pycompat.byteskwargs(opts)
4141 after, force = opts.get('after'), opts.get('force')
4141 after, force = opts.get('after'), opts.get('force')
4142 if not pats and not after:
4142 if not pats and not after:
4143 raise error.Abort(_('no files specified'))
4143 raise error.Abort(_('no files specified'))
4144
4144
4145 m = scmutil.match(repo[None], pats, opts)
4145 m = scmutil.match(repo[None], pats, opts)
4146 subrepos = opts.get('subrepos')
4146 subrepos = opts.get('subrepos')
4147 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4147 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4148
4148
4149 @command('rename|move|mv',
4149 @command('rename|move|mv',
4150 [('A', 'after', None, _('record a rename that has already occurred')),
4150 [('A', 'after', None, _('record a rename that has already occurred')),
4151 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4151 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4152 ] + walkopts + dryrunopts,
4152 ] + walkopts + dryrunopts,
4153 _('[OPTION]... SOURCE... DEST'))
4153 _('[OPTION]... SOURCE... DEST'))
4154 def rename(ui, repo, *pats, **opts):
4154 def rename(ui, repo, *pats, **opts):
4155 """rename files; equivalent of copy + remove
4155 """rename files; equivalent of copy + remove
4156
4156
4157 Mark dest as copies of sources; mark sources for deletion. If dest
4157 Mark dest as copies of sources; mark sources for deletion. If dest
4158 is a directory, copies are put in that directory. If dest is a
4158 is a directory, copies are put in that directory. If dest is a
4159 file, there can only be one source.
4159 file, there can only be one source.
4160
4160
4161 By default, this command copies the contents of files as they
4161 By default, this command copies the contents of files as they
4162 exist in the working directory. If invoked with -A/--after, the
4162 exist in the working directory. If invoked with -A/--after, the
4163 operation is recorded, but no copying is performed.
4163 operation is recorded, but no copying is performed.
4164
4164
4165 This command takes effect at the next commit. To undo a rename
4165 This command takes effect at the next commit. To undo a rename
4166 before that, see :hg:`revert`.
4166 before that, see :hg:`revert`.
4167
4167
4168 Returns 0 on success, 1 if errors are encountered.
4168 Returns 0 on success, 1 if errors are encountered.
4169 """
4169 """
4170 opts = pycompat.byteskwargs(opts)
4170 opts = pycompat.byteskwargs(opts)
4171 with repo.wlock(False):
4171 with repo.wlock(False):
4172 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4172 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4173
4173
4174 @command('resolve',
4174 @command('resolve',
4175 [('a', 'all', None, _('select all unresolved files')),
4175 [('a', 'all', None, _('select all unresolved files')),
4176 ('l', 'list', None, _('list state of files needing merge')),
4176 ('l', 'list', None, _('list state of files needing merge')),
4177 ('m', 'mark', None, _('mark files as resolved')),
4177 ('m', 'mark', None, _('mark files as resolved')),
4178 ('u', 'unmark', None, _('mark files as unresolved')),
4178 ('u', 'unmark', None, _('mark files as unresolved')),
4179 ('n', 'no-status', None, _('hide status prefix'))]
4179 ('n', 'no-status', None, _('hide status prefix'))]
4180 + mergetoolopts + walkopts + formatteropts,
4180 + mergetoolopts + walkopts + formatteropts,
4181 _('[OPTION]... [FILE]...'),
4181 _('[OPTION]... [FILE]...'),
4182 inferrepo=True)
4182 inferrepo=True)
4183 def resolve(ui, repo, *pats, **opts):
4183 def resolve(ui, repo, *pats, **opts):
4184 """redo merges or set/view the merge status of files
4184 """redo merges or set/view the merge status of files
4185
4185
4186 Merges with unresolved conflicts are often the result of
4186 Merges with unresolved conflicts are often the result of
4187 non-interactive merging using the ``internal:merge`` configuration
4187 non-interactive merging using the ``internal:merge`` configuration
4188 setting, or a command-line merge tool like ``diff3``. The resolve
4188 setting, or a command-line merge tool like ``diff3``. The resolve
4189 command is used to manage the files involved in a merge, after
4189 command is used to manage the files involved in a merge, after
4190 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4190 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4191 working directory must have two parents). See :hg:`help
4191 working directory must have two parents). See :hg:`help
4192 merge-tools` for information on configuring merge tools.
4192 merge-tools` for information on configuring merge tools.
4193
4193
4194 The resolve command can be used in the following ways:
4194 The resolve command can be used in the following ways:
4195
4195
4196 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4196 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4197 files, discarding any previous merge attempts. Re-merging is not
4197 files, discarding any previous merge attempts. Re-merging is not
4198 performed for files already marked as resolved. Use ``--all/-a``
4198 performed for files already marked as resolved. Use ``--all/-a``
4199 to select all unresolved files. ``--tool`` can be used to specify
4199 to select all unresolved files. ``--tool`` can be used to specify
4200 the merge tool used for the given files. It overrides the HGMERGE
4200 the merge tool used for the given files. It overrides the HGMERGE
4201 environment variable and your configuration files. Previous file
4201 environment variable and your configuration files. Previous file
4202 contents are saved with a ``.orig`` suffix.
4202 contents are saved with a ``.orig`` suffix.
4203
4203
4204 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4204 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4205 (e.g. after having manually fixed-up the files). The default is
4205 (e.g. after having manually fixed-up the files). The default is
4206 to mark all unresolved files.
4206 to mark all unresolved files.
4207
4207
4208 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4208 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4209 default is to mark all resolved files.
4209 default is to mark all resolved files.
4210
4210
4211 - :hg:`resolve -l`: list files which had or still have conflicts.
4211 - :hg:`resolve -l`: list files which had or still have conflicts.
4212 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4212 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4213 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4213 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4214 the list. See :hg:`help filesets` for details.
4214 the list. See :hg:`help filesets` for details.
4215
4215
4216 .. note::
4216 .. note::
4217
4217
4218 Mercurial will not let you commit files with unresolved merge
4218 Mercurial will not let you commit files with unresolved merge
4219 conflicts. You must use :hg:`resolve -m ...` before you can
4219 conflicts. You must use :hg:`resolve -m ...` before you can
4220 commit after a conflicting merge.
4220 commit after a conflicting merge.
4221
4221
4222 Returns 0 on success, 1 if any files fail a resolve attempt.
4222 Returns 0 on success, 1 if any files fail a resolve attempt.
4223 """
4223 """
4224
4224
4225 opts = pycompat.byteskwargs(opts)
4225 opts = pycompat.byteskwargs(opts)
4226 flaglist = 'all mark unmark list no_status'.split()
4226 flaglist = 'all mark unmark list no_status'.split()
4227 all, mark, unmark, show, nostatus = \
4227 all, mark, unmark, show, nostatus = \
4228 [opts.get(o) for o in flaglist]
4228 [opts.get(o) for o in flaglist]
4229
4229
4230 if (show and (mark or unmark)) or (mark and unmark):
4230 if (show and (mark or unmark)) or (mark and unmark):
4231 raise error.Abort(_("too many options specified"))
4231 raise error.Abort(_("too many options specified"))
4232 if pats and all:
4232 if pats and all:
4233 raise error.Abort(_("can't specify --all and patterns"))
4233 raise error.Abort(_("can't specify --all and patterns"))
4234 if not (all or pats or show or mark or unmark):
4234 if not (all or pats or show or mark or unmark):
4235 raise error.Abort(_('no files or directories specified'),
4235 raise error.Abort(_('no files or directories specified'),
4236 hint=('use --all to re-merge all unresolved files'))
4236 hint=('use --all to re-merge all unresolved files'))
4237
4237
4238 if show:
4238 if show:
4239 ui.pager('resolve')
4239 ui.pager('resolve')
4240 fm = ui.formatter('resolve', opts)
4240 fm = ui.formatter('resolve', opts)
4241 ms = mergemod.mergestate.read(repo)
4241 ms = mergemod.mergestate.read(repo)
4242 m = scmutil.match(repo[None], pats, opts)
4242 m = scmutil.match(repo[None], pats, opts)
4243 for f in ms:
4243 for f in ms:
4244 if not m(f):
4244 if not m(f):
4245 continue
4245 continue
4246 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4246 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4247 'd': 'driverresolved'}[ms[f]]
4247 'd': 'driverresolved'}[ms[f]]
4248 fm.startitem()
4248 fm.startitem()
4249 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4249 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4250 fm.write('path', '%s\n', f, label=l)
4250 fm.write('path', '%s\n', f, label=l)
4251 fm.end()
4251 fm.end()
4252 return 0
4252 return 0
4253
4253
4254 with repo.wlock():
4254 with repo.wlock():
4255 ms = mergemod.mergestate.read(repo)
4255 ms = mergemod.mergestate.read(repo)
4256
4256
4257 if not (ms.active() or repo.dirstate.p2() != nullid):
4257 if not (ms.active() or repo.dirstate.p2() != nullid):
4258 raise error.Abort(
4258 raise error.Abort(
4259 _('resolve command not applicable when not merging'))
4259 _('resolve command not applicable when not merging'))
4260
4260
4261 wctx = repo[None]
4261 wctx = repo[None]
4262
4262
4263 if ms.mergedriver and ms.mdstate() == 'u':
4263 if ms.mergedriver and ms.mdstate() == 'u':
4264 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4264 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4265 ms.commit()
4265 ms.commit()
4266 # allow mark and unmark to go through
4266 # allow mark and unmark to go through
4267 if not mark and not unmark and not proceed:
4267 if not mark and not unmark and not proceed:
4268 return 1
4268 return 1
4269
4269
4270 m = scmutil.match(wctx, pats, opts)
4270 m = scmutil.match(wctx, pats, opts)
4271 ret = 0
4271 ret = 0
4272 didwork = False
4272 didwork = False
4273 runconclude = False
4273 runconclude = False
4274
4274
4275 tocomplete = []
4275 tocomplete = []
4276 for f in ms:
4276 for f in ms:
4277 if not m(f):
4277 if not m(f):
4278 continue
4278 continue
4279
4279
4280 didwork = True
4280 didwork = True
4281
4281
4282 # don't let driver-resolved files be marked, and run the conclude
4282 # don't let driver-resolved files be marked, and run the conclude
4283 # step if asked to resolve
4283 # step if asked to resolve
4284 if ms[f] == "d":
4284 if ms[f] == "d":
4285 exact = m.exact(f)
4285 exact = m.exact(f)
4286 if mark:
4286 if mark:
4287 if exact:
4287 if exact:
4288 ui.warn(_('not marking %s as it is driver-resolved\n')
4288 ui.warn(_('not marking %s as it is driver-resolved\n')
4289 % f)
4289 % f)
4290 elif unmark:
4290 elif unmark:
4291 if exact:
4291 if exact:
4292 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4292 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4293 % f)
4293 % f)
4294 else:
4294 else:
4295 runconclude = True
4295 runconclude = True
4296 continue
4296 continue
4297
4297
4298 if mark:
4298 if mark:
4299 ms.mark(f, "r")
4299 ms.mark(f, "r")
4300 elif unmark:
4300 elif unmark:
4301 ms.mark(f, "u")
4301 ms.mark(f, "u")
4302 else:
4302 else:
4303 # backup pre-resolve (merge uses .orig for its own purposes)
4303 # backup pre-resolve (merge uses .orig for its own purposes)
4304 a = repo.wjoin(f)
4304 a = repo.wjoin(f)
4305 try:
4305 try:
4306 util.copyfile(a, a + ".resolve")
4306 util.copyfile(a, a + ".resolve")
4307 except (IOError, OSError) as inst:
4307 except (IOError, OSError) as inst:
4308 if inst.errno != errno.ENOENT:
4308 if inst.errno != errno.ENOENT:
4309 raise
4309 raise
4310
4310
4311 try:
4311 try:
4312 # preresolve file
4312 # preresolve file
4313 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4313 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4314 'resolve')
4314 'resolve')
4315 complete, r = ms.preresolve(f, wctx)
4315 complete, r = ms.preresolve(f, wctx)
4316 if not complete:
4316 if not complete:
4317 tocomplete.append(f)
4317 tocomplete.append(f)
4318 elif r:
4318 elif r:
4319 ret = 1
4319 ret = 1
4320 finally:
4320 finally:
4321 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4321 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4322 ms.commit()
4322 ms.commit()
4323
4323
4324 # replace filemerge's .orig file with our resolve file, but only
4324 # replace filemerge's .orig file with our resolve file, but only
4325 # for merges that are complete
4325 # for merges that are complete
4326 if complete:
4326 if complete:
4327 try:
4327 try:
4328 util.rename(a + ".resolve",
4328 util.rename(a + ".resolve",
4329 scmutil.origpath(ui, repo, a))
4329 scmutil.origpath(ui, repo, a))
4330 except OSError as inst:
4330 except OSError as inst:
4331 if inst.errno != errno.ENOENT:
4331 if inst.errno != errno.ENOENT:
4332 raise
4332 raise
4333
4333
4334 for f in tocomplete:
4334 for f in tocomplete:
4335 try:
4335 try:
4336 # resolve file
4336 # resolve file
4337 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4337 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4338 'resolve')
4338 'resolve')
4339 r = ms.resolve(f, wctx)
4339 r = ms.resolve(f, wctx)
4340 if r:
4340 if r:
4341 ret = 1
4341 ret = 1
4342 finally:
4342 finally:
4343 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4343 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4344 ms.commit()
4344 ms.commit()
4345
4345
4346 # replace filemerge's .orig file with our resolve file
4346 # replace filemerge's .orig file with our resolve file
4347 a = repo.wjoin(f)
4347 a = repo.wjoin(f)
4348 try:
4348 try:
4349 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4349 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4350 except OSError as inst:
4350 except OSError as inst:
4351 if inst.errno != errno.ENOENT:
4351 if inst.errno != errno.ENOENT:
4352 raise
4352 raise
4353
4353
4354 ms.commit()
4354 ms.commit()
4355 ms.recordactions()
4355 ms.recordactions()
4356
4356
4357 if not didwork and pats:
4357 if not didwork and pats:
4358 hint = None
4358 hint = None
4359 if not any([p for p in pats if p.find(':') >= 0]):
4359 if not any([p for p in pats if p.find(':') >= 0]):
4360 pats = ['path:%s' % p for p in pats]
4360 pats = ['path:%s' % p for p in pats]
4361 m = scmutil.match(wctx, pats, opts)
4361 m = scmutil.match(wctx, pats, opts)
4362 for f in ms:
4362 for f in ms:
4363 if not m(f):
4363 if not m(f):
4364 continue
4364 continue
4365 flags = ''.join(['-%s ' % o[0] for o in flaglist
4365 flags = ''.join(['-%s ' % o[0] for o in flaglist
4366 if opts.get(o)])
4366 if opts.get(o)])
4367 hint = _("(try: hg resolve %s%s)\n") % (
4367 hint = _("(try: hg resolve %s%s)\n") % (
4368 flags,
4368 flags,
4369 ' '.join(pats))
4369 ' '.join(pats))
4370 break
4370 break
4371 ui.warn(_("arguments do not match paths that need resolving\n"))
4371 ui.warn(_("arguments do not match paths that need resolving\n"))
4372 if hint:
4372 if hint:
4373 ui.warn(hint)
4373 ui.warn(hint)
4374 elif ms.mergedriver and ms.mdstate() != 's':
4374 elif ms.mergedriver and ms.mdstate() != 's':
4375 # run conclude step when either a driver-resolved file is requested
4375 # run conclude step when either a driver-resolved file is requested
4376 # or there are no driver-resolved files
4376 # or there are no driver-resolved files
4377 # we can't use 'ret' to determine whether any files are unresolved
4377 # we can't use 'ret' to determine whether any files are unresolved
4378 # because we might not have tried to resolve some
4378 # because we might not have tried to resolve some
4379 if ((runconclude or not list(ms.driverresolved()))
4379 if ((runconclude or not list(ms.driverresolved()))
4380 and not list(ms.unresolved())):
4380 and not list(ms.unresolved())):
4381 proceed = mergemod.driverconclude(repo, ms, wctx)
4381 proceed = mergemod.driverconclude(repo, ms, wctx)
4382 ms.commit()
4382 ms.commit()
4383 if not proceed:
4383 if not proceed:
4384 return 1
4384 return 1
4385
4385
4386 # Nudge users into finishing an unfinished operation
4386 # Nudge users into finishing an unfinished operation
4387 unresolvedf = list(ms.unresolved())
4387 unresolvedf = list(ms.unresolved())
4388 driverresolvedf = list(ms.driverresolved())
4388 driverresolvedf = list(ms.driverresolved())
4389 if not unresolvedf and not driverresolvedf:
4389 if not unresolvedf and not driverresolvedf:
4390 ui.status(_('(no more unresolved files)\n'))
4390 ui.status(_('(no more unresolved files)\n'))
4391 cmdutil.checkafterresolved(repo)
4391 cmdutil.checkafterresolved(repo)
4392 elif not unresolvedf:
4392 elif not unresolvedf:
4393 ui.status(_('(no more unresolved files -- '
4393 ui.status(_('(no more unresolved files -- '
4394 'run "hg resolve --all" to conclude)\n'))
4394 'run "hg resolve --all" to conclude)\n'))
4395
4395
4396 return ret
4396 return ret
4397
4397
4398 @command('revert',
4398 @command('revert',
4399 [('a', 'all', None, _('revert all changes when no arguments given')),
4399 [('a', 'all', None, _('revert all changes when no arguments given')),
4400 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4400 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4401 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4401 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4402 ('C', 'no-backup', None, _('do not save backup copies of files')),
4402 ('C', 'no-backup', None, _('do not save backup copies of files')),
4403 ('i', 'interactive', None,
4403 ('i', 'interactive', None,
4404 _('interactively select the changes (EXPERIMENTAL)')),
4404 _('interactively select the changes (EXPERIMENTAL)')),
4405 ] + walkopts + dryrunopts,
4405 ] + walkopts + dryrunopts,
4406 _('[OPTION]... [-r REV] [NAME]...'))
4406 _('[OPTION]... [-r REV] [NAME]...'))
4407 def revert(ui, repo, *pats, **opts):
4407 def revert(ui, repo, *pats, **opts):
4408 """restore files to their checkout state
4408 """restore files to their checkout state
4409
4409
4410 .. note::
4410 .. note::
4411
4411
4412 To check out earlier revisions, you should use :hg:`update REV`.
4412 To check out earlier revisions, you should use :hg:`update REV`.
4413 To cancel an uncommitted merge (and lose your changes),
4413 To cancel an uncommitted merge (and lose your changes),
4414 use :hg:`update --clean .`.
4414 use :hg:`update --clean .`.
4415
4415
4416 With no revision specified, revert the specified files or directories
4416 With no revision specified, revert the specified files or directories
4417 to the contents they had in the parent of the working directory.
4417 to the contents they had in the parent of the working directory.
4418 This restores the contents of files to an unmodified
4418 This restores the contents of files to an unmodified
4419 state and unschedules adds, removes, copies, and renames. If the
4419 state and unschedules adds, removes, copies, and renames. If the
4420 working directory has two parents, you must explicitly specify a
4420 working directory has two parents, you must explicitly specify a
4421 revision.
4421 revision.
4422
4422
4423 Using the -r/--rev or -d/--date options, revert the given files or
4423 Using the -r/--rev or -d/--date options, revert the given files or
4424 directories to their states as of a specific revision. Because
4424 directories to their states as of a specific revision. Because
4425 revert does not change the working directory parents, this will
4425 revert does not change the working directory parents, this will
4426 cause these files to appear modified. This can be helpful to "back
4426 cause these files to appear modified. This can be helpful to "back
4427 out" some or all of an earlier change. See :hg:`backout` for a
4427 out" some or all of an earlier change. See :hg:`backout` for a
4428 related method.
4428 related method.
4429
4429
4430 Modified files are saved with a .orig suffix before reverting.
4430 Modified files are saved with a .orig suffix before reverting.
4431 To disable these backups, use --no-backup. It is possible to store
4431 To disable these backups, use --no-backup. It is possible to store
4432 the backup files in a custom directory relative to the root of the
4432 the backup files in a custom directory relative to the root of the
4433 repository by setting the ``ui.origbackuppath`` configuration
4433 repository by setting the ``ui.origbackuppath`` configuration
4434 option.
4434 option.
4435
4435
4436 See :hg:`help dates` for a list of formats valid for -d/--date.
4436 See :hg:`help dates` for a list of formats valid for -d/--date.
4437
4437
4438 See :hg:`help backout` for a way to reverse the effect of an
4438 See :hg:`help backout` for a way to reverse the effect of an
4439 earlier changeset.
4439 earlier changeset.
4440
4440
4441 Returns 0 on success.
4441 Returns 0 on success.
4442 """
4442 """
4443
4443
4444 if opts.get("date"):
4444 if opts.get("date"):
4445 if opts.get("rev"):
4445 if opts.get("rev"):
4446 raise error.Abort(_("you can't specify a revision and a date"))
4446 raise error.Abort(_("you can't specify a revision and a date"))
4447 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4447 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4448
4448
4449 parent, p2 = repo.dirstate.parents()
4449 parent, p2 = repo.dirstate.parents()
4450 if not opts.get('rev') and p2 != nullid:
4450 if not opts.get('rev') and p2 != nullid:
4451 # revert after merge is a trap for new users (issue2915)
4451 # revert after merge is a trap for new users (issue2915)
4452 raise error.Abort(_('uncommitted merge with no revision specified'),
4452 raise error.Abort(_('uncommitted merge with no revision specified'),
4453 hint=_("use 'hg update' or see 'hg help revert'"))
4453 hint=_("use 'hg update' or see 'hg help revert'"))
4454
4454
4455 ctx = scmutil.revsingle(repo, opts.get('rev'))
4455 ctx = scmutil.revsingle(repo, opts.get('rev'))
4456
4456
4457 if (not (pats or opts.get('include') or opts.get('exclude') or
4457 if (not (pats or opts.get('include') or opts.get('exclude') or
4458 opts.get('all') or opts.get('interactive'))):
4458 opts.get('all') or opts.get('interactive'))):
4459 msg = _("no files or directories specified")
4459 msg = _("no files or directories specified")
4460 if p2 != nullid:
4460 if p2 != nullid:
4461 hint = _("uncommitted merge, use --all to discard all changes,"
4461 hint = _("uncommitted merge, use --all to discard all changes,"
4462 " or 'hg update -C .' to abort the merge")
4462 " or 'hg update -C .' to abort the merge")
4463 raise error.Abort(msg, hint=hint)
4463 raise error.Abort(msg, hint=hint)
4464 dirty = any(repo.status())
4464 dirty = any(repo.status())
4465 node = ctx.node()
4465 node = ctx.node()
4466 if node != parent:
4466 if node != parent:
4467 if dirty:
4467 if dirty:
4468 hint = _("uncommitted changes, use --all to discard all"
4468 hint = _("uncommitted changes, use --all to discard all"
4469 " changes, or 'hg update %s' to update") % ctx.rev()
4469 " changes, or 'hg update %s' to update") % ctx.rev()
4470 else:
4470 else:
4471 hint = _("use --all to revert all files,"
4471 hint = _("use --all to revert all files,"
4472 " or 'hg update %s' to update") % ctx.rev()
4472 " or 'hg update %s' to update") % ctx.rev()
4473 elif dirty:
4473 elif dirty:
4474 hint = _("uncommitted changes, use --all to discard all changes")
4474 hint = _("uncommitted changes, use --all to discard all changes")
4475 else:
4475 else:
4476 hint = _("use --all to revert all files")
4476 hint = _("use --all to revert all files")
4477 raise error.Abort(msg, hint=hint)
4477 raise error.Abort(msg, hint=hint)
4478
4478
4479 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4479 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4480
4480
4481 @command('rollback', dryrunopts +
4481 @command('rollback', dryrunopts +
4482 [('f', 'force', False, _('ignore safety measures'))])
4482 [('f', 'force', False, _('ignore safety measures'))])
4483 def rollback(ui, repo, **opts):
4483 def rollback(ui, repo, **opts):
4484 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4484 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4485
4485
4486 Please use :hg:`commit --amend` instead of rollback to correct
4486 Please use :hg:`commit --amend` instead of rollback to correct
4487 mistakes in the last commit.
4487 mistakes in the last commit.
4488
4488
4489 This command should be used with care. There is only one level of
4489 This command should be used with care. There is only one level of
4490 rollback, and there is no way to undo a rollback. It will also
4490 rollback, and there is no way to undo a rollback. It will also
4491 restore the dirstate at the time of the last transaction, losing
4491 restore the dirstate at the time of the last transaction, losing
4492 any dirstate changes since that time. This command does not alter
4492 any dirstate changes since that time. This command does not alter
4493 the working directory.
4493 the working directory.
4494
4494
4495 Transactions are used to encapsulate the effects of all commands
4495 Transactions are used to encapsulate the effects of all commands
4496 that create new changesets or propagate existing changesets into a
4496 that create new changesets or propagate existing changesets into a
4497 repository.
4497 repository.
4498
4498
4499 .. container:: verbose
4499 .. container:: verbose
4500
4500
4501 For example, the following commands are transactional, and their
4501 For example, the following commands are transactional, and their
4502 effects can be rolled back:
4502 effects can be rolled back:
4503
4503
4504 - commit
4504 - commit
4505 - import
4505 - import
4506 - pull
4506 - pull
4507 - push (with this repository as the destination)
4507 - push (with this repository as the destination)
4508 - unbundle
4508 - unbundle
4509
4509
4510 To avoid permanent data loss, rollback will refuse to rollback a
4510 To avoid permanent data loss, rollback will refuse to rollback a
4511 commit transaction if it isn't checked out. Use --force to
4511 commit transaction if it isn't checked out. Use --force to
4512 override this protection.
4512 override this protection.
4513
4513
4514 The rollback command can be entirely disabled by setting the
4514 The rollback command can be entirely disabled by setting the
4515 ``ui.rollback`` configuration setting to false. If you're here
4515 ``ui.rollback`` configuration setting to false. If you're here
4516 because you want to use rollback and it's disabled, you can
4516 because you want to use rollback and it's disabled, you can
4517 re-enable the command by setting ``ui.rollback`` to true.
4517 re-enable the command by setting ``ui.rollback`` to true.
4518
4518
4519 This command is not intended for use on public repositories. Once
4519 This command is not intended for use on public repositories. Once
4520 changes are visible for pull by other users, rolling a transaction
4520 changes are visible for pull by other users, rolling a transaction
4521 back locally is ineffective (someone else may already have pulled
4521 back locally is ineffective (someone else may already have pulled
4522 the changes). Furthermore, a race is possible with readers of the
4522 the changes). Furthermore, a race is possible with readers of the
4523 repository; for example an in-progress pull from the repository
4523 repository; for example an in-progress pull from the repository
4524 may fail if a rollback is performed.
4524 may fail if a rollback is performed.
4525
4525
4526 Returns 0 on success, 1 if no rollback data is available.
4526 Returns 0 on success, 1 if no rollback data is available.
4527 """
4527 """
4528 if not ui.configbool('ui', 'rollback', True):
4528 if not ui.configbool('ui', 'rollback', True):
4529 raise error.Abort(_('rollback is disabled because it is unsafe'),
4529 raise error.Abort(_('rollback is disabled because it is unsafe'),
4530 hint=('see `hg help -v rollback` for information'))
4530 hint=('see `hg help -v rollback` for information'))
4531 return repo.rollback(dryrun=opts.get(r'dry_run'),
4531 return repo.rollback(dryrun=opts.get(r'dry_run'),
4532 force=opts.get(r'force'))
4532 force=opts.get(r'force'))
4533
4533
4534 @command('root', [])
4534 @command('root', [])
4535 def root(ui, repo):
4535 def root(ui, repo):
4536 """print the root (top) of the current working directory
4536 """print the root (top) of the current working directory
4537
4537
4538 Print the root directory of the current repository.
4538 Print the root directory of the current repository.
4539
4539
4540 Returns 0 on success.
4540 Returns 0 on success.
4541 """
4541 """
4542 ui.write(repo.root + "\n")
4542 ui.write(repo.root + "\n")
4543
4543
4544 @command('^serve',
4544 @command('^serve',
4545 [('A', 'accesslog', '', _('name of access log file to write to'),
4545 [('A', 'accesslog', '', _('name of access log file to write to'),
4546 _('FILE')),
4546 _('FILE')),
4547 ('d', 'daemon', None, _('run server in background')),
4547 ('d', 'daemon', None, _('run server in background')),
4548 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4548 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4549 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4549 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4550 # use string type, then we can check if something was passed
4550 # use string type, then we can check if something was passed
4551 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4551 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4552 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4552 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4553 _('ADDR')),
4553 _('ADDR')),
4554 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4554 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4555 _('PREFIX')),
4555 _('PREFIX')),
4556 ('n', 'name', '',
4556 ('n', 'name', '',
4557 _('name to show in web pages (default: working directory)'), _('NAME')),
4557 _('name to show in web pages (default: working directory)'), _('NAME')),
4558 ('', 'web-conf', '',
4558 ('', 'web-conf', '',
4559 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4559 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4560 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4560 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4561 _('FILE')),
4561 _('FILE')),
4562 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4562 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4563 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4563 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4564 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4564 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4565 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4565 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4566 ('', 'style', '', _('template style to use'), _('STYLE')),
4566 ('', 'style', '', _('template style to use'), _('STYLE')),
4567 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4567 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4568 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4568 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4569 + subrepoopts,
4569 + subrepoopts,
4570 _('[OPTION]...'),
4570 _('[OPTION]...'),
4571 optionalrepo=True)
4571 optionalrepo=True)
4572 def serve(ui, repo, **opts):
4572 def serve(ui, repo, **opts):
4573 """start stand-alone webserver
4573 """start stand-alone webserver
4574
4574
4575 Start a local HTTP repository browser and pull server. You can use
4575 Start a local HTTP repository browser and pull server. You can use
4576 this for ad-hoc sharing and browsing of repositories. It is
4576 this for ad-hoc sharing and browsing of repositories. It is
4577 recommended to use a real web server to serve a repository for
4577 recommended to use a real web server to serve a repository for
4578 longer periods of time.
4578 longer periods of time.
4579
4579
4580 Please note that the server does not implement access control.
4580 Please note that the server does not implement access control.
4581 This means that, by default, anybody can read from the server and
4581 This means that, by default, anybody can read from the server and
4582 nobody can write to it by default. Set the ``web.allow_push``
4582 nobody can write to it by default. Set the ``web.allow_push``
4583 option to ``*`` to allow everybody to push to the server. You
4583 option to ``*`` to allow everybody to push to the server. You
4584 should use a real web server if you need to authenticate users.
4584 should use a real web server if you need to authenticate users.
4585
4585
4586 By default, the server logs accesses to stdout and errors to
4586 By default, the server logs accesses to stdout and errors to
4587 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4587 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4588 files.
4588 files.
4589
4589
4590 To have the server choose a free port number to listen on, specify
4590 To have the server choose a free port number to listen on, specify
4591 a port number of 0; in this case, the server will print the port
4591 a port number of 0; in this case, the server will print the port
4592 number it uses.
4592 number it uses.
4593
4593
4594 Returns 0 on success.
4594 Returns 0 on success.
4595 """
4595 """
4596
4596
4597 opts = pycompat.byteskwargs(opts)
4597 opts = pycompat.byteskwargs(opts)
4598 if opts["stdio"] and opts["cmdserver"]:
4598 if opts["stdio"] and opts["cmdserver"]:
4599 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4599 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4600
4600
4601 if opts["stdio"]:
4601 if opts["stdio"]:
4602 if repo is None:
4602 if repo is None:
4603 raise error.RepoError(_("there is no Mercurial repository here"
4603 raise error.RepoError(_("there is no Mercurial repository here"
4604 " (.hg not found)"))
4604 " (.hg not found)"))
4605 s = sshserver.sshserver(ui, repo)
4605 s = sshserver.sshserver(ui, repo)
4606 s.serve_forever()
4606 s.serve_forever()
4607
4607
4608 service = server.createservice(ui, repo, opts)
4608 service = server.createservice(ui, repo, opts)
4609 return server.runservice(opts, initfn=service.init, runfn=service.run)
4609 return server.runservice(opts, initfn=service.init, runfn=service.run)
4610
4610
4611 @command('^status|st',
4611 @command('^status|st',
4612 [('A', 'all', None, _('show status of all files')),
4612 [('A', 'all', None, _('show status of all files')),
4613 ('m', 'modified', None, _('show only modified files')),
4613 ('m', 'modified', None, _('show only modified files')),
4614 ('a', 'added', None, _('show only added files')),
4614 ('a', 'added', None, _('show only added files')),
4615 ('r', 'removed', None, _('show only removed files')),
4615 ('r', 'removed', None, _('show only removed files')),
4616 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4616 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4617 ('c', 'clean', None, _('show only files without changes')),
4617 ('c', 'clean', None, _('show only files without changes')),
4618 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4618 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4619 ('i', 'ignored', None, _('show only ignored files')),
4619 ('i', 'ignored', None, _('show only ignored files')),
4620 ('n', 'no-status', None, _('hide status prefix')),
4620 ('n', 'no-status', None, _('hide status prefix')),
4621 ('C', 'copies', None, _('show source of copied files')),
4621 ('C', 'copies', None, _('show source of copied files')),
4622 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4622 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4623 ('', 'rev', [], _('show difference from revision'), _('REV')),
4623 ('', 'rev', [], _('show difference from revision'), _('REV')),
4624 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4624 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4625 ] + walkopts + subrepoopts + formatteropts,
4625 ] + walkopts + subrepoopts + formatteropts,
4626 _('[OPTION]... [FILE]...'),
4626 _('[OPTION]... [FILE]...'),
4627 inferrepo=True)
4627 inferrepo=True)
4628 def status(ui, repo, *pats, **opts):
4628 def status(ui, repo, *pats, **opts):
4629 """show changed files in the working directory
4629 """show changed files in the working directory
4630
4630
4631 Show status of files in the repository. If names are given, only
4631 Show status of files in the repository. If names are given, only
4632 files that match are shown. Files that are clean or ignored or
4632 files that match are shown. Files that are clean or ignored or
4633 the source of a copy/move operation, are not listed unless
4633 the source of a copy/move operation, are not listed unless
4634 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4634 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4635 Unless options described with "show only ..." are given, the
4635 Unless options described with "show only ..." are given, the
4636 options -mardu are used.
4636 options -mardu are used.
4637
4637
4638 Option -q/--quiet hides untracked (unknown and ignored) files
4638 Option -q/--quiet hides untracked (unknown and ignored) files
4639 unless explicitly requested with -u/--unknown or -i/--ignored.
4639 unless explicitly requested with -u/--unknown or -i/--ignored.
4640
4640
4641 .. note::
4641 .. note::
4642
4642
4643 :hg:`status` may appear to disagree with diff if permissions have
4643 :hg:`status` may appear to disagree with diff if permissions have
4644 changed or a merge has occurred. The standard diff format does
4644 changed or a merge has occurred. The standard diff format does
4645 not report permission changes and diff only reports changes
4645 not report permission changes and diff only reports changes
4646 relative to one merge parent.
4646 relative to one merge parent.
4647
4647
4648 If one revision is given, it is used as the base revision.
4648 If one revision is given, it is used as the base revision.
4649 If two revisions are given, the differences between them are
4649 If two revisions are given, the differences between them are
4650 shown. The --change option can also be used as a shortcut to list
4650 shown. The --change option can also be used as a shortcut to list
4651 the changed files of a revision from its first parent.
4651 the changed files of a revision from its first parent.
4652
4652
4653 The codes used to show the status of files are::
4653 The codes used to show the status of files are::
4654
4654
4655 M = modified
4655 M = modified
4656 A = added
4656 A = added
4657 R = removed
4657 R = removed
4658 C = clean
4658 C = clean
4659 ! = missing (deleted by non-hg command, but still tracked)
4659 ! = missing (deleted by non-hg command, but still tracked)
4660 ? = not tracked
4660 ? = not tracked
4661 I = ignored
4661 I = ignored
4662 = origin of the previous file (with --copies)
4662 = origin of the previous file (with --copies)
4663
4663
4664 .. container:: verbose
4664 .. container:: verbose
4665
4665
4666 Examples:
4666 Examples:
4667
4667
4668 - show changes in the working directory relative to a
4668 - show changes in the working directory relative to a
4669 changeset::
4669 changeset::
4670
4670
4671 hg status --rev 9353
4671 hg status --rev 9353
4672
4672
4673 - show changes in the working directory relative to the
4673 - show changes in the working directory relative to the
4674 current directory (see :hg:`help patterns` for more information)::
4674 current directory (see :hg:`help patterns` for more information)::
4675
4675
4676 hg status re:
4676 hg status re:
4677
4677
4678 - show all changes including copies in an existing changeset::
4678 - show all changes including copies in an existing changeset::
4679
4679
4680 hg status --copies --change 9353
4680 hg status --copies --change 9353
4681
4681
4682 - get a NUL separated list of added files, suitable for xargs::
4682 - get a NUL separated list of added files, suitable for xargs::
4683
4683
4684 hg status -an0
4684 hg status -an0
4685
4685
4686 Returns 0 on success.
4686 Returns 0 on success.
4687 """
4687 """
4688
4688
4689 opts = pycompat.byteskwargs(opts)
4689 opts = pycompat.byteskwargs(opts)
4690 revs = opts.get('rev')
4690 revs = opts.get('rev')
4691 change = opts.get('change')
4691 change = opts.get('change')
4692
4692
4693 if revs and change:
4693 if revs and change:
4694 msg = _('cannot specify --rev and --change at the same time')
4694 msg = _('cannot specify --rev and --change at the same time')
4695 raise error.Abort(msg)
4695 raise error.Abort(msg)
4696 elif change:
4696 elif change:
4697 node2 = scmutil.revsingle(repo, change, None).node()
4697 node2 = scmutil.revsingle(repo, change, None).node()
4698 node1 = repo[node2].p1().node()
4698 node1 = repo[node2].p1().node()
4699 else:
4699 else:
4700 node1, node2 = scmutil.revpair(repo, revs)
4700 node1, node2 = scmutil.revpair(repo, revs)
4701
4701
4702 if pats or ui.configbool('commands', 'status.relative'):
4702 if pats or ui.configbool('commands', 'status.relative'):
4703 cwd = repo.getcwd()
4703 cwd = repo.getcwd()
4704 else:
4704 else:
4705 cwd = ''
4705 cwd = ''
4706
4706
4707 if opts.get('print0'):
4707 if opts.get('print0'):
4708 end = '\0'
4708 end = '\0'
4709 else:
4709 else:
4710 end = '\n'
4710 end = '\n'
4711 copy = {}
4711 copy = {}
4712 states = 'modified added removed deleted unknown ignored clean'.split()
4712 states = 'modified added removed deleted unknown ignored clean'.split()
4713 show = [k for k in states if opts.get(k)]
4713 show = [k for k in states if opts.get(k)]
4714 if opts.get('all'):
4714 if opts.get('all'):
4715 show += ui.quiet and (states[:4] + ['clean']) or states
4715 show += ui.quiet and (states[:4] + ['clean']) or states
4716 if not show:
4716 if not show:
4717 if ui.quiet:
4717 if ui.quiet:
4718 show = states[:4]
4718 show = states[:4]
4719 else:
4719 else:
4720 show = states[:5]
4720 show = states[:5]
4721
4721
4722 m = scmutil.match(repo[node2], pats, opts)
4722 m = scmutil.match(repo[node2], pats, opts)
4723 stat = repo.status(node1, node2, m,
4723 stat = repo.status(node1, node2, m,
4724 'ignored' in show, 'clean' in show, 'unknown' in show,
4724 'ignored' in show, 'clean' in show, 'unknown' in show,
4725 opts.get('subrepos'))
4725 opts.get('subrepos'))
4726 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4726 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4727
4727
4728 if (opts.get('all') or opts.get('copies')
4728 if (opts.get('all') or opts.get('copies')
4729 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4729 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4730 copy = copies.pathcopies(repo[node1], repo[node2], m)
4730 copy = copies.pathcopies(repo[node1], repo[node2], m)
4731
4731
4732 ui.pager('status')
4732 ui.pager('status')
4733 fm = ui.formatter('status', opts)
4733 fm = ui.formatter('status', opts)
4734 fmt = '%s' + end
4734 fmt = '%s' + end
4735 showchar = not opts.get('no_status')
4735 showchar = not opts.get('no_status')
4736
4736
4737 for state, char, files in changestates:
4737 for state, char, files in changestates:
4738 if state in show:
4738 if state in show:
4739 label = 'status.' + state
4739 label = 'status.' + state
4740 for f in files:
4740 for f in files:
4741 fm.startitem()
4741 fm.startitem()
4742 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4742 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4743 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4743 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4744 if f in copy:
4744 if f in copy:
4745 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4745 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4746 label='status.copied')
4746 label='status.copied')
4747 fm.end()
4747 fm.end()
4748
4748
4749 @command('^summary|sum',
4749 @command('^summary|sum',
4750 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4750 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4751 def summary(ui, repo, **opts):
4751 def summary(ui, repo, **opts):
4752 """summarize working directory state
4752 """summarize working directory state
4753
4753
4754 This generates a brief summary of the working directory state,
4754 This generates a brief summary of the working directory state,
4755 including parents, branch, commit status, phase and available updates.
4755 including parents, branch, commit status, phase and available updates.
4756
4756
4757 With the --remote option, this will check the default paths for
4757 With the --remote option, this will check the default paths for
4758 incoming and outgoing changes. This can be time-consuming.
4758 incoming and outgoing changes. This can be time-consuming.
4759
4759
4760 Returns 0 on success.
4760 Returns 0 on success.
4761 """
4761 """
4762
4762
4763 opts = pycompat.byteskwargs(opts)
4763 opts = pycompat.byteskwargs(opts)
4764 ui.pager('summary')
4764 ui.pager('summary')
4765 ctx = repo[None]
4765 ctx = repo[None]
4766 parents = ctx.parents()
4766 parents = ctx.parents()
4767 pnode = parents[0].node()
4767 pnode = parents[0].node()
4768 marks = []
4768 marks = []
4769
4769
4770 ms = None
4770 ms = None
4771 try:
4771 try:
4772 ms = mergemod.mergestate.read(repo)
4772 ms = mergemod.mergestate.read(repo)
4773 except error.UnsupportedMergeRecords as e:
4773 except error.UnsupportedMergeRecords as e:
4774 s = ' '.join(e.recordtypes)
4774 s = ' '.join(e.recordtypes)
4775 ui.warn(
4775 ui.warn(
4776 _('warning: merge state has unsupported record types: %s\n') % s)
4776 _('warning: merge state has unsupported record types: %s\n') % s)
4777 unresolved = 0
4777 unresolved = 0
4778 else:
4778 else:
4779 unresolved = [f for f in ms if ms[f] == 'u']
4779 unresolved = [f for f in ms if ms[f] == 'u']
4780
4780
4781 for p in parents:
4781 for p in parents:
4782 # label with log.changeset (instead of log.parent) since this
4782 # label with log.changeset (instead of log.parent) since this
4783 # shows a working directory parent *changeset*:
4783 # shows a working directory parent *changeset*:
4784 # i18n: column positioning for "hg summary"
4784 # i18n: column positioning for "hg summary"
4785 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4785 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4786 label=cmdutil._changesetlabels(p))
4786 label=cmdutil._changesetlabels(p))
4787 ui.write(' '.join(p.tags()), label='log.tag')
4787 ui.write(' '.join(p.tags()), label='log.tag')
4788 if p.bookmarks():
4788 if p.bookmarks():
4789 marks.extend(p.bookmarks())
4789 marks.extend(p.bookmarks())
4790 if p.rev() == -1:
4790 if p.rev() == -1:
4791 if not len(repo):
4791 if not len(repo):
4792 ui.write(_(' (empty repository)'))
4792 ui.write(_(' (empty repository)'))
4793 else:
4793 else:
4794 ui.write(_(' (no revision checked out)'))
4794 ui.write(_(' (no revision checked out)'))
4795 if p.obsolete():
4795 if p.obsolete():
4796 ui.write(_(' (obsolete)'))
4796 ui.write(_(' (obsolete)'))
4797 if p.troubled():
4797 if p.troubled():
4798 ui.write(' ('
4798 ui.write(' ('
4799 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4799 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4800 for trouble in p.troubles())
4800 for trouble in p.troubles())
4801 + ')')
4801 + ')')
4802 ui.write('\n')
4802 ui.write('\n')
4803 if p.description():
4803 if p.description():
4804 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4804 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4805 label='log.summary')
4805 label='log.summary')
4806
4806
4807 branch = ctx.branch()
4807 branch = ctx.branch()
4808 bheads = repo.branchheads(branch)
4808 bheads = repo.branchheads(branch)
4809 # i18n: column positioning for "hg summary"
4809 # i18n: column positioning for "hg summary"
4810 m = _('branch: %s\n') % branch
4810 m = _('branch: %s\n') % branch
4811 if branch != 'default':
4811 if branch != 'default':
4812 ui.write(m, label='log.branch')
4812 ui.write(m, label='log.branch')
4813 else:
4813 else:
4814 ui.status(m, label='log.branch')
4814 ui.status(m, label='log.branch')
4815
4815
4816 if marks:
4816 if marks:
4817 active = repo._activebookmark
4817 active = repo._activebookmark
4818 # i18n: column positioning for "hg summary"
4818 # i18n: column positioning for "hg summary"
4819 ui.write(_('bookmarks:'), label='log.bookmark')
4819 ui.write(_('bookmarks:'), label='log.bookmark')
4820 if active is not None:
4820 if active is not None:
4821 if active in marks:
4821 if active in marks:
4822 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4822 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4823 marks.remove(active)
4823 marks.remove(active)
4824 else:
4824 else:
4825 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4825 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4826 for m in marks:
4826 for m in marks:
4827 ui.write(' ' + m, label='log.bookmark')
4827 ui.write(' ' + m, label='log.bookmark')
4828 ui.write('\n', label='log.bookmark')
4828 ui.write('\n', label='log.bookmark')
4829
4829
4830 status = repo.status(unknown=True)
4830 status = repo.status(unknown=True)
4831
4831
4832 c = repo.dirstate.copies()
4832 c = repo.dirstate.copies()
4833 copied, renamed = [], []
4833 copied, renamed = [], []
4834 for d, s in c.iteritems():
4834 for d, s in c.iteritems():
4835 if s in status.removed:
4835 if s in status.removed:
4836 status.removed.remove(s)
4836 status.removed.remove(s)
4837 renamed.append(d)
4837 renamed.append(d)
4838 else:
4838 else:
4839 copied.append(d)
4839 copied.append(d)
4840 if d in status.added:
4840 if d in status.added:
4841 status.added.remove(d)
4841 status.added.remove(d)
4842
4842
4843 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4843 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4844
4844
4845 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4845 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4846 (ui.label(_('%d added'), 'status.added'), status.added),
4846 (ui.label(_('%d added'), 'status.added'), status.added),
4847 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4847 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4848 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4848 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4849 (ui.label(_('%d copied'), 'status.copied'), copied),
4849 (ui.label(_('%d copied'), 'status.copied'), copied),
4850 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4850 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4851 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4851 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4852 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4852 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4853 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4853 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4854 t = []
4854 t = []
4855 for l, s in labels:
4855 for l, s in labels:
4856 if s:
4856 if s:
4857 t.append(l % len(s))
4857 t.append(l % len(s))
4858
4858
4859 t = ', '.join(t)
4859 t = ', '.join(t)
4860 cleanworkdir = False
4860 cleanworkdir = False
4861
4861
4862 if repo.vfs.exists('graftstate'):
4862 if repo.vfs.exists('graftstate'):
4863 t += _(' (graft in progress)')
4863 t += _(' (graft in progress)')
4864 if repo.vfs.exists('updatestate'):
4864 if repo.vfs.exists('updatestate'):
4865 t += _(' (interrupted update)')
4865 t += _(' (interrupted update)')
4866 elif len(parents) > 1:
4866 elif len(parents) > 1:
4867 t += _(' (merge)')
4867 t += _(' (merge)')
4868 elif branch != parents[0].branch():
4868 elif branch != parents[0].branch():
4869 t += _(' (new branch)')
4869 t += _(' (new branch)')
4870 elif (parents[0].closesbranch() and
4870 elif (parents[0].closesbranch() and
4871 pnode in repo.branchheads(branch, closed=True)):
4871 pnode in repo.branchheads(branch, closed=True)):
4872 t += _(' (head closed)')
4872 t += _(' (head closed)')
4873 elif not (status.modified or status.added or status.removed or renamed or
4873 elif not (status.modified or status.added or status.removed or renamed or
4874 copied or subs):
4874 copied or subs):
4875 t += _(' (clean)')
4875 t += _(' (clean)')
4876 cleanworkdir = True
4876 cleanworkdir = True
4877 elif pnode not in bheads:
4877 elif pnode not in bheads:
4878 t += _(' (new branch head)')
4878 t += _(' (new branch head)')
4879
4879
4880 if parents:
4880 if parents:
4881 pendingphase = max(p.phase() for p in parents)
4881 pendingphase = max(p.phase() for p in parents)
4882 else:
4882 else:
4883 pendingphase = phases.public
4883 pendingphase = phases.public
4884
4884
4885 if pendingphase > phases.newcommitphase(ui):
4885 if pendingphase > phases.newcommitphase(ui):
4886 t += ' (%s)' % phases.phasenames[pendingphase]
4886 t += ' (%s)' % phases.phasenames[pendingphase]
4887
4887
4888 if cleanworkdir:
4888 if cleanworkdir:
4889 # i18n: column positioning for "hg summary"
4889 # i18n: column positioning for "hg summary"
4890 ui.status(_('commit: %s\n') % t.strip())
4890 ui.status(_('commit: %s\n') % t.strip())
4891 else:
4891 else:
4892 # i18n: column positioning for "hg summary"
4892 # i18n: column positioning for "hg summary"
4893 ui.write(_('commit: %s\n') % t.strip())
4893 ui.write(_('commit: %s\n') % t.strip())
4894
4894
4895 # all ancestors of branch heads - all ancestors of parent = new csets
4895 # all ancestors of branch heads - all ancestors of parent = new csets
4896 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4896 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4897 bheads))
4897 bheads))
4898
4898
4899 if new == 0:
4899 if new == 0:
4900 # i18n: column positioning for "hg summary"
4900 # i18n: column positioning for "hg summary"
4901 ui.status(_('update: (current)\n'))
4901 ui.status(_('update: (current)\n'))
4902 elif pnode not in bheads:
4902 elif pnode not in bheads:
4903 # i18n: column positioning for "hg summary"
4903 # i18n: column positioning for "hg summary"
4904 ui.write(_('update: %d new changesets (update)\n') % new)
4904 ui.write(_('update: %d new changesets (update)\n') % new)
4905 else:
4905 else:
4906 # i18n: column positioning for "hg summary"
4906 # i18n: column positioning for "hg summary"
4907 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4907 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4908 (new, len(bheads)))
4908 (new, len(bheads)))
4909
4909
4910 t = []
4910 t = []
4911 draft = len(repo.revs('draft()'))
4911 draft = len(repo.revs('draft()'))
4912 if draft:
4912 if draft:
4913 t.append(_('%d draft') % draft)
4913 t.append(_('%d draft') % draft)
4914 secret = len(repo.revs('secret()'))
4914 secret = len(repo.revs('secret()'))
4915 if secret:
4915 if secret:
4916 t.append(_('%d secret') % secret)
4916 t.append(_('%d secret') % secret)
4917
4917
4918 if draft or secret:
4918 if draft or secret:
4919 ui.status(_('phases: %s\n') % ', '.join(t))
4919 ui.status(_('phases: %s\n') % ', '.join(t))
4920
4920
4921 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4921 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4922 for trouble in ("unstable", "divergent", "bumped"):
4922 for trouble in ("unstable", "divergent", "bumped"):
4923 numtrouble = len(repo.revs(trouble + "()"))
4923 numtrouble = len(repo.revs(trouble + "()"))
4924 # We write all the possibilities to ease translation
4924 # We write all the possibilities to ease translation
4925 troublemsg = {
4925 troublemsg = {
4926 "unstable": _("unstable: %d changesets"),
4926 "unstable": _("unstable: %d changesets"),
4927 "divergent": _("divergent: %d changesets"),
4927 "divergent": _("divergent: %d changesets"),
4928 "bumped": _("bumped: %d changesets"),
4928 "bumped": _("bumped: %d changesets"),
4929 }
4929 }
4930 if numtrouble > 0:
4930 if numtrouble > 0:
4931 ui.status(troublemsg[trouble] % numtrouble + "\n")
4931 ui.status(troublemsg[trouble] % numtrouble + "\n")
4932
4932
4933 cmdutil.summaryhooks(ui, repo)
4933 cmdutil.summaryhooks(ui, repo)
4934
4934
4935 if opts.get('remote'):
4935 if opts.get('remote'):
4936 needsincoming, needsoutgoing = True, True
4936 needsincoming, needsoutgoing = True, True
4937 else:
4937 else:
4938 needsincoming, needsoutgoing = False, False
4938 needsincoming, needsoutgoing = False, False
4939 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4939 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4940 if i:
4940 if i:
4941 needsincoming = True
4941 needsincoming = True
4942 if o:
4942 if o:
4943 needsoutgoing = True
4943 needsoutgoing = True
4944 if not needsincoming and not needsoutgoing:
4944 if not needsincoming and not needsoutgoing:
4945 return
4945 return
4946
4946
4947 def getincoming():
4947 def getincoming():
4948 source, branches = hg.parseurl(ui.expandpath('default'))
4948 source, branches = hg.parseurl(ui.expandpath('default'))
4949 sbranch = branches[0]
4949 sbranch = branches[0]
4950 try:
4950 try:
4951 other = hg.peer(repo, {}, source)
4951 other = hg.peer(repo, {}, source)
4952 except error.RepoError:
4952 except error.RepoError:
4953 if opts.get('remote'):
4953 if opts.get('remote'):
4954 raise
4954 raise
4955 return source, sbranch, None, None, None
4955 return source, sbranch, None, None, None
4956 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4956 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4957 if revs:
4957 if revs:
4958 revs = [other.lookup(rev) for rev in revs]
4958 revs = [other.lookup(rev) for rev in revs]
4959 ui.debug('comparing with %s\n' % util.hidepassword(source))
4959 ui.debug('comparing with %s\n' % util.hidepassword(source))
4960 repo.ui.pushbuffer()
4960 repo.ui.pushbuffer()
4961 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4961 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4962 repo.ui.popbuffer()
4962 repo.ui.popbuffer()
4963 return source, sbranch, other, commoninc, commoninc[1]
4963 return source, sbranch, other, commoninc, commoninc[1]
4964
4964
4965 if needsincoming:
4965 if needsincoming:
4966 source, sbranch, sother, commoninc, incoming = getincoming()
4966 source, sbranch, sother, commoninc, incoming = getincoming()
4967 else:
4967 else:
4968 source = sbranch = sother = commoninc = incoming = None
4968 source = sbranch = sother = commoninc = incoming = None
4969
4969
4970 def getoutgoing():
4970 def getoutgoing():
4971 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
4971 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
4972 dbranch = branches[0]
4972 dbranch = branches[0]
4973 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
4973 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
4974 if source != dest:
4974 if source != dest:
4975 try:
4975 try:
4976 dother = hg.peer(repo, {}, dest)
4976 dother = hg.peer(repo, {}, dest)
4977 except error.RepoError:
4977 except error.RepoError:
4978 if opts.get('remote'):
4978 if opts.get('remote'):
4979 raise
4979 raise
4980 return dest, dbranch, None, None
4980 return dest, dbranch, None, None
4981 ui.debug('comparing with %s\n' % util.hidepassword(dest))
4981 ui.debug('comparing with %s\n' % util.hidepassword(dest))
4982 elif sother is None:
4982 elif sother is None:
4983 # there is no explicit destination peer, but source one is invalid
4983 # there is no explicit destination peer, but source one is invalid
4984 return dest, dbranch, None, None
4984 return dest, dbranch, None, None
4985 else:
4985 else:
4986 dother = sother
4986 dother = sother
4987 if (source != dest or (sbranch is not None and sbranch != dbranch)):
4987 if (source != dest or (sbranch is not None and sbranch != dbranch)):
4988 common = None
4988 common = None
4989 else:
4989 else:
4990 common = commoninc
4990 common = commoninc
4991 if revs:
4991 if revs:
4992 revs = [repo.lookup(rev) for rev in revs]
4992 revs = [repo.lookup(rev) for rev in revs]
4993 repo.ui.pushbuffer()
4993 repo.ui.pushbuffer()
4994 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
4994 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
4995 commoninc=common)
4995 commoninc=common)
4996 repo.ui.popbuffer()
4996 repo.ui.popbuffer()
4997 return dest, dbranch, dother, outgoing
4997 return dest, dbranch, dother, outgoing
4998
4998
4999 if needsoutgoing:
4999 if needsoutgoing:
5000 dest, dbranch, dother, outgoing = getoutgoing()
5000 dest, dbranch, dother, outgoing = getoutgoing()
5001 else:
5001 else:
5002 dest = dbranch = dother = outgoing = None
5002 dest = dbranch = dother = outgoing = None
5003
5003
5004 if opts.get('remote'):
5004 if opts.get('remote'):
5005 t = []
5005 t = []
5006 if incoming:
5006 if incoming:
5007 t.append(_('1 or more incoming'))
5007 t.append(_('1 or more incoming'))
5008 o = outgoing.missing
5008 o = outgoing.missing
5009 if o:
5009 if o:
5010 t.append(_('%d outgoing') % len(o))
5010 t.append(_('%d outgoing') % len(o))
5011 other = dother or sother
5011 other = dother or sother
5012 if 'bookmarks' in other.listkeys('namespaces'):
5012 if 'bookmarks' in other.listkeys('namespaces'):
5013 counts = bookmarks.summary(repo, other)
5013 counts = bookmarks.summary(repo, other)
5014 if counts[0] > 0:
5014 if counts[0] > 0:
5015 t.append(_('%d incoming bookmarks') % counts[0])
5015 t.append(_('%d incoming bookmarks') % counts[0])
5016 if counts[1] > 0:
5016 if counts[1] > 0:
5017 t.append(_('%d outgoing bookmarks') % counts[1])
5017 t.append(_('%d outgoing bookmarks') % counts[1])
5018
5018
5019 if t:
5019 if t:
5020 # i18n: column positioning for "hg summary"
5020 # i18n: column positioning for "hg summary"
5021 ui.write(_('remote: %s\n') % (', '.join(t)))
5021 ui.write(_('remote: %s\n') % (', '.join(t)))
5022 else:
5022 else:
5023 # i18n: column positioning for "hg summary"
5023 # i18n: column positioning for "hg summary"
5024 ui.status(_('remote: (synced)\n'))
5024 ui.status(_('remote: (synced)\n'))
5025
5025
5026 cmdutil.summaryremotehooks(ui, repo, opts,
5026 cmdutil.summaryremotehooks(ui, repo, opts,
5027 ((source, sbranch, sother, commoninc),
5027 ((source, sbranch, sother, commoninc),
5028 (dest, dbranch, dother, outgoing)))
5028 (dest, dbranch, dother, outgoing)))
5029
5029
5030 @command('tag',
5030 @command('tag',
5031 [('f', 'force', None, _('force tag')),
5031 [('f', 'force', None, _('force tag')),
5032 ('l', 'local', None, _('make the tag local')),
5032 ('l', 'local', None, _('make the tag local')),
5033 ('r', 'rev', '', _('revision to tag'), _('REV')),
5033 ('r', 'rev', '', _('revision to tag'), _('REV')),
5034 ('', 'remove', None, _('remove a tag')),
5034 ('', 'remove', None, _('remove a tag')),
5035 # -l/--local is already there, commitopts cannot be used
5035 # -l/--local is already there, commitopts cannot be used
5036 ('e', 'edit', None, _('invoke editor on commit messages')),
5036 ('e', 'edit', None, _('invoke editor on commit messages')),
5037 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5037 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5038 ] + commitopts2,
5038 ] + commitopts2,
5039 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5039 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5040 def tag(ui, repo, name1, *names, **opts):
5040 def tag(ui, repo, name1, *names, **opts):
5041 """add one or more tags for the current or given revision
5041 """add one or more tags for the current or given revision
5042
5042
5043 Name a particular revision using <name>.
5043 Name a particular revision using <name>.
5044
5044
5045 Tags are used to name particular revisions of the repository and are
5045 Tags are used to name particular revisions of the repository and are
5046 very useful to compare different revisions, to go back to significant
5046 very useful to compare different revisions, to go back to significant
5047 earlier versions or to mark branch points as releases, etc. Changing
5047 earlier versions or to mark branch points as releases, etc. Changing
5048 an existing tag is normally disallowed; use -f/--force to override.
5048 an existing tag is normally disallowed; use -f/--force to override.
5049
5049
5050 If no revision is given, the parent of the working directory is
5050 If no revision is given, the parent of the working directory is
5051 used.
5051 used.
5052
5052
5053 To facilitate version control, distribution, and merging of tags,
5053 To facilitate version control, distribution, and merging of tags,
5054 they are stored as a file named ".hgtags" which is managed similarly
5054 they are stored as a file named ".hgtags" which is managed similarly
5055 to other project files and can be hand-edited if necessary. This
5055 to other project files and can be hand-edited if necessary. This
5056 also means that tagging creates a new commit. The file
5056 also means that tagging creates a new commit. The file
5057 ".hg/localtags" is used for local tags (not shared among
5057 ".hg/localtags" is used for local tags (not shared among
5058 repositories).
5058 repositories).
5059
5059
5060 Tag commits are usually made at the head of a branch. If the parent
5060 Tag commits are usually made at the head of a branch. If the parent
5061 of the working directory is not a branch head, :hg:`tag` aborts; use
5061 of the working directory is not a branch head, :hg:`tag` aborts; use
5062 -f/--force to force the tag commit to be based on a non-head
5062 -f/--force to force the tag commit to be based on a non-head
5063 changeset.
5063 changeset.
5064
5064
5065 See :hg:`help dates` for a list of formats valid for -d/--date.
5065 See :hg:`help dates` for a list of formats valid for -d/--date.
5066
5066
5067 Since tag names have priority over branch names during revision
5067 Since tag names have priority over branch names during revision
5068 lookup, using an existing branch name as a tag name is discouraged.
5068 lookup, using an existing branch name as a tag name is discouraged.
5069
5069
5070 Returns 0 on success.
5070 Returns 0 on success.
5071 """
5071 """
5072 opts = pycompat.byteskwargs(opts)
5072 opts = pycompat.byteskwargs(opts)
5073 wlock = lock = None
5073 wlock = lock = None
5074 try:
5074 try:
5075 wlock = repo.wlock()
5075 wlock = repo.wlock()
5076 lock = repo.lock()
5076 lock = repo.lock()
5077 rev_ = "."
5077 rev_ = "."
5078 names = [t.strip() for t in (name1,) + names]
5078 names = [t.strip() for t in (name1,) + names]
5079 if len(names) != len(set(names)):
5079 if len(names) != len(set(names)):
5080 raise error.Abort(_('tag names must be unique'))
5080 raise error.Abort(_('tag names must be unique'))
5081 for n in names:
5081 for n in names:
5082 scmutil.checknewlabel(repo, n, 'tag')
5082 scmutil.checknewlabel(repo, n, 'tag')
5083 if not n:
5083 if not n:
5084 raise error.Abort(_('tag names cannot consist entirely of '
5084 raise error.Abort(_('tag names cannot consist entirely of '
5085 'whitespace'))
5085 'whitespace'))
5086 if opts.get('rev') and opts.get('remove'):
5086 if opts.get('rev') and opts.get('remove'):
5087 raise error.Abort(_("--rev and --remove are incompatible"))
5087 raise error.Abort(_("--rev and --remove are incompatible"))
5088 if opts.get('rev'):
5088 if opts.get('rev'):
5089 rev_ = opts['rev']
5089 rev_ = opts['rev']
5090 message = opts.get('message')
5090 message = opts.get('message')
5091 if opts.get('remove'):
5091 if opts.get('remove'):
5092 if opts.get('local'):
5092 if opts.get('local'):
5093 expectedtype = 'local'
5093 expectedtype = 'local'
5094 else:
5094 else:
5095 expectedtype = 'global'
5095 expectedtype = 'global'
5096
5096
5097 for n in names:
5097 for n in names:
5098 if not repo.tagtype(n):
5098 if not repo.tagtype(n):
5099 raise error.Abort(_("tag '%s' does not exist") % n)
5099 raise error.Abort(_("tag '%s' does not exist") % n)
5100 if repo.tagtype(n) != expectedtype:
5100 if repo.tagtype(n) != expectedtype:
5101 if expectedtype == 'global':
5101 if expectedtype == 'global':
5102 raise error.Abort(_("tag '%s' is not a global tag") % n)
5102 raise error.Abort(_("tag '%s' is not a global tag") % n)
5103 else:
5103 else:
5104 raise error.Abort(_("tag '%s' is not a local tag") % n)
5104 raise error.Abort(_("tag '%s' is not a local tag") % n)
5105 rev_ = 'null'
5105 rev_ = 'null'
5106 if not message:
5106 if not message:
5107 # we don't translate commit messages
5107 # we don't translate commit messages
5108 message = 'Removed tag %s' % ', '.join(names)
5108 message = 'Removed tag %s' % ', '.join(names)
5109 elif not opts.get('force'):
5109 elif not opts.get('force'):
5110 for n in names:
5110 for n in names:
5111 if n in repo.tags():
5111 if n in repo.tags():
5112 raise error.Abort(_("tag '%s' already exists "
5112 raise error.Abort(_("tag '%s' already exists "
5113 "(use -f to force)") % n)
5113 "(use -f to force)") % n)
5114 if not opts.get('local'):
5114 if not opts.get('local'):
5115 p1, p2 = repo.dirstate.parents()
5115 p1, p2 = repo.dirstate.parents()
5116 if p2 != nullid:
5116 if p2 != nullid:
5117 raise error.Abort(_('uncommitted merge'))
5117 raise error.Abort(_('uncommitted merge'))
5118 bheads = repo.branchheads()
5118 bheads = repo.branchheads()
5119 if not opts.get('force') and bheads and p1 not in bheads:
5119 if not opts.get('force') and bheads and p1 not in bheads:
5120 raise error.Abort(_('working directory is not at a branch head '
5120 raise error.Abort(_('working directory is not at a branch head '
5121 '(use -f to force)'))
5121 '(use -f to force)'))
5122 r = scmutil.revsingle(repo, rev_).node()
5122 r = scmutil.revsingle(repo, rev_).node()
5123
5123
5124 if not message:
5124 if not message:
5125 # we don't translate commit messages
5125 # we don't translate commit messages
5126 message = ('Added tag %s for changeset %s' %
5126 message = ('Added tag %s for changeset %s' %
5127 (', '.join(names), short(r)))
5127 (', '.join(names), short(r)))
5128
5128
5129 date = opts.get('date')
5129 date = opts.get('date')
5130 if date:
5130 if date:
5131 date = util.parsedate(date)
5131 date = util.parsedate(date)
5132
5132
5133 if opts.get('remove'):
5133 if opts.get('remove'):
5134 editform = 'tag.remove'
5134 editform = 'tag.remove'
5135 else:
5135 else:
5136 editform = 'tag.add'
5136 editform = 'tag.add'
5137 editor = cmdutil.getcommiteditor(editform=editform,
5137 editor = cmdutil.getcommiteditor(editform=editform,
5138 **pycompat.strkwargs(opts))
5138 **pycompat.strkwargs(opts))
5139
5139
5140 # don't allow tagging the null rev
5140 # don't allow tagging the null rev
5141 if (not opts.get('remove') and
5141 if (not opts.get('remove') and
5142 scmutil.revsingle(repo, rev_).rev() == nullrev):
5142 scmutil.revsingle(repo, rev_).rev() == nullrev):
5143 raise error.Abort(_("cannot tag null revision"))
5143 raise error.Abort(_("cannot tag null revision"))
5144
5144
5145 tagsmod.tag(repo, names, r, message, opts.get('local'),
5145 tagsmod.tag(repo, names, r, message, opts.get('local'),
5146 opts.get('user'), date, editor=editor)
5146 opts.get('user'), date, editor=editor)
5147 finally:
5147 finally:
5148 release(lock, wlock)
5148 release(lock, wlock)
5149
5149
5150 @command('tags', formatteropts, '')
5150 @command('tags', formatteropts, '')
5151 def tags(ui, repo, **opts):
5151 def tags(ui, repo, **opts):
5152 """list repository tags
5152 """list repository tags
5153
5153
5154 This lists both regular and local tags. When the -v/--verbose
5154 This lists both regular and local tags. When the -v/--verbose
5155 switch is used, a third column "local" is printed for local tags.
5155 switch is used, a third column "local" is printed for local tags.
5156 When the -q/--quiet switch is used, only the tag name is printed.
5156 When the -q/--quiet switch is used, only the tag name is printed.
5157
5157
5158 Returns 0 on success.
5158 Returns 0 on success.
5159 """
5159 """
5160
5160
5161 opts = pycompat.byteskwargs(opts)
5161 opts = pycompat.byteskwargs(opts)
5162 ui.pager('tags')
5162 ui.pager('tags')
5163 fm = ui.formatter('tags', opts)
5163 fm = ui.formatter('tags', opts)
5164 hexfunc = fm.hexfunc
5164 hexfunc = fm.hexfunc
5165 tagtype = ""
5165 tagtype = ""
5166
5166
5167 for t, n in reversed(repo.tagslist()):
5167 for t, n in reversed(repo.tagslist()):
5168 hn = hexfunc(n)
5168 hn = hexfunc(n)
5169 label = 'tags.normal'
5169 label = 'tags.normal'
5170 tagtype = ''
5170 tagtype = ''
5171 if repo.tagtype(t) == 'local':
5171 if repo.tagtype(t) == 'local':
5172 label = 'tags.local'
5172 label = 'tags.local'
5173 tagtype = 'local'
5173 tagtype = 'local'
5174
5174
5175 fm.startitem()
5175 fm.startitem()
5176 fm.write('tag', '%s', t, label=label)
5176 fm.write('tag', '%s', t, label=label)
5177 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5177 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5178 fm.condwrite(not ui.quiet, 'rev node', fmt,
5178 fm.condwrite(not ui.quiet, 'rev node', fmt,
5179 repo.changelog.rev(n), hn, label=label)
5179 repo.changelog.rev(n), hn, label=label)
5180 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5180 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5181 tagtype, label=label)
5181 tagtype, label=label)
5182 fm.plain('\n')
5182 fm.plain('\n')
5183 fm.end()
5183 fm.end()
5184
5184
5185 @command('tip',
5185 @command('tip',
5186 [('p', 'patch', None, _('show patch')),
5186 [('p', 'patch', None, _('show patch')),
5187 ('g', 'git', None, _('use git extended diff format')),
5187 ('g', 'git', None, _('use git extended diff format')),
5188 ] + templateopts,
5188 ] + templateopts,
5189 _('[-p] [-g]'))
5189 _('[-p] [-g]'))
5190 def tip(ui, repo, **opts):
5190 def tip(ui, repo, **opts):
5191 """show the tip revision (DEPRECATED)
5191 """show the tip revision (DEPRECATED)
5192
5192
5193 The tip revision (usually just called the tip) is the changeset
5193 The tip revision (usually just called the tip) is the changeset
5194 most recently added to the repository (and therefore the most
5194 most recently added to the repository (and therefore the most
5195 recently changed head).
5195 recently changed head).
5196
5196
5197 If you have just made a commit, that commit will be the tip. If
5197 If you have just made a commit, that commit will be the tip. If
5198 you have just pulled changes from another repository, the tip of
5198 you have just pulled changes from another repository, the tip of
5199 that repository becomes the current tip. The "tip" tag is special
5199 that repository becomes the current tip. The "tip" tag is special
5200 and cannot be renamed or assigned to a different changeset.
5200 and cannot be renamed or assigned to a different changeset.
5201
5201
5202 This command is deprecated, please use :hg:`heads` instead.
5202 This command is deprecated, please use :hg:`heads` instead.
5203
5203
5204 Returns 0 on success.
5204 Returns 0 on success.
5205 """
5205 """
5206 opts = pycompat.byteskwargs(opts)
5206 opts = pycompat.byteskwargs(opts)
5207 displayer = cmdutil.show_changeset(ui, repo, opts)
5207 displayer = cmdutil.show_changeset(ui, repo, opts)
5208 displayer.show(repo['tip'])
5208 displayer.show(repo['tip'])
5209 displayer.close()
5209 displayer.close()
5210
5210
5211 @command('unbundle',
5211 @command('unbundle',
5212 [('u', 'update', None,
5212 [('u', 'update', None,
5213 _('update to new branch head if changesets were unbundled'))],
5213 _('update to new branch head if changesets were unbundled'))],
5214 _('[-u] FILE...'))
5214 _('[-u] FILE...'))
5215 def unbundle(ui, repo, fname1, *fnames, **opts):
5215 def unbundle(ui, repo, fname1, *fnames, **opts):
5216 """apply one or more bundle files
5216 """apply one or more bundle files
5217
5217
5218 Apply one or more bundle files generated by :hg:`bundle`.
5218 Apply one or more bundle files generated by :hg:`bundle`.
5219
5219
5220 Returns 0 on success, 1 if an update has unresolved files.
5220 Returns 0 on success, 1 if an update has unresolved files.
5221 """
5221 """
5222 fnames = (fname1,) + fnames
5222 fnames = (fname1,) + fnames
5223
5223
5224 with repo.lock():
5224 with repo.lock():
5225 for fname in fnames:
5225 for fname in fnames:
5226 f = hg.openpath(ui, fname)
5226 f = hg.openpath(ui, fname)
5227 gen = exchange.readbundle(ui, f, fname)
5227 gen = exchange.readbundle(ui, f, fname)
5228 if isinstance(gen, streamclone.streamcloneapplier):
5228 if isinstance(gen, streamclone.streamcloneapplier):
5229 raise error.Abort(
5229 raise error.Abort(
5230 _('packed bundles cannot be applied with '
5230 _('packed bundles cannot be applied with '
5231 '"hg unbundle"'),
5231 '"hg unbundle"'),
5232 hint=_('use "hg debugapplystreamclonebundle"'))
5232 hint=_('use "hg debugapplystreamclonebundle"'))
5233 url = 'bundle:' + fname
5233 url = 'bundle:' + fname
5234 try:
5234 try:
5235 txnname = 'unbundle'
5235 txnname = 'unbundle'
5236 if not isinstance(gen, bundle2.unbundle20):
5236 if not isinstance(gen, bundle2.unbundle20):
5237 txnname = 'unbundle\n%s' % util.hidepassword(url)
5237 txnname = 'unbundle\n%s' % util.hidepassword(url)
5238 with repo.transaction(txnname) as tr:
5238 with repo.transaction(txnname) as tr:
5239 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5239 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5240 url=url)
5240 url=url)
5241 except error.BundleUnknownFeatureError as exc:
5241 except error.BundleUnknownFeatureError as exc:
5242 raise error.Abort(
5242 raise error.Abort(
5243 _('%s: unknown bundle feature, %s') % (fname, exc),
5243 _('%s: unknown bundle feature, %s') % (fname, exc),
5244 hint=_("see https://mercurial-scm.org/"
5244 hint=_("see https://mercurial-scm.org/"
5245 "wiki/BundleFeature for more "
5245 "wiki/BundleFeature for more "
5246 "information"))
5246 "information"))
5247 modheads = bundle2.combinechangegroupresults(op)
5247 modheads = bundle2.combinechangegroupresults(op)
5248
5248
5249 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5249 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5250
5250
5251 @command('^update|up|checkout|co',
5251 @command('^update|up|checkout|co',
5252 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5252 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5253 ('c', 'check', None, _('require clean working directory')),
5253 ('c', 'check', None, _('require clean working directory')),
5254 ('m', 'merge', None, _('merge uncommitted changes')),
5254 ('m', 'merge', None, _('merge uncommitted changes')),
5255 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5255 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5256 ('r', 'rev', '', _('revision'), _('REV'))
5256 ('r', 'rev', '', _('revision'), _('REV'))
5257 ] + mergetoolopts,
5257 ] + mergetoolopts,
5258 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5258 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5259 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5259 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5260 merge=None, tool=None):
5260 merge=None, tool=None):
5261 """update working directory (or switch revisions)
5261 """update working directory (or switch revisions)
5262
5262
5263 Update the repository's working directory to the specified
5263 Update the repository's working directory to the specified
5264 changeset. If no changeset is specified, update to the tip of the
5264 changeset. If no changeset is specified, update to the tip of the
5265 current named branch and move the active bookmark (see :hg:`help
5265 current named branch and move the active bookmark (see :hg:`help
5266 bookmarks`).
5266 bookmarks`).
5267
5267
5268 Update sets the working directory's parent revision to the specified
5268 Update sets the working directory's parent revision to the specified
5269 changeset (see :hg:`help parents`).
5269 changeset (see :hg:`help parents`).
5270
5270
5271 If the changeset is not a descendant or ancestor of the working
5271 If the changeset is not a descendant or ancestor of the working
5272 directory's parent and there are uncommitted changes, the update is
5272 directory's parent and there are uncommitted changes, the update is
5273 aborted. With the -c/--check option, the working directory is checked
5273 aborted. With the -c/--check option, the working directory is checked
5274 for uncommitted changes; if none are found, the working directory is
5274 for uncommitted changes; if none are found, the working directory is
5275 updated to the specified changeset.
5275 updated to the specified changeset.
5276
5276
5277 .. container:: verbose
5277 .. container:: verbose
5278
5278
5279 The -C/--clean, -c/--check, and -m/--merge options control what
5279 The -C/--clean, -c/--check, and -m/--merge options control what
5280 happens if the working directory contains uncommitted changes.
5280 happens if the working directory contains uncommitted changes.
5281 At most of one of them can be specified.
5281 At most of one of them can be specified.
5282
5282
5283 1. If no option is specified, and if
5283 1. If no option is specified, and if
5284 the requested changeset is an ancestor or descendant of
5284 the requested changeset is an ancestor or descendant of
5285 the working directory's parent, the uncommitted changes
5285 the working directory's parent, the uncommitted changes
5286 are merged into the requested changeset and the merged
5286 are merged into the requested changeset and the merged
5287 result is left uncommitted. If the requested changeset is
5287 result is left uncommitted. If the requested changeset is
5288 not an ancestor or descendant (that is, it is on another
5288 not an ancestor or descendant (that is, it is on another
5289 branch), the update is aborted and the uncommitted changes
5289 branch), the update is aborted and the uncommitted changes
5290 are preserved.
5290 are preserved.
5291
5291
5292 2. With the -m/--merge option, the update is allowed even if the
5292 2. With the -m/--merge option, the update is allowed even if the
5293 requested changeset is not an ancestor or descendant of
5293 requested changeset is not an ancestor or descendant of
5294 the working directory's parent.
5294 the working directory's parent.
5295
5295
5296 3. With the -c/--check option, the update is aborted and the
5296 3. With the -c/--check option, the update is aborted and the
5297 uncommitted changes are preserved.
5297 uncommitted changes are preserved.
5298
5298
5299 4. With the -C/--clean option, uncommitted changes are discarded and
5299 4. With the -C/--clean option, uncommitted changes are discarded and
5300 the working directory is updated to the requested changeset.
5300 the working directory is updated to the requested changeset.
5301
5301
5302 To cancel an uncommitted merge (and lose your changes), use
5302 To cancel an uncommitted merge (and lose your changes), use
5303 :hg:`update --clean .`.
5303 :hg:`update --clean .`.
5304
5304
5305 Use null as the changeset to remove the working directory (like
5305 Use null as the changeset to remove the working directory (like
5306 :hg:`clone -U`).
5306 :hg:`clone -U`).
5307
5307
5308 If you want to revert just one file to an older revision, use
5308 If you want to revert just one file to an older revision, use
5309 :hg:`revert [-r REV] NAME`.
5309 :hg:`revert [-r REV] NAME`.
5310
5310
5311 See :hg:`help dates` for a list of formats valid for -d/--date.
5311 See :hg:`help dates` for a list of formats valid for -d/--date.
5312
5312
5313 Returns 0 on success, 1 if there are unresolved files.
5313 Returns 0 on success, 1 if there are unresolved files.
5314 """
5314 """
5315 if rev and node:
5315 if rev and node:
5316 raise error.Abort(_("please specify just one revision"))
5316 raise error.Abort(_("please specify just one revision"))
5317
5317
5318 if ui.configbool('commands', 'update.requiredest'):
5318 if ui.configbool('commands', 'update.requiredest'):
5319 if not node and not rev and not date:
5319 if not node and not rev and not date:
5320 raise error.Abort(_('you must specify a destination'),
5320 raise error.Abort(_('you must specify a destination'),
5321 hint=_('for example: hg update ".::"'))
5321 hint=_('for example: hg update ".::"'))
5322
5322
5323 if rev is None or rev == '':
5323 if rev is None or rev == '':
5324 rev = node
5324 rev = node
5325
5325
5326 if date and rev is not None:
5326 if date and rev is not None:
5327 raise error.Abort(_("you can't specify a revision and a date"))
5327 raise error.Abort(_("you can't specify a revision and a date"))
5328
5328
5329 if len([x for x in (clean, check, merge) if x]) > 1:
5329 if len([x for x in (clean, check, merge) if x]) > 1:
5330 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5330 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5331 "or -m/merge"))
5331 "or -m/merge"))
5332
5332
5333 updatecheck = None
5333 updatecheck = None
5334 if check:
5334 if check:
5335 updatecheck = 'abort'
5335 updatecheck = 'abort'
5336 elif merge:
5336 elif merge:
5337 updatecheck = 'none'
5337 updatecheck = 'none'
5338
5338
5339 with repo.wlock():
5339 with repo.wlock():
5340 cmdutil.clearunfinished(repo)
5340 cmdutil.clearunfinished(repo)
5341
5341
5342 if date:
5342 if date:
5343 rev = cmdutil.finddate(ui, repo, date)
5343 rev = cmdutil.finddate(ui, repo, date)
5344
5344
5345 # if we defined a bookmark, we have to remember the original name
5345 # if we defined a bookmark, we have to remember the original name
5346 brev = rev
5346 brev = rev
5347 rev = scmutil.revsingle(repo, rev, rev).rev()
5347 rev = scmutil.revsingle(repo, rev, rev).rev()
5348
5348
5349 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5349 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5350
5350
5351 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5351 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5352 updatecheck=updatecheck)
5352 updatecheck=updatecheck)
5353
5353
5354 @command('verify', [])
5354 @command('verify', [])
5355 def verify(ui, repo):
5355 def verify(ui, repo):
5356 """verify the integrity of the repository
5356 """verify the integrity of the repository
5357
5357
5358 Verify the integrity of the current repository.
5358 Verify the integrity of the current repository.
5359
5359
5360 This will perform an extensive check of the repository's
5360 This will perform an extensive check of the repository's
5361 integrity, validating the hashes and checksums of each entry in
5361 integrity, validating the hashes and checksums of each entry in
5362 the changelog, manifest, and tracked files, as well as the
5362 the changelog, manifest, and tracked files, as well as the
5363 integrity of their crosslinks and indices.
5363 integrity of their crosslinks and indices.
5364
5364
5365 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5365 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5366 for more information about recovery from corruption of the
5366 for more information about recovery from corruption of the
5367 repository.
5367 repository.
5368
5368
5369 Returns 0 on success, 1 if errors are encountered.
5369 Returns 0 on success, 1 if errors are encountered.
5370 """
5370 """
5371 return hg.verify(repo)
5371 return hg.verify(repo)
5372
5372
5373 @command('version', [] + formatteropts, norepo=True)
5373 @command('version', [] + formatteropts, norepo=True)
5374 def version_(ui, **opts):
5374 def version_(ui, **opts):
5375 """output version and copyright information"""
5375 """output version and copyright information"""
5376 opts = pycompat.byteskwargs(opts)
5376 opts = pycompat.byteskwargs(opts)
5377 if ui.verbose:
5377 if ui.verbose:
5378 ui.pager('version')
5378 ui.pager('version')
5379 fm = ui.formatter("version", opts)
5379 fm = ui.formatter("version", opts)
5380 fm.startitem()
5380 fm.startitem()
5381 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5381 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5382 util.version())
5382 util.version())
5383 license = _(
5383 license = _(
5384 "(see https://mercurial-scm.org for more information)\n"
5384 "(see https://mercurial-scm.org for more information)\n"
5385 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5385 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5386 "This is free software; see the source for copying conditions. "
5386 "This is free software; see the source for copying conditions. "
5387 "There is NO\nwarranty; "
5387 "There is NO\nwarranty; "
5388 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5388 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5389 )
5389 )
5390 if not ui.quiet:
5390 if not ui.quiet:
5391 fm.plain(license)
5391 fm.plain(license)
5392
5392
5393 if ui.verbose:
5393 if ui.verbose:
5394 fm.plain(_("\nEnabled extensions:\n\n"))
5394 fm.plain(_("\nEnabled extensions:\n\n"))
5395 # format names and versions into columns
5395 # format names and versions into columns
5396 names = []
5396 names = []
5397 vers = []
5397 vers = []
5398 isinternals = []
5398 isinternals = []
5399 for name, module in extensions.extensions():
5399 for name, module in extensions.extensions():
5400 names.append(name)
5400 names.append(name)
5401 vers.append(extensions.moduleversion(module) or None)
5401 vers.append(extensions.moduleversion(module) or None)
5402 isinternals.append(extensions.ismoduleinternal(module))
5402 isinternals.append(extensions.ismoduleinternal(module))
5403 fn = fm.nested("extensions")
5403 fn = fm.nested("extensions")
5404 if names:
5404 if names:
5405 namefmt = " %%-%ds " % max(len(n) for n in names)
5405 namefmt = " %%-%ds " % max(len(n) for n in names)
5406 places = [_("external"), _("internal")]
5406 places = [_("external"), _("internal")]
5407 for n, v, p in zip(names, vers, isinternals):
5407 for n, v, p in zip(names, vers, isinternals):
5408 fn.startitem()
5408 fn.startitem()
5409 fn.condwrite(ui.verbose, "name", namefmt, n)
5409 fn.condwrite(ui.verbose, "name", namefmt, n)
5410 if ui.verbose:
5410 if ui.verbose:
5411 fn.plain("%s " % places[p])
5411 fn.plain("%s " % places[p])
5412 fn.data(bundled=p)
5412 fn.data(bundled=p)
5413 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5413 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5414 if ui.verbose:
5414 if ui.verbose:
5415 fn.plain("\n")
5415 fn.plain("\n")
5416 fn.end()
5416 fn.end()
5417 fm.end()
5417 fm.end()
5418
5418
5419 def loadcmdtable(ui, name, cmdtable):
5419 def loadcmdtable(ui, name, cmdtable):
5420 """Load command functions from specified cmdtable
5420 """Load command functions from specified cmdtable
5421 """
5421 """
5422 overrides = [cmd for cmd in cmdtable if cmd in table]
5422 overrides = [cmd for cmd in cmdtable if cmd in table]
5423 if overrides:
5423 if overrides:
5424 ui.warn(_("extension '%s' overrides commands: %s\n")
5424 ui.warn(_("extension '%s' overrides commands: %s\n")
5425 % (name, " ".join(overrides)))
5425 % (name, " ".join(overrides)))
5426 table.update(cmdtable)
5426 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now