##// END OF EJS Templates
serve: mark --stdio and --cmdserver as "(ADVANCED)" flags...
Jun Wu -
r31081:be74ce1b default
parent child Browse files
Show More
@@ -1,5429 +1,5429 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
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 )
21 )
22 from . import (
22 from . import (
23 archival,
23 archival,
24 bookmarks,
24 bookmarks,
25 bundle2,
25 bundle2,
26 changegroup,
26 changegroup,
27 cmdutil,
27 cmdutil,
28 copies,
28 copies,
29 destutil,
29 destutil,
30 dirstateguard,
30 dirstateguard,
31 discovery,
31 discovery,
32 encoding,
32 encoding,
33 error,
33 error,
34 exchange,
34 exchange,
35 extensions,
35 extensions,
36 graphmod,
36 graphmod,
37 hbisect,
37 hbisect,
38 help,
38 help,
39 hg,
39 hg,
40 lock as lockmod,
40 lock as lockmod,
41 merge as mergemod,
41 merge as mergemod,
42 obsolete,
42 obsolete,
43 patch,
43 patch,
44 phases,
44 phases,
45 pycompat,
45 pycompat,
46 revsetlang,
46 revsetlang,
47 scmutil,
47 scmutil,
48 server,
48 server,
49 sshserver,
49 sshserver,
50 streamclone,
50 streamclone,
51 templatekw,
51 templatekw,
52 ui as uimod,
52 ui as uimod,
53 util,
53 util,
54 )
54 )
55
55
56 release = lockmod.release
56 release = lockmod.release
57
57
58 table = {}
58 table = {}
59
59
60 command = cmdutil.command(table)
60 command = cmdutil.command(table)
61
61
62 # label constants
62 # label constants
63 # until 3.5, bookmarks.current was the advertised name, not
63 # until 3.5, bookmarks.current was the advertised name, not
64 # bookmarks.active, so we must use both to avoid breaking old
64 # bookmarks.active, so we must use both to avoid breaking old
65 # custom styles
65 # custom styles
66 activebookmarklabel = 'bookmarks.active bookmarks.current'
66 activebookmarklabel = 'bookmarks.active bookmarks.current'
67
67
68 # common command options
68 # common command options
69
69
70 globalopts = [
70 globalopts = [
71 ('R', 'repository', '',
71 ('R', 'repository', '',
72 _('repository root directory or name of overlay bundle file'),
72 _('repository root directory or name of overlay bundle file'),
73 _('REPO')),
73 _('REPO')),
74 ('', 'cwd', '',
74 ('', 'cwd', '',
75 _('change working directory'), _('DIR')),
75 _('change working directory'), _('DIR')),
76 ('y', 'noninteractive', None,
76 ('y', 'noninteractive', None,
77 _('do not prompt, automatically pick the first choice for all prompts')),
77 _('do not prompt, automatically pick the first choice for all prompts')),
78 ('q', 'quiet', None, _('suppress output')),
78 ('q', 'quiet', None, _('suppress output')),
79 ('v', 'verbose', None, _('enable additional output')),
79 ('v', 'verbose', None, _('enable additional output')),
80 ('', 'config', [],
80 ('', 'config', [],
81 _('set/override config option (use \'section.name=value\')'),
81 _('set/override config option (use \'section.name=value\')'),
82 _('CONFIG')),
82 _('CONFIG')),
83 ('', 'debug', None, _('enable debugging output')),
83 ('', 'debug', None, _('enable debugging output')),
84 ('', 'debugger', None, _('start debugger')),
84 ('', 'debugger', None, _('start debugger')),
85 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
85 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
86 _('ENCODE')),
86 _('ENCODE')),
87 ('', 'encodingmode', encoding.encodingmode,
87 ('', 'encodingmode', encoding.encodingmode,
88 _('set the charset encoding mode'), _('MODE')),
88 _('set the charset encoding mode'), _('MODE')),
89 ('', 'traceback', None, _('always print a traceback on exception')),
89 ('', 'traceback', None, _('always print a traceback on exception')),
90 ('', 'time', None, _('time how long the command takes')),
90 ('', 'time', None, _('time how long the command takes')),
91 ('', 'profile', None, _('print command execution profile')),
91 ('', 'profile', None, _('print command execution profile')),
92 ('', 'version', None, _('output version information and exit')),
92 ('', 'version', None, _('output version information and exit')),
93 ('h', 'help', None, _('display help and exit')),
93 ('h', 'help', None, _('display help and exit')),
94 ('', 'hidden', False, _('consider hidden changesets')),
94 ('', 'hidden', False, _('consider hidden changesets')),
95 ('', 'pager', 'auto',
95 ('', 'pager', 'auto',
96 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
96 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
97 ]
97 ]
98
98
99 dryrunopts = [('n', 'dry-run', None,
99 dryrunopts = [('n', 'dry-run', None,
100 _('do not perform actions, just print output'))]
100 _('do not perform actions, just print output'))]
101
101
102 remoteopts = [
102 remoteopts = [
103 ('e', 'ssh', '',
103 ('e', 'ssh', '',
104 _('specify ssh command to use'), _('CMD')),
104 _('specify ssh command to use'), _('CMD')),
105 ('', 'remotecmd', '',
105 ('', 'remotecmd', '',
106 _('specify hg command to run on the remote side'), _('CMD')),
106 _('specify hg command to run on the remote side'), _('CMD')),
107 ('', 'insecure', None,
107 ('', 'insecure', None,
108 _('do not verify server certificate (ignoring web.cacerts config)')),
108 _('do not verify server certificate (ignoring web.cacerts config)')),
109 ]
109 ]
110
110
111 walkopts = [
111 walkopts = [
112 ('I', 'include', [],
112 ('I', 'include', [],
113 _('include names matching the given patterns'), _('PATTERN')),
113 _('include names matching the given patterns'), _('PATTERN')),
114 ('X', 'exclude', [],
114 ('X', 'exclude', [],
115 _('exclude names matching the given patterns'), _('PATTERN')),
115 _('exclude names matching the given patterns'), _('PATTERN')),
116 ]
116 ]
117
117
118 commitopts = [
118 commitopts = [
119 ('m', 'message', '',
119 ('m', 'message', '',
120 _('use text as commit message'), _('TEXT')),
120 _('use text as commit message'), _('TEXT')),
121 ('l', 'logfile', '',
121 ('l', 'logfile', '',
122 _('read commit message from file'), _('FILE')),
122 _('read commit message from file'), _('FILE')),
123 ]
123 ]
124
124
125 commitopts2 = [
125 commitopts2 = [
126 ('d', 'date', '',
126 ('d', 'date', '',
127 _('record the specified date as commit date'), _('DATE')),
127 _('record the specified date as commit date'), _('DATE')),
128 ('u', 'user', '',
128 ('u', 'user', '',
129 _('record the specified user as committer'), _('USER')),
129 _('record the specified user as committer'), _('USER')),
130 ]
130 ]
131
131
132 # hidden for now
132 # hidden for now
133 formatteropts = [
133 formatteropts = [
134 ('T', 'template', '',
134 ('T', 'template', '',
135 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
135 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
136 ]
136 ]
137
137
138 templateopts = [
138 templateopts = [
139 ('', 'style', '',
139 ('', 'style', '',
140 _('display using template map file (DEPRECATED)'), _('STYLE')),
140 _('display using template map file (DEPRECATED)'), _('STYLE')),
141 ('T', 'template', '',
141 ('T', 'template', '',
142 _('display with template'), _('TEMPLATE')),
142 _('display with template'), _('TEMPLATE')),
143 ]
143 ]
144
144
145 logopts = [
145 logopts = [
146 ('p', 'patch', None, _('show patch')),
146 ('p', 'patch', None, _('show patch')),
147 ('g', 'git', None, _('use git extended diff format')),
147 ('g', 'git', None, _('use git extended diff format')),
148 ('l', 'limit', '',
148 ('l', 'limit', '',
149 _('limit number of changes displayed'), _('NUM')),
149 _('limit number of changes displayed'), _('NUM')),
150 ('M', 'no-merges', None, _('do not show merges')),
150 ('M', 'no-merges', None, _('do not show merges')),
151 ('', 'stat', None, _('output diffstat-style summary of changes')),
151 ('', 'stat', None, _('output diffstat-style summary of changes')),
152 ('G', 'graph', None, _("show the revision DAG")),
152 ('G', 'graph', None, _("show the revision DAG")),
153 ] + templateopts
153 ] + templateopts
154
154
155 diffopts = [
155 diffopts = [
156 ('a', 'text', None, _('treat all files as text')),
156 ('a', 'text', None, _('treat all files as text')),
157 ('g', 'git', None, _('use git extended diff format')),
157 ('g', 'git', None, _('use git extended diff format')),
158 ('', 'nodates', None, _('omit dates from diff headers'))
158 ('', 'nodates', None, _('omit dates from diff headers'))
159 ]
159 ]
160
160
161 diffwsopts = [
161 diffwsopts = [
162 ('w', 'ignore-all-space', None,
162 ('w', 'ignore-all-space', None,
163 _('ignore white space when comparing lines')),
163 _('ignore white space when comparing lines')),
164 ('b', 'ignore-space-change', None,
164 ('b', 'ignore-space-change', None,
165 _('ignore changes in the amount of white space')),
165 _('ignore changes in the amount of white space')),
166 ('B', 'ignore-blank-lines', None,
166 ('B', 'ignore-blank-lines', None,
167 _('ignore changes whose lines are all blank')),
167 _('ignore changes whose lines are all blank')),
168 ]
168 ]
169
169
170 diffopts2 = [
170 diffopts2 = [
171 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
171 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
172 ('p', 'show-function', None, _('show which function each change is in')),
172 ('p', 'show-function', None, _('show which function each change is in')),
173 ('', 'reverse', None, _('produce a diff that undoes the changes')),
173 ('', 'reverse', None, _('produce a diff that undoes the changes')),
174 ] + diffwsopts + [
174 ] + diffwsopts + [
175 ('U', 'unified', '',
175 ('U', 'unified', '',
176 _('number of lines of context to show'), _('NUM')),
176 _('number of lines of context to show'), _('NUM')),
177 ('', 'stat', None, _('output diffstat-style summary of changes')),
177 ('', 'stat', None, _('output diffstat-style summary of changes')),
178 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
178 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
179 ]
179 ]
180
180
181 mergetoolopts = [
181 mergetoolopts = [
182 ('t', 'tool', '', _('specify merge tool')),
182 ('t', 'tool', '', _('specify merge tool')),
183 ]
183 ]
184
184
185 similarityopts = [
185 similarityopts = [
186 ('s', 'similarity', '',
186 ('s', 'similarity', '',
187 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
187 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
188 ]
188 ]
189
189
190 subrepoopts = [
190 subrepoopts = [
191 ('S', 'subrepos', None,
191 ('S', 'subrepos', None,
192 _('recurse into subrepositories'))
192 _('recurse into subrepositories'))
193 ]
193 ]
194
194
195 debugrevlogopts = [
195 debugrevlogopts = [
196 ('c', 'changelog', False, _('open changelog')),
196 ('c', 'changelog', False, _('open changelog')),
197 ('m', 'manifest', False, _('open manifest')),
197 ('m', 'manifest', False, _('open manifest')),
198 ('', 'dir', '', _('open directory manifest')),
198 ('', 'dir', '', _('open directory manifest')),
199 ]
199 ]
200
200
201 # Commands start here, listed alphabetically
201 # Commands start here, listed alphabetically
202
202
203 @command('^add',
203 @command('^add',
204 walkopts + subrepoopts + dryrunopts,
204 walkopts + subrepoopts + dryrunopts,
205 _('[OPTION]... [FILE]...'),
205 _('[OPTION]... [FILE]...'),
206 inferrepo=True)
206 inferrepo=True)
207 def add(ui, repo, *pats, **opts):
207 def add(ui, repo, *pats, **opts):
208 """add the specified files on the next commit
208 """add the specified files on the next commit
209
209
210 Schedule files to be version controlled and added to the
210 Schedule files to be version controlled and added to the
211 repository.
211 repository.
212
212
213 The files will be added to the repository at the next commit. To
213 The files will be added to the repository at the next commit. To
214 undo an add before that, see :hg:`forget`.
214 undo an add before that, see :hg:`forget`.
215
215
216 If no names are given, add all files to the repository (except
216 If no names are given, add all files to the repository (except
217 files matching ``.hgignore``).
217 files matching ``.hgignore``).
218
218
219 .. container:: verbose
219 .. container:: verbose
220
220
221 Examples:
221 Examples:
222
222
223 - New (unknown) files are added
223 - New (unknown) files are added
224 automatically by :hg:`add`::
224 automatically by :hg:`add`::
225
225
226 $ ls
226 $ ls
227 foo.c
227 foo.c
228 $ hg status
228 $ hg status
229 ? foo.c
229 ? foo.c
230 $ hg add
230 $ hg add
231 adding foo.c
231 adding foo.c
232 $ hg status
232 $ hg status
233 A foo.c
233 A foo.c
234
234
235 - Specific files to be added can be specified::
235 - Specific files to be added can be specified::
236
236
237 $ ls
237 $ ls
238 bar.c foo.c
238 bar.c foo.c
239 $ hg status
239 $ hg status
240 ? bar.c
240 ? bar.c
241 ? foo.c
241 ? foo.c
242 $ hg add bar.c
242 $ hg add bar.c
243 $ hg status
243 $ hg status
244 A bar.c
244 A bar.c
245 ? foo.c
245 ? foo.c
246
246
247 Returns 0 if all files are successfully added.
247 Returns 0 if all files are successfully added.
248 """
248 """
249
249
250 m = scmutil.match(repo[None], pats, opts)
250 m = scmutil.match(repo[None], pats, opts)
251 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
251 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
252 return rejected and 1 or 0
252 return rejected and 1 or 0
253
253
254 @command('addremove',
254 @command('addremove',
255 similarityopts + subrepoopts + walkopts + dryrunopts,
255 similarityopts + subrepoopts + walkopts + dryrunopts,
256 _('[OPTION]... [FILE]...'),
256 _('[OPTION]... [FILE]...'),
257 inferrepo=True)
257 inferrepo=True)
258 def addremove(ui, repo, *pats, **opts):
258 def addremove(ui, repo, *pats, **opts):
259 """add all new files, delete all missing files
259 """add all new files, delete all missing files
260
260
261 Add all new files and remove all missing files from the
261 Add all new files and remove all missing files from the
262 repository.
262 repository.
263
263
264 Unless names are given, new files are ignored if they match any of
264 Unless names are given, new files are ignored if they match any of
265 the patterns in ``.hgignore``. As with add, these changes take
265 the patterns in ``.hgignore``. As with add, these changes take
266 effect at the next commit.
266 effect at the next commit.
267
267
268 Use the -s/--similarity option to detect renamed files. This
268 Use the -s/--similarity option to detect renamed files. This
269 option takes a percentage between 0 (disabled) and 100 (files must
269 option takes a percentage between 0 (disabled) and 100 (files must
270 be identical) as its parameter. With a parameter greater than 0,
270 be identical) as its parameter. With a parameter greater than 0,
271 this compares every removed file with every added file and records
271 this compares every removed file with every added file and records
272 those similar enough as renames. Detecting renamed files this way
272 those similar enough as renames. Detecting renamed files this way
273 can be expensive. After using this option, :hg:`status -C` can be
273 can be expensive. After using this option, :hg:`status -C` can be
274 used to check which files were identified as moved or renamed. If
274 used to check which files were identified as moved or renamed. If
275 not specified, -s/--similarity defaults to 100 and only renames of
275 not specified, -s/--similarity defaults to 100 and only renames of
276 identical files are detected.
276 identical files are detected.
277
277
278 .. container:: verbose
278 .. container:: verbose
279
279
280 Examples:
280 Examples:
281
281
282 - A number of files (bar.c and foo.c) are new,
282 - A number of files (bar.c and foo.c) are new,
283 while foobar.c has been removed (without using :hg:`remove`)
283 while foobar.c has been removed (without using :hg:`remove`)
284 from the repository::
284 from the repository::
285
285
286 $ ls
286 $ ls
287 bar.c foo.c
287 bar.c foo.c
288 $ hg status
288 $ hg status
289 ! foobar.c
289 ! foobar.c
290 ? bar.c
290 ? bar.c
291 ? foo.c
291 ? foo.c
292 $ hg addremove
292 $ hg addremove
293 adding bar.c
293 adding bar.c
294 adding foo.c
294 adding foo.c
295 removing foobar.c
295 removing foobar.c
296 $ hg status
296 $ hg status
297 A bar.c
297 A bar.c
298 A foo.c
298 A foo.c
299 R foobar.c
299 R foobar.c
300
300
301 - A file foobar.c was moved to foo.c without using :hg:`rename`.
301 - A file foobar.c was moved to foo.c without using :hg:`rename`.
302 Afterwards, it was edited slightly::
302 Afterwards, it was edited slightly::
303
303
304 $ ls
304 $ ls
305 foo.c
305 foo.c
306 $ hg status
306 $ hg status
307 ! foobar.c
307 ! foobar.c
308 ? foo.c
308 ? foo.c
309 $ hg addremove --similarity 90
309 $ hg addremove --similarity 90
310 removing foobar.c
310 removing foobar.c
311 adding foo.c
311 adding foo.c
312 recording removal of foobar.c as rename to foo.c (94% similar)
312 recording removal of foobar.c as rename to foo.c (94% similar)
313 $ hg status -C
313 $ hg status -C
314 A foo.c
314 A foo.c
315 foobar.c
315 foobar.c
316 R foobar.c
316 R foobar.c
317
317
318 Returns 0 if all files are successfully added.
318 Returns 0 if all files are successfully added.
319 """
319 """
320 try:
320 try:
321 sim = float(opts.get('similarity') or 100)
321 sim = float(opts.get('similarity') or 100)
322 except ValueError:
322 except ValueError:
323 raise error.Abort(_('similarity must be a number'))
323 raise error.Abort(_('similarity must be a number'))
324 if sim < 0 or sim > 100:
324 if sim < 0 or sim > 100:
325 raise error.Abort(_('similarity must be between 0 and 100'))
325 raise error.Abort(_('similarity must be between 0 and 100'))
326 matcher = scmutil.match(repo[None], pats, opts)
326 matcher = scmutil.match(repo[None], pats, opts)
327 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
327 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
328
328
329 @command('^annotate|blame',
329 @command('^annotate|blame',
330 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
330 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
331 ('', 'follow', None,
331 ('', 'follow', None,
332 _('follow copies/renames and list the filename (DEPRECATED)')),
332 _('follow copies/renames and list the filename (DEPRECATED)')),
333 ('', 'no-follow', None, _("don't follow copies and renames")),
333 ('', 'no-follow', None, _("don't follow copies and renames")),
334 ('a', 'text', None, _('treat all files as text')),
334 ('a', 'text', None, _('treat all files as text')),
335 ('u', 'user', None, _('list the author (long with -v)')),
335 ('u', 'user', None, _('list the author (long with -v)')),
336 ('f', 'file', None, _('list the filename')),
336 ('f', 'file', None, _('list the filename')),
337 ('d', 'date', None, _('list the date (short with -q)')),
337 ('d', 'date', None, _('list the date (short with -q)')),
338 ('n', 'number', None, _('list the revision number (default)')),
338 ('n', 'number', None, _('list the revision number (default)')),
339 ('c', 'changeset', None, _('list the changeset')),
339 ('c', 'changeset', None, _('list the changeset')),
340 ('l', 'line-number', None, _('show line number at the first appearance'))
340 ('l', 'line-number', None, _('show line number at the first appearance'))
341 ] + diffwsopts + walkopts + formatteropts,
341 ] + diffwsopts + walkopts + formatteropts,
342 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
342 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
343 inferrepo=True)
343 inferrepo=True)
344 def annotate(ui, repo, *pats, **opts):
344 def annotate(ui, repo, *pats, **opts):
345 """show changeset information by line for each file
345 """show changeset information by line for each file
346
346
347 List changes in files, showing the revision id responsible for
347 List changes in files, showing the revision id responsible for
348 each line.
348 each line.
349
349
350 This command is useful for discovering when a change was made and
350 This command is useful for discovering when a change was made and
351 by whom.
351 by whom.
352
352
353 If you include --file, --user, or --date, the revision number is
353 If you include --file, --user, or --date, the revision number is
354 suppressed unless you also include --number.
354 suppressed unless you also include --number.
355
355
356 Without the -a/--text option, annotate will avoid processing files
356 Without the -a/--text option, annotate will avoid processing files
357 it detects as binary. With -a, annotate will annotate the file
357 it detects as binary. With -a, annotate will annotate the file
358 anyway, although the results will probably be neither useful
358 anyway, although the results will probably be neither useful
359 nor desirable.
359 nor desirable.
360
360
361 Returns 0 on success.
361 Returns 0 on success.
362 """
362 """
363 if not pats:
363 if not pats:
364 raise error.Abort(_('at least one filename or pattern is required'))
364 raise error.Abort(_('at least one filename or pattern is required'))
365
365
366 if opts.get('follow'):
366 if opts.get('follow'):
367 # --follow is deprecated and now just an alias for -f/--file
367 # --follow is deprecated and now just an alias for -f/--file
368 # to mimic the behavior of Mercurial before version 1.5
368 # to mimic the behavior of Mercurial before version 1.5
369 opts['file'] = True
369 opts['file'] = True
370
370
371 ctx = scmutil.revsingle(repo, opts.get('rev'))
371 ctx = scmutil.revsingle(repo, opts.get('rev'))
372
372
373 fm = ui.formatter('annotate', opts)
373 fm = ui.formatter('annotate', opts)
374 if ui.quiet:
374 if ui.quiet:
375 datefunc = util.shortdate
375 datefunc = util.shortdate
376 else:
376 else:
377 datefunc = util.datestr
377 datefunc = util.datestr
378 if ctx.rev() is None:
378 if ctx.rev() is None:
379 def hexfn(node):
379 def hexfn(node):
380 if node is None:
380 if node is None:
381 return None
381 return None
382 else:
382 else:
383 return fm.hexfunc(node)
383 return fm.hexfunc(node)
384 if opts.get('changeset'):
384 if opts.get('changeset'):
385 # omit "+" suffix which is appended to node hex
385 # omit "+" suffix which is appended to node hex
386 def formatrev(rev):
386 def formatrev(rev):
387 if rev is None:
387 if rev is None:
388 return '%d' % ctx.p1().rev()
388 return '%d' % ctx.p1().rev()
389 else:
389 else:
390 return '%d' % rev
390 return '%d' % rev
391 else:
391 else:
392 def formatrev(rev):
392 def formatrev(rev):
393 if rev is None:
393 if rev is None:
394 return '%d+' % ctx.p1().rev()
394 return '%d+' % ctx.p1().rev()
395 else:
395 else:
396 return '%d ' % rev
396 return '%d ' % rev
397 def formathex(hex):
397 def formathex(hex):
398 if hex is None:
398 if hex is None:
399 return '%s+' % fm.hexfunc(ctx.p1().node())
399 return '%s+' % fm.hexfunc(ctx.p1().node())
400 else:
400 else:
401 return '%s ' % hex
401 return '%s ' % hex
402 else:
402 else:
403 hexfn = fm.hexfunc
403 hexfn = fm.hexfunc
404 formatrev = formathex = str
404 formatrev = formathex = str
405
405
406 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
406 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
407 ('number', ' ', lambda x: x[0].rev(), formatrev),
407 ('number', ' ', lambda x: x[0].rev(), formatrev),
408 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
408 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
409 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
409 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
410 ('file', ' ', lambda x: x[0].path(), str),
410 ('file', ' ', lambda x: x[0].path(), str),
411 ('line_number', ':', lambda x: x[1], str),
411 ('line_number', ':', lambda x: x[1], str),
412 ]
412 ]
413 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
413 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
414
414
415 if (not opts.get('user') and not opts.get('changeset')
415 if (not opts.get('user') and not opts.get('changeset')
416 and not opts.get('date') and not opts.get('file')):
416 and not opts.get('date') and not opts.get('file')):
417 opts['number'] = True
417 opts['number'] = True
418
418
419 linenumber = opts.get('line_number') is not None
419 linenumber = opts.get('line_number') is not None
420 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
420 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
421 raise error.Abort(_('at least one of -n/-c is required for -l'))
421 raise error.Abort(_('at least one of -n/-c is required for -l'))
422
422
423 ui.pager('annotate')
423 ui.pager('annotate')
424
424
425 if fm.isplain():
425 if fm.isplain():
426 def makefunc(get, fmt):
426 def makefunc(get, fmt):
427 return lambda x: fmt(get(x))
427 return lambda x: fmt(get(x))
428 else:
428 else:
429 def makefunc(get, fmt):
429 def makefunc(get, fmt):
430 return get
430 return get
431 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
431 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
432 if opts.get(op)]
432 if opts.get(op)]
433 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
433 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
434 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
434 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
435 if opts.get(op))
435 if opts.get(op))
436
436
437 def bad(x, y):
437 def bad(x, y):
438 raise error.Abort("%s: %s" % (x, y))
438 raise error.Abort("%s: %s" % (x, y))
439
439
440 m = scmutil.match(ctx, pats, opts, badfn=bad)
440 m = scmutil.match(ctx, pats, opts, badfn=bad)
441
441
442 follow = not opts.get('no_follow')
442 follow = not opts.get('no_follow')
443 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
443 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
444 whitespace=True)
444 whitespace=True)
445 for abs in ctx.walk(m):
445 for abs in ctx.walk(m):
446 fctx = ctx[abs]
446 fctx = ctx[abs]
447 if not opts.get('text') and util.binary(fctx.data()):
447 if not opts.get('text') and util.binary(fctx.data()):
448 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
448 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
449 continue
449 continue
450
450
451 lines = fctx.annotate(follow=follow, linenumber=linenumber,
451 lines = fctx.annotate(follow=follow, linenumber=linenumber,
452 diffopts=diffopts)
452 diffopts=diffopts)
453 if not lines:
453 if not lines:
454 continue
454 continue
455 formats = []
455 formats = []
456 pieces = []
456 pieces = []
457
457
458 for f, sep in funcmap:
458 for f, sep in funcmap:
459 l = [f(n) for n, dummy in lines]
459 l = [f(n) for n, dummy in lines]
460 if fm.isplain():
460 if fm.isplain():
461 sizes = [encoding.colwidth(x) for x in l]
461 sizes = [encoding.colwidth(x) for x in l]
462 ml = max(sizes)
462 ml = max(sizes)
463 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
463 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
464 else:
464 else:
465 formats.append(['%s' for x in l])
465 formats.append(['%s' for x in l])
466 pieces.append(l)
466 pieces.append(l)
467
467
468 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
468 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
469 fm.startitem()
469 fm.startitem()
470 fm.write(fields, "".join(f), *p)
470 fm.write(fields, "".join(f), *p)
471 fm.write('line', ": %s", l[1])
471 fm.write('line', ": %s", l[1])
472
472
473 if not lines[-1][1].endswith('\n'):
473 if not lines[-1][1].endswith('\n'):
474 fm.plain('\n')
474 fm.plain('\n')
475
475
476 fm.end()
476 fm.end()
477
477
478 @command('archive',
478 @command('archive',
479 [('', 'no-decode', None, _('do not pass files through decoders')),
479 [('', 'no-decode', None, _('do not pass files through decoders')),
480 ('p', 'prefix', '', _('directory prefix for files in archive'),
480 ('p', 'prefix', '', _('directory prefix for files in archive'),
481 _('PREFIX')),
481 _('PREFIX')),
482 ('r', 'rev', '', _('revision to distribute'), _('REV')),
482 ('r', 'rev', '', _('revision to distribute'), _('REV')),
483 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
483 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
484 ] + subrepoopts + walkopts,
484 ] + subrepoopts + walkopts,
485 _('[OPTION]... DEST'))
485 _('[OPTION]... DEST'))
486 def archive(ui, repo, dest, **opts):
486 def archive(ui, repo, dest, **opts):
487 '''create an unversioned archive of a repository revision
487 '''create an unversioned archive of a repository revision
488
488
489 By default, the revision used is the parent of the working
489 By default, the revision used is the parent of the working
490 directory; use -r/--rev to specify a different revision.
490 directory; use -r/--rev to specify a different revision.
491
491
492 The archive type is automatically detected based on file
492 The archive type is automatically detected based on file
493 extension (to override, use -t/--type).
493 extension (to override, use -t/--type).
494
494
495 .. container:: verbose
495 .. container:: verbose
496
496
497 Examples:
497 Examples:
498
498
499 - create a zip file containing the 1.0 release::
499 - create a zip file containing the 1.0 release::
500
500
501 hg archive -r 1.0 project-1.0.zip
501 hg archive -r 1.0 project-1.0.zip
502
502
503 - create a tarball excluding .hg files::
503 - create a tarball excluding .hg files::
504
504
505 hg archive project.tar.gz -X ".hg*"
505 hg archive project.tar.gz -X ".hg*"
506
506
507 Valid types are:
507 Valid types are:
508
508
509 :``files``: a directory full of files (default)
509 :``files``: a directory full of files (default)
510 :``tar``: tar archive, uncompressed
510 :``tar``: tar archive, uncompressed
511 :``tbz2``: tar archive, compressed using bzip2
511 :``tbz2``: tar archive, compressed using bzip2
512 :``tgz``: tar archive, compressed using gzip
512 :``tgz``: tar archive, compressed using gzip
513 :``uzip``: zip archive, uncompressed
513 :``uzip``: zip archive, uncompressed
514 :``zip``: zip archive, compressed using deflate
514 :``zip``: zip archive, compressed using deflate
515
515
516 The exact name of the destination archive or directory is given
516 The exact name of the destination archive or directory is given
517 using a format string; see :hg:`help export` for details.
517 using a format string; see :hg:`help export` for details.
518
518
519 Each member added to an archive file has a directory prefix
519 Each member added to an archive file has a directory prefix
520 prepended. Use -p/--prefix to specify a format string for the
520 prepended. Use -p/--prefix to specify a format string for the
521 prefix. The default is the basename of the archive, with suffixes
521 prefix. The default is the basename of the archive, with suffixes
522 removed.
522 removed.
523
523
524 Returns 0 on success.
524 Returns 0 on success.
525 '''
525 '''
526
526
527 ctx = scmutil.revsingle(repo, opts.get('rev'))
527 ctx = scmutil.revsingle(repo, opts.get('rev'))
528 if not ctx:
528 if not ctx:
529 raise error.Abort(_('no working directory: please specify a revision'))
529 raise error.Abort(_('no working directory: please specify a revision'))
530 node = ctx.node()
530 node = ctx.node()
531 dest = cmdutil.makefilename(repo, dest, node)
531 dest = cmdutil.makefilename(repo, dest, node)
532 if os.path.realpath(dest) == repo.root:
532 if os.path.realpath(dest) == repo.root:
533 raise error.Abort(_('repository root cannot be destination'))
533 raise error.Abort(_('repository root cannot be destination'))
534
534
535 kind = opts.get('type') or archival.guesskind(dest) or 'files'
535 kind = opts.get('type') or archival.guesskind(dest) or 'files'
536 prefix = opts.get('prefix')
536 prefix = opts.get('prefix')
537
537
538 if dest == '-':
538 if dest == '-':
539 if kind == 'files':
539 if kind == 'files':
540 raise error.Abort(_('cannot archive plain files to stdout'))
540 raise error.Abort(_('cannot archive plain files to stdout'))
541 dest = cmdutil.makefileobj(repo, dest)
541 dest = cmdutil.makefileobj(repo, dest)
542 if not prefix:
542 if not prefix:
543 prefix = os.path.basename(repo.root) + '-%h'
543 prefix = os.path.basename(repo.root) + '-%h'
544
544
545 prefix = cmdutil.makefilename(repo, prefix, node)
545 prefix = cmdutil.makefilename(repo, prefix, node)
546 matchfn = scmutil.match(ctx, [], opts)
546 matchfn = scmutil.match(ctx, [], opts)
547 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
547 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
548 matchfn, prefix, subrepos=opts.get('subrepos'))
548 matchfn, prefix, subrepos=opts.get('subrepos'))
549
549
550 @command('backout',
550 @command('backout',
551 [('', 'merge', None, _('merge with old dirstate parent after backout')),
551 [('', 'merge', None, _('merge with old dirstate parent after backout')),
552 ('', 'commit', None,
552 ('', 'commit', None,
553 _('commit if no conflicts were encountered (DEPRECATED)')),
553 _('commit if no conflicts were encountered (DEPRECATED)')),
554 ('', 'no-commit', None, _('do not commit')),
554 ('', 'no-commit', None, _('do not commit')),
555 ('', 'parent', '',
555 ('', 'parent', '',
556 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
556 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
557 ('r', 'rev', '', _('revision to backout'), _('REV')),
557 ('r', 'rev', '', _('revision to backout'), _('REV')),
558 ('e', 'edit', False, _('invoke editor on commit messages')),
558 ('e', 'edit', False, _('invoke editor on commit messages')),
559 ] + mergetoolopts + walkopts + commitopts + commitopts2,
559 ] + mergetoolopts + walkopts + commitopts + commitopts2,
560 _('[OPTION]... [-r] REV'))
560 _('[OPTION]... [-r] REV'))
561 def backout(ui, repo, node=None, rev=None, **opts):
561 def backout(ui, repo, node=None, rev=None, **opts):
562 '''reverse effect of earlier changeset
562 '''reverse effect of earlier changeset
563
563
564 Prepare a new changeset with the effect of REV undone in the
564 Prepare a new changeset with the effect of REV undone in the
565 current working directory. If no conflicts were encountered,
565 current working directory. If no conflicts were encountered,
566 it will be committed immediately.
566 it will be committed immediately.
567
567
568 If REV is the parent of the working directory, then this new changeset
568 If REV is the parent of the working directory, then this new changeset
569 is committed automatically (unless --no-commit is specified).
569 is committed automatically (unless --no-commit is specified).
570
570
571 .. note::
571 .. note::
572
572
573 :hg:`backout` cannot be used to fix either an unwanted or
573 :hg:`backout` cannot be used to fix either an unwanted or
574 incorrect merge.
574 incorrect merge.
575
575
576 .. container:: verbose
576 .. container:: verbose
577
577
578 Examples:
578 Examples:
579
579
580 - Reverse the effect of the parent of the working directory.
580 - Reverse the effect of the parent of the working directory.
581 This backout will be committed immediately::
581 This backout will be committed immediately::
582
582
583 hg backout -r .
583 hg backout -r .
584
584
585 - Reverse the effect of previous bad revision 23::
585 - Reverse the effect of previous bad revision 23::
586
586
587 hg backout -r 23
587 hg backout -r 23
588
588
589 - Reverse the effect of previous bad revision 23 and
589 - Reverse the effect of previous bad revision 23 and
590 leave changes uncommitted::
590 leave changes uncommitted::
591
591
592 hg backout -r 23 --no-commit
592 hg backout -r 23 --no-commit
593 hg commit -m "Backout revision 23"
593 hg commit -m "Backout revision 23"
594
594
595 By default, the pending changeset will have one parent,
595 By default, the pending changeset will have one parent,
596 maintaining a linear history. With --merge, the pending
596 maintaining a linear history. With --merge, the pending
597 changeset will instead have two parents: the old parent of the
597 changeset will instead have two parents: the old parent of the
598 working directory and a new child of REV that simply undoes REV.
598 working directory and a new child of REV that simply undoes REV.
599
599
600 Before version 1.7, the behavior without --merge was equivalent
600 Before version 1.7, the behavior without --merge was equivalent
601 to specifying --merge followed by :hg:`update --clean .` to
601 to specifying --merge followed by :hg:`update --clean .` to
602 cancel the merge and leave the child of REV as a head to be
602 cancel the merge and leave the child of REV as a head to be
603 merged separately.
603 merged separately.
604
604
605 See :hg:`help dates` for a list of formats valid for -d/--date.
605 See :hg:`help dates` for a list of formats valid for -d/--date.
606
606
607 See :hg:`help revert` for a way to restore files to the state
607 See :hg:`help revert` for a way to restore files to the state
608 of another revision.
608 of another revision.
609
609
610 Returns 0 on success, 1 if nothing to backout or there are unresolved
610 Returns 0 on success, 1 if nothing to backout or there are unresolved
611 files.
611 files.
612 '''
612 '''
613 wlock = lock = None
613 wlock = lock = None
614 try:
614 try:
615 wlock = repo.wlock()
615 wlock = repo.wlock()
616 lock = repo.lock()
616 lock = repo.lock()
617 return _dobackout(ui, repo, node, rev, **opts)
617 return _dobackout(ui, repo, node, rev, **opts)
618 finally:
618 finally:
619 release(lock, wlock)
619 release(lock, wlock)
620
620
621 def _dobackout(ui, repo, node=None, rev=None, **opts):
621 def _dobackout(ui, repo, node=None, rev=None, **opts):
622 if opts.get('commit') and opts.get('no_commit'):
622 if opts.get('commit') and opts.get('no_commit'):
623 raise error.Abort(_("cannot use --commit with --no-commit"))
623 raise error.Abort(_("cannot use --commit with --no-commit"))
624 if opts.get('merge') and opts.get('no_commit'):
624 if opts.get('merge') and opts.get('no_commit'):
625 raise error.Abort(_("cannot use --merge with --no-commit"))
625 raise error.Abort(_("cannot use --merge with --no-commit"))
626
626
627 if rev and node:
627 if rev and node:
628 raise error.Abort(_("please specify just one revision"))
628 raise error.Abort(_("please specify just one revision"))
629
629
630 if not rev:
630 if not rev:
631 rev = node
631 rev = node
632
632
633 if not rev:
633 if not rev:
634 raise error.Abort(_("please specify a revision to backout"))
634 raise error.Abort(_("please specify a revision to backout"))
635
635
636 date = opts.get('date')
636 date = opts.get('date')
637 if date:
637 if date:
638 opts['date'] = util.parsedate(date)
638 opts['date'] = util.parsedate(date)
639
639
640 cmdutil.checkunfinished(repo)
640 cmdutil.checkunfinished(repo)
641 cmdutil.bailifchanged(repo)
641 cmdutil.bailifchanged(repo)
642 node = scmutil.revsingle(repo, rev).node()
642 node = scmutil.revsingle(repo, rev).node()
643
643
644 op1, op2 = repo.dirstate.parents()
644 op1, op2 = repo.dirstate.parents()
645 if not repo.changelog.isancestor(node, op1):
645 if not repo.changelog.isancestor(node, op1):
646 raise error.Abort(_('cannot backout change that is not an ancestor'))
646 raise error.Abort(_('cannot backout change that is not an ancestor'))
647
647
648 p1, p2 = repo.changelog.parents(node)
648 p1, p2 = repo.changelog.parents(node)
649 if p1 == nullid:
649 if p1 == nullid:
650 raise error.Abort(_('cannot backout a change with no parents'))
650 raise error.Abort(_('cannot backout a change with no parents'))
651 if p2 != nullid:
651 if p2 != nullid:
652 if not opts.get('parent'):
652 if not opts.get('parent'):
653 raise error.Abort(_('cannot backout a merge changeset'))
653 raise error.Abort(_('cannot backout a merge changeset'))
654 p = repo.lookup(opts['parent'])
654 p = repo.lookup(opts['parent'])
655 if p not in (p1, p2):
655 if p not in (p1, p2):
656 raise error.Abort(_('%s is not a parent of %s') %
656 raise error.Abort(_('%s is not a parent of %s') %
657 (short(p), short(node)))
657 (short(p), short(node)))
658 parent = p
658 parent = p
659 else:
659 else:
660 if opts.get('parent'):
660 if opts.get('parent'):
661 raise error.Abort(_('cannot use --parent on non-merge changeset'))
661 raise error.Abort(_('cannot use --parent on non-merge changeset'))
662 parent = p1
662 parent = p1
663
663
664 # the backout should appear on the same branch
664 # the backout should appear on the same branch
665 branch = repo.dirstate.branch()
665 branch = repo.dirstate.branch()
666 bheads = repo.branchheads(branch)
666 bheads = repo.branchheads(branch)
667 rctx = scmutil.revsingle(repo, hex(parent))
667 rctx = scmutil.revsingle(repo, hex(parent))
668 if not opts.get('merge') and op1 != node:
668 if not opts.get('merge') and op1 != node:
669 dsguard = dirstateguard.dirstateguard(repo, 'backout')
669 dsguard = dirstateguard.dirstateguard(repo, 'backout')
670 try:
670 try:
671 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
671 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
672 'backout')
672 'backout')
673 stats = mergemod.update(repo, parent, True, True, node, False)
673 stats = mergemod.update(repo, parent, True, True, node, False)
674 repo.setparents(op1, op2)
674 repo.setparents(op1, op2)
675 dsguard.close()
675 dsguard.close()
676 hg._showstats(repo, stats)
676 hg._showstats(repo, stats)
677 if stats[3]:
677 if stats[3]:
678 repo.ui.status(_("use 'hg resolve' to retry unresolved "
678 repo.ui.status(_("use 'hg resolve' to retry unresolved "
679 "file merges\n"))
679 "file merges\n"))
680 return 1
680 return 1
681 finally:
681 finally:
682 ui.setconfig('ui', 'forcemerge', '', '')
682 ui.setconfig('ui', 'forcemerge', '', '')
683 lockmod.release(dsguard)
683 lockmod.release(dsguard)
684 else:
684 else:
685 hg.clean(repo, node, show_stats=False)
685 hg.clean(repo, node, show_stats=False)
686 repo.dirstate.setbranch(branch)
686 repo.dirstate.setbranch(branch)
687 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
687 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
688
688
689 if opts.get('no_commit'):
689 if opts.get('no_commit'):
690 msg = _("changeset %s backed out, "
690 msg = _("changeset %s backed out, "
691 "don't forget to commit.\n")
691 "don't forget to commit.\n")
692 ui.status(msg % short(node))
692 ui.status(msg % short(node))
693 return 0
693 return 0
694
694
695 def commitfunc(ui, repo, message, match, opts):
695 def commitfunc(ui, repo, message, match, opts):
696 editform = 'backout'
696 editform = 'backout'
697 e = cmdutil.getcommiteditor(editform=editform, **opts)
697 e = cmdutil.getcommiteditor(editform=editform, **opts)
698 if not message:
698 if not message:
699 # we don't translate commit messages
699 # we don't translate commit messages
700 message = "Backed out changeset %s" % short(node)
700 message = "Backed out changeset %s" % short(node)
701 e = cmdutil.getcommiteditor(edit=True, editform=editform)
701 e = cmdutil.getcommiteditor(edit=True, editform=editform)
702 return repo.commit(message, opts.get('user'), opts.get('date'),
702 return repo.commit(message, opts.get('user'), opts.get('date'),
703 match, editor=e)
703 match, editor=e)
704 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
704 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
705 if not newnode:
705 if not newnode:
706 ui.status(_("nothing changed\n"))
706 ui.status(_("nothing changed\n"))
707 return 1
707 return 1
708 cmdutil.commitstatus(repo, newnode, branch, bheads)
708 cmdutil.commitstatus(repo, newnode, branch, bheads)
709
709
710 def nice(node):
710 def nice(node):
711 return '%d:%s' % (repo.changelog.rev(node), short(node))
711 return '%d:%s' % (repo.changelog.rev(node), short(node))
712 ui.status(_('changeset %s backs out changeset %s\n') %
712 ui.status(_('changeset %s backs out changeset %s\n') %
713 (nice(repo.changelog.tip()), nice(node)))
713 (nice(repo.changelog.tip()), nice(node)))
714 if opts.get('merge') and op1 != node:
714 if opts.get('merge') and op1 != node:
715 hg.clean(repo, op1, show_stats=False)
715 hg.clean(repo, op1, show_stats=False)
716 ui.status(_('merging with changeset %s\n')
716 ui.status(_('merging with changeset %s\n')
717 % nice(repo.changelog.tip()))
717 % nice(repo.changelog.tip()))
718 try:
718 try:
719 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
719 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
720 'backout')
720 'backout')
721 return hg.merge(repo, hex(repo.changelog.tip()))
721 return hg.merge(repo, hex(repo.changelog.tip()))
722 finally:
722 finally:
723 ui.setconfig('ui', 'forcemerge', '', '')
723 ui.setconfig('ui', 'forcemerge', '', '')
724 return 0
724 return 0
725
725
726 @command('bisect',
726 @command('bisect',
727 [('r', 'reset', False, _('reset bisect state')),
727 [('r', 'reset', False, _('reset bisect state')),
728 ('g', 'good', False, _('mark changeset good')),
728 ('g', 'good', False, _('mark changeset good')),
729 ('b', 'bad', False, _('mark changeset bad')),
729 ('b', 'bad', False, _('mark changeset bad')),
730 ('s', 'skip', False, _('skip testing changeset')),
730 ('s', 'skip', False, _('skip testing changeset')),
731 ('e', 'extend', False, _('extend the bisect range')),
731 ('e', 'extend', False, _('extend the bisect range')),
732 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
732 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
733 ('U', 'noupdate', False, _('do not update to target'))],
733 ('U', 'noupdate', False, _('do not update to target'))],
734 _("[-gbsr] [-U] [-c CMD] [REV]"))
734 _("[-gbsr] [-U] [-c CMD] [REV]"))
735 def bisect(ui, repo, rev=None, extra=None, command=None,
735 def bisect(ui, repo, rev=None, extra=None, command=None,
736 reset=None, good=None, bad=None, skip=None, extend=None,
736 reset=None, good=None, bad=None, skip=None, extend=None,
737 noupdate=None):
737 noupdate=None):
738 """subdivision search of changesets
738 """subdivision search of changesets
739
739
740 This command helps to find changesets which introduce problems. To
740 This command helps to find changesets which introduce problems. To
741 use, mark the earliest changeset you know exhibits the problem as
741 use, mark the earliest changeset you know exhibits the problem as
742 bad, then mark the latest changeset which is free from the problem
742 bad, then mark the latest changeset which is free from the problem
743 as good. Bisect will update your working directory to a revision
743 as good. Bisect will update your working directory to a revision
744 for testing (unless the -U/--noupdate option is specified). Once
744 for testing (unless the -U/--noupdate option is specified). Once
745 you have performed tests, mark the working directory as good or
745 you have performed tests, mark the working directory as good or
746 bad, and bisect will either update to another candidate changeset
746 bad, and bisect will either update to another candidate changeset
747 or announce that it has found the bad revision.
747 or announce that it has found the bad revision.
748
748
749 As a shortcut, you can also use the revision argument to mark a
749 As a shortcut, you can also use the revision argument to mark a
750 revision as good or bad without checking it out first.
750 revision as good or bad without checking it out first.
751
751
752 If you supply a command, it will be used for automatic bisection.
752 If you supply a command, it will be used for automatic bisection.
753 The environment variable HG_NODE will contain the ID of the
753 The environment variable HG_NODE will contain the ID of the
754 changeset being tested. The exit status of the command will be
754 changeset being tested. The exit status of the command will be
755 used to mark revisions as good or bad: status 0 means good, 125
755 used to mark revisions as good or bad: status 0 means good, 125
756 means to skip the revision, 127 (command not found) will abort the
756 means to skip the revision, 127 (command not found) will abort the
757 bisection, and any other non-zero exit status means the revision
757 bisection, and any other non-zero exit status means the revision
758 is bad.
758 is bad.
759
759
760 .. container:: verbose
760 .. container:: verbose
761
761
762 Some examples:
762 Some examples:
763
763
764 - start a bisection with known bad revision 34, and good revision 12::
764 - start a bisection with known bad revision 34, and good revision 12::
765
765
766 hg bisect --bad 34
766 hg bisect --bad 34
767 hg bisect --good 12
767 hg bisect --good 12
768
768
769 - advance the current bisection by marking current revision as good or
769 - advance the current bisection by marking current revision as good or
770 bad::
770 bad::
771
771
772 hg bisect --good
772 hg bisect --good
773 hg bisect --bad
773 hg bisect --bad
774
774
775 - mark the current revision, or a known revision, to be skipped (e.g. if
775 - mark the current revision, or a known revision, to be skipped (e.g. if
776 that revision is not usable because of another issue)::
776 that revision is not usable because of another issue)::
777
777
778 hg bisect --skip
778 hg bisect --skip
779 hg bisect --skip 23
779 hg bisect --skip 23
780
780
781 - skip all revisions that do not touch directories ``foo`` or ``bar``::
781 - skip all revisions that do not touch directories ``foo`` or ``bar``::
782
782
783 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
783 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
784
784
785 - forget the current bisection::
785 - forget the current bisection::
786
786
787 hg bisect --reset
787 hg bisect --reset
788
788
789 - use 'make && make tests' to automatically find the first broken
789 - use 'make && make tests' to automatically find the first broken
790 revision::
790 revision::
791
791
792 hg bisect --reset
792 hg bisect --reset
793 hg bisect --bad 34
793 hg bisect --bad 34
794 hg bisect --good 12
794 hg bisect --good 12
795 hg bisect --command "make && make tests"
795 hg bisect --command "make && make tests"
796
796
797 - see all changesets whose states are already known in the current
797 - see all changesets whose states are already known in the current
798 bisection::
798 bisection::
799
799
800 hg log -r "bisect(pruned)"
800 hg log -r "bisect(pruned)"
801
801
802 - see the changeset currently being bisected (especially useful
802 - see the changeset currently being bisected (especially useful
803 if running with -U/--noupdate)::
803 if running with -U/--noupdate)::
804
804
805 hg log -r "bisect(current)"
805 hg log -r "bisect(current)"
806
806
807 - see all changesets that took part in the current bisection::
807 - see all changesets that took part in the current bisection::
808
808
809 hg log -r "bisect(range)"
809 hg log -r "bisect(range)"
810
810
811 - you can even get a nice graph::
811 - you can even get a nice graph::
812
812
813 hg log --graph -r "bisect(range)"
813 hg log --graph -r "bisect(range)"
814
814
815 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
815 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
816
816
817 Returns 0 on success.
817 Returns 0 on success.
818 """
818 """
819 # backward compatibility
819 # backward compatibility
820 if rev in "good bad reset init".split():
820 if rev in "good bad reset init".split():
821 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
821 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
822 cmd, rev, extra = rev, extra, None
822 cmd, rev, extra = rev, extra, None
823 if cmd == "good":
823 if cmd == "good":
824 good = True
824 good = True
825 elif cmd == "bad":
825 elif cmd == "bad":
826 bad = True
826 bad = True
827 else:
827 else:
828 reset = True
828 reset = True
829 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
829 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
830 raise error.Abort(_('incompatible arguments'))
830 raise error.Abort(_('incompatible arguments'))
831
831
832 cmdutil.checkunfinished(repo)
832 cmdutil.checkunfinished(repo)
833
833
834 if reset:
834 if reset:
835 hbisect.resetstate(repo)
835 hbisect.resetstate(repo)
836 return
836 return
837
837
838 state = hbisect.load_state(repo)
838 state = hbisect.load_state(repo)
839
839
840 # update state
840 # update state
841 if good or bad or skip:
841 if good or bad or skip:
842 if rev:
842 if rev:
843 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
843 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
844 else:
844 else:
845 nodes = [repo.lookup('.')]
845 nodes = [repo.lookup('.')]
846 if good:
846 if good:
847 state['good'] += nodes
847 state['good'] += nodes
848 elif bad:
848 elif bad:
849 state['bad'] += nodes
849 state['bad'] += nodes
850 elif skip:
850 elif skip:
851 state['skip'] += nodes
851 state['skip'] += nodes
852 hbisect.save_state(repo, state)
852 hbisect.save_state(repo, state)
853 if not (state['good'] and state['bad']):
853 if not (state['good'] and state['bad']):
854 return
854 return
855
855
856 def mayupdate(repo, node, show_stats=True):
856 def mayupdate(repo, node, show_stats=True):
857 """common used update sequence"""
857 """common used update sequence"""
858 if noupdate:
858 if noupdate:
859 return
859 return
860 cmdutil.bailifchanged(repo)
860 cmdutil.bailifchanged(repo)
861 return hg.clean(repo, node, show_stats=show_stats)
861 return hg.clean(repo, node, show_stats=show_stats)
862
862
863 displayer = cmdutil.show_changeset(ui, repo, {})
863 displayer = cmdutil.show_changeset(ui, repo, {})
864
864
865 if command:
865 if command:
866 changesets = 1
866 changesets = 1
867 if noupdate:
867 if noupdate:
868 try:
868 try:
869 node = state['current'][0]
869 node = state['current'][0]
870 except LookupError:
870 except LookupError:
871 raise error.Abort(_('current bisect revision is unknown - '
871 raise error.Abort(_('current bisect revision is unknown - '
872 'start a new bisect to fix'))
872 'start a new bisect to fix'))
873 else:
873 else:
874 node, p2 = repo.dirstate.parents()
874 node, p2 = repo.dirstate.parents()
875 if p2 != nullid:
875 if p2 != nullid:
876 raise error.Abort(_('current bisect revision is a merge'))
876 raise error.Abort(_('current bisect revision is a merge'))
877 if rev:
877 if rev:
878 node = repo[scmutil.revsingle(repo, rev, node)].node()
878 node = repo[scmutil.revsingle(repo, rev, node)].node()
879 try:
879 try:
880 while changesets:
880 while changesets:
881 # update state
881 # update state
882 state['current'] = [node]
882 state['current'] = [node]
883 hbisect.save_state(repo, state)
883 hbisect.save_state(repo, state)
884 status = ui.system(command, environ={'HG_NODE': hex(node)})
884 status = ui.system(command, environ={'HG_NODE': hex(node)})
885 if status == 125:
885 if status == 125:
886 transition = "skip"
886 transition = "skip"
887 elif status == 0:
887 elif status == 0:
888 transition = "good"
888 transition = "good"
889 # status < 0 means process was killed
889 # status < 0 means process was killed
890 elif status == 127:
890 elif status == 127:
891 raise error.Abort(_("failed to execute %s") % command)
891 raise error.Abort(_("failed to execute %s") % command)
892 elif status < 0:
892 elif status < 0:
893 raise error.Abort(_("%s killed") % command)
893 raise error.Abort(_("%s killed") % command)
894 else:
894 else:
895 transition = "bad"
895 transition = "bad"
896 state[transition].append(node)
896 state[transition].append(node)
897 ctx = repo[node]
897 ctx = repo[node]
898 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
898 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
899 hbisect.checkstate(state)
899 hbisect.checkstate(state)
900 # bisect
900 # bisect
901 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
901 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
902 # update to next check
902 # update to next check
903 node = nodes[0]
903 node = nodes[0]
904 mayupdate(repo, node, show_stats=False)
904 mayupdate(repo, node, show_stats=False)
905 finally:
905 finally:
906 state['current'] = [node]
906 state['current'] = [node]
907 hbisect.save_state(repo, state)
907 hbisect.save_state(repo, state)
908 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
908 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
909 return
909 return
910
910
911 hbisect.checkstate(state)
911 hbisect.checkstate(state)
912
912
913 # actually bisect
913 # actually bisect
914 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
914 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
915 if extend:
915 if extend:
916 if not changesets:
916 if not changesets:
917 extendnode = hbisect.extendrange(repo, state, nodes, good)
917 extendnode = hbisect.extendrange(repo, state, nodes, good)
918 if extendnode is not None:
918 if extendnode is not None:
919 ui.write(_("Extending search to changeset %d:%s\n")
919 ui.write(_("Extending search to changeset %d:%s\n")
920 % (extendnode.rev(), extendnode))
920 % (extendnode.rev(), extendnode))
921 state['current'] = [extendnode.node()]
921 state['current'] = [extendnode.node()]
922 hbisect.save_state(repo, state)
922 hbisect.save_state(repo, state)
923 return mayupdate(repo, extendnode.node())
923 return mayupdate(repo, extendnode.node())
924 raise error.Abort(_("nothing to extend"))
924 raise error.Abort(_("nothing to extend"))
925
925
926 if changesets == 0:
926 if changesets == 0:
927 hbisect.printresult(ui, repo, state, displayer, nodes, good)
927 hbisect.printresult(ui, repo, state, displayer, nodes, good)
928 else:
928 else:
929 assert len(nodes) == 1 # only a single node can be tested next
929 assert len(nodes) == 1 # only a single node can be tested next
930 node = nodes[0]
930 node = nodes[0]
931 # compute the approximate number of remaining tests
931 # compute the approximate number of remaining tests
932 tests, size = 0, 2
932 tests, size = 0, 2
933 while size <= changesets:
933 while size <= changesets:
934 tests, size = tests + 1, size * 2
934 tests, size = tests + 1, size * 2
935 rev = repo.changelog.rev(node)
935 rev = repo.changelog.rev(node)
936 ui.write(_("Testing changeset %d:%s "
936 ui.write(_("Testing changeset %d:%s "
937 "(%d changesets remaining, ~%d tests)\n")
937 "(%d changesets remaining, ~%d tests)\n")
938 % (rev, short(node), changesets, tests))
938 % (rev, short(node), changesets, tests))
939 state['current'] = [node]
939 state['current'] = [node]
940 hbisect.save_state(repo, state)
940 hbisect.save_state(repo, state)
941 return mayupdate(repo, node)
941 return mayupdate(repo, node)
942
942
943 @command('bookmarks|bookmark',
943 @command('bookmarks|bookmark',
944 [('f', 'force', False, _('force')),
944 [('f', 'force', False, _('force')),
945 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
945 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
946 ('d', 'delete', False, _('delete a given bookmark')),
946 ('d', 'delete', False, _('delete a given bookmark')),
947 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
947 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
948 ('i', 'inactive', False, _('mark a bookmark inactive')),
948 ('i', 'inactive', False, _('mark a bookmark inactive')),
949 ] + formatteropts,
949 ] + formatteropts,
950 _('hg bookmarks [OPTIONS]... [NAME]...'))
950 _('hg bookmarks [OPTIONS]... [NAME]...'))
951 def bookmark(ui, repo, *names, **opts):
951 def bookmark(ui, repo, *names, **opts):
952 '''create a new bookmark or list existing bookmarks
952 '''create a new bookmark or list existing bookmarks
953
953
954 Bookmarks are labels on changesets to help track lines of development.
954 Bookmarks are labels on changesets to help track lines of development.
955 Bookmarks are unversioned and can be moved, renamed and deleted.
955 Bookmarks are unversioned and can be moved, renamed and deleted.
956 Deleting or moving a bookmark has no effect on the associated changesets.
956 Deleting or moving a bookmark has no effect on the associated changesets.
957
957
958 Creating or updating to a bookmark causes it to be marked as 'active'.
958 Creating or updating to a bookmark causes it to be marked as 'active'.
959 The active bookmark is indicated with a '*'.
959 The active bookmark is indicated with a '*'.
960 When a commit is made, the active bookmark will advance to the new commit.
960 When a commit is made, the active bookmark will advance to the new commit.
961 A plain :hg:`update` will also advance an active bookmark, if possible.
961 A plain :hg:`update` will also advance an active bookmark, if possible.
962 Updating away from a bookmark will cause it to be deactivated.
962 Updating away from a bookmark will cause it to be deactivated.
963
963
964 Bookmarks can be pushed and pulled between repositories (see
964 Bookmarks can be pushed and pulled between repositories (see
965 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
965 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
966 diverged, a new 'divergent bookmark' of the form 'name@path' will
966 diverged, a new 'divergent bookmark' of the form 'name@path' will
967 be created. Using :hg:`merge` will resolve the divergence.
967 be created. Using :hg:`merge` will resolve the divergence.
968
968
969 A bookmark named '@' has the special property that :hg:`clone` will
969 A bookmark named '@' has the special property that :hg:`clone` will
970 check it out by default if it exists.
970 check it out by default if it exists.
971
971
972 .. container:: verbose
972 .. container:: verbose
973
973
974 Examples:
974 Examples:
975
975
976 - create an active bookmark for a new line of development::
976 - create an active bookmark for a new line of development::
977
977
978 hg book new-feature
978 hg book new-feature
979
979
980 - create an inactive bookmark as a place marker::
980 - create an inactive bookmark as a place marker::
981
981
982 hg book -i reviewed
982 hg book -i reviewed
983
983
984 - create an inactive bookmark on another changeset::
984 - create an inactive bookmark on another changeset::
985
985
986 hg book -r .^ tested
986 hg book -r .^ tested
987
987
988 - rename bookmark turkey to dinner::
988 - rename bookmark turkey to dinner::
989
989
990 hg book -m turkey dinner
990 hg book -m turkey dinner
991
991
992 - move the '@' bookmark from another branch::
992 - move the '@' bookmark from another branch::
993
993
994 hg book -f @
994 hg book -f @
995 '''
995 '''
996 force = opts.get('force')
996 force = opts.get('force')
997 rev = opts.get('rev')
997 rev = opts.get('rev')
998 delete = opts.get('delete')
998 delete = opts.get('delete')
999 rename = opts.get('rename')
999 rename = opts.get('rename')
1000 inactive = opts.get('inactive')
1000 inactive = opts.get('inactive')
1001
1001
1002 def checkformat(mark):
1002 def checkformat(mark):
1003 mark = mark.strip()
1003 mark = mark.strip()
1004 if not mark:
1004 if not mark:
1005 raise error.Abort(_("bookmark names cannot consist entirely of "
1005 raise error.Abort(_("bookmark names cannot consist entirely of "
1006 "whitespace"))
1006 "whitespace"))
1007 scmutil.checknewlabel(repo, mark, 'bookmark')
1007 scmutil.checknewlabel(repo, mark, 'bookmark')
1008 return mark
1008 return mark
1009
1009
1010 def checkconflict(repo, mark, cur, force=False, target=None):
1010 def checkconflict(repo, mark, cur, force=False, target=None):
1011 if mark in marks and not force:
1011 if mark in marks and not force:
1012 if target:
1012 if target:
1013 if marks[mark] == target and target == cur:
1013 if marks[mark] == target and target == cur:
1014 # re-activating a bookmark
1014 # re-activating a bookmark
1015 return
1015 return
1016 anc = repo.changelog.ancestors([repo[target].rev()])
1016 anc = repo.changelog.ancestors([repo[target].rev()])
1017 bmctx = repo[marks[mark]]
1017 bmctx = repo[marks[mark]]
1018 divs = [repo[b].node() for b in marks
1018 divs = [repo[b].node() for b in marks
1019 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1019 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1020
1020
1021 # allow resolving a single divergent bookmark even if moving
1021 # allow resolving a single divergent bookmark even if moving
1022 # the bookmark across branches when a revision is specified
1022 # the bookmark across branches when a revision is specified
1023 # that contains a divergent bookmark
1023 # that contains a divergent bookmark
1024 if bmctx.rev() not in anc and target in divs:
1024 if bmctx.rev() not in anc and target in divs:
1025 bookmarks.deletedivergent(repo, [target], mark)
1025 bookmarks.deletedivergent(repo, [target], mark)
1026 return
1026 return
1027
1027
1028 deletefrom = [b for b in divs
1028 deletefrom = [b for b in divs
1029 if repo[b].rev() in anc or b == target]
1029 if repo[b].rev() in anc or b == target]
1030 bookmarks.deletedivergent(repo, deletefrom, mark)
1030 bookmarks.deletedivergent(repo, deletefrom, mark)
1031 if bookmarks.validdest(repo, bmctx, repo[target]):
1031 if bookmarks.validdest(repo, bmctx, repo[target]):
1032 ui.status(_("moving bookmark '%s' forward from %s\n") %
1032 ui.status(_("moving bookmark '%s' forward from %s\n") %
1033 (mark, short(bmctx.node())))
1033 (mark, short(bmctx.node())))
1034 return
1034 return
1035 raise error.Abort(_("bookmark '%s' already exists "
1035 raise error.Abort(_("bookmark '%s' already exists "
1036 "(use -f to force)") % mark)
1036 "(use -f to force)") % mark)
1037 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1037 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1038 and not force):
1038 and not force):
1039 raise error.Abort(
1039 raise error.Abort(
1040 _("a bookmark cannot have the name of an existing branch"))
1040 _("a bookmark cannot have the name of an existing branch"))
1041
1041
1042 if delete and rename:
1042 if delete and rename:
1043 raise error.Abort(_("--delete and --rename are incompatible"))
1043 raise error.Abort(_("--delete and --rename are incompatible"))
1044 if delete and rev:
1044 if delete and rev:
1045 raise error.Abort(_("--rev is incompatible with --delete"))
1045 raise error.Abort(_("--rev is incompatible with --delete"))
1046 if rename and rev:
1046 if rename and rev:
1047 raise error.Abort(_("--rev is incompatible with --rename"))
1047 raise error.Abort(_("--rev is incompatible with --rename"))
1048 if not names and (delete or rev):
1048 if not names and (delete or rev):
1049 raise error.Abort(_("bookmark name required"))
1049 raise error.Abort(_("bookmark name required"))
1050
1050
1051 if delete or rename or names or inactive:
1051 if delete or rename or names or inactive:
1052 wlock = lock = tr = None
1052 wlock = lock = tr = None
1053 try:
1053 try:
1054 wlock = repo.wlock()
1054 wlock = repo.wlock()
1055 lock = repo.lock()
1055 lock = repo.lock()
1056 cur = repo.changectx('.').node()
1056 cur = repo.changectx('.').node()
1057 marks = repo._bookmarks
1057 marks = repo._bookmarks
1058 if delete:
1058 if delete:
1059 tr = repo.transaction('bookmark')
1059 tr = repo.transaction('bookmark')
1060 for mark in names:
1060 for mark in names:
1061 if mark not in marks:
1061 if mark not in marks:
1062 raise error.Abort(_("bookmark '%s' does not exist") %
1062 raise error.Abort(_("bookmark '%s' does not exist") %
1063 mark)
1063 mark)
1064 if mark == repo._activebookmark:
1064 if mark == repo._activebookmark:
1065 bookmarks.deactivate(repo)
1065 bookmarks.deactivate(repo)
1066 del marks[mark]
1066 del marks[mark]
1067
1067
1068 elif rename:
1068 elif rename:
1069 tr = repo.transaction('bookmark')
1069 tr = repo.transaction('bookmark')
1070 if not names:
1070 if not names:
1071 raise error.Abort(_("new bookmark name required"))
1071 raise error.Abort(_("new bookmark name required"))
1072 elif len(names) > 1:
1072 elif len(names) > 1:
1073 raise error.Abort(_("only one new bookmark name allowed"))
1073 raise error.Abort(_("only one new bookmark name allowed"))
1074 mark = checkformat(names[0])
1074 mark = checkformat(names[0])
1075 if rename not in marks:
1075 if rename not in marks:
1076 raise error.Abort(_("bookmark '%s' does not exist")
1076 raise error.Abort(_("bookmark '%s' does not exist")
1077 % rename)
1077 % rename)
1078 checkconflict(repo, mark, cur, force)
1078 checkconflict(repo, mark, cur, force)
1079 marks[mark] = marks[rename]
1079 marks[mark] = marks[rename]
1080 if repo._activebookmark == rename and not inactive:
1080 if repo._activebookmark == rename and not inactive:
1081 bookmarks.activate(repo, mark)
1081 bookmarks.activate(repo, mark)
1082 del marks[rename]
1082 del marks[rename]
1083 elif names:
1083 elif names:
1084 tr = repo.transaction('bookmark')
1084 tr = repo.transaction('bookmark')
1085 newact = None
1085 newact = None
1086 for mark in names:
1086 for mark in names:
1087 mark = checkformat(mark)
1087 mark = checkformat(mark)
1088 if newact is None:
1088 if newact is None:
1089 newact = mark
1089 newact = mark
1090 if inactive and mark == repo._activebookmark:
1090 if inactive and mark == repo._activebookmark:
1091 bookmarks.deactivate(repo)
1091 bookmarks.deactivate(repo)
1092 return
1092 return
1093 tgt = cur
1093 tgt = cur
1094 if rev:
1094 if rev:
1095 tgt = scmutil.revsingle(repo, rev).node()
1095 tgt = scmutil.revsingle(repo, rev).node()
1096 checkconflict(repo, mark, cur, force, tgt)
1096 checkconflict(repo, mark, cur, force, tgt)
1097 marks[mark] = tgt
1097 marks[mark] = tgt
1098 if not inactive and cur == marks[newact] and not rev:
1098 if not inactive and cur == marks[newact] and not rev:
1099 bookmarks.activate(repo, newact)
1099 bookmarks.activate(repo, newact)
1100 elif cur != tgt and newact == repo._activebookmark:
1100 elif cur != tgt and newact == repo._activebookmark:
1101 bookmarks.deactivate(repo)
1101 bookmarks.deactivate(repo)
1102 elif inactive:
1102 elif inactive:
1103 if len(marks) == 0:
1103 if len(marks) == 0:
1104 ui.status(_("no bookmarks set\n"))
1104 ui.status(_("no bookmarks set\n"))
1105 elif not repo._activebookmark:
1105 elif not repo._activebookmark:
1106 ui.status(_("no active bookmark\n"))
1106 ui.status(_("no active bookmark\n"))
1107 else:
1107 else:
1108 bookmarks.deactivate(repo)
1108 bookmarks.deactivate(repo)
1109 if tr is not None:
1109 if tr is not None:
1110 marks.recordchange(tr)
1110 marks.recordchange(tr)
1111 tr.close()
1111 tr.close()
1112 finally:
1112 finally:
1113 lockmod.release(tr, lock, wlock)
1113 lockmod.release(tr, lock, wlock)
1114 else: # show bookmarks
1114 else: # show bookmarks
1115 fm = ui.formatter('bookmarks', opts)
1115 fm = ui.formatter('bookmarks', opts)
1116 hexfn = fm.hexfunc
1116 hexfn = fm.hexfunc
1117 marks = repo._bookmarks
1117 marks = repo._bookmarks
1118 if len(marks) == 0 and fm.isplain():
1118 if len(marks) == 0 and fm.isplain():
1119 ui.status(_("no bookmarks set\n"))
1119 ui.status(_("no bookmarks set\n"))
1120 for bmark, n in sorted(marks.iteritems()):
1120 for bmark, n in sorted(marks.iteritems()):
1121 active = repo._activebookmark
1121 active = repo._activebookmark
1122 if bmark == active:
1122 if bmark == active:
1123 prefix, label = '*', activebookmarklabel
1123 prefix, label = '*', activebookmarklabel
1124 else:
1124 else:
1125 prefix, label = ' ', ''
1125 prefix, label = ' ', ''
1126
1126
1127 fm.startitem()
1127 fm.startitem()
1128 if not ui.quiet:
1128 if not ui.quiet:
1129 fm.plain(' %s ' % prefix, label=label)
1129 fm.plain(' %s ' % prefix, label=label)
1130 fm.write('bookmark', '%s', bmark, label=label)
1130 fm.write('bookmark', '%s', bmark, label=label)
1131 pad = " " * (25 - encoding.colwidth(bmark))
1131 pad = " " * (25 - encoding.colwidth(bmark))
1132 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1132 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1133 repo.changelog.rev(n), hexfn(n), label=label)
1133 repo.changelog.rev(n), hexfn(n), label=label)
1134 fm.data(active=(bmark == active))
1134 fm.data(active=(bmark == active))
1135 fm.plain('\n')
1135 fm.plain('\n')
1136 fm.end()
1136 fm.end()
1137
1137
1138 @command('branch',
1138 @command('branch',
1139 [('f', 'force', None,
1139 [('f', 'force', None,
1140 _('set branch name even if it shadows an existing branch')),
1140 _('set branch name even if it shadows an existing branch')),
1141 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1141 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1142 _('[-fC] [NAME]'))
1142 _('[-fC] [NAME]'))
1143 def branch(ui, repo, label=None, **opts):
1143 def branch(ui, repo, label=None, **opts):
1144 """set or show the current branch name
1144 """set or show the current branch name
1145
1145
1146 .. note::
1146 .. note::
1147
1147
1148 Branch names are permanent and global. Use :hg:`bookmark` to create a
1148 Branch names are permanent and global. Use :hg:`bookmark` to create a
1149 light-weight bookmark instead. See :hg:`help glossary` for more
1149 light-weight bookmark instead. See :hg:`help glossary` for more
1150 information about named branches and bookmarks.
1150 information about named branches and bookmarks.
1151
1151
1152 With no argument, show the current branch name. With one argument,
1152 With no argument, show the current branch name. With one argument,
1153 set the working directory branch name (the branch will not exist
1153 set the working directory branch name (the branch will not exist
1154 in the repository until the next commit). Standard practice
1154 in the repository until the next commit). Standard practice
1155 recommends that primary development take place on the 'default'
1155 recommends that primary development take place on the 'default'
1156 branch.
1156 branch.
1157
1157
1158 Unless -f/--force is specified, branch will not let you set a
1158 Unless -f/--force is specified, branch will not let you set a
1159 branch name that already exists.
1159 branch name that already exists.
1160
1160
1161 Use -C/--clean to reset the working directory branch to that of
1161 Use -C/--clean to reset the working directory branch to that of
1162 the parent of the working directory, negating a previous branch
1162 the parent of the working directory, negating a previous branch
1163 change.
1163 change.
1164
1164
1165 Use the command :hg:`update` to switch to an existing branch. Use
1165 Use the command :hg:`update` to switch to an existing branch. Use
1166 :hg:`commit --close-branch` to mark this branch head as closed.
1166 :hg:`commit --close-branch` to mark this branch head as closed.
1167 When all heads of a branch are closed, the branch will be
1167 When all heads of a branch are closed, the branch will be
1168 considered closed.
1168 considered closed.
1169
1169
1170 Returns 0 on success.
1170 Returns 0 on success.
1171 """
1171 """
1172 if label:
1172 if label:
1173 label = label.strip()
1173 label = label.strip()
1174
1174
1175 if not opts.get('clean') and not label:
1175 if not opts.get('clean') and not label:
1176 ui.write("%s\n" % repo.dirstate.branch())
1176 ui.write("%s\n" % repo.dirstate.branch())
1177 return
1177 return
1178
1178
1179 with repo.wlock():
1179 with repo.wlock():
1180 if opts.get('clean'):
1180 if opts.get('clean'):
1181 label = repo[None].p1().branch()
1181 label = repo[None].p1().branch()
1182 repo.dirstate.setbranch(label)
1182 repo.dirstate.setbranch(label)
1183 ui.status(_('reset working directory to branch %s\n') % label)
1183 ui.status(_('reset working directory to branch %s\n') % label)
1184 elif label:
1184 elif label:
1185 if not opts.get('force') and label in repo.branchmap():
1185 if not opts.get('force') and label in repo.branchmap():
1186 if label not in [p.branch() for p in repo[None].parents()]:
1186 if label not in [p.branch() for p in repo[None].parents()]:
1187 raise error.Abort(_('a branch of the same name already'
1187 raise error.Abort(_('a branch of the same name already'
1188 ' exists'),
1188 ' exists'),
1189 # i18n: "it" refers to an existing branch
1189 # i18n: "it" refers to an existing branch
1190 hint=_("use 'hg update' to switch to it"))
1190 hint=_("use 'hg update' to switch to it"))
1191 scmutil.checknewlabel(repo, label, 'branch')
1191 scmutil.checknewlabel(repo, label, 'branch')
1192 repo.dirstate.setbranch(label)
1192 repo.dirstate.setbranch(label)
1193 ui.status(_('marked working directory as branch %s\n') % label)
1193 ui.status(_('marked working directory as branch %s\n') % label)
1194
1194
1195 # find any open named branches aside from default
1195 # find any open named branches aside from default
1196 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1196 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1197 if n != "default" and not c]
1197 if n != "default" and not c]
1198 if not others:
1198 if not others:
1199 ui.status(_('(branches are permanent and global, '
1199 ui.status(_('(branches are permanent and global, '
1200 'did you want a bookmark?)\n'))
1200 'did you want a bookmark?)\n'))
1201
1201
1202 @command('branches',
1202 @command('branches',
1203 [('a', 'active', False,
1203 [('a', 'active', False,
1204 _('show only branches that have unmerged heads (DEPRECATED)')),
1204 _('show only branches that have unmerged heads (DEPRECATED)')),
1205 ('c', 'closed', False, _('show normal and closed branches')),
1205 ('c', 'closed', False, _('show normal and closed branches')),
1206 ] + formatteropts,
1206 ] + formatteropts,
1207 _('[-c]'))
1207 _('[-c]'))
1208 def branches(ui, repo, active=False, closed=False, **opts):
1208 def branches(ui, repo, active=False, closed=False, **opts):
1209 """list repository named branches
1209 """list repository named branches
1210
1210
1211 List the repository's named branches, indicating which ones are
1211 List the repository's named branches, indicating which ones are
1212 inactive. If -c/--closed is specified, also list branches which have
1212 inactive. If -c/--closed is specified, also list branches which have
1213 been marked closed (see :hg:`commit --close-branch`).
1213 been marked closed (see :hg:`commit --close-branch`).
1214
1214
1215 Use the command :hg:`update` to switch to an existing branch.
1215 Use the command :hg:`update` to switch to an existing branch.
1216
1216
1217 Returns 0.
1217 Returns 0.
1218 """
1218 """
1219
1219
1220 fm = ui.formatter('branches', opts)
1220 fm = ui.formatter('branches', opts)
1221 hexfunc = fm.hexfunc
1221 hexfunc = fm.hexfunc
1222
1222
1223 allheads = set(repo.heads())
1223 allheads = set(repo.heads())
1224 branches = []
1224 branches = []
1225 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1225 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1226 isactive = not isclosed and bool(set(heads) & allheads)
1226 isactive = not isclosed and bool(set(heads) & allheads)
1227 branches.append((tag, repo[tip], isactive, not isclosed))
1227 branches.append((tag, repo[tip], isactive, not isclosed))
1228 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1228 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1229 reverse=True)
1229 reverse=True)
1230
1230
1231 for tag, ctx, isactive, isopen in branches:
1231 for tag, ctx, isactive, isopen in branches:
1232 if active and not isactive:
1232 if active and not isactive:
1233 continue
1233 continue
1234 if isactive:
1234 if isactive:
1235 label = 'branches.active'
1235 label = 'branches.active'
1236 notice = ''
1236 notice = ''
1237 elif not isopen:
1237 elif not isopen:
1238 if not closed:
1238 if not closed:
1239 continue
1239 continue
1240 label = 'branches.closed'
1240 label = 'branches.closed'
1241 notice = _(' (closed)')
1241 notice = _(' (closed)')
1242 else:
1242 else:
1243 label = 'branches.inactive'
1243 label = 'branches.inactive'
1244 notice = _(' (inactive)')
1244 notice = _(' (inactive)')
1245 current = (tag == repo.dirstate.branch())
1245 current = (tag == repo.dirstate.branch())
1246 if current:
1246 if current:
1247 label = 'branches.current'
1247 label = 'branches.current'
1248
1248
1249 fm.startitem()
1249 fm.startitem()
1250 fm.write('branch', '%s', tag, label=label)
1250 fm.write('branch', '%s', tag, label=label)
1251 rev = ctx.rev()
1251 rev = ctx.rev()
1252 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1252 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1253 fmt = ' ' * padsize + ' %d:%s'
1253 fmt = ' ' * padsize + ' %d:%s'
1254 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1254 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1255 label='log.changeset changeset.%s' % ctx.phasestr())
1255 label='log.changeset changeset.%s' % ctx.phasestr())
1256 fm.data(active=isactive, closed=not isopen, current=current)
1256 fm.data(active=isactive, closed=not isopen, current=current)
1257 if not ui.quiet:
1257 if not ui.quiet:
1258 fm.plain(notice)
1258 fm.plain(notice)
1259 fm.plain('\n')
1259 fm.plain('\n')
1260 fm.end()
1260 fm.end()
1261
1261
1262 @command('bundle',
1262 @command('bundle',
1263 [('f', 'force', None, _('run even when the destination is unrelated')),
1263 [('f', 'force', None, _('run even when the destination is unrelated')),
1264 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1264 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1265 _('REV')),
1265 _('REV')),
1266 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1266 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1267 _('BRANCH')),
1267 _('BRANCH')),
1268 ('', 'base', [],
1268 ('', 'base', [],
1269 _('a base changeset assumed to be available at the destination'),
1269 _('a base changeset assumed to be available at the destination'),
1270 _('REV')),
1270 _('REV')),
1271 ('a', 'all', None, _('bundle all changesets in the repository')),
1271 ('a', 'all', None, _('bundle all changesets in the repository')),
1272 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1272 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1273 ] + remoteopts,
1273 ] + remoteopts,
1274 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1274 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1275 def bundle(ui, repo, fname, dest=None, **opts):
1275 def bundle(ui, repo, fname, dest=None, **opts):
1276 """create a changegroup file
1276 """create a changegroup file
1277
1277
1278 Generate a changegroup file collecting changesets to be added
1278 Generate a changegroup file collecting changesets to be added
1279 to a repository.
1279 to a repository.
1280
1280
1281 To create a bundle containing all changesets, use -a/--all
1281 To create a bundle containing all changesets, use -a/--all
1282 (or --base null). Otherwise, hg assumes the destination will have
1282 (or --base null). Otherwise, hg assumes the destination will have
1283 all the nodes you specify with --base parameters. Otherwise, hg
1283 all the nodes you specify with --base parameters. Otherwise, hg
1284 will assume the repository has all the nodes in destination, or
1284 will assume the repository has all the nodes in destination, or
1285 default-push/default if no destination is specified.
1285 default-push/default if no destination is specified.
1286
1286
1287 You can change bundle format with the -t/--type option. You can
1287 You can change bundle format with the -t/--type option. You can
1288 specify a compression, a bundle version or both using a dash
1288 specify a compression, a bundle version or both using a dash
1289 (comp-version). The available compression methods are: none, bzip2,
1289 (comp-version). The available compression methods are: none, bzip2,
1290 and gzip (by default, bundles are compressed using bzip2). The
1290 and gzip (by default, bundles are compressed using bzip2). The
1291 available formats are: v1, v2 (default to most suitable).
1291 available formats are: v1, v2 (default to most suitable).
1292
1292
1293 The bundle file can then be transferred using conventional means
1293 The bundle file can then be transferred using conventional means
1294 and applied to another repository with the unbundle or pull
1294 and applied to another repository with the unbundle or pull
1295 command. This is useful when direct push and pull are not
1295 command. This is useful when direct push and pull are not
1296 available or when exporting an entire repository is undesirable.
1296 available or when exporting an entire repository is undesirable.
1297
1297
1298 Applying bundles preserves all changeset contents including
1298 Applying bundles preserves all changeset contents including
1299 permissions, copy/rename information, and revision history.
1299 permissions, copy/rename information, and revision history.
1300
1300
1301 Returns 0 on success, 1 if no changes found.
1301 Returns 0 on success, 1 if no changes found.
1302 """
1302 """
1303 revs = None
1303 revs = None
1304 if 'rev' in opts:
1304 if 'rev' in opts:
1305 revstrings = opts['rev']
1305 revstrings = opts['rev']
1306 revs = scmutil.revrange(repo, revstrings)
1306 revs = scmutil.revrange(repo, revstrings)
1307 if revstrings and not revs:
1307 if revstrings and not revs:
1308 raise error.Abort(_('no commits to bundle'))
1308 raise error.Abort(_('no commits to bundle'))
1309
1309
1310 bundletype = opts.get('type', 'bzip2').lower()
1310 bundletype = opts.get('type', 'bzip2').lower()
1311 try:
1311 try:
1312 bcompression, cgversion, params = exchange.parsebundlespec(
1312 bcompression, cgversion, params = exchange.parsebundlespec(
1313 repo, bundletype, strict=False)
1313 repo, bundletype, strict=False)
1314 except error.UnsupportedBundleSpecification as e:
1314 except error.UnsupportedBundleSpecification as e:
1315 raise error.Abort(str(e),
1315 raise error.Abort(str(e),
1316 hint=_("see 'hg help bundle' for supported "
1316 hint=_("see 'hg help bundle' for supported "
1317 "values for --type"))
1317 "values for --type"))
1318
1318
1319 # Packed bundles are a pseudo bundle format for now.
1319 # Packed bundles are a pseudo bundle format for now.
1320 if cgversion == 's1':
1320 if cgversion == 's1':
1321 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1321 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1322 hint=_("use 'hg debugcreatestreamclonebundle'"))
1322 hint=_("use 'hg debugcreatestreamclonebundle'"))
1323
1323
1324 if opts.get('all'):
1324 if opts.get('all'):
1325 if dest:
1325 if dest:
1326 raise error.Abort(_("--all is incompatible with specifying "
1326 raise error.Abort(_("--all is incompatible with specifying "
1327 "a destination"))
1327 "a destination"))
1328 if opts.get('base'):
1328 if opts.get('base'):
1329 ui.warn(_("ignoring --base because --all was specified\n"))
1329 ui.warn(_("ignoring --base because --all was specified\n"))
1330 base = ['null']
1330 base = ['null']
1331 else:
1331 else:
1332 base = scmutil.revrange(repo, opts.get('base'))
1332 base = scmutil.revrange(repo, opts.get('base'))
1333 # TODO: get desired bundlecaps from command line.
1333 # TODO: get desired bundlecaps from command line.
1334 bundlecaps = None
1334 bundlecaps = None
1335 if cgversion not in changegroup.supportedoutgoingversions(repo):
1335 if cgversion not in changegroup.supportedoutgoingversions(repo):
1336 raise error.Abort(_("repository does not support bundle version %s") %
1336 raise error.Abort(_("repository does not support bundle version %s") %
1337 cgversion)
1337 cgversion)
1338
1338
1339 if base:
1339 if base:
1340 if dest:
1340 if dest:
1341 raise error.Abort(_("--base is incompatible with specifying "
1341 raise error.Abort(_("--base is incompatible with specifying "
1342 "a destination"))
1342 "a destination"))
1343 common = [repo.lookup(rev) for rev in base]
1343 common = [repo.lookup(rev) for rev in base]
1344 heads = revs and map(repo.lookup, revs) or None
1344 heads = revs and map(repo.lookup, revs) or None
1345 outgoing = discovery.outgoing(repo, common, heads)
1345 outgoing = discovery.outgoing(repo, common, heads)
1346 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1346 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1347 bundlecaps=bundlecaps,
1347 bundlecaps=bundlecaps,
1348 version=cgversion)
1348 version=cgversion)
1349 outgoing = None
1349 outgoing = None
1350 else:
1350 else:
1351 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1351 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1352 dest, branches = hg.parseurl(dest, opts.get('branch'))
1352 dest, branches = hg.parseurl(dest, opts.get('branch'))
1353 other = hg.peer(repo, opts, dest)
1353 other = hg.peer(repo, opts, dest)
1354 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1354 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1355 heads = revs and map(repo.lookup, revs) or revs
1355 heads = revs and map(repo.lookup, revs) or revs
1356 outgoing = discovery.findcommonoutgoing(repo, other,
1356 outgoing = discovery.findcommonoutgoing(repo, other,
1357 onlyheads=heads,
1357 onlyheads=heads,
1358 force=opts.get('force'),
1358 force=opts.get('force'),
1359 portable=True)
1359 portable=True)
1360 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1360 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1361 bundlecaps, version=cgversion)
1361 bundlecaps, version=cgversion)
1362 if not cg:
1362 if not cg:
1363 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1363 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1364 return 1
1364 return 1
1365
1365
1366 if cgversion == '01': #bundle1
1366 if cgversion == '01': #bundle1
1367 if bcompression is None:
1367 if bcompression is None:
1368 bcompression = 'UN'
1368 bcompression = 'UN'
1369 bversion = 'HG10' + bcompression
1369 bversion = 'HG10' + bcompression
1370 bcompression = None
1370 bcompression = None
1371 else:
1371 else:
1372 assert cgversion == '02'
1372 assert cgversion == '02'
1373 bversion = 'HG20'
1373 bversion = 'HG20'
1374
1374
1375 # TODO compression options should be derived from bundlespec parsing.
1375 # TODO compression options should be derived from bundlespec parsing.
1376 # This is a temporary hack to allow adjusting bundle compression
1376 # This is a temporary hack to allow adjusting bundle compression
1377 # level without a) formalizing the bundlespec changes to declare it
1377 # level without a) formalizing the bundlespec changes to declare it
1378 # b) introducing a command flag.
1378 # b) introducing a command flag.
1379 compopts = {}
1379 compopts = {}
1380 complevel = ui.configint('experimental', 'bundlecomplevel')
1380 complevel = ui.configint('experimental', 'bundlecomplevel')
1381 if complevel is not None:
1381 if complevel is not None:
1382 compopts['level'] = complevel
1382 compopts['level'] = complevel
1383
1383
1384 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1384 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1385 compopts=compopts)
1385 compopts=compopts)
1386
1386
1387 @command('cat',
1387 @command('cat',
1388 [('o', 'output', '',
1388 [('o', 'output', '',
1389 _('print output to file with formatted name'), _('FORMAT')),
1389 _('print output to file with formatted name'), _('FORMAT')),
1390 ('r', 'rev', '', _('print the given revision'), _('REV')),
1390 ('r', 'rev', '', _('print the given revision'), _('REV')),
1391 ('', 'decode', None, _('apply any matching decode filter')),
1391 ('', 'decode', None, _('apply any matching decode filter')),
1392 ] + walkopts,
1392 ] + walkopts,
1393 _('[OPTION]... FILE...'),
1393 _('[OPTION]... FILE...'),
1394 inferrepo=True)
1394 inferrepo=True)
1395 def cat(ui, repo, file1, *pats, **opts):
1395 def cat(ui, repo, file1, *pats, **opts):
1396 """output the current or given revision of files
1396 """output the current or given revision of files
1397
1397
1398 Print the specified files as they were at the given revision. If
1398 Print the specified files as they were at the given revision. If
1399 no revision is given, the parent of the working directory is used.
1399 no revision is given, the parent of the working directory is used.
1400
1400
1401 Output may be to a file, in which case the name of the file is
1401 Output may be to a file, in which case the name of the file is
1402 given using a format string. The formatting rules as follows:
1402 given using a format string. The formatting rules as follows:
1403
1403
1404 :``%%``: literal "%" character
1404 :``%%``: literal "%" character
1405 :``%s``: basename of file being printed
1405 :``%s``: basename of file being printed
1406 :``%d``: dirname of file being printed, or '.' if in repository root
1406 :``%d``: dirname of file being printed, or '.' if in repository root
1407 :``%p``: root-relative path name of file being printed
1407 :``%p``: root-relative path name of file being printed
1408 :``%H``: changeset hash (40 hexadecimal digits)
1408 :``%H``: changeset hash (40 hexadecimal digits)
1409 :``%R``: changeset revision number
1409 :``%R``: changeset revision number
1410 :``%h``: short-form changeset hash (12 hexadecimal digits)
1410 :``%h``: short-form changeset hash (12 hexadecimal digits)
1411 :``%r``: zero-padded changeset revision number
1411 :``%r``: zero-padded changeset revision number
1412 :``%b``: basename of the exporting repository
1412 :``%b``: basename of the exporting repository
1413
1413
1414 Returns 0 on success.
1414 Returns 0 on success.
1415 """
1415 """
1416 ctx = scmutil.revsingle(repo, opts.get('rev'))
1416 ctx = scmutil.revsingle(repo, opts.get('rev'))
1417 m = scmutil.match(ctx, (file1,) + pats, opts)
1417 m = scmutil.match(ctx, (file1,) + pats, opts)
1418
1418
1419 ui.pager('cat')
1419 ui.pager('cat')
1420 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1420 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1421
1421
1422 @command('^clone',
1422 @command('^clone',
1423 [('U', 'noupdate', None, _('the clone will include an empty working '
1423 [('U', 'noupdate', None, _('the clone will include an empty working '
1424 'directory (only a repository)')),
1424 'directory (only a repository)')),
1425 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1425 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1426 _('REV')),
1426 _('REV')),
1427 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1427 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1428 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1428 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1429 ('', 'pull', None, _('use pull protocol to copy metadata')),
1429 ('', 'pull', None, _('use pull protocol to copy metadata')),
1430 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1430 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1431 ] + remoteopts,
1431 ] + remoteopts,
1432 _('[OPTION]... SOURCE [DEST]'),
1432 _('[OPTION]... SOURCE [DEST]'),
1433 norepo=True)
1433 norepo=True)
1434 def clone(ui, source, dest=None, **opts):
1434 def clone(ui, source, dest=None, **opts):
1435 """make a copy of an existing repository
1435 """make a copy of an existing repository
1436
1436
1437 Create a copy of an existing repository in a new directory.
1437 Create a copy of an existing repository in a new directory.
1438
1438
1439 If no destination directory name is specified, it defaults to the
1439 If no destination directory name is specified, it defaults to the
1440 basename of the source.
1440 basename of the source.
1441
1441
1442 The location of the source is added to the new repository's
1442 The location of the source is added to the new repository's
1443 ``.hg/hgrc`` file, as the default to be used for future pulls.
1443 ``.hg/hgrc`` file, as the default to be used for future pulls.
1444
1444
1445 Only local paths and ``ssh://`` URLs are supported as
1445 Only local paths and ``ssh://`` URLs are supported as
1446 destinations. For ``ssh://`` destinations, no working directory or
1446 destinations. For ``ssh://`` destinations, no working directory or
1447 ``.hg/hgrc`` will be created on the remote side.
1447 ``.hg/hgrc`` will be created on the remote side.
1448
1448
1449 If the source repository has a bookmark called '@' set, that
1449 If the source repository has a bookmark called '@' set, that
1450 revision will be checked out in the new repository by default.
1450 revision will be checked out in the new repository by default.
1451
1451
1452 To check out a particular version, use -u/--update, or
1452 To check out a particular version, use -u/--update, or
1453 -U/--noupdate to create a clone with no working directory.
1453 -U/--noupdate to create a clone with no working directory.
1454
1454
1455 To pull only a subset of changesets, specify one or more revisions
1455 To pull only a subset of changesets, specify one or more revisions
1456 identifiers with -r/--rev or branches with -b/--branch. The
1456 identifiers with -r/--rev or branches with -b/--branch. The
1457 resulting clone will contain only the specified changesets and
1457 resulting clone will contain only the specified changesets and
1458 their ancestors. These options (or 'clone src#rev dest') imply
1458 their ancestors. These options (or 'clone src#rev dest') imply
1459 --pull, even for local source repositories.
1459 --pull, even for local source repositories.
1460
1460
1461 .. note::
1461 .. note::
1462
1462
1463 Specifying a tag will include the tagged changeset but not the
1463 Specifying a tag will include the tagged changeset but not the
1464 changeset containing the tag.
1464 changeset containing the tag.
1465
1465
1466 .. container:: verbose
1466 .. container:: verbose
1467
1467
1468 For efficiency, hardlinks are used for cloning whenever the
1468 For efficiency, hardlinks are used for cloning whenever the
1469 source and destination are on the same filesystem (note this
1469 source and destination are on the same filesystem (note this
1470 applies only to the repository data, not to the working
1470 applies only to the repository data, not to the working
1471 directory). Some filesystems, such as AFS, implement hardlinking
1471 directory). Some filesystems, such as AFS, implement hardlinking
1472 incorrectly, but do not report errors. In these cases, use the
1472 incorrectly, but do not report errors. In these cases, use the
1473 --pull option to avoid hardlinking.
1473 --pull option to avoid hardlinking.
1474
1474
1475 In some cases, you can clone repositories and the working
1475 In some cases, you can clone repositories and the working
1476 directory using full hardlinks with ::
1476 directory using full hardlinks with ::
1477
1477
1478 $ cp -al REPO REPOCLONE
1478 $ cp -al REPO REPOCLONE
1479
1479
1480 This is the fastest way to clone, but it is not always safe. The
1480 This is the fastest way to clone, but it is not always safe. The
1481 operation is not atomic (making sure REPO is not modified during
1481 operation is not atomic (making sure REPO is not modified during
1482 the operation is up to you) and you have to make sure your
1482 the operation is up to you) and you have to make sure your
1483 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1483 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1484 so). Also, this is not compatible with certain extensions that
1484 so). Also, this is not compatible with certain extensions that
1485 place their metadata under the .hg directory, such as mq.
1485 place their metadata under the .hg directory, such as mq.
1486
1486
1487 Mercurial will update the working directory to the first applicable
1487 Mercurial will update the working directory to the first applicable
1488 revision from this list:
1488 revision from this list:
1489
1489
1490 a) null if -U or the source repository has no changesets
1490 a) null if -U or the source repository has no changesets
1491 b) if -u . and the source repository is local, the first parent of
1491 b) if -u . and the source repository is local, the first parent of
1492 the source repository's working directory
1492 the source repository's working directory
1493 c) the changeset specified with -u (if a branch name, this means the
1493 c) the changeset specified with -u (if a branch name, this means the
1494 latest head of that branch)
1494 latest head of that branch)
1495 d) the changeset specified with -r
1495 d) the changeset specified with -r
1496 e) the tipmost head specified with -b
1496 e) the tipmost head specified with -b
1497 f) the tipmost head specified with the url#branch source syntax
1497 f) the tipmost head specified with the url#branch source syntax
1498 g) the revision marked with the '@' bookmark, if present
1498 g) the revision marked with the '@' bookmark, if present
1499 h) the tipmost head of the default branch
1499 h) the tipmost head of the default branch
1500 i) tip
1500 i) tip
1501
1501
1502 When cloning from servers that support it, Mercurial may fetch
1502 When cloning from servers that support it, Mercurial may fetch
1503 pre-generated data from a server-advertised URL. When this is done,
1503 pre-generated data from a server-advertised URL. When this is done,
1504 hooks operating on incoming changesets and changegroups may fire twice,
1504 hooks operating on incoming changesets and changegroups may fire twice,
1505 once for the bundle fetched from the URL and another for any additional
1505 once for the bundle fetched from the URL and another for any additional
1506 data not fetched from this URL. In addition, if an error occurs, the
1506 data not fetched from this URL. In addition, if an error occurs, the
1507 repository may be rolled back to a partial clone. This behavior may
1507 repository may be rolled back to a partial clone. This behavior may
1508 change in future releases. See :hg:`help -e clonebundles` for more.
1508 change in future releases. See :hg:`help -e clonebundles` for more.
1509
1509
1510 Examples:
1510 Examples:
1511
1511
1512 - clone a remote repository to a new directory named hg/::
1512 - clone a remote repository to a new directory named hg/::
1513
1513
1514 hg clone https://www.mercurial-scm.org/repo/hg/
1514 hg clone https://www.mercurial-scm.org/repo/hg/
1515
1515
1516 - create a lightweight local clone::
1516 - create a lightweight local clone::
1517
1517
1518 hg clone project/ project-feature/
1518 hg clone project/ project-feature/
1519
1519
1520 - clone from an absolute path on an ssh server (note double-slash)::
1520 - clone from an absolute path on an ssh server (note double-slash)::
1521
1521
1522 hg clone ssh://user@server//home/projects/alpha/
1522 hg clone ssh://user@server//home/projects/alpha/
1523
1523
1524 - do a high-speed clone over a LAN while checking out a
1524 - do a high-speed clone over a LAN while checking out a
1525 specified version::
1525 specified version::
1526
1526
1527 hg clone --uncompressed http://server/repo -u 1.5
1527 hg clone --uncompressed http://server/repo -u 1.5
1528
1528
1529 - create a repository without changesets after a particular revision::
1529 - create a repository without changesets after a particular revision::
1530
1530
1531 hg clone -r 04e544 experimental/ good/
1531 hg clone -r 04e544 experimental/ good/
1532
1532
1533 - clone (and track) a particular named branch::
1533 - clone (and track) a particular named branch::
1534
1534
1535 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1535 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1536
1536
1537 See :hg:`help urls` for details on specifying URLs.
1537 See :hg:`help urls` for details on specifying URLs.
1538
1538
1539 Returns 0 on success.
1539 Returns 0 on success.
1540 """
1540 """
1541 if opts.get('noupdate') and opts.get('updaterev'):
1541 if opts.get('noupdate') and opts.get('updaterev'):
1542 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1542 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1543
1543
1544 r = hg.clone(ui, opts, source, dest,
1544 r = hg.clone(ui, opts, source, dest,
1545 pull=opts.get('pull'),
1545 pull=opts.get('pull'),
1546 stream=opts.get('uncompressed'),
1546 stream=opts.get('uncompressed'),
1547 rev=opts.get('rev'),
1547 rev=opts.get('rev'),
1548 update=opts.get('updaterev') or not opts.get('noupdate'),
1548 update=opts.get('updaterev') or not opts.get('noupdate'),
1549 branch=opts.get('branch'),
1549 branch=opts.get('branch'),
1550 shareopts=opts.get('shareopts'))
1550 shareopts=opts.get('shareopts'))
1551
1551
1552 return r is None
1552 return r is None
1553
1553
1554 @command('^commit|ci',
1554 @command('^commit|ci',
1555 [('A', 'addremove', None,
1555 [('A', 'addremove', None,
1556 _('mark new/missing files as added/removed before committing')),
1556 _('mark new/missing files as added/removed before committing')),
1557 ('', 'close-branch', None,
1557 ('', 'close-branch', None,
1558 _('mark a branch head as closed')),
1558 _('mark a branch head as closed')),
1559 ('', 'amend', None, _('amend the parent of the working directory')),
1559 ('', 'amend', None, _('amend the parent of the working directory')),
1560 ('s', 'secret', None, _('use the secret phase for committing')),
1560 ('s', 'secret', None, _('use the secret phase for committing')),
1561 ('e', 'edit', None, _('invoke editor on commit messages')),
1561 ('e', 'edit', None, _('invoke editor on commit messages')),
1562 ('i', 'interactive', None, _('use interactive mode')),
1562 ('i', 'interactive', None, _('use interactive mode')),
1563 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1563 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1564 _('[OPTION]... [FILE]...'),
1564 _('[OPTION]... [FILE]...'),
1565 inferrepo=True)
1565 inferrepo=True)
1566 def commit(ui, repo, *pats, **opts):
1566 def commit(ui, repo, *pats, **opts):
1567 """commit the specified files or all outstanding changes
1567 """commit the specified files or all outstanding changes
1568
1568
1569 Commit changes to the given files into the repository. Unlike a
1569 Commit changes to the given files into the repository. Unlike a
1570 centralized SCM, this operation is a local operation. See
1570 centralized SCM, this operation is a local operation. See
1571 :hg:`push` for a way to actively distribute your changes.
1571 :hg:`push` for a way to actively distribute your changes.
1572
1572
1573 If a list of files is omitted, all changes reported by :hg:`status`
1573 If a list of files is omitted, all changes reported by :hg:`status`
1574 will be committed.
1574 will be committed.
1575
1575
1576 If you are committing the result of a merge, do not provide any
1576 If you are committing the result of a merge, do not provide any
1577 filenames or -I/-X filters.
1577 filenames or -I/-X filters.
1578
1578
1579 If no commit message is specified, Mercurial starts your
1579 If no commit message is specified, Mercurial starts your
1580 configured editor where you can enter a message. In case your
1580 configured editor where you can enter a message. In case your
1581 commit fails, you will find a backup of your message in
1581 commit fails, you will find a backup of your message in
1582 ``.hg/last-message.txt``.
1582 ``.hg/last-message.txt``.
1583
1583
1584 The --close-branch flag can be used to mark the current branch
1584 The --close-branch flag can be used to mark the current branch
1585 head closed. When all heads of a branch are closed, the branch
1585 head closed. When all heads of a branch are closed, the branch
1586 will be considered closed and no longer listed.
1586 will be considered closed and no longer listed.
1587
1587
1588 The --amend flag can be used to amend the parent of the
1588 The --amend flag can be used to amend the parent of the
1589 working directory with a new commit that contains the changes
1589 working directory with a new commit that contains the changes
1590 in the parent in addition to those currently reported by :hg:`status`,
1590 in the parent in addition to those currently reported by :hg:`status`,
1591 if there are any. The old commit is stored in a backup bundle in
1591 if there are any. The old commit is stored in a backup bundle in
1592 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1592 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1593 on how to restore it).
1593 on how to restore it).
1594
1594
1595 Message, user and date are taken from the amended commit unless
1595 Message, user and date are taken from the amended commit unless
1596 specified. When a message isn't specified on the command line,
1596 specified. When a message isn't specified on the command line,
1597 the editor will open with the message of the amended commit.
1597 the editor will open with the message of the amended commit.
1598
1598
1599 It is not possible to amend public changesets (see :hg:`help phases`)
1599 It is not possible to amend public changesets (see :hg:`help phases`)
1600 or changesets that have children.
1600 or changesets that have children.
1601
1601
1602 See :hg:`help dates` for a list of formats valid for -d/--date.
1602 See :hg:`help dates` for a list of formats valid for -d/--date.
1603
1603
1604 Returns 0 on success, 1 if nothing changed.
1604 Returns 0 on success, 1 if nothing changed.
1605
1605
1606 .. container:: verbose
1606 .. container:: verbose
1607
1607
1608 Examples:
1608 Examples:
1609
1609
1610 - commit all files ending in .py::
1610 - commit all files ending in .py::
1611
1611
1612 hg commit --include "set:**.py"
1612 hg commit --include "set:**.py"
1613
1613
1614 - commit all non-binary files::
1614 - commit all non-binary files::
1615
1615
1616 hg commit --exclude "set:binary()"
1616 hg commit --exclude "set:binary()"
1617
1617
1618 - amend the current commit and set the date to now::
1618 - amend the current commit and set the date to now::
1619
1619
1620 hg commit --amend --date now
1620 hg commit --amend --date now
1621 """
1621 """
1622 wlock = lock = None
1622 wlock = lock = None
1623 try:
1623 try:
1624 wlock = repo.wlock()
1624 wlock = repo.wlock()
1625 lock = repo.lock()
1625 lock = repo.lock()
1626 return _docommit(ui, repo, *pats, **opts)
1626 return _docommit(ui, repo, *pats, **opts)
1627 finally:
1627 finally:
1628 release(lock, wlock)
1628 release(lock, wlock)
1629
1629
1630 def _docommit(ui, repo, *pats, **opts):
1630 def _docommit(ui, repo, *pats, **opts):
1631 if opts.get('interactive'):
1631 if opts.get('interactive'):
1632 opts.pop('interactive')
1632 opts.pop('interactive')
1633 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1633 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1634 cmdutil.recordfilter, *pats, **opts)
1634 cmdutil.recordfilter, *pats, **opts)
1635 # ret can be 0 (no changes to record) or the value returned by
1635 # ret can be 0 (no changes to record) or the value returned by
1636 # commit(), 1 if nothing changed or None on success.
1636 # commit(), 1 if nothing changed or None on success.
1637 return 1 if ret == 0 else ret
1637 return 1 if ret == 0 else ret
1638
1638
1639 if opts.get('subrepos'):
1639 if opts.get('subrepos'):
1640 if opts.get('amend'):
1640 if opts.get('amend'):
1641 raise error.Abort(_('cannot amend with --subrepos'))
1641 raise error.Abort(_('cannot amend with --subrepos'))
1642 # Let --subrepos on the command line override config setting.
1642 # Let --subrepos on the command line override config setting.
1643 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1643 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1644
1644
1645 cmdutil.checkunfinished(repo, commit=True)
1645 cmdutil.checkunfinished(repo, commit=True)
1646
1646
1647 branch = repo[None].branch()
1647 branch = repo[None].branch()
1648 bheads = repo.branchheads(branch)
1648 bheads = repo.branchheads(branch)
1649
1649
1650 extra = {}
1650 extra = {}
1651 if opts.get('close_branch'):
1651 if opts.get('close_branch'):
1652 extra['close'] = 1
1652 extra['close'] = 1
1653
1653
1654 if not bheads:
1654 if not bheads:
1655 raise error.Abort(_('can only close branch heads'))
1655 raise error.Abort(_('can only close branch heads'))
1656 elif opts.get('amend'):
1656 elif opts.get('amend'):
1657 if repo[None].parents()[0].p1().branch() != branch and \
1657 if repo[None].parents()[0].p1().branch() != branch and \
1658 repo[None].parents()[0].p2().branch() != branch:
1658 repo[None].parents()[0].p2().branch() != branch:
1659 raise error.Abort(_('can only close branch heads'))
1659 raise error.Abort(_('can only close branch heads'))
1660
1660
1661 if opts.get('amend'):
1661 if opts.get('amend'):
1662 if ui.configbool('ui', 'commitsubrepos'):
1662 if ui.configbool('ui', 'commitsubrepos'):
1663 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1663 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1664
1664
1665 old = repo['.']
1665 old = repo['.']
1666 if not old.mutable():
1666 if not old.mutable():
1667 raise error.Abort(_('cannot amend public changesets'))
1667 raise error.Abort(_('cannot amend public changesets'))
1668 if len(repo[None].parents()) > 1:
1668 if len(repo[None].parents()) > 1:
1669 raise error.Abort(_('cannot amend while merging'))
1669 raise error.Abort(_('cannot amend while merging'))
1670 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1670 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1671 if not allowunstable and old.children():
1671 if not allowunstable and old.children():
1672 raise error.Abort(_('cannot amend changeset with children'))
1672 raise error.Abort(_('cannot amend changeset with children'))
1673
1673
1674 # Currently histedit gets confused if an amend happens while histedit
1674 # Currently histedit gets confused if an amend happens while histedit
1675 # is in progress. Since we have a checkunfinished command, we are
1675 # is in progress. Since we have a checkunfinished command, we are
1676 # temporarily honoring it.
1676 # temporarily honoring it.
1677 #
1677 #
1678 # Note: eventually this guard will be removed. Please do not expect
1678 # Note: eventually this guard will be removed. Please do not expect
1679 # this behavior to remain.
1679 # this behavior to remain.
1680 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1680 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1681 cmdutil.checkunfinished(repo)
1681 cmdutil.checkunfinished(repo)
1682
1682
1683 # commitfunc is used only for temporary amend commit by cmdutil.amend
1683 # commitfunc is used only for temporary amend commit by cmdutil.amend
1684 def commitfunc(ui, repo, message, match, opts):
1684 def commitfunc(ui, repo, message, match, opts):
1685 return repo.commit(message,
1685 return repo.commit(message,
1686 opts.get('user') or old.user(),
1686 opts.get('user') or old.user(),
1687 opts.get('date') or old.date(),
1687 opts.get('date') or old.date(),
1688 match,
1688 match,
1689 extra=extra)
1689 extra=extra)
1690
1690
1691 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1691 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1692 if node == old.node():
1692 if node == old.node():
1693 ui.status(_("nothing changed\n"))
1693 ui.status(_("nothing changed\n"))
1694 return 1
1694 return 1
1695 else:
1695 else:
1696 def commitfunc(ui, repo, message, match, opts):
1696 def commitfunc(ui, repo, message, match, opts):
1697 backup = ui.backupconfig('phases', 'new-commit')
1697 backup = ui.backupconfig('phases', 'new-commit')
1698 baseui = repo.baseui
1698 baseui = repo.baseui
1699 basebackup = baseui.backupconfig('phases', 'new-commit')
1699 basebackup = baseui.backupconfig('phases', 'new-commit')
1700 try:
1700 try:
1701 if opts.get('secret'):
1701 if opts.get('secret'):
1702 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1702 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1703 # Propagate to subrepos
1703 # Propagate to subrepos
1704 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1704 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1705
1705
1706 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1706 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1707 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1707 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1708 return repo.commit(message, opts.get('user'), opts.get('date'),
1708 return repo.commit(message, opts.get('user'), opts.get('date'),
1709 match,
1709 match,
1710 editor=editor,
1710 editor=editor,
1711 extra=extra)
1711 extra=extra)
1712 finally:
1712 finally:
1713 ui.restoreconfig(backup)
1713 ui.restoreconfig(backup)
1714 repo.baseui.restoreconfig(basebackup)
1714 repo.baseui.restoreconfig(basebackup)
1715
1715
1716
1716
1717 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1717 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1718
1718
1719 if not node:
1719 if not node:
1720 stat = cmdutil.postcommitstatus(repo, pats, opts)
1720 stat = cmdutil.postcommitstatus(repo, pats, opts)
1721 if stat[3]:
1721 if stat[3]:
1722 ui.status(_("nothing changed (%d missing files, see "
1722 ui.status(_("nothing changed (%d missing files, see "
1723 "'hg status')\n") % len(stat[3]))
1723 "'hg status')\n") % len(stat[3]))
1724 else:
1724 else:
1725 ui.status(_("nothing changed\n"))
1725 ui.status(_("nothing changed\n"))
1726 return 1
1726 return 1
1727
1727
1728 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1728 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1729
1729
1730 @command('config|showconfig|debugconfig',
1730 @command('config|showconfig|debugconfig',
1731 [('u', 'untrusted', None, _('show untrusted configuration options')),
1731 [('u', 'untrusted', None, _('show untrusted configuration options')),
1732 ('e', 'edit', None, _('edit user config')),
1732 ('e', 'edit', None, _('edit user config')),
1733 ('l', 'local', None, _('edit repository config')),
1733 ('l', 'local', None, _('edit repository config')),
1734 ('g', 'global', None, _('edit global config'))] + formatteropts,
1734 ('g', 'global', None, _('edit global config'))] + formatteropts,
1735 _('[-u] [NAME]...'),
1735 _('[-u] [NAME]...'),
1736 optionalrepo=True)
1736 optionalrepo=True)
1737 def config(ui, repo, *values, **opts):
1737 def config(ui, repo, *values, **opts):
1738 """show combined config settings from all hgrc files
1738 """show combined config settings from all hgrc files
1739
1739
1740 With no arguments, print names and values of all config items.
1740 With no arguments, print names and values of all config items.
1741
1741
1742 With one argument of the form section.name, print just the value
1742 With one argument of the form section.name, print just the value
1743 of that config item.
1743 of that config item.
1744
1744
1745 With multiple arguments, print names and values of all config
1745 With multiple arguments, print names and values of all config
1746 items with matching section names.
1746 items with matching section names.
1747
1747
1748 With --edit, start an editor on the user-level config file. With
1748 With --edit, start an editor on the user-level config file. With
1749 --global, edit the system-wide config file. With --local, edit the
1749 --global, edit the system-wide config file. With --local, edit the
1750 repository-level config file.
1750 repository-level config file.
1751
1751
1752 With --debug, the source (filename and line number) is printed
1752 With --debug, the source (filename and line number) is printed
1753 for each config item.
1753 for each config item.
1754
1754
1755 See :hg:`help config` for more information about config files.
1755 See :hg:`help config` for more information about config files.
1756
1756
1757 Returns 0 on success, 1 if NAME does not exist.
1757 Returns 0 on success, 1 if NAME does not exist.
1758
1758
1759 """
1759 """
1760
1760
1761 if opts.get('edit') or opts.get('local') or opts.get('global'):
1761 if opts.get('edit') or opts.get('local') or opts.get('global'):
1762 if opts.get('local') and opts.get('global'):
1762 if opts.get('local') and opts.get('global'):
1763 raise error.Abort(_("can't use --local and --global together"))
1763 raise error.Abort(_("can't use --local and --global together"))
1764
1764
1765 if opts.get('local'):
1765 if opts.get('local'):
1766 if not repo:
1766 if not repo:
1767 raise error.Abort(_("can't use --local outside a repository"))
1767 raise error.Abort(_("can't use --local outside a repository"))
1768 paths = [repo.join('hgrc')]
1768 paths = [repo.join('hgrc')]
1769 elif opts.get('global'):
1769 elif opts.get('global'):
1770 paths = scmutil.systemrcpath()
1770 paths = scmutil.systemrcpath()
1771 else:
1771 else:
1772 paths = scmutil.userrcpath()
1772 paths = scmutil.userrcpath()
1773
1773
1774 for f in paths:
1774 for f in paths:
1775 if os.path.exists(f):
1775 if os.path.exists(f):
1776 break
1776 break
1777 else:
1777 else:
1778 if opts.get('global'):
1778 if opts.get('global'):
1779 samplehgrc = uimod.samplehgrcs['global']
1779 samplehgrc = uimod.samplehgrcs['global']
1780 elif opts.get('local'):
1780 elif opts.get('local'):
1781 samplehgrc = uimod.samplehgrcs['local']
1781 samplehgrc = uimod.samplehgrcs['local']
1782 else:
1782 else:
1783 samplehgrc = uimod.samplehgrcs['user']
1783 samplehgrc = uimod.samplehgrcs['user']
1784
1784
1785 f = paths[0]
1785 f = paths[0]
1786 fp = open(f, "w")
1786 fp = open(f, "w")
1787 fp.write(samplehgrc)
1787 fp.write(samplehgrc)
1788 fp.close()
1788 fp.close()
1789
1789
1790 editor = ui.geteditor()
1790 editor = ui.geteditor()
1791 ui.system("%s \"%s\"" % (editor, f),
1791 ui.system("%s \"%s\"" % (editor, f),
1792 onerr=error.Abort, errprefix=_("edit failed"))
1792 onerr=error.Abort, errprefix=_("edit failed"))
1793 return
1793 return
1794 ui.pager('config')
1794 ui.pager('config')
1795 fm = ui.formatter('config', opts)
1795 fm = ui.formatter('config', opts)
1796 for f in scmutil.rcpath():
1796 for f in scmutil.rcpath():
1797 ui.debug('read config from: %s\n' % f)
1797 ui.debug('read config from: %s\n' % f)
1798 untrusted = bool(opts.get('untrusted'))
1798 untrusted = bool(opts.get('untrusted'))
1799 if values:
1799 if values:
1800 sections = [v for v in values if '.' not in v]
1800 sections = [v for v in values if '.' not in v]
1801 items = [v for v in values if '.' in v]
1801 items = [v for v in values if '.' in v]
1802 if len(items) > 1 or items and sections:
1802 if len(items) > 1 or items and sections:
1803 raise error.Abort(_('only one config item permitted'))
1803 raise error.Abort(_('only one config item permitted'))
1804 matched = False
1804 matched = False
1805 for section, name, value in ui.walkconfig(untrusted=untrusted):
1805 for section, name, value in ui.walkconfig(untrusted=untrusted):
1806 source = ui.configsource(section, name, untrusted)
1806 source = ui.configsource(section, name, untrusted)
1807 value = str(value)
1807 value = str(value)
1808 if fm.isplain():
1808 if fm.isplain():
1809 source = source or 'none'
1809 source = source or 'none'
1810 value = value.replace('\n', '\\n')
1810 value = value.replace('\n', '\\n')
1811 entryname = section + '.' + name
1811 entryname = section + '.' + name
1812 if values:
1812 if values:
1813 for v in values:
1813 for v in values:
1814 if v == section:
1814 if v == section:
1815 fm.startitem()
1815 fm.startitem()
1816 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1816 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1817 fm.write('name value', '%s=%s\n', entryname, value)
1817 fm.write('name value', '%s=%s\n', entryname, value)
1818 matched = True
1818 matched = True
1819 elif v == entryname:
1819 elif v == entryname:
1820 fm.startitem()
1820 fm.startitem()
1821 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1821 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1822 fm.write('value', '%s\n', value)
1822 fm.write('value', '%s\n', value)
1823 fm.data(name=entryname)
1823 fm.data(name=entryname)
1824 matched = True
1824 matched = True
1825 else:
1825 else:
1826 fm.startitem()
1826 fm.startitem()
1827 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1827 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1828 fm.write('name value', '%s=%s\n', entryname, value)
1828 fm.write('name value', '%s=%s\n', entryname, value)
1829 matched = True
1829 matched = True
1830 fm.end()
1830 fm.end()
1831 if matched:
1831 if matched:
1832 return 0
1832 return 0
1833 return 1
1833 return 1
1834
1834
1835 @command('copy|cp',
1835 @command('copy|cp',
1836 [('A', 'after', None, _('record a copy that has already occurred')),
1836 [('A', 'after', None, _('record a copy that has already occurred')),
1837 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1837 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1838 ] + walkopts + dryrunopts,
1838 ] + walkopts + dryrunopts,
1839 _('[OPTION]... [SOURCE]... DEST'))
1839 _('[OPTION]... [SOURCE]... DEST'))
1840 def copy(ui, repo, *pats, **opts):
1840 def copy(ui, repo, *pats, **opts):
1841 """mark files as copied for the next commit
1841 """mark files as copied for the next commit
1842
1842
1843 Mark dest as having copies of source files. If dest is a
1843 Mark dest as having copies of source files. If dest is a
1844 directory, copies are put in that directory. If dest is a file,
1844 directory, copies are put in that directory. If dest is a file,
1845 the source must be a single file.
1845 the source must be a single file.
1846
1846
1847 By default, this command copies the contents of files as they
1847 By default, this command copies the contents of files as they
1848 exist in the working directory. If invoked with -A/--after, the
1848 exist in the working directory. If invoked with -A/--after, the
1849 operation is recorded, but no copying is performed.
1849 operation is recorded, but no copying is performed.
1850
1850
1851 This command takes effect with the next commit. To undo a copy
1851 This command takes effect with the next commit. To undo a copy
1852 before that, see :hg:`revert`.
1852 before that, see :hg:`revert`.
1853
1853
1854 Returns 0 on success, 1 if errors are encountered.
1854 Returns 0 on success, 1 if errors are encountered.
1855 """
1855 """
1856 with repo.wlock(False):
1856 with repo.wlock(False):
1857 return cmdutil.copy(ui, repo, pats, opts)
1857 return cmdutil.copy(ui, repo, pats, opts)
1858
1858
1859 @command('^diff',
1859 @command('^diff',
1860 [('r', 'rev', [], _('revision'), _('REV')),
1860 [('r', 'rev', [], _('revision'), _('REV')),
1861 ('c', 'change', '', _('change made by revision'), _('REV'))
1861 ('c', 'change', '', _('change made by revision'), _('REV'))
1862 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1862 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1863 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1863 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1864 inferrepo=True)
1864 inferrepo=True)
1865 def diff(ui, repo, *pats, **opts):
1865 def diff(ui, repo, *pats, **opts):
1866 """diff repository (or selected files)
1866 """diff repository (or selected files)
1867
1867
1868 Show differences between revisions for the specified files.
1868 Show differences between revisions for the specified files.
1869
1869
1870 Differences between files are shown using the unified diff format.
1870 Differences between files are shown using the unified diff format.
1871
1871
1872 .. note::
1872 .. note::
1873
1873
1874 :hg:`diff` may generate unexpected results for merges, as it will
1874 :hg:`diff` may generate unexpected results for merges, as it will
1875 default to comparing against the working directory's first
1875 default to comparing against the working directory's first
1876 parent changeset if no revisions are specified.
1876 parent changeset if no revisions are specified.
1877
1877
1878 When two revision arguments are given, then changes are shown
1878 When two revision arguments are given, then changes are shown
1879 between those revisions. If only one revision is specified then
1879 between those revisions. If only one revision is specified then
1880 that revision is compared to the working directory, and, when no
1880 that revision is compared to the working directory, and, when no
1881 revisions are specified, the working directory files are compared
1881 revisions are specified, the working directory files are compared
1882 to its first parent.
1882 to its first parent.
1883
1883
1884 Alternatively you can specify -c/--change with a revision to see
1884 Alternatively you can specify -c/--change with a revision to see
1885 the changes in that changeset relative to its first parent.
1885 the changes in that changeset relative to its first parent.
1886
1886
1887 Without the -a/--text option, diff will avoid generating diffs of
1887 Without the -a/--text option, diff will avoid generating diffs of
1888 files it detects as binary. With -a, diff will generate a diff
1888 files it detects as binary. With -a, diff will generate a diff
1889 anyway, probably with undesirable results.
1889 anyway, probably with undesirable results.
1890
1890
1891 Use the -g/--git option to generate diffs in the git extended diff
1891 Use the -g/--git option to generate diffs in the git extended diff
1892 format. For more information, read :hg:`help diffs`.
1892 format. For more information, read :hg:`help diffs`.
1893
1893
1894 .. container:: verbose
1894 .. container:: verbose
1895
1895
1896 Examples:
1896 Examples:
1897
1897
1898 - compare a file in the current working directory to its parent::
1898 - compare a file in the current working directory to its parent::
1899
1899
1900 hg diff foo.c
1900 hg diff foo.c
1901
1901
1902 - compare two historical versions of a directory, with rename info::
1902 - compare two historical versions of a directory, with rename info::
1903
1903
1904 hg diff --git -r 1.0:1.2 lib/
1904 hg diff --git -r 1.0:1.2 lib/
1905
1905
1906 - get change stats relative to the last change on some date::
1906 - get change stats relative to the last change on some date::
1907
1907
1908 hg diff --stat -r "date('may 2')"
1908 hg diff --stat -r "date('may 2')"
1909
1909
1910 - diff all newly-added files that contain a keyword::
1910 - diff all newly-added files that contain a keyword::
1911
1911
1912 hg diff "set:added() and grep(GNU)"
1912 hg diff "set:added() and grep(GNU)"
1913
1913
1914 - compare a revision and its parents::
1914 - compare a revision and its parents::
1915
1915
1916 hg diff -c 9353 # compare against first parent
1916 hg diff -c 9353 # compare against first parent
1917 hg diff -r 9353^:9353 # same using revset syntax
1917 hg diff -r 9353^:9353 # same using revset syntax
1918 hg diff -r 9353^2:9353 # compare against the second parent
1918 hg diff -r 9353^2:9353 # compare against the second parent
1919
1919
1920 Returns 0 on success.
1920 Returns 0 on success.
1921 """
1921 """
1922
1922
1923 revs = opts.get('rev')
1923 revs = opts.get('rev')
1924 change = opts.get('change')
1924 change = opts.get('change')
1925 stat = opts.get('stat')
1925 stat = opts.get('stat')
1926 reverse = opts.get('reverse')
1926 reverse = opts.get('reverse')
1927
1927
1928 if revs and change:
1928 if revs and change:
1929 msg = _('cannot specify --rev and --change at the same time')
1929 msg = _('cannot specify --rev and --change at the same time')
1930 raise error.Abort(msg)
1930 raise error.Abort(msg)
1931 elif change:
1931 elif change:
1932 node2 = scmutil.revsingle(repo, change, None).node()
1932 node2 = scmutil.revsingle(repo, change, None).node()
1933 node1 = repo[node2].p1().node()
1933 node1 = repo[node2].p1().node()
1934 else:
1934 else:
1935 node1, node2 = scmutil.revpair(repo, revs)
1935 node1, node2 = scmutil.revpair(repo, revs)
1936
1936
1937 if reverse:
1937 if reverse:
1938 node1, node2 = node2, node1
1938 node1, node2 = node2, node1
1939
1939
1940 diffopts = patch.diffallopts(ui, opts)
1940 diffopts = patch.diffallopts(ui, opts)
1941 m = scmutil.match(repo[node2], pats, opts)
1941 m = scmutil.match(repo[node2], pats, opts)
1942 ui.pager('diff')
1942 ui.pager('diff')
1943 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1943 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1944 listsubrepos=opts.get('subrepos'),
1944 listsubrepos=opts.get('subrepos'),
1945 root=opts.get('root'))
1945 root=opts.get('root'))
1946
1946
1947 @command('^export',
1947 @command('^export',
1948 [('o', 'output', '',
1948 [('o', 'output', '',
1949 _('print output to file with formatted name'), _('FORMAT')),
1949 _('print output to file with formatted name'), _('FORMAT')),
1950 ('', 'switch-parent', None, _('diff against the second parent')),
1950 ('', 'switch-parent', None, _('diff against the second parent')),
1951 ('r', 'rev', [], _('revisions to export'), _('REV')),
1951 ('r', 'rev', [], _('revisions to export'), _('REV')),
1952 ] + diffopts,
1952 ] + diffopts,
1953 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1953 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1954 def export(ui, repo, *changesets, **opts):
1954 def export(ui, repo, *changesets, **opts):
1955 """dump the header and diffs for one or more changesets
1955 """dump the header and diffs for one or more changesets
1956
1956
1957 Print the changeset header and diffs for one or more revisions.
1957 Print the changeset header and diffs for one or more revisions.
1958 If no revision is given, the parent of the working directory is used.
1958 If no revision is given, the parent of the working directory is used.
1959
1959
1960 The information shown in the changeset header is: author, date,
1960 The information shown in the changeset header is: author, date,
1961 branch name (if non-default), changeset hash, parent(s) and commit
1961 branch name (if non-default), changeset hash, parent(s) and commit
1962 comment.
1962 comment.
1963
1963
1964 .. note::
1964 .. note::
1965
1965
1966 :hg:`export` may generate unexpected diff output for merge
1966 :hg:`export` may generate unexpected diff output for merge
1967 changesets, as it will compare the merge changeset against its
1967 changesets, as it will compare the merge changeset against its
1968 first parent only.
1968 first parent only.
1969
1969
1970 Output may be to a file, in which case the name of the file is
1970 Output may be to a file, in which case the name of the file is
1971 given using a format string. The formatting rules are as follows:
1971 given using a format string. The formatting rules are as follows:
1972
1972
1973 :``%%``: literal "%" character
1973 :``%%``: literal "%" character
1974 :``%H``: changeset hash (40 hexadecimal digits)
1974 :``%H``: changeset hash (40 hexadecimal digits)
1975 :``%N``: number of patches being generated
1975 :``%N``: number of patches being generated
1976 :``%R``: changeset revision number
1976 :``%R``: changeset revision number
1977 :``%b``: basename of the exporting repository
1977 :``%b``: basename of the exporting repository
1978 :``%h``: short-form changeset hash (12 hexadecimal digits)
1978 :``%h``: short-form changeset hash (12 hexadecimal digits)
1979 :``%m``: first line of the commit message (only alphanumeric characters)
1979 :``%m``: first line of the commit message (only alphanumeric characters)
1980 :``%n``: zero-padded sequence number, starting at 1
1980 :``%n``: zero-padded sequence number, starting at 1
1981 :``%r``: zero-padded changeset revision number
1981 :``%r``: zero-padded changeset revision number
1982
1982
1983 Without the -a/--text option, export will avoid generating diffs
1983 Without the -a/--text option, export will avoid generating diffs
1984 of files it detects as binary. With -a, export will generate a
1984 of files it detects as binary. With -a, export will generate a
1985 diff anyway, probably with undesirable results.
1985 diff anyway, probably with undesirable results.
1986
1986
1987 Use the -g/--git option to generate diffs in the git extended diff
1987 Use the -g/--git option to generate diffs in the git extended diff
1988 format. See :hg:`help diffs` for more information.
1988 format. See :hg:`help diffs` for more information.
1989
1989
1990 With the --switch-parent option, the diff will be against the
1990 With the --switch-parent option, the diff will be against the
1991 second parent. It can be useful to review a merge.
1991 second parent. It can be useful to review a merge.
1992
1992
1993 .. container:: verbose
1993 .. container:: verbose
1994
1994
1995 Examples:
1995 Examples:
1996
1996
1997 - use export and import to transplant a bugfix to the current
1997 - use export and import to transplant a bugfix to the current
1998 branch::
1998 branch::
1999
1999
2000 hg export -r 9353 | hg import -
2000 hg export -r 9353 | hg import -
2001
2001
2002 - export all the changesets between two revisions to a file with
2002 - export all the changesets between two revisions to a file with
2003 rename information::
2003 rename information::
2004
2004
2005 hg export --git -r 123:150 > changes.txt
2005 hg export --git -r 123:150 > changes.txt
2006
2006
2007 - split outgoing changes into a series of patches with
2007 - split outgoing changes into a series of patches with
2008 descriptive names::
2008 descriptive names::
2009
2009
2010 hg export -r "outgoing()" -o "%n-%m.patch"
2010 hg export -r "outgoing()" -o "%n-%m.patch"
2011
2011
2012 Returns 0 on success.
2012 Returns 0 on success.
2013 """
2013 """
2014 changesets += tuple(opts.get('rev', []))
2014 changesets += tuple(opts.get('rev', []))
2015 if not changesets:
2015 if not changesets:
2016 changesets = ['.']
2016 changesets = ['.']
2017 revs = scmutil.revrange(repo, changesets)
2017 revs = scmutil.revrange(repo, changesets)
2018 if not revs:
2018 if not revs:
2019 raise error.Abort(_("export requires at least one changeset"))
2019 raise error.Abort(_("export requires at least one changeset"))
2020 if len(revs) > 1:
2020 if len(revs) > 1:
2021 ui.note(_('exporting patches:\n'))
2021 ui.note(_('exporting patches:\n'))
2022 else:
2022 else:
2023 ui.note(_('exporting patch:\n'))
2023 ui.note(_('exporting patch:\n'))
2024 ui.pager('export')
2024 ui.pager('export')
2025 cmdutil.export(repo, revs, template=opts.get('output'),
2025 cmdutil.export(repo, revs, template=opts.get('output'),
2026 switch_parent=opts.get('switch_parent'),
2026 switch_parent=opts.get('switch_parent'),
2027 opts=patch.diffallopts(ui, opts))
2027 opts=patch.diffallopts(ui, opts))
2028
2028
2029 @command('files',
2029 @command('files',
2030 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2030 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2031 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2031 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2032 ] + walkopts + formatteropts + subrepoopts,
2032 ] + walkopts + formatteropts + subrepoopts,
2033 _('[OPTION]... [FILE]...'))
2033 _('[OPTION]... [FILE]...'))
2034 def files(ui, repo, *pats, **opts):
2034 def files(ui, repo, *pats, **opts):
2035 """list tracked files
2035 """list tracked files
2036
2036
2037 Print files under Mercurial control in the working directory or
2037 Print files under Mercurial control in the working directory or
2038 specified revision for given files (excluding removed files).
2038 specified revision for given files (excluding removed files).
2039 Files can be specified as filenames or filesets.
2039 Files can be specified as filenames or filesets.
2040
2040
2041 If no files are given to match, this command prints the names
2041 If no files are given to match, this command prints the names
2042 of all files under Mercurial control.
2042 of all files under Mercurial control.
2043
2043
2044 .. container:: verbose
2044 .. container:: verbose
2045
2045
2046 Examples:
2046 Examples:
2047
2047
2048 - list all files under the current directory::
2048 - list all files under the current directory::
2049
2049
2050 hg files .
2050 hg files .
2051
2051
2052 - shows sizes and flags for current revision::
2052 - shows sizes and flags for current revision::
2053
2053
2054 hg files -vr .
2054 hg files -vr .
2055
2055
2056 - list all files named README::
2056 - list all files named README::
2057
2057
2058 hg files -I "**/README"
2058 hg files -I "**/README"
2059
2059
2060 - list all binary files::
2060 - list all binary files::
2061
2061
2062 hg files "set:binary()"
2062 hg files "set:binary()"
2063
2063
2064 - find files containing a regular expression::
2064 - find files containing a regular expression::
2065
2065
2066 hg files "set:grep('bob')"
2066 hg files "set:grep('bob')"
2067
2067
2068 - search tracked file contents with xargs and grep::
2068 - search tracked file contents with xargs and grep::
2069
2069
2070 hg files -0 | xargs -0 grep foo
2070 hg files -0 | xargs -0 grep foo
2071
2071
2072 See :hg:`help patterns` and :hg:`help filesets` for more information
2072 See :hg:`help patterns` and :hg:`help filesets` for more information
2073 on specifying file patterns.
2073 on specifying file patterns.
2074
2074
2075 Returns 0 if a match is found, 1 otherwise.
2075 Returns 0 if a match is found, 1 otherwise.
2076
2076
2077 """
2077 """
2078 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2078 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2079
2079
2080 end = '\n'
2080 end = '\n'
2081 if opts.get('print0'):
2081 if opts.get('print0'):
2082 end = '\0'
2082 end = '\0'
2083 fmt = '%s' + end
2083 fmt = '%s' + end
2084
2084
2085 m = scmutil.match(ctx, pats, opts)
2085 m = scmutil.match(ctx, pats, opts)
2086 ui.pager('files')
2086 ui.pager('files')
2087 with ui.formatter('files', opts) as fm:
2087 with ui.formatter('files', opts) as fm:
2088 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2088 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2089
2089
2090 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2090 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2091 def forget(ui, repo, *pats, **opts):
2091 def forget(ui, repo, *pats, **opts):
2092 """forget the specified files on the next commit
2092 """forget the specified files on the next commit
2093
2093
2094 Mark the specified files so they will no longer be tracked
2094 Mark the specified files so they will no longer be tracked
2095 after the next commit.
2095 after the next commit.
2096
2096
2097 This only removes files from the current branch, not from the
2097 This only removes files from the current branch, not from the
2098 entire project history, and it does not delete them from the
2098 entire project history, and it does not delete them from the
2099 working directory.
2099 working directory.
2100
2100
2101 To delete the file from the working directory, see :hg:`remove`.
2101 To delete the file from the working directory, see :hg:`remove`.
2102
2102
2103 To undo a forget before the next commit, see :hg:`add`.
2103 To undo a forget before the next commit, see :hg:`add`.
2104
2104
2105 .. container:: verbose
2105 .. container:: verbose
2106
2106
2107 Examples:
2107 Examples:
2108
2108
2109 - forget newly-added binary files::
2109 - forget newly-added binary files::
2110
2110
2111 hg forget "set:added() and binary()"
2111 hg forget "set:added() and binary()"
2112
2112
2113 - forget files that would be excluded by .hgignore::
2113 - forget files that would be excluded by .hgignore::
2114
2114
2115 hg forget "set:hgignore()"
2115 hg forget "set:hgignore()"
2116
2116
2117 Returns 0 on success.
2117 Returns 0 on success.
2118 """
2118 """
2119
2119
2120 if not pats:
2120 if not pats:
2121 raise error.Abort(_('no files specified'))
2121 raise error.Abort(_('no files specified'))
2122
2122
2123 m = scmutil.match(repo[None], pats, opts)
2123 m = scmutil.match(repo[None], pats, opts)
2124 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2124 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2125 return rejected and 1 or 0
2125 return rejected and 1 or 0
2126
2126
2127 @command(
2127 @command(
2128 'graft',
2128 'graft',
2129 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2129 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2130 ('c', 'continue', False, _('resume interrupted graft')),
2130 ('c', 'continue', False, _('resume interrupted graft')),
2131 ('e', 'edit', False, _('invoke editor on commit messages')),
2131 ('e', 'edit', False, _('invoke editor on commit messages')),
2132 ('', 'log', None, _('append graft info to log message')),
2132 ('', 'log', None, _('append graft info to log message')),
2133 ('f', 'force', False, _('force graft')),
2133 ('f', 'force', False, _('force graft')),
2134 ('D', 'currentdate', False,
2134 ('D', 'currentdate', False,
2135 _('record the current date as commit date')),
2135 _('record the current date as commit date')),
2136 ('U', 'currentuser', False,
2136 ('U', 'currentuser', False,
2137 _('record the current user as committer'), _('DATE'))]
2137 _('record the current user as committer'), _('DATE'))]
2138 + commitopts2 + mergetoolopts + dryrunopts,
2138 + commitopts2 + mergetoolopts + dryrunopts,
2139 _('[OPTION]... [-r REV]... REV...'))
2139 _('[OPTION]... [-r REV]... REV...'))
2140 def graft(ui, repo, *revs, **opts):
2140 def graft(ui, repo, *revs, **opts):
2141 '''copy changes from other branches onto the current branch
2141 '''copy changes from other branches onto the current branch
2142
2142
2143 This command uses Mercurial's merge logic to copy individual
2143 This command uses Mercurial's merge logic to copy individual
2144 changes from other branches without merging branches in the
2144 changes from other branches without merging branches in the
2145 history graph. This is sometimes known as 'backporting' or
2145 history graph. This is sometimes known as 'backporting' or
2146 'cherry-picking'. By default, graft will copy user, date, and
2146 'cherry-picking'. By default, graft will copy user, date, and
2147 description from the source changesets.
2147 description from the source changesets.
2148
2148
2149 Changesets that are ancestors of the current revision, that have
2149 Changesets that are ancestors of the current revision, that have
2150 already been grafted, or that are merges will be skipped.
2150 already been grafted, or that are merges will be skipped.
2151
2151
2152 If --log is specified, log messages will have a comment appended
2152 If --log is specified, log messages will have a comment appended
2153 of the form::
2153 of the form::
2154
2154
2155 (grafted from CHANGESETHASH)
2155 (grafted from CHANGESETHASH)
2156
2156
2157 If --force is specified, revisions will be grafted even if they
2157 If --force is specified, revisions will be grafted even if they
2158 are already ancestors of or have been grafted to the destination.
2158 are already ancestors of or have been grafted to the destination.
2159 This is useful when the revisions have since been backed out.
2159 This is useful when the revisions have since been backed out.
2160
2160
2161 If a graft merge results in conflicts, the graft process is
2161 If a graft merge results in conflicts, the graft process is
2162 interrupted so that the current merge can be manually resolved.
2162 interrupted so that the current merge can be manually resolved.
2163 Once all conflicts are addressed, the graft process can be
2163 Once all conflicts are addressed, the graft process can be
2164 continued with the -c/--continue option.
2164 continued with the -c/--continue option.
2165
2165
2166 .. note::
2166 .. note::
2167
2167
2168 The -c/--continue option does not reapply earlier options, except
2168 The -c/--continue option does not reapply earlier options, except
2169 for --force.
2169 for --force.
2170
2170
2171 .. container:: verbose
2171 .. container:: verbose
2172
2172
2173 Examples:
2173 Examples:
2174
2174
2175 - copy a single change to the stable branch and edit its description::
2175 - copy a single change to the stable branch and edit its description::
2176
2176
2177 hg update stable
2177 hg update stable
2178 hg graft --edit 9393
2178 hg graft --edit 9393
2179
2179
2180 - graft a range of changesets with one exception, updating dates::
2180 - graft a range of changesets with one exception, updating dates::
2181
2181
2182 hg graft -D "2085::2093 and not 2091"
2182 hg graft -D "2085::2093 and not 2091"
2183
2183
2184 - continue a graft after resolving conflicts::
2184 - continue a graft after resolving conflicts::
2185
2185
2186 hg graft -c
2186 hg graft -c
2187
2187
2188 - show the source of a grafted changeset::
2188 - show the source of a grafted changeset::
2189
2189
2190 hg log --debug -r .
2190 hg log --debug -r .
2191
2191
2192 - show revisions sorted by date::
2192 - show revisions sorted by date::
2193
2193
2194 hg log -r "sort(all(), date)"
2194 hg log -r "sort(all(), date)"
2195
2195
2196 See :hg:`help revisions` for more about specifying revisions.
2196 See :hg:`help revisions` for more about specifying revisions.
2197
2197
2198 Returns 0 on successful completion.
2198 Returns 0 on successful completion.
2199 '''
2199 '''
2200 with repo.wlock():
2200 with repo.wlock():
2201 return _dograft(ui, repo, *revs, **opts)
2201 return _dograft(ui, repo, *revs, **opts)
2202
2202
2203 def _dograft(ui, repo, *revs, **opts):
2203 def _dograft(ui, repo, *revs, **opts):
2204 if revs and opts.get('rev'):
2204 if revs and opts.get('rev'):
2205 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2205 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2206 'revision ordering!\n'))
2206 'revision ordering!\n'))
2207
2207
2208 revs = list(revs)
2208 revs = list(revs)
2209 revs.extend(opts.get('rev'))
2209 revs.extend(opts.get('rev'))
2210
2210
2211 if not opts.get('user') and opts.get('currentuser'):
2211 if not opts.get('user') and opts.get('currentuser'):
2212 opts['user'] = ui.username()
2212 opts['user'] = ui.username()
2213 if not opts.get('date') and opts.get('currentdate'):
2213 if not opts.get('date') and opts.get('currentdate'):
2214 opts['date'] = "%d %d" % util.makedate()
2214 opts['date'] = "%d %d" % util.makedate()
2215
2215
2216 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2216 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2217
2217
2218 cont = False
2218 cont = False
2219 if opts.get('continue'):
2219 if opts.get('continue'):
2220 cont = True
2220 cont = True
2221 if revs:
2221 if revs:
2222 raise error.Abort(_("can't specify --continue and revisions"))
2222 raise error.Abort(_("can't specify --continue and revisions"))
2223 # read in unfinished revisions
2223 # read in unfinished revisions
2224 try:
2224 try:
2225 nodes = repo.vfs.read('graftstate').splitlines()
2225 nodes = repo.vfs.read('graftstate').splitlines()
2226 revs = [repo[node].rev() for node in nodes]
2226 revs = [repo[node].rev() for node in nodes]
2227 except IOError as inst:
2227 except IOError as inst:
2228 if inst.errno != errno.ENOENT:
2228 if inst.errno != errno.ENOENT:
2229 raise
2229 raise
2230 cmdutil.wrongtooltocontinue(repo, _('graft'))
2230 cmdutil.wrongtooltocontinue(repo, _('graft'))
2231 else:
2231 else:
2232 cmdutil.checkunfinished(repo)
2232 cmdutil.checkunfinished(repo)
2233 cmdutil.bailifchanged(repo)
2233 cmdutil.bailifchanged(repo)
2234 if not revs:
2234 if not revs:
2235 raise error.Abort(_('no revisions specified'))
2235 raise error.Abort(_('no revisions specified'))
2236 revs = scmutil.revrange(repo, revs)
2236 revs = scmutil.revrange(repo, revs)
2237
2237
2238 skipped = set()
2238 skipped = set()
2239 # check for merges
2239 # check for merges
2240 for rev in repo.revs('%ld and merge()', revs):
2240 for rev in repo.revs('%ld and merge()', revs):
2241 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2241 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2242 skipped.add(rev)
2242 skipped.add(rev)
2243 revs = [r for r in revs if r not in skipped]
2243 revs = [r for r in revs if r not in skipped]
2244 if not revs:
2244 if not revs:
2245 return -1
2245 return -1
2246
2246
2247 # Don't check in the --continue case, in effect retaining --force across
2247 # Don't check in the --continue case, in effect retaining --force across
2248 # --continues. That's because without --force, any revisions we decided to
2248 # --continues. That's because without --force, any revisions we decided to
2249 # skip would have been filtered out here, so they wouldn't have made their
2249 # skip would have been filtered out here, so they wouldn't have made their
2250 # way to the graftstate. With --force, any revisions we would have otherwise
2250 # way to the graftstate. With --force, any revisions we would have otherwise
2251 # skipped would not have been filtered out, and if they hadn't been applied
2251 # skipped would not have been filtered out, and if they hadn't been applied
2252 # already, they'd have been in the graftstate.
2252 # already, they'd have been in the graftstate.
2253 if not (cont or opts.get('force')):
2253 if not (cont or opts.get('force')):
2254 # check for ancestors of dest branch
2254 # check for ancestors of dest branch
2255 crev = repo['.'].rev()
2255 crev = repo['.'].rev()
2256 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2256 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2257 # XXX make this lazy in the future
2257 # XXX make this lazy in the future
2258 # don't mutate while iterating, create a copy
2258 # don't mutate while iterating, create a copy
2259 for rev in list(revs):
2259 for rev in list(revs):
2260 if rev in ancestors:
2260 if rev in ancestors:
2261 ui.warn(_('skipping ancestor revision %d:%s\n') %
2261 ui.warn(_('skipping ancestor revision %d:%s\n') %
2262 (rev, repo[rev]))
2262 (rev, repo[rev]))
2263 # XXX remove on list is slow
2263 # XXX remove on list is slow
2264 revs.remove(rev)
2264 revs.remove(rev)
2265 if not revs:
2265 if not revs:
2266 return -1
2266 return -1
2267
2267
2268 # analyze revs for earlier grafts
2268 # analyze revs for earlier grafts
2269 ids = {}
2269 ids = {}
2270 for ctx in repo.set("%ld", revs):
2270 for ctx in repo.set("%ld", revs):
2271 ids[ctx.hex()] = ctx.rev()
2271 ids[ctx.hex()] = ctx.rev()
2272 n = ctx.extra().get('source')
2272 n = ctx.extra().get('source')
2273 if n:
2273 if n:
2274 ids[n] = ctx.rev()
2274 ids[n] = ctx.rev()
2275
2275
2276 # check ancestors for earlier grafts
2276 # check ancestors for earlier grafts
2277 ui.debug('scanning for duplicate grafts\n')
2277 ui.debug('scanning for duplicate grafts\n')
2278
2278
2279 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2279 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2280 ctx = repo[rev]
2280 ctx = repo[rev]
2281 n = ctx.extra().get('source')
2281 n = ctx.extra().get('source')
2282 if n in ids:
2282 if n in ids:
2283 try:
2283 try:
2284 r = repo[n].rev()
2284 r = repo[n].rev()
2285 except error.RepoLookupError:
2285 except error.RepoLookupError:
2286 r = None
2286 r = None
2287 if r in revs:
2287 if r in revs:
2288 ui.warn(_('skipping revision %d:%s '
2288 ui.warn(_('skipping revision %d:%s '
2289 '(already grafted to %d:%s)\n')
2289 '(already grafted to %d:%s)\n')
2290 % (r, repo[r], rev, ctx))
2290 % (r, repo[r], rev, ctx))
2291 revs.remove(r)
2291 revs.remove(r)
2292 elif ids[n] in revs:
2292 elif ids[n] in revs:
2293 if r is None:
2293 if r is None:
2294 ui.warn(_('skipping already grafted revision %d:%s '
2294 ui.warn(_('skipping already grafted revision %d:%s '
2295 '(%d:%s also has unknown origin %s)\n')
2295 '(%d:%s also has unknown origin %s)\n')
2296 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2296 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2297 else:
2297 else:
2298 ui.warn(_('skipping already grafted revision %d:%s '
2298 ui.warn(_('skipping already grafted revision %d:%s '
2299 '(%d:%s also has origin %d:%s)\n')
2299 '(%d:%s also has origin %d:%s)\n')
2300 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2300 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2301 revs.remove(ids[n])
2301 revs.remove(ids[n])
2302 elif ctx.hex() in ids:
2302 elif ctx.hex() in ids:
2303 r = ids[ctx.hex()]
2303 r = ids[ctx.hex()]
2304 ui.warn(_('skipping already grafted revision %d:%s '
2304 ui.warn(_('skipping already grafted revision %d:%s '
2305 '(was grafted from %d:%s)\n') %
2305 '(was grafted from %d:%s)\n') %
2306 (r, repo[r], rev, ctx))
2306 (r, repo[r], rev, ctx))
2307 revs.remove(r)
2307 revs.remove(r)
2308 if not revs:
2308 if not revs:
2309 return -1
2309 return -1
2310
2310
2311 for pos, ctx in enumerate(repo.set("%ld", revs)):
2311 for pos, ctx in enumerate(repo.set("%ld", revs)):
2312 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2312 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2313 ctx.description().split('\n', 1)[0])
2313 ctx.description().split('\n', 1)[0])
2314 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2314 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2315 if names:
2315 if names:
2316 desc += ' (%s)' % ' '.join(names)
2316 desc += ' (%s)' % ' '.join(names)
2317 ui.status(_('grafting %s\n') % desc)
2317 ui.status(_('grafting %s\n') % desc)
2318 if opts.get('dry_run'):
2318 if opts.get('dry_run'):
2319 continue
2319 continue
2320
2320
2321 source = ctx.extra().get('source')
2321 source = ctx.extra().get('source')
2322 extra = {}
2322 extra = {}
2323 if source:
2323 if source:
2324 extra['source'] = source
2324 extra['source'] = source
2325 extra['intermediate-source'] = ctx.hex()
2325 extra['intermediate-source'] = ctx.hex()
2326 else:
2326 else:
2327 extra['source'] = ctx.hex()
2327 extra['source'] = ctx.hex()
2328 user = ctx.user()
2328 user = ctx.user()
2329 if opts.get('user'):
2329 if opts.get('user'):
2330 user = opts['user']
2330 user = opts['user']
2331 date = ctx.date()
2331 date = ctx.date()
2332 if opts.get('date'):
2332 if opts.get('date'):
2333 date = opts['date']
2333 date = opts['date']
2334 message = ctx.description()
2334 message = ctx.description()
2335 if opts.get('log'):
2335 if opts.get('log'):
2336 message += '\n(grafted from %s)' % ctx.hex()
2336 message += '\n(grafted from %s)' % ctx.hex()
2337
2337
2338 # we don't merge the first commit when continuing
2338 # we don't merge the first commit when continuing
2339 if not cont:
2339 if not cont:
2340 # perform the graft merge with p1(rev) as 'ancestor'
2340 # perform the graft merge with p1(rev) as 'ancestor'
2341 try:
2341 try:
2342 # ui.forcemerge is an internal variable, do not document
2342 # ui.forcemerge is an internal variable, do not document
2343 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2343 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2344 'graft')
2344 'graft')
2345 stats = mergemod.graft(repo, ctx, ctx.p1(),
2345 stats = mergemod.graft(repo, ctx, ctx.p1(),
2346 ['local', 'graft'])
2346 ['local', 'graft'])
2347 finally:
2347 finally:
2348 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2348 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2349 # report any conflicts
2349 # report any conflicts
2350 if stats and stats[3] > 0:
2350 if stats and stats[3] > 0:
2351 # write out state for --continue
2351 # write out state for --continue
2352 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2352 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2353 repo.vfs.write('graftstate', ''.join(nodelines))
2353 repo.vfs.write('graftstate', ''.join(nodelines))
2354 extra = ''
2354 extra = ''
2355 if opts.get('user'):
2355 if opts.get('user'):
2356 extra += ' --user %s' % util.shellquote(opts['user'])
2356 extra += ' --user %s' % util.shellquote(opts['user'])
2357 if opts.get('date'):
2357 if opts.get('date'):
2358 extra += ' --date %s' % util.shellquote(opts['date'])
2358 extra += ' --date %s' % util.shellquote(opts['date'])
2359 if opts.get('log'):
2359 if opts.get('log'):
2360 extra += ' --log'
2360 extra += ' --log'
2361 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2361 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2362 raise error.Abort(
2362 raise error.Abort(
2363 _("unresolved conflicts, can't continue"),
2363 _("unresolved conflicts, can't continue"),
2364 hint=hint)
2364 hint=hint)
2365 else:
2365 else:
2366 cont = False
2366 cont = False
2367
2367
2368 # commit
2368 # commit
2369 node = repo.commit(text=message, user=user,
2369 node = repo.commit(text=message, user=user,
2370 date=date, extra=extra, editor=editor)
2370 date=date, extra=extra, editor=editor)
2371 if node is None:
2371 if node is None:
2372 ui.warn(
2372 ui.warn(
2373 _('note: graft of %d:%s created no changes to commit\n') %
2373 _('note: graft of %d:%s created no changes to commit\n') %
2374 (ctx.rev(), ctx))
2374 (ctx.rev(), ctx))
2375
2375
2376 # remove state when we complete successfully
2376 # remove state when we complete successfully
2377 if not opts.get('dry_run'):
2377 if not opts.get('dry_run'):
2378 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
2378 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
2379
2379
2380 return 0
2380 return 0
2381
2381
2382 @command('grep',
2382 @command('grep',
2383 [('0', 'print0', None, _('end fields with NUL')),
2383 [('0', 'print0', None, _('end fields with NUL')),
2384 ('', 'all', None, _('print all revisions that match')),
2384 ('', 'all', None, _('print all revisions that match')),
2385 ('a', 'text', None, _('treat all files as text')),
2385 ('a', 'text', None, _('treat all files as text')),
2386 ('f', 'follow', None,
2386 ('f', 'follow', None,
2387 _('follow changeset history,'
2387 _('follow changeset history,'
2388 ' or file history across copies and renames')),
2388 ' or file history across copies and renames')),
2389 ('i', 'ignore-case', None, _('ignore case when matching')),
2389 ('i', 'ignore-case', None, _('ignore case when matching')),
2390 ('l', 'files-with-matches', None,
2390 ('l', 'files-with-matches', None,
2391 _('print only filenames and revisions that match')),
2391 _('print only filenames and revisions that match')),
2392 ('n', 'line-number', None, _('print matching line numbers')),
2392 ('n', 'line-number', None, _('print matching line numbers')),
2393 ('r', 'rev', [],
2393 ('r', 'rev', [],
2394 _('only search files changed within revision range'), _('REV')),
2394 _('only search files changed within revision range'), _('REV')),
2395 ('u', 'user', None, _('list the author (long with -v)')),
2395 ('u', 'user', None, _('list the author (long with -v)')),
2396 ('d', 'date', None, _('list the date (short with -q)')),
2396 ('d', 'date', None, _('list the date (short with -q)')),
2397 ] + formatteropts + walkopts,
2397 ] + formatteropts + walkopts,
2398 _('[OPTION]... PATTERN [FILE]...'),
2398 _('[OPTION]... PATTERN [FILE]...'),
2399 inferrepo=True)
2399 inferrepo=True)
2400 def grep(ui, repo, pattern, *pats, **opts):
2400 def grep(ui, repo, pattern, *pats, **opts):
2401 """search revision history for a pattern in specified files
2401 """search revision history for a pattern in specified files
2402
2402
2403 Search revision history for a regular expression in the specified
2403 Search revision history for a regular expression in the specified
2404 files or the entire project.
2404 files or the entire project.
2405
2405
2406 By default, grep prints the most recent revision number for each
2406 By default, grep prints the most recent revision number for each
2407 file in which it finds a match. To get it to print every revision
2407 file in which it finds a match. To get it to print every revision
2408 that contains a change in match status ("-" for a match that becomes
2408 that contains a change in match status ("-" for a match that becomes
2409 a non-match, or "+" for a non-match that becomes a match), use the
2409 a non-match, or "+" for a non-match that becomes a match), use the
2410 --all flag.
2410 --all flag.
2411
2411
2412 PATTERN can be any Python (roughly Perl-compatible) regular
2412 PATTERN can be any Python (roughly Perl-compatible) regular
2413 expression.
2413 expression.
2414
2414
2415 If no FILEs are specified (and -f/--follow isn't set), all files in
2415 If no FILEs are specified (and -f/--follow isn't set), all files in
2416 the repository are searched, including those that don't exist in the
2416 the repository are searched, including those that don't exist in the
2417 current branch or have been deleted in a prior changeset.
2417 current branch or have been deleted in a prior changeset.
2418
2418
2419 Returns 0 if a match is found, 1 otherwise.
2419 Returns 0 if a match is found, 1 otherwise.
2420 """
2420 """
2421 reflags = re.M
2421 reflags = re.M
2422 if opts.get('ignore_case'):
2422 if opts.get('ignore_case'):
2423 reflags |= re.I
2423 reflags |= re.I
2424 try:
2424 try:
2425 regexp = util.re.compile(pattern, reflags)
2425 regexp = util.re.compile(pattern, reflags)
2426 except re.error as inst:
2426 except re.error as inst:
2427 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2427 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2428 return 1
2428 return 1
2429 sep, eol = ':', '\n'
2429 sep, eol = ':', '\n'
2430 if opts.get('print0'):
2430 if opts.get('print0'):
2431 sep = eol = '\0'
2431 sep = eol = '\0'
2432
2432
2433 getfile = util.lrucachefunc(repo.file)
2433 getfile = util.lrucachefunc(repo.file)
2434
2434
2435 def matchlines(body):
2435 def matchlines(body):
2436 begin = 0
2436 begin = 0
2437 linenum = 0
2437 linenum = 0
2438 while begin < len(body):
2438 while begin < len(body):
2439 match = regexp.search(body, begin)
2439 match = regexp.search(body, begin)
2440 if not match:
2440 if not match:
2441 break
2441 break
2442 mstart, mend = match.span()
2442 mstart, mend = match.span()
2443 linenum += body.count('\n', begin, mstart) + 1
2443 linenum += body.count('\n', begin, mstart) + 1
2444 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2444 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2445 begin = body.find('\n', mend) + 1 or len(body) + 1
2445 begin = body.find('\n', mend) + 1 or len(body) + 1
2446 lend = begin - 1
2446 lend = begin - 1
2447 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2447 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2448
2448
2449 class linestate(object):
2449 class linestate(object):
2450 def __init__(self, line, linenum, colstart, colend):
2450 def __init__(self, line, linenum, colstart, colend):
2451 self.line = line
2451 self.line = line
2452 self.linenum = linenum
2452 self.linenum = linenum
2453 self.colstart = colstart
2453 self.colstart = colstart
2454 self.colend = colend
2454 self.colend = colend
2455
2455
2456 def __hash__(self):
2456 def __hash__(self):
2457 return hash((self.linenum, self.line))
2457 return hash((self.linenum, self.line))
2458
2458
2459 def __eq__(self, other):
2459 def __eq__(self, other):
2460 return self.line == other.line
2460 return self.line == other.line
2461
2461
2462 def findpos(self):
2462 def findpos(self):
2463 """Iterate all (start, end) indices of matches"""
2463 """Iterate all (start, end) indices of matches"""
2464 yield self.colstart, self.colend
2464 yield self.colstart, self.colend
2465 p = self.colend
2465 p = self.colend
2466 while p < len(self.line):
2466 while p < len(self.line):
2467 m = regexp.search(self.line, p)
2467 m = regexp.search(self.line, p)
2468 if not m:
2468 if not m:
2469 break
2469 break
2470 yield m.span()
2470 yield m.span()
2471 p = m.end()
2471 p = m.end()
2472
2472
2473 matches = {}
2473 matches = {}
2474 copies = {}
2474 copies = {}
2475 def grepbody(fn, rev, body):
2475 def grepbody(fn, rev, body):
2476 matches[rev].setdefault(fn, [])
2476 matches[rev].setdefault(fn, [])
2477 m = matches[rev][fn]
2477 m = matches[rev][fn]
2478 for lnum, cstart, cend, line in matchlines(body):
2478 for lnum, cstart, cend, line in matchlines(body):
2479 s = linestate(line, lnum, cstart, cend)
2479 s = linestate(line, lnum, cstart, cend)
2480 m.append(s)
2480 m.append(s)
2481
2481
2482 def difflinestates(a, b):
2482 def difflinestates(a, b):
2483 sm = difflib.SequenceMatcher(None, a, b)
2483 sm = difflib.SequenceMatcher(None, a, b)
2484 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2484 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2485 if tag == 'insert':
2485 if tag == 'insert':
2486 for i in xrange(blo, bhi):
2486 for i in xrange(blo, bhi):
2487 yield ('+', b[i])
2487 yield ('+', b[i])
2488 elif tag == 'delete':
2488 elif tag == 'delete':
2489 for i in xrange(alo, ahi):
2489 for i in xrange(alo, ahi):
2490 yield ('-', a[i])
2490 yield ('-', a[i])
2491 elif tag == 'replace':
2491 elif tag == 'replace':
2492 for i in xrange(alo, ahi):
2492 for i in xrange(alo, ahi):
2493 yield ('-', a[i])
2493 yield ('-', a[i])
2494 for i in xrange(blo, bhi):
2494 for i in xrange(blo, bhi):
2495 yield ('+', b[i])
2495 yield ('+', b[i])
2496
2496
2497 def display(fm, fn, ctx, pstates, states):
2497 def display(fm, fn, ctx, pstates, states):
2498 rev = ctx.rev()
2498 rev = ctx.rev()
2499 if fm.isplain():
2499 if fm.isplain():
2500 formatuser = ui.shortuser
2500 formatuser = ui.shortuser
2501 else:
2501 else:
2502 formatuser = str
2502 formatuser = str
2503 if ui.quiet:
2503 if ui.quiet:
2504 datefmt = '%Y-%m-%d'
2504 datefmt = '%Y-%m-%d'
2505 else:
2505 else:
2506 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2506 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2507 found = False
2507 found = False
2508 @util.cachefunc
2508 @util.cachefunc
2509 def binary():
2509 def binary():
2510 flog = getfile(fn)
2510 flog = getfile(fn)
2511 return util.binary(flog.read(ctx.filenode(fn)))
2511 return util.binary(flog.read(ctx.filenode(fn)))
2512
2512
2513 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2513 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2514 if opts.get('all'):
2514 if opts.get('all'):
2515 iter = difflinestates(pstates, states)
2515 iter = difflinestates(pstates, states)
2516 else:
2516 else:
2517 iter = [('', l) for l in states]
2517 iter = [('', l) for l in states]
2518 for change, l in iter:
2518 for change, l in iter:
2519 fm.startitem()
2519 fm.startitem()
2520 fm.data(node=fm.hexfunc(ctx.node()))
2520 fm.data(node=fm.hexfunc(ctx.node()))
2521 cols = [
2521 cols = [
2522 ('filename', fn, True),
2522 ('filename', fn, True),
2523 ('rev', rev, True),
2523 ('rev', rev, True),
2524 ('linenumber', l.linenum, opts.get('line_number')),
2524 ('linenumber', l.linenum, opts.get('line_number')),
2525 ]
2525 ]
2526 if opts.get('all'):
2526 if opts.get('all'):
2527 cols.append(('change', change, True))
2527 cols.append(('change', change, True))
2528 cols.extend([
2528 cols.extend([
2529 ('user', formatuser(ctx.user()), opts.get('user')),
2529 ('user', formatuser(ctx.user()), opts.get('user')),
2530 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2530 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2531 ])
2531 ])
2532 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2532 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2533 for name, data, cond in cols:
2533 for name, data, cond in cols:
2534 field = fieldnamemap.get(name, name)
2534 field = fieldnamemap.get(name, name)
2535 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2535 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2536 if cond and name != lastcol:
2536 if cond and name != lastcol:
2537 fm.plain(sep, label='grep.sep')
2537 fm.plain(sep, label='grep.sep')
2538 if not opts.get('files_with_matches'):
2538 if not opts.get('files_with_matches'):
2539 fm.plain(sep, label='grep.sep')
2539 fm.plain(sep, label='grep.sep')
2540 if not opts.get('text') and binary():
2540 if not opts.get('text') and binary():
2541 fm.plain(_(" Binary file matches"))
2541 fm.plain(_(" Binary file matches"))
2542 else:
2542 else:
2543 displaymatches(fm.nested('texts'), l)
2543 displaymatches(fm.nested('texts'), l)
2544 fm.plain(eol)
2544 fm.plain(eol)
2545 found = True
2545 found = True
2546 if opts.get('files_with_matches'):
2546 if opts.get('files_with_matches'):
2547 break
2547 break
2548 return found
2548 return found
2549
2549
2550 def displaymatches(fm, l):
2550 def displaymatches(fm, l):
2551 p = 0
2551 p = 0
2552 for s, e in l.findpos():
2552 for s, e in l.findpos():
2553 if p < s:
2553 if p < s:
2554 fm.startitem()
2554 fm.startitem()
2555 fm.write('text', '%s', l.line[p:s])
2555 fm.write('text', '%s', l.line[p:s])
2556 fm.data(matched=False)
2556 fm.data(matched=False)
2557 fm.startitem()
2557 fm.startitem()
2558 fm.write('text', '%s', l.line[s:e], label='grep.match')
2558 fm.write('text', '%s', l.line[s:e], label='grep.match')
2559 fm.data(matched=True)
2559 fm.data(matched=True)
2560 p = e
2560 p = e
2561 if p < len(l.line):
2561 if p < len(l.line):
2562 fm.startitem()
2562 fm.startitem()
2563 fm.write('text', '%s', l.line[p:])
2563 fm.write('text', '%s', l.line[p:])
2564 fm.data(matched=False)
2564 fm.data(matched=False)
2565 fm.end()
2565 fm.end()
2566
2566
2567 skip = {}
2567 skip = {}
2568 revfiles = {}
2568 revfiles = {}
2569 matchfn = scmutil.match(repo[None], pats, opts)
2569 matchfn = scmutil.match(repo[None], pats, opts)
2570 found = False
2570 found = False
2571 follow = opts.get('follow')
2571 follow = opts.get('follow')
2572
2572
2573 def prep(ctx, fns):
2573 def prep(ctx, fns):
2574 rev = ctx.rev()
2574 rev = ctx.rev()
2575 pctx = ctx.p1()
2575 pctx = ctx.p1()
2576 parent = pctx.rev()
2576 parent = pctx.rev()
2577 matches.setdefault(rev, {})
2577 matches.setdefault(rev, {})
2578 matches.setdefault(parent, {})
2578 matches.setdefault(parent, {})
2579 files = revfiles.setdefault(rev, [])
2579 files = revfiles.setdefault(rev, [])
2580 for fn in fns:
2580 for fn in fns:
2581 flog = getfile(fn)
2581 flog = getfile(fn)
2582 try:
2582 try:
2583 fnode = ctx.filenode(fn)
2583 fnode = ctx.filenode(fn)
2584 except error.LookupError:
2584 except error.LookupError:
2585 continue
2585 continue
2586
2586
2587 copied = flog.renamed(fnode)
2587 copied = flog.renamed(fnode)
2588 copy = follow and copied and copied[0]
2588 copy = follow and copied and copied[0]
2589 if copy:
2589 if copy:
2590 copies.setdefault(rev, {})[fn] = copy
2590 copies.setdefault(rev, {})[fn] = copy
2591 if fn in skip:
2591 if fn in skip:
2592 if copy:
2592 if copy:
2593 skip[copy] = True
2593 skip[copy] = True
2594 continue
2594 continue
2595 files.append(fn)
2595 files.append(fn)
2596
2596
2597 if fn not in matches[rev]:
2597 if fn not in matches[rev]:
2598 grepbody(fn, rev, flog.read(fnode))
2598 grepbody(fn, rev, flog.read(fnode))
2599
2599
2600 pfn = copy or fn
2600 pfn = copy or fn
2601 if pfn not in matches[parent]:
2601 if pfn not in matches[parent]:
2602 try:
2602 try:
2603 fnode = pctx.filenode(pfn)
2603 fnode = pctx.filenode(pfn)
2604 grepbody(pfn, parent, flog.read(fnode))
2604 grepbody(pfn, parent, flog.read(fnode))
2605 except error.LookupError:
2605 except error.LookupError:
2606 pass
2606 pass
2607
2607
2608 ui.pager('grep')
2608 ui.pager('grep')
2609 fm = ui.formatter('grep', opts)
2609 fm = ui.formatter('grep', opts)
2610 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2610 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2611 rev = ctx.rev()
2611 rev = ctx.rev()
2612 parent = ctx.p1().rev()
2612 parent = ctx.p1().rev()
2613 for fn in sorted(revfiles.get(rev, [])):
2613 for fn in sorted(revfiles.get(rev, [])):
2614 states = matches[rev][fn]
2614 states = matches[rev][fn]
2615 copy = copies.get(rev, {}).get(fn)
2615 copy = copies.get(rev, {}).get(fn)
2616 if fn in skip:
2616 if fn in skip:
2617 if copy:
2617 if copy:
2618 skip[copy] = True
2618 skip[copy] = True
2619 continue
2619 continue
2620 pstates = matches.get(parent, {}).get(copy or fn, [])
2620 pstates = matches.get(parent, {}).get(copy or fn, [])
2621 if pstates or states:
2621 if pstates or states:
2622 r = display(fm, fn, ctx, pstates, states)
2622 r = display(fm, fn, ctx, pstates, states)
2623 found = found or r
2623 found = found or r
2624 if r and not opts.get('all'):
2624 if r and not opts.get('all'):
2625 skip[fn] = True
2625 skip[fn] = True
2626 if copy:
2626 if copy:
2627 skip[copy] = True
2627 skip[copy] = True
2628 del matches[rev]
2628 del matches[rev]
2629 del revfiles[rev]
2629 del revfiles[rev]
2630 fm.end()
2630 fm.end()
2631
2631
2632 return not found
2632 return not found
2633
2633
2634 @command('heads',
2634 @command('heads',
2635 [('r', 'rev', '',
2635 [('r', 'rev', '',
2636 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2636 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2637 ('t', 'topo', False, _('show topological heads only')),
2637 ('t', 'topo', False, _('show topological heads only')),
2638 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2638 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2639 ('c', 'closed', False, _('show normal and closed branch heads')),
2639 ('c', 'closed', False, _('show normal and closed branch heads')),
2640 ] + templateopts,
2640 ] + templateopts,
2641 _('[-ct] [-r STARTREV] [REV]...'))
2641 _('[-ct] [-r STARTREV] [REV]...'))
2642 def heads(ui, repo, *branchrevs, **opts):
2642 def heads(ui, repo, *branchrevs, **opts):
2643 """show branch heads
2643 """show branch heads
2644
2644
2645 With no arguments, show all open branch heads in the repository.
2645 With no arguments, show all open branch heads in the repository.
2646 Branch heads are changesets that have no descendants on the
2646 Branch heads are changesets that have no descendants on the
2647 same branch. They are where development generally takes place and
2647 same branch. They are where development generally takes place and
2648 are the usual targets for update and merge operations.
2648 are the usual targets for update and merge operations.
2649
2649
2650 If one or more REVs are given, only open branch heads on the
2650 If one or more REVs are given, only open branch heads on the
2651 branches associated with the specified changesets are shown. This
2651 branches associated with the specified changesets are shown. This
2652 means that you can use :hg:`heads .` to see the heads on the
2652 means that you can use :hg:`heads .` to see the heads on the
2653 currently checked-out branch.
2653 currently checked-out branch.
2654
2654
2655 If -c/--closed is specified, also show branch heads marked closed
2655 If -c/--closed is specified, also show branch heads marked closed
2656 (see :hg:`commit --close-branch`).
2656 (see :hg:`commit --close-branch`).
2657
2657
2658 If STARTREV is specified, only those heads that are descendants of
2658 If STARTREV is specified, only those heads that are descendants of
2659 STARTREV will be displayed.
2659 STARTREV will be displayed.
2660
2660
2661 If -t/--topo is specified, named branch mechanics will be ignored and only
2661 If -t/--topo is specified, named branch mechanics will be ignored and only
2662 topological heads (changesets with no children) will be shown.
2662 topological heads (changesets with no children) will be shown.
2663
2663
2664 Returns 0 if matching heads are found, 1 if not.
2664 Returns 0 if matching heads are found, 1 if not.
2665 """
2665 """
2666
2666
2667 start = None
2667 start = None
2668 if 'rev' in opts:
2668 if 'rev' in opts:
2669 start = scmutil.revsingle(repo, opts['rev'], None).node()
2669 start = scmutil.revsingle(repo, opts['rev'], None).node()
2670
2670
2671 if opts.get('topo'):
2671 if opts.get('topo'):
2672 heads = [repo[h] for h in repo.heads(start)]
2672 heads = [repo[h] for h in repo.heads(start)]
2673 else:
2673 else:
2674 heads = []
2674 heads = []
2675 for branch in repo.branchmap():
2675 for branch in repo.branchmap():
2676 heads += repo.branchheads(branch, start, opts.get('closed'))
2676 heads += repo.branchheads(branch, start, opts.get('closed'))
2677 heads = [repo[h] for h in heads]
2677 heads = [repo[h] for h in heads]
2678
2678
2679 if branchrevs:
2679 if branchrevs:
2680 branches = set(repo[br].branch() for br in branchrevs)
2680 branches = set(repo[br].branch() for br in branchrevs)
2681 heads = [h for h in heads if h.branch() in branches]
2681 heads = [h for h in heads if h.branch() in branches]
2682
2682
2683 if opts.get('active') and branchrevs:
2683 if opts.get('active') and branchrevs:
2684 dagheads = repo.heads(start)
2684 dagheads = repo.heads(start)
2685 heads = [h for h in heads if h.node() in dagheads]
2685 heads = [h for h in heads if h.node() in dagheads]
2686
2686
2687 if branchrevs:
2687 if branchrevs:
2688 haveheads = set(h.branch() for h in heads)
2688 haveheads = set(h.branch() for h in heads)
2689 if branches - haveheads:
2689 if branches - haveheads:
2690 headless = ', '.join(b for b in branches - haveheads)
2690 headless = ', '.join(b for b in branches - haveheads)
2691 msg = _('no open branch heads found on branches %s')
2691 msg = _('no open branch heads found on branches %s')
2692 if opts.get('rev'):
2692 if opts.get('rev'):
2693 msg += _(' (started at %s)') % opts['rev']
2693 msg += _(' (started at %s)') % opts['rev']
2694 ui.warn((msg + '\n') % headless)
2694 ui.warn((msg + '\n') % headless)
2695
2695
2696 if not heads:
2696 if not heads:
2697 return 1
2697 return 1
2698
2698
2699 heads = sorted(heads, key=lambda x: -x.rev())
2699 heads = sorted(heads, key=lambda x: -x.rev())
2700 displayer = cmdutil.show_changeset(ui, repo, opts)
2700 displayer = cmdutil.show_changeset(ui, repo, opts)
2701 for ctx in heads:
2701 for ctx in heads:
2702 displayer.show(ctx)
2702 displayer.show(ctx)
2703 displayer.close()
2703 displayer.close()
2704
2704
2705 @command('help',
2705 @command('help',
2706 [('e', 'extension', None, _('show only help for extensions')),
2706 [('e', 'extension', None, _('show only help for extensions')),
2707 ('c', 'command', None, _('show only help for commands')),
2707 ('c', 'command', None, _('show only help for commands')),
2708 ('k', 'keyword', None, _('show topics matching keyword')),
2708 ('k', 'keyword', None, _('show topics matching keyword')),
2709 ('s', 'system', [], _('show help for specific platform(s)')),
2709 ('s', 'system', [], _('show help for specific platform(s)')),
2710 ],
2710 ],
2711 _('[-ecks] [TOPIC]'),
2711 _('[-ecks] [TOPIC]'),
2712 norepo=True)
2712 norepo=True)
2713 def help_(ui, name=None, **opts):
2713 def help_(ui, name=None, **opts):
2714 """show help for a given topic or a help overview
2714 """show help for a given topic or a help overview
2715
2715
2716 With no arguments, print a list of commands with short help messages.
2716 With no arguments, print a list of commands with short help messages.
2717
2717
2718 Given a topic, extension, or command name, print help for that
2718 Given a topic, extension, or command name, print help for that
2719 topic.
2719 topic.
2720
2720
2721 Returns 0 if successful.
2721 Returns 0 if successful.
2722 """
2722 """
2723
2723
2724 keep = opts.get('system') or []
2724 keep = opts.get('system') or []
2725 if len(keep) == 0:
2725 if len(keep) == 0:
2726 if pycompat.sysplatform.startswith('win'):
2726 if pycompat.sysplatform.startswith('win'):
2727 keep.append('windows')
2727 keep.append('windows')
2728 elif pycompat.sysplatform == 'OpenVMS':
2728 elif pycompat.sysplatform == 'OpenVMS':
2729 keep.append('vms')
2729 keep.append('vms')
2730 elif pycompat.sysplatform == 'plan9':
2730 elif pycompat.sysplatform == 'plan9':
2731 keep.append('plan9')
2731 keep.append('plan9')
2732 else:
2732 else:
2733 keep.append('unix')
2733 keep.append('unix')
2734 keep.append(pycompat.sysplatform.lower())
2734 keep.append(pycompat.sysplatform.lower())
2735 if ui.verbose:
2735 if ui.verbose:
2736 keep.append('verbose')
2736 keep.append('verbose')
2737
2737
2738 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2738 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2739 ui.pager('help')
2739 ui.pager('help')
2740 ui.write(formatted)
2740 ui.write(formatted)
2741
2741
2742
2742
2743 @command('identify|id',
2743 @command('identify|id',
2744 [('r', 'rev', '',
2744 [('r', 'rev', '',
2745 _('identify the specified revision'), _('REV')),
2745 _('identify the specified revision'), _('REV')),
2746 ('n', 'num', None, _('show local revision number')),
2746 ('n', 'num', None, _('show local revision number')),
2747 ('i', 'id', None, _('show global revision id')),
2747 ('i', 'id', None, _('show global revision id')),
2748 ('b', 'branch', None, _('show branch')),
2748 ('b', 'branch', None, _('show branch')),
2749 ('t', 'tags', None, _('show tags')),
2749 ('t', 'tags', None, _('show tags')),
2750 ('B', 'bookmarks', None, _('show bookmarks')),
2750 ('B', 'bookmarks', None, _('show bookmarks')),
2751 ] + remoteopts,
2751 ] + remoteopts,
2752 _('[-nibtB] [-r REV] [SOURCE]'),
2752 _('[-nibtB] [-r REV] [SOURCE]'),
2753 optionalrepo=True)
2753 optionalrepo=True)
2754 def identify(ui, repo, source=None, rev=None,
2754 def identify(ui, repo, source=None, rev=None,
2755 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2755 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2756 """identify the working directory or specified revision
2756 """identify the working directory or specified revision
2757
2757
2758 Print a summary identifying the repository state at REV using one or
2758 Print a summary identifying the repository state at REV using one or
2759 two parent hash identifiers, followed by a "+" if the working
2759 two parent hash identifiers, followed by a "+" if the working
2760 directory has uncommitted changes, the branch name (if not default),
2760 directory has uncommitted changes, the branch name (if not default),
2761 a list of tags, and a list of bookmarks.
2761 a list of tags, and a list of bookmarks.
2762
2762
2763 When REV is not given, print a summary of the current state of the
2763 When REV is not given, print a summary of the current state of the
2764 repository.
2764 repository.
2765
2765
2766 Specifying a path to a repository root or Mercurial bundle will
2766 Specifying a path to a repository root or Mercurial bundle will
2767 cause lookup to operate on that repository/bundle.
2767 cause lookup to operate on that repository/bundle.
2768
2768
2769 .. container:: verbose
2769 .. container:: verbose
2770
2770
2771 Examples:
2771 Examples:
2772
2772
2773 - generate a build identifier for the working directory::
2773 - generate a build identifier for the working directory::
2774
2774
2775 hg id --id > build-id.dat
2775 hg id --id > build-id.dat
2776
2776
2777 - find the revision corresponding to a tag::
2777 - find the revision corresponding to a tag::
2778
2778
2779 hg id -n -r 1.3
2779 hg id -n -r 1.3
2780
2780
2781 - check the most recent revision of a remote repository::
2781 - check the most recent revision of a remote repository::
2782
2782
2783 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2783 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2784
2784
2785 See :hg:`log` for generating more information about specific revisions,
2785 See :hg:`log` for generating more information about specific revisions,
2786 including full hash identifiers.
2786 including full hash identifiers.
2787
2787
2788 Returns 0 if successful.
2788 Returns 0 if successful.
2789 """
2789 """
2790
2790
2791 if not repo and not source:
2791 if not repo and not source:
2792 raise error.Abort(_("there is no Mercurial repository here "
2792 raise error.Abort(_("there is no Mercurial repository here "
2793 "(.hg not found)"))
2793 "(.hg not found)"))
2794
2794
2795 if ui.debugflag:
2795 if ui.debugflag:
2796 hexfunc = hex
2796 hexfunc = hex
2797 else:
2797 else:
2798 hexfunc = short
2798 hexfunc = short
2799 default = not (num or id or branch or tags or bookmarks)
2799 default = not (num or id or branch or tags or bookmarks)
2800 output = []
2800 output = []
2801 revs = []
2801 revs = []
2802
2802
2803 if source:
2803 if source:
2804 source, branches = hg.parseurl(ui.expandpath(source))
2804 source, branches = hg.parseurl(ui.expandpath(source))
2805 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2805 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2806 repo = peer.local()
2806 repo = peer.local()
2807 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2807 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2808
2808
2809 if not repo:
2809 if not repo:
2810 if num or branch or tags:
2810 if num or branch or tags:
2811 raise error.Abort(
2811 raise error.Abort(
2812 _("can't query remote revision number, branch, or tags"))
2812 _("can't query remote revision number, branch, or tags"))
2813 if not rev and revs:
2813 if not rev and revs:
2814 rev = revs[0]
2814 rev = revs[0]
2815 if not rev:
2815 if not rev:
2816 rev = "tip"
2816 rev = "tip"
2817
2817
2818 remoterev = peer.lookup(rev)
2818 remoterev = peer.lookup(rev)
2819 if default or id:
2819 if default or id:
2820 output = [hexfunc(remoterev)]
2820 output = [hexfunc(remoterev)]
2821
2821
2822 def getbms():
2822 def getbms():
2823 bms = []
2823 bms = []
2824
2824
2825 if 'bookmarks' in peer.listkeys('namespaces'):
2825 if 'bookmarks' in peer.listkeys('namespaces'):
2826 hexremoterev = hex(remoterev)
2826 hexremoterev = hex(remoterev)
2827 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2827 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2828 if bmr == hexremoterev]
2828 if bmr == hexremoterev]
2829
2829
2830 return sorted(bms)
2830 return sorted(bms)
2831
2831
2832 if bookmarks:
2832 if bookmarks:
2833 output.extend(getbms())
2833 output.extend(getbms())
2834 elif default and not ui.quiet:
2834 elif default and not ui.quiet:
2835 # multiple bookmarks for a single parent separated by '/'
2835 # multiple bookmarks for a single parent separated by '/'
2836 bm = '/'.join(getbms())
2836 bm = '/'.join(getbms())
2837 if bm:
2837 if bm:
2838 output.append(bm)
2838 output.append(bm)
2839 else:
2839 else:
2840 ctx = scmutil.revsingle(repo, rev, None)
2840 ctx = scmutil.revsingle(repo, rev, None)
2841
2841
2842 if ctx.rev() is None:
2842 if ctx.rev() is None:
2843 ctx = repo[None]
2843 ctx = repo[None]
2844 parents = ctx.parents()
2844 parents = ctx.parents()
2845 taglist = []
2845 taglist = []
2846 for p in parents:
2846 for p in parents:
2847 taglist.extend(p.tags())
2847 taglist.extend(p.tags())
2848
2848
2849 changed = ""
2849 changed = ""
2850 if default or id or num:
2850 if default or id or num:
2851 if (any(repo.status())
2851 if (any(repo.status())
2852 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2852 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2853 changed = '+'
2853 changed = '+'
2854 if default or id:
2854 if default or id:
2855 output = ["%s%s" %
2855 output = ["%s%s" %
2856 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2856 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2857 if num:
2857 if num:
2858 output.append("%s%s" %
2858 output.append("%s%s" %
2859 ('+'.join([str(p.rev()) for p in parents]), changed))
2859 ('+'.join([str(p.rev()) for p in parents]), changed))
2860 else:
2860 else:
2861 if default or id:
2861 if default or id:
2862 output = [hexfunc(ctx.node())]
2862 output = [hexfunc(ctx.node())]
2863 if num:
2863 if num:
2864 output.append(str(ctx.rev()))
2864 output.append(str(ctx.rev()))
2865 taglist = ctx.tags()
2865 taglist = ctx.tags()
2866
2866
2867 if default and not ui.quiet:
2867 if default and not ui.quiet:
2868 b = ctx.branch()
2868 b = ctx.branch()
2869 if b != 'default':
2869 if b != 'default':
2870 output.append("(%s)" % b)
2870 output.append("(%s)" % b)
2871
2871
2872 # multiple tags for a single parent separated by '/'
2872 # multiple tags for a single parent separated by '/'
2873 t = '/'.join(taglist)
2873 t = '/'.join(taglist)
2874 if t:
2874 if t:
2875 output.append(t)
2875 output.append(t)
2876
2876
2877 # multiple bookmarks for a single parent separated by '/'
2877 # multiple bookmarks for a single parent separated by '/'
2878 bm = '/'.join(ctx.bookmarks())
2878 bm = '/'.join(ctx.bookmarks())
2879 if bm:
2879 if bm:
2880 output.append(bm)
2880 output.append(bm)
2881 else:
2881 else:
2882 if branch:
2882 if branch:
2883 output.append(ctx.branch())
2883 output.append(ctx.branch())
2884
2884
2885 if tags:
2885 if tags:
2886 output.extend(taglist)
2886 output.extend(taglist)
2887
2887
2888 if bookmarks:
2888 if bookmarks:
2889 output.extend(ctx.bookmarks())
2889 output.extend(ctx.bookmarks())
2890
2890
2891 ui.write("%s\n" % ' '.join(output))
2891 ui.write("%s\n" % ' '.join(output))
2892
2892
2893 @command('import|patch',
2893 @command('import|patch',
2894 [('p', 'strip', 1,
2894 [('p', 'strip', 1,
2895 _('directory strip option for patch. This has the same '
2895 _('directory strip option for patch. This has the same '
2896 'meaning as the corresponding patch option'), _('NUM')),
2896 'meaning as the corresponding patch option'), _('NUM')),
2897 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2897 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2898 ('e', 'edit', False, _('invoke editor on commit messages')),
2898 ('e', 'edit', False, _('invoke editor on commit messages')),
2899 ('f', 'force', None,
2899 ('f', 'force', None,
2900 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2900 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2901 ('', 'no-commit', None,
2901 ('', 'no-commit', None,
2902 _("don't commit, just update the working directory")),
2902 _("don't commit, just update the working directory")),
2903 ('', 'bypass', None,
2903 ('', 'bypass', None,
2904 _("apply patch without touching the working directory")),
2904 _("apply patch without touching the working directory")),
2905 ('', 'partial', None,
2905 ('', 'partial', None,
2906 _('commit even if some hunks fail')),
2906 _('commit even if some hunks fail')),
2907 ('', 'exact', None,
2907 ('', 'exact', None,
2908 _('abort if patch would apply lossily')),
2908 _('abort if patch would apply lossily')),
2909 ('', 'prefix', '',
2909 ('', 'prefix', '',
2910 _('apply patch to subdirectory'), _('DIR')),
2910 _('apply patch to subdirectory'), _('DIR')),
2911 ('', 'import-branch', None,
2911 ('', 'import-branch', None,
2912 _('use any branch information in patch (implied by --exact)'))] +
2912 _('use any branch information in patch (implied by --exact)'))] +
2913 commitopts + commitopts2 + similarityopts,
2913 commitopts + commitopts2 + similarityopts,
2914 _('[OPTION]... PATCH...'))
2914 _('[OPTION]... PATCH...'))
2915 def import_(ui, repo, patch1=None, *patches, **opts):
2915 def import_(ui, repo, patch1=None, *patches, **opts):
2916 """import an ordered set of patches
2916 """import an ordered set of patches
2917
2917
2918 Import a list of patches and commit them individually (unless
2918 Import a list of patches and commit them individually (unless
2919 --no-commit is specified).
2919 --no-commit is specified).
2920
2920
2921 To read a patch from standard input (stdin), use "-" as the patch
2921 To read a patch from standard input (stdin), use "-" as the patch
2922 name. If a URL is specified, the patch will be downloaded from
2922 name. If a URL is specified, the patch will be downloaded from
2923 there.
2923 there.
2924
2924
2925 Import first applies changes to the working directory (unless
2925 Import first applies changes to the working directory (unless
2926 --bypass is specified), import will abort if there are outstanding
2926 --bypass is specified), import will abort if there are outstanding
2927 changes.
2927 changes.
2928
2928
2929 Use --bypass to apply and commit patches directly to the
2929 Use --bypass to apply and commit patches directly to the
2930 repository, without affecting the working directory. Without
2930 repository, without affecting the working directory. Without
2931 --exact, patches will be applied on top of the working directory
2931 --exact, patches will be applied on top of the working directory
2932 parent revision.
2932 parent revision.
2933
2933
2934 You can import a patch straight from a mail message. Even patches
2934 You can import a patch straight from a mail message. Even patches
2935 as attachments work (to use the body part, it must have type
2935 as attachments work (to use the body part, it must have type
2936 text/plain or text/x-patch). From and Subject headers of email
2936 text/plain or text/x-patch). From and Subject headers of email
2937 message are used as default committer and commit message. All
2937 message are used as default committer and commit message. All
2938 text/plain body parts before first diff are added to the commit
2938 text/plain body parts before first diff are added to the commit
2939 message.
2939 message.
2940
2940
2941 If the imported patch was generated by :hg:`export`, user and
2941 If the imported patch was generated by :hg:`export`, user and
2942 description from patch override values from message headers and
2942 description from patch override values from message headers and
2943 body. Values given on command line with -m/--message and -u/--user
2943 body. Values given on command line with -m/--message and -u/--user
2944 override these.
2944 override these.
2945
2945
2946 If --exact is specified, import will set the working directory to
2946 If --exact is specified, import will set the working directory to
2947 the parent of each patch before applying it, and will abort if the
2947 the parent of each patch before applying it, and will abort if the
2948 resulting changeset has a different ID than the one recorded in
2948 resulting changeset has a different ID than the one recorded in
2949 the patch. This will guard against various ways that portable
2949 the patch. This will guard against various ways that portable
2950 patch formats and mail systems might fail to transfer Mercurial
2950 patch formats and mail systems might fail to transfer Mercurial
2951 data or metadata. See :hg:`bundle` for lossless transmission.
2951 data or metadata. See :hg:`bundle` for lossless transmission.
2952
2952
2953 Use --partial to ensure a changeset will be created from the patch
2953 Use --partial to ensure a changeset will be created from the patch
2954 even if some hunks fail to apply. Hunks that fail to apply will be
2954 even if some hunks fail to apply. Hunks that fail to apply will be
2955 written to a <target-file>.rej file. Conflicts can then be resolved
2955 written to a <target-file>.rej file. Conflicts can then be resolved
2956 by hand before :hg:`commit --amend` is run to update the created
2956 by hand before :hg:`commit --amend` is run to update the created
2957 changeset. This flag exists to let people import patches that
2957 changeset. This flag exists to let people import patches that
2958 partially apply without losing the associated metadata (author,
2958 partially apply without losing the associated metadata (author,
2959 date, description, ...).
2959 date, description, ...).
2960
2960
2961 .. note::
2961 .. note::
2962
2962
2963 When no hunks apply cleanly, :hg:`import --partial` will create
2963 When no hunks apply cleanly, :hg:`import --partial` will create
2964 an empty changeset, importing only the patch metadata.
2964 an empty changeset, importing only the patch metadata.
2965
2965
2966 With -s/--similarity, hg will attempt to discover renames and
2966 With -s/--similarity, hg will attempt to discover renames and
2967 copies in the patch in the same way as :hg:`addremove`.
2967 copies in the patch in the same way as :hg:`addremove`.
2968
2968
2969 It is possible to use external patch programs to perform the patch
2969 It is possible to use external patch programs to perform the patch
2970 by setting the ``ui.patch`` configuration option. For the default
2970 by setting the ``ui.patch`` configuration option. For the default
2971 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2971 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2972 See :hg:`help config` for more information about configuration
2972 See :hg:`help config` for more information about configuration
2973 files and how to use these options.
2973 files and how to use these options.
2974
2974
2975 See :hg:`help dates` for a list of formats valid for -d/--date.
2975 See :hg:`help dates` for a list of formats valid for -d/--date.
2976
2976
2977 .. container:: verbose
2977 .. container:: verbose
2978
2978
2979 Examples:
2979 Examples:
2980
2980
2981 - import a traditional patch from a website and detect renames::
2981 - import a traditional patch from a website and detect renames::
2982
2982
2983 hg import -s 80 http://example.com/bugfix.patch
2983 hg import -s 80 http://example.com/bugfix.patch
2984
2984
2985 - import a changeset from an hgweb server::
2985 - import a changeset from an hgweb server::
2986
2986
2987 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2987 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2988
2988
2989 - import all the patches in an Unix-style mbox::
2989 - import all the patches in an Unix-style mbox::
2990
2990
2991 hg import incoming-patches.mbox
2991 hg import incoming-patches.mbox
2992
2992
2993 - import patches from stdin::
2993 - import patches from stdin::
2994
2994
2995 hg import -
2995 hg import -
2996
2996
2997 - attempt to exactly restore an exported changeset (not always
2997 - attempt to exactly restore an exported changeset (not always
2998 possible)::
2998 possible)::
2999
2999
3000 hg import --exact proposed-fix.patch
3000 hg import --exact proposed-fix.patch
3001
3001
3002 - use an external tool to apply a patch which is too fuzzy for
3002 - use an external tool to apply a patch which is too fuzzy for
3003 the default internal tool.
3003 the default internal tool.
3004
3004
3005 hg import --config ui.patch="patch --merge" fuzzy.patch
3005 hg import --config ui.patch="patch --merge" fuzzy.patch
3006
3006
3007 - change the default fuzzing from 2 to a less strict 7
3007 - change the default fuzzing from 2 to a less strict 7
3008
3008
3009 hg import --config ui.fuzz=7 fuzz.patch
3009 hg import --config ui.fuzz=7 fuzz.patch
3010
3010
3011 Returns 0 on success, 1 on partial success (see --partial).
3011 Returns 0 on success, 1 on partial success (see --partial).
3012 """
3012 """
3013
3013
3014 if not patch1:
3014 if not patch1:
3015 raise error.Abort(_('need at least one patch to import'))
3015 raise error.Abort(_('need at least one patch to import'))
3016
3016
3017 patches = (patch1,) + patches
3017 patches = (patch1,) + patches
3018
3018
3019 date = opts.get('date')
3019 date = opts.get('date')
3020 if date:
3020 if date:
3021 opts['date'] = util.parsedate(date)
3021 opts['date'] = util.parsedate(date)
3022
3022
3023 exact = opts.get('exact')
3023 exact = opts.get('exact')
3024 update = not opts.get('bypass')
3024 update = not opts.get('bypass')
3025 if not update and opts.get('no_commit'):
3025 if not update and opts.get('no_commit'):
3026 raise error.Abort(_('cannot use --no-commit with --bypass'))
3026 raise error.Abort(_('cannot use --no-commit with --bypass'))
3027 try:
3027 try:
3028 sim = float(opts.get('similarity') or 0)
3028 sim = float(opts.get('similarity') or 0)
3029 except ValueError:
3029 except ValueError:
3030 raise error.Abort(_('similarity must be a number'))
3030 raise error.Abort(_('similarity must be a number'))
3031 if sim < 0 or sim > 100:
3031 if sim < 0 or sim > 100:
3032 raise error.Abort(_('similarity must be between 0 and 100'))
3032 raise error.Abort(_('similarity must be between 0 and 100'))
3033 if sim and not update:
3033 if sim and not update:
3034 raise error.Abort(_('cannot use --similarity with --bypass'))
3034 raise error.Abort(_('cannot use --similarity with --bypass'))
3035 if exact:
3035 if exact:
3036 if opts.get('edit'):
3036 if opts.get('edit'):
3037 raise error.Abort(_('cannot use --exact with --edit'))
3037 raise error.Abort(_('cannot use --exact with --edit'))
3038 if opts.get('prefix'):
3038 if opts.get('prefix'):
3039 raise error.Abort(_('cannot use --exact with --prefix'))
3039 raise error.Abort(_('cannot use --exact with --prefix'))
3040
3040
3041 base = opts["base"]
3041 base = opts["base"]
3042 wlock = dsguard = lock = tr = None
3042 wlock = dsguard = lock = tr = None
3043 msgs = []
3043 msgs = []
3044 ret = 0
3044 ret = 0
3045
3045
3046
3046
3047 try:
3047 try:
3048 wlock = repo.wlock()
3048 wlock = repo.wlock()
3049
3049
3050 if update:
3050 if update:
3051 cmdutil.checkunfinished(repo)
3051 cmdutil.checkunfinished(repo)
3052 if (exact or not opts.get('force')):
3052 if (exact or not opts.get('force')):
3053 cmdutil.bailifchanged(repo)
3053 cmdutil.bailifchanged(repo)
3054
3054
3055 if not opts.get('no_commit'):
3055 if not opts.get('no_commit'):
3056 lock = repo.lock()
3056 lock = repo.lock()
3057 tr = repo.transaction('import')
3057 tr = repo.transaction('import')
3058 else:
3058 else:
3059 dsguard = dirstateguard.dirstateguard(repo, 'import')
3059 dsguard = dirstateguard.dirstateguard(repo, 'import')
3060 parents = repo[None].parents()
3060 parents = repo[None].parents()
3061 for patchurl in patches:
3061 for patchurl in patches:
3062 if patchurl == '-':
3062 if patchurl == '-':
3063 ui.status(_('applying patch from stdin\n'))
3063 ui.status(_('applying patch from stdin\n'))
3064 patchfile = ui.fin
3064 patchfile = ui.fin
3065 patchurl = 'stdin' # for error message
3065 patchurl = 'stdin' # for error message
3066 else:
3066 else:
3067 patchurl = os.path.join(base, patchurl)
3067 patchurl = os.path.join(base, patchurl)
3068 ui.status(_('applying %s\n') % patchurl)
3068 ui.status(_('applying %s\n') % patchurl)
3069 patchfile = hg.openpath(ui, patchurl)
3069 patchfile = hg.openpath(ui, patchurl)
3070
3070
3071 haspatch = False
3071 haspatch = False
3072 for hunk in patch.split(patchfile):
3072 for hunk in patch.split(patchfile):
3073 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3073 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3074 parents, opts,
3074 parents, opts,
3075 msgs, hg.clean)
3075 msgs, hg.clean)
3076 if msg:
3076 if msg:
3077 haspatch = True
3077 haspatch = True
3078 ui.note(msg + '\n')
3078 ui.note(msg + '\n')
3079 if update or exact:
3079 if update or exact:
3080 parents = repo[None].parents()
3080 parents = repo[None].parents()
3081 else:
3081 else:
3082 parents = [repo[node]]
3082 parents = [repo[node]]
3083 if rej:
3083 if rej:
3084 ui.write_err(_("patch applied partially\n"))
3084 ui.write_err(_("patch applied partially\n"))
3085 ui.write_err(_("(fix the .rej files and run "
3085 ui.write_err(_("(fix the .rej files and run "
3086 "`hg commit --amend`)\n"))
3086 "`hg commit --amend`)\n"))
3087 ret = 1
3087 ret = 1
3088 break
3088 break
3089
3089
3090 if not haspatch:
3090 if not haspatch:
3091 raise error.Abort(_('%s: no diffs found') % patchurl)
3091 raise error.Abort(_('%s: no diffs found') % patchurl)
3092
3092
3093 if tr:
3093 if tr:
3094 tr.close()
3094 tr.close()
3095 if msgs:
3095 if msgs:
3096 repo.savecommitmessage('\n* * *\n'.join(msgs))
3096 repo.savecommitmessage('\n* * *\n'.join(msgs))
3097 if dsguard:
3097 if dsguard:
3098 dsguard.close()
3098 dsguard.close()
3099 return ret
3099 return ret
3100 finally:
3100 finally:
3101 if tr:
3101 if tr:
3102 tr.release()
3102 tr.release()
3103 release(lock, dsguard, wlock)
3103 release(lock, dsguard, wlock)
3104
3104
3105 @command('incoming|in',
3105 @command('incoming|in',
3106 [('f', 'force', None,
3106 [('f', 'force', None,
3107 _('run even if remote repository is unrelated')),
3107 _('run even if remote repository is unrelated')),
3108 ('n', 'newest-first', None, _('show newest record first')),
3108 ('n', 'newest-first', None, _('show newest record first')),
3109 ('', 'bundle', '',
3109 ('', 'bundle', '',
3110 _('file to store the bundles into'), _('FILE')),
3110 _('file to store the bundles into'), _('FILE')),
3111 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3111 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3112 ('B', 'bookmarks', False, _("compare bookmarks")),
3112 ('B', 'bookmarks', False, _("compare bookmarks")),
3113 ('b', 'branch', [],
3113 ('b', 'branch', [],
3114 _('a specific branch you would like to pull'), _('BRANCH')),
3114 _('a specific branch you would like to pull'), _('BRANCH')),
3115 ] + logopts + remoteopts + subrepoopts,
3115 ] + logopts + remoteopts + subrepoopts,
3116 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3116 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3117 def incoming(ui, repo, source="default", **opts):
3117 def incoming(ui, repo, source="default", **opts):
3118 """show new changesets found in source
3118 """show new changesets found in source
3119
3119
3120 Show new changesets found in the specified path/URL or the default
3120 Show new changesets found in the specified path/URL or the default
3121 pull location. These are the changesets that would have been pulled
3121 pull location. These are the changesets that would have been pulled
3122 if a pull at the time you issued this command.
3122 if a pull at the time you issued this command.
3123
3123
3124 See pull for valid source format details.
3124 See pull for valid source format details.
3125
3125
3126 .. container:: verbose
3126 .. container:: verbose
3127
3127
3128 With -B/--bookmarks, the result of bookmark comparison between
3128 With -B/--bookmarks, the result of bookmark comparison between
3129 local and remote repositories is displayed. With -v/--verbose,
3129 local and remote repositories is displayed. With -v/--verbose,
3130 status is also displayed for each bookmark like below::
3130 status is also displayed for each bookmark like below::
3131
3131
3132 BM1 01234567890a added
3132 BM1 01234567890a added
3133 BM2 1234567890ab advanced
3133 BM2 1234567890ab advanced
3134 BM3 234567890abc diverged
3134 BM3 234567890abc diverged
3135 BM4 34567890abcd changed
3135 BM4 34567890abcd changed
3136
3136
3137 The action taken locally when pulling depends on the
3137 The action taken locally when pulling depends on the
3138 status of each bookmark:
3138 status of each bookmark:
3139
3139
3140 :``added``: pull will create it
3140 :``added``: pull will create it
3141 :``advanced``: pull will update it
3141 :``advanced``: pull will update it
3142 :``diverged``: pull will create a divergent bookmark
3142 :``diverged``: pull will create a divergent bookmark
3143 :``changed``: result depends on remote changesets
3143 :``changed``: result depends on remote changesets
3144
3144
3145 From the point of view of pulling behavior, bookmark
3145 From the point of view of pulling behavior, bookmark
3146 existing only in the remote repository are treated as ``added``,
3146 existing only in the remote repository are treated as ``added``,
3147 even if it is in fact locally deleted.
3147 even if it is in fact locally deleted.
3148
3148
3149 .. container:: verbose
3149 .. container:: verbose
3150
3150
3151 For remote repository, using --bundle avoids downloading the
3151 For remote repository, using --bundle avoids downloading the
3152 changesets twice if the incoming is followed by a pull.
3152 changesets twice if the incoming is followed by a pull.
3153
3153
3154 Examples:
3154 Examples:
3155
3155
3156 - show incoming changes with patches and full description::
3156 - show incoming changes with patches and full description::
3157
3157
3158 hg incoming -vp
3158 hg incoming -vp
3159
3159
3160 - show incoming changes excluding merges, store a bundle::
3160 - show incoming changes excluding merges, store a bundle::
3161
3161
3162 hg in -vpM --bundle incoming.hg
3162 hg in -vpM --bundle incoming.hg
3163 hg pull incoming.hg
3163 hg pull incoming.hg
3164
3164
3165 - briefly list changes inside a bundle::
3165 - briefly list changes inside a bundle::
3166
3166
3167 hg in changes.hg -T "{desc|firstline}\\n"
3167 hg in changes.hg -T "{desc|firstline}\\n"
3168
3168
3169 Returns 0 if there are incoming changes, 1 otherwise.
3169 Returns 0 if there are incoming changes, 1 otherwise.
3170 """
3170 """
3171 if opts.get('graph'):
3171 if opts.get('graph'):
3172 cmdutil.checkunsupportedgraphflags([], opts)
3172 cmdutil.checkunsupportedgraphflags([], opts)
3173 def display(other, chlist, displayer):
3173 def display(other, chlist, displayer):
3174 revdag = cmdutil.graphrevs(other, chlist, opts)
3174 revdag = cmdutil.graphrevs(other, chlist, opts)
3175 cmdutil.displaygraph(ui, repo, revdag, displayer,
3175 cmdutil.displaygraph(ui, repo, revdag, displayer,
3176 graphmod.asciiedges)
3176 graphmod.asciiedges)
3177
3177
3178 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3178 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3179 return 0
3179 return 0
3180
3180
3181 if opts.get('bundle') and opts.get('subrepos'):
3181 if opts.get('bundle') and opts.get('subrepos'):
3182 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3182 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3183
3183
3184 if opts.get('bookmarks'):
3184 if opts.get('bookmarks'):
3185 source, branches = hg.parseurl(ui.expandpath(source),
3185 source, branches = hg.parseurl(ui.expandpath(source),
3186 opts.get('branch'))
3186 opts.get('branch'))
3187 other = hg.peer(repo, opts, source)
3187 other = hg.peer(repo, opts, source)
3188 if 'bookmarks' not in other.listkeys('namespaces'):
3188 if 'bookmarks' not in other.listkeys('namespaces'):
3189 ui.warn(_("remote doesn't support bookmarks\n"))
3189 ui.warn(_("remote doesn't support bookmarks\n"))
3190 return 0
3190 return 0
3191 ui.pager('incoming')
3191 ui.pager('incoming')
3192 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3192 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3193 return bookmarks.incoming(ui, repo, other)
3193 return bookmarks.incoming(ui, repo, other)
3194
3194
3195 repo._subtoppath = ui.expandpath(source)
3195 repo._subtoppath = ui.expandpath(source)
3196 try:
3196 try:
3197 return hg.incoming(ui, repo, source, opts)
3197 return hg.incoming(ui, repo, source, opts)
3198 finally:
3198 finally:
3199 del repo._subtoppath
3199 del repo._subtoppath
3200
3200
3201
3201
3202 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3202 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3203 norepo=True)
3203 norepo=True)
3204 def init(ui, dest=".", **opts):
3204 def init(ui, dest=".", **opts):
3205 """create a new repository in the given directory
3205 """create a new repository in the given directory
3206
3206
3207 Initialize a new repository in the given directory. If the given
3207 Initialize a new repository in the given directory. If the given
3208 directory does not exist, it will be created.
3208 directory does not exist, it will be created.
3209
3209
3210 If no directory is given, the current directory is used.
3210 If no directory is given, the current directory is used.
3211
3211
3212 It is possible to specify an ``ssh://`` URL as the destination.
3212 It is possible to specify an ``ssh://`` URL as the destination.
3213 See :hg:`help urls` for more information.
3213 See :hg:`help urls` for more information.
3214
3214
3215 Returns 0 on success.
3215 Returns 0 on success.
3216 """
3216 """
3217 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3217 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3218
3218
3219 @command('locate',
3219 @command('locate',
3220 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3220 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3221 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3221 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3222 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3222 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3223 ] + walkopts,
3223 ] + walkopts,
3224 _('[OPTION]... [PATTERN]...'))
3224 _('[OPTION]... [PATTERN]...'))
3225 def locate(ui, repo, *pats, **opts):
3225 def locate(ui, repo, *pats, **opts):
3226 """locate files matching specific patterns (DEPRECATED)
3226 """locate files matching specific patterns (DEPRECATED)
3227
3227
3228 Print files under Mercurial control in the working directory whose
3228 Print files under Mercurial control in the working directory whose
3229 names match the given patterns.
3229 names match the given patterns.
3230
3230
3231 By default, this command searches all directories in the working
3231 By default, this command searches all directories in the working
3232 directory. To search just the current directory and its
3232 directory. To search just the current directory and its
3233 subdirectories, use "--include .".
3233 subdirectories, use "--include .".
3234
3234
3235 If no patterns are given to match, this command prints the names
3235 If no patterns are given to match, this command prints the names
3236 of all files under Mercurial control in the working directory.
3236 of all files under Mercurial control in the working directory.
3237
3237
3238 If you want to feed the output of this command into the "xargs"
3238 If you want to feed the output of this command into the "xargs"
3239 command, use the -0 option to both this command and "xargs". This
3239 command, use the -0 option to both this command and "xargs". This
3240 will avoid the problem of "xargs" treating single filenames that
3240 will avoid the problem of "xargs" treating single filenames that
3241 contain whitespace as multiple filenames.
3241 contain whitespace as multiple filenames.
3242
3242
3243 See :hg:`help files` for a more versatile command.
3243 See :hg:`help files` for a more versatile command.
3244
3244
3245 Returns 0 if a match is found, 1 otherwise.
3245 Returns 0 if a match is found, 1 otherwise.
3246 """
3246 """
3247 if opts.get('print0'):
3247 if opts.get('print0'):
3248 end = '\0'
3248 end = '\0'
3249 else:
3249 else:
3250 end = '\n'
3250 end = '\n'
3251 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3251 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3252
3252
3253 ret = 1
3253 ret = 1
3254 ctx = repo[rev]
3254 ctx = repo[rev]
3255 m = scmutil.match(ctx, pats, opts, default='relglob',
3255 m = scmutil.match(ctx, pats, opts, default='relglob',
3256 badfn=lambda x, y: False)
3256 badfn=lambda x, y: False)
3257
3257
3258 ui.pager('locate')
3258 ui.pager('locate')
3259 for abs in ctx.matches(m):
3259 for abs in ctx.matches(m):
3260 if opts.get('fullpath'):
3260 if opts.get('fullpath'):
3261 ui.write(repo.wjoin(abs), end)
3261 ui.write(repo.wjoin(abs), end)
3262 else:
3262 else:
3263 ui.write(((pats and m.rel(abs)) or abs), end)
3263 ui.write(((pats and m.rel(abs)) or abs), end)
3264 ret = 0
3264 ret = 0
3265
3265
3266 return ret
3266 return ret
3267
3267
3268 @command('^log|history',
3268 @command('^log|history',
3269 [('f', 'follow', None,
3269 [('f', 'follow', None,
3270 _('follow changeset history, or file history across copies and renames')),
3270 _('follow changeset history, or file history across copies and renames')),
3271 ('', 'follow-first', None,
3271 ('', 'follow-first', None,
3272 _('only follow the first parent of merge changesets (DEPRECATED)')),
3272 _('only follow the first parent of merge changesets (DEPRECATED)')),
3273 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3273 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3274 ('C', 'copies', None, _('show copied files')),
3274 ('C', 'copies', None, _('show copied files')),
3275 ('k', 'keyword', [],
3275 ('k', 'keyword', [],
3276 _('do case-insensitive search for a given text'), _('TEXT')),
3276 _('do case-insensitive search for a given text'), _('TEXT')),
3277 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3277 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3278 ('', 'removed', None, _('include revisions where files were removed')),
3278 ('', 'removed', None, _('include revisions where files were removed')),
3279 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3279 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3280 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3280 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3281 ('', 'only-branch', [],
3281 ('', 'only-branch', [],
3282 _('show only changesets within the given named branch (DEPRECATED)'),
3282 _('show only changesets within the given named branch (DEPRECATED)'),
3283 _('BRANCH')),
3283 _('BRANCH')),
3284 ('b', 'branch', [],
3284 ('b', 'branch', [],
3285 _('show changesets within the given named branch'), _('BRANCH')),
3285 _('show changesets within the given named branch'), _('BRANCH')),
3286 ('P', 'prune', [],
3286 ('P', 'prune', [],
3287 _('do not display revision or any of its ancestors'), _('REV')),
3287 _('do not display revision or any of its ancestors'), _('REV')),
3288 ] + logopts + walkopts,
3288 ] + logopts + walkopts,
3289 _('[OPTION]... [FILE]'),
3289 _('[OPTION]... [FILE]'),
3290 inferrepo=True)
3290 inferrepo=True)
3291 def log(ui, repo, *pats, **opts):
3291 def log(ui, repo, *pats, **opts):
3292 """show revision history of entire repository or files
3292 """show revision history of entire repository or files
3293
3293
3294 Print the revision history of the specified files or the entire
3294 Print the revision history of the specified files or the entire
3295 project.
3295 project.
3296
3296
3297 If no revision range is specified, the default is ``tip:0`` unless
3297 If no revision range is specified, the default is ``tip:0`` unless
3298 --follow is set, in which case the working directory parent is
3298 --follow is set, in which case the working directory parent is
3299 used as the starting revision.
3299 used as the starting revision.
3300
3300
3301 File history is shown without following rename or copy history of
3301 File history is shown without following rename or copy history of
3302 files. Use -f/--follow with a filename to follow history across
3302 files. Use -f/--follow with a filename to follow history across
3303 renames and copies. --follow without a filename will only show
3303 renames and copies. --follow without a filename will only show
3304 ancestors or descendants of the starting revision.
3304 ancestors or descendants of the starting revision.
3305
3305
3306 By default this command prints revision number and changeset id,
3306 By default this command prints revision number and changeset id,
3307 tags, non-trivial parents, user, date and time, and a summary for
3307 tags, non-trivial parents, user, date and time, and a summary for
3308 each commit. When the -v/--verbose switch is used, the list of
3308 each commit. When the -v/--verbose switch is used, the list of
3309 changed files and full commit message are shown.
3309 changed files and full commit message are shown.
3310
3310
3311 With --graph the revisions are shown as an ASCII art DAG with the most
3311 With --graph the revisions are shown as an ASCII art DAG with the most
3312 recent changeset at the top.
3312 recent changeset at the top.
3313 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3313 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3314 and '+' represents a fork where the changeset from the lines below is a
3314 and '+' represents a fork where the changeset from the lines below is a
3315 parent of the 'o' merge on the same line.
3315 parent of the 'o' merge on the same line.
3316
3316
3317 .. note::
3317 .. note::
3318
3318
3319 :hg:`log --patch` may generate unexpected diff output for merge
3319 :hg:`log --patch` may generate unexpected diff output for merge
3320 changesets, as it will only compare the merge changeset against
3320 changesets, as it will only compare the merge changeset against
3321 its first parent. Also, only files different from BOTH parents
3321 its first parent. Also, only files different from BOTH parents
3322 will appear in files:.
3322 will appear in files:.
3323
3323
3324 .. note::
3324 .. note::
3325
3325
3326 For performance reasons, :hg:`log FILE` may omit duplicate changes
3326 For performance reasons, :hg:`log FILE` may omit duplicate changes
3327 made on branches and will not show removals or mode changes. To
3327 made on branches and will not show removals or mode changes. To
3328 see all such changes, use the --removed switch.
3328 see all such changes, use the --removed switch.
3329
3329
3330 .. container:: verbose
3330 .. container:: verbose
3331
3331
3332 Some examples:
3332 Some examples:
3333
3333
3334 - changesets with full descriptions and file lists::
3334 - changesets with full descriptions and file lists::
3335
3335
3336 hg log -v
3336 hg log -v
3337
3337
3338 - changesets ancestral to the working directory::
3338 - changesets ancestral to the working directory::
3339
3339
3340 hg log -f
3340 hg log -f
3341
3341
3342 - last 10 commits on the current branch::
3342 - last 10 commits on the current branch::
3343
3343
3344 hg log -l 10 -b .
3344 hg log -l 10 -b .
3345
3345
3346 - changesets showing all modifications of a file, including removals::
3346 - changesets showing all modifications of a file, including removals::
3347
3347
3348 hg log --removed file.c
3348 hg log --removed file.c
3349
3349
3350 - all changesets that touch a directory, with diffs, excluding merges::
3350 - all changesets that touch a directory, with diffs, excluding merges::
3351
3351
3352 hg log -Mp lib/
3352 hg log -Mp lib/
3353
3353
3354 - all revision numbers that match a keyword::
3354 - all revision numbers that match a keyword::
3355
3355
3356 hg log -k bug --template "{rev}\\n"
3356 hg log -k bug --template "{rev}\\n"
3357
3357
3358 - the full hash identifier of the working directory parent::
3358 - the full hash identifier of the working directory parent::
3359
3359
3360 hg log -r . --template "{node}\\n"
3360 hg log -r . --template "{node}\\n"
3361
3361
3362 - list available log templates::
3362 - list available log templates::
3363
3363
3364 hg log -T list
3364 hg log -T list
3365
3365
3366 - check if a given changeset is included in a tagged release::
3366 - check if a given changeset is included in a tagged release::
3367
3367
3368 hg log -r "a21ccf and ancestor(1.9)"
3368 hg log -r "a21ccf and ancestor(1.9)"
3369
3369
3370 - find all changesets by some user in a date range::
3370 - find all changesets by some user in a date range::
3371
3371
3372 hg log -k alice -d "may 2008 to jul 2008"
3372 hg log -k alice -d "may 2008 to jul 2008"
3373
3373
3374 - summary of all changesets after the last tag::
3374 - summary of all changesets after the last tag::
3375
3375
3376 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3376 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3377
3377
3378 See :hg:`help dates` for a list of formats valid for -d/--date.
3378 See :hg:`help dates` for a list of formats valid for -d/--date.
3379
3379
3380 See :hg:`help revisions` for more about specifying and ordering
3380 See :hg:`help revisions` for more about specifying and ordering
3381 revisions.
3381 revisions.
3382
3382
3383 See :hg:`help templates` for more about pre-packaged styles and
3383 See :hg:`help templates` for more about pre-packaged styles and
3384 specifying custom templates.
3384 specifying custom templates.
3385
3385
3386 Returns 0 on success.
3386 Returns 0 on success.
3387
3387
3388 """
3388 """
3389 if opts.get('follow') and opts.get('rev'):
3389 if opts.get('follow') and opts.get('rev'):
3390 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3390 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3391 del opts['follow']
3391 del opts['follow']
3392
3392
3393 if opts.get('graph'):
3393 if opts.get('graph'):
3394 return cmdutil.graphlog(ui, repo, *pats, **opts)
3394 return cmdutil.graphlog(ui, repo, *pats, **opts)
3395
3395
3396 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3396 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3397 limit = cmdutil.loglimit(opts)
3397 limit = cmdutil.loglimit(opts)
3398 count = 0
3398 count = 0
3399
3399
3400 getrenamed = None
3400 getrenamed = None
3401 if opts.get('copies'):
3401 if opts.get('copies'):
3402 endrev = None
3402 endrev = None
3403 if opts.get('rev'):
3403 if opts.get('rev'):
3404 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3404 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3405 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3405 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3406
3406
3407 ui.pager('log')
3407 ui.pager('log')
3408 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3408 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3409 for rev in revs:
3409 for rev in revs:
3410 if count == limit:
3410 if count == limit:
3411 break
3411 break
3412 ctx = repo[rev]
3412 ctx = repo[rev]
3413 copies = None
3413 copies = None
3414 if getrenamed is not None and rev:
3414 if getrenamed is not None and rev:
3415 copies = []
3415 copies = []
3416 for fn in ctx.files():
3416 for fn in ctx.files():
3417 rename = getrenamed(fn, rev)
3417 rename = getrenamed(fn, rev)
3418 if rename:
3418 if rename:
3419 copies.append((fn, rename[0]))
3419 copies.append((fn, rename[0]))
3420 if filematcher:
3420 if filematcher:
3421 revmatchfn = filematcher(ctx.rev())
3421 revmatchfn = filematcher(ctx.rev())
3422 else:
3422 else:
3423 revmatchfn = None
3423 revmatchfn = None
3424 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3424 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3425 if displayer.flush(ctx):
3425 if displayer.flush(ctx):
3426 count += 1
3426 count += 1
3427
3427
3428 displayer.close()
3428 displayer.close()
3429
3429
3430 @command('manifest',
3430 @command('manifest',
3431 [('r', 'rev', '', _('revision to display'), _('REV')),
3431 [('r', 'rev', '', _('revision to display'), _('REV')),
3432 ('', 'all', False, _("list files from all revisions"))]
3432 ('', 'all', False, _("list files from all revisions"))]
3433 + formatteropts,
3433 + formatteropts,
3434 _('[-r REV]'))
3434 _('[-r REV]'))
3435 def manifest(ui, repo, node=None, rev=None, **opts):
3435 def manifest(ui, repo, node=None, rev=None, **opts):
3436 """output the current or given revision of the project manifest
3436 """output the current or given revision of the project manifest
3437
3437
3438 Print a list of version controlled files for the given revision.
3438 Print a list of version controlled files for the given revision.
3439 If no revision is given, the first parent of the working directory
3439 If no revision is given, the first parent of the working directory
3440 is used, or the null revision if no revision is checked out.
3440 is used, or the null revision if no revision is checked out.
3441
3441
3442 With -v, print file permissions, symlink and executable bits.
3442 With -v, print file permissions, symlink and executable bits.
3443 With --debug, print file revision hashes.
3443 With --debug, print file revision hashes.
3444
3444
3445 If option --all is specified, the list of all files from all revisions
3445 If option --all is specified, the list of all files from all revisions
3446 is printed. This includes deleted and renamed files.
3446 is printed. This includes deleted and renamed files.
3447
3447
3448 Returns 0 on success.
3448 Returns 0 on success.
3449 """
3449 """
3450 fm = ui.formatter('manifest', opts)
3450 fm = ui.formatter('manifest', opts)
3451
3451
3452 if opts.get('all'):
3452 if opts.get('all'):
3453 if rev or node:
3453 if rev or node:
3454 raise error.Abort(_("can't specify a revision with --all"))
3454 raise error.Abort(_("can't specify a revision with --all"))
3455
3455
3456 res = []
3456 res = []
3457 prefix = "data/"
3457 prefix = "data/"
3458 suffix = ".i"
3458 suffix = ".i"
3459 plen = len(prefix)
3459 plen = len(prefix)
3460 slen = len(suffix)
3460 slen = len(suffix)
3461 with repo.lock():
3461 with repo.lock():
3462 for fn, b, size in repo.store.datafiles():
3462 for fn, b, size in repo.store.datafiles():
3463 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3463 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3464 res.append(fn[plen:-slen])
3464 res.append(fn[plen:-slen])
3465 ui.pager('manifest')
3465 ui.pager('manifest')
3466 for f in res:
3466 for f in res:
3467 fm.startitem()
3467 fm.startitem()
3468 fm.write("path", '%s\n', f)
3468 fm.write("path", '%s\n', f)
3469 fm.end()
3469 fm.end()
3470 return
3470 return
3471
3471
3472 if rev and node:
3472 if rev and node:
3473 raise error.Abort(_("please specify just one revision"))
3473 raise error.Abort(_("please specify just one revision"))
3474
3474
3475 if not node:
3475 if not node:
3476 node = rev
3476 node = rev
3477
3477
3478 char = {'l': '@', 'x': '*', '': ''}
3478 char = {'l': '@', 'x': '*', '': ''}
3479 mode = {'l': '644', 'x': '755', '': '644'}
3479 mode = {'l': '644', 'x': '755', '': '644'}
3480 ctx = scmutil.revsingle(repo, node)
3480 ctx = scmutil.revsingle(repo, node)
3481 mf = ctx.manifest()
3481 mf = ctx.manifest()
3482 ui.pager('manifest')
3482 ui.pager('manifest')
3483 for f in ctx:
3483 for f in ctx:
3484 fm.startitem()
3484 fm.startitem()
3485 fl = ctx[f].flags()
3485 fl = ctx[f].flags()
3486 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3486 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3487 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3487 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3488 fm.write('path', '%s\n', f)
3488 fm.write('path', '%s\n', f)
3489 fm.end()
3489 fm.end()
3490
3490
3491 @command('^merge',
3491 @command('^merge',
3492 [('f', 'force', None,
3492 [('f', 'force', None,
3493 _('force a merge including outstanding changes (DEPRECATED)')),
3493 _('force a merge including outstanding changes (DEPRECATED)')),
3494 ('r', 'rev', '', _('revision to merge'), _('REV')),
3494 ('r', 'rev', '', _('revision to merge'), _('REV')),
3495 ('P', 'preview', None,
3495 ('P', 'preview', None,
3496 _('review revisions to merge (no merge is performed)'))
3496 _('review revisions to merge (no merge is performed)'))
3497 ] + mergetoolopts,
3497 ] + mergetoolopts,
3498 _('[-P] [[-r] REV]'))
3498 _('[-P] [[-r] REV]'))
3499 def merge(ui, repo, node=None, **opts):
3499 def merge(ui, repo, node=None, **opts):
3500 """merge another revision into working directory
3500 """merge another revision into working directory
3501
3501
3502 The current working directory is updated with all changes made in
3502 The current working directory is updated with all changes made in
3503 the requested revision since the last common predecessor revision.
3503 the requested revision since the last common predecessor revision.
3504
3504
3505 Files that changed between either parent are marked as changed for
3505 Files that changed between either parent are marked as changed for
3506 the next commit and a commit must be performed before any further
3506 the next commit and a commit must be performed before any further
3507 updates to the repository are allowed. The next commit will have
3507 updates to the repository are allowed. The next commit will have
3508 two parents.
3508 two parents.
3509
3509
3510 ``--tool`` can be used to specify the merge tool used for file
3510 ``--tool`` can be used to specify the merge tool used for file
3511 merges. It overrides the HGMERGE environment variable and your
3511 merges. It overrides the HGMERGE environment variable and your
3512 configuration files. See :hg:`help merge-tools` for options.
3512 configuration files. See :hg:`help merge-tools` for options.
3513
3513
3514 If no revision is specified, the working directory's parent is a
3514 If no revision is specified, the working directory's parent is a
3515 head revision, and the current branch contains exactly one other
3515 head revision, and the current branch contains exactly one other
3516 head, the other head is merged with by default. Otherwise, an
3516 head, the other head is merged with by default. Otherwise, an
3517 explicit revision with which to merge with must be provided.
3517 explicit revision with which to merge with must be provided.
3518
3518
3519 See :hg:`help resolve` for information on handling file conflicts.
3519 See :hg:`help resolve` for information on handling file conflicts.
3520
3520
3521 To undo an uncommitted merge, use :hg:`update --clean .` which
3521 To undo an uncommitted merge, use :hg:`update --clean .` which
3522 will check out a clean copy of the original merge parent, losing
3522 will check out a clean copy of the original merge parent, losing
3523 all changes.
3523 all changes.
3524
3524
3525 Returns 0 on success, 1 if there are unresolved files.
3525 Returns 0 on success, 1 if there are unresolved files.
3526 """
3526 """
3527
3527
3528 if opts.get('rev') and node:
3528 if opts.get('rev') and node:
3529 raise error.Abort(_("please specify just one revision"))
3529 raise error.Abort(_("please specify just one revision"))
3530 if not node:
3530 if not node:
3531 node = opts.get('rev')
3531 node = opts.get('rev')
3532
3532
3533 if node:
3533 if node:
3534 node = scmutil.revsingle(repo, node).node()
3534 node = scmutil.revsingle(repo, node).node()
3535
3535
3536 if not node:
3536 if not node:
3537 node = repo[destutil.destmerge(repo)].node()
3537 node = repo[destutil.destmerge(repo)].node()
3538
3538
3539 if opts.get('preview'):
3539 if opts.get('preview'):
3540 # find nodes that are ancestors of p2 but not of p1
3540 # find nodes that are ancestors of p2 but not of p1
3541 p1 = repo.lookup('.')
3541 p1 = repo.lookup('.')
3542 p2 = repo.lookup(node)
3542 p2 = repo.lookup(node)
3543 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3543 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3544
3544
3545 displayer = cmdutil.show_changeset(ui, repo, opts)
3545 displayer = cmdutil.show_changeset(ui, repo, opts)
3546 for node in nodes:
3546 for node in nodes:
3547 displayer.show(repo[node])
3547 displayer.show(repo[node])
3548 displayer.close()
3548 displayer.close()
3549 return 0
3549 return 0
3550
3550
3551 try:
3551 try:
3552 # ui.forcemerge is an internal variable, do not document
3552 # ui.forcemerge is an internal variable, do not document
3553 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3553 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3554 force = opts.get('force')
3554 force = opts.get('force')
3555 labels = ['working copy', 'merge rev']
3555 labels = ['working copy', 'merge rev']
3556 return hg.merge(repo, node, force=force, mergeforce=force,
3556 return hg.merge(repo, node, force=force, mergeforce=force,
3557 labels=labels)
3557 labels=labels)
3558 finally:
3558 finally:
3559 ui.setconfig('ui', 'forcemerge', '', 'merge')
3559 ui.setconfig('ui', 'forcemerge', '', 'merge')
3560
3560
3561 @command('outgoing|out',
3561 @command('outgoing|out',
3562 [('f', 'force', None, _('run even when the destination is unrelated')),
3562 [('f', 'force', None, _('run even when the destination is unrelated')),
3563 ('r', 'rev', [],
3563 ('r', 'rev', [],
3564 _('a changeset intended to be included in the destination'), _('REV')),
3564 _('a changeset intended to be included in the destination'), _('REV')),
3565 ('n', 'newest-first', None, _('show newest record first')),
3565 ('n', 'newest-first', None, _('show newest record first')),
3566 ('B', 'bookmarks', False, _('compare bookmarks')),
3566 ('B', 'bookmarks', False, _('compare bookmarks')),
3567 ('b', 'branch', [], _('a specific branch you would like to push'),
3567 ('b', 'branch', [], _('a specific branch you would like to push'),
3568 _('BRANCH')),
3568 _('BRANCH')),
3569 ] + logopts + remoteopts + subrepoopts,
3569 ] + logopts + remoteopts + subrepoopts,
3570 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3570 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3571 def outgoing(ui, repo, dest=None, **opts):
3571 def outgoing(ui, repo, dest=None, **opts):
3572 """show changesets not found in the destination
3572 """show changesets not found in the destination
3573
3573
3574 Show changesets not found in the specified destination repository
3574 Show changesets not found in the specified destination repository
3575 or the default push location. These are the changesets that would
3575 or the default push location. These are the changesets that would
3576 be pushed if a push was requested.
3576 be pushed if a push was requested.
3577
3577
3578 See pull for details of valid destination formats.
3578 See pull for details of valid destination formats.
3579
3579
3580 .. container:: verbose
3580 .. container:: verbose
3581
3581
3582 With -B/--bookmarks, the result of bookmark comparison between
3582 With -B/--bookmarks, the result of bookmark comparison between
3583 local and remote repositories is displayed. With -v/--verbose,
3583 local and remote repositories is displayed. With -v/--verbose,
3584 status is also displayed for each bookmark like below::
3584 status is also displayed for each bookmark like below::
3585
3585
3586 BM1 01234567890a added
3586 BM1 01234567890a added
3587 BM2 deleted
3587 BM2 deleted
3588 BM3 234567890abc advanced
3588 BM3 234567890abc advanced
3589 BM4 34567890abcd diverged
3589 BM4 34567890abcd diverged
3590 BM5 4567890abcde changed
3590 BM5 4567890abcde changed
3591
3591
3592 The action taken when pushing depends on the
3592 The action taken when pushing depends on the
3593 status of each bookmark:
3593 status of each bookmark:
3594
3594
3595 :``added``: push with ``-B`` will create it
3595 :``added``: push with ``-B`` will create it
3596 :``deleted``: push with ``-B`` will delete it
3596 :``deleted``: push with ``-B`` will delete it
3597 :``advanced``: push will update it
3597 :``advanced``: push will update it
3598 :``diverged``: push with ``-B`` will update it
3598 :``diverged``: push with ``-B`` will update it
3599 :``changed``: push with ``-B`` will update it
3599 :``changed``: push with ``-B`` will update it
3600
3600
3601 From the point of view of pushing behavior, bookmarks
3601 From the point of view of pushing behavior, bookmarks
3602 existing only in the remote repository are treated as
3602 existing only in the remote repository are treated as
3603 ``deleted``, even if it is in fact added remotely.
3603 ``deleted``, even if it is in fact added remotely.
3604
3604
3605 Returns 0 if there are outgoing changes, 1 otherwise.
3605 Returns 0 if there are outgoing changes, 1 otherwise.
3606 """
3606 """
3607 if opts.get('graph'):
3607 if opts.get('graph'):
3608 cmdutil.checkunsupportedgraphflags([], opts)
3608 cmdutil.checkunsupportedgraphflags([], opts)
3609 o, other = hg._outgoing(ui, repo, dest, opts)
3609 o, other = hg._outgoing(ui, repo, dest, opts)
3610 if not o:
3610 if not o:
3611 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3611 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3612 return
3612 return
3613
3613
3614 revdag = cmdutil.graphrevs(repo, o, opts)
3614 revdag = cmdutil.graphrevs(repo, o, opts)
3615 ui.pager('outgoing')
3615 ui.pager('outgoing')
3616 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3616 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3617 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3617 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3618 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3618 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3619 return 0
3619 return 0
3620
3620
3621 if opts.get('bookmarks'):
3621 if opts.get('bookmarks'):
3622 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3622 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3623 dest, branches = hg.parseurl(dest, opts.get('branch'))
3623 dest, branches = hg.parseurl(dest, opts.get('branch'))
3624 other = hg.peer(repo, opts, dest)
3624 other = hg.peer(repo, opts, dest)
3625 if 'bookmarks' not in other.listkeys('namespaces'):
3625 if 'bookmarks' not in other.listkeys('namespaces'):
3626 ui.warn(_("remote doesn't support bookmarks\n"))
3626 ui.warn(_("remote doesn't support bookmarks\n"))
3627 return 0
3627 return 0
3628 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3628 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3629 ui.pager('outgoing')
3629 ui.pager('outgoing')
3630 return bookmarks.outgoing(ui, repo, other)
3630 return bookmarks.outgoing(ui, repo, other)
3631
3631
3632 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3632 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3633 try:
3633 try:
3634 return hg.outgoing(ui, repo, dest, opts)
3634 return hg.outgoing(ui, repo, dest, opts)
3635 finally:
3635 finally:
3636 del repo._subtoppath
3636 del repo._subtoppath
3637
3637
3638 @command('parents',
3638 @command('parents',
3639 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3639 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3640 ] + templateopts,
3640 ] + templateopts,
3641 _('[-r REV] [FILE]'),
3641 _('[-r REV] [FILE]'),
3642 inferrepo=True)
3642 inferrepo=True)
3643 def parents(ui, repo, file_=None, **opts):
3643 def parents(ui, repo, file_=None, **opts):
3644 """show the parents of the working directory or revision (DEPRECATED)
3644 """show the parents of the working directory or revision (DEPRECATED)
3645
3645
3646 Print the working directory's parent revisions. If a revision is
3646 Print the working directory's parent revisions. If a revision is
3647 given via -r/--rev, the parent of that revision will be printed.
3647 given via -r/--rev, the parent of that revision will be printed.
3648 If a file argument is given, the revision in which the file was
3648 If a file argument is given, the revision in which the file was
3649 last changed (before the working directory revision or the
3649 last changed (before the working directory revision or the
3650 argument to --rev if given) is printed.
3650 argument to --rev if given) is printed.
3651
3651
3652 This command is equivalent to::
3652 This command is equivalent to::
3653
3653
3654 hg log -r "p1()+p2()" or
3654 hg log -r "p1()+p2()" or
3655 hg log -r "p1(REV)+p2(REV)" or
3655 hg log -r "p1(REV)+p2(REV)" or
3656 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3656 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3657 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3657 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3658
3658
3659 See :hg:`summary` and :hg:`help revsets` for related information.
3659 See :hg:`summary` and :hg:`help revsets` for related information.
3660
3660
3661 Returns 0 on success.
3661 Returns 0 on success.
3662 """
3662 """
3663
3663
3664 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3664 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3665
3665
3666 if file_:
3666 if file_:
3667 m = scmutil.match(ctx, (file_,), opts)
3667 m = scmutil.match(ctx, (file_,), opts)
3668 if m.anypats() or len(m.files()) != 1:
3668 if m.anypats() or len(m.files()) != 1:
3669 raise error.Abort(_('can only specify an explicit filename'))
3669 raise error.Abort(_('can only specify an explicit filename'))
3670 file_ = m.files()[0]
3670 file_ = m.files()[0]
3671 filenodes = []
3671 filenodes = []
3672 for cp in ctx.parents():
3672 for cp in ctx.parents():
3673 if not cp:
3673 if not cp:
3674 continue
3674 continue
3675 try:
3675 try:
3676 filenodes.append(cp.filenode(file_))
3676 filenodes.append(cp.filenode(file_))
3677 except error.LookupError:
3677 except error.LookupError:
3678 pass
3678 pass
3679 if not filenodes:
3679 if not filenodes:
3680 raise error.Abort(_("'%s' not found in manifest!") % file_)
3680 raise error.Abort(_("'%s' not found in manifest!") % file_)
3681 p = []
3681 p = []
3682 for fn in filenodes:
3682 for fn in filenodes:
3683 fctx = repo.filectx(file_, fileid=fn)
3683 fctx = repo.filectx(file_, fileid=fn)
3684 p.append(fctx.node())
3684 p.append(fctx.node())
3685 else:
3685 else:
3686 p = [cp.node() for cp in ctx.parents()]
3686 p = [cp.node() for cp in ctx.parents()]
3687
3687
3688 displayer = cmdutil.show_changeset(ui, repo, opts)
3688 displayer = cmdutil.show_changeset(ui, repo, opts)
3689 for n in p:
3689 for n in p:
3690 if n != nullid:
3690 if n != nullid:
3691 displayer.show(repo[n])
3691 displayer.show(repo[n])
3692 displayer.close()
3692 displayer.close()
3693
3693
3694 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3694 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3695 def paths(ui, repo, search=None, **opts):
3695 def paths(ui, repo, search=None, **opts):
3696 """show aliases for remote repositories
3696 """show aliases for remote repositories
3697
3697
3698 Show definition of symbolic path name NAME. If no name is given,
3698 Show definition of symbolic path name NAME. If no name is given,
3699 show definition of all available names.
3699 show definition of all available names.
3700
3700
3701 Option -q/--quiet suppresses all output when searching for NAME
3701 Option -q/--quiet suppresses all output when searching for NAME
3702 and shows only the path names when listing all definitions.
3702 and shows only the path names when listing all definitions.
3703
3703
3704 Path names are defined in the [paths] section of your
3704 Path names are defined in the [paths] section of your
3705 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3705 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3706 repository, ``.hg/hgrc`` is used, too.
3706 repository, ``.hg/hgrc`` is used, too.
3707
3707
3708 The path names ``default`` and ``default-push`` have a special
3708 The path names ``default`` and ``default-push`` have a special
3709 meaning. When performing a push or pull operation, they are used
3709 meaning. When performing a push or pull operation, they are used
3710 as fallbacks if no location is specified on the command-line.
3710 as fallbacks if no location is specified on the command-line.
3711 When ``default-push`` is set, it will be used for push and
3711 When ``default-push`` is set, it will be used for push and
3712 ``default`` will be used for pull; otherwise ``default`` is used
3712 ``default`` will be used for pull; otherwise ``default`` is used
3713 as the fallback for both. When cloning a repository, the clone
3713 as the fallback for both. When cloning a repository, the clone
3714 source is written as ``default`` in ``.hg/hgrc``.
3714 source is written as ``default`` in ``.hg/hgrc``.
3715
3715
3716 .. note::
3716 .. note::
3717
3717
3718 ``default`` and ``default-push`` apply to all inbound (e.g.
3718 ``default`` and ``default-push`` apply to all inbound (e.g.
3719 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3719 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3720 and :hg:`bundle`) operations.
3720 and :hg:`bundle`) operations.
3721
3721
3722 See :hg:`help urls` for more information.
3722 See :hg:`help urls` for more information.
3723
3723
3724 Returns 0 on success.
3724 Returns 0 on success.
3725 """
3725 """
3726 ui.pager('paths')
3726 ui.pager('paths')
3727 if search:
3727 if search:
3728 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3728 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3729 if name == search]
3729 if name == search]
3730 else:
3730 else:
3731 pathitems = sorted(ui.paths.iteritems())
3731 pathitems = sorted(ui.paths.iteritems())
3732
3732
3733 fm = ui.formatter('paths', opts)
3733 fm = ui.formatter('paths', opts)
3734 if fm.isplain():
3734 if fm.isplain():
3735 hidepassword = util.hidepassword
3735 hidepassword = util.hidepassword
3736 else:
3736 else:
3737 hidepassword = str
3737 hidepassword = str
3738 if ui.quiet:
3738 if ui.quiet:
3739 namefmt = '%s\n'
3739 namefmt = '%s\n'
3740 else:
3740 else:
3741 namefmt = '%s = '
3741 namefmt = '%s = '
3742 showsubopts = not search and not ui.quiet
3742 showsubopts = not search and not ui.quiet
3743
3743
3744 for name, path in pathitems:
3744 for name, path in pathitems:
3745 fm.startitem()
3745 fm.startitem()
3746 fm.condwrite(not search, 'name', namefmt, name)
3746 fm.condwrite(not search, 'name', namefmt, name)
3747 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3747 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3748 for subopt, value in sorted(path.suboptions.items()):
3748 for subopt, value in sorted(path.suboptions.items()):
3749 assert subopt not in ('name', 'url')
3749 assert subopt not in ('name', 'url')
3750 if showsubopts:
3750 if showsubopts:
3751 fm.plain('%s:%s = ' % (name, subopt))
3751 fm.plain('%s:%s = ' % (name, subopt))
3752 fm.condwrite(showsubopts, subopt, '%s\n', value)
3752 fm.condwrite(showsubopts, subopt, '%s\n', value)
3753
3753
3754 fm.end()
3754 fm.end()
3755
3755
3756 if search and not pathitems:
3756 if search and not pathitems:
3757 if not ui.quiet:
3757 if not ui.quiet:
3758 ui.warn(_("not found!\n"))
3758 ui.warn(_("not found!\n"))
3759 return 1
3759 return 1
3760 else:
3760 else:
3761 return 0
3761 return 0
3762
3762
3763 @command('phase',
3763 @command('phase',
3764 [('p', 'public', False, _('set changeset phase to public')),
3764 [('p', 'public', False, _('set changeset phase to public')),
3765 ('d', 'draft', False, _('set changeset phase to draft')),
3765 ('d', 'draft', False, _('set changeset phase to draft')),
3766 ('s', 'secret', False, _('set changeset phase to secret')),
3766 ('s', 'secret', False, _('set changeset phase to secret')),
3767 ('f', 'force', False, _('allow to move boundary backward')),
3767 ('f', 'force', False, _('allow to move boundary backward')),
3768 ('r', 'rev', [], _('target revision'), _('REV')),
3768 ('r', 'rev', [], _('target revision'), _('REV')),
3769 ],
3769 ],
3770 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3770 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3771 def phase(ui, repo, *revs, **opts):
3771 def phase(ui, repo, *revs, **opts):
3772 """set or show the current phase name
3772 """set or show the current phase name
3773
3773
3774 With no argument, show the phase name of the current revision(s).
3774 With no argument, show the phase name of the current revision(s).
3775
3775
3776 With one of -p/--public, -d/--draft or -s/--secret, change the
3776 With one of -p/--public, -d/--draft or -s/--secret, change the
3777 phase value of the specified revisions.
3777 phase value of the specified revisions.
3778
3778
3779 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3779 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3780 lower phase to an higher phase. Phases are ordered as follows::
3780 lower phase to an higher phase. Phases are ordered as follows::
3781
3781
3782 public < draft < secret
3782 public < draft < secret
3783
3783
3784 Returns 0 on success, 1 if some phases could not be changed.
3784 Returns 0 on success, 1 if some phases could not be changed.
3785
3785
3786 (For more information about the phases concept, see :hg:`help phases`.)
3786 (For more information about the phases concept, see :hg:`help phases`.)
3787 """
3787 """
3788 # search for a unique phase argument
3788 # search for a unique phase argument
3789 targetphase = None
3789 targetphase = None
3790 for idx, name in enumerate(phases.phasenames):
3790 for idx, name in enumerate(phases.phasenames):
3791 if opts[name]:
3791 if opts[name]:
3792 if targetphase is not None:
3792 if targetphase is not None:
3793 raise error.Abort(_('only one phase can be specified'))
3793 raise error.Abort(_('only one phase can be specified'))
3794 targetphase = idx
3794 targetphase = idx
3795
3795
3796 # look for specified revision
3796 # look for specified revision
3797 revs = list(revs)
3797 revs = list(revs)
3798 revs.extend(opts['rev'])
3798 revs.extend(opts['rev'])
3799 if not revs:
3799 if not revs:
3800 # display both parents as the second parent phase can influence
3800 # display both parents as the second parent phase can influence
3801 # the phase of a merge commit
3801 # the phase of a merge commit
3802 revs = [c.rev() for c in repo[None].parents()]
3802 revs = [c.rev() for c in repo[None].parents()]
3803
3803
3804 revs = scmutil.revrange(repo, revs)
3804 revs = scmutil.revrange(repo, revs)
3805
3805
3806 lock = None
3806 lock = None
3807 ret = 0
3807 ret = 0
3808 if targetphase is None:
3808 if targetphase is None:
3809 # display
3809 # display
3810 for r in revs:
3810 for r in revs:
3811 ctx = repo[r]
3811 ctx = repo[r]
3812 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3812 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3813 else:
3813 else:
3814 tr = None
3814 tr = None
3815 lock = repo.lock()
3815 lock = repo.lock()
3816 try:
3816 try:
3817 tr = repo.transaction("phase")
3817 tr = repo.transaction("phase")
3818 # set phase
3818 # set phase
3819 if not revs:
3819 if not revs:
3820 raise error.Abort(_('empty revision set'))
3820 raise error.Abort(_('empty revision set'))
3821 nodes = [repo[r].node() for r in revs]
3821 nodes = [repo[r].node() for r in revs]
3822 # moving revision from public to draft may hide them
3822 # moving revision from public to draft may hide them
3823 # We have to check result on an unfiltered repository
3823 # We have to check result on an unfiltered repository
3824 unfi = repo.unfiltered()
3824 unfi = repo.unfiltered()
3825 getphase = unfi._phasecache.phase
3825 getphase = unfi._phasecache.phase
3826 olddata = [getphase(unfi, r) for r in unfi]
3826 olddata = [getphase(unfi, r) for r in unfi]
3827 phases.advanceboundary(repo, tr, targetphase, nodes)
3827 phases.advanceboundary(repo, tr, targetphase, nodes)
3828 if opts['force']:
3828 if opts['force']:
3829 phases.retractboundary(repo, tr, targetphase, nodes)
3829 phases.retractboundary(repo, tr, targetphase, nodes)
3830 tr.close()
3830 tr.close()
3831 finally:
3831 finally:
3832 if tr is not None:
3832 if tr is not None:
3833 tr.release()
3833 tr.release()
3834 lock.release()
3834 lock.release()
3835 getphase = unfi._phasecache.phase
3835 getphase = unfi._phasecache.phase
3836 newdata = [getphase(unfi, r) for r in unfi]
3836 newdata = [getphase(unfi, r) for r in unfi]
3837 changes = sum(newdata[r] != olddata[r] for r in unfi)
3837 changes = sum(newdata[r] != olddata[r] for r in unfi)
3838 cl = unfi.changelog
3838 cl = unfi.changelog
3839 rejected = [n for n in nodes
3839 rejected = [n for n in nodes
3840 if newdata[cl.rev(n)] < targetphase]
3840 if newdata[cl.rev(n)] < targetphase]
3841 if rejected:
3841 if rejected:
3842 ui.warn(_('cannot move %i changesets to a higher '
3842 ui.warn(_('cannot move %i changesets to a higher '
3843 'phase, use --force\n') % len(rejected))
3843 'phase, use --force\n') % len(rejected))
3844 ret = 1
3844 ret = 1
3845 if changes:
3845 if changes:
3846 msg = _('phase changed for %i changesets\n') % changes
3846 msg = _('phase changed for %i changesets\n') % changes
3847 if ret:
3847 if ret:
3848 ui.status(msg)
3848 ui.status(msg)
3849 else:
3849 else:
3850 ui.note(msg)
3850 ui.note(msg)
3851 else:
3851 else:
3852 ui.warn(_('no phases changed\n'))
3852 ui.warn(_('no phases changed\n'))
3853 return ret
3853 return ret
3854
3854
3855 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3855 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3856 """Run after a changegroup has been added via pull/unbundle
3856 """Run after a changegroup has been added via pull/unbundle
3857
3857
3858 This takes arguments below:
3858 This takes arguments below:
3859
3859
3860 :modheads: change of heads by pull/unbundle
3860 :modheads: change of heads by pull/unbundle
3861 :optupdate: updating working directory is needed or not
3861 :optupdate: updating working directory is needed or not
3862 :checkout: update destination revision (or None to default destination)
3862 :checkout: update destination revision (or None to default destination)
3863 :brev: a name, which might be a bookmark to be activated after updating
3863 :brev: a name, which might be a bookmark to be activated after updating
3864 """
3864 """
3865 if modheads == 0:
3865 if modheads == 0:
3866 return
3866 return
3867 if optupdate:
3867 if optupdate:
3868 try:
3868 try:
3869 return hg.updatetotally(ui, repo, checkout, brev)
3869 return hg.updatetotally(ui, repo, checkout, brev)
3870 except error.UpdateAbort as inst:
3870 except error.UpdateAbort as inst:
3871 msg = _("not updating: %s") % str(inst)
3871 msg = _("not updating: %s") % str(inst)
3872 hint = inst.hint
3872 hint = inst.hint
3873 raise error.UpdateAbort(msg, hint=hint)
3873 raise error.UpdateAbort(msg, hint=hint)
3874 if modheads > 1:
3874 if modheads > 1:
3875 currentbranchheads = len(repo.branchheads())
3875 currentbranchheads = len(repo.branchheads())
3876 if currentbranchheads == modheads:
3876 if currentbranchheads == modheads:
3877 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3877 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3878 elif currentbranchheads > 1:
3878 elif currentbranchheads > 1:
3879 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3879 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3880 "merge)\n"))
3880 "merge)\n"))
3881 else:
3881 else:
3882 ui.status(_("(run 'hg heads' to see heads)\n"))
3882 ui.status(_("(run 'hg heads' to see heads)\n"))
3883 else:
3883 else:
3884 ui.status(_("(run 'hg update' to get a working copy)\n"))
3884 ui.status(_("(run 'hg update' to get a working copy)\n"))
3885
3885
3886 @command('^pull',
3886 @command('^pull',
3887 [('u', 'update', None,
3887 [('u', 'update', None,
3888 _('update to new branch head if changesets were pulled')),
3888 _('update to new branch head if changesets were pulled')),
3889 ('f', 'force', None, _('run even when remote repository is unrelated')),
3889 ('f', 'force', None, _('run even when remote repository is unrelated')),
3890 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3890 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3891 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3891 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3892 ('b', 'branch', [], _('a specific branch you would like to pull'),
3892 ('b', 'branch', [], _('a specific branch you would like to pull'),
3893 _('BRANCH')),
3893 _('BRANCH')),
3894 ] + remoteopts,
3894 ] + remoteopts,
3895 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3895 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3896 def pull(ui, repo, source="default", **opts):
3896 def pull(ui, repo, source="default", **opts):
3897 """pull changes from the specified source
3897 """pull changes from the specified source
3898
3898
3899 Pull changes from a remote repository to a local one.
3899 Pull changes from a remote repository to a local one.
3900
3900
3901 This finds all changes from the repository at the specified path
3901 This finds all changes from the repository at the specified path
3902 or URL and adds them to a local repository (the current one unless
3902 or URL and adds them to a local repository (the current one unless
3903 -R is specified). By default, this does not update the copy of the
3903 -R is specified). By default, this does not update the copy of the
3904 project in the working directory.
3904 project in the working directory.
3905
3905
3906 Use :hg:`incoming` if you want to see what would have been added
3906 Use :hg:`incoming` if you want to see what would have been added
3907 by a pull at the time you issued this command. If you then decide
3907 by a pull at the time you issued this command. If you then decide
3908 to add those changes to the repository, you should use :hg:`pull
3908 to add those changes to the repository, you should use :hg:`pull
3909 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3909 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3910
3910
3911 If SOURCE is omitted, the 'default' path will be used.
3911 If SOURCE is omitted, the 'default' path will be used.
3912 See :hg:`help urls` for more information.
3912 See :hg:`help urls` for more information.
3913
3913
3914 Specifying bookmark as ``.`` is equivalent to specifying the active
3914 Specifying bookmark as ``.`` is equivalent to specifying the active
3915 bookmark's name.
3915 bookmark's name.
3916
3916
3917 Returns 0 on success, 1 if an update had unresolved files.
3917 Returns 0 on success, 1 if an update had unresolved files.
3918 """
3918 """
3919 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3919 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3920 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3920 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3921 other = hg.peer(repo, opts, source)
3921 other = hg.peer(repo, opts, source)
3922 try:
3922 try:
3923 revs, checkout = hg.addbranchrevs(repo, other, branches,
3923 revs, checkout = hg.addbranchrevs(repo, other, branches,
3924 opts.get('rev'))
3924 opts.get('rev'))
3925
3925
3926
3926
3927 pullopargs = {}
3927 pullopargs = {}
3928 if opts.get('bookmark'):
3928 if opts.get('bookmark'):
3929 if not revs:
3929 if not revs:
3930 revs = []
3930 revs = []
3931 # The list of bookmark used here is not the one used to actually
3931 # The list of bookmark used here is not the one used to actually
3932 # update the bookmark name. This can result in the revision pulled
3932 # update the bookmark name. This can result in the revision pulled
3933 # not ending up with the name of the bookmark because of a race
3933 # not ending up with the name of the bookmark because of a race
3934 # condition on the server. (See issue 4689 for details)
3934 # condition on the server. (See issue 4689 for details)
3935 remotebookmarks = other.listkeys('bookmarks')
3935 remotebookmarks = other.listkeys('bookmarks')
3936 pullopargs['remotebookmarks'] = remotebookmarks
3936 pullopargs['remotebookmarks'] = remotebookmarks
3937 for b in opts['bookmark']:
3937 for b in opts['bookmark']:
3938 b = repo._bookmarks.expandname(b)
3938 b = repo._bookmarks.expandname(b)
3939 if b not in remotebookmarks:
3939 if b not in remotebookmarks:
3940 raise error.Abort(_('remote bookmark %s not found!') % b)
3940 raise error.Abort(_('remote bookmark %s not found!') % b)
3941 revs.append(remotebookmarks[b])
3941 revs.append(remotebookmarks[b])
3942
3942
3943 if revs:
3943 if revs:
3944 try:
3944 try:
3945 # When 'rev' is a bookmark name, we cannot guarantee that it
3945 # When 'rev' is a bookmark name, we cannot guarantee that it
3946 # will be updated with that name because of a race condition
3946 # will be updated with that name because of a race condition
3947 # server side. (See issue 4689 for details)
3947 # server side. (See issue 4689 for details)
3948 oldrevs = revs
3948 oldrevs = revs
3949 revs = [] # actually, nodes
3949 revs = [] # actually, nodes
3950 for r in oldrevs:
3950 for r in oldrevs:
3951 node = other.lookup(r)
3951 node = other.lookup(r)
3952 revs.append(node)
3952 revs.append(node)
3953 if r == checkout:
3953 if r == checkout:
3954 checkout = node
3954 checkout = node
3955 except error.CapabilityError:
3955 except error.CapabilityError:
3956 err = _("other repository doesn't support revision lookup, "
3956 err = _("other repository doesn't support revision lookup, "
3957 "so a rev cannot be specified.")
3957 "so a rev cannot be specified.")
3958 raise error.Abort(err)
3958 raise error.Abort(err)
3959
3959
3960 pullopargs.update(opts.get('opargs', {}))
3960 pullopargs.update(opts.get('opargs', {}))
3961 modheads = exchange.pull(repo, other, heads=revs,
3961 modheads = exchange.pull(repo, other, heads=revs,
3962 force=opts.get('force'),
3962 force=opts.get('force'),
3963 bookmarks=opts.get('bookmark', ()),
3963 bookmarks=opts.get('bookmark', ()),
3964 opargs=pullopargs).cgresult
3964 opargs=pullopargs).cgresult
3965
3965
3966 # brev is a name, which might be a bookmark to be activated at
3966 # brev is a name, which might be a bookmark to be activated at
3967 # the end of the update. In other words, it is an explicit
3967 # the end of the update. In other words, it is an explicit
3968 # destination of the update
3968 # destination of the update
3969 brev = None
3969 brev = None
3970
3970
3971 if checkout:
3971 if checkout:
3972 checkout = str(repo.changelog.rev(checkout))
3972 checkout = str(repo.changelog.rev(checkout))
3973
3973
3974 # order below depends on implementation of
3974 # order below depends on implementation of
3975 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3975 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3976 # because 'checkout' is determined without it.
3976 # because 'checkout' is determined without it.
3977 if opts.get('rev'):
3977 if opts.get('rev'):
3978 brev = opts['rev'][0]
3978 brev = opts['rev'][0]
3979 elif opts.get('branch'):
3979 elif opts.get('branch'):
3980 brev = opts['branch'][0]
3980 brev = opts['branch'][0]
3981 else:
3981 else:
3982 brev = branches[0]
3982 brev = branches[0]
3983 repo._subtoppath = source
3983 repo._subtoppath = source
3984 try:
3984 try:
3985 ret = postincoming(ui, repo, modheads, opts.get('update'),
3985 ret = postincoming(ui, repo, modheads, opts.get('update'),
3986 checkout, brev)
3986 checkout, brev)
3987
3987
3988 finally:
3988 finally:
3989 del repo._subtoppath
3989 del repo._subtoppath
3990
3990
3991 finally:
3991 finally:
3992 other.close()
3992 other.close()
3993 return ret
3993 return ret
3994
3994
3995 @command('^push',
3995 @command('^push',
3996 [('f', 'force', None, _('force push')),
3996 [('f', 'force', None, _('force push')),
3997 ('r', 'rev', [],
3997 ('r', 'rev', [],
3998 _('a changeset intended to be included in the destination'),
3998 _('a changeset intended to be included in the destination'),
3999 _('REV')),
3999 _('REV')),
4000 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4000 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4001 ('b', 'branch', [],
4001 ('b', 'branch', [],
4002 _('a specific branch you would like to push'), _('BRANCH')),
4002 _('a specific branch you would like to push'), _('BRANCH')),
4003 ('', 'new-branch', False, _('allow pushing a new branch')),
4003 ('', 'new-branch', False, _('allow pushing a new branch')),
4004 ] + remoteopts,
4004 ] + remoteopts,
4005 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4005 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4006 def push(ui, repo, dest=None, **opts):
4006 def push(ui, repo, dest=None, **opts):
4007 """push changes to the specified destination
4007 """push changes to the specified destination
4008
4008
4009 Push changesets from the local repository to the specified
4009 Push changesets from the local repository to the specified
4010 destination.
4010 destination.
4011
4011
4012 This operation is symmetrical to pull: it is identical to a pull
4012 This operation is symmetrical to pull: it is identical to a pull
4013 in the destination repository from the current one.
4013 in the destination repository from the current one.
4014
4014
4015 By default, push will not allow creation of new heads at the
4015 By default, push will not allow creation of new heads at the
4016 destination, since multiple heads would make it unclear which head
4016 destination, since multiple heads would make it unclear which head
4017 to use. In this situation, it is recommended to pull and merge
4017 to use. In this situation, it is recommended to pull and merge
4018 before pushing.
4018 before pushing.
4019
4019
4020 Use --new-branch if you want to allow push to create a new named
4020 Use --new-branch if you want to allow push to create a new named
4021 branch that is not present at the destination. This allows you to
4021 branch that is not present at the destination. This allows you to
4022 only create a new branch without forcing other changes.
4022 only create a new branch without forcing other changes.
4023
4023
4024 .. note::
4024 .. note::
4025
4025
4026 Extra care should be taken with the -f/--force option,
4026 Extra care should be taken with the -f/--force option,
4027 which will push all new heads on all branches, an action which will
4027 which will push all new heads on all branches, an action which will
4028 almost always cause confusion for collaborators.
4028 almost always cause confusion for collaborators.
4029
4029
4030 If -r/--rev is used, the specified revision and all its ancestors
4030 If -r/--rev is used, the specified revision and all its ancestors
4031 will be pushed to the remote repository.
4031 will be pushed to the remote repository.
4032
4032
4033 If -B/--bookmark is used, the specified bookmarked revision, its
4033 If -B/--bookmark is used, the specified bookmarked revision, its
4034 ancestors, and the bookmark will be pushed to the remote
4034 ancestors, and the bookmark will be pushed to the remote
4035 repository. Specifying ``.`` is equivalent to specifying the active
4035 repository. Specifying ``.`` is equivalent to specifying the active
4036 bookmark's name.
4036 bookmark's name.
4037
4037
4038 Please see :hg:`help urls` for important details about ``ssh://``
4038 Please see :hg:`help urls` for important details about ``ssh://``
4039 URLs. If DESTINATION is omitted, a default path will be used.
4039 URLs. If DESTINATION is omitted, a default path will be used.
4040
4040
4041 Returns 0 if push was successful, 1 if nothing to push.
4041 Returns 0 if push was successful, 1 if nothing to push.
4042 """
4042 """
4043
4043
4044 if opts.get('bookmark'):
4044 if opts.get('bookmark'):
4045 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4045 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4046 for b in opts['bookmark']:
4046 for b in opts['bookmark']:
4047 # translate -B options to -r so changesets get pushed
4047 # translate -B options to -r so changesets get pushed
4048 b = repo._bookmarks.expandname(b)
4048 b = repo._bookmarks.expandname(b)
4049 if b in repo._bookmarks:
4049 if b in repo._bookmarks:
4050 opts.setdefault('rev', []).append(b)
4050 opts.setdefault('rev', []).append(b)
4051 else:
4051 else:
4052 # if we try to push a deleted bookmark, translate it to null
4052 # if we try to push a deleted bookmark, translate it to null
4053 # this lets simultaneous -r, -b options continue working
4053 # this lets simultaneous -r, -b options continue working
4054 opts.setdefault('rev', []).append("null")
4054 opts.setdefault('rev', []).append("null")
4055
4055
4056 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4056 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4057 if not path:
4057 if not path:
4058 raise error.Abort(_('default repository not configured!'),
4058 raise error.Abort(_('default repository not configured!'),
4059 hint=_("see 'hg help config.paths'"))
4059 hint=_("see 'hg help config.paths'"))
4060 dest = path.pushloc or path.loc
4060 dest = path.pushloc or path.loc
4061 branches = (path.branch, opts.get('branch') or [])
4061 branches = (path.branch, opts.get('branch') or [])
4062 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4062 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4063 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4063 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4064 other = hg.peer(repo, opts, dest)
4064 other = hg.peer(repo, opts, dest)
4065
4065
4066 if revs:
4066 if revs:
4067 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4067 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4068 if not revs:
4068 if not revs:
4069 raise error.Abort(_("specified revisions evaluate to an empty set"),
4069 raise error.Abort(_("specified revisions evaluate to an empty set"),
4070 hint=_("use different revision arguments"))
4070 hint=_("use different revision arguments"))
4071 elif path.pushrev:
4071 elif path.pushrev:
4072 # It doesn't make any sense to specify ancestor revisions. So limit
4072 # It doesn't make any sense to specify ancestor revisions. So limit
4073 # to DAG heads to make discovery simpler.
4073 # to DAG heads to make discovery simpler.
4074 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4074 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4075 revs = scmutil.revrange(repo, [expr])
4075 revs = scmutil.revrange(repo, [expr])
4076 revs = [repo[rev].node() for rev in revs]
4076 revs = [repo[rev].node() for rev in revs]
4077 if not revs:
4077 if not revs:
4078 raise error.Abort(_('default push revset for path evaluates to an '
4078 raise error.Abort(_('default push revset for path evaluates to an '
4079 'empty set'))
4079 'empty set'))
4080
4080
4081 repo._subtoppath = dest
4081 repo._subtoppath = dest
4082 try:
4082 try:
4083 # push subrepos depth-first for coherent ordering
4083 # push subrepos depth-first for coherent ordering
4084 c = repo['']
4084 c = repo['']
4085 subs = c.substate # only repos that are committed
4085 subs = c.substate # only repos that are committed
4086 for s in sorted(subs):
4086 for s in sorted(subs):
4087 result = c.sub(s).push(opts)
4087 result = c.sub(s).push(opts)
4088 if result == 0:
4088 if result == 0:
4089 return not result
4089 return not result
4090 finally:
4090 finally:
4091 del repo._subtoppath
4091 del repo._subtoppath
4092 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4092 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4093 newbranch=opts.get('new_branch'),
4093 newbranch=opts.get('new_branch'),
4094 bookmarks=opts.get('bookmark', ()),
4094 bookmarks=opts.get('bookmark', ()),
4095 opargs=opts.get('opargs'))
4095 opargs=opts.get('opargs'))
4096
4096
4097 result = not pushop.cgresult
4097 result = not pushop.cgresult
4098
4098
4099 if pushop.bkresult is not None:
4099 if pushop.bkresult is not None:
4100 if pushop.bkresult == 2:
4100 if pushop.bkresult == 2:
4101 result = 2
4101 result = 2
4102 elif not result and pushop.bkresult:
4102 elif not result and pushop.bkresult:
4103 result = 2
4103 result = 2
4104
4104
4105 return result
4105 return result
4106
4106
4107 @command('recover', [])
4107 @command('recover', [])
4108 def recover(ui, repo):
4108 def recover(ui, repo):
4109 """roll back an interrupted transaction
4109 """roll back an interrupted transaction
4110
4110
4111 Recover from an interrupted commit or pull.
4111 Recover from an interrupted commit or pull.
4112
4112
4113 This command tries to fix the repository status after an
4113 This command tries to fix the repository status after an
4114 interrupted operation. It should only be necessary when Mercurial
4114 interrupted operation. It should only be necessary when Mercurial
4115 suggests it.
4115 suggests it.
4116
4116
4117 Returns 0 if successful, 1 if nothing to recover or verify fails.
4117 Returns 0 if successful, 1 if nothing to recover or verify fails.
4118 """
4118 """
4119 if repo.recover():
4119 if repo.recover():
4120 return hg.verify(repo)
4120 return hg.verify(repo)
4121 return 1
4121 return 1
4122
4122
4123 @command('^remove|rm',
4123 @command('^remove|rm',
4124 [('A', 'after', None, _('record delete for missing files')),
4124 [('A', 'after', None, _('record delete for missing files')),
4125 ('f', 'force', None,
4125 ('f', 'force', None,
4126 _('forget added files, delete modified files')),
4126 _('forget added files, delete modified files')),
4127 ] + subrepoopts + walkopts,
4127 ] + subrepoopts + walkopts,
4128 _('[OPTION]... FILE...'),
4128 _('[OPTION]... FILE...'),
4129 inferrepo=True)
4129 inferrepo=True)
4130 def remove(ui, repo, *pats, **opts):
4130 def remove(ui, repo, *pats, **opts):
4131 """remove the specified files on the next commit
4131 """remove the specified files on the next commit
4132
4132
4133 Schedule the indicated files for removal from the current branch.
4133 Schedule the indicated files for removal from the current branch.
4134
4134
4135 This command schedules the files to be removed at the next commit.
4135 This command schedules the files to be removed at the next commit.
4136 To undo a remove before that, see :hg:`revert`. To undo added
4136 To undo a remove before that, see :hg:`revert`. To undo added
4137 files, see :hg:`forget`.
4137 files, see :hg:`forget`.
4138
4138
4139 .. container:: verbose
4139 .. container:: verbose
4140
4140
4141 -A/--after can be used to remove only files that have already
4141 -A/--after can be used to remove only files that have already
4142 been deleted, -f/--force can be used to force deletion, and -Af
4142 been deleted, -f/--force can be used to force deletion, and -Af
4143 can be used to remove files from the next revision without
4143 can be used to remove files from the next revision without
4144 deleting them from the working directory.
4144 deleting them from the working directory.
4145
4145
4146 The following table details the behavior of remove for different
4146 The following table details the behavior of remove for different
4147 file states (columns) and option combinations (rows). The file
4147 file states (columns) and option combinations (rows). The file
4148 states are Added [A], Clean [C], Modified [M] and Missing [!]
4148 states are Added [A], Clean [C], Modified [M] and Missing [!]
4149 (as reported by :hg:`status`). The actions are Warn, Remove
4149 (as reported by :hg:`status`). The actions are Warn, Remove
4150 (from branch) and Delete (from disk):
4150 (from branch) and Delete (from disk):
4151
4151
4152 ========= == == == ==
4152 ========= == == == ==
4153 opt/state A C M !
4153 opt/state A C M !
4154 ========= == == == ==
4154 ========= == == == ==
4155 none W RD W R
4155 none W RD W R
4156 -f R RD RD R
4156 -f R RD RD R
4157 -A W W W R
4157 -A W W W R
4158 -Af R R R R
4158 -Af R R R R
4159 ========= == == == ==
4159 ========= == == == ==
4160
4160
4161 .. note::
4161 .. note::
4162
4162
4163 :hg:`remove` never deletes files in Added [A] state from the
4163 :hg:`remove` never deletes files in Added [A] state from the
4164 working directory, not even if ``--force`` is specified.
4164 working directory, not even if ``--force`` is specified.
4165
4165
4166 Returns 0 on success, 1 if any warnings encountered.
4166 Returns 0 on success, 1 if any warnings encountered.
4167 """
4167 """
4168
4168
4169 after, force = opts.get('after'), opts.get('force')
4169 after, force = opts.get('after'), opts.get('force')
4170 if not pats and not after:
4170 if not pats and not after:
4171 raise error.Abort(_('no files specified'))
4171 raise error.Abort(_('no files specified'))
4172
4172
4173 m = scmutil.match(repo[None], pats, opts)
4173 m = scmutil.match(repo[None], pats, opts)
4174 subrepos = opts.get('subrepos')
4174 subrepos = opts.get('subrepos')
4175 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4175 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4176
4176
4177 @command('rename|move|mv',
4177 @command('rename|move|mv',
4178 [('A', 'after', None, _('record a rename that has already occurred')),
4178 [('A', 'after', None, _('record a rename that has already occurred')),
4179 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4179 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4180 ] + walkopts + dryrunopts,
4180 ] + walkopts + dryrunopts,
4181 _('[OPTION]... SOURCE... DEST'))
4181 _('[OPTION]... SOURCE... DEST'))
4182 def rename(ui, repo, *pats, **opts):
4182 def rename(ui, repo, *pats, **opts):
4183 """rename files; equivalent of copy + remove
4183 """rename files; equivalent of copy + remove
4184
4184
4185 Mark dest as copies of sources; mark sources for deletion. If dest
4185 Mark dest as copies of sources; mark sources for deletion. If dest
4186 is a directory, copies are put in that directory. If dest is a
4186 is a directory, copies are put in that directory. If dest is a
4187 file, there can only be one source.
4187 file, there can only be one source.
4188
4188
4189 By default, this command copies the contents of files as they
4189 By default, this command copies the contents of files as they
4190 exist in the working directory. If invoked with -A/--after, the
4190 exist in the working directory. If invoked with -A/--after, the
4191 operation is recorded, but no copying is performed.
4191 operation is recorded, but no copying is performed.
4192
4192
4193 This command takes effect at the next commit. To undo a rename
4193 This command takes effect at the next commit. To undo a rename
4194 before that, see :hg:`revert`.
4194 before that, see :hg:`revert`.
4195
4195
4196 Returns 0 on success, 1 if errors are encountered.
4196 Returns 0 on success, 1 if errors are encountered.
4197 """
4197 """
4198 with repo.wlock(False):
4198 with repo.wlock(False):
4199 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4199 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4200
4200
4201 @command('resolve',
4201 @command('resolve',
4202 [('a', 'all', None, _('select all unresolved files')),
4202 [('a', 'all', None, _('select all unresolved files')),
4203 ('l', 'list', None, _('list state of files needing merge')),
4203 ('l', 'list', None, _('list state of files needing merge')),
4204 ('m', 'mark', None, _('mark files as resolved')),
4204 ('m', 'mark', None, _('mark files as resolved')),
4205 ('u', 'unmark', None, _('mark files as unresolved')),
4205 ('u', 'unmark', None, _('mark files as unresolved')),
4206 ('n', 'no-status', None, _('hide status prefix'))]
4206 ('n', 'no-status', None, _('hide status prefix'))]
4207 + mergetoolopts + walkopts + formatteropts,
4207 + mergetoolopts + walkopts + formatteropts,
4208 _('[OPTION]... [FILE]...'),
4208 _('[OPTION]... [FILE]...'),
4209 inferrepo=True)
4209 inferrepo=True)
4210 def resolve(ui, repo, *pats, **opts):
4210 def resolve(ui, repo, *pats, **opts):
4211 """redo merges or set/view the merge status of files
4211 """redo merges or set/view the merge status of files
4212
4212
4213 Merges with unresolved conflicts are often the result of
4213 Merges with unresolved conflicts are often the result of
4214 non-interactive merging using the ``internal:merge`` configuration
4214 non-interactive merging using the ``internal:merge`` configuration
4215 setting, or a command-line merge tool like ``diff3``. The resolve
4215 setting, or a command-line merge tool like ``diff3``. The resolve
4216 command is used to manage the files involved in a merge, after
4216 command is used to manage the files involved in a merge, after
4217 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4217 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4218 working directory must have two parents). See :hg:`help
4218 working directory must have two parents). See :hg:`help
4219 merge-tools` for information on configuring merge tools.
4219 merge-tools` for information on configuring merge tools.
4220
4220
4221 The resolve command can be used in the following ways:
4221 The resolve command can be used in the following ways:
4222
4222
4223 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4223 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4224 files, discarding any previous merge attempts. Re-merging is not
4224 files, discarding any previous merge attempts. Re-merging is not
4225 performed for files already marked as resolved. Use ``--all/-a``
4225 performed for files already marked as resolved. Use ``--all/-a``
4226 to select all unresolved files. ``--tool`` can be used to specify
4226 to select all unresolved files. ``--tool`` can be used to specify
4227 the merge tool used for the given files. It overrides the HGMERGE
4227 the merge tool used for the given files. It overrides the HGMERGE
4228 environment variable and your configuration files. Previous file
4228 environment variable and your configuration files. Previous file
4229 contents are saved with a ``.orig`` suffix.
4229 contents are saved with a ``.orig`` suffix.
4230
4230
4231 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4231 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4232 (e.g. after having manually fixed-up the files). The default is
4232 (e.g. after having manually fixed-up the files). The default is
4233 to mark all unresolved files.
4233 to mark all unresolved files.
4234
4234
4235 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4235 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4236 default is to mark all resolved files.
4236 default is to mark all resolved files.
4237
4237
4238 - :hg:`resolve -l`: list files which had or still have conflicts.
4238 - :hg:`resolve -l`: list files which had or still have conflicts.
4239 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4239 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4240 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4240 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4241 the list. See :hg:`help filesets` for details.
4241 the list. See :hg:`help filesets` for details.
4242
4242
4243 .. note::
4243 .. note::
4244
4244
4245 Mercurial will not let you commit files with unresolved merge
4245 Mercurial will not let you commit files with unresolved merge
4246 conflicts. You must use :hg:`resolve -m ...` before you can
4246 conflicts. You must use :hg:`resolve -m ...` before you can
4247 commit after a conflicting merge.
4247 commit after a conflicting merge.
4248
4248
4249 Returns 0 on success, 1 if any files fail a resolve attempt.
4249 Returns 0 on success, 1 if any files fail a resolve attempt.
4250 """
4250 """
4251
4251
4252 flaglist = 'all mark unmark list no_status'.split()
4252 flaglist = 'all mark unmark list no_status'.split()
4253 all, mark, unmark, show, nostatus = \
4253 all, mark, unmark, show, nostatus = \
4254 [opts.get(o) for o in flaglist]
4254 [opts.get(o) for o in flaglist]
4255
4255
4256 if (show and (mark or unmark)) or (mark and unmark):
4256 if (show and (mark or unmark)) or (mark and unmark):
4257 raise error.Abort(_("too many options specified"))
4257 raise error.Abort(_("too many options specified"))
4258 if pats and all:
4258 if pats and all:
4259 raise error.Abort(_("can't specify --all and patterns"))
4259 raise error.Abort(_("can't specify --all and patterns"))
4260 if not (all or pats or show or mark or unmark):
4260 if not (all or pats or show or mark or unmark):
4261 raise error.Abort(_('no files or directories specified'),
4261 raise error.Abort(_('no files or directories specified'),
4262 hint=('use --all to re-merge all unresolved files'))
4262 hint=('use --all to re-merge all unresolved files'))
4263
4263
4264 if show:
4264 if show:
4265 ui.pager('resolve')
4265 ui.pager('resolve')
4266 fm = ui.formatter('resolve', opts)
4266 fm = ui.formatter('resolve', opts)
4267 ms = mergemod.mergestate.read(repo)
4267 ms = mergemod.mergestate.read(repo)
4268 m = scmutil.match(repo[None], pats, opts)
4268 m = scmutil.match(repo[None], pats, opts)
4269 for f in ms:
4269 for f in ms:
4270 if not m(f):
4270 if not m(f):
4271 continue
4271 continue
4272 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4272 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4273 'd': 'driverresolved'}[ms[f]]
4273 'd': 'driverresolved'}[ms[f]]
4274 fm.startitem()
4274 fm.startitem()
4275 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4275 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4276 fm.write('path', '%s\n', f, label=l)
4276 fm.write('path', '%s\n', f, label=l)
4277 fm.end()
4277 fm.end()
4278 return 0
4278 return 0
4279
4279
4280 with repo.wlock():
4280 with repo.wlock():
4281 ms = mergemod.mergestate.read(repo)
4281 ms = mergemod.mergestate.read(repo)
4282
4282
4283 if not (ms.active() or repo.dirstate.p2() != nullid):
4283 if not (ms.active() or repo.dirstate.p2() != nullid):
4284 raise error.Abort(
4284 raise error.Abort(
4285 _('resolve command not applicable when not merging'))
4285 _('resolve command not applicable when not merging'))
4286
4286
4287 wctx = repo[None]
4287 wctx = repo[None]
4288
4288
4289 if ms.mergedriver and ms.mdstate() == 'u':
4289 if ms.mergedriver and ms.mdstate() == 'u':
4290 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4290 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4291 ms.commit()
4291 ms.commit()
4292 # allow mark and unmark to go through
4292 # allow mark and unmark to go through
4293 if not mark and not unmark and not proceed:
4293 if not mark and not unmark and not proceed:
4294 return 1
4294 return 1
4295
4295
4296 m = scmutil.match(wctx, pats, opts)
4296 m = scmutil.match(wctx, pats, opts)
4297 ret = 0
4297 ret = 0
4298 didwork = False
4298 didwork = False
4299 runconclude = False
4299 runconclude = False
4300
4300
4301 tocomplete = []
4301 tocomplete = []
4302 for f in ms:
4302 for f in ms:
4303 if not m(f):
4303 if not m(f):
4304 continue
4304 continue
4305
4305
4306 didwork = True
4306 didwork = True
4307
4307
4308 # don't let driver-resolved files be marked, and run the conclude
4308 # don't let driver-resolved files be marked, and run the conclude
4309 # step if asked to resolve
4309 # step if asked to resolve
4310 if ms[f] == "d":
4310 if ms[f] == "d":
4311 exact = m.exact(f)
4311 exact = m.exact(f)
4312 if mark:
4312 if mark:
4313 if exact:
4313 if exact:
4314 ui.warn(_('not marking %s as it is driver-resolved\n')
4314 ui.warn(_('not marking %s as it is driver-resolved\n')
4315 % f)
4315 % f)
4316 elif unmark:
4316 elif unmark:
4317 if exact:
4317 if exact:
4318 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4318 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4319 % f)
4319 % f)
4320 else:
4320 else:
4321 runconclude = True
4321 runconclude = True
4322 continue
4322 continue
4323
4323
4324 if mark:
4324 if mark:
4325 ms.mark(f, "r")
4325 ms.mark(f, "r")
4326 elif unmark:
4326 elif unmark:
4327 ms.mark(f, "u")
4327 ms.mark(f, "u")
4328 else:
4328 else:
4329 # backup pre-resolve (merge uses .orig for its own purposes)
4329 # backup pre-resolve (merge uses .orig for its own purposes)
4330 a = repo.wjoin(f)
4330 a = repo.wjoin(f)
4331 try:
4331 try:
4332 util.copyfile(a, a + ".resolve")
4332 util.copyfile(a, a + ".resolve")
4333 except (IOError, OSError) as inst:
4333 except (IOError, OSError) as inst:
4334 if inst.errno != errno.ENOENT:
4334 if inst.errno != errno.ENOENT:
4335 raise
4335 raise
4336
4336
4337 try:
4337 try:
4338 # preresolve file
4338 # preresolve file
4339 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4339 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4340 'resolve')
4340 'resolve')
4341 complete, r = ms.preresolve(f, wctx)
4341 complete, r = ms.preresolve(f, wctx)
4342 if not complete:
4342 if not complete:
4343 tocomplete.append(f)
4343 tocomplete.append(f)
4344 elif r:
4344 elif r:
4345 ret = 1
4345 ret = 1
4346 finally:
4346 finally:
4347 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4347 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4348 ms.commit()
4348 ms.commit()
4349
4349
4350 # replace filemerge's .orig file with our resolve file, but only
4350 # replace filemerge's .orig file with our resolve file, but only
4351 # for merges that are complete
4351 # for merges that are complete
4352 if complete:
4352 if complete:
4353 try:
4353 try:
4354 util.rename(a + ".resolve",
4354 util.rename(a + ".resolve",
4355 scmutil.origpath(ui, repo, a))
4355 scmutil.origpath(ui, repo, a))
4356 except OSError as inst:
4356 except OSError as inst:
4357 if inst.errno != errno.ENOENT:
4357 if inst.errno != errno.ENOENT:
4358 raise
4358 raise
4359
4359
4360 for f in tocomplete:
4360 for f in tocomplete:
4361 try:
4361 try:
4362 # resolve file
4362 # resolve file
4363 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4363 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4364 'resolve')
4364 'resolve')
4365 r = ms.resolve(f, wctx)
4365 r = ms.resolve(f, wctx)
4366 if r:
4366 if r:
4367 ret = 1
4367 ret = 1
4368 finally:
4368 finally:
4369 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4369 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4370 ms.commit()
4370 ms.commit()
4371
4371
4372 # replace filemerge's .orig file with our resolve file
4372 # replace filemerge's .orig file with our resolve file
4373 a = repo.wjoin(f)
4373 a = repo.wjoin(f)
4374 try:
4374 try:
4375 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4375 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4376 except OSError as inst:
4376 except OSError as inst:
4377 if inst.errno != errno.ENOENT:
4377 if inst.errno != errno.ENOENT:
4378 raise
4378 raise
4379
4379
4380 ms.commit()
4380 ms.commit()
4381 ms.recordactions()
4381 ms.recordactions()
4382
4382
4383 if not didwork and pats:
4383 if not didwork and pats:
4384 hint = None
4384 hint = None
4385 if not any([p for p in pats if p.find(':') >= 0]):
4385 if not any([p for p in pats if p.find(':') >= 0]):
4386 pats = ['path:%s' % p for p in pats]
4386 pats = ['path:%s' % p for p in pats]
4387 m = scmutil.match(wctx, pats, opts)
4387 m = scmutil.match(wctx, pats, opts)
4388 for f in ms:
4388 for f in ms:
4389 if not m(f):
4389 if not m(f):
4390 continue
4390 continue
4391 flags = ''.join(['-%s ' % o[0] for o in flaglist
4391 flags = ''.join(['-%s ' % o[0] for o in flaglist
4392 if opts.get(o)])
4392 if opts.get(o)])
4393 hint = _("(try: hg resolve %s%s)\n") % (
4393 hint = _("(try: hg resolve %s%s)\n") % (
4394 flags,
4394 flags,
4395 ' '.join(pats))
4395 ' '.join(pats))
4396 break
4396 break
4397 ui.warn(_("arguments do not match paths that need resolving\n"))
4397 ui.warn(_("arguments do not match paths that need resolving\n"))
4398 if hint:
4398 if hint:
4399 ui.warn(hint)
4399 ui.warn(hint)
4400 elif ms.mergedriver and ms.mdstate() != 's':
4400 elif ms.mergedriver and ms.mdstate() != 's':
4401 # run conclude step when either a driver-resolved file is requested
4401 # run conclude step when either a driver-resolved file is requested
4402 # or there are no driver-resolved files
4402 # or there are no driver-resolved files
4403 # we can't use 'ret' to determine whether any files are unresolved
4403 # we can't use 'ret' to determine whether any files are unresolved
4404 # because we might not have tried to resolve some
4404 # because we might not have tried to resolve some
4405 if ((runconclude or not list(ms.driverresolved()))
4405 if ((runconclude or not list(ms.driverresolved()))
4406 and not list(ms.unresolved())):
4406 and not list(ms.unresolved())):
4407 proceed = mergemod.driverconclude(repo, ms, wctx)
4407 proceed = mergemod.driverconclude(repo, ms, wctx)
4408 ms.commit()
4408 ms.commit()
4409 if not proceed:
4409 if not proceed:
4410 return 1
4410 return 1
4411
4411
4412 # Nudge users into finishing an unfinished operation
4412 # Nudge users into finishing an unfinished operation
4413 unresolvedf = list(ms.unresolved())
4413 unresolvedf = list(ms.unresolved())
4414 driverresolvedf = list(ms.driverresolved())
4414 driverresolvedf = list(ms.driverresolved())
4415 if not unresolvedf and not driverresolvedf:
4415 if not unresolvedf and not driverresolvedf:
4416 ui.status(_('(no more unresolved files)\n'))
4416 ui.status(_('(no more unresolved files)\n'))
4417 cmdutil.checkafterresolved(repo)
4417 cmdutil.checkafterresolved(repo)
4418 elif not unresolvedf:
4418 elif not unresolvedf:
4419 ui.status(_('(no more unresolved files -- '
4419 ui.status(_('(no more unresolved files -- '
4420 'run "hg resolve --all" to conclude)\n'))
4420 'run "hg resolve --all" to conclude)\n'))
4421
4421
4422 return ret
4422 return ret
4423
4423
4424 @command('revert',
4424 @command('revert',
4425 [('a', 'all', None, _('revert all changes when no arguments given')),
4425 [('a', 'all', None, _('revert all changes when no arguments given')),
4426 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4426 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4427 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4427 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4428 ('C', 'no-backup', None, _('do not save backup copies of files')),
4428 ('C', 'no-backup', None, _('do not save backup copies of files')),
4429 ('i', 'interactive', None,
4429 ('i', 'interactive', None,
4430 _('interactively select the changes (EXPERIMENTAL)')),
4430 _('interactively select the changes (EXPERIMENTAL)')),
4431 ] + walkopts + dryrunopts,
4431 ] + walkopts + dryrunopts,
4432 _('[OPTION]... [-r REV] [NAME]...'))
4432 _('[OPTION]... [-r REV] [NAME]...'))
4433 def revert(ui, repo, *pats, **opts):
4433 def revert(ui, repo, *pats, **opts):
4434 """restore files to their checkout state
4434 """restore files to their checkout state
4435
4435
4436 .. note::
4436 .. note::
4437
4437
4438 To check out earlier revisions, you should use :hg:`update REV`.
4438 To check out earlier revisions, you should use :hg:`update REV`.
4439 To cancel an uncommitted merge (and lose your changes),
4439 To cancel an uncommitted merge (and lose your changes),
4440 use :hg:`update --clean .`.
4440 use :hg:`update --clean .`.
4441
4441
4442 With no revision specified, revert the specified files or directories
4442 With no revision specified, revert the specified files or directories
4443 to the contents they had in the parent of the working directory.
4443 to the contents they had in the parent of the working directory.
4444 This restores the contents of files to an unmodified
4444 This restores the contents of files to an unmodified
4445 state and unschedules adds, removes, copies, and renames. If the
4445 state and unschedules adds, removes, copies, and renames. If the
4446 working directory has two parents, you must explicitly specify a
4446 working directory has two parents, you must explicitly specify a
4447 revision.
4447 revision.
4448
4448
4449 Using the -r/--rev or -d/--date options, revert the given files or
4449 Using the -r/--rev or -d/--date options, revert the given files or
4450 directories to their states as of a specific revision. Because
4450 directories to their states as of a specific revision. Because
4451 revert does not change the working directory parents, this will
4451 revert does not change the working directory parents, this will
4452 cause these files to appear modified. This can be helpful to "back
4452 cause these files to appear modified. This can be helpful to "back
4453 out" some or all of an earlier change. See :hg:`backout` for a
4453 out" some or all of an earlier change. See :hg:`backout` for a
4454 related method.
4454 related method.
4455
4455
4456 Modified files are saved with a .orig suffix before reverting.
4456 Modified files are saved with a .orig suffix before reverting.
4457 To disable these backups, use --no-backup. It is possible to store
4457 To disable these backups, use --no-backup. It is possible to store
4458 the backup files in a custom directory relative to the root of the
4458 the backup files in a custom directory relative to the root of the
4459 repository by setting the ``ui.origbackuppath`` configuration
4459 repository by setting the ``ui.origbackuppath`` configuration
4460 option.
4460 option.
4461
4461
4462 See :hg:`help dates` for a list of formats valid for -d/--date.
4462 See :hg:`help dates` for a list of formats valid for -d/--date.
4463
4463
4464 See :hg:`help backout` for a way to reverse the effect of an
4464 See :hg:`help backout` for a way to reverse the effect of an
4465 earlier changeset.
4465 earlier changeset.
4466
4466
4467 Returns 0 on success.
4467 Returns 0 on success.
4468 """
4468 """
4469
4469
4470 if opts.get("date"):
4470 if opts.get("date"):
4471 if opts.get("rev"):
4471 if opts.get("rev"):
4472 raise error.Abort(_("you can't specify a revision and a date"))
4472 raise error.Abort(_("you can't specify a revision and a date"))
4473 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4473 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4474
4474
4475 parent, p2 = repo.dirstate.parents()
4475 parent, p2 = repo.dirstate.parents()
4476 if not opts.get('rev') and p2 != nullid:
4476 if not opts.get('rev') and p2 != nullid:
4477 # revert after merge is a trap for new users (issue2915)
4477 # revert after merge is a trap for new users (issue2915)
4478 raise error.Abort(_('uncommitted merge with no revision specified'),
4478 raise error.Abort(_('uncommitted merge with no revision specified'),
4479 hint=_("use 'hg update' or see 'hg help revert'"))
4479 hint=_("use 'hg update' or see 'hg help revert'"))
4480
4480
4481 ctx = scmutil.revsingle(repo, opts.get('rev'))
4481 ctx = scmutil.revsingle(repo, opts.get('rev'))
4482
4482
4483 if (not (pats or opts.get('include') or opts.get('exclude') or
4483 if (not (pats or opts.get('include') or opts.get('exclude') or
4484 opts.get('all') or opts.get('interactive'))):
4484 opts.get('all') or opts.get('interactive'))):
4485 msg = _("no files or directories specified")
4485 msg = _("no files or directories specified")
4486 if p2 != nullid:
4486 if p2 != nullid:
4487 hint = _("uncommitted merge, use --all to discard all changes,"
4487 hint = _("uncommitted merge, use --all to discard all changes,"
4488 " or 'hg update -C .' to abort the merge")
4488 " or 'hg update -C .' to abort the merge")
4489 raise error.Abort(msg, hint=hint)
4489 raise error.Abort(msg, hint=hint)
4490 dirty = any(repo.status())
4490 dirty = any(repo.status())
4491 node = ctx.node()
4491 node = ctx.node()
4492 if node != parent:
4492 if node != parent:
4493 if dirty:
4493 if dirty:
4494 hint = _("uncommitted changes, use --all to discard all"
4494 hint = _("uncommitted changes, use --all to discard all"
4495 " changes, or 'hg update %s' to update") % ctx.rev()
4495 " changes, or 'hg update %s' to update") % ctx.rev()
4496 else:
4496 else:
4497 hint = _("use --all to revert all files,"
4497 hint = _("use --all to revert all files,"
4498 " or 'hg update %s' to update") % ctx.rev()
4498 " or 'hg update %s' to update") % ctx.rev()
4499 elif dirty:
4499 elif dirty:
4500 hint = _("uncommitted changes, use --all to discard all changes")
4500 hint = _("uncommitted changes, use --all to discard all changes")
4501 else:
4501 else:
4502 hint = _("use --all to revert all files")
4502 hint = _("use --all to revert all files")
4503 raise error.Abort(msg, hint=hint)
4503 raise error.Abort(msg, hint=hint)
4504
4504
4505 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4505 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4506
4506
4507 @command('rollback', dryrunopts +
4507 @command('rollback', dryrunopts +
4508 [('f', 'force', False, _('ignore safety measures'))])
4508 [('f', 'force', False, _('ignore safety measures'))])
4509 def rollback(ui, repo, **opts):
4509 def rollback(ui, repo, **opts):
4510 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4510 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4511
4511
4512 Please use :hg:`commit --amend` instead of rollback to correct
4512 Please use :hg:`commit --amend` instead of rollback to correct
4513 mistakes in the last commit.
4513 mistakes in the last commit.
4514
4514
4515 This command should be used with care. There is only one level of
4515 This command should be used with care. There is only one level of
4516 rollback, and there is no way to undo a rollback. It will also
4516 rollback, and there is no way to undo a rollback. It will also
4517 restore the dirstate at the time of the last transaction, losing
4517 restore the dirstate at the time of the last transaction, losing
4518 any dirstate changes since that time. This command does not alter
4518 any dirstate changes since that time. This command does not alter
4519 the working directory.
4519 the working directory.
4520
4520
4521 Transactions are used to encapsulate the effects of all commands
4521 Transactions are used to encapsulate the effects of all commands
4522 that create new changesets or propagate existing changesets into a
4522 that create new changesets or propagate existing changesets into a
4523 repository.
4523 repository.
4524
4524
4525 .. container:: verbose
4525 .. container:: verbose
4526
4526
4527 For example, the following commands are transactional, and their
4527 For example, the following commands are transactional, and their
4528 effects can be rolled back:
4528 effects can be rolled back:
4529
4529
4530 - commit
4530 - commit
4531 - import
4531 - import
4532 - pull
4532 - pull
4533 - push (with this repository as the destination)
4533 - push (with this repository as the destination)
4534 - unbundle
4534 - unbundle
4535
4535
4536 To avoid permanent data loss, rollback will refuse to rollback a
4536 To avoid permanent data loss, rollback will refuse to rollback a
4537 commit transaction if it isn't checked out. Use --force to
4537 commit transaction if it isn't checked out. Use --force to
4538 override this protection.
4538 override this protection.
4539
4539
4540 The rollback command can be entirely disabled by setting the
4540 The rollback command can be entirely disabled by setting the
4541 ``ui.rollback`` configuration setting to false. If you're here
4541 ``ui.rollback`` configuration setting to false. If you're here
4542 because you want to use rollback and it's disabled, you can
4542 because you want to use rollback and it's disabled, you can
4543 re-enable the command by setting ``ui.rollback`` to true.
4543 re-enable the command by setting ``ui.rollback`` to true.
4544
4544
4545 This command is not intended for use on public repositories. Once
4545 This command is not intended for use on public repositories. Once
4546 changes are visible for pull by other users, rolling a transaction
4546 changes are visible for pull by other users, rolling a transaction
4547 back locally is ineffective (someone else may already have pulled
4547 back locally is ineffective (someone else may already have pulled
4548 the changes). Furthermore, a race is possible with readers of the
4548 the changes). Furthermore, a race is possible with readers of the
4549 repository; for example an in-progress pull from the repository
4549 repository; for example an in-progress pull from the repository
4550 may fail if a rollback is performed.
4550 may fail if a rollback is performed.
4551
4551
4552 Returns 0 on success, 1 if no rollback data is available.
4552 Returns 0 on success, 1 if no rollback data is available.
4553 """
4553 """
4554 if not ui.configbool('ui', 'rollback', True):
4554 if not ui.configbool('ui', 'rollback', True):
4555 raise error.Abort(_('rollback is disabled because it is unsafe'),
4555 raise error.Abort(_('rollback is disabled because it is unsafe'),
4556 hint=('see `hg help -v rollback` for information'))
4556 hint=('see `hg help -v rollback` for information'))
4557 return repo.rollback(dryrun=opts.get('dry_run'),
4557 return repo.rollback(dryrun=opts.get('dry_run'),
4558 force=opts.get('force'))
4558 force=opts.get('force'))
4559
4559
4560 @command('root', [])
4560 @command('root', [])
4561 def root(ui, repo):
4561 def root(ui, repo):
4562 """print the root (top) of the current working directory
4562 """print the root (top) of the current working directory
4563
4563
4564 Print the root directory of the current repository.
4564 Print the root directory of the current repository.
4565
4565
4566 Returns 0 on success.
4566 Returns 0 on success.
4567 """
4567 """
4568 ui.write(repo.root + "\n")
4568 ui.write(repo.root + "\n")
4569
4569
4570 @command('^serve',
4570 @command('^serve',
4571 [('A', 'accesslog', '', _('name of access log file to write to'),
4571 [('A', 'accesslog', '', _('name of access log file to write to'),
4572 _('FILE')),
4572 _('FILE')),
4573 ('d', 'daemon', None, _('run server in background')),
4573 ('d', 'daemon', None, _('run server in background')),
4574 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4574 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4575 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4575 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4576 # use string type, then we can check if something was passed
4576 # use string type, then we can check if something was passed
4577 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4577 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4578 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4578 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4579 _('ADDR')),
4579 _('ADDR')),
4580 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4580 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4581 _('PREFIX')),
4581 _('PREFIX')),
4582 ('n', 'name', '',
4582 ('n', 'name', '',
4583 _('name to show in web pages (default: working directory)'), _('NAME')),
4583 _('name to show in web pages (default: working directory)'), _('NAME')),
4584 ('', 'web-conf', '',
4584 ('', 'web-conf', '',
4585 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4585 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4586 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4586 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4587 _('FILE')),
4587 _('FILE')),
4588 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4588 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4589 ('', 'stdio', None, _('for remote clients')),
4589 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4590 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4590 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4591 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4591 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4592 ('', 'style', '', _('template style to use'), _('STYLE')),
4592 ('', 'style', '', _('template style to use'), _('STYLE')),
4593 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4593 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4594 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4594 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4595 _('[OPTION]...'),
4595 _('[OPTION]...'),
4596 optionalrepo=True)
4596 optionalrepo=True)
4597 def serve(ui, repo, **opts):
4597 def serve(ui, repo, **opts):
4598 """start stand-alone webserver
4598 """start stand-alone webserver
4599
4599
4600 Start a local HTTP repository browser and pull server. You can use
4600 Start a local HTTP repository browser and pull server. You can use
4601 this for ad-hoc sharing and browsing of repositories. It is
4601 this for ad-hoc sharing and browsing of repositories. It is
4602 recommended to use a real web server to serve a repository for
4602 recommended to use a real web server to serve a repository for
4603 longer periods of time.
4603 longer periods of time.
4604
4604
4605 Please note that the server does not implement access control.
4605 Please note that the server does not implement access control.
4606 This means that, by default, anybody can read from the server and
4606 This means that, by default, anybody can read from the server and
4607 nobody can write to it by default. Set the ``web.allow_push``
4607 nobody can write to it by default. Set the ``web.allow_push``
4608 option to ``*`` to allow everybody to push to the server. You
4608 option to ``*`` to allow everybody to push to the server. You
4609 should use a real web server if you need to authenticate users.
4609 should use a real web server if you need to authenticate users.
4610
4610
4611 By default, the server logs accesses to stdout and errors to
4611 By default, the server logs accesses to stdout and errors to
4612 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4612 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4613 files.
4613 files.
4614
4614
4615 To have the server choose a free port number to listen on, specify
4615 To have the server choose a free port number to listen on, specify
4616 a port number of 0; in this case, the server will print the port
4616 a port number of 0; in this case, the server will print the port
4617 number it uses.
4617 number it uses.
4618
4618
4619 Returns 0 on success.
4619 Returns 0 on success.
4620 """
4620 """
4621
4621
4622 if opts["stdio"] and opts["cmdserver"]:
4622 if opts["stdio"] and opts["cmdserver"]:
4623 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4623 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4624
4624
4625 if opts["stdio"]:
4625 if opts["stdio"]:
4626 if repo is None:
4626 if repo is None:
4627 raise error.RepoError(_("there is no Mercurial repository here"
4627 raise error.RepoError(_("there is no Mercurial repository here"
4628 " (.hg not found)"))
4628 " (.hg not found)"))
4629 s = sshserver.sshserver(ui, repo)
4629 s = sshserver.sshserver(ui, repo)
4630 s.serve_forever()
4630 s.serve_forever()
4631
4631
4632 service = server.createservice(ui, repo, opts)
4632 service = server.createservice(ui, repo, opts)
4633 return server.runservice(opts, initfn=service.init, runfn=service.run)
4633 return server.runservice(opts, initfn=service.init, runfn=service.run)
4634
4634
4635 @command('^status|st',
4635 @command('^status|st',
4636 [('A', 'all', None, _('show status of all files')),
4636 [('A', 'all', None, _('show status of all files')),
4637 ('m', 'modified', None, _('show only modified files')),
4637 ('m', 'modified', None, _('show only modified files')),
4638 ('a', 'added', None, _('show only added files')),
4638 ('a', 'added', None, _('show only added files')),
4639 ('r', 'removed', None, _('show only removed files')),
4639 ('r', 'removed', None, _('show only removed files')),
4640 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4640 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4641 ('c', 'clean', None, _('show only files without changes')),
4641 ('c', 'clean', None, _('show only files without changes')),
4642 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4642 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4643 ('i', 'ignored', None, _('show only ignored files')),
4643 ('i', 'ignored', None, _('show only ignored files')),
4644 ('n', 'no-status', None, _('hide status prefix')),
4644 ('n', 'no-status', None, _('hide status prefix')),
4645 ('C', 'copies', None, _('show source of copied files')),
4645 ('C', 'copies', None, _('show source of copied files')),
4646 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4646 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4647 ('', 'rev', [], _('show difference from revision'), _('REV')),
4647 ('', 'rev', [], _('show difference from revision'), _('REV')),
4648 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4648 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4649 ] + walkopts + subrepoopts + formatteropts,
4649 ] + walkopts + subrepoopts + formatteropts,
4650 _('[OPTION]... [FILE]...'),
4650 _('[OPTION]... [FILE]...'),
4651 inferrepo=True)
4651 inferrepo=True)
4652 def status(ui, repo, *pats, **opts):
4652 def status(ui, repo, *pats, **opts):
4653 """show changed files in the working directory
4653 """show changed files in the working directory
4654
4654
4655 Show status of files in the repository. If names are given, only
4655 Show status of files in the repository. If names are given, only
4656 files that match are shown. Files that are clean or ignored or
4656 files that match are shown. Files that are clean or ignored or
4657 the source of a copy/move operation, are not listed unless
4657 the source of a copy/move operation, are not listed unless
4658 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4658 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4659 Unless options described with "show only ..." are given, the
4659 Unless options described with "show only ..." are given, the
4660 options -mardu are used.
4660 options -mardu are used.
4661
4661
4662 Option -q/--quiet hides untracked (unknown and ignored) files
4662 Option -q/--quiet hides untracked (unknown and ignored) files
4663 unless explicitly requested with -u/--unknown or -i/--ignored.
4663 unless explicitly requested with -u/--unknown or -i/--ignored.
4664
4664
4665 .. note::
4665 .. note::
4666
4666
4667 :hg:`status` may appear to disagree with diff if permissions have
4667 :hg:`status` may appear to disagree with diff if permissions have
4668 changed or a merge has occurred. The standard diff format does
4668 changed or a merge has occurred. The standard diff format does
4669 not report permission changes and diff only reports changes
4669 not report permission changes and diff only reports changes
4670 relative to one merge parent.
4670 relative to one merge parent.
4671
4671
4672 If one revision is given, it is used as the base revision.
4672 If one revision is given, it is used as the base revision.
4673 If two revisions are given, the differences between them are
4673 If two revisions are given, the differences between them are
4674 shown. The --change option can also be used as a shortcut to list
4674 shown. The --change option can also be used as a shortcut to list
4675 the changed files of a revision from its first parent.
4675 the changed files of a revision from its first parent.
4676
4676
4677 The codes used to show the status of files are::
4677 The codes used to show the status of files are::
4678
4678
4679 M = modified
4679 M = modified
4680 A = added
4680 A = added
4681 R = removed
4681 R = removed
4682 C = clean
4682 C = clean
4683 ! = missing (deleted by non-hg command, but still tracked)
4683 ! = missing (deleted by non-hg command, but still tracked)
4684 ? = not tracked
4684 ? = not tracked
4685 I = ignored
4685 I = ignored
4686 = origin of the previous file (with --copies)
4686 = origin of the previous file (with --copies)
4687
4687
4688 .. container:: verbose
4688 .. container:: verbose
4689
4689
4690 Examples:
4690 Examples:
4691
4691
4692 - show changes in the working directory relative to a
4692 - show changes in the working directory relative to a
4693 changeset::
4693 changeset::
4694
4694
4695 hg status --rev 9353
4695 hg status --rev 9353
4696
4696
4697 - show changes in the working directory relative to the
4697 - show changes in the working directory relative to the
4698 current directory (see :hg:`help patterns` for more information)::
4698 current directory (see :hg:`help patterns` for more information)::
4699
4699
4700 hg status re:
4700 hg status re:
4701
4701
4702 - show all changes including copies in an existing changeset::
4702 - show all changes including copies in an existing changeset::
4703
4703
4704 hg status --copies --change 9353
4704 hg status --copies --change 9353
4705
4705
4706 - get a NUL separated list of added files, suitable for xargs::
4706 - get a NUL separated list of added files, suitable for xargs::
4707
4707
4708 hg status -an0
4708 hg status -an0
4709
4709
4710 Returns 0 on success.
4710 Returns 0 on success.
4711 """
4711 """
4712
4712
4713 revs = opts.get('rev')
4713 revs = opts.get('rev')
4714 change = opts.get('change')
4714 change = opts.get('change')
4715
4715
4716 if revs and change:
4716 if revs and change:
4717 msg = _('cannot specify --rev and --change at the same time')
4717 msg = _('cannot specify --rev and --change at the same time')
4718 raise error.Abort(msg)
4718 raise error.Abort(msg)
4719 elif change:
4719 elif change:
4720 node2 = scmutil.revsingle(repo, change, None).node()
4720 node2 = scmutil.revsingle(repo, change, None).node()
4721 node1 = repo[node2].p1().node()
4721 node1 = repo[node2].p1().node()
4722 else:
4722 else:
4723 node1, node2 = scmutil.revpair(repo, revs)
4723 node1, node2 = scmutil.revpair(repo, revs)
4724
4724
4725 if pats:
4725 if pats:
4726 cwd = repo.getcwd()
4726 cwd = repo.getcwd()
4727 else:
4727 else:
4728 cwd = ''
4728 cwd = ''
4729
4729
4730 if opts.get('print0'):
4730 if opts.get('print0'):
4731 end = '\0'
4731 end = '\0'
4732 else:
4732 else:
4733 end = '\n'
4733 end = '\n'
4734 copy = {}
4734 copy = {}
4735 states = 'modified added removed deleted unknown ignored clean'.split()
4735 states = 'modified added removed deleted unknown ignored clean'.split()
4736 show = [k for k in states if opts.get(k)]
4736 show = [k for k in states if opts.get(k)]
4737 if opts.get('all'):
4737 if opts.get('all'):
4738 show += ui.quiet and (states[:4] + ['clean']) or states
4738 show += ui.quiet and (states[:4] + ['clean']) or states
4739 if not show:
4739 if not show:
4740 if ui.quiet:
4740 if ui.quiet:
4741 show = states[:4]
4741 show = states[:4]
4742 else:
4742 else:
4743 show = states[:5]
4743 show = states[:5]
4744
4744
4745 m = scmutil.match(repo[node2], pats, opts)
4745 m = scmutil.match(repo[node2], pats, opts)
4746 stat = repo.status(node1, node2, m,
4746 stat = repo.status(node1, node2, m,
4747 'ignored' in show, 'clean' in show, 'unknown' in show,
4747 'ignored' in show, 'clean' in show, 'unknown' in show,
4748 opts.get('subrepos'))
4748 opts.get('subrepos'))
4749 changestates = zip(states, 'MAR!?IC', stat)
4749 changestates = zip(states, 'MAR!?IC', stat)
4750
4750
4751 if (opts.get('all') or opts.get('copies')
4751 if (opts.get('all') or opts.get('copies')
4752 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4752 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4753 copy = copies.pathcopies(repo[node1], repo[node2], m)
4753 copy = copies.pathcopies(repo[node1], repo[node2], m)
4754
4754
4755 ui.pager('status')
4755 ui.pager('status')
4756 fm = ui.formatter('status', opts)
4756 fm = ui.formatter('status', opts)
4757 fmt = '%s' + end
4757 fmt = '%s' + end
4758 showchar = not opts.get('no_status')
4758 showchar = not opts.get('no_status')
4759
4759
4760 for state, char, files in changestates:
4760 for state, char, files in changestates:
4761 if state in show:
4761 if state in show:
4762 label = 'status.' + state
4762 label = 'status.' + state
4763 for f in files:
4763 for f in files:
4764 fm.startitem()
4764 fm.startitem()
4765 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4765 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4766 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4766 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4767 if f in copy:
4767 if f in copy:
4768 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4768 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4769 label='status.copied')
4769 label='status.copied')
4770 fm.end()
4770 fm.end()
4771
4771
4772 @command('^summary|sum',
4772 @command('^summary|sum',
4773 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4773 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4774 def summary(ui, repo, **opts):
4774 def summary(ui, repo, **opts):
4775 """summarize working directory state
4775 """summarize working directory state
4776
4776
4777 This generates a brief summary of the working directory state,
4777 This generates a brief summary of the working directory state,
4778 including parents, branch, commit status, phase and available updates.
4778 including parents, branch, commit status, phase and available updates.
4779
4779
4780 With the --remote option, this will check the default paths for
4780 With the --remote option, this will check the default paths for
4781 incoming and outgoing changes. This can be time-consuming.
4781 incoming and outgoing changes. This can be time-consuming.
4782
4782
4783 Returns 0 on success.
4783 Returns 0 on success.
4784 """
4784 """
4785
4785
4786 ui.pager('summary')
4786 ui.pager('summary')
4787 ctx = repo[None]
4787 ctx = repo[None]
4788 parents = ctx.parents()
4788 parents = ctx.parents()
4789 pnode = parents[0].node()
4789 pnode = parents[0].node()
4790 marks = []
4790 marks = []
4791
4791
4792 ms = None
4792 ms = None
4793 try:
4793 try:
4794 ms = mergemod.mergestate.read(repo)
4794 ms = mergemod.mergestate.read(repo)
4795 except error.UnsupportedMergeRecords as e:
4795 except error.UnsupportedMergeRecords as e:
4796 s = ' '.join(e.recordtypes)
4796 s = ' '.join(e.recordtypes)
4797 ui.warn(
4797 ui.warn(
4798 _('warning: merge state has unsupported record types: %s\n') % s)
4798 _('warning: merge state has unsupported record types: %s\n') % s)
4799 unresolved = 0
4799 unresolved = 0
4800 else:
4800 else:
4801 unresolved = [f for f in ms if ms[f] == 'u']
4801 unresolved = [f for f in ms if ms[f] == 'u']
4802
4802
4803 for p in parents:
4803 for p in parents:
4804 # label with log.changeset (instead of log.parent) since this
4804 # label with log.changeset (instead of log.parent) since this
4805 # shows a working directory parent *changeset*:
4805 # shows a working directory parent *changeset*:
4806 # i18n: column positioning for "hg summary"
4806 # i18n: column positioning for "hg summary"
4807 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
4807 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
4808 label=cmdutil._changesetlabels(p))
4808 label=cmdutil._changesetlabels(p))
4809 ui.write(' '.join(p.tags()), label='log.tag')
4809 ui.write(' '.join(p.tags()), label='log.tag')
4810 if p.bookmarks():
4810 if p.bookmarks():
4811 marks.extend(p.bookmarks())
4811 marks.extend(p.bookmarks())
4812 if p.rev() == -1:
4812 if p.rev() == -1:
4813 if not len(repo):
4813 if not len(repo):
4814 ui.write(_(' (empty repository)'))
4814 ui.write(_(' (empty repository)'))
4815 else:
4815 else:
4816 ui.write(_(' (no revision checked out)'))
4816 ui.write(_(' (no revision checked out)'))
4817 if p.troubled():
4817 if p.troubled():
4818 ui.write(' ('
4818 ui.write(' ('
4819 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4819 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4820 for trouble in p.troubles())
4820 for trouble in p.troubles())
4821 + ')')
4821 + ')')
4822 ui.write('\n')
4822 ui.write('\n')
4823 if p.description():
4823 if p.description():
4824 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4824 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4825 label='log.summary')
4825 label='log.summary')
4826
4826
4827 branch = ctx.branch()
4827 branch = ctx.branch()
4828 bheads = repo.branchheads(branch)
4828 bheads = repo.branchheads(branch)
4829 # i18n: column positioning for "hg summary"
4829 # i18n: column positioning for "hg summary"
4830 m = _('branch: %s\n') % branch
4830 m = _('branch: %s\n') % branch
4831 if branch != 'default':
4831 if branch != 'default':
4832 ui.write(m, label='log.branch')
4832 ui.write(m, label='log.branch')
4833 else:
4833 else:
4834 ui.status(m, label='log.branch')
4834 ui.status(m, label='log.branch')
4835
4835
4836 if marks:
4836 if marks:
4837 active = repo._activebookmark
4837 active = repo._activebookmark
4838 # i18n: column positioning for "hg summary"
4838 # i18n: column positioning for "hg summary"
4839 ui.write(_('bookmarks:'), label='log.bookmark')
4839 ui.write(_('bookmarks:'), label='log.bookmark')
4840 if active is not None:
4840 if active is not None:
4841 if active in marks:
4841 if active in marks:
4842 ui.write(' *' + active, label=activebookmarklabel)
4842 ui.write(' *' + active, label=activebookmarklabel)
4843 marks.remove(active)
4843 marks.remove(active)
4844 else:
4844 else:
4845 ui.write(' [%s]' % active, label=activebookmarklabel)
4845 ui.write(' [%s]' % active, label=activebookmarklabel)
4846 for m in marks:
4846 for m in marks:
4847 ui.write(' ' + m, label='log.bookmark')
4847 ui.write(' ' + m, label='log.bookmark')
4848 ui.write('\n', label='log.bookmark')
4848 ui.write('\n', label='log.bookmark')
4849
4849
4850 status = repo.status(unknown=True)
4850 status = repo.status(unknown=True)
4851
4851
4852 c = repo.dirstate.copies()
4852 c = repo.dirstate.copies()
4853 copied, renamed = [], []
4853 copied, renamed = [], []
4854 for d, s in c.iteritems():
4854 for d, s in c.iteritems():
4855 if s in status.removed:
4855 if s in status.removed:
4856 status.removed.remove(s)
4856 status.removed.remove(s)
4857 renamed.append(d)
4857 renamed.append(d)
4858 else:
4858 else:
4859 copied.append(d)
4859 copied.append(d)
4860 if d in status.added:
4860 if d in status.added:
4861 status.added.remove(d)
4861 status.added.remove(d)
4862
4862
4863 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4863 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4864
4864
4865 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4865 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4866 (ui.label(_('%d added'), 'status.added'), status.added),
4866 (ui.label(_('%d added'), 'status.added'), status.added),
4867 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4867 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4868 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4868 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4869 (ui.label(_('%d copied'), 'status.copied'), copied),
4869 (ui.label(_('%d copied'), 'status.copied'), copied),
4870 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4870 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4871 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4871 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4872 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4872 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4873 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4873 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4874 t = []
4874 t = []
4875 for l, s in labels:
4875 for l, s in labels:
4876 if s:
4876 if s:
4877 t.append(l % len(s))
4877 t.append(l % len(s))
4878
4878
4879 t = ', '.join(t)
4879 t = ', '.join(t)
4880 cleanworkdir = False
4880 cleanworkdir = False
4881
4881
4882 if repo.vfs.exists('graftstate'):
4882 if repo.vfs.exists('graftstate'):
4883 t += _(' (graft in progress)')
4883 t += _(' (graft in progress)')
4884 if repo.vfs.exists('updatestate'):
4884 if repo.vfs.exists('updatestate'):
4885 t += _(' (interrupted update)')
4885 t += _(' (interrupted update)')
4886 elif len(parents) > 1:
4886 elif len(parents) > 1:
4887 t += _(' (merge)')
4887 t += _(' (merge)')
4888 elif branch != parents[0].branch():
4888 elif branch != parents[0].branch():
4889 t += _(' (new branch)')
4889 t += _(' (new branch)')
4890 elif (parents[0].closesbranch() and
4890 elif (parents[0].closesbranch() and
4891 pnode in repo.branchheads(branch, closed=True)):
4891 pnode in repo.branchheads(branch, closed=True)):
4892 t += _(' (head closed)')
4892 t += _(' (head closed)')
4893 elif not (status.modified or status.added or status.removed or renamed or
4893 elif not (status.modified or status.added or status.removed or renamed or
4894 copied or subs):
4894 copied or subs):
4895 t += _(' (clean)')
4895 t += _(' (clean)')
4896 cleanworkdir = True
4896 cleanworkdir = True
4897 elif pnode not in bheads:
4897 elif pnode not in bheads:
4898 t += _(' (new branch head)')
4898 t += _(' (new branch head)')
4899
4899
4900 if parents:
4900 if parents:
4901 pendingphase = max(p.phase() for p in parents)
4901 pendingphase = max(p.phase() for p in parents)
4902 else:
4902 else:
4903 pendingphase = phases.public
4903 pendingphase = phases.public
4904
4904
4905 if pendingphase > phases.newcommitphase(ui):
4905 if pendingphase > phases.newcommitphase(ui):
4906 t += ' (%s)' % phases.phasenames[pendingphase]
4906 t += ' (%s)' % phases.phasenames[pendingphase]
4907
4907
4908 if cleanworkdir:
4908 if cleanworkdir:
4909 # i18n: column positioning for "hg summary"
4909 # i18n: column positioning for "hg summary"
4910 ui.status(_('commit: %s\n') % t.strip())
4910 ui.status(_('commit: %s\n') % t.strip())
4911 else:
4911 else:
4912 # i18n: column positioning for "hg summary"
4912 # i18n: column positioning for "hg summary"
4913 ui.write(_('commit: %s\n') % t.strip())
4913 ui.write(_('commit: %s\n') % t.strip())
4914
4914
4915 # all ancestors of branch heads - all ancestors of parent = new csets
4915 # all ancestors of branch heads - all ancestors of parent = new csets
4916 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4916 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4917 bheads))
4917 bheads))
4918
4918
4919 if new == 0:
4919 if new == 0:
4920 # i18n: column positioning for "hg summary"
4920 # i18n: column positioning for "hg summary"
4921 ui.status(_('update: (current)\n'))
4921 ui.status(_('update: (current)\n'))
4922 elif pnode not in bheads:
4922 elif pnode not in bheads:
4923 # i18n: column positioning for "hg summary"
4923 # i18n: column positioning for "hg summary"
4924 ui.write(_('update: %d new changesets (update)\n') % new)
4924 ui.write(_('update: %d new changesets (update)\n') % new)
4925 else:
4925 else:
4926 # i18n: column positioning for "hg summary"
4926 # i18n: column positioning for "hg summary"
4927 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4927 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4928 (new, len(bheads)))
4928 (new, len(bheads)))
4929
4929
4930 t = []
4930 t = []
4931 draft = len(repo.revs('draft()'))
4931 draft = len(repo.revs('draft()'))
4932 if draft:
4932 if draft:
4933 t.append(_('%d draft') % draft)
4933 t.append(_('%d draft') % draft)
4934 secret = len(repo.revs('secret()'))
4934 secret = len(repo.revs('secret()'))
4935 if secret:
4935 if secret:
4936 t.append(_('%d secret') % secret)
4936 t.append(_('%d secret') % secret)
4937
4937
4938 if draft or secret:
4938 if draft or secret:
4939 ui.status(_('phases: %s\n') % ', '.join(t))
4939 ui.status(_('phases: %s\n') % ', '.join(t))
4940
4940
4941 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4941 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4942 for trouble in ("unstable", "divergent", "bumped"):
4942 for trouble in ("unstable", "divergent", "bumped"):
4943 numtrouble = len(repo.revs(trouble + "()"))
4943 numtrouble = len(repo.revs(trouble + "()"))
4944 # We write all the possibilities to ease translation
4944 # We write all the possibilities to ease translation
4945 troublemsg = {
4945 troublemsg = {
4946 "unstable": _("unstable: %d changesets"),
4946 "unstable": _("unstable: %d changesets"),
4947 "divergent": _("divergent: %d changesets"),
4947 "divergent": _("divergent: %d changesets"),
4948 "bumped": _("bumped: %d changesets"),
4948 "bumped": _("bumped: %d changesets"),
4949 }
4949 }
4950 if numtrouble > 0:
4950 if numtrouble > 0:
4951 ui.status(troublemsg[trouble] % numtrouble + "\n")
4951 ui.status(troublemsg[trouble] % numtrouble + "\n")
4952
4952
4953 cmdutil.summaryhooks(ui, repo)
4953 cmdutil.summaryhooks(ui, repo)
4954
4954
4955 if opts.get('remote'):
4955 if opts.get('remote'):
4956 needsincoming, needsoutgoing = True, True
4956 needsincoming, needsoutgoing = True, True
4957 else:
4957 else:
4958 needsincoming, needsoutgoing = False, False
4958 needsincoming, needsoutgoing = False, False
4959 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4959 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4960 if i:
4960 if i:
4961 needsincoming = True
4961 needsincoming = True
4962 if o:
4962 if o:
4963 needsoutgoing = True
4963 needsoutgoing = True
4964 if not needsincoming and not needsoutgoing:
4964 if not needsincoming and not needsoutgoing:
4965 return
4965 return
4966
4966
4967 def getincoming():
4967 def getincoming():
4968 source, branches = hg.parseurl(ui.expandpath('default'))
4968 source, branches = hg.parseurl(ui.expandpath('default'))
4969 sbranch = branches[0]
4969 sbranch = branches[0]
4970 try:
4970 try:
4971 other = hg.peer(repo, {}, source)
4971 other = hg.peer(repo, {}, source)
4972 except error.RepoError:
4972 except error.RepoError:
4973 if opts.get('remote'):
4973 if opts.get('remote'):
4974 raise
4974 raise
4975 return source, sbranch, None, None, None
4975 return source, sbranch, None, None, None
4976 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4976 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4977 if revs:
4977 if revs:
4978 revs = [other.lookup(rev) for rev in revs]
4978 revs = [other.lookup(rev) for rev in revs]
4979 ui.debug('comparing with %s\n' % util.hidepassword(source))
4979 ui.debug('comparing with %s\n' % util.hidepassword(source))
4980 repo.ui.pushbuffer()
4980 repo.ui.pushbuffer()
4981 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4981 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4982 repo.ui.popbuffer()
4982 repo.ui.popbuffer()
4983 return source, sbranch, other, commoninc, commoninc[1]
4983 return source, sbranch, other, commoninc, commoninc[1]
4984
4984
4985 if needsincoming:
4985 if needsincoming:
4986 source, sbranch, sother, commoninc, incoming = getincoming()
4986 source, sbranch, sother, commoninc, incoming = getincoming()
4987 else:
4987 else:
4988 source = sbranch = sother = commoninc = incoming = None
4988 source = sbranch = sother = commoninc = incoming = None
4989
4989
4990 def getoutgoing():
4990 def getoutgoing():
4991 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
4991 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
4992 dbranch = branches[0]
4992 dbranch = branches[0]
4993 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
4993 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
4994 if source != dest:
4994 if source != dest:
4995 try:
4995 try:
4996 dother = hg.peer(repo, {}, dest)
4996 dother = hg.peer(repo, {}, dest)
4997 except error.RepoError:
4997 except error.RepoError:
4998 if opts.get('remote'):
4998 if opts.get('remote'):
4999 raise
4999 raise
5000 return dest, dbranch, None, None
5000 return dest, dbranch, None, None
5001 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5001 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5002 elif sother is None:
5002 elif sother is None:
5003 # there is no explicit destination peer, but source one is invalid
5003 # there is no explicit destination peer, but source one is invalid
5004 return dest, dbranch, None, None
5004 return dest, dbranch, None, None
5005 else:
5005 else:
5006 dother = sother
5006 dother = sother
5007 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5007 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5008 common = None
5008 common = None
5009 else:
5009 else:
5010 common = commoninc
5010 common = commoninc
5011 if revs:
5011 if revs:
5012 revs = [repo.lookup(rev) for rev in revs]
5012 revs = [repo.lookup(rev) for rev in revs]
5013 repo.ui.pushbuffer()
5013 repo.ui.pushbuffer()
5014 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5014 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5015 commoninc=common)
5015 commoninc=common)
5016 repo.ui.popbuffer()
5016 repo.ui.popbuffer()
5017 return dest, dbranch, dother, outgoing
5017 return dest, dbranch, dother, outgoing
5018
5018
5019 if needsoutgoing:
5019 if needsoutgoing:
5020 dest, dbranch, dother, outgoing = getoutgoing()
5020 dest, dbranch, dother, outgoing = getoutgoing()
5021 else:
5021 else:
5022 dest = dbranch = dother = outgoing = None
5022 dest = dbranch = dother = outgoing = None
5023
5023
5024 if opts.get('remote'):
5024 if opts.get('remote'):
5025 t = []
5025 t = []
5026 if incoming:
5026 if incoming:
5027 t.append(_('1 or more incoming'))
5027 t.append(_('1 or more incoming'))
5028 o = outgoing.missing
5028 o = outgoing.missing
5029 if o:
5029 if o:
5030 t.append(_('%d outgoing') % len(o))
5030 t.append(_('%d outgoing') % len(o))
5031 other = dother or sother
5031 other = dother or sother
5032 if 'bookmarks' in other.listkeys('namespaces'):
5032 if 'bookmarks' in other.listkeys('namespaces'):
5033 counts = bookmarks.summary(repo, other)
5033 counts = bookmarks.summary(repo, other)
5034 if counts[0] > 0:
5034 if counts[0] > 0:
5035 t.append(_('%d incoming bookmarks') % counts[0])
5035 t.append(_('%d incoming bookmarks') % counts[0])
5036 if counts[1] > 0:
5036 if counts[1] > 0:
5037 t.append(_('%d outgoing bookmarks') % counts[1])
5037 t.append(_('%d outgoing bookmarks') % counts[1])
5038
5038
5039 if t:
5039 if t:
5040 # i18n: column positioning for "hg summary"
5040 # i18n: column positioning for "hg summary"
5041 ui.write(_('remote: %s\n') % (', '.join(t)))
5041 ui.write(_('remote: %s\n') % (', '.join(t)))
5042 else:
5042 else:
5043 # i18n: column positioning for "hg summary"
5043 # i18n: column positioning for "hg summary"
5044 ui.status(_('remote: (synced)\n'))
5044 ui.status(_('remote: (synced)\n'))
5045
5045
5046 cmdutil.summaryremotehooks(ui, repo, opts,
5046 cmdutil.summaryremotehooks(ui, repo, opts,
5047 ((source, sbranch, sother, commoninc),
5047 ((source, sbranch, sother, commoninc),
5048 (dest, dbranch, dother, outgoing)))
5048 (dest, dbranch, dother, outgoing)))
5049
5049
5050 @command('tag',
5050 @command('tag',
5051 [('f', 'force', None, _('force tag')),
5051 [('f', 'force', None, _('force tag')),
5052 ('l', 'local', None, _('make the tag local')),
5052 ('l', 'local', None, _('make the tag local')),
5053 ('r', 'rev', '', _('revision to tag'), _('REV')),
5053 ('r', 'rev', '', _('revision to tag'), _('REV')),
5054 ('', 'remove', None, _('remove a tag')),
5054 ('', 'remove', None, _('remove a tag')),
5055 # -l/--local is already there, commitopts cannot be used
5055 # -l/--local is already there, commitopts cannot be used
5056 ('e', 'edit', None, _('invoke editor on commit messages')),
5056 ('e', 'edit', None, _('invoke editor on commit messages')),
5057 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5057 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5058 ] + commitopts2,
5058 ] + commitopts2,
5059 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5059 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5060 def tag(ui, repo, name1, *names, **opts):
5060 def tag(ui, repo, name1, *names, **opts):
5061 """add one or more tags for the current or given revision
5061 """add one or more tags for the current or given revision
5062
5062
5063 Name a particular revision using <name>.
5063 Name a particular revision using <name>.
5064
5064
5065 Tags are used to name particular revisions of the repository and are
5065 Tags are used to name particular revisions of the repository and are
5066 very useful to compare different revisions, to go back to significant
5066 very useful to compare different revisions, to go back to significant
5067 earlier versions or to mark branch points as releases, etc. Changing
5067 earlier versions or to mark branch points as releases, etc. Changing
5068 an existing tag is normally disallowed; use -f/--force to override.
5068 an existing tag is normally disallowed; use -f/--force to override.
5069
5069
5070 If no revision is given, the parent of the working directory is
5070 If no revision is given, the parent of the working directory is
5071 used.
5071 used.
5072
5072
5073 To facilitate version control, distribution, and merging of tags,
5073 To facilitate version control, distribution, and merging of tags,
5074 they are stored as a file named ".hgtags" which is managed similarly
5074 they are stored as a file named ".hgtags" which is managed similarly
5075 to other project files and can be hand-edited if necessary. This
5075 to other project files and can be hand-edited if necessary. This
5076 also means that tagging creates a new commit. The file
5076 also means that tagging creates a new commit. The file
5077 ".hg/localtags" is used for local tags (not shared among
5077 ".hg/localtags" is used for local tags (not shared among
5078 repositories).
5078 repositories).
5079
5079
5080 Tag commits are usually made at the head of a branch. If the parent
5080 Tag commits are usually made at the head of a branch. If the parent
5081 of the working directory is not a branch head, :hg:`tag` aborts; use
5081 of the working directory is not a branch head, :hg:`tag` aborts; use
5082 -f/--force to force the tag commit to be based on a non-head
5082 -f/--force to force the tag commit to be based on a non-head
5083 changeset.
5083 changeset.
5084
5084
5085 See :hg:`help dates` for a list of formats valid for -d/--date.
5085 See :hg:`help dates` for a list of formats valid for -d/--date.
5086
5086
5087 Since tag names have priority over branch names during revision
5087 Since tag names have priority over branch names during revision
5088 lookup, using an existing branch name as a tag name is discouraged.
5088 lookup, using an existing branch name as a tag name is discouraged.
5089
5089
5090 Returns 0 on success.
5090 Returns 0 on success.
5091 """
5091 """
5092 wlock = lock = None
5092 wlock = lock = None
5093 try:
5093 try:
5094 wlock = repo.wlock()
5094 wlock = repo.wlock()
5095 lock = repo.lock()
5095 lock = repo.lock()
5096 rev_ = "."
5096 rev_ = "."
5097 names = [t.strip() for t in (name1,) + names]
5097 names = [t.strip() for t in (name1,) + names]
5098 if len(names) != len(set(names)):
5098 if len(names) != len(set(names)):
5099 raise error.Abort(_('tag names must be unique'))
5099 raise error.Abort(_('tag names must be unique'))
5100 for n in names:
5100 for n in names:
5101 scmutil.checknewlabel(repo, n, 'tag')
5101 scmutil.checknewlabel(repo, n, 'tag')
5102 if not n:
5102 if not n:
5103 raise error.Abort(_('tag names cannot consist entirely of '
5103 raise error.Abort(_('tag names cannot consist entirely of '
5104 'whitespace'))
5104 'whitespace'))
5105 if opts.get('rev') and opts.get('remove'):
5105 if opts.get('rev') and opts.get('remove'):
5106 raise error.Abort(_("--rev and --remove are incompatible"))
5106 raise error.Abort(_("--rev and --remove are incompatible"))
5107 if opts.get('rev'):
5107 if opts.get('rev'):
5108 rev_ = opts['rev']
5108 rev_ = opts['rev']
5109 message = opts.get('message')
5109 message = opts.get('message')
5110 if opts.get('remove'):
5110 if opts.get('remove'):
5111 if opts.get('local'):
5111 if opts.get('local'):
5112 expectedtype = 'local'
5112 expectedtype = 'local'
5113 else:
5113 else:
5114 expectedtype = 'global'
5114 expectedtype = 'global'
5115
5115
5116 for n in names:
5116 for n in names:
5117 if not repo.tagtype(n):
5117 if not repo.tagtype(n):
5118 raise error.Abort(_("tag '%s' does not exist") % n)
5118 raise error.Abort(_("tag '%s' does not exist") % n)
5119 if repo.tagtype(n) != expectedtype:
5119 if repo.tagtype(n) != expectedtype:
5120 if expectedtype == 'global':
5120 if expectedtype == 'global':
5121 raise error.Abort(_("tag '%s' is not a global tag") % n)
5121 raise error.Abort(_("tag '%s' is not a global tag") % n)
5122 else:
5122 else:
5123 raise error.Abort(_("tag '%s' is not a local tag") % n)
5123 raise error.Abort(_("tag '%s' is not a local tag") % n)
5124 rev_ = 'null'
5124 rev_ = 'null'
5125 if not message:
5125 if not message:
5126 # we don't translate commit messages
5126 # we don't translate commit messages
5127 message = 'Removed tag %s' % ', '.join(names)
5127 message = 'Removed tag %s' % ', '.join(names)
5128 elif not opts.get('force'):
5128 elif not opts.get('force'):
5129 for n in names:
5129 for n in names:
5130 if n in repo.tags():
5130 if n in repo.tags():
5131 raise error.Abort(_("tag '%s' already exists "
5131 raise error.Abort(_("tag '%s' already exists "
5132 "(use -f to force)") % n)
5132 "(use -f to force)") % n)
5133 if not opts.get('local'):
5133 if not opts.get('local'):
5134 p1, p2 = repo.dirstate.parents()
5134 p1, p2 = repo.dirstate.parents()
5135 if p2 != nullid:
5135 if p2 != nullid:
5136 raise error.Abort(_('uncommitted merge'))
5136 raise error.Abort(_('uncommitted merge'))
5137 bheads = repo.branchheads()
5137 bheads = repo.branchheads()
5138 if not opts.get('force') and bheads and p1 not in bheads:
5138 if not opts.get('force') and bheads and p1 not in bheads:
5139 raise error.Abort(_('working directory is not at a branch head '
5139 raise error.Abort(_('working directory is not at a branch head '
5140 '(use -f to force)'))
5140 '(use -f to force)'))
5141 r = scmutil.revsingle(repo, rev_).node()
5141 r = scmutil.revsingle(repo, rev_).node()
5142
5142
5143 if not message:
5143 if not message:
5144 # we don't translate commit messages
5144 # we don't translate commit messages
5145 message = ('Added tag %s for changeset %s' %
5145 message = ('Added tag %s for changeset %s' %
5146 (', '.join(names), short(r)))
5146 (', '.join(names), short(r)))
5147
5147
5148 date = opts.get('date')
5148 date = opts.get('date')
5149 if date:
5149 if date:
5150 date = util.parsedate(date)
5150 date = util.parsedate(date)
5151
5151
5152 if opts.get('remove'):
5152 if opts.get('remove'):
5153 editform = 'tag.remove'
5153 editform = 'tag.remove'
5154 else:
5154 else:
5155 editform = 'tag.add'
5155 editform = 'tag.add'
5156 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5156 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5157
5157
5158 # don't allow tagging the null rev
5158 # don't allow tagging the null rev
5159 if (not opts.get('remove') and
5159 if (not opts.get('remove') and
5160 scmutil.revsingle(repo, rev_).rev() == nullrev):
5160 scmutil.revsingle(repo, rev_).rev() == nullrev):
5161 raise error.Abort(_("cannot tag null revision"))
5161 raise error.Abort(_("cannot tag null revision"))
5162
5162
5163 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5163 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5164 editor=editor)
5164 editor=editor)
5165 finally:
5165 finally:
5166 release(lock, wlock)
5166 release(lock, wlock)
5167
5167
5168 @command('tags', formatteropts, '')
5168 @command('tags', formatteropts, '')
5169 def tags(ui, repo, **opts):
5169 def tags(ui, repo, **opts):
5170 """list repository tags
5170 """list repository tags
5171
5171
5172 This lists both regular and local tags. When the -v/--verbose
5172 This lists both regular and local tags. When the -v/--verbose
5173 switch is used, a third column "local" is printed for local tags.
5173 switch is used, a third column "local" is printed for local tags.
5174 When the -q/--quiet switch is used, only the tag name is printed.
5174 When the -q/--quiet switch is used, only the tag name is printed.
5175
5175
5176 Returns 0 on success.
5176 Returns 0 on success.
5177 """
5177 """
5178
5178
5179 ui.pager('tags')
5179 ui.pager('tags')
5180 fm = ui.formatter('tags', opts)
5180 fm = ui.formatter('tags', opts)
5181 hexfunc = fm.hexfunc
5181 hexfunc = fm.hexfunc
5182 tagtype = ""
5182 tagtype = ""
5183
5183
5184 for t, n in reversed(repo.tagslist()):
5184 for t, n in reversed(repo.tagslist()):
5185 hn = hexfunc(n)
5185 hn = hexfunc(n)
5186 label = 'tags.normal'
5186 label = 'tags.normal'
5187 tagtype = ''
5187 tagtype = ''
5188 if repo.tagtype(t) == 'local':
5188 if repo.tagtype(t) == 'local':
5189 label = 'tags.local'
5189 label = 'tags.local'
5190 tagtype = 'local'
5190 tagtype = 'local'
5191
5191
5192 fm.startitem()
5192 fm.startitem()
5193 fm.write('tag', '%s', t, label=label)
5193 fm.write('tag', '%s', t, label=label)
5194 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5194 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5195 fm.condwrite(not ui.quiet, 'rev node', fmt,
5195 fm.condwrite(not ui.quiet, 'rev node', fmt,
5196 repo.changelog.rev(n), hn, label=label)
5196 repo.changelog.rev(n), hn, label=label)
5197 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5197 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5198 tagtype, label=label)
5198 tagtype, label=label)
5199 fm.plain('\n')
5199 fm.plain('\n')
5200 fm.end()
5200 fm.end()
5201
5201
5202 @command('tip',
5202 @command('tip',
5203 [('p', 'patch', None, _('show patch')),
5203 [('p', 'patch', None, _('show patch')),
5204 ('g', 'git', None, _('use git extended diff format')),
5204 ('g', 'git', None, _('use git extended diff format')),
5205 ] + templateopts,
5205 ] + templateopts,
5206 _('[-p] [-g]'))
5206 _('[-p] [-g]'))
5207 def tip(ui, repo, **opts):
5207 def tip(ui, repo, **opts):
5208 """show the tip revision (DEPRECATED)
5208 """show the tip revision (DEPRECATED)
5209
5209
5210 The tip revision (usually just called the tip) is the changeset
5210 The tip revision (usually just called the tip) is the changeset
5211 most recently added to the repository (and therefore the most
5211 most recently added to the repository (and therefore the most
5212 recently changed head).
5212 recently changed head).
5213
5213
5214 If you have just made a commit, that commit will be the tip. If
5214 If you have just made a commit, that commit will be the tip. If
5215 you have just pulled changes from another repository, the tip of
5215 you have just pulled changes from another repository, the tip of
5216 that repository becomes the current tip. The "tip" tag is special
5216 that repository becomes the current tip. The "tip" tag is special
5217 and cannot be renamed or assigned to a different changeset.
5217 and cannot be renamed or assigned to a different changeset.
5218
5218
5219 This command is deprecated, please use :hg:`heads` instead.
5219 This command is deprecated, please use :hg:`heads` instead.
5220
5220
5221 Returns 0 on success.
5221 Returns 0 on success.
5222 """
5222 """
5223 displayer = cmdutil.show_changeset(ui, repo, opts)
5223 displayer = cmdutil.show_changeset(ui, repo, opts)
5224 displayer.show(repo['tip'])
5224 displayer.show(repo['tip'])
5225 displayer.close()
5225 displayer.close()
5226
5226
5227 @command('unbundle',
5227 @command('unbundle',
5228 [('u', 'update', None,
5228 [('u', 'update', None,
5229 _('update to new branch head if changesets were unbundled'))],
5229 _('update to new branch head if changesets were unbundled'))],
5230 _('[-u] FILE...'))
5230 _('[-u] FILE...'))
5231 def unbundle(ui, repo, fname1, *fnames, **opts):
5231 def unbundle(ui, repo, fname1, *fnames, **opts):
5232 """apply one or more changegroup files
5232 """apply one or more changegroup files
5233
5233
5234 Apply one or more compressed changegroup files generated by the
5234 Apply one or more compressed changegroup files generated by the
5235 bundle command.
5235 bundle command.
5236
5236
5237 Returns 0 on success, 1 if an update has unresolved files.
5237 Returns 0 on success, 1 if an update has unresolved files.
5238 """
5238 """
5239 fnames = (fname1,) + fnames
5239 fnames = (fname1,) + fnames
5240
5240
5241 with repo.lock():
5241 with repo.lock():
5242 for fname in fnames:
5242 for fname in fnames:
5243 f = hg.openpath(ui, fname)
5243 f = hg.openpath(ui, fname)
5244 gen = exchange.readbundle(ui, f, fname)
5244 gen = exchange.readbundle(ui, f, fname)
5245 if isinstance(gen, bundle2.unbundle20):
5245 if isinstance(gen, bundle2.unbundle20):
5246 tr = repo.transaction('unbundle')
5246 tr = repo.transaction('unbundle')
5247 try:
5247 try:
5248 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5248 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5249 url='bundle:' + fname)
5249 url='bundle:' + fname)
5250 tr.close()
5250 tr.close()
5251 except error.BundleUnknownFeatureError as exc:
5251 except error.BundleUnknownFeatureError as exc:
5252 raise error.Abort(_('%s: unknown bundle feature, %s')
5252 raise error.Abort(_('%s: unknown bundle feature, %s')
5253 % (fname, exc),
5253 % (fname, exc),
5254 hint=_("see https://mercurial-scm.org/"
5254 hint=_("see https://mercurial-scm.org/"
5255 "wiki/BundleFeature for more "
5255 "wiki/BundleFeature for more "
5256 "information"))
5256 "information"))
5257 finally:
5257 finally:
5258 if tr:
5258 if tr:
5259 tr.release()
5259 tr.release()
5260 changes = [r.get('return', 0)
5260 changes = [r.get('return', 0)
5261 for r in op.records['changegroup']]
5261 for r in op.records['changegroup']]
5262 modheads = changegroup.combineresults(changes)
5262 modheads = changegroup.combineresults(changes)
5263 elif isinstance(gen, streamclone.streamcloneapplier):
5263 elif isinstance(gen, streamclone.streamcloneapplier):
5264 raise error.Abort(
5264 raise error.Abort(
5265 _('packed bundles cannot be applied with '
5265 _('packed bundles cannot be applied with '
5266 '"hg unbundle"'),
5266 '"hg unbundle"'),
5267 hint=_('use "hg debugapplystreamclonebundle"'))
5267 hint=_('use "hg debugapplystreamclonebundle"'))
5268 else:
5268 else:
5269 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5269 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5270
5270
5271 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5271 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5272
5272
5273 @command('^update|up|checkout|co',
5273 @command('^update|up|checkout|co',
5274 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5274 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5275 ('c', 'check', None, _('require clean working directory')),
5275 ('c', 'check', None, _('require clean working directory')),
5276 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5276 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5277 ('r', 'rev', '', _('revision'), _('REV'))
5277 ('r', 'rev', '', _('revision'), _('REV'))
5278 ] + mergetoolopts,
5278 ] + mergetoolopts,
5279 _('[-C|-c] [-d DATE] [[-r] REV]'))
5279 _('[-C|-c] [-d DATE] [[-r] REV]'))
5280 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5280 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5281 tool=None):
5281 tool=None):
5282 """update working directory (or switch revisions)
5282 """update working directory (or switch revisions)
5283
5283
5284 Update the repository's working directory to the specified
5284 Update the repository's working directory to the specified
5285 changeset. If no changeset is specified, update to the tip of the
5285 changeset. If no changeset is specified, update to the tip of the
5286 current named branch and move the active bookmark (see :hg:`help
5286 current named branch and move the active bookmark (see :hg:`help
5287 bookmarks`).
5287 bookmarks`).
5288
5288
5289 Update sets the working directory's parent revision to the specified
5289 Update sets the working directory's parent revision to the specified
5290 changeset (see :hg:`help parents`).
5290 changeset (see :hg:`help parents`).
5291
5291
5292 If the changeset is not a descendant or ancestor of the working
5292 If the changeset is not a descendant or ancestor of the working
5293 directory's parent and there are uncommitted changes, the update is
5293 directory's parent and there are uncommitted changes, the update is
5294 aborted. With the -c/--check option, the working directory is checked
5294 aborted. With the -c/--check option, the working directory is checked
5295 for uncommitted changes; if none are found, the working directory is
5295 for uncommitted changes; if none are found, the working directory is
5296 updated to the specified changeset.
5296 updated to the specified changeset.
5297
5297
5298 .. container:: verbose
5298 .. container:: verbose
5299
5299
5300 The -C/--clean and -c/--check options control what happens if the
5300 The -C/--clean and -c/--check options control what happens if the
5301 working directory contains uncommitted changes.
5301 working directory contains uncommitted changes.
5302 At most of one of them can be specified.
5302 At most of one of them can be specified.
5303
5303
5304 1. If no option is specified, and if
5304 1. If no option is specified, and if
5305 the requested changeset is an ancestor or descendant of
5305 the requested changeset is an ancestor or descendant of
5306 the working directory's parent, the uncommitted changes
5306 the working directory's parent, the uncommitted changes
5307 are merged into the requested changeset and the merged
5307 are merged into the requested changeset and the merged
5308 result is left uncommitted. If the requested changeset is
5308 result is left uncommitted. If the requested changeset is
5309 not an ancestor or descendant (that is, it is on another
5309 not an ancestor or descendant (that is, it is on another
5310 branch), the update is aborted and the uncommitted changes
5310 branch), the update is aborted and the uncommitted changes
5311 are preserved.
5311 are preserved.
5312
5312
5313 2. With the -c/--check option, the update is aborted and the
5313 2. With the -c/--check option, the update is aborted and the
5314 uncommitted changes are preserved.
5314 uncommitted changes are preserved.
5315
5315
5316 3. With the -C/--clean option, uncommitted changes are discarded and
5316 3. With the -C/--clean option, uncommitted changes are discarded and
5317 the working directory is updated to the requested changeset.
5317 the working directory is updated to the requested changeset.
5318
5318
5319 To cancel an uncommitted merge (and lose your changes), use
5319 To cancel an uncommitted merge (and lose your changes), use
5320 :hg:`update --clean .`.
5320 :hg:`update --clean .`.
5321
5321
5322 Use null as the changeset to remove the working directory (like
5322 Use null as the changeset to remove the working directory (like
5323 :hg:`clone -U`).
5323 :hg:`clone -U`).
5324
5324
5325 If you want to revert just one file to an older revision, use
5325 If you want to revert just one file to an older revision, use
5326 :hg:`revert [-r REV] NAME`.
5326 :hg:`revert [-r REV] NAME`.
5327
5327
5328 See :hg:`help dates` for a list of formats valid for -d/--date.
5328 See :hg:`help dates` for a list of formats valid for -d/--date.
5329
5329
5330 Returns 0 on success, 1 if there are unresolved files.
5330 Returns 0 on success, 1 if there are unresolved files.
5331 """
5331 """
5332 if rev and node:
5332 if rev and node:
5333 raise error.Abort(_("please specify just one revision"))
5333 raise error.Abort(_("please specify just one revision"))
5334
5334
5335 if rev is None or rev == '':
5335 if rev is None or rev == '':
5336 rev = node
5336 rev = node
5337
5337
5338 if date and rev is not None:
5338 if date and rev is not None:
5339 raise error.Abort(_("you can't specify a revision and a date"))
5339 raise error.Abort(_("you can't specify a revision and a date"))
5340
5340
5341 if check and clean:
5341 if check and clean:
5342 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
5342 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
5343
5343
5344 with repo.wlock():
5344 with repo.wlock():
5345 cmdutil.clearunfinished(repo)
5345 cmdutil.clearunfinished(repo)
5346
5346
5347 if date:
5347 if date:
5348 rev = cmdutil.finddate(ui, repo, date)
5348 rev = cmdutil.finddate(ui, repo, date)
5349
5349
5350 # if we defined a bookmark, we have to remember the original name
5350 # if we defined a bookmark, we have to remember the original name
5351 brev = rev
5351 brev = rev
5352 rev = scmutil.revsingle(repo, rev, rev).rev()
5352 rev = scmutil.revsingle(repo, rev, rev).rev()
5353
5353
5354 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5354 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5355
5355
5356 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
5356 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
5357
5357
5358 @command('verify', [])
5358 @command('verify', [])
5359 def verify(ui, repo):
5359 def verify(ui, repo):
5360 """verify the integrity of the repository
5360 """verify the integrity of the repository
5361
5361
5362 Verify the integrity of the current repository.
5362 Verify the integrity of the current repository.
5363
5363
5364 This will perform an extensive check of the repository's
5364 This will perform an extensive check of the repository's
5365 integrity, validating the hashes and checksums of each entry in
5365 integrity, validating the hashes and checksums of each entry in
5366 the changelog, manifest, and tracked files, as well as the
5366 the changelog, manifest, and tracked files, as well as the
5367 integrity of their crosslinks and indices.
5367 integrity of their crosslinks and indices.
5368
5368
5369 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5369 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5370 for more information about recovery from corruption of the
5370 for more information about recovery from corruption of the
5371 repository.
5371 repository.
5372
5372
5373 Returns 0 on success, 1 if errors are encountered.
5373 Returns 0 on success, 1 if errors are encountered.
5374 """
5374 """
5375 return hg.verify(repo)
5375 return hg.verify(repo)
5376
5376
5377 @command('version', [] + formatteropts, norepo=True)
5377 @command('version', [] + formatteropts, norepo=True)
5378 def version_(ui, **opts):
5378 def version_(ui, **opts):
5379 """output version and copyright information"""
5379 """output version and copyright information"""
5380 if ui.verbose:
5380 if ui.verbose:
5381 ui.pager('version')
5381 ui.pager('version')
5382 fm = ui.formatter("version", opts)
5382 fm = ui.formatter("version", opts)
5383 fm.startitem()
5383 fm.startitem()
5384 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5384 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5385 util.version())
5385 util.version())
5386 license = _(
5386 license = _(
5387 "(see https://mercurial-scm.org for more information)\n"
5387 "(see https://mercurial-scm.org for more information)\n"
5388 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5388 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5389 "This is free software; see the source for copying conditions. "
5389 "This is free software; see the source for copying conditions. "
5390 "There is NO\nwarranty; "
5390 "There is NO\nwarranty; "
5391 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5391 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5392 )
5392 )
5393 if not ui.quiet:
5393 if not ui.quiet:
5394 fm.plain(license)
5394 fm.plain(license)
5395
5395
5396 if ui.verbose:
5396 if ui.verbose:
5397 fm.plain(_("\nEnabled extensions:\n\n"))
5397 fm.plain(_("\nEnabled extensions:\n\n"))
5398 # format names and versions into columns
5398 # format names and versions into columns
5399 names = []
5399 names = []
5400 vers = []
5400 vers = []
5401 isinternals = []
5401 isinternals = []
5402 for name, module in extensions.extensions():
5402 for name, module in extensions.extensions():
5403 names.append(name)
5403 names.append(name)
5404 vers.append(extensions.moduleversion(module) or None)
5404 vers.append(extensions.moduleversion(module) or None)
5405 isinternals.append(extensions.ismoduleinternal(module))
5405 isinternals.append(extensions.ismoduleinternal(module))
5406 fn = fm.nested("extensions")
5406 fn = fm.nested("extensions")
5407 if names:
5407 if names:
5408 namefmt = " %%-%ds " % max(len(n) for n in names)
5408 namefmt = " %%-%ds " % max(len(n) for n in names)
5409 places = [_("external"), _("internal")]
5409 places = [_("external"), _("internal")]
5410 for n, v, p in zip(names, vers, isinternals):
5410 for n, v, p in zip(names, vers, isinternals):
5411 fn.startitem()
5411 fn.startitem()
5412 fn.condwrite(ui.verbose, "name", namefmt, n)
5412 fn.condwrite(ui.verbose, "name", namefmt, n)
5413 if ui.verbose:
5413 if ui.verbose:
5414 fn.plain("%s " % places[p])
5414 fn.plain("%s " % places[p])
5415 fn.data(bundled=p)
5415 fn.data(bundled=p)
5416 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5416 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5417 if ui.verbose:
5417 if ui.verbose:
5418 fn.plain("\n")
5418 fn.plain("\n")
5419 fn.end()
5419 fn.end()
5420 fm.end()
5420 fm.end()
5421
5421
5422 def loadcmdtable(ui, name, cmdtable):
5422 def loadcmdtable(ui, name, cmdtable):
5423 """Load command functions from specified cmdtable
5423 """Load command functions from specified cmdtable
5424 """
5424 """
5425 overrides = [cmd for cmd in cmdtable if cmd in table]
5425 overrides = [cmd for cmd in cmdtable if cmd in table]
5426 if overrides:
5426 if overrides:
5427 ui.warn(_("extension '%s' overrides commands: %s\n")
5427 ui.warn(_("extension '%s' overrides commands: %s\n")
5428 % (name, " ".join(overrides)))
5428 % (name, " ".join(overrides)))
5429 table.update(cmdtable)
5429 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now