##// END OF EJS Templates
config: set blockedtag when invoking configuration edit
Simon Farnsworth -
r31201:50d76bae default
parent child Browse files
Show More
@@ -1,5449 +1,5450 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 )
21 )
22 from . import (
22 from . import (
23 archival,
23 archival,
24 bookmarks,
24 bookmarks,
25 bundle2,
25 bundle2,
26 changegroup,
26 changegroup,
27 cmdutil,
27 cmdutil,
28 copies,
28 copies,
29 destutil,
29 destutil,
30 dirstateguard,
30 dirstateguard,
31 discovery,
31 discovery,
32 encoding,
32 encoding,
33 error,
33 error,
34 exchange,
34 exchange,
35 extensions,
35 extensions,
36 graphmod,
36 graphmod,
37 hbisect,
37 hbisect,
38 help,
38 help,
39 hg,
39 hg,
40 lock as lockmod,
40 lock as lockmod,
41 merge as mergemod,
41 merge as mergemod,
42 obsolete,
42 obsolete,
43 patch,
43 patch,
44 phases,
44 phases,
45 pycompat,
45 pycompat,
46 revsetlang,
46 revsetlang,
47 scmutil,
47 scmutil,
48 server,
48 server,
49 sshserver,
49 sshserver,
50 streamclone,
50 streamclone,
51 templatekw,
51 templatekw,
52 ui as uimod,
52 ui as uimod,
53 util,
53 util,
54 )
54 )
55
55
56 release = lockmod.release
56 release = lockmod.release
57
57
58 table = {}
58 table = {}
59
59
60 command = cmdutil.command(table)
60 command = cmdutil.command(table)
61
61
62 # label constants
62 # label constants
63 # until 3.5, bookmarks.current was the advertised name, not
63 # until 3.5, bookmarks.current was the advertised name, not
64 # bookmarks.active, so we must use both to avoid breaking old
64 # bookmarks.active, so we must use both to avoid breaking old
65 # custom styles
65 # custom styles
66 activebookmarklabel = 'bookmarks.active bookmarks.current'
66 activebookmarklabel = 'bookmarks.active bookmarks.current'
67
67
68 # common command options
68 # common command options
69
69
70 globalopts = [
70 globalopts = [
71 ('R', 'repository', '',
71 ('R', 'repository', '',
72 _('repository root directory or name of overlay bundle file'),
72 _('repository root directory or name of overlay bundle file'),
73 _('REPO')),
73 _('REPO')),
74 ('', 'cwd', '',
74 ('', 'cwd', '',
75 _('change working directory'), _('DIR')),
75 _('change working directory'), _('DIR')),
76 ('y', 'noninteractive', None,
76 ('y', 'noninteractive', None,
77 _('do not prompt, automatically pick the first choice for all prompts')),
77 _('do not prompt, automatically pick the first choice for all prompts')),
78 ('q', 'quiet', None, _('suppress output')),
78 ('q', 'quiet', None, _('suppress output')),
79 ('v', 'verbose', None, _('enable additional output')),
79 ('v', 'verbose', None, _('enable additional output')),
80 ('', 'color', '',
80 ('', 'color', '',
81 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
81 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
82 # and should not be translated
82 # and should not be translated
83 _("when to colorize (boolean, always, auto, never, or debug)"),
83 _("when to colorize (boolean, always, auto, never, or debug)"),
84 _('TYPE')),
84 _('TYPE')),
85 ('', 'config', [],
85 ('', 'config', [],
86 _('set/override config option (use \'section.name=value\')'),
86 _('set/override config option (use \'section.name=value\')'),
87 _('CONFIG')),
87 _('CONFIG')),
88 ('', 'debug', None, _('enable debugging output')),
88 ('', 'debug', None, _('enable debugging output')),
89 ('', 'debugger', None, _('start debugger')),
89 ('', 'debugger', None, _('start debugger')),
90 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
90 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
91 _('ENCODE')),
91 _('ENCODE')),
92 ('', 'encodingmode', encoding.encodingmode,
92 ('', 'encodingmode', encoding.encodingmode,
93 _('set the charset encoding mode'), _('MODE')),
93 _('set the charset encoding mode'), _('MODE')),
94 ('', 'traceback', None, _('always print a traceback on exception')),
94 ('', 'traceback', None, _('always print a traceback on exception')),
95 ('', 'time', None, _('time how long the command takes')),
95 ('', 'time', None, _('time how long the command takes')),
96 ('', 'profile', None, _('print command execution profile')),
96 ('', 'profile', None, _('print command execution profile')),
97 ('', 'version', None, _('output version information and exit')),
97 ('', 'version', None, _('output version information and exit')),
98 ('h', 'help', None, _('display help and exit')),
98 ('h', 'help', None, _('display help and exit')),
99 ('', 'hidden', False, _('consider hidden changesets')),
99 ('', 'hidden', False, _('consider hidden changesets')),
100 ('', 'pager', 'auto',
100 ('', 'pager', 'auto',
101 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
101 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
102 ]
102 ]
103
103
104 dryrunopts = [('n', 'dry-run', None,
104 dryrunopts = [('n', 'dry-run', None,
105 _('do not perform actions, just print output'))]
105 _('do not perform actions, just print output'))]
106
106
107 remoteopts = [
107 remoteopts = [
108 ('e', 'ssh', '',
108 ('e', 'ssh', '',
109 _('specify ssh command to use'), _('CMD')),
109 _('specify ssh command to use'), _('CMD')),
110 ('', 'remotecmd', '',
110 ('', 'remotecmd', '',
111 _('specify hg command to run on the remote side'), _('CMD')),
111 _('specify hg command to run on the remote side'), _('CMD')),
112 ('', 'insecure', None,
112 ('', 'insecure', None,
113 _('do not verify server certificate (ignoring web.cacerts config)')),
113 _('do not verify server certificate (ignoring web.cacerts config)')),
114 ]
114 ]
115
115
116 walkopts = [
116 walkopts = [
117 ('I', 'include', [],
117 ('I', 'include', [],
118 _('include names matching the given patterns'), _('PATTERN')),
118 _('include names matching the given patterns'), _('PATTERN')),
119 ('X', 'exclude', [],
119 ('X', 'exclude', [],
120 _('exclude names matching the given patterns'), _('PATTERN')),
120 _('exclude names matching the given patterns'), _('PATTERN')),
121 ]
121 ]
122
122
123 commitopts = [
123 commitopts = [
124 ('m', 'message', '',
124 ('m', 'message', '',
125 _('use text as commit message'), _('TEXT')),
125 _('use text as commit message'), _('TEXT')),
126 ('l', 'logfile', '',
126 ('l', 'logfile', '',
127 _('read commit message from file'), _('FILE')),
127 _('read commit message from file'), _('FILE')),
128 ]
128 ]
129
129
130 commitopts2 = [
130 commitopts2 = [
131 ('d', 'date', '',
131 ('d', 'date', '',
132 _('record the specified date as commit date'), _('DATE')),
132 _('record the specified date as commit date'), _('DATE')),
133 ('u', 'user', '',
133 ('u', 'user', '',
134 _('record the specified user as committer'), _('USER')),
134 _('record the specified user as committer'), _('USER')),
135 ]
135 ]
136
136
137 # hidden for now
137 # hidden for now
138 formatteropts = [
138 formatteropts = [
139 ('T', 'template', '',
139 ('T', 'template', '',
140 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
140 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
141 ]
141 ]
142
142
143 templateopts = [
143 templateopts = [
144 ('', 'style', '',
144 ('', 'style', '',
145 _('display using template map file (DEPRECATED)'), _('STYLE')),
145 _('display using template map file (DEPRECATED)'), _('STYLE')),
146 ('T', 'template', '',
146 ('T', 'template', '',
147 _('display with template'), _('TEMPLATE')),
147 _('display with template'), _('TEMPLATE')),
148 ]
148 ]
149
149
150 logopts = [
150 logopts = [
151 ('p', 'patch', None, _('show patch')),
151 ('p', 'patch', None, _('show patch')),
152 ('g', 'git', None, _('use git extended diff format')),
152 ('g', 'git', None, _('use git extended diff format')),
153 ('l', 'limit', '',
153 ('l', 'limit', '',
154 _('limit number of changes displayed'), _('NUM')),
154 _('limit number of changes displayed'), _('NUM')),
155 ('M', 'no-merges', None, _('do not show merges')),
155 ('M', 'no-merges', None, _('do not show merges')),
156 ('', 'stat', None, _('output diffstat-style summary of changes')),
156 ('', 'stat', None, _('output diffstat-style summary of changes')),
157 ('G', 'graph', None, _("show the revision DAG")),
157 ('G', 'graph', None, _("show the revision DAG")),
158 ] + templateopts
158 ] + templateopts
159
159
160 diffopts = [
160 diffopts = [
161 ('a', 'text', None, _('treat all files as text')),
161 ('a', 'text', None, _('treat all files as text')),
162 ('g', 'git', None, _('use git extended diff format')),
162 ('g', 'git', None, _('use git extended diff format')),
163 ('', 'nodates', None, _('omit dates from diff headers'))
163 ('', 'nodates', None, _('omit dates from diff headers'))
164 ]
164 ]
165
165
166 diffwsopts = [
166 diffwsopts = [
167 ('w', 'ignore-all-space', None,
167 ('w', 'ignore-all-space', None,
168 _('ignore white space when comparing lines')),
168 _('ignore white space when comparing lines')),
169 ('b', 'ignore-space-change', None,
169 ('b', 'ignore-space-change', None,
170 _('ignore changes in the amount of white space')),
170 _('ignore changes in the amount of white space')),
171 ('B', 'ignore-blank-lines', None,
171 ('B', 'ignore-blank-lines', None,
172 _('ignore changes whose lines are all blank')),
172 _('ignore changes whose lines are all blank')),
173 ]
173 ]
174
174
175 diffopts2 = [
175 diffopts2 = [
176 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
176 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
177 ('p', 'show-function', None, _('show which function each change is in')),
177 ('p', 'show-function', None, _('show which function each change is in')),
178 ('', 'reverse', None, _('produce a diff that undoes the changes')),
178 ('', 'reverse', None, _('produce a diff that undoes the changes')),
179 ] + diffwsopts + [
179 ] + diffwsopts + [
180 ('U', 'unified', '',
180 ('U', 'unified', '',
181 _('number of lines of context to show'), _('NUM')),
181 _('number of lines of context to show'), _('NUM')),
182 ('', 'stat', None, _('output diffstat-style summary of changes')),
182 ('', 'stat', None, _('output diffstat-style summary of changes')),
183 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
183 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
184 ]
184 ]
185
185
186 mergetoolopts = [
186 mergetoolopts = [
187 ('t', 'tool', '', _('specify merge tool')),
187 ('t', 'tool', '', _('specify merge tool')),
188 ]
188 ]
189
189
190 similarityopts = [
190 similarityopts = [
191 ('s', 'similarity', '',
191 ('s', 'similarity', '',
192 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
192 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
193 ]
193 ]
194
194
195 subrepoopts = [
195 subrepoopts = [
196 ('S', 'subrepos', None,
196 ('S', 'subrepos', None,
197 _('recurse into subrepositories'))
197 _('recurse into subrepositories'))
198 ]
198 ]
199
199
200 debugrevlogopts = [
200 debugrevlogopts = [
201 ('c', 'changelog', False, _('open changelog')),
201 ('c', 'changelog', False, _('open changelog')),
202 ('m', 'manifest', False, _('open manifest')),
202 ('m', 'manifest', False, _('open manifest')),
203 ('', 'dir', '', _('open directory manifest')),
203 ('', 'dir', '', _('open directory manifest')),
204 ]
204 ]
205
205
206 # Commands start here, listed alphabetically
206 # Commands start here, listed alphabetically
207
207
208 @command('^add',
208 @command('^add',
209 walkopts + subrepoopts + dryrunopts,
209 walkopts + subrepoopts + dryrunopts,
210 _('[OPTION]... [FILE]...'),
210 _('[OPTION]... [FILE]...'),
211 inferrepo=True)
211 inferrepo=True)
212 def add(ui, repo, *pats, **opts):
212 def add(ui, repo, *pats, **opts):
213 """add the specified files on the next commit
213 """add the specified files on the next commit
214
214
215 Schedule files to be version controlled and added to the
215 Schedule files to be version controlled and added to the
216 repository.
216 repository.
217
217
218 The files will be added to the repository at the next commit. To
218 The files will be added to the repository at the next commit. To
219 undo an add before that, see :hg:`forget`.
219 undo an add before that, see :hg:`forget`.
220
220
221 If no names are given, add all files to the repository (except
221 If no names are given, add all files to the repository (except
222 files matching ``.hgignore``).
222 files matching ``.hgignore``).
223
223
224 .. container:: verbose
224 .. container:: verbose
225
225
226 Examples:
226 Examples:
227
227
228 - New (unknown) files are added
228 - New (unknown) files are added
229 automatically by :hg:`add`::
229 automatically by :hg:`add`::
230
230
231 $ ls
231 $ ls
232 foo.c
232 foo.c
233 $ hg status
233 $ hg status
234 ? foo.c
234 ? foo.c
235 $ hg add
235 $ hg add
236 adding foo.c
236 adding foo.c
237 $ hg status
237 $ hg status
238 A foo.c
238 A foo.c
239
239
240 - Specific files to be added can be specified::
240 - Specific files to be added can be specified::
241
241
242 $ ls
242 $ ls
243 bar.c foo.c
243 bar.c foo.c
244 $ hg status
244 $ hg status
245 ? bar.c
245 ? bar.c
246 ? foo.c
246 ? foo.c
247 $ hg add bar.c
247 $ hg add bar.c
248 $ hg status
248 $ hg status
249 A bar.c
249 A bar.c
250 ? foo.c
250 ? foo.c
251
251
252 Returns 0 if all files are successfully added.
252 Returns 0 if all files are successfully added.
253 """
253 """
254
254
255 m = scmutil.match(repo[None], pats, opts)
255 m = scmutil.match(repo[None], pats, opts)
256 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
256 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
257 return rejected and 1 or 0
257 return rejected and 1 or 0
258
258
259 @command('addremove',
259 @command('addremove',
260 similarityopts + subrepoopts + walkopts + dryrunopts,
260 similarityopts + subrepoopts + walkopts + dryrunopts,
261 _('[OPTION]... [FILE]...'),
261 _('[OPTION]... [FILE]...'),
262 inferrepo=True)
262 inferrepo=True)
263 def addremove(ui, repo, *pats, **opts):
263 def addremove(ui, repo, *pats, **opts):
264 """add all new files, delete all missing files
264 """add all new files, delete all missing files
265
265
266 Add all new files and remove all missing files from the
266 Add all new files and remove all missing files from the
267 repository.
267 repository.
268
268
269 Unless names are given, new files are ignored if they match any of
269 Unless names are given, new files are ignored if they match any of
270 the patterns in ``.hgignore``. As with add, these changes take
270 the patterns in ``.hgignore``. As with add, these changes take
271 effect at the next commit.
271 effect at the next commit.
272
272
273 Use the -s/--similarity option to detect renamed files. This
273 Use the -s/--similarity option to detect renamed files. This
274 option takes a percentage between 0 (disabled) and 100 (files must
274 option takes a percentage between 0 (disabled) and 100 (files must
275 be identical) as its parameter. With a parameter greater than 0,
275 be identical) as its parameter. With a parameter greater than 0,
276 this compares every removed file with every added file and records
276 this compares every removed file with every added file and records
277 those similar enough as renames. Detecting renamed files this way
277 those similar enough as renames. Detecting renamed files this way
278 can be expensive. After using this option, :hg:`status -C` can be
278 can be expensive. After using this option, :hg:`status -C` can be
279 used to check which files were identified as moved or renamed. If
279 used to check which files were identified as moved or renamed. If
280 not specified, -s/--similarity defaults to 100 and only renames of
280 not specified, -s/--similarity defaults to 100 and only renames of
281 identical files are detected.
281 identical files are detected.
282
282
283 .. container:: verbose
283 .. container:: verbose
284
284
285 Examples:
285 Examples:
286
286
287 - A number of files (bar.c and foo.c) are new,
287 - A number of files (bar.c and foo.c) are new,
288 while foobar.c has been removed (without using :hg:`remove`)
288 while foobar.c has been removed (without using :hg:`remove`)
289 from the repository::
289 from the repository::
290
290
291 $ ls
291 $ ls
292 bar.c foo.c
292 bar.c foo.c
293 $ hg status
293 $ hg status
294 ! foobar.c
294 ! foobar.c
295 ? bar.c
295 ? bar.c
296 ? foo.c
296 ? foo.c
297 $ hg addremove
297 $ hg addremove
298 adding bar.c
298 adding bar.c
299 adding foo.c
299 adding foo.c
300 removing foobar.c
300 removing foobar.c
301 $ hg status
301 $ hg status
302 A bar.c
302 A bar.c
303 A foo.c
303 A foo.c
304 R foobar.c
304 R foobar.c
305
305
306 - A file foobar.c was moved to foo.c without using :hg:`rename`.
306 - A file foobar.c was moved to foo.c without using :hg:`rename`.
307 Afterwards, it was edited slightly::
307 Afterwards, it was edited slightly::
308
308
309 $ ls
309 $ ls
310 foo.c
310 foo.c
311 $ hg status
311 $ hg status
312 ! foobar.c
312 ! foobar.c
313 ? foo.c
313 ? foo.c
314 $ hg addremove --similarity 90
314 $ hg addremove --similarity 90
315 removing foobar.c
315 removing foobar.c
316 adding foo.c
316 adding foo.c
317 recording removal of foobar.c as rename to foo.c (94% similar)
317 recording removal of foobar.c as rename to foo.c (94% similar)
318 $ hg status -C
318 $ hg status -C
319 A foo.c
319 A foo.c
320 foobar.c
320 foobar.c
321 R foobar.c
321 R foobar.c
322
322
323 Returns 0 if all files are successfully added.
323 Returns 0 if all files are successfully added.
324 """
324 """
325 try:
325 try:
326 sim = float(opts.get('similarity') or 100)
326 sim = float(opts.get('similarity') or 100)
327 except ValueError:
327 except ValueError:
328 raise error.Abort(_('similarity must be a number'))
328 raise error.Abort(_('similarity must be a number'))
329 if sim < 0 or sim > 100:
329 if sim < 0 or sim > 100:
330 raise error.Abort(_('similarity must be between 0 and 100'))
330 raise error.Abort(_('similarity must be between 0 and 100'))
331 matcher = scmutil.match(repo[None], pats, opts)
331 matcher = scmutil.match(repo[None], pats, opts)
332 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
332 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
333
333
334 @command('^annotate|blame',
334 @command('^annotate|blame',
335 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
335 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
336 ('', 'follow', None,
336 ('', 'follow', None,
337 _('follow copies/renames and list the filename (DEPRECATED)')),
337 _('follow copies/renames and list the filename (DEPRECATED)')),
338 ('', 'no-follow', None, _("don't follow copies and renames")),
338 ('', 'no-follow', None, _("don't follow copies and renames")),
339 ('a', 'text', None, _('treat all files as text')),
339 ('a', 'text', None, _('treat all files as text')),
340 ('u', 'user', None, _('list the author (long with -v)')),
340 ('u', 'user', None, _('list the author (long with -v)')),
341 ('f', 'file', None, _('list the filename')),
341 ('f', 'file', None, _('list the filename')),
342 ('d', 'date', None, _('list the date (short with -q)')),
342 ('d', 'date', None, _('list the date (short with -q)')),
343 ('n', 'number', None, _('list the revision number (default)')),
343 ('n', 'number', None, _('list the revision number (default)')),
344 ('c', 'changeset', None, _('list the changeset')),
344 ('c', 'changeset', None, _('list the changeset')),
345 ('l', 'line-number', None, _('show line number at the first appearance'))
345 ('l', 'line-number', None, _('show line number at the first appearance'))
346 ] + diffwsopts + walkopts + formatteropts,
346 ] + diffwsopts + walkopts + formatteropts,
347 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
347 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
348 inferrepo=True)
348 inferrepo=True)
349 def annotate(ui, repo, *pats, **opts):
349 def annotate(ui, repo, *pats, **opts):
350 """show changeset information by line for each file
350 """show changeset information by line for each file
351
351
352 List changes in files, showing the revision id responsible for
352 List changes in files, showing the revision id responsible for
353 each line.
353 each line.
354
354
355 This command is useful for discovering when a change was made and
355 This command is useful for discovering when a change was made and
356 by whom.
356 by whom.
357
357
358 If you include --file, --user, or --date, the revision number is
358 If you include --file, --user, or --date, the revision number is
359 suppressed unless you also include --number.
359 suppressed unless you also include --number.
360
360
361 Without the -a/--text option, annotate will avoid processing files
361 Without the -a/--text option, annotate will avoid processing files
362 it detects as binary. With -a, annotate will annotate the file
362 it detects as binary. With -a, annotate will annotate the file
363 anyway, although the results will probably be neither useful
363 anyway, although the results will probably be neither useful
364 nor desirable.
364 nor desirable.
365
365
366 Returns 0 on success.
366 Returns 0 on success.
367 """
367 """
368 if not pats:
368 if not pats:
369 raise error.Abort(_('at least one filename or pattern is required'))
369 raise error.Abort(_('at least one filename or pattern is required'))
370
370
371 if opts.get('follow'):
371 if opts.get('follow'):
372 # --follow is deprecated and now just an alias for -f/--file
372 # --follow is deprecated and now just an alias for -f/--file
373 # to mimic the behavior of Mercurial before version 1.5
373 # to mimic the behavior of Mercurial before version 1.5
374 opts['file'] = True
374 opts['file'] = True
375
375
376 ctx = scmutil.revsingle(repo, opts.get('rev'))
376 ctx = scmutil.revsingle(repo, opts.get('rev'))
377
377
378 fm = ui.formatter('annotate', opts)
378 fm = ui.formatter('annotate', opts)
379 if ui.quiet:
379 if ui.quiet:
380 datefunc = util.shortdate
380 datefunc = util.shortdate
381 else:
381 else:
382 datefunc = util.datestr
382 datefunc = util.datestr
383 if ctx.rev() is None:
383 if ctx.rev() is None:
384 def hexfn(node):
384 def hexfn(node):
385 if node is None:
385 if node is None:
386 return None
386 return None
387 else:
387 else:
388 return fm.hexfunc(node)
388 return fm.hexfunc(node)
389 if opts.get('changeset'):
389 if opts.get('changeset'):
390 # omit "+" suffix which is appended to node hex
390 # omit "+" suffix which is appended to node hex
391 def formatrev(rev):
391 def formatrev(rev):
392 if rev is None:
392 if rev is None:
393 return '%d' % ctx.p1().rev()
393 return '%d' % ctx.p1().rev()
394 else:
394 else:
395 return '%d' % rev
395 return '%d' % rev
396 else:
396 else:
397 def formatrev(rev):
397 def formatrev(rev):
398 if rev is None:
398 if rev is None:
399 return '%d+' % ctx.p1().rev()
399 return '%d+' % ctx.p1().rev()
400 else:
400 else:
401 return '%d ' % rev
401 return '%d ' % rev
402 def formathex(hex):
402 def formathex(hex):
403 if hex is None:
403 if hex is None:
404 return '%s+' % fm.hexfunc(ctx.p1().node())
404 return '%s+' % fm.hexfunc(ctx.p1().node())
405 else:
405 else:
406 return '%s ' % hex
406 return '%s ' % hex
407 else:
407 else:
408 hexfn = fm.hexfunc
408 hexfn = fm.hexfunc
409 formatrev = formathex = str
409 formatrev = formathex = str
410
410
411 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
411 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
412 ('number', ' ', lambda x: x[0].rev(), formatrev),
412 ('number', ' ', lambda x: x[0].rev(), formatrev),
413 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
413 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
414 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
414 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
415 ('file', ' ', lambda x: x[0].path(), str),
415 ('file', ' ', lambda x: x[0].path(), str),
416 ('line_number', ':', lambda x: x[1], str),
416 ('line_number', ':', lambda x: x[1], str),
417 ]
417 ]
418 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
418 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
419
419
420 if (not opts.get('user') and not opts.get('changeset')
420 if (not opts.get('user') and not opts.get('changeset')
421 and not opts.get('date') and not opts.get('file')):
421 and not opts.get('date') and not opts.get('file')):
422 opts['number'] = True
422 opts['number'] = True
423
423
424 linenumber = opts.get('line_number') is not None
424 linenumber = opts.get('line_number') is not None
425 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
425 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
426 raise error.Abort(_('at least one of -n/-c is required for -l'))
426 raise error.Abort(_('at least one of -n/-c is required for -l'))
427
427
428 ui.pager('annotate')
428 ui.pager('annotate')
429
429
430 if fm.isplain():
430 if fm.isplain():
431 def makefunc(get, fmt):
431 def makefunc(get, fmt):
432 return lambda x: fmt(get(x))
432 return lambda x: fmt(get(x))
433 else:
433 else:
434 def makefunc(get, fmt):
434 def makefunc(get, fmt):
435 return get
435 return get
436 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
436 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
437 if opts.get(op)]
437 if opts.get(op)]
438 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
438 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
439 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
439 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
440 if opts.get(op))
440 if opts.get(op))
441
441
442 def bad(x, y):
442 def bad(x, y):
443 raise error.Abort("%s: %s" % (x, y))
443 raise error.Abort("%s: %s" % (x, y))
444
444
445 m = scmutil.match(ctx, pats, opts, badfn=bad)
445 m = scmutil.match(ctx, pats, opts, badfn=bad)
446
446
447 follow = not opts.get('no_follow')
447 follow = not opts.get('no_follow')
448 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
448 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
449 whitespace=True)
449 whitespace=True)
450 for abs in ctx.walk(m):
450 for abs in ctx.walk(m):
451 fctx = ctx[abs]
451 fctx = ctx[abs]
452 if not opts.get('text') and util.binary(fctx.data()):
452 if not opts.get('text') and util.binary(fctx.data()):
453 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
453 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
454 continue
454 continue
455
455
456 lines = fctx.annotate(follow=follow, linenumber=linenumber,
456 lines = fctx.annotate(follow=follow, linenumber=linenumber,
457 diffopts=diffopts)
457 diffopts=diffopts)
458 if not lines:
458 if not lines:
459 continue
459 continue
460 formats = []
460 formats = []
461 pieces = []
461 pieces = []
462
462
463 for f, sep in funcmap:
463 for f, sep in funcmap:
464 l = [f(n) for n, dummy in lines]
464 l = [f(n) for n, dummy in lines]
465 if fm.isplain():
465 if fm.isplain():
466 sizes = [encoding.colwidth(x) for x in l]
466 sizes = [encoding.colwidth(x) for x in l]
467 ml = max(sizes)
467 ml = max(sizes)
468 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
468 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
469 else:
469 else:
470 formats.append(['%s' for x in l])
470 formats.append(['%s' for x in l])
471 pieces.append(l)
471 pieces.append(l)
472
472
473 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
473 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
474 fm.startitem()
474 fm.startitem()
475 fm.write(fields, "".join(f), *p)
475 fm.write(fields, "".join(f), *p)
476 fm.write('line', ": %s", l[1])
476 fm.write('line', ": %s", l[1])
477
477
478 if not lines[-1][1].endswith('\n'):
478 if not lines[-1][1].endswith('\n'):
479 fm.plain('\n')
479 fm.plain('\n')
480
480
481 fm.end()
481 fm.end()
482
482
483 @command('archive',
483 @command('archive',
484 [('', 'no-decode', None, _('do not pass files through decoders')),
484 [('', 'no-decode', None, _('do not pass files through decoders')),
485 ('p', 'prefix', '', _('directory prefix for files in archive'),
485 ('p', 'prefix', '', _('directory prefix for files in archive'),
486 _('PREFIX')),
486 _('PREFIX')),
487 ('r', 'rev', '', _('revision to distribute'), _('REV')),
487 ('r', 'rev', '', _('revision to distribute'), _('REV')),
488 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
488 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
489 ] + subrepoopts + walkopts,
489 ] + subrepoopts + walkopts,
490 _('[OPTION]... DEST'))
490 _('[OPTION]... DEST'))
491 def archive(ui, repo, dest, **opts):
491 def archive(ui, repo, dest, **opts):
492 '''create an unversioned archive of a repository revision
492 '''create an unversioned archive of a repository revision
493
493
494 By default, the revision used is the parent of the working
494 By default, the revision used is the parent of the working
495 directory; use -r/--rev to specify a different revision.
495 directory; use -r/--rev to specify a different revision.
496
496
497 The archive type is automatically detected based on file
497 The archive type is automatically detected based on file
498 extension (to override, use -t/--type).
498 extension (to override, use -t/--type).
499
499
500 .. container:: verbose
500 .. container:: verbose
501
501
502 Examples:
502 Examples:
503
503
504 - create a zip file containing the 1.0 release::
504 - create a zip file containing the 1.0 release::
505
505
506 hg archive -r 1.0 project-1.0.zip
506 hg archive -r 1.0 project-1.0.zip
507
507
508 - create a tarball excluding .hg files::
508 - create a tarball excluding .hg files::
509
509
510 hg archive project.tar.gz -X ".hg*"
510 hg archive project.tar.gz -X ".hg*"
511
511
512 Valid types are:
512 Valid types are:
513
513
514 :``files``: a directory full of files (default)
514 :``files``: a directory full of files (default)
515 :``tar``: tar archive, uncompressed
515 :``tar``: tar archive, uncompressed
516 :``tbz2``: tar archive, compressed using bzip2
516 :``tbz2``: tar archive, compressed using bzip2
517 :``tgz``: tar archive, compressed using gzip
517 :``tgz``: tar archive, compressed using gzip
518 :``uzip``: zip archive, uncompressed
518 :``uzip``: zip archive, uncompressed
519 :``zip``: zip archive, compressed using deflate
519 :``zip``: zip archive, compressed using deflate
520
520
521 The exact name of the destination archive or directory is given
521 The exact name of the destination archive or directory is given
522 using a format string; see :hg:`help export` for details.
522 using a format string; see :hg:`help export` for details.
523
523
524 Each member added to an archive file has a directory prefix
524 Each member added to an archive file has a directory prefix
525 prepended. Use -p/--prefix to specify a format string for the
525 prepended. Use -p/--prefix to specify a format string for the
526 prefix. The default is the basename of the archive, with suffixes
526 prefix. The default is the basename of the archive, with suffixes
527 removed.
527 removed.
528
528
529 Returns 0 on success.
529 Returns 0 on success.
530 '''
530 '''
531
531
532 ctx = scmutil.revsingle(repo, opts.get('rev'))
532 ctx = scmutil.revsingle(repo, opts.get('rev'))
533 if not ctx:
533 if not ctx:
534 raise error.Abort(_('no working directory: please specify a revision'))
534 raise error.Abort(_('no working directory: please specify a revision'))
535 node = ctx.node()
535 node = ctx.node()
536 dest = cmdutil.makefilename(repo, dest, node)
536 dest = cmdutil.makefilename(repo, dest, node)
537 if os.path.realpath(dest) == repo.root:
537 if os.path.realpath(dest) == repo.root:
538 raise error.Abort(_('repository root cannot be destination'))
538 raise error.Abort(_('repository root cannot be destination'))
539
539
540 kind = opts.get('type') or archival.guesskind(dest) or 'files'
540 kind = opts.get('type') or archival.guesskind(dest) or 'files'
541 prefix = opts.get('prefix')
541 prefix = opts.get('prefix')
542
542
543 if dest == '-':
543 if dest == '-':
544 if kind == 'files':
544 if kind == 'files':
545 raise error.Abort(_('cannot archive plain files to stdout'))
545 raise error.Abort(_('cannot archive plain files to stdout'))
546 dest = cmdutil.makefileobj(repo, dest)
546 dest = cmdutil.makefileobj(repo, dest)
547 if not prefix:
547 if not prefix:
548 prefix = os.path.basename(repo.root) + '-%h'
548 prefix = os.path.basename(repo.root) + '-%h'
549
549
550 prefix = cmdutil.makefilename(repo, prefix, node)
550 prefix = cmdutil.makefilename(repo, prefix, node)
551 matchfn = scmutil.match(ctx, [], opts)
551 matchfn = scmutil.match(ctx, [], opts)
552 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
552 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
553 matchfn, prefix, subrepos=opts.get('subrepos'))
553 matchfn, prefix, subrepos=opts.get('subrepos'))
554
554
555 @command('backout',
555 @command('backout',
556 [('', 'merge', None, _('merge with old dirstate parent after backout')),
556 [('', 'merge', None, _('merge with old dirstate parent after backout')),
557 ('', 'commit', None,
557 ('', 'commit', None,
558 _('commit if no conflicts were encountered (DEPRECATED)')),
558 _('commit if no conflicts were encountered (DEPRECATED)')),
559 ('', 'no-commit', None, _('do not commit')),
559 ('', 'no-commit', None, _('do not commit')),
560 ('', 'parent', '',
560 ('', 'parent', '',
561 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
561 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
562 ('r', 'rev', '', _('revision to backout'), _('REV')),
562 ('r', 'rev', '', _('revision to backout'), _('REV')),
563 ('e', 'edit', False, _('invoke editor on commit messages')),
563 ('e', 'edit', False, _('invoke editor on commit messages')),
564 ] + mergetoolopts + walkopts + commitopts + commitopts2,
564 ] + mergetoolopts + walkopts + commitopts + commitopts2,
565 _('[OPTION]... [-r] REV'))
565 _('[OPTION]... [-r] REV'))
566 def backout(ui, repo, node=None, rev=None, **opts):
566 def backout(ui, repo, node=None, rev=None, **opts):
567 '''reverse effect of earlier changeset
567 '''reverse effect of earlier changeset
568
568
569 Prepare a new changeset with the effect of REV undone in the
569 Prepare a new changeset with the effect of REV undone in the
570 current working directory. If no conflicts were encountered,
570 current working directory. If no conflicts were encountered,
571 it will be committed immediately.
571 it will be committed immediately.
572
572
573 If REV is the parent of the working directory, then this new changeset
573 If REV is the parent of the working directory, then this new changeset
574 is committed automatically (unless --no-commit is specified).
574 is committed automatically (unless --no-commit is specified).
575
575
576 .. note::
576 .. note::
577
577
578 :hg:`backout` cannot be used to fix either an unwanted or
578 :hg:`backout` cannot be used to fix either an unwanted or
579 incorrect merge.
579 incorrect merge.
580
580
581 .. container:: verbose
581 .. container:: verbose
582
582
583 Examples:
583 Examples:
584
584
585 - Reverse the effect of the parent of the working directory.
585 - Reverse the effect of the parent of the working directory.
586 This backout will be committed immediately::
586 This backout will be committed immediately::
587
587
588 hg backout -r .
588 hg backout -r .
589
589
590 - Reverse the effect of previous bad revision 23::
590 - Reverse the effect of previous bad revision 23::
591
591
592 hg backout -r 23
592 hg backout -r 23
593
593
594 - Reverse the effect of previous bad revision 23 and
594 - Reverse the effect of previous bad revision 23 and
595 leave changes uncommitted::
595 leave changes uncommitted::
596
596
597 hg backout -r 23 --no-commit
597 hg backout -r 23 --no-commit
598 hg commit -m "Backout revision 23"
598 hg commit -m "Backout revision 23"
599
599
600 By default, the pending changeset will have one parent,
600 By default, the pending changeset will have one parent,
601 maintaining a linear history. With --merge, the pending
601 maintaining a linear history. With --merge, the pending
602 changeset will instead have two parents: the old parent of the
602 changeset will instead have two parents: the old parent of the
603 working directory and a new child of REV that simply undoes REV.
603 working directory and a new child of REV that simply undoes REV.
604
604
605 Before version 1.7, the behavior without --merge was equivalent
605 Before version 1.7, the behavior without --merge was equivalent
606 to specifying --merge followed by :hg:`update --clean .` to
606 to specifying --merge followed by :hg:`update --clean .` to
607 cancel the merge and leave the child of REV as a head to be
607 cancel the merge and leave the child of REV as a head to be
608 merged separately.
608 merged separately.
609
609
610 See :hg:`help dates` for a list of formats valid for -d/--date.
610 See :hg:`help dates` for a list of formats valid for -d/--date.
611
611
612 See :hg:`help revert` for a way to restore files to the state
612 See :hg:`help revert` for a way to restore files to the state
613 of another revision.
613 of another revision.
614
614
615 Returns 0 on success, 1 if nothing to backout or there are unresolved
615 Returns 0 on success, 1 if nothing to backout or there are unresolved
616 files.
616 files.
617 '''
617 '''
618 wlock = lock = None
618 wlock = lock = None
619 try:
619 try:
620 wlock = repo.wlock()
620 wlock = repo.wlock()
621 lock = repo.lock()
621 lock = repo.lock()
622 return _dobackout(ui, repo, node, rev, **opts)
622 return _dobackout(ui, repo, node, rev, **opts)
623 finally:
623 finally:
624 release(lock, wlock)
624 release(lock, wlock)
625
625
626 def _dobackout(ui, repo, node=None, rev=None, **opts):
626 def _dobackout(ui, repo, node=None, rev=None, **opts):
627 if opts.get('commit') and opts.get('no_commit'):
627 if opts.get('commit') and opts.get('no_commit'):
628 raise error.Abort(_("cannot use --commit with --no-commit"))
628 raise error.Abort(_("cannot use --commit with --no-commit"))
629 if opts.get('merge') and opts.get('no_commit'):
629 if opts.get('merge') and opts.get('no_commit'):
630 raise error.Abort(_("cannot use --merge with --no-commit"))
630 raise error.Abort(_("cannot use --merge with --no-commit"))
631
631
632 if rev and node:
632 if rev and node:
633 raise error.Abort(_("please specify just one revision"))
633 raise error.Abort(_("please specify just one revision"))
634
634
635 if not rev:
635 if not rev:
636 rev = node
636 rev = node
637
637
638 if not rev:
638 if not rev:
639 raise error.Abort(_("please specify a revision to backout"))
639 raise error.Abort(_("please specify a revision to backout"))
640
640
641 date = opts.get('date')
641 date = opts.get('date')
642 if date:
642 if date:
643 opts['date'] = util.parsedate(date)
643 opts['date'] = util.parsedate(date)
644
644
645 cmdutil.checkunfinished(repo)
645 cmdutil.checkunfinished(repo)
646 cmdutil.bailifchanged(repo)
646 cmdutil.bailifchanged(repo)
647 node = scmutil.revsingle(repo, rev).node()
647 node = scmutil.revsingle(repo, rev).node()
648
648
649 op1, op2 = repo.dirstate.parents()
649 op1, op2 = repo.dirstate.parents()
650 if not repo.changelog.isancestor(node, op1):
650 if not repo.changelog.isancestor(node, op1):
651 raise error.Abort(_('cannot backout change that is not an ancestor'))
651 raise error.Abort(_('cannot backout change that is not an ancestor'))
652
652
653 p1, p2 = repo.changelog.parents(node)
653 p1, p2 = repo.changelog.parents(node)
654 if p1 == nullid:
654 if p1 == nullid:
655 raise error.Abort(_('cannot backout a change with no parents'))
655 raise error.Abort(_('cannot backout a change with no parents'))
656 if p2 != nullid:
656 if p2 != nullid:
657 if not opts.get('parent'):
657 if not opts.get('parent'):
658 raise error.Abort(_('cannot backout a merge changeset'))
658 raise error.Abort(_('cannot backout a merge changeset'))
659 p = repo.lookup(opts['parent'])
659 p = repo.lookup(opts['parent'])
660 if p not in (p1, p2):
660 if p not in (p1, p2):
661 raise error.Abort(_('%s is not a parent of %s') %
661 raise error.Abort(_('%s is not a parent of %s') %
662 (short(p), short(node)))
662 (short(p), short(node)))
663 parent = p
663 parent = p
664 else:
664 else:
665 if opts.get('parent'):
665 if opts.get('parent'):
666 raise error.Abort(_('cannot use --parent on non-merge changeset'))
666 raise error.Abort(_('cannot use --parent on non-merge changeset'))
667 parent = p1
667 parent = p1
668
668
669 # the backout should appear on the same branch
669 # the backout should appear on the same branch
670 branch = repo.dirstate.branch()
670 branch = repo.dirstate.branch()
671 bheads = repo.branchheads(branch)
671 bheads = repo.branchheads(branch)
672 rctx = scmutil.revsingle(repo, hex(parent))
672 rctx = scmutil.revsingle(repo, hex(parent))
673 if not opts.get('merge') and op1 != node:
673 if not opts.get('merge') and op1 != node:
674 dsguard = dirstateguard.dirstateguard(repo, 'backout')
674 dsguard = dirstateguard.dirstateguard(repo, 'backout')
675 try:
675 try:
676 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
676 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
677 'backout')
677 'backout')
678 stats = mergemod.update(repo, parent, True, True, node, False)
678 stats = mergemod.update(repo, parent, True, True, node, False)
679 repo.setparents(op1, op2)
679 repo.setparents(op1, op2)
680 dsguard.close()
680 dsguard.close()
681 hg._showstats(repo, stats)
681 hg._showstats(repo, stats)
682 if stats[3]:
682 if stats[3]:
683 repo.ui.status(_("use 'hg resolve' to retry unresolved "
683 repo.ui.status(_("use 'hg resolve' to retry unresolved "
684 "file merges\n"))
684 "file merges\n"))
685 return 1
685 return 1
686 finally:
686 finally:
687 ui.setconfig('ui', 'forcemerge', '', '')
687 ui.setconfig('ui', 'forcemerge', '', '')
688 lockmod.release(dsguard)
688 lockmod.release(dsguard)
689 else:
689 else:
690 hg.clean(repo, node, show_stats=False)
690 hg.clean(repo, node, show_stats=False)
691 repo.dirstate.setbranch(branch)
691 repo.dirstate.setbranch(branch)
692 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
692 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
693
693
694 if opts.get('no_commit'):
694 if opts.get('no_commit'):
695 msg = _("changeset %s backed out, "
695 msg = _("changeset %s backed out, "
696 "don't forget to commit.\n")
696 "don't forget to commit.\n")
697 ui.status(msg % short(node))
697 ui.status(msg % short(node))
698 return 0
698 return 0
699
699
700 def commitfunc(ui, repo, message, match, opts):
700 def commitfunc(ui, repo, message, match, opts):
701 editform = 'backout'
701 editform = 'backout'
702 e = cmdutil.getcommiteditor(editform=editform, **opts)
702 e = cmdutil.getcommiteditor(editform=editform, **opts)
703 if not message:
703 if not message:
704 # we don't translate commit messages
704 # we don't translate commit messages
705 message = "Backed out changeset %s" % short(node)
705 message = "Backed out changeset %s" % short(node)
706 e = cmdutil.getcommiteditor(edit=True, editform=editform)
706 e = cmdutil.getcommiteditor(edit=True, editform=editform)
707 return repo.commit(message, opts.get('user'), opts.get('date'),
707 return repo.commit(message, opts.get('user'), opts.get('date'),
708 match, editor=e)
708 match, editor=e)
709 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
709 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
710 if not newnode:
710 if not newnode:
711 ui.status(_("nothing changed\n"))
711 ui.status(_("nothing changed\n"))
712 return 1
712 return 1
713 cmdutil.commitstatus(repo, newnode, branch, bheads)
713 cmdutil.commitstatus(repo, newnode, branch, bheads)
714
714
715 def nice(node):
715 def nice(node):
716 return '%d:%s' % (repo.changelog.rev(node), short(node))
716 return '%d:%s' % (repo.changelog.rev(node), short(node))
717 ui.status(_('changeset %s backs out changeset %s\n') %
717 ui.status(_('changeset %s backs out changeset %s\n') %
718 (nice(repo.changelog.tip()), nice(node)))
718 (nice(repo.changelog.tip()), nice(node)))
719 if opts.get('merge') and op1 != node:
719 if opts.get('merge') and op1 != node:
720 hg.clean(repo, op1, show_stats=False)
720 hg.clean(repo, op1, show_stats=False)
721 ui.status(_('merging with changeset %s\n')
721 ui.status(_('merging with changeset %s\n')
722 % nice(repo.changelog.tip()))
722 % nice(repo.changelog.tip()))
723 try:
723 try:
724 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
724 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
725 'backout')
725 'backout')
726 return hg.merge(repo, hex(repo.changelog.tip()))
726 return hg.merge(repo, hex(repo.changelog.tip()))
727 finally:
727 finally:
728 ui.setconfig('ui', 'forcemerge', '', '')
728 ui.setconfig('ui', 'forcemerge', '', '')
729 return 0
729 return 0
730
730
731 @command('bisect',
731 @command('bisect',
732 [('r', 'reset', False, _('reset bisect state')),
732 [('r', 'reset', False, _('reset bisect state')),
733 ('g', 'good', False, _('mark changeset good')),
733 ('g', 'good', False, _('mark changeset good')),
734 ('b', 'bad', False, _('mark changeset bad')),
734 ('b', 'bad', False, _('mark changeset bad')),
735 ('s', 'skip', False, _('skip testing changeset')),
735 ('s', 'skip', False, _('skip testing changeset')),
736 ('e', 'extend', False, _('extend the bisect range')),
736 ('e', 'extend', False, _('extend the bisect range')),
737 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
737 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
738 ('U', 'noupdate', False, _('do not update to target'))],
738 ('U', 'noupdate', False, _('do not update to target'))],
739 _("[-gbsr] [-U] [-c CMD] [REV]"))
739 _("[-gbsr] [-U] [-c CMD] [REV]"))
740 def bisect(ui, repo, rev=None, extra=None, command=None,
740 def bisect(ui, repo, rev=None, extra=None, command=None,
741 reset=None, good=None, bad=None, skip=None, extend=None,
741 reset=None, good=None, bad=None, skip=None, extend=None,
742 noupdate=None):
742 noupdate=None):
743 """subdivision search of changesets
743 """subdivision search of changesets
744
744
745 This command helps to find changesets which introduce problems. To
745 This command helps to find changesets which introduce problems. To
746 use, mark the earliest changeset you know exhibits the problem as
746 use, mark the earliest changeset you know exhibits the problem as
747 bad, then mark the latest changeset which is free from the problem
747 bad, then mark the latest changeset which is free from the problem
748 as good. Bisect will update your working directory to a revision
748 as good. Bisect will update your working directory to a revision
749 for testing (unless the -U/--noupdate option is specified). Once
749 for testing (unless the -U/--noupdate option is specified). Once
750 you have performed tests, mark the working directory as good or
750 you have performed tests, mark the working directory as good or
751 bad, and bisect will either update to another candidate changeset
751 bad, and bisect will either update to another candidate changeset
752 or announce that it has found the bad revision.
752 or announce that it has found the bad revision.
753
753
754 As a shortcut, you can also use the revision argument to mark a
754 As a shortcut, you can also use the revision argument to mark a
755 revision as good or bad without checking it out first.
755 revision as good or bad without checking it out first.
756
756
757 If you supply a command, it will be used for automatic bisection.
757 If you supply a command, it will be used for automatic bisection.
758 The environment variable HG_NODE will contain the ID of the
758 The environment variable HG_NODE will contain the ID of the
759 changeset being tested. The exit status of the command will be
759 changeset being tested. The exit status of the command will be
760 used to mark revisions as good or bad: status 0 means good, 125
760 used to mark revisions as good or bad: status 0 means good, 125
761 means to skip the revision, 127 (command not found) will abort the
761 means to skip the revision, 127 (command not found) will abort the
762 bisection, and any other non-zero exit status means the revision
762 bisection, and any other non-zero exit status means the revision
763 is bad.
763 is bad.
764
764
765 .. container:: verbose
765 .. container:: verbose
766
766
767 Some examples:
767 Some examples:
768
768
769 - start a bisection with known bad revision 34, and good revision 12::
769 - start a bisection with known bad revision 34, and good revision 12::
770
770
771 hg bisect --bad 34
771 hg bisect --bad 34
772 hg bisect --good 12
772 hg bisect --good 12
773
773
774 - advance the current bisection by marking current revision as good or
774 - advance the current bisection by marking current revision as good or
775 bad::
775 bad::
776
776
777 hg bisect --good
777 hg bisect --good
778 hg bisect --bad
778 hg bisect --bad
779
779
780 - mark the current revision, or a known revision, to be skipped (e.g. if
780 - mark the current revision, or a known revision, to be skipped (e.g. if
781 that revision is not usable because of another issue)::
781 that revision is not usable because of another issue)::
782
782
783 hg bisect --skip
783 hg bisect --skip
784 hg bisect --skip 23
784 hg bisect --skip 23
785
785
786 - skip all revisions that do not touch directories ``foo`` or ``bar``::
786 - skip all revisions that do not touch directories ``foo`` or ``bar``::
787
787
788 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
788 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
789
789
790 - forget the current bisection::
790 - forget the current bisection::
791
791
792 hg bisect --reset
792 hg bisect --reset
793
793
794 - use 'make && make tests' to automatically find the first broken
794 - use 'make && make tests' to automatically find the first broken
795 revision::
795 revision::
796
796
797 hg bisect --reset
797 hg bisect --reset
798 hg bisect --bad 34
798 hg bisect --bad 34
799 hg bisect --good 12
799 hg bisect --good 12
800 hg bisect --command "make && make tests"
800 hg bisect --command "make && make tests"
801
801
802 - see all changesets whose states are already known in the current
802 - see all changesets whose states are already known in the current
803 bisection::
803 bisection::
804
804
805 hg log -r "bisect(pruned)"
805 hg log -r "bisect(pruned)"
806
806
807 - see the changeset currently being bisected (especially useful
807 - see the changeset currently being bisected (especially useful
808 if running with -U/--noupdate)::
808 if running with -U/--noupdate)::
809
809
810 hg log -r "bisect(current)"
810 hg log -r "bisect(current)"
811
811
812 - see all changesets that took part in the current bisection::
812 - see all changesets that took part in the current bisection::
813
813
814 hg log -r "bisect(range)"
814 hg log -r "bisect(range)"
815
815
816 - you can even get a nice graph::
816 - you can even get a nice graph::
817
817
818 hg log --graph -r "bisect(range)"
818 hg log --graph -r "bisect(range)"
819
819
820 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
820 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
821
821
822 Returns 0 on success.
822 Returns 0 on success.
823 """
823 """
824 # backward compatibility
824 # backward compatibility
825 if rev in "good bad reset init".split():
825 if rev in "good bad reset init".split():
826 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
826 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
827 cmd, rev, extra = rev, extra, None
827 cmd, rev, extra = rev, extra, None
828 if cmd == "good":
828 if cmd == "good":
829 good = True
829 good = True
830 elif cmd == "bad":
830 elif cmd == "bad":
831 bad = True
831 bad = True
832 else:
832 else:
833 reset = True
833 reset = True
834 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
834 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
835 raise error.Abort(_('incompatible arguments'))
835 raise error.Abort(_('incompatible arguments'))
836
836
837 cmdutil.checkunfinished(repo)
837 cmdutil.checkunfinished(repo)
838
838
839 if reset:
839 if reset:
840 hbisect.resetstate(repo)
840 hbisect.resetstate(repo)
841 return
841 return
842
842
843 state = hbisect.load_state(repo)
843 state = hbisect.load_state(repo)
844
844
845 # update state
845 # update state
846 if good or bad or skip:
846 if good or bad or skip:
847 if rev:
847 if rev:
848 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
848 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
849 else:
849 else:
850 nodes = [repo.lookup('.')]
850 nodes = [repo.lookup('.')]
851 if good:
851 if good:
852 state['good'] += nodes
852 state['good'] += nodes
853 elif bad:
853 elif bad:
854 state['bad'] += nodes
854 state['bad'] += nodes
855 elif skip:
855 elif skip:
856 state['skip'] += nodes
856 state['skip'] += nodes
857 hbisect.save_state(repo, state)
857 hbisect.save_state(repo, state)
858 if not (state['good'] and state['bad']):
858 if not (state['good'] and state['bad']):
859 return
859 return
860
860
861 def mayupdate(repo, node, show_stats=True):
861 def mayupdate(repo, node, show_stats=True):
862 """common used update sequence"""
862 """common used update sequence"""
863 if noupdate:
863 if noupdate:
864 return
864 return
865 cmdutil.bailifchanged(repo)
865 cmdutil.bailifchanged(repo)
866 return hg.clean(repo, node, show_stats=show_stats)
866 return hg.clean(repo, node, show_stats=show_stats)
867
867
868 displayer = cmdutil.show_changeset(ui, repo, {})
868 displayer = cmdutil.show_changeset(ui, repo, {})
869
869
870 if command:
870 if command:
871 changesets = 1
871 changesets = 1
872 if noupdate:
872 if noupdate:
873 try:
873 try:
874 node = state['current'][0]
874 node = state['current'][0]
875 except LookupError:
875 except LookupError:
876 raise error.Abort(_('current bisect revision is unknown - '
876 raise error.Abort(_('current bisect revision is unknown - '
877 'start a new bisect to fix'))
877 'start a new bisect to fix'))
878 else:
878 else:
879 node, p2 = repo.dirstate.parents()
879 node, p2 = repo.dirstate.parents()
880 if p2 != nullid:
880 if p2 != nullid:
881 raise error.Abort(_('current bisect revision is a merge'))
881 raise error.Abort(_('current bisect revision is a merge'))
882 if rev:
882 if rev:
883 node = repo[scmutil.revsingle(repo, rev, node)].node()
883 node = repo[scmutil.revsingle(repo, rev, node)].node()
884 try:
884 try:
885 while changesets:
885 while changesets:
886 # update state
886 # update state
887 state['current'] = [node]
887 state['current'] = [node]
888 hbisect.save_state(repo, state)
888 hbisect.save_state(repo, state)
889 status = ui.system(command, environ={'HG_NODE': hex(node)},
889 status = ui.system(command, environ={'HG_NODE': hex(node)},
890 blockedtag='bisect_check')
890 blockedtag='bisect_check')
891 if status == 125:
891 if status == 125:
892 transition = "skip"
892 transition = "skip"
893 elif status == 0:
893 elif status == 0:
894 transition = "good"
894 transition = "good"
895 # status < 0 means process was killed
895 # status < 0 means process was killed
896 elif status == 127:
896 elif status == 127:
897 raise error.Abort(_("failed to execute %s") % command)
897 raise error.Abort(_("failed to execute %s") % command)
898 elif status < 0:
898 elif status < 0:
899 raise error.Abort(_("%s killed") % command)
899 raise error.Abort(_("%s killed") % command)
900 else:
900 else:
901 transition = "bad"
901 transition = "bad"
902 state[transition].append(node)
902 state[transition].append(node)
903 ctx = repo[node]
903 ctx = repo[node]
904 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
904 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
905 hbisect.checkstate(state)
905 hbisect.checkstate(state)
906 # bisect
906 # bisect
907 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
907 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
908 # update to next check
908 # update to next check
909 node = nodes[0]
909 node = nodes[0]
910 mayupdate(repo, node, show_stats=False)
910 mayupdate(repo, node, show_stats=False)
911 finally:
911 finally:
912 state['current'] = [node]
912 state['current'] = [node]
913 hbisect.save_state(repo, state)
913 hbisect.save_state(repo, state)
914 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
914 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
915 return
915 return
916
916
917 hbisect.checkstate(state)
917 hbisect.checkstate(state)
918
918
919 # actually bisect
919 # actually bisect
920 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
920 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
921 if extend:
921 if extend:
922 if not changesets:
922 if not changesets:
923 extendnode = hbisect.extendrange(repo, state, nodes, good)
923 extendnode = hbisect.extendrange(repo, state, nodes, good)
924 if extendnode is not None:
924 if extendnode is not None:
925 ui.write(_("Extending search to changeset %d:%s\n")
925 ui.write(_("Extending search to changeset %d:%s\n")
926 % (extendnode.rev(), extendnode))
926 % (extendnode.rev(), extendnode))
927 state['current'] = [extendnode.node()]
927 state['current'] = [extendnode.node()]
928 hbisect.save_state(repo, state)
928 hbisect.save_state(repo, state)
929 return mayupdate(repo, extendnode.node())
929 return mayupdate(repo, extendnode.node())
930 raise error.Abort(_("nothing to extend"))
930 raise error.Abort(_("nothing to extend"))
931
931
932 if changesets == 0:
932 if changesets == 0:
933 hbisect.printresult(ui, repo, state, displayer, nodes, good)
933 hbisect.printresult(ui, repo, state, displayer, nodes, good)
934 else:
934 else:
935 assert len(nodes) == 1 # only a single node can be tested next
935 assert len(nodes) == 1 # only a single node can be tested next
936 node = nodes[0]
936 node = nodes[0]
937 # compute the approximate number of remaining tests
937 # compute the approximate number of remaining tests
938 tests, size = 0, 2
938 tests, size = 0, 2
939 while size <= changesets:
939 while size <= changesets:
940 tests, size = tests + 1, size * 2
940 tests, size = tests + 1, size * 2
941 rev = repo.changelog.rev(node)
941 rev = repo.changelog.rev(node)
942 ui.write(_("Testing changeset %d:%s "
942 ui.write(_("Testing changeset %d:%s "
943 "(%d changesets remaining, ~%d tests)\n")
943 "(%d changesets remaining, ~%d tests)\n")
944 % (rev, short(node), changesets, tests))
944 % (rev, short(node), changesets, tests))
945 state['current'] = [node]
945 state['current'] = [node]
946 hbisect.save_state(repo, state)
946 hbisect.save_state(repo, state)
947 return mayupdate(repo, node)
947 return mayupdate(repo, node)
948
948
949 @command('bookmarks|bookmark',
949 @command('bookmarks|bookmark',
950 [('f', 'force', False, _('force')),
950 [('f', 'force', False, _('force')),
951 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
951 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
952 ('d', 'delete', False, _('delete a given bookmark')),
952 ('d', 'delete', False, _('delete a given bookmark')),
953 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
953 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
954 ('i', 'inactive', False, _('mark a bookmark inactive')),
954 ('i', 'inactive', False, _('mark a bookmark inactive')),
955 ] + formatteropts,
955 ] + formatteropts,
956 _('hg bookmarks [OPTIONS]... [NAME]...'))
956 _('hg bookmarks [OPTIONS]... [NAME]...'))
957 def bookmark(ui, repo, *names, **opts):
957 def bookmark(ui, repo, *names, **opts):
958 '''create a new bookmark or list existing bookmarks
958 '''create a new bookmark or list existing bookmarks
959
959
960 Bookmarks are labels on changesets to help track lines of development.
960 Bookmarks are labels on changesets to help track lines of development.
961 Bookmarks are unversioned and can be moved, renamed and deleted.
961 Bookmarks are unversioned and can be moved, renamed and deleted.
962 Deleting or moving a bookmark has no effect on the associated changesets.
962 Deleting or moving a bookmark has no effect on the associated changesets.
963
963
964 Creating or updating to a bookmark causes it to be marked as 'active'.
964 Creating or updating to a bookmark causes it to be marked as 'active'.
965 The active bookmark is indicated with a '*'.
965 The active bookmark is indicated with a '*'.
966 When a commit is made, the active bookmark will advance to the new commit.
966 When a commit is made, the active bookmark will advance to the new commit.
967 A plain :hg:`update` will also advance an active bookmark, if possible.
967 A plain :hg:`update` will also advance an active bookmark, if possible.
968 Updating away from a bookmark will cause it to be deactivated.
968 Updating away from a bookmark will cause it to be deactivated.
969
969
970 Bookmarks can be pushed and pulled between repositories (see
970 Bookmarks can be pushed and pulled between repositories (see
971 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
971 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
972 diverged, a new 'divergent bookmark' of the form 'name@path' will
972 diverged, a new 'divergent bookmark' of the form 'name@path' will
973 be created. Using :hg:`merge` will resolve the divergence.
973 be created. Using :hg:`merge` will resolve the divergence.
974
974
975 A bookmark named '@' has the special property that :hg:`clone` will
975 A bookmark named '@' has the special property that :hg:`clone` will
976 check it out by default if it exists.
976 check it out by default if it exists.
977
977
978 .. container:: verbose
978 .. container:: verbose
979
979
980 Examples:
980 Examples:
981
981
982 - create an active bookmark for a new line of development::
982 - create an active bookmark for a new line of development::
983
983
984 hg book new-feature
984 hg book new-feature
985
985
986 - create an inactive bookmark as a place marker::
986 - create an inactive bookmark as a place marker::
987
987
988 hg book -i reviewed
988 hg book -i reviewed
989
989
990 - create an inactive bookmark on another changeset::
990 - create an inactive bookmark on another changeset::
991
991
992 hg book -r .^ tested
992 hg book -r .^ tested
993
993
994 - rename bookmark turkey to dinner::
994 - rename bookmark turkey to dinner::
995
995
996 hg book -m turkey dinner
996 hg book -m turkey dinner
997
997
998 - move the '@' bookmark from another branch::
998 - move the '@' bookmark from another branch::
999
999
1000 hg book -f @
1000 hg book -f @
1001 '''
1001 '''
1002 force = opts.get('force')
1002 force = opts.get('force')
1003 rev = opts.get('rev')
1003 rev = opts.get('rev')
1004 delete = opts.get('delete')
1004 delete = opts.get('delete')
1005 rename = opts.get('rename')
1005 rename = opts.get('rename')
1006 inactive = opts.get('inactive')
1006 inactive = opts.get('inactive')
1007
1007
1008 def checkformat(mark):
1008 def checkformat(mark):
1009 mark = mark.strip()
1009 mark = mark.strip()
1010 if not mark:
1010 if not mark:
1011 raise error.Abort(_("bookmark names cannot consist entirely of "
1011 raise error.Abort(_("bookmark names cannot consist entirely of "
1012 "whitespace"))
1012 "whitespace"))
1013 scmutil.checknewlabel(repo, mark, 'bookmark')
1013 scmutil.checknewlabel(repo, mark, 'bookmark')
1014 return mark
1014 return mark
1015
1015
1016 def checkconflict(repo, mark, cur, force=False, target=None):
1016 def checkconflict(repo, mark, cur, force=False, target=None):
1017 if mark in marks and not force:
1017 if mark in marks and not force:
1018 if target:
1018 if target:
1019 if marks[mark] == target and target == cur:
1019 if marks[mark] == target and target == cur:
1020 # re-activating a bookmark
1020 # re-activating a bookmark
1021 return
1021 return
1022 anc = repo.changelog.ancestors([repo[target].rev()])
1022 anc = repo.changelog.ancestors([repo[target].rev()])
1023 bmctx = repo[marks[mark]]
1023 bmctx = repo[marks[mark]]
1024 divs = [repo[b].node() for b in marks
1024 divs = [repo[b].node() for b in marks
1025 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1025 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1026
1026
1027 # allow resolving a single divergent bookmark even if moving
1027 # allow resolving a single divergent bookmark even if moving
1028 # the bookmark across branches when a revision is specified
1028 # the bookmark across branches when a revision is specified
1029 # that contains a divergent bookmark
1029 # that contains a divergent bookmark
1030 if bmctx.rev() not in anc and target in divs:
1030 if bmctx.rev() not in anc and target in divs:
1031 bookmarks.deletedivergent(repo, [target], mark)
1031 bookmarks.deletedivergent(repo, [target], mark)
1032 return
1032 return
1033
1033
1034 deletefrom = [b for b in divs
1034 deletefrom = [b for b in divs
1035 if repo[b].rev() in anc or b == target]
1035 if repo[b].rev() in anc or b == target]
1036 bookmarks.deletedivergent(repo, deletefrom, mark)
1036 bookmarks.deletedivergent(repo, deletefrom, mark)
1037 if bookmarks.validdest(repo, bmctx, repo[target]):
1037 if bookmarks.validdest(repo, bmctx, repo[target]):
1038 ui.status(_("moving bookmark '%s' forward from %s\n") %
1038 ui.status(_("moving bookmark '%s' forward from %s\n") %
1039 (mark, short(bmctx.node())))
1039 (mark, short(bmctx.node())))
1040 return
1040 return
1041 raise error.Abort(_("bookmark '%s' already exists "
1041 raise error.Abort(_("bookmark '%s' already exists "
1042 "(use -f to force)") % mark)
1042 "(use -f to force)") % mark)
1043 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1043 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1044 and not force):
1044 and not force):
1045 raise error.Abort(
1045 raise error.Abort(
1046 _("a bookmark cannot have the name of an existing branch"))
1046 _("a bookmark cannot have the name of an existing branch"))
1047
1047
1048 if delete and rename:
1048 if delete and rename:
1049 raise error.Abort(_("--delete and --rename are incompatible"))
1049 raise error.Abort(_("--delete and --rename are incompatible"))
1050 if delete and rev:
1050 if delete and rev:
1051 raise error.Abort(_("--rev is incompatible with --delete"))
1051 raise error.Abort(_("--rev is incompatible with --delete"))
1052 if rename and rev:
1052 if rename and rev:
1053 raise error.Abort(_("--rev is incompatible with --rename"))
1053 raise error.Abort(_("--rev is incompatible with --rename"))
1054 if not names and (delete or rev):
1054 if not names and (delete or rev):
1055 raise error.Abort(_("bookmark name required"))
1055 raise error.Abort(_("bookmark name required"))
1056
1056
1057 if delete or rename or names or inactive:
1057 if delete or rename or names or inactive:
1058 wlock = lock = tr = None
1058 wlock = lock = tr = None
1059 try:
1059 try:
1060 wlock = repo.wlock()
1060 wlock = repo.wlock()
1061 lock = repo.lock()
1061 lock = repo.lock()
1062 cur = repo.changectx('.').node()
1062 cur = repo.changectx('.').node()
1063 marks = repo._bookmarks
1063 marks = repo._bookmarks
1064 if delete:
1064 if delete:
1065 tr = repo.transaction('bookmark')
1065 tr = repo.transaction('bookmark')
1066 for mark in names:
1066 for mark in names:
1067 if mark not in marks:
1067 if mark not in marks:
1068 raise error.Abort(_("bookmark '%s' does not exist") %
1068 raise error.Abort(_("bookmark '%s' does not exist") %
1069 mark)
1069 mark)
1070 if mark == repo._activebookmark:
1070 if mark == repo._activebookmark:
1071 bookmarks.deactivate(repo)
1071 bookmarks.deactivate(repo)
1072 del marks[mark]
1072 del marks[mark]
1073
1073
1074 elif rename:
1074 elif rename:
1075 tr = repo.transaction('bookmark')
1075 tr = repo.transaction('bookmark')
1076 if not names:
1076 if not names:
1077 raise error.Abort(_("new bookmark name required"))
1077 raise error.Abort(_("new bookmark name required"))
1078 elif len(names) > 1:
1078 elif len(names) > 1:
1079 raise error.Abort(_("only one new bookmark name allowed"))
1079 raise error.Abort(_("only one new bookmark name allowed"))
1080 mark = checkformat(names[0])
1080 mark = checkformat(names[0])
1081 if rename not in marks:
1081 if rename not in marks:
1082 raise error.Abort(_("bookmark '%s' does not exist")
1082 raise error.Abort(_("bookmark '%s' does not exist")
1083 % rename)
1083 % rename)
1084 checkconflict(repo, mark, cur, force)
1084 checkconflict(repo, mark, cur, force)
1085 marks[mark] = marks[rename]
1085 marks[mark] = marks[rename]
1086 if repo._activebookmark == rename and not inactive:
1086 if repo._activebookmark == rename and not inactive:
1087 bookmarks.activate(repo, mark)
1087 bookmarks.activate(repo, mark)
1088 del marks[rename]
1088 del marks[rename]
1089 elif names:
1089 elif names:
1090 tr = repo.transaction('bookmark')
1090 tr = repo.transaction('bookmark')
1091 newact = None
1091 newact = None
1092 for mark in names:
1092 for mark in names:
1093 mark = checkformat(mark)
1093 mark = checkformat(mark)
1094 if newact is None:
1094 if newact is None:
1095 newact = mark
1095 newact = mark
1096 if inactive and mark == repo._activebookmark:
1096 if inactive and mark == repo._activebookmark:
1097 bookmarks.deactivate(repo)
1097 bookmarks.deactivate(repo)
1098 return
1098 return
1099 tgt = cur
1099 tgt = cur
1100 if rev:
1100 if rev:
1101 tgt = scmutil.revsingle(repo, rev).node()
1101 tgt = scmutil.revsingle(repo, rev).node()
1102 checkconflict(repo, mark, cur, force, tgt)
1102 checkconflict(repo, mark, cur, force, tgt)
1103 marks[mark] = tgt
1103 marks[mark] = tgt
1104 if not inactive and cur == marks[newact] and not rev:
1104 if not inactive and cur == marks[newact] and not rev:
1105 bookmarks.activate(repo, newact)
1105 bookmarks.activate(repo, newact)
1106 elif cur != tgt and newact == repo._activebookmark:
1106 elif cur != tgt and newact == repo._activebookmark:
1107 bookmarks.deactivate(repo)
1107 bookmarks.deactivate(repo)
1108 elif inactive:
1108 elif inactive:
1109 if len(marks) == 0:
1109 if len(marks) == 0:
1110 ui.status(_("no bookmarks set\n"))
1110 ui.status(_("no bookmarks set\n"))
1111 elif not repo._activebookmark:
1111 elif not repo._activebookmark:
1112 ui.status(_("no active bookmark\n"))
1112 ui.status(_("no active bookmark\n"))
1113 else:
1113 else:
1114 bookmarks.deactivate(repo)
1114 bookmarks.deactivate(repo)
1115 if tr is not None:
1115 if tr is not None:
1116 marks.recordchange(tr)
1116 marks.recordchange(tr)
1117 tr.close()
1117 tr.close()
1118 finally:
1118 finally:
1119 lockmod.release(tr, lock, wlock)
1119 lockmod.release(tr, lock, wlock)
1120 else: # show bookmarks
1120 else: # show bookmarks
1121 fm = ui.formatter('bookmarks', opts)
1121 fm = ui.formatter('bookmarks', opts)
1122 hexfn = fm.hexfunc
1122 hexfn = fm.hexfunc
1123 marks = repo._bookmarks
1123 marks = repo._bookmarks
1124 if len(marks) == 0 and fm.isplain():
1124 if len(marks) == 0 and fm.isplain():
1125 ui.status(_("no bookmarks set\n"))
1125 ui.status(_("no bookmarks set\n"))
1126 for bmark, n in sorted(marks.iteritems()):
1126 for bmark, n in sorted(marks.iteritems()):
1127 active = repo._activebookmark
1127 active = repo._activebookmark
1128 if bmark == active:
1128 if bmark == active:
1129 prefix, label = '*', activebookmarklabel
1129 prefix, label = '*', activebookmarklabel
1130 else:
1130 else:
1131 prefix, label = ' ', ''
1131 prefix, label = ' ', ''
1132
1132
1133 fm.startitem()
1133 fm.startitem()
1134 if not ui.quiet:
1134 if not ui.quiet:
1135 fm.plain(' %s ' % prefix, label=label)
1135 fm.plain(' %s ' % prefix, label=label)
1136 fm.write('bookmark', '%s', bmark, label=label)
1136 fm.write('bookmark', '%s', bmark, label=label)
1137 pad = " " * (25 - encoding.colwidth(bmark))
1137 pad = " " * (25 - encoding.colwidth(bmark))
1138 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1138 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1139 repo.changelog.rev(n), hexfn(n), label=label)
1139 repo.changelog.rev(n), hexfn(n), label=label)
1140 fm.data(active=(bmark == active))
1140 fm.data(active=(bmark == active))
1141 fm.plain('\n')
1141 fm.plain('\n')
1142 fm.end()
1142 fm.end()
1143
1143
1144 @command('branch',
1144 @command('branch',
1145 [('f', 'force', None,
1145 [('f', 'force', None,
1146 _('set branch name even if it shadows an existing branch')),
1146 _('set branch name even if it shadows an existing branch')),
1147 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1147 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1148 _('[-fC] [NAME]'))
1148 _('[-fC] [NAME]'))
1149 def branch(ui, repo, label=None, **opts):
1149 def branch(ui, repo, label=None, **opts):
1150 """set or show the current branch name
1150 """set or show the current branch name
1151
1151
1152 .. note::
1152 .. note::
1153
1153
1154 Branch names are permanent and global. Use :hg:`bookmark` to create a
1154 Branch names are permanent and global. Use :hg:`bookmark` to create a
1155 light-weight bookmark instead. See :hg:`help glossary` for more
1155 light-weight bookmark instead. See :hg:`help glossary` for more
1156 information about named branches and bookmarks.
1156 information about named branches and bookmarks.
1157
1157
1158 With no argument, show the current branch name. With one argument,
1158 With no argument, show the current branch name. With one argument,
1159 set the working directory branch name (the branch will not exist
1159 set the working directory branch name (the branch will not exist
1160 in the repository until the next commit). Standard practice
1160 in the repository until the next commit). Standard practice
1161 recommends that primary development take place on the 'default'
1161 recommends that primary development take place on the 'default'
1162 branch.
1162 branch.
1163
1163
1164 Unless -f/--force is specified, branch will not let you set a
1164 Unless -f/--force is specified, branch will not let you set a
1165 branch name that already exists.
1165 branch name that already exists.
1166
1166
1167 Use -C/--clean to reset the working directory branch to that of
1167 Use -C/--clean to reset the working directory branch to that of
1168 the parent of the working directory, negating a previous branch
1168 the parent of the working directory, negating a previous branch
1169 change.
1169 change.
1170
1170
1171 Use the command :hg:`update` to switch to an existing branch. Use
1171 Use the command :hg:`update` to switch to an existing branch. Use
1172 :hg:`commit --close-branch` to mark this branch head as closed.
1172 :hg:`commit --close-branch` to mark this branch head as closed.
1173 When all heads of a branch are closed, the branch will be
1173 When all heads of a branch are closed, the branch will be
1174 considered closed.
1174 considered closed.
1175
1175
1176 Returns 0 on success.
1176 Returns 0 on success.
1177 """
1177 """
1178 if label:
1178 if label:
1179 label = label.strip()
1179 label = label.strip()
1180
1180
1181 if not opts.get('clean') and not label:
1181 if not opts.get('clean') and not label:
1182 ui.write("%s\n" % repo.dirstate.branch())
1182 ui.write("%s\n" % repo.dirstate.branch())
1183 return
1183 return
1184
1184
1185 with repo.wlock():
1185 with repo.wlock():
1186 if opts.get('clean'):
1186 if opts.get('clean'):
1187 label = repo[None].p1().branch()
1187 label = repo[None].p1().branch()
1188 repo.dirstate.setbranch(label)
1188 repo.dirstate.setbranch(label)
1189 ui.status(_('reset working directory to branch %s\n') % label)
1189 ui.status(_('reset working directory to branch %s\n') % label)
1190 elif label:
1190 elif label:
1191 if not opts.get('force') and label in repo.branchmap():
1191 if not opts.get('force') and label in repo.branchmap():
1192 if label not in [p.branch() for p in repo[None].parents()]:
1192 if label not in [p.branch() for p in repo[None].parents()]:
1193 raise error.Abort(_('a branch of the same name already'
1193 raise error.Abort(_('a branch of the same name already'
1194 ' exists'),
1194 ' exists'),
1195 # i18n: "it" refers to an existing branch
1195 # i18n: "it" refers to an existing branch
1196 hint=_("use 'hg update' to switch to it"))
1196 hint=_("use 'hg update' to switch to it"))
1197 scmutil.checknewlabel(repo, label, 'branch')
1197 scmutil.checknewlabel(repo, label, 'branch')
1198 repo.dirstate.setbranch(label)
1198 repo.dirstate.setbranch(label)
1199 ui.status(_('marked working directory as branch %s\n') % label)
1199 ui.status(_('marked working directory as branch %s\n') % label)
1200
1200
1201 # find any open named branches aside from default
1201 # find any open named branches aside from default
1202 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1202 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1203 if n != "default" and not c]
1203 if n != "default" and not c]
1204 if not others:
1204 if not others:
1205 ui.status(_('(branches are permanent and global, '
1205 ui.status(_('(branches are permanent and global, '
1206 'did you want a bookmark?)\n'))
1206 'did you want a bookmark?)\n'))
1207
1207
1208 @command('branches',
1208 @command('branches',
1209 [('a', 'active', False,
1209 [('a', 'active', False,
1210 _('show only branches that have unmerged heads (DEPRECATED)')),
1210 _('show only branches that have unmerged heads (DEPRECATED)')),
1211 ('c', 'closed', False, _('show normal and closed branches')),
1211 ('c', 'closed', False, _('show normal and closed branches')),
1212 ] + formatteropts,
1212 ] + formatteropts,
1213 _('[-c]'))
1213 _('[-c]'))
1214 def branches(ui, repo, active=False, closed=False, **opts):
1214 def branches(ui, repo, active=False, closed=False, **opts):
1215 """list repository named branches
1215 """list repository named branches
1216
1216
1217 List the repository's named branches, indicating which ones are
1217 List the repository's named branches, indicating which ones are
1218 inactive. If -c/--closed is specified, also list branches which have
1218 inactive. If -c/--closed is specified, also list branches which have
1219 been marked closed (see :hg:`commit --close-branch`).
1219 been marked closed (see :hg:`commit --close-branch`).
1220
1220
1221 Use the command :hg:`update` to switch to an existing branch.
1221 Use the command :hg:`update` to switch to an existing branch.
1222
1222
1223 Returns 0.
1223 Returns 0.
1224 """
1224 """
1225
1225
1226 fm = ui.formatter('branches', opts)
1226 fm = ui.formatter('branches', opts)
1227 hexfunc = fm.hexfunc
1227 hexfunc = fm.hexfunc
1228
1228
1229 allheads = set(repo.heads())
1229 allheads = set(repo.heads())
1230 branches = []
1230 branches = []
1231 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1231 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1232 isactive = not isclosed and bool(set(heads) & allheads)
1232 isactive = not isclosed and bool(set(heads) & allheads)
1233 branches.append((tag, repo[tip], isactive, not isclosed))
1233 branches.append((tag, repo[tip], isactive, not isclosed))
1234 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1234 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1235 reverse=True)
1235 reverse=True)
1236
1236
1237 for tag, ctx, isactive, isopen in branches:
1237 for tag, ctx, isactive, isopen in branches:
1238 if active and not isactive:
1238 if active and not isactive:
1239 continue
1239 continue
1240 if isactive:
1240 if isactive:
1241 label = 'branches.active'
1241 label = 'branches.active'
1242 notice = ''
1242 notice = ''
1243 elif not isopen:
1243 elif not isopen:
1244 if not closed:
1244 if not closed:
1245 continue
1245 continue
1246 label = 'branches.closed'
1246 label = 'branches.closed'
1247 notice = _(' (closed)')
1247 notice = _(' (closed)')
1248 else:
1248 else:
1249 label = 'branches.inactive'
1249 label = 'branches.inactive'
1250 notice = _(' (inactive)')
1250 notice = _(' (inactive)')
1251 current = (tag == repo.dirstate.branch())
1251 current = (tag == repo.dirstate.branch())
1252 if current:
1252 if current:
1253 label = 'branches.current'
1253 label = 'branches.current'
1254
1254
1255 fm.startitem()
1255 fm.startitem()
1256 fm.write('branch', '%s', tag, label=label)
1256 fm.write('branch', '%s', tag, label=label)
1257 rev = ctx.rev()
1257 rev = ctx.rev()
1258 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1258 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1259 fmt = ' ' * padsize + ' %d:%s'
1259 fmt = ' ' * padsize + ' %d:%s'
1260 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1260 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1261 label='log.changeset changeset.%s' % ctx.phasestr())
1261 label='log.changeset changeset.%s' % ctx.phasestr())
1262 fm.context(ctx=ctx)
1262 fm.context(ctx=ctx)
1263 fm.data(active=isactive, closed=not isopen, current=current)
1263 fm.data(active=isactive, closed=not isopen, current=current)
1264 if not ui.quiet:
1264 if not ui.quiet:
1265 fm.plain(notice)
1265 fm.plain(notice)
1266 fm.plain('\n')
1266 fm.plain('\n')
1267 fm.end()
1267 fm.end()
1268
1268
1269 @command('bundle',
1269 @command('bundle',
1270 [('f', 'force', None, _('run even when the destination is unrelated')),
1270 [('f', 'force', None, _('run even when the destination is unrelated')),
1271 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1271 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1272 _('REV')),
1272 _('REV')),
1273 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1273 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1274 _('BRANCH')),
1274 _('BRANCH')),
1275 ('', 'base', [],
1275 ('', 'base', [],
1276 _('a base changeset assumed to be available at the destination'),
1276 _('a base changeset assumed to be available at the destination'),
1277 _('REV')),
1277 _('REV')),
1278 ('a', 'all', None, _('bundle all changesets in the repository')),
1278 ('a', 'all', None, _('bundle all changesets in the repository')),
1279 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1279 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1280 ] + remoteopts,
1280 ] + remoteopts,
1281 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1281 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1282 def bundle(ui, repo, fname, dest=None, **opts):
1282 def bundle(ui, repo, fname, dest=None, **opts):
1283 """create a changegroup file
1283 """create a changegroup file
1284
1284
1285 Generate a changegroup file collecting changesets to be added
1285 Generate a changegroup file collecting changesets to be added
1286 to a repository.
1286 to a repository.
1287
1287
1288 To create a bundle containing all changesets, use -a/--all
1288 To create a bundle containing all changesets, use -a/--all
1289 (or --base null). Otherwise, hg assumes the destination will have
1289 (or --base null). Otherwise, hg assumes the destination will have
1290 all the nodes you specify with --base parameters. Otherwise, hg
1290 all the nodes you specify with --base parameters. Otherwise, hg
1291 will assume the repository has all the nodes in destination, or
1291 will assume the repository has all the nodes in destination, or
1292 default-push/default if no destination is specified.
1292 default-push/default if no destination is specified.
1293
1293
1294 You can change bundle format with the -t/--type option. You can
1294 You can change bundle format with the -t/--type option. You can
1295 specify a compression, a bundle version or both using a dash
1295 specify a compression, a bundle version or both using a dash
1296 (comp-version). The available compression methods are: none, bzip2,
1296 (comp-version). The available compression methods are: none, bzip2,
1297 and gzip (by default, bundles are compressed using bzip2). The
1297 and gzip (by default, bundles are compressed using bzip2). The
1298 available formats are: v1, v2 (default to most suitable).
1298 available formats are: v1, v2 (default to most suitable).
1299
1299
1300 The bundle file can then be transferred using conventional means
1300 The bundle file can then be transferred using conventional means
1301 and applied to another repository with the unbundle or pull
1301 and applied to another repository with the unbundle or pull
1302 command. This is useful when direct push and pull are not
1302 command. This is useful when direct push and pull are not
1303 available or when exporting an entire repository is undesirable.
1303 available or when exporting an entire repository is undesirable.
1304
1304
1305 Applying bundles preserves all changeset contents including
1305 Applying bundles preserves all changeset contents including
1306 permissions, copy/rename information, and revision history.
1306 permissions, copy/rename information, and revision history.
1307
1307
1308 Returns 0 on success, 1 if no changes found.
1308 Returns 0 on success, 1 if no changes found.
1309 """
1309 """
1310 revs = None
1310 revs = None
1311 if 'rev' in opts:
1311 if 'rev' in opts:
1312 revstrings = opts['rev']
1312 revstrings = opts['rev']
1313 revs = scmutil.revrange(repo, revstrings)
1313 revs = scmutil.revrange(repo, revstrings)
1314 if revstrings and not revs:
1314 if revstrings and not revs:
1315 raise error.Abort(_('no commits to bundle'))
1315 raise error.Abort(_('no commits to bundle'))
1316
1316
1317 bundletype = opts.get('type', 'bzip2').lower()
1317 bundletype = opts.get('type', 'bzip2').lower()
1318 try:
1318 try:
1319 bcompression, cgversion, params = exchange.parsebundlespec(
1319 bcompression, cgversion, params = exchange.parsebundlespec(
1320 repo, bundletype, strict=False)
1320 repo, bundletype, strict=False)
1321 except error.UnsupportedBundleSpecification as e:
1321 except error.UnsupportedBundleSpecification as e:
1322 raise error.Abort(str(e),
1322 raise error.Abort(str(e),
1323 hint=_("see 'hg help bundle' for supported "
1323 hint=_("see 'hg help bundle' for supported "
1324 "values for --type"))
1324 "values for --type"))
1325
1325
1326 # Packed bundles are a pseudo bundle format for now.
1326 # Packed bundles are a pseudo bundle format for now.
1327 if cgversion == 's1':
1327 if cgversion == 's1':
1328 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1328 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1329 hint=_("use 'hg debugcreatestreamclonebundle'"))
1329 hint=_("use 'hg debugcreatestreamclonebundle'"))
1330
1330
1331 if opts.get('all'):
1331 if opts.get('all'):
1332 if dest:
1332 if dest:
1333 raise error.Abort(_("--all is incompatible with specifying "
1333 raise error.Abort(_("--all is incompatible with specifying "
1334 "a destination"))
1334 "a destination"))
1335 if opts.get('base'):
1335 if opts.get('base'):
1336 ui.warn(_("ignoring --base because --all was specified\n"))
1336 ui.warn(_("ignoring --base because --all was specified\n"))
1337 base = ['null']
1337 base = ['null']
1338 else:
1338 else:
1339 base = scmutil.revrange(repo, opts.get('base'))
1339 base = scmutil.revrange(repo, opts.get('base'))
1340 # TODO: get desired bundlecaps from command line.
1340 # TODO: get desired bundlecaps from command line.
1341 bundlecaps = None
1341 bundlecaps = None
1342 if cgversion not in changegroup.supportedoutgoingversions(repo):
1342 if cgversion not in changegroup.supportedoutgoingversions(repo):
1343 raise error.Abort(_("repository does not support bundle version %s") %
1343 raise error.Abort(_("repository does not support bundle version %s") %
1344 cgversion)
1344 cgversion)
1345
1345
1346 if base:
1346 if base:
1347 if dest:
1347 if dest:
1348 raise error.Abort(_("--base is incompatible with specifying "
1348 raise error.Abort(_("--base is incompatible with specifying "
1349 "a destination"))
1349 "a destination"))
1350 common = [repo.lookup(rev) for rev in base]
1350 common = [repo.lookup(rev) for rev in base]
1351 heads = revs and map(repo.lookup, revs) or None
1351 heads = revs and map(repo.lookup, revs) or None
1352 outgoing = discovery.outgoing(repo, common, heads)
1352 outgoing = discovery.outgoing(repo, common, heads)
1353 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1353 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1354 bundlecaps=bundlecaps,
1354 bundlecaps=bundlecaps,
1355 version=cgversion)
1355 version=cgversion)
1356 outgoing = None
1356 outgoing = None
1357 else:
1357 else:
1358 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1358 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1359 dest, branches = hg.parseurl(dest, opts.get('branch'))
1359 dest, branches = hg.parseurl(dest, opts.get('branch'))
1360 other = hg.peer(repo, opts, dest)
1360 other = hg.peer(repo, opts, dest)
1361 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1361 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1362 heads = revs and map(repo.lookup, revs) or revs
1362 heads = revs and map(repo.lookup, revs) or revs
1363 outgoing = discovery.findcommonoutgoing(repo, other,
1363 outgoing = discovery.findcommonoutgoing(repo, other,
1364 onlyheads=heads,
1364 onlyheads=heads,
1365 force=opts.get('force'),
1365 force=opts.get('force'),
1366 portable=True)
1366 portable=True)
1367 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1367 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1368 bundlecaps, version=cgversion)
1368 bundlecaps, version=cgversion)
1369 if not cg:
1369 if not cg:
1370 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1370 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1371 return 1
1371 return 1
1372
1372
1373 if cgversion == '01': #bundle1
1373 if cgversion == '01': #bundle1
1374 if bcompression is None:
1374 if bcompression is None:
1375 bcompression = 'UN'
1375 bcompression = 'UN'
1376 bversion = 'HG10' + bcompression
1376 bversion = 'HG10' + bcompression
1377 bcompression = None
1377 bcompression = None
1378 else:
1378 else:
1379 assert cgversion == '02'
1379 assert cgversion == '02'
1380 bversion = 'HG20'
1380 bversion = 'HG20'
1381
1381
1382 # TODO compression options should be derived from bundlespec parsing.
1382 # TODO compression options should be derived from bundlespec parsing.
1383 # This is a temporary hack to allow adjusting bundle compression
1383 # This is a temporary hack to allow adjusting bundle compression
1384 # level without a) formalizing the bundlespec changes to declare it
1384 # level without a) formalizing the bundlespec changes to declare it
1385 # b) introducing a command flag.
1385 # b) introducing a command flag.
1386 compopts = {}
1386 compopts = {}
1387 complevel = ui.configint('experimental', 'bundlecomplevel')
1387 complevel = ui.configint('experimental', 'bundlecomplevel')
1388 if complevel is not None:
1388 if complevel is not None:
1389 compopts['level'] = complevel
1389 compopts['level'] = complevel
1390
1390
1391 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1391 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1392 compopts=compopts)
1392 compopts=compopts)
1393
1393
1394 @command('cat',
1394 @command('cat',
1395 [('o', 'output', '',
1395 [('o', 'output', '',
1396 _('print output to file with formatted name'), _('FORMAT')),
1396 _('print output to file with formatted name'), _('FORMAT')),
1397 ('r', 'rev', '', _('print the given revision'), _('REV')),
1397 ('r', 'rev', '', _('print the given revision'), _('REV')),
1398 ('', 'decode', None, _('apply any matching decode filter')),
1398 ('', 'decode', None, _('apply any matching decode filter')),
1399 ] + walkopts,
1399 ] + walkopts,
1400 _('[OPTION]... FILE...'),
1400 _('[OPTION]... FILE...'),
1401 inferrepo=True)
1401 inferrepo=True)
1402 def cat(ui, repo, file1, *pats, **opts):
1402 def cat(ui, repo, file1, *pats, **opts):
1403 """output the current or given revision of files
1403 """output the current or given revision of files
1404
1404
1405 Print the specified files as they were at the given revision. If
1405 Print the specified files as they were at the given revision. If
1406 no revision is given, the parent of the working directory is used.
1406 no revision is given, the parent of the working directory is used.
1407
1407
1408 Output may be to a file, in which case the name of the file is
1408 Output may be to a file, in which case the name of the file is
1409 given using a format string. The formatting rules as follows:
1409 given using a format string. The formatting rules as follows:
1410
1410
1411 :``%%``: literal "%" character
1411 :``%%``: literal "%" character
1412 :``%s``: basename of file being printed
1412 :``%s``: basename of file being printed
1413 :``%d``: dirname of file being printed, or '.' if in repository root
1413 :``%d``: dirname of file being printed, or '.' if in repository root
1414 :``%p``: root-relative path name of file being printed
1414 :``%p``: root-relative path name of file being printed
1415 :``%H``: changeset hash (40 hexadecimal digits)
1415 :``%H``: changeset hash (40 hexadecimal digits)
1416 :``%R``: changeset revision number
1416 :``%R``: changeset revision number
1417 :``%h``: short-form changeset hash (12 hexadecimal digits)
1417 :``%h``: short-form changeset hash (12 hexadecimal digits)
1418 :``%r``: zero-padded changeset revision number
1418 :``%r``: zero-padded changeset revision number
1419 :``%b``: basename of the exporting repository
1419 :``%b``: basename of the exporting repository
1420
1420
1421 Returns 0 on success.
1421 Returns 0 on success.
1422 """
1422 """
1423 ctx = scmutil.revsingle(repo, opts.get('rev'))
1423 ctx = scmutil.revsingle(repo, opts.get('rev'))
1424 m = scmutil.match(ctx, (file1,) + pats, opts)
1424 m = scmutil.match(ctx, (file1,) + pats, opts)
1425
1425
1426 ui.pager('cat')
1426 ui.pager('cat')
1427 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1427 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1428
1428
1429 @command('^clone',
1429 @command('^clone',
1430 [('U', 'noupdate', None, _('the clone will include an empty working '
1430 [('U', 'noupdate', None, _('the clone will include an empty working '
1431 'directory (only a repository)')),
1431 'directory (only a repository)')),
1432 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1432 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1433 _('REV')),
1433 _('REV')),
1434 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1434 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1435 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1435 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1436 ('', 'pull', None, _('use pull protocol to copy metadata')),
1436 ('', 'pull', None, _('use pull protocol to copy metadata')),
1437 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1437 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1438 ] + remoteopts,
1438 ] + remoteopts,
1439 _('[OPTION]... SOURCE [DEST]'),
1439 _('[OPTION]... SOURCE [DEST]'),
1440 norepo=True)
1440 norepo=True)
1441 def clone(ui, source, dest=None, **opts):
1441 def clone(ui, source, dest=None, **opts):
1442 """make a copy of an existing repository
1442 """make a copy of an existing repository
1443
1443
1444 Create a copy of an existing repository in a new directory.
1444 Create a copy of an existing repository in a new directory.
1445
1445
1446 If no destination directory name is specified, it defaults to the
1446 If no destination directory name is specified, it defaults to the
1447 basename of the source.
1447 basename of the source.
1448
1448
1449 The location of the source is added to the new repository's
1449 The location of the source is added to the new repository's
1450 ``.hg/hgrc`` file, as the default to be used for future pulls.
1450 ``.hg/hgrc`` file, as the default to be used for future pulls.
1451
1451
1452 Only local paths and ``ssh://`` URLs are supported as
1452 Only local paths and ``ssh://`` URLs are supported as
1453 destinations. For ``ssh://`` destinations, no working directory or
1453 destinations. For ``ssh://`` destinations, no working directory or
1454 ``.hg/hgrc`` will be created on the remote side.
1454 ``.hg/hgrc`` will be created on the remote side.
1455
1455
1456 If the source repository has a bookmark called '@' set, that
1456 If the source repository has a bookmark called '@' set, that
1457 revision will be checked out in the new repository by default.
1457 revision will be checked out in the new repository by default.
1458
1458
1459 To check out a particular version, use -u/--update, or
1459 To check out a particular version, use -u/--update, or
1460 -U/--noupdate to create a clone with no working directory.
1460 -U/--noupdate to create a clone with no working directory.
1461
1461
1462 To pull only a subset of changesets, specify one or more revisions
1462 To pull only a subset of changesets, specify one or more revisions
1463 identifiers with -r/--rev or branches with -b/--branch. The
1463 identifiers with -r/--rev or branches with -b/--branch. The
1464 resulting clone will contain only the specified changesets and
1464 resulting clone will contain only the specified changesets and
1465 their ancestors. These options (or 'clone src#rev dest') imply
1465 their ancestors. These options (or 'clone src#rev dest') imply
1466 --pull, even for local source repositories.
1466 --pull, even for local source repositories.
1467
1467
1468 .. note::
1468 .. note::
1469
1469
1470 Specifying a tag will include the tagged changeset but not the
1470 Specifying a tag will include the tagged changeset but not the
1471 changeset containing the tag.
1471 changeset containing the tag.
1472
1472
1473 .. container:: verbose
1473 .. container:: verbose
1474
1474
1475 For efficiency, hardlinks are used for cloning whenever the
1475 For efficiency, hardlinks are used for cloning whenever the
1476 source and destination are on the same filesystem (note this
1476 source and destination are on the same filesystem (note this
1477 applies only to the repository data, not to the working
1477 applies only to the repository data, not to the working
1478 directory). Some filesystems, such as AFS, implement hardlinking
1478 directory). Some filesystems, such as AFS, implement hardlinking
1479 incorrectly, but do not report errors. In these cases, use the
1479 incorrectly, but do not report errors. In these cases, use the
1480 --pull option to avoid hardlinking.
1480 --pull option to avoid hardlinking.
1481
1481
1482 In some cases, you can clone repositories and the working
1482 In some cases, you can clone repositories and the working
1483 directory using full hardlinks with ::
1483 directory using full hardlinks with ::
1484
1484
1485 $ cp -al REPO REPOCLONE
1485 $ cp -al REPO REPOCLONE
1486
1486
1487 This is the fastest way to clone, but it is not always safe. The
1487 This is the fastest way to clone, but it is not always safe. The
1488 operation is not atomic (making sure REPO is not modified during
1488 operation is not atomic (making sure REPO is not modified during
1489 the operation is up to you) and you have to make sure your
1489 the operation is up to you) and you have to make sure your
1490 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1490 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1491 so). Also, this is not compatible with certain extensions that
1491 so). Also, this is not compatible with certain extensions that
1492 place their metadata under the .hg directory, such as mq.
1492 place their metadata under the .hg directory, such as mq.
1493
1493
1494 Mercurial will update the working directory to the first applicable
1494 Mercurial will update the working directory to the first applicable
1495 revision from this list:
1495 revision from this list:
1496
1496
1497 a) null if -U or the source repository has no changesets
1497 a) null if -U or the source repository has no changesets
1498 b) if -u . and the source repository is local, the first parent of
1498 b) if -u . and the source repository is local, the first parent of
1499 the source repository's working directory
1499 the source repository's working directory
1500 c) the changeset specified with -u (if a branch name, this means the
1500 c) the changeset specified with -u (if a branch name, this means the
1501 latest head of that branch)
1501 latest head of that branch)
1502 d) the changeset specified with -r
1502 d) the changeset specified with -r
1503 e) the tipmost head specified with -b
1503 e) the tipmost head specified with -b
1504 f) the tipmost head specified with the url#branch source syntax
1504 f) the tipmost head specified with the url#branch source syntax
1505 g) the revision marked with the '@' bookmark, if present
1505 g) the revision marked with the '@' bookmark, if present
1506 h) the tipmost head of the default branch
1506 h) the tipmost head of the default branch
1507 i) tip
1507 i) tip
1508
1508
1509 When cloning from servers that support it, Mercurial may fetch
1509 When cloning from servers that support it, Mercurial may fetch
1510 pre-generated data from a server-advertised URL. When this is done,
1510 pre-generated data from a server-advertised URL. When this is done,
1511 hooks operating on incoming changesets and changegroups may fire twice,
1511 hooks operating on incoming changesets and changegroups may fire twice,
1512 once for the bundle fetched from the URL and another for any additional
1512 once for the bundle fetched from the URL and another for any additional
1513 data not fetched from this URL. In addition, if an error occurs, the
1513 data not fetched from this URL. In addition, if an error occurs, the
1514 repository may be rolled back to a partial clone. This behavior may
1514 repository may be rolled back to a partial clone. This behavior may
1515 change in future releases. See :hg:`help -e clonebundles` for more.
1515 change in future releases. See :hg:`help -e clonebundles` for more.
1516
1516
1517 Examples:
1517 Examples:
1518
1518
1519 - clone a remote repository to a new directory named hg/::
1519 - clone a remote repository to a new directory named hg/::
1520
1520
1521 hg clone https://www.mercurial-scm.org/repo/hg/
1521 hg clone https://www.mercurial-scm.org/repo/hg/
1522
1522
1523 - create a lightweight local clone::
1523 - create a lightweight local clone::
1524
1524
1525 hg clone project/ project-feature/
1525 hg clone project/ project-feature/
1526
1526
1527 - clone from an absolute path on an ssh server (note double-slash)::
1527 - clone from an absolute path on an ssh server (note double-slash)::
1528
1528
1529 hg clone ssh://user@server//home/projects/alpha/
1529 hg clone ssh://user@server//home/projects/alpha/
1530
1530
1531 - do a high-speed clone over a LAN while checking out a
1531 - do a high-speed clone over a LAN while checking out a
1532 specified version::
1532 specified version::
1533
1533
1534 hg clone --uncompressed http://server/repo -u 1.5
1534 hg clone --uncompressed http://server/repo -u 1.5
1535
1535
1536 - create a repository without changesets after a particular revision::
1536 - create a repository without changesets after a particular revision::
1537
1537
1538 hg clone -r 04e544 experimental/ good/
1538 hg clone -r 04e544 experimental/ good/
1539
1539
1540 - clone (and track) a particular named branch::
1540 - clone (and track) a particular named branch::
1541
1541
1542 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1542 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1543
1543
1544 See :hg:`help urls` for details on specifying URLs.
1544 See :hg:`help urls` for details on specifying URLs.
1545
1545
1546 Returns 0 on success.
1546 Returns 0 on success.
1547 """
1547 """
1548 if opts.get('noupdate') and opts.get('updaterev'):
1548 if opts.get('noupdate') and opts.get('updaterev'):
1549 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1549 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1550
1550
1551 r = hg.clone(ui, opts, source, dest,
1551 r = hg.clone(ui, opts, source, dest,
1552 pull=opts.get('pull'),
1552 pull=opts.get('pull'),
1553 stream=opts.get('uncompressed'),
1553 stream=opts.get('uncompressed'),
1554 rev=opts.get('rev'),
1554 rev=opts.get('rev'),
1555 update=opts.get('updaterev') or not opts.get('noupdate'),
1555 update=opts.get('updaterev') or not opts.get('noupdate'),
1556 branch=opts.get('branch'),
1556 branch=opts.get('branch'),
1557 shareopts=opts.get('shareopts'))
1557 shareopts=opts.get('shareopts'))
1558
1558
1559 return r is None
1559 return r is None
1560
1560
1561 @command('^commit|ci',
1561 @command('^commit|ci',
1562 [('A', 'addremove', None,
1562 [('A', 'addremove', None,
1563 _('mark new/missing files as added/removed before committing')),
1563 _('mark new/missing files as added/removed before committing')),
1564 ('', 'close-branch', None,
1564 ('', 'close-branch', None,
1565 _('mark a branch head as closed')),
1565 _('mark a branch head as closed')),
1566 ('', 'amend', None, _('amend the parent of the working directory')),
1566 ('', 'amend', None, _('amend the parent of the working directory')),
1567 ('s', 'secret', None, _('use the secret phase for committing')),
1567 ('s', 'secret', None, _('use the secret phase for committing')),
1568 ('e', 'edit', None, _('invoke editor on commit messages')),
1568 ('e', 'edit', None, _('invoke editor on commit messages')),
1569 ('i', 'interactive', None, _('use interactive mode')),
1569 ('i', 'interactive', None, _('use interactive mode')),
1570 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1570 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1571 _('[OPTION]... [FILE]...'),
1571 _('[OPTION]... [FILE]...'),
1572 inferrepo=True)
1572 inferrepo=True)
1573 def commit(ui, repo, *pats, **opts):
1573 def commit(ui, repo, *pats, **opts):
1574 """commit the specified files or all outstanding changes
1574 """commit the specified files or all outstanding changes
1575
1575
1576 Commit changes to the given files into the repository. Unlike a
1576 Commit changes to the given files into the repository. Unlike a
1577 centralized SCM, this operation is a local operation. See
1577 centralized SCM, this operation is a local operation. See
1578 :hg:`push` for a way to actively distribute your changes.
1578 :hg:`push` for a way to actively distribute your changes.
1579
1579
1580 If a list of files is omitted, all changes reported by :hg:`status`
1580 If a list of files is omitted, all changes reported by :hg:`status`
1581 will be committed.
1581 will be committed.
1582
1582
1583 If you are committing the result of a merge, do not provide any
1583 If you are committing the result of a merge, do not provide any
1584 filenames or -I/-X filters.
1584 filenames or -I/-X filters.
1585
1585
1586 If no commit message is specified, Mercurial starts your
1586 If no commit message is specified, Mercurial starts your
1587 configured editor where you can enter a message. In case your
1587 configured editor where you can enter a message. In case your
1588 commit fails, you will find a backup of your message in
1588 commit fails, you will find a backup of your message in
1589 ``.hg/last-message.txt``.
1589 ``.hg/last-message.txt``.
1590
1590
1591 The --close-branch flag can be used to mark the current branch
1591 The --close-branch flag can be used to mark the current branch
1592 head closed. When all heads of a branch are closed, the branch
1592 head closed. When all heads of a branch are closed, the branch
1593 will be considered closed and no longer listed.
1593 will be considered closed and no longer listed.
1594
1594
1595 The --amend flag can be used to amend the parent of the
1595 The --amend flag can be used to amend the parent of the
1596 working directory with a new commit that contains the changes
1596 working directory with a new commit that contains the changes
1597 in the parent in addition to those currently reported by :hg:`status`,
1597 in the parent in addition to those currently reported by :hg:`status`,
1598 if there are any. The old commit is stored in a backup bundle in
1598 if there are any. The old commit is stored in a backup bundle in
1599 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1599 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1600 on how to restore it).
1600 on how to restore it).
1601
1601
1602 Message, user and date are taken from the amended commit unless
1602 Message, user and date are taken from the amended commit unless
1603 specified. When a message isn't specified on the command line,
1603 specified. When a message isn't specified on the command line,
1604 the editor will open with the message of the amended commit.
1604 the editor will open with the message of the amended commit.
1605
1605
1606 It is not possible to amend public changesets (see :hg:`help phases`)
1606 It is not possible to amend public changesets (see :hg:`help phases`)
1607 or changesets that have children.
1607 or changesets that have children.
1608
1608
1609 See :hg:`help dates` for a list of formats valid for -d/--date.
1609 See :hg:`help dates` for a list of formats valid for -d/--date.
1610
1610
1611 Returns 0 on success, 1 if nothing changed.
1611 Returns 0 on success, 1 if nothing changed.
1612
1612
1613 .. container:: verbose
1613 .. container:: verbose
1614
1614
1615 Examples:
1615 Examples:
1616
1616
1617 - commit all files ending in .py::
1617 - commit all files ending in .py::
1618
1618
1619 hg commit --include "set:**.py"
1619 hg commit --include "set:**.py"
1620
1620
1621 - commit all non-binary files::
1621 - commit all non-binary files::
1622
1622
1623 hg commit --exclude "set:binary()"
1623 hg commit --exclude "set:binary()"
1624
1624
1625 - amend the current commit and set the date to now::
1625 - amend the current commit and set the date to now::
1626
1626
1627 hg commit --amend --date now
1627 hg commit --amend --date now
1628 """
1628 """
1629 wlock = lock = None
1629 wlock = lock = None
1630 try:
1630 try:
1631 wlock = repo.wlock()
1631 wlock = repo.wlock()
1632 lock = repo.lock()
1632 lock = repo.lock()
1633 return _docommit(ui, repo, *pats, **opts)
1633 return _docommit(ui, repo, *pats, **opts)
1634 finally:
1634 finally:
1635 release(lock, wlock)
1635 release(lock, wlock)
1636
1636
1637 def _docommit(ui, repo, *pats, **opts):
1637 def _docommit(ui, repo, *pats, **opts):
1638 if opts.get('interactive'):
1638 if opts.get('interactive'):
1639 opts.pop('interactive')
1639 opts.pop('interactive')
1640 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1640 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1641 cmdutil.recordfilter, *pats, **opts)
1641 cmdutil.recordfilter, *pats, **opts)
1642 # ret can be 0 (no changes to record) or the value returned by
1642 # ret can be 0 (no changes to record) or the value returned by
1643 # commit(), 1 if nothing changed or None on success.
1643 # commit(), 1 if nothing changed or None on success.
1644 return 1 if ret == 0 else ret
1644 return 1 if ret == 0 else ret
1645
1645
1646 if opts.get('subrepos'):
1646 if opts.get('subrepos'):
1647 if opts.get('amend'):
1647 if opts.get('amend'):
1648 raise error.Abort(_('cannot amend with --subrepos'))
1648 raise error.Abort(_('cannot amend with --subrepos'))
1649 # Let --subrepos on the command line override config setting.
1649 # Let --subrepos on the command line override config setting.
1650 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1650 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1651
1651
1652 cmdutil.checkunfinished(repo, commit=True)
1652 cmdutil.checkunfinished(repo, commit=True)
1653
1653
1654 branch = repo[None].branch()
1654 branch = repo[None].branch()
1655 bheads = repo.branchheads(branch)
1655 bheads = repo.branchheads(branch)
1656
1656
1657 extra = {}
1657 extra = {}
1658 if opts.get('close_branch'):
1658 if opts.get('close_branch'):
1659 extra['close'] = 1
1659 extra['close'] = 1
1660
1660
1661 if not bheads:
1661 if not bheads:
1662 raise error.Abort(_('can only close branch heads'))
1662 raise error.Abort(_('can only close branch heads'))
1663 elif opts.get('amend'):
1663 elif opts.get('amend'):
1664 if repo[None].parents()[0].p1().branch() != branch and \
1664 if repo[None].parents()[0].p1().branch() != branch and \
1665 repo[None].parents()[0].p2().branch() != branch:
1665 repo[None].parents()[0].p2().branch() != branch:
1666 raise error.Abort(_('can only close branch heads'))
1666 raise error.Abort(_('can only close branch heads'))
1667
1667
1668 if opts.get('amend'):
1668 if opts.get('amend'):
1669 if ui.configbool('ui', 'commitsubrepos'):
1669 if ui.configbool('ui', 'commitsubrepos'):
1670 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1670 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1671
1671
1672 old = repo['.']
1672 old = repo['.']
1673 if not old.mutable():
1673 if not old.mutable():
1674 raise error.Abort(_('cannot amend public changesets'))
1674 raise error.Abort(_('cannot amend public changesets'))
1675 if len(repo[None].parents()) > 1:
1675 if len(repo[None].parents()) > 1:
1676 raise error.Abort(_('cannot amend while merging'))
1676 raise error.Abort(_('cannot amend while merging'))
1677 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1677 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1678 if not allowunstable and old.children():
1678 if not allowunstable and old.children():
1679 raise error.Abort(_('cannot amend changeset with children'))
1679 raise error.Abort(_('cannot amend changeset with children'))
1680
1680
1681 # Currently histedit gets confused if an amend happens while histedit
1681 # Currently histedit gets confused if an amend happens while histedit
1682 # is in progress. Since we have a checkunfinished command, we are
1682 # is in progress. Since we have a checkunfinished command, we are
1683 # temporarily honoring it.
1683 # temporarily honoring it.
1684 #
1684 #
1685 # Note: eventually this guard will be removed. Please do not expect
1685 # Note: eventually this guard will be removed. Please do not expect
1686 # this behavior to remain.
1686 # this behavior to remain.
1687 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1687 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1688 cmdutil.checkunfinished(repo)
1688 cmdutil.checkunfinished(repo)
1689
1689
1690 # commitfunc is used only for temporary amend commit by cmdutil.amend
1690 # commitfunc is used only for temporary amend commit by cmdutil.amend
1691 def commitfunc(ui, repo, message, match, opts):
1691 def commitfunc(ui, repo, message, match, opts):
1692 return repo.commit(message,
1692 return repo.commit(message,
1693 opts.get('user') or old.user(),
1693 opts.get('user') or old.user(),
1694 opts.get('date') or old.date(),
1694 opts.get('date') or old.date(),
1695 match,
1695 match,
1696 extra=extra)
1696 extra=extra)
1697
1697
1698 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1698 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1699 if node == old.node():
1699 if node == old.node():
1700 ui.status(_("nothing changed\n"))
1700 ui.status(_("nothing changed\n"))
1701 return 1
1701 return 1
1702 else:
1702 else:
1703 def commitfunc(ui, repo, message, match, opts):
1703 def commitfunc(ui, repo, message, match, opts):
1704 backup = ui.backupconfig('phases', 'new-commit')
1704 backup = ui.backupconfig('phases', 'new-commit')
1705 baseui = repo.baseui
1705 baseui = repo.baseui
1706 basebackup = baseui.backupconfig('phases', 'new-commit')
1706 basebackup = baseui.backupconfig('phases', 'new-commit')
1707 try:
1707 try:
1708 if opts.get('secret'):
1708 if opts.get('secret'):
1709 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1709 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1710 # Propagate to subrepos
1710 # Propagate to subrepos
1711 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1711 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1712
1712
1713 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1713 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1714 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1714 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1715 return repo.commit(message, opts.get('user'), opts.get('date'),
1715 return repo.commit(message, opts.get('user'), opts.get('date'),
1716 match,
1716 match,
1717 editor=editor,
1717 editor=editor,
1718 extra=extra)
1718 extra=extra)
1719 finally:
1719 finally:
1720 ui.restoreconfig(backup)
1720 ui.restoreconfig(backup)
1721 repo.baseui.restoreconfig(basebackup)
1721 repo.baseui.restoreconfig(basebackup)
1722
1722
1723
1723
1724 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1724 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1725
1725
1726 if not node:
1726 if not node:
1727 stat = cmdutil.postcommitstatus(repo, pats, opts)
1727 stat = cmdutil.postcommitstatus(repo, pats, opts)
1728 if stat[3]:
1728 if stat[3]:
1729 ui.status(_("nothing changed (%d missing files, see "
1729 ui.status(_("nothing changed (%d missing files, see "
1730 "'hg status')\n") % len(stat[3]))
1730 "'hg status')\n") % len(stat[3]))
1731 else:
1731 else:
1732 ui.status(_("nothing changed\n"))
1732 ui.status(_("nothing changed\n"))
1733 return 1
1733 return 1
1734
1734
1735 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1735 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1736
1736
1737 @command('config|showconfig|debugconfig',
1737 @command('config|showconfig|debugconfig',
1738 [('u', 'untrusted', None, _('show untrusted configuration options')),
1738 [('u', 'untrusted', None, _('show untrusted configuration options')),
1739 ('e', 'edit', None, _('edit user config')),
1739 ('e', 'edit', None, _('edit user config')),
1740 ('l', 'local', None, _('edit repository config')),
1740 ('l', 'local', None, _('edit repository config')),
1741 ('g', 'global', None, _('edit global config'))] + formatteropts,
1741 ('g', 'global', None, _('edit global config'))] + formatteropts,
1742 _('[-u] [NAME]...'),
1742 _('[-u] [NAME]...'),
1743 optionalrepo=True)
1743 optionalrepo=True)
1744 def config(ui, repo, *values, **opts):
1744 def config(ui, repo, *values, **opts):
1745 """show combined config settings from all hgrc files
1745 """show combined config settings from all hgrc files
1746
1746
1747 With no arguments, print names and values of all config items.
1747 With no arguments, print names and values of all config items.
1748
1748
1749 With one argument of the form section.name, print just the value
1749 With one argument of the form section.name, print just the value
1750 of that config item.
1750 of that config item.
1751
1751
1752 With multiple arguments, print names and values of all config
1752 With multiple arguments, print names and values of all config
1753 items with matching section names.
1753 items with matching section names.
1754
1754
1755 With --edit, start an editor on the user-level config file. With
1755 With --edit, start an editor on the user-level config file. With
1756 --global, edit the system-wide config file. With --local, edit the
1756 --global, edit the system-wide config file. With --local, edit the
1757 repository-level config file.
1757 repository-level config file.
1758
1758
1759 With --debug, the source (filename and line number) is printed
1759 With --debug, the source (filename and line number) is printed
1760 for each config item.
1760 for each config item.
1761
1761
1762 See :hg:`help config` for more information about config files.
1762 See :hg:`help config` for more information about config files.
1763
1763
1764 Returns 0 on success, 1 if NAME does not exist.
1764 Returns 0 on success, 1 if NAME does not exist.
1765
1765
1766 """
1766 """
1767
1767
1768 if opts.get('edit') or opts.get('local') or opts.get('global'):
1768 if opts.get('edit') or opts.get('local') or opts.get('global'):
1769 if opts.get('local') and opts.get('global'):
1769 if opts.get('local') and opts.get('global'):
1770 raise error.Abort(_("can't use --local and --global together"))
1770 raise error.Abort(_("can't use --local and --global together"))
1771
1771
1772 if opts.get('local'):
1772 if opts.get('local'):
1773 if not repo:
1773 if not repo:
1774 raise error.Abort(_("can't use --local outside a repository"))
1774 raise error.Abort(_("can't use --local outside a repository"))
1775 paths = [repo.join('hgrc')]
1775 paths = [repo.join('hgrc')]
1776 elif opts.get('global'):
1776 elif opts.get('global'):
1777 paths = scmutil.systemrcpath()
1777 paths = scmutil.systemrcpath()
1778 else:
1778 else:
1779 paths = scmutil.userrcpath()
1779 paths = scmutil.userrcpath()
1780
1780
1781 for f in paths:
1781 for f in paths:
1782 if os.path.exists(f):
1782 if os.path.exists(f):
1783 break
1783 break
1784 else:
1784 else:
1785 if opts.get('global'):
1785 if opts.get('global'):
1786 samplehgrc = uimod.samplehgrcs['global']
1786 samplehgrc = uimod.samplehgrcs['global']
1787 elif opts.get('local'):
1787 elif opts.get('local'):
1788 samplehgrc = uimod.samplehgrcs['local']
1788 samplehgrc = uimod.samplehgrcs['local']
1789 else:
1789 else:
1790 samplehgrc = uimod.samplehgrcs['user']
1790 samplehgrc = uimod.samplehgrcs['user']
1791
1791
1792 f = paths[0]
1792 f = paths[0]
1793 fp = open(f, "w")
1793 fp = open(f, "w")
1794 fp.write(samplehgrc)
1794 fp.write(samplehgrc)
1795 fp.close()
1795 fp.close()
1796
1796
1797 editor = ui.geteditor()
1797 editor = ui.geteditor()
1798 ui.system("%s \"%s\"" % (editor, f),
1798 ui.system("%s \"%s\"" % (editor, f),
1799 onerr=error.Abort, errprefix=_("edit failed"))
1799 onerr=error.Abort, errprefix=_("edit failed"),
1800 blockedtag='config_edit')
1800 return
1801 return
1801 ui.pager('config')
1802 ui.pager('config')
1802 fm = ui.formatter('config', opts)
1803 fm = ui.formatter('config', opts)
1803 for f in scmutil.rcpath():
1804 for f in scmutil.rcpath():
1804 ui.debug('read config from: %s\n' % f)
1805 ui.debug('read config from: %s\n' % f)
1805 untrusted = bool(opts.get('untrusted'))
1806 untrusted = bool(opts.get('untrusted'))
1806 if values:
1807 if values:
1807 sections = [v for v in values if '.' not in v]
1808 sections = [v for v in values if '.' not in v]
1808 items = [v for v in values if '.' in v]
1809 items = [v for v in values if '.' in v]
1809 if len(items) > 1 or items and sections:
1810 if len(items) > 1 or items and sections:
1810 raise error.Abort(_('only one config item permitted'))
1811 raise error.Abort(_('only one config item permitted'))
1811 matched = False
1812 matched = False
1812 for section, name, value in ui.walkconfig(untrusted=untrusted):
1813 for section, name, value in ui.walkconfig(untrusted=untrusted):
1813 source = ui.configsource(section, name, untrusted)
1814 source = ui.configsource(section, name, untrusted)
1814 value = str(value)
1815 value = str(value)
1815 if fm.isplain():
1816 if fm.isplain():
1816 source = source or 'none'
1817 source = source or 'none'
1817 value = value.replace('\n', '\\n')
1818 value = value.replace('\n', '\\n')
1818 entryname = section + '.' + name
1819 entryname = section + '.' + name
1819 if values:
1820 if values:
1820 for v in values:
1821 for v in values:
1821 if v == section:
1822 if v == section:
1822 fm.startitem()
1823 fm.startitem()
1823 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1824 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1824 fm.write('name value', '%s=%s\n', entryname, value)
1825 fm.write('name value', '%s=%s\n', entryname, value)
1825 matched = True
1826 matched = True
1826 elif v == entryname:
1827 elif v == entryname:
1827 fm.startitem()
1828 fm.startitem()
1828 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1829 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1829 fm.write('value', '%s\n', value)
1830 fm.write('value', '%s\n', value)
1830 fm.data(name=entryname)
1831 fm.data(name=entryname)
1831 matched = True
1832 matched = True
1832 else:
1833 else:
1833 fm.startitem()
1834 fm.startitem()
1834 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1835 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1835 fm.write('name value', '%s=%s\n', entryname, value)
1836 fm.write('name value', '%s=%s\n', entryname, value)
1836 matched = True
1837 matched = True
1837 fm.end()
1838 fm.end()
1838 if matched:
1839 if matched:
1839 return 0
1840 return 0
1840 return 1
1841 return 1
1841
1842
1842 @command('copy|cp',
1843 @command('copy|cp',
1843 [('A', 'after', None, _('record a copy that has already occurred')),
1844 [('A', 'after', None, _('record a copy that has already occurred')),
1844 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1845 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1845 ] + walkopts + dryrunopts,
1846 ] + walkopts + dryrunopts,
1846 _('[OPTION]... [SOURCE]... DEST'))
1847 _('[OPTION]... [SOURCE]... DEST'))
1847 def copy(ui, repo, *pats, **opts):
1848 def copy(ui, repo, *pats, **opts):
1848 """mark files as copied for the next commit
1849 """mark files as copied for the next commit
1849
1850
1850 Mark dest as having copies of source files. If dest is a
1851 Mark dest as having copies of source files. If dest is a
1851 directory, copies are put in that directory. If dest is a file,
1852 directory, copies are put in that directory. If dest is a file,
1852 the source must be a single file.
1853 the source must be a single file.
1853
1854
1854 By default, this command copies the contents of files as they
1855 By default, this command copies the contents of files as they
1855 exist in the working directory. If invoked with -A/--after, the
1856 exist in the working directory. If invoked with -A/--after, the
1856 operation is recorded, but no copying is performed.
1857 operation is recorded, but no copying is performed.
1857
1858
1858 This command takes effect with the next commit. To undo a copy
1859 This command takes effect with the next commit. To undo a copy
1859 before that, see :hg:`revert`.
1860 before that, see :hg:`revert`.
1860
1861
1861 Returns 0 on success, 1 if errors are encountered.
1862 Returns 0 on success, 1 if errors are encountered.
1862 """
1863 """
1863 with repo.wlock(False):
1864 with repo.wlock(False):
1864 return cmdutil.copy(ui, repo, pats, opts)
1865 return cmdutil.copy(ui, repo, pats, opts)
1865
1866
1866 @command('^diff',
1867 @command('^diff',
1867 [('r', 'rev', [], _('revision'), _('REV')),
1868 [('r', 'rev', [], _('revision'), _('REV')),
1868 ('c', 'change', '', _('change made by revision'), _('REV'))
1869 ('c', 'change', '', _('change made by revision'), _('REV'))
1869 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1870 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1870 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1871 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1871 inferrepo=True)
1872 inferrepo=True)
1872 def diff(ui, repo, *pats, **opts):
1873 def diff(ui, repo, *pats, **opts):
1873 """diff repository (or selected files)
1874 """diff repository (or selected files)
1874
1875
1875 Show differences between revisions for the specified files.
1876 Show differences between revisions for the specified files.
1876
1877
1877 Differences between files are shown using the unified diff format.
1878 Differences between files are shown using the unified diff format.
1878
1879
1879 .. note::
1880 .. note::
1880
1881
1881 :hg:`diff` may generate unexpected results for merges, as it will
1882 :hg:`diff` may generate unexpected results for merges, as it will
1882 default to comparing against the working directory's first
1883 default to comparing against the working directory's first
1883 parent changeset if no revisions are specified.
1884 parent changeset if no revisions are specified.
1884
1885
1885 When two revision arguments are given, then changes are shown
1886 When two revision arguments are given, then changes are shown
1886 between those revisions. If only one revision is specified then
1887 between those revisions. If only one revision is specified then
1887 that revision is compared to the working directory, and, when no
1888 that revision is compared to the working directory, and, when no
1888 revisions are specified, the working directory files are compared
1889 revisions are specified, the working directory files are compared
1889 to its first parent.
1890 to its first parent.
1890
1891
1891 Alternatively you can specify -c/--change with a revision to see
1892 Alternatively you can specify -c/--change with a revision to see
1892 the changes in that changeset relative to its first parent.
1893 the changes in that changeset relative to its first parent.
1893
1894
1894 Without the -a/--text option, diff will avoid generating diffs of
1895 Without the -a/--text option, diff will avoid generating diffs of
1895 files it detects as binary. With -a, diff will generate a diff
1896 files it detects as binary. With -a, diff will generate a diff
1896 anyway, probably with undesirable results.
1897 anyway, probably with undesirable results.
1897
1898
1898 Use the -g/--git option to generate diffs in the git extended diff
1899 Use the -g/--git option to generate diffs in the git extended diff
1899 format. For more information, read :hg:`help diffs`.
1900 format. For more information, read :hg:`help diffs`.
1900
1901
1901 .. container:: verbose
1902 .. container:: verbose
1902
1903
1903 Examples:
1904 Examples:
1904
1905
1905 - compare a file in the current working directory to its parent::
1906 - compare a file in the current working directory to its parent::
1906
1907
1907 hg diff foo.c
1908 hg diff foo.c
1908
1909
1909 - compare two historical versions of a directory, with rename info::
1910 - compare two historical versions of a directory, with rename info::
1910
1911
1911 hg diff --git -r 1.0:1.2 lib/
1912 hg diff --git -r 1.0:1.2 lib/
1912
1913
1913 - get change stats relative to the last change on some date::
1914 - get change stats relative to the last change on some date::
1914
1915
1915 hg diff --stat -r "date('may 2')"
1916 hg diff --stat -r "date('may 2')"
1916
1917
1917 - diff all newly-added files that contain a keyword::
1918 - diff all newly-added files that contain a keyword::
1918
1919
1919 hg diff "set:added() and grep(GNU)"
1920 hg diff "set:added() and grep(GNU)"
1920
1921
1921 - compare a revision and its parents::
1922 - compare a revision and its parents::
1922
1923
1923 hg diff -c 9353 # compare against first parent
1924 hg diff -c 9353 # compare against first parent
1924 hg diff -r 9353^:9353 # same using revset syntax
1925 hg diff -r 9353^:9353 # same using revset syntax
1925 hg diff -r 9353^2:9353 # compare against the second parent
1926 hg diff -r 9353^2:9353 # compare against the second parent
1926
1927
1927 Returns 0 on success.
1928 Returns 0 on success.
1928 """
1929 """
1929
1930
1930 revs = opts.get('rev')
1931 revs = opts.get('rev')
1931 change = opts.get('change')
1932 change = opts.get('change')
1932 stat = opts.get('stat')
1933 stat = opts.get('stat')
1933 reverse = opts.get('reverse')
1934 reverse = opts.get('reverse')
1934
1935
1935 if revs and change:
1936 if revs and change:
1936 msg = _('cannot specify --rev and --change at the same time')
1937 msg = _('cannot specify --rev and --change at the same time')
1937 raise error.Abort(msg)
1938 raise error.Abort(msg)
1938 elif change:
1939 elif change:
1939 node2 = scmutil.revsingle(repo, change, None).node()
1940 node2 = scmutil.revsingle(repo, change, None).node()
1940 node1 = repo[node2].p1().node()
1941 node1 = repo[node2].p1().node()
1941 else:
1942 else:
1942 node1, node2 = scmutil.revpair(repo, revs)
1943 node1, node2 = scmutil.revpair(repo, revs)
1943
1944
1944 if reverse:
1945 if reverse:
1945 node1, node2 = node2, node1
1946 node1, node2 = node2, node1
1946
1947
1947 diffopts = patch.diffallopts(ui, opts)
1948 diffopts = patch.diffallopts(ui, opts)
1948 m = scmutil.match(repo[node2], pats, opts)
1949 m = scmutil.match(repo[node2], pats, opts)
1949 ui.pager('diff')
1950 ui.pager('diff')
1950 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1951 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1951 listsubrepos=opts.get('subrepos'),
1952 listsubrepos=opts.get('subrepos'),
1952 root=opts.get('root'))
1953 root=opts.get('root'))
1953
1954
1954 @command('^export',
1955 @command('^export',
1955 [('o', 'output', '',
1956 [('o', 'output', '',
1956 _('print output to file with formatted name'), _('FORMAT')),
1957 _('print output to file with formatted name'), _('FORMAT')),
1957 ('', 'switch-parent', None, _('diff against the second parent')),
1958 ('', 'switch-parent', None, _('diff against the second parent')),
1958 ('r', 'rev', [], _('revisions to export'), _('REV')),
1959 ('r', 'rev', [], _('revisions to export'), _('REV')),
1959 ] + diffopts,
1960 ] + diffopts,
1960 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1961 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1961 def export(ui, repo, *changesets, **opts):
1962 def export(ui, repo, *changesets, **opts):
1962 """dump the header and diffs for one or more changesets
1963 """dump the header and diffs for one or more changesets
1963
1964
1964 Print the changeset header and diffs for one or more revisions.
1965 Print the changeset header and diffs for one or more revisions.
1965 If no revision is given, the parent of the working directory is used.
1966 If no revision is given, the parent of the working directory is used.
1966
1967
1967 The information shown in the changeset header is: author, date,
1968 The information shown in the changeset header is: author, date,
1968 branch name (if non-default), changeset hash, parent(s) and commit
1969 branch name (if non-default), changeset hash, parent(s) and commit
1969 comment.
1970 comment.
1970
1971
1971 .. note::
1972 .. note::
1972
1973
1973 :hg:`export` may generate unexpected diff output for merge
1974 :hg:`export` may generate unexpected diff output for merge
1974 changesets, as it will compare the merge changeset against its
1975 changesets, as it will compare the merge changeset against its
1975 first parent only.
1976 first parent only.
1976
1977
1977 Output may be to a file, in which case the name of the file is
1978 Output may be to a file, in which case the name of the file is
1978 given using a format string. The formatting rules are as follows:
1979 given using a format string. The formatting rules are as follows:
1979
1980
1980 :``%%``: literal "%" character
1981 :``%%``: literal "%" character
1981 :``%H``: changeset hash (40 hexadecimal digits)
1982 :``%H``: changeset hash (40 hexadecimal digits)
1982 :``%N``: number of patches being generated
1983 :``%N``: number of patches being generated
1983 :``%R``: changeset revision number
1984 :``%R``: changeset revision number
1984 :``%b``: basename of the exporting repository
1985 :``%b``: basename of the exporting repository
1985 :``%h``: short-form changeset hash (12 hexadecimal digits)
1986 :``%h``: short-form changeset hash (12 hexadecimal digits)
1986 :``%m``: first line of the commit message (only alphanumeric characters)
1987 :``%m``: first line of the commit message (only alphanumeric characters)
1987 :``%n``: zero-padded sequence number, starting at 1
1988 :``%n``: zero-padded sequence number, starting at 1
1988 :``%r``: zero-padded changeset revision number
1989 :``%r``: zero-padded changeset revision number
1989
1990
1990 Without the -a/--text option, export will avoid generating diffs
1991 Without the -a/--text option, export will avoid generating diffs
1991 of files it detects as binary. With -a, export will generate a
1992 of files it detects as binary. With -a, export will generate a
1992 diff anyway, probably with undesirable results.
1993 diff anyway, probably with undesirable results.
1993
1994
1994 Use the -g/--git option to generate diffs in the git extended diff
1995 Use the -g/--git option to generate diffs in the git extended diff
1995 format. See :hg:`help diffs` for more information.
1996 format. See :hg:`help diffs` for more information.
1996
1997
1997 With the --switch-parent option, the diff will be against the
1998 With the --switch-parent option, the diff will be against the
1998 second parent. It can be useful to review a merge.
1999 second parent. It can be useful to review a merge.
1999
2000
2000 .. container:: verbose
2001 .. container:: verbose
2001
2002
2002 Examples:
2003 Examples:
2003
2004
2004 - use export and import to transplant a bugfix to the current
2005 - use export and import to transplant a bugfix to the current
2005 branch::
2006 branch::
2006
2007
2007 hg export -r 9353 | hg import -
2008 hg export -r 9353 | hg import -
2008
2009
2009 - export all the changesets between two revisions to a file with
2010 - export all the changesets between two revisions to a file with
2010 rename information::
2011 rename information::
2011
2012
2012 hg export --git -r 123:150 > changes.txt
2013 hg export --git -r 123:150 > changes.txt
2013
2014
2014 - split outgoing changes into a series of patches with
2015 - split outgoing changes into a series of patches with
2015 descriptive names::
2016 descriptive names::
2016
2017
2017 hg export -r "outgoing()" -o "%n-%m.patch"
2018 hg export -r "outgoing()" -o "%n-%m.patch"
2018
2019
2019 Returns 0 on success.
2020 Returns 0 on success.
2020 """
2021 """
2021 changesets += tuple(opts.get('rev', []))
2022 changesets += tuple(opts.get('rev', []))
2022 if not changesets:
2023 if not changesets:
2023 changesets = ['.']
2024 changesets = ['.']
2024 revs = scmutil.revrange(repo, changesets)
2025 revs = scmutil.revrange(repo, changesets)
2025 if not revs:
2026 if not revs:
2026 raise error.Abort(_("export requires at least one changeset"))
2027 raise error.Abort(_("export requires at least one changeset"))
2027 if len(revs) > 1:
2028 if len(revs) > 1:
2028 ui.note(_('exporting patches:\n'))
2029 ui.note(_('exporting patches:\n'))
2029 else:
2030 else:
2030 ui.note(_('exporting patch:\n'))
2031 ui.note(_('exporting patch:\n'))
2031 ui.pager('export')
2032 ui.pager('export')
2032 cmdutil.export(repo, revs, template=opts.get('output'),
2033 cmdutil.export(repo, revs, template=opts.get('output'),
2033 switch_parent=opts.get('switch_parent'),
2034 switch_parent=opts.get('switch_parent'),
2034 opts=patch.diffallopts(ui, opts))
2035 opts=patch.diffallopts(ui, opts))
2035
2036
2036 @command('files',
2037 @command('files',
2037 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2038 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2038 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2039 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2039 ] + walkopts + formatteropts + subrepoopts,
2040 ] + walkopts + formatteropts + subrepoopts,
2040 _('[OPTION]... [FILE]...'))
2041 _('[OPTION]... [FILE]...'))
2041 def files(ui, repo, *pats, **opts):
2042 def files(ui, repo, *pats, **opts):
2042 """list tracked files
2043 """list tracked files
2043
2044
2044 Print files under Mercurial control in the working directory or
2045 Print files under Mercurial control in the working directory or
2045 specified revision for given files (excluding removed files).
2046 specified revision for given files (excluding removed files).
2046 Files can be specified as filenames or filesets.
2047 Files can be specified as filenames or filesets.
2047
2048
2048 If no files are given to match, this command prints the names
2049 If no files are given to match, this command prints the names
2049 of all files under Mercurial control.
2050 of all files under Mercurial control.
2050
2051
2051 .. container:: verbose
2052 .. container:: verbose
2052
2053
2053 Examples:
2054 Examples:
2054
2055
2055 - list all files under the current directory::
2056 - list all files under the current directory::
2056
2057
2057 hg files .
2058 hg files .
2058
2059
2059 - shows sizes and flags for current revision::
2060 - shows sizes and flags for current revision::
2060
2061
2061 hg files -vr .
2062 hg files -vr .
2062
2063
2063 - list all files named README::
2064 - list all files named README::
2064
2065
2065 hg files -I "**/README"
2066 hg files -I "**/README"
2066
2067
2067 - list all binary files::
2068 - list all binary files::
2068
2069
2069 hg files "set:binary()"
2070 hg files "set:binary()"
2070
2071
2071 - find files containing a regular expression::
2072 - find files containing a regular expression::
2072
2073
2073 hg files "set:grep('bob')"
2074 hg files "set:grep('bob')"
2074
2075
2075 - search tracked file contents with xargs and grep::
2076 - search tracked file contents with xargs and grep::
2076
2077
2077 hg files -0 | xargs -0 grep foo
2078 hg files -0 | xargs -0 grep foo
2078
2079
2079 See :hg:`help patterns` and :hg:`help filesets` for more information
2080 See :hg:`help patterns` and :hg:`help filesets` for more information
2080 on specifying file patterns.
2081 on specifying file patterns.
2081
2082
2082 Returns 0 if a match is found, 1 otherwise.
2083 Returns 0 if a match is found, 1 otherwise.
2083
2084
2084 """
2085 """
2085 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2086 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2086
2087
2087 end = '\n'
2088 end = '\n'
2088 if opts.get('print0'):
2089 if opts.get('print0'):
2089 end = '\0'
2090 end = '\0'
2090 fmt = '%s' + end
2091 fmt = '%s' + end
2091
2092
2092 m = scmutil.match(ctx, pats, opts)
2093 m = scmutil.match(ctx, pats, opts)
2093 ui.pager('files')
2094 ui.pager('files')
2094 with ui.formatter('files', opts) as fm:
2095 with ui.formatter('files', opts) as fm:
2095 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2096 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2096
2097
2097 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2098 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2098 def forget(ui, repo, *pats, **opts):
2099 def forget(ui, repo, *pats, **opts):
2099 """forget the specified files on the next commit
2100 """forget the specified files on the next commit
2100
2101
2101 Mark the specified files so they will no longer be tracked
2102 Mark the specified files so they will no longer be tracked
2102 after the next commit.
2103 after the next commit.
2103
2104
2104 This only removes files from the current branch, not from the
2105 This only removes files from the current branch, not from the
2105 entire project history, and it does not delete them from the
2106 entire project history, and it does not delete them from the
2106 working directory.
2107 working directory.
2107
2108
2108 To delete the file from the working directory, see :hg:`remove`.
2109 To delete the file from the working directory, see :hg:`remove`.
2109
2110
2110 To undo a forget before the next commit, see :hg:`add`.
2111 To undo a forget before the next commit, see :hg:`add`.
2111
2112
2112 .. container:: verbose
2113 .. container:: verbose
2113
2114
2114 Examples:
2115 Examples:
2115
2116
2116 - forget newly-added binary files::
2117 - forget newly-added binary files::
2117
2118
2118 hg forget "set:added() and binary()"
2119 hg forget "set:added() and binary()"
2119
2120
2120 - forget files that would be excluded by .hgignore::
2121 - forget files that would be excluded by .hgignore::
2121
2122
2122 hg forget "set:hgignore()"
2123 hg forget "set:hgignore()"
2123
2124
2124 Returns 0 on success.
2125 Returns 0 on success.
2125 """
2126 """
2126
2127
2127 if not pats:
2128 if not pats:
2128 raise error.Abort(_('no files specified'))
2129 raise error.Abort(_('no files specified'))
2129
2130
2130 m = scmutil.match(repo[None], pats, opts)
2131 m = scmutil.match(repo[None], pats, opts)
2131 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2132 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2132 return rejected and 1 or 0
2133 return rejected and 1 or 0
2133
2134
2134 @command(
2135 @command(
2135 'graft',
2136 'graft',
2136 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2137 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2137 ('c', 'continue', False, _('resume interrupted graft')),
2138 ('c', 'continue', False, _('resume interrupted graft')),
2138 ('e', 'edit', False, _('invoke editor on commit messages')),
2139 ('e', 'edit', False, _('invoke editor on commit messages')),
2139 ('', 'log', None, _('append graft info to log message')),
2140 ('', 'log', None, _('append graft info to log message')),
2140 ('f', 'force', False, _('force graft')),
2141 ('f', 'force', False, _('force graft')),
2141 ('D', 'currentdate', False,
2142 ('D', 'currentdate', False,
2142 _('record the current date as commit date')),
2143 _('record the current date as commit date')),
2143 ('U', 'currentuser', False,
2144 ('U', 'currentuser', False,
2144 _('record the current user as committer'), _('DATE'))]
2145 _('record the current user as committer'), _('DATE'))]
2145 + commitopts2 + mergetoolopts + dryrunopts,
2146 + commitopts2 + mergetoolopts + dryrunopts,
2146 _('[OPTION]... [-r REV]... REV...'))
2147 _('[OPTION]... [-r REV]... REV...'))
2147 def graft(ui, repo, *revs, **opts):
2148 def graft(ui, repo, *revs, **opts):
2148 '''copy changes from other branches onto the current branch
2149 '''copy changes from other branches onto the current branch
2149
2150
2150 This command uses Mercurial's merge logic to copy individual
2151 This command uses Mercurial's merge logic to copy individual
2151 changes from other branches without merging branches in the
2152 changes from other branches without merging branches in the
2152 history graph. This is sometimes known as 'backporting' or
2153 history graph. This is sometimes known as 'backporting' or
2153 'cherry-picking'. By default, graft will copy user, date, and
2154 'cherry-picking'. By default, graft will copy user, date, and
2154 description from the source changesets.
2155 description from the source changesets.
2155
2156
2156 Changesets that are ancestors of the current revision, that have
2157 Changesets that are ancestors of the current revision, that have
2157 already been grafted, or that are merges will be skipped.
2158 already been grafted, or that are merges will be skipped.
2158
2159
2159 If --log is specified, log messages will have a comment appended
2160 If --log is specified, log messages will have a comment appended
2160 of the form::
2161 of the form::
2161
2162
2162 (grafted from CHANGESETHASH)
2163 (grafted from CHANGESETHASH)
2163
2164
2164 If --force is specified, revisions will be grafted even if they
2165 If --force is specified, revisions will be grafted even if they
2165 are already ancestors of or have been grafted to the destination.
2166 are already ancestors of or have been grafted to the destination.
2166 This is useful when the revisions have since been backed out.
2167 This is useful when the revisions have since been backed out.
2167
2168
2168 If a graft merge results in conflicts, the graft process is
2169 If a graft merge results in conflicts, the graft process is
2169 interrupted so that the current merge can be manually resolved.
2170 interrupted so that the current merge can be manually resolved.
2170 Once all conflicts are addressed, the graft process can be
2171 Once all conflicts are addressed, the graft process can be
2171 continued with the -c/--continue option.
2172 continued with the -c/--continue option.
2172
2173
2173 .. note::
2174 .. note::
2174
2175
2175 The -c/--continue option does not reapply earlier options, except
2176 The -c/--continue option does not reapply earlier options, except
2176 for --force.
2177 for --force.
2177
2178
2178 .. container:: verbose
2179 .. container:: verbose
2179
2180
2180 Examples:
2181 Examples:
2181
2182
2182 - copy a single change to the stable branch and edit its description::
2183 - copy a single change to the stable branch and edit its description::
2183
2184
2184 hg update stable
2185 hg update stable
2185 hg graft --edit 9393
2186 hg graft --edit 9393
2186
2187
2187 - graft a range of changesets with one exception, updating dates::
2188 - graft a range of changesets with one exception, updating dates::
2188
2189
2189 hg graft -D "2085::2093 and not 2091"
2190 hg graft -D "2085::2093 and not 2091"
2190
2191
2191 - continue a graft after resolving conflicts::
2192 - continue a graft after resolving conflicts::
2192
2193
2193 hg graft -c
2194 hg graft -c
2194
2195
2195 - show the source of a grafted changeset::
2196 - show the source of a grafted changeset::
2196
2197
2197 hg log --debug -r .
2198 hg log --debug -r .
2198
2199
2199 - show revisions sorted by date::
2200 - show revisions sorted by date::
2200
2201
2201 hg log -r "sort(all(), date)"
2202 hg log -r "sort(all(), date)"
2202
2203
2203 See :hg:`help revisions` for more about specifying revisions.
2204 See :hg:`help revisions` for more about specifying revisions.
2204
2205
2205 Returns 0 on successful completion.
2206 Returns 0 on successful completion.
2206 '''
2207 '''
2207 with repo.wlock():
2208 with repo.wlock():
2208 return _dograft(ui, repo, *revs, **opts)
2209 return _dograft(ui, repo, *revs, **opts)
2209
2210
2210 def _dograft(ui, repo, *revs, **opts):
2211 def _dograft(ui, repo, *revs, **opts):
2211 if revs and opts.get('rev'):
2212 if revs and opts.get('rev'):
2212 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2213 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2213 'revision ordering!\n'))
2214 'revision ordering!\n'))
2214
2215
2215 revs = list(revs)
2216 revs = list(revs)
2216 revs.extend(opts.get('rev'))
2217 revs.extend(opts.get('rev'))
2217
2218
2218 if not opts.get('user') and opts.get('currentuser'):
2219 if not opts.get('user') and opts.get('currentuser'):
2219 opts['user'] = ui.username()
2220 opts['user'] = ui.username()
2220 if not opts.get('date') and opts.get('currentdate'):
2221 if not opts.get('date') and opts.get('currentdate'):
2221 opts['date'] = "%d %d" % util.makedate()
2222 opts['date'] = "%d %d" % util.makedate()
2222
2223
2223 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2224 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2224
2225
2225 cont = False
2226 cont = False
2226 if opts.get('continue'):
2227 if opts.get('continue'):
2227 cont = True
2228 cont = True
2228 if revs:
2229 if revs:
2229 raise error.Abort(_("can't specify --continue and revisions"))
2230 raise error.Abort(_("can't specify --continue and revisions"))
2230 # read in unfinished revisions
2231 # read in unfinished revisions
2231 try:
2232 try:
2232 nodes = repo.vfs.read('graftstate').splitlines()
2233 nodes = repo.vfs.read('graftstate').splitlines()
2233 revs = [repo[node].rev() for node in nodes]
2234 revs = [repo[node].rev() for node in nodes]
2234 except IOError as inst:
2235 except IOError as inst:
2235 if inst.errno != errno.ENOENT:
2236 if inst.errno != errno.ENOENT:
2236 raise
2237 raise
2237 cmdutil.wrongtooltocontinue(repo, _('graft'))
2238 cmdutil.wrongtooltocontinue(repo, _('graft'))
2238 else:
2239 else:
2239 cmdutil.checkunfinished(repo)
2240 cmdutil.checkunfinished(repo)
2240 cmdutil.bailifchanged(repo)
2241 cmdutil.bailifchanged(repo)
2241 if not revs:
2242 if not revs:
2242 raise error.Abort(_('no revisions specified'))
2243 raise error.Abort(_('no revisions specified'))
2243 revs = scmutil.revrange(repo, revs)
2244 revs = scmutil.revrange(repo, revs)
2244
2245
2245 skipped = set()
2246 skipped = set()
2246 # check for merges
2247 # check for merges
2247 for rev in repo.revs('%ld and merge()', revs):
2248 for rev in repo.revs('%ld and merge()', revs):
2248 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2249 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2249 skipped.add(rev)
2250 skipped.add(rev)
2250 revs = [r for r in revs if r not in skipped]
2251 revs = [r for r in revs if r not in skipped]
2251 if not revs:
2252 if not revs:
2252 return -1
2253 return -1
2253
2254
2254 # Don't check in the --continue case, in effect retaining --force across
2255 # Don't check in the --continue case, in effect retaining --force across
2255 # --continues. That's because without --force, any revisions we decided to
2256 # --continues. That's because without --force, any revisions we decided to
2256 # skip would have been filtered out here, so they wouldn't have made their
2257 # skip would have been filtered out here, so they wouldn't have made their
2257 # way to the graftstate. With --force, any revisions we would have otherwise
2258 # way to the graftstate. With --force, any revisions we would have otherwise
2258 # skipped would not have been filtered out, and if they hadn't been applied
2259 # skipped would not have been filtered out, and if they hadn't been applied
2259 # already, they'd have been in the graftstate.
2260 # already, they'd have been in the graftstate.
2260 if not (cont or opts.get('force')):
2261 if not (cont or opts.get('force')):
2261 # check for ancestors of dest branch
2262 # check for ancestors of dest branch
2262 crev = repo['.'].rev()
2263 crev = repo['.'].rev()
2263 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2264 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2264 # XXX make this lazy in the future
2265 # XXX make this lazy in the future
2265 # don't mutate while iterating, create a copy
2266 # don't mutate while iterating, create a copy
2266 for rev in list(revs):
2267 for rev in list(revs):
2267 if rev in ancestors:
2268 if rev in ancestors:
2268 ui.warn(_('skipping ancestor revision %d:%s\n') %
2269 ui.warn(_('skipping ancestor revision %d:%s\n') %
2269 (rev, repo[rev]))
2270 (rev, repo[rev]))
2270 # XXX remove on list is slow
2271 # XXX remove on list is slow
2271 revs.remove(rev)
2272 revs.remove(rev)
2272 if not revs:
2273 if not revs:
2273 return -1
2274 return -1
2274
2275
2275 # analyze revs for earlier grafts
2276 # analyze revs for earlier grafts
2276 ids = {}
2277 ids = {}
2277 for ctx in repo.set("%ld", revs):
2278 for ctx in repo.set("%ld", revs):
2278 ids[ctx.hex()] = ctx.rev()
2279 ids[ctx.hex()] = ctx.rev()
2279 n = ctx.extra().get('source')
2280 n = ctx.extra().get('source')
2280 if n:
2281 if n:
2281 ids[n] = ctx.rev()
2282 ids[n] = ctx.rev()
2282
2283
2283 # check ancestors for earlier grafts
2284 # check ancestors for earlier grafts
2284 ui.debug('scanning for duplicate grafts\n')
2285 ui.debug('scanning for duplicate grafts\n')
2285
2286
2286 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2287 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2287 ctx = repo[rev]
2288 ctx = repo[rev]
2288 n = ctx.extra().get('source')
2289 n = ctx.extra().get('source')
2289 if n in ids:
2290 if n in ids:
2290 try:
2291 try:
2291 r = repo[n].rev()
2292 r = repo[n].rev()
2292 except error.RepoLookupError:
2293 except error.RepoLookupError:
2293 r = None
2294 r = None
2294 if r in revs:
2295 if r in revs:
2295 ui.warn(_('skipping revision %d:%s '
2296 ui.warn(_('skipping revision %d:%s '
2296 '(already grafted to %d:%s)\n')
2297 '(already grafted to %d:%s)\n')
2297 % (r, repo[r], rev, ctx))
2298 % (r, repo[r], rev, ctx))
2298 revs.remove(r)
2299 revs.remove(r)
2299 elif ids[n] in revs:
2300 elif ids[n] in revs:
2300 if r is None:
2301 if r is None:
2301 ui.warn(_('skipping already grafted revision %d:%s '
2302 ui.warn(_('skipping already grafted revision %d:%s '
2302 '(%d:%s also has unknown origin %s)\n')
2303 '(%d:%s also has unknown origin %s)\n')
2303 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2304 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2304 else:
2305 else:
2305 ui.warn(_('skipping already grafted revision %d:%s '
2306 ui.warn(_('skipping already grafted revision %d:%s '
2306 '(%d:%s also has origin %d:%s)\n')
2307 '(%d:%s also has origin %d:%s)\n')
2307 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2308 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2308 revs.remove(ids[n])
2309 revs.remove(ids[n])
2309 elif ctx.hex() in ids:
2310 elif ctx.hex() in ids:
2310 r = ids[ctx.hex()]
2311 r = ids[ctx.hex()]
2311 ui.warn(_('skipping already grafted revision %d:%s '
2312 ui.warn(_('skipping already grafted revision %d:%s '
2312 '(was grafted from %d:%s)\n') %
2313 '(was grafted from %d:%s)\n') %
2313 (r, repo[r], rev, ctx))
2314 (r, repo[r], rev, ctx))
2314 revs.remove(r)
2315 revs.remove(r)
2315 if not revs:
2316 if not revs:
2316 return -1
2317 return -1
2317
2318
2318 for pos, ctx in enumerate(repo.set("%ld", revs)):
2319 for pos, ctx in enumerate(repo.set("%ld", revs)):
2319 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2320 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2320 ctx.description().split('\n', 1)[0])
2321 ctx.description().split('\n', 1)[0])
2321 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2322 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2322 if names:
2323 if names:
2323 desc += ' (%s)' % ' '.join(names)
2324 desc += ' (%s)' % ' '.join(names)
2324 ui.status(_('grafting %s\n') % desc)
2325 ui.status(_('grafting %s\n') % desc)
2325 if opts.get('dry_run'):
2326 if opts.get('dry_run'):
2326 continue
2327 continue
2327
2328
2328 source = ctx.extra().get('source')
2329 source = ctx.extra().get('source')
2329 extra = {}
2330 extra = {}
2330 if source:
2331 if source:
2331 extra['source'] = source
2332 extra['source'] = source
2332 extra['intermediate-source'] = ctx.hex()
2333 extra['intermediate-source'] = ctx.hex()
2333 else:
2334 else:
2334 extra['source'] = ctx.hex()
2335 extra['source'] = ctx.hex()
2335 user = ctx.user()
2336 user = ctx.user()
2336 if opts.get('user'):
2337 if opts.get('user'):
2337 user = opts['user']
2338 user = opts['user']
2338 date = ctx.date()
2339 date = ctx.date()
2339 if opts.get('date'):
2340 if opts.get('date'):
2340 date = opts['date']
2341 date = opts['date']
2341 message = ctx.description()
2342 message = ctx.description()
2342 if opts.get('log'):
2343 if opts.get('log'):
2343 message += '\n(grafted from %s)' % ctx.hex()
2344 message += '\n(grafted from %s)' % ctx.hex()
2344
2345
2345 # we don't merge the first commit when continuing
2346 # we don't merge the first commit when continuing
2346 if not cont:
2347 if not cont:
2347 # perform the graft merge with p1(rev) as 'ancestor'
2348 # perform the graft merge with p1(rev) as 'ancestor'
2348 try:
2349 try:
2349 # ui.forcemerge is an internal variable, do not document
2350 # ui.forcemerge is an internal variable, do not document
2350 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2351 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2351 'graft')
2352 'graft')
2352 stats = mergemod.graft(repo, ctx, ctx.p1(),
2353 stats = mergemod.graft(repo, ctx, ctx.p1(),
2353 ['local', 'graft'])
2354 ['local', 'graft'])
2354 finally:
2355 finally:
2355 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2356 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2356 # report any conflicts
2357 # report any conflicts
2357 if stats and stats[3] > 0:
2358 if stats and stats[3] > 0:
2358 # write out state for --continue
2359 # write out state for --continue
2359 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2360 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2360 repo.vfs.write('graftstate', ''.join(nodelines))
2361 repo.vfs.write('graftstate', ''.join(nodelines))
2361 extra = ''
2362 extra = ''
2362 if opts.get('user'):
2363 if opts.get('user'):
2363 extra += ' --user %s' % util.shellquote(opts['user'])
2364 extra += ' --user %s' % util.shellquote(opts['user'])
2364 if opts.get('date'):
2365 if opts.get('date'):
2365 extra += ' --date %s' % util.shellquote(opts['date'])
2366 extra += ' --date %s' % util.shellquote(opts['date'])
2366 if opts.get('log'):
2367 if opts.get('log'):
2367 extra += ' --log'
2368 extra += ' --log'
2368 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2369 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2369 raise error.Abort(
2370 raise error.Abort(
2370 _("unresolved conflicts, can't continue"),
2371 _("unresolved conflicts, can't continue"),
2371 hint=hint)
2372 hint=hint)
2372 else:
2373 else:
2373 cont = False
2374 cont = False
2374
2375
2375 # commit
2376 # commit
2376 node = repo.commit(text=message, user=user,
2377 node = repo.commit(text=message, user=user,
2377 date=date, extra=extra, editor=editor)
2378 date=date, extra=extra, editor=editor)
2378 if node is None:
2379 if node is None:
2379 ui.warn(
2380 ui.warn(
2380 _('note: graft of %d:%s created no changes to commit\n') %
2381 _('note: graft of %d:%s created no changes to commit\n') %
2381 (ctx.rev(), ctx))
2382 (ctx.rev(), ctx))
2382
2383
2383 # remove state when we complete successfully
2384 # remove state when we complete successfully
2384 if not opts.get('dry_run'):
2385 if not opts.get('dry_run'):
2385 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
2386 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
2386
2387
2387 return 0
2388 return 0
2388
2389
2389 @command('grep',
2390 @command('grep',
2390 [('0', 'print0', None, _('end fields with NUL')),
2391 [('0', 'print0', None, _('end fields with NUL')),
2391 ('', 'all', None, _('print all revisions that match')),
2392 ('', 'all', None, _('print all revisions that match')),
2392 ('a', 'text', None, _('treat all files as text')),
2393 ('a', 'text', None, _('treat all files as text')),
2393 ('f', 'follow', None,
2394 ('f', 'follow', None,
2394 _('follow changeset history,'
2395 _('follow changeset history,'
2395 ' or file history across copies and renames')),
2396 ' or file history across copies and renames')),
2396 ('i', 'ignore-case', None, _('ignore case when matching')),
2397 ('i', 'ignore-case', None, _('ignore case when matching')),
2397 ('l', 'files-with-matches', None,
2398 ('l', 'files-with-matches', None,
2398 _('print only filenames and revisions that match')),
2399 _('print only filenames and revisions that match')),
2399 ('n', 'line-number', None, _('print matching line numbers')),
2400 ('n', 'line-number', None, _('print matching line numbers')),
2400 ('r', 'rev', [],
2401 ('r', 'rev', [],
2401 _('only search files changed within revision range'), _('REV')),
2402 _('only search files changed within revision range'), _('REV')),
2402 ('u', 'user', None, _('list the author (long with -v)')),
2403 ('u', 'user', None, _('list the author (long with -v)')),
2403 ('d', 'date', None, _('list the date (short with -q)')),
2404 ('d', 'date', None, _('list the date (short with -q)')),
2404 ] + formatteropts + walkopts,
2405 ] + formatteropts + walkopts,
2405 _('[OPTION]... PATTERN [FILE]...'),
2406 _('[OPTION]... PATTERN [FILE]...'),
2406 inferrepo=True)
2407 inferrepo=True)
2407 def grep(ui, repo, pattern, *pats, **opts):
2408 def grep(ui, repo, pattern, *pats, **opts):
2408 """search revision history for a pattern in specified files
2409 """search revision history for a pattern in specified files
2409
2410
2410 Search revision history for a regular expression in the specified
2411 Search revision history for a regular expression in the specified
2411 files or the entire project.
2412 files or the entire project.
2412
2413
2413 By default, grep prints the most recent revision number for each
2414 By default, grep prints the most recent revision number for each
2414 file in which it finds a match. To get it to print every revision
2415 file in which it finds a match. To get it to print every revision
2415 that contains a change in match status ("-" for a match that becomes
2416 that contains a change in match status ("-" for a match that becomes
2416 a non-match, or "+" for a non-match that becomes a match), use the
2417 a non-match, or "+" for a non-match that becomes a match), use the
2417 --all flag.
2418 --all flag.
2418
2419
2419 PATTERN can be any Python (roughly Perl-compatible) regular
2420 PATTERN can be any Python (roughly Perl-compatible) regular
2420 expression.
2421 expression.
2421
2422
2422 If no FILEs are specified (and -f/--follow isn't set), all files in
2423 If no FILEs are specified (and -f/--follow isn't set), all files in
2423 the repository are searched, including those that don't exist in the
2424 the repository are searched, including those that don't exist in the
2424 current branch or have been deleted in a prior changeset.
2425 current branch or have been deleted in a prior changeset.
2425
2426
2426 Returns 0 if a match is found, 1 otherwise.
2427 Returns 0 if a match is found, 1 otherwise.
2427 """
2428 """
2428 reflags = re.M
2429 reflags = re.M
2429 if opts.get('ignore_case'):
2430 if opts.get('ignore_case'):
2430 reflags |= re.I
2431 reflags |= re.I
2431 try:
2432 try:
2432 regexp = util.re.compile(pattern, reflags)
2433 regexp = util.re.compile(pattern, reflags)
2433 except re.error as inst:
2434 except re.error as inst:
2434 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2435 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2435 return 1
2436 return 1
2436 sep, eol = ':', '\n'
2437 sep, eol = ':', '\n'
2437 if opts.get('print0'):
2438 if opts.get('print0'):
2438 sep = eol = '\0'
2439 sep = eol = '\0'
2439
2440
2440 getfile = util.lrucachefunc(repo.file)
2441 getfile = util.lrucachefunc(repo.file)
2441
2442
2442 def matchlines(body):
2443 def matchlines(body):
2443 begin = 0
2444 begin = 0
2444 linenum = 0
2445 linenum = 0
2445 while begin < len(body):
2446 while begin < len(body):
2446 match = regexp.search(body, begin)
2447 match = regexp.search(body, begin)
2447 if not match:
2448 if not match:
2448 break
2449 break
2449 mstart, mend = match.span()
2450 mstart, mend = match.span()
2450 linenum += body.count('\n', begin, mstart) + 1
2451 linenum += body.count('\n', begin, mstart) + 1
2451 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2452 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2452 begin = body.find('\n', mend) + 1 or len(body) + 1
2453 begin = body.find('\n', mend) + 1 or len(body) + 1
2453 lend = begin - 1
2454 lend = begin - 1
2454 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2455 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2455
2456
2456 class linestate(object):
2457 class linestate(object):
2457 def __init__(self, line, linenum, colstart, colend):
2458 def __init__(self, line, linenum, colstart, colend):
2458 self.line = line
2459 self.line = line
2459 self.linenum = linenum
2460 self.linenum = linenum
2460 self.colstart = colstart
2461 self.colstart = colstart
2461 self.colend = colend
2462 self.colend = colend
2462
2463
2463 def __hash__(self):
2464 def __hash__(self):
2464 return hash((self.linenum, self.line))
2465 return hash((self.linenum, self.line))
2465
2466
2466 def __eq__(self, other):
2467 def __eq__(self, other):
2467 return self.line == other.line
2468 return self.line == other.line
2468
2469
2469 def findpos(self):
2470 def findpos(self):
2470 """Iterate all (start, end) indices of matches"""
2471 """Iterate all (start, end) indices of matches"""
2471 yield self.colstart, self.colend
2472 yield self.colstart, self.colend
2472 p = self.colend
2473 p = self.colend
2473 while p < len(self.line):
2474 while p < len(self.line):
2474 m = regexp.search(self.line, p)
2475 m = regexp.search(self.line, p)
2475 if not m:
2476 if not m:
2476 break
2477 break
2477 yield m.span()
2478 yield m.span()
2478 p = m.end()
2479 p = m.end()
2479
2480
2480 matches = {}
2481 matches = {}
2481 copies = {}
2482 copies = {}
2482 def grepbody(fn, rev, body):
2483 def grepbody(fn, rev, body):
2483 matches[rev].setdefault(fn, [])
2484 matches[rev].setdefault(fn, [])
2484 m = matches[rev][fn]
2485 m = matches[rev][fn]
2485 for lnum, cstart, cend, line in matchlines(body):
2486 for lnum, cstart, cend, line in matchlines(body):
2486 s = linestate(line, lnum, cstart, cend)
2487 s = linestate(line, lnum, cstart, cend)
2487 m.append(s)
2488 m.append(s)
2488
2489
2489 def difflinestates(a, b):
2490 def difflinestates(a, b):
2490 sm = difflib.SequenceMatcher(None, a, b)
2491 sm = difflib.SequenceMatcher(None, a, b)
2491 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2492 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2492 if tag == 'insert':
2493 if tag == 'insert':
2493 for i in xrange(blo, bhi):
2494 for i in xrange(blo, bhi):
2494 yield ('+', b[i])
2495 yield ('+', b[i])
2495 elif tag == 'delete':
2496 elif tag == 'delete':
2496 for i in xrange(alo, ahi):
2497 for i in xrange(alo, ahi):
2497 yield ('-', a[i])
2498 yield ('-', a[i])
2498 elif tag == 'replace':
2499 elif tag == 'replace':
2499 for i in xrange(alo, ahi):
2500 for i in xrange(alo, ahi):
2500 yield ('-', a[i])
2501 yield ('-', a[i])
2501 for i in xrange(blo, bhi):
2502 for i in xrange(blo, bhi):
2502 yield ('+', b[i])
2503 yield ('+', b[i])
2503
2504
2504 def display(fm, fn, ctx, pstates, states):
2505 def display(fm, fn, ctx, pstates, states):
2505 rev = ctx.rev()
2506 rev = ctx.rev()
2506 if fm.isplain():
2507 if fm.isplain():
2507 formatuser = ui.shortuser
2508 formatuser = ui.shortuser
2508 else:
2509 else:
2509 formatuser = str
2510 formatuser = str
2510 if ui.quiet:
2511 if ui.quiet:
2511 datefmt = '%Y-%m-%d'
2512 datefmt = '%Y-%m-%d'
2512 else:
2513 else:
2513 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2514 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2514 found = False
2515 found = False
2515 @util.cachefunc
2516 @util.cachefunc
2516 def binary():
2517 def binary():
2517 flog = getfile(fn)
2518 flog = getfile(fn)
2518 return util.binary(flog.read(ctx.filenode(fn)))
2519 return util.binary(flog.read(ctx.filenode(fn)))
2519
2520
2520 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2521 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2521 if opts.get('all'):
2522 if opts.get('all'):
2522 iter = difflinestates(pstates, states)
2523 iter = difflinestates(pstates, states)
2523 else:
2524 else:
2524 iter = [('', l) for l in states]
2525 iter = [('', l) for l in states]
2525 for change, l in iter:
2526 for change, l in iter:
2526 fm.startitem()
2527 fm.startitem()
2527 fm.data(node=fm.hexfunc(ctx.node()))
2528 fm.data(node=fm.hexfunc(ctx.node()))
2528 cols = [
2529 cols = [
2529 ('filename', fn, True),
2530 ('filename', fn, True),
2530 ('rev', rev, True),
2531 ('rev', rev, True),
2531 ('linenumber', l.linenum, opts.get('line_number')),
2532 ('linenumber', l.linenum, opts.get('line_number')),
2532 ]
2533 ]
2533 if opts.get('all'):
2534 if opts.get('all'):
2534 cols.append(('change', change, True))
2535 cols.append(('change', change, True))
2535 cols.extend([
2536 cols.extend([
2536 ('user', formatuser(ctx.user()), opts.get('user')),
2537 ('user', formatuser(ctx.user()), opts.get('user')),
2537 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2538 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2538 ])
2539 ])
2539 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2540 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2540 for name, data, cond in cols:
2541 for name, data, cond in cols:
2541 field = fieldnamemap.get(name, name)
2542 field = fieldnamemap.get(name, name)
2542 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2543 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2543 if cond and name != lastcol:
2544 if cond and name != lastcol:
2544 fm.plain(sep, label='grep.sep')
2545 fm.plain(sep, label='grep.sep')
2545 if not opts.get('files_with_matches'):
2546 if not opts.get('files_with_matches'):
2546 fm.plain(sep, label='grep.sep')
2547 fm.plain(sep, label='grep.sep')
2547 if not opts.get('text') and binary():
2548 if not opts.get('text') and binary():
2548 fm.plain(_(" Binary file matches"))
2549 fm.plain(_(" Binary file matches"))
2549 else:
2550 else:
2550 displaymatches(fm.nested('texts'), l)
2551 displaymatches(fm.nested('texts'), l)
2551 fm.plain(eol)
2552 fm.plain(eol)
2552 found = True
2553 found = True
2553 if opts.get('files_with_matches'):
2554 if opts.get('files_with_matches'):
2554 break
2555 break
2555 return found
2556 return found
2556
2557
2557 def displaymatches(fm, l):
2558 def displaymatches(fm, l):
2558 p = 0
2559 p = 0
2559 for s, e in l.findpos():
2560 for s, e in l.findpos():
2560 if p < s:
2561 if p < s:
2561 fm.startitem()
2562 fm.startitem()
2562 fm.write('text', '%s', l.line[p:s])
2563 fm.write('text', '%s', l.line[p:s])
2563 fm.data(matched=False)
2564 fm.data(matched=False)
2564 fm.startitem()
2565 fm.startitem()
2565 fm.write('text', '%s', l.line[s:e], label='grep.match')
2566 fm.write('text', '%s', l.line[s:e], label='grep.match')
2566 fm.data(matched=True)
2567 fm.data(matched=True)
2567 p = e
2568 p = e
2568 if p < len(l.line):
2569 if p < len(l.line):
2569 fm.startitem()
2570 fm.startitem()
2570 fm.write('text', '%s', l.line[p:])
2571 fm.write('text', '%s', l.line[p:])
2571 fm.data(matched=False)
2572 fm.data(matched=False)
2572 fm.end()
2573 fm.end()
2573
2574
2574 skip = {}
2575 skip = {}
2575 revfiles = {}
2576 revfiles = {}
2576 matchfn = scmutil.match(repo[None], pats, opts)
2577 matchfn = scmutil.match(repo[None], pats, opts)
2577 found = False
2578 found = False
2578 follow = opts.get('follow')
2579 follow = opts.get('follow')
2579
2580
2580 def prep(ctx, fns):
2581 def prep(ctx, fns):
2581 rev = ctx.rev()
2582 rev = ctx.rev()
2582 pctx = ctx.p1()
2583 pctx = ctx.p1()
2583 parent = pctx.rev()
2584 parent = pctx.rev()
2584 matches.setdefault(rev, {})
2585 matches.setdefault(rev, {})
2585 matches.setdefault(parent, {})
2586 matches.setdefault(parent, {})
2586 files = revfiles.setdefault(rev, [])
2587 files = revfiles.setdefault(rev, [])
2587 for fn in fns:
2588 for fn in fns:
2588 flog = getfile(fn)
2589 flog = getfile(fn)
2589 try:
2590 try:
2590 fnode = ctx.filenode(fn)
2591 fnode = ctx.filenode(fn)
2591 except error.LookupError:
2592 except error.LookupError:
2592 continue
2593 continue
2593
2594
2594 copied = flog.renamed(fnode)
2595 copied = flog.renamed(fnode)
2595 copy = follow and copied and copied[0]
2596 copy = follow and copied and copied[0]
2596 if copy:
2597 if copy:
2597 copies.setdefault(rev, {})[fn] = copy
2598 copies.setdefault(rev, {})[fn] = copy
2598 if fn in skip:
2599 if fn in skip:
2599 if copy:
2600 if copy:
2600 skip[copy] = True
2601 skip[copy] = True
2601 continue
2602 continue
2602 files.append(fn)
2603 files.append(fn)
2603
2604
2604 if fn not in matches[rev]:
2605 if fn not in matches[rev]:
2605 grepbody(fn, rev, flog.read(fnode))
2606 grepbody(fn, rev, flog.read(fnode))
2606
2607
2607 pfn = copy or fn
2608 pfn = copy or fn
2608 if pfn not in matches[parent]:
2609 if pfn not in matches[parent]:
2609 try:
2610 try:
2610 fnode = pctx.filenode(pfn)
2611 fnode = pctx.filenode(pfn)
2611 grepbody(pfn, parent, flog.read(fnode))
2612 grepbody(pfn, parent, flog.read(fnode))
2612 except error.LookupError:
2613 except error.LookupError:
2613 pass
2614 pass
2614
2615
2615 ui.pager('grep')
2616 ui.pager('grep')
2616 fm = ui.formatter('grep', opts)
2617 fm = ui.formatter('grep', opts)
2617 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2618 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2618 rev = ctx.rev()
2619 rev = ctx.rev()
2619 parent = ctx.p1().rev()
2620 parent = ctx.p1().rev()
2620 for fn in sorted(revfiles.get(rev, [])):
2621 for fn in sorted(revfiles.get(rev, [])):
2621 states = matches[rev][fn]
2622 states = matches[rev][fn]
2622 copy = copies.get(rev, {}).get(fn)
2623 copy = copies.get(rev, {}).get(fn)
2623 if fn in skip:
2624 if fn in skip:
2624 if copy:
2625 if copy:
2625 skip[copy] = True
2626 skip[copy] = True
2626 continue
2627 continue
2627 pstates = matches.get(parent, {}).get(copy or fn, [])
2628 pstates = matches.get(parent, {}).get(copy or fn, [])
2628 if pstates or states:
2629 if pstates or states:
2629 r = display(fm, fn, ctx, pstates, states)
2630 r = display(fm, fn, ctx, pstates, states)
2630 found = found or r
2631 found = found or r
2631 if r and not opts.get('all'):
2632 if r and not opts.get('all'):
2632 skip[fn] = True
2633 skip[fn] = True
2633 if copy:
2634 if copy:
2634 skip[copy] = True
2635 skip[copy] = True
2635 del matches[rev]
2636 del matches[rev]
2636 del revfiles[rev]
2637 del revfiles[rev]
2637 fm.end()
2638 fm.end()
2638
2639
2639 return not found
2640 return not found
2640
2641
2641 @command('heads',
2642 @command('heads',
2642 [('r', 'rev', '',
2643 [('r', 'rev', '',
2643 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2644 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2644 ('t', 'topo', False, _('show topological heads only')),
2645 ('t', 'topo', False, _('show topological heads only')),
2645 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2646 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2646 ('c', 'closed', False, _('show normal and closed branch heads')),
2647 ('c', 'closed', False, _('show normal and closed branch heads')),
2647 ] + templateopts,
2648 ] + templateopts,
2648 _('[-ct] [-r STARTREV] [REV]...'))
2649 _('[-ct] [-r STARTREV] [REV]...'))
2649 def heads(ui, repo, *branchrevs, **opts):
2650 def heads(ui, repo, *branchrevs, **opts):
2650 """show branch heads
2651 """show branch heads
2651
2652
2652 With no arguments, show all open branch heads in the repository.
2653 With no arguments, show all open branch heads in the repository.
2653 Branch heads are changesets that have no descendants on the
2654 Branch heads are changesets that have no descendants on the
2654 same branch. They are where development generally takes place and
2655 same branch. They are where development generally takes place and
2655 are the usual targets for update and merge operations.
2656 are the usual targets for update and merge operations.
2656
2657
2657 If one or more REVs are given, only open branch heads on the
2658 If one or more REVs are given, only open branch heads on the
2658 branches associated with the specified changesets are shown. This
2659 branches associated with the specified changesets are shown. This
2659 means that you can use :hg:`heads .` to see the heads on the
2660 means that you can use :hg:`heads .` to see the heads on the
2660 currently checked-out branch.
2661 currently checked-out branch.
2661
2662
2662 If -c/--closed is specified, also show branch heads marked closed
2663 If -c/--closed is specified, also show branch heads marked closed
2663 (see :hg:`commit --close-branch`).
2664 (see :hg:`commit --close-branch`).
2664
2665
2665 If STARTREV is specified, only those heads that are descendants of
2666 If STARTREV is specified, only those heads that are descendants of
2666 STARTREV will be displayed.
2667 STARTREV will be displayed.
2667
2668
2668 If -t/--topo is specified, named branch mechanics will be ignored and only
2669 If -t/--topo is specified, named branch mechanics will be ignored and only
2669 topological heads (changesets with no children) will be shown.
2670 topological heads (changesets with no children) will be shown.
2670
2671
2671 Returns 0 if matching heads are found, 1 if not.
2672 Returns 0 if matching heads are found, 1 if not.
2672 """
2673 """
2673
2674
2674 start = None
2675 start = None
2675 if 'rev' in opts:
2676 if 'rev' in opts:
2676 start = scmutil.revsingle(repo, opts['rev'], None).node()
2677 start = scmutil.revsingle(repo, opts['rev'], None).node()
2677
2678
2678 if opts.get('topo'):
2679 if opts.get('topo'):
2679 heads = [repo[h] for h in repo.heads(start)]
2680 heads = [repo[h] for h in repo.heads(start)]
2680 else:
2681 else:
2681 heads = []
2682 heads = []
2682 for branch in repo.branchmap():
2683 for branch in repo.branchmap():
2683 heads += repo.branchheads(branch, start, opts.get('closed'))
2684 heads += repo.branchheads(branch, start, opts.get('closed'))
2684 heads = [repo[h] for h in heads]
2685 heads = [repo[h] for h in heads]
2685
2686
2686 if branchrevs:
2687 if branchrevs:
2687 branches = set(repo[br].branch() for br in branchrevs)
2688 branches = set(repo[br].branch() for br in branchrevs)
2688 heads = [h for h in heads if h.branch() in branches]
2689 heads = [h for h in heads if h.branch() in branches]
2689
2690
2690 if opts.get('active') and branchrevs:
2691 if opts.get('active') and branchrevs:
2691 dagheads = repo.heads(start)
2692 dagheads = repo.heads(start)
2692 heads = [h for h in heads if h.node() in dagheads]
2693 heads = [h for h in heads if h.node() in dagheads]
2693
2694
2694 if branchrevs:
2695 if branchrevs:
2695 haveheads = set(h.branch() for h in heads)
2696 haveheads = set(h.branch() for h in heads)
2696 if branches - haveheads:
2697 if branches - haveheads:
2697 headless = ', '.join(b for b in branches - haveheads)
2698 headless = ', '.join(b for b in branches - haveheads)
2698 msg = _('no open branch heads found on branches %s')
2699 msg = _('no open branch heads found on branches %s')
2699 if opts.get('rev'):
2700 if opts.get('rev'):
2700 msg += _(' (started at %s)') % opts['rev']
2701 msg += _(' (started at %s)') % opts['rev']
2701 ui.warn((msg + '\n') % headless)
2702 ui.warn((msg + '\n') % headless)
2702
2703
2703 if not heads:
2704 if not heads:
2704 return 1
2705 return 1
2705
2706
2706 heads = sorted(heads, key=lambda x: -x.rev())
2707 heads = sorted(heads, key=lambda x: -x.rev())
2707 displayer = cmdutil.show_changeset(ui, repo, opts)
2708 displayer = cmdutil.show_changeset(ui, repo, opts)
2708 for ctx in heads:
2709 for ctx in heads:
2709 displayer.show(ctx)
2710 displayer.show(ctx)
2710 displayer.close()
2711 displayer.close()
2711
2712
2712 @command('help',
2713 @command('help',
2713 [('e', 'extension', None, _('show only help for extensions')),
2714 [('e', 'extension', None, _('show only help for extensions')),
2714 ('c', 'command', None, _('show only help for commands')),
2715 ('c', 'command', None, _('show only help for commands')),
2715 ('k', 'keyword', None, _('show topics matching keyword')),
2716 ('k', 'keyword', None, _('show topics matching keyword')),
2716 ('s', 'system', [], _('show help for specific platform(s)')),
2717 ('s', 'system', [], _('show help for specific platform(s)')),
2717 ],
2718 ],
2718 _('[-ecks] [TOPIC]'),
2719 _('[-ecks] [TOPIC]'),
2719 norepo=True)
2720 norepo=True)
2720 def help_(ui, name=None, **opts):
2721 def help_(ui, name=None, **opts):
2721 """show help for a given topic or a help overview
2722 """show help for a given topic or a help overview
2722
2723
2723 With no arguments, print a list of commands with short help messages.
2724 With no arguments, print a list of commands with short help messages.
2724
2725
2725 Given a topic, extension, or command name, print help for that
2726 Given a topic, extension, or command name, print help for that
2726 topic.
2727 topic.
2727
2728
2728 Returns 0 if successful.
2729 Returns 0 if successful.
2729 """
2730 """
2730
2731
2731 keep = opts.get('system') or []
2732 keep = opts.get('system') or []
2732 if len(keep) == 0:
2733 if len(keep) == 0:
2733 if pycompat.sysplatform.startswith('win'):
2734 if pycompat.sysplatform.startswith('win'):
2734 keep.append('windows')
2735 keep.append('windows')
2735 elif pycompat.sysplatform == 'OpenVMS':
2736 elif pycompat.sysplatform == 'OpenVMS':
2736 keep.append('vms')
2737 keep.append('vms')
2737 elif pycompat.sysplatform == 'plan9':
2738 elif pycompat.sysplatform == 'plan9':
2738 keep.append('plan9')
2739 keep.append('plan9')
2739 else:
2740 else:
2740 keep.append('unix')
2741 keep.append('unix')
2741 keep.append(pycompat.sysplatform.lower())
2742 keep.append(pycompat.sysplatform.lower())
2742 if ui.verbose:
2743 if ui.verbose:
2743 keep.append('verbose')
2744 keep.append('verbose')
2744
2745
2745 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2746 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2746 ui.pager('help')
2747 ui.pager('help')
2747 ui.write(formatted)
2748 ui.write(formatted)
2748
2749
2749
2750
2750 @command('identify|id',
2751 @command('identify|id',
2751 [('r', 'rev', '',
2752 [('r', 'rev', '',
2752 _('identify the specified revision'), _('REV')),
2753 _('identify the specified revision'), _('REV')),
2753 ('n', 'num', None, _('show local revision number')),
2754 ('n', 'num', None, _('show local revision number')),
2754 ('i', 'id', None, _('show global revision id')),
2755 ('i', 'id', None, _('show global revision id')),
2755 ('b', 'branch', None, _('show branch')),
2756 ('b', 'branch', None, _('show branch')),
2756 ('t', 'tags', None, _('show tags')),
2757 ('t', 'tags', None, _('show tags')),
2757 ('B', 'bookmarks', None, _('show bookmarks')),
2758 ('B', 'bookmarks', None, _('show bookmarks')),
2758 ] + remoteopts,
2759 ] + remoteopts,
2759 _('[-nibtB] [-r REV] [SOURCE]'),
2760 _('[-nibtB] [-r REV] [SOURCE]'),
2760 optionalrepo=True)
2761 optionalrepo=True)
2761 def identify(ui, repo, source=None, rev=None,
2762 def identify(ui, repo, source=None, rev=None,
2762 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2763 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2763 """identify the working directory or specified revision
2764 """identify the working directory or specified revision
2764
2765
2765 Print a summary identifying the repository state at REV using one or
2766 Print a summary identifying the repository state at REV using one or
2766 two parent hash identifiers, followed by a "+" if the working
2767 two parent hash identifiers, followed by a "+" if the working
2767 directory has uncommitted changes, the branch name (if not default),
2768 directory has uncommitted changes, the branch name (if not default),
2768 a list of tags, and a list of bookmarks.
2769 a list of tags, and a list of bookmarks.
2769
2770
2770 When REV is not given, print a summary of the current state of the
2771 When REV is not given, print a summary of the current state of the
2771 repository.
2772 repository.
2772
2773
2773 Specifying a path to a repository root or Mercurial bundle will
2774 Specifying a path to a repository root or Mercurial bundle will
2774 cause lookup to operate on that repository/bundle.
2775 cause lookup to operate on that repository/bundle.
2775
2776
2776 .. container:: verbose
2777 .. container:: verbose
2777
2778
2778 Examples:
2779 Examples:
2779
2780
2780 - generate a build identifier for the working directory::
2781 - generate a build identifier for the working directory::
2781
2782
2782 hg id --id > build-id.dat
2783 hg id --id > build-id.dat
2783
2784
2784 - find the revision corresponding to a tag::
2785 - find the revision corresponding to a tag::
2785
2786
2786 hg id -n -r 1.3
2787 hg id -n -r 1.3
2787
2788
2788 - check the most recent revision of a remote repository::
2789 - check the most recent revision of a remote repository::
2789
2790
2790 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2791 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2791
2792
2792 See :hg:`log` for generating more information about specific revisions,
2793 See :hg:`log` for generating more information about specific revisions,
2793 including full hash identifiers.
2794 including full hash identifiers.
2794
2795
2795 Returns 0 if successful.
2796 Returns 0 if successful.
2796 """
2797 """
2797
2798
2798 if not repo and not source:
2799 if not repo and not source:
2799 raise error.Abort(_("there is no Mercurial repository here "
2800 raise error.Abort(_("there is no Mercurial repository here "
2800 "(.hg not found)"))
2801 "(.hg not found)"))
2801
2802
2802 if ui.debugflag:
2803 if ui.debugflag:
2803 hexfunc = hex
2804 hexfunc = hex
2804 else:
2805 else:
2805 hexfunc = short
2806 hexfunc = short
2806 default = not (num or id or branch or tags or bookmarks)
2807 default = not (num or id or branch or tags or bookmarks)
2807 output = []
2808 output = []
2808 revs = []
2809 revs = []
2809
2810
2810 if source:
2811 if source:
2811 source, branches = hg.parseurl(ui.expandpath(source))
2812 source, branches = hg.parseurl(ui.expandpath(source))
2812 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2813 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2813 repo = peer.local()
2814 repo = peer.local()
2814 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2815 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2815
2816
2816 if not repo:
2817 if not repo:
2817 if num or branch or tags:
2818 if num or branch or tags:
2818 raise error.Abort(
2819 raise error.Abort(
2819 _("can't query remote revision number, branch, or tags"))
2820 _("can't query remote revision number, branch, or tags"))
2820 if not rev and revs:
2821 if not rev and revs:
2821 rev = revs[0]
2822 rev = revs[0]
2822 if not rev:
2823 if not rev:
2823 rev = "tip"
2824 rev = "tip"
2824
2825
2825 remoterev = peer.lookup(rev)
2826 remoterev = peer.lookup(rev)
2826 if default or id:
2827 if default or id:
2827 output = [hexfunc(remoterev)]
2828 output = [hexfunc(remoterev)]
2828
2829
2829 def getbms():
2830 def getbms():
2830 bms = []
2831 bms = []
2831
2832
2832 if 'bookmarks' in peer.listkeys('namespaces'):
2833 if 'bookmarks' in peer.listkeys('namespaces'):
2833 hexremoterev = hex(remoterev)
2834 hexremoterev = hex(remoterev)
2834 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2835 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2835 if bmr == hexremoterev]
2836 if bmr == hexremoterev]
2836
2837
2837 return sorted(bms)
2838 return sorted(bms)
2838
2839
2839 if bookmarks:
2840 if bookmarks:
2840 output.extend(getbms())
2841 output.extend(getbms())
2841 elif default and not ui.quiet:
2842 elif default and not ui.quiet:
2842 # multiple bookmarks for a single parent separated by '/'
2843 # multiple bookmarks for a single parent separated by '/'
2843 bm = '/'.join(getbms())
2844 bm = '/'.join(getbms())
2844 if bm:
2845 if bm:
2845 output.append(bm)
2846 output.append(bm)
2846 else:
2847 else:
2847 ctx = scmutil.revsingle(repo, rev, None)
2848 ctx = scmutil.revsingle(repo, rev, None)
2848
2849
2849 if ctx.rev() is None:
2850 if ctx.rev() is None:
2850 ctx = repo[None]
2851 ctx = repo[None]
2851 parents = ctx.parents()
2852 parents = ctx.parents()
2852 taglist = []
2853 taglist = []
2853 for p in parents:
2854 for p in parents:
2854 taglist.extend(p.tags())
2855 taglist.extend(p.tags())
2855
2856
2856 changed = ""
2857 changed = ""
2857 if default or id or num:
2858 if default or id or num:
2858 if (any(repo.status())
2859 if (any(repo.status())
2859 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2860 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2860 changed = '+'
2861 changed = '+'
2861 if default or id:
2862 if default or id:
2862 output = ["%s%s" %
2863 output = ["%s%s" %
2863 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2864 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2864 if num:
2865 if num:
2865 output.append("%s%s" %
2866 output.append("%s%s" %
2866 ('+'.join([str(p.rev()) for p in parents]), changed))
2867 ('+'.join([str(p.rev()) for p in parents]), changed))
2867 else:
2868 else:
2868 if default or id:
2869 if default or id:
2869 output = [hexfunc(ctx.node())]
2870 output = [hexfunc(ctx.node())]
2870 if num:
2871 if num:
2871 output.append(str(ctx.rev()))
2872 output.append(str(ctx.rev()))
2872 taglist = ctx.tags()
2873 taglist = ctx.tags()
2873
2874
2874 if default and not ui.quiet:
2875 if default and not ui.quiet:
2875 b = ctx.branch()
2876 b = ctx.branch()
2876 if b != 'default':
2877 if b != 'default':
2877 output.append("(%s)" % b)
2878 output.append("(%s)" % b)
2878
2879
2879 # multiple tags for a single parent separated by '/'
2880 # multiple tags for a single parent separated by '/'
2880 t = '/'.join(taglist)
2881 t = '/'.join(taglist)
2881 if t:
2882 if t:
2882 output.append(t)
2883 output.append(t)
2883
2884
2884 # multiple bookmarks for a single parent separated by '/'
2885 # multiple bookmarks for a single parent separated by '/'
2885 bm = '/'.join(ctx.bookmarks())
2886 bm = '/'.join(ctx.bookmarks())
2886 if bm:
2887 if bm:
2887 output.append(bm)
2888 output.append(bm)
2888 else:
2889 else:
2889 if branch:
2890 if branch:
2890 output.append(ctx.branch())
2891 output.append(ctx.branch())
2891
2892
2892 if tags:
2893 if tags:
2893 output.extend(taglist)
2894 output.extend(taglist)
2894
2895
2895 if bookmarks:
2896 if bookmarks:
2896 output.extend(ctx.bookmarks())
2897 output.extend(ctx.bookmarks())
2897
2898
2898 ui.write("%s\n" % ' '.join(output))
2899 ui.write("%s\n" % ' '.join(output))
2899
2900
2900 @command('import|patch',
2901 @command('import|patch',
2901 [('p', 'strip', 1,
2902 [('p', 'strip', 1,
2902 _('directory strip option for patch. This has the same '
2903 _('directory strip option for patch. This has the same '
2903 'meaning as the corresponding patch option'), _('NUM')),
2904 'meaning as the corresponding patch option'), _('NUM')),
2904 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2905 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2905 ('e', 'edit', False, _('invoke editor on commit messages')),
2906 ('e', 'edit', False, _('invoke editor on commit messages')),
2906 ('f', 'force', None,
2907 ('f', 'force', None,
2907 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2908 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2908 ('', 'no-commit', None,
2909 ('', 'no-commit', None,
2909 _("don't commit, just update the working directory")),
2910 _("don't commit, just update the working directory")),
2910 ('', 'bypass', None,
2911 ('', 'bypass', None,
2911 _("apply patch without touching the working directory")),
2912 _("apply patch without touching the working directory")),
2912 ('', 'partial', None,
2913 ('', 'partial', None,
2913 _('commit even if some hunks fail')),
2914 _('commit even if some hunks fail')),
2914 ('', 'exact', None,
2915 ('', 'exact', None,
2915 _('abort if patch would apply lossily')),
2916 _('abort if patch would apply lossily')),
2916 ('', 'prefix', '',
2917 ('', 'prefix', '',
2917 _('apply patch to subdirectory'), _('DIR')),
2918 _('apply patch to subdirectory'), _('DIR')),
2918 ('', 'import-branch', None,
2919 ('', 'import-branch', None,
2919 _('use any branch information in patch (implied by --exact)'))] +
2920 _('use any branch information in patch (implied by --exact)'))] +
2920 commitopts + commitopts2 + similarityopts,
2921 commitopts + commitopts2 + similarityopts,
2921 _('[OPTION]... PATCH...'))
2922 _('[OPTION]... PATCH...'))
2922 def import_(ui, repo, patch1=None, *patches, **opts):
2923 def import_(ui, repo, patch1=None, *patches, **opts):
2923 """import an ordered set of patches
2924 """import an ordered set of patches
2924
2925
2925 Import a list of patches and commit them individually (unless
2926 Import a list of patches and commit them individually (unless
2926 --no-commit is specified).
2927 --no-commit is specified).
2927
2928
2928 To read a patch from standard input (stdin), use "-" as the patch
2929 To read a patch from standard input (stdin), use "-" as the patch
2929 name. If a URL is specified, the patch will be downloaded from
2930 name. If a URL is specified, the patch will be downloaded from
2930 there.
2931 there.
2931
2932
2932 Import first applies changes to the working directory (unless
2933 Import first applies changes to the working directory (unless
2933 --bypass is specified), import will abort if there are outstanding
2934 --bypass is specified), import will abort if there are outstanding
2934 changes.
2935 changes.
2935
2936
2936 Use --bypass to apply and commit patches directly to the
2937 Use --bypass to apply and commit patches directly to the
2937 repository, without affecting the working directory. Without
2938 repository, without affecting the working directory. Without
2938 --exact, patches will be applied on top of the working directory
2939 --exact, patches will be applied on top of the working directory
2939 parent revision.
2940 parent revision.
2940
2941
2941 You can import a patch straight from a mail message. Even patches
2942 You can import a patch straight from a mail message. Even patches
2942 as attachments work (to use the body part, it must have type
2943 as attachments work (to use the body part, it must have type
2943 text/plain or text/x-patch). From and Subject headers of email
2944 text/plain or text/x-patch). From and Subject headers of email
2944 message are used as default committer and commit message. All
2945 message are used as default committer and commit message. All
2945 text/plain body parts before first diff are added to the commit
2946 text/plain body parts before first diff are added to the commit
2946 message.
2947 message.
2947
2948
2948 If the imported patch was generated by :hg:`export`, user and
2949 If the imported patch was generated by :hg:`export`, user and
2949 description from patch override values from message headers and
2950 description from patch override values from message headers and
2950 body. Values given on command line with -m/--message and -u/--user
2951 body. Values given on command line with -m/--message and -u/--user
2951 override these.
2952 override these.
2952
2953
2953 If --exact is specified, import will set the working directory to
2954 If --exact is specified, import will set the working directory to
2954 the parent of each patch before applying it, and will abort if the
2955 the parent of each patch before applying it, and will abort if the
2955 resulting changeset has a different ID than the one recorded in
2956 resulting changeset has a different ID than the one recorded in
2956 the patch. This will guard against various ways that portable
2957 the patch. This will guard against various ways that portable
2957 patch formats and mail systems might fail to transfer Mercurial
2958 patch formats and mail systems might fail to transfer Mercurial
2958 data or metadata. See :hg:`bundle` for lossless transmission.
2959 data or metadata. See :hg:`bundle` for lossless transmission.
2959
2960
2960 Use --partial to ensure a changeset will be created from the patch
2961 Use --partial to ensure a changeset will be created from the patch
2961 even if some hunks fail to apply. Hunks that fail to apply will be
2962 even if some hunks fail to apply. Hunks that fail to apply will be
2962 written to a <target-file>.rej file. Conflicts can then be resolved
2963 written to a <target-file>.rej file. Conflicts can then be resolved
2963 by hand before :hg:`commit --amend` is run to update the created
2964 by hand before :hg:`commit --amend` is run to update the created
2964 changeset. This flag exists to let people import patches that
2965 changeset. This flag exists to let people import patches that
2965 partially apply without losing the associated metadata (author,
2966 partially apply without losing the associated metadata (author,
2966 date, description, ...).
2967 date, description, ...).
2967
2968
2968 .. note::
2969 .. note::
2969
2970
2970 When no hunks apply cleanly, :hg:`import --partial` will create
2971 When no hunks apply cleanly, :hg:`import --partial` will create
2971 an empty changeset, importing only the patch metadata.
2972 an empty changeset, importing only the patch metadata.
2972
2973
2973 With -s/--similarity, hg will attempt to discover renames and
2974 With -s/--similarity, hg will attempt to discover renames and
2974 copies in the patch in the same way as :hg:`addremove`.
2975 copies in the patch in the same way as :hg:`addremove`.
2975
2976
2976 It is possible to use external patch programs to perform the patch
2977 It is possible to use external patch programs to perform the patch
2977 by setting the ``ui.patch`` configuration option. For the default
2978 by setting the ``ui.patch`` configuration option. For the default
2978 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2979 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2979 See :hg:`help config` for more information about configuration
2980 See :hg:`help config` for more information about configuration
2980 files and how to use these options.
2981 files and how to use these options.
2981
2982
2982 See :hg:`help dates` for a list of formats valid for -d/--date.
2983 See :hg:`help dates` for a list of formats valid for -d/--date.
2983
2984
2984 .. container:: verbose
2985 .. container:: verbose
2985
2986
2986 Examples:
2987 Examples:
2987
2988
2988 - import a traditional patch from a website and detect renames::
2989 - import a traditional patch from a website and detect renames::
2989
2990
2990 hg import -s 80 http://example.com/bugfix.patch
2991 hg import -s 80 http://example.com/bugfix.patch
2991
2992
2992 - import a changeset from an hgweb server::
2993 - import a changeset from an hgweb server::
2993
2994
2994 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2995 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2995
2996
2996 - import all the patches in an Unix-style mbox::
2997 - import all the patches in an Unix-style mbox::
2997
2998
2998 hg import incoming-patches.mbox
2999 hg import incoming-patches.mbox
2999
3000
3000 - import patches from stdin::
3001 - import patches from stdin::
3001
3002
3002 hg import -
3003 hg import -
3003
3004
3004 - attempt to exactly restore an exported changeset (not always
3005 - attempt to exactly restore an exported changeset (not always
3005 possible)::
3006 possible)::
3006
3007
3007 hg import --exact proposed-fix.patch
3008 hg import --exact proposed-fix.patch
3008
3009
3009 - use an external tool to apply a patch which is too fuzzy for
3010 - use an external tool to apply a patch which is too fuzzy for
3010 the default internal tool.
3011 the default internal tool.
3011
3012
3012 hg import --config ui.patch="patch --merge" fuzzy.patch
3013 hg import --config ui.patch="patch --merge" fuzzy.patch
3013
3014
3014 - change the default fuzzing from 2 to a less strict 7
3015 - change the default fuzzing from 2 to a less strict 7
3015
3016
3016 hg import --config ui.fuzz=7 fuzz.patch
3017 hg import --config ui.fuzz=7 fuzz.patch
3017
3018
3018 Returns 0 on success, 1 on partial success (see --partial).
3019 Returns 0 on success, 1 on partial success (see --partial).
3019 """
3020 """
3020
3021
3021 if not patch1:
3022 if not patch1:
3022 raise error.Abort(_('need at least one patch to import'))
3023 raise error.Abort(_('need at least one patch to import'))
3023
3024
3024 patches = (patch1,) + patches
3025 patches = (patch1,) + patches
3025
3026
3026 date = opts.get('date')
3027 date = opts.get('date')
3027 if date:
3028 if date:
3028 opts['date'] = util.parsedate(date)
3029 opts['date'] = util.parsedate(date)
3029
3030
3030 exact = opts.get('exact')
3031 exact = opts.get('exact')
3031 update = not opts.get('bypass')
3032 update = not opts.get('bypass')
3032 if not update and opts.get('no_commit'):
3033 if not update and opts.get('no_commit'):
3033 raise error.Abort(_('cannot use --no-commit with --bypass'))
3034 raise error.Abort(_('cannot use --no-commit with --bypass'))
3034 try:
3035 try:
3035 sim = float(opts.get('similarity') or 0)
3036 sim = float(opts.get('similarity') or 0)
3036 except ValueError:
3037 except ValueError:
3037 raise error.Abort(_('similarity must be a number'))
3038 raise error.Abort(_('similarity must be a number'))
3038 if sim < 0 or sim > 100:
3039 if sim < 0 or sim > 100:
3039 raise error.Abort(_('similarity must be between 0 and 100'))
3040 raise error.Abort(_('similarity must be between 0 and 100'))
3040 if sim and not update:
3041 if sim and not update:
3041 raise error.Abort(_('cannot use --similarity with --bypass'))
3042 raise error.Abort(_('cannot use --similarity with --bypass'))
3042 if exact:
3043 if exact:
3043 if opts.get('edit'):
3044 if opts.get('edit'):
3044 raise error.Abort(_('cannot use --exact with --edit'))
3045 raise error.Abort(_('cannot use --exact with --edit'))
3045 if opts.get('prefix'):
3046 if opts.get('prefix'):
3046 raise error.Abort(_('cannot use --exact with --prefix'))
3047 raise error.Abort(_('cannot use --exact with --prefix'))
3047
3048
3048 base = opts["base"]
3049 base = opts["base"]
3049 wlock = dsguard = lock = tr = None
3050 wlock = dsguard = lock = tr = None
3050 msgs = []
3051 msgs = []
3051 ret = 0
3052 ret = 0
3052
3053
3053
3054
3054 try:
3055 try:
3055 wlock = repo.wlock()
3056 wlock = repo.wlock()
3056
3057
3057 if update:
3058 if update:
3058 cmdutil.checkunfinished(repo)
3059 cmdutil.checkunfinished(repo)
3059 if (exact or not opts.get('force')):
3060 if (exact or not opts.get('force')):
3060 cmdutil.bailifchanged(repo)
3061 cmdutil.bailifchanged(repo)
3061
3062
3062 if not opts.get('no_commit'):
3063 if not opts.get('no_commit'):
3063 lock = repo.lock()
3064 lock = repo.lock()
3064 tr = repo.transaction('import')
3065 tr = repo.transaction('import')
3065 else:
3066 else:
3066 dsguard = dirstateguard.dirstateguard(repo, 'import')
3067 dsguard = dirstateguard.dirstateguard(repo, 'import')
3067 parents = repo[None].parents()
3068 parents = repo[None].parents()
3068 for patchurl in patches:
3069 for patchurl in patches:
3069 if patchurl == '-':
3070 if patchurl == '-':
3070 ui.status(_('applying patch from stdin\n'))
3071 ui.status(_('applying patch from stdin\n'))
3071 patchfile = ui.fin
3072 patchfile = ui.fin
3072 patchurl = 'stdin' # for error message
3073 patchurl = 'stdin' # for error message
3073 else:
3074 else:
3074 patchurl = os.path.join(base, patchurl)
3075 patchurl = os.path.join(base, patchurl)
3075 ui.status(_('applying %s\n') % patchurl)
3076 ui.status(_('applying %s\n') % patchurl)
3076 patchfile = hg.openpath(ui, patchurl)
3077 patchfile = hg.openpath(ui, patchurl)
3077
3078
3078 haspatch = False
3079 haspatch = False
3079 for hunk in patch.split(patchfile):
3080 for hunk in patch.split(patchfile):
3080 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3081 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3081 parents, opts,
3082 parents, opts,
3082 msgs, hg.clean)
3083 msgs, hg.clean)
3083 if msg:
3084 if msg:
3084 haspatch = True
3085 haspatch = True
3085 ui.note(msg + '\n')
3086 ui.note(msg + '\n')
3086 if update or exact:
3087 if update or exact:
3087 parents = repo[None].parents()
3088 parents = repo[None].parents()
3088 else:
3089 else:
3089 parents = [repo[node]]
3090 parents = [repo[node]]
3090 if rej:
3091 if rej:
3091 ui.write_err(_("patch applied partially\n"))
3092 ui.write_err(_("patch applied partially\n"))
3092 ui.write_err(_("(fix the .rej files and run "
3093 ui.write_err(_("(fix the .rej files and run "
3093 "`hg commit --amend`)\n"))
3094 "`hg commit --amend`)\n"))
3094 ret = 1
3095 ret = 1
3095 break
3096 break
3096
3097
3097 if not haspatch:
3098 if not haspatch:
3098 raise error.Abort(_('%s: no diffs found') % patchurl)
3099 raise error.Abort(_('%s: no diffs found') % patchurl)
3099
3100
3100 if tr:
3101 if tr:
3101 tr.close()
3102 tr.close()
3102 if msgs:
3103 if msgs:
3103 repo.savecommitmessage('\n* * *\n'.join(msgs))
3104 repo.savecommitmessage('\n* * *\n'.join(msgs))
3104 if dsguard:
3105 if dsguard:
3105 dsguard.close()
3106 dsguard.close()
3106 return ret
3107 return ret
3107 finally:
3108 finally:
3108 if tr:
3109 if tr:
3109 tr.release()
3110 tr.release()
3110 release(lock, dsguard, wlock)
3111 release(lock, dsguard, wlock)
3111
3112
3112 @command('incoming|in',
3113 @command('incoming|in',
3113 [('f', 'force', None,
3114 [('f', 'force', None,
3114 _('run even if remote repository is unrelated')),
3115 _('run even if remote repository is unrelated')),
3115 ('n', 'newest-first', None, _('show newest record first')),
3116 ('n', 'newest-first', None, _('show newest record first')),
3116 ('', 'bundle', '',
3117 ('', 'bundle', '',
3117 _('file to store the bundles into'), _('FILE')),
3118 _('file to store the bundles into'), _('FILE')),
3118 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3119 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3119 ('B', 'bookmarks', False, _("compare bookmarks")),
3120 ('B', 'bookmarks', False, _("compare bookmarks")),
3120 ('b', 'branch', [],
3121 ('b', 'branch', [],
3121 _('a specific branch you would like to pull'), _('BRANCH')),
3122 _('a specific branch you would like to pull'), _('BRANCH')),
3122 ] + logopts + remoteopts + subrepoopts,
3123 ] + logopts + remoteopts + subrepoopts,
3123 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3124 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3124 def incoming(ui, repo, source="default", **opts):
3125 def incoming(ui, repo, source="default", **opts):
3125 """show new changesets found in source
3126 """show new changesets found in source
3126
3127
3127 Show new changesets found in the specified path/URL or the default
3128 Show new changesets found in the specified path/URL or the default
3128 pull location. These are the changesets that would have been pulled
3129 pull location. These are the changesets that would have been pulled
3129 if a pull at the time you issued this command.
3130 if a pull at the time you issued this command.
3130
3131
3131 See pull for valid source format details.
3132 See pull for valid source format details.
3132
3133
3133 .. container:: verbose
3134 .. container:: verbose
3134
3135
3135 With -B/--bookmarks, the result of bookmark comparison between
3136 With -B/--bookmarks, the result of bookmark comparison between
3136 local and remote repositories is displayed. With -v/--verbose,
3137 local and remote repositories is displayed. With -v/--verbose,
3137 status is also displayed for each bookmark like below::
3138 status is also displayed for each bookmark like below::
3138
3139
3139 BM1 01234567890a added
3140 BM1 01234567890a added
3140 BM2 1234567890ab advanced
3141 BM2 1234567890ab advanced
3141 BM3 234567890abc diverged
3142 BM3 234567890abc diverged
3142 BM4 34567890abcd changed
3143 BM4 34567890abcd changed
3143
3144
3144 The action taken locally when pulling depends on the
3145 The action taken locally when pulling depends on the
3145 status of each bookmark:
3146 status of each bookmark:
3146
3147
3147 :``added``: pull will create it
3148 :``added``: pull will create it
3148 :``advanced``: pull will update it
3149 :``advanced``: pull will update it
3149 :``diverged``: pull will create a divergent bookmark
3150 :``diverged``: pull will create a divergent bookmark
3150 :``changed``: result depends on remote changesets
3151 :``changed``: result depends on remote changesets
3151
3152
3152 From the point of view of pulling behavior, bookmark
3153 From the point of view of pulling behavior, bookmark
3153 existing only in the remote repository are treated as ``added``,
3154 existing only in the remote repository are treated as ``added``,
3154 even if it is in fact locally deleted.
3155 even if it is in fact locally deleted.
3155
3156
3156 .. container:: verbose
3157 .. container:: verbose
3157
3158
3158 For remote repository, using --bundle avoids downloading the
3159 For remote repository, using --bundle avoids downloading the
3159 changesets twice if the incoming is followed by a pull.
3160 changesets twice if the incoming is followed by a pull.
3160
3161
3161 Examples:
3162 Examples:
3162
3163
3163 - show incoming changes with patches and full description::
3164 - show incoming changes with patches and full description::
3164
3165
3165 hg incoming -vp
3166 hg incoming -vp
3166
3167
3167 - show incoming changes excluding merges, store a bundle::
3168 - show incoming changes excluding merges, store a bundle::
3168
3169
3169 hg in -vpM --bundle incoming.hg
3170 hg in -vpM --bundle incoming.hg
3170 hg pull incoming.hg
3171 hg pull incoming.hg
3171
3172
3172 - briefly list changes inside a bundle::
3173 - briefly list changes inside a bundle::
3173
3174
3174 hg in changes.hg -T "{desc|firstline}\\n"
3175 hg in changes.hg -T "{desc|firstline}\\n"
3175
3176
3176 Returns 0 if there are incoming changes, 1 otherwise.
3177 Returns 0 if there are incoming changes, 1 otherwise.
3177 """
3178 """
3178 if opts.get('graph'):
3179 if opts.get('graph'):
3179 cmdutil.checkunsupportedgraphflags([], opts)
3180 cmdutil.checkunsupportedgraphflags([], opts)
3180 def display(other, chlist, displayer):
3181 def display(other, chlist, displayer):
3181 revdag = cmdutil.graphrevs(other, chlist, opts)
3182 revdag = cmdutil.graphrevs(other, chlist, opts)
3182 cmdutil.displaygraph(ui, repo, revdag, displayer,
3183 cmdutil.displaygraph(ui, repo, revdag, displayer,
3183 graphmod.asciiedges)
3184 graphmod.asciiedges)
3184
3185
3185 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3186 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3186 return 0
3187 return 0
3187
3188
3188 if opts.get('bundle') and opts.get('subrepos'):
3189 if opts.get('bundle') and opts.get('subrepos'):
3189 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3190 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3190
3191
3191 if opts.get('bookmarks'):
3192 if opts.get('bookmarks'):
3192 source, branches = hg.parseurl(ui.expandpath(source),
3193 source, branches = hg.parseurl(ui.expandpath(source),
3193 opts.get('branch'))
3194 opts.get('branch'))
3194 other = hg.peer(repo, opts, source)
3195 other = hg.peer(repo, opts, source)
3195 if 'bookmarks' not in other.listkeys('namespaces'):
3196 if 'bookmarks' not in other.listkeys('namespaces'):
3196 ui.warn(_("remote doesn't support bookmarks\n"))
3197 ui.warn(_("remote doesn't support bookmarks\n"))
3197 return 0
3198 return 0
3198 ui.pager('incoming')
3199 ui.pager('incoming')
3199 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3200 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3200 return bookmarks.incoming(ui, repo, other)
3201 return bookmarks.incoming(ui, repo, other)
3201
3202
3202 repo._subtoppath = ui.expandpath(source)
3203 repo._subtoppath = ui.expandpath(source)
3203 try:
3204 try:
3204 return hg.incoming(ui, repo, source, opts)
3205 return hg.incoming(ui, repo, source, opts)
3205 finally:
3206 finally:
3206 del repo._subtoppath
3207 del repo._subtoppath
3207
3208
3208
3209
3209 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3210 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3210 norepo=True)
3211 norepo=True)
3211 def init(ui, dest=".", **opts):
3212 def init(ui, dest=".", **opts):
3212 """create a new repository in the given directory
3213 """create a new repository in the given directory
3213
3214
3214 Initialize a new repository in the given directory. If the given
3215 Initialize a new repository in the given directory. If the given
3215 directory does not exist, it will be created.
3216 directory does not exist, it will be created.
3216
3217
3217 If no directory is given, the current directory is used.
3218 If no directory is given, the current directory is used.
3218
3219
3219 It is possible to specify an ``ssh://`` URL as the destination.
3220 It is possible to specify an ``ssh://`` URL as the destination.
3220 See :hg:`help urls` for more information.
3221 See :hg:`help urls` for more information.
3221
3222
3222 Returns 0 on success.
3223 Returns 0 on success.
3223 """
3224 """
3224 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3225 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3225
3226
3226 @command('locate',
3227 @command('locate',
3227 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3228 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3228 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3229 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3229 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3230 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3230 ] + walkopts,
3231 ] + walkopts,
3231 _('[OPTION]... [PATTERN]...'))
3232 _('[OPTION]... [PATTERN]...'))
3232 def locate(ui, repo, *pats, **opts):
3233 def locate(ui, repo, *pats, **opts):
3233 """locate files matching specific patterns (DEPRECATED)
3234 """locate files matching specific patterns (DEPRECATED)
3234
3235
3235 Print files under Mercurial control in the working directory whose
3236 Print files under Mercurial control in the working directory whose
3236 names match the given patterns.
3237 names match the given patterns.
3237
3238
3238 By default, this command searches all directories in the working
3239 By default, this command searches all directories in the working
3239 directory. To search just the current directory and its
3240 directory. To search just the current directory and its
3240 subdirectories, use "--include .".
3241 subdirectories, use "--include .".
3241
3242
3242 If no patterns are given to match, this command prints the names
3243 If no patterns are given to match, this command prints the names
3243 of all files under Mercurial control in the working directory.
3244 of all files under Mercurial control in the working directory.
3244
3245
3245 If you want to feed the output of this command into the "xargs"
3246 If you want to feed the output of this command into the "xargs"
3246 command, use the -0 option to both this command and "xargs". This
3247 command, use the -0 option to both this command and "xargs". This
3247 will avoid the problem of "xargs" treating single filenames that
3248 will avoid the problem of "xargs" treating single filenames that
3248 contain whitespace as multiple filenames.
3249 contain whitespace as multiple filenames.
3249
3250
3250 See :hg:`help files` for a more versatile command.
3251 See :hg:`help files` for a more versatile command.
3251
3252
3252 Returns 0 if a match is found, 1 otherwise.
3253 Returns 0 if a match is found, 1 otherwise.
3253 """
3254 """
3254 if opts.get('print0'):
3255 if opts.get('print0'):
3255 end = '\0'
3256 end = '\0'
3256 else:
3257 else:
3257 end = '\n'
3258 end = '\n'
3258 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3259 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3259
3260
3260 ret = 1
3261 ret = 1
3261 ctx = repo[rev]
3262 ctx = repo[rev]
3262 m = scmutil.match(ctx, pats, opts, default='relglob',
3263 m = scmutil.match(ctx, pats, opts, default='relglob',
3263 badfn=lambda x, y: False)
3264 badfn=lambda x, y: False)
3264
3265
3265 ui.pager('locate')
3266 ui.pager('locate')
3266 for abs in ctx.matches(m):
3267 for abs in ctx.matches(m):
3267 if opts.get('fullpath'):
3268 if opts.get('fullpath'):
3268 ui.write(repo.wjoin(abs), end)
3269 ui.write(repo.wjoin(abs), end)
3269 else:
3270 else:
3270 ui.write(((pats and m.rel(abs)) or abs), end)
3271 ui.write(((pats and m.rel(abs)) or abs), end)
3271 ret = 0
3272 ret = 0
3272
3273
3273 return ret
3274 return ret
3274
3275
3275 @command('^log|history',
3276 @command('^log|history',
3276 [('f', 'follow', None,
3277 [('f', 'follow', None,
3277 _('follow changeset history, or file history across copies and renames')),
3278 _('follow changeset history, or file history across copies and renames')),
3278 ('', 'follow-first', None,
3279 ('', 'follow-first', None,
3279 _('only follow the first parent of merge changesets (DEPRECATED)')),
3280 _('only follow the first parent of merge changesets (DEPRECATED)')),
3280 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3281 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3281 ('C', 'copies', None, _('show copied files')),
3282 ('C', 'copies', None, _('show copied files')),
3282 ('k', 'keyword', [],
3283 ('k', 'keyword', [],
3283 _('do case-insensitive search for a given text'), _('TEXT')),
3284 _('do case-insensitive search for a given text'), _('TEXT')),
3284 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3285 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3285 ('', 'removed', None, _('include revisions where files were removed')),
3286 ('', 'removed', None, _('include revisions where files were removed')),
3286 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3287 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3287 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3288 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3288 ('', 'only-branch', [],
3289 ('', 'only-branch', [],
3289 _('show only changesets within the given named branch (DEPRECATED)'),
3290 _('show only changesets within the given named branch (DEPRECATED)'),
3290 _('BRANCH')),
3291 _('BRANCH')),
3291 ('b', 'branch', [],
3292 ('b', 'branch', [],
3292 _('show changesets within the given named branch'), _('BRANCH')),
3293 _('show changesets within the given named branch'), _('BRANCH')),
3293 ('P', 'prune', [],
3294 ('P', 'prune', [],
3294 _('do not display revision or any of its ancestors'), _('REV')),
3295 _('do not display revision or any of its ancestors'), _('REV')),
3295 ] + logopts + walkopts,
3296 ] + logopts + walkopts,
3296 _('[OPTION]... [FILE]'),
3297 _('[OPTION]... [FILE]'),
3297 inferrepo=True)
3298 inferrepo=True)
3298 def log(ui, repo, *pats, **opts):
3299 def log(ui, repo, *pats, **opts):
3299 """show revision history of entire repository or files
3300 """show revision history of entire repository or files
3300
3301
3301 Print the revision history of the specified files or the entire
3302 Print the revision history of the specified files or the entire
3302 project.
3303 project.
3303
3304
3304 If no revision range is specified, the default is ``tip:0`` unless
3305 If no revision range is specified, the default is ``tip:0`` unless
3305 --follow is set, in which case the working directory parent is
3306 --follow is set, in which case the working directory parent is
3306 used as the starting revision.
3307 used as the starting revision.
3307
3308
3308 File history is shown without following rename or copy history of
3309 File history is shown without following rename or copy history of
3309 files. Use -f/--follow with a filename to follow history across
3310 files. Use -f/--follow with a filename to follow history across
3310 renames and copies. --follow without a filename will only show
3311 renames and copies. --follow without a filename will only show
3311 ancestors or descendants of the starting revision.
3312 ancestors or descendants of the starting revision.
3312
3313
3313 By default this command prints revision number and changeset id,
3314 By default this command prints revision number and changeset id,
3314 tags, non-trivial parents, user, date and time, and a summary for
3315 tags, non-trivial parents, user, date and time, and a summary for
3315 each commit. When the -v/--verbose switch is used, the list of
3316 each commit. When the -v/--verbose switch is used, the list of
3316 changed files and full commit message are shown.
3317 changed files and full commit message are shown.
3317
3318
3318 With --graph the revisions are shown as an ASCII art DAG with the most
3319 With --graph the revisions are shown as an ASCII art DAG with the most
3319 recent changeset at the top.
3320 recent changeset at the top.
3320 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3321 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3321 and '+' represents a fork where the changeset from the lines below is a
3322 and '+' represents a fork where the changeset from the lines below is a
3322 parent of the 'o' merge on the same line.
3323 parent of the 'o' merge on the same line.
3323
3324
3324 .. note::
3325 .. note::
3325
3326
3326 :hg:`log --patch` may generate unexpected diff output for merge
3327 :hg:`log --patch` may generate unexpected diff output for merge
3327 changesets, as it will only compare the merge changeset against
3328 changesets, as it will only compare the merge changeset against
3328 its first parent. Also, only files different from BOTH parents
3329 its first parent. Also, only files different from BOTH parents
3329 will appear in files:.
3330 will appear in files:.
3330
3331
3331 .. note::
3332 .. note::
3332
3333
3333 For performance reasons, :hg:`log FILE` may omit duplicate changes
3334 For performance reasons, :hg:`log FILE` may omit duplicate changes
3334 made on branches and will not show removals or mode changes. To
3335 made on branches and will not show removals or mode changes. To
3335 see all such changes, use the --removed switch.
3336 see all such changes, use the --removed switch.
3336
3337
3337 .. container:: verbose
3338 .. container:: verbose
3338
3339
3339 Some examples:
3340 Some examples:
3340
3341
3341 - changesets with full descriptions and file lists::
3342 - changesets with full descriptions and file lists::
3342
3343
3343 hg log -v
3344 hg log -v
3344
3345
3345 - changesets ancestral to the working directory::
3346 - changesets ancestral to the working directory::
3346
3347
3347 hg log -f
3348 hg log -f
3348
3349
3349 - last 10 commits on the current branch::
3350 - last 10 commits on the current branch::
3350
3351
3351 hg log -l 10 -b .
3352 hg log -l 10 -b .
3352
3353
3353 - changesets showing all modifications of a file, including removals::
3354 - changesets showing all modifications of a file, including removals::
3354
3355
3355 hg log --removed file.c
3356 hg log --removed file.c
3356
3357
3357 - all changesets that touch a directory, with diffs, excluding merges::
3358 - all changesets that touch a directory, with diffs, excluding merges::
3358
3359
3359 hg log -Mp lib/
3360 hg log -Mp lib/
3360
3361
3361 - all revision numbers that match a keyword::
3362 - all revision numbers that match a keyword::
3362
3363
3363 hg log -k bug --template "{rev}\\n"
3364 hg log -k bug --template "{rev}\\n"
3364
3365
3365 - the full hash identifier of the working directory parent::
3366 - the full hash identifier of the working directory parent::
3366
3367
3367 hg log -r . --template "{node}\\n"
3368 hg log -r . --template "{node}\\n"
3368
3369
3369 - list available log templates::
3370 - list available log templates::
3370
3371
3371 hg log -T list
3372 hg log -T list
3372
3373
3373 - check if a given changeset is included in a tagged release::
3374 - check if a given changeset is included in a tagged release::
3374
3375
3375 hg log -r "a21ccf and ancestor(1.9)"
3376 hg log -r "a21ccf and ancestor(1.9)"
3376
3377
3377 - find all changesets by some user in a date range::
3378 - find all changesets by some user in a date range::
3378
3379
3379 hg log -k alice -d "may 2008 to jul 2008"
3380 hg log -k alice -d "may 2008 to jul 2008"
3380
3381
3381 - summary of all changesets after the last tag::
3382 - summary of all changesets after the last tag::
3382
3383
3383 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3384 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3384
3385
3385 See :hg:`help dates` for a list of formats valid for -d/--date.
3386 See :hg:`help dates` for a list of formats valid for -d/--date.
3386
3387
3387 See :hg:`help revisions` for more about specifying and ordering
3388 See :hg:`help revisions` for more about specifying and ordering
3388 revisions.
3389 revisions.
3389
3390
3390 See :hg:`help templates` for more about pre-packaged styles and
3391 See :hg:`help templates` for more about pre-packaged styles and
3391 specifying custom templates.
3392 specifying custom templates.
3392
3393
3393 Returns 0 on success.
3394 Returns 0 on success.
3394
3395
3395 """
3396 """
3396 if opts.get('follow') and opts.get('rev'):
3397 if opts.get('follow') and opts.get('rev'):
3397 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3398 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3398 del opts['follow']
3399 del opts['follow']
3399
3400
3400 if opts.get('graph'):
3401 if opts.get('graph'):
3401 return cmdutil.graphlog(ui, repo, *pats, **opts)
3402 return cmdutil.graphlog(ui, repo, *pats, **opts)
3402
3403
3403 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3404 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3404 limit = cmdutil.loglimit(opts)
3405 limit = cmdutil.loglimit(opts)
3405 count = 0
3406 count = 0
3406
3407
3407 getrenamed = None
3408 getrenamed = None
3408 if opts.get('copies'):
3409 if opts.get('copies'):
3409 endrev = None
3410 endrev = None
3410 if opts.get('rev'):
3411 if opts.get('rev'):
3411 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3412 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3412 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3413 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3413
3414
3414 ui.pager('log')
3415 ui.pager('log')
3415 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3416 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3416 for rev in revs:
3417 for rev in revs:
3417 if count == limit:
3418 if count == limit:
3418 break
3419 break
3419 ctx = repo[rev]
3420 ctx = repo[rev]
3420 copies = None
3421 copies = None
3421 if getrenamed is not None and rev:
3422 if getrenamed is not None and rev:
3422 copies = []
3423 copies = []
3423 for fn in ctx.files():
3424 for fn in ctx.files():
3424 rename = getrenamed(fn, rev)
3425 rename = getrenamed(fn, rev)
3425 if rename:
3426 if rename:
3426 copies.append((fn, rename[0]))
3427 copies.append((fn, rename[0]))
3427 if filematcher:
3428 if filematcher:
3428 revmatchfn = filematcher(ctx.rev())
3429 revmatchfn = filematcher(ctx.rev())
3429 else:
3430 else:
3430 revmatchfn = None
3431 revmatchfn = None
3431 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3432 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3432 if displayer.flush(ctx):
3433 if displayer.flush(ctx):
3433 count += 1
3434 count += 1
3434
3435
3435 displayer.close()
3436 displayer.close()
3436
3437
3437 @command('manifest',
3438 @command('manifest',
3438 [('r', 'rev', '', _('revision to display'), _('REV')),
3439 [('r', 'rev', '', _('revision to display'), _('REV')),
3439 ('', 'all', False, _("list files from all revisions"))]
3440 ('', 'all', False, _("list files from all revisions"))]
3440 + formatteropts,
3441 + formatteropts,
3441 _('[-r REV]'))
3442 _('[-r REV]'))
3442 def manifest(ui, repo, node=None, rev=None, **opts):
3443 def manifest(ui, repo, node=None, rev=None, **opts):
3443 """output the current or given revision of the project manifest
3444 """output the current or given revision of the project manifest
3444
3445
3445 Print a list of version controlled files for the given revision.
3446 Print a list of version controlled files for the given revision.
3446 If no revision is given, the first parent of the working directory
3447 If no revision is given, the first parent of the working directory
3447 is used, or the null revision if no revision is checked out.
3448 is used, or the null revision if no revision is checked out.
3448
3449
3449 With -v, print file permissions, symlink and executable bits.
3450 With -v, print file permissions, symlink and executable bits.
3450 With --debug, print file revision hashes.
3451 With --debug, print file revision hashes.
3451
3452
3452 If option --all is specified, the list of all files from all revisions
3453 If option --all is specified, the list of all files from all revisions
3453 is printed. This includes deleted and renamed files.
3454 is printed. This includes deleted and renamed files.
3454
3455
3455 Returns 0 on success.
3456 Returns 0 on success.
3456 """
3457 """
3457 fm = ui.formatter('manifest', opts)
3458 fm = ui.formatter('manifest', opts)
3458
3459
3459 if opts.get('all'):
3460 if opts.get('all'):
3460 if rev or node:
3461 if rev or node:
3461 raise error.Abort(_("can't specify a revision with --all"))
3462 raise error.Abort(_("can't specify a revision with --all"))
3462
3463
3463 res = []
3464 res = []
3464 prefix = "data/"
3465 prefix = "data/"
3465 suffix = ".i"
3466 suffix = ".i"
3466 plen = len(prefix)
3467 plen = len(prefix)
3467 slen = len(suffix)
3468 slen = len(suffix)
3468 with repo.lock():
3469 with repo.lock():
3469 for fn, b, size in repo.store.datafiles():
3470 for fn, b, size in repo.store.datafiles():
3470 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3471 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3471 res.append(fn[plen:-slen])
3472 res.append(fn[plen:-slen])
3472 ui.pager('manifest')
3473 ui.pager('manifest')
3473 for f in res:
3474 for f in res:
3474 fm.startitem()
3475 fm.startitem()
3475 fm.write("path", '%s\n', f)
3476 fm.write("path", '%s\n', f)
3476 fm.end()
3477 fm.end()
3477 return
3478 return
3478
3479
3479 if rev and node:
3480 if rev and node:
3480 raise error.Abort(_("please specify just one revision"))
3481 raise error.Abort(_("please specify just one revision"))
3481
3482
3482 if not node:
3483 if not node:
3483 node = rev
3484 node = rev
3484
3485
3485 char = {'l': '@', 'x': '*', '': ''}
3486 char = {'l': '@', 'x': '*', '': ''}
3486 mode = {'l': '644', 'x': '755', '': '644'}
3487 mode = {'l': '644', 'x': '755', '': '644'}
3487 ctx = scmutil.revsingle(repo, node)
3488 ctx = scmutil.revsingle(repo, node)
3488 mf = ctx.manifest()
3489 mf = ctx.manifest()
3489 ui.pager('manifest')
3490 ui.pager('manifest')
3490 for f in ctx:
3491 for f in ctx:
3491 fm.startitem()
3492 fm.startitem()
3492 fl = ctx[f].flags()
3493 fl = ctx[f].flags()
3493 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3494 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3494 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3495 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3495 fm.write('path', '%s\n', f)
3496 fm.write('path', '%s\n', f)
3496 fm.end()
3497 fm.end()
3497
3498
3498 @command('^merge',
3499 @command('^merge',
3499 [('f', 'force', None,
3500 [('f', 'force', None,
3500 _('force a merge including outstanding changes (DEPRECATED)')),
3501 _('force a merge including outstanding changes (DEPRECATED)')),
3501 ('r', 'rev', '', _('revision to merge'), _('REV')),
3502 ('r', 'rev', '', _('revision to merge'), _('REV')),
3502 ('P', 'preview', None,
3503 ('P', 'preview', None,
3503 _('review revisions to merge (no merge is performed)'))
3504 _('review revisions to merge (no merge is performed)'))
3504 ] + mergetoolopts,
3505 ] + mergetoolopts,
3505 _('[-P] [[-r] REV]'))
3506 _('[-P] [[-r] REV]'))
3506 def merge(ui, repo, node=None, **opts):
3507 def merge(ui, repo, node=None, **opts):
3507 """merge another revision into working directory
3508 """merge another revision into working directory
3508
3509
3509 The current working directory is updated with all changes made in
3510 The current working directory is updated with all changes made in
3510 the requested revision since the last common predecessor revision.
3511 the requested revision since the last common predecessor revision.
3511
3512
3512 Files that changed between either parent are marked as changed for
3513 Files that changed between either parent are marked as changed for
3513 the next commit and a commit must be performed before any further
3514 the next commit and a commit must be performed before any further
3514 updates to the repository are allowed. The next commit will have
3515 updates to the repository are allowed. The next commit will have
3515 two parents.
3516 two parents.
3516
3517
3517 ``--tool`` can be used to specify the merge tool used for file
3518 ``--tool`` can be used to specify the merge tool used for file
3518 merges. It overrides the HGMERGE environment variable and your
3519 merges. It overrides the HGMERGE environment variable and your
3519 configuration files. See :hg:`help merge-tools` for options.
3520 configuration files. See :hg:`help merge-tools` for options.
3520
3521
3521 If no revision is specified, the working directory's parent is a
3522 If no revision is specified, the working directory's parent is a
3522 head revision, and the current branch contains exactly one other
3523 head revision, and the current branch contains exactly one other
3523 head, the other head is merged with by default. Otherwise, an
3524 head, the other head is merged with by default. Otherwise, an
3524 explicit revision with which to merge with must be provided.
3525 explicit revision with which to merge with must be provided.
3525
3526
3526 See :hg:`help resolve` for information on handling file conflicts.
3527 See :hg:`help resolve` for information on handling file conflicts.
3527
3528
3528 To undo an uncommitted merge, use :hg:`update --clean .` which
3529 To undo an uncommitted merge, use :hg:`update --clean .` which
3529 will check out a clean copy of the original merge parent, losing
3530 will check out a clean copy of the original merge parent, losing
3530 all changes.
3531 all changes.
3531
3532
3532 Returns 0 on success, 1 if there are unresolved files.
3533 Returns 0 on success, 1 if there are unresolved files.
3533 """
3534 """
3534
3535
3535 if opts.get('rev') and node:
3536 if opts.get('rev') and node:
3536 raise error.Abort(_("please specify just one revision"))
3537 raise error.Abort(_("please specify just one revision"))
3537 if not node:
3538 if not node:
3538 node = opts.get('rev')
3539 node = opts.get('rev')
3539
3540
3540 if node:
3541 if node:
3541 node = scmutil.revsingle(repo, node).node()
3542 node = scmutil.revsingle(repo, node).node()
3542
3543
3543 if not node:
3544 if not node:
3544 node = repo[destutil.destmerge(repo)].node()
3545 node = repo[destutil.destmerge(repo)].node()
3545
3546
3546 if opts.get('preview'):
3547 if opts.get('preview'):
3547 # find nodes that are ancestors of p2 but not of p1
3548 # find nodes that are ancestors of p2 but not of p1
3548 p1 = repo.lookup('.')
3549 p1 = repo.lookup('.')
3549 p2 = repo.lookup(node)
3550 p2 = repo.lookup(node)
3550 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3551 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3551
3552
3552 displayer = cmdutil.show_changeset(ui, repo, opts)
3553 displayer = cmdutil.show_changeset(ui, repo, opts)
3553 for node in nodes:
3554 for node in nodes:
3554 displayer.show(repo[node])
3555 displayer.show(repo[node])
3555 displayer.close()
3556 displayer.close()
3556 return 0
3557 return 0
3557
3558
3558 try:
3559 try:
3559 # ui.forcemerge is an internal variable, do not document
3560 # ui.forcemerge is an internal variable, do not document
3560 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3561 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3561 force = opts.get('force')
3562 force = opts.get('force')
3562 labels = ['working copy', 'merge rev']
3563 labels = ['working copy', 'merge rev']
3563 return hg.merge(repo, node, force=force, mergeforce=force,
3564 return hg.merge(repo, node, force=force, mergeforce=force,
3564 labels=labels)
3565 labels=labels)
3565 finally:
3566 finally:
3566 ui.setconfig('ui', 'forcemerge', '', 'merge')
3567 ui.setconfig('ui', 'forcemerge', '', 'merge')
3567
3568
3568 @command('outgoing|out',
3569 @command('outgoing|out',
3569 [('f', 'force', None, _('run even when the destination is unrelated')),
3570 [('f', 'force', None, _('run even when the destination is unrelated')),
3570 ('r', 'rev', [],
3571 ('r', 'rev', [],
3571 _('a changeset intended to be included in the destination'), _('REV')),
3572 _('a changeset intended to be included in the destination'), _('REV')),
3572 ('n', 'newest-first', None, _('show newest record first')),
3573 ('n', 'newest-first', None, _('show newest record first')),
3573 ('B', 'bookmarks', False, _('compare bookmarks')),
3574 ('B', 'bookmarks', False, _('compare bookmarks')),
3574 ('b', 'branch', [], _('a specific branch you would like to push'),
3575 ('b', 'branch', [], _('a specific branch you would like to push'),
3575 _('BRANCH')),
3576 _('BRANCH')),
3576 ] + logopts + remoteopts + subrepoopts,
3577 ] + logopts + remoteopts + subrepoopts,
3577 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3578 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3578 def outgoing(ui, repo, dest=None, **opts):
3579 def outgoing(ui, repo, dest=None, **opts):
3579 """show changesets not found in the destination
3580 """show changesets not found in the destination
3580
3581
3581 Show changesets not found in the specified destination repository
3582 Show changesets not found in the specified destination repository
3582 or the default push location. These are the changesets that would
3583 or the default push location. These are the changesets that would
3583 be pushed if a push was requested.
3584 be pushed if a push was requested.
3584
3585
3585 See pull for details of valid destination formats.
3586 See pull for details of valid destination formats.
3586
3587
3587 .. container:: verbose
3588 .. container:: verbose
3588
3589
3589 With -B/--bookmarks, the result of bookmark comparison between
3590 With -B/--bookmarks, the result of bookmark comparison between
3590 local and remote repositories is displayed. With -v/--verbose,
3591 local and remote repositories is displayed. With -v/--verbose,
3591 status is also displayed for each bookmark like below::
3592 status is also displayed for each bookmark like below::
3592
3593
3593 BM1 01234567890a added
3594 BM1 01234567890a added
3594 BM2 deleted
3595 BM2 deleted
3595 BM3 234567890abc advanced
3596 BM3 234567890abc advanced
3596 BM4 34567890abcd diverged
3597 BM4 34567890abcd diverged
3597 BM5 4567890abcde changed
3598 BM5 4567890abcde changed
3598
3599
3599 The action taken when pushing depends on the
3600 The action taken when pushing depends on the
3600 status of each bookmark:
3601 status of each bookmark:
3601
3602
3602 :``added``: push with ``-B`` will create it
3603 :``added``: push with ``-B`` will create it
3603 :``deleted``: push with ``-B`` will delete it
3604 :``deleted``: push with ``-B`` will delete it
3604 :``advanced``: push will update it
3605 :``advanced``: push will update it
3605 :``diverged``: push with ``-B`` will update it
3606 :``diverged``: push with ``-B`` will update it
3606 :``changed``: push with ``-B`` will update it
3607 :``changed``: push with ``-B`` will update it
3607
3608
3608 From the point of view of pushing behavior, bookmarks
3609 From the point of view of pushing behavior, bookmarks
3609 existing only in the remote repository are treated as
3610 existing only in the remote repository are treated as
3610 ``deleted``, even if it is in fact added remotely.
3611 ``deleted``, even if it is in fact added remotely.
3611
3612
3612 Returns 0 if there are outgoing changes, 1 otherwise.
3613 Returns 0 if there are outgoing changes, 1 otherwise.
3613 """
3614 """
3614 if opts.get('graph'):
3615 if opts.get('graph'):
3615 cmdutil.checkunsupportedgraphflags([], opts)
3616 cmdutil.checkunsupportedgraphflags([], opts)
3616 o, other = hg._outgoing(ui, repo, dest, opts)
3617 o, other = hg._outgoing(ui, repo, dest, opts)
3617 if not o:
3618 if not o:
3618 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3619 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3619 return
3620 return
3620
3621
3621 revdag = cmdutil.graphrevs(repo, o, opts)
3622 revdag = cmdutil.graphrevs(repo, o, opts)
3622 ui.pager('outgoing')
3623 ui.pager('outgoing')
3623 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3624 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3624 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3625 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3625 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3626 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3626 return 0
3627 return 0
3627
3628
3628 if opts.get('bookmarks'):
3629 if opts.get('bookmarks'):
3629 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3630 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3630 dest, branches = hg.parseurl(dest, opts.get('branch'))
3631 dest, branches = hg.parseurl(dest, opts.get('branch'))
3631 other = hg.peer(repo, opts, dest)
3632 other = hg.peer(repo, opts, dest)
3632 if 'bookmarks' not in other.listkeys('namespaces'):
3633 if 'bookmarks' not in other.listkeys('namespaces'):
3633 ui.warn(_("remote doesn't support bookmarks\n"))
3634 ui.warn(_("remote doesn't support bookmarks\n"))
3634 return 0
3635 return 0
3635 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3636 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3636 ui.pager('outgoing')
3637 ui.pager('outgoing')
3637 return bookmarks.outgoing(ui, repo, other)
3638 return bookmarks.outgoing(ui, repo, other)
3638
3639
3639 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3640 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3640 try:
3641 try:
3641 return hg.outgoing(ui, repo, dest, opts)
3642 return hg.outgoing(ui, repo, dest, opts)
3642 finally:
3643 finally:
3643 del repo._subtoppath
3644 del repo._subtoppath
3644
3645
3645 @command('parents',
3646 @command('parents',
3646 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3647 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3647 ] + templateopts,
3648 ] + templateopts,
3648 _('[-r REV] [FILE]'),
3649 _('[-r REV] [FILE]'),
3649 inferrepo=True)
3650 inferrepo=True)
3650 def parents(ui, repo, file_=None, **opts):
3651 def parents(ui, repo, file_=None, **opts):
3651 """show the parents of the working directory or revision (DEPRECATED)
3652 """show the parents of the working directory or revision (DEPRECATED)
3652
3653
3653 Print the working directory's parent revisions. If a revision is
3654 Print the working directory's parent revisions. If a revision is
3654 given via -r/--rev, the parent of that revision will be printed.
3655 given via -r/--rev, the parent of that revision will be printed.
3655 If a file argument is given, the revision in which the file was
3656 If a file argument is given, the revision in which the file was
3656 last changed (before the working directory revision or the
3657 last changed (before the working directory revision or the
3657 argument to --rev if given) is printed.
3658 argument to --rev if given) is printed.
3658
3659
3659 This command is equivalent to::
3660 This command is equivalent to::
3660
3661
3661 hg log -r "p1()+p2()" or
3662 hg log -r "p1()+p2()" or
3662 hg log -r "p1(REV)+p2(REV)" or
3663 hg log -r "p1(REV)+p2(REV)" or
3663 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3664 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3664 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3665 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3665
3666
3666 See :hg:`summary` and :hg:`help revsets` for related information.
3667 See :hg:`summary` and :hg:`help revsets` for related information.
3667
3668
3668 Returns 0 on success.
3669 Returns 0 on success.
3669 """
3670 """
3670
3671
3671 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3672 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3672
3673
3673 if file_:
3674 if file_:
3674 m = scmutil.match(ctx, (file_,), opts)
3675 m = scmutil.match(ctx, (file_,), opts)
3675 if m.anypats() or len(m.files()) != 1:
3676 if m.anypats() or len(m.files()) != 1:
3676 raise error.Abort(_('can only specify an explicit filename'))
3677 raise error.Abort(_('can only specify an explicit filename'))
3677 file_ = m.files()[0]
3678 file_ = m.files()[0]
3678 filenodes = []
3679 filenodes = []
3679 for cp in ctx.parents():
3680 for cp in ctx.parents():
3680 if not cp:
3681 if not cp:
3681 continue
3682 continue
3682 try:
3683 try:
3683 filenodes.append(cp.filenode(file_))
3684 filenodes.append(cp.filenode(file_))
3684 except error.LookupError:
3685 except error.LookupError:
3685 pass
3686 pass
3686 if not filenodes:
3687 if not filenodes:
3687 raise error.Abort(_("'%s' not found in manifest!") % file_)
3688 raise error.Abort(_("'%s' not found in manifest!") % file_)
3688 p = []
3689 p = []
3689 for fn in filenodes:
3690 for fn in filenodes:
3690 fctx = repo.filectx(file_, fileid=fn)
3691 fctx = repo.filectx(file_, fileid=fn)
3691 p.append(fctx.node())
3692 p.append(fctx.node())
3692 else:
3693 else:
3693 p = [cp.node() for cp in ctx.parents()]
3694 p = [cp.node() for cp in ctx.parents()]
3694
3695
3695 displayer = cmdutil.show_changeset(ui, repo, opts)
3696 displayer = cmdutil.show_changeset(ui, repo, opts)
3696 for n in p:
3697 for n in p:
3697 if n != nullid:
3698 if n != nullid:
3698 displayer.show(repo[n])
3699 displayer.show(repo[n])
3699 displayer.close()
3700 displayer.close()
3700
3701
3701 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3702 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3702 def paths(ui, repo, search=None, **opts):
3703 def paths(ui, repo, search=None, **opts):
3703 """show aliases for remote repositories
3704 """show aliases for remote repositories
3704
3705
3705 Show definition of symbolic path name NAME. If no name is given,
3706 Show definition of symbolic path name NAME. If no name is given,
3706 show definition of all available names.
3707 show definition of all available names.
3707
3708
3708 Option -q/--quiet suppresses all output when searching for NAME
3709 Option -q/--quiet suppresses all output when searching for NAME
3709 and shows only the path names when listing all definitions.
3710 and shows only the path names when listing all definitions.
3710
3711
3711 Path names are defined in the [paths] section of your
3712 Path names are defined in the [paths] section of your
3712 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3713 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3713 repository, ``.hg/hgrc`` is used, too.
3714 repository, ``.hg/hgrc`` is used, too.
3714
3715
3715 The path names ``default`` and ``default-push`` have a special
3716 The path names ``default`` and ``default-push`` have a special
3716 meaning. When performing a push or pull operation, they are used
3717 meaning. When performing a push or pull operation, they are used
3717 as fallbacks if no location is specified on the command-line.
3718 as fallbacks if no location is specified on the command-line.
3718 When ``default-push`` is set, it will be used for push and
3719 When ``default-push`` is set, it will be used for push and
3719 ``default`` will be used for pull; otherwise ``default`` is used
3720 ``default`` will be used for pull; otherwise ``default`` is used
3720 as the fallback for both. When cloning a repository, the clone
3721 as the fallback for both. When cloning a repository, the clone
3721 source is written as ``default`` in ``.hg/hgrc``.
3722 source is written as ``default`` in ``.hg/hgrc``.
3722
3723
3723 .. note::
3724 .. note::
3724
3725
3725 ``default`` and ``default-push`` apply to all inbound (e.g.
3726 ``default`` and ``default-push`` apply to all inbound (e.g.
3726 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3727 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3727 and :hg:`bundle`) operations.
3728 and :hg:`bundle`) operations.
3728
3729
3729 See :hg:`help urls` for more information.
3730 See :hg:`help urls` for more information.
3730
3731
3731 Returns 0 on success.
3732 Returns 0 on success.
3732 """
3733 """
3733 ui.pager('paths')
3734 ui.pager('paths')
3734 if search:
3735 if search:
3735 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3736 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3736 if name == search]
3737 if name == search]
3737 else:
3738 else:
3738 pathitems = sorted(ui.paths.iteritems())
3739 pathitems = sorted(ui.paths.iteritems())
3739
3740
3740 fm = ui.formatter('paths', opts)
3741 fm = ui.formatter('paths', opts)
3741 if fm.isplain():
3742 if fm.isplain():
3742 hidepassword = util.hidepassword
3743 hidepassword = util.hidepassword
3743 else:
3744 else:
3744 hidepassword = str
3745 hidepassword = str
3745 if ui.quiet:
3746 if ui.quiet:
3746 namefmt = '%s\n'
3747 namefmt = '%s\n'
3747 else:
3748 else:
3748 namefmt = '%s = '
3749 namefmt = '%s = '
3749 showsubopts = not search and not ui.quiet
3750 showsubopts = not search and not ui.quiet
3750
3751
3751 for name, path in pathitems:
3752 for name, path in pathitems:
3752 fm.startitem()
3753 fm.startitem()
3753 fm.condwrite(not search, 'name', namefmt, name)
3754 fm.condwrite(not search, 'name', namefmt, name)
3754 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3755 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3755 for subopt, value in sorted(path.suboptions.items()):
3756 for subopt, value in sorted(path.suboptions.items()):
3756 assert subopt not in ('name', 'url')
3757 assert subopt not in ('name', 'url')
3757 if showsubopts:
3758 if showsubopts:
3758 fm.plain('%s:%s = ' % (name, subopt))
3759 fm.plain('%s:%s = ' % (name, subopt))
3759 fm.condwrite(showsubopts, subopt, '%s\n', value)
3760 fm.condwrite(showsubopts, subopt, '%s\n', value)
3760
3761
3761 fm.end()
3762 fm.end()
3762
3763
3763 if search and not pathitems:
3764 if search and not pathitems:
3764 if not ui.quiet:
3765 if not ui.quiet:
3765 ui.warn(_("not found!\n"))
3766 ui.warn(_("not found!\n"))
3766 return 1
3767 return 1
3767 else:
3768 else:
3768 return 0
3769 return 0
3769
3770
3770 @command('phase',
3771 @command('phase',
3771 [('p', 'public', False, _('set changeset phase to public')),
3772 [('p', 'public', False, _('set changeset phase to public')),
3772 ('d', 'draft', False, _('set changeset phase to draft')),
3773 ('d', 'draft', False, _('set changeset phase to draft')),
3773 ('s', 'secret', False, _('set changeset phase to secret')),
3774 ('s', 'secret', False, _('set changeset phase to secret')),
3774 ('f', 'force', False, _('allow to move boundary backward')),
3775 ('f', 'force', False, _('allow to move boundary backward')),
3775 ('r', 'rev', [], _('target revision'), _('REV')),
3776 ('r', 'rev', [], _('target revision'), _('REV')),
3776 ],
3777 ],
3777 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3778 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3778 def phase(ui, repo, *revs, **opts):
3779 def phase(ui, repo, *revs, **opts):
3779 """set or show the current phase name
3780 """set or show the current phase name
3780
3781
3781 With no argument, show the phase name of the current revision(s).
3782 With no argument, show the phase name of the current revision(s).
3782
3783
3783 With one of -p/--public, -d/--draft or -s/--secret, change the
3784 With one of -p/--public, -d/--draft or -s/--secret, change the
3784 phase value of the specified revisions.
3785 phase value of the specified revisions.
3785
3786
3786 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3787 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3787 lower phase to an higher phase. Phases are ordered as follows::
3788 lower phase to an higher phase. Phases are ordered as follows::
3788
3789
3789 public < draft < secret
3790 public < draft < secret
3790
3791
3791 Returns 0 on success, 1 if some phases could not be changed.
3792 Returns 0 on success, 1 if some phases could not be changed.
3792
3793
3793 (For more information about the phases concept, see :hg:`help phases`.)
3794 (For more information about the phases concept, see :hg:`help phases`.)
3794 """
3795 """
3795 # search for a unique phase argument
3796 # search for a unique phase argument
3796 targetphase = None
3797 targetphase = None
3797 for idx, name in enumerate(phases.phasenames):
3798 for idx, name in enumerate(phases.phasenames):
3798 if opts[name]:
3799 if opts[name]:
3799 if targetphase is not None:
3800 if targetphase is not None:
3800 raise error.Abort(_('only one phase can be specified'))
3801 raise error.Abort(_('only one phase can be specified'))
3801 targetphase = idx
3802 targetphase = idx
3802
3803
3803 # look for specified revision
3804 # look for specified revision
3804 revs = list(revs)
3805 revs = list(revs)
3805 revs.extend(opts['rev'])
3806 revs.extend(opts['rev'])
3806 if not revs:
3807 if not revs:
3807 # display both parents as the second parent phase can influence
3808 # display both parents as the second parent phase can influence
3808 # the phase of a merge commit
3809 # the phase of a merge commit
3809 revs = [c.rev() for c in repo[None].parents()]
3810 revs = [c.rev() for c in repo[None].parents()]
3810
3811
3811 revs = scmutil.revrange(repo, revs)
3812 revs = scmutil.revrange(repo, revs)
3812
3813
3813 lock = None
3814 lock = None
3814 ret = 0
3815 ret = 0
3815 if targetphase is None:
3816 if targetphase is None:
3816 # display
3817 # display
3817 for r in revs:
3818 for r in revs:
3818 ctx = repo[r]
3819 ctx = repo[r]
3819 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3820 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3820 else:
3821 else:
3821 tr = None
3822 tr = None
3822 lock = repo.lock()
3823 lock = repo.lock()
3823 try:
3824 try:
3824 tr = repo.transaction("phase")
3825 tr = repo.transaction("phase")
3825 # set phase
3826 # set phase
3826 if not revs:
3827 if not revs:
3827 raise error.Abort(_('empty revision set'))
3828 raise error.Abort(_('empty revision set'))
3828 nodes = [repo[r].node() for r in revs]
3829 nodes = [repo[r].node() for r in revs]
3829 # moving revision from public to draft may hide them
3830 # moving revision from public to draft may hide them
3830 # We have to check result on an unfiltered repository
3831 # We have to check result on an unfiltered repository
3831 unfi = repo.unfiltered()
3832 unfi = repo.unfiltered()
3832 getphase = unfi._phasecache.phase
3833 getphase = unfi._phasecache.phase
3833 olddata = [getphase(unfi, r) for r in unfi]
3834 olddata = [getphase(unfi, r) for r in unfi]
3834 phases.advanceboundary(repo, tr, targetphase, nodes)
3835 phases.advanceboundary(repo, tr, targetphase, nodes)
3835 if opts['force']:
3836 if opts['force']:
3836 phases.retractboundary(repo, tr, targetphase, nodes)
3837 phases.retractboundary(repo, tr, targetphase, nodes)
3837 tr.close()
3838 tr.close()
3838 finally:
3839 finally:
3839 if tr is not None:
3840 if tr is not None:
3840 tr.release()
3841 tr.release()
3841 lock.release()
3842 lock.release()
3842 getphase = unfi._phasecache.phase
3843 getphase = unfi._phasecache.phase
3843 newdata = [getphase(unfi, r) for r in unfi]
3844 newdata = [getphase(unfi, r) for r in unfi]
3844 changes = sum(newdata[r] != olddata[r] for r in unfi)
3845 changes = sum(newdata[r] != olddata[r] for r in unfi)
3845 cl = unfi.changelog
3846 cl = unfi.changelog
3846 rejected = [n for n in nodes
3847 rejected = [n for n in nodes
3847 if newdata[cl.rev(n)] < targetphase]
3848 if newdata[cl.rev(n)] < targetphase]
3848 if rejected:
3849 if rejected:
3849 ui.warn(_('cannot move %i changesets to a higher '
3850 ui.warn(_('cannot move %i changesets to a higher '
3850 'phase, use --force\n') % len(rejected))
3851 'phase, use --force\n') % len(rejected))
3851 ret = 1
3852 ret = 1
3852 if changes:
3853 if changes:
3853 msg = _('phase changed for %i changesets\n') % changes
3854 msg = _('phase changed for %i changesets\n') % changes
3854 if ret:
3855 if ret:
3855 ui.status(msg)
3856 ui.status(msg)
3856 else:
3857 else:
3857 ui.note(msg)
3858 ui.note(msg)
3858 else:
3859 else:
3859 ui.warn(_('no phases changed\n'))
3860 ui.warn(_('no phases changed\n'))
3860 return ret
3861 return ret
3861
3862
3862 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3863 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3863 """Run after a changegroup has been added via pull/unbundle
3864 """Run after a changegroup has been added via pull/unbundle
3864
3865
3865 This takes arguments below:
3866 This takes arguments below:
3866
3867
3867 :modheads: change of heads by pull/unbundle
3868 :modheads: change of heads by pull/unbundle
3868 :optupdate: updating working directory is needed or not
3869 :optupdate: updating working directory is needed or not
3869 :checkout: update destination revision (or None to default destination)
3870 :checkout: update destination revision (or None to default destination)
3870 :brev: a name, which might be a bookmark to be activated after updating
3871 :brev: a name, which might be a bookmark to be activated after updating
3871 """
3872 """
3872 if modheads == 0:
3873 if modheads == 0:
3873 return
3874 return
3874 if optupdate:
3875 if optupdate:
3875 try:
3876 try:
3876 return hg.updatetotally(ui, repo, checkout, brev)
3877 return hg.updatetotally(ui, repo, checkout, brev)
3877 except error.UpdateAbort as inst:
3878 except error.UpdateAbort as inst:
3878 msg = _("not updating: %s") % str(inst)
3879 msg = _("not updating: %s") % str(inst)
3879 hint = inst.hint
3880 hint = inst.hint
3880 raise error.UpdateAbort(msg, hint=hint)
3881 raise error.UpdateAbort(msg, hint=hint)
3881 if modheads > 1:
3882 if modheads > 1:
3882 currentbranchheads = len(repo.branchheads())
3883 currentbranchheads = len(repo.branchheads())
3883 if currentbranchheads == modheads:
3884 if currentbranchheads == modheads:
3884 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3885 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3885 elif currentbranchheads > 1:
3886 elif currentbranchheads > 1:
3886 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3887 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3887 "merge)\n"))
3888 "merge)\n"))
3888 else:
3889 else:
3889 ui.status(_("(run 'hg heads' to see heads)\n"))
3890 ui.status(_("(run 'hg heads' to see heads)\n"))
3890 else:
3891 else:
3891 ui.status(_("(run 'hg update' to get a working copy)\n"))
3892 ui.status(_("(run 'hg update' to get a working copy)\n"))
3892
3893
3893 @command('^pull',
3894 @command('^pull',
3894 [('u', 'update', None,
3895 [('u', 'update', None,
3895 _('update to new branch head if changesets were pulled')),
3896 _('update to new branch head if changesets were pulled')),
3896 ('f', 'force', None, _('run even when remote repository is unrelated')),
3897 ('f', 'force', None, _('run even when remote repository is unrelated')),
3897 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3898 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3898 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3899 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3899 ('b', 'branch', [], _('a specific branch you would like to pull'),
3900 ('b', 'branch', [], _('a specific branch you would like to pull'),
3900 _('BRANCH')),
3901 _('BRANCH')),
3901 ] + remoteopts,
3902 ] + remoteopts,
3902 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3903 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3903 def pull(ui, repo, source="default", **opts):
3904 def pull(ui, repo, source="default", **opts):
3904 """pull changes from the specified source
3905 """pull changes from the specified source
3905
3906
3906 Pull changes from a remote repository to a local one.
3907 Pull changes from a remote repository to a local one.
3907
3908
3908 This finds all changes from the repository at the specified path
3909 This finds all changes from the repository at the specified path
3909 or URL and adds them to a local repository (the current one unless
3910 or URL and adds them to a local repository (the current one unless
3910 -R is specified). By default, this does not update the copy of the
3911 -R is specified). By default, this does not update the copy of the
3911 project in the working directory.
3912 project in the working directory.
3912
3913
3913 Use :hg:`incoming` if you want to see what would have been added
3914 Use :hg:`incoming` if you want to see what would have been added
3914 by a pull at the time you issued this command. If you then decide
3915 by a pull at the time you issued this command. If you then decide
3915 to add those changes to the repository, you should use :hg:`pull
3916 to add those changes to the repository, you should use :hg:`pull
3916 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3917 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3917
3918
3918 If SOURCE is omitted, the 'default' path will be used.
3919 If SOURCE is omitted, the 'default' path will be used.
3919 See :hg:`help urls` for more information.
3920 See :hg:`help urls` for more information.
3920
3921
3921 Specifying bookmark as ``.`` is equivalent to specifying the active
3922 Specifying bookmark as ``.`` is equivalent to specifying the active
3922 bookmark's name.
3923 bookmark's name.
3923
3924
3924 Returns 0 on success, 1 if an update had unresolved files.
3925 Returns 0 on success, 1 if an update had unresolved files.
3925 """
3926 """
3926 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3927 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3927 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3928 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3928 other = hg.peer(repo, opts, source)
3929 other = hg.peer(repo, opts, source)
3929 try:
3930 try:
3930 revs, checkout = hg.addbranchrevs(repo, other, branches,
3931 revs, checkout = hg.addbranchrevs(repo, other, branches,
3931 opts.get('rev'))
3932 opts.get('rev'))
3932
3933
3933
3934
3934 pullopargs = {}
3935 pullopargs = {}
3935 if opts.get('bookmark'):
3936 if opts.get('bookmark'):
3936 if not revs:
3937 if not revs:
3937 revs = []
3938 revs = []
3938 # The list of bookmark used here is not the one used to actually
3939 # The list of bookmark used here is not the one used to actually
3939 # update the bookmark name. This can result in the revision pulled
3940 # update the bookmark name. This can result in the revision pulled
3940 # not ending up with the name of the bookmark because of a race
3941 # not ending up with the name of the bookmark because of a race
3941 # condition on the server. (See issue 4689 for details)
3942 # condition on the server. (See issue 4689 for details)
3942 remotebookmarks = other.listkeys('bookmarks')
3943 remotebookmarks = other.listkeys('bookmarks')
3943 pullopargs['remotebookmarks'] = remotebookmarks
3944 pullopargs['remotebookmarks'] = remotebookmarks
3944 for b in opts['bookmark']:
3945 for b in opts['bookmark']:
3945 b = repo._bookmarks.expandname(b)
3946 b = repo._bookmarks.expandname(b)
3946 if b not in remotebookmarks:
3947 if b not in remotebookmarks:
3947 raise error.Abort(_('remote bookmark %s not found!') % b)
3948 raise error.Abort(_('remote bookmark %s not found!') % b)
3948 revs.append(remotebookmarks[b])
3949 revs.append(remotebookmarks[b])
3949
3950
3950 if revs:
3951 if revs:
3951 try:
3952 try:
3952 # When 'rev' is a bookmark name, we cannot guarantee that it
3953 # When 'rev' is a bookmark name, we cannot guarantee that it
3953 # will be updated with that name because of a race condition
3954 # will be updated with that name because of a race condition
3954 # server side. (See issue 4689 for details)
3955 # server side. (See issue 4689 for details)
3955 oldrevs = revs
3956 oldrevs = revs
3956 revs = [] # actually, nodes
3957 revs = [] # actually, nodes
3957 for r in oldrevs:
3958 for r in oldrevs:
3958 node = other.lookup(r)
3959 node = other.lookup(r)
3959 revs.append(node)
3960 revs.append(node)
3960 if r == checkout:
3961 if r == checkout:
3961 checkout = node
3962 checkout = node
3962 except error.CapabilityError:
3963 except error.CapabilityError:
3963 err = _("other repository doesn't support revision lookup, "
3964 err = _("other repository doesn't support revision lookup, "
3964 "so a rev cannot be specified.")
3965 "so a rev cannot be specified.")
3965 raise error.Abort(err)
3966 raise error.Abort(err)
3966
3967
3967 pullopargs.update(opts.get('opargs', {}))
3968 pullopargs.update(opts.get('opargs', {}))
3968 modheads = exchange.pull(repo, other, heads=revs,
3969 modheads = exchange.pull(repo, other, heads=revs,
3969 force=opts.get('force'),
3970 force=opts.get('force'),
3970 bookmarks=opts.get('bookmark', ()),
3971 bookmarks=opts.get('bookmark', ()),
3971 opargs=pullopargs).cgresult
3972 opargs=pullopargs).cgresult
3972
3973
3973 # brev is a name, which might be a bookmark to be activated at
3974 # brev is a name, which might be a bookmark to be activated at
3974 # the end of the update. In other words, it is an explicit
3975 # the end of the update. In other words, it is an explicit
3975 # destination of the update
3976 # destination of the update
3976 brev = None
3977 brev = None
3977
3978
3978 if checkout:
3979 if checkout:
3979 checkout = str(repo.changelog.rev(checkout))
3980 checkout = str(repo.changelog.rev(checkout))
3980
3981
3981 # order below depends on implementation of
3982 # order below depends on implementation of
3982 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3983 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3983 # because 'checkout' is determined without it.
3984 # because 'checkout' is determined without it.
3984 if opts.get('rev'):
3985 if opts.get('rev'):
3985 brev = opts['rev'][0]
3986 brev = opts['rev'][0]
3986 elif opts.get('branch'):
3987 elif opts.get('branch'):
3987 brev = opts['branch'][0]
3988 brev = opts['branch'][0]
3988 else:
3989 else:
3989 brev = branches[0]
3990 brev = branches[0]
3990 repo._subtoppath = source
3991 repo._subtoppath = source
3991 try:
3992 try:
3992 ret = postincoming(ui, repo, modheads, opts.get('update'),
3993 ret = postincoming(ui, repo, modheads, opts.get('update'),
3993 checkout, brev)
3994 checkout, brev)
3994
3995
3995 finally:
3996 finally:
3996 del repo._subtoppath
3997 del repo._subtoppath
3997
3998
3998 finally:
3999 finally:
3999 other.close()
4000 other.close()
4000 return ret
4001 return ret
4001
4002
4002 @command('^push',
4003 @command('^push',
4003 [('f', 'force', None, _('force push')),
4004 [('f', 'force', None, _('force push')),
4004 ('r', 'rev', [],
4005 ('r', 'rev', [],
4005 _('a changeset intended to be included in the destination'),
4006 _('a changeset intended to be included in the destination'),
4006 _('REV')),
4007 _('REV')),
4007 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4008 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4008 ('b', 'branch', [],
4009 ('b', 'branch', [],
4009 _('a specific branch you would like to push'), _('BRANCH')),
4010 _('a specific branch you would like to push'), _('BRANCH')),
4010 ('', 'new-branch', False, _('allow pushing a new branch')),
4011 ('', 'new-branch', False, _('allow pushing a new branch')),
4011 ] + remoteopts,
4012 ] + remoteopts,
4012 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4013 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4013 def push(ui, repo, dest=None, **opts):
4014 def push(ui, repo, dest=None, **opts):
4014 """push changes to the specified destination
4015 """push changes to the specified destination
4015
4016
4016 Push changesets from the local repository to the specified
4017 Push changesets from the local repository to the specified
4017 destination.
4018 destination.
4018
4019
4019 This operation is symmetrical to pull: it is identical to a pull
4020 This operation is symmetrical to pull: it is identical to a pull
4020 in the destination repository from the current one.
4021 in the destination repository from the current one.
4021
4022
4022 By default, push will not allow creation of new heads at the
4023 By default, push will not allow creation of new heads at the
4023 destination, since multiple heads would make it unclear which head
4024 destination, since multiple heads would make it unclear which head
4024 to use. In this situation, it is recommended to pull and merge
4025 to use. In this situation, it is recommended to pull and merge
4025 before pushing.
4026 before pushing.
4026
4027
4027 Use --new-branch if you want to allow push to create a new named
4028 Use --new-branch if you want to allow push to create a new named
4028 branch that is not present at the destination. This allows you to
4029 branch that is not present at the destination. This allows you to
4029 only create a new branch without forcing other changes.
4030 only create a new branch without forcing other changes.
4030
4031
4031 .. note::
4032 .. note::
4032
4033
4033 Extra care should be taken with the -f/--force option,
4034 Extra care should be taken with the -f/--force option,
4034 which will push all new heads on all branches, an action which will
4035 which will push all new heads on all branches, an action which will
4035 almost always cause confusion for collaborators.
4036 almost always cause confusion for collaborators.
4036
4037
4037 If -r/--rev is used, the specified revision and all its ancestors
4038 If -r/--rev is used, the specified revision and all its ancestors
4038 will be pushed to the remote repository.
4039 will be pushed to the remote repository.
4039
4040
4040 If -B/--bookmark is used, the specified bookmarked revision, its
4041 If -B/--bookmark is used, the specified bookmarked revision, its
4041 ancestors, and the bookmark will be pushed to the remote
4042 ancestors, and the bookmark will be pushed to the remote
4042 repository. Specifying ``.`` is equivalent to specifying the active
4043 repository. Specifying ``.`` is equivalent to specifying the active
4043 bookmark's name.
4044 bookmark's name.
4044
4045
4045 Please see :hg:`help urls` for important details about ``ssh://``
4046 Please see :hg:`help urls` for important details about ``ssh://``
4046 URLs. If DESTINATION is omitted, a default path will be used.
4047 URLs. If DESTINATION is omitted, a default path will be used.
4047
4048
4048 Returns 0 if push was successful, 1 if nothing to push.
4049 Returns 0 if push was successful, 1 if nothing to push.
4049 """
4050 """
4050
4051
4051 if opts.get('bookmark'):
4052 if opts.get('bookmark'):
4052 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4053 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4053 for b in opts['bookmark']:
4054 for b in opts['bookmark']:
4054 # translate -B options to -r so changesets get pushed
4055 # translate -B options to -r so changesets get pushed
4055 b = repo._bookmarks.expandname(b)
4056 b = repo._bookmarks.expandname(b)
4056 if b in repo._bookmarks:
4057 if b in repo._bookmarks:
4057 opts.setdefault('rev', []).append(b)
4058 opts.setdefault('rev', []).append(b)
4058 else:
4059 else:
4059 # if we try to push a deleted bookmark, translate it to null
4060 # if we try to push a deleted bookmark, translate it to null
4060 # this lets simultaneous -r, -b options continue working
4061 # this lets simultaneous -r, -b options continue working
4061 opts.setdefault('rev', []).append("null")
4062 opts.setdefault('rev', []).append("null")
4062
4063
4063 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4064 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4064 if not path:
4065 if not path:
4065 raise error.Abort(_('default repository not configured!'),
4066 raise error.Abort(_('default repository not configured!'),
4066 hint=_("see 'hg help config.paths'"))
4067 hint=_("see 'hg help config.paths'"))
4067 dest = path.pushloc or path.loc
4068 dest = path.pushloc or path.loc
4068 branches = (path.branch, opts.get('branch') or [])
4069 branches = (path.branch, opts.get('branch') or [])
4069 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4070 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4070 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4071 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4071 other = hg.peer(repo, opts, dest)
4072 other = hg.peer(repo, opts, dest)
4072
4073
4073 if revs:
4074 if revs:
4074 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4075 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4075 if not revs:
4076 if not revs:
4076 raise error.Abort(_("specified revisions evaluate to an empty set"),
4077 raise error.Abort(_("specified revisions evaluate to an empty set"),
4077 hint=_("use different revision arguments"))
4078 hint=_("use different revision arguments"))
4078 elif path.pushrev:
4079 elif path.pushrev:
4079 # It doesn't make any sense to specify ancestor revisions. So limit
4080 # It doesn't make any sense to specify ancestor revisions. So limit
4080 # to DAG heads to make discovery simpler.
4081 # to DAG heads to make discovery simpler.
4081 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4082 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4082 revs = scmutil.revrange(repo, [expr])
4083 revs = scmutil.revrange(repo, [expr])
4083 revs = [repo[rev].node() for rev in revs]
4084 revs = [repo[rev].node() for rev in revs]
4084 if not revs:
4085 if not revs:
4085 raise error.Abort(_('default push revset for path evaluates to an '
4086 raise error.Abort(_('default push revset for path evaluates to an '
4086 'empty set'))
4087 'empty set'))
4087
4088
4088 repo._subtoppath = dest
4089 repo._subtoppath = dest
4089 try:
4090 try:
4090 # push subrepos depth-first for coherent ordering
4091 # push subrepos depth-first for coherent ordering
4091 c = repo['']
4092 c = repo['']
4092 subs = c.substate # only repos that are committed
4093 subs = c.substate # only repos that are committed
4093 for s in sorted(subs):
4094 for s in sorted(subs):
4094 result = c.sub(s).push(opts)
4095 result = c.sub(s).push(opts)
4095 if result == 0:
4096 if result == 0:
4096 return not result
4097 return not result
4097 finally:
4098 finally:
4098 del repo._subtoppath
4099 del repo._subtoppath
4099 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4100 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4100 newbranch=opts.get('new_branch'),
4101 newbranch=opts.get('new_branch'),
4101 bookmarks=opts.get('bookmark', ()),
4102 bookmarks=opts.get('bookmark', ()),
4102 opargs=opts.get('opargs'))
4103 opargs=opts.get('opargs'))
4103
4104
4104 result = not pushop.cgresult
4105 result = not pushop.cgresult
4105
4106
4106 if pushop.bkresult is not None:
4107 if pushop.bkresult is not None:
4107 if pushop.bkresult == 2:
4108 if pushop.bkresult == 2:
4108 result = 2
4109 result = 2
4109 elif not result and pushop.bkresult:
4110 elif not result and pushop.bkresult:
4110 result = 2
4111 result = 2
4111
4112
4112 return result
4113 return result
4113
4114
4114 @command('recover', [])
4115 @command('recover', [])
4115 def recover(ui, repo):
4116 def recover(ui, repo):
4116 """roll back an interrupted transaction
4117 """roll back an interrupted transaction
4117
4118
4118 Recover from an interrupted commit or pull.
4119 Recover from an interrupted commit or pull.
4119
4120
4120 This command tries to fix the repository status after an
4121 This command tries to fix the repository status after an
4121 interrupted operation. It should only be necessary when Mercurial
4122 interrupted operation. It should only be necessary when Mercurial
4122 suggests it.
4123 suggests it.
4123
4124
4124 Returns 0 if successful, 1 if nothing to recover or verify fails.
4125 Returns 0 if successful, 1 if nothing to recover or verify fails.
4125 """
4126 """
4126 if repo.recover():
4127 if repo.recover():
4127 return hg.verify(repo)
4128 return hg.verify(repo)
4128 return 1
4129 return 1
4129
4130
4130 @command('^remove|rm',
4131 @command('^remove|rm',
4131 [('A', 'after', None, _('record delete for missing files')),
4132 [('A', 'after', None, _('record delete for missing files')),
4132 ('f', 'force', None,
4133 ('f', 'force', None,
4133 _('forget added files, delete modified files')),
4134 _('forget added files, delete modified files')),
4134 ] + subrepoopts + walkopts,
4135 ] + subrepoopts + walkopts,
4135 _('[OPTION]... FILE...'),
4136 _('[OPTION]... FILE...'),
4136 inferrepo=True)
4137 inferrepo=True)
4137 def remove(ui, repo, *pats, **opts):
4138 def remove(ui, repo, *pats, **opts):
4138 """remove the specified files on the next commit
4139 """remove the specified files on the next commit
4139
4140
4140 Schedule the indicated files for removal from the current branch.
4141 Schedule the indicated files for removal from the current branch.
4141
4142
4142 This command schedules the files to be removed at the next commit.
4143 This command schedules the files to be removed at the next commit.
4143 To undo a remove before that, see :hg:`revert`. To undo added
4144 To undo a remove before that, see :hg:`revert`. To undo added
4144 files, see :hg:`forget`.
4145 files, see :hg:`forget`.
4145
4146
4146 .. container:: verbose
4147 .. container:: verbose
4147
4148
4148 -A/--after can be used to remove only files that have already
4149 -A/--after can be used to remove only files that have already
4149 been deleted, -f/--force can be used to force deletion, and -Af
4150 been deleted, -f/--force can be used to force deletion, and -Af
4150 can be used to remove files from the next revision without
4151 can be used to remove files from the next revision without
4151 deleting them from the working directory.
4152 deleting them from the working directory.
4152
4153
4153 The following table details the behavior of remove for different
4154 The following table details the behavior of remove for different
4154 file states (columns) and option combinations (rows). The file
4155 file states (columns) and option combinations (rows). The file
4155 states are Added [A], Clean [C], Modified [M] and Missing [!]
4156 states are Added [A], Clean [C], Modified [M] and Missing [!]
4156 (as reported by :hg:`status`). The actions are Warn, Remove
4157 (as reported by :hg:`status`). The actions are Warn, Remove
4157 (from branch) and Delete (from disk):
4158 (from branch) and Delete (from disk):
4158
4159
4159 ========= == == == ==
4160 ========= == == == ==
4160 opt/state A C M !
4161 opt/state A C M !
4161 ========= == == == ==
4162 ========= == == == ==
4162 none W RD W R
4163 none W RD W R
4163 -f R RD RD R
4164 -f R RD RD R
4164 -A W W W R
4165 -A W W W R
4165 -Af R R R R
4166 -Af R R R R
4166 ========= == == == ==
4167 ========= == == == ==
4167
4168
4168 .. note::
4169 .. note::
4169
4170
4170 :hg:`remove` never deletes files in Added [A] state from the
4171 :hg:`remove` never deletes files in Added [A] state from the
4171 working directory, not even if ``--force`` is specified.
4172 working directory, not even if ``--force`` is specified.
4172
4173
4173 Returns 0 on success, 1 if any warnings encountered.
4174 Returns 0 on success, 1 if any warnings encountered.
4174 """
4175 """
4175
4176
4176 after, force = opts.get('after'), opts.get('force')
4177 after, force = opts.get('after'), opts.get('force')
4177 if not pats and not after:
4178 if not pats and not after:
4178 raise error.Abort(_('no files specified'))
4179 raise error.Abort(_('no files specified'))
4179
4180
4180 m = scmutil.match(repo[None], pats, opts)
4181 m = scmutil.match(repo[None], pats, opts)
4181 subrepos = opts.get('subrepos')
4182 subrepos = opts.get('subrepos')
4182 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4183 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4183
4184
4184 @command('rename|move|mv',
4185 @command('rename|move|mv',
4185 [('A', 'after', None, _('record a rename that has already occurred')),
4186 [('A', 'after', None, _('record a rename that has already occurred')),
4186 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4187 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4187 ] + walkopts + dryrunopts,
4188 ] + walkopts + dryrunopts,
4188 _('[OPTION]... SOURCE... DEST'))
4189 _('[OPTION]... SOURCE... DEST'))
4189 def rename(ui, repo, *pats, **opts):
4190 def rename(ui, repo, *pats, **opts):
4190 """rename files; equivalent of copy + remove
4191 """rename files; equivalent of copy + remove
4191
4192
4192 Mark dest as copies of sources; mark sources for deletion. If dest
4193 Mark dest as copies of sources; mark sources for deletion. If dest
4193 is a directory, copies are put in that directory. If dest is a
4194 is a directory, copies are put in that directory. If dest is a
4194 file, there can only be one source.
4195 file, there can only be one source.
4195
4196
4196 By default, this command copies the contents of files as they
4197 By default, this command copies the contents of files as they
4197 exist in the working directory. If invoked with -A/--after, the
4198 exist in the working directory. If invoked with -A/--after, the
4198 operation is recorded, but no copying is performed.
4199 operation is recorded, but no copying is performed.
4199
4200
4200 This command takes effect at the next commit. To undo a rename
4201 This command takes effect at the next commit. To undo a rename
4201 before that, see :hg:`revert`.
4202 before that, see :hg:`revert`.
4202
4203
4203 Returns 0 on success, 1 if errors are encountered.
4204 Returns 0 on success, 1 if errors are encountered.
4204 """
4205 """
4205 with repo.wlock(False):
4206 with repo.wlock(False):
4206 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4207 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4207
4208
4208 @command('resolve',
4209 @command('resolve',
4209 [('a', 'all', None, _('select all unresolved files')),
4210 [('a', 'all', None, _('select all unresolved files')),
4210 ('l', 'list', None, _('list state of files needing merge')),
4211 ('l', 'list', None, _('list state of files needing merge')),
4211 ('m', 'mark', None, _('mark files as resolved')),
4212 ('m', 'mark', None, _('mark files as resolved')),
4212 ('u', 'unmark', None, _('mark files as unresolved')),
4213 ('u', 'unmark', None, _('mark files as unresolved')),
4213 ('n', 'no-status', None, _('hide status prefix'))]
4214 ('n', 'no-status', None, _('hide status prefix'))]
4214 + mergetoolopts + walkopts + formatteropts,
4215 + mergetoolopts + walkopts + formatteropts,
4215 _('[OPTION]... [FILE]...'),
4216 _('[OPTION]... [FILE]...'),
4216 inferrepo=True)
4217 inferrepo=True)
4217 def resolve(ui, repo, *pats, **opts):
4218 def resolve(ui, repo, *pats, **opts):
4218 """redo merges or set/view the merge status of files
4219 """redo merges or set/view the merge status of files
4219
4220
4220 Merges with unresolved conflicts are often the result of
4221 Merges with unresolved conflicts are often the result of
4221 non-interactive merging using the ``internal:merge`` configuration
4222 non-interactive merging using the ``internal:merge`` configuration
4222 setting, or a command-line merge tool like ``diff3``. The resolve
4223 setting, or a command-line merge tool like ``diff3``. The resolve
4223 command is used to manage the files involved in a merge, after
4224 command is used to manage the files involved in a merge, after
4224 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4225 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4225 working directory must have two parents). See :hg:`help
4226 working directory must have two parents). See :hg:`help
4226 merge-tools` for information on configuring merge tools.
4227 merge-tools` for information on configuring merge tools.
4227
4228
4228 The resolve command can be used in the following ways:
4229 The resolve command can be used in the following ways:
4229
4230
4230 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4231 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4231 files, discarding any previous merge attempts. Re-merging is not
4232 files, discarding any previous merge attempts. Re-merging is not
4232 performed for files already marked as resolved. Use ``--all/-a``
4233 performed for files already marked as resolved. Use ``--all/-a``
4233 to select all unresolved files. ``--tool`` can be used to specify
4234 to select all unresolved files. ``--tool`` can be used to specify
4234 the merge tool used for the given files. It overrides the HGMERGE
4235 the merge tool used for the given files. It overrides the HGMERGE
4235 environment variable and your configuration files. Previous file
4236 environment variable and your configuration files. Previous file
4236 contents are saved with a ``.orig`` suffix.
4237 contents are saved with a ``.orig`` suffix.
4237
4238
4238 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4239 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4239 (e.g. after having manually fixed-up the files). The default is
4240 (e.g. after having manually fixed-up the files). The default is
4240 to mark all unresolved files.
4241 to mark all unresolved files.
4241
4242
4242 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4243 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4243 default is to mark all resolved files.
4244 default is to mark all resolved files.
4244
4245
4245 - :hg:`resolve -l`: list files which had or still have conflicts.
4246 - :hg:`resolve -l`: list files which had or still have conflicts.
4246 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4247 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4247 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4248 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4248 the list. See :hg:`help filesets` for details.
4249 the list. See :hg:`help filesets` for details.
4249
4250
4250 .. note::
4251 .. note::
4251
4252
4252 Mercurial will not let you commit files with unresolved merge
4253 Mercurial will not let you commit files with unresolved merge
4253 conflicts. You must use :hg:`resolve -m ...` before you can
4254 conflicts. You must use :hg:`resolve -m ...` before you can
4254 commit after a conflicting merge.
4255 commit after a conflicting merge.
4255
4256
4256 Returns 0 on success, 1 if any files fail a resolve attempt.
4257 Returns 0 on success, 1 if any files fail a resolve attempt.
4257 """
4258 """
4258
4259
4259 flaglist = 'all mark unmark list no_status'.split()
4260 flaglist = 'all mark unmark list no_status'.split()
4260 all, mark, unmark, show, nostatus = \
4261 all, mark, unmark, show, nostatus = \
4261 [opts.get(o) for o in flaglist]
4262 [opts.get(o) for o in flaglist]
4262
4263
4263 if (show and (mark or unmark)) or (mark and unmark):
4264 if (show and (mark or unmark)) or (mark and unmark):
4264 raise error.Abort(_("too many options specified"))
4265 raise error.Abort(_("too many options specified"))
4265 if pats and all:
4266 if pats and all:
4266 raise error.Abort(_("can't specify --all and patterns"))
4267 raise error.Abort(_("can't specify --all and patterns"))
4267 if not (all or pats or show or mark or unmark):
4268 if not (all or pats or show or mark or unmark):
4268 raise error.Abort(_('no files or directories specified'),
4269 raise error.Abort(_('no files or directories specified'),
4269 hint=('use --all to re-merge all unresolved files'))
4270 hint=('use --all to re-merge all unresolved files'))
4270
4271
4271 if show:
4272 if show:
4272 ui.pager('resolve')
4273 ui.pager('resolve')
4273 fm = ui.formatter('resolve', opts)
4274 fm = ui.formatter('resolve', opts)
4274 ms = mergemod.mergestate.read(repo)
4275 ms = mergemod.mergestate.read(repo)
4275 m = scmutil.match(repo[None], pats, opts)
4276 m = scmutil.match(repo[None], pats, opts)
4276 for f in ms:
4277 for f in ms:
4277 if not m(f):
4278 if not m(f):
4278 continue
4279 continue
4279 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4280 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4280 'd': 'driverresolved'}[ms[f]]
4281 'd': 'driverresolved'}[ms[f]]
4281 fm.startitem()
4282 fm.startitem()
4282 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4283 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4283 fm.write('path', '%s\n', f, label=l)
4284 fm.write('path', '%s\n', f, label=l)
4284 fm.end()
4285 fm.end()
4285 return 0
4286 return 0
4286
4287
4287 with repo.wlock():
4288 with repo.wlock():
4288 ms = mergemod.mergestate.read(repo)
4289 ms = mergemod.mergestate.read(repo)
4289
4290
4290 if not (ms.active() or repo.dirstate.p2() != nullid):
4291 if not (ms.active() or repo.dirstate.p2() != nullid):
4291 raise error.Abort(
4292 raise error.Abort(
4292 _('resolve command not applicable when not merging'))
4293 _('resolve command not applicable when not merging'))
4293
4294
4294 wctx = repo[None]
4295 wctx = repo[None]
4295
4296
4296 if ms.mergedriver and ms.mdstate() == 'u':
4297 if ms.mergedriver and ms.mdstate() == 'u':
4297 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4298 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4298 ms.commit()
4299 ms.commit()
4299 # allow mark and unmark to go through
4300 # allow mark and unmark to go through
4300 if not mark and not unmark and not proceed:
4301 if not mark and not unmark and not proceed:
4301 return 1
4302 return 1
4302
4303
4303 m = scmutil.match(wctx, pats, opts)
4304 m = scmutil.match(wctx, pats, opts)
4304 ret = 0
4305 ret = 0
4305 didwork = False
4306 didwork = False
4306 runconclude = False
4307 runconclude = False
4307
4308
4308 tocomplete = []
4309 tocomplete = []
4309 for f in ms:
4310 for f in ms:
4310 if not m(f):
4311 if not m(f):
4311 continue
4312 continue
4312
4313
4313 didwork = True
4314 didwork = True
4314
4315
4315 # don't let driver-resolved files be marked, and run the conclude
4316 # don't let driver-resolved files be marked, and run the conclude
4316 # step if asked to resolve
4317 # step if asked to resolve
4317 if ms[f] == "d":
4318 if ms[f] == "d":
4318 exact = m.exact(f)
4319 exact = m.exact(f)
4319 if mark:
4320 if mark:
4320 if exact:
4321 if exact:
4321 ui.warn(_('not marking %s as it is driver-resolved\n')
4322 ui.warn(_('not marking %s as it is driver-resolved\n')
4322 % f)
4323 % f)
4323 elif unmark:
4324 elif unmark:
4324 if exact:
4325 if exact:
4325 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4326 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4326 % f)
4327 % f)
4327 else:
4328 else:
4328 runconclude = True
4329 runconclude = True
4329 continue
4330 continue
4330
4331
4331 if mark:
4332 if mark:
4332 ms.mark(f, "r")
4333 ms.mark(f, "r")
4333 elif unmark:
4334 elif unmark:
4334 ms.mark(f, "u")
4335 ms.mark(f, "u")
4335 else:
4336 else:
4336 # backup pre-resolve (merge uses .orig for its own purposes)
4337 # backup pre-resolve (merge uses .orig for its own purposes)
4337 a = repo.wjoin(f)
4338 a = repo.wjoin(f)
4338 try:
4339 try:
4339 util.copyfile(a, a + ".resolve")
4340 util.copyfile(a, a + ".resolve")
4340 except (IOError, OSError) as inst:
4341 except (IOError, OSError) as inst:
4341 if inst.errno != errno.ENOENT:
4342 if inst.errno != errno.ENOENT:
4342 raise
4343 raise
4343
4344
4344 try:
4345 try:
4345 # preresolve file
4346 # preresolve file
4346 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4347 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4347 'resolve')
4348 'resolve')
4348 complete, r = ms.preresolve(f, wctx)
4349 complete, r = ms.preresolve(f, wctx)
4349 if not complete:
4350 if not complete:
4350 tocomplete.append(f)
4351 tocomplete.append(f)
4351 elif r:
4352 elif r:
4352 ret = 1
4353 ret = 1
4353 finally:
4354 finally:
4354 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4355 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4355 ms.commit()
4356 ms.commit()
4356
4357
4357 # replace filemerge's .orig file with our resolve file, but only
4358 # replace filemerge's .orig file with our resolve file, but only
4358 # for merges that are complete
4359 # for merges that are complete
4359 if complete:
4360 if complete:
4360 try:
4361 try:
4361 util.rename(a + ".resolve",
4362 util.rename(a + ".resolve",
4362 scmutil.origpath(ui, repo, a))
4363 scmutil.origpath(ui, repo, a))
4363 except OSError as inst:
4364 except OSError as inst:
4364 if inst.errno != errno.ENOENT:
4365 if inst.errno != errno.ENOENT:
4365 raise
4366 raise
4366
4367
4367 for f in tocomplete:
4368 for f in tocomplete:
4368 try:
4369 try:
4369 # resolve file
4370 # resolve file
4370 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4371 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4371 'resolve')
4372 'resolve')
4372 r = ms.resolve(f, wctx)
4373 r = ms.resolve(f, wctx)
4373 if r:
4374 if r:
4374 ret = 1
4375 ret = 1
4375 finally:
4376 finally:
4376 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4377 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4377 ms.commit()
4378 ms.commit()
4378
4379
4379 # replace filemerge's .orig file with our resolve file
4380 # replace filemerge's .orig file with our resolve file
4380 a = repo.wjoin(f)
4381 a = repo.wjoin(f)
4381 try:
4382 try:
4382 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4383 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4383 except OSError as inst:
4384 except OSError as inst:
4384 if inst.errno != errno.ENOENT:
4385 if inst.errno != errno.ENOENT:
4385 raise
4386 raise
4386
4387
4387 ms.commit()
4388 ms.commit()
4388 ms.recordactions()
4389 ms.recordactions()
4389
4390
4390 if not didwork and pats:
4391 if not didwork and pats:
4391 hint = None
4392 hint = None
4392 if not any([p for p in pats if p.find(':') >= 0]):
4393 if not any([p for p in pats if p.find(':') >= 0]):
4393 pats = ['path:%s' % p for p in pats]
4394 pats = ['path:%s' % p for p in pats]
4394 m = scmutil.match(wctx, pats, opts)
4395 m = scmutil.match(wctx, pats, opts)
4395 for f in ms:
4396 for f in ms:
4396 if not m(f):
4397 if not m(f):
4397 continue
4398 continue
4398 flags = ''.join(['-%s ' % o[0] for o in flaglist
4399 flags = ''.join(['-%s ' % o[0] for o in flaglist
4399 if opts.get(o)])
4400 if opts.get(o)])
4400 hint = _("(try: hg resolve %s%s)\n") % (
4401 hint = _("(try: hg resolve %s%s)\n") % (
4401 flags,
4402 flags,
4402 ' '.join(pats))
4403 ' '.join(pats))
4403 break
4404 break
4404 ui.warn(_("arguments do not match paths that need resolving\n"))
4405 ui.warn(_("arguments do not match paths that need resolving\n"))
4405 if hint:
4406 if hint:
4406 ui.warn(hint)
4407 ui.warn(hint)
4407 elif ms.mergedriver and ms.mdstate() != 's':
4408 elif ms.mergedriver and ms.mdstate() != 's':
4408 # run conclude step when either a driver-resolved file is requested
4409 # run conclude step when either a driver-resolved file is requested
4409 # or there are no driver-resolved files
4410 # or there are no driver-resolved files
4410 # we can't use 'ret' to determine whether any files are unresolved
4411 # we can't use 'ret' to determine whether any files are unresolved
4411 # because we might not have tried to resolve some
4412 # because we might not have tried to resolve some
4412 if ((runconclude or not list(ms.driverresolved()))
4413 if ((runconclude or not list(ms.driverresolved()))
4413 and not list(ms.unresolved())):
4414 and not list(ms.unresolved())):
4414 proceed = mergemod.driverconclude(repo, ms, wctx)
4415 proceed = mergemod.driverconclude(repo, ms, wctx)
4415 ms.commit()
4416 ms.commit()
4416 if not proceed:
4417 if not proceed:
4417 return 1
4418 return 1
4418
4419
4419 # Nudge users into finishing an unfinished operation
4420 # Nudge users into finishing an unfinished operation
4420 unresolvedf = list(ms.unresolved())
4421 unresolvedf = list(ms.unresolved())
4421 driverresolvedf = list(ms.driverresolved())
4422 driverresolvedf = list(ms.driverresolved())
4422 if not unresolvedf and not driverresolvedf:
4423 if not unresolvedf and not driverresolvedf:
4423 ui.status(_('(no more unresolved files)\n'))
4424 ui.status(_('(no more unresolved files)\n'))
4424 cmdutil.checkafterresolved(repo)
4425 cmdutil.checkafterresolved(repo)
4425 elif not unresolvedf:
4426 elif not unresolvedf:
4426 ui.status(_('(no more unresolved files -- '
4427 ui.status(_('(no more unresolved files -- '
4427 'run "hg resolve --all" to conclude)\n'))
4428 'run "hg resolve --all" to conclude)\n'))
4428
4429
4429 return ret
4430 return ret
4430
4431
4431 @command('revert',
4432 @command('revert',
4432 [('a', 'all', None, _('revert all changes when no arguments given')),
4433 [('a', 'all', None, _('revert all changes when no arguments given')),
4433 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4434 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4434 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4435 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4435 ('C', 'no-backup', None, _('do not save backup copies of files')),
4436 ('C', 'no-backup', None, _('do not save backup copies of files')),
4436 ('i', 'interactive', None,
4437 ('i', 'interactive', None,
4437 _('interactively select the changes (EXPERIMENTAL)')),
4438 _('interactively select the changes (EXPERIMENTAL)')),
4438 ] + walkopts + dryrunopts,
4439 ] + walkopts + dryrunopts,
4439 _('[OPTION]... [-r REV] [NAME]...'))
4440 _('[OPTION]... [-r REV] [NAME]...'))
4440 def revert(ui, repo, *pats, **opts):
4441 def revert(ui, repo, *pats, **opts):
4441 """restore files to their checkout state
4442 """restore files to their checkout state
4442
4443
4443 .. note::
4444 .. note::
4444
4445
4445 To check out earlier revisions, you should use :hg:`update REV`.
4446 To check out earlier revisions, you should use :hg:`update REV`.
4446 To cancel an uncommitted merge (and lose your changes),
4447 To cancel an uncommitted merge (and lose your changes),
4447 use :hg:`update --clean .`.
4448 use :hg:`update --clean .`.
4448
4449
4449 With no revision specified, revert the specified files or directories
4450 With no revision specified, revert the specified files or directories
4450 to the contents they had in the parent of the working directory.
4451 to the contents they had in the parent of the working directory.
4451 This restores the contents of files to an unmodified
4452 This restores the contents of files to an unmodified
4452 state and unschedules adds, removes, copies, and renames. If the
4453 state and unschedules adds, removes, copies, and renames. If the
4453 working directory has two parents, you must explicitly specify a
4454 working directory has two parents, you must explicitly specify a
4454 revision.
4455 revision.
4455
4456
4456 Using the -r/--rev or -d/--date options, revert the given files or
4457 Using the -r/--rev or -d/--date options, revert the given files or
4457 directories to their states as of a specific revision. Because
4458 directories to their states as of a specific revision. Because
4458 revert does not change the working directory parents, this will
4459 revert does not change the working directory parents, this will
4459 cause these files to appear modified. This can be helpful to "back
4460 cause these files to appear modified. This can be helpful to "back
4460 out" some or all of an earlier change. See :hg:`backout` for a
4461 out" some or all of an earlier change. See :hg:`backout` for a
4461 related method.
4462 related method.
4462
4463
4463 Modified files are saved with a .orig suffix before reverting.
4464 Modified files are saved with a .orig suffix before reverting.
4464 To disable these backups, use --no-backup. It is possible to store
4465 To disable these backups, use --no-backup. It is possible to store
4465 the backup files in a custom directory relative to the root of the
4466 the backup files in a custom directory relative to the root of the
4466 repository by setting the ``ui.origbackuppath`` configuration
4467 repository by setting the ``ui.origbackuppath`` configuration
4467 option.
4468 option.
4468
4469
4469 See :hg:`help dates` for a list of formats valid for -d/--date.
4470 See :hg:`help dates` for a list of formats valid for -d/--date.
4470
4471
4471 See :hg:`help backout` for a way to reverse the effect of an
4472 See :hg:`help backout` for a way to reverse the effect of an
4472 earlier changeset.
4473 earlier changeset.
4473
4474
4474 Returns 0 on success.
4475 Returns 0 on success.
4475 """
4476 """
4476
4477
4477 if opts.get("date"):
4478 if opts.get("date"):
4478 if opts.get("rev"):
4479 if opts.get("rev"):
4479 raise error.Abort(_("you can't specify a revision and a date"))
4480 raise error.Abort(_("you can't specify a revision and a date"))
4480 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4481 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4481
4482
4482 parent, p2 = repo.dirstate.parents()
4483 parent, p2 = repo.dirstate.parents()
4483 if not opts.get('rev') and p2 != nullid:
4484 if not opts.get('rev') and p2 != nullid:
4484 # revert after merge is a trap for new users (issue2915)
4485 # revert after merge is a trap for new users (issue2915)
4485 raise error.Abort(_('uncommitted merge with no revision specified'),
4486 raise error.Abort(_('uncommitted merge with no revision specified'),
4486 hint=_("use 'hg update' or see 'hg help revert'"))
4487 hint=_("use 'hg update' or see 'hg help revert'"))
4487
4488
4488 ctx = scmutil.revsingle(repo, opts.get('rev'))
4489 ctx = scmutil.revsingle(repo, opts.get('rev'))
4489
4490
4490 if (not (pats or opts.get('include') or opts.get('exclude') or
4491 if (not (pats or opts.get('include') or opts.get('exclude') or
4491 opts.get('all') or opts.get('interactive'))):
4492 opts.get('all') or opts.get('interactive'))):
4492 msg = _("no files or directories specified")
4493 msg = _("no files or directories specified")
4493 if p2 != nullid:
4494 if p2 != nullid:
4494 hint = _("uncommitted merge, use --all to discard all changes,"
4495 hint = _("uncommitted merge, use --all to discard all changes,"
4495 " or 'hg update -C .' to abort the merge")
4496 " or 'hg update -C .' to abort the merge")
4496 raise error.Abort(msg, hint=hint)
4497 raise error.Abort(msg, hint=hint)
4497 dirty = any(repo.status())
4498 dirty = any(repo.status())
4498 node = ctx.node()
4499 node = ctx.node()
4499 if node != parent:
4500 if node != parent:
4500 if dirty:
4501 if dirty:
4501 hint = _("uncommitted changes, use --all to discard all"
4502 hint = _("uncommitted changes, use --all to discard all"
4502 " changes, or 'hg update %s' to update") % ctx.rev()
4503 " changes, or 'hg update %s' to update") % ctx.rev()
4503 else:
4504 else:
4504 hint = _("use --all to revert all files,"
4505 hint = _("use --all to revert all files,"
4505 " or 'hg update %s' to update") % ctx.rev()
4506 " or 'hg update %s' to update") % ctx.rev()
4506 elif dirty:
4507 elif dirty:
4507 hint = _("uncommitted changes, use --all to discard all changes")
4508 hint = _("uncommitted changes, use --all to discard all changes")
4508 else:
4509 else:
4509 hint = _("use --all to revert all files")
4510 hint = _("use --all to revert all files")
4510 raise error.Abort(msg, hint=hint)
4511 raise error.Abort(msg, hint=hint)
4511
4512
4512 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4513 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4513
4514
4514 @command('rollback', dryrunopts +
4515 @command('rollback', dryrunopts +
4515 [('f', 'force', False, _('ignore safety measures'))])
4516 [('f', 'force', False, _('ignore safety measures'))])
4516 def rollback(ui, repo, **opts):
4517 def rollback(ui, repo, **opts):
4517 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4518 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4518
4519
4519 Please use :hg:`commit --amend` instead of rollback to correct
4520 Please use :hg:`commit --amend` instead of rollback to correct
4520 mistakes in the last commit.
4521 mistakes in the last commit.
4521
4522
4522 This command should be used with care. There is only one level of
4523 This command should be used with care. There is only one level of
4523 rollback, and there is no way to undo a rollback. It will also
4524 rollback, and there is no way to undo a rollback. It will also
4524 restore the dirstate at the time of the last transaction, losing
4525 restore the dirstate at the time of the last transaction, losing
4525 any dirstate changes since that time. This command does not alter
4526 any dirstate changes since that time. This command does not alter
4526 the working directory.
4527 the working directory.
4527
4528
4528 Transactions are used to encapsulate the effects of all commands
4529 Transactions are used to encapsulate the effects of all commands
4529 that create new changesets or propagate existing changesets into a
4530 that create new changesets or propagate existing changesets into a
4530 repository.
4531 repository.
4531
4532
4532 .. container:: verbose
4533 .. container:: verbose
4533
4534
4534 For example, the following commands are transactional, and their
4535 For example, the following commands are transactional, and their
4535 effects can be rolled back:
4536 effects can be rolled back:
4536
4537
4537 - commit
4538 - commit
4538 - import
4539 - import
4539 - pull
4540 - pull
4540 - push (with this repository as the destination)
4541 - push (with this repository as the destination)
4541 - unbundle
4542 - unbundle
4542
4543
4543 To avoid permanent data loss, rollback will refuse to rollback a
4544 To avoid permanent data loss, rollback will refuse to rollback a
4544 commit transaction if it isn't checked out. Use --force to
4545 commit transaction if it isn't checked out. Use --force to
4545 override this protection.
4546 override this protection.
4546
4547
4547 The rollback command can be entirely disabled by setting the
4548 The rollback command can be entirely disabled by setting the
4548 ``ui.rollback`` configuration setting to false. If you're here
4549 ``ui.rollback`` configuration setting to false. If you're here
4549 because you want to use rollback and it's disabled, you can
4550 because you want to use rollback and it's disabled, you can
4550 re-enable the command by setting ``ui.rollback`` to true.
4551 re-enable the command by setting ``ui.rollback`` to true.
4551
4552
4552 This command is not intended for use on public repositories. Once
4553 This command is not intended for use on public repositories. Once
4553 changes are visible for pull by other users, rolling a transaction
4554 changes are visible for pull by other users, rolling a transaction
4554 back locally is ineffective (someone else may already have pulled
4555 back locally is ineffective (someone else may already have pulled
4555 the changes). Furthermore, a race is possible with readers of the
4556 the changes). Furthermore, a race is possible with readers of the
4556 repository; for example an in-progress pull from the repository
4557 repository; for example an in-progress pull from the repository
4557 may fail if a rollback is performed.
4558 may fail if a rollback is performed.
4558
4559
4559 Returns 0 on success, 1 if no rollback data is available.
4560 Returns 0 on success, 1 if no rollback data is available.
4560 """
4561 """
4561 if not ui.configbool('ui', 'rollback', True):
4562 if not ui.configbool('ui', 'rollback', True):
4562 raise error.Abort(_('rollback is disabled because it is unsafe'),
4563 raise error.Abort(_('rollback is disabled because it is unsafe'),
4563 hint=('see `hg help -v rollback` for information'))
4564 hint=('see `hg help -v rollback` for information'))
4564 return repo.rollback(dryrun=opts.get('dry_run'),
4565 return repo.rollback(dryrun=opts.get('dry_run'),
4565 force=opts.get('force'))
4566 force=opts.get('force'))
4566
4567
4567 @command('root', [])
4568 @command('root', [])
4568 def root(ui, repo):
4569 def root(ui, repo):
4569 """print the root (top) of the current working directory
4570 """print the root (top) of the current working directory
4570
4571
4571 Print the root directory of the current repository.
4572 Print the root directory of the current repository.
4572
4573
4573 Returns 0 on success.
4574 Returns 0 on success.
4574 """
4575 """
4575 ui.write(repo.root + "\n")
4576 ui.write(repo.root + "\n")
4576
4577
4577 @command('^serve',
4578 @command('^serve',
4578 [('A', 'accesslog', '', _('name of access log file to write to'),
4579 [('A', 'accesslog', '', _('name of access log file to write to'),
4579 _('FILE')),
4580 _('FILE')),
4580 ('d', 'daemon', None, _('run server in background')),
4581 ('d', 'daemon', None, _('run server in background')),
4581 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4582 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4582 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4583 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4583 # use string type, then we can check if something was passed
4584 # use string type, then we can check if something was passed
4584 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4585 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4585 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4586 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4586 _('ADDR')),
4587 _('ADDR')),
4587 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4588 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4588 _('PREFIX')),
4589 _('PREFIX')),
4589 ('n', 'name', '',
4590 ('n', 'name', '',
4590 _('name to show in web pages (default: working directory)'), _('NAME')),
4591 _('name to show in web pages (default: working directory)'), _('NAME')),
4591 ('', 'web-conf', '',
4592 ('', 'web-conf', '',
4592 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4593 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4593 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4594 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4594 _('FILE')),
4595 _('FILE')),
4595 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4596 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4596 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4597 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4597 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4598 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4598 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4599 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4599 ('', 'style', '', _('template style to use'), _('STYLE')),
4600 ('', 'style', '', _('template style to use'), _('STYLE')),
4600 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4601 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4601 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4602 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4602 _('[OPTION]...'),
4603 _('[OPTION]...'),
4603 optionalrepo=True)
4604 optionalrepo=True)
4604 def serve(ui, repo, **opts):
4605 def serve(ui, repo, **opts):
4605 """start stand-alone webserver
4606 """start stand-alone webserver
4606
4607
4607 Start a local HTTP repository browser and pull server. You can use
4608 Start a local HTTP repository browser and pull server. You can use
4608 this for ad-hoc sharing and browsing of repositories. It is
4609 this for ad-hoc sharing and browsing of repositories. It is
4609 recommended to use a real web server to serve a repository for
4610 recommended to use a real web server to serve a repository for
4610 longer periods of time.
4611 longer periods of time.
4611
4612
4612 Please note that the server does not implement access control.
4613 Please note that the server does not implement access control.
4613 This means that, by default, anybody can read from the server and
4614 This means that, by default, anybody can read from the server and
4614 nobody can write to it by default. Set the ``web.allow_push``
4615 nobody can write to it by default. Set the ``web.allow_push``
4615 option to ``*`` to allow everybody to push to the server. You
4616 option to ``*`` to allow everybody to push to the server. You
4616 should use a real web server if you need to authenticate users.
4617 should use a real web server if you need to authenticate users.
4617
4618
4618 By default, the server logs accesses to stdout and errors to
4619 By default, the server logs accesses to stdout and errors to
4619 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4620 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4620 files.
4621 files.
4621
4622
4622 To have the server choose a free port number to listen on, specify
4623 To have the server choose a free port number to listen on, specify
4623 a port number of 0; in this case, the server will print the port
4624 a port number of 0; in this case, the server will print the port
4624 number it uses.
4625 number it uses.
4625
4626
4626 Returns 0 on success.
4627 Returns 0 on success.
4627 """
4628 """
4628
4629
4629 if opts["stdio"] and opts["cmdserver"]:
4630 if opts["stdio"] and opts["cmdserver"]:
4630 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4631 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4631
4632
4632 if opts["stdio"]:
4633 if opts["stdio"]:
4633 if repo is None:
4634 if repo is None:
4634 raise error.RepoError(_("there is no Mercurial repository here"
4635 raise error.RepoError(_("there is no Mercurial repository here"
4635 " (.hg not found)"))
4636 " (.hg not found)"))
4636 s = sshserver.sshserver(ui, repo)
4637 s = sshserver.sshserver(ui, repo)
4637 s.serve_forever()
4638 s.serve_forever()
4638
4639
4639 service = server.createservice(ui, repo, opts)
4640 service = server.createservice(ui, repo, opts)
4640 return server.runservice(opts, initfn=service.init, runfn=service.run)
4641 return server.runservice(opts, initfn=service.init, runfn=service.run)
4641
4642
4642 @command('^status|st',
4643 @command('^status|st',
4643 [('A', 'all', None, _('show status of all files')),
4644 [('A', 'all', None, _('show status of all files')),
4644 ('m', 'modified', None, _('show only modified files')),
4645 ('m', 'modified', None, _('show only modified files')),
4645 ('a', 'added', None, _('show only added files')),
4646 ('a', 'added', None, _('show only added files')),
4646 ('r', 'removed', None, _('show only removed files')),
4647 ('r', 'removed', None, _('show only removed files')),
4647 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4648 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4648 ('c', 'clean', None, _('show only files without changes')),
4649 ('c', 'clean', None, _('show only files without changes')),
4649 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4650 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4650 ('i', 'ignored', None, _('show only ignored files')),
4651 ('i', 'ignored', None, _('show only ignored files')),
4651 ('n', 'no-status', None, _('hide status prefix')),
4652 ('n', 'no-status', None, _('hide status prefix')),
4652 ('C', 'copies', None, _('show source of copied files')),
4653 ('C', 'copies', None, _('show source of copied files')),
4653 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4654 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4654 ('', 'rev', [], _('show difference from revision'), _('REV')),
4655 ('', 'rev', [], _('show difference from revision'), _('REV')),
4655 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4656 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4656 ] + walkopts + subrepoopts + formatteropts,
4657 ] + walkopts + subrepoopts + formatteropts,
4657 _('[OPTION]... [FILE]...'),
4658 _('[OPTION]... [FILE]...'),
4658 inferrepo=True)
4659 inferrepo=True)
4659 def status(ui, repo, *pats, **opts):
4660 def status(ui, repo, *pats, **opts):
4660 """show changed files in the working directory
4661 """show changed files in the working directory
4661
4662
4662 Show status of files in the repository. If names are given, only
4663 Show status of files in the repository. If names are given, only
4663 files that match are shown. Files that are clean or ignored or
4664 files that match are shown. Files that are clean or ignored or
4664 the source of a copy/move operation, are not listed unless
4665 the source of a copy/move operation, are not listed unless
4665 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4666 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4666 Unless options described with "show only ..." are given, the
4667 Unless options described with "show only ..." are given, the
4667 options -mardu are used.
4668 options -mardu are used.
4668
4669
4669 Option -q/--quiet hides untracked (unknown and ignored) files
4670 Option -q/--quiet hides untracked (unknown and ignored) files
4670 unless explicitly requested with -u/--unknown or -i/--ignored.
4671 unless explicitly requested with -u/--unknown or -i/--ignored.
4671
4672
4672 .. note::
4673 .. note::
4673
4674
4674 :hg:`status` may appear to disagree with diff if permissions have
4675 :hg:`status` may appear to disagree with diff if permissions have
4675 changed or a merge has occurred. The standard diff format does
4676 changed or a merge has occurred. The standard diff format does
4676 not report permission changes and diff only reports changes
4677 not report permission changes and diff only reports changes
4677 relative to one merge parent.
4678 relative to one merge parent.
4678
4679
4679 If one revision is given, it is used as the base revision.
4680 If one revision is given, it is used as the base revision.
4680 If two revisions are given, the differences between them are
4681 If two revisions are given, the differences between them are
4681 shown. The --change option can also be used as a shortcut to list
4682 shown. The --change option can also be used as a shortcut to list
4682 the changed files of a revision from its first parent.
4683 the changed files of a revision from its first parent.
4683
4684
4684 The codes used to show the status of files are::
4685 The codes used to show the status of files are::
4685
4686
4686 M = modified
4687 M = modified
4687 A = added
4688 A = added
4688 R = removed
4689 R = removed
4689 C = clean
4690 C = clean
4690 ! = missing (deleted by non-hg command, but still tracked)
4691 ! = missing (deleted by non-hg command, but still tracked)
4691 ? = not tracked
4692 ? = not tracked
4692 I = ignored
4693 I = ignored
4693 = origin of the previous file (with --copies)
4694 = origin of the previous file (with --copies)
4694
4695
4695 .. container:: verbose
4696 .. container:: verbose
4696
4697
4697 Examples:
4698 Examples:
4698
4699
4699 - show changes in the working directory relative to a
4700 - show changes in the working directory relative to a
4700 changeset::
4701 changeset::
4701
4702
4702 hg status --rev 9353
4703 hg status --rev 9353
4703
4704
4704 - show changes in the working directory relative to the
4705 - show changes in the working directory relative to the
4705 current directory (see :hg:`help patterns` for more information)::
4706 current directory (see :hg:`help patterns` for more information)::
4706
4707
4707 hg status re:
4708 hg status re:
4708
4709
4709 - show all changes including copies in an existing changeset::
4710 - show all changes including copies in an existing changeset::
4710
4711
4711 hg status --copies --change 9353
4712 hg status --copies --change 9353
4712
4713
4713 - get a NUL separated list of added files, suitable for xargs::
4714 - get a NUL separated list of added files, suitable for xargs::
4714
4715
4715 hg status -an0
4716 hg status -an0
4716
4717
4717 Returns 0 on success.
4718 Returns 0 on success.
4718 """
4719 """
4719
4720
4720 revs = opts.get('rev')
4721 revs = opts.get('rev')
4721 change = opts.get('change')
4722 change = opts.get('change')
4722
4723
4723 if revs and change:
4724 if revs and change:
4724 msg = _('cannot specify --rev and --change at the same time')
4725 msg = _('cannot specify --rev and --change at the same time')
4725 raise error.Abort(msg)
4726 raise error.Abort(msg)
4726 elif change:
4727 elif change:
4727 node2 = scmutil.revsingle(repo, change, None).node()
4728 node2 = scmutil.revsingle(repo, change, None).node()
4728 node1 = repo[node2].p1().node()
4729 node1 = repo[node2].p1().node()
4729 else:
4730 else:
4730 node1, node2 = scmutil.revpair(repo, revs)
4731 node1, node2 = scmutil.revpair(repo, revs)
4731
4732
4732 if pats:
4733 if pats:
4733 cwd = repo.getcwd()
4734 cwd = repo.getcwd()
4734 else:
4735 else:
4735 cwd = ''
4736 cwd = ''
4736
4737
4737 if opts.get('print0'):
4738 if opts.get('print0'):
4738 end = '\0'
4739 end = '\0'
4739 else:
4740 else:
4740 end = '\n'
4741 end = '\n'
4741 copy = {}
4742 copy = {}
4742 states = 'modified added removed deleted unknown ignored clean'.split()
4743 states = 'modified added removed deleted unknown ignored clean'.split()
4743 show = [k for k in states if opts.get(k)]
4744 show = [k for k in states if opts.get(k)]
4744 if opts.get('all'):
4745 if opts.get('all'):
4745 show += ui.quiet and (states[:4] + ['clean']) or states
4746 show += ui.quiet and (states[:4] + ['clean']) or states
4746 if not show:
4747 if not show:
4747 if ui.quiet:
4748 if ui.quiet:
4748 show = states[:4]
4749 show = states[:4]
4749 else:
4750 else:
4750 show = states[:5]
4751 show = states[:5]
4751
4752
4752 m = scmutil.match(repo[node2], pats, opts)
4753 m = scmutil.match(repo[node2], pats, opts)
4753 stat = repo.status(node1, node2, m,
4754 stat = repo.status(node1, node2, m,
4754 'ignored' in show, 'clean' in show, 'unknown' in show,
4755 'ignored' in show, 'clean' in show, 'unknown' in show,
4755 opts.get('subrepos'))
4756 opts.get('subrepos'))
4756 changestates = zip(states, 'MAR!?IC', stat)
4757 changestates = zip(states, 'MAR!?IC', stat)
4757
4758
4758 if (opts.get('all') or opts.get('copies')
4759 if (opts.get('all') or opts.get('copies')
4759 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4760 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4760 copy = copies.pathcopies(repo[node1], repo[node2], m)
4761 copy = copies.pathcopies(repo[node1], repo[node2], m)
4761
4762
4762 ui.pager('status')
4763 ui.pager('status')
4763 fm = ui.formatter('status', opts)
4764 fm = ui.formatter('status', opts)
4764 fmt = '%s' + end
4765 fmt = '%s' + end
4765 showchar = not opts.get('no_status')
4766 showchar = not opts.get('no_status')
4766
4767
4767 for state, char, files in changestates:
4768 for state, char, files in changestates:
4768 if state in show:
4769 if state in show:
4769 label = 'status.' + state
4770 label = 'status.' + state
4770 for f in files:
4771 for f in files:
4771 fm.startitem()
4772 fm.startitem()
4772 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4773 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4773 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4774 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4774 if f in copy:
4775 if f in copy:
4775 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4776 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4776 label='status.copied')
4777 label='status.copied')
4777 fm.end()
4778 fm.end()
4778
4779
4779 @command('^summary|sum',
4780 @command('^summary|sum',
4780 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4781 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4781 def summary(ui, repo, **opts):
4782 def summary(ui, repo, **opts):
4782 """summarize working directory state
4783 """summarize working directory state
4783
4784
4784 This generates a brief summary of the working directory state,
4785 This generates a brief summary of the working directory state,
4785 including parents, branch, commit status, phase and available updates.
4786 including parents, branch, commit status, phase and available updates.
4786
4787
4787 With the --remote option, this will check the default paths for
4788 With the --remote option, this will check the default paths for
4788 incoming and outgoing changes. This can be time-consuming.
4789 incoming and outgoing changes. This can be time-consuming.
4789
4790
4790 Returns 0 on success.
4791 Returns 0 on success.
4791 """
4792 """
4792
4793
4793 ui.pager('summary')
4794 ui.pager('summary')
4794 ctx = repo[None]
4795 ctx = repo[None]
4795 parents = ctx.parents()
4796 parents = ctx.parents()
4796 pnode = parents[0].node()
4797 pnode = parents[0].node()
4797 marks = []
4798 marks = []
4798
4799
4799 ms = None
4800 ms = None
4800 try:
4801 try:
4801 ms = mergemod.mergestate.read(repo)
4802 ms = mergemod.mergestate.read(repo)
4802 except error.UnsupportedMergeRecords as e:
4803 except error.UnsupportedMergeRecords as e:
4803 s = ' '.join(e.recordtypes)
4804 s = ' '.join(e.recordtypes)
4804 ui.warn(
4805 ui.warn(
4805 _('warning: merge state has unsupported record types: %s\n') % s)
4806 _('warning: merge state has unsupported record types: %s\n') % s)
4806 unresolved = 0
4807 unresolved = 0
4807 else:
4808 else:
4808 unresolved = [f for f in ms if ms[f] == 'u']
4809 unresolved = [f for f in ms if ms[f] == 'u']
4809
4810
4810 for p in parents:
4811 for p in parents:
4811 # label with log.changeset (instead of log.parent) since this
4812 # label with log.changeset (instead of log.parent) since this
4812 # shows a working directory parent *changeset*:
4813 # shows a working directory parent *changeset*:
4813 # i18n: column positioning for "hg summary"
4814 # i18n: column positioning for "hg summary"
4814 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
4815 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
4815 label=cmdutil._changesetlabels(p))
4816 label=cmdutil._changesetlabels(p))
4816 ui.write(' '.join(p.tags()), label='log.tag')
4817 ui.write(' '.join(p.tags()), label='log.tag')
4817 if p.bookmarks():
4818 if p.bookmarks():
4818 marks.extend(p.bookmarks())
4819 marks.extend(p.bookmarks())
4819 if p.rev() == -1:
4820 if p.rev() == -1:
4820 if not len(repo):
4821 if not len(repo):
4821 ui.write(_(' (empty repository)'))
4822 ui.write(_(' (empty repository)'))
4822 else:
4823 else:
4823 ui.write(_(' (no revision checked out)'))
4824 ui.write(_(' (no revision checked out)'))
4824 if p.troubled():
4825 if p.troubled():
4825 ui.write(' ('
4826 ui.write(' ('
4826 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4827 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4827 for trouble in p.troubles())
4828 for trouble in p.troubles())
4828 + ')')
4829 + ')')
4829 ui.write('\n')
4830 ui.write('\n')
4830 if p.description():
4831 if p.description():
4831 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4832 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4832 label='log.summary')
4833 label='log.summary')
4833
4834
4834 branch = ctx.branch()
4835 branch = ctx.branch()
4835 bheads = repo.branchheads(branch)
4836 bheads = repo.branchheads(branch)
4836 # i18n: column positioning for "hg summary"
4837 # i18n: column positioning for "hg summary"
4837 m = _('branch: %s\n') % branch
4838 m = _('branch: %s\n') % branch
4838 if branch != 'default':
4839 if branch != 'default':
4839 ui.write(m, label='log.branch')
4840 ui.write(m, label='log.branch')
4840 else:
4841 else:
4841 ui.status(m, label='log.branch')
4842 ui.status(m, label='log.branch')
4842
4843
4843 if marks:
4844 if marks:
4844 active = repo._activebookmark
4845 active = repo._activebookmark
4845 # i18n: column positioning for "hg summary"
4846 # i18n: column positioning for "hg summary"
4846 ui.write(_('bookmarks:'), label='log.bookmark')
4847 ui.write(_('bookmarks:'), label='log.bookmark')
4847 if active is not None:
4848 if active is not None:
4848 if active in marks:
4849 if active in marks:
4849 ui.write(' *' + active, label=activebookmarklabel)
4850 ui.write(' *' + active, label=activebookmarklabel)
4850 marks.remove(active)
4851 marks.remove(active)
4851 else:
4852 else:
4852 ui.write(' [%s]' % active, label=activebookmarklabel)
4853 ui.write(' [%s]' % active, label=activebookmarklabel)
4853 for m in marks:
4854 for m in marks:
4854 ui.write(' ' + m, label='log.bookmark')
4855 ui.write(' ' + m, label='log.bookmark')
4855 ui.write('\n', label='log.bookmark')
4856 ui.write('\n', label='log.bookmark')
4856
4857
4857 status = repo.status(unknown=True)
4858 status = repo.status(unknown=True)
4858
4859
4859 c = repo.dirstate.copies()
4860 c = repo.dirstate.copies()
4860 copied, renamed = [], []
4861 copied, renamed = [], []
4861 for d, s in c.iteritems():
4862 for d, s in c.iteritems():
4862 if s in status.removed:
4863 if s in status.removed:
4863 status.removed.remove(s)
4864 status.removed.remove(s)
4864 renamed.append(d)
4865 renamed.append(d)
4865 else:
4866 else:
4866 copied.append(d)
4867 copied.append(d)
4867 if d in status.added:
4868 if d in status.added:
4868 status.added.remove(d)
4869 status.added.remove(d)
4869
4870
4870 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4871 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4871
4872
4872 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4873 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4873 (ui.label(_('%d added'), 'status.added'), status.added),
4874 (ui.label(_('%d added'), 'status.added'), status.added),
4874 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4875 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4875 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4876 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4876 (ui.label(_('%d copied'), 'status.copied'), copied),
4877 (ui.label(_('%d copied'), 'status.copied'), copied),
4877 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4878 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4878 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4879 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4879 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4880 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4880 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4881 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4881 t = []
4882 t = []
4882 for l, s in labels:
4883 for l, s in labels:
4883 if s:
4884 if s:
4884 t.append(l % len(s))
4885 t.append(l % len(s))
4885
4886
4886 t = ', '.join(t)
4887 t = ', '.join(t)
4887 cleanworkdir = False
4888 cleanworkdir = False
4888
4889
4889 if repo.vfs.exists('graftstate'):
4890 if repo.vfs.exists('graftstate'):
4890 t += _(' (graft in progress)')
4891 t += _(' (graft in progress)')
4891 if repo.vfs.exists('updatestate'):
4892 if repo.vfs.exists('updatestate'):
4892 t += _(' (interrupted update)')
4893 t += _(' (interrupted update)')
4893 elif len(parents) > 1:
4894 elif len(parents) > 1:
4894 t += _(' (merge)')
4895 t += _(' (merge)')
4895 elif branch != parents[0].branch():
4896 elif branch != parents[0].branch():
4896 t += _(' (new branch)')
4897 t += _(' (new branch)')
4897 elif (parents[0].closesbranch() and
4898 elif (parents[0].closesbranch() and
4898 pnode in repo.branchheads(branch, closed=True)):
4899 pnode in repo.branchheads(branch, closed=True)):
4899 t += _(' (head closed)')
4900 t += _(' (head closed)')
4900 elif not (status.modified or status.added or status.removed or renamed or
4901 elif not (status.modified or status.added or status.removed or renamed or
4901 copied or subs):
4902 copied or subs):
4902 t += _(' (clean)')
4903 t += _(' (clean)')
4903 cleanworkdir = True
4904 cleanworkdir = True
4904 elif pnode not in bheads:
4905 elif pnode not in bheads:
4905 t += _(' (new branch head)')
4906 t += _(' (new branch head)')
4906
4907
4907 if parents:
4908 if parents:
4908 pendingphase = max(p.phase() for p in parents)
4909 pendingphase = max(p.phase() for p in parents)
4909 else:
4910 else:
4910 pendingphase = phases.public
4911 pendingphase = phases.public
4911
4912
4912 if pendingphase > phases.newcommitphase(ui):
4913 if pendingphase > phases.newcommitphase(ui):
4913 t += ' (%s)' % phases.phasenames[pendingphase]
4914 t += ' (%s)' % phases.phasenames[pendingphase]
4914
4915
4915 if cleanworkdir:
4916 if cleanworkdir:
4916 # i18n: column positioning for "hg summary"
4917 # i18n: column positioning for "hg summary"
4917 ui.status(_('commit: %s\n') % t.strip())
4918 ui.status(_('commit: %s\n') % t.strip())
4918 else:
4919 else:
4919 # i18n: column positioning for "hg summary"
4920 # i18n: column positioning for "hg summary"
4920 ui.write(_('commit: %s\n') % t.strip())
4921 ui.write(_('commit: %s\n') % t.strip())
4921
4922
4922 # all ancestors of branch heads - all ancestors of parent = new csets
4923 # all ancestors of branch heads - all ancestors of parent = new csets
4923 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4924 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4924 bheads))
4925 bheads))
4925
4926
4926 if new == 0:
4927 if new == 0:
4927 # i18n: column positioning for "hg summary"
4928 # i18n: column positioning for "hg summary"
4928 ui.status(_('update: (current)\n'))
4929 ui.status(_('update: (current)\n'))
4929 elif pnode not in bheads:
4930 elif pnode not in bheads:
4930 # i18n: column positioning for "hg summary"
4931 # i18n: column positioning for "hg summary"
4931 ui.write(_('update: %d new changesets (update)\n') % new)
4932 ui.write(_('update: %d new changesets (update)\n') % new)
4932 else:
4933 else:
4933 # i18n: column positioning for "hg summary"
4934 # i18n: column positioning for "hg summary"
4934 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4935 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4935 (new, len(bheads)))
4936 (new, len(bheads)))
4936
4937
4937 t = []
4938 t = []
4938 draft = len(repo.revs('draft()'))
4939 draft = len(repo.revs('draft()'))
4939 if draft:
4940 if draft:
4940 t.append(_('%d draft') % draft)
4941 t.append(_('%d draft') % draft)
4941 secret = len(repo.revs('secret()'))
4942 secret = len(repo.revs('secret()'))
4942 if secret:
4943 if secret:
4943 t.append(_('%d secret') % secret)
4944 t.append(_('%d secret') % secret)
4944
4945
4945 if draft or secret:
4946 if draft or secret:
4946 ui.status(_('phases: %s\n') % ', '.join(t))
4947 ui.status(_('phases: %s\n') % ', '.join(t))
4947
4948
4948 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4949 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4949 for trouble in ("unstable", "divergent", "bumped"):
4950 for trouble in ("unstable", "divergent", "bumped"):
4950 numtrouble = len(repo.revs(trouble + "()"))
4951 numtrouble = len(repo.revs(trouble + "()"))
4951 # We write all the possibilities to ease translation
4952 # We write all the possibilities to ease translation
4952 troublemsg = {
4953 troublemsg = {
4953 "unstable": _("unstable: %d changesets"),
4954 "unstable": _("unstable: %d changesets"),
4954 "divergent": _("divergent: %d changesets"),
4955 "divergent": _("divergent: %d changesets"),
4955 "bumped": _("bumped: %d changesets"),
4956 "bumped": _("bumped: %d changesets"),
4956 }
4957 }
4957 if numtrouble > 0:
4958 if numtrouble > 0:
4958 ui.status(troublemsg[trouble] % numtrouble + "\n")
4959 ui.status(troublemsg[trouble] % numtrouble + "\n")
4959
4960
4960 cmdutil.summaryhooks(ui, repo)
4961 cmdutil.summaryhooks(ui, repo)
4961
4962
4962 if opts.get('remote'):
4963 if opts.get('remote'):
4963 needsincoming, needsoutgoing = True, True
4964 needsincoming, needsoutgoing = True, True
4964 else:
4965 else:
4965 needsincoming, needsoutgoing = False, False
4966 needsincoming, needsoutgoing = False, False
4966 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4967 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4967 if i:
4968 if i:
4968 needsincoming = True
4969 needsincoming = True
4969 if o:
4970 if o:
4970 needsoutgoing = True
4971 needsoutgoing = True
4971 if not needsincoming and not needsoutgoing:
4972 if not needsincoming and not needsoutgoing:
4972 return
4973 return
4973
4974
4974 def getincoming():
4975 def getincoming():
4975 source, branches = hg.parseurl(ui.expandpath('default'))
4976 source, branches = hg.parseurl(ui.expandpath('default'))
4976 sbranch = branches[0]
4977 sbranch = branches[0]
4977 try:
4978 try:
4978 other = hg.peer(repo, {}, source)
4979 other = hg.peer(repo, {}, source)
4979 except error.RepoError:
4980 except error.RepoError:
4980 if opts.get('remote'):
4981 if opts.get('remote'):
4981 raise
4982 raise
4982 return source, sbranch, None, None, None
4983 return source, sbranch, None, None, None
4983 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4984 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4984 if revs:
4985 if revs:
4985 revs = [other.lookup(rev) for rev in revs]
4986 revs = [other.lookup(rev) for rev in revs]
4986 ui.debug('comparing with %s\n' % util.hidepassword(source))
4987 ui.debug('comparing with %s\n' % util.hidepassword(source))
4987 repo.ui.pushbuffer()
4988 repo.ui.pushbuffer()
4988 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4989 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4989 repo.ui.popbuffer()
4990 repo.ui.popbuffer()
4990 return source, sbranch, other, commoninc, commoninc[1]
4991 return source, sbranch, other, commoninc, commoninc[1]
4991
4992
4992 if needsincoming:
4993 if needsincoming:
4993 source, sbranch, sother, commoninc, incoming = getincoming()
4994 source, sbranch, sother, commoninc, incoming = getincoming()
4994 else:
4995 else:
4995 source = sbranch = sother = commoninc = incoming = None
4996 source = sbranch = sother = commoninc = incoming = None
4996
4997
4997 def getoutgoing():
4998 def getoutgoing():
4998 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
4999 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
4999 dbranch = branches[0]
5000 dbranch = branches[0]
5000 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5001 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5001 if source != dest:
5002 if source != dest:
5002 try:
5003 try:
5003 dother = hg.peer(repo, {}, dest)
5004 dother = hg.peer(repo, {}, dest)
5004 except error.RepoError:
5005 except error.RepoError:
5005 if opts.get('remote'):
5006 if opts.get('remote'):
5006 raise
5007 raise
5007 return dest, dbranch, None, None
5008 return dest, dbranch, None, None
5008 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5009 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5009 elif sother is None:
5010 elif sother is None:
5010 # there is no explicit destination peer, but source one is invalid
5011 # there is no explicit destination peer, but source one is invalid
5011 return dest, dbranch, None, None
5012 return dest, dbranch, None, None
5012 else:
5013 else:
5013 dother = sother
5014 dother = sother
5014 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5015 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5015 common = None
5016 common = None
5016 else:
5017 else:
5017 common = commoninc
5018 common = commoninc
5018 if revs:
5019 if revs:
5019 revs = [repo.lookup(rev) for rev in revs]
5020 revs = [repo.lookup(rev) for rev in revs]
5020 repo.ui.pushbuffer()
5021 repo.ui.pushbuffer()
5021 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5022 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5022 commoninc=common)
5023 commoninc=common)
5023 repo.ui.popbuffer()
5024 repo.ui.popbuffer()
5024 return dest, dbranch, dother, outgoing
5025 return dest, dbranch, dother, outgoing
5025
5026
5026 if needsoutgoing:
5027 if needsoutgoing:
5027 dest, dbranch, dother, outgoing = getoutgoing()
5028 dest, dbranch, dother, outgoing = getoutgoing()
5028 else:
5029 else:
5029 dest = dbranch = dother = outgoing = None
5030 dest = dbranch = dother = outgoing = None
5030
5031
5031 if opts.get('remote'):
5032 if opts.get('remote'):
5032 t = []
5033 t = []
5033 if incoming:
5034 if incoming:
5034 t.append(_('1 or more incoming'))
5035 t.append(_('1 or more incoming'))
5035 o = outgoing.missing
5036 o = outgoing.missing
5036 if o:
5037 if o:
5037 t.append(_('%d outgoing') % len(o))
5038 t.append(_('%d outgoing') % len(o))
5038 other = dother or sother
5039 other = dother or sother
5039 if 'bookmarks' in other.listkeys('namespaces'):
5040 if 'bookmarks' in other.listkeys('namespaces'):
5040 counts = bookmarks.summary(repo, other)
5041 counts = bookmarks.summary(repo, other)
5041 if counts[0] > 0:
5042 if counts[0] > 0:
5042 t.append(_('%d incoming bookmarks') % counts[0])
5043 t.append(_('%d incoming bookmarks') % counts[0])
5043 if counts[1] > 0:
5044 if counts[1] > 0:
5044 t.append(_('%d outgoing bookmarks') % counts[1])
5045 t.append(_('%d outgoing bookmarks') % counts[1])
5045
5046
5046 if t:
5047 if t:
5047 # i18n: column positioning for "hg summary"
5048 # i18n: column positioning for "hg summary"
5048 ui.write(_('remote: %s\n') % (', '.join(t)))
5049 ui.write(_('remote: %s\n') % (', '.join(t)))
5049 else:
5050 else:
5050 # i18n: column positioning for "hg summary"
5051 # i18n: column positioning for "hg summary"
5051 ui.status(_('remote: (synced)\n'))
5052 ui.status(_('remote: (synced)\n'))
5052
5053
5053 cmdutil.summaryremotehooks(ui, repo, opts,
5054 cmdutil.summaryremotehooks(ui, repo, opts,
5054 ((source, sbranch, sother, commoninc),
5055 ((source, sbranch, sother, commoninc),
5055 (dest, dbranch, dother, outgoing)))
5056 (dest, dbranch, dother, outgoing)))
5056
5057
5057 @command('tag',
5058 @command('tag',
5058 [('f', 'force', None, _('force tag')),
5059 [('f', 'force', None, _('force tag')),
5059 ('l', 'local', None, _('make the tag local')),
5060 ('l', 'local', None, _('make the tag local')),
5060 ('r', 'rev', '', _('revision to tag'), _('REV')),
5061 ('r', 'rev', '', _('revision to tag'), _('REV')),
5061 ('', 'remove', None, _('remove a tag')),
5062 ('', 'remove', None, _('remove a tag')),
5062 # -l/--local is already there, commitopts cannot be used
5063 # -l/--local is already there, commitopts cannot be used
5063 ('e', 'edit', None, _('invoke editor on commit messages')),
5064 ('e', 'edit', None, _('invoke editor on commit messages')),
5064 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5065 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5065 ] + commitopts2,
5066 ] + commitopts2,
5066 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5067 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5067 def tag(ui, repo, name1, *names, **opts):
5068 def tag(ui, repo, name1, *names, **opts):
5068 """add one or more tags for the current or given revision
5069 """add one or more tags for the current or given revision
5069
5070
5070 Name a particular revision using <name>.
5071 Name a particular revision using <name>.
5071
5072
5072 Tags are used to name particular revisions of the repository and are
5073 Tags are used to name particular revisions of the repository and are
5073 very useful to compare different revisions, to go back to significant
5074 very useful to compare different revisions, to go back to significant
5074 earlier versions or to mark branch points as releases, etc. Changing
5075 earlier versions or to mark branch points as releases, etc. Changing
5075 an existing tag is normally disallowed; use -f/--force to override.
5076 an existing tag is normally disallowed; use -f/--force to override.
5076
5077
5077 If no revision is given, the parent of the working directory is
5078 If no revision is given, the parent of the working directory is
5078 used.
5079 used.
5079
5080
5080 To facilitate version control, distribution, and merging of tags,
5081 To facilitate version control, distribution, and merging of tags,
5081 they are stored as a file named ".hgtags" which is managed similarly
5082 they are stored as a file named ".hgtags" which is managed similarly
5082 to other project files and can be hand-edited if necessary. This
5083 to other project files and can be hand-edited if necessary. This
5083 also means that tagging creates a new commit. The file
5084 also means that tagging creates a new commit. The file
5084 ".hg/localtags" is used for local tags (not shared among
5085 ".hg/localtags" is used for local tags (not shared among
5085 repositories).
5086 repositories).
5086
5087
5087 Tag commits are usually made at the head of a branch. If the parent
5088 Tag commits are usually made at the head of a branch. If the parent
5088 of the working directory is not a branch head, :hg:`tag` aborts; use
5089 of the working directory is not a branch head, :hg:`tag` aborts; use
5089 -f/--force to force the tag commit to be based on a non-head
5090 -f/--force to force the tag commit to be based on a non-head
5090 changeset.
5091 changeset.
5091
5092
5092 See :hg:`help dates` for a list of formats valid for -d/--date.
5093 See :hg:`help dates` for a list of formats valid for -d/--date.
5093
5094
5094 Since tag names have priority over branch names during revision
5095 Since tag names have priority over branch names during revision
5095 lookup, using an existing branch name as a tag name is discouraged.
5096 lookup, using an existing branch name as a tag name is discouraged.
5096
5097
5097 Returns 0 on success.
5098 Returns 0 on success.
5098 """
5099 """
5099 wlock = lock = None
5100 wlock = lock = None
5100 try:
5101 try:
5101 wlock = repo.wlock()
5102 wlock = repo.wlock()
5102 lock = repo.lock()
5103 lock = repo.lock()
5103 rev_ = "."
5104 rev_ = "."
5104 names = [t.strip() for t in (name1,) + names]
5105 names = [t.strip() for t in (name1,) + names]
5105 if len(names) != len(set(names)):
5106 if len(names) != len(set(names)):
5106 raise error.Abort(_('tag names must be unique'))
5107 raise error.Abort(_('tag names must be unique'))
5107 for n in names:
5108 for n in names:
5108 scmutil.checknewlabel(repo, n, 'tag')
5109 scmutil.checknewlabel(repo, n, 'tag')
5109 if not n:
5110 if not n:
5110 raise error.Abort(_('tag names cannot consist entirely of '
5111 raise error.Abort(_('tag names cannot consist entirely of '
5111 'whitespace'))
5112 'whitespace'))
5112 if opts.get('rev') and opts.get('remove'):
5113 if opts.get('rev') and opts.get('remove'):
5113 raise error.Abort(_("--rev and --remove are incompatible"))
5114 raise error.Abort(_("--rev and --remove are incompatible"))
5114 if opts.get('rev'):
5115 if opts.get('rev'):
5115 rev_ = opts['rev']
5116 rev_ = opts['rev']
5116 message = opts.get('message')
5117 message = opts.get('message')
5117 if opts.get('remove'):
5118 if opts.get('remove'):
5118 if opts.get('local'):
5119 if opts.get('local'):
5119 expectedtype = 'local'
5120 expectedtype = 'local'
5120 else:
5121 else:
5121 expectedtype = 'global'
5122 expectedtype = 'global'
5122
5123
5123 for n in names:
5124 for n in names:
5124 if not repo.tagtype(n):
5125 if not repo.tagtype(n):
5125 raise error.Abort(_("tag '%s' does not exist") % n)
5126 raise error.Abort(_("tag '%s' does not exist") % n)
5126 if repo.tagtype(n) != expectedtype:
5127 if repo.tagtype(n) != expectedtype:
5127 if expectedtype == 'global':
5128 if expectedtype == 'global':
5128 raise error.Abort(_("tag '%s' is not a global tag") % n)
5129 raise error.Abort(_("tag '%s' is not a global tag") % n)
5129 else:
5130 else:
5130 raise error.Abort(_("tag '%s' is not a local tag") % n)
5131 raise error.Abort(_("tag '%s' is not a local tag") % n)
5131 rev_ = 'null'
5132 rev_ = 'null'
5132 if not message:
5133 if not message:
5133 # we don't translate commit messages
5134 # we don't translate commit messages
5134 message = 'Removed tag %s' % ', '.join(names)
5135 message = 'Removed tag %s' % ', '.join(names)
5135 elif not opts.get('force'):
5136 elif not opts.get('force'):
5136 for n in names:
5137 for n in names:
5137 if n in repo.tags():
5138 if n in repo.tags():
5138 raise error.Abort(_("tag '%s' already exists "
5139 raise error.Abort(_("tag '%s' already exists "
5139 "(use -f to force)") % n)
5140 "(use -f to force)") % n)
5140 if not opts.get('local'):
5141 if not opts.get('local'):
5141 p1, p2 = repo.dirstate.parents()
5142 p1, p2 = repo.dirstate.parents()
5142 if p2 != nullid:
5143 if p2 != nullid:
5143 raise error.Abort(_('uncommitted merge'))
5144 raise error.Abort(_('uncommitted merge'))
5144 bheads = repo.branchheads()
5145 bheads = repo.branchheads()
5145 if not opts.get('force') and bheads and p1 not in bheads:
5146 if not opts.get('force') and bheads and p1 not in bheads:
5146 raise error.Abort(_('working directory is not at a branch head '
5147 raise error.Abort(_('working directory is not at a branch head '
5147 '(use -f to force)'))
5148 '(use -f to force)'))
5148 r = scmutil.revsingle(repo, rev_).node()
5149 r = scmutil.revsingle(repo, rev_).node()
5149
5150
5150 if not message:
5151 if not message:
5151 # we don't translate commit messages
5152 # we don't translate commit messages
5152 message = ('Added tag %s for changeset %s' %
5153 message = ('Added tag %s for changeset %s' %
5153 (', '.join(names), short(r)))
5154 (', '.join(names), short(r)))
5154
5155
5155 date = opts.get('date')
5156 date = opts.get('date')
5156 if date:
5157 if date:
5157 date = util.parsedate(date)
5158 date = util.parsedate(date)
5158
5159
5159 if opts.get('remove'):
5160 if opts.get('remove'):
5160 editform = 'tag.remove'
5161 editform = 'tag.remove'
5161 else:
5162 else:
5162 editform = 'tag.add'
5163 editform = 'tag.add'
5163 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5164 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5164
5165
5165 # don't allow tagging the null rev
5166 # don't allow tagging the null rev
5166 if (not opts.get('remove') and
5167 if (not opts.get('remove') and
5167 scmutil.revsingle(repo, rev_).rev() == nullrev):
5168 scmutil.revsingle(repo, rev_).rev() == nullrev):
5168 raise error.Abort(_("cannot tag null revision"))
5169 raise error.Abort(_("cannot tag null revision"))
5169
5170
5170 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5171 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
5171 editor=editor)
5172 editor=editor)
5172 finally:
5173 finally:
5173 release(lock, wlock)
5174 release(lock, wlock)
5174
5175
5175 @command('tags', formatteropts, '')
5176 @command('tags', formatteropts, '')
5176 def tags(ui, repo, **opts):
5177 def tags(ui, repo, **opts):
5177 """list repository tags
5178 """list repository tags
5178
5179
5179 This lists both regular and local tags. When the -v/--verbose
5180 This lists both regular and local tags. When the -v/--verbose
5180 switch is used, a third column "local" is printed for local tags.
5181 switch is used, a third column "local" is printed for local tags.
5181 When the -q/--quiet switch is used, only the tag name is printed.
5182 When the -q/--quiet switch is used, only the tag name is printed.
5182
5183
5183 Returns 0 on success.
5184 Returns 0 on success.
5184 """
5185 """
5185
5186
5186 ui.pager('tags')
5187 ui.pager('tags')
5187 fm = ui.formatter('tags', opts)
5188 fm = ui.formatter('tags', opts)
5188 hexfunc = fm.hexfunc
5189 hexfunc = fm.hexfunc
5189 tagtype = ""
5190 tagtype = ""
5190
5191
5191 for t, n in reversed(repo.tagslist()):
5192 for t, n in reversed(repo.tagslist()):
5192 hn = hexfunc(n)
5193 hn = hexfunc(n)
5193 label = 'tags.normal'
5194 label = 'tags.normal'
5194 tagtype = ''
5195 tagtype = ''
5195 if repo.tagtype(t) == 'local':
5196 if repo.tagtype(t) == 'local':
5196 label = 'tags.local'
5197 label = 'tags.local'
5197 tagtype = 'local'
5198 tagtype = 'local'
5198
5199
5199 fm.startitem()
5200 fm.startitem()
5200 fm.write('tag', '%s', t, label=label)
5201 fm.write('tag', '%s', t, label=label)
5201 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5202 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5202 fm.condwrite(not ui.quiet, 'rev node', fmt,
5203 fm.condwrite(not ui.quiet, 'rev node', fmt,
5203 repo.changelog.rev(n), hn, label=label)
5204 repo.changelog.rev(n), hn, label=label)
5204 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5205 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5205 tagtype, label=label)
5206 tagtype, label=label)
5206 fm.plain('\n')
5207 fm.plain('\n')
5207 fm.end()
5208 fm.end()
5208
5209
5209 @command('tip',
5210 @command('tip',
5210 [('p', 'patch', None, _('show patch')),
5211 [('p', 'patch', None, _('show patch')),
5211 ('g', 'git', None, _('use git extended diff format')),
5212 ('g', 'git', None, _('use git extended diff format')),
5212 ] + templateopts,
5213 ] + templateopts,
5213 _('[-p] [-g]'))
5214 _('[-p] [-g]'))
5214 def tip(ui, repo, **opts):
5215 def tip(ui, repo, **opts):
5215 """show the tip revision (DEPRECATED)
5216 """show the tip revision (DEPRECATED)
5216
5217
5217 The tip revision (usually just called the tip) is the changeset
5218 The tip revision (usually just called the tip) is the changeset
5218 most recently added to the repository (and therefore the most
5219 most recently added to the repository (and therefore the most
5219 recently changed head).
5220 recently changed head).
5220
5221
5221 If you have just made a commit, that commit will be the tip. If
5222 If you have just made a commit, that commit will be the tip. If
5222 you have just pulled changes from another repository, the tip of
5223 you have just pulled changes from another repository, the tip of
5223 that repository becomes the current tip. The "tip" tag is special
5224 that repository becomes the current tip. The "tip" tag is special
5224 and cannot be renamed or assigned to a different changeset.
5225 and cannot be renamed or assigned to a different changeset.
5225
5226
5226 This command is deprecated, please use :hg:`heads` instead.
5227 This command is deprecated, please use :hg:`heads` instead.
5227
5228
5228 Returns 0 on success.
5229 Returns 0 on success.
5229 """
5230 """
5230 displayer = cmdutil.show_changeset(ui, repo, opts)
5231 displayer = cmdutil.show_changeset(ui, repo, opts)
5231 displayer.show(repo['tip'])
5232 displayer.show(repo['tip'])
5232 displayer.close()
5233 displayer.close()
5233
5234
5234 @command('unbundle',
5235 @command('unbundle',
5235 [('u', 'update', None,
5236 [('u', 'update', None,
5236 _('update to new branch head if changesets were unbundled'))],
5237 _('update to new branch head if changesets were unbundled'))],
5237 _('[-u] FILE...'))
5238 _('[-u] FILE...'))
5238 def unbundle(ui, repo, fname1, *fnames, **opts):
5239 def unbundle(ui, repo, fname1, *fnames, **opts):
5239 """apply one or more changegroup files
5240 """apply one or more changegroup files
5240
5241
5241 Apply one or more compressed changegroup files generated by the
5242 Apply one or more compressed changegroup files generated by the
5242 bundle command.
5243 bundle command.
5243
5244
5244 Returns 0 on success, 1 if an update has unresolved files.
5245 Returns 0 on success, 1 if an update has unresolved files.
5245 """
5246 """
5246 fnames = (fname1,) + fnames
5247 fnames = (fname1,) + fnames
5247
5248
5248 with repo.lock():
5249 with repo.lock():
5249 for fname in fnames:
5250 for fname in fnames:
5250 f = hg.openpath(ui, fname)
5251 f = hg.openpath(ui, fname)
5251 gen = exchange.readbundle(ui, f, fname)
5252 gen = exchange.readbundle(ui, f, fname)
5252 if isinstance(gen, bundle2.unbundle20):
5253 if isinstance(gen, bundle2.unbundle20):
5253 tr = repo.transaction('unbundle')
5254 tr = repo.transaction('unbundle')
5254 try:
5255 try:
5255 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5256 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5256 url='bundle:' + fname)
5257 url='bundle:' + fname)
5257 tr.close()
5258 tr.close()
5258 except error.BundleUnknownFeatureError as exc:
5259 except error.BundleUnknownFeatureError as exc:
5259 raise error.Abort(_('%s: unknown bundle feature, %s')
5260 raise error.Abort(_('%s: unknown bundle feature, %s')
5260 % (fname, exc),
5261 % (fname, exc),
5261 hint=_("see https://mercurial-scm.org/"
5262 hint=_("see https://mercurial-scm.org/"
5262 "wiki/BundleFeature for more "
5263 "wiki/BundleFeature for more "
5263 "information"))
5264 "information"))
5264 finally:
5265 finally:
5265 if tr:
5266 if tr:
5266 tr.release()
5267 tr.release()
5267 changes = [r.get('return', 0)
5268 changes = [r.get('return', 0)
5268 for r in op.records['changegroup']]
5269 for r in op.records['changegroup']]
5269 modheads = changegroup.combineresults(changes)
5270 modheads = changegroup.combineresults(changes)
5270 elif isinstance(gen, streamclone.streamcloneapplier):
5271 elif isinstance(gen, streamclone.streamcloneapplier):
5271 raise error.Abort(
5272 raise error.Abort(
5272 _('packed bundles cannot be applied with '
5273 _('packed bundles cannot be applied with '
5273 '"hg unbundle"'),
5274 '"hg unbundle"'),
5274 hint=_('use "hg debugapplystreamclonebundle"'))
5275 hint=_('use "hg debugapplystreamclonebundle"'))
5275 else:
5276 else:
5276 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5277 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5277
5278
5278 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5279 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5279
5280
5280 @command('^update|up|checkout|co',
5281 @command('^update|up|checkout|co',
5281 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5282 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5282 ('c', 'check', None, _('require clean working directory')),
5283 ('c', 'check', None, _('require clean working directory')),
5283 ('m', 'merge', None, _('merge uncommitted changes')),
5284 ('m', 'merge', None, _('merge uncommitted changes')),
5284 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5285 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5285 ('r', 'rev', '', _('revision'), _('REV'))
5286 ('r', 'rev', '', _('revision'), _('REV'))
5286 ] + mergetoolopts,
5287 ] + mergetoolopts,
5287 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5288 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5288 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5289 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5289 merge=None, tool=None):
5290 merge=None, tool=None):
5290 """update working directory (or switch revisions)
5291 """update working directory (or switch revisions)
5291
5292
5292 Update the repository's working directory to the specified
5293 Update the repository's working directory to the specified
5293 changeset. If no changeset is specified, update to the tip of the
5294 changeset. If no changeset is specified, update to the tip of the
5294 current named branch and move the active bookmark (see :hg:`help
5295 current named branch and move the active bookmark (see :hg:`help
5295 bookmarks`).
5296 bookmarks`).
5296
5297
5297 Update sets the working directory's parent revision to the specified
5298 Update sets the working directory's parent revision to the specified
5298 changeset (see :hg:`help parents`).
5299 changeset (see :hg:`help parents`).
5299
5300
5300 If the changeset is not a descendant or ancestor of the working
5301 If the changeset is not a descendant or ancestor of the working
5301 directory's parent and there are uncommitted changes, the update is
5302 directory's parent and there are uncommitted changes, the update is
5302 aborted. With the -c/--check option, the working directory is checked
5303 aborted. With the -c/--check option, the working directory is checked
5303 for uncommitted changes; if none are found, the working directory is
5304 for uncommitted changes; if none are found, the working directory is
5304 updated to the specified changeset.
5305 updated to the specified changeset.
5305
5306
5306 .. container:: verbose
5307 .. container:: verbose
5307
5308
5308 The -C/--clean, -c/--check, and -m/--merge options control what
5309 The -C/--clean, -c/--check, and -m/--merge options control what
5309 happens if the working directory contains uncommitted changes.
5310 happens if the working directory contains uncommitted changes.
5310 At most of one of them can be specified.
5311 At most of one of them can be specified.
5311
5312
5312 1. If no option is specified, and if
5313 1. If no option is specified, and if
5313 the requested changeset is an ancestor or descendant of
5314 the requested changeset is an ancestor or descendant of
5314 the working directory's parent, the uncommitted changes
5315 the working directory's parent, the uncommitted changes
5315 are merged into the requested changeset and the merged
5316 are merged into the requested changeset and the merged
5316 result is left uncommitted. If the requested changeset is
5317 result is left uncommitted. If the requested changeset is
5317 not an ancestor or descendant (that is, it is on another
5318 not an ancestor or descendant (that is, it is on another
5318 branch), the update is aborted and the uncommitted changes
5319 branch), the update is aborted and the uncommitted changes
5319 are preserved.
5320 are preserved.
5320
5321
5321 2. With the -m/--merge option, the update is allowed even if the
5322 2. With the -m/--merge option, the update is allowed even if the
5322 requested changeset is not an ancestor or descendant of
5323 requested changeset is not an ancestor or descendant of
5323 the working directory's parent.
5324 the working directory's parent.
5324
5325
5325 3. With the -c/--check option, the update is aborted and the
5326 3. With the -c/--check option, the update is aborted and the
5326 uncommitted changes are preserved.
5327 uncommitted changes are preserved.
5327
5328
5328 4. With the -C/--clean option, uncommitted changes are discarded and
5329 4. With the -C/--clean option, uncommitted changes are discarded and
5329 the working directory is updated to the requested changeset.
5330 the working directory is updated to the requested changeset.
5330
5331
5331 To cancel an uncommitted merge (and lose your changes), use
5332 To cancel an uncommitted merge (and lose your changes), use
5332 :hg:`update --clean .`.
5333 :hg:`update --clean .`.
5333
5334
5334 Use null as the changeset to remove the working directory (like
5335 Use null as the changeset to remove the working directory (like
5335 :hg:`clone -U`).
5336 :hg:`clone -U`).
5336
5337
5337 If you want to revert just one file to an older revision, use
5338 If you want to revert just one file to an older revision, use
5338 :hg:`revert [-r REV] NAME`.
5339 :hg:`revert [-r REV] NAME`.
5339
5340
5340 See :hg:`help dates` for a list of formats valid for -d/--date.
5341 See :hg:`help dates` for a list of formats valid for -d/--date.
5341
5342
5342 Returns 0 on success, 1 if there are unresolved files.
5343 Returns 0 on success, 1 if there are unresolved files.
5343 """
5344 """
5344 if rev and node:
5345 if rev and node:
5345 raise error.Abort(_("please specify just one revision"))
5346 raise error.Abort(_("please specify just one revision"))
5346
5347
5347 if rev is None or rev == '':
5348 if rev is None or rev == '':
5348 rev = node
5349 rev = node
5349
5350
5350 if date and rev is not None:
5351 if date and rev is not None:
5351 raise error.Abort(_("you can't specify a revision and a date"))
5352 raise error.Abort(_("you can't specify a revision and a date"))
5352
5353
5353 if len([x for x in (clean, check, merge) if x]) > 1:
5354 if len([x for x in (clean, check, merge) if x]) > 1:
5354 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5355 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5355 "or -m/merge"))
5356 "or -m/merge"))
5356
5357
5357 updatecheck = None
5358 updatecheck = None
5358 if check:
5359 if check:
5359 updatecheck = 'abort'
5360 updatecheck = 'abort'
5360 elif merge:
5361 elif merge:
5361 updatecheck = 'none'
5362 updatecheck = 'none'
5362
5363
5363 with repo.wlock():
5364 with repo.wlock():
5364 cmdutil.clearunfinished(repo)
5365 cmdutil.clearunfinished(repo)
5365
5366
5366 if date:
5367 if date:
5367 rev = cmdutil.finddate(ui, repo, date)
5368 rev = cmdutil.finddate(ui, repo, date)
5368
5369
5369 # if we defined a bookmark, we have to remember the original name
5370 # if we defined a bookmark, we have to remember the original name
5370 brev = rev
5371 brev = rev
5371 rev = scmutil.revsingle(repo, rev, rev).rev()
5372 rev = scmutil.revsingle(repo, rev, rev).rev()
5372
5373
5373 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5374 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5374
5375
5375 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5376 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5376 updatecheck=updatecheck)
5377 updatecheck=updatecheck)
5377
5378
5378 @command('verify', [])
5379 @command('verify', [])
5379 def verify(ui, repo):
5380 def verify(ui, repo):
5380 """verify the integrity of the repository
5381 """verify the integrity of the repository
5381
5382
5382 Verify the integrity of the current repository.
5383 Verify the integrity of the current repository.
5383
5384
5384 This will perform an extensive check of the repository's
5385 This will perform an extensive check of the repository's
5385 integrity, validating the hashes and checksums of each entry in
5386 integrity, validating the hashes and checksums of each entry in
5386 the changelog, manifest, and tracked files, as well as the
5387 the changelog, manifest, and tracked files, as well as the
5387 integrity of their crosslinks and indices.
5388 integrity of their crosslinks and indices.
5388
5389
5389 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5390 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5390 for more information about recovery from corruption of the
5391 for more information about recovery from corruption of the
5391 repository.
5392 repository.
5392
5393
5393 Returns 0 on success, 1 if errors are encountered.
5394 Returns 0 on success, 1 if errors are encountered.
5394 """
5395 """
5395 return hg.verify(repo)
5396 return hg.verify(repo)
5396
5397
5397 @command('version', [] + formatteropts, norepo=True)
5398 @command('version', [] + formatteropts, norepo=True)
5398 def version_(ui, **opts):
5399 def version_(ui, **opts):
5399 """output version and copyright information"""
5400 """output version and copyright information"""
5400 if ui.verbose:
5401 if ui.verbose:
5401 ui.pager('version')
5402 ui.pager('version')
5402 fm = ui.formatter("version", opts)
5403 fm = ui.formatter("version", opts)
5403 fm.startitem()
5404 fm.startitem()
5404 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5405 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5405 util.version())
5406 util.version())
5406 license = _(
5407 license = _(
5407 "(see https://mercurial-scm.org for more information)\n"
5408 "(see https://mercurial-scm.org for more information)\n"
5408 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5409 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5409 "This is free software; see the source for copying conditions. "
5410 "This is free software; see the source for copying conditions. "
5410 "There is NO\nwarranty; "
5411 "There is NO\nwarranty; "
5411 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5412 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5412 )
5413 )
5413 if not ui.quiet:
5414 if not ui.quiet:
5414 fm.plain(license)
5415 fm.plain(license)
5415
5416
5416 if ui.verbose:
5417 if ui.verbose:
5417 fm.plain(_("\nEnabled extensions:\n\n"))
5418 fm.plain(_("\nEnabled extensions:\n\n"))
5418 # format names and versions into columns
5419 # format names and versions into columns
5419 names = []
5420 names = []
5420 vers = []
5421 vers = []
5421 isinternals = []
5422 isinternals = []
5422 for name, module in extensions.extensions():
5423 for name, module in extensions.extensions():
5423 names.append(name)
5424 names.append(name)
5424 vers.append(extensions.moduleversion(module) or None)
5425 vers.append(extensions.moduleversion(module) or None)
5425 isinternals.append(extensions.ismoduleinternal(module))
5426 isinternals.append(extensions.ismoduleinternal(module))
5426 fn = fm.nested("extensions")
5427 fn = fm.nested("extensions")
5427 if names:
5428 if names:
5428 namefmt = " %%-%ds " % max(len(n) for n in names)
5429 namefmt = " %%-%ds " % max(len(n) for n in names)
5429 places = [_("external"), _("internal")]
5430 places = [_("external"), _("internal")]
5430 for n, v, p in zip(names, vers, isinternals):
5431 for n, v, p in zip(names, vers, isinternals):
5431 fn.startitem()
5432 fn.startitem()
5432 fn.condwrite(ui.verbose, "name", namefmt, n)
5433 fn.condwrite(ui.verbose, "name", namefmt, n)
5433 if ui.verbose:
5434 if ui.verbose:
5434 fn.plain("%s " % places[p])
5435 fn.plain("%s " % places[p])
5435 fn.data(bundled=p)
5436 fn.data(bundled=p)
5436 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5437 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5437 if ui.verbose:
5438 if ui.verbose:
5438 fn.plain("\n")
5439 fn.plain("\n")
5439 fn.end()
5440 fn.end()
5440 fm.end()
5441 fm.end()
5441
5442
5442 def loadcmdtable(ui, name, cmdtable):
5443 def loadcmdtable(ui, name, cmdtable):
5443 """Load command functions from specified cmdtable
5444 """Load command functions from specified cmdtable
5444 """
5445 """
5445 overrides = [cmd for cmd in cmdtable if cmd in table]
5446 overrides = [cmd for cmd in cmdtable if cmd in table]
5446 if overrides:
5447 if overrides:
5447 ui.warn(_("extension '%s' overrides commands: %s\n")
5448 ui.warn(_("extension '%s' overrides commands: %s\n")
5448 % (name, " ".join(overrides)))
5449 % (name, " ".join(overrides)))
5449 table.update(cmdtable)
5450 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now