##// END OF EJS Templates
outgoing: enable pager...
Augie Fackler -
r31041:77a252f2 default
parent child Browse files
Show More
@@ -1,5457 +1,5460 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 minirst,
42 minirst,
43 obsolete,
43 obsolete,
44 patch,
44 patch,
45 phases,
45 phases,
46 pycompat,
46 pycompat,
47 revsetlang,
47 revsetlang,
48 scmutil,
48 scmutil,
49 server,
49 server,
50 sshserver,
50 sshserver,
51 streamclone,
51 streamclone,
52 templatekw,
52 templatekw,
53 ui as uimod,
53 ui as uimod,
54 util,
54 util,
55 )
55 )
56
56
57 release = lockmod.release
57 release = lockmod.release
58
58
59 table = {}
59 table = {}
60
60
61 command = cmdutil.command(table)
61 command = cmdutil.command(table)
62
62
63 # label constants
63 # label constants
64 # until 3.5, bookmarks.current was the advertised name, not
64 # until 3.5, bookmarks.current was the advertised name, not
65 # bookmarks.active, so we must use both to avoid breaking old
65 # bookmarks.active, so we must use both to avoid breaking old
66 # custom styles
66 # custom styles
67 activebookmarklabel = 'bookmarks.active bookmarks.current'
67 activebookmarklabel = 'bookmarks.active bookmarks.current'
68
68
69 # common command options
69 # common command options
70
70
71 globalopts = [
71 globalopts = [
72 ('R', 'repository', '',
72 ('R', 'repository', '',
73 _('repository root directory or name of overlay bundle file'),
73 _('repository root directory or name of overlay bundle file'),
74 _('REPO')),
74 _('REPO')),
75 ('', 'cwd', '',
75 ('', 'cwd', '',
76 _('change working directory'), _('DIR')),
76 _('change working directory'), _('DIR')),
77 ('y', 'noninteractive', None,
77 ('y', 'noninteractive', None,
78 _('do not prompt, automatically pick the first choice for all prompts')),
78 _('do not prompt, automatically pick the first choice for all prompts')),
79 ('q', 'quiet', None, _('suppress output')),
79 ('q', 'quiet', None, _('suppress output')),
80 ('v', 'verbose', None, _('enable additional output')),
80 ('v', 'verbose', None, _('enable additional output')),
81 ('', 'config', [],
81 ('', 'config', [],
82 _('set/override config option (use \'section.name=value\')'),
82 _('set/override config option (use \'section.name=value\')'),
83 _('CONFIG')),
83 _('CONFIG')),
84 ('', 'debug', None, _('enable debugging output')),
84 ('', 'debug', None, _('enable debugging output')),
85 ('', 'debugger', None, _('start debugger')),
85 ('', 'debugger', None, _('start debugger')),
86 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
86 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
87 _('ENCODE')),
87 _('ENCODE')),
88 ('', 'encodingmode', encoding.encodingmode,
88 ('', 'encodingmode', encoding.encodingmode,
89 _('set the charset encoding mode'), _('MODE')),
89 _('set the charset encoding mode'), _('MODE')),
90 ('', 'traceback', None, _('always print a traceback on exception')),
90 ('', 'traceback', None, _('always print a traceback on exception')),
91 ('', 'time', None, _('time how long the command takes')),
91 ('', 'time', None, _('time how long the command takes')),
92 ('', 'profile', None, _('print command execution profile')),
92 ('', 'profile', None, _('print command execution profile')),
93 ('', 'version', None, _('output version information and exit')),
93 ('', 'version', None, _('output version information and exit')),
94 ('h', 'help', None, _('display help and exit')),
94 ('h', 'help', None, _('display help and exit')),
95 ('', 'hidden', False, _('consider hidden changesets')),
95 ('', 'hidden', False, _('consider hidden changesets')),
96 ('', 'pager', 'auto',
96 ('', 'pager', 'auto',
97 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
97 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
98 ]
98 ]
99
99
100 dryrunopts = [('n', 'dry-run', None,
100 dryrunopts = [('n', 'dry-run', None,
101 _('do not perform actions, just print output'))]
101 _('do not perform actions, just print output'))]
102
102
103 remoteopts = [
103 remoteopts = [
104 ('e', 'ssh', '',
104 ('e', 'ssh', '',
105 _('specify ssh command to use'), _('CMD')),
105 _('specify ssh command to use'), _('CMD')),
106 ('', 'remotecmd', '',
106 ('', 'remotecmd', '',
107 _('specify hg command to run on the remote side'), _('CMD')),
107 _('specify hg command to run on the remote side'), _('CMD')),
108 ('', 'insecure', None,
108 ('', 'insecure', None,
109 _('do not verify server certificate (ignoring web.cacerts config)')),
109 _('do not verify server certificate (ignoring web.cacerts config)')),
110 ]
110 ]
111
111
112 walkopts = [
112 walkopts = [
113 ('I', 'include', [],
113 ('I', 'include', [],
114 _('include names matching the given patterns'), _('PATTERN')),
114 _('include names matching the given patterns'), _('PATTERN')),
115 ('X', 'exclude', [],
115 ('X', 'exclude', [],
116 _('exclude names matching the given patterns'), _('PATTERN')),
116 _('exclude names matching the given patterns'), _('PATTERN')),
117 ]
117 ]
118
118
119 commitopts = [
119 commitopts = [
120 ('m', 'message', '',
120 ('m', 'message', '',
121 _('use text as commit message'), _('TEXT')),
121 _('use text as commit message'), _('TEXT')),
122 ('l', 'logfile', '',
122 ('l', 'logfile', '',
123 _('read commit message from file'), _('FILE')),
123 _('read commit message from file'), _('FILE')),
124 ]
124 ]
125
125
126 commitopts2 = [
126 commitopts2 = [
127 ('d', 'date', '',
127 ('d', 'date', '',
128 _('record the specified date as commit date'), _('DATE')),
128 _('record the specified date as commit date'), _('DATE')),
129 ('u', 'user', '',
129 ('u', 'user', '',
130 _('record the specified user as committer'), _('USER')),
130 _('record the specified user as committer'), _('USER')),
131 ]
131 ]
132
132
133 # hidden for now
133 # hidden for now
134 formatteropts = [
134 formatteropts = [
135 ('T', 'template', '',
135 ('T', 'template', '',
136 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
136 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
137 ]
137 ]
138
138
139 templateopts = [
139 templateopts = [
140 ('', 'style', '',
140 ('', 'style', '',
141 _('display using template map file (DEPRECATED)'), _('STYLE')),
141 _('display using template map file (DEPRECATED)'), _('STYLE')),
142 ('T', 'template', '',
142 ('T', 'template', '',
143 _('display with template'), _('TEMPLATE')),
143 _('display with template'), _('TEMPLATE')),
144 ]
144 ]
145
145
146 logopts = [
146 logopts = [
147 ('p', 'patch', None, _('show patch')),
147 ('p', 'patch', None, _('show patch')),
148 ('g', 'git', None, _('use git extended diff format')),
148 ('g', 'git', None, _('use git extended diff format')),
149 ('l', 'limit', '',
149 ('l', 'limit', '',
150 _('limit number of changes displayed'), _('NUM')),
150 _('limit number of changes displayed'), _('NUM')),
151 ('M', 'no-merges', None, _('do not show merges')),
151 ('M', 'no-merges', None, _('do not show merges')),
152 ('', 'stat', None, _('output diffstat-style summary of changes')),
152 ('', 'stat', None, _('output diffstat-style summary of changes')),
153 ('G', 'graph', None, _("show the revision DAG")),
153 ('G', 'graph', None, _("show the revision DAG")),
154 ] + templateopts
154 ] + templateopts
155
155
156 diffopts = [
156 diffopts = [
157 ('a', 'text', None, _('treat all files as text')),
157 ('a', 'text', None, _('treat all files as text')),
158 ('g', 'git', None, _('use git extended diff format')),
158 ('g', 'git', None, _('use git extended diff format')),
159 ('', 'nodates', None, _('omit dates from diff headers'))
159 ('', 'nodates', None, _('omit dates from diff headers'))
160 ]
160 ]
161
161
162 diffwsopts = [
162 diffwsopts = [
163 ('w', 'ignore-all-space', None,
163 ('w', 'ignore-all-space', None,
164 _('ignore white space when comparing lines')),
164 _('ignore white space when comparing lines')),
165 ('b', 'ignore-space-change', None,
165 ('b', 'ignore-space-change', None,
166 _('ignore changes in the amount of white space')),
166 _('ignore changes in the amount of white space')),
167 ('B', 'ignore-blank-lines', None,
167 ('B', 'ignore-blank-lines', None,
168 _('ignore changes whose lines are all blank')),
168 _('ignore changes whose lines are all blank')),
169 ]
169 ]
170
170
171 diffopts2 = [
171 diffopts2 = [
172 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
172 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
173 ('p', 'show-function', None, _('show which function each change is in')),
173 ('p', 'show-function', None, _('show which function each change is in')),
174 ('', 'reverse', None, _('produce a diff that undoes the changes')),
174 ('', 'reverse', None, _('produce a diff that undoes the changes')),
175 ] + diffwsopts + [
175 ] + diffwsopts + [
176 ('U', 'unified', '',
176 ('U', 'unified', '',
177 _('number of lines of context to show'), _('NUM')),
177 _('number of lines of context to show'), _('NUM')),
178 ('', 'stat', None, _('output diffstat-style summary of changes')),
178 ('', 'stat', None, _('output diffstat-style summary of changes')),
179 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
179 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
180 ]
180 ]
181
181
182 mergetoolopts = [
182 mergetoolopts = [
183 ('t', 'tool', '', _('specify merge tool')),
183 ('t', 'tool', '', _('specify merge tool')),
184 ]
184 ]
185
185
186 similarityopts = [
186 similarityopts = [
187 ('s', 'similarity', '',
187 ('s', 'similarity', '',
188 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
188 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
189 ]
189 ]
190
190
191 subrepoopts = [
191 subrepoopts = [
192 ('S', 'subrepos', None,
192 ('S', 'subrepos', None,
193 _('recurse into subrepositories'))
193 _('recurse into subrepositories'))
194 ]
194 ]
195
195
196 debugrevlogopts = [
196 debugrevlogopts = [
197 ('c', 'changelog', False, _('open changelog')),
197 ('c', 'changelog', False, _('open changelog')),
198 ('m', 'manifest', False, _('open manifest')),
198 ('m', 'manifest', False, _('open manifest')),
199 ('', 'dir', '', _('open directory manifest')),
199 ('', 'dir', '', _('open directory manifest')),
200 ]
200 ]
201
201
202 # Commands start here, listed alphabetically
202 # Commands start here, listed alphabetically
203
203
204 @command('^add',
204 @command('^add',
205 walkopts + subrepoopts + dryrunopts,
205 walkopts + subrepoopts + dryrunopts,
206 _('[OPTION]... [FILE]...'),
206 _('[OPTION]... [FILE]...'),
207 inferrepo=True)
207 inferrepo=True)
208 def add(ui, repo, *pats, **opts):
208 def add(ui, repo, *pats, **opts):
209 """add the specified files on the next commit
209 """add the specified files on the next commit
210
210
211 Schedule files to be version controlled and added to the
211 Schedule files to be version controlled and added to the
212 repository.
212 repository.
213
213
214 The files will be added to the repository at the next commit. To
214 The files will be added to the repository at the next commit. To
215 undo an add before that, see :hg:`forget`.
215 undo an add before that, see :hg:`forget`.
216
216
217 If no names are given, add all files to the repository (except
217 If no names are given, add all files to the repository (except
218 files matching ``.hgignore``).
218 files matching ``.hgignore``).
219
219
220 .. container:: verbose
220 .. container:: verbose
221
221
222 Examples:
222 Examples:
223
223
224 - New (unknown) files are added
224 - New (unknown) files are added
225 automatically by :hg:`add`::
225 automatically by :hg:`add`::
226
226
227 $ ls
227 $ ls
228 foo.c
228 foo.c
229 $ hg status
229 $ hg status
230 ? foo.c
230 ? foo.c
231 $ hg add
231 $ hg add
232 adding foo.c
232 adding foo.c
233 $ hg status
233 $ hg status
234 A foo.c
234 A foo.c
235
235
236 - Specific files to be added can be specified::
236 - Specific files to be added can be specified::
237
237
238 $ ls
238 $ ls
239 bar.c foo.c
239 bar.c foo.c
240 $ hg status
240 $ hg status
241 ? bar.c
241 ? bar.c
242 ? foo.c
242 ? foo.c
243 $ hg add bar.c
243 $ hg add bar.c
244 $ hg status
244 $ hg status
245 A bar.c
245 A bar.c
246 ? foo.c
246 ? foo.c
247
247
248 Returns 0 if all files are successfully added.
248 Returns 0 if all files are successfully added.
249 """
249 """
250
250
251 m = scmutil.match(repo[None], pats, opts)
251 m = scmutil.match(repo[None], pats, opts)
252 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
252 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
253 return rejected and 1 or 0
253 return rejected and 1 or 0
254
254
255 @command('addremove',
255 @command('addremove',
256 similarityopts + subrepoopts + walkopts + dryrunopts,
256 similarityopts + subrepoopts + walkopts + dryrunopts,
257 _('[OPTION]... [FILE]...'),
257 _('[OPTION]... [FILE]...'),
258 inferrepo=True)
258 inferrepo=True)
259 def addremove(ui, repo, *pats, **opts):
259 def addremove(ui, repo, *pats, **opts):
260 """add all new files, delete all missing files
260 """add all new files, delete all missing files
261
261
262 Add all new files and remove all missing files from the
262 Add all new files and remove all missing files from the
263 repository.
263 repository.
264
264
265 Unless names are given, new files are ignored if they match any of
265 Unless names are given, new files are ignored if they match any of
266 the patterns in ``.hgignore``. As with add, these changes take
266 the patterns in ``.hgignore``. As with add, these changes take
267 effect at the next commit.
267 effect at the next commit.
268
268
269 Use the -s/--similarity option to detect renamed files. This
269 Use the -s/--similarity option to detect renamed files. This
270 option takes a percentage between 0 (disabled) and 100 (files must
270 option takes a percentage between 0 (disabled) and 100 (files must
271 be identical) as its parameter. With a parameter greater than 0,
271 be identical) as its parameter. With a parameter greater than 0,
272 this compares every removed file with every added file and records
272 this compares every removed file with every added file and records
273 those similar enough as renames. Detecting renamed files this way
273 those similar enough as renames. Detecting renamed files this way
274 can be expensive. After using this option, :hg:`status -C` can be
274 can be expensive. After using this option, :hg:`status -C` can be
275 used to check which files were identified as moved or renamed. If
275 used to check which files were identified as moved or renamed. If
276 not specified, -s/--similarity defaults to 100 and only renames of
276 not specified, -s/--similarity defaults to 100 and only renames of
277 identical files are detected.
277 identical files are detected.
278
278
279 .. container:: verbose
279 .. container:: verbose
280
280
281 Examples:
281 Examples:
282
282
283 - A number of files (bar.c and foo.c) are new,
283 - A number of files (bar.c and foo.c) are new,
284 while foobar.c has been removed (without using :hg:`remove`)
284 while foobar.c has been removed (without using :hg:`remove`)
285 from the repository::
285 from the repository::
286
286
287 $ ls
287 $ ls
288 bar.c foo.c
288 bar.c foo.c
289 $ hg status
289 $ hg status
290 ! foobar.c
290 ! foobar.c
291 ? bar.c
291 ? bar.c
292 ? foo.c
292 ? foo.c
293 $ hg addremove
293 $ hg addremove
294 adding bar.c
294 adding bar.c
295 adding foo.c
295 adding foo.c
296 removing foobar.c
296 removing foobar.c
297 $ hg status
297 $ hg status
298 A bar.c
298 A bar.c
299 A foo.c
299 A foo.c
300 R foobar.c
300 R foobar.c
301
301
302 - A file foobar.c was moved to foo.c without using :hg:`rename`.
302 - A file foobar.c was moved to foo.c without using :hg:`rename`.
303 Afterwards, it was edited slightly::
303 Afterwards, it was edited slightly::
304
304
305 $ ls
305 $ ls
306 foo.c
306 foo.c
307 $ hg status
307 $ hg status
308 ! foobar.c
308 ! foobar.c
309 ? foo.c
309 ? foo.c
310 $ hg addremove --similarity 90
310 $ hg addremove --similarity 90
311 removing foobar.c
311 removing foobar.c
312 adding foo.c
312 adding foo.c
313 recording removal of foobar.c as rename to foo.c (94% similar)
313 recording removal of foobar.c as rename to foo.c (94% similar)
314 $ hg status -C
314 $ hg status -C
315 A foo.c
315 A foo.c
316 foobar.c
316 foobar.c
317 R foobar.c
317 R foobar.c
318
318
319 Returns 0 if all files are successfully added.
319 Returns 0 if all files are successfully added.
320 """
320 """
321 try:
321 try:
322 sim = float(opts.get('similarity') or 100)
322 sim = float(opts.get('similarity') or 100)
323 except ValueError:
323 except ValueError:
324 raise error.Abort(_('similarity must be a number'))
324 raise error.Abort(_('similarity must be a number'))
325 if sim < 0 or sim > 100:
325 if sim < 0 or sim > 100:
326 raise error.Abort(_('similarity must be between 0 and 100'))
326 raise error.Abort(_('similarity must be between 0 and 100'))
327 matcher = scmutil.match(repo[None], pats, opts)
327 matcher = scmutil.match(repo[None], pats, opts)
328 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
328 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
329
329
330 @command('^annotate|blame',
330 @command('^annotate|blame',
331 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
331 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
332 ('', 'follow', None,
332 ('', 'follow', None,
333 _('follow copies/renames and list the filename (DEPRECATED)')),
333 _('follow copies/renames and list the filename (DEPRECATED)')),
334 ('', 'no-follow', None, _("don't follow copies and renames")),
334 ('', 'no-follow', None, _("don't follow copies and renames")),
335 ('a', 'text', None, _('treat all files as text')),
335 ('a', 'text', None, _('treat all files as text')),
336 ('u', 'user', None, _('list the author (long with -v)')),
336 ('u', 'user', None, _('list the author (long with -v)')),
337 ('f', 'file', None, _('list the filename')),
337 ('f', 'file', None, _('list the filename')),
338 ('d', 'date', None, _('list the date (short with -q)')),
338 ('d', 'date', None, _('list the date (short with -q)')),
339 ('n', 'number', None, _('list the revision number (default)')),
339 ('n', 'number', None, _('list the revision number (default)')),
340 ('c', 'changeset', None, _('list the changeset')),
340 ('c', 'changeset', None, _('list the changeset')),
341 ('l', 'line-number', None, _('show line number at the first appearance'))
341 ('l', 'line-number', None, _('show line number at the first appearance'))
342 ] + diffwsopts + walkopts + formatteropts,
342 ] + diffwsopts + walkopts + formatteropts,
343 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
343 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
344 inferrepo=True)
344 inferrepo=True)
345 def annotate(ui, repo, *pats, **opts):
345 def annotate(ui, repo, *pats, **opts):
346 """show changeset information by line for each file
346 """show changeset information by line for each file
347
347
348 List changes in files, showing the revision id responsible for
348 List changes in files, showing the revision id responsible for
349 each line.
349 each line.
350
350
351 This command is useful for discovering when a change was made and
351 This command is useful for discovering when a change was made and
352 by whom.
352 by whom.
353
353
354 If you include --file, --user, or --date, the revision number is
354 If you include --file, --user, or --date, the revision number is
355 suppressed unless you also include --number.
355 suppressed unless you also include --number.
356
356
357 Without the -a/--text option, annotate will avoid processing files
357 Without the -a/--text option, annotate will avoid processing files
358 it detects as binary. With -a, annotate will annotate the file
358 it detects as binary. With -a, annotate will annotate the file
359 anyway, although the results will probably be neither useful
359 anyway, although the results will probably be neither useful
360 nor desirable.
360 nor desirable.
361
361
362 Returns 0 on success.
362 Returns 0 on success.
363 """
363 """
364 if not pats:
364 if not pats:
365 raise error.Abort(_('at least one filename or pattern is required'))
365 raise error.Abort(_('at least one filename or pattern is required'))
366
366
367 if opts.get('follow'):
367 if opts.get('follow'):
368 # --follow is deprecated and now just an alias for -f/--file
368 # --follow is deprecated and now just an alias for -f/--file
369 # to mimic the behavior of Mercurial before version 1.5
369 # to mimic the behavior of Mercurial before version 1.5
370 opts['file'] = True
370 opts['file'] = True
371
371
372 ctx = scmutil.revsingle(repo, opts.get('rev'))
372 ctx = scmutil.revsingle(repo, opts.get('rev'))
373
373
374 fm = ui.formatter('annotate', opts)
374 fm = ui.formatter('annotate', opts)
375 if ui.quiet:
375 if ui.quiet:
376 datefunc = util.shortdate
376 datefunc = util.shortdate
377 else:
377 else:
378 datefunc = util.datestr
378 datefunc = util.datestr
379 if ctx.rev() is None:
379 if ctx.rev() is None:
380 def hexfn(node):
380 def hexfn(node):
381 if node is None:
381 if node is None:
382 return None
382 return None
383 else:
383 else:
384 return fm.hexfunc(node)
384 return fm.hexfunc(node)
385 if opts.get('changeset'):
385 if opts.get('changeset'):
386 # omit "+" suffix which is appended to node hex
386 # omit "+" suffix which is appended to node hex
387 def formatrev(rev):
387 def formatrev(rev):
388 if rev is None:
388 if rev is None:
389 return '%d' % ctx.p1().rev()
389 return '%d' % ctx.p1().rev()
390 else:
390 else:
391 return '%d' % rev
391 return '%d' % rev
392 else:
392 else:
393 def formatrev(rev):
393 def formatrev(rev):
394 if rev is None:
394 if rev is None:
395 return '%d+' % ctx.p1().rev()
395 return '%d+' % ctx.p1().rev()
396 else:
396 else:
397 return '%d ' % rev
397 return '%d ' % rev
398 def formathex(hex):
398 def formathex(hex):
399 if hex is None:
399 if hex is None:
400 return '%s+' % fm.hexfunc(ctx.p1().node())
400 return '%s+' % fm.hexfunc(ctx.p1().node())
401 else:
401 else:
402 return '%s ' % hex
402 return '%s ' % hex
403 else:
403 else:
404 hexfn = fm.hexfunc
404 hexfn = fm.hexfunc
405 formatrev = formathex = str
405 formatrev = formathex = str
406
406
407 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
407 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
408 ('number', ' ', lambda x: x[0].rev(), formatrev),
408 ('number', ' ', lambda x: x[0].rev(), formatrev),
409 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
409 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
410 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
410 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
411 ('file', ' ', lambda x: x[0].path(), str),
411 ('file', ' ', lambda x: x[0].path(), str),
412 ('line_number', ':', lambda x: x[1], str),
412 ('line_number', ':', lambda x: x[1], str),
413 ]
413 ]
414 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
414 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
415
415
416 if (not opts.get('user') and not opts.get('changeset')
416 if (not opts.get('user') and not opts.get('changeset')
417 and not opts.get('date') and not opts.get('file')):
417 and not opts.get('date') and not opts.get('file')):
418 opts['number'] = True
418 opts['number'] = True
419
419
420 linenumber = opts.get('line_number') is not None
420 linenumber = opts.get('line_number') is not None
421 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
421 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
422 raise error.Abort(_('at least one of -n/-c is required for -l'))
422 raise error.Abort(_('at least one of -n/-c is required for -l'))
423
423
424 ui.pager('annotate')
424 ui.pager('annotate')
425
425
426 if fm.isplain():
426 if fm.isplain():
427 def makefunc(get, fmt):
427 def makefunc(get, fmt):
428 return lambda x: fmt(get(x))
428 return lambda x: fmt(get(x))
429 else:
429 else:
430 def makefunc(get, fmt):
430 def makefunc(get, fmt):
431 return get
431 return get
432 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
432 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
433 if opts.get(op)]
433 if opts.get(op)]
434 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
434 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
435 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
435 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
436 if opts.get(op))
436 if opts.get(op))
437
437
438 def bad(x, y):
438 def bad(x, y):
439 raise error.Abort("%s: %s" % (x, y))
439 raise error.Abort("%s: %s" % (x, y))
440
440
441 m = scmutil.match(ctx, pats, opts, badfn=bad)
441 m = scmutil.match(ctx, pats, opts, badfn=bad)
442
442
443 follow = not opts.get('no_follow')
443 follow = not opts.get('no_follow')
444 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
444 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
445 whitespace=True)
445 whitespace=True)
446 for abs in ctx.walk(m):
446 for abs in ctx.walk(m):
447 fctx = ctx[abs]
447 fctx = ctx[abs]
448 if not opts.get('text') and util.binary(fctx.data()):
448 if not opts.get('text') and util.binary(fctx.data()):
449 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
449 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
450 continue
450 continue
451
451
452 lines = fctx.annotate(follow=follow, linenumber=linenumber,
452 lines = fctx.annotate(follow=follow, linenumber=linenumber,
453 diffopts=diffopts)
453 diffopts=diffopts)
454 if not lines:
454 if not lines:
455 continue
455 continue
456 formats = []
456 formats = []
457 pieces = []
457 pieces = []
458
458
459 for f, sep in funcmap:
459 for f, sep in funcmap:
460 l = [f(n) for n, dummy in lines]
460 l = [f(n) for n, dummy in lines]
461 if fm.isplain():
461 if fm.isplain():
462 sizes = [encoding.colwidth(x) for x in l]
462 sizes = [encoding.colwidth(x) for x in l]
463 ml = max(sizes)
463 ml = max(sizes)
464 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
464 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
465 else:
465 else:
466 formats.append(['%s' for x in l])
466 formats.append(['%s' for x in l])
467 pieces.append(l)
467 pieces.append(l)
468
468
469 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
469 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
470 fm.startitem()
470 fm.startitem()
471 fm.write(fields, "".join(f), *p)
471 fm.write(fields, "".join(f), *p)
472 fm.write('line', ": %s", l[1])
472 fm.write('line', ": %s", l[1])
473
473
474 if not lines[-1][1].endswith('\n'):
474 if not lines[-1][1].endswith('\n'):
475 fm.plain('\n')
475 fm.plain('\n')
476
476
477 fm.end()
477 fm.end()
478
478
479 @command('archive',
479 @command('archive',
480 [('', 'no-decode', None, _('do not pass files through decoders')),
480 [('', 'no-decode', None, _('do not pass files through decoders')),
481 ('p', 'prefix', '', _('directory prefix for files in archive'),
481 ('p', 'prefix', '', _('directory prefix for files in archive'),
482 _('PREFIX')),
482 _('PREFIX')),
483 ('r', 'rev', '', _('revision to distribute'), _('REV')),
483 ('r', 'rev', '', _('revision to distribute'), _('REV')),
484 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
484 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
485 ] + subrepoopts + walkopts,
485 ] + subrepoopts + walkopts,
486 _('[OPTION]... DEST'))
486 _('[OPTION]... DEST'))
487 def archive(ui, repo, dest, **opts):
487 def archive(ui, repo, dest, **opts):
488 '''create an unversioned archive of a repository revision
488 '''create an unversioned archive of a repository revision
489
489
490 By default, the revision used is the parent of the working
490 By default, the revision used is the parent of the working
491 directory; use -r/--rev to specify a different revision.
491 directory; use -r/--rev to specify a different revision.
492
492
493 The archive type is automatically detected based on file
493 The archive type is automatically detected based on file
494 extension (to override, use -t/--type).
494 extension (to override, use -t/--type).
495
495
496 .. container:: verbose
496 .. container:: verbose
497
497
498 Examples:
498 Examples:
499
499
500 - create a zip file containing the 1.0 release::
500 - create a zip file containing the 1.0 release::
501
501
502 hg archive -r 1.0 project-1.0.zip
502 hg archive -r 1.0 project-1.0.zip
503
503
504 - create a tarball excluding .hg files::
504 - create a tarball excluding .hg files::
505
505
506 hg archive project.tar.gz -X ".hg*"
506 hg archive project.tar.gz -X ".hg*"
507
507
508 Valid types are:
508 Valid types are:
509
509
510 :``files``: a directory full of files (default)
510 :``files``: a directory full of files (default)
511 :``tar``: tar archive, uncompressed
511 :``tar``: tar archive, uncompressed
512 :``tbz2``: tar archive, compressed using bzip2
512 :``tbz2``: tar archive, compressed using bzip2
513 :``tgz``: tar archive, compressed using gzip
513 :``tgz``: tar archive, compressed using gzip
514 :``uzip``: zip archive, uncompressed
514 :``uzip``: zip archive, uncompressed
515 :``zip``: zip archive, compressed using deflate
515 :``zip``: zip archive, compressed using deflate
516
516
517 The exact name of the destination archive or directory is given
517 The exact name of the destination archive or directory is given
518 using a format string; see :hg:`help export` for details.
518 using a format string; see :hg:`help export` for details.
519
519
520 Each member added to an archive file has a directory prefix
520 Each member added to an archive file has a directory prefix
521 prepended. Use -p/--prefix to specify a format string for the
521 prepended. Use -p/--prefix to specify a format string for the
522 prefix. The default is the basename of the archive, with suffixes
522 prefix. The default is the basename of the archive, with suffixes
523 removed.
523 removed.
524
524
525 Returns 0 on success.
525 Returns 0 on success.
526 '''
526 '''
527
527
528 ctx = scmutil.revsingle(repo, opts.get('rev'))
528 ctx = scmutil.revsingle(repo, opts.get('rev'))
529 if not ctx:
529 if not ctx:
530 raise error.Abort(_('no working directory: please specify a revision'))
530 raise error.Abort(_('no working directory: please specify a revision'))
531 node = ctx.node()
531 node = ctx.node()
532 dest = cmdutil.makefilename(repo, dest, node)
532 dest = cmdutil.makefilename(repo, dest, node)
533 if os.path.realpath(dest) == repo.root:
533 if os.path.realpath(dest) == repo.root:
534 raise error.Abort(_('repository root cannot be destination'))
534 raise error.Abort(_('repository root cannot be destination'))
535
535
536 kind = opts.get('type') or archival.guesskind(dest) or 'files'
536 kind = opts.get('type') or archival.guesskind(dest) or 'files'
537 prefix = opts.get('prefix')
537 prefix = opts.get('prefix')
538
538
539 if dest == '-':
539 if dest == '-':
540 if kind == 'files':
540 if kind == 'files':
541 raise error.Abort(_('cannot archive plain files to stdout'))
541 raise error.Abort(_('cannot archive plain files to stdout'))
542 dest = cmdutil.makefileobj(repo, dest)
542 dest = cmdutil.makefileobj(repo, dest)
543 if not prefix:
543 if not prefix:
544 prefix = os.path.basename(repo.root) + '-%h'
544 prefix = os.path.basename(repo.root) + '-%h'
545
545
546 prefix = cmdutil.makefilename(repo, prefix, node)
546 prefix = cmdutil.makefilename(repo, prefix, node)
547 matchfn = scmutil.match(ctx, [], opts)
547 matchfn = scmutil.match(ctx, [], opts)
548 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
548 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
549 matchfn, prefix, subrepos=opts.get('subrepos'))
549 matchfn, prefix, subrepos=opts.get('subrepos'))
550
550
551 @command('backout',
551 @command('backout',
552 [('', 'merge', None, _('merge with old dirstate parent after backout')),
552 [('', 'merge', None, _('merge with old dirstate parent after backout')),
553 ('', 'commit', None,
553 ('', 'commit', None,
554 _('commit if no conflicts were encountered (DEPRECATED)')),
554 _('commit if no conflicts were encountered (DEPRECATED)')),
555 ('', 'no-commit', None, _('do not commit')),
555 ('', 'no-commit', None, _('do not commit')),
556 ('', 'parent', '',
556 ('', 'parent', '',
557 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
557 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
558 ('r', 'rev', '', _('revision to backout'), _('REV')),
558 ('r', 'rev', '', _('revision to backout'), _('REV')),
559 ('e', 'edit', False, _('invoke editor on commit messages')),
559 ('e', 'edit', False, _('invoke editor on commit messages')),
560 ] + mergetoolopts + walkopts + commitopts + commitopts2,
560 ] + mergetoolopts + walkopts + commitopts + commitopts2,
561 _('[OPTION]... [-r] REV'))
561 _('[OPTION]... [-r] REV'))
562 def backout(ui, repo, node=None, rev=None, **opts):
562 def backout(ui, repo, node=None, rev=None, **opts):
563 '''reverse effect of earlier changeset
563 '''reverse effect of earlier changeset
564
564
565 Prepare a new changeset with the effect of REV undone in the
565 Prepare a new changeset with the effect of REV undone in the
566 current working directory. If no conflicts were encountered,
566 current working directory. If no conflicts were encountered,
567 it will be committed immediately.
567 it will be committed immediately.
568
568
569 If REV is the parent of the working directory, then this new changeset
569 If REV is the parent of the working directory, then this new changeset
570 is committed automatically (unless --no-commit is specified).
570 is committed automatically (unless --no-commit is specified).
571
571
572 .. note::
572 .. note::
573
573
574 :hg:`backout` cannot be used to fix either an unwanted or
574 :hg:`backout` cannot be used to fix either an unwanted or
575 incorrect merge.
575 incorrect merge.
576
576
577 .. container:: verbose
577 .. container:: verbose
578
578
579 Examples:
579 Examples:
580
580
581 - Reverse the effect of the parent of the working directory.
581 - Reverse the effect of the parent of the working directory.
582 This backout will be committed immediately::
582 This backout will be committed immediately::
583
583
584 hg backout -r .
584 hg backout -r .
585
585
586 - Reverse the effect of previous bad revision 23::
586 - Reverse the effect of previous bad revision 23::
587
587
588 hg backout -r 23
588 hg backout -r 23
589
589
590 - Reverse the effect of previous bad revision 23 and
590 - Reverse the effect of previous bad revision 23 and
591 leave changes uncommitted::
591 leave changes uncommitted::
592
592
593 hg backout -r 23 --no-commit
593 hg backout -r 23 --no-commit
594 hg commit -m "Backout revision 23"
594 hg commit -m "Backout revision 23"
595
595
596 By default, the pending changeset will have one parent,
596 By default, the pending changeset will have one parent,
597 maintaining a linear history. With --merge, the pending
597 maintaining a linear history. With --merge, the pending
598 changeset will instead have two parents: the old parent of the
598 changeset will instead have two parents: the old parent of the
599 working directory and a new child of REV that simply undoes REV.
599 working directory and a new child of REV that simply undoes REV.
600
600
601 Before version 1.7, the behavior without --merge was equivalent
601 Before version 1.7, the behavior without --merge was equivalent
602 to specifying --merge followed by :hg:`update --clean .` to
602 to specifying --merge followed by :hg:`update --clean .` to
603 cancel the merge and leave the child of REV as a head to be
603 cancel the merge and leave the child of REV as a head to be
604 merged separately.
604 merged separately.
605
605
606 See :hg:`help dates` for a list of formats valid for -d/--date.
606 See :hg:`help dates` for a list of formats valid for -d/--date.
607
607
608 See :hg:`help revert` for a way to restore files to the state
608 See :hg:`help revert` for a way to restore files to the state
609 of another revision.
609 of another revision.
610
610
611 Returns 0 on success, 1 if nothing to backout or there are unresolved
611 Returns 0 on success, 1 if nothing to backout or there are unresolved
612 files.
612 files.
613 '''
613 '''
614 wlock = lock = None
614 wlock = lock = None
615 try:
615 try:
616 wlock = repo.wlock()
616 wlock = repo.wlock()
617 lock = repo.lock()
617 lock = repo.lock()
618 return _dobackout(ui, repo, node, rev, **opts)
618 return _dobackout(ui, repo, node, rev, **opts)
619 finally:
619 finally:
620 release(lock, wlock)
620 release(lock, wlock)
621
621
622 def _dobackout(ui, repo, node=None, rev=None, **opts):
622 def _dobackout(ui, repo, node=None, rev=None, **opts):
623 if opts.get('commit') and opts.get('no_commit'):
623 if opts.get('commit') and opts.get('no_commit'):
624 raise error.Abort(_("cannot use --commit with --no-commit"))
624 raise error.Abort(_("cannot use --commit with --no-commit"))
625 if opts.get('merge') and opts.get('no_commit'):
625 if opts.get('merge') and opts.get('no_commit'):
626 raise error.Abort(_("cannot use --merge with --no-commit"))
626 raise error.Abort(_("cannot use --merge with --no-commit"))
627
627
628 if rev and node:
628 if rev and node:
629 raise error.Abort(_("please specify just one revision"))
629 raise error.Abort(_("please specify just one revision"))
630
630
631 if not rev:
631 if not rev:
632 rev = node
632 rev = node
633
633
634 if not rev:
634 if not rev:
635 raise error.Abort(_("please specify a revision to backout"))
635 raise error.Abort(_("please specify a revision to backout"))
636
636
637 date = opts.get('date')
637 date = opts.get('date')
638 if date:
638 if date:
639 opts['date'] = util.parsedate(date)
639 opts['date'] = util.parsedate(date)
640
640
641 cmdutil.checkunfinished(repo)
641 cmdutil.checkunfinished(repo)
642 cmdutil.bailifchanged(repo)
642 cmdutil.bailifchanged(repo)
643 node = scmutil.revsingle(repo, rev).node()
643 node = scmutil.revsingle(repo, rev).node()
644
644
645 op1, op2 = repo.dirstate.parents()
645 op1, op2 = repo.dirstate.parents()
646 if not repo.changelog.isancestor(node, op1):
646 if not repo.changelog.isancestor(node, op1):
647 raise error.Abort(_('cannot backout change that is not an ancestor'))
647 raise error.Abort(_('cannot backout change that is not an ancestor'))
648
648
649 p1, p2 = repo.changelog.parents(node)
649 p1, p2 = repo.changelog.parents(node)
650 if p1 == nullid:
650 if p1 == nullid:
651 raise error.Abort(_('cannot backout a change with no parents'))
651 raise error.Abort(_('cannot backout a change with no parents'))
652 if p2 != nullid:
652 if p2 != nullid:
653 if not opts.get('parent'):
653 if not opts.get('parent'):
654 raise error.Abort(_('cannot backout a merge changeset'))
654 raise error.Abort(_('cannot backout a merge changeset'))
655 p = repo.lookup(opts['parent'])
655 p = repo.lookup(opts['parent'])
656 if p not in (p1, p2):
656 if p not in (p1, p2):
657 raise error.Abort(_('%s is not a parent of %s') %
657 raise error.Abort(_('%s is not a parent of %s') %
658 (short(p), short(node)))
658 (short(p), short(node)))
659 parent = p
659 parent = p
660 else:
660 else:
661 if opts.get('parent'):
661 if opts.get('parent'):
662 raise error.Abort(_('cannot use --parent on non-merge changeset'))
662 raise error.Abort(_('cannot use --parent on non-merge changeset'))
663 parent = p1
663 parent = p1
664
664
665 # the backout should appear on the same branch
665 # the backout should appear on the same branch
666 branch = repo.dirstate.branch()
666 branch = repo.dirstate.branch()
667 bheads = repo.branchheads(branch)
667 bheads = repo.branchheads(branch)
668 rctx = scmutil.revsingle(repo, hex(parent))
668 rctx = scmutil.revsingle(repo, hex(parent))
669 if not opts.get('merge') and op1 != node:
669 if not opts.get('merge') and op1 != node:
670 dsguard = dirstateguard.dirstateguard(repo, 'backout')
670 dsguard = dirstateguard.dirstateguard(repo, 'backout')
671 try:
671 try:
672 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
672 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
673 'backout')
673 'backout')
674 stats = mergemod.update(repo, parent, True, True, node, False)
674 stats = mergemod.update(repo, parent, True, True, node, False)
675 repo.setparents(op1, op2)
675 repo.setparents(op1, op2)
676 dsguard.close()
676 dsguard.close()
677 hg._showstats(repo, stats)
677 hg._showstats(repo, stats)
678 if stats[3]:
678 if stats[3]:
679 repo.ui.status(_("use 'hg resolve' to retry unresolved "
679 repo.ui.status(_("use 'hg resolve' to retry unresolved "
680 "file merges\n"))
680 "file merges\n"))
681 return 1
681 return 1
682 finally:
682 finally:
683 ui.setconfig('ui', 'forcemerge', '', '')
683 ui.setconfig('ui', 'forcemerge', '', '')
684 lockmod.release(dsguard)
684 lockmod.release(dsguard)
685 else:
685 else:
686 hg.clean(repo, node, show_stats=False)
686 hg.clean(repo, node, show_stats=False)
687 repo.dirstate.setbranch(branch)
687 repo.dirstate.setbranch(branch)
688 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
688 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
689
689
690 if opts.get('no_commit'):
690 if opts.get('no_commit'):
691 msg = _("changeset %s backed out, "
691 msg = _("changeset %s backed out, "
692 "don't forget to commit.\n")
692 "don't forget to commit.\n")
693 ui.status(msg % short(node))
693 ui.status(msg % short(node))
694 return 0
694 return 0
695
695
696 def commitfunc(ui, repo, message, match, opts):
696 def commitfunc(ui, repo, message, match, opts):
697 editform = 'backout'
697 editform = 'backout'
698 e = cmdutil.getcommiteditor(editform=editform, **opts)
698 e = cmdutil.getcommiteditor(editform=editform, **opts)
699 if not message:
699 if not message:
700 # we don't translate commit messages
700 # we don't translate commit messages
701 message = "Backed out changeset %s" % short(node)
701 message = "Backed out changeset %s" % short(node)
702 e = cmdutil.getcommiteditor(edit=True, editform=editform)
702 e = cmdutil.getcommiteditor(edit=True, editform=editform)
703 return repo.commit(message, opts.get('user'), opts.get('date'),
703 return repo.commit(message, opts.get('user'), opts.get('date'),
704 match, editor=e)
704 match, editor=e)
705 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
705 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
706 if not newnode:
706 if not newnode:
707 ui.status(_("nothing changed\n"))
707 ui.status(_("nothing changed\n"))
708 return 1
708 return 1
709 cmdutil.commitstatus(repo, newnode, branch, bheads)
709 cmdutil.commitstatus(repo, newnode, branch, bheads)
710
710
711 def nice(node):
711 def nice(node):
712 return '%d:%s' % (repo.changelog.rev(node), short(node))
712 return '%d:%s' % (repo.changelog.rev(node), short(node))
713 ui.status(_('changeset %s backs out changeset %s\n') %
713 ui.status(_('changeset %s backs out changeset %s\n') %
714 (nice(repo.changelog.tip()), nice(node)))
714 (nice(repo.changelog.tip()), nice(node)))
715 if opts.get('merge') and op1 != node:
715 if opts.get('merge') and op1 != node:
716 hg.clean(repo, op1, show_stats=False)
716 hg.clean(repo, op1, show_stats=False)
717 ui.status(_('merging with changeset %s\n')
717 ui.status(_('merging with changeset %s\n')
718 % nice(repo.changelog.tip()))
718 % nice(repo.changelog.tip()))
719 try:
719 try:
720 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
720 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
721 'backout')
721 'backout')
722 return hg.merge(repo, hex(repo.changelog.tip()))
722 return hg.merge(repo, hex(repo.changelog.tip()))
723 finally:
723 finally:
724 ui.setconfig('ui', 'forcemerge', '', '')
724 ui.setconfig('ui', 'forcemerge', '', '')
725 return 0
725 return 0
726
726
727 @command('bisect',
727 @command('bisect',
728 [('r', 'reset', False, _('reset bisect state')),
728 [('r', 'reset', False, _('reset bisect state')),
729 ('g', 'good', False, _('mark changeset good')),
729 ('g', 'good', False, _('mark changeset good')),
730 ('b', 'bad', False, _('mark changeset bad')),
730 ('b', 'bad', False, _('mark changeset bad')),
731 ('s', 'skip', False, _('skip testing changeset')),
731 ('s', 'skip', False, _('skip testing changeset')),
732 ('e', 'extend', False, _('extend the bisect range')),
732 ('e', 'extend', False, _('extend the bisect range')),
733 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
733 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
734 ('U', 'noupdate', False, _('do not update to target'))],
734 ('U', 'noupdate', False, _('do not update to target'))],
735 _("[-gbsr] [-U] [-c CMD] [REV]"))
735 _("[-gbsr] [-U] [-c CMD] [REV]"))
736 def bisect(ui, repo, rev=None, extra=None, command=None,
736 def bisect(ui, repo, rev=None, extra=None, command=None,
737 reset=None, good=None, bad=None, skip=None, extend=None,
737 reset=None, good=None, bad=None, skip=None, extend=None,
738 noupdate=None):
738 noupdate=None):
739 """subdivision search of changesets
739 """subdivision search of changesets
740
740
741 This command helps to find changesets which introduce problems. To
741 This command helps to find changesets which introduce problems. To
742 use, mark the earliest changeset you know exhibits the problem as
742 use, mark the earliest changeset you know exhibits the problem as
743 bad, then mark the latest changeset which is free from the problem
743 bad, then mark the latest changeset which is free from the problem
744 as good. Bisect will update your working directory to a revision
744 as good. Bisect will update your working directory to a revision
745 for testing (unless the -U/--noupdate option is specified). Once
745 for testing (unless the -U/--noupdate option is specified). Once
746 you have performed tests, mark the working directory as good or
746 you have performed tests, mark the working directory as good or
747 bad, and bisect will either update to another candidate changeset
747 bad, and bisect will either update to another candidate changeset
748 or announce that it has found the bad revision.
748 or announce that it has found the bad revision.
749
749
750 As a shortcut, you can also use the revision argument to mark a
750 As a shortcut, you can also use the revision argument to mark a
751 revision as good or bad without checking it out first.
751 revision as good or bad without checking it out first.
752
752
753 If you supply a command, it will be used for automatic bisection.
753 If you supply a command, it will be used for automatic bisection.
754 The environment variable HG_NODE will contain the ID of the
754 The environment variable HG_NODE will contain the ID of the
755 changeset being tested. The exit status of the command will be
755 changeset being tested. The exit status of the command will be
756 used to mark revisions as good or bad: status 0 means good, 125
756 used to mark revisions as good or bad: status 0 means good, 125
757 means to skip the revision, 127 (command not found) will abort the
757 means to skip the revision, 127 (command not found) will abort the
758 bisection, and any other non-zero exit status means the revision
758 bisection, and any other non-zero exit status means the revision
759 is bad.
759 is bad.
760
760
761 .. container:: verbose
761 .. container:: verbose
762
762
763 Some examples:
763 Some examples:
764
764
765 - start a bisection with known bad revision 34, and good revision 12::
765 - start a bisection with known bad revision 34, and good revision 12::
766
766
767 hg bisect --bad 34
767 hg bisect --bad 34
768 hg bisect --good 12
768 hg bisect --good 12
769
769
770 - advance the current bisection by marking current revision as good or
770 - advance the current bisection by marking current revision as good or
771 bad::
771 bad::
772
772
773 hg bisect --good
773 hg bisect --good
774 hg bisect --bad
774 hg bisect --bad
775
775
776 - mark the current revision, or a known revision, to be skipped (e.g. if
776 - mark the current revision, or a known revision, to be skipped (e.g. if
777 that revision is not usable because of another issue)::
777 that revision is not usable because of another issue)::
778
778
779 hg bisect --skip
779 hg bisect --skip
780 hg bisect --skip 23
780 hg bisect --skip 23
781
781
782 - skip all revisions that do not touch directories ``foo`` or ``bar``::
782 - skip all revisions that do not touch directories ``foo`` or ``bar``::
783
783
784 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
784 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
785
785
786 - forget the current bisection::
786 - forget the current bisection::
787
787
788 hg bisect --reset
788 hg bisect --reset
789
789
790 - use 'make && make tests' to automatically find the first broken
790 - use 'make && make tests' to automatically find the first broken
791 revision::
791 revision::
792
792
793 hg bisect --reset
793 hg bisect --reset
794 hg bisect --bad 34
794 hg bisect --bad 34
795 hg bisect --good 12
795 hg bisect --good 12
796 hg bisect --command "make && make tests"
796 hg bisect --command "make && make tests"
797
797
798 - see all changesets whose states are already known in the current
798 - see all changesets whose states are already known in the current
799 bisection::
799 bisection::
800
800
801 hg log -r "bisect(pruned)"
801 hg log -r "bisect(pruned)"
802
802
803 - see the changeset currently being bisected (especially useful
803 - see the changeset currently being bisected (especially useful
804 if running with -U/--noupdate)::
804 if running with -U/--noupdate)::
805
805
806 hg log -r "bisect(current)"
806 hg log -r "bisect(current)"
807
807
808 - see all changesets that took part in the current bisection::
808 - see all changesets that took part in the current bisection::
809
809
810 hg log -r "bisect(range)"
810 hg log -r "bisect(range)"
811
811
812 - you can even get a nice graph::
812 - you can even get a nice graph::
813
813
814 hg log --graph -r "bisect(range)"
814 hg log --graph -r "bisect(range)"
815
815
816 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
816 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
817
817
818 Returns 0 on success.
818 Returns 0 on success.
819 """
819 """
820 # backward compatibility
820 # backward compatibility
821 if rev in "good bad reset init".split():
821 if rev in "good bad reset init".split():
822 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
822 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
823 cmd, rev, extra = rev, extra, None
823 cmd, rev, extra = rev, extra, None
824 if cmd == "good":
824 if cmd == "good":
825 good = True
825 good = True
826 elif cmd == "bad":
826 elif cmd == "bad":
827 bad = True
827 bad = True
828 else:
828 else:
829 reset = True
829 reset = True
830 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
830 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
831 raise error.Abort(_('incompatible arguments'))
831 raise error.Abort(_('incompatible arguments'))
832
832
833 cmdutil.checkunfinished(repo)
833 cmdutil.checkunfinished(repo)
834
834
835 if reset:
835 if reset:
836 hbisect.resetstate(repo)
836 hbisect.resetstate(repo)
837 return
837 return
838
838
839 state = hbisect.load_state(repo)
839 state = hbisect.load_state(repo)
840
840
841 # update state
841 # update state
842 if good or bad or skip:
842 if good or bad or skip:
843 if rev:
843 if rev:
844 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
844 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
845 else:
845 else:
846 nodes = [repo.lookup('.')]
846 nodes = [repo.lookup('.')]
847 if good:
847 if good:
848 state['good'] += nodes
848 state['good'] += nodes
849 elif bad:
849 elif bad:
850 state['bad'] += nodes
850 state['bad'] += nodes
851 elif skip:
851 elif skip:
852 state['skip'] += nodes
852 state['skip'] += nodes
853 hbisect.save_state(repo, state)
853 hbisect.save_state(repo, state)
854 if not (state['good'] and state['bad']):
854 if not (state['good'] and state['bad']):
855 return
855 return
856
856
857 def mayupdate(repo, node, show_stats=True):
857 def mayupdate(repo, node, show_stats=True):
858 """common used update sequence"""
858 """common used update sequence"""
859 if noupdate:
859 if noupdate:
860 return
860 return
861 cmdutil.bailifchanged(repo)
861 cmdutil.bailifchanged(repo)
862 return hg.clean(repo, node, show_stats=show_stats)
862 return hg.clean(repo, node, show_stats=show_stats)
863
863
864 displayer = cmdutil.show_changeset(ui, repo, {})
864 displayer = cmdutil.show_changeset(ui, repo, {})
865
865
866 if command:
866 if command:
867 changesets = 1
867 changesets = 1
868 if noupdate:
868 if noupdate:
869 try:
869 try:
870 node = state['current'][0]
870 node = state['current'][0]
871 except LookupError:
871 except LookupError:
872 raise error.Abort(_('current bisect revision is unknown - '
872 raise error.Abort(_('current bisect revision is unknown - '
873 'start a new bisect to fix'))
873 'start a new bisect to fix'))
874 else:
874 else:
875 node, p2 = repo.dirstate.parents()
875 node, p2 = repo.dirstate.parents()
876 if p2 != nullid:
876 if p2 != nullid:
877 raise error.Abort(_('current bisect revision is a merge'))
877 raise error.Abort(_('current bisect revision is a merge'))
878 if rev:
878 if rev:
879 node = repo[scmutil.revsingle(repo, rev, node)].node()
879 node = repo[scmutil.revsingle(repo, rev, node)].node()
880 try:
880 try:
881 while changesets:
881 while changesets:
882 # update state
882 # update state
883 state['current'] = [node]
883 state['current'] = [node]
884 hbisect.save_state(repo, state)
884 hbisect.save_state(repo, state)
885 status = ui.system(command, environ={'HG_NODE': hex(node)})
885 status = ui.system(command, environ={'HG_NODE': hex(node)})
886 if status == 125:
886 if status == 125:
887 transition = "skip"
887 transition = "skip"
888 elif status == 0:
888 elif status == 0:
889 transition = "good"
889 transition = "good"
890 # status < 0 means process was killed
890 # status < 0 means process was killed
891 elif status == 127:
891 elif status == 127:
892 raise error.Abort(_("failed to execute %s") % command)
892 raise error.Abort(_("failed to execute %s") % command)
893 elif status < 0:
893 elif status < 0:
894 raise error.Abort(_("%s killed") % command)
894 raise error.Abort(_("%s killed") % command)
895 else:
895 else:
896 transition = "bad"
896 transition = "bad"
897 state[transition].append(node)
897 state[transition].append(node)
898 ctx = repo[node]
898 ctx = repo[node]
899 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
899 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
900 hbisect.checkstate(state)
900 hbisect.checkstate(state)
901 # bisect
901 # bisect
902 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
902 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
903 # update to next check
903 # update to next check
904 node = nodes[0]
904 node = nodes[0]
905 mayupdate(repo, node, show_stats=False)
905 mayupdate(repo, node, show_stats=False)
906 finally:
906 finally:
907 state['current'] = [node]
907 state['current'] = [node]
908 hbisect.save_state(repo, state)
908 hbisect.save_state(repo, state)
909 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
909 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
910 return
910 return
911
911
912 hbisect.checkstate(state)
912 hbisect.checkstate(state)
913
913
914 # actually bisect
914 # actually bisect
915 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
915 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
916 if extend:
916 if extend:
917 if not changesets:
917 if not changesets:
918 extendnode = hbisect.extendrange(repo, state, nodes, good)
918 extendnode = hbisect.extendrange(repo, state, nodes, good)
919 if extendnode is not None:
919 if extendnode is not None:
920 ui.write(_("Extending search to changeset %d:%s\n")
920 ui.write(_("Extending search to changeset %d:%s\n")
921 % (extendnode.rev(), extendnode))
921 % (extendnode.rev(), extendnode))
922 state['current'] = [extendnode.node()]
922 state['current'] = [extendnode.node()]
923 hbisect.save_state(repo, state)
923 hbisect.save_state(repo, state)
924 return mayupdate(repo, extendnode.node())
924 return mayupdate(repo, extendnode.node())
925 raise error.Abort(_("nothing to extend"))
925 raise error.Abort(_("nothing to extend"))
926
926
927 if changesets == 0:
927 if changesets == 0:
928 hbisect.printresult(ui, repo, state, displayer, nodes, good)
928 hbisect.printresult(ui, repo, state, displayer, nodes, good)
929 else:
929 else:
930 assert len(nodes) == 1 # only a single node can be tested next
930 assert len(nodes) == 1 # only a single node can be tested next
931 node = nodes[0]
931 node = nodes[0]
932 # compute the approximate number of remaining tests
932 # compute the approximate number of remaining tests
933 tests, size = 0, 2
933 tests, size = 0, 2
934 while size <= changesets:
934 while size <= changesets:
935 tests, size = tests + 1, size * 2
935 tests, size = tests + 1, size * 2
936 rev = repo.changelog.rev(node)
936 rev = repo.changelog.rev(node)
937 ui.write(_("Testing changeset %d:%s "
937 ui.write(_("Testing changeset %d:%s "
938 "(%d changesets remaining, ~%d tests)\n")
938 "(%d changesets remaining, ~%d tests)\n")
939 % (rev, short(node), changesets, tests))
939 % (rev, short(node), changesets, tests))
940 state['current'] = [node]
940 state['current'] = [node]
941 hbisect.save_state(repo, state)
941 hbisect.save_state(repo, state)
942 return mayupdate(repo, node)
942 return mayupdate(repo, node)
943
943
944 @command('bookmarks|bookmark',
944 @command('bookmarks|bookmark',
945 [('f', 'force', False, _('force')),
945 [('f', 'force', False, _('force')),
946 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
946 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
947 ('d', 'delete', False, _('delete a given bookmark')),
947 ('d', 'delete', False, _('delete a given bookmark')),
948 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
948 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
949 ('i', 'inactive', False, _('mark a bookmark inactive')),
949 ('i', 'inactive', False, _('mark a bookmark inactive')),
950 ] + formatteropts,
950 ] + formatteropts,
951 _('hg bookmarks [OPTIONS]... [NAME]...'))
951 _('hg bookmarks [OPTIONS]... [NAME]...'))
952 def bookmark(ui, repo, *names, **opts):
952 def bookmark(ui, repo, *names, **opts):
953 '''create a new bookmark or list existing bookmarks
953 '''create a new bookmark or list existing bookmarks
954
954
955 Bookmarks are labels on changesets to help track lines of development.
955 Bookmarks are labels on changesets to help track lines of development.
956 Bookmarks are unversioned and can be moved, renamed and deleted.
956 Bookmarks are unversioned and can be moved, renamed and deleted.
957 Deleting or moving a bookmark has no effect on the associated changesets.
957 Deleting or moving a bookmark has no effect on the associated changesets.
958
958
959 Creating or updating to a bookmark causes it to be marked as 'active'.
959 Creating or updating to a bookmark causes it to be marked as 'active'.
960 The active bookmark is indicated with a '*'.
960 The active bookmark is indicated with a '*'.
961 When a commit is made, the active bookmark will advance to the new commit.
961 When a commit is made, the active bookmark will advance to the new commit.
962 A plain :hg:`update` will also advance an active bookmark, if possible.
962 A plain :hg:`update` will also advance an active bookmark, if possible.
963 Updating away from a bookmark will cause it to be deactivated.
963 Updating away from a bookmark will cause it to be deactivated.
964
964
965 Bookmarks can be pushed and pulled between repositories (see
965 Bookmarks can be pushed and pulled between repositories (see
966 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
966 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
967 diverged, a new 'divergent bookmark' of the form 'name@path' will
967 diverged, a new 'divergent bookmark' of the form 'name@path' will
968 be created. Using :hg:`merge` will resolve the divergence.
968 be created. Using :hg:`merge` will resolve the divergence.
969
969
970 A bookmark named '@' has the special property that :hg:`clone` will
970 A bookmark named '@' has the special property that :hg:`clone` will
971 check it out by default if it exists.
971 check it out by default if it exists.
972
972
973 .. container:: verbose
973 .. container:: verbose
974
974
975 Examples:
975 Examples:
976
976
977 - create an active bookmark for a new line of development::
977 - create an active bookmark for a new line of development::
978
978
979 hg book new-feature
979 hg book new-feature
980
980
981 - create an inactive bookmark as a place marker::
981 - create an inactive bookmark as a place marker::
982
982
983 hg book -i reviewed
983 hg book -i reviewed
984
984
985 - create an inactive bookmark on another changeset::
985 - create an inactive bookmark on another changeset::
986
986
987 hg book -r .^ tested
987 hg book -r .^ tested
988
988
989 - rename bookmark turkey to dinner::
989 - rename bookmark turkey to dinner::
990
990
991 hg book -m turkey dinner
991 hg book -m turkey dinner
992
992
993 - move the '@' bookmark from another branch::
993 - move the '@' bookmark from another branch::
994
994
995 hg book -f @
995 hg book -f @
996 '''
996 '''
997 force = opts.get('force')
997 force = opts.get('force')
998 rev = opts.get('rev')
998 rev = opts.get('rev')
999 delete = opts.get('delete')
999 delete = opts.get('delete')
1000 rename = opts.get('rename')
1000 rename = opts.get('rename')
1001 inactive = opts.get('inactive')
1001 inactive = opts.get('inactive')
1002
1002
1003 def checkformat(mark):
1003 def checkformat(mark):
1004 mark = mark.strip()
1004 mark = mark.strip()
1005 if not mark:
1005 if not mark:
1006 raise error.Abort(_("bookmark names cannot consist entirely of "
1006 raise error.Abort(_("bookmark names cannot consist entirely of "
1007 "whitespace"))
1007 "whitespace"))
1008 scmutil.checknewlabel(repo, mark, 'bookmark')
1008 scmutil.checknewlabel(repo, mark, 'bookmark')
1009 return mark
1009 return mark
1010
1010
1011 def checkconflict(repo, mark, cur, force=False, target=None):
1011 def checkconflict(repo, mark, cur, force=False, target=None):
1012 if mark in marks and not force:
1012 if mark in marks and not force:
1013 if target:
1013 if target:
1014 if marks[mark] == target and target == cur:
1014 if marks[mark] == target and target == cur:
1015 # re-activating a bookmark
1015 # re-activating a bookmark
1016 return
1016 return
1017 anc = repo.changelog.ancestors([repo[target].rev()])
1017 anc = repo.changelog.ancestors([repo[target].rev()])
1018 bmctx = repo[marks[mark]]
1018 bmctx = repo[marks[mark]]
1019 divs = [repo[b].node() for b in marks
1019 divs = [repo[b].node() for b in marks
1020 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1020 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1021
1021
1022 # allow resolving a single divergent bookmark even if moving
1022 # allow resolving a single divergent bookmark even if moving
1023 # the bookmark across branches when a revision is specified
1023 # the bookmark across branches when a revision is specified
1024 # that contains a divergent bookmark
1024 # that contains a divergent bookmark
1025 if bmctx.rev() not in anc and target in divs:
1025 if bmctx.rev() not in anc and target in divs:
1026 bookmarks.deletedivergent(repo, [target], mark)
1026 bookmarks.deletedivergent(repo, [target], mark)
1027 return
1027 return
1028
1028
1029 deletefrom = [b for b in divs
1029 deletefrom = [b for b in divs
1030 if repo[b].rev() in anc or b == target]
1030 if repo[b].rev() in anc or b == target]
1031 bookmarks.deletedivergent(repo, deletefrom, mark)
1031 bookmarks.deletedivergent(repo, deletefrom, mark)
1032 if bookmarks.validdest(repo, bmctx, repo[target]):
1032 if bookmarks.validdest(repo, bmctx, repo[target]):
1033 ui.status(_("moving bookmark '%s' forward from %s\n") %
1033 ui.status(_("moving bookmark '%s' forward from %s\n") %
1034 (mark, short(bmctx.node())))
1034 (mark, short(bmctx.node())))
1035 return
1035 return
1036 raise error.Abort(_("bookmark '%s' already exists "
1036 raise error.Abort(_("bookmark '%s' already exists "
1037 "(use -f to force)") % mark)
1037 "(use -f to force)") % mark)
1038 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1038 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1039 and not force):
1039 and not force):
1040 raise error.Abort(
1040 raise error.Abort(
1041 _("a bookmark cannot have the name of an existing branch"))
1041 _("a bookmark cannot have the name of an existing branch"))
1042
1042
1043 if delete and rename:
1043 if delete and rename:
1044 raise error.Abort(_("--delete and --rename are incompatible"))
1044 raise error.Abort(_("--delete and --rename are incompatible"))
1045 if delete and rev:
1045 if delete and rev:
1046 raise error.Abort(_("--rev is incompatible with --delete"))
1046 raise error.Abort(_("--rev is incompatible with --delete"))
1047 if rename and rev:
1047 if rename and rev:
1048 raise error.Abort(_("--rev is incompatible with --rename"))
1048 raise error.Abort(_("--rev is incompatible with --rename"))
1049 if not names and (delete or rev):
1049 if not names and (delete or rev):
1050 raise error.Abort(_("bookmark name required"))
1050 raise error.Abort(_("bookmark name required"))
1051
1051
1052 if delete or rename or names or inactive:
1052 if delete or rename or names or inactive:
1053 wlock = lock = tr = None
1053 wlock = lock = tr = None
1054 try:
1054 try:
1055 wlock = repo.wlock()
1055 wlock = repo.wlock()
1056 lock = repo.lock()
1056 lock = repo.lock()
1057 cur = repo.changectx('.').node()
1057 cur = repo.changectx('.').node()
1058 marks = repo._bookmarks
1058 marks = repo._bookmarks
1059 if delete:
1059 if delete:
1060 tr = repo.transaction('bookmark')
1060 tr = repo.transaction('bookmark')
1061 for mark in names:
1061 for mark in names:
1062 if mark not in marks:
1062 if mark not in marks:
1063 raise error.Abort(_("bookmark '%s' does not exist") %
1063 raise error.Abort(_("bookmark '%s' does not exist") %
1064 mark)
1064 mark)
1065 if mark == repo._activebookmark:
1065 if mark == repo._activebookmark:
1066 bookmarks.deactivate(repo)
1066 bookmarks.deactivate(repo)
1067 del marks[mark]
1067 del marks[mark]
1068
1068
1069 elif rename:
1069 elif rename:
1070 tr = repo.transaction('bookmark')
1070 tr = repo.transaction('bookmark')
1071 if not names:
1071 if not names:
1072 raise error.Abort(_("new bookmark name required"))
1072 raise error.Abort(_("new bookmark name required"))
1073 elif len(names) > 1:
1073 elif len(names) > 1:
1074 raise error.Abort(_("only one new bookmark name allowed"))
1074 raise error.Abort(_("only one new bookmark name allowed"))
1075 mark = checkformat(names[0])
1075 mark = checkformat(names[0])
1076 if rename not in marks:
1076 if rename not in marks:
1077 raise error.Abort(_("bookmark '%s' does not exist")
1077 raise error.Abort(_("bookmark '%s' does not exist")
1078 % rename)
1078 % rename)
1079 checkconflict(repo, mark, cur, force)
1079 checkconflict(repo, mark, cur, force)
1080 marks[mark] = marks[rename]
1080 marks[mark] = marks[rename]
1081 if repo._activebookmark == rename and not inactive:
1081 if repo._activebookmark == rename and not inactive:
1082 bookmarks.activate(repo, mark)
1082 bookmarks.activate(repo, mark)
1083 del marks[rename]
1083 del marks[rename]
1084 elif names:
1084 elif names:
1085 tr = repo.transaction('bookmark')
1085 tr = repo.transaction('bookmark')
1086 newact = None
1086 newact = None
1087 for mark in names:
1087 for mark in names:
1088 mark = checkformat(mark)
1088 mark = checkformat(mark)
1089 if newact is None:
1089 if newact is None:
1090 newact = mark
1090 newact = mark
1091 if inactive and mark == repo._activebookmark:
1091 if inactive and mark == repo._activebookmark:
1092 bookmarks.deactivate(repo)
1092 bookmarks.deactivate(repo)
1093 return
1093 return
1094 tgt = cur
1094 tgt = cur
1095 if rev:
1095 if rev:
1096 tgt = scmutil.revsingle(repo, rev).node()
1096 tgt = scmutil.revsingle(repo, rev).node()
1097 checkconflict(repo, mark, cur, force, tgt)
1097 checkconflict(repo, mark, cur, force, tgt)
1098 marks[mark] = tgt
1098 marks[mark] = tgt
1099 if not inactive and cur == marks[newact] and not rev:
1099 if not inactive and cur == marks[newact] and not rev:
1100 bookmarks.activate(repo, newact)
1100 bookmarks.activate(repo, newact)
1101 elif cur != tgt and newact == repo._activebookmark:
1101 elif cur != tgt and newact == repo._activebookmark:
1102 bookmarks.deactivate(repo)
1102 bookmarks.deactivate(repo)
1103 elif inactive:
1103 elif inactive:
1104 if len(marks) == 0:
1104 if len(marks) == 0:
1105 ui.status(_("no bookmarks set\n"))
1105 ui.status(_("no bookmarks set\n"))
1106 elif not repo._activebookmark:
1106 elif not repo._activebookmark:
1107 ui.status(_("no active bookmark\n"))
1107 ui.status(_("no active bookmark\n"))
1108 else:
1108 else:
1109 bookmarks.deactivate(repo)
1109 bookmarks.deactivate(repo)
1110 if tr is not None:
1110 if tr is not None:
1111 marks.recordchange(tr)
1111 marks.recordchange(tr)
1112 tr.close()
1112 tr.close()
1113 finally:
1113 finally:
1114 lockmod.release(tr, lock, wlock)
1114 lockmod.release(tr, lock, wlock)
1115 else: # show bookmarks
1115 else: # show bookmarks
1116 fm = ui.formatter('bookmarks', opts)
1116 fm = ui.formatter('bookmarks', opts)
1117 hexfn = fm.hexfunc
1117 hexfn = fm.hexfunc
1118 marks = repo._bookmarks
1118 marks = repo._bookmarks
1119 if len(marks) == 0 and fm.isplain():
1119 if len(marks) == 0 and fm.isplain():
1120 ui.status(_("no bookmarks set\n"))
1120 ui.status(_("no bookmarks set\n"))
1121 for bmark, n in sorted(marks.iteritems()):
1121 for bmark, n in sorted(marks.iteritems()):
1122 active = repo._activebookmark
1122 active = repo._activebookmark
1123 if bmark == active:
1123 if bmark == active:
1124 prefix, label = '*', activebookmarklabel
1124 prefix, label = '*', activebookmarklabel
1125 else:
1125 else:
1126 prefix, label = ' ', ''
1126 prefix, label = ' ', ''
1127
1127
1128 fm.startitem()
1128 fm.startitem()
1129 if not ui.quiet:
1129 if not ui.quiet:
1130 fm.plain(' %s ' % prefix, label=label)
1130 fm.plain(' %s ' % prefix, label=label)
1131 fm.write('bookmark', '%s', bmark, label=label)
1131 fm.write('bookmark', '%s', bmark, label=label)
1132 pad = " " * (25 - encoding.colwidth(bmark))
1132 pad = " " * (25 - encoding.colwidth(bmark))
1133 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1133 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1134 repo.changelog.rev(n), hexfn(n), label=label)
1134 repo.changelog.rev(n), hexfn(n), label=label)
1135 fm.data(active=(bmark == active))
1135 fm.data(active=(bmark == active))
1136 fm.plain('\n')
1136 fm.plain('\n')
1137 fm.end()
1137 fm.end()
1138
1138
1139 @command('branch',
1139 @command('branch',
1140 [('f', 'force', None,
1140 [('f', 'force', None,
1141 _('set branch name even if it shadows an existing branch')),
1141 _('set branch name even if it shadows an existing branch')),
1142 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1142 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1143 _('[-fC] [NAME]'))
1143 _('[-fC] [NAME]'))
1144 def branch(ui, repo, label=None, **opts):
1144 def branch(ui, repo, label=None, **opts):
1145 """set or show the current branch name
1145 """set or show the current branch name
1146
1146
1147 .. note::
1147 .. note::
1148
1148
1149 Branch names are permanent and global. Use :hg:`bookmark` to create a
1149 Branch names are permanent and global. Use :hg:`bookmark` to create a
1150 light-weight bookmark instead. See :hg:`help glossary` for more
1150 light-weight bookmark instead. See :hg:`help glossary` for more
1151 information about named branches and bookmarks.
1151 information about named branches and bookmarks.
1152
1152
1153 With no argument, show the current branch name. With one argument,
1153 With no argument, show the current branch name. With one argument,
1154 set the working directory branch name (the branch will not exist
1154 set the working directory branch name (the branch will not exist
1155 in the repository until the next commit). Standard practice
1155 in the repository until the next commit). Standard practice
1156 recommends that primary development take place on the 'default'
1156 recommends that primary development take place on the 'default'
1157 branch.
1157 branch.
1158
1158
1159 Unless -f/--force is specified, branch will not let you set a
1159 Unless -f/--force is specified, branch will not let you set a
1160 branch name that already exists.
1160 branch name that already exists.
1161
1161
1162 Use -C/--clean to reset the working directory branch to that of
1162 Use -C/--clean to reset the working directory branch to that of
1163 the parent of the working directory, negating a previous branch
1163 the parent of the working directory, negating a previous branch
1164 change.
1164 change.
1165
1165
1166 Use the command :hg:`update` to switch to an existing branch. Use
1166 Use the command :hg:`update` to switch to an existing branch. Use
1167 :hg:`commit --close-branch` to mark this branch head as closed.
1167 :hg:`commit --close-branch` to mark this branch head as closed.
1168 When all heads of a branch are closed, the branch will be
1168 When all heads of a branch are closed, the branch will be
1169 considered closed.
1169 considered closed.
1170
1170
1171 Returns 0 on success.
1171 Returns 0 on success.
1172 """
1172 """
1173 if label:
1173 if label:
1174 label = label.strip()
1174 label = label.strip()
1175
1175
1176 if not opts.get('clean') and not label:
1176 if not opts.get('clean') and not label:
1177 ui.write("%s\n" % repo.dirstate.branch())
1177 ui.write("%s\n" % repo.dirstate.branch())
1178 return
1178 return
1179
1179
1180 with repo.wlock():
1180 with repo.wlock():
1181 if opts.get('clean'):
1181 if opts.get('clean'):
1182 label = repo[None].p1().branch()
1182 label = repo[None].p1().branch()
1183 repo.dirstate.setbranch(label)
1183 repo.dirstate.setbranch(label)
1184 ui.status(_('reset working directory to branch %s\n') % label)
1184 ui.status(_('reset working directory to branch %s\n') % label)
1185 elif label:
1185 elif label:
1186 if not opts.get('force') and label in repo.branchmap():
1186 if not opts.get('force') and label in repo.branchmap():
1187 if label not in [p.branch() for p in repo[None].parents()]:
1187 if label not in [p.branch() for p in repo[None].parents()]:
1188 raise error.Abort(_('a branch of the same name already'
1188 raise error.Abort(_('a branch of the same name already'
1189 ' exists'),
1189 ' exists'),
1190 # i18n: "it" refers to an existing branch
1190 # i18n: "it" refers to an existing branch
1191 hint=_("use 'hg update' to switch to it"))
1191 hint=_("use 'hg update' to switch to it"))
1192 scmutil.checknewlabel(repo, label, 'branch')
1192 scmutil.checknewlabel(repo, label, 'branch')
1193 repo.dirstate.setbranch(label)
1193 repo.dirstate.setbranch(label)
1194 ui.status(_('marked working directory as branch %s\n') % label)
1194 ui.status(_('marked working directory as branch %s\n') % label)
1195
1195
1196 # find any open named branches aside from default
1196 # find any open named branches aside from default
1197 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1197 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1198 if n != "default" and not c]
1198 if n != "default" and not c]
1199 if not others:
1199 if not others:
1200 ui.status(_('(branches are permanent and global, '
1200 ui.status(_('(branches are permanent and global, '
1201 'did you want a bookmark?)\n'))
1201 'did you want a bookmark?)\n'))
1202
1202
1203 @command('branches',
1203 @command('branches',
1204 [('a', 'active', False,
1204 [('a', 'active', False,
1205 _('show only branches that have unmerged heads (DEPRECATED)')),
1205 _('show only branches that have unmerged heads (DEPRECATED)')),
1206 ('c', 'closed', False, _('show normal and closed branches')),
1206 ('c', 'closed', False, _('show normal and closed branches')),
1207 ] + formatteropts,
1207 ] + formatteropts,
1208 _('[-c]'))
1208 _('[-c]'))
1209 def branches(ui, repo, active=False, closed=False, **opts):
1209 def branches(ui, repo, active=False, closed=False, **opts):
1210 """list repository named branches
1210 """list repository named branches
1211
1211
1212 List the repository's named branches, indicating which ones are
1212 List the repository's named branches, indicating which ones are
1213 inactive. If -c/--closed is specified, also list branches which have
1213 inactive. If -c/--closed is specified, also list branches which have
1214 been marked closed (see :hg:`commit --close-branch`).
1214 been marked closed (see :hg:`commit --close-branch`).
1215
1215
1216 Use the command :hg:`update` to switch to an existing branch.
1216 Use the command :hg:`update` to switch to an existing branch.
1217
1217
1218 Returns 0.
1218 Returns 0.
1219 """
1219 """
1220
1220
1221 fm = ui.formatter('branches', opts)
1221 fm = ui.formatter('branches', opts)
1222 hexfunc = fm.hexfunc
1222 hexfunc = fm.hexfunc
1223
1223
1224 allheads = set(repo.heads())
1224 allheads = set(repo.heads())
1225 branches = []
1225 branches = []
1226 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1226 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1227 isactive = not isclosed and bool(set(heads) & allheads)
1227 isactive = not isclosed and bool(set(heads) & allheads)
1228 branches.append((tag, repo[tip], isactive, not isclosed))
1228 branches.append((tag, repo[tip], isactive, not isclosed))
1229 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1229 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1230 reverse=True)
1230 reverse=True)
1231
1231
1232 for tag, ctx, isactive, isopen in branches:
1232 for tag, ctx, isactive, isopen in branches:
1233 if active and not isactive:
1233 if active and not isactive:
1234 continue
1234 continue
1235 if isactive:
1235 if isactive:
1236 label = 'branches.active'
1236 label = 'branches.active'
1237 notice = ''
1237 notice = ''
1238 elif not isopen:
1238 elif not isopen:
1239 if not closed:
1239 if not closed:
1240 continue
1240 continue
1241 label = 'branches.closed'
1241 label = 'branches.closed'
1242 notice = _(' (closed)')
1242 notice = _(' (closed)')
1243 else:
1243 else:
1244 label = 'branches.inactive'
1244 label = 'branches.inactive'
1245 notice = _(' (inactive)')
1245 notice = _(' (inactive)')
1246 current = (tag == repo.dirstate.branch())
1246 current = (tag == repo.dirstate.branch())
1247 if current:
1247 if current:
1248 label = 'branches.current'
1248 label = 'branches.current'
1249
1249
1250 fm.startitem()
1250 fm.startitem()
1251 fm.write('branch', '%s', tag, label=label)
1251 fm.write('branch', '%s', tag, label=label)
1252 rev = ctx.rev()
1252 rev = ctx.rev()
1253 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1253 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1254 fmt = ' ' * padsize + ' %d:%s'
1254 fmt = ' ' * padsize + ' %d:%s'
1255 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1255 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1256 label='log.changeset changeset.%s' % ctx.phasestr())
1256 label='log.changeset changeset.%s' % ctx.phasestr())
1257 fm.data(active=isactive, closed=not isopen, current=current)
1257 fm.data(active=isactive, closed=not isopen, current=current)
1258 if not ui.quiet:
1258 if not ui.quiet:
1259 fm.plain(notice)
1259 fm.plain(notice)
1260 fm.plain('\n')
1260 fm.plain('\n')
1261 fm.end()
1261 fm.end()
1262
1262
1263 @command('bundle',
1263 @command('bundle',
1264 [('f', 'force', None, _('run even when the destination is unrelated')),
1264 [('f', 'force', None, _('run even when the destination is unrelated')),
1265 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1265 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1266 _('REV')),
1266 _('REV')),
1267 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1267 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1268 _('BRANCH')),
1268 _('BRANCH')),
1269 ('', 'base', [],
1269 ('', 'base', [],
1270 _('a base changeset assumed to be available at the destination'),
1270 _('a base changeset assumed to be available at the destination'),
1271 _('REV')),
1271 _('REV')),
1272 ('a', 'all', None, _('bundle all changesets in the repository')),
1272 ('a', 'all', None, _('bundle all changesets in the repository')),
1273 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1273 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1274 ] + remoteopts,
1274 ] + remoteopts,
1275 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1275 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1276 def bundle(ui, repo, fname, dest=None, **opts):
1276 def bundle(ui, repo, fname, dest=None, **opts):
1277 """create a changegroup file
1277 """create a changegroup file
1278
1278
1279 Generate a changegroup file collecting changesets to be added
1279 Generate a changegroup file collecting changesets to be added
1280 to a repository.
1280 to a repository.
1281
1281
1282 To create a bundle containing all changesets, use -a/--all
1282 To create a bundle containing all changesets, use -a/--all
1283 (or --base null). Otherwise, hg assumes the destination will have
1283 (or --base null). Otherwise, hg assumes the destination will have
1284 all the nodes you specify with --base parameters. Otherwise, hg
1284 all the nodes you specify with --base parameters. Otherwise, hg
1285 will assume the repository has all the nodes in destination, or
1285 will assume the repository has all the nodes in destination, or
1286 default-push/default if no destination is specified.
1286 default-push/default if no destination is specified.
1287
1287
1288 You can change bundle format with the -t/--type option. You can
1288 You can change bundle format with the -t/--type option. You can
1289 specify a compression, a bundle version or both using a dash
1289 specify a compression, a bundle version or both using a dash
1290 (comp-version). The available compression methods are: none, bzip2,
1290 (comp-version). The available compression methods are: none, bzip2,
1291 and gzip (by default, bundles are compressed using bzip2). The
1291 and gzip (by default, bundles are compressed using bzip2). The
1292 available formats are: v1, v2 (default to most suitable).
1292 available formats are: v1, v2 (default to most suitable).
1293
1293
1294 The bundle file can then be transferred using conventional means
1294 The bundle file can then be transferred using conventional means
1295 and applied to another repository with the unbundle or pull
1295 and applied to another repository with the unbundle or pull
1296 command. This is useful when direct push and pull are not
1296 command. This is useful when direct push and pull are not
1297 available or when exporting an entire repository is undesirable.
1297 available or when exporting an entire repository is undesirable.
1298
1298
1299 Applying bundles preserves all changeset contents including
1299 Applying bundles preserves all changeset contents including
1300 permissions, copy/rename information, and revision history.
1300 permissions, copy/rename information, and revision history.
1301
1301
1302 Returns 0 on success, 1 if no changes found.
1302 Returns 0 on success, 1 if no changes found.
1303 """
1303 """
1304 revs = None
1304 revs = None
1305 if 'rev' in opts:
1305 if 'rev' in opts:
1306 revstrings = opts['rev']
1306 revstrings = opts['rev']
1307 revs = scmutil.revrange(repo, revstrings)
1307 revs = scmutil.revrange(repo, revstrings)
1308 if revstrings and not revs:
1308 if revstrings and not revs:
1309 raise error.Abort(_('no commits to bundle'))
1309 raise error.Abort(_('no commits to bundle'))
1310
1310
1311 bundletype = opts.get('type', 'bzip2').lower()
1311 bundletype = opts.get('type', 'bzip2').lower()
1312 try:
1312 try:
1313 bcompression, cgversion, params = exchange.parsebundlespec(
1313 bcompression, cgversion, params = exchange.parsebundlespec(
1314 repo, bundletype, strict=False)
1314 repo, bundletype, strict=False)
1315 except error.UnsupportedBundleSpecification as e:
1315 except error.UnsupportedBundleSpecification as e:
1316 raise error.Abort(str(e),
1316 raise error.Abort(str(e),
1317 hint=_("see 'hg help bundle' for supported "
1317 hint=_("see 'hg help bundle' for supported "
1318 "values for --type"))
1318 "values for --type"))
1319
1319
1320 # Packed bundles are a pseudo bundle format for now.
1320 # Packed bundles are a pseudo bundle format for now.
1321 if cgversion == 's1':
1321 if cgversion == 's1':
1322 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1322 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1323 hint=_("use 'hg debugcreatestreamclonebundle'"))
1323 hint=_("use 'hg debugcreatestreamclonebundle'"))
1324
1324
1325 if opts.get('all'):
1325 if opts.get('all'):
1326 if dest:
1326 if dest:
1327 raise error.Abort(_("--all is incompatible with specifying "
1327 raise error.Abort(_("--all is incompatible with specifying "
1328 "a destination"))
1328 "a destination"))
1329 if opts.get('base'):
1329 if opts.get('base'):
1330 ui.warn(_("ignoring --base because --all was specified\n"))
1330 ui.warn(_("ignoring --base because --all was specified\n"))
1331 base = ['null']
1331 base = ['null']
1332 else:
1332 else:
1333 base = scmutil.revrange(repo, opts.get('base'))
1333 base = scmutil.revrange(repo, opts.get('base'))
1334 # TODO: get desired bundlecaps from command line.
1334 # TODO: get desired bundlecaps from command line.
1335 bundlecaps = None
1335 bundlecaps = None
1336 if cgversion not in changegroup.supportedoutgoingversions(repo):
1336 if cgversion not in changegroup.supportedoutgoingversions(repo):
1337 raise error.Abort(_("repository does not support bundle version %s") %
1337 raise error.Abort(_("repository does not support bundle version %s") %
1338 cgversion)
1338 cgversion)
1339
1339
1340 if base:
1340 if base:
1341 if dest:
1341 if dest:
1342 raise error.Abort(_("--base is incompatible with specifying "
1342 raise error.Abort(_("--base is incompatible with specifying "
1343 "a destination"))
1343 "a destination"))
1344 common = [repo.lookup(rev) for rev in base]
1344 common = [repo.lookup(rev) for rev in base]
1345 heads = revs and map(repo.lookup, revs) or None
1345 heads = revs and map(repo.lookup, revs) or None
1346 outgoing = discovery.outgoing(repo, common, heads)
1346 outgoing = discovery.outgoing(repo, common, heads)
1347 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1347 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1348 bundlecaps=bundlecaps,
1348 bundlecaps=bundlecaps,
1349 version=cgversion)
1349 version=cgversion)
1350 outgoing = None
1350 outgoing = None
1351 else:
1351 else:
1352 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1352 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1353 dest, branches = hg.parseurl(dest, opts.get('branch'))
1353 dest, branches = hg.parseurl(dest, opts.get('branch'))
1354 other = hg.peer(repo, opts, dest)
1354 other = hg.peer(repo, opts, dest)
1355 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1355 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1356 heads = revs and map(repo.lookup, revs) or revs
1356 heads = revs and map(repo.lookup, revs) or revs
1357 outgoing = discovery.findcommonoutgoing(repo, other,
1357 outgoing = discovery.findcommonoutgoing(repo, other,
1358 onlyheads=heads,
1358 onlyheads=heads,
1359 force=opts.get('force'),
1359 force=opts.get('force'),
1360 portable=True)
1360 portable=True)
1361 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1361 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1362 bundlecaps, version=cgversion)
1362 bundlecaps, version=cgversion)
1363 if not cg:
1363 if not cg:
1364 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1364 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1365 return 1
1365 return 1
1366
1366
1367 if cgversion == '01': #bundle1
1367 if cgversion == '01': #bundle1
1368 if bcompression is None:
1368 if bcompression is None:
1369 bcompression = 'UN'
1369 bcompression = 'UN'
1370 bversion = 'HG10' + bcompression
1370 bversion = 'HG10' + bcompression
1371 bcompression = None
1371 bcompression = None
1372 else:
1372 else:
1373 assert cgversion == '02'
1373 assert cgversion == '02'
1374 bversion = 'HG20'
1374 bversion = 'HG20'
1375
1375
1376 # TODO compression options should be derived from bundlespec parsing.
1376 # TODO compression options should be derived from bundlespec parsing.
1377 # This is a temporary hack to allow adjusting bundle compression
1377 # This is a temporary hack to allow adjusting bundle compression
1378 # level without a) formalizing the bundlespec changes to declare it
1378 # level without a) formalizing the bundlespec changes to declare it
1379 # b) introducing a command flag.
1379 # b) introducing a command flag.
1380 compopts = {}
1380 compopts = {}
1381 complevel = ui.configint('experimental', 'bundlecomplevel')
1381 complevel = ui.configint('experimental', 'bundlecomplevel')
1382 if complevel is not None:
1382 if complevel is not None:
1383 compopts['level'] = complevel
1383 compopts['level'] = complevel
1384
1384
1385 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1385 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1386 compopts=compopts)
1386 compopts=compopts)
1387
1387
1388 @command('cat',
1388 @command('cat',
1389 [('o', 'output', '',
1389 [('o', 'output', '',
1390 _('print output to file with formatted name'), _('FORMAT')),
1390 _('print output to file with formatted name'), _('FORMAT')),
1391 ('r', 'rev', '', _('print the given revision'), _('REV')),
1391 ('r', 'rev', '', _('print the given revision'), _('REV')),
1392 ('', 'decode', None, _('apply any matching decode filter')),
1392 ('', 'decode', None, _('apply any matching decode filter')),
1393 ] + walkopts,
1393 ] + walkopts,
1394 _('[OPTION]... FILE...'),
1394 _('[OPTION]... FILE...'),
1395 inferrepo=True)
1395 inferrepo=True)
1396 def cat(ui, repo, file1, *pats, **opts):
1396 def cat(ui, repo, file1, *pats, **opts):
1397 """output the current or given revision of files
1397 """output the current or given revision of files
1398
1398
1399 Print the specified files as they were at the given revision. If
1399 Print the specified files as they were at the given revision. If
1400 no revision is given, the parent of the working directory is used.
1400 no revision is given, the parent of the working directory is used.
1401
1401
1402 Output may be to a file, in which case the name of the file is
1402 Output may be to a file, in which case the name of the file is
1403 given using a format string. The formatting rules as follows:
1403 given using a format string. The formatting rules as follows:
1404
1404
1405 :``%%``: literal "%" character
1405 :``%%``: literal "%" character
1406 :``%s``: basename of file being printed
1406 :``%s``: basename of file being printed
1407 :``%d``: dirname of file being printed, or '.' if in repository root
1407 :``%d``: dirname of file being printed, or '.' if in repository root
1408 :``%p``: root-relative path name of file being printed
1408 :``%p``: root-relative path name of file being printed
1409 :``%H``: changeset hash (40 hexadecimal digits)
1409 :``%H``: changeset hash (40 hexadecimal digits)
1410 :``%R``: changeset revision number
1410 :``%R``: changeset revision number
1411 :``%h``: short-form changeset hash (12 hexadecimal digits)
1411 :``%h``: short-form changeset hash (12 hexadecimal digits)
1412 :``%r``: zero-padded changeset revision number
1412 :``%r``: zero-padded changeset revision number
1413 :``%b``: basename of the exporting repository
1413 :``%b``: basename of the exporting repository
1414
1414
1415 Returns 0 on success.
1415 Returns 0 on success.
1416 """
1416 """
1417 ctx = scmutil.revsingle(repo, opts.get('rev'))
1417 ctx = scmutil.revsingle(repo, opts.get('rev'))
1418 m = scmutil.match(ctx, (file1,) + pats, opts)
1418 m = scmutil.match(ctx, (file1,) + pats, opts)
1419
1419
1420 ui.pager('cat')
1420 ui.pager('cat')
1421 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1421 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1422
1422
1423 @command('^clone',
1423 @command('^clone',
1424 [('U', 'noupdate', None, _('the clone will include an empty working '
1424 [('U', 'noupdate', None, _('the clone will include an empty working '
1425 'directory (only a repository)')),
1425 'directory (only a repository)')),
1426 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1426 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1427 _('REV')),
1427 _('REV')),
1428 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1428 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1429 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1429 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1430 ('', 'pull', None, _('use pull protocol to copy metadata')),
1430 ('', 'pull', None, _('use pull protocol to copy metadata')),
1431 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1431 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1432 ] + remoteopts,
1432 ] + remoteopts,
1433 _('[OPTION]... SOURCE [DEST]'),
1433 _('[OPTION]... SOURCE [DEST]'),
1434 norepo=True)
1434 norepo=True)
1435 def clone(ui, source, dest=None, **opts):
1435 def clone(ui, source, dest=None, **opts):
1436 """make a copy of an existing repository
1436 """make a copy of an existing repository
1437
1437
1438 Create a copy of an existing repository in a new directory.
1438 Create a copy of an existing repository in a new directory.
1439
1439
1440 If no destination directory name is specified, it defaults to the
1440 If no destination directory name is specified, it defaults to the
1441 basename of the source.
1441 basename of the source.
1442
1442
1443 The location of the source is added to the new repository's
1443 The location of the source is added to the new repository's
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1445
1445
1446 Only local paths and ``ssh://`` URLs are supported as
1446 Only local paths and ``ssh://`` URLs are supported as
1447 destinations. For ``ssh://`` destinations, no working directory or
1447 destinations. For ``ssh://`` destinations, no working directory or
1448 ``.hg/hgrc`` will be created on the remote side.
1448 ``.hg/hgrc`` will be created on the remote side.
1449
1449
1450 If the source repository has a bookmark called '@' set, that
1450 If the source repository has a bookmark called '@' set, that
1451 revision will be checked out in the new repository by default.
1451 revision will be checked out in the new repository by default.
1452
1452
1453 To check out a particular version, use -u/--update, or
1453 To check out a particular version, use -u/--update, or
1454 -U/--noupdate to create a clone with no working directory.
1454 -U/--noupdate to create a clone with no working directory.
1455
1455
1456 To pull only a subset of changesets, specify one or more revisions
1456 To pull only a subset of changesets, specify one or more revisions
1457 identifiers with -r/--rev or branches with -b/--branch. The
1457 identifiers with -r/--rev or branches with -b/--branch. The
1458 resulting clone will contain only the specified changesets and
1458 resulting clone will contain only the specified changesets and
1459 their ancestors. These options (or 'clone src#rev dest') imply
1459 their ancestors. These options (or 'clone src#rev dest') imply
1460 --pull, even for local source repositories.
1460 --pull, even for local source repositories.
1461
1461
1462 .. note::
1462 .. note::
1463
1463
1464 Specifying a tag will include the tagged changeset but not the
1464 Specifying a tag will include the tagged changeset but not the
1465 changeset containing the tag.
1465 changeset containing the tag.
1466
1466
1467 .. container:: verbose
1467 .. container:: verbose
1468
1468
1469 For efficiency, hardlinks are used for cloning whenever the
1469 For efficiency, hardlinks are used for cloning whenever the
1470 source and destination are on the same filesystem (note this
1470 source and destination are on the same filesystem (note this
1471 applies only to the repository data, not to the working
1471 applies only to the repository data, not to the working
1472 directory). Some filesystems, such as AFS, implement hardlinking
1472 directory). Some filesystems, such as AFS, implement hardlinking
1473 incorrectly, but do not report errors. In these cases, use the
1473 incorrectly, but do not report errors. In these cases, use the
1474 --pull option to avoid hardlinking.
1474 --pull option to avoid hardlinking.
1475
1475
1476 In some cases, you can clone repositories and the working
1476 In some cases, you can clone repositories and the working
1477 directory using full hardlinks with ::
1477 directory using full hardlinks with ::
1478
1478
1479 $ cp -al REPO REPOCLONE
1479 $ cp -al REPO REPOCLONE
1480
1480
1481 This is the fastest way to clone, but it is not always safe. The
1481 This is the fastest way to clone, but it is not always safe. The
1482 operation is not atomic (making sure REPO is not modified during
1482 operation is not atomic (making sure REPO is not modified during
1483 the operation is up to you) and you have to make sure your
1483 the operation is up to you) and you have to make sure your
1484 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1484 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1485 so). Also, this is not compatible with certain extensions that
1485 so). Also, this is not compatible with certain extensions that
1486 place their metadata under the .hg directory, such as mq.
1486 place their metadata under the .hg directory, such as mq.
1487
1487
1488 Mercurial will update the working directory to the first applicable
1488 Mercurial will update the working directory to the first applicable
1489 revision from this list:
1489 revision from this list:
1490
1490
1491 a) null if -U or the source repository has no changesets
1491 a) null if -U or the source repository has no changesets
1492 b) if -u . and the source repository is local, the first parent of
1492 b) if -u . and the source repository is local, the first parent of
1493 the source repository's working directory
1493 the source repository's working directory
1494 c) the changeset specified with -u (if a branch name, this means the
1494 c) the changeset specified with -u (if a branch name, this means the
1495 latest head of that branch)
1495 latest head of that branch)
1496 d) the changeset specified with -r
1496 d) the changeset specified with -r
1497 e) the tipmost head specified with -b
1497 e) the tipmost head specified with -b
1498 f) the tipmost head specified with the url#branch source syntax
1498 f) the tipmost head specified with the url#branch source syntax
1499 g) the revision marked with the '@' bookmark, if present
1499 g) the revision marked with the '@' bookmark, if present
1500 h) the tipmost head of the default branch
1500 h) the tipmost head of the default branch
1501 i) tip
1501 i) tip
1502
1502
1503 When cloning from servers that support it, Mercurial may fetch
1503 When cloning from servers that support it, Mercurial may fetch
1504 pre-generated data from a server-advertised URL. When this is done,
1504 pre-generated data from a server-advertised URL. When this is done,
1505 hooks operating on incoming changesets and changegroups may fire twice,
1505 hooks operating on incoming changesets and changegroups may fire twice,
1506 once for the bundle fetched from the URL and another for any additional
1506 once for the bundle fetched from the URL and another for any additional
1507 data not fetched from this URL. In addition, if an error occurs, the
1507 data not fetched from this URL. In addition, if an error occurs, the
1508 repository may be rolled back to a partial clone. This behavior may
1508 repository may be rolled back to a partial clone. This behavior may
1509 change in future releases. See :hg:`help -e clonebundles` for more.
1509 change in future releases. See :hg:`help -e clonebundles` for more.
1510
1510
1511 Examples:
1511 Examples:
1512
1512
1513 - clone a remote repository to a new directory named hg/::
1513 - clone a remote repository to a new directory named hg/::
1514
1514
1515 hg clone https://www.mercurial-scm.org/repo/hg/
1515 hg clone https://www.mercurial-scm.org/repo/hg/
1516
1516
1517 - create a lightweight local clone::
1517 - create a lightweight local clone::
1518
1518
1519 hg clone project/ project-feature/
1519 hg clone project/ project-feature/
1520
1520
1521 - clone from an absolute path on an ssh server (note double-slash)::
1521 - clone from an absolute path on an ssh server (note double-slash)::
1522
1522
1523 hg clone ssh://user@server//home/projects/alpha/
1523 hg clone ssh://user@server//home/projects/alpha/
1524
1524
1525 - do a high-speed clone over a LAN while checking out a
1525 - do a high-speed clone over a LAN while checking out a
1526 specified version::
1526 specified version::
1527
1527
1528 hg clone --uncompressed http://server/repo -u 1.5
1528 hg clone --uncompressed http://server/repo -u 1.5
1529
1529
1530 - create a repository without changesets after a particular revision::
1530 - create a repository without changesets after a particular revision::
1531
1531
1532 hg clone -r 04e544 experimental/ good/
1532 hg clone -r 04e544 experimental/ good/
1533
1533
1534 - clone (and track) a particular named branch::
1534 - clone (and track) a particular named branch::
1535
1535
1536 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1536 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1537
1537
1538 See :hg:`help urls` for details on specifying URLs.
1538 See :hg:`help urls` for details on specifying URLs.
1539
1539
1540 Returns 0 on success.
1540 Returns 0 on success.
1541 """
1541 """
1542 if opts.get('noupdate') and opts.get('updaterev'):
1542 if opts.get('noupdate') and opts.get('updaterev'):
1543 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1543 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1544
1544
1545 r = hg.clone(ui, opts, source, dest,
1545 r = hg.clone(ui, opts, source, dest,
1546 pull=opts.get('pull'),
1546 pull=opts.get('pull'),
1547 stream=opts.get('uncompressed'),
1547 stream=opts.get('uncompressed'),
1548 rev=opts.get('rev'),
1548 rev=opts.get('rev'),
1549 update=opts.get('updaterev') or not opts.get('noupdate'),
1549 update=opts.get('updaterev') or not opts.get('noupdate'),
1550 branch=opts.get('branch'),
1550 branch=opts.get('branch'),
1551 shareopts=opts.get('shareopts'))
1551 shareopts=opts.get('shareopts'))
1552
1552
1553 return r is None
1553 return r is None
1554
1554
1555 @command('^commit|ci',
1555 @command('^commit|ci',
1556 [('A', 'addremove', None,
1556 [('A', 'addremove', None,
1557 _('mark new/missing files as added/removed before committing')),
1557 _('mark new/missing files as added/removed before committing')),
1558 ('', 'close-branch', None,
1558 ('', 'close-branch', None,
1559 _('mark a branch head as closed')),
1559 _('mark a branch head as closed')),
1560 ('', 'amend', None, _('amend the parent of the working directory')),
1560 ('', 'amend', None, _('amend the parent of the working directory')),
1561 ('s', 'secret', None, _('use the secret phase for committing')),
1561 ('s', 'secret', None, _('use the secret phase for committing')),
1562 ('e', 'edit', None, _('invoke editor on commit messages')),
1562 ('e', 'edit', None, _('invoke editor on commit messages')),
1563 ('i', 'interactive', None, _('use interactive mode')),
1563 ('i', 'interactive', None, _('use interactive mode')),
1564 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1564 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1565 _('[OPTION]... [FILE]...'),
1565 _('[OPTION]... [FILE]...'),
1566 inferrepo=True)
1566 inferrepo=True)
1567 def commit(ui, repo, *pats, **opts):
1567 def commit(ui, repo, *pats, **opts):
1568 """commit the specified files or all outstanding changes
1568 """commit the specified files or all outstanding changes
1569
1569
1570 Commit changes to the given files into the repository. Unlike a
1570 Commit changes to the given files into the repository. Unlike a
1571 centralized SCM, this operation is a local operation. See
1571 centralized SCM, this operation is a local operation. See
1572 :hg:`push` for a way to actively distribute your changes.
1572 :hg:`push` for a way to actively distribute your changes.
1573
1573
1574 If a list of files is omitted, all changes reported by :hg:`status`
1574 If a list of files is omitted, all changes reported by :hg:`status`
1575 will be committed.
1575 will be committed.
1576
1576
1577 If you are committing the result of a merge, do not provide any
1577 If you are committing the result of a merge, do not provide any
1578 filenames or -I/-X filters.
1578 filenames or -I/-X filters.
1579
1579
1580 If no commit message is specified, Mercurial starts your
1580 If no commit message is specified, Mercurial starts your
1581 configured editor where you can enter a message. In case your
1581 configured editor where you can enter a message. In case your
1582 commit fails, you will find a backup of your message in
1582 commit fails, you will find a backup of your message in
1583 ``.hg/last-message.txt``.
1583 ``.hg/last-message.txt``.
1584
1584
1585 The --close-branch flag can be used to mark the current branch
1585 The --close-branch flag can be used to mark the current branch
1586 head closed. When all heads of a branch are closed, the branch
1586 head closed. When all heads of a branch are closed, the branch
1587 will be considered closed and no longer listed.
1587 will be considered closed and no longer listed.
1588
1588
1589 The --amend flag can be used to amend the parent of the
1589 The --amend flag can be used to amend the parent of the
1590 working directory with a new commit that contains the changes
1590 working directory with a new commit that contains the changes
1591 in the parent in addition to those currently reported by :hg:`status`,
1591 in the parent in addition to those currently reported by :hg:`status`,
1592 if there are any. The old commit is stored in a backup bundle in
1592 if there are any. The old commit is stored in a backup bundle in
1593 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1593 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1594 on how to restore it).
1594 on how to restore it).
1595
1595
1596 Message, user and date are taken from the amended commit unless
1596 Message, user and date are taken from the amended commit unless
1597 specified. When a message isn't specified on the command line,
1597 specified. When a message isn't specified on the command line,
1598 the editor will open with the message of the amended commit.
1598 the editor will open with the message of the amended commit.
1599
1599
1600 It is not possible to amend public changesets (see :hg:`help phases`)
1600 It is not possible to amend public changesets (see :hg:`help phases`)
1601 or changesets that have children.
1601 or changesets that have children.
1602
1602
1603 See :hg:`help dates` for a list of formats valid for -d/--date.
1603 See :hg:`help dates` for a list of formats valid for -d/--date.
1604
1604
1605 Returns 0 on success, 1 if nothing changed.
1605 Returns 0 on success, 1 if nothing changed.
1606
1606
1607 .. container:: verbose
1607 .. container:: verbose
1608
1608
1609 Examples:
1609 Examples:
1610
1610
1611 - commit all files ending in .py::
1611 - commit all files ending in .py::
1612
1612
1613 hg commit --include "set:**.py"
1613 hg commit --include "set:**.py"
1614
1614
1615 - commit all non-binary files::
1615 - commit all non-binary files::
1616
1616
1617 hg commit --exclude "set:binary()"
1617 hg commit --exclude "set:binary()"
1618
1618
1619 - amend the current commit and set the date to now::
1619 - amend the current commit and set the date to now::
1620
1620
1621 hg commit --amend --date now
1621 hg commit --amend --date now
1622 """
1622 """
1623 wlock = lock = None
1623 wlock = lock = None
1624 try:
1624 try:
1625 wlock = repo.wlock()
1625 wlock = repo.wlock()
1626 lock = repo.lock()
1626 lock = repo.lock()
1627 return _docommit(ui, repo, *pats, **opts)
1627 return _docommit(ui, repo, *pats, **opts)
1628 finally:
1628 finally:
1629 release(lock, wlock)
1629 release(lock, wlock)
1630
1630
1631 def _docommit(ui, repo, *pats, **opts):
1631 def _docommit(ui, repo, *pats, **opts):
1632 if opts.get('interactive'):
1632 if opts.get('interactive'):
1633 opts.pop('interactive')
1633 opts.pop('interactive')
1634 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1634 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1635 cmdutil.recordfilter, *pats, **opts)
1635 cmdutil.recordfilter, *pats, **opts)
1636 # ret can be 0 (no changes to record) or the value returned by
1636 # ret can be 0 (no changes to record) or the value returned by
1637 # commit(), 1 if nothing changed or None on success.
1637 # commit(), 1 if nothing changed or None on success.
1638 return 1 if ret == 0 else ret
1638 return 1 if ret == 0 else ret
1639
1639
1640 if opts.get('subrepos'):
1640 if opts.get('subrepos'):
1641 if opts.get('amend'):
1641 if opts.get('amend'):
1642 raise error.Abort(_('cannot amend with --subrepos'))
1642 raise error.Abort(_('cannot amend with --subrepos'))
1643 # Let --subrepos on the command line override config setting.
1643 # Let --subrepos on the command line override config setting.
1644 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1644 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1645
1645
1646 cmdutil.checkunfinished(repo, commit=True)
1646 cmdutil.checkunfinished(repo, commit=True)
1647
1647
1648 branch = repo[None].branch()
1648 branch = repo[None].branch()
1649 bheads = repo.branchheads(branch)
1649 bheads = repo.branchheads(branch)
1650
1650
1651 extra = {}
1651 extra = {}
1652 if opts.get('close_branch'):
1652 if opts.get('close_branch'):
1653 extra['close'] = 1
1653 extra['close'] = 1
1654
1654
1655 if not bheads:
1655 if not bheads:
1656 raise error.Abort(_('can only close branch heads'))
1656 raise error.Abort(_('can only close branch heads'))
1657 elif opts.get('amend'):
1657 elif opts.get('amend'):
1658 if repo[None].parents()[0].p1().branch() != branch and \
1658 if repo[None].parents()[0].p1().branch() != branch and \
1659 repo[None].parents()[0].p2().branch() != branch:
1659 repo[None].parents()[0].p2().branch() != branch:
1660 raise error.Abort(_('can only close branch heads'))
1660 raise error.Abort(_('can only close branch heads'))
1661
1661
1662 if opts.get('amend'):
1662 if opts.get('amend'):
1663 if ui.configbool('ui', 'commitsubrepos'):
1663 if ui.configbool('ui', 'commitsubrepos'):
1664 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1664 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1665
1665
1666 old = repo['.']
1666 old = repo['.']
1667 if not old.mutable():
1667 if not old.mutable():
1668 raise error.Abort(_('cannot amend public changesets'))
1668 raise error.Abort(_('cannot amend public changesets'))
1669 if len(repo[None].parents()) > 1:
1669 if len(repo[None].parents()) > 1:
1670 raise error.Abort(_('cannot amend while merging'))
1670 raise error.Abort(_('cannot amend while merging'))
1671 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1671 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1672 if not allowunstable and old.children():
1672 if not allowunstable and old.children():
1673 raise error.Abort(_('cannot amend changeset with children'))
1673 raise error.Abort(_('cannot amend changeset with children'))
1674
1674
1675 # Currently histedit gets confused if an amend happens while histedit
1675 # Currently histedit gets confused if an amend happens while histedit
1676 # is in progress. Since we have a checkunfinished command, we are
1676 # is in progress. Since we have a checkunfinished command, we are
1677 # temporarily honoring it.
1677 # temporarily honoring it.
1678 #
1678 #
1679 # Note: eventually this guard will be removed. Please do not expect
1679 # Note: eventually this guard will be removed. Please do not expect
1680 # this behavior to remain.
1680 # this behavior to remain.
1681 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1681 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1682 cmdutil.checkunfinished(repo)
1682 cmdutil.checkunfinished(repo)
1683
1683
1684 # commitfunc is used only for temporary amend commit by cmdutil.amend
1684 # commitfunc is used only for temporary amend commit by cmdutil.amend
1685 def commitfunc(ui, repo, message, match, opts):
1685 def commitfunc(ui, repo, message, match, opts):
1686 return repo.commit(message,
1686 return repo.commit(message,
1687 opts.get('user') or old.user(),
1687 opts.get('user') or old.user(),
1688 opts.get('date') or old.date(),
1688 opts.get('date') or old.date(),
1689 match,
1689 match,
1690 extra=extra)
1690 extra=extra)
1691
1691
1692 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1692 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1693 if node == old.node():
1693 if node == old.node():
1694 ui.status(_("nothing changed\n"))
1694 ui.status(_("nothing changed\n"))
1695 return 1
1695 return 1
1696 else:
1696 else:
1697 def commitfunc(ui, repo, message, match, opts):
1697 def commitfunc(ui, repo, message, match, opts):
1698 backup = ui.backupconfig('phases', 'new-commit')
1698 backup = ui.backupconfig('phases', 'new-commit')
1699 baseui = repo.baseui
1699 baseui = repo.baseui
1700 basebackup = baseui.backupconfig('phases', 'new-commit')
1700 basebackup = baseui.backupconfig('phases', 'new-commit')
1701 try:
1701 try:
1702 if opts.get('secret'):
1702 if opts.get('secret'):
1703 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1703 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1704 # Propagate to subrepos
1704 # Propagate to subrepos
1705 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1705 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1706
1706
1707 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1707 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1708 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1708 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1709 return repo.commit(message, opts.get('user'), opts.get('date'),
1709 return repo.commit(message, opts.get('user'), opts.get('date'),
1710 match,
1710 match,
1711 editor=editor,
1711 editor=editor,
1712 extra=extra)
1712 extra=extra)
1713 finally:
1713 finally:
1714 ui.restoreconfig(backup)
1714 ui.restoreconfig(backup)
1715 repo.baseui.restoreconfig(basebackup)
1715 repo.baseui.restoreconfig(basebackup)
1716
1716
1717
1717
1718 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1718 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1719
1719
1720 if not node:
1720 if not node:
1721 stat = cmdutil.postcommitstatus(repo, pats, opts)
1721 stat = cmdutil.postcommitstatus(repo, pats, opts)
1722 if stat[3]:
1722 if stat[3]:
1723 ui.status(_("nothing changed (%d missing files, see "
1723 ui.status(_("nothing changed (%d missing files, see "
1724 "'hg status')\n") % len(stat[3]))
1724 "'hg status')\n") % len(stat[3]))
1725 else:
1725 else:
1726 ui.status(_("nothing changed\n"))
1726 ui.status(_("nothing changed\n"))
1727 return 1
1727 return 1
1728
1728
1729 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1729 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1730
1730
1731 @command('config|showconfig|debugconfig',
1731 @command('config|showconfig|debugconfig',
1732 [('u', 'untrusted', None, _('show untrusted configuration options')),
1732 [('u', 'untrusted', None, _('show untrusted configuration options')),
1733 ('e', 'edit', None, _('edit user config')),
1733 ('e', 'edit', None, _('edit user config')),
1734 ('l', 'local', None, _('edit repository config')),
1734 ('l', 'local', None, _('edit repository config')),
1735 ('g', 'global', None, _('edit global config'))] + formatteropts,
1735 ('g', 'global', None, _('edit global config'))] + formatteropts,
1736 _('[-u] [NAME]...'),
1736 _('[-u] [NAME]...'),
1737 optionalrepo=True)
1737 optionalrepo=True)
1738 def config(ui, repo, *values, **opts):
1738 def config(ui, repo, *values, **opts):
1739 """show combined config settings from all hgrc files
1739 """show combined config settings from all hgrc files
1740
1740
1741 With no arguments, print names and values of all config items.
1741 With no arguments, print names and values of all config items.
1742
1742
1743 With one argument of the form section.name, print just the value
1743 With one argument of the form section.name, print just the value
1744 of that config item.
1744 of that config item.
1745
1745
1746 With multiple arguments, print names and values of all config
1746 With multiple arguments, print names and values of all config
1747 items with matching section names.
1747 items with matching section names.
1748
1748
1749 With --edit, start an editor on the user-level config file. With
1749 With --edit, start an editor on the user-level config file. With
1750 --global, edit the system-wide config file. With --local, edit the
1750 --global, edit the system-wide config file. With --local, edit the
1751 repository-level config file.
1751 repository-level config file.
1752
1752
1753 With --debug, the source (filename and line number) is printed
1753 With --debug, the source (filename and line number) is printed
1754 for each config item.
1754 for each config item.
1755
1755
1756 See :hg:`help config` for more information about config files.
1756 See :hg:`help config` for more information about config files.
1757
1757
1758 Returns 0 on success, 1 if NAME does not exist.
1758 Returns 0 on success, 1 if NAME does not exist.
1759
1759
1760 """
1760 """
1761
1761
1762 if opts.get('edit') or opts.get('local') or opts.get('global'):
1762 if opts.get('edit') or opts.get('local') or opts.get('global'):
1763 if opts.get('local') and opts.get('global'):
1763 if opts.get('local') and opts.get('global'):
1764 raise error.Abort(_("can't use --local and --global together"))
1764 raise error.Abort(_("can't use --local and --global together"))
1765
1765
1766 if opts.get('local'):
1766 if opts.get('local'):
1767 if not repo:
1767 if not repo:
1768 raise error.Abort(_("can't use --local outside a repository"))
1768 raise error.Abort(_("can't use --local outside a repository"))
1769 paths = [repo.join('hgrc')]
1769 paths = [repo.join('hgrc')]
1770 elif opts.get('global'):
1770 elif opts.get('global'):
1771 paths = scmutil.systemrcpath()
1771 paths = scmutil.systemrcpath()
1772 else:
1772 else:
1773 paths = scmutil.userrcpath()
1773 paths = scmutil.userrcpath()
1774
1774
1775 for f in paths:
1775 for f in paths:
1776 if os.path.exists(f):
1776 if os.path.exists(f):
1777 break
1777 break
1778 else:
1778 else:
1779 if opts.get('global'):
1779 if opts.get('global'):
1780 samplehgrc = uimod.samplehgrcs['global']
1780 samplehgrc = uimod.samplehgrcs['global']
1781 elif opts.get('local'):
1781 elif opts.get('local'):
1782 samplehgrc = uimod.samplehgrcs['local']
1782 samplehgrc = uimod.samplehgrcs['local']
1783 else:
1783 else:
1784 samplehgrc = uimod.samplehgrcs['user']
1784 samplehgrc = uimod.samplehgrcs['user']
1785
1785
1786 f = paths[0]
1786 f = paths[0]
1787 fp = open(f, "w")
1787 fp = open(f, "w")
1788 fp.write(samplehgrc)
1788 fp.write(samplehgrc)
1789 fp.close()
1789 fp.close()
1790
1790
1791 editor = ui.geteditor()
1791 editor = ui.geteditor()
1792 ui.system("%s \"%s\"" % (editor, f),
1792 ui.system("%s \"%s\"" % (editor, f),
1793 onerr=error.Abort, errprefix=_("edit failed"))
1793 onerr=error.Abort, errprefix=_("edit failed"))
1794 return
1794 return
1795 ui.pager('config')
1795 ui.pager('config')
1796 fm = ui.formatter('config', opts)
1796 fm = ui.formatter('config', opts)
1797 for f in scmutil.rcpath():
1797 for f in scmutil.rcpath():
1798 ui.debug('read config from: %s\n' % f)
1798 ui.debug('read config from: %s\n' % f)
1799 untrusted = bool(opts.get('untrusted'))
1799 untrusted = bool(opts.get('untrusted'))
1800 if values:
1800 if values:
1801 sections = [v for v in values if '.' not in v]
1801 sections = [v for v in values if '.' not in v]
1802 items = [v for v in values if '.' in v]
1802 items = [v for v in values if '.' in v]
1803 if len(items) > 1 or items and sections:
1803 if len(items) > 1 or items and sections:
1804 raise error.Abort(_('only one config item permitted'))
1804 raise error.Abort(_('only one config item permitted'))
1805 matched = False
1805 matched = False
1806 for section, name, value in ui.walkconfig(untrusted=untrusted):
1806 for section, name, value in ui.walkconfig(untrusted=untrusted):
1807 source = ui.configsource(section, name, untrusted)
1807 source = ui.configsource(section, name, untrusted)
1808 value = str(value)
1808 value = str(value)
1809 if fm.isplain():
1809 if fm.isplain():
1810 source = source or 'none'
1810 source = source or 'none'
1811 value = value.replace('\n', '\\n')
1811 value = value.replace('\n', '\\n')
1812 entryname = section + '.' + name
1812 entryname = section + '.' + name
1813 if values:
1813 if values:
1814 for v in values:
1814 for v in values:
1815 if v == section:
1815 if v == section:
1816 fm.startitem()
1816 fm.startitem()
1817 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1817 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1818 fm.write('name value', '%s=%s\n', entryname, value)
1818 fm.write('name value', '%s=%s\n', entryname, value)
1819 matched = True
1819 matched = True
1820 elif v == entryname:
1820 elif v == entryname:
1821 fm.startitem()
1821 fm.startitem()
1822 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1822 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1823 fm.write('value', '%s\n', value)
1823 fm.write('value', '%s\n', value)
1824 fm.data(name=entryname)
1824 fm.data(name=entryname)
1825 matched = True
1825 matched = True
1826 else:
1826 else:
1827 fm.startitem()
1827 fm.startitem()
1828 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1828 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1829 fm.write('name value', '%s=%s\n', entryname, value)
1829 fm.write('name value', '%s=%s\n', entryname, value)
1830 matched = True
1830 matched = True
1831 fm.end()
1831 fm.end()
1832 if matched:
1832 if matched:
1833 return 0
1833 return 0
1834 return 1
1834 return 1
1835
1835
1836 @command('copy|cp',
1836 @command('copy|cp',
1837 [('A', 'after', None, _('record a copy that has already occurred')),
1837 [('A', 'after', None, _('record a copy that has already occurred')),
1838 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1838 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1839 ] + walkopts + dryrunopts,
1839 ] + walkopts + dryrunopts,
1840 _('[OPTION]... [SOURCE]... DEST'))
1840 _('[OPTION]... [SOURCE]... DEST'))
1841 def copy(ui, repo, *pats, **opts):
1841 def copy(ui, repo, *pats, **opts):
1842 """mark files as copied for the next commit
1842 """mark files as copied for the next commit
1843
1843
1844 Mark dest as having copies of source files. If dest is a
1844 Mark dest as having copies of source files. If dest is a
1845 directory, copies are put in that directory. If dest is a file,
1845 directory, copies are put in that directory. If dest is a file,
1846 the source must be a single file.
1846 the source must be a single file.
1847
1847
1848 By default, this command copies the contents of files as they
1848 By default, this command copies the contents of files as they
1849 exist in the working directory. If invoked with -A/--after, the
1849 exist in the working directory. If invoked with -A/--after, the
1850 operation is recorded, but no copying is performed.
1850 operation is recorded, but no copying is performed.
1851
1851
1852 This command takes effect with the next commit. To undo a copy
1852 This command takes effect with the next commit. To undo a copy
1853 before that, see :hg:`revert`.
1853 before that, see :hg:`revert`.
1854
1854
1855 Returns 0 on success, 1 if errors are encountered.
1855 Returns 0 on success, 1 if errors are encountered.
1856 """
1856 """
1857 with repo.wlock(False):
1857 with repo.wlock(False):
1858 return cmdutil.copy(ui, repo, pats, opts)
1858 return cmdutil.copy(ui, repo, pats, opts)
1859
1859
1860 @command('^diff',
1860 @command('^diff',
1861 [('r', 'rev', [], _('revision'), _('REV')),
1861 [('r', 'rev', [], _('revision'), _('REV')),
1862 ('c', 'change', '', _('change made by revision'), _('REV'))
1862 ('c', 'change', '', _('change made by revision'), _('REV'))
1863 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1863 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1864 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1864 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1865 inferrepo=True)
1865 inferrepo=True)
1866 def diff(ui, repo, *pats, **opts):
1866 def diff(ui, repo, *pats, **opts):
1867 """diff repository (or selected files)
1867 """diff repository (or selected files)
1868
1868
1869 Show differences between revisions for the specified files.
1869 Show differences between revisions for the specified files.
1870
1870
1871 Differences between files are shown using the unified diff format.
1871 Differences between files are shown using the unified diff format.
1872
1872
1873 .. note::
1873 .. note::
1874
1874
1875 :hg:`diff` may generate unexpected results for merges, as it will
1875 :hg:`diff` may generate unexpected results for merges, as it will
1876 default to comparing against the working directory's first
1876 default to comparing against the working directory's first
1877 parent changeset if no revisions are specified.
1877 parent changeset if no revisions are specified.
1878
1878
1879 When two revision arguments are given, then changes are shown
1879 When two revision arguments are given, then changes are shown
1880 between those revisions. If only one revision is specified then
1880 between those revisions. If only one revision is specified then
1881 that revision is compared to the working directory, and, when no
1881 that revision is compared to the working directory, and, when no
1882 revisions are specified, the working directory files are compared
1882 revisions are specified, the working directory files are compared
1883 to its first parent.
1883 to its first parent.
1884
1884
1885 Alternatively you can specify -c/--change with a revision to see
1885 Alternatively you can specify -c/--change with a revision to see
1886 the changes in that changeset relative to its first parent.
1886 the changes in that changeset relative to its first parent.
1887
1887
1888 Without the -a/--text option, diff will avoid generating diffs of
1888 Without the -a/--text option, diff will avoid generating diffs of
1889 files it detects as binary. With -a, diff will generate a diff
1889 files it detects as binary. With -a, diff will generate a diff
1890 anyway, probably with undesirable results.
1890 anyway, probably with undesirable results.
1891
1891
1892 Use the -g/--git option to generate diffs in the git extended diff
1892 Use the -g/--git option to generate diffs in the git extended diff
1893 format. For more information, read :hg:`help diffs`.
1893 format. For more information, read :hg:`help diffs`.
1894
1894
1895 .. container:: verbose
1895 .. container:: verbose
1896
1896
1897 Examples:
1897 Examples:
1898
1898
1899 - compare a file in the current working directory to its parent::
1899 - compare a file in the current working directory to its parent::
1900
1900
1901 hg diff foo.c
1901 hg diff foo.c
1902
1902
1903 - compare two historical versions of a directory, with rename info::
1903 - compare two historical versions of a directory, with rename info::
1904
1904
1905 hg diff --git -r 1.0:1.2 lib/
1905 hg diff --git -r 1.0:1.2 lib/
1906
1906
1907 - get change stats relative to the last change on some date::
1907 - get change stats relative to the last change on some date::
1908
1908
1909 hg diff --stat -r "date('may 2')"
1909 hg diff --stat -r "date('may 2')"
1910
1910
1911 - diff all newly-added files that contain a keyword::
1911 - diff all newly-added files that contain a keyword::
1912
1912
1913 hg diff "set:added() and grep(GNU)"
1913 hg diff "set:added() and grep(GNU)"
1914
1914
1915 - compare a revision and its parents::
1915 - compare a revision and its parents::
1916
1916
1917 hg diff -c 9353 # compare against first parent
1917 hg diff -c 9353 # compare against first parent
1918 hg diff -r 9353^:9353 # same using revset syntax
1918 hg diff -r 9353^:9353 # same using revset syntax
1919 hg diff -r 9353^2:9353 # compare against the second parent
1919 hg diff -r 9353^2:9353 # compare against the second parent
1920
1920
1921 Returns 0 on success.
1921 Returns 0 on success.
1922 """
1922 """
1923
1923
1924 revs = opts.get('rev')
1924 revs = opts.get('rev')
1925 change = opts.get('change')
1925 change = opts.get('change')
1926 stat = opts.get('stat')
1926 stat = opts.get('stat')
1927 reverse = opts.get('reverse')
1927 reverse = opts.get('reverse')
1928
1928
1929 if revs and change:
1929 if revs and change:
1930 msg = _('cannot specify --rev and --change at the same time')
1930 msg = _('cannot specify --rev and --change at the same time')
1931 raise error.Abort(msg)
1931 raise error.Abort(msg)
1932 elif change:
1932 elif change:
1933 node2 = scmutil.revsingle(repo, change, None).node()
1933 node2 = scmutil.revsingle(repo, change, None).node()
1934 node1 = repo[node2].p1().node()
1934 node1 = repo[node2].p1().node()
1935 else:
1935 else:
1936 node1, node2 = scmutil.revpair(repo, revs)
1936 node1, node2 = scmutil.revpair(repo, revs)
1937
1937
1938 if reverse:
1938 if reverse:
1939 node1, node2 = node2, node1
1939 node1, node2 = node2, node1
1940
1940
1941 diffopts = patch.diffallopts(ui, opts)
1941 diffopts = patch.diffallopts(ui, opts)
1942 m = scmutil.match(repo[node2], pats, opts)
1942 m = scmutil.match(repo[node2], pats, opts)
1943 ui.pager('diff')
1943 ui.pager('diff')
1944 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1944 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1945 listsubrepos=opts.get('subrepos'),
1945 listsubrepos=opts.get('subrepos'),
1946 root=opts.get('root'))
1946 root=opts.get('root'))
1947
1947
1948 @command('^export',
1948 @command('^export',
1949 [('o', 'output', '',
1949 [('o', 'output', '',
1950 _('print output to file with formatted name'), _('FORMAT')),
1950 _('print output to file with formatted name'), _('FORMAT')),
1951 ('', 'switch-parent', None, _('diff against the second parent')),
1951 ('', 'switch-parent', None, _('diff against the second parent')),
1952 ('r', 'rev', [], _('revisions to export'), _('REV')),
1952 ('r', 'rev', [], _('revisions to export'), _('REV')),
1953 ] + diffopts,
1953 ] + diffopts,
1954 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1954 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1955 def export(ui, repo, *changesets, **opts):
1955 def export(ui, repo, *changesets, **opts):
1956 """dump the header and diffs for one or more changesets
1956 """dump the header and diffs for one or more changesets
1957
1957
1958 Print the changeset header and diffs for one or more revisions.
1958 Print the changeset header and diffs for one or more revisions.
1959 If no revision is given, the parent of the working directory is used.
1959 If no revision is given, the parent of the working directory is used.
1960
1960
1961 The information shown in the changeset header is: author, date,
1961 The information shown in the changeset header is: author, date,
1962 branch name (if non-default), changeset hash, parent(s) and commit
1962 branch name (if non-default), changeset hash, parent(s) and commit
1963 comment.
1963 comment.
1964
1964
1965 .. note::
1965 .. note::
1966
1966
1967 :hg:`export` may generate unexpected diff output for merge
1967 :hg:`export` may generate unexpected diff output for merge
1968 changesets, as it will compare the merge changeset against its
1968 changesets, as it will compare the merge changeset against its
1969 first parent only.
1969 first parent only.
1970
1970
1971 Output may be to a file, in which case the name of the file is
1971 Output may be to a file, in which case the name of the file is
1972 given using a format string. The formatting rules are as follows:
1972 given using a format string. The formatting rules are as follows:
1973
1973
1974 :``%%``: literal "%" character
1974 :``%%``: literal "%" character
1975 :``%H``: changeset hash (40 hexadecimal digits)
1975 :``%H``: changeset hash (40 hexadecimal digits)
1976 :``%N``: number of patches being generated
1976 :``%N``: number of patches being generated
1977 :``%R``: changeset revision number
1977 :``%R``: changeset revision number
1978 :``%b``: basename of the exporting repository
1978 :``%b``: basename of the exporting repository
1979 :``%h``: short-form changeset hash (12 hexadecimal digits)
1979 :``%h``: short-form changeset hash (12 hexadecimal digits)
1980 :``%m``: first line of the commit message (only alphanumeric characters)
1980 :``%m``: first line of the commit message (only alphanumeric characters)
1981 :``%n``: zero-padded sequence number, starting at 1
1981 :``%n``: zero-padded sequence number, starting at 1
1982 :``%r``: zero-padded changeset revision number
1982 :``%r``: zero-padded changeset revision number
1983
1983
1984 Without the -a/--text option, export will avoid generating diffs
1984 Without the -a/--text option, export will avoid generating diffs
1985 of files it detects as binary. With -a, export will generate a
1985 of files it detects as binary. With -a, export will generate a
1986 diff anyway, probably with undesirable results.
1986 diff anyway, probably with undesirable results.
1987
1987
1988 Use the -g/--git option to generate diffs in the git extended diff
1988 Use the -g/--git option to generate diffs in the git extended diff
1989 format. See :hg:`help diffs` for more information.
1989 format. See :hg:`help diffs` for more information.
1990
1990
1991 With the --switch-parent option, the diff will be against the
1991 With the --switch-parent option, the diff will be against the
1992 second parent. It can be useful to review a merge.
1992 second parent. It can be useful to review a merge.
1993
1993
1994 .. container:: verbose
1994 .. container:: verbose
1995
1995
1996 Examples:
1996 Examples:
1997
1997
1998 - use export and import to transplant a bugfix to the current
1998 - use export and import to transplant a bugfix to the current
1999 branch::
1999 branch::
2000
2000
2001 hg export -r 9353 | hg import -
2001 hg export -r 9353 | hg import -
2002
2002
2003 - export all the changesets between two revisions to a file with
2003 - export all the changesets between two revisions to a file with
2004 rename information::
2004 rename information::
2005
2005
2006 hg export --git -r 123:150 > changes.txt
2006 hg export --git -r 123:150 > changes.txt
2007
2007
2008 - split outgoing changes into a series of patches with
2008 - split outgoing changes into a series of patches with
2009 descriptive names::
2009 descriptive names::
2010
2010
2011 hg export -r "outgoing()" -o "%n-%m.patch"
2011 hg export -r "outgoing()" -o "%n-%m.patch"
2012
2012
2013 Returns 0 on success.
2013 Returns 0 on success.
2014 """
2014 """
2015 changesets += tuple(opts.get('rev', []))
2015 changesets += tuple(opts.get('rev', []))
2016 if not changesets:
2016 if not changesets:
2017 changesets = ['.']
2017 changesets = ['.']
2018 revs = scmutil.revrange(repo, changesets)
2018 revs = scmutil.revrange(repo, changesets)
2019 if not revs:
2019 if not revs:
2020 raise error.Abort(_("export requires at least one changeset"))
2020 raise error.Abort(_("export requires at least one changeset"))
2021 if len(revs) > 1:
2021 if len(revs) > 1:
2022 ui.note(_('exporting patches:\n'))
2022 ui.note(_('exporting patches:\n'))
2023 else:
2023 else:
2024 ui.note(_('exporting patch:\n'))
2024 ui.note(_('exporting patch:\n'))
2025 ui.pager('export')
2025 ui.pager('export')
2026 cmdutil.export(repo, revs, template=opts.get('output'),
2026 cmdutil.export(repo, revs, template=opts.get('output'),
2027 switch_parent=opts.get('switch_parent'),
2027 switch_parent=opts.get('switch_parent'),
2028 opts=patch.diffallopts(ui, opts))
2028 opts=patch.diffallopts(ui, opts))
2029
2029
2030 @command('files',
2030 @command('files',
2031 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2031 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2032 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2032 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2033 ] + walkopts + formatteropts + subrepoopts,
2033 ] + walkopts + formatteropts + subrepoopts,
2034 _('[OPTION]... [FILE]...'))
2034 _('[OPTION]... [FILE]...'))
2035 def files(ui, repo, *pats, **opts):
2035 def files(ui, repo, *pats, **opts):
2036 """list tracked files
2036 """list tracked files
2037
2037
2038 Print files under Mercurial control in the working directory or
2038 Print files under Mercurial control in the working directory or
2039 specified revision for given files (excluding removed files).
2039 specified revision for given files (excluding removed files).
2040 Files can be specified as filenames or filesets.
2040 Files can be specified as filenames or filesets.
2041
2041
2042 If no files are given to match, this command prints the names
2042 If no files are given to match, this command prints the names
2043 of all files under Mercurial control.
2043 of all files under Mercurial control.
2044
2044
2045 .. container:: verbose
2045 .. container:: verbose
2046
2046
2047 Examples:
2047 Examples:
2048
2048
2049 - list all files under the current directory::
2049 - list all files under the current directory::
2050
2050
2051 hg files .
2051 hg files .
2052
2052
2053 - shows sizes and flags for current revision::
2053 - shows sizes and flags for current revision::
2054
2054
2055 hg files -vr .
2055 hg files -vr .
2056
2056
2057 - list all files named README::
2057 - list all files named README::
2058
2058
2059 hg files -I "**/README"
2059 hg files -I "**/README"
2060
2060
2061 - list all binary files::
2061 - list all binary files::
2062
2062
2063 hg files "set:binary()"
2063 hg files "set:binary()"
2064
2064
2065 - find files containing a regular expression::
2065 - find files containing a regular expression::
2066
2066
2067 hg files "set:grep('bob')"
2067 hg files "set:grep('bob')"
2068
2068
2069 - search tracked file contents with xargs and grep::
2069 - search tracked file contents with xargs and grep::
2070
2070
2071 hg files -0 | xargs -0 grep foo
2071 hg files -0 | xargs -0 grep foo
2072
2072
2073 See :hg:`help patterns` and :hg:`help filesets` for more information
2073 See :hg:`help patterns` and :hg:`help filesets` for more information
2074 on specifying file patterns.
2074 on specifying file patterns.
2075
2075
2076 Returns 0 if a match is found, 1 otherwise.
2076 Returns 0 if a match is found, 1 otherwise.
2077
2077
2078 """
2078 """
2079 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2079 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2080
2080
2081 end = '\n'
2081 end = '\n'
2082 if opts.get('print0'):
2082 if opts.get('print0'):
2083 end = '\0'
2083 end = '\0'
2084 fmt = '%s' + end
2084 fmt = '%s' + end
2085
2085
2086 m = scmutil.match(ctx, pats, opts)
2086 m = scmutil.match(ctx, pats, opts)
2087 ui.pager('files')
2087 ui.pager('files')
2088 with ui.formatter('files', opts) as fm:
2088 with ui.formatter('files', opts) as fm:
2089 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2089 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2090
2090
2091 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2091 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2092 def forget(ui, repo, *pats, **opts):
2092 def forget(ui, repo, *pats, **opts):
2093 """forget the specified files on the next commit
2093 """forget the specified files on the next commit
2094
2094
2095 Mark the specified files so they will no longer be tracked
2095 Mark the specified files so they will no longer be tracked
2096 after the next commit.
2096 after the next commit.
2097
2097
2098 This only removes files from the current branch, not from the
2098 This only removes files from the current branch, not from the
2099 entire project history, and it does not delete them from the
2099 entire project history, and it does not delete them from the
2100 working directory.
2100 working directory.
2101
2101
2102 To delete the file from the working directory, see :hg:`remove`.
2102 To delete the file from the working directory, see :hg:`remove`.
2103
2103
2104 To undo a forget before the next commit, see :hg:`add`.
2104 To undo a forget before the next commit, see :hg:`add`.
2105
2105
2106 .. container:: verbose
2106 .. container:: verbose
2107
2107
2108 Examples:
2108 Examples:
2109
2109
2110 - forget newly-added binary files::
2110 - forget newly-added binary files::
2111
2111
2112 hg forget "set:added() and binary()"
2112 hg forget "set:added() and binary()"
2113
2113
2114 - forget files that would be excluded by .hgignore::
2114 - forget files that would be excluded by .hgignore::
2115
2115
2116 hg forget "set:hgignore()"
2116 hg forget "set:hgignore()"
2117
2117
2118 Returns 0 on success.
2118 Returns 0 on success.
2119 """
2119 """
2120
2120
2121 if not pats:
2121 if not pats:
2122 raise error.Abort(_('no files specified'))
2122 raise error.Abort(_('no files specified'))
2123
2123
2124 m = scmutil.match(repo[None], pats, opts)
2124 m = scmutil.match(repo[None], pats, opts)
2125 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2125 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2126 return rejected and 1 or 0
2126 return rejected and 1 or 0
2127
2127
2128 @command(
2128 @command(
2129 'graft',
2129 'graft',
2130 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2130 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2131 ('c', 'continue', False, _('resume interrupted graft')),
2131 ('c', 'continue', False, _('resume interrupted graft')),
2132 ('e', 'edit', False, _('invoke editor on commit messages')),
2132 ('e', 'edit', False, _('invoke editor on commit messages')),
2133 ('', 'log', None, _('append graft info to log message')),
2133 ('', 'log', None, _('append graft info to log message')),
2134 ('f', 'force', False, _('force graft')),
2134 ('f', 'force', False, _('force graft')),
2135 ('D', 'currentdate', False,
2135 ('D', 'currentdate', False,
2136 _('record the current date as commit date')),
2136 _('record the current date as commit date')),
2137 ('U', 'currentuser', False,
2137 ('U', 'currentuser', False,
2138 _('record the current user as committer'), _('DATE'))]
2138 _('record the current user as committer'), _('DATE'))]
2139 + commitopts2 + mergetoolopts + dryrunopts,
2139 + commitopts2 + mergetoolopts + dryrunopts,
2140 _('[OPTION]... [-r REV]... REV...'))
2140 _('[OPTION]... [-r REV]... REV...'))
2141 def graft(ui, repo, *revs, **opts):
2141 def graft(ui, repo, *revs, **opts):
2142 '''copy changes from other branches onto the current branch
2142 '''copy changes from other branches onto the current branch
2143
2143
2144 This command uses Mercurial's merge logic to copy individual
2144 This command uses Mercurial's merge logic to copy individual
2145 changes from other branches without merging branches in the
2145 changes from other branches without merging branches in the
2146 history graph. This is sometimes known as 'backporting' or
2146 history graph. This is sometimes known as 'backporting' or
2147 'cherry-picking'. By default, graft will copy user, date, and
2147 'cherry-picking'. By default, graft will copy user, date, and
2148 description from the source changesets.
2148 description from the source changesets.
2149
2149
2150 Changesets that are ancestors of the current revision, that have
2150 Changesets that are ancestors of the current revision, that have
2151 already been grafted, or that are merges will be skipped.
2151 already been grafted, or that are merges will be skipped.
2152
2152
2153 If --log is specified, log messages will have a comment appended
2153 If --log is specified, log messages will have a comment appended
2154 of the form::
2154 of the form::
2155
2155
2156 (grafted from CHANGESETHASH)
2156 (grafted from CHANGESETHASH)
2157
2157
2158 If --force is specified, revisions will be grafted even if they
2158 If --force is specified, revisions will be grafted even if they
2159 are already ancestors of or have been grafted to the destination.
2159 are already ancestors of or have been grafted to the destination.
2160 This is useful when the revisions have since been backed out.
2160 This is useful when the revisions have since been backed out.
2161
2161
2162 If a graft merge results in conflicts, the graft process is
2162 If a graft merge results in conflicts, the graft process is
2163 interrupted so that the current merge can be manually resolved.
2163 interrupted so that the current merge can be manually resolved.
2164 Once all conflicts are addressed, the graft process can be
2164 Once all conflicts are addressed, the graft process can be
2165 continued with the -c/--continue option.
2165 continued with the -c/--continue option.
2166
2166
2167 .. note::
2167 .. note::
2168
2168
2169 The -c/--continue option does not reapply earlier options, except
2169 The -c/--continue option does not reapply earlier options, except
2170 for --force.
2170 for --force.
2171
2171
2172 .. container:: verbose
2172 .. container:: verbose
2173
2173
2174 Examples:
2174 Examples:
2175
2175
2176 - copy a single change to the stable branch and edit its description::
2176 - copy a single change to the stable branch and edit its description::
2177
2177
2178 hg update stable
2178 hg update stable
2179 hg graft --edit 9393
2179 hg graft --edit 9393
2180
2180
2181 - graft a range of changesets with one exception, updating dates::
2181 - graft a range of changesets with one exception, updating dates::
2182
2182
2183 hg graft -D "2085::2093 and not 2091"
2183 hg graft -D "2085::2093 and not 2091"
2184
2184
2185 - continue a graft after resolving conflicts::
2185 - continue a graft after resolving conflicts::
2186
2186
2187 hg graft -c
2187 hg graft -c
2188
2188
2189 - show the source of a grafted changeset::
2189 - show the source of a grafted changeset::
2190
2190
2191 hg log --debug -r .
2191 hg log --debug -r .
2192
2192
2193 - show revisions sorted by date::
2193 - show revisions sorted by date::
2194
2194
2195 hg log -r "sort(all(), date)"
2195 hg log -r "sort(all(), date)"
2196
2196
2197 See :hg:`help revisions` for more about specifying revisions.
2197 See :hg:`help revisions` for more about specifying revisions.
2198
2198
2199 Returns 0 on successful completion.
2199 Returns 0 on successful completion.
2200 '''
2200 '''
2201 with repo.wlock():
2201 with repo.wlock():
2202 return _dograft(ui, repo, *revs, **opts)
2202 return _dograft(ui, repo, *revs, **opts)
2203
2203
2204 def _dograft(ui, repo, *revs, **opts):
2204 def _dograft(ui, repo, *revs, **opts):
2205 if revs and opts.get('rev'):
2205 if revs and opts.get('rev'):
2206 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2206 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2207 'revision ordering!\n'))
2207 'revision ordering!\n'))
2208
2208
2209 revs = list(revs)
2209 revs = list(revs)
2210 revs.extend(opts.get('rev'))
2210 revs.extend(opts.get('rev'))
2211
2211
2212 if not opts.get('user') and opts.get('currentuser'):
2212 if not opts.get('user') and opts.get('currentuser'):
2213 opts['user'] = ui.username()
2213 opts['user'] = ui.username()
2214 if not opts.get('date') and opts.get('currentdate'):
2214 if not opts.get('date') and opts.get('currentdate'):
2215 opts['date'] = "%d %d" % util.makedate()
2215 opts['date'] = "%d %d" % util.makedate()
2216
2216
2217 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2217 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2218
2218
2219 cont = False
2219 cont = False
2220 if opts.get('continue'):
2220 if opts.get('continue'):
2221 cont = True
2221 cont = True
2222 if revs:
2222 if revs:
2223 raise error.Abort(_("can't specify --continue and revisions"))
2223 raise error.Abort(_("can't specify --continue and revisions"))
2224 # read in unfinished revisions
2224 # read in unfinished revisions
2225 try:
2225 try:
2226 nodes = repo.vfs.read('graftstate').splitlines()
2226 nodes = repo.vfs.read('graftstate').splitlines()
2227 revs = [repo[node].rev() for node in nodes]
2227 revs = [repo[node].rev() for node in nodes]
2228 except IOError as inst:
2228 except IOError as inst:
2229 if inst.errno != errno.ENOENT:
2229 if inst.errno != errno.ENOENT:
2230 raise
2230 raise
2231 cmdutil.wrongtooltocontinue(repo, _('graft'))
2231 cmdutil.wrongtooltocontinue(repo, _('graft'))
2232 else:
2232 else:
2233 cmdutil.checkunfinished(repo)
2233 cmdutil.checkunfinished(repo)
2234 cmdutil.bailifchanged(repo)
2234 cmdutil.bailifchanged(repo)
2235 if not revs:
2235 if not revs:
2236 raise error.Abort(_('no revisions specified'))
2236 raise error.Abort(_('no revisions specified'))
2237 revs = scmutil.revrange(repo, revs)
2237 revs = scmutil.revrange(repo, revs)
2238
2238
2239 skipped = set()
2239 skipped = set()
2240 # check for merges
2240 # check for merges
2241 for rev in repo.revs('%ld and merge()', revs):
2241 for rev in repo.revs('%ld and merge()', revs):
2242 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2242 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2243 skipped.add(rev)
2243 skipped.add(rev)
2244 revs = [r for r in revs if r not in skipped]
2244 revs = [r for r in revs if r not in skipped]
2245 if not revs:
2245 if not revs:
2246 return -1
2246 return -1
2247
2247
2248 # Don't check in the --continue case, in effect retaining --force across
2248 # Don't check in the --continue case, in effect retaining --force across
2249 # --continues. That's because without --force, any revisions we decided to
2249 # --continues. That's because without --force, any revisions we decided to
2250 # skip would have been filtered out here, so they wouldn't have made their
2250 # skip would have been filtered out here, so they wouldn't have made their
2251 # way to the graftstate. With --force, any revisions we would have otherwise
2251 # way to the graftstate. With --force, any revisions we would have otherwise
2252 # skipped would not have been filtered out, and if they hadn't been applied
2252 # skipped would not have been filtered out, and if they hadn't been applied
2253 # already, they'd have been in the graftstate.
2253 # already, they'd have been in the graftstate.
2254 if not (cont or opts.get('force')):
2254 if not (cont or opts.get('force')):
2255 # check for ancestors of dest branch
2255 # check for ancestors of dest branch
2256 crev = repo['.'].rev()
2256 crev = repo['.'].rev()
2257 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2257 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2258 # XXX make this lazy in the future
2258 # XXX make this lazy in the future
2259 # don't mutate while iterating, create a copy
2259 # don't mutate while iterating, create a copy
2260 for rev in list(revs):
2260 for rev in list(revs):
2261 if rev in ancestors:
2261 if rev in ancestors:
2262 ui.warn(_('skipping ancestor revision %d:%s\n') %
2262 ui.warn(_('skipping ancestor revision %d:%s\n') %
2263 (rev, repo[rev]))
2263 (rev, repo[rev]))
2264 # XXX remove on list is slow
2264 # XXX remove on list is slow
2265 revs.remove(rev)
2265 revs.remove(rev)
2266 if not revs:
2266 if not revs:
2267 return -1
2267 return -1
2268
2268
2269 # analyze revs for earlier grafts
2269 # analyze revs for earlier grafts
2270 ids = {}
2270 ids = {}
2271 for ctx in repo.set("%ld", revs):
2271 for ctx in repo.set("%ld", revs):
2272 ids[ctx.hex()] = ctx.rev()
2272 ids[ctx.hex()] = ctx.rev()
2273 n = ctx.extra().get('source')
2273 n = ctx.extra().get('source')
2274 if n:
2274 if n:
2275 ids[n] = ctx.rev()
2275 ids[n] = ctx.rev()
2276
2276
2277 # check ancestors for earlier grafts
2277 # check ancestors for earlier grafts
2278 ui.debug('scanning for duplicate grafts\n')
2278 ui.debug('scanning for duplicate grafts\n')
2279
2279
2280 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2280 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2281 ctx = repo[rev]
2281 ctx = repo[rev]
2282 n = ctx.extra().get('source')
2282 n = ctx.extra().get('source')
2283 if n in ids:
2283 if n in ids:
2284 try:
2284 try:
2285 r = repo[n].rev()
2285 r = repo[n].rev()
2286 except error.RepoLookupError:
2286 except error.RepoLookupError:
2287 r = None
2287 r = None
2288 if r in revs:
2288 if r in revs:
2289 ui.warn(_('skipping revision %d:%s '
2289 ui.warn(_('skipping revision %d:%s '
2290 '(already grafted to %d:%s)\n')
2290 '(already grafted to %d:%s)\n')
2291 % (r, repo[r], rev, ctx))
2291 % (r, repo[r], rev, ctx))
2292 revs.remove(r)
2292 revs.remove(r)
2293 elif ids[n] in revs:
2293 elif ids[n] in revs:
2294 if r is None:
2294 if r is None:
2295 ui.warn(_('skipping already grafted revision %d:%s '
2295 ui.warn(_('skipping already grafted revision %d:%s '
2296 '(%d:%s also has unknown origin %s)\n')
2296 '(%d:%s also has unknown origin %s)\n')
2297 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2297 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2298 else:
2298 else:
2299 ui.warn(_('skipping already grafted revision %d:%s '
2299 ui.warn(_('skipping already grafted revision %d:%s '
2300 '(%d:%s also has origin %d:%s)\n')
2300 '(%d:%s also has origin %d:%s)\n')
2301 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2301 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2302 revs.remove(ids[n])
2302 revs.remove(ids[n])
2303 elif ctx.hex() in ids:
2303 elif ctx.hex() in ids:
2304 r = ids[ctx.hex()]
2304 r = ids[ctx.hex()]
2305 ui.warn(_('skipping already grafted revision %d:%s '
2305 ui.warn(_('skipping already grafted revision %d:%s '
2306 '(was grafted from %d:%s)\n') %
2306 '(was grafted from %d:%s)\n') %
2307 (r, repo[r], rev, ctx))
2307 (r, repo[r], rev, ctx))
2308 revs.remove(r)
2308 revs.remove(r)
2309 if not revs:
2309 if not revs:
2310 return -1
2310 return -1
2311
2311
2312 for pos, ctx in enumerate(repo.set("%ld", revs)):
2312 for pos, ctx in enumerate(repo.set("%ld", revs)):
2313 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2313 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2314 ctx.description().split('\n', 1)[0])
2314 ctx.description().split('\n', 1)[0])
2315 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2315 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2316 if names:
2316 if names:
2317 desc += ' (%s)' % ' '.join(names)
2317 desc += ' (%s)' % ' '.join(names)
2318 ui.status(_('grafting %s\n') % desc)
2318 ui.status(_('grafting %s\n') % desc)
2319 if opts.get('dry_run'):
2319 if opts.get('dry_run'):
2320 continue
2320 continue
2321
2321
2322 source = ctx.extra().get('source')
2322 source = ctx.extra().get('source')
2323 extra = {}
2323 extra = {}
2324 if source:
2324 if source:
2325 extra['source'] = source
2325 extra['source'] = source
2326 extra['intermediate-source'] = ctx.hex()
2326 extra['intermediate-source'] = ctx.hex()
2327 else:
2327 else:
2328 extra['source'] = ctx.hex()
2328 extra['source'] = ctx.hex()
2329 user = ctx.user()
2329 user = ctx.user()
2330 if opts.get('user'):
2330 if opts.get('user'):
2331 user = opts['user']
2331 user = opts['user']
2332 date = ctx.date()
2332 date = ctx.date()
2333 if opts.get('date'):
2333 if opts.get('date'):
2334 date = opts['date']
2334 date = opts['date']
2335 message = ctx.description()
2335 message = ctx.description()
2336 if opts.get('log'):
2336 if opts.get('log'):
2337 message += '\n(grafted from %s)' % ctx.hex()
2337 message += '\n(grafted from %s)' % ctx.hex()
2338
2338
2339 # we don't merge the first commit when continuing
2339 # we don't merge the first commit when continuing
2340 if not cont:
2340 if not cont:
2341 # perform the graft merge with p1(rev) as 'ancestor'
2341 # perform the graft merge with p1(rev) as 'ancestor'
2342 try:
2342 try:
2343 # ui.forcemerge is an internal variable, do not document
2343 # ui.forcemerge is an internal variable, do not document
2344 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2344 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2345 'graft')
2345 'graft')
2346 stats = mergemod.graft(repo, ctx, ctx.p1(),
2346 stats = mergemod.graft(repo, ctx, ctx.p1(),
2347 ['local', 'graft'])
2347 ['local', 'graft'])
2348 finally:
2348 finally:
2349 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2349 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2350 # report any conflicts
2350 # report any conflicts
2351 if stats and stats[3] > 0:
2351 if stats and stats[3] > 0:
2352 # write out state for --continue
2352 # write out state for --continue
2353 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2353 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2354 repo.vfs.write('graftstate', ''.join(nodelines))
2354 repo.vfs.write('graftstate', ''.join(nodelines))
2355 extra = ''
2355 extra = ''
2356 if opts.get('user'):
2356 if opts.get('user'):
2357 extra += ' --user %s' % util.shellquote(opts['user'])
2357 extra += ' --user %s' % util.shellquote(opts['user'])
2358 if opts.get('date'):
2358 if opts.get('date'):
2359 extra += ' --date %s' % util.shellquote(opts['date'])
2359 extra += ' --date %s' % util.shellquote(opts['date'])
2360 if opts.get('log'):
2360 if opts.get('log'):
2361 extra += ' --log'
2361 extra += ' --log'
2362 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2362 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2363 raise error.Abort(
2363 raise error.Abort(
2364 _("unresolved conflicts, can't continue"),
2364 _("unresolved conflicts, can't continue"),
2365 hint=hint)
2365 hint=hint)
2366 else:
2366 else:
2367 cont = False
2367 cont = False
2368
2368
2369 # commit
2369 # commit
2370 node = repo.commit(text=message, user=user,
2370 node = repo.commit(text=message, user=user,
2371 date=date, extra=extra, editor=editor)
2371 date=date, extra=extra, editor=editor)
2372 if node is None:
2372 if node is None:
2373 ui.warn(
2373 ui.warn(
2374 _('note: graft of %d:%s created no changes to commit\n') %
2374 _('note: graft of %d:%s created no changes to commit\n') %
2375 (ctx.rev(), ctx))
2375 (ctx.rev(), ctx))
2376
2376
2377 # remove state when we complete successfully
2377 # remove state when we complete successfully
2378 if not opts.get('dry_run'):
2378 if not opts.get('dry_run'):
2379 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
2379 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
2380
2380
2381 return 0
2381 return 0
2382
2382
2383 @command('grep',
2383 @command('grep',
2384 [('0', 'print0', None, _('end fields with NUL')),
2384 [('0', 'print0', None, _('end fields with NUL')),
2385 ('', 'all', None, _('print all revisions that match')),
2385 ('', 'all', None, _('print all revisions that match')),
2386 ('a', 'text', None, _('treat all files as text')),
2386 ('a', 'text', None, _('treat all files as text')),
2387 ('f', 'follow', None,
2387 ('f', 'follow', None,
2388 _('follow changeset history,'
2388 _('follow changeset history,'
2389 ' or file history across copies and renames')),
2389 ' or file history across copies and renames')),
2390 ('i', 'ignore-case', None, _('ignore case when matching')),
2390 ('i', 'ignore-case', None, _('ignore case when matching')),
2391 ('l', 'files-with-matches', None,
2391 ('l', 'files-with-matches', None,
2392 _('print only filenames and revisions that match')),
2392 _('print only filenames and revisions that match')),
2393 ('n', 'line-number', None, _('print matching line numbers')),
2393 ('n', 'line-number', None, _('print matching line numbers')),
2394 ('r', 'rev', [],
2394 ('r', 'rev', [],
2395 _('only search files changed within revision range'), _('REV')),
2395 _('only search files changed within revision range'), _('REV')),
2396 ('u', 'user', None, _('list the author (long with -v)')),
2396 ('u', 'user', None, _('list the author (long with -v)')),
2397 ('d', 'date', None, _('list the date (short with -q)')),
2397 ('d', 'date', None, _('list the date (short with -q)')),
2398 ] + formatteropts + walkopts,
2398 ] + formatteropts + walkopts,
2399 _('[OPTION]... PATTERN [FILE]...'),
2399 _('[OPTION]... PATTERN [FILE]...'),
2400 inferrepo=True)
2400 inferrepo=True)
2401 def grep(ui, repo, pattern, *pats, **opts):
2401 def grep(ui, repo, pattern, *pats, **opts):
2402 """search revision history for a pattern in specified files
2402 """search revision history for a pattern in specified files
2403
2403
2404 Search revision history for a regular expression in the specified
2404 Search revision history for a regular expression in the specified
2405 files or the entire project.
2405 files or the entire project.
2406
2406
2407 By default, grep prints the most recent revision number for each
2407 By default, grep prints the most recent revision number for each
2408 file in which it finds a match. To get it to print every revision
2408 file in which it finds a match. To get it to print every revision
2409 that contains a change in match status ("-" for a match that becomes
2409 that contains a change in match status ("-" for a match that becomes
2410 a non-match, or "+" for a non-match that becomes a match), use the
2410 a non-match, or "+" for a non-match that becomes a match), use the
2411 --all flag.
2411 --all flag.
2412
2412
2413 PATTERN can be any Python (roughly Perl-compatible) regular
2413 PATTERN can be any Python (roughly Perl-compatible) regular
2414 expression.
2414 expression.
2415
2415
2416 If no FILEs are specified (and -f/--follow isn't set), all files in
2416 If no FILEs are specified (and -f/--follow isn't set), all files in
2417 the repository are searched, including those that don't exist in the
2417 the repository are searched, including those that don't exist in the
2418 current branch or have been deleted in a prior changeset.
2418 current branch or have been deleted in a prior changeset.
2419
2419
2420 Returns 0 if a match is found, 1 otherwise.
2420 Returns 0 if a match is found, 1 otherwise.
2421 """
2421 """
2422 reflags = re.M
2422 reflags = re.M
2423 if opts.get('ignore_case'):
2423 if opts.get('ignore_case'):
2424 reflags |= re.I
2424 reflags |= re.I
2425 try:
2425 try:
2426 regexp = util.re.compile(pattern, reflags)
2426 regexp = util.re.compile(pattern, reflags)
2427 except re.error as inst:
2427 except re.error as inst:
2428 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2428 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2429 return 1
2429 return 1
2430 sep, eol = ':', '\n'
2430 sep, eol = ':', '\n'
2431 if opts.get('print0'):
2431 if opts.get('print0'):
2432 sep = eol = '\0'
2432 sep = eol = '\0'
2433
2433
2434 getfile = util.lrucachefunc(repo.file)
2434 getfile = util.lrucachefunc(repo.file)
2435
2435
2436 def matchlines(body):
2436 def matchlines(body):
2437 begin = 0
2437 begin = 0
2438 linenum = 0
2438 linenum = 0
2439 while begin < len(body):
2439 while begin < len(body):
2440 match = regexp.search(body, begin)
2440 match = regexp.search(body, begin)
2441 if not match:
2441 if not match:
2442 break
2442 break
2443 mstart, mend = match.span()
2443 mstart, mend = match.span()
2444 linenum += body.count('\n', begin, mstart) + 1
2444 linenum += body.count('\n', begin, mstart) + 1
2445 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2445 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2446 begin = body.find('\n', mend) + 1 or len(body) + 1
2446 begin = body.find('\n', mend) + 1 or len(body) + 1
2447 lend = begin - 1
2447 lend = begin - 1
2448 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2448 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2449
2449
2450 class linestate(object):
2450 class linestate(object):
2451 def __init__(self, line, linenum, colstart, colend):
2451 def __init__(self, line, linenum, colstart, colend):
2452 self.line = line
2452 self.line = line
2453 self.linenum = linenum
2453 self.linenum = linenum
2454 self.colstart = colstart
2454 self.colstart = colstart
2455 self.colend = colend
2455 self.colend = colend
2456
2456
2457 def __hash__(self):
2457 def __hash__(self):
2458 return hash((self.linenum, self.line))
2458 return hash((self.linenum, self.line))
2459
2459
2460 def __eq__(self, other):
2460 def __eq__(self, other):
2461 return self.line == other.line
2461 return self.line == other.line
2462
2462
2463 def findpos(self):
2463 def findpos(self):
2464 """Iterate all (start, end) indices of matches"""
2464 """Iterate all (start, end) indices of matches"""
2465 yield self.colstart, self.colend
2465 yield self.colstart, self.colend
2466 p = self.colend
2466 p = self.colend
2467 while p < len(self.line):
2467 while p < len(self.line):
2468 m = regexp.search(self.line, p)
2468 m = regexp.search(self.line, p)
2469 if not m:
2469 if not m:
2470 break
2470 break
2471 yield m.span()
2471 yield m.span()
2472 p = m.end()
2472 p = m.end()
2473
2473
2474 matches = {}
2474 matches = {}
2475 copies = {}
2475 copies = {}
2476 def grepbody(fn, rev, body):
2476 def grepbody(fn, rev, body):
2477 matches[rev].setdefault(fn, [])
2477 matches[rev].setdefault(fn, [])
2478 m = matches[rev][fn]
2478 m = matches[rev][fn]
2479 for lnum, cstart, cend, line in matchlines(body):
2479 for lnum, cstart, cend, line in matchlines(body):
2480 s = linestate(line, lnum, cstart, cend)
2480 s = linestate(line, lnum, cstart, cend)
2481 m.append(s)
2481 m.append(s)
2482
2482
2483 def difflinestates(a, b):
2483 def difflinestates(a, b):
2484 sm = difflib.SequenceMatcher(None, a, b)
2484 sm = difflib.SequenceMatcher(None, a, b)
2485 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2485 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2486 if tag == 'insert':
2486 if tag == 'insert':
2487 for i in xrange(blo, bhi):
2487 for i in xrange(blo, bhi):
2488 yield ('+', b[i])
2488 yield ('+', b[i])
2489 elif tag == 'delete':
2489 elif tag == 'delete':
2490 for i in xrange(alo, ahi):
2490 for i in xrange(alo, ahi):
2491 yield ('-', a[i])
2491 yield ('-', a[i])
2492 elif tag == 'replace':
2492 elif tag == 'replace':
2493 for i in xrange(alo, ahi):
2493 for i in xrange(alo, ahi):
2494 yield ('-', a[i])
2494 yield ('-', a[i])
2495 for i in xrange(blo, bhi):
2495 for i in xrange(blo, bhi):
2496 yield ('+', b[i])
2496 yield ('+', b[i])
2497
2497
2498 def display(fm, fn, ctx, pstates, states):
2498 def display(fm, fn, ctx, pstates, states):
2499 rev = ctx.rev()
2499 rev = ctx.rev()
2500 if fm.isplain():
2500 if fm.isplain():
2501 formatuser = ui.shortuser
2501 formatuser = ui.shortuser
2502 else:
2502 else:
2503 formatuser = str
2503 formatuser = str
2504 if ui.quiet:
2504 if ui.quiet:
2505 datefmt = '%Y-%m-%d'
2505 datefmt = '%Y-%m-%d'
2506 else:
2506 else:
2507 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2507 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2508 found = False
2508 found = False
2509 @util.cachefunc
2509 @util.cachefunc
2510 def binary():
2510 def binary():
2511 flog = getfile(fn)
2511 flog = getfile(fn)
2512 return util.binary(flog.read(ctx.filenode(fn)))
2512 return util.binary(flog.read(ctx.filenode(fn)))
2513
2513
2514 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2514 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2515 if opts.get('all'):
2515 if opts.get('all'):
2516 iter = difflinestates(pstates, states)
2516 iter = difflinestates(pstates, states)
2517 else:
2517 else:
2518 iter = [('', l) for l in states]
2518 iter = [('', l) for l in states]
2519 for change, l in iter:
2519 for change, l in iter:
2520 fm.startitem()
2520 fm.startitem()
2521 fm.data(node=fm.hexfunc(ctx.node()))
2521 fm.data(node=fm.hexfunc(ctx.node()))
2522 cols = [
2522 cols = [
2523 ('filename', fn, True),
2523 ('filename', fn, True),
2524 ('rev', rev, True),
2524 ('rev', rev, True),
2525 ('linenumber', l.linenum, opts.get('line_number')),
2525 ('linenumber', l.linenum, opts.get('line_number')),
2526 ]
2526 ]
2527 if opts.get('all'):
2527 if opts.get('all'):
2528 cols.append(('change', change, True))
2528 cols.append(('change', change, True))
2529 cols.extend([
2529 cols.extend([
2530 ('user', formatuser(ctx.user()), opts.get('user')),
2530 ('user', formatuser(ctx.user()), opts.get('user')),
2531 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2531 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2532 ])
2532 ])
2533 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2533 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2534 for name, data, cond in cols:
2534 for name, data, cond in cols:
2535 field = fieldnamemap.get(name, name)
2535 field = fieldnamemap.get(name, name)
2536 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2536 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2537 if cond and name != lastcol:
2537 if cond and name != lastcol:
2538 fm.plain(sep, label='grep.sep')
2538 fm.plain(sep, label='grep.sep')
2539 if not opts.get('files_with_matches'):
2539 if not opts.get('files_with_matches'):
2540 fm.plain(sep, label='grep.sep')
2540 fm.plain(sep, label='grep.sep')
2541 if not opts.get('text') and binary():
2541 if not opts.get('text') and binary():
2542 fm.plain(_(" Binary file matches"))
2542 fm.plain(_(" Binary file matches"))
2543 else:
2543 else:
2544 displaymatches(fm.nested('texts'), l)
2544 displaymatches(fm.nested('texts'), l)
2545 fm.plain(eol)
2545 fm.plain(eol)
2546 found = True
2546 found = True
2547 if opts.get('files_with_matches'):
2547 if opts.get('files_with_matches'):
2548 break
2548 break
2549 return found
2549 return found
2550
2550
2551 def displaymatches(fm, l):
2551 def displaymatches(fm, l):
2552 p = 0
2552 p = 0
2553 for s, e in l.findpos():
2553 for s, e in l.findpos():
2554 if p < s:
2554 if p < s:
2555 fm.startitem()
2555 fm.startitem()
2556 fm.write('text', '%s', l.line[p:s])
2556 fm.write('text', '%s', l.line[p:s])
2557 fm.data(matched=False)
2557 fm.data(matched=False)
2558 fm.startitem()
2558 fm.startitem()
2559 fm.write('text', '%s', l.line[s:e], label='grep.match')
2559 fm.write('text', '%s', l.line[s:e], label='grep.match')
2560 fm.data(matched=True)
2560 fm.data(matched=True)
2561 p = e
2561 p = e
2562 if p < len(l.line):
2562 if p < len(l.line):
2563 fm.startitem()
2563 fm.startitem()
2564 fm.write('text', '%s', l.line[p:])
2564 fm.write('text', '%s', l.line[p:])
2565 fm.data(matched=False)
2565 fm.data(matched=False)
2566 fm.end()
2566 fm.end()
2567
2567
2568 skip = {}
2568 skip = {}
2569 revfiles = {}
2569 revfiles = {}
2570 matchfn = scmutil.match(repo[None], pats, opts)
2570 matchfn = scmutil.match(repo[None], pats, opts)
2571 found = False
2571 found = False
2572 follow = opts.get('follow')
2572 follow = opts.get('follow')
2573
2573
2574 def prep(ctx, fns):
2574 def prep(ctx, fns):
2575 rev = ctx.rev()
2575 rev = ctx.rev()
2576 pctx = ctx.p1()
2576 pctx = ctx.p1()
2577 parent = pctx.rev()
2577 parent = pctx.rev()
2578 matches.setdefault(rev, {})
2578 matches.setdefault(rev, {})
2579 matches.setdefault(parent, {})
2579 matches.setdefault(parent, {})
2580 files = revfiles.setdefault(rev, [])
2580 files = revfiles.setdefault(rev, [])
2581 for fn in fns:
2581 for fn in fns:
2582 flog = getfile(fn)
2582 flog = getfile(fn)
2583 try:
2583 try:
2584 fnode = ctx.filenode(fn)
2584 fnode = ctx.filenode(fn)
2585 except error.LookupError:
2585 except error.LookupError:
2586 continue
2586 continue
2587
2587
2588 copied = flog.renamed(fnode)
2588 copied = flog.renamed(fnode)
2589 copy = follow and copied and copied[0]
2589 copy = follow and copied and copied[0]
2590 if copy:
2590 if copy:
2591 copies.setdefault(rev, {})[fn] = copy
2591 copies.setdefault(rev, {})[fn] = copy
2592 if fn in skip:
2592 if fn in skip:
2593 if copy:
2593 if copy:
2594 skip[copy] = True
2594 skip[copy] = True
2595 continue
2595 continue
2596 files.append(fn)
2596 files.append(fn)
2597
2597
2598 if fn not in matches[rev]:
2598 if fn not in matches[rev]:
2599 grepbody(fn, rev, flog.read(fnode))
2599 grepbody(fn, rev, flog.read(fnode))
2600
2600
2601 pfn = copy or fn
2601 pfn = copy or fn
2602 if pfn not in matches[parent]:
2602 if pfn not in matches[parent]:
2603 try:
2603 try:
2604 fnode = pctx.filenode(pfn)
2604 fnode = pctx.filenode(pfn)
2605 grepbody(pfn, parent, flog.read(fnode))
2605 grepbody(pfn, parent, flog.read(fnode))
2606 except error.LookupError:
2606 except error.LookupError:
2607 pass
2607 pass
2608
2608
2609 ui.pager('grep')
2609 ui.pager('grep')
2610 fm = ui.formatter('grep', opts)
2610 fm = ui.formatter('grep', opts)
2611 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2611 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2612 rev = ctx.rev()
2612 rev = ctx.rev()
2613 parent = ctx.p1().rev()
2613 parent = ctx.p1().rev()
2614 for fn in sorted(revfiles.get(rev, [])):
2614 for fn in sorted(revfiles.get(rev, [])):
2615 states = matches[rev][fn]
2615 states = matches[rev][fn]
2616 copy = copies.get(rev, {}).get(fn)
2616 copy = copies.get(rev, {}).get(fn)
2617 if fn in skip:
2617 if fn in skip:
2618 if copy:
2618 if copy:
2619 skip[copy] = True
2619 skip[copy] = True
2620 continue
2620 continue
2621 pstates = matches.get(parent, {}).get(copy or fn, [])
2621 pstates = matches.get(parent, {}).get(copy or fn, [])
2622 if pstates or states:
2622 if pstates or states:
2623 r = display(fm, fn, ctx, pstates, states)
2623 r = display(fm, fn, ctx, pstates, states)
2624 found = found or r
2624 found = found or r
2625 if r and not opts.get('all'):
2625 if r and not opts.get('all'):
2626 skip[fn] = True
2626 skip[fn] = True
2627 if copy:
2627 if copy:
2628 skip[copy] = True
2628 skip[copy] = True
2629 del matches[rev]
2629 del matches[rev]
2630 del revfiles[rev]
2630 del revfiles[rev]
2631 fm.end()
2631 fm.end()
2632
2632
2633 return not found
2633 return not found
2634
2634
2635 @command('heads',
2635 @command('heads',
2636 [('r', 'rev', '',
2636 [('r', 'rev', '',
2637 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2637 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2638 ('t', 'topo', False, _('show topological heads only')),
2638 ('t', 'topo', False, _('show topological heads only')),
2639 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2639 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2640 ('c', 'closed', False, _('show normal and closed branch heads')),
2640 ('c', 'closed', False, _('show normal and closed branch heads')),
2641 ] + templateopts,
2641 ] + templateopts,
2642 _('[-ct] [-r STARTREV] [REV]...'))
2642 _('[-ct] [-r STARTREV] [REV]...'))
2643 def heads(ui, repo, *branchrevs, **opts):
2643 def heads(ui, repo, *branchrevs, **opts):
2644 """show branch heads
2644 """show branch heads
2645
2645
2646 With no arguments, show all open branch heads in the repository.
2646 With no arguments, show all open branch heads in the repository.
2647 Branch heads are changesets that have no descendants on the
2647 Branch heads are changesets that have no descendants on the
2648 same branch. They are where development generally takes place and
2648 same branch. They are where development generally takes place and
2649 are the usual targets for update and merge operations.
2649 are the usual targets for update and merge operations.
2650
2650
2651 If one or more REVs are given, only open branch heads on the
2651 If one or more REVs are given, only open branch heads on the
2652 branches associated with the specified changesets are shown. This
2652 branches associated with the specified changesets are shown. This
2653 means that you can use :hg:`heads .` to see the heads on the
2653 means that you can use :hg:`heads .` to see the heads on the
2654 currently checked-out branch.
2654 currently checked-out branch.
2655
2655
2656 If -c/--closed is specified, also show branch heads marked closed
2656 If -c/--closed is specified, also show branch heads marked closed
2657 (see :hg:`commit --close-branch`).
2657 (see :hg:`commit --close-branch`).
2658
2658
2659 If STARTREV is specified, only those heads that are descendants of
2659 If STARTREV is specified, only those heads that are descendants of
2660 STARTREV will be displayed.
2660 STARTREV will be displayed.
2661
2661
2662 If -t/--topo is specified, named branch mechanics will be ignored and only
2662 If -t/--topo is specified, named branch mechanics will be ignored and only
2663 topological heads (changesets with no children) will be shown.
2663 topological heads (changesets with no children) will be shown.
2664
2664
2665 Returns 0 if matching heads are found, 1 if not.
2665 Returns 0 if matching heads are found, 1 if not.
2666 """
2666 """
2667
2667
2668 start = None
2668 start = None
2669 if 'rev' in opts:
2669 if 'rev' in opts:
2670 start = scmutil.revsingle(repo, opts['rev'], None).node()
2670 start = scmutil.revsingle(repo, opts['rev'], None).node()
2671
2671
2672 if opts.get('topo'):
2672 if opts.get('topo'):
2673 heads = [repo[h] for h in repo.heads(start)]
2673 heads = [repo[h] for h in repo.heads(start)]
2674 else:
2674 else:
2675 heads = []
2675 heads = []
2676 for branch in repo.branchmap():
2676 for branch in repo.branchmap():
2677 heads += repo.branchheads(branch, start, opts.get('closed'))
2677 heads += repo.branchheads(branch, start, opts.get('closed'))
2678 heads = [repo[h] for h in heads]
2678 heads = [repo[h] for h in heads]
2679
2679
2680 if branchrevs:
2680 if branchrevs:
2681 branches = set(repo[br].branch() for br in branchrevs)
2681 branches = set(repo[br].branch() for br in branchrevs)
2682 heads = [h for h in heads if h.branch() in branches]
2682 heads = [h for h in heads if h.branch() in branches]
2683
2683
2684 if opts.get('active') and branchrevs:
2684 if opts.get('active') and branchrevs:
2685 dagheads = repo.heads(start)
2685 dagheads = repo.heads(start)
2686 heads = [h for h in heads if h.node() in dagheads]
2686 heads = [h for h in heads if h.node() in dagheads]
2687
2687
2688 if branchrevs:
2688 if branchrevs:
2689 haveheads = set(h.branch() for h in heads)
2689 haveheads = set(h.branch() for h in heads)
2690 if branches - haveheads:
2690 if branches - haveheads:
2691 headless = ', '.join(b for b in branches - haveheads)
2691 headless = ', '.join(b for b in branches - haveheads)
2692 msg = _('no open branch heads found on branches %s')
2692 msg = _('no open branch heads found on branches %s')
2693 if opts.get('rev'):
2693 if opts.get('rev'):
2694 msg += _(' (started at %s)') % opts['rev']
2694 msg += _(' (started at %s)') % opts['rev']
2695 ui.warn((msg + '\n') % headless)
2695 ui.warn((msg + '\n') % headless)
2696
2696
2697 if not heads:
2697 if not heads:
2698 return 1
2698 return 1
2699
2699
2700 heads = sorted(heads, key=lambda x: -x.rev())
2700 heads = sorted(heads, key=lambda x: -x.rev())
2701 displayer = cmdutil.show_changeset(ui, repo, opts)
2701 displayer = cmdutil.show_changeset(ui, repo, opts)
2702 for ctx in heads:
2702 for ctx in heads:
2703 displayer.show(ctx)
2703 displayer.show(ctx)
2704 displayer.close()
2704 displayer.close()
2705
2705
2706 @command('help',
2706 @command('help',
2707 [('e', 'extension', None, _('show only help for extensions')),
2707 [('e', 'extension', None, _('show only help for extensions')),
2708 ('c', 'command', None, _('show only help for commands')),
2708 ('c', 'command', None, _('show only help for commands')),
2709 ('k', 'keyword', None, _('show topics matching keyword')),
2709 ('k', 'keyword', None, _('show topics matching keyword')),
2710 ('s', 'system', [], _('show help for specific platform(s)')),
2710 ('s', 'system', [], _('show help for specific platform(s)')),
2711 ],
2711 ],
2712 _('[-ecks] [TOPIC]'),
2712 _('[-ecks] [TOPIC]'),
2713 norepo=True)
2713 norepo=True)
2714 def help_(ui, name=None, **opts):
2714 def help_(ui, name=None, **opts):
2715 """show help for a given topic or a help overview
2715 """show help for a given topic or a help overview
2716
2716
2717 With no arguments, print a list of commands with short help messages.
2717 With no arguments, print a list of commands with short help messages.
2718
2718
2719 Given a topic, extension, or command name, print help for that
2719 Given a topic, extension, or command name, print help for that
2720 topic.
2720 topic.
2721
2721
2722 Returns 0 if successful.
2722 Returns 0 if successful.
2723 """
2723 """
2724 textwidth = ui.configint('ui', 'textwidth', 78)
2724 textwidth = ui.configint('ui', 'textwidth', 78)
2725 termwidth = ui.termwidth() - 2
2725 termwidth = ui.termwidth() - 2
2726 if textwidth <= 0 or termwidth < textwidth:
2726 if textwidth <= 0 or termwidth < textwidth:
2727 textwidth = termwidth
2727 textwidth = termwidth
2728
2728
2729 keep = opts.get('system') or []
2729 keep = opts.get('system') or []
2730 if len(keep) == 0:
2730 if len(keep) == 0:
2731 if pycompat.sysplatform.startswith('win'):
2731 if pycompat.sysplatform.startswith('win'):
2732 keep.append('windows')
2732 keep.append('windows')
2733 elif pycompat.sysplatform == 'OpenVMS':
2733 elif pycompat.sysplatform == 'OpenVMS':
2734 keep.append('vms')
2734 keep.append('vms')
2735 elif pycompat.sysplatform == 'plan9':
2735 elif pycompat.sysplatform == 'plan9':
2736 keep.append('plan9')
2736 keep.append('plan9')
2737 else:
2737 else:
2738 keep.append('unix')
2738 keep.append('unix')
2739 keep.append(pycompat.sysplatform.lower())
2739 keep.append(pycompat.sysplatform.lower())
2740 if ui.verbose:
2740 if ui.verbose:
2741 keep.append('verbose')
2741 keep.append('verbose')
2742
2742
2743 fullname = name
2743 fullname = name
2744 section = None
2744 section = None
2745 subtopic = None
2745 subtopic = None
2746 if name and '.' in name:
2746 if name and '.' in name:
2747 name, remaining = name.split('.', 1)
2747 name, remaining = name.split('.', 1)
2748 remaining = encoding.lower(remaining)
2748 remaining = encoding.lower(remaining)
2749 if '.' in remaining:
2749 if '.' in remaining:
2750 subtopic, section = remaining.split('.', 1)
2750 subtopic, section = remaining.split('.', 1)
2751 else:
2751 else:
2752 if name in help.subtopics:
2752 if name in help.subtopics:
2753 subtopic = remaining
2753 subtopic = remaining
2754 else:
2754 else:
2755 section = remaining
2755 section = remaining
2756
2756
2757 text = help.help_(ui, name, subtopic=subtopic, **opts)
2757 text = help.help_(ui, name, subtopic=subtopic, **opts)
2758
2758
2759 formatted, pruned = minirst.format(text, textwidth, keep=keep,
2759 formatted, pruned = minirst.format(text, textwidth, keep=keep,
2760 section=section)
2760 section=section)
2761
2761
2762 # We could have been given a weird ".foo" section without a name
2762 # We could have been given a weird ".foo" section without a name
2763 # to look for, or we could have simply failed to found "foo.bar"
2763 # to look for, or we could have simply failed to found "foo.bar"
2764 # because bar isn't a section of foo
2764 # because bar isn't a section of foo
2765 if section and not (formatted and name):
2765 if section and not (formatted and name):
2766 raise error.Abort(_("help section not found: %s") % fullname)
2766 raise error.Abort(_("help section not found: %s") % fullname)
2767
2767
2768 if 'verbose' in pruned:
2768 if 'verbose' in pruned:
2769 keep.append('omitted')
2769 keep.append('omitted')
2770 else:
2770 else:
2771 keep.append('notomitted')
2771 keep.append('notomitted')
2772 formatted, pruned = minirst.format(text, textwidth, keep=keep,
2772 formatted, pruned = minirst.format(text, textwidth, keep=keep,
2773 section=section)
2773 section=section)
2774 ui.pager('help')
2774 ui.pager('help')
2775 ui.write(formatted)
2775 ui.write(formatted)
2776
2776
2777
2777
2778 @command('identify|id',
2778 @command('identify|id',
2779 [('r', 'rev', '',
2779 [('r', 'rev', '',
2780 _('identify the specified revision'), _('REV')),
2780 _('identify the specified revision'), _('REV')),
2781 ('n', 'num', None, _('show local revision number')),
2781 ('n', 'num', None, _('show local revision number')),
2782 ('i', 'id', None, _('show global revision id')),
2782 ('i', 'id', None, _('show global revision id')),
2783 ('b', 'branch', None, _('show branch')),
2783 ('b', 'branch', None, _('show branch')),
2784 ('t', 'tags', None, _('show tags')),
2784 ('t', 'tags', None, _('show tags')),
2785 ('B', 'bookmarks', None, _('show bookmarks')),
2785 ('B', 'bookmarks', None, _('show bookmarks')),
2786 ] + remoteopts,
2786 ] + remoteopts,
2787 _('[-nibtB] [-r REV] [SOURCE]'),
2787 _('[-nibtB] [-r REV] [SOURCE]'),
2788 optionalrepo=True)
2788 optionalrepo=True)
2789 def identify(ui, repo, source=None, rev=None,
2789 def identify(ui, repo, source=None, rev=None,
2790 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2790 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2791 """identify the working directory or specified revision
2791 """identify the working directory or specified revision
2792
2792
2793 Print a summary identifying the repository state at REV using one or
2793 Print a summary identifying the repository state at REV using one or
2794 two parent hash identifiers, followed by a "+" if the working
2794 two parent hash identifiers, followed by a "+" if the working
2795 directory has uncommitted changes, the branch name (if not default),
2795 directory has uncommitted changes, the branch name (if not default),
2796 a list of tags, and a list of bookmarks.
2796 a list of tags, and a list of bookmarks.
2797
2797
2798 When REV is not given, print a summary of the current state of the
2798 When REV is not given, print a summary of the current state of the
2799 repository.
2799 repository.
2800
2800
2801 Specifying a path to a repository root or Mercurial bundle will
2801 Specifying a path to a repository root or Mercurial bundle will
2802 cause lookup to operate on that repository/bundle.
2802 cause lookup to operate on that repository/bundle.
2803
2803
2804 .. container:: verbose
2804 .. container:: verbose
2805
2805
2806 Examples:
2806 Examples:
2807
2807
2808 - generate a build identifier for the working directory::
2808 - generate a build identifier for the working directory::
2809
2809
2810 hg id --id > build-id.dat
2810 hg id --id > build-id.dat
2811
2811
2812 - find the revision corresponding to a tag::
2812 - find the revision corresponding to a tag::
2813
2813
2814 hg id -n -r 1.3
2814 hg id -n -r 1.3
2815
2815
2816 - check the most recent revision of a remote repository::
2816 - check the most recent revision of a remote repository::
2817
2817
2818 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2818 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2819
2819
2820 See :hg:`log` for generating more information about specific revisions,
2820 See :hg:`log` for generating more information about specific revisions,
2821 including full hash identifiers.
2821 including full hash identifiers.
2822
2822
2823 Returns 0 if successful.
2823 Returns 0 if successful.
2824 """
2824 """
2825
2825
2826 if not repo and not source:
2826 if not repo and not source:
2827 raise error.Abort(_("there is no Mercurial repository here "
2827 raise error.Abort(_("there is no Mercurial repository here "
2828 "(.hg not found)"))
2828 "(.hg not found)"))
2829
2829
2830 if ui.debugflag:
2830 if ui.debugflag:
2831 hexfunc = hex
2831 hexfunc = hex
2832 else:
2832 else:
2833 hexfunc = short
2833 hexfunc = short
2834 default = not (num or id or branch or tags or bookmarks)
2834 default = not (num or id or branch or tags or bookmarks)
2835 output = []
2835 output = []
2836 revs = []
2836 revs = []
2837
2837
2838 if source:
2838 if source:
2839 source, branches = hg.parseurl(ui.expandpath(source))
2839 source, branches = hg.parseurl(ui.expandpath(source))
2840 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2840 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2841 repo = peer.local()
2841 repo = peer.local()
2842 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2842 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2843
2843
2844 if not repo:
2844 if not repo:
2845 if num or branch or tags:
2845 if num or branch or tags:
2846 raise error.Abort(
2846 raise error.Abort(
2847 _("can't query remote revision number, branch, or tags"))
2847 _("can't query remote revision number, branch, or tags"))
2848 if not rev and revs:
2848 if not rev and revs:
2849 rev = revs[0]
2849 rev = revs[0]
2850 if not rev:
2850 if not rev:
2851 rev = "tip"
2851 rev = "tip"
2852
2852
2853 remoterev = peer.lookup(rev)
2853 remoterev = peer.lookup(rev)
2854 if default or id:
2854 if default or id:
2855 output = [hexfunc(remoterev)]
2855 output = [hexfunc(remoterev)]
2856
2856
2857 def getbms():
2857 def getbms():
2858 bms = []
2858 bms = []
2859
2859
2860 if 'bookmarks' in peer.listkeys('namespaces'):
2860 if 'bookmarks' in peer.listkeys('namespaces'):
2861 hexremoterev = hex(remoterev)
2861 hexremoterev = hex(remoterev)
2862 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2862 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2863 if bmr == hexremoterev]
2863 if bmr == hexremoterev]
2864
2864
2865 return sorted(bms)
2865 return sorted(bms)
2866
2866
2867 if bookmarks:
2867 if bookmarks:
2868 output.extend(getbms())
2868 output.extend(getbms())
2869 elif default and not ui.quiet:
2869 elif default and not ui.quiet:
2870 # multiple bookmarks for a single parent separated by '/'
2870 # multiple bookmarks for a single parent separated by '/'
2871 bm = '/'.join(getbms())
2871 bm = '/'.join(getbms())
2872 if bm:
2872 if bm:
2873 output.append(bm)
2873 output.append(bm)
2874 else:
2874 else:
2875 ctx = scmutil.revsingle(repo, rev, None)
2875 ctx = scmutil.revsingle(repo, rev, None)
2876
2876
2877 if ctx.rev() is None:
2877 if ctx.rev() is None:
2878 ctx = repo[None]
2878 ctx = repo[None]
2879 parents = ctx.parents()
2879 parents = ctx.parents()
2880 taglist = []
2880 taglist = []
2881 for p in parents:
2881 for p in parents:
2882 taglist.extend(p.tags())
2882 taglist.extend(p.tags())
2883
2883
2884 changed = ""
2884 changed = ""
2885 if default or id or num:
2885 if default or id or num:
2886 if (any(repo.status())
2886 if (any(repo.status())
2887 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2887 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2888 changed = '+'
2888 changed = '+'
2889 if default or id:
2889 if default or id:
2890 output = ["%s%s" %
2890 output = ["%s%s" %
2891 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2891 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2892 if num:
2892 if num:
2893 output.append("%s%s" %
2893 output.append("%s%s" %
2894 ('+'.join([str(p.rev()) for p in parents]), changed))
2894 ('+'.join([str(p.rev()) for p in parents]), changed))
2895 else:
2895 else:
2896 if default or id:
2896 if default or id:
2897 output = [hexfunc(ctx.node())]
2897 output = [hexfunc(ctx.node())]
2898 if num:
2898 if num:
2899 output.append(str(ctx.rev()))
2899 output.append(str(ctx.rev()))
2900 taglist = ctx.tags()
2900 taglist = ctx.tags()
2901
2901
2902 if default and not ui.quiet:
2902 if default and not ui.quiet:
2903 b = ctx.branch()
2903 b = ctx.branch()
2904 if b != 'default':
2904 if b != 'default':
2905 output.append("(%s)" % b)
2905 output.append("(%s)" % b)
2906
2906
2907 # multiple tags for a single parent separated by '/'
2907 # multiple tags for a single parent separated by '/'
2908 t = '/'.join(taglist)
2908 t = '/'.join(taglist)
2909 if t:
2909 if t:
2910 output.append(t)
2910 output.append(t)
2911
2911
2912 # multiple bookmarks for a single parent separated by '/'
2912 # multiple bookmarks for a single parent separated by '/'
2913 bm = '/'.join(ctx.bookmarks())
2913 bm = '/'.join(ctx.bookmarks())
2914 if bm:
2914 if bm:
2915 output.append(bm)
2915 output.append(bm)
2916 else:
2916 else:
2917 if branch:
2917 if branch:
2918 output.append(ctx.branch())
2918 output.append(ctx.branch())
2919
2919
2920 if tags:
2920 if tags:
2921 output.extend(taglist)
2921 output.extend(taglist)
2922
2922
2923 if bookmarks:
2923 if bookmarks:
2924 output.extend(ctx.bookmarks())
2924 output.extend(ctx.bookmarks())
2925
2925
2926 ui.write("%s\n" % ' '.join(output))
2926 ui.write("%s\n" % ' '.join(output))
2927
2927
2928 @command('import|patch',
2928 @command('import|patch',
2929 [('p', 'strip', 1,
2929 [('p', 'strip', 1,
2930 _('directory strip option for patch. This has the same '
2930 _('directory strip option for patch. This has the same '
2931 'meaning as the corresponding patch option'), _('NUM')),
2931 'meaning as the corresponding patch option'), _('NUM')),
2932 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2932 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2933 ('e', 'edit', False, _('invoke editor on commit messages')),
2933 ('e', 'edit', False, _('invoke editor on commit messages')),
2934 ('f', 'force', None,
2934 ('f', 'force', None,
2935 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2935 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2936 ('', 'no-commit', None,
2936 ('', 'no-commit', None,
2937 _("don't commit, just update the working directory")),
2937 _("don't commit, just update the working directory")),
2938 ('', 'bypass', None,
2938 ('', 'bypass', None,
2939 _("apply patch without touching the working directory")),
2939 _("apply patch without touching the working directory")),
2940 ('', 'partial', None,
2940 ('', 'partial', None,
2941 _('commit even if some hunks fail')),
2941 _('commit even if some hunks fail')),
2942 ('', 'exact', None,
2942 ('', 'exact', None,
2943 _('abort if patch would apply lossily')),
2943 _('abort if patch would apply lossily')),
2944 ('', 'prefix', '',
2944 ('', 'prefix', '',
2945 _('apply patch to subdirectory'), _('DIR')),
2945 _('apply patch to subdirectory'), _('DIR')),
2946 ('', 'import-branch', None,
2946 ('', 'import-branch', None,
2947 _('use any branch information in patch (implied by --exact)'))] +
2947 _('use any branch information in patch (implied by --exact)'))] +
2948 commitopts + commitopts2 + similarityopts,
2948 commitopts + commitopts2 + similarityopts,
2949 _('[OPTION]... PATCH...'))
2949 _('[OPTION]... PATCH...'))
2950 def import_(ui, repo, patch1=None, *patches, **opts):
2950 def import_(ui, repo, patch1=None, *patches, **opts):
2951 """import an ordered set of patches
2951 """import an ordered set of patches
2952
2952
2953 Import a list of patches and commit them individually (unless
2953 Import a list of patches and commit them individually (unless
2954 --no-commit is specified).
2954 --no-commit is specified).
2955
2955
2956 To read a patch from standard input (stdin), use "-" as the patch
2956 To read a patch from standard input (stdin), use "-" as the patch
2957 name. If a URL is specified, the patch will be downloaded from
2957 name. If a URL is specified, the patch will be downloaded from
2958 there.
2958 there.
2959
2959
2960 Import first applies changes to the working directory (unless
2960 Import first applies changes to the working directory (unless
2961 --bypass is specified), import will abort if there are outstanding
2961 --bypass is specified), import will abort if there are outstanding
2962 changes.
2962 changes.
2963
2963
2964 Use --bypass to apply and commit patches directly to the
2964 Use --bypass to apply and commit patches directly to the
2965 repository, without affecting the working directory. Without
2965 repository, without affecting the working directory. Without
2966 --exact, patches will be applied on top of the working directory
2966 --exact, patches will be applied on top of the working directory
2967 parent revision.
2967 parent revision.
2968
2968
2969 You can import a patch straight from a mail message. Even patches
2969 You can import a patch straight from a mail message. Even patches
2970 as attachments work (to use the body part, it must have type
2970 as attachments work (to use the body part, it must have type
2971 text/plain or text/x-patch). From and Subject headers of email
2971 text/plain or text/x-patch). From and Subject headers of email
2972 message are used as default committer and commit message. All
2972 message are used as default committer and commit message. All
2973 text/plain body parts before first diff are added to the commit
2973 text/plain body parts before first diff are added to the commit
2974 message.
2974 message.
2975
2975
2976 If the imported patch was generated by :hg:`export`, user and
2976 If the imported patch was generated by :hg:`export`, user and
2977 description from patch override values from message headers and
2977 description from patch override values from message headers and
2978 body. Values given on command line with -m/--message and -u/--user
2978 body. Values given on command line with -m/--message and -u/--user
2979 override these.
2979 override these.
2980
2980
2981 If --exact is specified, import will set the working directory to
2981 If --exact is specified, import will set the working directory to
2982 the parent of each patch before applying it, and will abort if the
2982 the parent of each patch before applying it, and will abort if the
2983 resulting changeset has a different ID than the one recorded in
2983 resulting changeset has a different ID than the one recorded in
2984 the patch. This will guard against various ways that portable
2984 the patch. This will guard against various ways that portable
2985 patch formats and mail systems might fail to transfer Mercurial
2985 patch formats and mail systems might fail to transfer Mercurial
2986 data or metadata. See :hg:`bundle` for lossless transmission.
2986 data or metadata. See :hg:`bundle` for lossless transmission.
2987
2987
2988 Use --partial to ensure a changeset will be created from the patch
2988 Use --partial to ensure a changeset will be created from the patch
2989 even if some hunks fail to apply. Hunks that fail to apply will be
2989 even if some hunks fail to apply. Hunks that fail to apply will be
2990 written to a <target-file>.rej file. Conflicts can then be resolved
2990 written to a <target-file>.rej file. Conflicts can then be resolved
2991 by hand before :hg:`commit --amend` is run to update the created
2991 by hand before :hg:`commit --amend` is run to update the created
2992 changeset. This flag exists to let people import patches that
2992 changeset. This flag exists to let people import patches that
2993 partially apply without losing the associated metadata (author,
2993 partially apply without losing the associated metadata (author,
2994 date, description, ...).
2994 date, description, ...).
2995
2995
2996 .. note::
2996 .. note::
2997
2997
2998 When no hunks apply cleanly, :hg:`import --partial` will create
2998 When no hunks apply cleanly, :hg:`import --partial` will create
2999 an empty changeset, importing only the patch metadata.
2999 an empty changeset, importing only the patch metadata.
3000
3000
3001 With -s/--similarity, hg will attempt to discover renames and
3001 With -s/--similarity, hg will attempt to discover renames and
3002 copies in the patch in the same way as :hg:`addremove`.
3002 copies in the patch in the same way as :hg:`addremove`.
3003
3003
3004 It is possible to use external patch programs to perform the patch
3004 It is possible to use external patch programs to perform the patch
3005 by setting the ``ui.patch`` configuration option. For the default
3005 by setting the ``ui.patch`` configuration option. For the default
3006 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3006 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3007 See :hg:`help config` for more information about configuration
3007 See :hg:`help config` for more information about configuration
3008 files and how to use these options.
3008 files and how to use these options.
3009
3009
3010 See :hg:`help dates` for a list of formats valid for -d/--date.
3010 See :hg:`help dates` for a list of formats valid for -d/--date.
3011
3011
3012 .. container:: verbose
3012 .. container:: verbose
3013
3013
3014 Examples:
3014 Examples:
3015
3015
3016 - import a traditional patch from a website and detect renames::
3016 - import a traditional patch from a website and detect renames::
3017
3017
3018 hg import -s 80 http://example.com/bugfix.patch
3018 hg import -s 80 http://example.com/bugfix.patch
3019
3019
3020 - import a changeset from an hgweb server::
3020 - import a changeset from an hgweb server::
3021
3021
3022 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3022 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3023
3023
3024 - import all the patches in an Unix-style mbox::
3024 - import all the patches in an Unix-style mbox::
3025
3025
3026 hg import incoming-patches.mbox
3026 hg import incoming-patches.mbox
3027
3027
3028 - import patches from stdin::
3028 - import patches from stdin::
3029
3029
3030 hg import -
3030 hg import -
3031
3031
3032 - attempt to exactly restore an exported changeset (not always
3032 - attempt to exactly restore an exported changeset (not always
3033 possible)::
3033 possible)::
3034
3034
3035 hg import --exact proposed-fix.patch
3035 hg import --exact proposed-fix.patch
3036
3036
3037 - use an external tool to apply a patch which is too fuzzy for
3037 - use an external tool to apply a patch which is too fuzzy for
3038 the default internal tool.
3038 the default internal tool.
3039
3039
3040 hg import --config ui.patch="patch --merge" fuzzy.patch
3040 hg import --config ui.patch="patch --merge" fuzzy.patch
3041
3041
3042 - change the default fuzzing from 2 to a less strict 7
3042 - change the default fuzzing from 2 to a less strict 7
3043
3043
3044 hg import --config ui.fuzz=7 fuzz.patch
3044 hg import --config ui.fuzz=7 fuzz.patch
3045
3045
3046 Returns 0 on success, 1 on partial success (see --partial).
3046 Returns 0 on success, 1 on partial success (see --partial).
3047 """
3047 """
3048
3048
3049 if not patch1:
3049 if not patch1:
3050 raise error.Abort(_('need at least one patch to import'))
3050 raise error.Abort(_('need at least one patch to import'))
3051
3051
3052 patches = (patch1,) + patches
3052 patches = (patch1,) + patches
3053
3053
3054 date = opts.get('date')
3054 date = opts.get('date')
3055 if date:
3055 if date:
3056 opts['date'] = util.parsedate(date)
3056 opts['date'] = util.parsedate(date)
3057
3057
3058 exact = opts.get('exact')
3058 exact = opts.get('exact')
3059 update = not opts.get('bypass')
3059 update = not opts.get('bypass')
3060 if not update and opts.get('no_commit'):
3060 if not update and opts.get('no_commit'):
3061 raise error.Abort(_('cannot use --no-commit with --bypass'))
3061 raise error.Abort(_('cannot use --no-commit with --bypass'))
3062 try:
3062 try:
3063 sim = float(opts.get('similarity') or 0)
3063 sim = float(opts.get('similarity') or 0)
3064 except ValueError:
3064 except ValueError:
3065 raise error.Abort(_('similarity must be a number'))
3065 raise error.Abort(_('similarity must be a number'))
3066 if sim < 0 or sim > 100:
3066 if sim < 0 or sim > 100:
3067 raise error.Abort(_('similarity must be between 0 and 100'))
3067 raise error.Abort(_('similarity must be between 0 and 100'))
3068 if sim and not update:
3068 if sim and not update:
3069 raise error.Abort(_('cannot use --similarity with --bypass'))
3069 raise error.Abort(_('cannot use --similarity with --bypass'))
3070 if exact:
3070 if exact:
3071 if opts.get('edit'):
3071 if opts.get('edit'):
3072 raise error.Abort(_('cannot use --exact with --edit'))
3072 raise error.Abort(_('cannot use --exact with --edit'))
3073 if opts.get('prefix'):
3073 if opts.get('prefix'):
3074 raise error.Abort(_('cannot use --exact with --prefix'))
3074 raise error.Abort(_('cannot use --exact with --prefix'))
3075
3075
3076 base = opts["base"]
3076 base = opts["base"]
3077 wlock = dsguard = lock = tr = None
3077 wlock = dsguard = lock = tr = None
3078 msgs = []
3078 msgs = []
3079 ret = 0
3079 ret = 0
3080
3080
3081
3081
3082 try:
3082 try:
3083 wlock = repo.wlock()
3083 wlock = repo.wlock()
3084
3084
3085 if update:
3085 if update:
3086 cmdutil.checkunfinished(repo)
3086 cmdutil.checkunfinished(repo)
3087 if (exact or not opts.get('force')):
3087 if (exact or not opts.get('force')):
3088 cmdutil.bailifchanged(repo)
3088 cmdutil.bailifchanged(repo)
3089
3089
3090 if not opts.get('no_commit'):
3090 if not opts.get('no_commit'):
3091 lock = repo.lock()
3091 lock = repo.lock()
3092 tr = repo.transaction('import')
3092 tr = repo.transaction('import')
3093 else:
3093 else:
3094 dsguard = dirstateguard.dirstateguard(repo, 'import')
3094 dsguard = dirstateguard.dirstateguard(repo, 'import')
3095 parents = repo[None].parents()
3095 parents = repo[None].parents()
3096 for patchurl in patches:
3096 for patchurl in patches:
3097 if patchurl == '-':
3097 if patchurl == '-':
3098 ui.status(_('applying patch from stdin\n'))
3098 ui.status(_('applying patch from stdin\n'))
3099 patchfile = ui.fin
3099 patchfile = ui.fin
3100 patchurl = 'stdin' # for error message
3100 patchurl = 'stdin' # for error message
3101 else:
3101 else:
3102 patchurl = os.path.join(base, patchurl)
3102 patchurl = os.path.join(base, patchurl)
3103 ui.status(_('applying %s\n') % patchurl)
3103 ui.status(_('applying %s\n') % patchurl)
3104 patchfile = hg.openpath(ui, patchurl)
3104 patchfile = hg.openpath(ui, patchurl)
3105
3105
3106 haspatch = False
3106 haspatch = False
3107 for hunk in patch.split(patchfile):
3107 for hunk in patch.split(patchfile):
3108 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3108 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3109 parents, opts,
3109 parents, opts,
3110 msgs, hg.clean)
3110 msgs, hg.clean)
3111 if msg:
3111 if msg:
3112 haspatch = True
3112 haspatch = True
3113 ui.note(msg + '\n')
3113 ui.note(msg + '\n')
3114 if update or exact:
3114 if update or exact:
3115 parents = repo[None].parents()
3115 parents = repo[None].parents()
3116 else:
3116 else:
3117 parents = [repo[node]]
3117 parents = [repo[node]]
3118 if rej:
3118 if rej:
3119 ui.write_err(_("patch applied partially\n"))
3119 ui.write_err(_("patch applied partially\n"))
3120 ui.write_err(_("(fix the .rej files and run "
3120 ui.write_err(_("(fix the .rej files and run "
3121 "`hg commit --amend`)\n"))
3121 "`hg commit --amend`)\n"))
3122 ret = 1
3122 ret = 1
3123 break
3123 break
3124
3124
3125 if not haspatch:
3125 if not haspatch:
3126 raise error.Abort(_('%s: no diffs found') % patchurl)
3126 raise error.Abort(_('%s: no diffs found') % patchurl)
3127
3127
3128 if tr:
3128 if tr:
3129 tr.close()
3129 tr.close()
3130 if msgs:
3130 if msgs:
3131 repo.savecommitmessage('\n* * *\n'.join(msgs))
3131 repo.savecommitmessage('\n* * *\n'.join(msgs))
3132 if dsguard:
3132 if dsguard:
3133 dsguard.close()
3133 dsguard.close()
3134 return ret
3134 return ret
3135 finally:
3135 finally:
3136 if tr:
3136 if tr:
3137 tr.release()
3137 tr.release()
3138 release(lock, dsguard, wlock)
3138 release(lock, dsguard, wlock)
3139
3139
3140 @command('incoming|in',
3140 @command('incoming|in',
3141 [('f', 'force', None,
3141 [('f', 'force', None,
3142 _('run even if remote repository is unrelated')),
3142 _('run even if remote repository is unrelated')),
3143 ('n', 'newest-first', None, _('show newest record first')),
3143 ('n', 'newest-first', None, _('show newest record first')),
3144 ('', 'bundle', '',
3144 ('', 'bundle', '',
3145 _('file to store the bundles into'), _('FILE')),
3145 _('file to store the bundles into'), _('FILE')),
3146 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3146 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3147 ('B', 'bookmarks', False, _("compare bookmarks")),
3147 ('B', 'bookmarks', False, _("compare bookmarks")),
3148 ('b', 'branch', [],
3148 ('b', 'branch', [],
3149 _('a specific branch you would like to pull'), _('BRANCH')),
3149 _('a specific branch you would like to pull'), _('BRANCH')),
3150 ] + logopts + remoteopts + subrepoopts,
3150 ] + logopts + remoteopts + subrepoopts,
3151 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3151 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3152 def incoming(ui, repo, source="default", **opts):
3152 def incoming(ui, repo, source="default", **opts):
3153 """show new changesets found in source
3153 """show new changesets found in source
3154
3154
3155 Show new changesets found in the specified path/URL or the default
3155 Show new changesets found in the specified path/URL or the default
3156 pull location. These are the changesets that would have been pulled
3156 pull location. These are the changesets that would have been pulled
3157 if a pull at the time you issued this command.
3157 if a pull at the time you issued this command.
3158
3158
3159 See pull for valid source format details.
3159 See pull for valid source format details.
3160
3160
3161 .. container:: verbose
3161 .. container:: verbose
3162
3162
3163 With -B/--bookmarks, the result of bookmark comparison between
3163 With -B/--bookmarks, the result of bookmark comparison between
3164 local and remote repositories is displayed. With -v/--verbose,
3164 local and remote repositories is displayed. With -v/--verbose,
3165 status is also displayed for each bookmark like below::
3165 status is also displayed for each bookmark like below::
3166
3166
3167 BM1 01234567890a added
3167 BM1 01234567890a added
3168 BM2 1234567890ab advanced
3168 BM2 1234567890ab advanced
3169 BM3 234567890abc diverged
3169 BM3 234567890abc diverged
3170 BM4 34567890abcd changed
3170 BM4 34567890abcd changed
3171
3171
3172 The action taken locally when pulling depends on the
3172 The action taken locally when pulling depends on the
3173 status of each bookmark:
3173 status of each bookmark:
3174
3174
3175 :``added``: pull will create it
3175 :``added``: pull will create it
3176 :``advanced``: pull will update it
3176 :``advanced``: pull will update it
3177 :``diverged``: pull will create a divergent bookmark
3177 :``diverged``: pull will create a divergent bookmark
3178 :``changed``: result depends on remote changesets
3178 :``changed``: result depends on remote changesets
3179
3179
3180 From the point of view of pulling behavior, bookmark
3180 From the point of view of pulling behavior, bookmark
3181 existing only in the remote repository are treated as ``added``,
3181 existing only in the remote repository are treated as ``added``,
3182 even if it is in fact locally deleted.
3182 even if it is in fact locally deleted.
3183
3183
3184 .. container:: verbose
3184 .. container:: verbose
3185
3185
3186 For remote repository, using --bundle avoids downloading the
3186 For remote repository, using --bundle avoids downloading the
3187 changesets twice if the incoming is followed by a pull.
3187 changesets twice if the incoming is followed by a pull.
3188
3188
3189 Examples:
3189 Examples:
3190
3190
3191 - show incoming changes with patches and full description::
3191 - show incoming changes with patches and full description::
3192
3192
3193 hg incoming -vp
3193 hg incoming -vp
3194
3194
3195 - show incoming changes excluding merges, store a bundle::
3195 - show incoming changes excluding merges, store a bundle::
3196
3196
3197 hg in -vpM --bundle incoming.hg
3197 hg in -vpM --bundle incoming.hg
3198 hg pull incoming.hg
3198 hg pull incoming.hg
3199
3199
3200 - briefly list changes inside a bundle::
3200 - briefly list changes inside a bundle::
3201
3201
3202 hg in changes.hg -T "{desc|firstline}\\n"
3202 hg in changes.hg -T "{desc|firstline}\\n"
3203
3203
3204 Returns 0 if there are incoming changes, 1 otherwise.
3204 Returns 0 if there are incoming changes, 1 otherwise.
3205 """
3205 """
3206 if opts.get('graph'):
3206 if opts.get('graph'):
3207 cmdutil.checkunsupportedgraphflags([], opts)
3207 cmdutil.checkunsupportedgraphflags([], opts)
3208 def display(other, chlist, displayer):
3208 def display(other, chlist, displayer):
3209 revdag = cmdutil.graphrevs(other, chlist, opts)
3209 revdag = cmdutil.graphrevs(other, chlist, opts)
3210 cmdutil.displaygraph(ui, repo, revdag, displayer,
3210 cmdutil.displaygraph(ui, repo, revdag, displayer,
3211 graphmod.asciiedges)
3211 graphmod.asciiedges)
3212
3212
3213 ui.pager('incoming')
3213 ui.pager('incoming')
3214 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3214 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3215 return 0
3215 return 0
3216
3216
3217 if opts.get('bundle') and opts.get('subrepos'):
3217 if opts.get('bundle') and opts.get('subrepos'):
3218 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3218 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3219
3219
3220 if opts.get('bookmarks'):
3220 if opts.get('bookmarks'):
3221 source, branches = hg.parseurl(ui.expandpath(source),
3221 source, branches = hg.parseurl(ui.expandpath(source),
3222 opts.get('branch'))
3222 opts.get('branch'))
3223 other = hg.peer(repo, opts, source)
3223 other = hg.peer(repo, opts, source)
3224 if 'bookmarks' not in other.listkeys('namespaces'):
3224 if 'bookmarks' not in other.listkeys('namespaces'):
3225 ui.warn(_("remote doesn't support bookmarks\n"))
3225 ui.warn(_("remote doesn't support bookmarks\n"))
3226 return 0
3226 return 0
3227 ui.pager('incoming')
3227 ui.pager('incoming')
3228 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3228 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3229 return bookmarks.incoming(ui, repo, other)
3229 return bookmarks.incoming(ui, repo, other)
3230
3230
3231 repo._subtoppath = ui.expandpath(source)
3231 repo._subtoppath = ui.expandpath(source)
3232 try:
3232 try:
3233 ui.pager('incoming')
3233 ui.pager('incoming')
3234 return hg.incoming(ui, repo, source, opts)
3234 return hg.incoming(ui, repo, source, opts)
3235 finally:
3235 finally:
3236 del repo._subtoppath
3236 del repo._subtoppath
3237
3237
3238
3238
3239 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3239 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3240 norepo=True)
3240 norepo=True)
3241 def init(ui, dest=".", **opts):
3241 def init(ui, dest=".", **opts):
3242 """create a new repository in the given directory
3242 """create a new repository in the given directory
3243
3243
3244 Initialize a new repository in the given directory. If the given
3244 Initialize a new repository in the given directory. If the given
3245 directory does not exist, it will be created.
3245 directory does not exist, it will be created.
3246
3246
3247 If no directory is given, the current directory is used.
3247 If no directory is given, the current directory is used.
3248
3248
3249 It is possible to specify an ``ssh://`` URL as the destination.
3249 It is possible to specify an ``ssh://`` URL as the destination.
3250 See :hg:`help urls` for more information.
3250 See :hg:`help urls` for more information.
3251
3251
3252 Returns 0 on success.
3252 Returns 0 on success.
3253 """
3253 """
3254 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3254 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3255
3255
3256 @command('locate',
3256 @command('locate',
3257 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3257 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3258 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3258 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3259 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3259 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3260 ] + walkopts,
3260 ] + walkopts,
3261 _('[OPTION]... [PATTERN]...'))
3261 _('[OPTION]... [PATTERN]...'))
3262 def locate(ui, repo, *pats, **opts):
3262 def locate(ui, repo, *pats, **opts):
3263 """locate files matching specific patterns (DEPRECATED)
3263 """locate files matching specific patterns (DEPRECATED)
3264
3264
3265 Print files under Mercurial control in the working directory whose
3265 Print files under Mercurial control in the working directory whose
3266 names match the given patterns.
3266 names match the given patterns.
3267
3267
3268 By default, this command searches all directories in the working
3268 By default, this command searches all directories in the working
3269 directory. To search just the current directory and its
3269 directory. To search just the current directory and its
3270 subdirectories, use "--include .".
3270 subdirectories, use "--include .".
3271
3271
3272 If no patterns are given to match, this command prints the names
3272 If no patterns are given to match, this command prints the names
3273 of all files under Mercurial control in the working directory.
3273 of all files under Mercurial control in the working directory.
3274
3274
3275 If you want to feed the output of this command into the "xargs"
3275 If you want to feed the output of this command into the "xargs"
3276 command, use the -0 option to both this command and "xargs". This
3276 command, use the -0 option to both this command and "xargs". This
3277 will avoid the problem of "xargs" treating single filenames that
3277 will avoid the problem of "xargs" treating single filenames that
3278 contain whitespace as multiple filenames.
3278 contain whitespace as multiple filenames.
3279
3279
3280 See :hg:`help files` for a more versatile command.
3280 See :hg:`help files` for a more versatile command.
3281
3281
3282 Returns 0 if a match is found, 1 otherwise.
3282 Returns 0 if a match is found, 1 otherwise.
3283 """
3283 """
3284 if opts.get('print0'):
3284 if opts.get('print0'):
3285 end = '\0'
3285 end = '\0'
3286 else:
3286 else:
3287 end = '\n'
3287 end = '\n'
3288 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3288 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3289
3289
3290 ret = 1
3290 ret = 1
3291 ctx = repo[rev]
3291 ctx = repo[rev]
3292 m = scmutil.match(ctx, pats, opts, default='relglob',
3292 m = scmutil.match(ctx, pats, opts, default='relglob',
3293 badfn=lambda x, y: False)
3293 badfn=lambda x, y: False)
3294
3294
3295 ui.pager('locate')
3295 ui.pager('locate')
3296 for abs in ctx.matches(m):
3296 for abs in ctx.matches(m):
3297 if opts.get('fullpath'):
3297 if opts.get('fullpath'):
3298 ui.write(repo.wjoin(abs), end)
3298 ui.write(repo.wjoin(abs), end)
3299 else:
3299 else:
3300 ui.write(((pats and m.rel(abs)) or abs), end)
3300 ui.write(((pats and m.rel(abs)) or abs), end)
3301 ret = 0
3301 ret = 0
3302
3302
3303 return ret
3303 return ret
3304
3304
3305 @command('^log|history',
3305 @command('^log|history',
3306 [('f', 'follow', None,
3306 [('f', 'follow', None,
3307 _('follow changeset history, or file history across copies and renames')),
3307 _('follow changeset history, or file history across copies and renames')),
3308 ('', 'follow-first', None,
3308 ('', 'follow-first', None,
3309 _('only follow the first parent of merge changesets (DEPRECATED)')),
3309 _('only follow the first parent of merge changesets (DEPRECATED)')),
3310 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3310 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3311 ('C', 'copies', None, _('show copied files')),
3311 ('C', 'copies', None, _('show copied files')),
3312 ('k', 'keyword', [],
3312 ('k', 'keyword', [],
3313 _('do case-insensitive search for a given text'), _('TEXT')),
3313 _('do case-insensitive search for a given text'), _('TEXT')),
3314 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3314 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3315 ('', 'removed', None, _('include revisions where files were removed')),
3315 ('', 'removed', None, _('include revisions where files were removed')),
3316 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3316 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3317 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3317 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3318 ('', 'only-branch', [],
3318 ('', 'only-branch', [],
3319 _('show only changesets within the given named branch (DEPRECATED)'),
3319 _('show only changesets within the given named branch (DEPRECATED)'),
3320 _('BRANCH')),
3320 _('BRANCH')),
3321 ('b', 'branch', [],
3321 ('b', 'branch', [],
3322 _('show changesets within the given named branch'), _('BRANCH')),
3322 _('show changesets within the given named branch'), _('BRANCH')),
3323 ('P', 'prune', [],
3323 ('P', 'prune', [],
3324 _('do not display revision or any of its ancestors'), _('REV')),
3324 _('do not display revision or any of its ancestors'), _('REV')),
3325 ] + logopts + walkopts,
3325 ] + logopts + walkopts,
3326 _('[OPTION]... [FILE]'),
3326 _('[OPTION]... [FILE]'),
3327 inferrepo=True)
3327 inferrepo=True)
3328 def log(ui, repo, *pats, **opts):
3328 def log(ui, repo, *pats, **opts):
3329 """show revision history of entire repository or files
3329 """show revision history of entire repository or files
3330
3330
3331 Print the revision history of the specified files or the entire
3331 Print the revision history of the specified files or the entire
3332 project.
3332 project.
3333
3333
3334 If no revision range is specified, the default is ``tip:0`` unless
3334 If no revision range is specified, the default is ``tip:0`` unless
3335 --follow is set, in which case the working directory parent is
3335 --follow is set, in which case the working directory parent is
3336 used as the starting revision.
3336 used as the starting revision.
3337
3337
3338 File history is shown without following rename or copy history of
3338 File history is shown without following rename or copy history of
3339 files. Use -f/--follow with a filename to follow history across
3339 files. Use -f/--follow with a filename to follow history across
3340 renames and copies. --follow without a filename will only show
3340 renames and copies. --follow without a filename will only show
3341 ancestors or descendants of the starting revision.
3341 ancestors or descendants of the starting revision.
3342
3342
3343 By default this command prints revision number and changeset id,
3343 By default this command prints revision number and changeset id,
3344 tags, non-trivial parents, user, date and time, and a summary for
3344 tags, non-trivial parents, user, date and time, and a summary for
3345 each commit. When the -v/--verbose switch is used, the list of
3345 each commit. When the -v/--verbose switch is used, the list of
3346 changed files and full commit message are shown.
3346 changed files and full commit message are shown.
3347
3347
3348 With --graph the revisions are shown as an ASCII art DAG with the most
3348 With --graph the revisions are shown as an ASCII art DAG with the most
3349 recent changeset at the top.
3349 recent changeset at the top.
3350 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3350 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3351 and '+' represents a fork where the changeset from the lines below is a
3351 and '+' represents a fork where the changeset from the lines below is a
3352 parent of the 'o' merge on the same line.
3352 parent of the 'o' merge on the same line.
3353
3353
3354 .. note::
3354 .. note::
3355
3355
3356 :hg:`log --patch` may generate unexpected diff output for merge
3356 :hg:`log --patch` may generate unexpected diff output for merge
3357 changesets, as it will only compare the merge changeset against
3357 changesets, as it will only compare the merge changeset against
3358 its first parent. Also, only files different from BOTH parents
3358 its first parent. Also, only files different from BOTH parents
3359 will appear in files:.
3359 will appear in files:.
3360
3360
3361 .. note::
3361 .. note::
3362
3362
3363 For performance reasons, :hg:`log FILE` may omit duplicate changes
3363 For performance reasons, :hg:`log FILE` may omit duplicate changes
3364 made on branches and will not show removals or mode changes. To
3364 made on branches and will not show removals or mode changes. To
3365 see all such changes, use the --removed switch.
3365 see all such changes, use the --removed switch.
3366
3366
3367 .. container:: verbose
3367 .. container:: verbose
3368
3368
3369 Some examples:
3369 Some examples:
3370
3370
3371 - changesets with full descriptions and file lists::
3371 - changesets with full descriptions and file lists::
3372
3372
3373 hg log -v
3373 hg log -v
3374
3374
3375 - changesets ancestral to the working directory::
3375 - changesets ancestral to the working directory::
3376
3376
3377 hg log -f
3377 hg log -f
3378
3378
3379 - last 10 commits on the current branch::
3379 - last 10 commits on the current branch::
3380
3380
3381 hg log -l 10 -b .
3381 hg log -l 10 -b .
3382
3382
3383 - changesets showing all modifications of a file, including removals::
3383 - changesets showing all modifications of a file, including removals::
3384
3384
3385 hg log --removed file.c
3385 hg log --removed file.c
3386
3386
3387 - all changesets that touch a directory, with diffs, excluding merges::
3387 - all changesets that touch a directory, with diffs, excluding merges::
3388
3388
3389 hg log -Mp lib/
3389 hg log -Mp lib/
3390
3390
3391 - all revision numbers that match a keyword::
3391 - all revision numbers that match a keyword::
3392
3392
3393 hg log -k bug --template "{rev}\\n"
3393 hg log -k bug --template "{rev}\\n"
3394
3394
3395 - the full hash identifier of the working directory parent::
3395 - the full hash identifier of the working directory parent::
3396
3396
3397 hg log -r . --template "{node}\\n"
3397 hg log -r . --template "{node}\\n"
3398
3398
3399 - list available log templates::
3399 - list available log templates::
3400
3400
3401 hg log -T list
3401 hg log -T list
3402
3402
3403 - check if a given changeset is included in a tagged release::
3403 - check if a given changeset is included in a tagged release::
3404
3404
3405 hg log -r "a21ccf and ancestor(1.9)"
3405 hg log -r "a21ccf and ancestor(1.9)"
3406
3406
3407 - find all changesets by some user in a date range::
3407 - find all changesets by some user in a date range::
3408
3408
3409 hg log -k alice -d "may 2008 to jul 2008"
3409 hg log -k alice -d "may 2008 to jul 2008"
3410
3410
3411 - summary of all changesets after the last tag::
3411 - summary of all changesets after the last tag::
3412
3412
3413 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3413 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3414
3414
3415 See :hg:`help dates` for a list of formats valid for -d/--date.
3415 See :hg:`help dates` for a list of formats valid for -d/--date.
3416
3416
3417 See :hg:`help revisions` for more about specifying and ordering
3417 See :hg:`help revisions` for more about specifying and ordering
3418 revisions.
3418 revisions.
3419
3419
3420 See :hg:`help templates` for more about pre-packaged styles and
3420 See :hg:`help templates` for more about pre-packaged styles and
3421 specifying custom templates.
3421 specifying custom templates.
3422
3422
3423 Returns 0 on success.
3423 Returns 0 on success.
3424
3424
3425 """
3425 """
3426 if opts.get('follow') and opts.get('rev'):
3426 if opts.get('follow') and opts.get('rev'):
3427 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3427 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3428 del opts['follow']
3428 del opts['follow']
3429
3429
3430 if opts.get('graph'):
3430 if opts.get('graph'):
3431 return cmdutil.graphlog(ui, repo, *pats, **opts)
3431 return cmdutil.graphlog(ui, repo, *pats, **opts)
3432
3432
3433 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3433 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3434 limit = cmdutil.loglimit(opts)
3434 limit = cmdutil.loglimit(opts)
3435 count = 0
3435 count = 0
3436
3436
3437 getrenamed = None
3437 getrenamed = None
3438 if opts.get('copies'):
3438 if opts.get('copies'):
3439 endrev = None
3439 endrev = None
3440 if opts.get('rev'):
3440 if opts.get('rev'):
3441 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3441 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3442 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3442 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3443
3443
3444 ui.pager('log')
3444 ui.pager('log')
3445 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3445 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3446 for rev in revs:
3446 for rev in revs:
3447 if count == limit:
3447 if count == limit:
3448 break
3448 break
3449 ctx = repo[rev]
3449 ctx = repo[rev]
3450 copies = None
3450 copies = None
3451 if getrenamed is not None and rev:
3451 if getrenamed is not None and rev:
3452 copies = []
3452 copies = []
3453 for fn in ctx.files():
3453 for fn in ctx.files():
3454 rename = getrenamed(fn, rev)
3454 rename = getrenamed(fn, rev)
3455 if rename:
3455 if rename:
3456 copies.append((fn, rename[0]))
3456 copies.append((fn, rename[0]))
3457 if filematcher:
3457 if filematcher:
3458 revmatchfn = filematcher(ctx.rev())
3458 revmatchfn = filematcher(ctx.rev())
3459 else:
3459 else:
3460 revmatchfn = None
3460 revmatchfn = None
3461 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3461 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3462 if displayer.flush(ctx):
3462 if displayer.flush(ctx):
3463 count += 1
3463 count += 1
3464
3464
3465 displayer.close()
3465 displayer.close()
3466
3466
3467 @command('manifest',
3467 @command('manifest',
3468 [('r', 'rev', '', _('revision to display'), _('REV')),
3468 [('r', 'rev', '', _('revision to display'), _('REV')),
3469 ('', 'all', False, _("list files from all revisions"))]
3469 ('', 'all', False, _("list files from all revisions"))]
3470 + formatteropts,
3470 + formatteropts,
3471 _('[-r REV]'))
3471 _('[-r REV]'))
3472 def manifest(ui, repo, node=None, rev=None, **opts):
3472 def manifest(ui, repo, node=None, rev=None, **opts):
3473 """output the current or given revision of the project manifest
3473 """output the current or given revision of the project manifest
3474
3474
3475 Print a list of version controlled files for the given revision.
3475 Print a list of version controlled files for the given revision.
3476 If no revision is given, the first parent of the working directory
3476 If no revision is given, the first parent of the working directory
3477 is used, or the null revision if no revision is checked out.
3477 is used, or the null revision if no revision is checked out.
3478
3478
3479 With -v, print file permissions, symlink and executable bits.
3479 With -v, print file permissions, symlink and executable bits.
3480 With --debug, print file revision hashes.
3480 With --debug, print file revision hashes.
3481
3481
3482 If option --all is specified, the list of all files from all revisions
3482 If option --all is specified, the list of all files from all revisions
3483 is printed. This includes deleted and renamed files.
3483 is printed. This includes deleted and renamed files.
3484
3484
3485 Returns 0 on success.
3485 Returns 0 on success.
3486 """
3486 """
3487 fm = ui.formatter('manifest', opts)
3487 fm = ui.formatter('manifest', opts)
3488
3488
3489 if opts.get('all'):
3489 if opts.get('all'):
3490 if rev or node:
3490 if rev or node:
3491 raise error.Abort(_("can't specify a revision with --all"))
3491 raise error.Abort(_("can't specify a revision with --all"))
3492
3492
3493 res = []
3493 res = []
3494 prefix = "data/"
3494 prefix = "data/"
3495 suffix = ".i"
3495 suffix = ".i"
3496 plen = len(prefix)
3496 plen = len(prefix)
3497 slen = len(suffix)
3497 slen = len(suffix)
3498 with repo.lock():
3498 with repo.lock():
3499 for fn, b, size in repo.store.datafiles():
3499 for fn, b, size in repo.store.datafiles():
3500 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3500 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3501 res.append(fn[plen:-slen])
3501 res.append(fn[plen:-slen])
3502 ui.pager('manifest')
3502 ui.pager('manifest')
3503 for f in res:
3503 for f in res:
3504 fm.startitem()
3504 fm.startitem()
3505 fm.write("path", '%s\n', f)
3505 fm.write("path", '%s\n', f)
3506 fm.end()
3506 fm.end()
3507 return
3507 return
3508
3508
3509 if rev and node:
3509 if rev and node:
3510 raise error.Abort(_("please specify just one revision"))
3510 raise error.Abort(_("please specify just one revision"))
3511
3511
3512 if not node:
3512 if not node:
3513 node = rev
3513 node = rev
3514
3514
3515 char = {'l': '@', 'x': '*', '': ''}
3515 char = {'l': '@', 'x': '*', '': ''}
3516 mode = {'l': '644', 'x': '755', '': '644'}
3516 mode = {'l': '644', 'x': '755', '': '644'}
3517 ctx = scmutil.revsingle(repo, node)
3517 ctx = scmutil.revsingle(repo, node)
3518 mf = ctx.manifest()
3518 mf = ctx.manifest()
3519 ui.pager('manifest')
3519 ui.pager('manifest')
3520 for f in ctx:
3520 for f in ctx:
3521 fm.startitem()
3521 fm.startitem()
3522 fl = ctx[f].flags()
3522 fl = ctx[f].flags()
3523 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3523 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3524 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3524 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3525 fm.write('path', '%s\n', f)
3525 fm.write('path', '%s\n', f)
3526 fm.end()
3526 fm.end()
3527
3527
3528 @command('^merge',
3528 @command('^merge',
3529 [('f', 'force', None,
3529 [('f', 'force', None,
3530 _('force a merge including outstanding changes (DEPRECATED)')),
3530 _('force a merge including outstanding changes (DEPRECATED)')),
3531 ('r', 'rev', '', _('revision to merge'), _('REV')),
3531 ('r', 'rev', '', _('revision to merge'), _('REV')),
3532 ('P', 'preview', None,
3532 ('P', 'preview', None,
3533 _('review revisions to merge (no merge is performed)'))
3533 _('review revisions to merge (no merge is performed)'))
3534 ] + mergetoolopts,
3534 ] + mergetoolopts,
3535 _('[-P] [[-r] REV]'))
3535 _('[-P] [[-r] REV]'))
3536 def merge(ui, repo, node=None, **opts):
3536 def merge(ui, repo, node=None, **opts):
3537 """merge another revision into working directory
3537 """merge another revision into working directory
3538
3538
3539 The current working directory is updated with all changes made in
3539 The current working directory is updated with all changes made in
3540 the requested revision since the last common predecessor revision.
3540 the requested revision since the last common predecessor revision.
3541
3541
3542 Files that changed between either parent are marked as changed for
3542 Files that changed between either parent are marked as changed for
3543 the next commit and a commit must be performed before any further
3543 the next commit and a commit must be performed before any further
3544 updates to the repository are allowed. The next commit will have
3544 updates to the repository are allowed. The next commit will have
3545 two parents.
3545 two parents.
3546
3546
3547 ``--tool`` can be used to specify the merge tool used for file
3547 ``--tool`` can be used to specify the merge tool used for file
3548 merges. It overrides the HGMERGE environment variable and your
3548 merges. It overrides the HGMERGE environment variable and your
3549 configuration files. See :hg:`help merge-tools` for options.
3549 configuration files. See :hg:`help merge-tools` for options.
3550
3550
3551 If no revision is specified, the working directory's parent is a
3551 If no revision is specified, the working directory's parent is a
3552 head revision, and the current branch contains exactly one other
3552 head revision, and the current branch contains exactly one other
3553 head, the other head is merged with by default. Otherwise, an
3553 head, the other head is merged with by default. Otherwise, an
3554 explicit revision with which to merge with must be provided.
3554 explicit revision with which to merge with must be provided.
3555
3555
3556 See :hg:`help resolve` for information on handling file conflicts.
3556 See :hg:`help resolve` for information on handling file conflicts.
3557
3557
3558 To undo an uncommitted merge, use :hg:`update --clean .` which
3558 To undo an uncommitted merge, use :hg:`update --clean .` which
3559 will check out a clean copy of the original merge parent, losing
3559 will check out a clean copy of the original merge parent, losing
3560 all changes.
3560 all changes.
3561
3561
3562 Returns 0 on success, 1 if there are unresolved files.
3562 Returns 0 on success, 1 if there are unresolved files.
3563 """
3563 """
3564
3564
3565 if opts.get('rev') and node:
3565 if opts.get('rev') and node:
3566 raise error.Abort(_("please specify just one revision"))
3566 raise error.Abort(_("please specify just one revision"))
3567 if not node:
3567 if not node:
3568 node = opts.get('rev')
3568 node = opts.get('rev')
3569
3569
3570 if node:
3570 if node:
3571 node = scmutil.revsingle(repo, node).node()
3571 node = scmutil.revsingle(repo, node).node()
3572
3572
3573 if not node:
3573 if not node:
3574 node = repo[destutil.destmerge(repo)].node()
3574 node = repo[destutil.destmerge(repo)].node()
3575
3575
3576 if opts.get('preview'):
3576 if opts.get('preview'):
3577 # find nodes that are ancestors of p2 but not of p1
3577 # find nodes that are ancestors of p2 but not of p1
3578 p1 = repo.lookup('.')
3578 p1 = repo.lookup('.')
3579 p2 = repo.lookup(node)
3579 p2 = repo.lookup(node)
3580 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3580 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3581
3581
3582 displayer = cmdutil.show_changeset(ui, repo, opts)
3582 displayer = cmdutil.show_changeset(ui, repo, opts)
3583 for node in nodes:
3583 for node in nodes:
3584 displayer.show(repo[node])
3584 displayer.show(repo[node])
3585 displayer.close()
3585 displayer.close()
3586 return 0
3586 return 0
3587
3587
3588 try:
3588 try:
3589 # ui.forcemerge is an internal variable, do not document
3589 # ui.forcemerge is an internal variable, do not document
3590 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3590 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3591 force = opts.get('force')
3591 force = opts.get('force')
3592 labels = ['working copy', 'merge rev']
3592 labels = ['working copy', 'merge rev']
3593 return hg.merge(repo, node, force=force, mergeforce=force,
3593 return hg.merge(repo, node, force=force, mergeforce=force,
3594 labels=labels)
3594 labels=labels)
3595 finally:
3595 finally:
3596 ui.setconfig('ui', 'forcemerge', '', 'merge')
3596 ui.setconfig('ui', 'forcemerge', '', 'merge')
3597
3597
3598 @command('outgoing|out',
3598 @command('outgoing|out',
3599 [('f', 'force', None, _('run even when the destination is unrelated')),
3599 [('f', 'force', None, _('run even when the destination is unrelated')),
3600 ('r', 'rev', [],
3600 ('r', 'rev', [],
3601 _('a changeset intended to be included in the destination'), _('REV')),
3601 _('a changeset intended to be included in the destination'), _('REV')),
3602 ('n', 'newest-first', None, _('show newest record first')),
3602 ('n', 'newest-first', None, _('show newest record first')),
3603 ('B', 'bookmarks', False, _('compare bookmarks')),
3603 ('B', 'bookmarks', False, _('compare bookmarks')),
3604 ('b', 'branch', [], _('a specific branch you would like to push'),
3604 ('b', 'branch', [], _('a specific branch you would like to push'),
3605 _('BRANCH')),
3605 _('BRANCH')),
3606 ] + logopts + remoteopts + subrepoopts,
3606 ] + logopts + remoteopts + subrepoopts,
3607 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3607 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3608 def outgoing(ui, repo, dest=None, **opts):
3608 def outgoing(ui, repo, dest=None, **opts):
3609 """show changesets not found in the destination
3609 """show changesets not found in the destination
3610
3610
3611 Show changesets not found in the specified destination repository
3611 Show changesets not found in the specified destination repository
3612 or the default push location. These are the changesets that would
3612 or the default push location. These are the changesets that would
3613 be pushed if a push was requested.
3613 be pushed if a push was requested.
3614
3614
3615 See pull for details of valid destination formats.
3615 See pull for details of valid destination formats.
3616
3616
3617 .. container:: verbose
3617 .. container:: verbose
3618
3618
3619 With -B/--bookmarks, the result of bookmark comparison between
3619 With -B/--bookmarks, the result of bookmark comparison between
3620 local and remote repositories is displayed. With -v/--verbose,
3620 local and remote repositories is displayed. With -v/--verbose,
3621 status is also displayed for each bookmark like below::
3621 status is also displayed for each bookmark like below::
3622
3622
3623 BM1 01234567890a added
3623 BM1 01234567890a added
3624 BM2 deleted
3624 BM2 deleted
3625 BM3 234567890abc advanced
3625 BM3 234567890abc advanced
3626 BM4 34567890abcd diverged
3626 BM4 34567890abcd diverged
3627 BM5 4567890abcde changed
3627 BM5 4567890abcde changed
3628
3628
3629 The action taken when pushing depends on the
3629 The action taken when pushing depends on the
3630 status of each bookmark:
3630 status of each bookmark:
3631
3631
3632 :``added``: push with ``-B`` will create it
3632 :``added``: push with ``-B`` will create it
3633 :``deleted``: push with ``-B`` will delete it
3633 :``deleted``: push with ``-B`` will delete it
3634 :``advanced``: push will update it
3634 :``advanced``: push will update it
3635 :``diverged``: push with ``-B`` will update it
3635 :``diverged``: push with ``-B`` will update it
3636 :``changed``: push with ``-B`` will update it
3636 :``changed``: push with ``-B`` will update it
3637
3637
3638 From the point of view of pushing behavior, bookmarks
3638 From the point of view of pushing behavior, bookmarks
3639 existing only in the remote repository are treated as
3639 existing only in the remote repository are treated as
3640 ``deleted``, even if it is in fact added remotely.
3640 ``deleted``, even if it is in fact added remotely.
3641
3641
3642 Returns 0 if there are outgoing changes, 1 otherwise.
3642 Returns 0 if there are outgoing changes, 1 otherwise.
3643 """
3643 """
3644 if opts.get('graph'):
3644 if opts.get('graph'):
3645 cmdutil.checkunsupportedgraphflags([], opts)
3645 cmdutil.checkunsupportedgraphflags([], opts)
3646 ui.pager('outgoing')
3646 o, other = hg._outgoing(ui, repo, dest, opts)
3647 o, other = hg._outgoing(ui, repo, dest, opts)
3647 if not o:
3648 if not o:
3648 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3649 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3649 return
3650 return
3650
3651
3651 revdag = cmdutil.graphrevs(repo, o, opts)
3652 revdag = cmdutil.graphrevs(repo, o, opts)
3652 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3653 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3653 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3654 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3654 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3655 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3655 return 0
3656 return 0
3656
3657
3657 if opts.get('bookmarks'):
3658 if opts.get('bookmarks'):
3658 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3659 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3659 dest, branches = hg.parseurl(dest, opts.get('branch'))
3660 dest, branches = hg.parseurl(dest, opts.get('branch'))
3660 other = hg.peer(repo, opts, dest)
3661 other = hg.peer(repo, opts, dest)
3661 if 'bookmarks' not in other.listkeys('namespaces'):
3662 if 'bookmarks' not in other.listkeys('namespaces'):
3662 ui.warn(_("remote doesn't support bookmarks\n"))
3663 ui.warn(_("remote doesn't support bookmarks\n"))
3663 return 0
3664 return 0
3665 ui.pager('outgoing')
3664 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3666 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3665 return bookmarks.outgoing(ui, repo, other)
3667 return bookmarks.outgoing(ui, repo, other)
3666
3668
3667 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3669 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3668 try:
3670 try:
3671 ui.pager('outgoing')
3669 return hg.outgoing(ui, repo, dest, opts)
3672 return hg.outgoing(ui, repo, dest, opts)
3670 finally:
3673 finally:
3671 del repo._subtoppath
3674 del repo._subtoppath
3672
3675
3673 @command('parents',
3676 @command('parents',
3674 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3677 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3675 ] + templateopts,
3678 ] + templateopts,
3676 _('[-r REV] [FILE]'),
3679 _('[-r REV] [FILE]'),
3677 inferrepo=True)
3680 inferrepo=True)
3678 def parents(ui, repo, file_=None, **opts):
3681 def parents(ui, repo, file_=None, **opts):
3679 """show the parents of the working directory or revision (DEPRECATED)
3682 """show the parents of the working directory or revision (DEPRECATED)
3680
3683
3681 Print the working directory's parent revisions. If a revision is
3684 Print the working directory's parent revisions. If a revision is
3682 given via -r/--rev, the parent of that revision will be printed.
3685 given via -r/--rev, the parent of that revision will be printed.
3683 If a file argument is given, the revision in which the file was
3686 If a file argument is given, the revision in which the file was
3684 last changed (before the working directory revision or the
3687 last changed (before the working directory revision or the
3685 argument to --rev if given) is printed.
3688 argument to --rev if given) is printed.
3686
3689
3687 This command is equivalent to::
3690 This command is equivalent to::
3688
3691
3689 hg log -r "p1()+p2()" or
3692 hg log -r "p1()+p2()" or
3690 hg log -r "p1(REV)+p2(REV)" or
3693 hg log -r "p1(REV)+p2(REV)" or
3691 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3694 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3692 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3695 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3693
3696
3694 See :hg:`summary` and :hg:`help revsets` for related information.
3697 See :hg:`summary` and :hg:`help revsets` for related information.
3695
3698
3696 Returns 0 on success.
3699 Returns 0 on success.
3697 """
3700 """
3698
3701
3699 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3702 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3700
3703
3701 if file_:
3704 if file_:
3702 m = scmutil.match(ctx, (file_,), opts)
3705 m = scmutil.match(ctx, (file_,), opts)
3703 if m.anypats() or len(m.files()) != 1:
3706 if m.anypats() or len(m.files()) != 1:
3704 raise error.Abort(_('can only specify an explicit filename'))
3707 raise error.Abort(_('can only specify an explicit filename'))
3705 file_ = m.files()[0]
3708 file_ = m.files()[0]
3706 filenodes = []
3709 filenodes = []
3707 for cp in ctx.parents():
3710 for cp in ctx.parents():
3708 if not cp:
3711 if not cp:
3709 continue
3712 continue
3710 try:
3713 try:
3711 filenodes.append(cp.filenode(file_))
3714 filenodes.append(cp.filenode(file_))
3712 except error.LookupError:
3715 except error.LookupError:
3713 pass
3716 pass
3714 if not filenodes:
3717 if not filenodes:
3715 raise error.Abort(_("'%s' not found in manifest!") % file_)
3718 raise error.Abort(_("'%s' not found in manifest!") % file_)
3716 p = []
3719 p = []
3717 for fn in filenodes:
3720 for fn in filenodes:
3718 fctx = repo.filectx(file_, fileid=fn)
3721 fctx = repo.filectx(file_, fileid=fn)
3719 p.append(fctx.node())
3722 p.append(fctx.node())
3720 else:
3723 else:
3721 p = [cp.node() for cp in ctx.parents()]
3724 p = [cp.node() for cp in ctx.parents()]
3722
3725
3723 displayer = cmdutil.show_changeset(ui, repo, opts)
3726 displayer = cmdutil.show_changeset(ui, repo, opts)
3724 for n in p:
3727 for n in p:
3725 if n != nullid:
3728 if n != nullid:
3726 displayer.show(repo[n])
3729 displayer.show(repo[n])
3727 displayer.close()
3730 displayer.close()
3728
3731
3729 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3732 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3730 def paths(ui, repo, search=None, **opts):
3733 def paths(ui, repo, search=None, **opts):
3731 """show aliases for remote repositories
3734 """show aliases for remote repositories
3732
3735
3733 Show definition of symbolic path name NAME. If no name is given,
3736 Show definition of symbolic path name NAME. If no name is given,
3734 show definition of all available names.
3737 show definition of all available names.
3735
3738
3736 Option -q/--quiet suppresses all output when searching for NAME
3739 Option -q/--quiet suppresses all output when searching for NAME
3737 and shows only the path names when listing all definitions.
3740 and shows only the path names when listing all definitions.
3738
3741
3739 Path names are defined in the [paths] section of your
3742 Path names are defined in the [paths] section of your
3740 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3743 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3741 repository, ``.hg/hgrc`` is used, too.
3744 repository, ``.hg/hgrc`` is used, too.
3742
3745
3743 The path names ``default`` and ``default-push`` have a special
3746 The path names ``default`` and ``default-push`` have a special
3744 meaning. When performing a push or pull operation, they are used
3747 meaning. When performing a push or pull operation, they are used
3745 as fallbacks if no location is specified on the command-line.
3748 as fallbacks if no location is specified on the command-line.
3746 When ``default-push`` is set, it will be used for push and
3749 When ``default-push`` is set, it will be used for push and
3747 ``default`` will be used for pull; otherwise ``default`` is used
3750 ``default`` will be used for pull; otherwise ``default`` is used
3748 as the fallback for both. When cloning a repository, the clone
3751 as the fallback for both. When cloning a repository, the clone
3749 source is written as ``default`` in ``.hg/hgrc``.
3752 source is written as ``default`` in ``.hg/hgrc``.
3750
3753
3751 .. note::
3754 .. note::
3752
3755
3753 ``default`` and ``default-push`` apply to all inbound (e.g.
3756 ``default`` and ``default-push`` apply to all inbound (e.g.
3754 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3757 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3755 and :hg:`bundle`) operations.
3758 and :hg:`bundle`) operations.
3756
3759
3757 See :hg:`help urls` for more information.
3760 See :hg:`help urls` for more information.
3758
3761
3759 Returns 0 on success.
3762 Returns 0 on success.
3760 """
3763 """
3761 if search:
3764 if search:
3762 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3765 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3763 if name == search]
3766 if name == search]
3764 else:
3767 else:
3765 pathitems = sorted(ui.paths.iteritems())
3768 pathitems = sorted(ui.paths.iteritems())
3766
3769
3767 fm = ui.formatter('paths', opts)
3770 fm = ui.formatter('paths', opts)
3768 if fm.isplain():
3771 if fm.isplain():
3769 hidepassword = util.hidepassword
3772 hidepassword = util.hidepassword
3770 else:
3773 else:
3771 hidepassword = str
3774 hidepassword = str
3772 if ui.quiet:
3775 if ui.quiet:
3773 namefmt = '%s\n'
3776 namefmt = '%s\n'
3774 else:
3777 else:
3775 namefmt = '%s = '
3778 namefmt = '%s = '
3776 showsubopts = not search and not ui.quiet
3779 showsubopts = not search and not ui.quiet
3777
3780
3778 for name, path in pathitems:
3781 for name, path in pathitems:
3779 fm.startitem()
3782 fm.startitem()
3780 fm.condwrite(not search, 'name', namefmt, name)
3783 fm.condwrite(not search, 'name', namefmt, name)
3781 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3784 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3782 for subopt, value in sorted(path.suboptions.items()):
3785 for subopt, value in sorted(path.suboptions.items()):
3783 assert subopt not in ('name', 'url')
3786 assert subopt not in ('name', 'url')
3784 if showsubopts:
3787 if showsubopts:
3785 fm.plain('%s:%s = ' % (name, subopt))
3788 fm.plain('%s:%s = ' % (name, subopt))
3786 fm.condwrite(showsubopts, subopt, '%s\n', value)
3789 fm.condwrite(showsubopts, subopt, '%s\n', value)
3787
3790
3788 fm.end()
3791 fm.end()
3789
3792
3790 if search and not pathitems:
3793 if search and not pathitems:
3791 if not ui.quiet:
3794 if not ui.quiet:
3792 ui.warn(_("not found!\n"))
3795 ui.warn(_("not found!\n"))
3793 return 1
3796 return 1
3794 else:
3797 else:
3795 return 0
3798 return 0
3796
3799
3797 @command('phase',
3800 @command('phase',
3798 [('p', 'public', False, _('set changeset phase to public')),
3801 [('p', 'public', False, _('set changeset phase to public')),
3799 ('d', 'draft', False, _('set changeset phase to draft')),
3802 ('d', 'draft', False, _('set changeset phase to draft')),
3800 ('s', 'secret', False, _('set changeset phase to secret')),
3803 ('s', 'secret', False, _('set changeset phase to secret')),
3801 ('f', 'force', False, _('allow to move boundary backward')),
3804 ('f', 'force', False, _('allow to move boundary backward')),
3802 ('r', 'rev', [], _('target revision'), _('REV')),
3805 ('r', 'rev', [], _('target revision'), _('REV')),
3803 ],
3806 ],
3804 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3807 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3805 def phase(ui, repo, *revs, **opts):
3808 def phase(ui, repo, *revs, **opts):
3806 """set or show the current phase name
3809 """set or show the current phase name
3807
3810
3808 With no argument, show the phase name of the current revision(s).
3811 With no argument, show the phase name of the current revision(s).
3809
3812
3810 With one of -p/--public, -d/--draft or -s/--secret, change the
3813 With one of -p/--public, -d/--draft or -s/--secret, change the
3811 phase value of the specified revisions.
3814 phase value of the specified revisions.
3812
3815
3813 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3816 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3814 lower phase to an higher phase. Phases are ordered as follows::
3817 lower phase to an higher phase. Phases are ordered as follows::
3815
3818
3816 public < draft < secret
3819 public < draft < secret
3817
3820
3818 Returns 0 on success, 1 if some phases could not be changed.
3821 Returns 0 on success, 1 if some phases could not be changed.
3819
3822
3820 (For more information about the phases concept, see :hg:`help phases`.)
3823 (For more information about the phases concept, see :hg:`help phases`.)
3821 """
3824 """
3822 # search for a unique phase argument
3825 # search for a unique phase argument
3823 targetphase = None
3826 targetphase = None
3824 for idx, name in enumerate(phases.phasenames):
3827 for idx, name in enumerate(phases.phasenames):
3825 if opts[name]:
3828 if opts[name]:
3826 if targetphase is not None:
3829 if targetphase is not None:
3827 raise error.Abort(_('only one phase can be specified'))
3830 raise error.Abort(_('only one phase can be specified'))
3828 targetphase = idx
3831 targetphase = idx
3829
3832
3830 # look for specified revision
3833 # look for specified revision
3831 revs = list(revs)
3834 revs = list(revs)
3832 revs.extend(opts['rev'])
3835 revs.extend(opts['rev'])
3833 if not revs:
3836 if not revs:
3834 # display both parents as the second parent phase can influence
3837 # display both parents as the second parent phase can influence
3835 # the phase of a merge commit
3838 # the phase of a merge commit
3836 revs = [c.rev() for c in repo[None].parents()]
3839 revs = [c.rev() for c in repo[None].parents()]
3837
3840
3838 revs = scmutil.revrange(repo, revs)
3841 revs = scmutil.revrange(repo, revs)
3839
3842
3840 lock = None
3843 lock = None
3841 ret = 0
3844 ret = 0
3842 if targetphase is None:
3845 if targetphase is None:
3843 # display
3846 # display
3844 for r in revs:
3847 for r in revs:
3845 ctx = repo[r]
3848 ctx = repo[r]
3846 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3849 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3847 else:
3850 else:
3848 tr = None
3851 tr = None
3849 lock = repo.lock()
3852 lock = repo.lock()
3850 try:
3853 try:
3851 tr = repo.transaction("phase")
3854 tr = repo.transaction("phase")
3852 # set phase
3855 # set phase
3853 if not revs:
3856 if not revs:
3854 raise error.Abort(_('empty revision set'))
3857 raise error.Abort(_('empty revision set'))
3855 nodes = [repo[r].node() for r in revs]
3858 nodes = [repo[r].node() for r in revs]
3856 # moving revision from public to draft may hide them
3859 # moving revision from public to draft may hide them
3857 # We have to check result on an unfiltered repository
3860 # We have to check result on an unfiltered repository
3858 unfi = repo.unfiltered()
3861 unfi = repo.unfiltered()
3859 getphase = unfi._phasecache.phase
3862 getphase = unfi._phasecache.phase
3860 olddata = [getphase(unfi, r) for r in unfi]
3863 olddata = [getphase(unfi, r) for r in unfi]
3861 phases.advanceboundary(repo, tr, targetphase, nodes)
3864 phases.advanceboundary(repo, tr, targetphase, nodes)
3862 if opts['force']:
3865 if opts['force']:
3863 phases.retractboundary(repo, tr, targetphase, nodes)
3866 phases.retractboundary(repo, tr, targetphase, nodes)
3864 tr.close()
3867 tr.close()
3865 finally:
3868 finally:
3866 if tr is not None:
3869 if tr is not None:
3867 tr.release()
3870 tr.release()
3868 lock.release()
3871 lock.release()
3869 getphase = unfi._phasecache.phase
3872 getphase = unfi._phasecache.phase
3870 newdata = [getphase(unfi, r) for r in unfi]
3873 newdata = [getphase(unfi, r) for r in unfi]
3871 changes = sum(newdata[r] != olddata[r] for r in unfi)
3874 changes = sum(newdata[r] != olddata[r] for r in unfi)
3872 cl = unfi.changelog
3875 cl = unfi.changelog
3873 rejected = [n for n in nodes
3876 rejected = [n for n in nodes
3874 if newdata[cl.rev(n)] < targetphase]
3877 if newdata[cl.rev(n)] < targetphase]
3875 if rejected:
3878 if rejected:
3876 ui.warn(_('cannot move %i changesets to a higher '
3879 ui.warn(_('cannot move %i changesets to a higher '
3877 'phase, use --force\n') % len(rejected))
3880 'phase, use --force\n') % len(rejected))
3878 ret = 1
3881 ret = 1
3879 if changes:
3882 if changes:
3880 msg = _('phase changed for %i changesets\n') % changes
3883 msg = _('phase changed for %i changesets\n') % changes
3881 if ret:
3884 if ret:
3882 ui.status(msg)
3885 ui.status(msg)
3883 else:
3886 else:
3884 ui.note(msg)
3887 ui.note(msg)
3885 else:
3888 else:
3886 ui.warn(_('no phases changed\n'))
3889 ui.warn(_('no phases changed\n'))
3887 return ret
3890 return ret
3888
3891
3889 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3892 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3890 """Run after a changegroup has been added via pull/unbundle
3893 """Run after a changegroup has been added via pull/unbundle
3891
3894
3892 This takes arguments below:
3895 This takes arguments below:
3893
3896
3894 :modheads: change of heads by pull/unbundle
3897 :modheads: change of heads by pull/unbundle
3895 :optupdate: updating working directory is needed or not
3898 :optupdate: updating working directory is needed or not
3896 :checkout: update destination revision (or None to default destination)
3899 :checkout: update destination revision (or None to default destination)
3897 :brev: a name, which might be a bookmark to be activated after updating
3900 :brev: a name, which might be a bookmark to be activated after updating
3898 """
3901 """
3899 if modheads == 0:
3902 if modheads == 0:
3900 return
3903 return
3901 if optupdate:
3904 if optupdate:
3902 try:
3905 try:
3903 return hg.updatetotally(ui, repo, checkout, brev)
3906 return hg.updatetotally(ui, repo, checkout, brev)
3904 except error.UpdateAbort as inst:
3907 except error.UpdateAbort as inst:
3905 msg = _("not updating: %s") % str(inst)
3908 msg = _("not updating: %s") % str(inst)
3906 hint = inst.hint
3909 hint = inst.hint
3907 raise error.UpdateAbort(msg, hint=hint)
3910 raise error.UpdateAbort(msg, hint=hint)
3908 if modheads > 1:
3911 if modheads > 1:
3909 currentbranchheads = len(repo.branchheads())
3912 currentbranchheads = len(repo.branchheads())
3910 if currentbranchheads == modheads:
3913 if currentbranchheads == modheads:
3911 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3914 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3912 elif currentbranchheads > 1:
3915 elif currentbranchheads > 1:
3913 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3916 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3914 "merge)\n"))
3917 "merge)\n"))
3915 else:
3918 else:
3916 ui.status(_("(run 'hg heads' to see heads)\n"))
3919 ui.status(_("(run 'hg heads' to see heads)\n"))
3917 else:
3920 else:
3918 ui.status(_("(run 'hg update' to get a working copy)\n"))
3921 ui.status(_("(run 'hg update' to get a working copy)\n"))
3919
3922
3920 @command('^pull',
3923 @command('^pull',
3921 [('u', 'update', None,
3924 [('u', 'update', None,
3922 _('update to new branch head if changesets were pulled')),
3925 _('update to new branch head if changesets were pulled')),
3923 ('f', 'force', None, _('run even when remote repository is unrelated')),
3926 ('f', 'force', None, _('run even when remote repository is unrelated')),
3924 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3927 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3925 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3928 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3926 ('b', 'branch', [], _('a specific branch you would like to pull'),
3929 ('b', 'branch', [], _('a specific branch you would like to pull'),
3927 _('BRANCH')),
3930 _('BRANCH')),
3928 ] + remoteopts,
3931 ] + remoteopts,
3929 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3932 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3930 def pull(ui, repo, source="default", **opts):
3933 def pull(ui, repo, source="default", **opts):
3931 """pull changes from the specified source
3934 """pull changes from the specified source
3932
3935
3933 Pull changes from a remote repository to a local one.
3936 Pull changes from a remote repository to a local one.
3934
3937
3935 This finds all changes from the repository at the specified path
3938 This finds all changes from the repository at the specified path
3936 or URL and adds them to a local repository (the current one unless
3939 or URL and adds them to a local repository (the current one unless
3937 -R is specified). By default, this does not update the copy of the
3940 -R is specified). By default, this does not update the copy of the
3938 project in the working directory.
3941 project in the working directory.
3939
3942
3940 Use :hg:`incoming` if you want to see what would have been added
3943 Use :hg:`incoming` if you want to see what would have been added
3941 by a pull at the time you issued this command. If you then decide
3944 by a pull at the time you issued this command. If you then decide
3942 to add those changes to the repository, you should use :hg:`pull
3945 to add those changes to the repository, you should use :hg:`pull
3943 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3946 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3944
3947
3945 If SOURCE is omitted, the 'default' path will be used.
3948 If SOURCE is omitted, the 'default' path will be used.
3946 See :hg:`help urls` for more information.
3949 See :hg:`help urls` for more information.
3947
3950
3948 Specifying bookmark as ``.`` is equivalent to specifying the active
3951 Specifying bookmark as ``.`` is equivalent to specifying the active
3949 bookmark's name.
3952 bookmark's name.
3950
3953
3951 Returns 0 on success, 1 if an update had unresolved files.
3954 Returns 0 on success, 1 if an update had unresolved files.
3952 """
3955 """
3953 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3956 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3954 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3957 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3955 other = hg.peer(repo, opts, source)
3958 other = hg.peer(repo, opts, source)
3956 try:
3959 try:
3957 revs, checkout = hg.addbranchrevs(repo, other, branches,
3960 revs, checkout = hg.addbranchrevs(repo, other, branches,
3958 opts.get('rev'))
3961 opts.get('rev'))
3959
3962
3960
3963
3961 pullopargs = {}
3964 pullopargs = {}
3962 if opts.get('bookmark'):
3965 if opts.get('bookmark'):
3963 if not revs:
3966 if not revs:
3964 revs = []
3967 revs = []
3965 # The list of bookmark used here is not the one used to actually
3968 # The list of bookmark used here is not the one used to actually
3966 # update the bookmark name. This can result in the revision pulled
3969 # update the bookmark name. This can result in the revision pulled
3967 # not ending up with the name of the bookmark because of a race
3970 # not ending up with the name of the bookmark because of a race
3968 # condition on the server. (See issue 4689 for details)
3971 # condition on the server. (See issue 4689 for details)
3969 remotebookmarks = other.listkeys('bookmarks')
3972 remotebookmarks = other.listkeys('bookmarks')
3970 pullopargs['remotebookmarks'] = remotebookmarks
3973 pullopargs['remotebookmarks'] = remotebookmarks
3971 for b in opts['bookmark']:
3974 for b in opts['bookmark']:
3972 b = repo._bookmarks.expandname(b)
3975 b = repo._bookmarks.expandname(b)
3973 if b not in remotebookmarks:
3976 if b not in remotebookmarks:
3974 raise error.Abort(_('remote bookmark %s not found!') % b)
3977 raise error.Abort(_('remote bookmark %s not found!') % b)
3975 revs.append(remotebookmarks[b])
3978 revs.append(remotebookmarks[b])
3976
3979
3977 if revs:
3980 if revs:
3978 try:
3981 try:
3979 # When 'rev' is a bookmark name, we cannot guarantee that it
3982 # When 'rev' is a bookmark name, we cannot guarantee that it
3980 # will be updated with that name because of a race condition
3983 # will be updated with that name because of a race condition
3981 # server side. (See issue 4689 for details)
3984 # server side. (See issue 4689 for details)
3982 oldrevs = revs
3985 oldrevs = revs
3983 revs = [] # actually, nodes
3986 revs = [] # actually, nodes
3984 for r in oldrevs:
3987 for r in oldrevs:
3985 node = other.lookup(r)
3988 node = other.lookup(r)
3986 revs.append(node)
3989 revs.append(node)
3987 if r == checkout:
3990 if r == checkout:
3988 checkout = node
3991 checkout = node
3989 except error.CapabilityError:
3992 except error.CapabilityError:
3990 err = _("other repository doesn't support revision lookup, "
3993 err = _("other repository doesn't support revision lookup, "
3991 "so a rev cannot be specified.")
3994 "so a rev cannot be specified.")
3992 raise error.Abort(err)
3995 raise error.Abort(err)
3993
3996
3994 pullopargs.update(opts.get('opargs', {}))
3997 pullopargs.update(opts.get('opargs', {}))
3995 modheads = exchange.pull(repo, other, heads=revs,
3998 modheads = exchange.pull(repo, other, heads=revs,
3996 force=opts.get('force'),
3999 force=opts.get('force'),
3997 bookmarks=opts.get('bookmark', ()),
4000 bookmarks=opts.get('bookmark', ()),
3998 opargs=pullopargs).cgresult
4001 opargs=pullopargs).cgresult
3999
4002
4000 # brev is a name, which might be a bookmark to be activated at
4003 # brev is a name, which might be a bookmark to be activated at
4001 # the end of the update. In other words, it is an explicit
4004 # the end of the update. In other words, it is an explicit
4002 # destination of the update
4005 # destination of the update
4003 brev = None
4006 brev = None
4004
4007
4005 if checkout:
4008 if checkout:
4006 checkout = str(repo.changelog.rev(checkout))
4009 checkout = str(repo.changelog.rev(checkout))
4007
4010
4008 # order below depends on implementation of
4011 # order below depends on implementation of
4009 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4012 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4010 # because 'checkout' is determined without it.
4013 # because 'checkout' is determined without it.
4011 if opts.get('rev'):
4014 if opts.get('rev'):
4012 brev = opts['rev'][0]
4015 brev = opts['rev'][0]
4013 elif opts.get('branch'):
4016 elif opts.get('branch'):
4014 brev = opts['branch'][0]
4017 brev = opts['branch'][0]
4015 else:
4018 else:
4016 brev = branches[0]
4019 brev = branches[0]
4017 repo._subtoppath = source
4020 repo._subtoppath = source
4018 try:
4021 try:
4019 ret = postincoming(ui, repo, modheads, opts.get('update'),
4022 ret = postincoming(ui, repo, modheads, opts.get('update'),
4020 checkout, brev)
4023 checkout, brev)
4021
4024
4022 finally:
4025 finally:
4023 del repo._subtoppath
4026 del repo._subtoppath
4024
4027
4025 finally:
4028 finally:
4026 other.close()
4029 other.close()
4027 return ret
4030 return ret
4028
4031
4029 @command('^push',
4032 @command('^push',
4030 [('f', 'force', None, _('force push')),
4033 [('f', 'force', None, _('force push')),
4031 ('r', 'rev', [],
4034 ('r', 'rev', [],
4032 _('a changeset intended to be included in the destination'),
4035 _('a changeset intended to be included in the destination'),
4033 _('REV')),
4036 _('REV')),
4034 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4037 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4035 ('b', 'branch', [],
4038 ('b', 'branch', [],
4036 _('a specific branch you would like to push'), _('BRANCH')),
4039 _('a specific branch you would like to push'), _('BRANCH')),
4037 ('', 'new-branch', False, _('allow pushing a new branch')),
4040 ('', 'new-branch', False, _('allow pushing a new branch')),
4038 ] + remoteopts,
4041 ] + remoteopts,
4039 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4042 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4040 def push(ui, repo, dest=None, **opts):
4043 def push(ui, repo, dest=None, **opts):
4041 """push changes to the specified destination
4044 """push changes to the specified destination
4042
4045
4043 Push changesets from the local repository to the specified
4046 Push changesets from the local repository to the specified
4044 destination.
4047 destination.
4045
4048
4046 This operation is symmetrical to pull: it is identical to a pull
4049 This operation is symmetrical to pull: it is identical to a pull
4047 in the destination repository from the current one.
4050 in the destination repository from the current one.
4048
4051
4049 By default, push will not allow creation of new heads at the
4052 By default, push will not allow creation of new heads at the
4050 destination, since multiple heads would make it unclear which head
4053 destination, since multiple heads would make it unclear which head
4051 to use. In this situation, it is recommended to pull and merge
4054 to use. In this situation, it is recommended to pull and merge
4052 before pushing.
4055 before pushing.
4053
4056
4054 Use --new-branch if you want to allow push to create a new named
4057 Use --new-branch if you want to allow push to create a new named
4055 branch that is not present at the destination. This allows you to
4058 branch that is not present at the destination. This allows you to
4056 only create a new branch without forcing other changes.
4059 only create a new branch without forcing other changes.
4057
4060
4058 .. note::
4061 .. note::
4059
4062
4060 Extra care should be taken with the -f/--force option,
4063 Extra care should be taken with the -f/--force option,
4061 which will push all new heads on all branches, an action which will
4064 which will push all new heads on all branches, an action which will
4062 almost always cause confusion for collaborators.
4065 almost always cause confusion for collaborators.
4063
4066
4064 If -r/--rev is used, the specified revision and all its ancestors
4067 If -r/--rev is used, the specified revision and all its ancestors
4065 will be pushed to the remote repository.
4068 will be pushed to the remote repository.
4066
4069
4067 If -B/--bookmark is used, the specified bookmarked revision, its
4070 If -B/--bookmark is used, the specified bookmarked revision, its
4068 ancestors, and the bookmark will be pushed to the remote
4071 ancestors, and the bookmark will be pushed to the remote
4069 repository. Specifying ``.`` is equivalent to specifying the active
4072 repository. Specifying ``.`` is equivalent to specifying the active
4070 bookmark's name.
4073 bookmark's name.
4071
4074
4072 Please see :hg:`help urls` for important details about ``ssh://``
4075 Please see :hg:`help urls` for important details about ``ssh://``
4073 URLs. If DESTINATION is omitted, a default path will be used.
4076 URLs. If DESTINATION is omitted, a default path will be used.
4074
4077
4075 Returns 0 if push was successful, 1 if nothing to push.
4078 Returns 0 if push was successful, 1 if nothing to push.
4076 """
4079 """
4077
4080
4078 if opts.get('bookmark'):
4081 if opts.get('bookmark'):
4079 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4082 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4080 for b in opts['bookmark']:
4083 for b in opts['bookmark']:
4081 # translate -B options to -r so changesets get pushed
4084 # translate -B options to -r so changesets get pushed
4082 b = repo._bookmarks.expandname(b)
4085 b = repo._bookmarks.expandname(b)
4083 if b in repo._bookmarks:
4086 if b in repo._bookmarks:
4084 opts.setdefault('rev', []).append(b)
4087 opts.setdefault('rev', []).append(b)
4085 else:
4088 else:
4086 # if we try to push a deleted bookmark, translate it to null
4089 # if we try to push a deleted bookmark, translate it to null
4087 # this lets simultaneous -r, -b options continue working
4090 # this lets simultaneous -r, -b options continue working
4088 opts.setdefault('rev', []).append("null")
4091 opts.setdefault('rev', []).append("null")
4089
4092
4090 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4093 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4091 if not path:
4094 if not path:
4092 raise error.Abort(_('default repository not configured!'),
4095 raise error.Abort(_('default repository not configured!'),
4093 hint=_("see 'hg help config.paths'"))
4096 hint=_("see 'hg help config.paths'"))
4094 dest = path.pushloc or path.loc
4097 dest = path.pushloc or path.loc
4095 branches = (path.branch, opts.get('branch') or [])
4098 branches = (path.branch, opts.get('branch') or [])
4096 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4099 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4097 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4100 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4098 other = hg.peer(repo, opts, dest)
4101 other = hg.peer(repo, opts, dest)
4099
4102
4100 if revs:
4103 if revs:
4101 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4104 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4102 if not revs:
4105 if not revs:
4103 raise error.Abort(_("specified revisions evaluate to an empty set"),
4106 raise error.Abort(_("specified revisions evaluate to an empty set"),
4104 hint=_("use different revision arguments"))
4107 hint=_("use different revision arguments"))
4105 elif path.pushrev:
4108 elif path.pushrev:
4106 # It doesn't make any sense to specify ancestor revisions. So limit
4109 # It doesn't make any sense to specify ancestor revisions. So limit
4107 # to DAG heads to make discovery simpler.
4110 # to DAG heads to make discovery simpler.
4108 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4111 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4109 revs = scmutil.revrange(repo, [expr])
4112 revs = scmutil.revrange(repo, [expr])
4110 revs = [repo[rev].node() for rev in revs]
4113 revs = [repo[rev].node() for rev in revs]
4111 if not revs:
4114 if not revs:
4112 raise error.Abort(_('default push revset for path evaluates to an '
4115 raise error.Abort(_('default push revset for path evaluates to an '
4113 'empty set'))
4116 'empty set'))
4114
4117
4115 repo._subtoppath = dest
4118 repo._subtoppath = dest
4116 try:
4119 try:
4117 # push subrepos depth-first for coherent ordering
4120 # push subrepos depth-first for coherent ordering
4118 c = repo['']
4121 c = repo['']
4119 subs = c.substate # only repos that are committed
4122 subs = c.substate # only repos that are committed
4120 for s in sorted(subs):
4123 for s in sorted(subs):
4121 result = c.sub(s).push(opts)
4124 result = c.sub(s).push(opts)
4122 if result == 0:
4125 if result == 0:
4123 return not result
4126 return not result
4124 finally:
4127 finally:
4125 del repo._subtoppath
4128 del repo._subtoppath
4126 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4129 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4127 newbranch=opts.get('new_branch'),
4130 newbranch=opts.get('new_branch'),
4128 bookmarks=opts.get('bookmark', ()),
4131 bookmarks=opts.get('bookmark', ()),
4129 opargs=opts.get('opargs'))
4132 opargs=opts.get('opargs'))
4130
4133
4131 result = not pushop.cgresult
4134 result = not pushop.cgresult
4132
4135
4133 if pushop.bkresult is not None:
4136 if pushop.bkresult is not None:
4134 if pushop.bkresult == 2:
4137 if pushop.bkresult == 2:
4135 result = 2
4138 result = 2
4136 elif not result and pushop.bkresult:
4139 elif not result and pushop.bkresult:
4137 result = 2
4140 result = 2
4138
4141
4139 return result
4142 return result
4140
4143
4141 @command('recover', [])
4144 @command('recover', [])
4142 def recover(ui, repo):
4145 def recover(ui, repo):
4143 """roll back an interrupted transaction
4146 """roll back an interrupted transaction
4144
4147
4145 Recover from an interrupted commit or pull.
4148 Recover from an interrupted commit or pull.
4146
4149
4147 This command tries to fix the repository status after an
4150 This command tries to fix the repository status after an
4148 interrupted operation. It should only be necessary when Mercurial
4151 interrupted operation. It should only be necessary when Mercurial
4149 suggests it.
4152 suggests it.
4150
4153
4151 Returns 0 if successful, 1 if nothing to recover or verify fails.
4154 Returns 0 if successful, 1 if nothing to recover or verify fails.
4152 """
4155 """
4153 if repo.recover():
4156 if repo.recover():
4154 return hg.verify(repo)
4157 return hg.verify(repo)
4155 return 1
4158 return 1
4156
4159
4157 @command('^remove|rm',
4160 @command('^remove|rm',
4158 [('A', 'after', None, _('record delete for missing files')),
4161 [('A', 'after', None, _('record delete for missing files')),
4159 ('f', 'force', None,
4162 ('f', 'force', None,
4160 _('forget added files, delete modified files')),
4163 _('forget added files, delete modified files')),
4161 ] + subrepoopts + walkopts,
4164 ] + subrepoopts + walkopts,
4162 _('[OPTION]... FILE...'),
4165 _('[OPTION]... FILE...'),
4163 inferrepo=True)
4166 inferrepo=True)
4164 def remove(ui, repo, *pats, **opts):
4167 def remove(ui, repo, *pats, **opts):
4165 """remove the specified files on the next commit
4168 """remove the specified files on the next commit
4166
4169
4167 Schedule the indicated files for removal from the current branch.
4170 Schedule the indicated files for removal from the current branch.
4168
4171
4169 This command schedules the files to be removed at the next commit.
4172 This command schedules the files to be removed at the next commit.
4170 To undo a remove before that, see :hg:`revert`. To undo added
4173 To undo a remove before that, see :hg:`revert`. To undo added
4171 files, see :hg:`forget`.
4174 files, see :hg:`forget`.
4172
4175
4173 .. container:: verbose
4176 .. container:: verbose
4174
4177
4175 -A/--after can be used to remove only files that have already
4178 -A/--after can be used to remove only files that have already
4176 been deleted, -f/--force can be used to force deletion, and -Af
4179 been deleted, -f/--force can be used to force deletion, and -Af
4177 can be used to remove files from the next revision without
4180 can be used to remove files from the next revision without
4178 deleting them from the working directory.
4181 deleting them from the working directory.
4179
4182
4180 The following table details the behavior of remove for different
4183 The following table details the behavior of remove for different
4181 file states (columns) and option combinations (rows). The file
4184 file states (columns) and option combinations (rows). The file
4182 states are Added [A], Clean [C], Modified [M] and Missing [!]
4185 states are Added [A], Clean [C], Modified [M] and Missing [!]
4183 (as reported by :hg:`status`). The actions are Warn, Remove
4186 (as reported by :hg:`status`). The actions are Warn, Remove
4184 (from branch) and Delete (from disk):
4187 (from branch) and Delete (from disk):
4185
4188
4186 ========= == == == ==
4189 ========= == == == ==
4187 opt/state A C M !
4190 opt/state A C M !
4188 ========= == == == ==
4191 ========= == == == ==
4189 none W RD W R
4192 none W RD W R
4190 -f R RD RD R
4193 -f R RD RD R
4191 -A W W W R
4194 -A W W W R
4192 -Af R R R R
4195 -Af R R R R
4193 ========= == == == ==
4196 ========= == == == ==
4194
4197
4195 .. note::
4198 .. note::
4196
4199
4197 :hg:`remove` never deletes files in Added [A] state from the
4200 :hg:`remove` never deletes files in Added [A] state from the
4198 working directory, not even if ``--force`` is specified.
4201 working directory, not even if ``--force`` is specified.
4199
4202
4200 Returns 0 on success, 1 if any warnings encountered.
4203 Returns 0 on success, 1 if any warnings encountered.
4201 """
4204 """
4202
4205
4203 after, force = opts.get('after'), opts.get('force')
4206 after, force = opts.get('after'), opts.get('force')
4204 if not pats and not after:
4207 if not pats and not after:
4205 raise error.Abort(_('no files specified'))
4208 raise error.Abort(_('no files specified'))
4206
4209
4207 m = scmutil.match(repo[None], pats, opts)
4210 m = scmutil.match(repo[None], pats, opts)
4208 subrepos = opts.get('subrepos')
4211 subrepos = opts.get('subrepos')
4209 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4212 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4210
4213
4211 @command('rename|move|mv',
4214 @command('rename|move|mv',
4212 [('A', 'after', None, _('record a rename that has already occurred')),
4215 [('A', 'after', None, _('record a rename that has already occurred')),
4213 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4216 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4214 ] + walkopts + dryrunopts,
4217 ] + walkopts + dryrunopts,
4215 _('[OPTION]... SOURCE... DEST'))
4218 _('[OPTION]... SOURCE... DEST'))
4216 def rename(ui, repo, *pats, **opts):
4219 def rename(ui, repo, *pats, **opts):
4217 """rename files; equivalent of copy + remove
4220 """rename files; equivalent of copy + remove
4218
4221
4219 Mark dest as copies of sources; mark sources for deletion. If dest
4222 Mark dest as copies of sources; mark sources for deletion. If dest
4220 is a directory, copies are put in that directory. If dest is a
4223 is a directory, copies are put in that directory. If dest is a
4221 file, there can only be one source.
4224 file, there can only be one source.
4222
4225
4223 By default, this command copies the contents of files as they
4226 By default, this command copies the contents of files as they
4224 exist in the working directory. If invoked with -A/--after, the
4227 exist in the working directory. If invoked with -A/--after, the
4225 operation is recorded, but no copying is performed.
4228 operation is recorded, but no copying is performed.
4226
4229
4227 This command takes effect at the next commit. To undo a rename
4230 This command takes effect at the next commit. To undo a rename
4228 before that, see :hg:`revert`.
4231 before that, see :hg:`revert`.
4229
4232
4230 Returns 0 on success, 1 if errors are encountered.
4233 Returns 0 on success, 1 if errors are encountered.
4231 """
4234 """
4232 with repo.wlock(False):
4235 with repo.wlock(False):
4233 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4236 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4234
4237
4235 @command('resolve',
4238 @command('resolve',
4236 [('a', 'all', None, _('select all unresolved files')),
4239 [('a', 'all', None, _('select all unresolved files')),
4237 ('l', 'list', None, _('list state of files needing merge')),
4240 ('l', 'list', None, _('list state of files needing merge')),
4238 ('m', 'mark', None, _('mark files as resolved')),
4241 ('m', 'mark', None, _('mark files as resolved')),
4239 ('u', 'unmark', None, _('mark files as unresolved')),
4242 ('u', 'unmark', None, _('mark files as unresolved')),
4240 ('n', 'no-status', None, _('hide status prefix'))]
4243 ('n', 'no-status', None, _('hide status prefix'))]
4241 + mergetoolopts + walkopts + formatteropts,
4244 + mergetoolopts + walkopts + formatteropts,
4242 _('[OPTION]... [FILE]...'),
4245 _('[OPTION]... [FILE]...'),
4243 inferrepo=True)
4246 inferrepo=True)
4244 def resolve(ui, repo, *pats, **opts):
4247 def resolve(ui, repo, *pats, **opts):
4245 """redo merges or set/view the merge status of files
4248 """redo merges or set/view the merge status of files
4246
4249
4247 Merges with unresolved conflicts are often the result of
4250 Merges with unresolved conflicts are often the result of
4248 non-interactive merging using the ``internal:merge`` configuration
4251 non-interactive merging using the ``internal:merge`` configuration
4249 setting, or a command-line merge tool like ``diff3``. The resolve
4252 setting, or a command-line merge tool like ``diff3``. The resolve
4250 command is used to manage the files involved in a merge, after
4253 command is used to manage the files involved in a merge, after
4251 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4254 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4252 working directory must have two parents). See :hg:`help
4255 working directory must have two parents). See :hg:`help
4253 merge-tools` for information on configuring merge tools.
4256 merge-tools` for information on configuring merge tools.
4254
4257
4255 The resolve command can be used in the following ways:
4258 The resolve command can be used in the following ways:
4256
4259
4257 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4260 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4258 files, discarding any previous merge attempts. Re-merging is not
4261 files, discarding any previous merge attempts. Re-merging is not
4259 performed for files already marked as resolved. Use ``--all/-a``
4262 performed for files already marked as resolved. Use ``--all/-a``
4260 to select all unresolved files. ``--tool`` can be used to specify
4263 to select all unresolved files. ``--tool`` can be used to specify
4261 the merge tool used for the given files. It overrides the HGMERGE
4264 the merge tool used for the given files. It overrides the HGMERGE
4262 environment variable and your configuration files. Previous file
4265 environment variable and your configuration files. Previous file
4263 contents are saved with a ``.orig`` suffix.
4266 contents are saved with a ``.orig`` suffix.
4264
4267
4265 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4268 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4266 (e.g. after having manually fixed-up the files). The default is
4269 (e.g. after having manually fixed-up the files). The default is
4267 to mark all unresolved files.
4270 to mark all unresolved files.
4268
4271
4269 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4272 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4270 default is to mark all resolved files.
4273 default is to mark all resolved files.
4271
4274
4272 - :hg:`resolve -l`: list files which had or still have conflicts.
4275 - :hg:`resolve -l`: list files which had or still have conflicts.
4273 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4276 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4274 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4277 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4275 the list. See :hg:`help filesets` for details.
4278 the list. See :hg:`help filesets` for details.
4276
4279
4277 .. note::
4280 .. note::
4278
4281
4279 Mercurial will not let you commit files with unresolved merge
4282 Mercurial will not let you commit files with unresolved merge
4280 conflicts. You must use :hg:`resolve -m ...` before you can
4283 conflicts. You must use :hg:`resolve -m ...` before you can
4281 commit after a conflicting merge.
4284 commit after a conflicting merge.
4282
4285
4283 Returns 0 on success, 1 if any files fail a resolve attempt.
4286 Returns 0 on success, 1 if any files fail a resolve attempt.
4284 """
4287 """
4285
4288
4286 flaglist = 'all mark unmark list no_status'.split()
4289 flaglist = 'all mark unmark list no_status'.split()
4287 all, mark, unmark, show, nostatus = \
4290 all, mark, unmark, show, nostatus = \
4288 [opts.get(o) for o in flaglist]
4291 [opts.get(o) for o in flaglist]
4289
4292
4290 if (show and (mark or unmark)) or (mark and unmark):
4293 if (show and (mark or unmark)) or (mark and unmark):
4291 raise error.Abort(_("too many options specified"))
4294 raise error.Abort(_("too many options specified"))
4292 if pats and all:
4295 if pats and all:
4293 raise error.Abort(_("can't specify --all and patterns"))
4296 raise error.Abort(_("can't specify --all and patterns"))
4294 if not (all or pats or show or mark or unmark):
4297 if not (all or pats or show or mark or unmark):
4295 raise error.Abort(_('no files or directories specified'),
4298 raise error.Abort(_('no files or directories specified'),
4296 hint=('use --all to re-merge all unresolved files'))
4299 hint=('use --all to re-merge all unresolved files'))
4297
4300
4298 if show:
4301 if show:
4299 fm = ui.formatter('resolve', opts)
4302 fm = ui.formatter('resolve', opts)
4300 ms = mergemod.mergestate.read(repo)
4303 ms = mergemod.mergestate.read(repo)
4301 m = scmutil.match(repo[None], pats, opts)
4304 m = scmutil.match(repo[None], pats, opts)
4302 for f in ms:
4305 for f in ms:
4303 if not m(f):
4306 if not m(f):
4304 continue
4307 continue
4305 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4308 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4306 'd': 'driverresolved'}[ms[f]]
4309 'd': 'driverresolved'}[ms[f]]
4307 fm.startitem()
4310 fm.startitem()
4308 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4311 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4309 fm.write('path', '%s\n', f, label=l)
4312 fm.write('path', '%s\n', f, label=l)
4310 fm.end()
4313 fm.end()
4311 return 0
4314 return 0
4312
4315
4313 with repo.wlock():
4316 with repo.wlock():
4314 ms = mergemod.mergestate.read(repo)
4317 ms = mergemod.mergestate.read(repo)
4315
4318
4316 if not (ms.active() or repo.dirstate.p2() != nullid):
4319 if not (ms.active() or repo.dirstate.p2() != nullid):
4317 raise error.Abort(
4320 raise error.Abort(
4318 _('resolve command not applicable when not merging'))
4321 _('resolve command not applicable when not merging'))
4319
4322
4320 wctx = repo[None]
4323 wctx = repo[None]
4321
4324
4322 if ms.mergedriver and ms.mdstate() == 'u':
4325 if ms.mergedriver and ms.mdstate() == 'u':
4323 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4326 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4324 ms.commit()
4327 ms.commit()
4325 # allow mark and unmark to go through
4328 # allow mark and unmark to go through
4326 if not mark and not unmark and not proceed:
4329 if not mark and not unmark and not proceed:
4327 return 1
4330 return 1
4328
4331
4329 m = scmutil.match(wctx, pats, opts)
4332 m = scmutil.match(wctx, pats, opts)
4330 ret = 0
4333 ret = 0
4331 didwork = False
4334 didwork = False
4332 runconclude = False
4335 runconclude = False
4333
4336
4334 tocomplete = []
4337 tocomplete = []
4335 for f in ms:
4338 for f in ms:
4336 if not m(f):
4339 if not m(f):
4337 continue
4340 continue
4338
4341
4339 didwork = True
4342 didwork = True
4340
4343
4341 # don't let driver-resolved files be marked, and run the conclude
4344 # don't let driver-resolved files be marked, and run the conclude
4342 # step if asked to resolve
4345 # step if asked to resolve
4343 if ms[f] == "d":
4346 if ms[f] == "d":
4344 exact = m.exact(f)
4347 exact = m.exact(f)
4345 if mark:
4348 if mark:
4346 if exact:
4349 if exact:
4347 ui.warn(_('not marking %s as it is driver-resolved\n')
4350 ui.warn(_('not marking %s as it is driver-resolved\n')
4348 % f)
4351 % f)
4349 elif unmark:
4352 elif unmark:
4350 if exact:
4353 if exact:
4351 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4354 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4352 % f)
4355 % f)
4353 else:
4356 else:
4354 runconclude = True
4357 runconclude = True
4355 continue
4358 continue
4356
4359
4357 if mark:
4360 if mark:
4358 ms.mark(f, "r")
4361 ms.mark(f, "r")
4359 elif unmark:
4362 elif unmark:
4360 ms.mark(f, "u")
4363 ms.mark(f, "u")
4361 else:
4364 else:
4362 # backup pre-resolve (merge uses .orig for its own purposes)
4365 # backup pre-resolve (merge uses .orig for its own purposes)
4363 a = repo.wjoin(f)
4366 a = repo.wjoin(f)
4364 try:
4367 try:
4365 util.copyfile(a, a + ".resolve")
4368 util.copyfile(a, a + ".resolve")
4366 except (IOError, OSError) as inst:
4369 except (IOError, OSError) as inst:
4367 if inst.errno != errno.ENOENT:
4370 if inst.errno != errno.ENOENT:
4368 raise
4371 raise
4369
4372
4370 try:
4373 try:
4371 # preresolve file
4374 # preresolve file
4372 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4375 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4373 'resolve')
4376 'resolve')
4374 complete, r = ms.preresolve(f, wctx)
4377 complete, r = ms.preresolve(f, wctx)
4375 if not complete:
4378 if not complete:
4376 tocomplete.append(f)
4379 tocomplete.append(f)
4377 elif r:
4380 elif r:
4378 ret = 1
4381 ret = 1
4379 finally:
4382 finally:
4380 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4383 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4381 ms.commit()
4384 ms.commit()
4382
4385
4383 # replace filemerge's .orig file with our resolve file, but only
4386 # replace filemerge's .orig file with our resolve file, but only
4384 # for merges that are complete
4387 # for merges that are complete
4385 if complete:
4388 if complete:
4386 try:
4389 try:
4387 util.rename(a + ".resolve",
4390 util.rename(a + ".resolve",
4388 scmutil.origpath(ui, repo, a))
4391 scmutil.origpath(ui, repo, a))
4389 except OSError as inst:
4392 except OSError as inst:
4390 if inst.errno != errno.ENOENT:
4393 if inst.errno != errno.ENOENT:
4391 raise
4394 raise
4392
4395
4393 for f in tocomplete:
4396 for f in tocomplete:
4394 try:
4397 try:
4395 # resolve file
4398 # resolve file
4396 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4399 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4397 'resolve')
4400 'resolve')
4398 r = ms.resolve(f, wctx)
4401 r = ms.resolve(f, wctx)
4399 if r:
4402 if r:
4400 ret = 1
4403 ret = 1
4401 finally:
4404 finally:
4402 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4405 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4403 ms.commit()
4406 ms.commit()
4404
4407
4405 # replace filemerge's .orig file with our resolve file
4408 # replace filemerge's .orig file with our resolve file
4406 a = repo.wjoin(f)
4409 a = repo.wjoin(f)
4407 try:
4410 try:
4408 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4411 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4409 except OSError as inst:
4412 except OSError as inst:
4410 if inst.errno != errno.ENOENT:
4413 if inst.errno != errno.ENOENT:
4411 raise
4414 raise
4412
4415
4413 ms.commit()
4416 ms.commit()
4414 ms.recordactions()
4417 ms.recordactions()
4415
4418
4416 if not didwork and pats:
4419 if not didwork and pats:
4417 hint = None
4420 hint = None
4418 if not any([p for p in pats if p.find(':') >= 0]):
4421 if not any([p for p in pats if p.find(':') >= 0]):
4419 pats = ['path:%s' % p for p in pats]
4422 pats = ['path:%s' % p for p in pats]
4420 m = scmutil.match(wctx, pats, opts)
4423 m = scmutil.match(wctx, pats, opts)
4421 for f in ms:
4424 for f in ms:
4422 if not m(f):
4425 if not m(f):
4423 continue
4426 continue
4424 flags = ''.join(['-%s ' % o[0] for o in flaglist
4427 flags = ''.join(['-%s ' % o[0] for o in flaglist
4425 if opts.get(o)])
4428 if opts.get(o)])
4426 hint = _("(try: hg resolve %s%s)\n") % (
4429 hint = _("(try: hg resolve %s%s)\n") % (
4427 flags,
4430 flags,
4428 ' '.join(pats))
4431 ' '.join(pats))
4429 break
4432 break
4430 ui.warn(_("arguments do not match paths that need resolving\n"))
4433 ui.warn(_("arguments do not match paths that need resolving\n"))
4431 if hint:
4434 if hint:
4432 ui.warn(hint)
4435 ui.warn(hint)
4433 elif ms.mergedriver and ms.mdstate() != 's':
4436 elif ms.mergedriver and ms.mdstate() != 's':
4434 # run conclude step when either a driver-resolved file is requested
4437 # run conclude step when either a driver-resolved file is requested
4435 # or there are no driver-resolved files
4438 # or there are no driver-resolved files
4436 # we can't use 'ret' to determine whether any files are unresolved
4439 # we can't use 'ret' to determine whether any files are unresolved
4437 # because we might not have tried to resolve some
4440 # because we might not have tried to resolve some
4438 if ((runconclude or not list(ms.driverresolved()))
4441 if ((runconclude or not list(ms.driverresolved()))
4439 and not list(ms.unresolved())):
4442 and not list(ms.unresolved())):
4440 proceed = mergemod.driverconclude(repo, ms, wctx)
4443 proceed = mergemod.driverconclude(repo, ms, wctx)
4441 ms.commit()
4444 ms.commit()
4442 if not proceed:
4445 if not proceed:
4443 return 1
4446 return 1
4444
4447
4445 # Nudge users into finishing an unfinished operation
4448 # Nudge users into finishing an unfinished operation
4446 unresolvedf = list(ms.unresolved())
4449 unresolvedf = list(ms.unresolved())
4447 driverresolvedf = list(ms.driverresolved())
4450 driverresolvedf = list(ms.driverresolved())
4448 if not unresolvedf and not driverresolvedf:
4451 if not unresolvedf and not driverresolvedf:
4449 ui.status(_('(no more unresolved files)\n'))
4452 ui.status(_('(no more unresolved files)\n'))
4450 cmdutil.checkafterresolved(repo)
4453 cmdutil.checkafterresolved(repo)
4451 elif not unresolvedf:
4454 elif not unresolvedf:
4452 ui.status(_('(no more unresolved files -- '
4455 ui.status(_('(no more unresolved files -- '
4453 'run "hg resolve --all" to conclude)\n'))
4456 'run "hg resolve --all" to conclude)\n'))
4454
4457
4455 return ret
4458 return ret
4456
4459
4457 @command('revert',
4460 @command('revert',
4458 [('a', 'all', None, _('revert all changes when no arguments given')),
4461 [('a', 'all', None, _('revert all changes when no arguments given')),
4459 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4462 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4460 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4463 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4461 ('C', 'no-backup', None, _('do not save backup copies of files')),
4464 ('C', 'no-backup', None, _('do not save backup copies of files')),
4462 ('i', 'interactive', None,
4465 ('i', 'interactive', None,
4463 _('interactively select the changes (EXPERIMENTAL)')),
4466 _('interactively select the changes (EXPERIMENTAL)')),
4464 ] + walkopts + dryrunopts,
4467 ] + walkopts + dryrunopts,
4465 _('[OPTION]... [-r REV] [NAME]...'))
4468 _('[OPTION]... [-r REV] [NAME]...'))
4466 def revert(ui, repo, *pats, **opts):
4469 def revert(ui, repo, *pats, **opts):
4467 """restore files to their checkout state
4470 """restore files to their checkout state
4468
4471
4469 .. note::
4472 .. note::
4470
4473
4471 To check out earlier revisions, you should use :hg:`update REV`.
4474 To check out earlier revisions, you should use :hg:`update REV`.
4472 To cancel an uncommitted merge (and lose your changes),
4475 To cancel an uncommitted merge (and lose your changes),
4473 use :hg:`update --clean .`.
4476 use :hg:`update --clean .`.
4474
4477
4475 With no revision specified, revert the specified files or directories
4478 With no revision specified, revert the specified files or directories
4476 to the contents they had in the parent of the working directory.
4479 to the contents they had in the parent of the working directory.
4477 This restores the contents of files to an unmodified
4480 This restores the contents of files to an unmodified
4478 state and unschedules adds, removes, copies, and renames. If the
4481 state and unschedules adds, removes, copies, and renames. If the
4479 working directory has two parents, you must explicitly specify a
4482 working directory has two parents, you must explicitly specify a
4480 revision.
4483 revision.
4481
4484
4482 Using the -r/--rev or -d/--date options, revert the given files or
4485 Using the -r/--rev or -d/--date options, revert the given files or
4483 directories to their states as of a specific revision. Because
4486 directories to their states as of a specific revision. Because
4484 revert does not change the working directory parents, this will
4487 revert does not change the working directory parents, this will
4485 cause these files to appear modified. This can be helpful to "back
4488 cause these files to appear modified. This can be helpful to "back
4486 out" some or all of an earlier change. See :hg:`backout` for a
4489 out" some or all of an earlier change. See :hg:`backout` for a
4487 related method.
4490 related method.
4488
4491
4489 Modified files are saved with a .orig suffix before reverting.
4492 Modified files are saved with a .orig suffix before reverting.
4490 To disable these backups, use --no-backup. It is possible to store
4493 To disable these backups, use --no-backup. It is possible to store
4491 the backup files in a custom directory relative to the root of the
4494 the backup files in a custom directory relative to the root of the
4492 repository by setting the ``ui.origbackuppath`` configuration
4495 repository by setting the ``ui.origbackuppath`` configuration
4493 option.
4496 option.
4494
4497
4495 See :hg:`help dates` for a list of formats valid for -d/--date.
4498 See :hg:`help dates` for a list of formats valid for -d/--date.
4496
4499
4497 See :hg:`help backout` for a way to reverse the effect of an
4500 See :hg:`help backout` for a way to reverse the effect of an
4498 earlier changeset.
4501 earlier changeset.
4499
4502
4500 Returns 0 on success.
4503 Returns 0 on success.
4501 """
4504 """
4502
4505
4503 if opts.get("date"):
4506 if opts.get("date"):
4504 if opts.get("rev"):
4507 if opts.get("rev"):
4505 raise error.Abort(_("you can't specify a revision and a date"))
4508 raise error.Abort(_("you can't specify a revision and a date"))
4506 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4509 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4507
4510
4508 parent, p2 = repo.dirstate.parents()
4511 parent, p2 = repo.dirstate.parents()
4509 if not opts.get('rev') and p2 != nullid:
4512 if not opts.get('rev') and p2 != nullid:
4510 # revert after merge is a trap for new users (issue2915)
4513 # revert after merge is a trap for new users (issue2915)
4511 raise error.Abort(_('uncommitted merge with no revision specified'),
4514 raise error.Abort(_('uncommitted merge with no revision specified'),
4512 hint=_("use 'hg update' or see 'hg help revert'"))
4515 hint=_("use 'hg update' or see 'hg help revert'"))
4513
4516
4514 ctx = scmutil.revsingle(repo, opts.get('rev'))
4517 ctx = scmutil.revsingle(repo, opts.get('rev'))
4515
4518
4516 if (not (pats or opts.get('include') or opts.get('exclude') or
4519 if (not (pats or opts.get('include') or opts.get('exclude') or
4517 opts.get('all') or opts.get('interactive'))):
4520 opts.get('all') or opts.get('interactive'))):
4518 msg = _("no files or directories specified")
4521 msg = _("no files or directories specified")
4519 if p2 != nullid:
4522 if p2 != nullid:
4520 hint = _("uncommitted merge, use --all to discard all changes,"
4523 hint = _("uncommitted merge, use --all to discard all changes,"
4521 " or 'hg update -C .' to abort the merge")
4524 " or 'hg update -C .' to abort the merge")
4522 raise error.Abort(msg, hint=hint)
4525 raise error.Abort(msg, hint=hint)
4523 dirty = any(repo.status())
4526 dirty = any(repo.status())
4524 node = ctx.node()
4527 node = ctx.node()
4525 if node != parent:
4528 if node != parent:
4526 if dirty:
4529 if dirty:
4527 hint = _("uncommitted changes, use --all to discard all"
4530 hint = _("uncommitted changes, use --all to discard all"
4528 " changes, or 'hg update %s' to update") % ctx.rev()
4531 " changes, or 'hg update %s' to update") % ctx.rev()
4529 else:
4532 else:
4530 hint = _("use --all to revert all files,"
4533 hint = _("use --all to revert all files,"
4531 " or 'hg update %s' to update") % ctx.rev()
4534 " or 'hg update %s' to update") % ctx.rev()
4532 elif dirty:
4535 elif dirty:
4533 hint = _("uncommitted changes, use --all to discard all changes")
4536 hint = _("uncommitted changes, use --all to discard all changes")
4534 else:
4537 else:
4535 hint = _("use --all to revert all files")
4538 hint = _("use --all to revert all files")
4536 raise error.Abort(msg, hint=hint)
4539 raise error.Abort(msg, hint=hint)
4537
4540
4538 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4541 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4539
4542
4540 @command('rollback', dryrunopts +
4543 @command('rollback', dryrunopts +
4541 [('f', 'force', False, _('ignore safety measures'))])
4544 [('f', 'force', False, _('ignore safety measures'))])
4542 def rollback(ui, repo, **opts):
4545 def rollback(ui, repo, **opts):
4543 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4546 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4544
4547
4545 Please use :hg:`commit --amend` instead of rollback to correct
4548 Please use :hg:`commit --amend` instead of rollback to correct
4546 mistakes in the last commit.
4549 mistakes in the last commit.
4547
4550
4548 This command should be used with care. There is only one level of
4551 This command should be used with care. There is only one level of
4549 rollback, and there is no way to undo a rollback. It will also
4552 rollback, and there is no way to undo a rollback. It will also
4550 restore the dirstate at the time of the last transaction, losing
4553 restore the dirstate at the time of the last transaction, losing
4551 any dirstate changes since that time. This command does not alter
4554 any dirstate changes since that time. This command does not alter
4552 the working directory.
4555 the working directory.
4553
4556
4554 Transactions are used to encapsulate the effects of all commands
4557 Transactions are used to encapsulate the effects of all commands
4555 that create new changesets or propagate existing changesets into a
4558 that create new changesets or propagate existing changesets into a
4556 repository.
4559 repository.
4557
4560
4558 .. container:: verbose
4561 .. container:: verbose
4559
4562
4560 For example, the following commands are transactional, and their
4563 For example, the following commands are transactional, and their
4561 effects can be rolled back:
4564 effects can be rolled back:
4562
4565
4563 - commit
4566 - commit
4564 - import
4567 - import
4565 - pull
4568 - pull
4566 - push (with this repository as the destination)
4569 - push (with this repository as the destination)
4567 - unbundle
4570 - unbundle
4568
4571
4569 To avoid permanent data loss, rollback will refuse to rollback a
4572 To avoid permanent data loss, rollback will refuse to rollback a
4570 commit transaction if it isn't checked out. Use --force to
4573 commit transaction if it isn't checked out. Use --force to
4571 override this protection.
4574 override this protection.
4572
4575
4573 The rollback command can be entirely disabled by setting the
4576 The rollback command can be entirely disabled by setting the
4574 ``ui.rollback`` configuration setting to false. If you're here
4577 ``ui.rollback`` configuration setting to false. If you're here
4575 because you want to use rollback and it's disabled, you can
4578 because you want to use rollback and it's disabled, you can
4576 re-enable the command by setting ``ui.rollback`` to true.
4579 re-enable the command by setting ``ui.rollback`` to true.
4577
4580
4578 This command is not intended for use on public repositories. Once
4581 This command is not intended for use on public repositories. Once
4579 changes are visible for pull by other users, rolling a transaction
4582 changes are visible for pull by other users, rolling a transaction
4580 back locally is ineffective (someone else may already have pulled
4583 back locally is ineffective (someone else may already have pulled
4581 the changes). Furthermore, a race is possible with readers of the
4584 the changes). Furthermore, a race is possible with readers of the
4582 repository; for example an in-progress pull from the repository
4585 repository; for example an in-progress pull from the repository
4583 may fail if a rollback is performed.
4586 may fail if a rollback is performed.
4584
4587
4585 Returns 0 on success, 1 if no rollback data is available.
4588 Returns 0 on success, 1 if no rollback data is available.
4586 """
4589 """
4587 if not ui.configbool('ui', 'rollback', True):
4590 if not ui.configbool('ui', 'rollback', True):
4588 raise error.Abort(_('rollback is disabled because it is unsafe'),
4591 raise error.Abort(_('rollback is disabled because it is unsafe'),
4589 hint=('see `hg help -v rollback` for information'))
4592 hint=('see `hg help -v rollback` for information'))
4590 return repo.rollback(dryrun=opts.get('dry_run'),
4593 return repo.rollback(dryrun=opts.get('dry_run'),
4591 force=opts.get('force'))
4594 force=opts.get('force'))
4592
4595
4593 @command('root', [])
4596 @command('root', [])
4594 def root(ui, repo):
4597 def root(ui, repo):
4595 """print the root (top) of the current working directory
4598 """print the root (top) of the current working directory
4596
4599
4597 Print the root directory of the current repository.
4600 Print the root directory of the current repository.
4598
4601
4599 Returns 0 on success.
4602 Returns 0 on success.
4600 """
4603 """
4601 ui.write(repo.root + "\n")
4604 ui.write(repo.root + "\n")
4602
4605
4603 @command('^serve',
4606 @command('^serve',
4604 [('A', 'accesslog', '', _('name of access log file to write to'),
4607 [('A', 'accesslog', '', _('name of access log file to write to'),
4605 _('FILE')),
4608 _('FILE')),
4606 ('d', 'daemon', None, _('run server in background')),
4609 ('d', 'daemon', None, _('run server in background')),
4607 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4610 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4608 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4611 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4609 # use string type, then we can check if something was passed
4612 # use string type, then we can check if something was passed
4610 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4613 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4611 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4614 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4612 _('ADDR')),
4615 _('ADDR')),
4613 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4616 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4614 _('PREFIX')),
4617 _('PREFIX')),
4615 ('n', 'name', '',
4618 ('n', 'name', '',
4616 _('name to show in web pages (default: working directory)'), _('NAME')),
4619 _('name to show in web pages (default: working directory)'), _('NAME')),
4617 ('', 'web-conf', '',
4620 ('', 'web-conf', '',
4618 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4621 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4619 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4622 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4620 _('FILE')),
4623 _('FILE')),
4621 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4624 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4622 ('', 'stdio', None, _('for remote clients')),
4625 ('', 'stdio', None, _('for remote clients')),
4623 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4626 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4624 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4627 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4625 ('', 'style', '', _('template style to use'), _('STYLE')),
4628 ('', 'style', '', _('template style to use'), _('STYLE')),
4626 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4629 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4627 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4630 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4628 _('[OPTION]...'),
4631 _('[OPTION]...'),
4629 optionalrepo=True)
4632 optionalrepo=True)
4630 def serve(ui, repo, **opts):
4633 def serve(ui, repo, **opts):
4631 """start stand-alone webserver
4634 """start stand-alone webserver
4632
4635
4633 Start a local HTTP repository browser and pull server. You can use
4636 Start a local HTTP repository browser and pull server. You can use
4634 this for ad-hoc sharing and browsing of repositories. It is
4637 this for ad-hoc sharing and browsing of repositories. It is
4635 recommended to use a real web server to serve a repository for
4638 recommended to use a real web server to serve a repository for
4636 longer periods of time.
4639 longer periods of time.
4637
4640
4638 Please note that the server does not implement access control.
4641 Please note that the server does not implement access control.
4639 This means that, by default, anybody can read from the server and
4642 This means that, by default, anybody can read from the server and
4640 nobody can write to it by default. Set the ``web.allow_push``
4643 nobody can write to it by default. Set the ``web.allow_push``
4641 option to ``*`` to allow everybody to push to the server. You
4644 option to ``*`` to allow everybody to push to the server. You
4642 should use a real web server if you need to authenticate users.
4645 should use a real web server if you need to authenticate users.
4643
4646
4644 By default, the server logs accesses to stdout and errors to
4647 By default, the server logs accesses to stdout and errors to
4645 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4648 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4646 files.
4649 files.
4647
4650
4648 To have the server choose a free port number to listen on, specify
4651 To have the server choose a free port number to listen on, specify
4649 a port number of 0; in this case, the server will print the port
4652 a port number of 0; in this case, the server will print the port
4650 number it uses.
4653 number it uses.
4651
4654
4652 Returns 0 on success.
4655 Returns 0 on success.
4653 """
4656 """
4654
4657
4655 if opts["stdio"] and opts["cmdserver"]:
4658 if opts["stdio"] and opts["cmdserver"]:
4656 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4659 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4657
4660
4658 if opts["stdio"]:
4661 if opts["stdio"]:
4659 if repo is None:
4662 if repo is None:
4660 raise error.RepoError(_("there is no Mercurial repository here"
4663 raise error.RepoError(_("there is no Mercurial repository here"
4661 " (.hg not found)"))
4664 " (.hg not found)"))
4662 s = sshserver.sshserver(ui, repo)
4665 s = sshserver.sshserver(ui, repo)
4663 s.serve_forever()
4666 s.serve_forever()
4664
4667
4665 service = server.createservice(ui, repo, opts)
4668 service = server.createservice(ui, repo, opts)
4666 return server.runservice(opts, initfn=service.init, runfn=service.run)
4669 return server.runservice(opts, initfn=service.init, runfn=service.run)
4667
4670
4668 @command('^status|st',
4671 @command('^status|st',
4669 [('A', 'all', None, _('show status of all files')),
4672 [('A', 'all', None, _('show status of all files')),
4670 ('m', 'modified', None, _('show only modified files')),
4673 ('m', 'modified', None, _('show only modified files')),
4671 ('a', 'added', None, _('show only added files')),
4674 ('a', 'added', None, _('show only added files')),
4672 ('r', 'removed', None, _('show only removed files')),
4675 ('r', 'removed', None, _('show only removed files')),
4673 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4676 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4674 ('c', 'clean', None, _('show only files without changes')),
4677 ('c', 'clean', None, _('show only files without changes')),
4675 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4678 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4676 ('i', 'ignored', None, _('show only ignored files')),
4679 ('i', 'ignored', None, _('show only ignored files')),
4677 ('n', 'no-status', None, _('hide status prefix')),
4680 ('n', 'no-status', None, _('hide status prefix')),
4678 ('C', 'copies', None, _('show source of copied files')),
4681 ('C', 'copies', None, _('show source of copied files')),
4679 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4682 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4680 ('', 'rev', [], _('show difference from revision'), _('REV')),
4683 ('', 'rev', [], _('show difference from revision'), _('REV')),
4681 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4684 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4682 ] + walkopts + subrepoopts + formatteropts,
4685 ] + walkopts + subrepoopts + formatteropts,
4683 _('[OPTION]... [FILE]...'),
4686 _('[OPTION]... [FILE]...'),
4684 inferrepo=True)
4687 inferrepo=True)
4685 def status(ui, repo, *pats, **opts):
4688 def status(ui, repo, *pats, **opts):
4686 """show changed files in the working directory
4689 """show changed files in the working directory
4687
4690
4688 Show status of files in the repository. If names are given, only
4691 Show status of files in the repository. If names are given, only
4689 files that match are shown. Files that are clean or ignored or
4692 files that match are shown. Files that are clean or ignored or
4690 the source of a copy/move operation, are not listed unless
4693 the source of a copy/move operation, are not listed unless
4691 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4694 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4692 Unless options described with "show only ..." are given, the
4695 Unless options described with "show only ..." are given, the
4693 options -mardu are used.
4696 options -mardu are used.
4694
4697
4695 Option -q/--quiet hides untracked (unknown and ignored) files
4698 Option -q/--quiet hides untracked (unknown and ignored) files
4696 unless explicitly requested with -u/--unknown or -i/--ignored.
4699 unless explicitly requested with -u/--unknown or -i/--ignored.
4697
4700
4698 .. note::
4701 .. note::
4699
4702
4700 :hg:`status` may appear to disagree with diff if permissions have
4703 :hg:`status` may appear to disagree with diff if permissions have
4701 changed or a merge has occurred. The standard diff format does
4704 changed or a merge has occurred. The standard diff format does
4702 not report permission changes and diff only reports changes
4705 not report permission changes and diff only reports changes
4703 relative to one merge parent.
4706 relative to one merge parent.
4704
4707
4705 If one revision is given, it is used as the base revision.
4708 If one revision is given, it is used as the base revision.
4706 If two revisions are given, the differences between them are
4709 If two revisions are given, the differences between them are
4707 shown. The --change option can also be used as a shortcut to list
4710 shown. The --change option can also be used as a shortcut to list
4708 the changed files of a revision from its first parent.
4711 the changed files of a revision from its first parent.
4709
4712
4710 The codes used to show the status of files are::
4713 The codes used to show the status of files are::
4711
4714
4712 M = modified
4715 M = modified
4713 A = added
4716 A = added
4714 R = removed
4717 R = removed
4715 C = clean
4718 C = clean
4716 ! = missing (deleted by non-hg command, but still tracked)
4719 ! = missing (deleted by non-hg command, but still tracked)
4717 ? = not tracked
4720 ? = not tracked
4718 I = ignored
4721 I = ignored
4719 = origin of the previous file (with --copies)
4722 = origin of the previous file (with --copies)
4720
4723
4721 .. container:: verbose
4724 .. container:: verbose
4722
4725
4723 Examples:
4726 Examples:
4724
4727
4725 - show changes in the working directory relative to a
4728 - show changes in the working directory relative to a
4726 changeset::
4729 changeset::
4727
4730
4728 hg status --rev 9353
4731 hg status --rev 9353
4729
4732
4730 - show changes in the working directory relative to the
4733 - show changes in the working directory relative to the
4731 current directory (see :hg:`help patterns` for more information)::
4734 current directory (see :hg:`help patterns` for more information)::
4732
4735
4733 hg status re:
4736 hg status re:
4734
4737
4735 - show all changes including copies in an existing changeset::
4738 - show all changes including copies in an existing changeset::
4736
4739
4737 hg status --copies --change 9353
4740 hg status --copies --change 9353
4738
4741
4739 - get a NUL separated list of added files, suitable for xargs::
4742 - get a NUL separated list of added files, suitable for xargs::
4740
4743
4741 hg status -an0
4744 hg status -an0
4742
4745
4743 Returns 0 on success.
4746 Returns 0 on success.
4744 """
4747 """
4745
4748
4746 revs = opts.get('rev')
4749 revs = opts.get('rev')
4747 change = opts.get('change')
4750 change = opts.get('change')
4748
4751
4749 if revs and change:
4752 if revs and change:
4750 msg = _('cannot specify --rev and --change at the same time')
4753 msg = _('cannot specify --rev and --change at the same time')
4751 raise error.Abort(msg)
4754 raise error.Abort(msg)
4752 elif change:
4755 elif change:
4753 node2 = scmutil.revsingle(repo, change, None).node()
4756 node2 = scmutil.revsingle(repo, change, None).node()
4754 node1 = repo[node2].p1().node()
4757 node1 = repo[node2].p1().node()
4755 else:
4758 else:
4756 node1, node2 = scmutil.revpair(repo, revs)
4759 node1, node2 = scmutil.revpair(repo, revs)
4757
4760
4758 if pats:
4761 if pats:
4759 cwd = repo.getcwd()
4762 cwd = repo.getcwd()
4760 else:
4763 else:
4761 cwd = ''
4764 cwd = ''
4762
4765
4763 if opts.get('print0'):
4766 if opts.get('print0'):
4764 end = '\0'
4767 end = '\0'
4765 else:
4768 else:
4766 end = '\n'
4769 end = '\n'
4767 copy = {}
4770 copy = {}
4768 states = 'modified added removed deleted unknown ignored clean'.split()
4771 states = 'modified added removed deleted unknown ignored clean'.split()
4769 show = [k for k in states if opts.get(k)]
4772 show = [k for k in states if opts.get(k)]
4770 if opts.get('all'):
4773 if opts.get('all'):
4771 show += ui.quiet and (states[:4] + ['clean']) or states
4774 show += ui.quiet and (states[:4] + ['clean']) or states
4772 if not show:
4775 if not show:
4773 if ui.quiet:
4776 if ui.quiet:
4774 show = states[:4]
4777 show = states[:4]
4775 else:
4778 else:
4776 show = states[:5]
4779 show = states[:5]
4777
4780
4778 m = scmutil.match(repo[node2], pats, opts)
4781 m = scmutil.match(repo[node2], pats, opts)
4779 stat = repo.status(node1, node2, m,
4782 stat = repo.status(node1, node2, m,
4780 'ignored' in show, 'clean' in show, 'unknown' in show,
4783 'ignored' in show, 'clean' in show, 'unknown' in show,
4781 opts.get('subrepos'))
4784 opts.get('subrepos'))
4782 changestates = zip(states, 'MAR!?IC', stat)
4785 changestates = zip(states, 'MAR!?IC', stat)
4783
4786
4784 if (opts.get('all') or opts.get('copies')
4787 if (opts.get('all') or opts.get('copies')
4785 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4788 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4786 copy = copies.pathcopies(repo[node1], repo[node2], m)
4789 copy = copies.pathcopies(repo[node1], repo[node2], m)
4787
4790
4788 fm = ui.formatter('status', opts)
4791 fm = ui.formatter('status', opts)
4789 fmt = '%s' + end
4792 fmt = '%s' + end
4790 showchar = not opts.get('no_status')
4793 showchar = not opts.get('no_status')
4791
4794
4792 for state, char, files in changestates:
4795 for state, char, files in changestates:
4793 if state in show:
4796 if state in show:
4794 label = 'status.' + state
4797 label = 'status.' + state
4795 for f in files:
4798 for f in files:
4796 fm.startitem()
4799 fm.startitem()
4797 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4800 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4798 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4801 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4799 if f in copy:
4802 if f in copy:
4800 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4803 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4801 label='status.copied')
4804 label='status.copied')
4802 fm.end()
4805 fm.end()
4803
4806
4804 @command('^summary|sum',
4807 @command('^summary|sum',
4805 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4808 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4806 def summary(ui, repo, **opts):
4809 def summary(ui, repo, **opts):
4807 """summarize working directory state
4810 """summarize working directory state
4808
4811
4809 This generates a brief summary of the working directory state,
4812 This generates a brief summary of the working directory state,
4810 including parents, branch, commit status, phase and available updates.
4813 including parents, branch, commit status, phase and available updates.
4811
4814
4812 With the --remote option, this will check the default paths for
4815 With the --remote option, this will check the default paths for
4813 incoming and outgoing changes. This can be time-consuming.
4816 incoming and outgoing changes. This can be time-consuming.
4814
4817
4815 Returns 0 on success.
4818 Returns 0 on success.
4816 """
4819 """
4817
4820
4818 ctx = repo[None]
4821 ctx = repo[None]
4819 parents = ctx.parents()
4822 parents = ctx.parents()
4820 pnode = parents[0].node()
4823 pnode = parents[0].node()
4821 marks = []
4824 marks = []
4822
4825
4823 ms = None
4826 ms = None
4824 try:
4827 try:
4825 ms = mergemod.mergestate.read(repo)
4828 ms = mergemod.mergestate.read(repo)
4826 except error.UnsupportedMergeRecords as e:
4829 except error.UnsupportedMergeRecords as e:
4827 s = ' '.join(e.recordtypes)
4830 s = ' '.join(e.recordtypes)
4828 ui.warn(
4831 ui.warn(
4829 _('warning: merge state has unsupported record types: %s\n') % s)
4832 _('warning: merge state has unsupported record types: %s\n') % s)
4830 unresolved = 0
4833 unresolved = 0
4831 else:
4834 else:
4832 unresolved = [f for f in ms if ms[f] == 'u']
4835 unresolved = [f for f in ms if ms[f] == 'u']
4833
4836
4834 for p in parents:
4837 for p in parents:
4835 # label with log.changeset (instead of log.parent) since this
4838 # label with log.changeset (instead of log.parent) since this
4836 # shows a working directory parent *changeset*:
4839 # shows a working directory parent *changeset*:
4837 # i18n: column positioning for "hg summary"
4840 # i18n: column positioning for "hg summary"
4838 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
4841 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
4839 label=cmdutil._changesetlabels(p))
4842 label=cmdutil._changesetlabels(p))
4840 ui.write(' '.join(p.tags()), label='log.tag')
4843 ui.write(' '.join(p.tags()), label='log.tag')
4841 if p.bookmarks():
4844 if p.bookmarks():
4842 marks.extend(p.bookmarks())
4845 marks.extend(p.bookmarks())
4843 if p.rev() == -1:
4846 if p.rev() == -1:
4844 if not len(repo):
4847 if not len(repo):
4845 ui.write(_(' (empty repository)'))
4848 ui.write(_(' (empty repository)'))
4846 else:
4849 else:
4847 ui.write(_(' (no revision checked out)'))
4850 ui.write(_(' (no revision checked out)'))
4848 if p.troubled():
4851 if p.troubled():
4849 ui.write(' ('
4852 ui.write(' ('
4850 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4853 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4851 for trouble in p.troubles())
4854 for trouble in p.troubles())
4852 + ')')
4855 + ')')
4853 ui.write('\n')
4856 ui.write('\n')
4854 if p.description():
4857 if p.description():
4855 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4858 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4856 label='log.summary')
4859 label='log.summary')
4857
4860
4858 branch = ctx.branch()
4861 branch = ctx.branch()
4859 bheads = repo.branchheads(branch)
4862 bheads = repo.branchheads(branch)
4860 # i18n: column positioning for "hg summary"
4863 # i18n: column positioning for "hg summary"
4861 m = _('branch: %s\n') % branch
4864 m = _('branch: %s\n') % branch
4862 if branch != 'default':
4865 if branch != 'default':
4863 ui.write(m, label='log.branch')
4866 ui.write(m, label='log.branch')
4864 else:
4867 else:
4865 ui.status(m, label='log.branch')
4868 ui.status(m, label='log.branch')
4866
4869
4867 if marks:
4870 if marks:
4868 active = repo._activebookmark
4871 active = repo._activebookmark
4869 # i18n: column positioning for "hg summary"
4872 # i18n: column positioning for "hg summary"
4870 ui.write(_('bookmarks:'), label='log.bookmark')
4873 ui.write(_('bookmarks:'), label='log.bookmark')
4871 if active is not None:
4874 if active is not None:
4872 if active in marks:
4875 if active in marks:
4873 ui.write(' *' + active, label=activebookmarklabel)
4876 ui.write(' *' + active, label=activebookmarklabel)
4874 marks.remove(active)
4877 marks.remove(active)
4875 else:
4878 else:
4876 ui.write(' [%s]' % active, label=activebookmarklabel)
4879 ui.write(' [%s]' % active, label=activebookmarklabel)
4877 for m in marks:
4880 for m in marks:
4878 ui.write(' ' + m, label='log.bookmark')
4881 ui.write(' ' + m, label='log.bookmark')
4879 ui.write('\n', label='log.bookmark')
4882 ui.write('\n', label='log.bookmark')
4880
4883
4881 status = repo.status(unknown=True)
4884 status = repo.status(unknown=True)
4882
4885
4883 c = repo.dirstate.copies()
4886 c = repo.dirstate.copies()
4884 copied, renamed = [], []
4887 copied, renamed = [], []
4885 for d, s in c.iteritems():
4888 for d, s in c.iteritems():
4886 if s in status.removed:
4889 if s in status.removed:
4887 status.removed.remove(s)
4890 status.removed.remove(s)
4888 renamed.append(d)
4891 renamed.append(d)
4889 else:
4892 else:
4890 copied.append(d)
4893 copied.append(d)
4891 if d in status.added:
4894 if d in status.added:
4892 status.added.remove(d)
4895 status.added.remove(d)
4893
4896
4894 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4897 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4895
4898
4896 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4899 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4897 (ui.label(_('%d added'), 'status.added'), status.added),
4900 (ui.label(_('%d added'), 'status.added'), status.added),
4898 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4901 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4899 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4902 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4900 (ui.label(_('%d copied'), 'status.copied'), copied),
4903 (ui.label(_('%d copied'), 'status.copied'), copied),
4901 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4904 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4902 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4905 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4903 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4906 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4904 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4907 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4905 t = []
4908 t = []
4906 for l, s in labels:
4909 for l, s in labels:
4907 if s:
4910 if s:
4908 t.append(l % len(s))
4911 t.append(l % len(s))
4909
4912
4910 t = ', '.join(t)
4913 t = ', '.join(t)
4911 cleanworkdir = False
4914 cleanworkdir = False
4912
4915
4913 if repo.vfs.exists('graftstate'):
4916 if repo.vfs.exists('graftstate'):
4914 t += _(' (graft in progress)')
4917 t += _(' (graft in progress)')
4915 if repo.vfs.exists('updatestate'):
4918 if repo.vfs.exists('updatestate'):
4916 t += _(' (interrupted update)')
4919 t += _(' (interrupted update)')
4917 elif len(parents) > 1:
4920 elif len(parents) > 1:
4918 t += _(' (merge)')
4921 t += _(' (merge)')
4919 elif branch != parents[0].branch():
4922 elif branch != parents[0].branch():
4920 t += _(' (new branch)')
4923 t += _(' (new branch)')
4921 elif (parents[0].closesbranch() and
4924 elif (parents[0].closesbranch() and
4922 pnode in repo.branchheads(branch, closed=True)):
4925 pnode in repo.branchheads(branch, closed=True)):
4923 t += _(' (head closed)')
4926 t += _(' (head closed)')
4924 elif not (status.modified or status.added or status.removed or renamed or
4927 elif not (status.modified or status.added or status.removed or renamed or
4925 copied or subs):
4928 copied or subs):
4926 t += _(' (clean)')
4929 t += _(' (clean)')
4927 cleanworkdir = True
4930 cleanworkdir = True
4928 elif pnode not in bheads:
4931 elif pnode not in bheads:
4929 t += _(' (new branch head)')
4932 t += _(' (new branch head)')
4930
4933
4931 if parents:
4934 if parents:
4932 pendingphase = max(p.phase() for p in parents)
4935 pendingphase = max(p.phase() for p in parents)
4933 else:
4936 else:
4934 pendingphase = phases.public
4937 pendingphase = phases.public
4935
4938
4936 if pendingphase > phases.newcommitphase(ui):
4939 if pendingphase > phases.newcommitphase(ui):
4937 t += ' (%s)' % phases.phasenames[pendingphase]
4940 t += ' (%s)' % phases.phasenames[pendingphase]
4938
4941
4939 if cleanworkdir:
4942 if cleanworkdir:
4940 # i18n: column positioning for "hg summary"
4943 # i18n: column positioning for "hg summary"
4941 ui.status(_('commit: %s\n') % t.strip())
4944 ui.status(_('commit: %s\n') % t.strip())
4942 else:
4945 else:
4943 # i18n: column positioning for "hg summary"
4946 # i18n: column positioning for "hg summary"
4944 ui.write(_('commit: %s\n') % t.strip())
4947 ui.write(_('commit: %s\n') % t.strip())
4945
4948
4946 # all ancestors of branch heads - all ancestors of parent = new csets
4949 # all ancestors of branch heads - all ancestors of parent = new csets
4947 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4950 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4948 bheads))
4951 bheads))
4949
4952
4950 if new == 0:
4953 if new == 0:
4951 # i18n: column positioning for "hg summary"
4954 # i18n: column positioning for "hg summary"
4952 ui.status(_('update: (current)\n'))
4955 ui.status(_('update: (current)\n'))
4953 elif pnode not in bheads:
4956 elif pnode not in bheads:
4954 # i18n: column positioning for "hg summary"
4957 # i18n: column positioning for "hg summary"
4955 ui.write(_('update: %d new changesets (update)\n') % new)
4958 ui.write(_('update: %d new changesets (update)\n') % new)
4956 else:
4959 else:
4957 # i18n: column positioning for "hg summary"
4960 # i18n: column positioning for "hg summary"
4958 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4961 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4959 (new, len(bheads)))
4962 (new, len(bheads)))
4960
4963
4961 t = []
4964 t = []
4962 draft = len(repo.revs('draft()'))
4965 draft = len(repo.revs('draft()'))
4963 if draft:
4966 if draft:
4964 t.append(_('%d draft') % draft)
4967 t.append(_('%d draft') % draft)
4965 secret = len(repo.revs('secret()'))
4968 secret = len(repo.revs('secret()'))
4966 if secret:
4969 if secret:
4967 t.append(_('%d secret') % secret)
4970 t.append(_('%d secret') % secret)
4968
4971
4969 if draft or secret:
4972 if draft or secret:
4970 ui.status(_('phases: %s\n') % ', '.join(t))
4973 ui.status(_('phases: %s\n') % ', '.join(t))
4971
4974
4972 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4975 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4973 for trouble in ("unstable", "divergent", "bumped"):
4976 for trouble in ("unstable", "divergent", "bumped"):
4974 numtrouble = len(repo.revs(trouble + "()"))
4977 numtrouble = len(repo.revs(trouble + "()"))
4975 # We write all the possibilities to ease translation
4978 # We write all the possibilities to ease translation
4976 troublemsg = {
4979 troublemsg = {
4977 "unstable": _("unstable: %d changesets"),
4980 "unstable": _("unstable: %d changesets"),
4978 "divergent": _("divergent: %d changesets"),
4981 "divergent": _("divergent: %d changesets"),
4979 "bumped": _("bumped: %d changesets"),
4982 "bumped": _("bumped: %d changesets"),
4980 }
4983 }
4981 if numtrouble > 0:
4984 if numtrouble > 0:
4982 ui.status(troublemsg[trouble] % numtrouble + "\n")
4985 ui.status(troublemsg[trouble] % numtrouble + "\n")
4983
4986
4984 cmdutil.summaryhooks(ui, repo)
4987 cmdutil.summaryhooks(ui, repo)
4985
4988
4986 if opts.get('remote'):
4989 if opts.get('remote'):
4987 needsincoming, needsoutgoing = True, True
4990 needsincoming, needsoutgoing = True, True
4988 else:
4991 else:
4989 needsincoming, needsoutgoing = False, False
4992 needsincoming, needsoutgoing = False, False
4990 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4993 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4991 if i:
4994 if i:
4992 needsincoming = True
4995 needsincoming = True
4993 if o:
4996 if o:
4994 needsoutgoing = True
4997 needsoutgoing = True
4995 if not needsincoming and not needsoutgoing:
4998 if not needsincoming and not needsoutgoing:
4996 return
4999 return
4997
5000
4998 def getincoming():
5001 def getincoming():
4999 source, branches = hg.parseurl(ui.expandpath('default'))
5002 source, branches = hg.parseurl(ui.expandpath('default'))
5000 sbranch = branches[0]
5003 sbranch = branches[0]
5001 try:
5004 try:
5002 other = hg.peer(repo, {}, source)
5005 other = hg.peer(repo, {}, source)
5003 except error.RepoError:
5006 except error.RepoError:
5004 if opts.get('remote'):
5007 if opts.get('remote'):
5005 raise
5008 raise
5006 return source, sbranch, None, None, None
5009 return source, sbranch, None, None, None
5007 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5010 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5008 if revs:
5011 if revs:
5009 revs = [other.lookup(rev) for rev in revs]
5012 revs = [other.lookup(rev) for rev in revs]
5010 ui.debug('comparing with %s\n' % util.hidepassword(source))
5013 ui.debug('comparing with %s\n' % util.hidepassword(source))
5011 repo.ui.pushbuffer()
5014 repo.ui.pushbuffer()
5012 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5015 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5013 repo.ui.popbuffer()
5016 repo.ui.popbuffer()
5014 return source, sbranch, other, commoninc, commoninc[1]
5017 return source, sbranch, other, commoninc, commoninc[1]
5015
5018
5016 if needsincoming:
5019 if needsincoming:
5017 source, sbranch, sother, commoninc, incoming = getincoming()
5020 source, sbranch, sother, commoninc, incoming = getincoming()
5018 else:
5021 else:
5019 source = sbranch = sother = commoninc = incoming = None
5022 source = sbranch = sother = commoninc = incoming = None
5020
5023
5021 def getoutgoing():
5024 def getoutgoing():
5022 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5025 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5023 dbranch = branches[0]
5026 dbranch = branches[0]
5024 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5027 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5025 if source != dest:
5028 if source != dest:
5026 try:
5029 try:
5027 dother = hg.peer(repo, {}, dest)
5030 dother = hg.peer(repo, {}, dest)
5028 except error.RepoError:
5031 except error.RepoError:
5029 if opts.get('remote'):
5032 if opts.get('remote'):
5030 raise
5033 raise
5031 return dest, dbranch, None, None
5034 return dest, dbranch, None, None
5032 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5035 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5033 elif sother is None:
5036 elif sother is None:
5034 # there is no explicit destination peer, but source one is invalid
5037 # there is no explicit destination peer, but source one is invalid
5035 return dest, dbranch, None, None
5038 return dest, dbranch, None, None
5036 else:
5039 else:
5037 dother = sother
5040 dother = sother
5038 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5041 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5039 common = None
5042 common = None
5040 else:
5043 else:
5041 common = commoninc
5044 common = commoninc
5042 if revs:
5045 if revs:
5043 revs = [repo.lookup(rev) for rev in revs]
5046 revs = [repo.lookup(rev) for rev in revs]
5044 repo.ui.pushbuffer()
5047 repo.ui.pushbuffer()
5045 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5048 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5046 commoninc=common)
5049 commoninc=common)
5047 repo.ui.popbuffer()
5050 repo.ui.popbuffer()
5048 return dest, dbranch, dother, outgoing
5051 return dest, dbranch, dother, outgoing
5049
5052
5050 if needsoutgoing:
5053 if needsoutgoing:
5051 dest, dbranch, dother, outgoing = getoutgoing()
5054 dest, dbranch, dother, outgoing = getoutgoing()
5052 else:
5055 else:
5053 dest = dbranch = dother = outgoing = None
5056 dest = dbranch = dother = outgoing = None
5054
5057
5055 if opts.get('remote'):
5058 if opts.get('remote'):
5056 t = []
5059 t = []
5057 if incoming:
5060 if incoming:
5058 t.append(_('1 or more incoming'))
5061 t.append(_('1 or more incoming'))
5059 o = outgoing.missing
5062 o = outgoing.missing
5060 if o:
5063 if o:
5061 t.append(_('%d outgoing') % len(o))
5064 t.append(_('%d outgoing') % len(o))
5062 other = dother or sother
5065 other = dother or sother
5063 if 'bookmarks' in other.listkeys('namespaces'):
5066 if 'bookmarks' in other.listkeys('namespaces'):
5064 counts = bookmarks.summary(repo, other)
5067 counts = bookmarks.summary(repo, other)
5065 if counts[0] > 0:
5068 if counts[0] > 0:
5066 t.append(_('%d incoming bookmarks') % counts[0])
5069 t.append(_('%d incoming bookmarks') % counts[0])
5067 if counts[1] > 0:
5070 if counts[1] > 0:
5068 t.append(_('%d outgoing bookmarks') % counts[1])
5071 t.append(_('%d outgoing bookmarks') % counts[1])
5069
5072
5070 if t:
5073 if t:
5071 # i18n: column positioning for "hg summary"
5074 # i18n: column positioning for "hg summary"
5072 ui.write(_('remote: %s\n') % (', '.join(t)))
5075 ui.write(_('remote: %s\n') % (', '.join(t)))
5073 else:
5076 else:
5074 # i18n: column positioning for "hg summary"
5077 # i18n: column positioning for "hg summary"
5075 ui.status(_('remote: (synced)\n'))
5078 ui.status(_('remote: (synced)\n'))
5076
5079
5077 cmdutil.summaryremotehooks(ui, repo, opts,
5080 cmdutil.summaryremotehooks(ui, repo, opts,
5078 ((source, sbranch, sother, commoninc),
5081 ((source, sbranch, sother, commoninc),
5079 (dest, dbranch, dother, outgoing)))
5082 (dest, dbranch, dother, outgoing)))
5080
5083
5081 @command('tag',
5084 @command('tag',
5082 [('f', 'force', None, _('force tag')),
5085 [('f', 'force', None, _('force tag')),
5083 ('l', 'local', None, _('make the tag local')),
5086 ('l', 'local', None, _('make the tag local')),
5084 ('r', 'rev', '', _('revision to tag'), _('REV')),
5087 ('r', 'rev', '', _('revision to tag'), _('REV')),
5085 ('', 'remove', None, _('remove a tag')),
5088 ('', 'remove', None, _('remove a tag')),
5086 # -l/--local is already there, commitopts cannot be used
5089 # -l/--local is already there, commitopts cannot be used
5087 ('e', 'edit', None, _('invoke editor on commit messages')),
5090 ('e', 'edit', None, _('invoke editor on commit messages')),
5088 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5091 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5089 ] + commitopts2,
5092 ] + commitopts2,
5090 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5093 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5091 def tag(ui, repo, name1, *names, **opts):
5094 def tag(ui, repo, name1, *names, **opts):
5092 """add one or more tags for the current or given revision
5095 """add one or more tags for the current or given revision
5093
5096
5094 Name a particular revision using <name>.
5097 Name a particular revision using <name>.
5095
5098
5096 Tags are used to name particular revisions of the repository and are
5099 Tags are used to name particular revisions of the repository and are
5097 very useful to compare different revisions, to go back to significant
5100 very useful to compare different revisions, to go back to significant
5098 earlier versions or to mark branch points as releases, etc. Changing
5101 earlier versions or to mark branch points as releases, etc. Changing
5099 an existing tag is normally disallowed; use -f/--force to override.
5102 an existing tag is normally disallowed; use -f/--force to override.
5100
5103
5101 If no revision is given, the parent of the working directory is
5104 If no revision is given, the parent of the working directory is
5102 used.
5105 used.
5103
5106
5104 To facilitate version control, distribution, and merging of tags,
5107 To facilitate version control, distribution, and merging of tags,
5105 they are stored as a file named ".hgtags" which is managed similarly
5108 they are stored as a file named ".hgtags" which is managed similarly
5106 to other project files and can be hand-edited if necessary. This
5109 to other project files and can be hand-edited if necessary. This
5107 also means that tagging creates a new commit. The file
5110 also means that tagging creates a new commit. The file
5108 ".hg/localtags" is used for local tags (not shared among
5111 ".hg/localtags" is used for local tags (not shared among
5109 repositories).
5112 repositories).
5110
5113
5111 Tag commits are usually made at the head of a branch. If the parent
5114 Tag commits are usually made at the head of a branch. If the parent
5112 of the working directory is not a branch head, :hg:`tag` aborts; use
5115 of the working directory is not a branch head, :hg:`tag` aborts; use
5113 -f/--force to force the tag commit to be based on a non-head
5116 -f/--force to force the tag commit to be based on a non-head
5114 changeset.
5117 changeset.
5115
5118
5116 See :hg:`help dates` for a list of formats valid for -d/--date.
5119 See :hg:`help dates` for a list of formats valid for -d/--date.
5117
5120
5118 Since tag names have priority over branch names during revision
5121 Since tag names have priority over branch names during revision
5119 lookup, using an existing branch name as a tag name is discouraged.
5122 lookup, using an existing branch name as a tag name is discouraged.
5120
5123
5121 Returns 0 on success.
5124 Returns 0 on success.
5122 """
5125 """
5123 wlock = lock = None
5126 wlock = lock = None
5124 try:
5127 try:
5125 wlock = repo.wlock()
5128 wlock = repo.wlock()
5126 lock = repo.lock()
5129 lock = repo.lock()
5127 rev_ = "."
5130 rev_ = "."
5128 names = [t.strip() for t in (name1,) + names]
5131 names = [t.strip() for t in (name1,) + names]
5129 if len(names) != len(set(names)):
5132 if len(names) != len(set(names)):
5130 raise error.Abort(_('tag names must be unique'))
5133 raise error.Abort(_('tag names must be unique'))
5131 for n in names:
5134 for n in names:
5132 scmutil.checknewlabel(repo, n, 'tag')
5135 scmutil.checknewlabel(repo, n, 'tag')
5133 if not n:
5136 if not n:
5134 raise error.Abort(_('tag names cannot consist entirely of '
5137 raise error.Abort(_('tag names cannot consist entirely of '
5135 'whitespace'))
5138 'whitespace'))
5136 if opts.get('rev') and opts.get('remove'):
5139 if opts.get('rev') and opts.get('remove'):
5137 raise error.Abort(_("--rev and --remove are incompatible"))
5140 raise error.Abort(_("--rev and --remove are incompatible"))
5138 if opts.get('rev'):
5141 if opts.get('rev'):
5139 rev_ = opts['rev']
5142 rev_ = opts['rev']
5140 message = opts.get('message')
5143 message = opts.get('message')
5141 if opts.get('remove'):
5144 if opts.get('remove'):
5142 if opts.get('local'):
5145 if opts.get('local'):
5143 expectedtype = 'local'
5146 expectedtype = 'local'
5144 else:
5147 else:
5145 expectedtype = 'global'
5148 expectedtype = 'global'
5146
5149
5147 for n in names:
5150 for n in names:
5148 if not repo.tagtype(n):
5151 if not repo.tagtype(n):
5149 raise error.Abort(_("tag '%s' does not exist") % n)
5152 raise error.Abort(_("tag '%s' does not exist") % n)
5150 if repo.tagtype(n) != expectedtype:
5153 if repo.tagtype(n) != expectedtype:
5151 if expectedtype == 'global':
5154 if expectedtype == 'global':
5152 raise error.Abort(_("tag '%s' is not a global tag") % n)
5155 raise error.Abort(_("tag '%s' is not a global tag") % n)
5153 else:
5156 else:
5154 raise error.Abort(_("tag '%s' is not a local tag") % n)
5157 raise error.Abort(_("tag '%s' is not a local tag") % n)
5155 rev_ = 'null'
5158 rev_ = 'null'
5156 if not message:
5159 if not message:
5157 # we don't translate commit messages
5160 # we don't translate commit messages
5158 message = 'Removed tag %s' % ', '.join(names)
5161 message = 'Removed tag %s' % ', '.join(names)
5159 elif not opts.get('force'):
5162 elif not opts.get('force'):
5160 for n in names:
5163 for n in names:
5161 if n in repo.tags():
5164 if n in repo.tags():
5162 raise error.Abort(_("tag '%s' already exists "
5165 raise error.Abort(_("tag '%s' already exists "
5163 "(use -f to force)") % n)
5166 "(use -f to force)") % n)
5164 if not opts.get('local'):
5167 if not opts.get('local'):
5165 p1, p2 = repo.dirstate.parents()
5168 p1, p2 = repo.dirstate.parents()
5166 if p2 != nullid:
5169 if p2 != nullid:
5167 raise error.Abort(_('uncommitted merge'))
5170 raise error.Abort(_('uncommitted merge'))
5168 bheads = repo.branchheads()
5171 bheads = repo.branchheads()
5169 if not opts.get('force') and bheads and p1 not in bheads:
5172 if not opts.get('force') and bheads and p1 not in bheads:
5170 raise error.Abort(_('working directory is not at a branch head '
5173 raise error.Abort(_('working directory is not at a branch head '
5171 '(use -f to force)'))
5174 '(use -f to force)'))
5172 r = scmutil.revsingle(repo, rev_).node()
5175 r = scmutil.revsingle(repo, rev_).node()
5173
5176
5174 if not message:
5177 if not message:
5175 # we don't translate commit messages
5178 # we don't translate commit messages
5176 message = ('Added tag %s for changeset %s' %
5179 message = ('Added tag %s for changeset %s' %
5177 (', '.join(names), short(r)))
5180 (', '.join(names), short(r)))
5178
5181
5179 date = opts.get('date')
5182 date = opts.get('date')
5180 if date:
5183 if date:
5181 date = util.parsedate(date)
5184 date = util.parsedate(date)
5182
5185
5183 if opts.get('remove'):
5186 if opts.get('remove'):
5184 editform = 'tag.remove'
5187 editform = 'tag.remove'
5185 else:
5188 else:
5186 editform = 'tag.add'
5189 editform = 'tag.add'
5187 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5190 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5188
5191
5189 # don't allow tagging the null rev
5192 # don't allow tagging the null rev
5190 if (not opts.get('remove') and
5193 if (not opts.get('remove') and
5191 scmutil.revsingle(repo, rev_).rev() == nullrev):
5194 scmutil.revsingle(repo, rev_).rev() == nullrev):
5192 raise error.Abort(_("cannot tag null revision"))
5195 raise error.Abort(_("cannot tag null revision"))
5193
5196
5194 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5197 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5195 editor=editor)
5198 editor=editor)
5196 finally:
5199 finally:
5197 release(lock, wlock)
5200 release(lock, wlock)
5198
5201
5199 @command('tags', formatteropts, '')
5202 @command('tags', formatteropts, '')
5200 def tags(ui, repo, **opts):
5203 def tags(ui, repo, **opts):
5201 """list repository tags
5204 """list repository tags
5202
5205
5203 This lists both regular and local tags. When the -v/--verbose
5206 This lists both regular and local tags. When the -v/--verbose
5204 switch is used, a third column "local" is printed for local tags.
5207 switch is used, a third column "local" is printed for local tags.
5205 When the -q/--quiet switch is used, only the tag name is printed.
5208 When the -q/--quiet switch is used, only the tag name is printed.
5206
5209
5207 Returns 0 on success.
5210 Returns 0 on success.
5208 """
5211 """
5209
5212
5210 fm = ui.formatter('tags', opts)
5213 fm = ui.formatter('tags', opts)
5211 hexfunc = fm.hexfunc
5214 hexfunc = fm.hexfunc
5212 tagtype = ""
5215 tagtype = ""
5213
5216
5214 for t, n in reversed(repo.tagslist()):
5217 for t, n in reversed(repo.tagslist()):
5215 hn = hexfunc(n)
5218 hn = hexfunc(n)
5216 label = 'tags.normal'
5219 label = 'tags.normal'
5217 tagtype = ''
5220 tagtype = ''
5218 if repo.tagtype(t) == 'local':
5221 if repo.tagtype(t) == 'local':
5219 label = 'tags.local'
5222 label = 'tags.local'
5220 tagtype = 'local'
5223 tagtype = 'local'
5221
5224
5222 fm.startitem()
5225 fm.startitem()
5223 fm.write('tag', '%s', t, label=label)
5226 fm.write('tag', '%s', t, label=label)
5224 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5227 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5225 fm.condwrite(not ui.quiet, 'rev node', fmt,
5228 fm.condwrite(not ui.quiet, 'rev node', fmt,
5226 repo.changelog.rev(n), hn, label=label)
5229 repo.changelog.rev(n), hn, label=label)
5227 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5230 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5228 tagtype, label=label)
5231 tagtype, label=label)
5229 fm.plain('\n')
5232 fm.plain('\n')
5230 fm.end()
5233 fm.end()
5231
5234
5232 @command('tip',
5235 @command('tip',
5233 [('p', 'patch', None, _('show patch')),
5236 [('p', 'patch', None, _('show patch')),
5234 ('g', 'git', None, _('use git extended diff format')),
5237 ('g', 'git', None, _('use git extended diff format')),
5235 ] + templateopts,
5238 ] + templateopts,
5236 _('[-p] [-g]'))
5239 _('[-p] [-g]'))
5237 def tip(ui, repo, **opts):
5240 def tip(ui, repo, **opts):
5238 """show the tip revision (DEPRECATED)
5241 """show the tip revision (DEPRECATED)
5239
5242
5240 The tip revision (usually just called the tip) is the changeset
5243 The tip revision (usually just called the tip) is the changeset
5241 most recently added to the repository (and therefore the most
5244 most recently added to the repository (and therefore the most
5242 recently changed head).
5245 recently changed head).
5243
5246
5244 If you have just made a commit, that commit will be the tip. If
5247 If you have just made a commit, that commit will be the tip. If
5245 you have just pulled changes from another repository, the tip of
5248 you have just pulled changes from another repository, the tip of
5246 that repository becomes the current tip. The "tip" tag is special
5249 that repository becomes the current tip. The "tip" tag is special
5247 and cannot be renamed or assigned to a different changeset.
5250 and cannot be renamed or assigned to a different changeset.
5248
5251
5249 This command is deprecated, please use :hg:`heads` instead.
5252 This command is deprecated, please use :hg:`heads` instead.
5250
5253
5251 Returns 0 on success.
5254 Returns 0 on success.
5252 """
5255 """
5253 displayer = cmdutil.show_changeset(ui, repo, opts)
5256 displayer = cmdutil.show_changeset(ui, repo, opts)
5254 displayer.show(repo['tip'])
5257 displayer.show(repo['tip'])
5255 displayer.close()
5258 displayer.close()
5256
5259
5257 @command('unbundle',
5260 @command('unbundle',
5258 [('u', 'update', None,
5261 [('u', 'update', None,
5259 _('update to new branch head if changesets were unbundled'))],
5262 _('update to new branch head if changesets were unbundled'))],
5260 _('[-u] FILE...'))
5263 _('[-u] FILE...'))
5261 def unbundle(ui, repo, fname1, *fnames, **opts):
5264 def unbundle(ui, repo, fname1, *fnames, **opts):
5262 """apply one or more changegroup files
5265 """apply one or more changegroup files
5263
5266
5264 Apply one or more compressed changegroup files generated by the
5267 Apply one or more compressed changegroup files generated by the
5265 bundle command.
5268 bundle command.
5266
5269
5267 Returns 0 on success, 1 if an update has unresolved files.
5270 Returns 0 on success, 1 if an update has unresolved files.
5268 """
5271 """
5269 fnames = (fname1,) + fnames
5272 fnames = (fname1,) + fnames
5270
5273
5271 with repo.lock():
5274 with repo.lock():
5272 for fname in fnames:
5275 for fname in fnames:
5273 f = hg.openpath(ui, fname)
5276 f = hg.openpath(ui, fname)
5274 gen = exchange.readbundle(ui, f, fname)
5277 gen = exchange.readbundle(ui, f, fname)
5275 if isinstance(gen, bundle2.unbundle20):
5278 if isinstance(gen, bundle2.unbundle20):
5276 tr = repo.transaction('unbundle')
5279 tr = repo.transaction('unbundle')
5277 try:
5280 try:
5278 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5281 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5279 url='bundle:' + fname)
5282 url='bundle:' + fname)
5280 tr.close()
5283 tr.close()
5281 except error.BundleUnknownFeatureError as exc:
5284 except error.BundleUnknownFeatureError as exc:
5282 raise error.Abort(_('%s: unknown bundle feature, %s')
5285 raise error.Abort(_('%s: unknown bundle feature, %s')
5283 % (fname, exc),
5286 % (fname, exc),
5284 hint=_("see https://mercurial-scm.org/"
5287 hint=_("see https://mercurial-scm.org/"
5285 "wiki/BundleFeature for more "
5288 "wiki/BundleFeature for more "
5286 "information"))
5289 "information"))
5287 finally:
5290 finally:
5288 if tr:
5291 if tr:
5289 tr.release()
5292 tr.release()
5290 changes = [r.get('return', 0)
5293 changes = [r.get('return', 0)
5291 for r in op.records['changegroup']]
5294 for r in op.records['changegroup']]
5292 modheads = changegroup.combineresults(changes)
5295 modheads = changegroup.combineresults(changes)
5293 elif isinstance(gen, streamclone.streamcloneapplier):
5296 elif isinstance(gen, streamclone.streamcloneapplier):
5294 raise error.Abort(
5297 raise error.Abort(
5295 _('packed bundles cannot be applied with '
5298 _('packed bundles cannot be applied with '
5296 '"hg unbundle"'),
5299 '"hg unbundle"'),
5297 hint=_('use "hg debugapplystreamclonebundle"'))
5300 hint=_('use "hg debugapplystreamclonebundle"'))
5298 else:
5301 else:
5299 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5302 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5300
5303
5301 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5304 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5302
5305
5303 @command('^update|up|checkout|co',
5306 @command('^update|up|checkout|co',
5304 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5307 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5305 ('c', 'check', None, _('require clean working directory')),
5308 ('c', 'check', None, _('require clean working directory')),
5306 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5309 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5307 ('r', 'rev', '', _('revision'), _('REV'))
5310 ('r', 'rev', '', _('revision'), _('REV'))
5308 ] + mergetoolopts,
5311 ] + mergetoolopts,
5309 _('[-C|-c] [-d DATE] [[-r] REV]'))
5312 _('[-C|-c] [-d DATE] [[-r] REV]'))
5310 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5313 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5311 tool=None):
5314 tool=None):
5312 """update working directory (or switch revisions)
5315 """update working directory (or switch revisions)
5313
5316
5314 Update the repository's working directory to the specified
5317 Update the repository's working directory to the specified
5315 changeset. If no changeset is specified, update to the tip of the
5318 changeset. If no changeset is specified, update to the tip of the
5316 current named branch and move the active bookmark (see :hg:`help
5319 current named branch and move the active bookmark (see :hg:`help
5317 bookmarks`).
5320 bookmarks`).
5318
5321
5319 Update sets the working directory's parent revision to the specified
5322 Update sets the working directory's parent revision to the specified
5320 changeset (see :hg:`help parents`).
5323 changeset (see :hg:`help parents`).
5321
5324
5322 If the changeset is not a descendant or ancestor of the working
5325 If the changeset is not a descendant or ancestor of the working
5323 directory's parent and there are uncommitted changes, the update is
5326 directory's parent and there are uncommitted changes, the update is
5324 aborted. With the -c/--check option, the working directory is checked
5327 aborted. With the -c/--check option, the working directory is checked
5325 for uncommitted changes; if none are found, the working directory is
5328 for uncommitted changes; if none are found, the working directory is
5326 updated to the specified changeset.
5329 updated to the specified changeset.
5327
5330
5328 .. container:: verbose
5331 .. container:: verbose
5329
5332
5330 The -C/--clean and -c/--check options control what happens if the
5333 The -C/--clean and -c/--check options control what happens if the
5331 working directory contains uncommitted changes.
5334 working directory contains uncommitted changes.
5332 At most of one of them can be specified.
5335 At most of one of them can be specified.
5333
5336
5334 1. If no option is specified, and if
5337 1. If no option is specified, and if
5335 the requested changeset is an ancestor or descendant of
5338 the requested changeset is an ancestor or descendant of
5336 the working directory's parent, the uncommitted changes
5339 the working directory's parent, the uncommitted changes
5337 are merged into the requested changeset and the merged
5340 are merged into the requested changeset and the merged
5338 result is left uncommitted. If the requested changeset is
5341 result is left uncommitted. If the requested changeset is
5339 not an ancestor or descendant (that is, it is on another
5342 not an ancestor or descendant (that is, it is on another
5340 branch), the update is aborted and the uncommitted changes
5343 branch), the update is aborted and the uncommitted changes
5341 are preserved.
5344 are preserved.
5342
5345
5343 2. With the -c/--check option, the update is aborted and the
5346 2. With the -c/--check option, the update is aborted and the
5344 uncommitted changes are preserved.
5347 uncommitted changes are preserved.
5345
5348
5346 3. With the -C/--clean option, uncommitted changes are discarded and
5349 3. With the -C/--clean option, uncommitted changes are discarded and
5347 the working directory is updated to the requested changeset.
5350 the working directory is updated to the requested changeset.
5348
5351
5349 To cancel an uncommitted merge (and lose your changes), use
5352 To cancel an uncommitted merge (and lose your changes), use
5350 :hg:`update --clean .`.
5353 :hg:`update --clean .`.
5351
5354
5352 Use null as the changeset to remove the working directory (like
5355 Use null as the changeset to remove the working directory (like
5353 :hg:`clone -U`).
5356 :hg:`clone -U`).
5354
5357
5355 If you want to revert just one file to an older revision, use
5358 If you want to revert just one file to an older revision, use
5356 :hg:`revert [-r REV] NAME`.
5359 :hg:`revert [-r REV] NAME`.
5357
5360
5358 See :hg:`help dates` for a list of formats valid for -d/--date.
5361 See :hg:`help dates` for a list of formats valid for -d/--date.
5359
5362
5360 Returns 0 on success, 1 if there are unresolved files.
5363 Returns 0 on success, 1 if there are unresolved files.
5361 """
5364 """
5362 if rev and node:
5365 if rev and node:
5363 raise error.Abort(_("please specify just one revision"))
5366 raise error.Abort(_("please specify just one revision"))
5364
5367
5365 if rev is None or rev == '':
5368 if rev is None or rev == '':
5366 rev = node
5369 rev = node
5367
5370
5368 if date and rev is not None:
5371 if date and rev is not None:
5369 raise error.Abort(_("you can't specify a revision and a date"))
5372 raise error.Abort(_("you can't specify a revision and a date"))
5370
5373
5371 if check and clean:
5374 if check and clean:
5372 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
5375 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
5373
5376
5374 with repo.wlock():
5377 with repo.wlock():
5375 cmdutil.clearunfinished(repo)
5378 cmdutil.clearunfinished(repo)
5376
5379
5377 if date:
5380 if date:
5378 rev = cmdutil.finddate(ui, repo, date)
5381 rev = cmdutil.finddate(ui, repo, date)
5379
5382
5380 # if we defined a bookmark, we have to remember the original name
5383 # if we defined a bookmark, we have to remember the original name
5381 brev = rev
5384 brev = rev
5382 rev = scmutil.revsingle(repo, rev, rev).rev()
5385 rev = scmutil.revsingle(repo, rev, rev).rev()
5383
5386
5384 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5387 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5385
5388
5386 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
5389 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
5387
5390
5388 @command('verify', [])
5391 @command('verify', [])
5389 def verify(ui, repo):
5392 def verify(ui, repo):
5390 """verify the integrity of the repository
5393 """verify the integrity of the repository
5391
5394
5392 Verify the integrity of the current repository.
5395 Verify the integrity of the current repository.
5393
5396
5394 This will perform an extensive check of the repository's
5397 This will perform an extensive check of the repository's
5395 integrity, validating the hashes and checksums of each entry in
5398 integrity, validating the hashes and checksums of each entry in
5396 the changelog, manifest, and tracked files, as well as the
5399 the changelog, manifest, and tracked files, as well as the
5397 integrity of their crosslinks and indices.
5400 integrity of their crosslinks and indices.
5398
5401
5399 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5402 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5400 for more information about recovery from corruption of the
5403 for more information about recovery from corruption of the
5401 repository.
5404 repository.
5402
5405
5403 Returns 0 on success, 1 if errors are encountered.
5406 Returns 0 on success, 1 if errors are encountered.
5404 """
5407 """
5405 return hg.verify(repo)
5408 return hg.verify(repo)
5406
5409
5407 @command('version', [] + formatteropts, norepo=True)
5410 @command('version', [] + formatteropts, norepo=True)
5408 def version_(ui, **opts):
5411 def version_(ui, **opts):
5409 """output version and copyright information"""
5412 """output version and copyright information"""
5410 fm = ui.formatter("version", opts)
5413 fm = ui.formatter("version", opts)
5411 fm.startitem()
5414 fm.startitem()
5412 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5415 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5413 util.version())
5416 util.version())
5414 license = _(
5417 license = _(
5415 "(see https://mercurial-scm.org for more information)\n"
5418 "(see https://mercurial-scm.org for more information)\n"
5416 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5419 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5417 "This is free software; see the source for copying conditions. "
5420 "This is free software; see the source for copying conditions. "
5418 "There is NO\nwarranty; "
5421 "There is NO\nwarranty; "
5419 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5422 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5420 )
5423 )
5421 if not ui.quiet:
5424 if not ui.quiet:
5422 fm.plain(license)
5425 fm.plain(license)
5423
5426
5424 if ui.verbose:
5427 if ui.verbose:
5425 fm.plain(_("\nEnabled extensions:\n\n"))
5428 fm.plain(_("\nEnabled extensions:\n\n"))
5426 # format names and versions into columns
5429 # format names and versions into columns
5427 names = []
5430 names = []
5428 vers = []
5431 vers = []
5429 isinternals = []
5432 isinternals = []
5430 for name, module in extensions.extensions():
5433 for name, module in extensions.extensions():
5431 names.append(name)
5434 names.append(name)
5432 vers.append(extensions.moduleversion(module) or None)
5435 vers.append(extensions.moduleversion(module) or None)
5433 isinternals.append(extensions.ismoduleinternal(module))
5436 isinternals.append(extensions.ismoduleinternal(module))
5434 fn = fm.nested("extensions")
5437 fn = fm.nested("extensions")
5435 if names:
5438 if names:
5436 namefmt = " %%-%ds " % max(len(n) for n in names)
5439 namefmt = " %%-%ds " % max(len(n) for n in names)
5437 places = [_("external"), _("internal")]
5440 places = [_("external"), _("internal")]
5438 for n, v, p in zip(names, vers, isinternals):
5441 for n, v, p in zip(names, vers, isinternals):
5439 fn.startitem()
5442 fn.startitem()
5440 fn.condwrite(ui.verbose, "name", namefmt, n)
5443 fn.condwrite(ui.verbose, "name", namefmt, n)
5441 if ui.verbose:
5444 if ui.verbose:
5442 fn.plain("%s " % places[p])
5445 fn.plain("%s " % places[p])
5443 fn.data(bundled=p)
5446 fn.data(bundled=p)
5444 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5447 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5445 if ui.verbose:
5448 if ui.verbose:
5446 fn.plain("\n")
5449 fn.plain("\n")
5447 fn.end()
5450 fn.end()
5448 fm.end()
5451 fm.end()
5449
5452
5450 def loadcmdtable(ui, name, cmdtable):
5453 def loadcmdtable(ui, name, cmdtable):
5451 """Load command functions from specified cmdtable
5454 """Load command functions from specified cmdtable
5452 """
5455 """
5453 overrides = [cmd for cmd in cmdtable if cmd in table]
5456 overrides = [cmd for cmd in cmdtable if cmd in table]
5454 if overrides:
5457 if overrides:
5455 ui.warn(_("extension '%s' overrides commands: %s\n")
5458 ui.warn(_("extension '%s' overrides commands: %s\n")
5456 % (name, " ".join(overrides)))
5459 % (name, " ".join(overrides)))
5457 table.update(cmdtable)
5460 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now