##// END OF EJS Templates
py3: use %d instead of %s for integers...
Pulkit Goyal -
r30611:cbc61b1b default
parent child Browse files
Show More
@@ -1,6602 +1,6602 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import shlex
14 import shlex
15 import socket
15 import socket
16 import string
16 import string
17 import sys
17 import sys
18 import tempfile
18 import tempfile
19 import time
19 import time
20
20
21 from .i18n import _
21 from .i18n import _
22 from .node import (
22 from .node import (
23 bin,
23 bin,
24 hex,
24 hex,
25 nullhex,
25 nullhex,
26 nullid,
26 nullid,
27 nullrev,
27 nullrev,
28 short,
28 short,
29 )
29 )
30 from . import (
30 from . import (
31 archival,
31 archival,
32 bookmarks,
32 bookmarks,
33 bundle2,
33 bundle2,
34 changegroup,
34 changegroup,
35 cmdutil,
35 cmdutil,
36 copies,
36 copies,
37 destutil,
37 destutil,
38 dirstateguard,
38 dirstateguard,
39 discovery,
39 discovery,
40 encoding,
40 encoding,
41 error,
41 error,
42 exchange,
42 exchange,
43 extensions,
43 extensions,
44 formatter,
44 formatter,
45 graphmod,
45 graphmod,
46 hbisect,
46 hbisect,
47 help,
47 help,
48 hg,
48 hg,
49 lock as lockmod,
49 lock as lockmod,
50 merge as mergemod,
50 merge as mergemod,
51 minirst,
51 minirst,
52 obsolete,
52 obsolete,
53 patch,
53 patch,
54 phases,
54 phases,
55 policy,
55 policy,
56 pvec,
56 pvec,
57 pycompat,
57 pycompat,
58 repair,
58 repair,
59 revlog,
59 revlog,
60 revset,
60 revset,
61 scmutil,
61 scmutil,
62 server,
62 server,
63 sshserver,
63 sshserver,
64 sslutil,
64 sslutil,
65 streamclone,
65 streamclone,
66 templatekw,
66 templatekw,
67 templater,
67 templater,
68 ui as uimod,
68 ui as uimod,
69 util,
69 util,
70 )
70 )
71
71
72 release = lockmod.release
72 release = lockmod.release
73
73
74 table = {}
74 table = {}
75
75
76 command = cmdutil.command(table)
76 command = cmdutil.command(table)
77
77
78 # label constants
78 # label constants
79 # until 3.5, bookmarks.current was the advertised name, not
79 # until 3.5, bookmarks.current was the advertised name, not
80 # bookmarks.active, so we must use both to avoid breaking old
80 # bookmarks.active, so we must use both to avoid breaking old
81 # custom styles
81 # custom styles
82 activebookmarklabel = 'bookmarks.active bookmarks.current'
82 activebookmarklabel = 'bookmarks.active bookmarks.current'
83
83
84 # common command options
84 # common command options
85
85
86 globalopts = [
86 globalopts = [
87 ('R', 'repository', '',
87 ('R', 'repository', '',
88 _('repository root directory or name of overlay bundle file'),
88 _('repository root directory or name of overlay bundle file'),
89 _('REPO')),
89 _('REPO')),
90 ('', 'cwd', '',
90 ('', 'cwd', '',
91 _('change working directory'), _('DIR')),
91 _('change working directory'), _('DIR')),
92 ('y', 'noninteractive', None,
92 ('y', 'noninteractive', None,
93 _('do not prompt, automatically pick the first choice for all prompts')),
93 _('do not prompt, automatically pick the first choice for all prompts')),
94 ('q', 'quiet', None, _('suppress output')),
94 ('q', 'quiet', None, _('suppress output')),
95 ('v', 'verbose', None, _('enable additional output')),
95 ('v', 'verbose', None, _('enable additional output')),
96 ('', 'config', [],
96 ('', 'config', [],
97 _('set/override config option (use \'section.name=value\')'),
97 _('set/override config option (use \'section.name=value\')'),
98 _('CONFIG')),
98 _('CONFIG')),
99 ('', 'debug', None, _('enable debugging output')),
99 ('', 'debug', None, _('enable debugging output')),
100 ('', 'debugger', None, _('start debugger')),
100 ('', 'debugger', None, _('start debugger')),
101 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
101 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
102 _('ENCODE')),
102 _('ENCODE')),
103 ('', 'encodingmode', encoding.encodingmode,
103 ('', 'encodingmode', encoding.encodingmode,
104 _('set the charset encoding mode'), _('MODE')),
104 _('set the charset encoding mode'), _('MODE')),
105 ('', 'traceback', None, _('always print a traceback on exception')),
105 ('', 'traceback', None, _('always print a traceback on exception')),
106 ('', 'time', None, _('time how long the command takes')),
106 ('', 'time', None, _('time how long the command takes')),
107 ('', 'profile', None, _('print command execution profile')),
107 ('', 'profile', None, _('print command execution profile')),
108 ('', 'version', None, _('output version information and exit')),
108 ('', 'version', None, _('output version information and exit')),
109 ('h', 'help', None, _('display help and exit')),
109 ('h', 'help', None, _('display help and exit')),
110 ('', 'hidden', False, _('consider hidden changesets')),
110 ('', 'hidden', False, _('consider hidden changesets')),
111 ]
111 ]
112
112
113 dryrunopts = [('n', 'dry-run', None,
113 dryrunopts = [('n', 'dry-run', None,
114 _('do not perform actions, just print output'))]
114 _('do not perform actions, just print output'))]
115
115
116 remoteopts = [
116 remoteopts = [
117 ('e', 'ssh', '',
117 ('e', 'ssh', '',
118 _('specify ssh command to use'), _('CMD')),
118 _('specify ssh command to use'), _('CMD')),
119 ('', 'remotecmd', '',
119 ('', 'remotecmd', '',
120 _('specify hg command to run on the remote side'), _('CMD')),
120 _('specify hg command to run on the remote side'), _('CMD')),
121 ('', 'insecure', None,
121 ('', 'insecure', None,
122 _('do not verify server certificate (ignoring web.cacerts config)')),
122 _('do not verify server certificate (ignoring web.cacerts config)')),
123 ]
123 ]
124
124
125 walkopts = [
125 walkopts = [
126 ('I', 'include', [],
126 ('I', 'include', [],
127 _('include names matching the given patterns'), _('PATTERN')),
127 _('include names matching the given patterns'), _('PATTERN')),
128 ('X', 'exclude', [],
128 ('X', 'exclude', [],
129 _('exclude names matching the given patterns'), _('PATTERN')),
129 _('exclude names matching the given patterns'), _('PATTERN')),
130 ]
130 ]
131
131
132 commitopts = [
132 commitopts = [
133 ('m', 'message', '',
133 ('m', 'message', '',
134 _('use text as commit message'), _('TEXT')),
134 _('use text as commit message'), _('TEXT')),
135 ('l', 'logfile', '',
135 ('l', 'logfile', '',
136 _('read commit message from file'), _('FILE')),
136 _('read commit message from file'), _('FILE')),
137 ]
137 ]
138
138
139 commitopts2 = [
139 commitopts2 = [
140 ('d', 'date', '',
140 ('d', 'date', '',
141 _('record the specified date as commit date'), _('DATE')),
141 _('record the specified date as commit date'), _('DATE')),
142 ('u', 'user', '',
142 ('u', 'user', '',
143 _('record the specified user as committer'), _('USER')),
143 _('record the specified user as committer'), _('USER')),
144 ]
144 ]
145
145
146 # hidden for now
146 # hidden for now
147 formatteropts = [
147 formatteropts = [
148 ('T', 'template', '',
148 ('T', 'template', '',
149 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
149 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
150 ]
150 ]
151
151
152 templateopts = [
152 templateopts = [
153 ('', 'style', '',
153 ('', 'style', '',
154 _('display using template map file (DEPRECATED)'), _('STYLE')),
154 _('display using template map file (DEPRECATED)'), _('STYLE')),
155 ('T', 'template', '',
155 ('T', 'template', '',
156 _('display with template'), _('TEMPLATE')),
156 _('display with template'), _('TEMPLATE')),
157 ]
157 ]
158
158
159 logopts = [
159 logopts = [
160 ('p', 'patch', None, _('show patch')),
160 ('p', 'patch', None, _('show patch')),
161 ('g', 'git', None, _('use git extended diff format')),
161 ('g', 'git', None, _('use git extended diff format')),
162 ('l', 'limit', '',
162 ('l', 'limit', '',
163 _('limit number of changes displayed'), _('NUM')),
163 _('limit number of changes displayed'), _('NUM')),
164 ('M', 'no-merges', None, _('do not show merges')),
164 ('M', 'no-merges', None, _('do not show merges')),
165 ('', 'stat', None, _('output diffstat-style summary of changes')),
165 ('', 'stat', None, _('output diffstat-style summary of changes')),
166 ('G', 'graph', None, _("show the revision DAG")),
166 ('G', 'graph', None, _("show the revision DAG")),
167 ] + templateopts
167 ] + templateopts
168
168
169 diffopts = [
169 diffopts = [
170 ('a', 'text', None, _('treat all files as text')),
170 ('a', 'text', None, _('treat all files as text')),
171 ('g', 'git', None, _('use git extended diff format')),
171 ('g', 'git', None, _('use git extended diff format')),
172 ('', 'nodates', None, _('omit dates from diff headers'))
172 ('', 'nodates', None, _('omit dates from diff headers'))
173 ]
173 ]
174
174
175 diffwsopts = [
175 diffwsopts = [
176 ('w', 'ignore-all-space', None,
176 ('w', 'ignore-all-space', None,
177 _('ignore white space when comparing lines')),
177 _('ignore white space when comparing lines')),
178 ('b', 'ignore-space-change', None,
178 ('b', 'ignore-space-change', None,
179 _('ignore changes in the amount of white space')),
179 _('ignore changes in the amount of white space')),
180 ('B', 'ignore-blank-lines', None,
180 ('B', 'ignore-blank-lines', None,
181 _('ignore changes whose lines are all blank')),
181 _('ignore changes whose lines are all blank')),
182 ]
182 ]
183
183
184 diffopts2 = [
184 diffopts2 = [
185 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
185 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
186 ('p', 'show-function', None, _('show which function each change is in')),
186 ('p', 'show-function', None, _('show which function each change is in')),
187 ('', 'reverse', None, _('produce a diff that undoes the changes')),
187 ('', 'reverse', None, _('produce a diff that undoes the changes')),
188 ] + diffwsopts + [
188 ] + diffwsopts + [
189 ('U', 'unified', '',
189 ('U', 'unified', '',
190 _('number of lines of context to show'), _('NUM')),
190 _('number of lines of context to show'), _('NUM')),
191 ('', 'stat', None, _('output diffstat-style summary of changes')),
191 ('', 'stat', None, _('output diffstat-style summary of changes')),
192 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
192 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
193 ]
193 ]
194
194
195 mergetoolopts = [
195 mergetoolopts = [
196 ('t', 'tool', '', _('specify merge tool')),
196 ('t', 'tool', '', _('specify merge tool')),
197 ]
197 ]
198
198
199 similarityopts = [
199 similarityopts = [
200 ('s', 'similarity', '',
200 ('s', 'similarity', '',
201 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
201 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
202 ]
202 ]
203
203
204 subrepoopts = [
204 subrepoopts = [
205 ('S', 'subrepos', None,
205 ('S', 'subrepos', None,
206 _('recurse into subrepositories'))
206 _('recurse into subrepositories'))
207 ]
207 ]
208
208
209 debugrevlogopts = [
209 debugrevlogopts = [
210 ('c', 'changelog', False, _('open changelog')),
210 ('c', 'changelog', False, _('open changelog')),
211 ('m', 'manifest', False, _('open manifest')),
211 ('m', 'manifest', False, _('open manifest')),
212 ('', 'dir', '', _('open directory manifest')),
212 ('', 'dir', '', _('open directory manifest')),
213 ]
213 ]
214
214
215 # Commands start here, listed alphabetically
215 # Commands start here, listed alphabetically
216
216
217 @command('^add',
217 @command('^add',
218 walkopts + subrepoopts + dryrunopts,
218 walkopts + subrepoopts + dryrunopts,
219 _('[OPTION]... [FILE]...'),
219 _('[OPTION]... [FILE]...'),
220 inferrepo=True)
220 inferrepo=True)
221 def add(ui, repo, *pats, **opts):
221 def add(ui, repo, *pats, **opts):
222 """add the specified files on the next commit
222 """add the specified files on the next commit
223
223
224 Schedule files to be version controlled and added to the
224 Schedule files to be version controlled and added to the
225 repository.
225 repository.
226
226
227 The files will be added to the repository at the next commit. To
227 The files will be added to the repository at the next commit. To
228 undo an add before that, see :hg:`forget`.
228 undo an add before that, see :hg:`forget`.
229
229
230 If no names are given, add all files to the repository (except
230 If no names are given, add all files to the repository (except
231 files matching ``.hgignore``).
231 files matching ``.hgignore``).
232
232
233 .. container:: verbose
233 .. container:: verbose
234
234
235 Examples:
235 Examples:
236
236
237 - New (unknown) files are added
237 - New (unknown) files are added
238 automatically by :hg:`add`::
238 automatically by :hg:`add`::
239
239
240 $ ls
240 $ ls
241 foo.c
241 foo.c
242 $ hg status
242 $ hg status
243 ? foo.c
243 ? foo.c
244 $ hg add
244 $ hg add
245 adding foo.c
245 adding foo.c
246 $ hg status
246 $ hg status
247 A foo.c
247 A foo.c
248
248
249 - Specific files to be added can be specified::
249 - Specific files to be added can be specified::
250
250
251 $ ls
251 $ ls
252 bar.c foo.c
252 bar.c foo.c
253 $ hg status
253 $ hg status
254 ? bar.c
254 ? bar.c
255 ? foo.c
255 ? foo.c
256 $ hg add bar.c
256 $ hg add bar.c
257 $ hg status
257 $ hg status
258 A bar.c
258 A bar.c
259 ? foo.c
259 ? foo.c
260
260
261 Returns 0 if all files are successfully added.
261 Returns 0 if all files are successfully added.
262 """
262 """
263
263
264 m = scmutil.match(repo[None], pats, opts)
264 m = scmutil.match(repo[None], pats, opts)
265 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
265 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
266 return rejected and 1 or 0
266 return rejected and 1 or 0
267
267
268 @command('addremove',
268 @command('addremove',
269 similarityopts + subrepoopts + walkopts + dryrunopts,
269 similarityopts + subrepoopts + walkopts + dryrunopts,
270 _('[OPTION]... [FILE]...'),
270 _('[OPTION]... [FILE]...'),
271 inferrepo=True)
271 inferrepo=True)
272 def addremove(ui, repo, *pats, **opts):
272 def addremove(ui, repo, *pats, **opts):
273 """add all new files, delete all missing files
273 """add all new files, delete all missing files
274
274
275 Add all new files and remove all missing files from the
275 Add all new files and remove all missing files from the
276 repository.
276 repository.
277
277
278 Unless names are given, new files are ignored if they match any of
278 Unless names are given, new files are ignored if they match any of
279 the patterns in ``.hgignore``. As with add, these changes take
279 the patterns in ``.hgignore``. As with add, these changes take
280 effect at the next commit.
280 effect at the next commit.
281
281
282 Use the -s/--similarity option to detect renamed files. This
282 Use the -s/--similarity option to detect renamed files. This
283 option takes a percentage between 0 (disabled) and 100 (files must
283 option takes a percentage between 0 (disabled) and 100 (files must
284 be identical) as its parameter. With a parameter greater than 0,
284 be identical) as its parameter. With a parameter greater than 0,
285 this compares every removed file with every added file and records
285 this compares every removed file with every added file and records
286 those similar enough as renames. Detecting renamed files this way
286 those similar enough as renames. Detecting renamed files this way
287 can be expensive. After using this option, :hg:`status -C` can be
287 can be expensive. After using this option, :hg:`status -C` can be
288 used to check which files were identified as moved or renamed. If
288 used to check which files were identified as moved or renamed. If
289 not specified, -s/--similarity defaults to 100 and only renames of
289 not specified, -s/--similarity defaults to 100 and only renames of
290 identical files are detected.
290 identical files are detected.
291
291
292 .. container:: verbose
292 .. container:: verbose
293
293
294 Examples:
294 Examples:
295
295
296 - A number of files (bar.c and foo.c) are new,
296 - A number of files (bar.c and foo.c) are new,
297 while foobar.c has been removed (without using :hg:`remove`)
297 while foobar.c has been removed (without using :hg:`remove`)
298 from the repository::
298 from the repository::
299
299
300 $ ls
300 $ ls
301 bar.c foo.c
301 bar.c foo.c
302 $ hg status
302 $ hg status
303 ! foobar.c
303 ! foobar.c
304 ? bar.c
304 ? bar.c
305 ? foo.c
305 ? foo.c
306 $ hg addremove
306 $ hg addremove
307 adding bar.c
307 adding bar.c
308 adding foo.c
308 adding foo.c
309 removing foobar.c
309 removing foobar.c
310 $ hg status
310 $ hg status
311 A bar.c
311 A bar.c
312 A foo.c
312 A foo.c
313 R foobar.c
313 R foobar.c
314
314
315 - A file foobar.c was moved to foo.c without using :hg:`rename`.
315 - A file foobar.c was moved to foo.c without using :hg:`rename`.
316 Afterwards, it was edited slightly::
316 Afterwards, it was edited slightly::
317
317
318 $ ls
318 $ ls
319 foo.c
319 foo.c
320 $ hg status
320 $ hg status
321 ! foobar.c
321 ! foobar.c
322 ? foo.c
322 ? foo.c
323 $ hg addremove --similarity 90
323 $ hg addremove --similarity 90
324 removing foobar.c
324 removing foobar.c
325 adding foo.c
325 adding foo.c
326 recording removal of foobar.c as rename to foo.c (94% similar)
326 recording removal of foobar.c as rename to foo.c (94% similar)
327 $ hg status -C
327 $ hg status -C
328 A foo.c
328 A foo.c
329 foobar.c
329 foobar.c
330 R foobar.c
330 R foobar.c
331
331
332 Returns 0 if all files are successfully added.
332 Returns 0 if all files are successfully added.
333 """
333 """
334 try:
334 try:
335 sim = float(opts.get('similarity') or 100)
335 sim = float(opts.get('similarity') or 100)
336 except ValueError:
336 except ValueError:
337 raise error.Abort(_('similarity must be a number'))
337 raise error.Abort(_('similarity must be a number'))
338 if sim < 0 or sim > 100:
338 if sim < 0 or sim > 100:
339 raise error.Abort(_('similarity must be between 0 and 100'))
339 raise error.Abort(_('similarity must be between 0 and 100'))
340 matcher = scmutil.match(repo[None], pats, opts)
340 matcher = scmutil.match(repo[None], pats, opts)
341 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
341 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
342
342
343 @command('^annotate|blame',
343 @command('^annotate|blame',
344 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
344 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
345 ('', 'follow', None,
345 ('', 'follow', None,
346 _('follow copies/renames and list the filename (DEPRECATED)')),
346 _('follow copies/renames and list the filename (DEPRECATED)')),
347 ('', 'no-follow', None, _("don't follow copies and renames")),
347 ('', 'no-follow', None, _("don't follow copies and renames")),
348 ('a', 'text', None, _('treat all files as text')),
348 ('a', 'text', None, _('treat all files as text')),
349 ('u', 'user', None, _('list the author (long with -v)')),
349 ('u', 'user', None, _('list the author (long with -v)')),
350 ('f', 'file', None, _('list the filename')),
350 ('f', 'file', None, _('list the filename')),
351 ('d', 'date', None, _('list the date (short with -q)')),
351 ('d', 'date', None, _('list the date (short with -q)')),
352 ('n', 'number', None, _('list the revision number (default)')),
352 ('n', 'number', None, _('list the revision number (default)')),
353 ('c', 'changeset', None, _('list the changeset')),
353 ('c', 'changeset', None, _('list the changeset')),
354 ('l', 'line-number', None, _('show line number at the first appearance'))
354 ('l', 'line-number', None, _('show line number at the first appearance'))
355 ] + diffwsopts + walkopts + formatteropts,
355 ] + diffwsopts + walkopts + formatteropts,
356 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
356 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
357 inferrepo=True)
357 inferrepo=True)
358 def annotate(ui, repo, *pats, **opts):
358 def annotate(ui, repo, *pats, **opts):
359 """show changeset information by line for each file
359 """show changeset information by line for each file
360
360
361 List changes in files, showing the revision id responsible for
361 List changes in files, showing the revision id responsible for
362 each line.
362 each line.
363
363
364 This command is useful for discovering when a change was made and
364 This command is useful for discovering when a change was made and
365 by whom.
365 by whom.
366
366
367 If you include --file, --user, or --date, the revision number is
367 If you include --file, --user, or --date, the revision number is
368 suppressed unless you also include --number.
368 suppressed unless you also include --number.
369
369
370 Without the -a/--text option, annotate will avoid processing files
370 Without the -a/--text option, annotate will avoid processing files
371 it detects as binary. With -a, annotate will annotate the file
371 it detects as binary. With -a, annotate will annotate the file
372 anyway, although the results will probably be neither useful
372 anyway, although the results will probably be neither useful
373 nor desirable.
373 nor desirable.
374
374
375 Returns 0 on success.
375 Returns 0 on success.
376 """
376 """
377 if not pats:
377 if not pats:
378 raise error.Abort(_('at least one filename or pattern is required'))
378 raise error.Abort(_('at least one filename or pattern is required'))
379
379
380 if opts.get('follow'):
380 if opts.get('follow'):
381 # --follow is deprecated and now just an alias for -f/--file
381 # --follow is deprecated and now just an alias for -f/--file
382 # to mimic the behavior of Mercurial before version 1.5
382 # to mimic the behavior of Mercurial before version 1.5
383 opts['file'] = True
383 opts['file'] = True
384
384
385 ctx = scmutil.revsingle(repo, opts.get('rev'))
385 ctx = scmutil.revsingle(repo, opts.get('rev'))
386
386
387 fm = ui.formatter('annotate', opts)
387 fm = ui.formatter('annotate', opts)
388 if ui.quiet:
388 if ui.quiet:
389 datefunc = util.shortdate
389 datefunc = util.shortdate
390 else:
390 else:
391 datefunc = util.datestr
391 datefunc = util.datestr
392 if ctx.rev() is None:
392 if ctx.rev() is None:
393 def hexfn(node):
393 def hexfn(node):
394 if node is None:
394 if node is None:
395 return None
395 return None
396 else:
396 else:
397 return fm.hexfunc(node)
397 return fm.hexfunc(node)
398 if opts.get('changeset'):
398 if opts.get('changeset'):
399 # omit "+" suffix which is appended to node hex
399 # omit "+" suffix which is appended to node hex
400 def formatrev(rev):
400 def formatrev(rev):
401 if rev is None:
401 if rev is None:
402 return '%d' % ctx.p1().rev()
402 return '%d' % ctx.p1().rev()
403 else:
403 else:
404 return '%d' % rev
404 return '%d' % rev
405 else:
405 else:
406 def formatrev(rev):
406 def formatrev(rev):
407 if rev is None:
407 if rev is None:
408 return '%d+' % ctx.p1().rev()
408 return '%d+' % ctx.p1().rev()
409 else:
409 else:
410 return '%d ' % rev
410 return '%d ' % rev
411 def formathex(hex):
411 def formathex(hex):
412 if hex is None:
412 if hex is None:
413 return '%s+' % fm.hexfunc(ctx.p1().node())
413 return '%s+' % fm.hexfunc(ctx.p1().node())
414 else:
414 else:
415 return '%s ' % hex
415 return '%s ' % hex
416 else:
416 else:
417 hexfn = fm.hexfunc
417 hexfn = fm.hexfunc
418 formatrev = formathex = str
418 formatrev = formathex = str
419
419
420 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
420 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
421 ('number', ' ', lambda x: x[0].rev(), formatrev),
421 ('number', ' ', lambda x: x[0].rev(), formatrev),
422 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
422 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
423 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
423 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
424 ('file', ' ', lambda x: x[0].path(), str),
424 ('file', ' ', lambda x: x[0].path(), str),
425 ('line_number', ':', lambda x: x[1], str),
425 ('line_number', ':', lambda x: x[1], str),
426 ]
426 ]
427 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
427 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
428
428
429 if (not opts.get('user') and not opts.get('changeset')
429 if (not opts.get('user') and not opts.get('changeset')
430 and not opts.get('date') and not opts.get('file')):
430 and not opts.get('date') and not opts.get('file')):
431 opts['number'] = True
431 opts['number'] = True
432
432
433 linenumber = opts.get('line_number') is not None
433 linenumber = opts.get('line_number') is not None
434 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
434 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
435 raise error.Abort(_('at least one of -n/-c is required for -l'))
435 raise error.Abort(_('at least one of -n/-c is required for -l'))
436
436
437 if fm.isplain():
437 if fm.isplain():
438 def makefunc(get, fmt):
438 def makefunc(get, fmt):
439 return lambda x: fmt(get(x))
439 return lambda x: fmt(get(x))
440 else:
440 else:
441 def makefunc(get, fmt):
441 def makefunc(get, fmt):
442 return get
442 return get
443 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
443 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
444 if opts.get(op)]
444 if opts.get(op)]
445 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
445 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
446 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
446 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
447 if opts.get(op))
447 if opts.get(op))
448
448
449 def bad(x, y):
449 def bad(x, y):
450 raise error.Abort("%s: %s" % (x, y))
450 raise error.Abort("%s: %s" % (x, y))
451
451
452 m = scmutil.match(ctx, pats, opts, badfn=bad)
452 m = scmutil.match(ctx, pats, opts, badfn=bad)
453
453
454 follow = not opts.get('no_follow')
454 follow = not opts.get('no_follow')
455 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
455 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
456 whitespace=True)
456 whitespace=True)
457 for abs in ctx.walk(m):
457 for abs in ctx.walk(m):
458 fctx = ctx[abs]
458 fctx = ctx[abs]
459 if not opts.get('text') and util.binary(fctx.data()):
459 if not opts.get('text') and util.binary(fctx.data()):
460 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
460 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
461 continue
461 continue
462
462
463 lines = fctx.annotate(follow=follow, linenumber=linenumber,
463 lines = fctx.annotate(follow=follow, linenumber=linenumber,
464 diffopts=diffopts)
464 diffopts=diffopts)
465 if not lines:
465 if not lines:
466 continue
466 continue
467 formats = []
467 formats = []
468 pieces = []
468 pieces = []
469
469
470 for f, sep in funcmap:
470 for f, sep in funcmap:
471 l = [f(n) for n, dummy in lines]
471 l = [f(n) for n, dummy in lines]
472 if fm.isplain():
472 if fm.isplain():
473 sizes = [encoding.colwidth(x) for x in l]
473 sizes = [encoding.colwidth(x) for x in l]
474 ml = max(sizes)
474 ml = max(sizes)
475 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
475 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
476 else:
476 else:
477 formats.append(['%s' for x in l])
477 formats.append(['%s' for x in l])
478 pieces.append(l)
478 pieces.append(l)
479
479
480 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
480 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
481 fm.startitem()
481 fm.startitem()
482 fm.write(fields, "".join(f), *p)
482 fm.write(fields, "".join(f), *p)
483 fm.write('line', ": %s", l[1])
483 fm.write('line', ": %s", l[1])
484
484
485 if not lines[-1][1].endswith('\n'):
485 if not lines[-1][1].endswith('\n'):
486 fm.plain('\n')
486 fm.plain('\n')
487
487
488 fm.end()
488 fm.end()
489
489
490 @command('archive',
490 @command('archive',
491 [('', 'no-decode', None, _('do not pass files through decoders')),
491 [('', 'no-decode', None, _('do not pass files through decoders')),
492 ('p', 'prefix', '', _('directory prefix for files in archive'),
492 ('p', 'prefix', '', _('directory prefix for files in archive'),
493 _('PREFIX')),
493 _('PREFIX')),
494 ('r', 'rev', '', _('revision to distribute'), _('REV')),
494 ('r', 'rev', '', _('revision to distribute'), _('REV')),
495 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
495 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
496 ] + subrepoopts + walkopts,
496 ] + subrepoopts + walkopts,
497 _('[OPTION]... DEST'))
497 _('[OPTION]... DEST'))
498 def archive(ui, repo, dest, **opts):
498 def archive(ui, repo, dest, **opts):
499 '''create an unversioned archive of a repository revision
499 '''create an unversioned archive of a repository revision
500
500
501 By default, the revision used is the parent of the working
501 By default, the revision used is the parent of the working
502 directory; use -r/--rev to specify a different revision.
502 directory; use -r/--rev to specify a different revision.
503
503
504 The archive type is automatically detected based on file
504 The archive type is automatically detected based on file
505 extension (to override, use -t/--type).
505 extension (to override, use -t/--type).
506
506
507 .. container:: verbose
507 .. container:: verbose
508
508
509 Examples:
509 Examples:
510
510
511 - create a zip file containing the 1.0 release::
511 - create a zip file containing the 1.0 release::
512
512
513 hg archive -r 1.0 project-1.0.zip
513 hg archive -r 1.0 project-1.0.zip
514
514
515 - create a tarball excluding .hg files::
515 - create a tarball excluding .hg files::
516
516
517 hg archive project.tar.gz -X ".hg*"
517 hg archive project.tar.gz -X ".hg*"
518
518
519 Valid types are:
519 Valid types are:
520
520
521 :``files``: a directory full of files (default)
521 :``files``: a directory full of files (default)
522 :``tar``: tar archive, uncompressed
522 :``tar``: tar archive, uncompressed
523 :``tbz2``: tar archive, compressed using bzip2
523 :``tbz2``: tar archive, compressed using bzip2
524 :``tgz``: tar archive, compressed using gzip
524 :``tgz``: tar archive, compressed using gzip
525 :``uzip``: zip archive, uncompressed
525 :``uzip``: zip archive, uncompressed
526 :``zip``: zip archive, compressed using deflate
526 :``zip``: zip archive, compressed using deflate
527
527
528 The exact name of the destination archive or directory is given
528 The exact name of the destination archive or directory is given
529 using a format string; see :hg:`help export` for details.
529 using a format string; see :hg:`help export` for details.
530
530
531 Each member added to an archive file has a directory prefix
531 Each member added to an archive file has a directory prefix
532 prepended. Use -p/--prefix to specify a format string for the
532 prepended. Use -p/--prefix to specify a format string for the
533 prefix. The default is the basename of the archive, with suffixes
533 prefix. The default is the basename of the archive, with suffixes
534 removed.
534 removed.
535
535
536 Returns 0 on success.
536 Returns 0 on success.
537 '''
537 '''
538
538
539 ctx = scmutil.revsingle(repo, opts.get('rev'))
539 ctx = scmutil.revsingle(repo, opts.get('rev'))
540 if not ctx:
540 if not ctx:
541 raise error.Abort(_('no working directory: please specify a revision'))
541 raise error.Abort(_('no working directory: please specify a revision'))
542 node = ctx.node()
542 node = ctx.node()
543 dest = cmdutil.makefilename(repo, dest, node)
543 dest = cmdutil.makefilename(repo, dest, node)
544 if os.path.realpath(dest) == repo.root:
544 if os.path.realpath(dest) == repo.root:
545 raise error.Abort(_('repository root cannot be destination'))
545 raise error.Abort(_('repository root cannot be destination'))
546
546
547 kind = opts.get('type') or archival.guesskind(dest) or 'files'
547 kind = opts.get('type') or archival.guesskind(dest) or 'files'
548 prefix = opts.get('prefix')
548 prefix = opts.get('prefix')
549
549
550 if dest == '-':
550 if dest == '-':
551 if kind == 'files':
551 if kind == 'files':
552 raise error.Abort(_('cannot archive plain files to stdout'))
552 raise error.Abort(_('cannot archive plain files to stdout'))
553 dest = cmdutil.makefileobj(repo, dest)
553 dest = cmdutil.makefileobj(repo, dest)
554 if not prefix:
554 if not prefix:
555 prefix = os.path.basename(repo.root) + '-%h'
555 prefix = os.path.basename(repo.root) + '-%h'
556
556
557 prefix = cmdutil.makefilename(repo, prefix, node)
557 prefix = cmdutil.makefilename(repo, prefix, node)
558 matchfn = scmutil.match(ctx, [], opts)
558 matchfn = scmutil.match(ctx, [], opts)
559 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
559 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
560 matchfn, prefix, subrepos=opts.get('subrepos'))
560 matchfn, prefix, subrepos=opts.get('subrepos'))
561
561
562 @command('backout',
562 @command('backout',
563 [('', 'merge', None, _('merge with old dirstate parent after backout')),
563 [('', 'merge', None, _('merge with old dirstate parent after backout')),
564 ('', 'commit', None,
564 ('', 'commit', None,
565 _('commit if no conflicts were encountered (DEPRECATED)')),
565 _('commit if no conflicts were encountered (DEPRECATED)')),
566 ('', 'no-commit', None, _('do not commit')),
566 ('', 'no-commit', None, _('do not commit')),
567 ('', 'parent', '',
567 ('', 'parent', '',
568 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
568 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
569 ('r', 'rev', '', _('revision to backout'), _('REV')),
569 ('r', 'rev', '', _('revision to backout'), _('REV')),
570 ('e', 'edit', False, _('invoke editor on commit messages')),
570 ('e', 'edit', False, _('invoke editor on commit messages')),
571 ] + mergetoolopts + walkopts + commitopts + commitopts2,
571 ] + mergetoolopts + walkopts + commitopts + commitopts2,
572 _('[OPTION]... [-r] REV'))
572 _('[OPTION]... [-r] REV'))
573 def backout(ui, repo, node=None, rev=None, **opts):
573 def backout(ui, repo, node=None, rev=None, **opts):
574 '''reverse effect of earlier changeset
574 '''reverse effect of earlier changeset
575
575
576 Prepare a new changeset with the effect of REV undone in the
576 Prepare a new changeset with the effect of REV undone in the
577 current working directory. If no conflicts were encountered,
577 current working directory. If no conflicts were encountered,
578 it will be committed immediately.
578 it will be committed immediately.
579
579
580 If REV is the parent of the working directory, then this new changeset
580 If REV is the parent of the working directory, then this new changeset
581 is committed automatically (unless --no-commit is specified).
581 is committed automatically (unless --no-commit is specified).
582
582
583 .. note::
583 .. note::
584
584
585 :hg:`backout` cannot be used to fix either an unwanted or
585 :hg:`backout` cannot be used to fix either an unwanted or
586 incorrect merge.
586 incorrect merge.
587
587
588 .. container:: verbose
588 .. container:: verbose
589
589
590 Examples:
590 Examples:
591
591
592 - Reverse the effect of the parent of the working directory.
592 - Reverse the effect of the parent of the working directory.
593 This backout will be committed immediately::
593 This backout will be committed immediately::
594
594
595 hg backout -r .
595 hg backout -r .
596
596
597 - Reverse the effect of previous bad revision 23::
597 - Reverse the effect of previous bad revision 23::
598
598
599 hg backout -r 23
599 hg backout -r 23
600
600
601 - Reverse the effect of previous bad revision 23 and
601 - Reverse the effect of previous bad revision 23 and
602 leave changes uncommitted::
602 leave changes uncommitted::
603
603
604 hg backout -r 23 --no-commit
604 hg backout -r 23 --no-commit
605 hg commit -m "Backout revision 23"
605 hg commit -m "Backout revision 23"
606
606
607 By default, the pending changeset will have one parent,
607 By default, the pending changeset will have one parent,
608 maintaining a linear history. With --merge, the pending
608 maintaining a linear history. With --merge, the pending
609 changeset will instead have two parents: the old parent of the
609 changeset will instead have two parents: the old parent of the
610 working directory and a new child of REV that simply undoes REV.
610 working directory and a new child of REV that simply undoes REV.
611
611
612 Before version 1.7, the behavior without --merge was equivalent
612 Before version 1.7, the behavior without --merge was equivalent
613 to specifying --merge followed by :hg:`update --clean .` to
613 to specifying --merge followed by :hg:`update --clean .` to
614 cancel the merge and leave the child of REV as a head to be
614 cancel the merge and leave the child of REV as a head to be
615 merged separately.
615 merged separately.
616
616
617 See :hg:`help dates` for a list of formats valid for -d/--date.
617 See :hg:`help dates` for a list of formats valid for -d/--date.
618
618
619 See :hg:`help revert` for a way to restore files to the state
619 See :hg:`help revert` for a way to restore files to the state
620 of another revision.
620 of another revision.
621
621
622 Returns 0 on success, 1 if nothing to backout or there are unresolved
622 Returns 0 on success, 1 if nothing to backout or there are unresolved
623 files.
623 files.
624 '''
624 '''
625 wlock = lock = None
625 wlock = lock = None
626 try:
626 try:
627 wlock = repo.wlock()
627 wlock = repo.wlock()
628 lock = repo.lock()
628 lock = repo.lock()
629 return _dobackout(ui, repo, node, rev, **opts)
629 return _dobackout(ui, repo, node, rev, **opts)
630 finally:
630 finally:
631 release(lock, wlock)
631 release(lock, wlock)
632
632
633 def _dobackout(ui, repo, node=None, rev=None, **opts):
633 def _dobackout(ui, repo, node=None, rev=None, **opts):
634 if opts.get('commit') and opts.get('no_commit'):
634 if opts.get('commit') and opts.get('no_commit'):
635 raise error.Abort(_("cannot use --commit with --no-commit"))
635 raise error.Abort(_("cannot use --commit with --no-commit"))
636 if opts.get('merge') and opts.get('no_commit'):
636 if opts.get('merge') and opts.get('no_commit'):
637 raise error.Abort(_("cannot use --merge with --no-commit"))
637 raise error.Abort(_("cannot use --merge with --no-commit"))
638
638
639 if rev and node:
639 if rev and node:
640 raise error.Abort(_("please specify just one revision"))
640 raise error.Abort(_("please specify just one revision"))
641
641
642 if not rev:
642 if not rev:
643 rev = node
643 rev = node
644
644
645 if not rev:
645 if not rev:
646 raise error.Abort(_("please specify a revision to backout"))
646 raise error.Abort(_("please specify a revision to backout"))
647
647
648 date = opts.get('date')
648 date = opts.get('date')
649 if date:
649 if date:
650 opts['date'] = util.parsedate(date)
650 opts['date'] = util.parsedate(date)
651
651
652 cmdutil.checkunfinished(repo)
652 cmdutil.checkunfinished(repo)
653 cmdutil.bailifchanged(repo)
653 cmdutil.bailifchanged(repo)
654 node = scmutil.revsingle(repo, rev).node()
654 node = scmutil.revsingle(repo, rev).node()
655
655
656 op1, op2 = repo.dirstate.parents()
656 op1, op2 = repo.dirstate.parents()
657 if not repo.changelog.isancestor(node, op1):
657 if not repo.changelog.isancestor(node, op1):
658 raise error.Abort(_('cannot backout change that is not an ancestor'))
658 raise error.Abort(_('cannot backout change that is not an ancestor'))
659
659
660 p1, p2 = repo.changelog.parents(node)
660 p1, p2 = repo.changelog.parents(node)
661 if p1 == nullid:
661 if p1 == nullid:
662 raise error.Abort(_('cannot backout a change with no parents'))
662 raise error.Abort(_('cannot backout a change with no parents'))
663 if p2 != nullid:
663 if p2 != nullid:
664 if not opts.get('parent'):
664 if not opts.get('parent'):
665 raise error.Abort(_('cannot backout a merge changeset'))
665 raise error.Abort(_('cannot backout a merge changeset'))
666 p = repo.lookup(opts['parent'])
666 p = repo.lookup(opts['parent'])
667 if p not in (p1, p2):
667 if p not in (p1, p2):
668 raise error.Abort(_('%s is not a parent of %s') %
668 raise error.Abort(_('%s is not a parent of %s') %
669 (short(p), short(node)))
669 (short(p), short(node)))
670 parent = p
670 parent = p
671 else:
671 else:
672 if opts.get('parent'):
672 if opts.get('parent'):
673 raise error.Abort(_('cannot use --parent on non-merge changeset'))
673 raise error.Abort(_('cannot use --parent on non-merge changeset'))
674 parent = p1
674 parent = p1
675
675
676 # the backout should appear on the same branch
676 # the backout should appear on the same branch
677 branch = repo.dirstate.branch()
677 branch = repo.dirstate.branch()
678 bheads = repo.branchheads(branch)
678 bheads = repo.branchheads(branch)
679 rctx = scmutil.revsingle(repo, hex(parent))
679 rctx = scmutil.revsingle(repo, hex(parent))
680 if not opts.get('merge') and op1 != node:
680 if not opts.get('merge') and op1 != node:
681 dsguard = dirstateguard.dirstateguard(repo, 'backout')
681 dsguard = dirstateguard.dirstateguard(repo, 'backout')
682 try:
682 try:
683 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
683 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
684 'backout')
684 'backout')
685 stats = mergemod.update(repo, parent, True, True, node, False)
685 stats = mergemod.update(repo, parent, True, True, node, False)
686 repo.setparents(op1, op2)
686 repo.setparents(op1, op2)
687 dsguard.close()
687 dsguard.close()
688 hg._showstats(repo, stats)
688 hg._showstats(repo, stats)
689 if stats[3]:
689 if stats[3]:
690 repo.ui.status(_("use 'hg resolve' to retry unresolved "
690 repo.ui.status(_("use 'hg resolve' to retry unresolved "
691 "file merges\n"))
691 "file merges\n"))
692 return 1
692 return 1
693 finally:
693 finally:
694 ui.setconfig('ui', 'forcemerge', '', '')
694 ui.setconfig('ui', 'forcemerge', '', '')
695 lockmod.release(dsguard)
695 lockmod.release(dsguard)
696 else:
696 else:
697 hg.clean(repo, node, show_stats=False)
697 hg.clean(repo, node, show_stats=False)
698 repo.dirstate.setbranch(branch)
698 repo.dirstate.setbranch(branch)
699 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
699 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
700
700
701 if opts.get('no_commit'):
701 if opts.get('no_commit'):
702 msg = _("changeset %s backed out, "
702 msg = _("changeset %s backed out, "
703 "don't forget to commit.\n")
703 "don't forget to commit.\n")
704 ui.status(msg % short(node))
704 ui.status(msg % short(node))
705 return 0
705 return 0
706
706
707 def commitfunc(ui, repo, message, match, opts):
707 def commitfunc(ui, repo, message, match, opts):
708 editform = 'backout'
708 editform = 'backout'
709 e = cmdutil.getcommiteditor(editform=editform, **opts)
709 e = cmdutil.getcommiteditor(editform=editform, **opts)
710 if not message:
710 if not message:
711 # we don't translate commit messages
711 # we don't translate commit messages
712 message = "Backed out changeset %s" % short(node)
712 message = "Backed out changeset %s" % short(node)
713 e = cmdutil.getcommiteditor(edit=True, editform=editform)
713 e = cmdutil.getcommiteditor(edit=True, editform=editform)
714 return repo.commit(message, opts.get('user'), opts.get('date'),
714 return repo.commit(message, opts.get('user'), opts.get('date'),
715 match, editor=e)
715 match, editor=e)
716 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
716 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
717 if not newnode:
717 if not newnode:
718 ui.status(_("nothing changed\n"))
718 ui.status(_("nothing changed\n"))
719 return 1
719 return 1
720 cmdutil.commitstatus(repo, newnode, branch, bheads)
720 cmdutil.commitstatus(repo, newnode, branch, bheads)
721
721
722 def nice(node):
722 def nice(node):
723 return '%d:%s' % (repo.changelog.rev(node), short(node))
723 return '%d:%s' % (repo.changelog.rev(node), short(node))
724 ui.status(_('changeset %s backs out changeset %s\n') %
724 ui.status(_('changeset %s backs out changeset %s\n') %
725 (nice(repo.changelog.tip()), nice(node)))
725 (nice(repo.changelog.tip()), nice(node)))
726 if opts.get('merge') and op1 != node:
726 if opts.get('merge') and op1 != node:
727 hg.clean(repo, op1, show_stats=False)
727 hg.clean(repo, op1, show_stats=False)
728 ui.status(_('merging with changeset %s\n')
728 ui.status(_('merging with changeset %s\n')
729 % nice(repo.changelog.tip()))
729 % nice(repo.changelog.tip()))
730 try:
730 try:
731 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
731 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
732 'backout')
732 'backout')
733 return hg.merge(repo, hex(repo.changelog.tip()))
733 return hg.merge(repo, hex(repo.changelog.tip()))
734 finally:
734 finally:
735 ui.setconfig('ui', 'forcemerge', '', '')
735 ui.setconfig('ui', 'forcemerge', '', '')
736 return 0
736 return 0
737
737
738 @command('bisect',
738 @command('bisect',
739 [('r', 'reset', False, _('reset bisect state')),
739 [('r', 'reset', False, _('reset bisect state')),
740 ('g', 'good', False, _('mark changeset good')),
740 ('g', 'good', False, _('mark changeset good')),
741 ('b', 'bad', False, _('mark changeset bad')),
741 ('b', 'bad', False, _('mark changeset bad')),
742 ('s', 'skip', False, _('skip testing changeset')),
742 ('s', 'skip', False, _('skip testing changeset')),
743 ('e', 'extend', False, _('extend the bisect range')),
743 ('e', 'extend', False, _('extend the bisect range')),
744 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
744 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
745 ('U', 'noupdate', False, _('do not update to target'))],
745 ('U', 'noupdate', False, _('do not update to target'))],
746 _("[-gbsr] [-U] [-c CMD] [REV]"))
746 _("[-gbsr] [-U] [-c CMD] [REV]"))
747 def bisect(ui, repo, rev=None, extra=None, command=None,
747 def bisect(ui, repo, rev=None, extra=None, command=None,
748 reset=None, good=None, bad=None, skip=None, extend=None,
748 reset=None, good=None, bad=None, skip=None, extend=None,
749 noupdate=None):
749 noupdate=None):
750 """subdivision search of changesets
750 """subdivision search of changesets
751
751
752 This command helps to find changesets which introduce problems. To
752 This command helps to find changesets which introduce problems. To
753 use, mark the earliest changeset you know exhibits the problem as
753 use, mark the earliest changeset you know exhibits the problem as
754 bad, then mark the latest changeset which is free from the problem
754 bad, then mark the latest changeset which is free from the problem
755 as good. Bisect will update your working directory to a revision
755 as good. Bisect will update your working directory to a revision
756 for testing (unless the -U/--noupdate option is specified). Once
756 for testing (unless the -U/--noupdate option is specified). Once
757 you have performed tests, mark the working directory as good or
757 you have performed tests, mark the working directory as good or
758 bad, and bisect will either update to another candidate changeset
758 bad, and bisect will either update to another candidate changeset
759 or announce that it has found the bad revision.
759 or announce that it has found the bad revision.
760
760
761 As a shortcut, you can also use the revision argument to mark a
761 As a shortcut, you can also use the revision argument to mark a
762 revision as good or bad without checking it out first.
762 revision as good or bad without checking it out first.
763
763
764 If you supply a command, it will be used for automatic bisection.
764 If you supply a command, it will be used for automatic bisection.
765 The environment variable HG_NODE will contain the ID of the
765 The environment variable HG_NODE will contain the ID of the
766 changeset being tested. The exit status of the command will be
766 changeset being tested. The exit status of the command will be
767 used to mark revisions as good or bad: status 0 means good, 125
767 used to mark revisions as good or bad: status 0 means good, 125
768 means to skip the revision, 127 (command not found) will abort the
768 means to skip the revision, 127 (command not found) will abort the
769 bisection, and any other non-zero exit status means the revision
769 bisection, and any other non-zero exit status means the revision
770 is bad.
770 is bad.
771
771
772 .. container:: verbose
772 .. container:: verbose
773
773
774 Some examples:
774 Some examples:
775
775
776 - start a bisection with known bad revision 34, and good revision 12::
776 - start a bisection with known bad revision 34, and good revision 12::
777
777
778 hg bisect --bad 34
778 hg bisect --bad 34
779 hg bisect --good 12
779 hg bisect --good 12
780
780
781 - advance the current bisection by marking current revision as good or
781 - advance the current bisection by marking current revision as good or
782 bad::
782 bad::
783
783
784 hg bisect --good
784 hg bisect --good
785 hg bisect --bad
785 hg bisect --bad
786
786
787 - mark the current revision, or a known revision, to be skipped (e.g. if
787 - mark the current revision, or a known revision, to be skipped (e.g. if
788 that revision is not usable because of another issue)::
788 that revision is not usable because of another issue)::
789
789
790 hg bisect --skip
790 hg bisect --skip
791 hg bisect --skip 23
791 hg bisect --skip 23
792
792
793 - skip all revisions that do not touch directories ``foo`` or ``bar``::
793 - skip all revisions that do not touch directories ``foo`` or ``bar``::
794
794
795 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
795 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
796
796
797 - forget the current bisection::
797 - forget the current bisection::
798
798
799 hg bisect --reset
799 hg bisect --reset
800
800
801 - use 'make && make tests' to automatically find the first broken
801 - use 'make && make tests' to automatically find the first broken
802 revision::
802 revision::
803
803
804 hg bisect --reset
804 hg bisect --reset
805 hg bisect --bad 34
805 hg bisect --bad 34
806 hg bisect --good 12
806 hg bisect --good 12
807 hg bisect --command "make && make tests"
807 hg bisect --command "make && make tests"
808
808
809 - see all changesets whose states are already known in the current
809 - see all changesets whose states are already known in the current
810 bisection::
810 bisection::
811
811
812 hg log -r "bisect(pruned)"
812 hg log -r "bisect(pruned)"
813
813
814 - see the changeset currently being bisected (especially useful
814 - see the changeset currently being bisected (especially useful
815 if running with -U/--noupdate)::
815 if running with -U/--noupdate)::
816
816
817 hg log -r "bisect(current)"
817 hg log -r "bisect(current)"
818
818
819 - see all changesets that took part in the current bisection::
819 - see all changesets that took part in the current bisection::
820
820
821 hg log -r "bisect(range)"
821 hg log -r "bisect(range)"
822
822
823 - you can even get a nice graph::
823 - you can even get a nice graph::
824
824
825 hg log --graph -r "bisect(range)"
825 hg log --graph -r "bisect(range)"
826
826
827 See :hg:`help revsets` for more about the `bisect()` keyword.
827 See :hg:`help revsets` for more about the `bisect()` keyword.
828
828
829 Returns 0 on success.
829 Returns 0 on success.
830 """
830 """
831 # backward compatibility
831 # backward compatibility
832 if rev in "good bad reset init".split():
832 if rev in "good bad reset init".split():
833 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
833 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
834 cmd, rev, extra = rev, extra, None
834 cmd, rev, extra = rev, extra, None
835 if cmd == "good":
835 if cmd == "good":
836 good = True
836 good = True
837 elif cmd == "bad":
837 elif cmd == "bad":
838 bad = True
838 bad = True
839 else:
839 else:
840 reset = True
840 reset = True
841 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
841 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
842 raise error.Abort(_('incompatible arguments'))
842 raise error.Abort(_('incompatible arguments'))
843
843
844 cmdutil.checkunfinished(repo)
844 cmdutil.checkunfinished(repo)
845
845
846 if reset:
846 if reset:
847 hbisect.resetstate(repo)
847 hbisect.resetstate(repo)
848 return
848 return
849
849
850 state = hbisect.load_state(repo)
850 state = hbisect.load_state(repo)
851
851
852 # update state
852 # update state
853 if good or bad or skip:
853 if good or bad or skip:
854 if rev:
854 if rev:
855 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
855 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
856 else:
856 else:
857 nodes = [repo.lookup('.')]
857 nodes = [repo.lookup('.')]
858 if good:
858 if good:
859 state['good'] += nodes
859 state['good'] += nodes
860 elif bad:
860 elif bad:
861 state['bad'] += nodes
861 state['bad'] += nodes
862 elif skip:
862 elif skip:
863 state['skip'] += nodes
863 state['skip'] += nodes
864 hbisect.save_state(repo, state)
864 hbisect.save_state(repo, state)
865 if not (state['good'] and state['bad']):
865 if not (state['good'] and state['bad']):
866 return
866 return
867
867
868 def mayupdate(repo, node, show_stats=True):
868 def mayupdate(repo, node, show_stats=True):
869 """common used update sequence"""
869 """common used update sequence"""
870 if noupdate:
870 if noupdate:
871 return
871 return
872 cmdutil.bailifchanged(repo)
872 cmdutil.bailifchanged(repo)
873 return hg.clean(repo, node, show_stats=show_stats)
873 return hg.clean(repo, node, show_stats=show_stats)
874
874
875 displayer = cmdutil.show_changeset(ui, repo, {})
875 displayer = cmdutil.show_changeset(ui, repo, {})
876
876
877 if command:
877 if command:
878 changesets = 1
878 changesets = 1
879 if noupdate:
879 if noupdate:
880 try:
880 try:
881 node = state['current'][0]
881 node = state['current'][0]
882 except LookupError:
882 except LookupError:
883 raise error.Abort(_('current bisect revision is unknown - '
883 raise error.Abort(_('current bisect revision is unknown - '
884 'start a new bisect to fix'))
884 'start a new bisect to fix'))
885 else:
885 else:
886 node, p2 = repo.dirstate.parents()
886 node, p2 = repo.dirstate.parents()
887 if p2 != nullid:
887 if p2 != nullid:
888 raise error.Abort(_('current bisect revision is a merge'))
888 raise error.Abort(_('current bisect revision is a merge'))
889 if rev:
889 if rev:
890 node = repo[scmutil.revsingle(repo, rev, node)].node()
890 node = repo[scmutil.revsingle(repo, rev, node)].node()
891 try:
891 try:
892 while changesets:
892 while changesets:
893 # update state
893 # update state
894 state['current'] = [node]
894 state['current'] = [node]
895 hbisect.save_state(repo, state)
895 hbisect.save_state(repo, state)
896 status = ui.system(command, environ={'HG_NODE': hex(node)})
896 status = ui.system(command, environ={'HG_NODE': hex(node)})
897 if status == 125:
897 if status == 125:
898 transition = "skip"
898 transition = "skip"
899 elif status == 0:
899 elif status == 0:
900 transition = "good"
900 transition = "good"
901 # status < 0 means process was killed
901 # status < 0 means process was killed
902 elif status == 127:
902 elif status == 127:
903 raise error.Abort(_("failed to execute %s") % command)
903 raise error.Abort(_("failed to execute %s") % command)
904 elif status < 0:
904 elif status < 0:
905 raise error.Abort(_("%s killed") % command)
905 raise error.Abort(_("%s killed") % command)
906 else:
906 else:
907 transition = "bad"
907 transition = "bad"
908 state[transition].append(node)
908 state[transition].append(node)
909 ctx = repo[node]
909 ctx = repo[node]
910 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
910 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
911 hbisect.checkstate(state)
911 hbisect.checkstate(state)
912 # bisect
912 # bisect
913 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
913 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
914 # update to next check
914 # update to next check
915 node = nodes[0]
915 node = nodes[0]
916 mayupdate(repo, node, show_stats=False)
916 mayupdate(repo, node, show_stats=False)
917 finally:
917 finally:
918 state['current'] = [node]
918 state['current'] = [node]
919 hbisect.save_state(repo, state)
919 hbisect.save_state(repo, state)
920 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
920 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
921 return
921 return
922
922
923 hbisect.checkstate(state)
923 hbisect.checkstate(state)
924
924
925 # actually bisect
925 # actually bisect
926 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
926 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
927 if extend:
927 if extend:
928 if not changesets:
928 if not changesets:
929 extendnode = hbisect.extendrange(repo, state, nodes, good)
929 extendnode = hbisect.extendrange(repo, state, nodes, good)
930 if extendnode is not None:
930 if extendnode is not None:
931 ui.write(_("Extending search to changeset %d:%s\n")
931 ui.write(_("Extending search to changeset %d:%s\n")
932 % (extendnode.rev(), extendnode))
932 % (extendnode.rev(), extendnode))
933 state['current'] = [extendnode.node()]
933 state['current'] = [extendnode.node()]
934 hbisect.save_state(repo, state)
934 hbisect.save_state(repo, state)
935 return mayupdate(repo, extendnode.node())
935 return mayupdate(repo, extendnode.node())
936 raise error.Abort(_("nothing to extend"))
936 raise error.Abort(_("nothing to extend"))
937
937
938 if changesets == 0:
938 if changesets == 0:
939 hbisect.printresult(ui, repo, state, displayer, nodes, good)
939 hbisect.printresult(ui, repo, state, displayer, nodes, good)
940 else:
940 else:
941 assert len(nodes) == 1 # only a single node can be tested next
941 assert len(nodes) == 1 # only a single node can be tested next
942 node = nodes[0]
942 node = nodes[0]
943 # compute the approximate number of remaining tests
943 # compute the approximate number of remaining tests
944 tests, size = 0, 2
944 tests, size = 0, 2
945 while size <= changesets:
945 while size <= changesets:
946 tests, size = tests + 1, size * 2
946 tests, size = tests + 1, size * 2
947 rev = repo.changelog.rev(node)
947 rev = repo.changelog.rev(node)
948 ui.write(_("Testing changeset %d:%s "
948 ui.write(_("Testing changeset %d:%s "
949 "(%d changesets remaining, ~%d tests)\n")
949 "(%d changesets remaining, ~%d tests)\n")
950 % (rev, short(node), changesets, tests))
950 % (rev, short(node), changesets, tests))
951 state['current'] = [node]
951 state['current'] = [node]
952 hbisect.save_state(repo, state)
952 hbisect.save_state(repo, state)
953 return mayupdate(repo, node)
953 return mayupdate(repo, node)
954
954
955 @command('bookmarks|bookmark',
955 @command('bookmarks|bookmark',
956 [('f', 'force', False, _('force')),
956 [('f', 'force', False, _('force')),
957 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
957 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
958 ('d', 'delete', False, _('delete a given bookmark')),
958 ('d', 'delete', False, _('delete a given bookmark')),
959 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
959 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
960 ('i', 'inactive', False, _('mark a bookmark inactive')),
960 ('i', 'inactive', False, _('mark a bookmark inactive')),
961 ] + formatteropts,
961 ] + formatteropts,
962 _('hg bookmarks [OPTIONS]... [NAME]...'))
962 _('hg bookmarks [OPTIONS]... [NAME]...'))
963 def bookmark(ui, repo, *names, **opts):
963 def bookmark(ui, repo, *names, **opts):
964 '''create a new bookmark or list existing bookmarks
964 '''create a new bookmark or list existing bookmarks
965
965
966 Bookmarks are labels on changesets to help track lines of development.
966 Bookmarks are labels on changesets to help track lines of development.
967 Bookmarks are unversioned and can be moved, renamed and deleted.
967 Bookmarks are unversioned and can be moved, renamed and deleted.
968 Deleting or moving a bookmark has no effect on the associated changesets.
968 Deleting or moving a bookmark has no effect on the associated changesets.
969
969
970 Creating or updating to a bookmark causes it to be marked as 'active'.
970 Creating or updating to a bookmark causes it to be marked as 'active'.
971 The active bookmark is indicated with a '*'.
971 The active bookmark is indicated with a '*'.
972 When a commit is made, the active bookmark will advance to the new commit.
972 When a commit is made, the active bookmark will advance to the new commit.
973 A plain :hg:`update` will also advance an active bookmark, if possible.
973 A plain :hg:`update` will also advance an active bookmark, if possible.
974 Updating away from a bookmark will cause it to be deactivated.
974 Updating away from a bookmark will cause it to be deactivated.
975
975
976 Bookmarks can be pushed and pulled between repositories (see
976 Bookmarks can be pushed and pulled between repositories (see
977 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
977 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
978 diverged, a new 'divergent bookmark' of the form 'name@path' will
978 diverged, a new 'divergent bookmark' of the form 'name@path' will
979 be created. Using :hg:`merge` will resolve the divergence.
979 be created. Using :hg:`merge` will resolve the divergence.
980
980
981 A bookmark named '@' has the special property that :hg:`clone` will
981 A bookmark named '@' has the special property that :hg:`clone` will
982 check it out by default if it exists.
982 check it out by default if it exists.
983
983
984 .. container:: verbose
984 .. container:: verbose
985
985
986 Examples:
986 Examples:
987
987
988 - create an active bookmark for a new line of development::
988 - create an active bookmark for a new line of development::
989
989
990 hg book new-feature
990 hg book new-feature
991
991
992 - create an inactive bookmark as a place marker::
992 - create an inactive bookmark as a place marker::
993
993
994 hg book -i reviewed
994 hg book -i reviewed
995
995
996 - create an inactive bookmark on another changeset::
996 - create an inactive bookmark on another changeset::
997
997
998 hg book -r .^ tested
998 hg book -r .^ tested
999
999
1000 - rename bookmark turkey to dinner::
1000 - rename bookmark turkey to dinner::
1001
1001
1002 hg book -m turkey dinner
1002 hg book -m turkey dinner
1003
1003
1004 - move the '@' bookmark from another branch::
1004 - move the '@' bookmark from another branch::
1005
1005
1006 hg book -f @
1006 hg book -f @
1007 '''
1007 '''
1008 force = opts.get('force')
1008 force = opts.get('force')
1009 rev = opts.get('rev')
1009 rev = opts.get('rev')
1010 delete = opts.get('delete')
1010 delete = opts.get('delete')
1011 rename = opts.get('rename')
1011 rename = opts.get('rename')
1012 inactive = opts.get('inactive')
1012 inactive = opts.get('inactive')
1013
1013
1014 def checkformat(mark):
1014 def checkformat(mark):
1015 mark = mark.strip()
1015 mark = mark.strip()
1016 if not mark:
1016 if not mark:
1017 raise error.Abort(_("bookmark names cannot consist entirely of "
1017 raise error.Abort(_("bookmark names cannot consist entirely of "
1018 "whitespace"))
1018 "whitespace"))
1019 scmutil.checknewlabel(repo, mark, 'bookmark')
1019 scmutil.checknewlabel(repo, mark, 'bookmark')
1020 return mark
1020 return mark
1021
1021
1022 def checkconflict(repo, mark, cur, force=False, target=None):
1022 def checkconflict(repo, mark, cur, force=False, target=None):
1023 if mark in marks and not force:
1023 if mark in marks and not force:
1024 if target:
1024 if target:
1025 if marks[mark] == target and target == cur:
1025 if marks[mark] == target and target == cur:
1026 # re-activating a bookmark
1026 # re-activating a bookmark
1027 return
1027 return
1028 anc = repo.changelog.ancestors([repo[target].rev()])
1028 anc = repo.changelog.ancestors([repo[target].rev()])
1029 bmctx = repo[marks[mark]]
1029 bmctx = repo[marks[mark]]
1030 divs = [repo[b].node() for b in marks
1030 divs = [repo[b].node() for b in marks
1031 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1031 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1032
1032
1033 # allow resolving a single divergent bookmark even if moving
1033 # allow resolving a single divergent bookmark even if moving
1034 # the bookmark across branches when a revision is specified
1034 # the bookmark across branches when a revision is specified
1035 # that contains a divergent bookmark
1035 # that contains a divergent bookmark
1036 if bmctx.rev() not in anc and target in divs:
1036 if bmctx.rev() not in anc and target in divs:
1037 bookmarks.deletedivergent(repo, [target], mark)
1037 bookmarks.deletedivergent(repo, [target], mark)
1038 return
1038 return
1039
1039
1040 deletefrom = [b for b in divs
1040 deletefrom = [b for b in divs
1041 if repo[b].rev() in anc or b == target]
1041 if repo[b].rev() in anc or b == target]
1042 bookmarks.deletedivergent(repo, deletefrom, mark)
1042 bookmarks.deletedivergent(repo, deletefrom, mark)
1043 if bookmarks.validdest(repo, bmctx, repo[target]):
1043 if bookmarks.validdest(repo, bmctx, repo[target]):
1044 ui.status(_("moving bookmark '%s' forward from %s\n") %
1044 ui.status(_("moving bookmark '%s' forward from %s\n") %
1045 (mark, short(bmctx.node())))
1045 (mark, short(bmctx.node())))
1046 return
1046 return
1047 raise error.Abort(_("bookmark '%s' already exists "
1047 raise error.Abort(_("bookmark '%s' already exists "
1048 "(use -f to force)") % mark)
1048 "(use -f to force)") % mark)
1049 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1049 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1050 and not force):
1050 and not force):
1051 raise error.Abort(
1051 raise error.Abort(
1052 _("a bookmark cannot have the name of an existing branch"))
1052 _("a bookmark cannot have the name of an existing branch"))
1053
1053
1054 if delete and rename:
1054 if delete and rename:
1055 raise error.Abort(_("--delete and --rename are incompatible"))
1055 raise error.Abort(_("--delete and --rename are incompatible"))
1056 if delete and rev:
1056 if delete and rev:
1057 raise error.Abort(_("--rev is incompatible with --delete"))
1057 raise error.Abort(_("--rev is incompatible with --delete"))
1058 if rename and rev:
1058 if rename and rev:
1059 raise error.Abort(_("--rev is incompatible with --rename"))
1059 raise error.Abort(_("--rev is incompatible with --rename"))
1060 if not names and (delete or rev):
1060 if not names and (delete or rev):
1061 raise error.Abort(_("bookmark name required"))
1061 raise error.Abort(_("bookmark name required"))
1062
1062
1063 if delete or rename or names or inactive:
1063 if delete or rename or names or inactive:
1064 wlock = lock = tr = None
1064 wlock = lock = tr = None
1065 try:
1065 try:
1066 wlock = repo.wlock()
1066 wlock = repo.wlock()
1067 lock = repo.lock()
1067 lock = repo.lock()
1068 cur = repo.changectx('.').node()
1068 cur = repo.changectx('.').node()
1069 marks = repo._bookmarks
1069 marks = repo._bookmarks
1070 if delete:
1070 if delete:
1071 tr = repo.transaction('bookmark')
1071 tr = repo.transaction('bookmark')
1072 for mark in names:
1072 for mark in names:
1073 if mark not in marks:
1073 if mark not in marks:
1074 raise error.Abort(_("bookmark '%s' does not exist") %
1074 raise error.Abort(_("bookmark '%s' does not exist") %
1075 mark)
1075 mark)
1076 if mark == repo._activebookmark:
1076 if mark == repo._activebookmark:
1077 bookmarks.deactivate(repo)
1077 bookmarks.deactivate(repo)
1078 del marks[mark]
1078 del marks[mark]
1079
1079
1080 elif rename:
1080 elif rename:
1081 tr = repo.transaction('bookmark')
1081 tr = repo.transaction('bookmark')
1082 if not names:
1082 if not names:
1083 raise error.Abort(_("new bookmark name required"))
1083 raise error.Abort(_("new bookmark name required"))
1084 elif len(names) > 1:
1084 elif len(names) > 1:
1085 raise error.Abort(_("only one new bookmark name allowed"))
1085 raise error.Abort(_("only one new bookmark name allowed"))
1086 mark = checkformat(names[0])
1086 mark = checkformat(names[0])
1087 if rename not in marks:
1087 if rename not in marks:
1088 raise error.Abort(_("bookmark '%s' does not exist")
1088 raise error.Abort(_("bookmark '%s' does not exist")
1089 % rename)
1089 % rename)
1090 checkconflict(repo, mark, cur, force)
1090 checkconflict(repo, mark, cur, force)
1091 marks[mark] = marks[rename]
1091 marks[mark] = marks[rename]
1092 if repo._activebookmark == rename and not inactive:
1092 if repo._activebookmark == rename and not inactive:
1093 bookmarks.activate(repo, mark)
1093 bookmarks.activate(repo, mark)
1094 del marks[rename]
1094 del marks[rename]
1095 elif names:
1095 elif names:
1096 tr = repo.transaction('bookmark')
1096 tr = repo.transaction('bookmark')
1097 newact = None
1097 newact = None
1098 for mark in names:
1098 for mark in names:
1099 mark = checkformat(mark)
1099 mark = checkformat(mark)
1100 if newact is None:
1100 if newact is None:
1101 newact = mark
1101 newact = mark
1102 if inactive and mark == repo._activebookmark:
1102 if inactive and mark == repo._activebookmark:
1103 bookmarks.deactivate(repo)
1103 bookmarks.deactivate(repo)
1104 return
1104 return
1105 tgt = cur
1105 tgt = cur
1106 if rev:
1106 if rev:
1107 tgt = scmutil.revsingle(repo, rev).node()
1107 tgt = scmutil.revsingle(repo, rev).node()
1108 checkconflict(repo, mark, cur, force, tgt)
1108 checkconflict(repo, mark, cur, force, tgt)
1109 marks[mark] = tgt
1109 marks[mark] = tgt
1110 if not inactive and cur == marks[newact] and not rev:
1110 if not inactive and cur == marks[newact] and not rev:
1111 bookmarks.activate(repo, newact)
1111 bookmarks.activate(repo, newact)
1112 elif cur != tgt and newact == repo._activebookmark:
1112 elif cur != tgt and newact == repo._activebookmark:
1113 bookmarks.deactivate(repo)
1113 bookmarks.deactivate(repo)
1114 elif inactive:
1114 elif inactive:
1115 if len(marks) == 0:
1115 if len(marks) == 0:
1116 ui.status(_("no bookmarks set\n"))
1116 ui.status(_("no bookmarks set\n"))
1117 elif not repo._activebookmark:
1117 elif not repo._activebookmark:
1118 ui.status(_("no active bookmark\n"))
1118 ui.status(_("no active bookmark\n"))
1119 else:
1119 else:
1120 bookmarks.deactivate(repo)
1120 bookmarks.deactivate(repo)
1121 if tr is not None:
1121 if tr is not None:
1122 marks.recordchange(tr)
1122 marks.recordchange(tr)
1123 tr.close()
1123 tr.close()
1124 finally:
1124 finally:
1125 lockmod.release(tr, lock, wlock)
1125 lockmod.release(tr, lock, wlock)
1126 else: # show bookmarks
1126 else: # show bookmarks
1127 fm = ui.formatter('bookmarks', opts)
1127 fm = ui.formatter('bookmarks', opts)
1128 hexfn = fm.hexfunc
1128 hexfn = fm.hexfunc
1129 marks = repo._bookmarks
1129 marks = repo._bookmarks
1130 if len(marks) == 0 and fm.isplain():
1130 if len(marks) == 0 and fm.isplain():
1131 ui.status(_("no bookmarks set\n"))
1131 ui.status(_("no bookmarks set\n"))
1132 for bmark, n in sorted(marks.iteritems()):
1132 for bmark, n in sorted(marks.iteritems()):
1133 active = repo._activebookmark
1133 active = repo._activebookmark
1134 if bmark == active:
1134 if bmark == active:
1135 prefix, label = '*', activebookmarklabel
1135 prefix, label = '*', activebookmarklabel
1136 else:
1136 else:
1137 prefix, label = ' ', ''
1137 prefix, label = ' ', ''
1138
1138
1139 fm.startitem()
1139 fm.startitem()
1140 if not ui.quiet:
1140 if not ui.quiet:
1141 fm.plain(' %s ' % prefix, label=label)
1141 fm.plain(' %s ' % prefix, label=label)
1142 fm.write('bookmark', '%s', bmark, label=label)
1142 fm.write('bookmark', '%s', bmark, label=label)
1143 pad = " " * (25 - encoding.colwidth(bmark))
1143 pad = " " * (25 - encoding.colwidth(bmark))
1144 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1144 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1145 repo.changelog.rev(n), hexfn(n), label=label)
1145 repo.changelog.rev(n), hexfn(n), label=label)
1146 fm.data(active=(bmark == active))
1146 fm.data(active=(bmark == active))
1147 fm.plain('\n')
1147 fm.plain('\n')
1148 fm.end()
1148 fm.end()
1149
1149
1150 @command('branch',
1150 @command('branch',
1151 [('f', 'force', None,
1151 [('f', 'force', None,
1152 _('set branch name even if it shadows an existing branch')),
1152 _('set branch name even if it shadows an existing branch')),
1153 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1153 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1154 _('[-fC] [NAME]'))
1154 _('[-fC] [NAME]'))
1155 def branch(ui, repo, label=None, **opts):
1155 def branch(ui, repo, label=None, **opts):
1156 """set or show the current branch name
1156 """set or show the current branch name
1157
1157
1158 .. note::
1158 .. note::
1159
1159
1160 Branch names are permanent and global. Use :hg:`bookmark` to create a
1160 Branch names are permanent and global. Use :hg:`bookmark` to create a
1161 light-weight bookmark instead. See :hg:`help glossary` for more
1161 light-weight bookmark instead. See :hg:`help glossary` for more
1162 information about named branches and bookmarks.
1162 information about named branches and bookmarks.
1163
1163
1164 With no argument, show the current branch name. With one argument,
1164 With no argument, show the current branch name. With one argument,
1165 set the working directory branch name (the branch will not exist
1165 set the working directory branch name (the branch will not exist
1166 in the repository until the next commit). Standard practice
1166 in the repository until the next commit). Standard practice
1167 recommends that primary development take place on the 'default'
1167 recommends that primary development take place on the 'default'
1168 branch.
1168 branch.
1169
1169
1170 Unless -f/--force is specified, branch will not let you set a
1170 Unless -f/--force is specified, branch will not let you set a
1171 branch name that already exists.
1171 branch name that already exists.
1172
1172
1173 Use -C/--clean to reset the working directory branch to that of
1173 Use -C/--clean to reset the working directory branch to that of
1174 the parent of the working directory, negating a previous branch
1174 the parent of the working directory, negating a previous branch
1175 change.
1175 change.
1176
1176
1177 Use the command :hg:`update` to switch to an existing branch. Use
1177 Use the command :hg:`update` to switch to an existing branch. Use
1178 :hg:`commit --close-branch` to mark this branch head as closed.
1178 :hg:`commit --close-branch` to mark this branch head as closed.
1179 When all heads of a branch are closed, the branch will be
1179 When all heads of a branch are closed, the branch will be
1180 considered closed.
1180 considered closed.
1181
1181
1182 Returns 0 on success.
1182 Returns 0 on success.
1183 """
1183 """
1184 if label:
1184 if label:
1185 label = label.strip()
1185 label = label.strip()
1186
1186
1187 if not opts.get('clean') and not label:
1187 if not opts.get('clean') and not label:
1188 ui.write("%s\n" % repo.dirstate.branch())
1188 ui.write("%s\n" % repo.dirstate.branch())
1189 return
1189 return
1190
1190
1191 with repo.wlock():
1191 with repo.wlock():
1192 if opts.get('clean'):
1192 if opts.get('clean'):
1193 label = repo[None].p1().branch()
1193 label = repo[None].p1().branch()
1194 repo.dirstate.setbranch(label)
1194 repo.dirstate.setbranch(label)
1195 ui.status(_('reset working directory to branch %s\n') % label)
1195 ui.status(_('reset working directory to branch %s\n') % label)
1196 elif label:
1196 elif label:
1197 if not opts.get('force') and label in repo.branchmap():
1197 if not opts.get('force') and label in repo.branchmap():
1198 if label not in [p.branch() for p in repo[None].parents()]:
1198 if label not in [p.branch() for p in repo[None].parents()]:
1199 raise error.Abort(_('a branch of the same name already'
1199 raise error.Abort(_('a branch of the same name already'
1200 ' exists'),
1200 ' exists'),
1201 # i18n: "it" refers to an existing branch
1201 # i18n: "it" refers to an existing branch
1202 hint=_("use 'hg update' to switch to it"))
1202 hint=_("use 'hg update' to switch to it"))
1203 scmutil.checknewlabel(repo, label, 'branch')
1203 scmutil.checknewlabel(repo, label, 'branch')
1204 repo.dirstate.setbranch(label)
1204 repo.dirstate.setbranch(label)
1205 ui.status(_('marked working directory as branch %s\n') % label)
1205 ui.status(_('marked working directory as branch %s\n') % label)
1206
1206
1207 # find any open named branches aside from default
1207 # find any open named branches aside from default
1208 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1208 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1209 if n != "default" and not c]
1209 if n != "default" and not c]
1210 if not others:
1210 if not others:
1211 ui.status(_('(branches are permanent and global, '
1211 ui.status(_('(branches are permanent and global, '
1212 'did you want a bookmark?)\n'))
1212 'did you want a bookmark?)\n'))
1213
1213
1214 @command('branches',
1214 @command('branches',
1215 [('a', 'active', False,
1215 [('a', 'active', False,
1216 _('show only branches that have unmerged heads (DEPRECATED)')),
1216 _('show only branches that have unmerged heads (DEPRECATED)')),
1217 ('c', 'closed', False, _('show normal and closed branches')),
1217 ('c', 'closed', False, _('show normal and closed branches')),
1218 ] + formatteropts,
1218 ] + formatteropts,
1219 _('[-c]'))
1219 _('[-c]'))
1220 def branches(ui, repo, active=False, closed=False, **opts):
1220 def branches(ui, repo, active=False, closed=False, **opts):
1221 """list repository named branches
1221 """list repository named branches
1222
1222
1223 List the repository's named branches, indicating which ones are
1223 List the repository's named branches, indicating which ones are
1224 inactive. If -c/--closed is specified, also list branches which have
1224 inactive. If -c/--closed is specified, also list branches which have
1225 been marked closed (see :hg:`commit --close-branch`).
1225 been marked closed (see :hg:`commit --close-branch`).
1226
1226
1227 Use the command :hg:`update` to switch to an existing branch.
1227 Use the command :hg:`update` to switch to an existing branch.
1228
1228
1229 Returns 0.
1229 Returns 0.
1230 """
1230 """
1231
1231
1232 fm = ui.formatter('branches', opts)
1232 fm = ui.formatter('branches', opts)
1233 hexfunc = fm.hexfunc
1233 hexfunc = fm.hexfunc
1234
1234
1235 allheads = set(repo.heads())
1235 allheads = set(repo.heads())
1236 branches = []
1236 branches = []
1237 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1237 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1238 isactive = not isclosed and bool(set(heads) & allheads)
1238 isactive = not isclosed and bool(set(heads) & allheads)
1239 branches.append((tag, repo[tip], isactive, not isclosed))
1239 branches.append((tag, repo[tip], isactive, not isclosed))
1240 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1240 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1241 reverse=True)
1241 reverse=True)
1242
1242
1243 for tag, ctx, isactive, isopen in branches:
1243 for tag, ctx, isactive, isopen in branches:
1244 if active and not isactive:
1244 if active and not isactive:
1245 continue
1245 continue
1246 if isactive:
1246 if isactive:
1247 label = 'branches.active'
1247 label = 'branches.active'
1248 notice = ''
1248 notice = ''
1249 elif not isopen:
1249 elif not isopen:
1250 if not closed:
1250 if not closed:
1251 continue
1251 continue
1252 label = 'branches.closed'
1252 label = 'branches.closed'
1253 notice = _(' (closed)')
1253 notice = _(' (closed)')
1254 else:
1254 else:
1255 label = 'branches.inactive'
1255 label = 'branches.inactive'
1256 notice = _(' (inactive)')
1256 notice = _(' (inactive)')
1257 current = (tag == repo.dirstate.branch())
1257 current = (tag == repo.dirstate.branch())
1258 if current:
1258 if current:
1259 label = 'branches.current'
1259 label = 'branches.current'
1260
1260
1261 fm.startitem()
1261 fm.startitem()
1262 fm.write('branch', '%s', tag, label=label)
1262 fm.write('branch', '%s', tag, label=label)
1263 rev = ctx.rev()
1263 rev = ctx.rev()
1264 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1264 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1265 fmt = ' ' * padsize + ' %d:%s'
1265 fmt = ' ' * padsize + ' %d:%s'
1266 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1266 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1267 label='log.changeset changeset.%s' % ctx.phasestr())
1267 label='log.changeset changeset.%s' % ctx.phasestr())
1268 fm.data(active=isactive, closed=not isopen, current=current)
1268 fm.data(active=isactive, closed=not isopen, current=current)
1269 if not ui.quiet:
1269 if not ui.quiet:
1270 fm.plain(notice)
1270 fm.plain(notice)
1271 fm.plain('\n')
1271 fm.plain('\n')
1272 fm.end()
1272 fm.end()
1273
1273
1274 @command('bundle',
1274 @command('bundle',
1275 [('f', 'force', None, _('run even when the destination is unrelated')),
1275 [('f', 'force', None, _('run even when the destination is unrelated')),
1276 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1276 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1277 _('REV')),
1277 _('REV')),
1278 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1278 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1279 _('BRANCH')),
1279 _('BRANCH')),
1280 ('', 'base', [],
1280 ('', 'base', [],
1281 _('a base changeset assumed to be available at the destination'),
1281 _('a base changeset assumed to be available at the destination'),
1282 _('REV')),
1282 _('REV')),
1283 ('a', 'all', None, _('bundle all changesets in the repository')),
1283 ('a', 'all', None, _('bundle all changesets in the repository')),
1284 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1284 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1285 ] + remoteopts,
1285 ] + remoteopts,
1286 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1286 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1287 def bundle(ui, repo, fname, dest=None, **opts):
1287 def bundle(ui, repo, fname, dest=None, **opts):
1288 """create a changegroup file
1288 """create a changegroup file
1289
1289
1290 Generate a changegroup file collecting changesets to be added
1290 Generate a changegroup file collecting changesets to be added
1291 to a repository.
1291 to a repository.
1292
1292
1293 To create a bundle containing all changesets, use -a/--all
1293 To create a bundle containing all changesets, use -a/--all
1294 (or --base null). Otherwise, hg assumes the destination will have
1294 (or --base null). Otherwise, hg assumes the destination will have
1295 all the nodes you specify with --base parameters. Otherwise, hg
1295 all the nodes you specify with --base parameters. Otherwise, hg
1296 will assume the repository has all the nodes in destination, or
1296 will assume the repository has all the nodes in destination, or
1297 default-push/default if no destination is specified.
1297 default-push/default if no destination is specified.
1298
1298
1299 You can change bundle format with the -t/--type option. You can
1299 You can change bundle format with the -t/--type option. You can
1300 specify a compression, a bundle version or both using a dash
1300 specify a compression, a bundle version or both using a dash
1301 (comp-version). The available compression methods are: none, bzip2,
1301 (comp-version). The available compression methods are: none, bzip2,
1302 and gzip (by default, bundles are compressed using bzip2). The
1302 and gzip (by default, bundles are compressed using bzip2). The
1303 available formats are: v1, v2 (default to most suitable).
1303 available formats are: v1, v2 (default to most suitable).
1304
1304
1305 The bundle file can then be transferred using conventional means
1305 The bundle file can then be transferred using conventional means
1306 and applied to another repository with the unbundle or pull
1306 and applied to another repository with the unbundle or pull
1307 command. This is useful when direct push and pull are not
1307 command. This is useful when direct push and pull are not
1308 available or when exporting an entire repository is undesirable.
1308 available or when exporting an entire repository is undesirable.
1309
1309
1310 Applying bundles preserves all changeset contents including
1310 Applying bundles preserves all changeset contents including
1311 permissions, copy/rename information, and revision history.
1311 permissions, copy/rename information, and revision history.
1312
1312
1313 Returns 0 on success, 1 if no changes found.
1313 Returns 0 on success, 1 if no changes found.
1314 """
1314 """
1315 revs = None
1315 revs = None
1316 if 'rev' in opts:
1316 if 'rev' in opts:
1317 revstrings = opts['rev']
1317 revstrings = opts['rev']
1318 revs = scmutil.revrange(repo, revstrings)
1318 revs = scmutil.revrange(repo, revstrings)
1319 if revstrings and not revs:
1319 if revstrings and not revs:
1320 raise error.Abort(_('no commits to bundle'))
1320 raise error.Abort(_('no commits to bundle'))
1321
1321
1322 bundletype = opts.get('type', 'bzip2').lower()
1322 bundletype = opts.get('type', 'bzip2').lower()
1323 try:
1323 try:
1324 bcompression, cgversion, params = exchange.parsebundlespec(
1324 bcompression, cgversion, params = exchange.parsebundlespec(
1325 repo, bundletype, strict=False)
1325 repo, bundletype, strict=False)
1326 except error.UnsupportedBundleSpecification as e:
1326 except error.UnsupportedBundleSpecification as e:
1327 raise error.Abort(str(e),
1327 raise error.Abort(str(e),
1328 hint=_("see 'hg help bundle' for supported "
1328 hint=_("see 'hg help bundle' for supported "
1329 "values for --type"))
1329 "values for --type"))
1330
1330
1331 # Packed bundles are a pseudo bundle format for now.
1331 # Packed bundles are a pseudo bundle format for now.
1332 if cgversion == 's1':
1332 if cgversion == 's1':
1333 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1333 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1334 hint=_("use 'hg debugcreatestreamclonebundle'"))
1334 hint=_("use 'hg debugcreatestreamclonebundle'"))
1335
1335
1336 if opts.get('all'):
1336 if opts.get('all'):
1337 if dest:
1337 if dest:
1338 raise error.Abort(_("--all is incompatible with specifying "
1338 raise error.Abort(_("--all is incompatible with specifying "
1339 "a destination"))
1339 "a destination"))
1340 if opts.get('base'):
1340 if opts.get('base'):
1341 ui.warn(_("ignoring --base because --all was specified\n"))
1341 ui.warn(_("ignoring --base because --all was specified\n"))
1342 base = ['null']
1342 base = ['null']
1343 else:
1343 else:
1344 base = scmutil.revrange(repo, opts.get('base'))
1344 base = scmutil.revrange(repo, opts.get('base'))
1345 # TODO: get desired bundlecaps from command line.
1345 # TODO: get desired bundlecaps from command line.
1346 bundlecaps = None
1346 bundlecaps = None
1347 if cgversion not in changegroup.supportedoutgoingversions(repo):
1347 if cgversion not in changegroup.supportedoutgoingversions(repo):
1348 raise error.Abort(_("repository does not support bundle version %s") %
1348 raise error.Abort(_("repository does not support bundle version %s") %
1349 cgversion)
1349 cgversion)
1350
1350
1351 if base:
1351 if base:
1352 if dest:
1352 if dest:
1353 raise error.Abort(_("--base is incompatible with specifying "
1353 raise error.Abort(_("--base is incompatible with specifying "
1354 "a destination"))
1354 "a destination"))
1355 common = [repo.lookup(rev) for rev in base]
1355 common = [repo.lookup(rev) for rev in base]
1356 heads = revs and map(repo.lookup, revs) or None
1356 heads = revs and map(repo.lookup, revs) or None
1357 outgoing = discovery.outgoing(repo, common, heads)
1357 outgoing = discovery.outgoing(repo, common, heads)
1358 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1358 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1359 bundlecaps=bundlecaps,
1359 bundlecaps=bundlecaps,
1360 version=cgversion)
1360 version=cgversion)
1361 outgoing = None
1361 outgoing = None
1362 else:
1362 else:
1363 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1363 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1364 dest, branches = hg.parseurl(dest, opts.get('branch'))
1364 dest, branches = hg.parseurl(dest, opts.get('branch'))
1365 other = hg.peer(repo, opts, dest)
1365 other = hg.peer(repo, opts, dest)
1366 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1366 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1367 heads = revs and map(repo.lookup, revs) or revs
1367 heads = revs and map(repo.lookup, revs) or revs
1368 outgoing = discovery.findcommonoutgoing(repo, other,
1368 outgoing = discovery.findcommonoutgoing(repo, other,
1369 onlyheads=heads,
1369 onlyheads=heads,
1370 force=opts.get('force'),
1370 force=opts.get('force'),
1371 portable=True)
1371 portable=True)
1372 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1372 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1373 bundlecaps, version=cgversion)
1373 bundlecaps, version=cgversion)
1374 if not cg:
1374 if not cg:
1375 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1375 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1376 return 1
1376 return 1
1377
1377
1378 if cgversion == '01': #bundle1
1378 if cgversion == '01': #bundle1
1379 if bcompression is None:
1379 if bcompression is None:
1380 bcompression = 'UN'
1380 bcompression = 'UN'
1381 bversion = 'HG10' + bcompression
1381 bversion = 'HG10' + bcompression
1382 bcompression = None
1382 bcompression = None
1383 else:
1383 else:
1384 assert cgversion == '02'
1384 assert cgversion == '02'
1385 bversion = 'HG20'
1385 bversion = 'HG20'
1386
1386
1387 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1387 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1388
1388
1389 @command('cat',
1389 @command('cat',
1390 [('o', 'output', '',
1390 [('o', 'output', '',
1391 _('print output to file with formatted name'), _('FORMAT')),
1391 _('print output to file with formatted name'), _('FORMAT')),
1392 ('r', 'rev', '', _('print the given revision'), _('REV')),
1392 ('r', 'rev', '', _('print the given revision'), _('REV')),
1393 ('', 'decode', None, _('apply any matching decode filter')),
1393 ('', 'decode', None, _('apply any matching decode filter')),
1394 ] + walkopts,
1394 ] + walkopts,
1395 _('[OPTION]... FILE...'),
1395 _('[OPTION]... FILE...'),
1396 inferrepo=True)
1396 inferrepo=True)
1397 def cat(ui, repo, file1, *pats, **opts):
1397 def cat(ui, repo, file1, *pats, **opts):
1398 """output the current or given revision of files
1398 """output the current or given revision of files
1399
1399
1400 Print the specified files as they were at the given revision. If
1400 Print the specified files as they were at the given revision. If
1401 no revision is given, the parent of the working directory is used.
1401 no revision is given, the parent of the working directory is used.
1402
1402
1403 Output may be to a file, in which case the name of the file is
1403 Output may be to a file, in which case the name of the file is
1404 given using a format string. The formatting rules as follows:
1404 given using a format string. The formatting rules as follows:
1405
1405
1406 :``%%``: literal "%" character
1406 :``%%``: literal "%" character
1407 :``%s``: basename of file being printed
1407 :``%s``: basename of file being printed
1408 :``%d``: dirname of file being printed, or '.' if in repository root
1408 :``%d``: dirname of file being printed, or '.' if in repository root
1409 :``%p``: root-relative path name of file being printed
1409 :``%p``: root-relative path name of file being printed
1410 :``%H``: changeset hash (40 hexadecimal digits)
1410 :``%H``: changeset hash (40 hexadecimal digits)
1411 :``%R``: changeset revision number
1411 :``%R``: changeset revision number
1412 :``%h``: short-form changeset hash (12 hexadecimal digits)
1412 :``%h``: short-form changeset hash (12 hexadecimal digits)
1413 :``%r``: zero-padded changeset revision number
1413 :``%r``: zero-padded changeset revision number
1414 :``%b``: basename of the exporting repository
1414 :``%b``: basename of the exporting repository
1415
1415
1416 Returns 0 on success.
1416 Returns 0 on success.
1417 """
1417 """
1418 ctx = scmutil.revsingle(repo, opts.get('rev'))
1418 ctx = scmutil.revsingle(repo, opts.get('rev'))
1419 m = scmutil.match(ctx, (file1,) + pats, opts)
1419 m = scmutil.match(ctx, (file1,) + pats, opts)
1420
1420
1421 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1421 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1422
1422
1423 @command('^clone',
1423 @command('^clone',
1424 [('U', 'noupdate', None, _('the clone will include an empty working '
1424 [('U', 'noupdate', None, _('the clone will include an empty working '
1425 'directory (only a repository)')),
1425 'directory (only a repository)')),
1426 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1426 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1427 _('REV')),
1427 _('REV')),
1428 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1428 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1429 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1429 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1430 ('', 'pull', None, _('use pull protocol to copy metadata')),
1430 ('', 'pull', None, _('use pull protocol to copy metadata')),
1431 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1431 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1432 ] + remoteopts,
1432 ] + remoteopts,
1433 _('[OPTION]... SOURCE [DEST]'),
1433 _('[OPTION]... SOURCE [DEST]'),
1434 norepo=True)
1434 norepo=True)
1435 def clone(ui, source, dest=None, **opts):
1435 def clone(ui, source, dest=None, **opts):
1436 """make a copy of an existing repository
1436 """make a copy of an existing repository
1437
1437
1438 Create a copy of an existing repository in a new directory.
1438 Create a copy of an existing repository in a new directory.
1439
1439
1440 If no destination directory name is specified, it defaults to the
1440 If no destination directory name is specified, it defaults to the
1441 basename of the source.
1441 basename of the source.
1442
1442
1443 The location of the source is added to the new repository's
1443 The location of the source is added to the new repository's
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1445
1445
1446 Only local paths and ``ssh://`` URLs are supported as
1446 Only local paths and ``ssh://`` URLs are supported as
1447 destinations. For ``ssh://`` destinations, no working directory or
1447 destinations. For ``ssh://`` destinations, no working directory or
1448 ``.hg/hgrc`` will be created on the remote side.
1448 ``.hg/hgrc`` will be created on the remote side.
1449
1449
1450 If the source repository has a bookmark called '@' set, that
1450 If the source repository has a bookmark called '@' set, that
1451 revision will be checked out in the new repository by default.
1451 revision will be checked out in the new repository by default.
1452
1452
1453 To check out a particular version, use -u/--update, or
1453 To check out a particular version, use -u/--update, or
1454 -U/--noupdate to create a clone with no working directory.
1454 -U/--noupdate to create a clone with no working directory.
1455
1455
1456 To pull only a subset of changesets, specify one or more revisions
1456 To pull only a subset of changesets, specify one or more revisions
1457 identifiers with -r/--rev or branches with -b/--branch. The
1457 identifiers with -r/--rev or branches with -b/--branch. The
1458 resulting clone will contain only the specified changesets and
1458 resulting clone will contain only the specified changesets and
1459 their ancestors. These options (or 'clone src#rev dest') imply
1459 their ancestors. These options (or 'clone src#rev dest') imply
1460 --pull, even for local source repositories.
1460 --pull, even for local source repositories.
1461
1461
1462 .. note::
1462 .. note::
1463
1463
1464 Specifying a tag will include the tagged changeset but not the
1464 Specifying a tag will include the tagged changeset but not the
1465 changeset containing the tag.
1465 changeset containing the tag.
1466
1466
1467 .. container:: verbose
1467 .. container:: verbose
1468
1468
1469 For efficiency, hardlinks are used for cloning whenever the
1469 For efficiency, hardlinks are used for cloning whenever the
1470 source and destination are on the same filesystem (note this
1470 source and destination are on the same filesystem (note this
1471 applies only to the repository data, not to the working
1471 applies only to the repository data, not to the working
1472 directory). Some filesystems, such as AFS, implement hardlinking
1472 directory). Some filesystems, such as AFS, implement hardlinking
1473 incorrectly, but do not report errors. In these cases, use the
1473 incorrectly, but do not report errors. In these cases, use the
1474 --pull option to avoid hardlinking.
1474 --pull option to avoid hardlinking.
1475
1475
1476 In some cases, you can clone repositories and the working
1476 In some cases, you can clone repositories and the working
1477 directory using full hardlinks with ::
1477 directory using full hardlinks with ::
1478
1478
1479 $ cp -al REPO REPOCLONE
1479 $ cp -al REPO REPOCLONE
1480
1480
1481 This is the fastest way to clone, but it is not always safe. The
1481 This is the fastest way to clone, but it is not always safe. The
1482 operation is not atomic (making sure REPO is not modified during
1482 operation is not atomic (making sure REPO is not modified during
1483 the operation is up to you) and you have to make sure your
1483 the operation is up to you) and you have to make sure your
1484 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1484 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1485 so). Also, this is not compatible with certain extensions that
1485 so). Also, this is not compatible with certain extensions that
1486 place their metadata under the .hg directory, such as mq.
1486 place their metadata under the .hg directory, such as mq.
1487
1487
1488 Mercurial will update the working directory to the first applicable
1488 Mercurial will update the working directory to the first applicable
1489 revision from this list:
1489 revision from this list:
1490
1490
1491 a) null if -U or the source repository has no changesets
1491 a) null if -U or the source repository has no changesets
1492 b) if -u . and the source repository is local, the first parent of
1492 b) if -u . and the source repository is local, the first parent of
1493 the source repository's working directory
1493 the source repository's working directory
1494 c) the changeset specified with -u (if a branch name, this means the
1494 c) the changeset specified with -u (if a branch name, this means the
1495 latest head of that branch)
1495 latest head of that branch)
1496 d) the changeset specified with -r
1496 d) the changeset specified with -r
1497 e) the tipmost head specified with -b
1497 e) the tipmost head specified with -b
1498 f) the tipmost head specified with the url#branch source syntax
1498 f) the tipmost head specified with the url#branch source syntax
1499 g) the revision marked with the '@' bookmark, if present
1499 g) the revision marked with the '@' bookmark, if present
1500 h) the tipmost head of the default branch
1500 h) the tipmost head of the default branch
1501 i) tip
1501 i) tip
1502
1502
1503 When cloning from servers that support it, Mercurial may fetch
1503 When cloning from servers that support it, Mercurial may fetch
1504 pre-generated data from a server-advertised URL. When this is done,
1504 pre-generated data from a server-advertised URL. When this is done,
1505 hooks operating on incoming changesets and changegroups may fire twice,
1505 hooks operating on incoming changesets and changegroups may fire twice,
1506 once for the bundle fetched from the URL and another for any additional
1506 once for the bundle fetched from the URL and another for any additional
1507 data not fetched from this URL. In addition, if an error occurs, the
1507 data not fetched from this URL. In addition, if an error occurs, the
1508 repository may be rolled back to a partial clone. This behavior may
1508 repository may be rolled back to a partial clone. This behavior may
1509 change in future releases. See :hg:`help -e clonebundles` for more.
1509 change in future releases. See :hg:`help -e clonebundles` for more.
1510
1510
1511 Examples:
1511 Examples:
1512
1512
1513 - clone a remote repository to a new directory named hg/::
1513 - clone a remote repository to a new directory named hg/::
1514
1514
1515 hg clone https://www.mercurial-scm.org/repo/hg/
1515 hg clone https://www.mercurial-scm.org/repo/hg/
1516
1516
1517 - create a lightweight local clone::
1517 - create a lightweight local clone::
1518
1518
1519 hg clone project/ project-feature/
1519 hg clone project/ project-feature/
1520
1520
1521 - clone from an absolute path on an ssh server (note double-slash)::
1521 - clone from an absolute path on an ssh server (note double-slash)::
1522
1522
1523 hg clone ssh://user@server//home/projects/alpha/
1523 hg clone ssh://user@server//home/projects/alpha/
1524
1524
1525 - do a high-speed clone over a LAN while checking out a
1525 - do a high-speed clone over a LAN while checking out a
1526 specified version::
1526 specified version::
1527
1527
1528 hg clone --uncompressed http://server/repo -u 1.5
1528 hg clone --uncompressed http://server/repo -u 1.5
1529
1529
1530 - create a repository without changesets after a particular revision::
1530 - create a repository without changesets after a particular revision::
1531
1531
1532 hg clone -r 04e544 experimental/ good/
1532 hg clone -r 04e544 experimental/ good/
1533
1533
1534 - clone (and track) a particular named branch::
1534 - clone (and track) a particular named branch::
1535
1535
1536 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1536 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1537
1537
1538 See :hg:`help urls` for details on specifying URLs.
1538 See :hg:`help urls` for details on specifying URLs.
1539
1539
1540 Returns 0 on success.
1540 Returns 0 on success.
1541 """
1541 """
1542 if opts.get('noupdate') and opts.get('updaterev'):
1542 if opts.get('noupdate') and opts.get('updaterev'):
1543 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1543 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1544
1544
1545 r = hg.clone(ui, opts, source, dest,
1545 r = hg.clone(ui, opts, source, dest,
1546 pull=opts.get('pull'),
1546 pull=opts.get('pull'),
1547 stream=opts.get('uncompressed'),
1547 stream=opts.get('uncompressed'),
1548 rev=opts.get('rev'),
1548 rev=opts.get('rev'),
1549 update=opts.get('updaterev') or not opts.get('noupdate'),
1549 update=opts.get('updaterev') or not opts.get('noupdate'),
1550 branch=opts.get('branch'),
1550 branch=opts.get('branch'),
1551 shareopts=opts.get('shareopts'))
1551 shareopts=opts.get('shareopts'))
1552
1552
1553 return r is None
1553 return r is None
1554
1554
1555 @command('^commit|ci',
1555 @command('^commit|ci',
1556 [('A', 'addremove', None,
1556 [('A', 'addremove', None,
1557 _('mark new/missing files as added/removed before committing')),
1557 _('mark new/missing files as added/removed before committing')),
1558 ('', 'close-branch', None,
1558 ('', 'close-branch', None,
1559 _('mark a branch head as closed')),
1559 _('mark a branch head as closed')),
1560 ('', 'amend', None, _('amend the parent of the working directory')),
1560 ('', 'amend', None, _('amend the parent of the working directory')),
1561 ('s', 'secret', None, _('use the secret phase for committing')),
1561 ('s', 'secret', None, _('use the secret phase for committing')),
1562 ('e', 'edit', None, _('invoke editor on commit messages')),
1562 ('e', 'edit', None, _('invoke editor on commit messages')),
1563 ('i', 'interactive', None, _('use interactive mode')),
1563 ('i', 'interactive', None, _('use interactive mode')),
1564 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1564 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1565 _('[OPTION]... [FILE]...'),
1565 _('[OPTION]... [FILE]...'),
1566 inferrepo=True)
1566 inferrepo=True)
1567 def commit(ui, repo, *pats, **opts):
1567 def commit(ui, repo, *pats, **opts):
1568 """commit the specified files or all outstanding changes
1568 """commit the specified files or all outstanding changes
1569
1569
1570 Commit changes to the given files into the repository. Unlike a
1570 Commit changes to the given files into the repository. Unlike a
1571 centralized SCM, this operation is a local operation. See
1571 centralized SCM, this operation is a local operation. See
1572 :hg:`push` for a way to actively distribute your changes.
1572 :hg:`push` for a way to actively distribute your changes.
1573
1573
1574 If a list of files is omitted, all changes reported by :hg:`status`
1574 If a list of files is omitted, all changes reported by :hg:`status`
1575 will be committed.
1575 will be committed.
1576
1576
1577 If you are committing the result of a merge, do not provide any
1577 If you are committing the result of a merge, do not provide any
1578 filenames or -I/-X filters.
1578 filenames or -I/-X filters.
1579
1579
1580 If no commit message is specified, Mercurial starts your
1580 If no commit message is specified, Mercurial starts your
1581 configured editor where you can enter a message. In case your
1581 configured editor where you can enter a message. In case your
1582 commit fails, you will find a backup of your message in
1582 commit fails, you will find a backup of your message in
1583 ``.hg/last-message.txt``.
1583 ``.hg/last-message.txt``.
1584
1584
1585 The --close-branch flag can be used to mark the current branch
1585 The --close-branch flag can be used to mark the current branch
1586 head closed. When all heads of a branch are closed, the branch
1586 head closed. When all heads of a branch are closed, the branch
1587 will be considered closed and no longer listed.
1587 will be considered closed and no longer listed.
1588
1588
1589 The --amend flag can be used to amend the parent of the
1589 The --amend flag can be used to amend the parent of the
1590 working directory with a new commit that contains the changes
1590 working directory with a new commit that contains the changes
1591 in the parent in addition to those currently reported by :hg:`status`,
1591 in the parent in addition to those currently reported by :hg:`status`,
1592 if there are any. The old commit is stored in a backup bundle in
1592 if there are any. The old commit is stored in a backup bundle in
1593 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1593 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1594 on how to restore it).
1594 on how to restore it).
1595
1595
1596 Message, user and date are taken from the amended commit unless
1596 Message, user and date are taken from the amended commit unless
1597 specified. When a message isn't specified on the command line,
1597 specified. When a message isn't specified on the command line,
1598 the editor will open with the message of the amended commit.
1598 the editor will open with the message of the amended commit.
1599
1599
1600 It is not possible to amend public changesets (see :hg:`help phases`)
1600 It is not possible to amend public changesets (see :hg:`help phases`)
1601 or changesets that have children.
1601 or changesets that have children.
1602
1602
1603 See :hg:`help dates` for a list of formats valid for -d/--date.
1603 See :hg:`help dates` for a list of formats valid for -d/--date.
1604
1604
1605 Returns 0 on success, 1 if nothing changed.
1605 Returns 0 on success, 1 if nothing changed.
1606
1606
1607 .. container:: verbose
1607 .. container:: verbose
1608
1608
1609 Examples:
1609 Examples:
1610
1610
1611 - commit all files ending in .py::
1611 - commit all files ending in .py::
1612
1612
1613 hg commit --include "set:**.py"
1613 hg commit --include "set:**.py"
1614
1614
1615 - commit all non-binary files::
1615 - commit all non-binary files::
1616
1616
1617 hg commit --exclude "set:binary()"
1617 hg commit --exclude "set:binary()"
1618
1618
1619 - amend the current commit and set the date to now::
1619 - amend the current commit and set the date to now::
1620
1620
1621 hg commit --amend --date now
1621 hg commit --amend --date now
1622 """
1622 """
1623 wlock = lock = None
1623 wlock = lock = None
1624 try:
1624 try:
1625 wlock = repo.wlock()
1625 wlock = repo.wlock()
1626 lock = repo.lock()
1626 lock = repo.lock()
1627 return _docommit(ui, repo, *pats, **opts)
1627 return _docommit(ui, repo, *pats, **opts)
1628 finally:
1628 finally:
1629 release(lock, wlock)
1629 release(lock, wlock)
1630
1630
1631 def _docommit(ui, repo, *pats, **opts):
1631 def _docommit(ui, repo, *pats, **opts):
1632 if opts.get('interactive'):
1632 if opts.get('interactive'):
1633 opts.pop('interactive')
1633 opts.pop('interactive')
1634 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1634 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1635 cmdutil.recordfilter, *pats, **opts)
1635 cmdutil.recordfilter, *pats, **opts)
1636 # ret can be 0 (no changes to record) or the value returned by
1636 # ret can be 0 (no changes to record) or the value returned by
1637 # commit(), 1 if nothing changed or None on success.
1637 # commit(), 1 if nothing changed or None on success.
1638 return 1 if ret == 0 else ret
1638 return 1 if ret == 0 else ret
1639
1639
1640 if opts.get('subrepos'):
1640 if opts.get('subrepos'):
1641 if opts.get('amend'):
1641 if opts.get('amend'):
1642 raise error.Abort(_('cannot amend with --subrepos'))
1642 raise error.Abort(_('cannot amend with --subrepos'))
1643 # Let --subrepos on the command line override config setting.
1643 # Let --subrepos on the command line override config setting.
1644 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1644 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1645
1645
1646 cmdutil.checkunfinished(repo, commit=True)
1646 cmdutil.checkunfinished(repo, commit=True)
1647
1647
1648 branch = repo[None].branch()
1648 branch = repo[None].branch()
1649 bheads = repo.branchheads(branch)
1649 bheads = repo.branchheads(branch)
1650
1650
1651 extra = {}
1651 extra = {}
1652 if opts.get('close_branch'):
1652 if opts.get('close_branch'):
1653 extra['close'] = 1
1653 extra['close'] = 1
1654
1654
1655 if not bheads:
1655 if not bheads:
1656 raise error.Abort(_('can only close branch heads'))
1656 raise error.Abort(_('can only close branch heads'))
1657 elif opts.get('amend'):
1657 elif opts.get('amend'):
1658 if repo[None].parents()[0].p1().branch() != branch and \
1658 if repo[None].parents()[0].p1().branch() != branch and \
1659 repo[None].parents()[0].p2().branch() != branch:
1659 repo[None].parents()[0].p2().branch() != branch:
1660 raise error.Abort(_('can only close branch heads'))
1660 raise error.Abort(_('can only close branch heads'))
1661
1661
1662 if opts.get('amend'):
1662 if opts.get('amend'):
1663 if ui.configbool('ui', 'commitsubrepos'):
1663 if ui.configbool('ui', 'commitsubrepos'):
1664 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1664 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1665
1665
1666 old = repo['.']
1666 old = repo['.']
1667 if not old.mutable():
1667 if not old.mutable():
1668 raise error.Abort(_('cannot amend public changesets'))
1668 raise error.Abort(_('cannot amend public changesets'))
1669 if len(repo[None].parents()) > 1:
1669 if len(repo[None].parents()) > 1:
1670 raise error.Abort(_('cannot amend while merging'))
1670 raise error.Abort(_('cannot amend while merging'))
1671 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1671 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1672 if not allowunstable and old.children():
1672 if not allowunstable and old.children():
1673 raise error.Abort(_('cannot amend changeset with children'))
1673 raise error.Abort(_('cannot amend changeset with children'))
1674
1674
1675 # Currently histedit gets confused if an amend happens while histedit
1675 # Currently histedit gets confused if an amend happens while histedit
1676 # is in progress. Since we have a checkunfinished command, we are
1676 # is in progress. Since we have a checkunfinished command, we are
1677 # temporarily honoring it.
1677 # temporarily honoring it.
1678 #
1678 #
1679 # Note: eventually this guard will be removed. Please do not expect
1679 # Note: eventually this guard will be removed. Please do not expect
1680 # this behavior to remain.
1680 # this behavior to remain.
1681 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1681 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1682 cmdutil.checkunfinished(repo)
1682 cmdutil.checkunfinished(repo)
1683
1683
1684 # commitfunc is used only for temporary amend commit by cmdutil.amend
1684 # commitfunc is used only for temporary amend commit by cmdutil.amend
1685 def commitfunc(ui, repo, message, match, opts):
1685 def commitfunc(ui, repo, message, match, opts):
1686 return repo.commit(message,
1686 return repo.commit(message,
1687 opts.get('user') or old.user(),
1687 opts.get('user') or old.user(),
1688 opts.get('date') or old.date(),
1688 opts.get('date') or old.date(),
1689 match,
1689 match,
1690 extra=extra)
1690 extra=extra)
1691
1691
1692 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1692 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1693 if node == old.node():
1693 if node == old.node():
1694 ui.status(_("nothing changed\n"))
1694 ui.status(_("nothing changed\n"))
1695 return 1
1695 return 1
1696 else:
1696 else:
1697 def commitfunc(ui, repo, message, match, opts):
1697 def commitfunc(ui, repo, message, match, opts):
1698 backup = ui.backupconfig('phases', 'new-commit')
1698 backup = ui.backupconfig('phases', 'new-commit')
1699 baseui = repo.baseui
1699 baseui = repo.baseui
1700 basebackup = baseui.backupconfig('phases', 'new-commit')
1700 basebackup = baseui.backupconfig('phases', 'new-commit')
1701 try:
1701 try:
1702 if opts.get('secret'):
1702 if opts.get('secret'):
1703 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1703 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1704 # Propagate to subrepos
1704 # Propagate to subrepos
1705 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1705 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1706
1706
1707 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1707 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1708 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1708 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1709 return repo.commit(message, opts.get('user'), opts.get('date'),
1709 return repo.commit(message, opts.get('user'), opts.get('date'),
1710 match,
1710 match,
1711 editor=editor,
1711 editor=editor,
1712 extra=extra)
1712 extra=extra)
1713 finally:
1713 finally:
1714 ui.restoreconfig(backup)
1714 ui.restoreconfig(backup)
1715 repo.baseui.restoreconfig(basebackup)
1715 repo.baseui.restoreconfig(basebackup)
1716
1716
1717
1717
1718 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1718 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1719
1719
1720 if not node:
1720 if not node:
1721 stat = cmdutil.postcommitstatus(repo, pats, opts)
1721 stat = cmdutil.postcommitstatus(repo, pats, opts)
1722 if stat[3]:
1722 if stat[3]:
1723 ui.status(_("nothing changed (%d missing files, see "
1723 ui.status(_("nothing changed (%d missing files, see "
1724 "'hg status')\n") % len(stat[3]))
1724 "'hg status')\n") % len(stat[3]))
1725 else:
1725 else:
1726 ui.status(_("nothing changed\n"))
1726 ui.status(_("nothing changed\n"))
1727 return 1
1727 return 1
1728
1728
1729 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1729 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1730
1730
1731 @command('config|showconfig|debugconfig',
1731 @command('config|showconfig|debugconfig',
1732 [('u', 'untrusted', None, _('show untrusted configuration options')),
1732 [('u', 'untrusted', None, _('show untrusted configuration options')),
1733 ('e', 'edit', None, _('edit user config')),
1733 ('e', 'edit', None, _('edit user config')),
1734 ('l', 'local', None, _('edit repository config')),
1734 ('l', 'local', None, _('edit repository config')),
1735 ('g', 'global', None, _('edit global config'))] + formatteropts,
1735 ('g', 'global', None, _('edit global config'))] + formatteropts,
1736 _('[-u] [NAME]...'),
1736 _('[-u] [NAME]...'),
1737 optionalrepo=True)
1737 optionalrepo=True)
1738 def config(ui, repo, *values, **opts):
1738 def config(ui, repo, *values, **opts):
1739 """show combined config settings from all hgrc files
1739 """show combined config settings from all hgrc files
1740
1740
1741 With no arguments, print names and values of all config items.
1741 With no arguments, print names and values of all config items.
1742
1742
1743 With one argument of the form section.name, print just the value
1743 With one argument of the form section.name, print just the value
1744 of that config item.
1744 of that config item.
1745
1745
1746 With multiple arguments, print names and values of all config
1746 With multiple arguments, print names and values of all config
1747 items with matching section names.
1747 items with matching section names.
1748
1748
1749 With --edit, start an editor on the user-level config file. With
1749 With --edit, start an editor on the user-level config file. With
1750 --global, edit the system-wide config file. With --local, edit the
1750 --global, edit the system-wide config file. With --local, edit the
1751 repository-level config file.
1751 repository-level config file.
1752
1752
1753 With --debug, the source (filename and line number) is printed
1753 With --debug, the source (filename and line number) is printed
1754 for each config item.
1754 for each config item.
1755
1755
1756 See :hg:`help config` for more information about config files.
1756 See :hg:`help config` for more information about config files.
1757
1757
1758 Returns 0 on success, 1 if NAME does not exist.
1758 Returns 0 on success, 1 if NAME does not exist.
1759
1759
1760 """
1760 """
1761
1761
1762 if opts.get('edit') or opts.get('local') or opts.get('global'):
1762 if opts.get('edit') or opts.get('local') or opts.get('global'):
1763 if opts.get('local') and opts.get('global'):
1763 if opts.get('local') and opts.get('global'):
1764 raise error.Abort(_("can't use --local and --global together"))
1764 raise error.Abort(_("can't use --local and --global together"))
1765
1765
1766 if opts.get('local'):
1766 if opts.get('local'):
1767 if not repo:
1767 if not repo:
1768 raise error.Abort(_("can't use --local outside a repository"))
1768 raise error.Abort(_("can't use --local outside a repository"))
1769 paths = [repo.join('hgrc')]
1769 paths = [repo.join('hgrc')]
1770 elif opts.get('global'):
1770 elif opts.get('global'):
1771 paths = scmutil.systemrcpath()
1771 paths = scmutil.systemrcpath()
1772 else:
1772 else:
1773 paths = scmutil.userrcpath()
1773 paths = scmutil.userrcpath()
1774
1774
1775 for f in paths:
1775 for f in paths:
1776 if os.path.exists(f):
1776 if os.path.exists(f):
1777 break
1777 break
1778 else:
1778 else:
1779 if opts.get('global'):
1779 if opts.get('global'):
1780 samplehgrc = uimod.samplehgrcs['global']
1780 samplehgrc = uimod.samplehgrcs['global']
1781 elif opts.get('local'):
1781 elif opts.get('local'):
1782 samplehgrc = uimod.samplehgrcs['local']
1782 samplehgrc = uimod.samplehgrcs['local']
1783 else:
1783 else:
1784 samplehgrc = uimod.samplehgrcs['user']
1784 samplehgrc = uimod.samplehgrcs['user']
1785
1785
1786 f = paths[0]
1786 f = paths[0]
1787 fp = open(f, "w")
1787 fp = open(f, "w")
1788 fp.write(samplehgrc)
1788 fp.write(samplehgrc)
1789 fp.close()
1789 fp.close()
1790
1790
1791 editor = ui.geteditor()
1791 editor = ui.geteditor()
1792 ui.system("%s \"%s\"" % (editor, f),
1792 ui.system("%s \"%s\"" % (editor, f),
1793 onerr=error.Abort, errprefix=_("edit failed"))
1793 onerr=error.Abort, errprefix=_("edit failed"))
1794 return
1794 return
1795
1795
1796 fm = ui.formatter('config', opts)
1796 fm = ui.formatter('config', opts)
1797 for f in scmutil.rcpath():
1797 for f in scmutil.rcpath():
1798 ui.debug('read config from: %s\n' % f)
1798 ui.debug('read config from: %s\n' % f)
1799 untrusted = bool(opts.get('untrusted'))
1799 untrusted = bool(opts.get('untrusted'))
1800 if values:
1800 if values:
1801 sections = [v for v in values if '.' not in v]
1801 sections = [v for v in values if '.' not in v]
1802 items = [v for v in values if '.' in v]
1802 items = [v for v in values if '.' in v]
1803 if len(items) > 1 or items and sections:
1803 if len(items) > 1 or items and sections:
1804 raise error.Abort(_('only one config item permitted'))
1804 raise error.Abort(_('only one config item permitted'))
1805 matched = False
1805 matched = False
1806 for section, name, value in ui.walkconfig(untrusted=untrusted):
1806 for section, name, value in ui.walkconfig(untrusted=untrusted):
1807 value = str(value)
1807 value = str(value)
1808 if fm.isplain():
1808 if fm.isplain():
1809 value = value.replace('\n', '\\n')
1809 value = value.replace('\n', '\\n')
1810 entryname = section + '.' + name
1810 entryname = section + '.' + name
1811 if values:
1811 if values:
1812 for v in values:
1812 for v in values:
1813 if v == section:
1813 if v == section:
1814 fm.startitem()
1814 fm.startitem()
1815 fm.condwrite(ui.debugflag, 'source', '%s: ',
1815 fm.condwrite(ui.debugflag, 'source', '%s: ',
1816 ui.configsource(section, name, untrusted))
1816 ui.configsource(section, name, untrusted))
1817 fm.write('name value', '%s=%s\n', entryname, value)
1817 fm.write('name value', '%s=%s\n', entryname, value)
1818 matched = True
1818 matched = True
1819 elif v == entryname:
1819 elif v == entryname:
1820 fm.startitem()
1820 fm.startitem()
1821 fm.condwrite(ui.debugflag, 'source', '%s: ',
1821 fm.condwrite(ui.debugflag, 'source', '%s: ',
1822 ui.configsource(section, name, untrusted))
1822 ui.configsource(section, name, untrusted))
1823 fm.write('value', '%s\n', value)
1823 fm.write('value', '%s\n', value)
1824 fm.data(name=entryname)
1824 fm.data(name=entryname)
1825 matched = True
1825 matched = True
1826 else:
1826 else:
1827 fm.startitem()
1827 fm.startitem()
1828 fm.condwrite(ui.debugflag, 'source', '%s: ',
1828 fm.condwrite(ui.debugflag, 'source', '%s: ',
1829 ui.configsource(section, name, untrusted))
1829 ui.configsource(section, name, untrusted))
1830 fm.write('name value', '%s=%s\n', entryname, value)
1830 fm.write('name value', '%s=%s\n', entryname, value)
1831 matched = True
1831 matched = True
1832 fm.end()
1832 fm.end()
1833 if matched:
1833 if matched:
1834 return 0
1834 return 0
1835 return 1
1835 return 1
1836
1836
1837 @command('copy|cp',
1837 @command('copy|cp',
1838 [('A', 'after', None, _('record a copy that has already occurred')),
1838 [('A', 'after', None, _('record a copy that has already occurred')),
1839 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1839 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1840 ] + walkopts + dryrunopts,
1840 ] + walkopts + dryrunopts,
1841 _('[OPTION]... [SOURCE]... DEST'))
1841 _('[OPTION]... [SOURCE]... DEST'))
1842 def copy(ui, repo, *pats, **opts):
1842 def copy(ui, repo, *pats, **opts):
1843 """mark files as copied for the next commit
1843 """mark files as copied for the next commit
1844
1844
1845 Mark dest as having copies of source files. If dest is a
1845 Mark dest as having copies of source files. If dest is a
1846 directory, copies are put in that directory. If dest is a file,
1846 directory, copies are put in that directory. If dest is a file,
1847 the source must be a single file.
1847 the source must be a single file.
1848
1848
1849 By default, this command copies the contents of files as they
1849 By default, this command copies the contents of files as they
1850 exist in the working directory. If invoked with -A/--after, the
1850 exist in the working directory. If invoked with -A/--after, the
1851 operation is recorded, but no copying is performed.
1851 operation is recorded, but no copying is performed.
1852
1852
1853 This command takes effect with the next commit. To undo a copy
1853 This command takes effect with the next commit. To undo a copy
1854 before that, see :hg:`revert`.
1854 before that, see :hg:`revert`.
1855
1855
1856 Returns 0 on success, 1 if errors are encountered.
1856 Returns 0 on success, 1 if errors are encountered.
1857 """
1857 """
1858 with repo.wlock(False):
1858 with repo.wlock(False):
1859 return cmdutil.copy(ui, repo, pats, opts)
1859 return cmdutil.copy(ui, repo, pats, opts)
1860
1860
1861 @command('debuginstall', [] + formatteropts, '', norepo=True)
1861 @command('debuginstall', [] + formatteropts, '', norepo=True)
1862 def debuginstall(ui, **opts):
1862 def debuginstall(ui, **opts):
1863 '''test Mercurial installation
1863 '''test Mercurial installation
1864
1864
1865 Returns 0 on success.
1865 Returns 0 on success.
1866 '''
1866 '''
1867
1867
1868 def writetemp(contents):
1868 def writetemp(contents):
1869 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1869 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1870 f = os.fdopen(fd, "wb")
1870 f = os.fdopen(fd, "wb")
1871 f.write(contents)
1871 f.write(contents)
1872 f.close()
1872 f.close()
1873 return name
1873 return name
1874
1874
1875 problems = 0
1875 problems = 0
1876
1876
1877 fm = ui.formatter('debuginstall', opts)
1877 fm = ui.formatter('debuginstall', opts)
1878 fm.startitem()
1878 fm.startitem()
1879
1879
1880 # encoding
1880 # encoding
1881 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1881 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1882 err = None
1882 err = None
1883 try:
1883 try:
1884 encoding.fromlocal("test")
1884 encoding.fromlocal("test")
1885 except error.Abort as inst:
1885 except error.Abort as inst:
1886 err = inst
1886 err = inst
1887 problems += 1
1887 problems += 1
1888 fm.condwrite(err, 'encodingerror', _(" %s\n"
1888 fm.condwrite(err, 'encodingerror', _(" %s\n"
1889 " (check that your locale is properly set)\n"), err)
1889 " (check that your locale is properly set)\n"), err)
1890
1890
1891 # Python
1891 # Python
1892 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1892 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1893 sys.executable)
1893 sys.executable)
1894 fm.write('pythonver', _("checking Python version (%s)\n"),
1894 fm.write('pythonver', _("checking Python version (%s)\n"),
1895 ("%s.%s.%s" % sys.version_info[:3]))
1895 ("%d.%d.%d" % sys.version_info[:3]))
1896 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1896 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1897 os.path.dirname(os.__file__))
1897 os.path.dirname(os.__file__))
1898
1898
1899 security = set(sslutil.supportedprotocols)
1899 security = set(sslutil.supportedprotocols)
1900 if sslutil.hassni:
1900 if sslutil.hassni:
1901 security.add('sni')
1901 security.add('sni')
1902
1902
1903 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1903 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1904 fm.formatlist(sorted(security), name='protocol',
1904 fm.formatlist(sorted(security), name='protocol',
1905 fmt='%s', sep=','))
1905 fmt='%s', sep=','))
1906
1906
1907 # These are warnings, not errors. So don't increment problem count. This
1907 # These are warnings, not errors. So don't increment problem count. This
1908 # may change in the future.
1908 # may change in the future.
1909 if 'tls1.2' not in security:
1909 if 'tls1.2' not in security:
1910 fm.plain(_(' TLS 1.2 not supported by Python install; '
1910 fm.plain(_(' TLS 1.2 not supported by Python install; '
1911 'network connections lack modern security\n'))
1911 'network connections lack modern security\n'))
1912 if 'sni' not in security:
1912 if 'sni' not in security:
1913 fm.plain(_(' SNI not supported by Python install; may have '
1913 fm.plain(_(' SNI not supported by Python install; may have '
1914 'connectivity issues with some servers\n'))
1914 'connectivity issues with some servers\n'))
1915
1915
1916 # TODO print CA cert info
1916 # TODO print CA cert info
1917
1917
1918 # hg version
1918 # hg version
1919 hgver = util.version()
1919 hgver = util.version()
1920 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1920 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1921 hgver.split('+')[0])
1921 hgver.split('+')[0])
1922 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1922 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1923 '+'.join(hgver.split('+')[1:]))
1923 '+'.join(hgver.split('+')[1:]))
1924
1924
1925 # compiled modules
1925 # compiled modules
1926 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1926 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1927 policy.policy)
1927 policy.policy)
1928 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1928 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1929 os.path.dirname(__file__))
1929 os.path.dirname(__file__))
1930
1930
1931 err = None
1931 err = None
1932 try:
1932 try:
1933 from . import (
1933 from . import (
1934 base85,
1934 base85,
1935 bdiff,
1935 bdiff,
1936 mpatch,
1936 mpatch,
1937 osutil,
1937 osutil,
1938 )
1938 )
1939 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1939 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1940 except Exception as inst:
1940 except Exception as inst:
1941 err = inst
1941 err = inst
1942 problems += 1
1942 problems += 1
1943 fm.condwrite(err, 'extensionserror', " %s\n", err)
1943 fm.condwrite(err, 'extensionserror', " %s\n", err)
1944
1944
1945 compengines = util.compengines._engines.values()
1945 compengines = util.compengines._engines.values()
1946 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1946 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1947 fm.formatlist(sorted(e.name() for e in compengines),
1947 fm.formatlist(sorted(e.name() for e in compengines),
1948 name='compengine', fmt='%s', sep=', '))
1948 name='compengine', fmt='%s', sep=', '))
1949 fm.write('compenginesavail', _('checking available compression engines '
1949 fm.write('compenginesavail', _('checking available compression engines '
1950 '(%s)\n'),
1950 '(%s)\n'),
1951 fm.formatlist(sorted(e.name() for e in compengines
1951 fm.formatlist(sorted(e.name() for e in compengines
1952 if e.available()),
1952 if e.available()),
1953 name='compengine', fmt='%s', sep=', '))
1953 name='compengine', fmt='%s', sep=', '))
1954
1954
1955 # templates
1955 # templates
1956 p = templater.templatepaths()
1956 p = templater.templatepaths()
1957 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1957 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1958 fm.condwrite(not p, '', _(" no template directories found\n"))
1958 fm.condwrite(not p, '', _(" no template directories found\n"))
1959 if p:
1959 if p:
1960 m = templater.templatepath("map-cmdline.default")
1960 m = templater.templatepath("map-cmdline.default")
1961 if m:
1961 if m:
1962 # template found, check if it is working
1962 # template found, check if it is working
1963 err = None
1963 err = None
1964 try:
1964 try:
1965 templater.templater.frommapfile(m)
1965 templater.templater.frommapfile(m)
1966 except Exception as inst:
1966 except Exception as inst:
1967 err = inst
1967 err = inst
1968 p = None
1968 p = None
1969 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1969 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1970 else:
1970 else:
1971 p = None
1971 p = None
1972 fm.condwrite(p, 'defaulttemplate',
1972 fm.condwrite(p, 'defaulttemplate',
1973 _("checking default template (%s)\n"), m)
1973 _("checking default template (%s)\n"), m)
1974 fm.condwrite(not m, 'defaulttemplatenotfound',
1974 fm.condwrite(not m, 'defaulttemplatenotfound',
1975 _(" template '%s' not found\n"), "default")
1975 _(" template '%s' not found\n"), "default")
1976 if not p:
1976 if not p:
1977 problems += 1
1977 problems += 1
1978 fm.condwrite(not p, '',
1978 fm.condwrite(not p, '',
1979 _(" (templates seem to have been installed incorrectly)\n"))
1979 _(" (templates seem to have been installed incorrectly)\n"))
1980
1980
1981 # editor
1981 # editor
1982 editor = ui.geteditor()
1982 editor = ui.geteditor()
1983 editor = util.expandpath(editor)
1983 editor = util.expandpath(editor)
1984 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
1984 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
1985 cmdpath = util.findexe(shlex.split(editor)[0])
1985 cmdpath = util.findexe(shlex.split(editor)[0])
1986 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
1986 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
1987 _(" No commit editor set and can't find %s in PATH\n"
1987 _(" No commit editor set and can't find %s in PATH\n"
1988 " (specify a commit editor in your configuration"
1988 " (specify a commit editor in your configuration"
1989 " file)\n"), not cmdpath and editor == 'vi' and editor)
1989 " file)\n"), not cmdpath and editor == 'vi' and editor)
1990 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
1990 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
1991 _(" Can't find editor '%s' in PATH\n"
1991 _(" Can't find editor '%s' in PATH\n"
1992 " (specify a commit editor in your configuration"
1992 " (specify a commit editor in your configuration"
1993 " file)\n"), not cmdpath and editor)
1993 " file)\n"), not cmdpath and editor)
1994 if not cmdpath and editor != 'vi':
1994 if not cmdpath and editor != 'vi':
1995 problems += 1
1995 problems += 1
1996
1996
1997 # check username
1997 # check username
1998 username = None
1998 username = None
1999 err = None
1999 err = None
2000 try:
2000 try:
2001 username = ui.username()
2001 username = ui.username()
2002 except error.Abort as e:
2002 except error.Abort as e:
2003 err = e
2003 err = e
2004 problems += 1
2004 problems += 1
2005
2005
2006 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2006 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2007 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2007 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2008 " (specify a username in your configuration file)\n"), err)
2008 " (specify a username in your configuration file)\n"), err)
2009
2009
2010 fm.condwrite(not problems, '',
2010 fm.condwrite(not problems, '',
2011 _("no problems detected\n"))
2011 _("no problems detected\n"))
2012 if not problems:
2012 if not problems:
2013 fm.data(problems=problems)
2013 fm.data(problems=problems)
2014 fm.condwrite(problems, 'problems',
2014 fm.condwrite(problems, 'problems',
2015 _("%d problems detected,"
2015 _("%d problems detected,"
2016 " please check your install!\n"), problems)
2016 " please check your install!\n"), problems)
2017 fm.end()
2017 fm.end()
2018
2018
2019 return problems
2019 return problems
2020
2020
2021 @command('debugknown', [], _('REPO ID...'), norepo=True)
2021 @command('debugknown', [], _('REPO ID...'), norepo=True)
2022 def debugknown(ui, repopath, *ids, **opts):
2022 def debugknown(ui, repopath, *ids, **opts):
2023 """test whether node ids are known to a repo
2023 """test whether node ids are known to a repo
2024
2024
2025 Every ID must be a full-length hex node id string. Returns a list of 0s
2025 Every ID must be a full-length hex node id string. Returns a list of 0s
2026 and 1s indicating unknown/known.
2026 and 1s indicating unknown/known.
2027 """
2027 """
2028 repo = hg.peer(ui, opts, repopath)
2028 repo = hg.peer(ui, opts, repopath)
2029 if not repo.capable('known'):
2029 if not repo.capable('known'):
2030 raise error.Abort("known() not supported by target repository")
2030 raise error.Abort("known() not supported by target repository")
2031 flags = repo.known([bin(s) for s in ids])
2031 flags = repo.known([bin(s) for s in ids])
2032 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2032 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2033
2033
2034 @command('debuglabelcomplete', [], _('LABEL...'))
2034 @command('debuglabelcomplete', [], _('LABEL...'))
2035 def debuglabelcomplete(ui, repo, *args):
2035 def debuglabelcomplete(ui, repo, *args):
2036 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2036 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2037 debugnamecomplete(ui, repo, *args)
2037 debugnamecomplete(ui, repo, *args)
2038
2038
2039 @command('debugmergestate', [], '')
2039 @command('debugmergestate', [], '')
2040 def debugmergestate(ui, repo, *args):
2040 def debugmergestate(ui, repo, *args):
2041 """print merge state
2041 """print merge state
2042
2042
2043 Use --verbose to print out information about whether v1 or v2 merge state
2043 Use --verbose to print out information about whether v1 or v2 merge state
2044 was chosen."""
2044 was chosen."""
2045 def _hashornull(h):
2045 def _hashornull(h):
2046 if h == nullhex:
2046 if h == nullhex:
2047 return 'null'
2047 return 'null'
2048 else:
2048 else:
2049 return h
2049 return h
2050
2050
2051 def printrecords(version):
2051 def printrecords(version):
2052 ui.write(('* version %s records\n') % version)
2052 ui.write(('* version %s records\n') % version)
2053 if version == 1:
2053 if version == 1:
2054 records = v1records
2054 records = v1records
2055 else:
2055 else:
2056 records = v2records
2056 records = v2records
2057
2057
2058 for rtype, record in records:
2058 for rtype, record in records:
2059 # pretty print some record types
2059 # pretty print some record types
2060 if rtype == 'L':
2060 if rtype == 'L':
2061 ui.write(('local: %s\n') % record)
2061 ui.write(('local: %s\n') % record)
2062 elif rtype == 'O':
2062 elif rtype == 'O':
2063 ui.write(('other: %s\n') % record)
2063 ui.write(('other: %s\n') % record)
2064 elif rtype == 'm':
2064 elif rtype == 'm':
2065 driver, mdstate = record.split('\0', 1)
2065 driver, mdstate = record.split('\0', 1)
2066 ui.write(('merge driver: %s (state "%s")\n')
2066 ui.write(('merge driver: %s (state "%s")\n')
2067 % (driver, mdstate))
2067 % (driver, mdstate))
2068 elif rtype in 'FDC':
2068 elif rtype in 'FDC':
2069 r = record.split('\0')
2069 r = record.split('\0')
2070 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2070 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2071 if version == 1:
2071 if version == 1:
2072 onode = 'not stored in v1 format'
2072 onode = 'not stored in v1 format'
2073 flags = r[7]
2073 flags = r[7]
2074 else:
2074 else:
2075 onode, flags = r[7:9]
2075 onode, flags = r[7:9]
2076 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2076 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2077 % (f, rtype, state, _hashornull(hash)))
2077 % (f, rtype, state, _hashornull(hash)))
2078 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2078 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2079 ui.write((' ancestor path: %s (node %s)\n')
2079 ui.write((' ancestor path: %s (node %s)\n')
2080 % (afile, _hashornull(anode)))
2080 % (afile, _hashornull(anode)))
2081 ui.write((' other path: %s (node %s)\n')
2081 ui.write((' other path: %s (node %s)\n')
2082 % (ofile, _hashornull(onode)))
2082 % (ofile, _hashornull(onode)))
2083 elif rtype == 'f':
2083 elif rtype == 'f':
2084 filename, rawextras = record.split('\0', 1)
2084 filename, rawextras = record.split('\0', 1)
2085 extras = rawextras.split('\0')
2085 extras = rawextras.split('\0')
2086 i = 0
2086 i = 0
2087 extrastrings = []
2087 extrastrings = []
2088 while i < len(extras):
2088 while i < len(extras):
2089 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2089 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2090 i += 2
2090 i += 2
2091
2091
2092 ui.write(('file extras: %s (%s)\n')
2092 ui.write(('file extras: %s (%s)\n')
2093 % (filename, ', '.join(extrastrings)))
2093 % (filename, ', '.join(extrastrings)))
2094 elif rtype == 'l':
2094 elif rtype == 'l':
2095 labels = record.split('\0', 2)
2095 labels = record.split('\0', 2)
2096 labels = [l for l in labels if len(l) > 0]
2096 labels = [l for l in labels if len(l) > 0]
2097 ui.write(('labels:\n'))
2097 ui.write(('labels:\n'))
2098 ui.write((' local: %s\n' % labels[0]))
2098 ui.write((' local: %s\n' % labels[0]))
2099 ui.write((' other: %s\n' % labels[1]))
2099 ui.write((' other: %s\n' % labels[1]))
2100 if len(labels) > 2:
2100 if len(labels) > 2:
2101 ui.write((' base: %s\n' % labels[2]))
2101 ui.write((' base: %s\n' % labels[2]))
2102 else:
2102 else:
2103 ui.write(('unrecognized entry: %s\t%s\n')
2103 ui.write(('unrecognized entry: %s\t%s\n')
2104 % (rtype, record.replace('\0', '\t')))
2104 % (rtype, record.replace('\0', '\t')))
2105
2105
2106 # Avoid mergestate.read() since it may raise an exception for unsupported
2106 # Avoid mergestate.read() since it may raise an exception for unsupported
2107 # merge state records. We shouldn't be doing this, but this is OK since this
2107 # merge state records. We shouldn't be doing this, but this is OK since this
2108 # command is pretty low-level.
2108 # command is pretty low-level.
2109 ms = mergemod.mergestate(repo)
2109 ms = mergemod.mergestate(repo)
2110
2110
2111 # sort so that reasonable information is on top
2111 # sort so that reasonable information is on top
2112 v1records = ms._readrecordsv1()
2112 v1records = ms._readrecordsv1()
2113 v2records = ms._readrecordsv2()
2113 v2records = ms._readrecordsv2()
2114 order = 'LOml'
2114 order = 'LOml'
2115 def key(r):
2115 def key(r):
2116 idx = order.find(r[0])
2116 idx = order.find(r[0])
2117 if idx == -1:
2117 if idx == -1:
2118 return (1, r[1])
2118 return (1, r[1])
2119 else:
2119 else:
2120 return (0, idx)
2120 return (0, idx)
2121 v1records.sort(key=key)
2121 v1records.sort(key=key)
2122 v2records.sort(key=key)
2122 v2records.sort(key=key)
2123
2123
2124 if not v1records and not v2records:
2124 if not v1records and not v2records:
2125 ui.write(('no merge state found\n'))
2125 ui.write(('no merge state found\n'))
2126 elif not v2records:
2126 elif not v2records:
2127 ui.note(('no version 2 merge state\n'))
2127 ui.note(('no version 2 merge state\n'))
2128 printrecords(1)
2128 printrecords(1)
2129 elif ms._v1v2match(v1records, v2records):
2129 elif ms._v1v2match(v1records, v2records):
2130 ui.note(('v1 and v2 states match: using v2\n'))
2130 ui.note(('v1 and v2 states match: using v2\n'))
2131 printrecords(2)
2131 printrecords(2)
2132 else:
2132 else:
2133 ui.note(('v1 and v2 states mismatch: using v1\n'))
2133 ui.note(('v1 and v2 states mismatch: using v1\n'))
2134 printrecords(1)
2134 printrecords(1)
2135 if ui.verbose:
2135 if ui.verbose:
2136 printrecords(2)
2136 printrecords(2)
2137
2137
2138 @command('debugnamecomplete', [], _('NAME...'))
2138 @command('debugnamecomplete', [], _('NAME...'))
2139 def debugnamecomplete(ui, repo, *args):
2139 def debugnamecomplete(ui, repo, *args):
2140 '''complete "names" - tags, open branch names, bookmark names'''
2140 '''complete "names" - tags, open branch names, bookmark names'''
2141
2141
2142 names = set()
2142 names = set()
2143 # since we previously only listed open branches, we will handle that
2143 # since we previously only listed open branches, we will handle that
2144 # specially (after this for loop)
2144 # specially (after this for loop)
2145 for name, ns in repo.names.iteritems():
2145 for name, ns in repo.names.iteritems():
2146 if name != 'branches':
2146 if name != 'branches':
2147 names.update(ns.listnames(repo))
2147 names.update(ns.listnames(repo))
2148 names.update(tag for (tag, heads, tip, closed)
2148 names.update(tag for (tag, heads, tip, closed)
2149 in repo.branchmap().iterbranches() if not closed)
2149 in repo.branchmap().iterbranches() if not closed)
2150 completions = set()
2150 completions = set()
2151 if not args:
2151 if not args:
2152 args = ['']
2152 args = ['']
2153 for a in args:
2153 for a in args:
2154 completions.update(n for n in names if n.startswith(a))
2154 completions.update(n for n in names if n.startswith(a))
2155 ui.write('\n'.join(sorted(completions)))
2155 ui.write('\n'.join(sorted(completions)))
2156 ui.write('\n')
2156 ui.write('\n')
2157
2157
2158 @command('debuglocks',
2158 @command('debuglocks',
2159 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2159 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2160 ('W', 'force-wlock', None,
2160 ('W', 'force-wlock', None,
2161 _('free the working state lock (DANGEROUS)'))],
2161 _('free the working state lock (DANGEROUS)'))],
2162 _('[OPTION]...'))
2162 _('[OPTION]...'))
2163 def debuglocks(ui, repo, **opts):
2163 def debuglocks(ui, repo, **opts):
2164 """show or modify state of locks
2164 """show or modify state of locks
2165
2165
2166 By default, this command will show which locks are held. This
2166 By default, this command will show which locks are held. This
2167 includes the user and process holding the lock, the amount of time
2167 includes the user and process holding the lock, the amount of time
2168 the lock has been held, and the machine name where the process is
2168 the lock has been held, and the machine name where the process is
2169 running if it's not local.
2169 running if it's not local.
2170
2170
2171 Locks protect the integrity of Mercurial's data, so should be
2171 Locks protect the integrity of Mercurial's data, so should be
2172 treated with care. System crashes or other interruptions may cause
2172 treated with care. System crashes or other interruptions may cause
2173 locks to not be properly released, though Mercurial will usually
2173 locks to not be properly released, though Mercurial will usually
2174 detect and remove such stale locks automatically.
2174 detect and remove such stale locks automatically.
2175
2175
2176 However, detecting stale locks may not always be possible (for
2176 However, detecting stale locks may not always be possible (for
2177 instance, on a shared filesystem). Removing locks may also be
2177 instance, on a shared filesystem). Removing locks may also be
2178 blocked by filesystem permissions.
2178 blocked by filesystem permissions.
2179
2179
2180 Returns 0 if no locks are held.
2180 Returns 0 if no locks are held.
2181
2181
2182 """
2182 """
2183
2183
2184 if opts.get('force_lock'):
2184 if opts.get('force_lock'):
2185 repo.svfs.unlink('lock')
2185 repo.svfs.unlink('lock')
2186 if opts.get('force_wlock'):
2186 if opts.get('force_wlock'):
2187 repo.vfs.unlink('wlock')
2187 repo.vfs.unlink('wlock')
2188 if opts.get('force_lock') or opts.get('force_lock'):
2188 if opts.get('force_lock') or opts.get('force_lock'):
2189 return 0
2189 return 0
2190
2190
2191 now = time.time()
2191 now = time.time()
2192 held = 0
2192 held = 0
2193
2193
2194 def report(vfs, name, method):
2194 def report(vfs, name, method):
2195 # this causes stale locks to get reaped for more accurate reporting
2195 # this causes stale locks to get reaped for more accurate reporting
2196 try:
2196 try:
2197 l = method(False)
2197 l = method(False)
2198 except error.LockHeld:
2198 except error.LockHeld:
2199 l = None
2199 l = None
2200
2200
2201 if l:
2201 if l:
2202 l.release()
2202 l.release()
2203 else:
2203 else:
2204 try:
2204 try:
2205 stat = vfs.lstat(name)
2205 stat = vfs.lstat(name)
2206 age = now - stat.st_mtime
2206 age = now - stat.st_mtime
2207 user = util.username(stat.st_uid)
2207 user = util.username(stat.st_uid)
2208 locker = vfs.readlock(name)
2208 locker = vfs.readlock(name)
2209 if ":" in locker:
2209 if ":" in locker:
2210 host, pid = locker.split(':')
2210 host, pid = locker.split(':')
2211 if host == socket.gethostname():
2211 if host == socket.gethostname():
2212 locker = 'user %s, process %s' % (user, pid)
2212 locker = 'user %s, process %s' % (user, pid)
2213 else:
2213 else:
2214 locker = 'user %s, process %s, host %s' \
2214 locker = 'user %s, process %s, host %s' \
2215 % (user, pid, host)
2215 % (user, pid, host)
2216 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
2216 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
2217 return 1
2217 return 1
2218 except OSError as e:
2218 except OSError as e:
2219 if e.errno != errno.ENOENT:
2219 if e.errno != errno.ENOENT:
2220 raise
2220 raise
2221
2221
2222 ui.write(("%-6s free\n") % (name + ":"))
2222 ui.write(("%-6s free\n") % (name + ":"))
2223 return 0
2223 return 0
2224
2224
2225 held += report(repo.svfs, "lock", repo.lock)
2225 held += report(repo.svfs, "lock", repo.lock)
2226 held += report(repo.vfs, "wlock", repo.wlock)
2226 held += report(repo.vfs, "wlock", repo.wlock)
2227
2227
2228 return held
2228 return held
2229
2229
2230 @command('debugobsolete',
2230 @command('debugobsolete',
2231 [('', 'flags', 0, _('markers flag')),
2231 [('', 'flags', 0, _('markers flag')),
2232 ('', 'record-parents', False,
2232 ('', 'record-parents', False,
2233 _('record parent information for the precursor')),
2233 _('record parent information for the precursor')),
2234 ('r', 'rev', [], _('display markers relevant to REV')),
2234 ('r', 'rev', [], _('display markers relevant to REV')),
2235 ('', 'index', False, _('display index of the marker')),
2235 ('', 'index', False, _('display index of the marker')),
2236 ('', 'delete', [], _('delete markers specified by indices')),
2236 ('', 'delete', [], _('delete markers specified by indices')),
2237 ] + commitopts2 + formatteropts,
2237 ] + commitopts2 + formatteropts,
2238 _('[OBSOLETED [REPLACEMENT ...]]'))
2238 _('[OBSOLETED [REPLACEMENT ...]]'))
2239 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2239 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2240 """create arbitrary obsolete marker
2240 """create arbitrary obsolete marker
2241
2241
2242 With no arguments, displays the list of obsolescence markers."""
2242 With no arguments, displays the list of obsolescence markers."""
2243
2243
2244 def parsenodeid(s):
2244 def parsenodeid(s):
2245 try:
2245 try:
2246 # We do not use revsingle/revrange functions here to accept
2246 # We do not use revsingle/revrange functions here to accept
2247 # arbitrary node identifiers, possibly not present in the
2247 # arbitrary node identifiers, possibly not present in the
2248 # local repository.
2248 # local repository.
2249 n = bin(s)
2249 n = bin(s)
2250 if len(n) != len(nullid):
2250 if len(n) != len(nullid):
2251 raise TypeError()
2251 raise TypeError()
2252 return n
2252 return n
2253 except TypeError:
2253 except TypeError:
2254 raise error.Abort('changeset references must be full hexadecimal '
2254 raise error.Abort('changeset references must be full hexadecimal '
2255 'node identifiers')
2255 'node identifiers')
2256
2256
2257 if opts.get('delete'):
2257 if opts.get('delete'):
2258 indices = []
2258 indices = []
2259 for v in opts.get('delete'):
2259 for v in opts.get('delete'):
2260 try:
2260 try:
2261 indices.append(int(v))
2261 indices.append(int(v))
2262 except ValueError:
2262 except ValueError:
2263 raise error.Abort(_('invalid index value: %r') % v,
2263 raise error.Abort(_('invalid index value: %r') % v,
2264 hint=_('use integers for indices'))
2264 hint=_('use integers for indices'))
2265
2265
2266 if repo.currenttransaction():
2266 if repo.currenttransaction():
2267 raise error.Abort(_('cannot delete obsmarkers in the middle '
2267 raise error.Abort(_('cannot delete obsmarkers in the middle '
2268 'of transaction.'))
2268 'of transaction.'))
2269
2269
2270 with repo.lock():
2270 with repo.lock():
2271 n = repair.deleteobsmarkers(repo.obsstore, indices)
2271 n = repair.deleteobsmarkers(repo.obsstore, indices)
2272 ui.write(_('deleted %i obsolescence markers\n') % n)
2272 ui.write(_('deleted %i obsolescence markers\n') % n)
2273
2273
2274 return
2274 return
2275
2275
2276 if precursor is not None:
2276 if precursor is not None:
2277 if opts['rev']:
2277 if opts['rev']:
2278 raise error.Abort('cannot select revision when creating marker')
2278 raise error.Abort('cannot select revision when creating marker')
2279 metadata = {}
2279 metadata = {}
2280 metadata['user'] = opts['user'] or ui.username()
2280 metadata['user'] = opts['user'] or ui.username()
2281 succs = tuple(parsenodeid(succ) for succ in successors)
2281 succs = tuple(parsenodeid(succ) for succ in successors)
2282 l = repo.lock()
2282 l = repo.lock()
2283 try:
2283 try:
2284 tr = repo.transaction('debugobsolete')
2284 tr = repo.transaction('debugobsolete')
2285 try:
2285 try:
2286 date = opts.get('date')
2286 date = opts.get('date')
2287 if date:
2287 if date:
2288 date = util.parsedate(date)
2288 date = util.parsedate(date)
2289 else:
2289 else:
2290 date = None
2290 date = None
2291 prec = parsenodeid(precursor)
2291 prec = parsenodeid(precursor)
2292 parents = None
2292 parents = None
2293 if opts['record_parents']:
2293 if opts['record_parents']:
2294 if prec not in repo.unfiltered():
2294 if prec not in repo.unfiltered():
2295 raise error.Abort('cannot used --record-parents on '
2295 raise error.Abort('cannot used --record-parents on '
2296 'unknown changesets')
2296 'unknown changesets')
2297 parents = repo.unfiltered()[prec].parents()
2297 parents = repo.unfiltered()[prec].parents()
2298 parents = tuple(p.node() for p in parents)
2298 parents = tuple(p.node() for p in parents)
2299 repo.obsstore.create(tr, prec, succs, opts['flags'],
2299 repo.obsstore.create(tr, prec, succs, opts['flags'],
2300 parents=parents, date=date,
2300 parents=parents, date=date,
2301 metadata=metadata)
2301 metadata=metadata)
2302 tr.close()
2302 tr.close()
2303 except ValueError as exc:
2303 except ValueError as exc:
2304 raise error.Abort(_('bad obsmarker input: %s') % exc)
2304 raise error.Abort(_('bad obsmarker input: %s') % exc)
2305 finally:
2305 finally:
2306 tr.release()
2306 tr.release()
2307 finally:
2307 finally:
2308 l.release()
2308 l.release()
2309 else:
2309 else:
2310 if opts['rev']:
2310 if opts['rev']:
2311 revs = scmutil.revrange(repo, opts['rev'])
2311 revs = scmutil.revrange(repo, opts['rev'])
2312 nodes = [repo[r].node() for r in revs]
2312 nodes = [repo[r].node() for r in revs]
2313 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2313 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2314 markers.sort(key=lambda x: x._data)
2314 markers.sort(key=lambda x: x._data)
2315 else:
2315 else:
2316 markers = obsolete.getmarkers(repo)
2316 markers = obsolete.getmarkers(repo)
2317
2317
2318 markerstoiter = markers
2318 markerstoiter = markers
2319 isrelevant = lambda m: True
2319 isrelevant = lambda m: True
2320 if opts.get('rev') and opts.get('index'):
2320 if opts.get('rev') and opts.get('index'):
2321 markerstoiter = obsolete.getmarkers(repo)
2321 markerstoiter = obsolete.getmarkers(repo)
2322 markerset = set(markers)
2322 markerset = set(markers)
2323 isrelevant = lambda m: m in markerset
2323 isrelevant = lambda m: m in markerset
2324
2324
2325 fm = ui.formatter('debugobsolete', opts)
2325 fm = ui.formatter('debugobsolete', opts)
2326 for i, m in enumerate(markerstoiter):
2326 for i, m in enumerate(markerstoiter):
2327 if not isrelevant(m):
2327 if not isrelevant(m):
2328 # marker can be irrelevant when we're iterating over a set
2328 # marker can be irrelevant when we're iterating over a set
2329 # of markers (markerstoiter) which is bigger than the set
2329 # of markers (markerstoiter) which is bigger than the set
2330 # of markers we want to display (markers)
2330 # of markers we want to display (markers)
2331 # this can happen if both --index and --rev options are
2331 # this can happen if both --index and --rev options are
2332 # provided and thus we need to iterate over all of the markers
2332 # provided and thus we need to iterate over all of the markers
2333 # to get the correct indices, but only display the ones that
2333 # to get the correct indices, but only display the ones that
2334 # are relevant to --rev value
2334 # are relevant to --rev value
2335 continue
2335 continue
2336 fm.startitem()
2336 fm.startitem()
2337 ind = i if opts.get('index') else None
2337 ind = i if opts.get('index') else None
2338 cmdutil.showmarker(fm, m, index=ind)
2338 cmdutil.showmarker(fm, m, index=ind)
2339 fm.end()
2339 fm.end()
2340
2340
2341 @command('debugpathcomplete',
2341 @command('debugpathcomplete',
2342 [('f', 'full', None, _('complete an entire path')),
2342 [('f', 'full', None, _('complete an entire path')),
2343 ('n', 'normal', None, _('show only normal files')),
2343 ('n', 'normal', None, _('show only normal files')),
2344 ('a', 'added', None, _('show only added files')),
2344 ('a', 'added', None, _('show only added files')),
2345 ('r', 'removed', None, _('show only removed files'))],
2345 ('r', 'removed', None, _('show only removed files'))],
2346 _('FILESPEC...'))
2346 _('FILESPEC...'))
2347 def debugpathcomplete(ui, repo, *specs, **opts):
2347 def debugpathcomplete(ui, repo, *specs, **opts):
2348 '''complete part or all of a tracked path
2348 '''complete part or all of a tracked path
2349
2349
2350 This command supports shells that offer path name completion. It
2350 This command supports shells that offer path name completion. It
2351 currently completes only files already known to the dirstate.
2351 currently completes only files already known to the dirstate.
2352
2352
2353 Completion extends only to the next path segment unless
2353 Completion extends only to the next path segment unless
2354 --full is specified, in which case entire paths are used.'''
2354 --full is specified, in which case entire paths are used.'''
2355
2355
2356 def complete(path, acceptable):
2356 def complete(path, acceptable):
2357 dirstate = repo.dirstate
2357 dirstate = repo.dirstate
2358 spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
2358 spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
2359 rootdir = repo.root + os.sep
2359 rootdir = repo.root + os.sep
2360 if spec != repo.root and not spec.startswith(rootdir):
2360 if spec != repo.root and not spec.startswith(rootdir):
2361 return [], []
2361 return [], []
2362 if os.path.isdir(spec):
2362 if os.path.isdir(spec):
2363 spec += '/'
2363 spec += '/'
2364 spec = spec[len(rootdir):]
2364 spec = spec[len(rootdir):]
2365 fixpaths = pycompat.ossep != '/'
2365 fixpaths = pycompat.ossep != '/'
2366 if fixpaths:
2366 if fixpaths:
2367 spec = spec.replace(os.sep, '/')
2367 spec = spec.replace(os.sep, '/')
2368 speclen = len(spec)
2368 speclen = len(spec)
2369 fullpaths = opts['full']
2369 fullpaths = opts['full']
2370 files, dirs = set(), set()
2370 files, dirs = set(), set()
2371 adddir, addfile = dirs.add, files.add
2371 adddir, addfile = dirs.add, files.add
2372 for f, st in dirstate.iteritems():
2372 for f, st in dirstate.iteritems():
2373 if f.startswith(spec) and st[0] in acceptable:
2373 if f.startswith(spec) and st[0] in acceptable:
2374 if fixpaths:
2374 if fixpaths:
2375 f = f.replace('/', os.sep)
2375 f = f.replace('/', os.sep)
2376 if fullpaths:
2376 if fullpaths:
2377 addfile(f)
2377 addfile(f)
2378 continue
2378 continue
2379 s = f.find(os.sep, speclen)
2379 s = f.find(os.sep, speclen)
2380 if s >= 0:
2380 if s >= 0:
2381 adddir(f[:s])
2381 adddir(f[:s])
2382 else:
2382 else:
2383 addfile(f)
2383 addfile(f)
2384 return files, dirs
2384 return files, dirs
2385
2385
2386 acceptable = ''
2386 acceptable = ''
2387 if opts['normal']:
2387 if opts['normal']:
2388 acceptable += 'nm'
2388 acceptable += 'nm'
2389 if opts['added']:
2389 if opts['added']:
2390 acceptable += 'a'
2390 acceptable += 'a'
2391 if opts['removed']:
2391 if opts['removed']:
2392 acceptable += 'r'
2392 acceptable += 'r'
2393 cwd = repo.getcwd()
2393 cwd = repo.getcwd()
2394 if not specs:
2394 if not specs:
2395 specs = ['.']
2395 specs = ['.']
2396
2396
2397 files, dirs = set(), set()
2397 files, dirs = set(), set()
2398 for spec in specs:
2398 for spec in specs:
2399 f, d = complete(spec, acceptable or 'nmar')
2399 f, d = complete(spec, acceptable or 'nmar')
2400 files.update(f)
2400 files.update(f)
2401 dirs.update(d)
2401 dirs.update(d)
2402 files.update(dirs)
2402 files.update(dirs)
2403 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2403 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2404 ui.write('\n')
2404 ui.write('\n')
2405
2405
2406 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2406 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2407 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2407 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2408 '''access the pushkey key/value protocol
2408 '''access the pushkey key/value protocol
2409
2409
2410 With two args, list the keys in the given namespace.
2410 With two args, list the keys in the given namespace.
2411
2411
2412 With five args, set a key to new if it currently is set to old.
2412 With five args, set a key to new if it currently is set to old.
2413 Reports success or failure.
2413 Reports success or failure.
2414 '''
2414 '''
2415
2415
2416 target = hg.peer(ui, {}, repopath)
2416 target = hg.peer(ui, {}, repopath)
2417 if keyinfo:
2417 if keyinfo:
2418 key, old, new = keyinfo
2418 key, old, new = keyinfo
2419 r = target.pushkey(namespace, key, old, new)
2419 r = target.pushkey(namespace, key, old, new)
2420 ui.status(str(r) + '\n')
2420 ui.status(str(r) + '\n')
2421 return not r
2421 return not r
2422 else:
2422 else:
2423 for k, v in sorted(target.listkeys(namespace).iteritems()):
2423 for k, v in sorted(target.listkeys(namespace).iteritems()):
2424 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2424 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2425 v.encode('string-escape')))
2425 v.encode('string-escape')))
2426
2426
2427 @command('debugpvec', [], _('A B'))
2427 @command('debugpvec', [], _('A B'))
2428 def debugpvec(ui, repo, a, b=None):
2428 def debugpvec(ui, repo, a, b=None):
2429 ca = scmutil.revsingle(repo, a)
2429 ca = scmutil.revsingle(repo, a)
2430 cb = scmutil.revsingle(repo, b)
2430 cb = scmutil.revsingle(repo, b)
2431 pa = pvec.ctxpvec(ca)
2431 pa = pvec.ctxpvec(ca)
2432 pb = pvec.ctxpvec(cb)
2432 pb = pvec.ctxpvec(cb)
2433 if pa == pb:
2433 if pa == pb:
2434 rel = "="
2434 rel = "="
2435 elif pa > pb:
2435 elif pa > pb:
2436 rel = ">"
2436 rel = ">"
2437 elif pa < pb:
2437 elif pa < pb:
2438 rel = "<"
2438 rel = "<"
2439 elif pa | pb:
2439 elif pa | pb:
2440 rel = "|"
2440 rel = "|"
2441 ui.write(_("a: %s\n") % pa)
2441 ui.write(_("a: %s\n") % pa)
2442 ui.write(_("b: %s\n") % pb)
2442 ui.write(_("b: %s\n") % pb)
2443 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2443 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2444 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2444 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2445 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2445 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2446 pa.distance(pb), rel))
2446 pa.distance(pb), rel))
2447
2447
2448 @command('debugrebuilddirstate|debugrebuildstate',
2448 @command('debugrebuilddirstate|debugrebuildstate',
2449 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
2449 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
2450 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
2450 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
2451 'the working copy parent')),
2451 'the working copy parent')),
2452 ],
2452 ],
2453 _('[-r REV]'))
2453 _('[-r REV]'))
2454 def debugrebuilddirstate(ui, repo, rev, **opts):
2454 def debugrebuilddirstate(ui, repo, rev, **opts):
2455 """rebuild the dirstate as it would look like for the given revision
2455 """rebuild the dirstate as it would look like for the given revision
2456
2456
2457 If no revision is specified the first current parent will be used.
2457 If no revision is specified the first current parent will be used.
2458
2458
2459 The dirstate will be set to the files of the given revision.
2459 The dirstate will be set to the files of the given revision.
2460 The actual working directory content or existing dirstate
2460 The actual working directory content or existing dirstate
2461 information such as adds or removes is not considered.
2461 information such as adds or removes is not considered.
2462
2462
2463 ``minimal`` will only rebuild the dirstate status for files that claim to be
2463 ``minimal`` will only rebuild the dirstate status for files that claim to be
2464 tracked but are not in the parent manifest, or that exist in the parent
2464 tracked but are not in the parent manifest, or that exist in the parent
2465 manifest but are not in the dirstate. It will not change adds, removes, or
2465 manifest but are not in the dirstate. It will not change adds, removes, or
2466 modified files that are in the working copy parent.
2466 modified files that are in the working copy parent.
2467
2467
2468 One use of this command is to make the next :hg:`status` invocation
2468 One use of this command is to make the next :hg:`status` invocation
2469 check the actual file content.
2469 check the actual file content.
2470 """
2470 """
2471 ctx = scmutil.revsingle(repo, rev)
2471 ctx = scmutil.revsingle(repo, rev)
2472 with repo.wlock():
2472 with repo.wlock():
2473 dirstate = repo.dirstate
2473 dirstate = repo.dirstate
2474 changedfiles = None
2474 changedfiles = None
2475 # See command doc for what minimal does.
2475 # See command doc for what minimal does.
2476 if opts.get('minimal'):
2476 if opts.get('minimal'):
2477 manifestfiles = set(ctx.manifest().keys())
2477 manifestfiles = set(ctx.manifest().keys())
2478 dirstatefiles = set(dirstate)
2478 dirstatefiles = set(dirstate)
2479 manifestonly = manifestfiles - dirstatefiles
2479 manifestonly = manifestfiles - dirstatefiles
2480 dsonly = dirstatefiles - manifestfiles
2480 dsonly = dirstatefiles - manifestfiles
2481 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
2481 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
2482 changedfiles = manifestonly | dsnotadded
2482 changedfiles = manifestonly | dsnotadded
2483
2483
2484 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
2484 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
2485
2485
2486 @command('debugrebuildfncache', [], '')
2486 @command('debugrebuildfncache', [], '')
2487 def debugrebuildfncache(ui, repo):
2487 def debugrebuildfncache(ui, repo):
2488 """rebuild the fncache file"""
2488 """rebuild the fncache file"""
2489 repair.rebuildfncache(ui, repo)
2489 repair.rebuildfncache(ui, repo)
2490
2490
2491 @command('debugrename',
2491 @command('debugrename',
2492 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2492 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2493 _('[-r REV] FILE'))
2493 _('[-r REV] FILE'))
2494 def debugrename(ui, repo, file1, *pats, **opts):
2494 def debugrename(ui, repo, file1, *pats, **opts):
2495 """dump rename information"""
2495 """dump rename information"""
2496
2496
2497 ctx = scmutil.revsingle(repo, opts.get('rev'))
2497 ctx = scmutil.revsingle(repo, opts.get('rev'))
2498 m = scmutil.match(ctx, (file1,) + pats, opts)
2498 m = scmutil.match(ctx, (file1,) + pats, opts)
2499 for abs in ctx.walk(m):
2499 for abs in ctx.walk(m):
2500 fctx = ctx[abs]
2500 fctx = ctx[abs]
2501 o = fctx.filelog().renamed(fctx.filenode())
2501 o = fctx.filelog().renamed(fctx.filenode())
2502 rel = m.rel(abs)
2502 rel = m.rel(abs)
2503 if o:
2503 if o:
2504 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2504 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2505 else:
2505 else:
2506 ui.write(_("%s not renamed\n") % rel)
2506 ui.write(_("%s not renamed\n") % rel)
2507
2507
2508 @command('debugrevlog', debugrevlogopts +
2508 @command('debugrevlog', debugrevlogopts +
2509 [('d', 'dump', False, _('dump index data'))],
2509 [('d', 'dump', False, _('dump index data'))],
2510 _('-c|-m|FILE'),
2510 _('-c|-m|FILE'),
2511 optionalrepo=True)
2511 optionalrepo=True)
2512 def debugrevlog(ui, repo, file_=None, **opts):
2512 def debugrevlog(ui, repo, file_=None, **opts):
2513 """show data and statistics about a revlog"""
2513 """show data and statistics about a revlog"""
2514 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2514 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2515
2515
2516 if opts.get("dump"):
2516 if opts.get("dump"):
2517 numrevs = len(r)
2517 numrevs = len(r)
2518 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
2518 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
2519 " rawsize totalsize compression heads chainlen\n"))
2519 " rawsize totalsize compression heads chainlen\n"))
2520 ts = 0
2520 ts = 0
2521 heads = set()
2521 heads = set()
2522
2522
2523 for rev in xrange(numrevs):
2523 for rev in xrange(numrevs):
2524 dbase = r.deltaparent(rev)
2524 dbase = r.deltaparent(rev)
2525 if dbase == -1:
2525 if dbase == -1:
2526 dbase = rev
2526 dbase = rev
2527 cbase = r.chainbase(rev)
2527 cbase = r.chainbase(rev)
2528 clen = r.chainlen(rev)
2528 clen = r.chainlen(rev)
2529 p1, p2 = r.parentrevs(rev)
2529 p1, p2 = r.parentrevs(rev)
2530 rs = r.rawsize(rev)
2530 rs = r.rawsize(rev)
2531 ts = ts + rs
2531 ts = ts + rs
2532 heads -= set(r.parentrevs(rev))
2532 heads -= set(r.parentrevs(rev))
2533 heads.add(rev)
2533 heads.add(rev)
2534 try:
2534 try:
2535 compression = ts / r.end(rev)
2535 compression = ts / r.end(rev)
2536 except ZeroDivisionError:
2536 except ZeroDivisionError:
2537 compression = 0
2537 compression = 0
2538 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2538 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2539 "%11d %5d %8d\n" %
2539 "%11d %5d %8d\n" %
2540 (rev, p1, p2, r.start(rev), r.end(rev),
2540 (rev, p1, p2, r.start(rev), r.end(rev),
2541 r.start(dbase), r.start(cbase),
2541 r.start(dbase), r.start(cbase),
2542 r.start(p1), r.start(p2),
2542 r.start(p1), r.start(p2),
2543 rs, ts, compression, len(heads), clen))
2543 rs, ts, compression, len(heads), clen))
2544 return 0
2544 return 0
2545
2545
2546 v = r.version
2546 v = r.version
2547 format = v & 0xFFFF
2547 format = v & 0xFFFF
2548 flags = []
2548 flags = []
2549 gdelta = False
2549 gdelta = False
2550 if v & revlog.REVLOGNGINLINEDATA:
2550 if v & revlog.REVLOGNGINLINEDATA:
2551 flags.append('inline')
2551 flags.append('inline')
2552 if v & revlog.REVLOGGENERALDELTA:
2552 if v & revlog.REVLOGGENERALDELTA:
2553 gdelta = True
2553 gdelta = True
2554 flags.append('generaldelta')
2554 flags.append('generaldelta')
2555 if not flags:
2555 if not flags:
2556 flags = ['(none)']
2556 flags = ['(none)']
2557
2557
2558 nummerges = 0
2558 nummerges = 0
2559 numfull = 0
2559 numfull = 0
2560 numprev = 0
2560 numprev = 0
2561 nump1 = 0
2561 nump1 = 0
2562 nump2 = 0
2562 nump2 = 0
2563 numother = 0
2563 numother = 0
2564 nump1prev = 0
2564 nump1prev = 0
2565 nump2prev = 0
2565 nump2prev = 0
2566 chainlengths = []
2566 chainlengths = []
2567
2567
2568 datasize = [None, 0, 0]
2568 datasize = [None, 0, 0]
2569 fullsize = [None, 0, 0]
2569 fullsize = [None, 0, 0]
2570 deltasize = [None, 0, 0]
2570 deltasize = [None, 0, 0]
2571 chunktypecounts = {}
2571 chunktypecounts = {}
2572 chunktypesizes = {}
2572 chunktypesizes = {}
2573
2573
2574 def addsize(size, l):
2574 def addsize(size, l):
2575 if l[0] is None or size < l[0]:
2575 if l[0] is None or size < l[0]:
2576 l[0] = size
2576 l[0] = size
2577 if size > l[1]:
2577 if size > l[1]:
2578 l[1] = size
2578 l[1] = size
2579 l[2] += size
2579 l[2] += size
2580
2580
2581 numrevs = len(r)
2581 numrevs = len(r)
2582 for rev in xrange(numrevs):
2582 for rev in xrange(numrevs):
2583 p1, p2 = r.parentrevs(rev)
2583 p1, p2 = r.parentrevs(rev)
2584 delta = r.deltaparent(rev)
2584 delta = r.deltaparent(rev)
2585 if format > 0:
2585 if format > 0:
2586 addsize(r.rawsize(rev), datasize)
2586 addsize(r.rawsize(rev), datasize)
2587 if p2 != nullrev:
2587 if p2 != nullrev:
2588 nummerges += 1
2588 nummerges += 1
2589 size = r.length(rev)
2589 size = r.length(rev)
2590 if delta == nullrev:
2590 if delta == nullrev:
2591 chainlengths.append(0)
2591 chainlengths.append(0)
2592 numfull += 1
2592 numfull += 1
2593 addsize(size, fullsize)
2593 addsize(size, fullsize)
2594 else:
2594 else:
2595 chainlengths.append(chainlengths[delta] + 1)
2595 chainlengths.append(chainlengths[delta] + 1)
2596 addsize(size, deltasize)
2596 addsize(size, deltasize)
2597 if delta == rev - 1:
2597 if delta == rev - 1:
2598 numprev += 1
2598 numprev += 1
2599 if delta == p1:
2599 if delta == p1:
2600 nump1prev += 1
2600 nump1prev += 1
2601 elif delta == p2:
2601 elif delta == p2:
2602 nump2prev += 1
2602 nump2prev += 1
2603 elif delta == p1:
2603 elif delta == p1:
2604 nump1 += 1
2604 nump1 += 1
2605 elif delta == p2:
2605 elif delta == p2:
2606 nump2 += 1
2606 nump2 += 1
2607 elif delta != nullrev:
2607 elif delta != nullrev:
2608 numother += 1
2608 numother += 1
2609
2609
2610 # Obtain data on the raw chunks in the revlog.
2610 # Obtain data on the raw chunks in the revlog.
2611 chunk = r._chunkraw(rev, rev)[1]
2611 chunk = r._chunkraw(rev, rev)[1]
2612 if chunk:
2612 if chunk:
2613 chunktype = chunk[0]
2613 chunktype = chunk[0]
2614 else:
2614 else:
2615 chunktype = 'empty'
2615 chunktype = 'empty'
2616
2616
2617 if chunktype not in chunktypecounts:
2617 if chunktype not in chunktypecounts:
2618 chunktypecounts[chunktype] = 0
2618 chunktypecounts[chunktype] = 0
2619 chunktypesizes[chunktype] = 0
2619 chunktypesizes[chunktype] = 0
2620
2620
2621 chunktypecounts[chunktype] += 1
2621 chunktypecounts[chunktype] += 1
2622 chunktypesizes[chunktype] += size
2622 chunktypesizes[chunktype] += size
2623
2623
2624 # Adjust size min value for empty cases
2624 # Adjust size min value for empty cases
2625 for size in (datasize, fullsize, deltasize):
2625 for size in (datasize, fullsize, deltasize):
2626 if size[0] is None:
2626 if size[0] is None:
2627 size[0] = 0
2627 size[0] = 0
2628
2628
2629 numdeltas = numrevs - numfull
2629 numdeltas = numrevs - numfull
2630 numoprev = numprev - nump1prev - nump2prev
2630 numoprev = numprev - nump1prev - nump2prev
2631 totalrawsize = datasize[2]
2631 totalrawsize = datasize[2]
2632 datasize[2] /= numrevs
2632 datasize[2] /= numrevs
2633 fulltotal = fullsize[2]
2633 fulltotal = fullsize[2]
2634 fullsize[2] /= numfull
2634 fullsize[2] /= numfull
2635 deltatotal = deltasize[2]
2635 deltatotal = deltasize[2]
2636 if numrevs - numfull > 0:
2636 if numrevs - numfull > 0:
2637 deltasize[2] /= numrevs - numfull
2637 deltasize[2] /= numrevs - numfull
2638 totalsize = fulltotal + deltatotal
2638 totalsize = fulltotal + deltatotal
2639 avgchainlen = sum(chainlengths) / numrevs
2639 avgchainlen = sum(chainlengths) / numrevs
2640 maxchainlen = max(chainlengths)
2640 maxchainlen = max(chainlengths)
2641 compratio = 1
2641 compratio = 1
2642 if totalsize:
2642 if totalsize:
2643 compratio = totalrawsize / totalsize
2643 compratio = totalrawsize / totalsize
2644
2644
2645 basedfmtstr = '%%%dd\n'
2645 basedfmtstr = '%%%dd\n'
2646 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2646 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2647
2647
2648 def dfmtstr(max):
2648 def dfmtstr(max):
2649 return basedfmtstr % len(str(max))
2649 return basedfmtstr % len(str(max))
2650 def pcfmtstr(max, padding=0):
2650 def pcfmtstr(max, padding=0):
2651 return basepcfmtstr % (len(str(max)), ' ' * padding)
2651 return basepcfmtstr % (len(str(max)), ' ' * padding)
2652
2652
2653 def pcfmt(value, total):
2653 def pcfmt(value, total):
2654 if total:
2654 if total:
2655 return (value, 100 * float(value) / total)
2655 return (value, 100 * float(value) / total)
2656 else:
2656 else:
2657 return value, 100.0
2657 return value, 100.0
2658
2658
2659 ui.write(('format : %d\n') % format)
2659 ui.write(('format : %d\n') % format)
2660 ui.write(('flags : %s\n') % ', '.join(flags))
2660 ui.write(('flags : %s\n') % ', '.join(flags))
2661
2661
2662 ui.write('\n')
2662 ui.write('\n')
2663 fmt = pcfmtstr(totalsize)
2663 fmt = pcfmtstr(totalsize)
2664 fmt2 = dfmtstr(totalsize)
2664 fmt2 = dfmtstr(totalsize)
2665 ui.write(('revisions : ') + fmt2 % numrevs)
2665 ui.write(('revisions : ') + fmt2 % numrevs)
2666 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2666 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2667 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2667 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2668 ui.write(('revisions : ') + fmt2 % numrevs)
2668 ui.write(('revisions : ') + fmt2 % numrevs)
2669 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2669 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2670 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2670 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2671 ui.write(('revision size : ') + fmt2 % totalsize)
2671 ui.write(('revision size : ') + fmt2 % totalsize)
2672 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2672 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2673 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2673 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2674
2674
2675 def fmtchunktype(chunktype):
2675 def fmtchunktype(chunktype):
2676 if chunktype == 'empty':
2676 if chunktype == 'empty':
2677 return ' %s : ' % chunktype
2677 return ' %s : ' % chunktype
2678 elif chunktype in string.ascii_letters:
2678 elif chunktype in string.ascii_letters:
2679 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2679 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2680 else:
2680 else:
2681 return ' 0x%s : ' % hex(chunktype)
2681 return ' 0x%s : ' % hex(chunktype)
2682
2682
2683 ui.write('\n')
2683 ui.write('\n')
2684 ui.write(('chunks : ') + fmt2 % numrevs)
2684 ui.write(('chunks : ') + fmt2 % numrevs)
2685 for chunktype in sorted(chunktypecounts):
2685 for chunktype in sorted(chunktypecounts):
2686 ui.write(fmtchunktype(chunktype))
2686 ui.write(fmtchunktype(chunktype))
2687 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2687 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2688 ui.write(('chunks size : ') + fmt2 % totalsize)
2688 ui.write(('chunks size : ') + fmt2 % totalsize)
2689 for chunktype in sorted(chunktypecounts):
2689 for chunktype in sorted(chunktypecounts):
2690 ui.write(fmtchunktype(chunktype))
2690 ui.write(fmtchunktype(chunktype))
2691 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2691 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2692
2692
2693 ui.write('\n')
2693 ui.write('\n')
2694 fmt = dfmtstr(max(avgchainlen, compratio))
2694 fmt = dfmtstr(max(avgchainlen, compratio))
2695 ui.write(('avg chain length : ') + fmt % avgchainlen)
2695 ui.write(('avg chain length : ') + fmt % avgchainlen)
2696 ui.write(('max chain length : ') + fmt % maxchainlen)
2696 ui.write(('max chain length : ') + fmt % maxchainlen)
2697 ui.write(('compression ratio : ') + fmt % compratio)
2697 ui.write(('compression ratio : ') + fmt % compratio)
2698
2698
2699 if format > 0:
2699 if format > 0:
2700 ui.write('\n')
2700 ui.write('\n')
2701 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2701 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2702 % tuple(datasize))
2702 % tuple(datasize))
2703 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2703 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2704 % tuple(fullsize))
2704 % tuple(fullsize))
2705 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2705 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2706 % tuple(deltasize))
2706 % tuple(deltasize))
2707
2707
2708 if numdeltas > 0:
2708 if numdeltas > 0:
2709 ui.write('\n')
2709 ui.write('\n')
2710 fmt = pcfmtstr(numdeltas)
2710 fmt = pcfmtstr(numdeltas)
2711 fmt2 = pcfmtstr(numdeltas, 4)
2711 fmt2 = pcfmtstr(numdeltas, 4)
2712 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2712 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2713 if numprev > 0:
2713 if numprev > 0:
2714 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2714 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2715 numprev))
2715 numprev))
2716 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2716 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2717 numprev))
2717 numprev))
2718 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2718 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2719 numprev))
2719 numprev))
2720 if gdelta:
2720 if gdelta:
2721 ui.write(('deltas against p1 : ')
2721 ui.write(('deltas against p1 : ')
2722 + fmt % pcfmt(nump1, numdeltas))
2722 + fmt % pcfmt(nump1, numdeltas))
2723 ui.write(('deltas against p2 : ')
2723 ui.write(('deltas against p2 : ')
2724 + fmt % pcfmt(nump2, numdeltas))
2724 + fmt % pcfmt(nump2, numdeltas))
2725 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2725 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2726 numdeltas))
2726 numdeltas))
2727
2727
2728 @command('debugrevspec',
2728 @command('debugrevspec',
2729 [('', 'optimize', None,
2729 [('', 'optimize', None,
2730 _('print parsed tree after optimizing (DEPRECATED)')),
2730 _('print parsed tree after optimizing (DEPRECATED)')),
2731 ('p', 'show-stage', [],
2731 ('p', 'show-stage', [],
2732 _('print parsed tree at the given stage'), _('NAME')),
2732 _('print parsed tree at the given stage'), _('NAME')),
2733 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2733 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2734 ('', 'verify-optimized', False, _('verify optimized result')),
2734 ('', 'verify-optimized', False, _('verify optimized result')),
2735 ],
2735 ],
2736 ('REVSPEC'))
2736 ('REVSPEC'))
2737 def debugrevspec(ui, repo, expr, **opts):
2737 def debugrevspec(ui, repo, expr, **opts):
2738 """parse and apply a revision specification
2738 """parse and apply a revision specification
2739
2739
2740 Use -p/--show-stage option to print the parsed tree at the given stages.
2740 Use -p/--show-stage option to print the parsed tree at the given stages.
2741 Use -p all to print tree at every stage.
2741 Use -p all to print tree at every stage.
2742
2742
2743 Use --verify-optimized to compare the optimized result with the unoptimized
2743 Use --verify-optimized to compare the optimized result with the unoptimized
2744 one. Returns 1 if the optimized result differs.
2744 one. Returns 1 if the optimized result differs.
2745 """
2745 """
2746 stages = [
2746 stages = [
2747 ('parsed', lambda tree: tree),
2747 ('parsed', lambda tree: tree),
2748 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
2748 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
2749 ('concatenated', revset.foldconcat),
2749 ('concatenated', revset.foldconcat),
2750 ('analyzed', revset.analyze),
2750 ('analyzed', revset.analyze),
2751 ('optimized', revset.optimize),
2751 ('optimized', revset.optimize),
2752 ]
2752 ]
2753 if opts['no_optimized']:
2753 if opts['no_optimized']:
2754 stages = stages[:-1]
2754 stages = stages[:-1]
2755 if opts['verify_optimized'] and opts['no_optimized']:
2755 if opts['verify_optimized'] and opts['no_optimized']:
2756 raise error.Abort(_('cannot use --verify-optimized with '
2756 raise error.Abort(_('cannot use --verify-optimized with '
2757 '--no-optimized'))
2757 '--no-optimized'))
2758 stagenames = set(n for n, f in stages)
2758 stagenames = set(n for n, f in stages)
2759
2759
2760 showalways = set()
2760 showalways = set()
2761 showchanged = set()
2761 showchanged = set()
2762 if ui.verbose and not opts['show_stage']:
2762 if ui.verbose and not opts['show_stage']:
2763 # show parsed tree by --verbose (deprecated)
2763 # show parsed tree by --verbose (deprecated)
2764 showalways.add('parsed')
2764 showalways.add('parsed')
2765 showchanged.update(['expanded', 'concatenated'])
2765 showchanged.update(['expanded', 'concatenated'])
2766 if opts['optimize']:
2766 if opts['optimize']:
2767 showalways.add('optimized')
2767 showalways.add('optimized')
2768 if opts['show_stage'] and opts['optimize']:
2768 if opts['show_stage'] and opts['optimize']:
2769 raise error.Abort(_('cannot use --optimize with --show-stage'))
2769 raise error.Abort(_('cannot use --optimize with --show-stage'))
2770 if opts['show_stage'] == ['all']:
2770 if opts['show_stage'] == ['all']:
2771 showalways.update(stagenames)
2771 showalways.update(stagenames)
2772 else:
2772 else:
2773 for n in opts['show_stage']:
2773 for n in opts['show_stage']:
2774 if n not in stagenames:
2774 if n not in stagenames:
2775 raise error.Abort(_('invalid stage name: %s') % n)
2775 raise error.Abort(_('invalid stage name: %s') % n)
2776 showalways.update(opts['show_stage'])
2776 showalways.update(opts['show_stage'])
2777
2777
2778 treebystage = {}
2778 treebystage = {}
2779 printedtree = None
2779 printedtree = None
2780 tree = revset.parse(expr, lookup=repo.__contains__)
2780 tree = revset.parse(expr, lookup=repo.__contains__)
2781 for n, f in stages:
2781 for n, f in stages:
2782 treebystage[n] = tree = f(tree)
2782 treebystage[n] = tree = f(tree)
2783 if n in showalways or (n in showchanged and tree != printedtree):
2783 if n in showalways or (n in showchanged and tree != printedtree):
2784 if opts['show_stage'] or n != 'parsed':
2784 if opts['show_stage'] or n != 'parsed':
2785 ui.write(("* %s:\n") % n)
2785 ui.write(("* %s:\n") % n)
2786 ui.write(revset.prettyformat(tree), "\n")
2786 ui.write(revset.prettyformat(tree), "\n")
2787 printedtree = tree
2787 printedtree = tree
2788
2788
2789 if opts['verify_optimized']:
2789 if opts['verify_optimized']:
2790 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2790 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2791 brevs = revset.makematcher(treebystage['optimized'])(repo)
2791 brevs = revset.makematcher(treebystage['optimized'])(repo)
2792 if ui.verbose:
2792 if ui.verbose:
2793 ui.note(("* analyzed set:\n"), revset.prettyformatset(arevs), "\n")
2793 ui.note(("* analyzed set:\n"), revset.prettyformatset(arevs), "\n")
2794 ui.note(("* optimized set:\n"), revset.prettyformatset(brevs), "\n")
2794 ui.note(("* optimized set:\n"), revset.prettyformatset(brevs), "\n")
2795 arevs = list(arevs)
2795 arevs = list(arevs)
2796 brevs = list(brevs)
2796 brevs = list(brevs)
2797 if arevs == brevs:
2797 if arevs == brevs:
2798 return 0
2798 return 0
2799 ui.write(('--- analyzed\n'), label='diff.file_a')
2799 ui.write(('--- analyzed\n'), label='diff.file_a')
2800 ui.write(('+++ optimized\n'), label='diff.file_b')
2800 ui.write(('+++ optimized\n'), label='diff.file_b')
2801 sm = difflib.SequenceMatcher(None, arevs, brevs)
2801 sm = difflib.SequenceMatcher(None, arevs, brevs)
2802 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2802 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2803 if tag in ('delete', 'replace'):
2803 if tag in ('delete', 'replace'):
2804 for c in arevs[alo:ahi]:
2804 for c in arevs[alo:ahi]:
2805 ui.write('-%s\n' % c, label='diff.deleted')
2805 ui.write('-%s\n' % c, label='diff.deleted')
2806 if tag in ('insert', 'replace'):
2806 if tag in ('insert', 'replace'):
2807 for c in brevs[blo:bhi]:
2807 for c in brevs[blo:bhi]:
2808 ui.write('+%s\n' % c, label='diff.inserted')
2808 ui.write('+%s\n' % c, label='diff.inserted')
2809 if tag == 'equal':
2809 if tag == 'equal':
2810 for c in arevs[alo:ahi]:
2810 for c in arevs[alo:ahi]:
2811 ui.write(' %s\n' % c)
2811 ui.write(' %s\n' % c)
2812 return 1
2812 return 1
2813
2813
2814 func = revset.makematcher(tree)
2814 func = revset.makematcher(tree)
2815 revs = func(repo)
2815 revs = func(repo)
2816 if ui.verbose:
2816 if ui.verbose:
2817 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
2817 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
2818 for c in revs:
2818 for c in revs:
2819 ui.write("%s\n" % c)
2819 ui.write("%s\n" % c)
2820
2820
2821 @command('debugsetparents', [], _('REV1 [REV2]'))
2821 @command('debugsetparents', [], _('REV1 [REV2]'))
2822 def debugsetparents(ui, repo, rev1, rev2=None):
2822 def debugsetparents(ui, repo, rev1, rev2=None):
2823 """manually set the parents of the current working directory
2823 """manually set the parents of the current working directory
2824
2824
2825 This is useful for writing repository conversion tools, but should
2825 This is useful for writing repository conversion tools, but should
2826 be used with care. For example, neither the working directory nor the
2826 be used with care. For example, neither the working directory nor the
2827 dirstate is updated, so file status may be incorrect after running this
2827 dirstate is updated, so file status may be incorrect after running this
2828 command.
2828 command.
2829
2829
2830 Returns 0 on success.
2830 Returns 0 on success.
2831 """
2831 """
2832
2832
2833 r1 = scmutil.revsingle(repo, rev1).node()
2833 r1 = scmutil.revsingle(repo, rev1).node()
2834 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2834 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2835
2835
2836 with repo.wlock():
2836 with repo.wlock():
2837 repo.setparents(r1, r2)
2837 repo.setparents(r1, r2)
2838
2838
2839 @command('debugdirstate|debugstate',
2839 @command('debugdirstate|debugstate',
2840 [('', 'nodates', None, _('do not display the saved mtime')),
2840 [('', 'nodates', None, _('do not display the saved mtime')),
2841 ('', 'datesort', None, _('sort by saved mtime'))],
2841 ('', 'datesort', None, _('sort by saved mtime'))],
2842 _('[OPTION]...'))
2842 _('[OPTION]...'))
2843 def debugstate(ui, repo, **opts):
2843 def debugstate(ui, repo, **opts):
2844 """show the contents of the current dirstate"""
2844 """show the contents of the current dirstate"""
2845
2845
2846 nodates = opts.get('nodates')
2846 nodates = opts.get('nodates')
2847 datesort = opts.get('datesort')
2847 datesort = opts.get('datesort')
2848
2848
2849 timestr = ""
2849 timestr = ""
2850 if datesort:
2850 if datesort:
2851 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2851 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2852 else:
2852 else:
2853 keyfunc = None # sort by filename
2853 keyfunc = None # sort by filename
2854 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2854 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2855 if ent[3] == -1:
2855 if ent[3] == -1:
2856 timestr = 'unset '
2856 timestr = 'unset '
2857 elif nodates:
2857 elif nodates:
2858 timestr = 'set '
2858 timestr = 'set '
2859 else:
2859 else:
2860 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2860 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2861 time.localtime(ent[3]))
2861 time.localtime(ent[3]))
2862 if ent[1] & 0o20000:
2862 if ent[1] & 0o20000:
2863 mode = 'lnk'
2863 mode = 'lnk'
2864 else:
2864 else:
2865 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
2865 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
2866 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2866 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2867 for f in repo.dirstate.copies():
2867 for f in repo.dirstate.copies():
2868 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2868 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2869
2869
2870 @command('debugsub',
2870 @command('debugsub',
2871 [('r', 'rev', '',
2871 [('r', 'rev', '',
2872 _('revision to check'), _('REV'))],
2872 _('revision to check'), _('REV'))],
2873 _('[-r REV] [REV]'))
2873 _('[-r REV] [REV]'))
2874 def debugsub(ui, repo, rev=None):
2874 def debugsub(ui, repo, rev=None):
2875 ctx = scmutil.revsingle(repo, rev, None)
2875 ctx = scmutil.revsingle(repo, rev, None)
2876 for k, v in sorted(ctx.substate.items()):
2876 for k, v in sorted(ctx.substate.items()):
2877 ui.write(('path %s\n') % k)
2877 ui.write(('path %s\n') % k)
2878 ui.write((' source %s\n') % v[0])
2878 ui.write((' source %s\n') % v[0])
2879 ui.write((' revision %s\n') % v[1])
2879 ui.write((' revision %s\n') % v[1])
2880
2880
2881 @command('debugsuccessorssets',
2881 @command('debugsuccessorssets',
2882 [],
2882 [],
2883 _('[REV]'))
2883 _('[REV]'))
2884 def debugsuccessorssets(ui, repo, *revs):
2884 def debugsuccessorssets(ui, repo, *revs):
2885 """show set of successors for revision
2885 """show set of successors for revision
2886
2886
2887 A successors set of changeset A is a consistent group of revisions that
2887 A successors set of changeset A is a consistent group of revisions that
2888 succeed A. It contains non-obsolete changesets only.
2888 succeed A. It contains non-obsolete changesets only.
2889
2889
2890 In most cases a changeset A has a single successors set containing a single
2890 In most cases a changeset A has a single successors set containing a single
2891 successor (changeset A replaced by A').
2891 successor (changeset A replaced by A').
2892
2892
2893 A changeset that is made obsolete with no successors are called "pruned".
2893 A changeset that is made obsolete with no successors are called "pruned".
2894 Such changesets have no successors sets at all.
2894 Such changesets have no successors sets at all.
2895
2895
2896 A changeset that has been "split" will have a successors set containing
2896 A changeset that has been "split" will have a successors set containing
2897 more than one successor.
2897 more than one successor.
2898
2898
2899 A changeset that has been rewritten in multiple different ways is called
2899 A changeset that has been rewritten in multiple different ways is called
2900 "divergent". Such changesets have multiple successor sets (each of which
2900 "divergent". Such changesets have multiple successor sets (each of which
2901 may also be split, i.e. have multiple successors).
2901 may also be split, i.e. have multiple successors).
2902
2902
2903 Results are displayed as follows::
2903 Results are displayed as follows::
2904
2904
2905 <rev1>
2905 <rev1>
2906 <successors-1A>
2906 <successors-1A>
2907 <rev2>
2907 <rev2>
2908 <successors-2A>
2908 <successors-2A>
2909 <successors-2B1> <successors-2B2> <successors-2B3>
2909 <successors-2B1> <successors-2B2> <successors-2B3>
2910
2910
2911 Here rev2 has two possible (i.e. divergent) successors sets. The first
2911 Here rev2 has two possible (i.e. divergent) successors sets. The first
2912 holds one element, whereas the second holds three (i.e. the changeset has
2912 holds one element, whereas the second holds three (i.e. the changeset has
2913 been split).
2913 been split).
2914 """
2914 """
2915 # passed to successorssets caching computation from one call to another
2915 # passed to successorssets caching computation from one call to another
2916 cache = {}
2916 cache = {}
2917 ctx2str = str
2917 ctx2str = str
2918 node2str = short
2918 node2str = short
2919 if ui.debug():
2919 if ui.debug():
2920 def ctx2str(ctx):
2920 def ctx2str(ctx):
2921 return ctx.hex()
2921 return ctx.hex()
2922 node2str = hex
2922 node2str = hex
2923 for rev in scmutil.revrange(repo, revs):
2923 for rev in scmutil.revrange(repo, revs):
2924 ctx = repo[rev]
2924 ctx = repo[rev]
2925 ui.write('%s\n'% ctx2str(ctx))
2925 ui.write('%s\n'% ctx2str(ctx))
2926 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2926 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2927 if succsset:
2927 if succsset:
2928 ui.write(' ')
2928 ui.write(' ')
2929 ui.write(node2str(succsset[0]))
2929 ui.write(node2str(succsset[0]))
2930 for node in succsset[1:]:
2930 for node in succsset[1:]:
2931 ui.write(' ')
2931 ui.write(' ')
2932 ui.write(node2str(node))
2932 ui.write(node2str(node))
2933 ui.write('\n')
2933 ui.write('\n')
2934
2934
2935 @command('debugtemplate',
2935 @command('debugtemplate',
2936 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2936 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2937 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2937 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2938 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2938 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2939 optionalrepo=True)
2939 optionalrepo=True)
2940 def debugtemplate(ui, repo, tmpl, **opts):
2940 def debugtemplate(ui, repo, tmpl, **opts):
2941 """parse and apply a template
2941 """parse and apply a template
2942
2942
2943 If -r/--rev is given, the template is processed as a log template and
2943 If -r/--rev is given, the template is processed as a log template and
2944 applied to the given changesets. Otherwise, it is processed as a generic
2944 applied to the given changesets. Otherwise, it is processed as a generic
2945 template.
2945 template.
2946
2946
2947 Use --verbose to print the parsed tree.
2947 Use --verbose to print the parsed tree.
2948 """
2948 """
2949 revs = None
2949 revs = None
2950 if opts['rev']:
2950 if opts['rev']:
2951 if repo is None:
2951 if repo is None:
2952 raise error.RepoError(_('there is no Mercurial repository here '
2952 raise error.RepoError(_('there is no Mercurial repository here '
2953 '(.hg not found)'))
2953 '(.hg not found)'))
2954 revs = scmutil.revrange(repo, opts['rev'])
2954 revs = scmutil.revrange(repo, opts['rev'])
2955
2955
2956 props = {}
2956 props = {}
2957 for d in opts['define']:
2957 for d in opts['define']:
2958 try:
2958 try:
2959 k, v = (e.strip() for e in d.split('=', 1))
2959 k, v = (e.strip() for e in d.split('=', 1))
2960 if not k:
2960 if not k:
2961 raise ValueError
2961 raise ValueError
2962 props[k] = v
2962 props[k] = v
2963 except ValueError:
2963 except ValueError:
2964 raise error.Abort(_('malformed keyword definition: %s') % d)
2964 raise error.Abort(_('malformed keyword definition: %s') % d)
2965
2965
2966 if ui.verbose:
2966 if ui.verbose:
2967 aliases = ui.configitems('templatealias')
2967 aliases = ui.configitems('templatealias')
2968 tree = templater.parse(tmpl)
2968 tree = templater.parse(tmpl)
2969 ui.note(templater.prettyformat(tree), '\n')
2969 ui.note(templater.prettyformat(tree), '\n')
2970 newtree = templater.expandaliases(tree, aliases)
2970 newtree = templater.expandaliases(tree, aliases)
2971 if newtree != tree:
2971 if newtree != tree:
2972 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2972 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2973
2973
2974 mapfile = None
2974 mapfile = None
2975 if revs is None:
2975 if revs is None:
2976 k = 'debugtemplate'
2976 k = 'debugtemplate'
2977 t = formatter.maketemplater(ui, k, tmpl)
2977 t = formatter.maketemplater(ui, k, tmpl)
2978 ui.write(templater.stringify(t(k, **props)))
2978 ui.write(templater.stringify(t(k, **props)))
2979 else:
2979 else:
2980 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
2980 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
2981 mapfile, buffered=False)
2981 mapfile, buffered=False)
2982 for r in revs:
2982 for r in revs:
2983 displayer.show(repo[r], **props)
2983 displayer.show(repo[r], **props)
2984 displayer.close()
2984 displayer.close()
2985
2985
2986 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2986 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2987 def debugwalk(ui, repo, *pats, **opts):
2987 def debugwalk(ui, repo, *pats, **opts):
2988 """show how files match on given patterns"""
2988 """show how files match on given patterns"""
2989 m = scmutil.match(repo[None], pats, opts)
2989 m = scmutil.match(repo[None], pats, opts)
2990 items = list(repo.walk(m))
2990 items = list(repo.walk(m))
2991 if not items:
2991 if not items:
2992 return
2992 return
2993 f = lambda fn: fn
2993 f = lambda fn: fn
2994 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
2994 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
2995 f = lambda fn: util.normpath(fn)
2995 f = lambda fn: util.normpath(fn)
2996 fmt = 'f %%-%ds %%-%ds %%s' % (
2996 fmt = 'f %%-%ds %%-%ds %%s' % (
2997 max([len(abs) for abs in items]),
2997 max([len(abs) for abs in items]),
2998 max([len(m.rel(abs)) for abs in items]))
2998 max([len(m.rel(abs)) for abs in items]))
2999 for abs in items:
2999 for abs in items:
3000 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3000 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3001 ui.write("%s\n" % line.rstrip())
3001 ui.write("%s\n" % line.rstrip())
3002
3002
3003 @command('debugwireargs',
3003 @command('debugwireargs',
3004 [('', 'three', '', 'three'),
3004 [('', 'three', '', 'three'),
3005 ('', 'four', '', 'four'),
3005 ('', 'four', '', 'four'),
3006 ('', 'five', '', 'five'),
3006 ('', 'five', '', 'five'),
3007 ] + remoteopts,
3007 ] + remoteopts,
3008 _('REPO [OPTIONS]... [ONE [TWO]]'),
3008 _('REPO [OPTIONS]... [ONE [TWO]]'),
3009 norepo=True)
3009 norepo=True)
3010 def debugwireargs(ui, repopath, *vals, **opts):
3010 def debugwireargs(ui, repopath, *vals, **opts):
3011 repo = hg.peer(ui, opts, repopath)
3011 repo = hg.peer(ui, opts, repopath)
3012 for opt in remoteopts:
3012 for opt in remoteopts:
3013 del opts[opt[1]]
3013 del opts[opt[1]]
3014 args = {}
3014 args = {}
3015 for k, v in opts.iteritems():
3015 for k, v in opts.iteritems():
3016 if v:
3016 if v:
3017 args[k] = v
3017 args[k] = v
3018 # run twice to check that we don't mess up the stream for the next command
3018 # run twice to check that we don't mess up the stream for the next command
3019 res1 = repo.debugwireargs(*vals, **args)
3019 res1 = repo.debugwireargs(*vals, **args)
3020 res2 = repo.debugwireargs(*vals, **args)
3020 res2 = repo.debugwireargs(*vals, **args)
3021 ui.write("%s\n" % res1)
3021 ui.write("%s\n" % res1)
3022 if res1 != res2:
3022 if res1 != res2:
3023 ui.warn("%s\n" % res2)
3023 ui.warn("%s\n" % res2)
3024
3024
3025 @command('^diff',
3025 @command('^diff',
3026 [('r', 'rev', [], _('revision'), _('REV')),
3026 [('r', 'rev', [], _('revision'), _('REV')),
3027 ('c', 'change', '', _('change made by revision'), _('REV'))
3027 ('c', 'change', '', _('change made by revision'), _('REV'))
3028 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3028 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3029 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3029 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3030 inferrepo=True)
3030 inferrepo=True)
3031 def diff(ui, repo, *pats, **opts):
3031 def diff(ui, repo, *pats, **opts):
3032 """diff repository (or selected files)
3032 """diff repository (or selected files)
3033
3033
3034 Show differences between revisions for the specified files.
3034 Show differences between revisions for the specified files.
3035
3035
3036 Differences between files are shown using the unified diff format.
3036 Differences between files are shown using the unified diff format.
3037
3037
3038 .. note::
3038 .. note::
3039
3039
3040 :hg:`diff` may generate unexpected results for merges, as it will
3040 :hg:`diff` may generate unexpected results for merges, as it will
3041 default to comparing against the working directory's first
3041 default to comparing against the working directory's first
3042 parent changeset if no revisions are specified.
3042 parent changeset if no revisions are specified.
3043
3043
3044 When two revision arguments are given, then changes are shown
3044 When two revision arguments are given, then changes are shown
3045 between those revisions. If only one revision is specified then
3045 between those revisions. If only one revision is specified then
3046 that revision is compared to the working directory, and, when no
3046 that revision is compared to the working directory, and, when no
3047 revisions are specified, the working directory files are compared
3047 revisions are specified, the working directory files are compared
3048 to its first parent.
3048 to its first parent.
3049
3049
3050 Alternatively you can specify -c/--change with a revision to see
3050 Alternatively you can specify -c/--change with a revision to see
3051 the changes in that changeset relative to its first parent.
3051 the changes in that changeset relative to its first parent.
3052
3052
3053 Without the -a/--text option, diff will avoid generating diffs of
3053 Without the -a/--text option, diff will avoid generating diffs of
3054 files it detects as binary. With -a, diff will generate a diff
3054 files it detects as binary. With -a, diff will generate a diff
3055 anyway, probably with undesirable results.
3055 anyway, probably with undesirable results.
3056
3056
3057 Use the -g/--git option to generate diffs in the git extended diff
3057 Use the -g/--git option to generate diffs in the git extended diff
3058 format. For more information, read :hg:`help diffs`.
3058 format. For more information, read :hg:`help diffs`.
3059
3059
3060 .. container:: verbose
3060 .. container:: verbose
3061
3061
3062 Examples:
3062 Examples:
3063
3063
3064 - compare a file in the current working directory to its parent::
3064 - compare a file in the current working directory to its parent::
3065
3065
3066 hg diff foo.c
3066 hg diff foo.c
3067
3067
3068 - compare two historical versions of a directory, with rename info::
3068 - compare two historical versions of a directory, with rename info::
3069
3069
3070 hg diff --git -r 1.0:1.2 lib/
3070 hg diff --git -r 1.0:1.2 lib/
3071
3071
3072 - get change stats relative to the last change on some date::
3072 - get change stats relative to the last change on some date::
3073
3073
3074 hg diff --stat -r "date('may 2')"
3074 hg diff --stat -r "date('may 2')"
3075
3075
3076 - diff all newly-added files that contain a keyword::
3076 - diff all newly-added files that contain a keyword::
3077
3077
3078 hg diff "set:added() and grep(GNU)"
3078 hg diff "set:added() and grep(GNU)"
3079
3079
3080 - compare a revision and its parents::
3080 - compare a revision and its parents::
3081
3081
3082 hg diff -c 9353 # compare against first parent
3082 hg diff -c 9353 # compare against first parent
3083 hg diff -r 9353^:9353 # same using revset syntax
3083 hg diff -r 9353^:9353 # same using revset syntax
3084 hg diff -r 9353^2:9353 # compare against the second parent
3084 hg diff -r 9353^2:9353 # compare against the second parent
3085
3085
3086 Returns 0 on success.
3086 Returns 0 on success.
3087 """
3087 """
3088
3088
3089 revs = opts.get('rev')
3089 revs = opts.get('rev')
3090 change = opts.get('change')
3090 change = opts.get('change')
3091 stat = opts.get('stat')
3091 stat = opts.get('stat')
3092 reverse = opts.get('reverse')
3092 reverse = opts.get('reverse')
3093
3093
3094 if revs and change:
3094 if revs and change:
3095 msg = _('cannot specify --rev and --change at the same time')
3095 msg = _('cannot specify --rev and --change at the same time')
3096 raise error.Abort(msg)
3096 raise error.Abort(msg)
3097 elif change:
3097 elif change:
3098 node2 = scmutil.revsingle(repo, change, None).node()
3098 node2 = scmutil.revsingle(repo, change, None).node()
3099 node1 = repo[node2].p1().node()
3099 node1 = repo[node2].p1().node()
3100 else:
3100 else:
3101 node1, node2 = scmutil.revpair(repo, revs)
3101 node1, node2 = scmutil.revpair(repo, revs)
3102
3102
3103 if reverse:
3103 if reverse:
3104 node1, node2 = node2, node1
3104 node1, node2 = node2, node1
3105
3105
3106 diffopts = patch.diffallopts(ui, opts)
3106 diffopts = patch.diffallopts(ui, opts)
3107 m = scmutil.match(repo[node2], pats, opts)
3107 m = scmutil.match(repo[node2], pats, opts)
3108 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3108 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3109 listsubrepos=opts.get('subrepos'),
3109 listsubrepos=opts.get('subrepos'),
3110 root=opts.get('root'))
3110 root=opts.get('root'))
3111
3111
3112 @command('^export',
3112 @command('^export',
3113 [('o', 'output', '',
3113 [('o', 'output', '',
3114 _('print output to file with formatted name'), _('FORMAT')),
3114 _('print output to file with formatted name'), _('FORMAT')),
3115 ('', 'switch-parent', None, _('diff against the second parent')),
3115 ('', 'switch-parent', None, _('diff against the second parent')),
3116 ('r', 'rev', [], _('revisions to export'), _('REV')),
3116 ('r', 'rev', [], _('revisions to export'), _('REV')),
3117 ] + diffopts,
3117 ] + diffopts,
3118 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3118 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3119 def export(ui, repo, *changesets, **opts):
3119 def export(ui, repo, *changesets, **opts):
3120 """dump the header and diffs for one or more changesets
3120 """dump the header and diffs for one or more changesets
3121
3121
3122 Print the changeset header and diffs for one or more revisions.
3122 Print the changeset header and diffs for one or more revisions.
3123 If no revision is given, the parent of the working directory is used.
3123 If no revision is given, the parent of the working directory is used.
3124
3124
3125 The information shown in the changeset header is: author, date,
3125 The information shown in the changeset header is: author, date,
3126 branch name (if non-default), changeset hash, parent(s) and commit
3126 branch name (if non-default), changeset hash, parent(s) and commit
3127 comment.
3127 comment.
3128
3128
3129 .. note::
3129 .. note::
3130
3130
3131 :hg:`export` may generate unexpected diff output for merge
3131 :hg:`export` may generate unexpected diff output for merge
3132 changesets, as it will compare the merge changeset against its
3132 changesets, as it will compare the merge changeset against its
3133 first parent only.
3133 first parent only.
3134
3134
3135 Output may be to a file, in which case the name of the file is
3135 Output may be to a file, in which case the name of the file is
3136 given using a format string. The formatting rules are as follows:
3136 given using a format string. The formatting rules are as follows:
3137
3137
3138 :``%%``: literal "%" character
3138 :``%%``: literal "%" character
3139 :``%H``: changeset hash (40 hexadecimal digits)
3139 :``%H``: changeset hash (40 hexadecimal digits)
3140 :``%N``: number of patches being generated
3140 :``%N``: number of patches being generated
3141 :``%R``: changeset revision number
3141 :``%R``: changeset revision number
3142 :``%b``: basename of the exporting repository
3142 :``%b``: basename of the exporting repository
3143 :``%h``: short-form changeset hash (12 hexadecimal digits)
3143 :``%h``: short-form changeset hash (12 hexadecimal digits)
3144 :``%m``: first line of the commit message (only alphanumeric characters)
3144 :``%m``: first line of the commit message (only alphanumeric characters)
3145 :``%n``: zero-padded sequence number, starting at 1
3145 :``%n``: zero-padded sequence number, starting at 1
3146 :``%r``: zero-padded changeset revision number
3146 :``%r``: zero-padded changeset revision number
3147
3147
3148 Without the -a/--text option, export will avoid generating diffs
3148 Without the -a/--text option, export will avoid generating diffs
3149 of files it detects as binary. With -a, export will generate a
3149 of files it detects as binary. With -a, export will generate a
3150 diff anyway, probably with undesirable results.
3150 diff anyway, probably with undesirable results.
3151
3151
3152 Use the -g/--git option to generate diffs in the git extended diff
3152 Use the -g/--git option to generate diffs in the git extended diff
3153 format. See :hg:`help diffs` for more information.
3153 format. See :hg:`help diffs` for more information.
3154
3154
3155 With the --switch-parent option, the diff will be against the
3155 With the --switch-parent option, the diff will be against the
3156 second parent. It can be useful to review a merge.
3156 second parent. It can be useful to review a merge.
3157
3157
3158 .. container:: verbose
3158 .. container:: verbose
3159
3159
3160 Examples:
3160 Examples:
3161
3161
3162 - use export and import to transplant a bugfix to the current
3162 - use export and import to transplant a bugfix to the current
3163 branch::
3163 branch::
3164
3164
3165 hg export -r 9353 | hg import -
3165 hg export -r 9353 | hg import -
3166
3166
3167 - export all the changesets between two revisions to a file with
3167 - export all the changesets between two revisions to a file with
3168 rename information::
3168 rename information::
3169
3169
3170 hg export --git -r 123:150 > changes.txt
3170 hg export --git -r 123:150 > changes.txt
3171
3171
3172 - split outgoing changes into a series of patches with
3172 - split outgoing changes into a series of patches with
3173 descriptive names::
3173 descriptive names::
3174
3174
3175 hg export -r "outgoing()" -o "%n-%m.patch"
3175 hg export -r "outgoing()" -o "%n-%m.patch"
3176
3176
3177 Returns 0 on success.
3177 Returns 0 on success.
3178 """
3178 """
3179 changesets += tuple(opts.get('rev', []))
3179 changesets += tuple(opts.get('rev', []))
3180 if not changesets:
3180 if not changesets:
3181 changesets = ['.']
3181 changesets = ['.']
3182 revs = scmutil.revrange(repo, changesets)
3182 revs = scmutil.revrange(repo, changesets)
3183 if not revs:
3183 if not revs:
3184 raise error.Abort(_("export requires at least one changeset"))
3184 raise error.Abort(_("export requires at least one changeset"))
3185 if len(revs) > 1:
3185 if len(revs) > 1:
3186 ui.note(_('exporting patches:\n'))
3186 ui.note(_('exporting patches:\n'))
3187 else:
3187 else:
3188 ui.note(_('exporting patch:\n'))
3188 ui.note(_('exporting patch:\n'))
3189 cmdutil.export(repo, revs, template=opts.get('output'),
3189 cmdutil.export(repo, revs, template=opts.get('output'),
3190 switch_parent=opts.get('switch_parent'),
3190 switch_parent=opts.get('switch_parent'),
3191 opts=patch.diffallopts(ui, opts))
3191 opts=patch.diffallopts(ui, opts))
3192
3192
3193 @command('files',
3193 @command('files',
3194 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3194 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3195 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3195 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3196 ] + walkopts + formatteropts + subrepoopts,
3196 ] + walkopts + formatteropts + subrepoopts,
3197 _('[OPTION]... [FILE]...'))
3197 _('[OPTION]... [FILE]...'))
3198 def files(ui, repo, *pats, **opts):
3198 def files(ui, repo, *pats, **opts):
3199 """list tracked files
3199 """list tracked files
3200
3200
3201 Print files under Mercurial control in the working directory or
3201 Print files under Mercurial control in the working directory or
3202 specified revision for given files (excluding removed files).
3202 specified revision for given files (excluding removed files).
3203 Files can be specified as filenames or filesets.
3203 Files can be specified as filenames or filesets.
3204
3204
3205 If no files are given to match, this command prints the names
3205 If no files are given to match, this command prints the names
3206 of all files under Mercurial control.
3206 of all files under Mercurial control.
3207
3207
3208 .. container:: verbose
3208 .. container:: verbose
3209
3209
3210 Examples:
3210 Examples:
3211
3211
3212 - list all files under the current directory::
3212 - list all files under the current directory::
3213
3213
3214 hg files .
3214 hg files .
3215
3215
3216 - shows sizes and flags for current revision::
3216 - shows sizes and flags for current revision::
3217
3217
3218 hg files -vr .
3218 hg files -vr .
3219
3219
3220 - list all files named README::
3220 - list all files named README::
3221
3221
3222 hg files -I "**/README"
3222 hg files -I "**/README"
3223
3223
3224 - list all binary files::
3224 - list all binary files::
3225
3225
3226 hg files "set:binary()"
3226 hg files "set:binary()"
3227
3227
3228 - find files containing a regular expression::
3228 - find files containing a regular expression::
3229
3229
3230 hg files "set:grep('bob')"
3230 hg files "set:grep('bob')"
3231
3231
3232 - search tracked file contents with xargs and grep::
3232 - search tracked file contents with xargs and grep::
3233
3233
3234 hg files -0 | xargs -0 grep foo
3234 hg files -0 | xargs -0 grep foo
3235
3235
3236 See :hg:`help patterns` and :hg:`help filesets` for more information
3236 See :hg:`help patterns` and :hg:`help filesets` for more information
3237 on specifying file patterns.
3237 on specifying file patterns.
3238
3238
3239 Returns 0 if a match is found, 1 otherwise.
3239 Returns 0 if a match is found, 1 otherwise.
3240
3240
3241 """
3241 """
3242 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3242 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3243
3243
3244 end = '\n'
3244 end = '\n'
3245 if opts.get('print0'):
3245 if opts.get('print0'):
3246 end = '\0'
3246 end = '\0'
3247 fmt = '%s' + end
3247 fmt = '%s' + end
3248
3248
3249 m = scmutil.match(ctx, pats, opts)
3249 m = scmutil.match(ctx, pats, opts)
3250 with ui.formatter('files', opts) as fm:
3250 with ui.formatter('files', opts) as fm:
3251 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3251 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3252
3252
3253 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3253 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3254 def forget(ui, repo, *pats, **opts):
3254 def forget(ui, repo, *pats, **opts):
3255 """forget the specified files on the next commit
3255 """forget the specified files on the next commit
3256
3256
3257 Mark the specified files so they will no longer be tracked
3257 Mark the specified files so they will no longer be tracked
3258 after the next commit.
3258 after the next commit.
3259
3259
3260 This only removes files from the current branch, not from the
3260 This only removes files from the current branch, not from the
3261 entire project history, and it does not delete them from the
3261 entire project history, and it does not delete them from the
3262 working directory.
3262 working directory.
3263
3263
3264 To delete the file from the working directory, see :hg:`remove`.
3264 To delete the file from the working directory, see :hg:`remove`.
3265
3265
3266 To undo a forget before the next commit, see :hg:`add`.
3266 To undo a forget before the next commit, see :hg:`add`.
3267
3267
3268 .. container:: verbose
3268 .. container:: verbose
3269
3269
3270 Examples:
3270 Examples:
3271
3271
3272 - forget newly-added binary files::
3272 - forget newly-added binary files::
3273
3273
3274 hg forget "set:added() and binary()"
3274 hg forget "set:added() and binary()"
3275
3275
3276 - forget files that would be excluded by .hgignore::
3276 - forget files that would be excluded by .hgignore::
3277
3277
3278 hg forget "set:hgignore()"
3278 hg forget "set:hgignore()"
3279
3279
3280 Returns 0 on success.
3280 Returns 0 on success.
3281 """
3281 """
3282
3282
3283 if not pats:
3283 if not pats:
3284 raise error.Abort(_('no files specified'))
3284 raise error.Abort(_('no files specified'))
3285
3285
3286 m = scmutil.match(repo[None], pats, opts)
3286 m = scmutil.match(repo[None], pats, opts)
3287 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3287 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3288 return rejected and 1 or 0
3288 return rejected and 1 or 0
3289
3289
3290 @command(
3290 @command(
3291 'graft',
3291 'graft',
3292 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3292 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3293 ('c', 'continue', False, _('resume interrupted graft')),
3293 ('c', 'continue', False, _('resume interrupted graft')),
3294 ('e', 'edit', False, _('invoke editor on commit messages')),
3294 ('e', 'edit', False, _('invoke editor on commit messages')),
3295 ('', 'log', None, _('append graft info to log message')),
3295 ('', 'log', None, _('append graft info to log message')),
3296 ('f', 'force', False, _('force graft')),
3296 ('f', 'force', False, _('force graft')),
3297 ('D', 'currentdate', False,
3297 ('D', 'currentdate', False,
3298 _('record the current date as commit date')),
3298 _('record the current date as commit date')),
3299 ('U', 'currentuser', False,
3299 ('U', 'currentuser', False,
3300 _('record the current user as committer'), _('DATE'))]
3300 _('record the current user as committer'), _('DATE'))]
3301 + commitopts2 + mergetoolopts + dryrunopts,
3301 + commitopts2 + mergetoolopts + dryrunopts,
3302 _('[OPTION]... [-r REV]... REV...'))
3302 _('[OPTION]... [-r REV]... REV...'))
3303 def graft(ui, repo, *revs, **opts):
3303 def graft(ui, repo, *revs, **opts):
3304 '''copy changes from other branches onto the current branch
3304 '''copy changes from other branches onto the current branch
3305
3305
3306 This command uses Mercurial's merge logic to copy individual
3306 This command uses Mercurial's merge logic to copy individual
3307 changes from other branches without merging branches in the
3307 changes from other branches without merging branches in the
3308 history graph. This is sometimes known as 'backporting' or
3308 history graph. This is sometimes known as 'backporting' or
3309 'cherry-picking'. By default, graft will copy user, date, and
3309 'cherry-picking'. By default, graft will copy user, date, and
3310 description from the source changesets.
3310 description from the source changesets.
3311
3311
3312 Changesets that are ancestors of the current revision, that have
3312 Changesets that are ancestors of the current revision, that have
3313 already been grafted, or that are merges will be skipped.
3313 already been grafted, or that are merges will be skipped.
3314
3314
3315 If --log is specified, log messages will have a comment appended
3315 If --log is specified, log messages will have a comment appended
3316 of the form::
3316 of the form::
3317
3317
3318 (grafted from CHANGESETHASH)
3318 (grafted from CHANGESETHASH)
3319
3319
3320 If --force is specified, revisions will be grafted even if they
3320 If --force is specified, revisions will be grafted even if they
3321 are already ancestors of or have been grafted to the destination.
3321 are already ancestors of or have been grafted to the destination.
3322 This is useful when the revisions have since been backed out.
3322 This is useful when the revisions have since been backed out.
3323
3323
3324 If a graft merge results in conflicts, the graft process is
3324 If a graft merge results in conflicts, the graft process is
3325 interrupted so that the current merge can be manually resolved.
3325 interrupted so that the current merge can be manually resolved.
3326 Once all conflicts are addressed, the graft process can be
3326 Once all conflicts are addressed, the graft process can be
3327 continued with the -c/--continue option.
3327 continued with the -c/--continue option.
3328
3328
3329 .. note::
3329 .. note::
3330
3330
3331 The -c/--continue option does not reapply earlier options, except
3331 The -c/--continue option does not reapply earlier options, except
3332 for --force.
3332 for --force.
3333
3333
3334 .. container:: verbose
3334 .. container:: verbose
3335
3335
3336 Examples:
3336 Examples:
3337
3337
3338 - copy a single change to the stable branch and edit its description::
3338 - copy a single change to the stable branch and edit its description::
3339
3339
3340 hg update stable
3340 hg update stable
3341 hg graft --edit 9393
3341 hg graft --edit 9393
3342
3342
3343 - graft a range of changesets with one exception, updating dates::
3343 - graft a range of changesets with one exception, updating dates::
3344
3344
3345 hg graft -D "2085::2093 and not 2091"
3345 hg graft -D "2085::2093 and not 2091"
3346
3346
3347 - continue a graft after resolving conflicts::
3347 - continue a graft after resolving conflicts::
3348
3348
3349 hg graft -c
3349 hg graft -c
3350
3350
3351 - show the source of a grafted changeset::
3351 - show the source of a grafted changeset::
3352
3352
3353 hg log --debug -r .
3353 hg log --debug -r .
3354
3354
3355 - show revisions sorted by date::
3355 - show revisions sorted by date::
3356
3356
3357 hg log -r "sort(all(), date)"
3357 hg log -r "sort(all(), date)"
3358
3358
3359 See :hg:`help revisions` and :hg:`help revsets` for more about
3359 See :hg:`help revisions` and :hg:`help revsets` for more about
3360 specifying revisions.
3360 specifying revisions.
3361
3361
3362 Returns 0 on successful completion.
3362 Returns 0 on successful completion.
3363 '''
3363 '''
3364 with repo.wlock():
3364 with repo.wlock():
3365 return _dograft(ui, repo, *revs, **opts)
3365 return _dograft(ui, repo, *revs, **opts)
3366
3366
3367 def _dograft(ui, repo, *revs, **opts):
3367 def _dograft(ui, repo, *revs, **opts):
3368 if revs and opts.get('rev'):
3368 if revs and opts.get('rev'):
3369 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3369 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3370 'revision ordering!\n'))
3370 'revision ordering!\n'))
3371
3371
3372 revs = list(revs)
3372 revs = list(revs)
3373 revs.extend(opts.get('rev'))
3373 revs.extend(opts.get('rev'))
3374
3374
3375 if not opts.get('user') and opts.get('currentuser'):
3375 if not opts.get('user') and opts.get('currentuser'):
3376 opts['user'] = ui.username()
3376 opts['user'] = ui.username()
3377 if not opts.get('date') and opts.get('currentdate'):
3377 if not opts.get('date') and opts.get('currentdate'):
3378 opts['date'] = "%d %d" % util.makedate()
3378 opts['date'] = "%d %d" % util.makedate()
3379
3379
3380 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3380 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3381
3381
3382 cont = False
3382 cont = False
3383 if opts.get('continue'):
3383 if opts.get('continue'):
3384 cont = True
3384 cont = True
3385 if revs:
3385 if revs:
3386 raise error.Abort(_("can't specify --continue and revisions"))
3386 raise error.Abort(_("can't specify --continue and revisions"))
3387 # read in unfinished revisions
3387 # read in unfinished revisions
3388 try:
3388 try:
3389 nodes = repo.vfs.read('graftstate').splitlines()
3389 nodes = repo.vfs.read('graftstate').splitlines()
3390 revs = [repo[node].rev() for node in nodes]
3390 revs = [repo[node].rev() for node in nodes]
3391 except IOError as inst:
3391 except IOError as inst:
3392 if inst.errno != errno.ENOENT:
3392 if inst.errno != errno.ENOENT:
3393 raise
3393 raise
3394 cmdutil.wrongtooltocontinue(repo, _('graft'))
3394 cmdutil.wrongtooltocontinue(repo, _('graft'))
3395 else:
3395 else:
3396 cmdutil.checkunfinished(repo)
3396 cmdutil.checkunfinished(repo)
3397 cmdutil.bailifchanged(repo)
3397 cmdutil.bailifchanged(repo)
3398 if not revs:
3398 if not revs:
3399 raise error.Abort(_('no revisions specified'))
3399 raise error.Abort(_('no revisions specified'))
3400 revs = scmutil.revrange(repo, revs)
3400 revs = scmutil.revrange(repo, revs)
3401
3401
3402 skipped = set()
3402 skipped = set()
3403 # check for merges
3403 # check for merges
3404 for rev in repo.revs('%ld and merge()', revs):
3404 for rev in repo.revs('%ld and merge()', revs):
3405 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3405 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3406 skipped.add(rev)
3406 skipped.add(rev)
3407 revs = [r for r in revs if r not in skipped]
3407 revs = [r for r in revs if r not in skipped]
3408 if not revs:
3408 if not revs:
3409 return -1
3409 return -1
3410
3410
3411 # Don't check in the --continue case, in effect retaining --force across
3411 # Don't check in the --continue case, in effect retaining --force across
3412 # --continues. That's because without --force, any revisions we decided to
3412 # --continues. That's because without --force, any revisions we decided to
3413 # skip would have been filtered out here, so they wouldn't have made their
3413 # skip would have been filtered out here, so they wouldn't have made their
3414 # way to the graftstate. With --force, any revisions we would have otherwise
3414 # way to the graftstate. With --force, any revisions we would have otherwise
3415 # skipped would not have been filtered out, and if they hadn't been applied
3415 # skipped would not have been filtered out, and if they hadn't been applied
3416 # already, they'd have been in the graftstate.
3416 # already, they'd have been in the graftstate.
3417 if not (cont or opts.get('force')):
3417 if not (cont or opts.get('force')):
3418 # check for ancestors of dest branch
3418 # check for ancestors of dest branch
3419 crev = repo['.'].rev()
3419 crev = repo['.'].rev()
3420 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3420 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3421 # XXX make this lazy in the future
3421 # XXX make this lazy in the future
3422 # don't mutate while iterating, create a copy
3422 # don't mutate while iterating, create a copy
3423 for rev in list(revs):
3423 for rev in list(revs):
3424 if rev in ancestors:
3424 if rev in ancestors:
3425 ui.warn(_('skipping ancestor revision %d:%s\n') %
3425 ui.warn(_('skipping ancestor revision %d:%s\n') %
3426 (rev, repo[rev]))
3426 (rev, repo[rev]))
3427 # XXX remove on list is slow
3427 # XXX remove on list is slow
3428 revs.remove(rev)
3428 revs.remove(rev)
3429 if not revs:
3429 if not revs:
3430 return -1
3430 return -1
3431
3431
3432 # analyze revs for earlier grafts
3432 # analyze revs for earlier grafts
3433 ids = {}
3433 ids = {}
3434 for ctx in repo.set("%ld", revs):
3434 for ctx in repo.set("%ld", revs):
3435 ids[ctx.hex()] = ctx.rev()
3435 ids[ctx.hex()] = ctx.rev()
3436 n = ctx.extra().get('source')
3436 n = ctx.extra().get('source')
3437 if n:
3437 if n:
3438 ids[n] = ctx.rev()
3438 ids[n] = ctx.rev()
3439
3439
3440 # check ancestors for earlier grafts
3440 # check ancestors for earlier grafts
3441 ui.debug('scanning for duplicate grafts\n')
3441 ui.debug('scanning for duplicate grafts\n')
3442
3442
3443 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3443 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3444 ctx = repo[rev]
3444 ctx = repo[rev]
3445 n = ctx.extra().get('source')
3445 n = ctx.extra().get('source')
3446 if n in ids:
3446 if n in ids:
3447 try:
3447 try:
3448 r = repo[n].rev()
3448 r = repo[n].rev()
3449 except error.RepoLookupError:
3449 except error.RepoLookupError:
3450 r = None
3450 r = None
3451 if r in revs:
3451 if r in revs:
3452 ui.warn(_('skipping revision %d:%s '
3452 ui.warn(_('skipping revision %d:%s '
3453 '(already grafted to %d:%s)\n')
3453 '(already grafted to %d:%s)\n')
3454 % (r, repo[r], rev, ctx))
3454 % (r, repo[r], rev, ctx))
3455 revs.remove(r)
3455 revs.remove(r)
3456 elif ids[n] in revs:
3456 elif ids[n] in revs:
3457 if r is None:
3457 if r is None:
3458 ui.warn(_('skipping already grafted revision %d:%s '
3458 ui.warn(_('skipping already grafted revision %d:%s '
3459 '(%d:%s also has unknown origin %s)\n')
3459 '(%d:%s also has unknown origin %s)\n')
3460 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3460 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3461 else:
3461 else:
3462 ui.warn(_('skipping already grafted revision %d:%s '
3462 ui.warn(_('skipping already grafted revision %d:%s '
3463 '(%d:%s also has origin %d:%s)\n')
3463 '(%d:%s also has origin %d:%s)\n')
3464 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3464 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3465 revs.remove(ids[n])
3465 revs.remove(ids[n])
3466 elif ctx.hex() in ids:
3466 elif ctx.hex() in ids:
3467 r = ids[ctx.hex()]
3467 r = ids[ctx.hex()]
3468 ui.warn(_('skipping already grafted revision %d:%s '
3468 ui.warn(_('skipping already grafted revision %d:%s '
3469 '(was grafted from %d:%s)\n') %
3469 '(was grafted from %d:%s)\n') %
3470 (r, repo[r], rev, ctx))
3470 (r, repo[r], rev, ctx))
3471 revs.remove(r)
3471 revs.remove(r)
3472 if not revs:
3472 if not revs:
3473 return -1
3473 return -1
3474
3474
3475 for pos, ctx in enumerate(repo.set("%ld", revs)):
3475 for pos, ctx in enumerate(repo.set("%ld", revs)):
3476 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3476 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3477 ctx.description().split('\n', 1)[0])
3477 ctx.description().split('\n', 1)[0])
3478 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3478 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3479 if names:
3479 if names:
3480 desc += ' (%s)' % ' '.join(names)
3480 desc += ' (%s)' % ' '.join(names)
3481 ui.status(_('grafting %s\n') % desc)
3481 ui.status(_('grafting %s\n') % desc)
3482 if opts.get('dry_run'):
3482 if opts.get('dry_run'):
3483 continue
3483 continue
3484
3484
3485 source = ctx.extra().get('source')
3485 source = ctx.extra().get('source')
3486 extra = {}
3486 extra = {}
3487 if source:
3487 if source:
3488 extra['source'] = source
3488 extra['source'] = source
3489 extra['intermediate-source'] = ctx.hex()
3489 extra['intermediate-source'] = ctx.hex()
3490 else:
3490 else:
3491 extra['source'] = ctx.hex()
3491 extra['source'] = ctx.hex()
3492 user = ctx.user()
3492 user = ctx.user()
3493 if opts.get('user'):
3493 if opts.get('user'):
3494 user = opts['user']
3494 user = opts['user']
3495 date = ctx.date()
3495 date = ctx.date()
3496 if opts.get('date'):
3496 if opts.get('date'):
3497 date = opts['date']
3497 date = opts['date']
3498 message = ctx.description()
3498 message = ctx.description()
3499 if opts.get('log'):
3499 if opts.get('log'):
3500 message += '\n(grafted from %s)' % ctx.hex()
3500 message += '\n(grafted from %s)' % ctx.hex()
3501
3501
3502 # we don't merge the first commit when continuing
3502 # we don't merge the first commit when continuing
3503 if not cont:
3503 if not cont:
3504 # perform the graft merge with p1(rev) as 'ancestor'
3504 # perform the graft merge with p1(rev) as 'ancestor'
3505 try:
3505 try:
3506 # ui.forcemerge is an internal variable, do not document
3506 # ui.forcemerge is an internal variable, do not document
3507 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3507 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3508 'graft')
3508 'graft')
3509 stats = mergemod.graft(repo, ctx, ctx.p1(),
3509 stats = mergemod.graft(repo, ctx, ctx.p1(),
3510 ['local', 'graft'])
3510 ['local', 'graft'])
3511 finally:
3511 finally:
3512 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3512 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3513 # report any conflicts
3513 # report any conflicts
3514 if stats and stats[3] > 0:
3514 if stats and stats[3] > 0:
3515 # write out state for --continue
3515 # write out state for --continue
3516 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3516 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3517 repo.vfs.write('graftstate', ''.join(nodelines))
3517 repo.vfs.write('graftstate', ''.join(nodelines))
3518 extra = ''
3518 extra = ''
3519 if opts.get('user'):
3519 if opts.get('user'):
3520 extra += ' --user %s' % util.shellquote(opts['user'])
3520 extra += ' --user %s' % util.shellquote(opts['user'])
3521 if opts.get('date'):
3521 if opts.get('date'):
3522 extra += ' --date %s' % util.shellquote(opts['date'])
3522 extra += ' --date %s' % util.shellquote(opts['date'])
3523 if opts.get('log'):
3523 if opts.get('log'):
3524 extra += ' --log'
3524 extra += ' --log'
3525 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
3525 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
3526 raise error.Abort(
3526 raise error.Abort(
3527 _("unresolved conflicts, can't continue"),
3527 _("unresolved conflicts, can't continue"),
3528 hint=hint)
3528 hint=hint)
3529 else:
3529 else:
3530 cont = False
3530 cont = False
3531
3531
3532 # commit
3532 # commit
3533 node = repo.commit(text=message, user=user,
3533 node = repo.commit(text=message, user=user,
3534 date=date, extra=extra, editor=editor)
3534 date=date, extra=extra, editor=editor)
3535 if node is None:
3535 if node is None:
3536 ui.warn(
3536 ui.warn(
3537 _('note: graft of %d:%s created no changes to commit\n') %
3537 _('note: graft of %d:%s created no changes to commit\n') %
3538 (ctx.rev(), ctx))
3538 (ctx.rev(), ctx))
3539
3539
3540 # remove state when we complete successfully
3540 # remove state when we complete successfully
3541 if not opts.get('dry_run'):
3541 if not opts.get('dry_run'):
3542 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3542 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3543
3543
3544 return 0
3544 return 0
3545
3545
3546 @command('grep',
3546 @command('grep',
3547 [('0', 'print0', None, _('end fields with NUL')),
3547 [('0', 'print0', None, _('end fields with NUL')),
3548 ('', 'all', None, _('print all revisions that match')),
3548 ('', 'all', None, _('print all revisions that match')),
3549 ('a', 'text', None, _('treat all files as text')),
3549 ('a', 'text', None, _('treat all files as text')),
3550 ('f', 'follow', None,
3550 ('f', 'follow', None,
3551 _('follow changeset history,'
3551 _('follow changeset history,'
3552 ' or file history across copies and renames')),
3552 ' or file history across copies and renames')),
3553 ('i', 'ignore-case', None, _('ignore case when matching')),
3553 ('i', 'ignore-case', None, _('ignore case when matching')),
3554 ('l', 'files-with-matches', None,
3554 ('l', 'files-with-matches', None,
3555 _('print only filenames and revisions that match')),
3555 _('print only filenames and revisions that match')),
3556 ('n', 'line-number', None, _('print matching line numbers')),
3556 ('n', 'line-number', None, _('print matching line numbers')),
3557 ('r', 'rev', [],
3557 ('r', 'rev', [],
3558 _('only search files changed within revision range'), _('REV')),
3558 _('only search files changed within revision range'), _('REV')),
3559 ('u', 'user', None, _('list the author (long with -v)')),
3559 ('u', 'user', None, _('list the author (long with -v)')),
3560 ('d', 'date', None, _('list the date (short with -q)')),
3560 ('d', 'date', None, _('list the date (short with -q)')),
3561 ] + formatteropts + walkopts,
3561 ] + formatteropts + walkopts,
3562 _('[OPTION]... PATTERN [FILE]...'),
3562 _('[OPTION]... PATTERN [FILE]...'),
3563 inferrepo=True)
3563 inferrepo=True)
3564 def grep(ui, repo, pattern, *pats, **opts):
3564 def grep(ui, repo, pattern, *pats, **opts):
3565 """search revision history for a pattern in specified files
3565 """search revision history for a pattern in specified files
3566
3566
3567 Search revision history for a regular expression in the specified
3567 Search revision history for a regular expression in the specified
3568 files or the entire project.
3568 files or the entire project.
3569
3569
3570 By default, grep prints the most recent revision number for each
3570 By default, grep prints the most recent revision number for each
3571 file in which it finds a match. To get it to print every revision
3571 file in which it finds a match. To get it to print every revision
3572 that contains a change in match status ("-" for a match that becomes
3572 that contains a change in match status ("-" for a match that becomes
3573 a non-match, or "+" for a non-match that becomes a match), use the
3573 a non-match, or "+" for a non-match that becomes a match), use the
3574 --all flag.
3574 --all flag.
3575
3575
3576 PATTERN can be any Python (roughly Perl-compatible) regular
3576 PATTERN can be any Python (roughly Perl-compatible) regular
3577 expression.
3577 expression.
3578
3578
3579 If no FILEs are specified (and -f/--follow isn't set), all files in
3579 If no FILEs are specified (and -f/--follow isn't set), all files in
3580 the repository are searched, including those that don't exist in the
3580 the repository are searched, including those that don't exist in the
3581 current branch or have been deleted in a prior changeset.
3581 current branch or have been deleted in a prior changeset.
3582
3582
3583 Returns 0 if a match is found, 1 otherwise.
3583 Returns 0 if a match is found, 1 otherwise.
3584 """
3584 """
3585 reflags = re.M
3585 reflags = re.M
3586 if opts.get('ignore_case'):
3586 if opts.get('ignore_case'):
3587 reflags |= re.I
3587 reflags |= re.I
3588 try:
3588 try:
3589 regexp = util.re.compile(pattern, reflags)
3589 regexp = util.re.compile(pattern, reflags)
3590 except re.error as inst:
3590 except re.error as inst:
3591 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3591 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3592 return 1
3592 return 1
3593 sep, eol = ':', '\n'
3593 sep, eol = ':', '\n'
3594 if opts.get('print0'):
3594 if opts.get('print0'):
3595 sep = eol = '\0'
3595 sep = eol = '\0'
3596
3596
3597 getfile = util.lrucachefunc(repo.file)
3597 getfile = util.lrucachefunc(repo.file)
3598
3598
3599 def matchlines(body):
3599 def matchlines(body):
3600 begin = 0
3600 begin = 0
3601 linenum = 0
3601 linenum = 0
3602 while begin < len(body):
3602 while begin < len(body):
3603 match = regexp.search(body, begin)
3603 match = regexp.search(body, begin)
3604 if not match:
3604 if not match:
3605 break
3605 break
3606 mstart, mend = match.span()
3606 mstart, mend = match.span()
3607 linenum += body.count('\n', begin, mstart) + 1
3607 linenum += body.count('\n', begin, mstart) + 1
3608 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3608 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3609 begin = body.find('\n', mend) + 1 or len(body) + 1
3609 begin = body.find('\n', mend) + 1 or len(body) + 1
3610 lend = begin - 1
3610 lend = begin - 1
3611 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3611 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3612
3612
3613 class linestate(object):
3613 class linestate(object):
3614 def __init__(self, line, linenum, colstart, colend):
3614 def __init__(self, line, linenum, colstart, colend):
3615 self.line = line
3615 self.line = line
3616 self.linenum = linenum
3616 self.linenum = linenum
3617 self.colstart = colstart
3617 self.colstart = colstart
3618 self.colend = colend
3618 self.colend = colend
3619
3619
3620 def __hash__(self):
3620 def __hash__(self):
3621 return hash((self.linenum, self.line))
3621 return hash((self.linenum, self.line))
3622
3622
3623 def __eq__(self, other):
3623 def __eq__(self, other):
3624 return self.line == other.line
3624 return self.line == other.line
3625
3625
3626 def findpos(self):
3626 def findpos(self):
3627 """Iterate all (start, end) indices of matches"""
3627 """Iterate all (start, end) indices of matches"""
3628 yield self.colstart, self.colend
3628 yield self.colstart, self.colend
3629 p = self.colend
3629 p = self.colend
3630 while p < len(self.line):
3630 while p < len(self.line):
3631 m = regexp.search(self.line, p)
3631 m = regexp.search(self.line, p)
3632 if not m:
3632 if not m:
3633 break
3633 break
3634 yield m.span()
3634 yield m.span()
3635 p = m.end()
3635 p = m.end()
3636
3636
3637 matches = {}
3637 matches = {}
3638 copies = {}
3638 copies = {}
3639 def grepbody(fn, rev, body):
3639 def grepbody(fn, rev, body):
3640 matches[rev].setdefault(fn, [])
3640 matches[rev].setdefault(fn, [])
3641 m = matches[rev][fn]
3641 m = matches[rev][fn]
3642 for lnum, cstart, cend, line in matchlines(body):
3642 for lnum, cstart, cend, line in matchlines(body):
3643 s = linestate(line, lnum, cstart, cend)
3643 s = linestate(line, lnum, cstart, cend)
3644 m.append(s)
3644 m.append(s)
3645
3645
3646 def difflinestates(a, b):
3646 def difflinestates(a, b):
3647 sm = difflib.SequenceMatcher(None, a, b)
3647 sm = difflib.SequenceMatcher(None, a, b)
3648 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3648 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3649 if tag == 'insert':
3649 if tag == 'insert':
3650 for i in xrange(blo, bhi):
3650 for i in xrange(blo, bhi):
3651 yield ('+', b[i])
3651 yield ('+', b[i])
3652 elif tag == 'delete':
3652 elif tag == 'delete':
3653 for i in xrange(alo, ahi):
3653 for i in xrange(alo, ahi):
3654 yield ('-', a[i])
3654 yield ('-', a[i])
3655 elif tag == 'replace':
3655 elif tag == 'replace':
3656 for i in xrange(alo, ahi):
3656 for i in xrange(alo, ahi):
3657 yield ('-', a[i])
3657 yield ('-', a[i])
3658 for i in xrange(blo, bhi):
3658 for i in xrange(blo, bhi):
3659 yield ('+', b[i])
3659 yield ('+', b[i])
3660
3660
3661 def display(fm, fn, ctx, pstates, states):
3661 def display(fm, fn, ctx, pstates, states):
3662 rev = ctx.rev()
3662 rev = ctx.rev()
3663 if fm.isplain():
3663 if fm.isplain():
3664 formatuser = ui.shortuser
3664 formatuser = ui.shortuser
3665 else:
3665 else:
3666 formatuser = str
3666 formatuser = str
3667 if ui.quiet:
3667 if ui.quiet:
3668 datefmt = '%Y-%m-%d'
3668 datefmt = '%Y-%m-%d'
3669 else:
3669 else:
3670 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
3670 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
3671 found = False
3671 found = False
3672 @util.cachefunc
3672 @util.cachefunc
3673 def binary():
3673 def binary():
3674 flog = getfile(fn)
3674 flog = getfile(fn)
3675 return util.binary(flog.read(ctx.filenode(fn)))
3675 return util.binary(flog.read(ctx.filenode(fn)))
3676
3676
3677 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
3677 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
3678 if opts.get('all'):
3678 if opts.get('all'):
3679 iter = difflinestates(pstates, states)
3679 iter = difflinestates(pstates, states)
3680 else:
3680 else:
3681 iter = [('', l) for l in states]
3681 iter = [('', l) for l in states]
3682 for change, l in iter:
3682 for change, l in iter:
3683 fm.startitem()
3683 fm.startitem()
3684 fm.data(node=fm.hexfunc(ctx.node()))
3684 fm.data(node=fm.hexfunc(ctx.node()))
3685 cols = [
3685 cols = [
3686 ('filename', fn, True),
3686 ('filename', fn, True),
3687 ('rev', rev, True),
3687 ('rev', rev, True),
3688 ('linenumber', l.linenum, opts.get('line_number')),
3688 ('linenumber', l.linenum, opts.get('line_number')),
3689 ]
3689 ]
3690 if opts.get('all'):
3690 if opts.get('all'):
3691 cols.append(('change', change, True))
3691 cols.append(('change', change, True))
3692 cols.extend([
3692 cols.extend([
3693 ('user', formatuser(ctx.user()), opts.get('user')),
3693 ('user', formatuser(ctx.user()), opts.get('user')),
3694 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
3694 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
3695 ])
3695 ])
3696 lastcol = next(name for name, data, cond in reversed(cols) if cond)
3696 lastcol = next(name for name, data, cond in reversed(cols) if cond)
3697 for name, data, cond in cols:
3697 for name, data, cond in cols:
3698 field = fieldnamemap.get(name, name)
3698 field = fieldnamemap.get(name, name)
3699 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
3699 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
3700 if cond and name != lastcol:
3700 if cond and name != lastcol:
3701 fm.plain(sep, label='grep.sep')
3701 fm.plain(sep, label='grep.sep')
3702 if not opts.get('files_with_matches'):
3702 if not opts.get('files_with_matches'):
3703 fm.plain(sep, label='grep.sep')
3703 fm.plain(sep, label='grep.sep')
3704 if not opts.get('text') and binary():
3704 if not opts.get('text') and binary():
3705 fm.plain(_(" Binary file matches"))
3705 fm.plain(_(" Binary file matches"))
3706 else:
3706 else:
3707 displaymatches(fm.nested('texts'), l)
3707 displaymatches(fm.nested('texts'), l)
3708 fm.plain(eol)
3708 fm.plain(eol)
3709 found = True
3709 found = True
3710 if opts.get('files_with_matches'):
3710 if opts.get('files_with_matches'):
3711 break
3711 break
3712 return found
3712 return found
3713
3713
3714 def displaymatches(fm, l):
3714 def displaymatches(fm, l):
3715 p = 0
3715 p = 0
3716 for s, e in l.findpos():
3716 for s, e in l.findpos():
3717 if p < s:
3717 if p < s:
3718 fm.startitem()
3718 fm.startitem()
3719 fm.write('text', '%s', l.line[p:s])
3719 fm.write('text', '%s', l.line[p:s])
3720 fm.data(matched=False)
3720 fm.data(matched=False)
3721 fm.startitem()
3721 fm.startitem()
3722 fm.write('text', '%s', l.line[s:e], label='grep.match')
3722 fm.write('text', '%s', l.line[s:e], label='grep.match')
3723 fm.data(matched=True)
3723 fm.data(matched=True)
3724 p = e
3724 p = e
3725 if p < len(l.line):
3725 if p < len(l.line):
3726 fm.startitem()
3726 fm.startitem()
3727 fm.write('text', '%s', l.line[p:])
3727 fm.write('text', '%s', l.line[p:])
3728 fm.data(matched=False)
3728 fm.data(matched=False)
3729 fm.end()
3729 fm.end()
3730
3730
3731 skip = {}
3731 skip = {}
3732 revfiles = {}
3732 revfiles = {}
3733 matchfn = scmutil.match(repo[None], pats, opts)
3733 matchfn = scmutil.match(repo[None], pats, opts)
3734 found = False
3734 found = False
3735 follow = opts.get('follow')
3735 follow = opts.get('follow')
3736
3736
3737 def prep(ctx, fns):
3737 def prep(ctx, fns):
3738 rev = ctx.rev()
3738 rev = ctx.rev()
3739 pctx = ctx.p1()
3739 pctx = ctx.p1()
3740 parent = pctx.rev()
3740 parent = pctx.rev()
3741 matches.setdefault(rev, {})
3741 matches.setdefault(rev, {})
3742 matches.setdefault(parent, {})
3742 matches.setdefault(parent, {})
3743 files = revfiles.setdefault(rev, [])
3743 files = revfiles.setdefault(rev, [])
3744 for fn in fns:
3744 for fn in fns:
3745 flog = getfile(fn)
3745 flog = getfile(fn)
3746 try:
3746 try:
3747 fnode = ctx.filenode(fn)
3747 fnode = ctx.filenode(fn)
3748 except error.LookupError:
3748 except error.LookupError:
3749 continue
3749 continue
3750
3750
3751 copied = flog.renamed(fnode)
3751 copied = flog.renamed(fnode)
3752 copy = follow and copied and copied[0]
3752 copy = follow and copied and copied[0]
3753 if copy:
3753 if copy:
3754 copies.setdefault(rev, {})[fn] = copy
3754 copies.setdefault(rev, {})[fn] = copy
3755 if fn in skip:
3755 if fn in skip:
3756 if copy:
3756 if copy:
3757 skip[copy] = True
3757 skip[copy] = True
3758 continue
3758 continue
3759 files.append(fn)
3759 files.append(fn)
3760
3760
3761 if fn not in matches[rev]:
3761 if fn not in matches[rev]:
3762 grepbody(fn, rev, flog.read(fnode))
3762 grepbody(fn, rev, flog.read(fnode))
3763
3763
3764 pfn = copy or fn
3764 pfn = copy or fn
3765 if pfn not in matches[parent]:
3765 if pfn not in matches[parent]:
3766 try:
3766 try:
3767 fnode = pctx.filenode(pfn)
3767 fnode = pctx.filenode(pfn)
3768 grepbody(pfn, parent, flog.read(fnode))
3768 grepbody(pfn, parent, flog.read(fnode))
3769 except error.LookupError:
3769 except error.LookupError:
3770 pass
3770 pass
3771
3771
3772 fm = ui.formatter('grep', opts)
3772 fm = ui.formatter('grep', opts)
3773 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3773 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3774 rev = ctx.rev()
3774 rev = ctx.rev()
3775 parent = ctx.p1().rev()
3775 parent = ctx.p1().rev()
3776 for fn in sorted(revfiles.get(rev, [])):
3776 for fn in sorted(revfiles.get(rev, [])):
3777 states = matches[rev][fn]
3777 states = matches[rev][fn]
3778 copy = copies.get(rev, {}).get(fn)
3778 copy = copies.get(rev, {}).get(fn)
3779 if fn in skip:
3779 if fn in skip:
3780 if copy:
3780 if copy:
3781 skip[copy] = True
3781 skip[copy] = True
3782 continue
3782 continue
3783 pstates = matches.get(parent, {}).get(copy or fn, [])
3783 pstates = matches.get(parent, {}).get(copy or fn, [])
3784 if pstates or states:
3784 if pstates or states:
3785 r = display(fm, fn, ctx, pstates, states)
3785 r = display(fm, fn, ctx, pstates, states)
3786 found = found or r
3786 found = found or r
3787 if r and not opts.get('all'):
3787 if r and not opts.get('all'):
3788 skip[fn] = True
3788 skip[fn] = True
3789 if copy:
3789 if copy:
3790 skip[copy] = True
3790 skip[copy] = True
3791 del matches[rev]
3791 del matches[rev]
3792 del revfiles[rev]
3792 del revfiles[rev]
3793 fm.end()
3793 fm.end()
3794
3794
3795 return not found
3795 return not found
3796
3796
3797 @command('heads',
3797 @command('heads',
3798 [('r', 'rev', '',
3798 [('r', 'rev', '',
3799 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3799 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3800 ('t', 'topo', False, _('show topological heads only')),
3800 ('t', 'topo', False, _('show topological heads only')),
3801 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3801 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3802 ('c', 'closed', False, _('show normal and closed branch heads')),
3802 ('c', 'closed', False, _('show normal and closed branch heads')),
3803 ] + templateopts,
3803 ] + templateopts,
3804 _('[-ct] [-r STARTREV] [REV]...'))
3804 _('[-ct] [-r STARTREV] [REV]...'))
3805 def heads(ui, repo, *branchrevs, **opts):
3805 def heads(ui, repo, *branchrevs, **opts):
3806 """show branch heads
3806 """show branch heads
3807
3807
3808 With no arguments, show all open branch heads in the repository.
3808 With no arguments, show all open branch heads in the repository.
3809 Branch heads are changesets that have no descendants on the
3809 Branch heads are changesets that have no descendants on the
3810 same branch. They are where development generally takes place and
3810 same branch. They are where development generally takes place and
3811 are the usual targets for update and merge operations.
3811 are the usual targets for update and merge operations.
3812
3812
3813 If one or more REVs are given, only open branch heads on the
3813 If one or more REVs are given, only open branch heads on the
3814 branches associated with the specified changesets are shown. This
3814 branches associated with the specified changesets are shown. This
3815 means that you can use :hg:`heads .` to see the heads on the
3815 means that you can use :hg:`heads .` to see the heads on the
3816 currently checked-out branch.
3816 currently checked-out branch.
3817
3817
3818 If -c/--closed is specified, also show branch heads marked closed
3818 If -c/--closed is specified, also show branch heads marked closed
3819 (see :hg:`commit --close-branch`).
3819 (see :hg:`commit --close-branch`).
3820
3820
3821 If STARTREV is specified, only those heads that are descendants of
3821 If STARTREV is specified, only those heads that are descendants of
3822 STARTREV will be displayed.
3822 STARTREV will be displayed.
3823
3823
3824 If -t/--topo is specified, named branch mechanics will be ignored and only
3824 If -t/--topo is specified, named branch mechanics will be ignored and only
3825 topological heads (changesets with no children) will be shown.
3825 topological heads (changesets with no children) will be shown.
3826
3826
3827 Returns 0 if matching heads are found, 1 if not.
3827 Returns 0 if matching heads are found, 1 if not.
3828 """
3828 """
3829
3829
3830 start = None
3830 start = None
3831 if 'rev' in opts:
3831 if 'rev' in opts:
3832 start = scmutil.revsingle(repo, opts['rev'], None).node()
3832 start = scmutil.revsingle(repo, opts['rev'], None).node()
3833
3833
3834 if opts.get('topo'):
3834 if opts.get('topo'):
3835 heads = [repo[h] for h in repo.heads(start)]
3835 heads = [repo[h] for h in repo.heads(start)]
3836 else:
3836 else:
3837 heads = []
3837 heads = []
3838 for branch in repo.branchmap():
3838 for branch in repo.branchmap():
3839 heads += repo.branchheads(branch, start, opts.get('closed'))
3839 heads += repo.branchheads(branch, start, opts.get('closed'))
3840 heads = [repo[h] for h in heads]
3840 heads = [repo[h] for h in heads]
3841
3841
3842 if branchrevs:
3842 if branchrevs:
3843 branches = set(repo[br].branch() for br in branchrevs)
3843 branches = set(repo[br].branch() for br in branchrevs)
3844 heads = [h for h in heads if h.branch() in branches]
3844 heads = [h for h in heads if h.branch() in branches]
3845
3845
3846 if opts.get('active') and branchrevs:
3846 if opts.get('active') and branchrevs:
3847 dagheads = repo.heads(start)
3847 dagheads = repo.heads(start)
3848 heads = [h for h in heads if h.node() in dagheads]
3848 heads = [h for h in heads if h.node() in dagheads]
3849
3849
3850 if branchrevs:
3850 if branchrevs:
3851 haveheads = set(h.branch() for h in heads)
3851 haveheads = set(h.branch() for h in heads)
3852 if branches - haveheads:
3852 if branches - haveheads:
3853 headless = ', '.join(b for b in branches - haveheads)
3853 headless = ', '.join(b for b in branches - haveheads)
3854 msg = _('no open branch heads found on branches %s')
3854 msg = _('no open branch heads found on branches %s')
3855 if opts.get('rev'):
3855 if opts.get('rev'):
3856 msg += _(' (started at %s)') % opts['rev']
3856 msg += _(' (started at %s)') % opts['rev']
3857 ui.warn((msg + '\n') % headless)
3857 ui.warn((msg + '\n') % headless)
3858
3858
3859 if not heads:
3859 if not heads:
3860 return 1
3860 return 1
3861
3861
3862 heads = sorted(heads, key=lambda x: -x.rev())
3862 heads = sorted(heads, key=lambda x: -x.rev())
3863 displayer = cmdutil.show_changeset(ui, repo, opts)
3863 displayer = cmdutil.show_changeset(ui, repo, opts)
3864 for ctx in heads:
3864 for ctx in heads:
3865 displayer.show(ctx)
3865 displayer.show(ctx)
3866 displayer.close()
3866 displayer.close()
3867
3867
3868 @command('help',
3868 @command('help',
3869 [('e', 'extension', None, _('show only help for extensions')),
3869 [('e', 'extension', None, _('show only help for extensions')),
3870 ('c', 'command', None, _('show only help for commands')),
3870 ('c', 'command', None, _('show only help for commands')),
3871 ('k', 'keyword', None, _('show topics matching keyword')),
3871 ('k', 'keyword', None, _('show topics matching keyword')),
3872 ('s', 'system', [], _('show help for specific platform(s)')),
3872 ('s', 'system', [], _('show help for specific platform(s)')),
3873 ],
3873 ],
3874 _('[-ecks] [TOPIC]'),
3874 _('[-ecks] [TOPIC]'),
3875 norepo=True)
3875 norepo=True)
3876 def help_(ui, name=None, **opts):
3876 def help_(ui, name=None, **opts):
3877 """show help for a given topic or a help overview
3877 """show help for a given topic or a help overview
3878
3878
3879 With no arguments, print a list of commands with short help messages.
3879 With no arguments, print a list of commands with short help messages.
3880
3880
3881 Given a topic, extension, or command name, print help for that
3881 Given a topic, extension, or command name, print help for that
3882 topic.
3882 topic.
3883
3883
3884 Returns 0 if successful.
3884 Returns 0 if successful.
3885 """
3885 """
3886
3886
3887 textwidth = ui.configint('ui', 'textwidth', 78)
3887 textwidth = ui.configint('ui', 'textwidth', 78)
3888 termwidth = ui.termwidth() - 2
3888 termwidth = ui.termwidth() - 2
3889 if textwidth <= 0 or termwidth < textwidth:
3889 if textwidth <= 0 or termwidth < textwidth:
3890 textwidth = termwidth
3890 textwidth = termwidth
3891
3891
3892 keep = opts.get('system') or []
3892 keep = opts.get('system') or []
3893 if len(keep) == 0:
3893 if len(keep) == 0:
3894 if sys.platform.startswith('win'):
3894 if sys.platform.startswith('win'):
3895 keep.append('windows')
3895 keep.append('windows')
3896 elif sys.platform == 'OpenVMS':
3896 elif sys.platform == 'OpenVMS':
3897 keep.append('vms')
3897 keep.append('vms')
3898 elif sys.platform == 'plan9':
3898 elif sys.platform == 'plan9':
3899 keep.append('plan9')
3899 keep.append('plan9')
3900 else:
3900 else:
3901 keep.append('unix')
3901 keep.append('unix')
3902 keep.append(sys.platform.lower())
3902 keep.append(sys.platform.lower())
3903 if ui.verbose:
3903 if ui.verbose:
3904 keep.append('verbose')
3904 keep.append('verbose')
3905
3905
3906 section = None
3906 section = None
3907 subtopic = None
3907 subtopic = None
3908 if name and '.' in name:
3908 if name and '.' in name:
3909 name, remaining = name.split('.', 1)
3909 name, remaining = name.split('.', 1)
3910 remaining = encoding.lower(remaining)
3910 remaining = encoding.lower(remaining)
3911 if '.' in remaining:
3911 if '.' in remaining:
3912 subtopic, section = remaining.split('.', 1)
3912 subtopic, section = remaining.split('.', 1)
3913 else:
3913 else:
3914 if name in help.subtopics:
3914 if name in help.subtopics:
3915 subtopic = remaining
3915 subtopic = remaining
3916 else:
3916 else:
3917 section = remaining
3917 section = remaining
3918
3918
3919 text = help.help_(ui, name, subtopic=subtopic, **opts)
3919 text = help.help_(ui, name, subtopic=subtopic, **opts)
3920
3920
3921 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3921 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3922 section=section)
3922 section=section)
3923
3923
3924 # We could have been given a weird ".foo" section without a name
3924 # We could have been given a weird ".foo" section without a name
3925 # to look for, or we could have simply failed to found "foo.bar"
3925 # to look for, or we could have simply failed to found "foo.bar"
3926 # because bar isn't a section of foo
3926 # because bar isn't a section of foo
3927 if section and not (formatted and name):
3927 if section and not (formatted and name):
3928 raise error.Abort(_("help section not found"))
3928 raise error.Abort(_("help section not found"))
3929
3929
3930 if 'verbose' in pruned:
3930 if 'verbose' in pruned:
3931 keep.append('omitted')
3931 keep.append('omitted')
3932 else:
3932 else:
3933 keep.append('notomitted')
3933 keep.append('notomitted')
3934 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3934 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3935 section=section)
3935 section=section)
3936 ui.write(formatted)
3936 ui.write(formatted)
3937
3937
3938
3938
3939 @command('identify|id',
3939 @command('identify|id',
3940 [('r', 'rev', '',
3940 [('r', 'rev', '',
3941 _('identify the specified revision'), _('REV')),
3941 _('identify the specified revision'), _('REV')),
3942 ('n', 'num', None, _('show local revision number')),
3942 ('n', 'num', None, _('show local revision number')),
3943 ('i', 'id', None, _('show global revision id')),
3943 ('i', 'id', None, _('show global revision id')),
3944 ('b', 'branch', None, _('show branch')),
3944 ('b', 'branch', None, _('show branch')),
3945 ('t', 'tags', None, _('show tags')),
3945 ('t', 'tags', None, _('show tags')),
3946 ('B', 'bookmarks', None, _('show bookmarks')),
3946 ('B', 'bookmarks', None, _('show bookmarks')),
3947 ] + remoteopts,
3947 ] + remoteopts,
3948 _('[-nibtB] [-r REV] [SOURCE]'),
3948 _('[-nibtB] [-r REV] [SOURCE]'),
3949 optionalrepo=True)
3949 optionalrepo=True)
3950 def identify(ui, repo, source=None, rev=None,
3950 def identify(ui, repo, source=None, rev=None,
3951 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3951 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3952 """identify the working directory or specified revision
3952 """identify the working directory or specified revision
3953
3953
3954 Print a summary identifying the repository state at REV using one or
3954 Print a summary identifying the repository state at REV using one or
3955 two parent hash identifiers, followed by a "+" if the working
3955 two parent hash identifiers, followed by a "+" if the working
3956 directory has uncommitted changes, the branch name (if not default),
3956 directory has uncommitted changes, the branch name (if not default),
3957 a list of tags, and a list of bookmarks.
3957 a list of tags, and a list of bookmarks.
3958
3958
3959 When REV is not given, print a summary of the current state of the
3959 When REV is not given, print a summary of the current state of the
3960 repository.
3960 repository.
3961
3961
3962 Specifying a path to a repository root or Mercurial bundle will
3962 Specifying a path to a repository root or Mercurial bundle will
3963 cause lookup to operate on that repository/bundle.
3963 cause lookup to operate on that repository/bundle.
3964
3964
3965 .. container:: verbose
3965 .. container:: verbose
3966
3966
3967 Examples:
3967 Examples:
3968
3968
3969 - generate a build identifier for the working directory::
3969 - generate a build identifier for the working directory::
3970
3970
3971 hg id --id > build-id.dat
3971 hg id --id > build-id.dat
3972
3972
3973 - find the revision corresponding to a tag::
3973 - find the revision corresponding to a tag::
3974
3974
3975 hg id -n -r 1.3
3975 hg id -n -r 1.3
3976
3976
3977 - check the most recent revision of a remote repository::
3977 - check the most recent revision of a remote repository::
3978
3978
3979 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3979 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3980
3980
3981 See :hg:`log` for generating more information about specific revisions,
3981 See :hg:`log` for generating more information about specific revisions,
3982 including full hash identifiers.
3982 including full hash identifiers.
3983
3983
3984 Returns 0 if successful.
3984 Returns 0 if successful.
3985 """
3985 """
3986
3986
3987 if not repo and not source:
3987 if not repo and not source:
3988 raise error.Abort(_("there is no Mercurial repository here "
3988 raise error.Abort(_("there is no Mercurial repository here "
3989 "(.hg not found)"))
3989 "(.hg not found)"))
3990
3990
3991 if ui.debugflag:
3991 if ui.debugflag:
3992 hexfunc = hex
3992 hexfunc = hex
3993 else:
3993 else:
3994 hexfunc = short
3994 hexfunc = short
3995 default = not (num or id or branch or tags or bookmarks)
3995 default = not (num or id or branch or tags or bookmarks)
3996 output = []
3996 output = []
3997 revs = []
3997 revs = []
3998
3998
3999 if source:
3999 if source:
4000 source, branches = hg.parseurl(ui.expandpath(source))
4000 source, branches = hg.parseurl(ui.expandpath(source))
4001 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4001 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4002 repo = peer.local()
4002 repo = peer.local()
4003 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4003 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4004
4004
4005 if not repo:
4005 if not repo:
4006 if num or branch or tags:
4006 if num or branch or tags:
4007 raise error.Abort(
4007 raise error.Abort(
4008 _("can't query remote revision number, branch, or tags"))
4008 _("can't query remote revision number, branch, or tags"))
4009 if not rev and revs:
4009 if not rev and revs:
4010 rev = revs[0]
4010 rev = revs[0]
4011 if not rev:
4011 if not rev:
4012 rev = "tip"
4012 rev = "tip"
4013
4013
4014 remoterev = peer.lookup(rev)
4014 remoterev = peer.lookup(rev)
4015 if default or id:
4015 if default or id:
4016 output = [hexfunc(remoterev)]
4016 output = [hexfunc(remoterev)]
4017
4017
4018 def getbms():
4018 def getbms():
4019 bms = []
4019 bms = []
4020
4020
4021 if 'bookmarks' in peer.listkeys('namespaces'):
4021 if 'bookmarks' in peer.listkeys('namespaces'):
4022 hexremoterev = hex(remoterev)
4022 hexremoterev = hex(remoterev)
4023 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4023 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4024 if bmr == hexremoterev]
4024 if bmr == hexremoterev]
4025
4025
4026 return sorted(bms)
4026 return sorted(bms)
4027
4027
4028 if bookmarks:
4028 if bookmarks:
4029 output.extend(getbms())
4029 output.extend(getbms())
4030 elif default and not ui.quiet:
4030 elif default and not ui.quiet:
4031 # multiple bookmarks for a single parent separated by '/'
4031 # multiple bookmarks for a single parent separated by '/'
4032 bm = '/'.join(getbms())
4032 bm = '/'.join(getbms())
4033 if bm:
4033 if bm:
4034 output.append(bm)
4034 output.append(bm)
4035 else:
4035 else:
4036 ctx = scmutil.revsingle(repo, rev, None)
4036 ctx = scmutil.revsingle(repo, rev, None)
4037
4037
4038 if ctx.rev() is None:
4038 if ctx.rev() is None:
4039 ctx = repo[None]
4039 ctx = repo[None]
4040 parents = ctx.parents()
4040 parents = ctx.parents()
4041 taglist = []
4041 taglist = []
4042 for p in parents:
4042 for p in parents:
4043 taglist.extend(p.tags())
4043 taglist.extend(p.tags())
4044
4044
4045 changed = ""
4045 changed = ""
4046 if default or id or num:
4046 if default or id or num:
4047 if (any(repo.status())
4047 if (any(repo.status())
4048 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4048 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4049 changed = '+'
4049 changed = '+'
4050 if default or id:
4050 if default or id:
4051 output = ["%s%s" %
4051 output = ["%s%s" %
4052 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4052 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4053 if num:
4053 if num:
4054 output.append("%s%s" %
4054 output.append("%s%s" %
4055 ('+'.join([str(p.rev()) for p in parents]), changed))
4055 ('+'.join([str(p.rev()) for p in parents]), changed))
4056 else:
4056 else:
4057 if default or id:
4057 if default or id:
4058 output = [hexfunc(ctx.node())]
4058 output = [hexfunc(ctx.node())]
4059 if num:
4059 if num:
4060 output.append(str(ctx.rev()))
4060 output.append(str(ctx.rev()))
4061 taglist = ctx.tags()
4061 taglist = ctx.tags()
4062
4062
4063 if default and not ui.quiet:
4063 if default and not ui.quiet:
4064 b = ctx.branch()
4064 b = ctx.branch()
4065 if b != 'default':
4065 if b != 'default':
4066 output.append("(%s)" % b)
4066 output.append("(%s)" % b)
4067
4067
4068 # multiple tags for a single parent separated by '/'
4068 # multiple tags for a single parent separated by '/'
4069 t = '/'.join(taglist)
4069 t = '/'.join(taglist)
4070 if t:
4070 if t:
4071 output.append(t)
4071 output.append(t)
4072
4072
4073 # multiple bookmarks for a single parent separated by '/'
4073 # multiple bookmarks for a single parent separated by '/'
4074 bm = '/'.join(ctx.bookmarks())
4074 bm = '/'.join(ctx.bookmarks())
4075 if bm:
4075 if bm:
4076 output.append(bm)
4076 output.append(bm)
4077 else:
4077 else:
4078 if branch:
4078 if branch:
4079 output.append(ctx.branch())
4079 output.append(ctx.branch())
4080
4080
4081 if tags:
4081 if tags:
4082 output.extend(taglist)
4082 output.extend(taglist)
4083
4083
4084 if bookmarks:
4084 if bookmarks:
4085 output.extend(ctx.bookmarks())
4085 output.extend(ctx.bookmarks())
4086
4086
4087 ui.write("%s\n" % ' '.join(output))
4087 ui.write("%s\n" % ' '.join(output))
4088
4088
4089 @command('import|patch',
4089 @command('import|patch',
4090 [('p', 'strip', 1,
4090 [('p', 'strip', 1,
4091 _('directory strip option for patch. This has the same '
4091 _('directory strip option for patch. This has the same '
4092 'meaning as the corresponding patch option'), _('NUM')),
4092 'meaning as the corresponding patch option'), _('NUM')),
4093 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4093 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4094 ('e', 'edit', False, _('invoke editor on commit messages')),
4094 ('e', 'edit', False, _('invoke editor on commit messages')),
4095 ('f', 'force', None,
4095 ('f', 'force', None,
4096 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4096 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4097 ('', 'no-commit', None,
4097 ('', 'no-commit', None,
4098 _("don't commit, just update the working directory")),
4098 _("don't commit, just update the working directory")),
4099 ('', 'bypass', None,
4099 ('', 'bypass', None,
4100 _("apply patch without touching the working directory")),
4100 _("apply patch without touching the working directory")),
4101 ('', 'partial', None,
4101 ('', 'partial', None,
4102 _('commit even if some hunks fail')),
4102 _('commit even if some hunks fail')),
4103 ('', 'exact', None,
4103 ('', 'exact', None,
4104 _('abort if patch would apply lossily')),
4104 _('abort if patch would apply lossily')),
4105 ('', 'prefix', '',
4105 ('', 'prefix', '',
4106 _('apply patch to subdirectory'), _('DIR')),
4106 _('apply patch to subdirectory'), _('DIR')),
4107 ('', 'import-branch', None,
4107 ('', 'import-branch', None,
4108 _('use any branch information in patch (implied by --exact)'))] +
4108 _('use any branch information in patch (implied by --exact)'))] +
4109 commitopts + commitopts2 + similarityopts,
4109 commitopts + commitopts2 + similarityopts,
4110 _('[OPTION]... PATCH...'))
4110 _('[OPTION]... PATCH...'))
4111 def import_(ui, repo, patch1=None, *patches, **opts):
4111 def import_(ui, repo, patch1=None, *patches, **opts):
4112 """import an ordered set of patches
4112 """import an ordered set of patches
4113
4113
4114 Import a list of patches and commit them individually (unless
4114 Import a list of patches and commit them individually (unless
4115 --no-commit is specified).
4115 --no-commit is specified).
4116
4116
4117 To read a patch from standard input, use "-" as the patch name. If
4117 To read a patch from standard input, use "-" as the patch name. If
4118 a URL is specified, the patch will be downloaded from there.
4118 a URL is specified, the patch will be downloaded from there.
4119
4119
4120 Import first applies changes to the working directory (unless
4120 Import first applies changes to the working directory (unless
4121 --bypass is specified), import will abort if there are outstanding
4121 --bypass is specified), import will abort if there are outstanding
4122 changes.
4122 changes.
4123
4123
4124 Use --bypass to apply and commit patches directly to the
4124 Use --bypass to apply and commit patches directly to the
4125 repository, without affecting the working directory. Without
4125 repository, without affecting the working directory. Without
4126 --exact, patches will be applied on top of the working directory
4126 --exact, patches will be applied on top of the working directory
4127 parent revision.
4127 parent revision.
4128
4128
4129 You can import a patch straight from a mail message. Even patches
4129 You can import a patch straight from a mail message. Even patches
4130 as attachments work (to use the body part, it must have type
4130 as attachments work (to use the body part, it must have type
4131 text/plain or text/x-patch). From and Subject headers of email
4131 text/plain or text/x-patch). From and Subject headers of email
4132 message are used as default committer and commit message. All
4132 message are used as default committer and commit message. All
4133 text/plain body parts before first diff are added to the commit
4133 text/plain body parts before first diff are added to the commit
4134 message.
4134 message.
4135
4135
4136 If the imported patch was generated by :hg:`export`, user and
4136 If the imported patch was generated by :hg:`export`, user and
4137 description from patch override values from message headers and
4137 description from patch override values from message headers and
4138 body. Values given on command line with -m/--message and -u/--user
4138 body. Values given on command line with -m/--message and -u/--user
4139 override these.
4139 override these.
4140
4140
4141 If --exact is specified, import will set the working directory to
4141 If --exact is specified, import will set the working directory to
4142 the parent of each patch before applying it, and will abort if the
4142 the parent of each patch before applying it, and will abort if the
4143 resulting changeset has a different ID than the one recorded in
4143 resulting changeset has a different ID than the one recorded in
4144 the patch. This will guard against various ways that portable
4144 the patch. This will guard against various ways that portable
4145 patch formats and mail systems might fail to transfer Mercurial
4145 patch formats and mail systems might fail to transfer Mercurial
4146 data or metadata. See :hg:`bundle` for lossless transmission.
4146 data or metadata. See :hg:`bundle` for lossless transmission.
4147
4147
4148 Use --partial to ensure a changeset will be created from the patch
4148 Use --partial to ensure a changeset will be created from the patch
4149 even if some hunks fail to apply. Hunks that fail to apply will be
4149 even if some hunks fail to apply. Hunks that fail to apply will be
4150 written to a <target-file>.rej file. Conflicts can then be resolved
4150 written to a <target-file>.rej file. Conflicts can then be resolved
4151 by hand before :hg:`commit --amend` is run to update the created
4151 by hand before :hg:`commit --amend` is run to update the created
4152 changeset. This flag exists to let people import patches that
4152 changeset. This flag exists to let people import patches that
4153 partially apply without losing the associated metadata (author,
4153 partially apply without losing the associated metadata (author,
4154 date, description, ...).
4154 date, description, ...).
4155
4155
4156 .. note::
4156 .. note::
4157
4157
4158 When no hunks apply cleanly, :hg:`import --partial` will create
4158 When no hunks apply cleanly, :hg:`import --partial` will create
4159 an empty changeset, importing only the patch metadata.
4159 an empty changeset, importing only the patch metadata.
4160
4160
4161 With -s/--similarity, hg will attempt to discover renames and
4161 With -s/--similarity, hg will attempt to discover renames and
4162 copies in the patch in the same way as :hg:`addremove`.
4162 copies in the patch in the same way as :hg:`addremove`.
4163
4163
4164 It is possible to use external patch programs to perform the patch
4164 It is possible to use external patch programs to perform the patch
4165 by setting the ``ui.patch`` configuration option. For the default
4165 by setting the ``ui.patch`` configuration option. For the default
4166 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4166 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4167 See :hg:`help config` for more information about configuration
4167 See :hg:`help config` for more information about configuration
4168 files and how to use these options.
4168 files and how to use these options.
4169
4169
4170 See :hg:`help dates` for a list of formats valid for -d/--date.
4170 See :hg:`help dates` for a list of formats valid for -d/--date.
4171
4171
4172 .. container:: verbose
4172 .. container:: verbose
4173
4173
4174 Examples:
4174 Examples:
4175
4175
4176 - import a traditional patch from a website and detect renames::
4176 - import a traditional patch from a website and detect renames::
4177
4177
4178 hg import -s 80 http://example.com/bugfix.patch
4178 hg import -s 80 http://example.com/bugfix.patch
4179
4179
4180 - import a changeset from an hgweb server::
4180 - import a changeset from an hgweb server::
4181
4181
4182 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4182 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4183
4183
4184 - import all the patches in an Unix-style mbox::
4184 - import all the patches in an Unix-style mbox::
4185
4185
4186 hg import incoming-patches.mbox
4186 hg import incoming-patches.mbox
4187
4187
4188 - attempt to exactly restore an exported changeset (not always
4188 - attempt to exactly restore an exported changeset (not always
4189 possible)::
4189 possible)::
4190
4190
4191 hg import --exact proposed-fix.patch
4191 hg import --exact proposed-fix.patch
4192
4192
4193 - use an external tool to apply a patch which is too fuzzy for
4193 - use an external tool to apply a patch which is too fuzzy for
4194 the default internal tool.
4194 the default internal tool.
4195
4195
4196 hg import --config ui.patch="patch --merge" fuzzy.patch
4196 hg import --config ui.patch="patch --merge" fuzzy.patch
4197
4197
4198 - change the default fuzzing from 2 to a less strict 7
4198 - change the default fuzzing from 2 to a less strict 7
4199
4199
4200 hg import --config ui.fuzz=7 fuzz.patch
4200 hg import --config ui.fuzz=7 fuzz.patch
4201
4201
4202 Returns 0 on success, 1 on partial success (see --partial).
4202 Returns 0 on success, 1 on partial success (see --partial).
4203 """
4203 """
4204
4204
4205 if not patch1:
4205 if not patch1:
4206 raise error.Abort(_('need at least one patch to import'))
4206 raise error.Abort(_('need at least one patch to import'))
4207
4207
4208 patches = (patch1,) + patches
4208 patches = (patch1,) + patches
4209
4209
4210 date = opts.get('date')
4210 date = opts.get('date')
4211 if date:
4211 if date:
4212 opts['date'] = util.parsedate(date)
4212 opts['date'] = util.parsedate(date)
4213
4213
4214 exact = opts.get('exact')
4214 exact = opts.get('exact')
4215 update = not opts.get('bypass')
4215 update = not opts.get('bypass')
4216 if not update and opts.get('no_commit'):
4216 if not update and opts.get('no_commit'):
4217 raise error.Abort(_('cannot use --no-commit with --bypass'))
4217 raise error.Abort(_('cannot use --no-commit with --bypass'))
4218 try:
4218 try:
4219 sim = float(opts.get('similarity') or 0)
4219 sim = float(opts.get('similarity') or 0)
4220 except ValueError:
4220 except ValueError:
4221 raise error.Abort(_('similarity must be a number'))
4221 raise error.Abort(_('similarity must be a number'))
4222 if sim < 0 or sim > 100:
4222 if sim < 0 or sim > 100:
4223 raise error.Abort(_('similarity must be between 0 and 100'))
4223 raise error.Abort(_('similarity must be between 0 and 100'))
4224 if sim and not update:
4224 if sim and not update:
4225 raise error.Abort(_('cannot use --similarity with --bypass'))
4225 raise error.Abort(_('cannot use --similarity with --bypass'))
4226 if exact:
4226 if exact:
4227 if opts.get('edit'):
4227 if opts.get('edit'):
4228 raise error.Abort(_('cannot use --exact with --edit'))
4228 raise error.Abort(_('cannot use --exact with --edit'))
4229 if opts.get('prefix'):
4229 if opts.get('prefix'):
4230 raise error.Abort(_('cannot use --exact with --prefix'))
4230 raise error.Abort(_('cannot use --exact with --prefix'))
4231
4231
4232 base = opts["base"]
4232 base = opts["base"]
4233 wlock = dsguard = lock = tr = None
4233 wlock = dsguard = lock = tr = None
4234 msgs = []
4234 msgs = []
4235 ret = 0
4235 ret = 0
4236
4236
4237
4237
4238 try:
4238 try:
4239 wlock = repo.wlock()
4239 wlock = repo.wlock()
4240
4240
4241 if update:
4241 if update:
4242 cmdutil.checkunfinished(repo)
4242 cmdutil.checkunfinished(repo)
4243 if (exact or not opts.get('force')):
4243 if (exact or not opts.get('force')):
4244 cmdutil.bailifchanged(repo)
4244 cmdutil.bailifchanged(repo)
4245
4245
4246 if not opts.get('no_commit'):
4246 if not opts.get('no_commit'):
4247 lock = repo.lock()
4247 lock = repo.lock()
4248 tr = repo.transaction('import')
4248 tr = repo.transaction('import')
4249 else:
4249 else:
4250 dsguard = dirstateguard.dirstateguard(repo, 'import')
4250 dsguard = dirstateguard.dirstateguard(repo, 'import')
4251 parents = repo[None].parents()
4251 parents = repo[None].parents()
4252 for patchurl in patches:
4252 for patchurl in patches:
4253 if patchurl == '-':
4253 if patchurl == '-':
4254 ui.status(_('applying patch from stdin\n'))
4254 ui.status(_('applying patch from stdin\n'))
4255 patchfile = ui.fin
4255 patchfile = ui.fin
4256 patchurl = 'stdin' # for error message
4256 patchurl = 'stdin' # for error message
4257 else:
4257 else:
4258 patchurl = os.path.join(base, patchurl)
4258 patchurl = os.path.join(base, patchurl)
4259 ui.status(_('applying %s\n') % patchurl)
4259 ui.status(_('applying %s\n') % patchurl)
4260 patchfile = hg.openpath(ui, patchurl)
4260 patchfile = hg.openpath(ui, patchurl)
4261
4261
4262 haspatch = False
4262 haspatch = False
4263 for hunk in patch.split(patchfile):
4263 for hunk in patch.split(patchfile):
4264 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4264 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4265 parents, opts,
4265 parents, opts,
4266 msgs, hg.clean)
4266 msgs, hg.clean)
4267 if msg:
4267 if msg:
4268 haspatch = True
4268 haspatch = True
4269 ui.note(msg + '\n')
4269 ui.note(msg + '\n')
4270 if update or exact:
4270 if update or exact:
4271 parents = repo[None].parents()
4271 parents = repo[None].parents()
4272 else:
4272 else:
4273 parents = [repo[node]]
4273 parents = [repo[node]]
4274 if rej:
4274 if rej:
4275 ui.write_err(_("patch applied partially\n"))
4275 ui.write_err(_("patch applied partially\n"))
4276 ui.write_err(_("(fix the .rej files and run "
4276 ui.write_err(_("(fix the .rej files and run "
4277 "`hg commit --amend`)\n"))
4277 "`hg commit --amend`)\n"))
4278 ret = 1
4278 ret = 1
4279 break
4279 break
4280
4280
4281 if not haspatch:
4281 if not haspatch:
4282 raise error.Abort(_('%s: no diffs found') % patchurl)
4282 raise error.Abort(_('%s: no diffs found') % patchurl)
4283
4283
4284 if tr:
4284 if tr:
4285 tr.close()
4285 tr.close()
4286 if msgs:
4286 if msgs:
4287 repo.savecommitmessage('\n* * *\n'.join(msgs))
4287 repo.savecommitmessage('\n* * *\n'.join(msgs))
4288 if dsguard:
4288 if dsguard:
4289 dsguard.close()
4289 dsguard.close()
4290 return ret
4290 return ret
4291 finally:
4291 finally:
4292 if tr:
4292 if tr:
4293 tr.release()
4293 tr.release()
4294 release(lock, dsguard, wlock)
4294 release(lock, dsguard, wlock)
4295
4295
4296 @command('incoming|in',
4296 @command('incoming|in',
4297 [('f', 'force', None,
4297 [('f', 'force', None,
4298 _('run even if remote repository is unrelated')),
4298 _('run even if remote repository is unrelated')),
4299 ('n', 'newest-first', None, _('show newest record first')),
4299 ('n', 'newest-first', None, _('show newest record first')),
4300 ('', 'bundle', '',
4300 ('', 'bundle', '',
4301 _('file to store the bundles into'), _('FILE')),
4301 _('file to store the bundles into'), _('FILE')),
4302 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4302 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4303 ('B', 'bookmarks', False, _("compare bookmarks")),
4303 ('B', 'bookmarks', False, _("compare bookmarks")),
4304 ('b', 'branch', [],
4304 ('b', 'branch', [],
4305 _('a specific branch you would like to pull'), _('BRANCH')),
4305 _('a specific branch you would like to pull'), _('BRANCH')),
4306 ] + logopts + remoteopts + subrepoopts,
4306 ] + logopts + remoteopts + subrepoopts,
4307 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4307 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4308 def incoming(ui, repo, source="default", **opts):
4308 def incoming(ui, repo, source="default", **opts):
4309 """show new changesets found in source
4309 """show new changesets found in source
4310
4310
4311 Show new changesets found in the specified path/URL or the default
4311 Show new changesets found in the specified path/URL or the default
4312 pull location. These are the changesets that would have been pulled
4312 pull location. These are the changesets that would have been pulled
4313 if a pull at the time you issued this command.
4313 if a pull at the time you issued this command.
4314
4314
4315 See pull for valid source format details.
4315 See pull for valid source format details.
4316
4316
4317 .. container:: verbose
4317 .. container:: verbose
4318
4318
4319 With -B/--bookmarks, the result of bookmark comparison between
4319 With -B/--bookmarks, the result of bookmark comparison between
4320 local and remote repositories is displayed. With -v/--verbose,
4320 local and remote repositories is displayed. With -v/--verbose,
4321 status is also displayed for each bookmark like below::
4321 status is also displayed for each bookmark like below::
4322
4322
4323 BM1 01234567890a added
4323 BM1 01234567890a added
4324 BM2 1234567890ab advanced
4324 BM2 1234567890ab advanced
4325 BM3 234567890abc diverged
4325 BM3 234567890abc diverged
4326 BM4 34567890abcd changed
4326 BM4 34567890abcd changed
4327
4327
4328 The action taken locally when pulling depends on the
4328 The action taken locally when pulling depends on the
4329 status of each bookmark:
4329 status of each bookmark:
4330
4330
4331 :``added``: pull will create it
4331 :``added``: pull will create it
4332 :``advanced``: pull will update it
4332 :``advanced``: pull will update it
4333 :``diverged``: pull will create a divergent bookmark
4333 :``diverged``: pull will create a divergent bookmark
4334 :``changed``: result depends on remote changesets
4334 :``changed``: result depends on remote changesets
4335
4335
4336 From the point of view of pulling behavior, bookmark
4336 From the point of view of pulling behavior, bookmark
4337 existing only in the remote repository are treated as ``added``,
4337 existing only in the remote repository are treated as ``added``,
4338 even if it is in fact locally deleted.
4338 even if it is in fact locally deleted.
4339
4339
4340 .. container:: verbose
4340 .. container:: verbose
4341
4341
4342 For remote repository, using --bundle avoids downloading the
4342 For remote repository, using --bundle avoids downloading the
4343 changesets twice if the incoming is followed by a pull.
4343 changesets twice if the incoming is followed by a pull.
4344
4344
4345 Examples:
4345 Examples:
4346
4346
4347 - show incoming changes with patches and full description::
4347 - show incoming changes with patches and full description::
4348
4348
4349 hg incoming -vp
4349 hg incoming -vp
4350
4350
4351 - show incoming changes excluding merges, store a bundle::
4351 - show incoming changes excluding merges, store a bundle::
4352
4352
4353 hg in -vpM --bundle incoming.hg
4353 hg in -vpM --bundle incoming.hg
4354 hg pull incoming.hg
4354 hg pull incoming.hg
4355
4355
4356 - briefly list changes inside a bundle::
4356 - briefly list changes inside a bundle::
4357
4357
4358 hg in changes.hg -T "{desc|firstline}\\n"
4358 hg in changes.hg -T "{desc|firstline}\\n"
4359
4359
4360 Returns 0 if there are incoming changes, 1 otherwise.
4360 Returns 0 if there are incoming changes, 1 otherwise.
4361 """
4361 """
4362 if opts.get('graph'):
4362 if opts.get('graph'):
4363 cmdutil.checkunsupportedgraphflags([], opts)
4363 cmdutil.checkunsupportedgraphflags([], opts)
4364 def display(other, chlist, displayer):
4364 def display(other, chlist, displayer):
4365 revdag = cmdutil.graphrevs(other, chlist, opts)
4365 revdag = cmdutil.graphrevs(other, chlist, opts)
4366 cmdutil.displaygraph(ui, repo, revdag, displayer,
4366 cmdutil.displaygraph(ui, repo, revdag, displayer,
4367 graphmod.asciiedges)
4367 graphmod.asciiedges)
4368
4368
4369 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4369 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4370 return 0
4370 return 0
4371
4371
4372 if opts.get('bundle') and opts.get('subrepos'):
4372 if opts.get('bundle') and opts.get('subrepos'):
4373 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4373 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4374
4374
4375 if opts.get('bookmarks'):
4375 if opts.get('bookmarks'):
4376 source, branches = hg.parseurl(ui.expandpath(source),
4376 source, branches = hg.parseurl(ui.expandpath(source),
4377 opts.get('branch'))
4377 opts.get('branch'))
4378 other = hg.peer(repo, opts, source)
4378 other = hg.peer(repo, opts, source)
4379 if 'bookmarks' not in other.listkeys('namespaces'):
4379 if 'bookmarks' not in other.listkeys('namespaces'):
4380 ui.warn(_("remote doesn't support bookmarks\n"))
4380 ui.warn(_("remote doesn't support bookmarks\n"))
4381 return 0
4381 return 0
4382 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4382 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4383 return bookmarks.incoming(ui, repo, other)
4383 return bookmarks.incoming(ui, repo, other)
4384
4384
4385 repo._subtoppath = ui.expandpath(source)
4385 repo._subtoppath = ui.expandpath(source)
4386 try:
4386 try:
4387 return hg.incoming(ui, repo, source, opts)
4387 return hg.incoming(ui, repo, source, opts)
4388 finally:
4388 finally:
4389 del repo._subtoppath
4389 del repo._subtoppath
4390
4390
4391
4391
4392 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4392 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4393 norepo=True)
4393 norepo=True)
4394 def init(ui, dest=".", **opts):
4394 def init(ui, dest=".", **opts):
4395 """create a new repository in the given directory
4395 """create a new repository in the given directory
4396
4396
4397 Initialize a new repository in the given directory. If the given
4397 Initialize a new repository in the given directory. If the given
4398 directory does not exist, it will be created.
4398 directory does not exist, it will be created.
4399
4399
4400 If no directory is given, the current directory is used.
4400 If no directory is given, the current directory is used.
4401
4401
4402 It is possible to specify an ``ssh://`` URL as the destination.
4402 It is possible to specify an ``ssh://`` URL as the destination.
4403 See :hg:`help urls` for more information.
4403 See :hg:`help urls` for more information.
4404
4404
4405 Returns 0 on success.
4405 Returns 0 on success.
4406 """
4406 """
4407 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4407 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4408
4408
4409 @command('locate',
4409 @command('locate',
4410 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4410 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4411 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4411 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4412 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4412 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4413 ] + walkopts,
4413 ] + walkopts,
4414 _('[OPTION]... [PATTERN]...'))
4414 _('[OPTION]... [PATTERN]...'))
4415 def locate(ui, repo, *pats, **opts):
4415 def locate(ui, repo, *pats, **opts):
4416 """locate files matching specific patterns (DEPRECATED)
4416 """locate files matching specific patterns (DEPRECATED)
4417
4417
4418 Print files under Mercurial control in the working directory whose
4418 Print files under Mercurial control in the working directory whose
4419 names match the given patterns.
4419 names match the given patterns.
4420
4420
4421 By default, this command searches all directories in the working
4421 By default, this command searches all directories in the working
4422 directory. To search just the current directory and its
4422 directory. To search just the current directory and its
4423 subdirectories, use "--include .".
4423 subdirectories, use "--include .".
4424
4424
4425 If no patterns are given to match, this command prints the names
4425 If no patterns are given to match, this command prints the names
4426 of all files under Mercurial control in the working directory.
4426 of all files under Mercurial control in the working directory.
4427
4427
4428 If you want to feed the output of this command into the "xargs"
4428 If you want to feed the output of this command into the "xargs"
4429 command, use the -0 option to both this command and "xargs". This
4429 command, use the -0 option to both this command and "xargs". This
4430 will avoid the problem of "xargs" treating single filenames that
4430 will avoid the problem of "xargs" treating single filenames that
4431 contain whitespace as multiple filenames.
4431 contain whitespace as multiple filenames.
4432
4432
4433 See :hg:`help files` for a more versatile command.
4433 See :hg:`help files` for a more versatile command.
4434
4434
4435 Returns 0 if a match is found, 1 otherwise.
4435 Returns 0 if a match is found, 1 otherwise.
4436 """
4436 """
4437 if opts.get('print0'):
4437 if opts.get('print0'):
4438 end = '\0'
4438 end = '\0'
4439 else:
4439 else:
4440 end = '\n'
4440 end = '\n'
4441 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4441 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4442
4442
4443 ret = 1
4443 ret = 1
4444 ctx = repo[rev]
4444 ctx = repo[rev]
4445 m = scmutil.match(ctx, pats, opts, default='relglob',
4445 m = scmutil.match(ctx, pats, opts, default='relglob',
4446 badfn=lambda x, y: False)
4446 badfn=lambda x, y: False)
4447
4447
4448 for abs in ctx.matches(m):
4448 for abs in ctx.matches(m):
4449 if opts.get('fullpath'):
4449 if opts.get('fullpath'):
4450 ui.write(repo.wjoin(abs), end)
4450 ui.write(repo.wjoin(abs), end)
4451 else:
4451 else:
4452 ui.write(((pats and m.rel(abs)) or abs), end)
4452 ui.write(((pats and m.rel(abs)) or abs), end)
4453 ret = 0
4453 ret = 0
4454
4454
4455 return ret
4455 return ret
4456
4456
4457 @command('^log|history',
4457 @command('^log|history',
4458 [('f', 'follow', None,
4458 [('f', 'follow', None,
4459 _('follow changeset history, or file history across copies and renames')),
4459 _('follow changeset history, or file history across copies and renames')),
4460 ('', 'follow-first', None,
4460 ('', 'follow-first', None,
4461 _('only follow the first parent of merge changesets (DEPRECATED)')),
4461 _('only follow the first parent of merge changesets (DEPRECATED)')),
4462 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4462 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4463 ('C', 'copies', None, _('show copied files')),
4463 ('C', 'copies', None, _('show copied files')),
4464 ('k', 'keyword', [],
4464 ('k', 'keyword', [],
4465 _('do case-insensitive search for a given text'), _('TEXT')),
4465 _('do case-insensitive search for a given text'), _('TEXT')),
4466 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4466 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4467 ('', 'removed', None, _('include revisions where files were removed')),
4467 ('', 'removed', None, _('include revisions where files were removed')),
4468 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4468 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4469 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4469 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4470 ('', 'only-branch', [],
4470 ('', 'only-branch', [],
4471 _('show only changesets within the given named branch (DEPRECATED)'),
4471 _('show only changesets within the given named branch (DEPRECATED)'),
4472 _('BRANCH')),
4472 _('BRANCH')),
4473 ('b', 'branch', [],
4473 ('b', 'branch', [],
4474 _('show changesets within the given named branch'), _('BRANCH')),
4474 _('show changesets within the given named branch'), _('BRANCH')),
4475 ('P', 'prune', [],
4475 ('P', 'prune', [],
4476 _('do not display revision or any of its ancestors'), _('REV')),
4476 _('do not display revision or any of its ancestors'), _('REV')),
4477 ] + logopts + walkopts,
4477 ] + logopts + walkopts,
4478 _('[OPTION]... [FILE]'),
4478 _('[OPTION]... [FILE]'),
4479 inferrepo=True)
4479 inferrepo=True)
4480 def log(ui, repo, *pats, **opts):
4480 def log(ui, repo, *pats, **opts):
4481 """show revision history of entire repository or files
4481 """show revision history of entire repository or files
4482
4482
4483 Print the revision history of the specified files or the entire
4483 Print the revision history of the specified files or the entire
4484 project.
4484 project.
4485
4485
4486 If no revision range is specified, the default is ``tip:0`` unless
4486 If no revision range is specified, the default is ``tip:0`` unless
4487 --follow is set, in which case the working directory parent is
4487 --follow is set, in which case the working directory parent is
4488 used as the starting revision.
4488 used as the starting revision.
4489
4489
4490 File history is shown without following rename or copy history of
4490 File history is shown without following rename or copy history of
4491 files. Use -f/--follow with a filename to follow history across
4491 files. Use -f/--follow with a filename to follow history across
4492 renames and copies. --follow without a filename will only show
4492 renames and copies. --follow without a filename will only show
4493 ancestors or descendants of the starting revision.
4493 ancestors or descendants of the starting revision.
4494
4494
4495 By default this command prints revision number and changeset id,
4495 By default this command prints revision number and changeset id,
4496 tags, non-trivial parents, user, date and time, and a summary for
4496 tags, non-trivial parents, user, date and time, and a summary for
4497 each commit. When the -v/--verbose switch is used, the list of
4497 each commit. When the -v/--verbose switch is used, the list of
4498 changed files and full commit message are shown.
4498 changed files and full commit message are shown.
4499
4499
4500 With --graph the revisions are shown as an ASCII art DAG with the most
4500 With --graph the revisions are shown as an ASCII art DAG with the most
4501 recent changeset at the top.
4501 recent changeset at the top.
4502 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4502 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4503 and '+' represents a fork where the changeset from the lines below is a
4503 and '+' represents a fork where the changeset from the lines below is a
4504 parent of the 'o' merge on the same line.
4504 parent of the 'o' merge on the same line.
4505
4505
4506 .. note::
4506 .. note::
4507
4507
4508 :hg:`log --patch` may generate unexpected diff output for merge
4508 :hg:`log --patch` may generate unexpected diff output for merge
4509 changesets, as it will only compare the merge changeset against
4509 changesets, as it will only compare the merge changeset against
4510 its first parent. Also, only files different from BOTH parents
4510 its first parent. Also, only files different from BOTH parents
4511 will appear in files:.
4511 will appear in files:.
4512
4512
4513 .. note::
4513 .. note::
4514
4514
4515 For performance reasons, :hg:`log FILE` may omit duplicate changes
4515 For performance reasons, :hg:`log FILE` may omit duplicate changes
4516 made on branches and will not show removals or mode changes. To
4516 made on branches and will not show removals or mode changes. To
4517 see all such changes, use the --removed switch.
4517 see all such changes, use the --removed switch.
4518
4518
4519 .. container:: verbose
4519 .. container:: verbose
4520
4520
4521 Some examples:
4521 Some examples:
4522
4522
4523 - changesets with full descriptions and file lists::
4523 - changesets with full descriptions and file lists::
4524
4524
4525 hg log -v
4525 hg log -v
4526
4526
4527 - changesets ancestral to the working directory::
4527 - changesets ancestral to the working directory::
4528
4528
4529 hg log -f
4529 hg log -f
4530
4530
4531 - last 10 commits on the current branch::
4531 - last 10 commits on the current branch::
4532
4532
4533 hg log -l 10 -b .
4533 hg log -l 10 -b .
4534
4534
4535 - changesets showing all modifications of a file, including removals::
4535 - changesets showing all modifications of a file, including removals::
4536
4536
4537 hg log --removed file.c
4537 hg log --removed file.c
4538
4538
4539 - all changesets that touch a directory, with diffs, excluding merges::
4539 - all changesets that touch a directory, with diffs, excluding merges::
4540
4540
4541 hg log -Mp lib/
4541 hg log -Mp lib/
4542
4542
4543 - all revision numbers that match a keyword::
4543 - all revision numbers that match a keyword::
4544
4544
4545 hg log -k bug --template "{rev}\\n"
4545 hg log -k bug --template "{rev}\\n"
4546
4546
4547 - the full hash identifier of the working directory parent::
4547 - the full hash identifier of the working directory parent::
4548
4548
4549 hg log -r . --template "{node}\\n"
4549 hg log -r . --template "{node}\\n"
4550
4550
4551 - list available log templates::
4551 - list available log templates::
4552
4552
4553 hg log -T list
4553 hg log -T list
4554
4554
4555 - check if a given changeset is included in a tagged release::
4555 - check if a given changeset is included in a tagged release::
4556
4556
4557 hg log -r "a21ccf and ancestor(1.9)"
4557 hg log -r "a21ccf and ancestor(1.9)"
4558
4558
4559 - find all changesets by some user in a date range::
4559 - find all changesets by some user in a date range::
4560
4560
4561 hg log -k alice -d "may 2008 to jul 2008"
4561 hg log -k alice -d "may 2008 to jul 2008"
4562
4562
4563 - summary of all changesets after the last tag::
4563 - summary of all changesets after the last tag::
4564
4564
4565 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4565 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4566
4566
4567 See :hg:`help dates` for a list of formats valid for -d/--date.
4567 See :hg:`help dates` for a list of formats valid for -d/--date.
4568
4568
4569 See :hg:`help revisions` and :hg:`help revsets` for more about
4569 See :hg:`help revisions` and :hg:`help revsets` for more about
4570 specifying and ordering revisions.
4570 specifying and ordering revisions.
4571
4571
4572 See :hg:`help templates` for more about pre-packaged styles and
4572 See :hg:`help templates` for more about pre-packaged styles and
4573 specifying custom templates.
4573 specifying custom templates.
4574
4574
4575 Returns 0 on success.
4575 Returns 0 on success.
4576
4576
4577 """
4577 """
4578 if opts.get('follow') and opts.get('rev'):
4578 if opts.get('follow') and opts.get('rev'):
4579 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
4579 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
4580 del opts['follow']
4580 del opts['follow']
4581
4581
4582 if opts.get('graph'):
4582 if opts.get('graph'):
4583 return cmdutil.graphlog(ui, repo, *pats, **opts)
4583 return cmdutil.graphlog(ui, repo, *pats, **opts)
4584
4584
4585 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4585 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4586 limit = cmdutil.loglimit(opts)
4586 limit = cmdutil.loglimit(opts)
4587 count = 0
4587 count = 0
4588
4588
4589 getrenamed = None
4589 getrenamed = None
4590 if opts.get('copies'):
4590 if opts.get('copies'):
4591 endrev = None
4591 endrev = None
4592 if opts.get('rev'):
4592 if opts.get('rev'):
4593 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4593 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4594 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4594 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4595
4595
4596 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4596 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4597 for rev in revs:
4597 for rev in revs:
4598 if count == limit:
4598 if count == limit:
4599 break
4599 break
4600 ctx = repo[rev]
4600 ctx = repo[rev]
4601 copies = None
4601 copies = None
4602 if getrenamed is not None and rev:
4602 if getrenamed is not None and rev:
4603 copies = []
4603 copies = []
4604 for fn in ctx.files():
4604 for fn in ctx.files():
4605 rename = getrenamed(fn, rev)
4605 rename = getrenamed(fn, rev)
4606 if rename:
4606 if rename:
4607 copies.append((fn, rename[0]))
4607 copies.append((fn, rename[0]))
4608 if filematcher:
4608 if filematcher:
4609 revmatchfn = filematcher(ctx.rev())
4609 revmatchfn = filematcher(ctx.rev())
4610 else:
4610 else:
4611 revmatchfn = None
4611 revmatchfn = None
4612 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4612 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4613 if displayer.flush(ctx):
4613 if displayer.flush(ctx):
4614 count += 1
4614 count += 1
4615
4615
4616 displayer.close()
4616 displayer.close()
4617
4617
4618 @command('manifest',
4618 @command('manifest',
4619 [('r', 'rev', '', _('revision to display'), _('REV')),
4619 [('r', 'rev', '', _('revision to display'), _('REV')),
4620 ('', 'all', False, _("list files from all revisions"))]
4620 ('', 'all', False, _("list files from all revisions"))]
4621 + formatteropts,
4621 + formatteropts,
4622 _('[-r REV]'))
4622 _('[-r REV]'))
4623 def manifest(ui, repo, node=None, rev=None, **opts):
4623 def manifest(ui, repo, node=None, rev=None, **opts):
4624 """output the current or given revision of the project manifest
4624 """output the current or given revision of the project manifest
4625
4625
4626 Print a list of version controlled files for the given revision.
4626 Print a list of version controlled files for the given revision.
4627 If no revision is given, the first parent of the working directory
4627 If no revision is given, the first parent of the working directory
4628 is used, or the null revision if no revision is checked out.
4628 is used, or the null revision if no revision is checked out.
4629
4629
4630 With -v, print file permissions, symlink and executable bits.
4630 With -v, print file permissions, symlink and executable bits.
4631 With --debug, print file revision hashes.
4631 With --debug, print file revision hashes.
4632
4632
4633 If option --all is specified, the list of all files from all revisions
4633 If option --all is specified, the list of all files from all revisions
4634 is printed. This includes deleted and renamed files.
4634 is printed. This includes deleted and renamed files.
4635
4635
4636 Returns 0 on success.
4636 Returns 0 on success.
4637 """
4637 """
4638
4638
4639 fm = ui.formatter('manifest', opts)
4639 fm = ui.formatter('manifest', opts)
4640
4640
4641 if opts.get('all'):
4641 if opts.get('all'):
4642 if rev or node:
4642 if rev or node:
4643 raise error.Abort(_("can't specify a revision with --all"))
4643 raise error.Abort(_("can't specify a revision with --all"))
4644
4644
4645 res = []
4645 res = []
4646 prefix = "data/"
4646 prefix = "data/"
4647 suffix = ".i"
4647 suffix = ".i"
4648 plen = len(prefix)
4648 plen = len(prefix)
4649 slen = len(suffix)
4649 slen = len(suffix)
4650 with repo.lock():
4650 with repo.lock():
4651 for fn, b, size in repo.store.datafiles():
4651 for fn, b, size in repo.store.datafiles():
4652 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4652 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4653 res.append(fn[plen:-slen])
4653 res.append(fn[plen:-slen])
4654 for f in res:
4654 for f in res:
4655 fm.startitem()
4655 fm.startitem()
4656 fm.write("path", '%s\n', f)
4656 fm.write("path", '%s\n', f)
4657 fm.end()
4657 fm.end()
4658 return
4658 return
4659
4659
4660 if rev and node:
4660 if rev and node:
4661 raise error.Abort(_("please specify just one revision"))
4661 raise error.Abort(_("please specify just one revision"))
4662
4662
4663 if not node:
4663 if not node:
4664 node = rev
4664 node = rev
4665
4665
4666 char = {'l': '@', 'x': '*', '': ''}
4666 char = {'l': '@', 'x': '*', '': ''}
4667 mode = {'l': '644', 'x': '755', '': '644'}
4667 mode = {'l': '644', 'x': '755', '': '644'}
4668 ctx = scmutil.revsingle(repo, node)
4668 ctx = scmutil.revsingle(repo, node)
4669 mf = ctx.manifest()
4669 mf = ctx.manifest()
4670 for f in ctx:
4670 for f in ctx:
4671 fm.startitem()
4671 fm.startitem()
4672 fl = ctx[f].flags()
4672 fl = ctx[f].flags()
4673 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4673 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4674 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4674 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4675 fm.write('path', '%s\n', f)
4675 fm.write('path', '%s\n', f)
4676 fm.end()
4676 fm.end()
4677
4677
4678 @command('^merge',
4678 @command('^merge',
4679 [('f', 'force', None,
4679 [('f', 'force', None,
4680 _('force a merge including outstanding changes (DEPRECATED)')),
4680 _('force a merge including outstanding changes (DEPRECATED)')),
4681 ('r', 'rev', '', _('revision to merge'), _('REV')),
4681 ('r', 'rev', '', _('revision to merge'), _('REV')),
4682 ('P', 'preview', None,
4682 ('P', 'preview', None,
4683 _('review revisions to merge (no merge is performed)'))
4683 _('review revisions to merge (no merge is performed)'))
4684 ] + mergetoolopts,
4684 ] + mergetoolopts,
4685 _('[-P] [[-r] REV]'))
4685 _('[-P] [[-r] REV]'))
4686 def merge(ui, repo, node=None, **opts):
4686 def merge(ui, repo, node=None, **opts):
4687 """merge another revision into working directory
4687 """merge another revision into working directory
4688
4688
4689 The current working directory is updated with all changes made in
4689 The current working directory is updated with all changes made in
4690 the requested revision since the last common predecessor revision.
4690 the requested revision since the last common predecessor revision.
4691
4691
4692 Files that changed between either parent are marked as changed for
4692 Files that changed between either parent are marked as changed for
4693 the next commit and a commit must be performed before any further
4693 the next commit and a commit must be performed before any further
4694 updates to the repository are allowed. The next commit will have
4694 updates to the repository are allowed. The next commit will have
4695 two parents.
4695 two parents.
4696
4696
4697 ``--tool`` can be used to specify the merge tool used for file
4697 ``--tool`` can be used to specify the merge tool used for file
4698 merges. It overrides the HGMERGE environment variable and your
4698 merges. It overrides the HGMERGE environment variable and your
4699 configuration files. See :hg:`help merge-tools` for options.
4699 configuration files. See :hg:`help merge-tools` for options.
4700
4700
4701 If no revision is specified, the working directory's parent is a
4701 If no revision is specified, the working directory's parent is a
4702 head revision, and the current branch contains exactly one other
4702 head revision, and the current branch contains exactly one other
4703 head, the other head is merged with by default. Otherwise, an
4703 head, the other head is merged with by default. Otherwise, an
4704 explicit revision with which to merge with must be provided.
4704 explicit revision with which to merge with must be provided.
4705
4705
4706 See :hg:`help resolve` for information on handling file conflicts.
4706 See :hg:`help resolve` for information on handling file conflicts.
4707
4707
4708 To undo an uncommitted merge, use :hg:`update --clean .` which
4708 To undo an uncommitted merge, use :hg:`update --clean .` which
4709 will check out a clean copy of the original merge parent, losing
4709 will check out a clean copy of the original merge parent, losing
4710 all changes.
4710 all changes.
4711
4711
4712 Returns 0 on success, 1 if there are unresolved files.
4712 Returns 0 on success, 1 if there are unresolved files.
4713 """
4713 """
4714
4714
4715 if opts.get('rev') and node:
4715 if opts.get('rev') and node:
4716 raise error.Abort(_("please specify just one revision"))
4716 raise error.Abort(_("please specify just one revision"))
4717 if not node:
4717 if not node:
4718 node = opts.get('rev')
4718 node = opts.get('rev')
4719
4719
4720 if node:
4720 if node:
4721 node = scmutil.revsingle(repo, node).node()
4721 node = scmutil.revsingle(repo, node).node()
4722
4722
4723 if not node:
4723 if not node:
4724 node = repo[destutil.destmerge(repo)].node()
4724 node = repo[destutil.destmerge(repo)].node()
4725
4725
4726 if opts.get('preview'):
4726 if opts.get('preview'):
4727 # find nodes that are ancestors of p2 but not of p1
4727 # find nodes that are ancestors of p2 but not of p1
4728 p1 = repo.lookup('.')
4728 p1 = repo.lookup('.')
4729 p2 = repo.lookup(node)
4729 p2 = repo.lookup(node)
4730 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4730 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4731
4731
4732 displayer = cmdutil.show_changeset(ui, repo, opts)
4732 displayer = cmdutil.show_changeset(ui, repo, opts)
4733 for node in nodes:
4733 for node in nodes:
4734 displayer.show(repo[node])
4734 displayer.show(repo[node])
4735 displayer.close()
4735 displayer.close()
4736 return 0
4736 return 0
4737
4737
4738 try:
4738 try:
4739 # ui.forcemerge is an internal variable, do not document
4739 # ui.forcemerge is an internal variable, do not document
4740 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4740 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4741 force = opts.get('force')
4741 force = opts.get('force')
4742 labels = ['working copy', 'merge rev']
4742 labels = ['working copy', 'merge rev']
4743 return hg.merge(repo, node, force=force, mergeforce=force,
4743 return hg.merge(repo, node, force=force, mergeforce=force,
4744 labels=labels)
4744 labels=labels)
4745 finally:
4745 finally:
4746 ui.setconfig('ui', 'forcemerge', '', 'merge')
4746 ui.setconfig('ui', 'forcemerge', '', 'merge')
4747
4747
4748 @command('outgoing|out',
4748 @command('outgoing|out',
4749 [('f', 'force', None, _('run even when the destination is unrelated')),
4749 [('f', 'force', None, _('run even when the destination is unrelated')),
4750 ('r', 'rev', [],
4750 ('r', 'rev', [],
4751 _('a changeset intended to be included in the destination'), _('REV')),
4751 _('a changeset intended to be included in the destination'), _('REV')),
4752 ('n', 'newest-first', None, _('show newest record first')),
4752 ('n', 'newest-first', None, _('show newest record first')),
4753 ('B', 'bookmarks', False, _('compare bookmarks')),
4753 ('B', 'bookmarks', False, _('compare bookmarks')),
4754 ('b', 'branch', [], _('a specific branch you would like to push'),
4754 ('b', 'branch', [], _('a specific branch you would like to push'),
4755 _('BRANCH')),
4755 _('BRANCH')),
4756 ] + logopts + remoteopts + subrepoopts,
4756 ] + logopts + remoteopts + subrepoopts,
4757 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4757 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4758 def outgoing(ui, repo, dest=None, **opts):
4758 def outgoing(ui, repo, dest=None, **opts):
4759 """show changesets not found in the destination
4759 """show changesets not found in the destination
4760
4760
4761 Show changesets not found in the specified destination repository
4761 Show changesets not found in the specified destination repository
4762 or the default push location. These are the changesets that would
4762 or the default push location. These are the changesets that would
4763 be pushed if a push was requested.
4763 be pushed if a push was requested.
4764
4764
4765 See pull for details of valid destination formats.
4765 See pull for details of valid destination formats.
4766
4766
4767 .. container:: verbose
4767 .. container:: verbose
4768
4768
4769 With -B/--bookmarks, the result of bookmark comparison between
4769 With -B/--bookmarks, the result of bookmark comparison between
4770 local and remote repositories is displayed. With -v/--verbose,
4770 local and remote repositories is displayed. With -v/--verbose,
4771 status is also displayed for each bookmark like below::
4771 status is also displayed for each bookmark like below::
4772
4772
4773 BM1 01234567890a added
4773 BM1 01234567890a added
4774 BM2 deleted
4774 BM2 deleted
4775 BM3 234567890abc advanced
4775 BM3 234567890abc advanced
4776 BM4 34567890abcd diverged
4776 BM4 34567890abcd diverged
4777 BM5 4567890abcde changed
4777 BM5 4567890abcde changed
4778
4778
4779 The action taken when pushing depends on the
4779 The action taken when pushing depends on the
4780 status of each bookmark:
4780 status of each bookmark:
4781
4781
4782 :``added``: push with ``-B`` will create it
4782 :``added``: push with ``-B`` will create it
4783 :``deleted``: push with ``-B`` will delete it
4783 :``deleted``: push with ``-B`` will delete it
4784 :``advanced``: push will update it
4784 :``advanced``: push will update it
4785 :``diverged``: push with ``-B`` will update it
4785 :``diverged``: push with ``-B`` will update it
4786 :``changed``: push with ``-B`` will update it
4786 :``changed``: push with ``-B`` will update it
4787
4787
4788 From the point of view of pushing behavior, bookmarks
4788 From the point of view of pushing behavior, bookmarks
4789 existing only in the remote repository are treated as
4789 existing only in the remote repository are treated as
4790 ``deleted``, even if it is in fact added remotely.
4790 ``deleted``, even if it is in fact added remotely.
4791
4791
4792 Returns 0 if there are outgoing changes, 1 otherwise.
4792 Returns 0 if there are outgoing changes, 1 otherwise.
4793 """
4793 """
4794 if opts.get('graph'):
4794 if opts.get('graph'):
4795 cmdutil.checkunsupportedgraphflags([], opts)
4795 cmdutil.checkunsupportedgraphflags([], opts)
4796 o, other = hg._outgoing(ui, repo, dest, opts)
4796 o, other = hg._outgoing(ui, repo, dest, opts)
4797 if not o:
4797 if not o:
4798 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4798 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4799 return
4799 return
4800
4800
4801 revdag = cmdutil.graphrevs(repo, o, opts)
4801 revdag = cmdutil.graphrevs(repo, o, opts)
4802 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4802 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4803 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
4803 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
4804 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4804 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4805 return 0
4805 return 0
4806
4806
4807 if opts.get('bookmarks'):
4807 if opts.get('bookmarks'):
4808 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4808 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4809 dest, branches = hg.parseurl(dest, opts.get('branch'))
4809 dest, branches = hg.parseurl(dest, opts.get('branch'))
4810 other = hg.peer(repo, opts, dest)
4810 other = hg.peer(repo, opts, dest)
4811 if 'bookmarks' not in other.listkeys('namespaces'):
4811 if 'bookmarks' not in other.listkeys('namespaces'):
4812 ui.warn(_("remote doesn't support bookmarks\n"))
4812 ui.warn(_("remote doesn't support bookmarks\n"))
4813 return 0
4813 return 0
4814 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4814 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4815 return bookmarks.outgoing(ui, repo, other)
4815 return bookmarks.outgoing(ui, repo, other)
4816
4816
4817 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4817 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4818 try:
4818 try:
4819 return hg.outgoing(ui, repo, dest, opts)
4819 return hg.outgoing(ui, repo, dest, opts)
4820 finally:
4820 finally:
4821 del repo._subtoppath
4821 del repo._subtoppath
4822
4822
4823 @command('parents',
4823 @command('parents',
4824 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4824 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4825 ] + templateopts,
4825 ] + templateopts,
4826 _('[-r REV] [FILE]'),
4826 _('[-r REV] [FILE]'),
4827 inferrepo=True)
4827 inferrepo=True)
4828 def parents(ui, repo, file_=None, **opts):
4828 def parents(ui, repo, file_=None, **opts):
4829 """show the parents of the working directory or revision (DEPRECATED)
4829 """show the parents of the working directory or revision (DEPRECATED)
4830
4830
4831 Print the working directory's parent revisions. If a revision is
4831 Print the working directory's parent revisions. If a revision is
4832 given via -r/--rev, the parent of that revision will be printed.
4832 given via -r/--rev, the parent of that revision will be printed.
4833 If a file argument is given, the revision in which the file was
4833 If a file argument is given, the revision in which the file was
4834 last changed (before the working directory revision or the
4834 last changed (before the working directory revision or the
4835 argument to --rev if given) is printed.
4835 argument to --rev if given) is printed.
4836
4836
4837 This command is equivalent to::
4837 This command is equivalent to::
4838
4838
4839 hg log -r "p1()+p2()" or
4839 hg log -r "p1()+p2()" or
4840 hg log -r "p1(REV)+p2(REV)" or
4840 hg log -r "p1(REV)+p2(REV)" or
4841 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4841 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4842 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4842 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4843
4843
4844 See :hg:`summary` and :hg:`help revsets` for related information.
4844 See :hg:`summary` and :hg:`help revsets` for related information.
4845
4845
4846 Returns 0 on success.
4846 Returns 0 on success.
4847 """
4847 """
4848
4848
4849 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4849 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4850
4850
4851 if file_:
4851 if file_:
4852 m = scmutil.match(ctx, (file_,), opts)
4852 m = scmutil.match(ctx, (file_,), opts)
4853 if m.anypats() or len(m.files()) != 1:
4853 if m.anypats() or len(m.files()) != 1:
4854 raise error.Abort(_('can only specify an explicit filename'))
4854 raise error.Abort(_('can only specify an explicit filename'))
4855 file_ = m.files()[0]
4855 file_ = m.files()[0]
4856 filenodes = []
4856 filenodes = []
4857 for cp in ctx.parents():
4857 for cp in ctx.parents():
4858 if not cp:
4858 if not cp:
4859 continue
4859 continue
4860 try:
4860 try:
4861 filenodes.append(cp.filenode(file_))
4861 filenodes.append(cp.filenode(file_))
4862 except error.LookupError:
4862 except error.LookupError:
4863 pass
4863 pass
4864 if not filenodes:
4864 if not filenodes:
4865 raise error.Abort(_("'%s' not found in manifest!") % file_)
4865 raise error.Abort(_("'%s' not found in manifest!") % file_)
4866 p = []
4866 p = []
4867 for fn in filenodes:
4867 for fn in filenodes:
4868 fctx = repo.filectx(file_, fileid=fn)
4868 fctx = repo.filectx(file_, fileid=fn)
4869 p.append(fctx.node())
4869 p.append(fctx.node())
4870 else:
4870 else:
4871 p = [cp.node() for cp in ctx.parents()]
4871 p = [cp.node() for cp in ctx.parents()]
4872
4872
4873 displayer = cmdutil.show_changeset(ui, repo, opts)
4873 displayer = cmdutil.show_changeset(ui, repo, opts)
4874 for n in p:
4874 for n in p:
4875 if n != nullid:
4875 if n != nullid:
4876 displayer.show(repo[n])
4876 displayer.show(repo[n])
4877 displayer.close()
4877 displayer.close()
4878
4878
4879 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
4879 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
4880 def paths(ui, repo, search=None, **opts):
4880 def paths(ui, repo, search=None, **opts):
4881 """show aliases for remote repositories
4881 """show aliases for remote repositories
4882
4882
4883 Show definition of symbolic path name NAME. If no name is given,
4883 Show definition of symbolic path name NAME. If no name is given,
4884 show definition of all available names.
4884 show definition of all available names.
4885
4885
4886 Option -q/--quiet suppresses all output when searching for NAME
4886 Option -q/--quiet suppresses all output when searching for NAME
4887 and shows only the path names when listing all definitions.
4887 and shows only the path names when listing all definitions.
4888
4888
4889 Path names are defined in the [paths] section of your
4889 Path names are defined in the [paths] section of your
4890 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4890 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4891 repository, ``.hg/hgrc`` is used, too.
4891 repository, ``.hg/hgrc`` is used, too.
4892
4892
4893 The path names ``default`` and ``default-push`` have a special
4893 The path names ``default`` and ``default-push`` have a special
4894 meaning. When performing a push or pull operation, they are used
4894 meaning. When performing a push or pull operation, they are used
4895 as fallbacks if no location is specified on the command-line.
4895 as fallbacks if no location is specified on the command-line.
4896 When ``default-push`` is set, it will be used for push and
4896 When ``default-push`` is set, it will be used for push and
4897 ``default`` will be used for pull; otherwise ``default`` is used
4897 ``default`` will be used for pull; otherwise ``default`` is used
4898 as the fallback for both. When cloning a repository, the clone
4898 as the fallback for both. When cloning a repository, the clone
4899 source is written as ``default`` in ``.hg/hgrc``.
4899 source is written as ``default`` in ``.hg/hgrc``.
4900
4900
4901 .. note::
4901 .. note::
4902
4902
4903 ``default`` and ``default-push`` apply to all inbound (e.g.
4903 ``default`` and ``default-push`` apply to all inbound (e.g.
4904 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4904 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4905 and :hg:`bundle`) operations.
4905 and :hg:`bundle`) operations.
4906
4906
4907 See :hg:`help urls` for more information.
4907 See :hg:`help urls` for more information.
4908
4908
4909 Returns 0 on success.
4909 Returns 0 on success.
4910 """
4910 """
4911 if search:
4911 if search:
4912 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4912 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4913 if name == search]
4913 if name == search]
4914 else:
4914 else:
4915 pathitems = sorted(ui.paths.iteritems())
4915 pathitems = sorted(ui.paths.iteritems())
4916
4916
4917 fm = ui.formatter('paths', opts)
4917 fm = ui.formatter('paths', opts)
4918 if fm.isplain():
4918 if fm.isplain():
4919 hidepassword = util.hidepassword
4919 hidepassword = util.hidepassword
4920 else:
4920 else:
4921 hidepassword = str
4921 hidepassword = str
4922 if ui.quiet:
4922 if ui.quiet:
4923 namefmt = '%s\n'
4923 namefmt = '%s\n'
4924 else:
4924 else:
4925 namefmt = '%s = '
4925 namefmt = '%s = '
4926 showsubopts = not search and not ui.quiet
4926 showsubopts = not search and not ui.quiet
4927
4927
4928 for name, path in pathitems:
4928 for name, path in pathitems:
4929 fm.startitem()
4929 fm.startitem()
4930 fm.condwrite(not search, 'name', namefmt, name)
4930 fm.condwrite(not search, 'name', namefmt, name)
4931 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4931 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4932 for subopt, value in sorted(path.suboptions.items()):
4932 for subopt, value in sorted(path.suboptions.items()):
4933 assert subopt not in ('name', 'url')
4933 assert subopt not in ('name', 'url')
4934 if showsubopts:
4934 if showsubopts:
4935 fm.plain('%s:%s = ' % (name, subopt))
4935 fm.plain('%s:%s = ' % (name, subopt))
4936 fm.condwrite(showsubopts, subopt, '%s\n', value)
4936 fm.condwrite(showsubopts, subopt, '%s\n', value)
4937
4937
4938 fm.end()
4938 fm.end()
4939
4939
4940 if search and not pathitems:
4940 if search and not pathitems:
4941 if not ui.quiet:
4941 if not ui.quiet:
4942 ui.warn(_("not found!\n"))
4942 ui.warn(_("not found!\n"))
4943 return 1
4943 return 1
4944 else:
4944 else:
4945 return 0
4945 return 0
4946
4946
4947 @command('phase',
4947 @command('phase',
4948 [('p', 'public', False, _('set changeset phase to public')),
4948 [('p', 'public', False, _('set changeset phase to public')),
4949 ('d', 'draft', False, _('set changeset phase to draft')),
4949 ('d', 'draft', False, _('set changeset phase to draft')),
4950 ('s', 'secret', False, _('set changeset phase to secret')),
4950 ('s', 'secret', False, _('set changeset phase to secret')),
4951 ('f', 'force', False, _('allow to move boundary backward')),
4951 ('f', 'force', False, _('allow to move boundary backward')),
4952 ('r', 'rev', [], _('target revision'), _('REV')),
4952 ('r', 'rev', [], _('target revision'), _('REV')),
4953 ],
4953 ],
4954 _('[-p|-d|-s] [-f] [-r] [REV...]'))
4954 _('[-p|-d|-s] [-f] [-r] [REV...]'))
4955 def phase(ui, repo, *revs, **opts):
4955 def phase(ui, repo, *revs, **opts):
4956 """set or show the current phase name
4956 """set or show the current phase name
4957
4957
4958 With no argument, show the phase name of the current revision(s).
4958 With no argument, show the phase name of the current revision(s).
4959
4959
4960 With one of -p/--public, -d/--draft or -s/--secret, change the
4960 With one of -p/--public, -d/--draft or -s/--secret, change the
4961 phase value of the specified revisions.
4961 phase value of the specified revisions.
4962
4962
4963 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4963 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4964 lower phase to an higher phase. Phases are ordered as follows::
4964 lower phase to an higher phase. Phases are ordered as follows::
4965
4965
4966 public < draft < secret
4966 public < draft < secret
4967
4967
4968 Returns 0 on success, 1 if some phases could not be changed.
4968 Returns 0 on success, 1 if some phases could not be changed.
4969
4969
4970 (For more information about the phases concept, see :hg:`help phases`.)
4970 (For more information about the phases concept, see :hg:`help phases`.)
4971 """
4971 """
4972 # search for a unique phase argument
4972 # search for a unique phase argument
4973 targetphase = None
4973 targetphase = None
4974 for idx, name in enumerate(phases.phasenames):
4974 for idx, name in enumerate(phases.phasenames):
4975 if opts[name]:
4975 if opts[name]:
4976 if targetphase is not None:
4976 if targetphase is not None:
4977 raise error.Abort(_('only one phase can be specified'))
4977 raise error.Abort(_('only one phase can be specified'))
4978 targetphase = idx
4978 targetphase = idx
4979
4979
4980 # look for specified revision
4980 # look for specified revision
4981 revs = list(revs)
4981 revs = list(revs)
4982 revs.extend(opts['rev'])
4982 revs.extend(opts['rev'])
4983 if not revs:
4983 if not revs:
4984 # display both parents as the second parent phase can influence
4984 # display both parents as the second parent phase can influence
4985 # the phase of a merge commit
4985 # the phase of a merge commit
4986 revs = [c.rev() for c in repo[None].parents()]
4986 revs = [c.rev() for c in repo[None].parents()]
4987
4987
4988 revs = scmutil.revrange(repo, revs)
4988 revs = scmutil.revrange(repo, revs)
4989
4989
4990 lock = None
4990 lock = None
4991 ret = 0
4991 ret = 0
4992 if targetphase is None:
4992 if targetphase is None:
4993 # display
4993 # display
4994 for r in revs:
4994 for r in revs:
4995 ctx = repo[r]
4995 ctx = repo[r]
4996 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4996 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4997 else:
4997 else:
4998 tr = None
4998 tr = None
4999 lock = repo.lock()
4999 lock = repo.lock()
5000 try:
5000 try:
5001 tr = repo.transaction("phase")
5001 tr = repo.transaction("phase")
5002 # set phase
5002 # set phase
5003 if not revs:
5003 if not revs:
5004 raise error.Abort(_('empty revision set'))
5004 raise error.Abort(_('empty revision set'))
5005 nodes = [repo[r].node() for r in revs]
5005 nodes = [repo[r].node() for r in revs]
5006 # moving revision from public to draft may hide them
5006 # moving revision from public to draft may hide them
5007 # We have to check result on an unfiltered repository
5007 # We have to check result on an unfiltered repository
5008 unfi = repo.unfiltered()
5008 unfi = repo.unfiltered()
5009 getphase = unfi._phasecache.phase
5009 getphase = unfi._phasecache.phase
5010 olddata = [getphase(unfi, r) for r in unfi]
5010 olddata = [getphase(unfi, r) for r in unfi]
5011 phases.advanceboundary(repo, tr, targetphase, nodes)
5011 phases.advanceboundary(repo, tr, targetphase, nodes)
5012 if opts['force']:
5012 if opts['force']:
5013 phases.retractboundary(repo, tr, targetphase, nodes)
5013 phases.retractboundary(repo, tr, targetphase, nodes)
5014 tr.close()
5014 tr.close()
5015 finally:
5015 finally:
5016 if tr is not None:
5016 if tr is not None:
5017 tr.release()
5017 tr.release()
5018 lock.release()
5018 lock.release()
5019 getphase = unfi._phasecache.phase
5019 getphase = unfi._phasecache.phase
5020 newdata = [getphase(unfi, r) for r in unfi]
5020 newdata = [getphase(unfi, r) for r in unfi]
5021 changes = sum(newdata[r] != olddata[r] for r in unfi)
5021 changes = sum(newdata[r] != olddata[r] for r in unfi)
5022 cl = unfi.changelog
5022 cl = unfi.changelog
5023 rejected = [n for n in nodes
5023 rejected = [n for n in nodes
5024 if newdata[cl.rev(n)] < targetphase]
5024 if newdata[cl.rev(n)] < targetphase]
5025 if rejected:
5025 if rejected:
5026 ui.warn(_('cannot move %i changesets to a higher '
5026 ui.warn(_('cannot move %i changesets to a higher '
5027 'phase, use --force\n') % len(rejected))
5027 'phase, use --force\n') % len(rejected))
5028 ret = 1
5028 ret = 1
5029 if changes:
5029 if changes:
5030 msg = _('phase changed for %i changesets\n') % changes
5030 msg = _('phase changed for %i changesets\n') % changes
5031 if ret:
5031 if ret:
5032 ui.status(msg)
5032 ui.status(msg)
5033 else:
5033 else:
5034 ui.note(msg)
5034 ui.note(msg)
5035 else:
5035 else:
5036 ui.warn(_('no phases changed\n'))
5036 ui.warn(_('no phases changed\n'))
5037 return ret
5037 return ret
5038
5038
5039 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5039 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5040 """Run after a changegroup has been added via pull/unbundle
5040 """Run after a changegroup has been added via pull/unbundle
5041
5041
5042 This takes arguments below:
5042 This takes arguments below:
5043
5043
5044 :modheads: change of heads by pull/unbundle
5044 :modheads: change of heads by pull/unbundle
5045 :optupdate: updating working directory is needed or not
5045 :optupdate: updating working directory is needed or not
5046 :checkout: update destination revision (or None to default destination)
5046 :checkout: update destination revision (or None to default destination)
5047 :brev: a name, which might be a bookmark to be activated after updating
5047 :brev: a name, which might be a bookmark to be activated after updating
5048 """
5048 """
5049 if modheads == 0:
5049 if modheads == 0:
5050 return
5050 return
5051 if optupdate:
5051 if optupdate:
5052 try:
5052 try:
5053 return hg.updatetotally(ui, repo, checkout, brev)
5053 return hg.updatetotally(ui, repo, checkout, brev)
5054 except error.UpdateAbort as inst:
5054 except error.UpdateAbort as inst:
5055 msg = _("not updating: %s") % str(inst)
5055 msg = _("not updating: %s") % str(inst)
5056 hint = inst.hint
5056 hint = inst.hint
5057 raise error.UpdateAbort(msg, hint=hint)
5057 raise error.UpdateAbort(msg, hint=hint)
5058 if modheads > 1:
5058 if modheads > 1:
5059 currentbranchheads = len(repo.branchheads())
5059 currentbranchheads = len(repo.branchheads())
5060 if currentbranchheads == modheads:
5060 if currentbranchheads == modheads:
5061 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5061 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5062 elif currentbranchheads > 1:
5062 elif currentbranchheads > 1:
5063 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5063 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5064 "merge)\n"))
5064 "merge)\n"))
5065 else:
5065 else:
5066 ui.status(_("(run 'hg heads' to see heads)\n"))
5066 ui.status(_("(run 'hg heads' to see heads)\n"))
5067 else:
5067 else:
5068 ui.status(_("(run 'hg update' to get a working copy)\n"))
5068 ui.status(_("(run 'hg update' to get a working copy)\n"))
5069
5069
5070 @command('^pull',
5070 @command('^pull',
5071 [('u', 'update', None,
5071 [('u', 'update', None,
5072 _('update to new branch head if changesets were pulled')),
5072 _('update to new branch head if changesets were pulled')),
5073 ('f', 'force', None, _('run even when remote repository is unrelated')),
5073 ('f', 'force', None, _('run even when remote repository is unrelated')),
5074 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5074 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5075 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5075 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5076 ('b', 'branch', [], _('a specific branch you would like to pull'),
5076 ('b', 'branch', [], _('a specific branch you would like to pull'),
5077 _('BRANCH')),
5077 _('BRANCH')),
5078 ] + remoteopts,
5078 ] + remoteopts,
5079 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5079 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5080 def pull(ui, repo, source="default", **opts):
5080 def pull(ui, repo, source="default", **opts):
5081 """pull changes from the specified source
5081 """pull changes from the specified source
5082
5082
5083 Pull changes from a remote repository to a local one.
5083 Pull changes from a remote repository to a local one.
5084
5084
5085 This finds all changes from the repository at the specified path
5085 This finds all changes from the repository at the specified path
5086 or URL and adds them to a local repository (the current one unless
5086 or URL and adds them to a local repository (the current one unless
5087 -R is specified). By default, this does not update the copy of the
5087 -R is specified). By default, this does not update the copy of the
5088 project in the working directory.
5088 project in the working directory.
5089
5089
5090 Use :hg:`incoming` if you want to see what would have been added
5090 Use :hg:`incoming` if you want to see what would have been added
5091 by a pull at the time you issued this command. If you then decide
5091 by a pull at the time you issued this command. If you then decide
5092 to add those changes to the repository, you should use :hg:`pull
5092 to add those changes to the repository, you should use :hg:`pull
5093 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5093 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5094
5094
5095 If SOURCE is omitted, the 'default' path will be used.
5095 If SOURCE is omitted, the 'default' path will be used.
5096 See :hg:`help urls` for more information.
5096 See :hg:`help urls` for more information.
5097
5097
5098 Specifying bookmark as ``.`` is equivalent to specifying the active
5098 Specifying bookmark as ``.`` is equivalent to specifying the active
5099 bookmark's name.
5099 bookmark's name.
5100
5100
5101 Returns 0 on success, 1 if an update had unresolved files.
5101 Returns 0 on success, 1 if an update had unresolved files.
5102 """
5102 """
5103 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5103 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5104 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5104 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5105 other = hg.peer(repo, opts, source)
5105 other = hg.peer(repo, opts, source)
5106 try:
5106 try:
5107 revs, checkout = hg.addbranchrevs(repo, other, branches,
5107 revs, checkout = hg.addbranchrevs(repo, other, branches,
5108 opts.get('rev'))
5108 opts.get('rev'))
5109
5109
5110
5110
5111 pullopargs = {}
5111 pullopargs = {}
5112 if opts.get('bookmark'):
5112 if opts.get('bookmark'):
5113 if not revs:
5113 if not revs:
5114 revs = []
5114 revs = []
5115 # The list of bookmark used here is not the one used to actually
5115 # The list of bookmark used here is not the one used to actually
5116 # update the bookmark name. This can result in the revision pulled
5116 # update the bookmark name. This can result in the revision pulled
5117 # not ending up with the name of the bookmark because of a race
5117 # not ending up with the name of the bookmark because of a race
5118 # condition on the server. (See issue 4689 for details)
5118 # condition on the server. (See issue 4689 for details)
5119 remotebookmarks = other.listkeys('bookmarks')
5119 remotebookmarks = other.listkeys('bookmarks')
5120 pullopargs['remotebookmarks'] = remotebookmarks
5120 pullopargs['remotebookmarks'] = remotebookmarks
5121 for b in opts['bookmark']:
5121 for b in opts['bookmark']:
5122 b = repo._bookmarks.expandname(b)
5122 b = repo._bookmarks.expandname(b)
5123 if b not in remotebookmarks:
5123 if b not in remotebookmarks:
5124 raise error.Abort(_('remote bookmark %s not found!') % b)
5124 raise error.Abort(_('remote bookmark %s not found!') % b)
5125 revs.append(remotebookmarks[b])
5125 revs.append(remotebookmarks[b])
5126
5126
5127 if revs:
5127 if revs:
5128 try:
5128 try:
5129 # When 'rev' is a bookmark name, we cannot guarantee that it
5129 # When 'rev' is a bookmark name, we cannot guarantee that it
5130 # will be updated with that name because of a race condition
5130 # will be updated with that name because of a race condition
5131 # server side. (See issue 4689 for details)
5131 # server side. (See issue 4689 for details)
5132 oldrevs = revs
5132 oldrevs = revs
5133 revs = [] # actually, nodes
5133 revs = [] # actually, nodes
5134 for r in oldrevs:
5134 for r in oldrevs:
5135 node = other.lookup(r)
5135 node = other.lookup(r)
5136 revs.append(node)
5136 revs.append(node)
5137 if r == checkout:
5137 if r == checkout:
5138 checkout = node
5138 checkout = node
5139 except error.CapabilityError:
5139 except error.CapabilityError:
5140 err = _("other repository doesn't support revision lookup, "
5140 err = _("other repository doesn't support revision lookup, "
5141 "so a rev cannot be specified.")
5141 "so a rev cannot be specified.")
5142 raise error.Abort(err)
5142 raise error.Abort(err)
5143
5143
5144 pullopargs.update(opts.get('opargs', {}))
5144 pullopargs.update(opts.get('opargs', {}))
5145 modheads = exchange.pull(repo, other, heads=revs,
5145 modheads = exchange.pull(repo, other, heads=revs,
5146 force=opts.get('force'),
5146 force=opts.get('force'),
5147 bookmarks=opts.get('bookmark', ()),
5147 bookmarks=opts.get('bookmark', ()),
5148 opargs=pullopargs).cgresult
5148 opargs=pullopargs).cgresult
5149
5149
5150 # brev is a name, which might be a bookmark to be activated at
5150 # brev is a name, which might be a bookmark to be activated at
5151 # the end of the update. In other words, it is an explicit
5151 # the end of the update. In other words, it is an explicit
5152 # destination of the update
5152 # destination of the update
5153 brev = None
5153 brev = None
5154
5154
5155 if checkout:
5155 if checkout:
5156 checkout = str(repo.changelog.rev(checkout))
5156 checkout = str(repo.changelog.rev(checkout))
5157
5157
5158 # order below depends on implementation of
5158 # order below depends on implementation of
5159 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5159 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5160 # because 'checkout' is determined without it.
5160 # because 'checkout' is determined without it.
5161 if opts.get('rev'):
5161 if opts.get('rev'):
5162 brev = opts['rev'][0]
5162 brev = opts['rev'][0]
5163 elif opts.get('branch'):
5163 elif opts.get('branch'):
5164 brev = opts['branch'][0]
5164 brev = opts['branch'][0]
5165 else:
5165 else:
5166 brev = branches[0]
5166 brev = branches[0]
5167 repo._subtoppath = source
5167 repo._subtoppath = source
5168 try:
5168 try:
5169 ret = postincoming(ui, repo, modheads, opts.get('update'),
5169 ret = postincoming(ui, repo, modheads, opts.get('update'),
5170 checkout, brev)
5170 checkout, brev)
5171
5171
5172 finally:
5172 finally:
5173 del repo._subtoppath
5173 del repo._subtoppath
5174
5174
5175 finally:
5175 finally:
5176 other.close()
5176 other.close()
5177 return ret
5177 return ret
5178
5178
5179 @command('^push',
5179 @command('^push',
5180 [('f', 'force', None, _('force push')),
5180 [('f', 'force', None, _('force push')),
5181 ('r', 'rev', [],
5181 ('r', 'rev', [],
5182 _('a changeset intended to be included in the destination'),
5182 _('a changeset intended to be included in the destination'),
5183 _('REV')),
5183 _('REV')),
5184 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5184 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5185 ('b', 'branch', [],
5185 ('b', 'branch', [],
5186 _('a specific branch you would like to push'), _('BRANCH')),
5186 _('a specific branch you would like to push'), _('BRANCH')),
5187 ('', 'new-branch', False, _('allow pushing a new branch')),
5187 ('', 'new-branch', False, _('allow pushing a new branch')),
5188 ] + remoteopts,
5188 ] + remoteopts,
5189 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5189 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5190 def push(ui, repo, dest=None, **opts):
5190 def push(ui, repo, dest=None, **opts):
5191 """push changes to the specified destination
5191 """push changes to the specified destination
5192
5192
5193 Push changesets from the local repository to the specified
5193 Push changesets from the local repository to the specified
5194 destination.
5194 destination.
5195
5195
5196 This operation is symmetrical to pull: it is identical to a pull
5196 This operation is symmetrical to pull: it is identical to a pull
5197 in the destination repository from the current one.
5197 in the destination repository from the current one.
5198
5198
5199 By default, push will not allow creation of new heads at the
5199 By default, push will not allow creation of new heads at the
5200 destination, since multiple heads would make it unclear which head
5200 destination, since multiple heads would make it unclear which head
5201 to use. In this situation, it is recommended to pull and merge
5201 to use. In this situation, it is recommended to pull and merge
5202 before pushing.
5202 before pushing.
5203
5203
5204 Use --new-branch if you want to allow push to create a new named
5204 Use --new-branch if you want to allow push to create a new named
5205 branch that is not present at the destination. This allows you to
5205 branch that is not present at the destination. This allows you to
5206 only create a new branch without forcing other changes.
5206 only create a new branch without forcing other changes.
5207
5207
5208 .. note::
5208 .. note::
5209
5209
5210 Extra care should be taken with the -f/--force option,
5210 Extra care should be taken with the -f/--force option,
5211 which will push all new heads on all branches, an action which will
5211 which will push all new heads on all branches, an action which will
5212 almost always cause confusion for collaborators.
5212 almost always cause confusion for collaborators.
5213
5213
5214 If -r/--rev is used, the specified revision and all its ancestors
5214 If -r/--rev is used, the specified revision and all its ancestors
5215 will be pushed to the remote repository.
5215 will be pushed to the remote repository.
5216
5216
5217 If -B/--bookmark is used, the specified bookmarked revision, its
5217 If -B/--bookmark is used, the specified bookmarked revision, its
5218 ancestors, and the bookmark will be pushed to the remote
5218 ancestors, and the bookmark will be pushed to the remote
5219 repository. Specifying ``.`` is equivalent to specifying the active
5219 repository. Specifying ``.`` is equivalent to specifying the active
5220 bookmark's name.
5220 bookmark's name.
5221
5221
5222 Please see :hg:`help urls` for important details about ``ssh://``
5222 Please see :hg:`help urls` for important details about ``ssh://``
5223 URLs. If DESTINATION is omitted, a default path will be used.
5223 URLs. If DESTINATION is omitted, a default path will be used.
5224
5224
5225 Returns 0 if push was successful, 1 if nothing to push.
5225 Returns 0 if push was successful, 1 if nothing to push.
5226 """
5226 """
5227
5227
5228 if opts.get('bookmark'):
5228 if opts.get('bookmark'):
5229 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5229 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5230 for b in opts['bookmark']:
5230 for b in opts['bookmark']:
5231 # translate -B options to -r so changesets get pushed
5231 # translate -B options to -r so changesets get pushed
5232 b = repo._bookmarks.expandname(b)
5232 b = repo._bookmarks.expandname(b)
5233 if b in repo._bookmarks:
5233 if b in repo._bookmarks:
5234 opts.setdefault('rev', []).append(b)
5234 opts.setdefault('rev', []).append(b)
5235 else:
5235 else:
5236 # if we try to push a deleted bookmark, translate it to null
5236 # if we try to push a deleted bookmark, translate it to null
5237 # this lets simultaneous -r, -b options continue working
5237 # this lets simultaneous -r, -b options continue working
5238 opts.setdefault('rev', []).append("null")
5238 opts.setdefault('rev', []).append("null")
5239
5239
5240 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5240 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5241 if not path:
5241 if not path:
5242 raise error.Abort(_('default repository not configured!'),
5242 raise error.Abort(_('default repository not configured!'),
5243 hint=_("see 'hg help config.paths'"))
5243 hint=_("see 'hg help config.paths'"))
5244 dest = path.pushloc or path.loc
5244 dest = path.pushloc or path.loc
5245 branches = (path.branch, opts.get('branch') or [])
5245 branches = (path.branch, opts.get('branch') or [])
5246 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5246 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5247 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5247 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5248 other = hg.peer(repo, opts, dest)
5248 other = hg.peer(repo, opts, dest)
5249
5249
5250 if revs:
5250 if revs:
5251 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5251 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5252 if not revs:
5252 if not revs:
5253 raise error.Abort(_("specified revisions evaluate to an empty set"),
5253 raise error.Abort(_("specified revisions evaluate to an empty set"),
5254 hint=_("use different revision arguments"))
5254 hint=_("use different revision arguments"))
5255 elif path.pushrev:
5255 elif path.pushrev:
5256 # It doesn't make any sense to specify ancestor revisions. So limit
5256 # It doesn't make any sense to specify ancestor revisions. So limit
5257 # to DAG heads to make discovery simpler.
5257 # to DAG heads to make discovery simpler.
5258 expr = revset.formatspec('heads(%r)', path.pushrev)
5258 expr = revset.formatspec('heads(%r)', path.pushrev)
5259 revs = scmutil.revrange(repo, [expr])
5259 revs = scmutil.revrange(repo, [expr])
5260 revs = [repo[rev].node() for rev in revs]
5260 revs = [repo[rev].node() for rev in revs]
5261 if not revs:
5261 if not revs:
5262 raise error.Abort(_('default push revset for path evaluates to an '
5262 raise error.Abort(_('default push revset for path evaluates to an '
5263 'empty set'))
5263 'empty set'))
5264
5264
5265 repo._subtoppath = dest
5265 repo._subtoppath = dest
5266 try:
5266 try:
5267 # push subrepos depth-first for coherent ordering
5267 # push subrepos depth-first for coherent ordering
5268 c = repo['']
5268 c = repo['']
5269 subs = c.substate # only repos that are committed
5269 subs = c.substate # only repos that are committed
5270 for s in sorted(subs):
5270 for s in sorted(subs):
5271 result = c.sub(s).push(opts)
5271 result = c.sub(s).push(opts)
5272 if result == 0:
5272 if result == 0:
5273 return not result
5273 return not result
5274 finally:
5274 finally:
5275 del repo._subtoppath
5275 del repo._subtoppath
5276 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5276 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5277 newbranch=opts.get('new_branch'),
5277 newbranch=opts.get('new_branch'),
5278 bookmarks=opts.get('bookmark', ()),
5278 bookmarks=opts.get('bookmark', ()),
5279 opargs=opts.get('opargs'))
5279 opargs=opts.get('opargs'))
5280
5280
5281 result = not pushop.cgresult
5281 result = not pushop.cgresult
5282
5282
5283 if pushop.bkresult is not None:
5283 if pushop.bkresult is not None:
5284 if pushop.bkresult == 2:
5284 if pushop.bkresult == 2:
5285 result = 2
5285 result = 2
5286 elif not result and pushop.bkresult:
5286 elif not result and pushop.bkresult:
5287 result = 2
5287 result = 2
5288
5288
5289 return result
5289 return result
5290
5290
5291 @command('recover', [])
5291 @command('recover', [])
5292 def recover(ui, repo):
5292 def recover(ui, repo):
5293 """roll back an interrupted transaction
5293 """roll back an interrupted transaction
5294
5294
5295 Recover from an interrupted commit or pull.
5295 Recover from an interrupted commit or pull.
5296
5296
5297 This command tries to fix the repository status after an
5297 This command tries to fix the repository status after an
5298 interrupted operation. It should only be necessary when Mercurial
5298 interrupted operation. It should only be necessary when Mercurial
5299 suggests it.
5299 suggests it.
5300
5300
5301 Returns 0 if successful, 1 if nothing to recover or verify fails.
5301 Returns 0 if successful, 1 if nothing to recover or verify fails.
5302 """
5302 """
5303 if repo.recover():
5303 if repo.recover():
5304 return hg.verify(repo)
5304 return hg.verify(repo)
5305 return 1
5305 return 1
5306
5306
5307 @command('^remove|rm',
5307 @command('^remove|rm',
5308 [('A', 'after', None, _('record delete for missing files')),
5308 [('A', 'after', None, _('record delete for missing files')),
5309 ('f', 'force', None,
5309 ('f', 'force', None,
5310 _('forget added files, delete modified files')),
5310 _('forget added files, delete modified files')),
5311 ] + subrepoopts + walkopts,
5311 ] + subrepoopts + walkopts,
5312 _('[OPTION]... FILE...'),
5312 _('[OPTION]... FILE...'),
5313 inferrepo=True)
5313 inferrepo=True)
5314 def remove(ui, repo, *pats, **opts):
5314 def remove(ui, repo, *pats, **opts):
5315 """remove the specified files on the next commit
5315 """remove the specified files on the next commit
5316
5316
5317 Schedule the indicated files for removal from the current branch.
5317 Schedule the indicated files for removal from the current branch.
5318
5318
5319 This command schedules the files to be removed at the next commit.
5319 This command schedules the files to be removed at the next commit.
5320 To undo a remove before that, see :hg:`revert`. To undo added
5320 To undo a remove before that, see :hg:`revert`. To undo added
5321 files, see :hg:`forget`.
5321 files, see :hg:`forget`.
5322
5322
5323 .. container:: verbose
5323 .. container:: verbose
5324
5324
5325 -A/--after can be used to remove only files that have already
5325 -A/--after can be used to remove only files that have already
5326 been deleted, -f/--force can be used to force deletion, and -Af
5326 been deleted, -f/--force can be used to force deletion, and -Af
5327 can be used to remove files from the next revision without
5327 can be used to remove files from the next revision without
5328 deleting them from the working directory.
5328 deleting them from the working directory.
5329
5329
5330 The following table details the behavior of remove for different
5330 The following table details the behavior of remove for different
5331 file states (columns) and option combinations (rows). The file
5331 file states (columns) and option combinations (rows). The file
5332 states are Added [A], Clean [C], Modified [M] and Missing [!]
5332 states are Added [A], Clean [C], Modified [M] and Missing [!]
5333 (as reported by :hg:`status`). The actions are Warn, Remove
5333 (as reported by :hg:`status`). The actions are Warn, Remove
5334 (from branch) and Delete (from disk):
5334 (from branch) and Delete (from disk):
5335
5335
5336 ========= == == == ==
5336 ========= == == == ==
5337 opt/state A C M !
5337 opt/state A C M !
5338 ========= == == == ==
5338 ========= == == == ==
5339 none W RD W R
5339 none W RD W R
5340 -f R RD RD R
5340 -f R RD RD R
5341 -A W W W R
5341 -A W W W R
5342 -Af R R R R
5342 -Af R R R R
5343 ========= == == == ==
5343 ========= == == == ==
5344
5344
5345 .. note::
5345 .. note::
5346
5346
5347 :hg:`remove` never deletes files in Added [A] state from the
5347 :hg:`remove` never deletes files in Added [A] state from the
5348 working directory, not even if ``--force`` is specified.
5348 working directory, not even if ``--force`` is specified.
5349
5349
5350 Returns 0 on success, 1 if any warnings encountered.
5350 Returns 0 on success, 1 if any warnings encountered.
5351 """
5351 """
5352
5352
5353 after, force = opts.get('after'), opts.get('force')
5353 after, force = opts.get('after'), opts.get('force')
5354 if not pats and not after:
5354 if not pats and not after:
5355 raise error.Abort(_('no files specified'))
5355 raise error.Abort(_('no files specified'))
5356
5356
5357 m = scmutil.match(repo[None], pats, opts)
5357 m = scmutil.match(repo[None], pats, opts)
5358 subrepos = opts.get('subrepos')
5358 subrepos = opts.get('subrepos')
5359 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5359 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5360
5360
5361 @command('rename|move|mv',
5361 @command('rename|move|mv',
5362 [('A', 'after', None, _('record a rename that has already occurred')),
5362 [('A', 'after', None, _('record a rename that has already occurred')),
5363 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5363 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5364 ] + walkopts + dryrunopts,
5364 ] + walkopts + dryrunopts,
5365 _('[OPTION]... SOURCE... DEST'))
5365 _('[OPTION]... SOURCE... DEST'))
5366 def rename(ui, repo, *pats, **opts):
5366 def rename(ui, repo, *pats, **opts):
5367 """rename files; equivalent of copy + remove
5367 """rename files; equivalent of copy + remove
5368
5368
5369 Mark dest as copies of sources; mark sources for deletion. If dest
5369 Mark dest as copies of sources; mark sources for deletion. If dest
5370 is a directory, copies are put in that directory. If dest is a
5370 is a directory, copies are put in that directory. If dest is a
5371 file, there can only be one source.
5371 file, there can only be one source.
5372
5372
5373 By default, this command copies the contents of files as they
5373 By default, this command copies the contents of files as they
5374 exist in the working directory. If invoked with -A/--after, the
5374 exist in the working directory. If invoked with -A/--after, the
5375 operation is recorded, but no copying is performed.
5375 operation is recorded, but no copying is performed.
5376
5376
5377 This command takes effect at the next commit. To undo a rename
5377 This command takes effect at the next commit. To undo a rename
5378 before that, see :hg:`revert`.
5378 before that, see :hg:`revert`.
5379
5379
5380 Returns 0 on success, 1 if errors are encountered.
5380 Returns 0 on success, 1 if errors are encountered.
5381 """
5381 """
5382 with repo.wlock(False):
5382 with repo.wlock(False):
5383 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5383 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5384
5384
5385 @command('resolve',
5385 @command('resolve',
5386 [('a', 'all', None, _('select all unresolved files')),
5386 [('a', 'all', None, _('select all unresolved files')),
5387 ('l', 'list', None, _('list state of files needing merge')),
5387 ('l', 'list', None, _('list state of files needing merge')),
5388 ('m', 'mark', None, _('mark files as resolved')),
5388 ('m', 'mark', None, _('mark files as resolved')),
5389 ('u', 'unmark', None, _('mark files as unresolved')),
5389 ('u', 'unmark', None, _('mark files as unresolved')),
5390 ('n', 'no-status', None, _('hide status prefix'))]
5390 ('n', 'no-status', None, _('hide status prefix'))]
5391 + mergetoolopts + walkopts + formatteropts,
5391 + mergetoolopts + walkopts + formatteropts,
5392 _('[OPTION]... [FILE]...'),
5392 _('[OPTION]... [FILE]...'),
5393 inferrepo=True)
5393 inferrepo=True)
5394 def resolve(ui, repo, *pats, **opts):
5394 def resolve(ui, repo, *pats, **opts):
5395 """redo merges or set/view the merge status of files
5395 """redo merges or set/view the merge status of files
5396
5396
5397 Merges with unresolved conflicts are often the result of
5397 Merges with unresolved conflicts are often the result of
5398 non-interactive merging using the ``internal:merge`` configuration
5398 non-interactive merging using the ``internal:merge`` configuration
5399 setting, or a command-line merge tool like ``diff3``. The resolve
5399 setting, or a command-line merge tool like ``diff3``. The resolve
5400 command is used to manage the files involved in a merge, after
5400 command is used to manage the files involved in a merge, after
5401 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5401 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5402 working directory must have two parents). See :hg:`help
5402 working directory must have two parents). See :hg:`help
5403 merge-tools` for information on configuring merge tools.
5403 merge-tools` for information on configuring merge tools.
5404
5404
5405 The resolve command can be used in the following ways:
5405 The resolve command can be used in the following ways:
5406
5406
5407 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5407 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5408 files, discarding any previous merge attempts. Re-merging is not
5408 files, discarding any previous merge attempts. Re-merging is not
5409 performed for files already marked as resolved. Use ``--all/-a``
5409 performed for files already marked as resolved. Use ``--all/-a``
5410 to select all unresolved files. ``--tool`` can be used to specify
5410 to select all unresolved files. ``--tool`` can be used to specify
5411 the merge tool used for the given files. It overrides the HGMERGE
5411 the merge tool used for the given files. It overrides the HGMERGE
5412 environment variable and your configuration files. Previous file
5412 environment variable and your configuration files. Previous file
5413 contents are saved with a ``.orig`` suffix.
5413 contents are saved with a ``.orig`` suffix.
5414
5414
5415 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5415 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5416 (e.g. after having manually fixed-up the files). The default is
5416 (e.g. after having manually fixed-up the files). The default is
5417 to mark all unresolved files.
5417 to mark all unresolved files.
5418
5418
5419 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5419 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5420 default is to mark all resolved files.
5420 default is to mark all resolved files.
5421
5421
5422 - :hg:`resolve -l`: list files which had or still have conflicts.
5422 - :hg:`resolve -l`: list files which had or still have conflicts.
5423 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5423 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5424
5424
5425 .. note::
5425 .. note::
5426
5426
5427 Mercurial will not let you commit files with unresolved merge
5427 Mercurial will not let you commit files with unresolved merge
5428 conflicts. You must use :hg:`resolve -m ...` before you can
5428 conflicts. You must use :hg:`resolve -m ...` before you can
5429 commit after a conflicting merge.
5429 commit after a conflicting merge.
5430
5430
5431 Returns 0 on success, 1 if any files fail a resolve attempt.
5431 Returns 0 on success, 1 if any files fail a resolve attempt.
5432 """
5432 """
5433
5433
5434 flaglist = 'all mark unmark list no_status'.split()
5434 flaglist = 'all mark unmark list no_status'.split()
5435 all, mark, unmark, show, nostatus = \
5435 all, mark, unmark, show, nostatus = \
5436 [opts.get(o) for o in flaglist]
5436 [opts.get(o) for o in flaglist]
5437
5437
5438 if (show and (mark or unmark)) or (mark and unmark):
5438 if (show and (mark or unmark)) or (mark and unmark):
5439 raise error.Abort(_("too many options specified"))
5439 raise error.Abort(_("too many options specified"))
5440 if pats and all:
5440 if pats and all:
5441 raise error.Abort(_("can't specify --all and patterns"))
5441 raise error.Abort(_("can't specify --all and patterns"))
5442 if not (all or pats or show or mark or unmark):
5442 if not (all or pats or show or mark or unmark):
5443 raise error.Abort(_('no files or directories specified'),
5443 raise error.Abort(_('no files or directories specified'),
5444 hint=('use --all to re-merge all unresolved files'))
5444 hint=('use --all to re-merge all unresolved files'))
5445
5445
5446 if show:
5446 if show:
5447 fm = ui.formatter('resolve', opts)
5447 fm = ui.formatter('resolve', opts)
5448 ms = mergemod.mergestate.read(repo)
5448 ms = mergemod.mergestate.read(repo)
5449 m = scmutil.match(repo[None], pats, opts)
5449 m = scmutil.match(repo[None], pats, opts)
5450 for f in ms:
5450 for f in ms:
5451 if not m(f):
5451 if not m(f):
5452 continue
5452 continue
5453 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5453 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5454 'd': 'driverresolved'}[ms[f]]
5454 'd': 'driverresolved'}[ms[f]]
5455 fm.startitem()
5455 fm.startitem()
5456 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5456 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5457 fm.write('path', '%s\n', f, label=l)
5457 fm.write('path', '%s\n', f, label=l)
5458 fm.end()
5458 fm.end()
5459 return 0
5459 return 0
5460
5460
5461 with repo.wlock():
5461 with repo.wlock():
5462 ms = mergemod.mergestate.read(repo)
5462 ms = mergemod.mergestate.read(repo)
5463
5463
5464 if not (ms.active() or repo.dirstate.p2() != nullid):
5464 if not (ms.active() or repo.dirstate.p2() != nullid):
5465 raise error.Abort(
5465 raise error.Abort(
5466 _('resolve command not applicable when not merging'))
5466 _('resolve command not applicable when not merging'))
5467
5467
5468 wctx = repo[None]
5468 wctx = repo[None]
5469
5469
5470 if ms.mergedriver and ms.mdstate() == 'u':
5470 if ms.mergedriver and ms.mdstate() == 'u':
5471 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5471 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5472 ms.commit()
5472 ms.commit()
5473 # allow mark and unmark to go through
5473 # allow mark and unmark to go through
5474 if not mark and not unmark and not proceed:
5474 if not mark and not unmark and not proceed:
5475 return 1
5475 return 1
5476
5476
5477 m = scmutil.match(wctx, pats, opts)
5477 m = scmutil.match(wctx, pats, opts)
5478 ret = 0
5478 ret = 0
5479 didwork = False
5479 didwork = False
5480 runconclude = False
5480 runconclude = False
5481
5481
5482 tocomplete = []
5482 tocomplete = []
5483 for f in ms:
5483 for f in ms:
5484 if not m(f):
5484 if not m(f):
5485 continue
5485 continue
5486
5486
5487 didwork = True
5487 didwork = True
5488
5488
5489 # don't let driver-resolved files be marked, and run the conclude
5489 # don't let driver-resolved files be marked, and run the conclude
5490 # step if asked to resolve
5490 # step if asked to resolve
5491 if ms[f] == "d":
5491 if ms[f] == "d":
5492 exact = m.exact(f)
5492 exact = m.exact(f)
5493 if mark:
5493 if mark:
5494 if exact:
5494 if exact:
5495 ui.warn(_('not marking %s as it is driver-resolved\n')
5495 ui.warn(_('not marking %s as it is driver-resolved\n')
5496 % f)
5496 % f)
5497 elif unmark:
5497 elif unmark:
5498 if exact:
5498 if exact:
5499 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5499 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5500 % f)
5500 % f)
5501 else:
5501 else:
5502 runconclude = True
5502 runconclude = True
5503 continue
5503 continue
5504
5504
5505 if mark:
5505 if mark:
5506 ms.mark(f, "r")
5506 ms.mark(f, "r")
5507 elif unmark:
5507 elif unmark:
5508 ms.mark(f, "u")
5508 ms.mark(f, "u")
5509 else:
5509 else:
5510 # backup pre-resolve (merge uses .orig for its own purposes)
5510 # backup pre-resolve (merge uses .orig for its own purposes)
5511 a = repo.wjoin(f)
5511 a = repo.wjoin(f)
5512 try:
5512 try:
5513 util.copyfile(a, a + ".resolve")
5513 util.copyfile(a, a + ".resolve")
5514 except (IOError, OSError) as inst:
5514 except (IOError, OSError) as inst:
5515 if inst.errno != errno.ENOENT:
5515 if inst.errno != errno.ENOENT:
5516 raise
5516 raise
5517
5517
5518 try:
5518 try:
5519 # preresolve file
5519 # preresolve file
5520 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5520 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5521 'resolve')
5521 'resolve')
5522 complete, r = ms.preresolve(f, wctx)
5522 complete, r = ms.preresolve(f, wctx)
5523 if not complete:
5523 if not complete:
5524 tocomplete.append(f)
5524 tocomplete.append(f)
5525 elif r:
5525 elif r:
5526 ret = 1
5526 ret = 1
5527 finally:
5527 finally:
5528 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5528 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5529 ms.commit()
5529 ms.commit()
5530
5530
5531 # replace filemerge's .orig file with our resolve file, but only
5531 # replace filemerge's .orig file with our resolve file, but only
5532 # for merges that are complete
5532 # for merges that are complete
5533 if complete:
5533 if complete:
5534 try:
5534 try:
5535 util.rename(a + ".resolve",
5535 util.rename(a + ".resolve",
5536 scmutil.origpath(ui, repo, a))
5536 scmutil.origpath(ui, repo, a))
5537 except OSError as inst:
5537 except OSError as inst:
5538 if inst.errno != errno.ENOENT:
5538 if inst.errno != errno.ENOENT:
5539 raise
5539 raise
5540
5540
5541 for f in tocomplete:
5541 for f in tocomplete:
5542 try:
5542 try:
5543 # resolve file
5543 # resolve file
5544 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5544 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5545 'resolve')
5545 'resolve')
5546 r = ms.resolve(f, wctx)
5546 r = ms.resolve(f, wctx)
5547 if r:
5547 if r:
5548 ret = 1
5548 ret = 1
5549 finally:
5549 finally:
5550 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5550 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5551 ms.commit()
5551 ms.commit()
5552
5552
5553 # replace filemerge's .orig file with our resolve file
5553 # replace filemerge's .orig file with our resolve file
5554 a = repo.wjoin(f)
5554 a = repo.wjoin(f)
5555 try:
5555 try:
5556 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
5556 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
5557 except OSError as inst:
5557 except OSError as inst:
5558 if inst.errno != errno.ENOENT:
5558 if inst.errno != errno.ENOENT:
5559 raise
5559 raise
5560
5560
5561 ms.commit()
5561 ms.commit()
5562 ms.recordactions()
5562 ms.recordactions()
5563
5563
5564 if not didwork and pats:
5564 if not didwork and pats:
5565 hint = None
5565 hint = None
5566 if not any([p for p in pats if p.find(':') >= 0]):
5566 if not any([p for p in pats if p.find(':') >= 0]):
5567 pats = ['path:%s' % p for p in pats]
5567 pats = ['path:%s' % p for p in pats]
5568 m = scmutil.match(wctx, pats, opts)
5568 m = scmutil.match(wctx, pats, opts)
5569 for f in ms:
5569 for f in ms:
5570 if not m(f):
5570 if not m(f):
5571 continue
5571 continue
5572 flags = ''.join(['-%s ' % o[0] for o in flaglist
5572 flags = ''.join(['-%s ' % o[0] for o in flaglist
5573 if opts.get(o)])
5573 if opts.get(o)])
5574 hint = _("(try: hg resolve %s%s)\n") % (
5574 hint = _("(try: hg resolve %s%s)\n") % (
5575 flags,
5575 flags,
5576 ' '.join(pats))
5576 ' '.join(pats))
5577 break
5577 break
5578 ui.warn(_("arguments do not match paths that need resolving\n"))
5578 ui.warn(_("arguments do not match paths that need resolving\n"))
5579 if hint:
5579 if hint:
5580 ui.warn(hint)
5580 ui.warn(hint)
5581 elif ms.mergedriver and ms.mdstate() != 's':
5581 elif ms.mergedriver and ms.mdstate() != 's':
5582 # run conclude step when either a driver-resolved file is requested
5582 # run conclude step when either a driver-resolved file is requested
5583 # or there are no driver-resolved files
5583 # or there are no driver-resolved files
5584 # we can't use 'ret' to determine whether any files are unresolved
5584 # we can't use 'ret' to determine whether any files are unresolved
5585 # because we might not have tried to resolve some
5585 # because we might not have tried to resolve some
5586 if ((runconclude or not list(ms.driverresolved()))
5586 if ((runconclude or not list(ms.driverresolved()))
5587 and not list(ms.unresolved())):
5587 and not list(ms.unresolved())):
5588 proceed = mergemod.driverconclude(repo, ms, wctx)
5588 proceed = mergemod.driverconclude(repo, ms, wctx)
5589 ms.commit()
5589 ms.commit()
5590 if not proceed:
5590 if not proceed:
5591 return 1
5591 return 1
5592
5592
5593 # Nudge users into finishing an unfinished operation
5593 # Nudge users into finishing an unfinished operation
5594 unresolvedf = list(ms.unresolved())
5594 unresolvedf = list(ms.unresolved())
5595 driverresolvedf = list(ms.driverresolved())
5595 driverresolvedf = list(ms.driverresolved())
5596 if not unresolvedf and not driverresolvedf:
5596 if not unresolvedf and not driverresolvedf:
5597 ui.status(_('(no more unresolved files)\n'))
5597 ui.status(_('(no more unresolved files)\n'))
5598 cmdutil.checkafterresolved(repo)
5598 cmdutil.checkafterresolved(repo)
5599 elif not unresolvedf:
5599 elif not unresolvedf:
5600 ui.status(_('(no more unresolved files -- '
5600 ui.status(_('(no more unresolved files -- '
5601 'run "hg resolve --all" to conclude)\n'))
5601 'run "hg resolve --all" to conclude)\n'))
5602
5602
5603 return ret
5603 return ret
5604
5604
5605 @command('revert',
5605 @command('revert',
5606 [('a', 'all', None, _('revert all changes when no arguments given')),
5606 [('a', 'all', None, _('revert all changes when no arguments given')),
5607 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5607 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5608 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5608 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5609 ('C', 'no-backup', None, _('do not save backup copies of files')),
5609 ('C', 'no-backup', None, _('do not save backup copies of files')),
5610 ('i', 'interactive', None,
5610 ('i', 'interactive', None,
5611 _('interactively select the changes (EXPERIMENTAL)')),
5611 _('interactively select the changes (EXPERIMENTAL)')),
5612 ] + walkopts + dryrunopts,
5612 ] + walkopts + dryrunopts,
5613 _('[OPTION]... [-r REV] [NAME]...'))
5613 _('[OPTION]... [-r REV] [NAME]...'))
5614 def revert(ui, repo, *pats, **opts):
5614 def revert(ui, repo, *pats, **opts):
5615 """restore files to their checkout state
5615 """restore files to their checkout state
5616
5616
5617 .. note::
5617 .. note::
5618
5618
5619 To check out earlier revisions, you should use :hg:`update REV`.
5619 To check out earlier revisions, you should use :hg:`update REV`.
5620 To cancel an uncommitted merge (and lose your changes),
5620 To cancel an uncommitted merge (and lose your changes),
5621 use :hg:`update --clean .`.
5621 use :hg:`update --clean .`.
5622
5622
5623 With no revision specified, revert the specified files or directories
5623 With no revision specified, revert the specified files or directories
5624 to the contents they had in the parent of the working directory.
5624 to the contents they had in the parent of the working directory.
5625 This restores the contents of files to an unmodified
5625 This restores the contents of files to an unmodified
5626 state and unschedules adds, removes, copies, and renames. If the
5626 state and unschedules adds, removes, copies, and renames. If the
5627 working directory has two parents, you must explicitly specify a
5627 working directory has two parents, you must explicitly specify a
5628 revision.
5628 revision.
5629
5629
5630 Using the -r/--rev or -d/--date options, revert the given files or
5630 Using the -r/--rev or -d/--date options, revert the given files or
5631 directories to their states as of a specific revision. Because
5631 directories to their states as of a specific revision. Because
5632 revert does not change the working directory parents, this will
5632 revert does not change the working directory parents, this will
5633 cause these files to appear modified. This can be helpful to "back
5633 cause these files to appear modified. This can be helpful to "back
5634 out" some or all of an earlier change. See :hg:`backout` for a
5634 out" some or all of an earlier change. See :hg:`backout` for a
5635 related method.
5635 related method.
5636
5636
5637 Modified files are saved with a .orig suffix before reverting.
5637 Modified files are saved with a .orig suffix before reverting.
5638 To disable these backups, use --no-backup. It is possible to store
5638 To disable these backups, use --no-backup. It is possible to store
5639 the backup files in a custom directory relative to the root of the
5639 the backup files in a custom directory relative to the root of the
5640 repository by setting the ``ui.origbackuppath`` configuration
5640 repository by setting the ``ui.origbackuppath`` configuration
5641 option.
5641 option.
5642
5642
5643 See :hg:`help dates` for a list of formats valid for -d/--date.
5643 See :hg:`help dates` for a list of formats valid for -d/--date.
5644
5644
5645 See :hg:`help backout` for a way to reverse the effect of an
5645 See :hg:`help backout` for a way to reverse the effect of an
5646 earlier changeset.
5646 earlier changeset.
5647
5647
5648 Returns 0 on success.
5648 Returns 0 on success.
5649 """
5649 """
5650
5650
5651 if opts.get("date"):
5651 if opts.get("date"):
5652 if opts.get("rev"):
5652 if opts.get("rev"):
5653 raise error.Abort(_("you can't specify a revision and a date"))
5653 raise error.Abort(_("you can't specify a revision and a date"))
5654 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5654 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5655
5655
5656 parent, p2 = repo.dirstate.parents()
5656 parent, p2 = repo.dirstate.parents()
5657 if not opts.get('rev') and p2 != nullid:
5657 if not opts.get('rev') and p2 != nullid:
5658 # revert after merge is a trap for new users (issue2915)
5658 # revert after merge is a trap for new users (issue2915)
5659 raise error.Abort(_('uncommitted merge with no revision specified'),
5659 raise error.Abort(_('uncommitted merge with no revision specified'),
5660 hint=_("use 'hg update' or see 'hg help revert'"))
5660 hint=_("use 'hg update' or see 'hg help revert'"))
5661
5661
5662 ctx = scmutil.revsingle(repo, opts.get('rev'))
5662 ctx = scmutil.revsingle(repo, opts.get('rev'))
5663
5663
5664 if (not (pats or opts.get('include') or opts.get('exclude') or
5664 if (not (pats or opts.get('include') or opts.get('exclude') or
5665 opts.get('all') or opts.get('interactive'))):
5665 opts.get('all') or opts.get('interactive'))):
5666 msg = _("no files or directories specified")
5666 msg = _("no files or directories specified")
5667 if p2 != nullid:
5667 if p2 != nullid:
5668 hint = _("uncommitted merge, use --all to discard all changes,"
5668 hint = _("uncommitted merge, use --all to discard all changes,"
5669 " or 'hg update -C .' to abort the merge")
5669 " or 'hg update -C .' to abort the merge")
5670 raise error.Abort(msg, hint=hint)
5670 raise error.Abort(msg, hint=hint)
5671 dirty = any(repo.status())
5671 dirty = any(repo.status())
5672 node = ctx.node()
5672 node = ctx.node()
5673 if node != parent:
5673 if node != parent:
5674 if dirty:
5674 if dirty:
5675 hint = _("uncommitted changes, use --all to discard all"
5675 hint = _("uncommitted changes, use --all to discard all"
5676 " changes, or 'hg update %s' to update") % ctx.rev()
5676 " changes, or 'hg update %s' to update") % ctx.rev()
5677 else:
5677 else:
5678 hint = _("use --all to revert all files,"
5678 hint = _("use --all to revert all files,"
5679 " or 'hg update %s' to update") % ctx.rev()
5679 " or 'hg update %s' to update") % ctx.rev()
5680 elif dirty:
5680 elif dirty:
5681 hint = _("uncommitted changes, use --all to discard all changes")
5681 hint = _("uncommitted changes, use --all to discard all changes")
5682 else:
5682 else:
5683 hint = _("use --all to revert all files")
5683 hint = _("use --all to revert all files")
5684 raise error.Abort(msg, hint=hint)
5684 raise error.Abort(msg, hint=hint)
5685
5685
5686 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5686 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5687
5687
5688 @command('rollback', dryrunopts +
5688 @command('rollback', dryrunopts +
5689 [('f', 'force', False, _('ignore safety measures'))])
5689 [('f', 'force', False, _('ignore safety measures'))])
5690 def rollback(ui, repo, **opts):
5690 def rollback(ui, repo, **opts):
5691 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5691 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5692
5692
5693 Please use :hg:`commit --amend` instead of rollback to correct
5693 Please use :hg:`commit --amend` instead of rollback to correct
5694 mistakes in the last commit.
5694 mistakes in the last commit.
5695
5695
5696 This command should be used with care. There is only one level of
5696 This command should be used with care. There is only one level of
5697 rollback, and there is no way to undo a rollback. It will also
5697 rollback, and there is no way to undo a rollback. It will also
5698 restore the dirstate at the time of the last transaction, losing
5698 restore the dirstate at the time of the last transaction, losing
5699 any dirstate changes since that time. This command does not alter
5699 any dirstate changes since that time. This command does not alter
5700 the working directory.
5700 the working directory.
5701
5701
5702 Transactions are used to encapsulate the effects of all commands
5702 Transactions are used to encapsulate the effects of all commands
5703 that create new changesets or propagate existing changesets into a
5703 that create new changesets or propagate existing changesets into a
5704 repository.
5704 repository.
5705
5705
5706 .. container:: verbose
5706 .. container:: verbose
5707
5707
5708 For example, the following commands are transactional, and their
5708 For example, the following commands are transactional, and their
5709 effects can be rolled back:
5709 effects can be rolled back:
5710
5710
5711 - commit
5711 - commit
5712 - import
5712 - import
5713 - pull
5713 - pull
5714 - push (with this repository as the destination)
5714 - push (with this repository as the destination)
5715 - unbundle
5715 - unbundle
5716
5716
5717 To avoid permanent data loss, rollback will refuse to rollback a
5717 To avoid permanent data loss, rollback will refuse to rollback a
5718 commit transaction if it isn't checked out. Use --force to
5718 commit transaction if it isn't checked out. Use --force to
5719 override this protection.
5719 override this protection.
5720
5720
5721 The rollback command can be entirely disabled by setting the
5721 The rollback command can be entirely disabled by setting the
5722 ``ui.rollback`` configuration setting to false. If you're here
5722 ``ui.rollback`` configuration setting to false. If you're here
5723 because you want to use rollback and it's disabled, you can
5723 because you want to use rollback and it's disabled, you can
5724 re-enable the command by setting ``ui.rollback`` to true.
5724 re-enable the command by setting ``ui.rollback`` to true.
5725
5725
5726 This command is not intended for use on public repositories. Once
5726 This command is not intended for use on public repositories. Once
5727 changes are visible for pull by other users, rolling a transaction
5727 changes are visible for pull by other users, rolling a transaction
5728 back locally is ineffective (someone else may already have pulled
5728 back locally is ineffective (someone else may already have pulled
5729 the changes). Furthermore, a race is possible with readers of the
5729 the changes). Furthermore, a race is possible with readers of the
5730 repository; for example an in-progress pull from the repository
5730 repository; for example an in-progress pull from the repository
5731 may fail if a rollback is performed.
5731 may fail if a rollback is performed.
5732
5732
5733 Returns 0 on success, 1 if no rollback data is available.
5733 Returns 0 on success, 1 if no rollback data is available.
5734 """
5734 """
5735 if not ui.configbool('ui', 'rollback', True):
5735 if not ui.configbool('ui', 'rollback', True):
5736 raise error.Abort(_('rollback is disabled because it is unsafe'),
5736 raise error.Abort(_('rollback is disabled because it is unsafe'),
5737 hint=('see `hg help -v rollback` for information'))
5737 hint=('see `hg help -v rollback` for information'))
5738 return repo.rollback(dryrun=opts.get('dry_run'),
5738 return repo.rollback(dryrun=opts.get('dry_run'),
5739 force=opts.get('force'))
5739 force=opts.get('force'))
5740
5740
5741 @command('root', [])
5741 @command('root', [])
5742 def root(ui, repo):
5742 def root(ui, repo):
5743 """print the root (top) of the current working directory
5743 """print the root (top) of the current working directory
5744
5744
5745 Print the root directory of the current repository.
5745 Print the root directory of the current repository.
5746
5746
5747 Returns 0 on success.
5747 Returns 0 on success.
5748 """
5748 """
5749 ui.write(repo.root + "\n")
5749 ui.write(repo.root + "\n")
5750
5750
5751 @command('^serve',
5751 @command('^serve',
5752 [('A', 'accesslog', '', _('name of access log file to write to'),
5752 [('A', 'accesslog', '', _('name of access log file to write to'),
5753 _('FILE')),
5753 _('FILE')),
5754 ('d', 'daemon', None, _('run server in background')),
5754 ('d', 'daemon', None, _('run server in background')),
5755 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5755 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5756 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5756 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5757 # use string type, then we can check if something was passed
5757 # use string type, then we can check if something was passed
5758 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5758 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5759 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5759 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5760 _('ADDR')),
5760 _('ADDR')),
5761 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5761 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5762 _('PREFIX')),
5762 _('PREFIX')),
5763 ('n', 'name', '',
5763 ('n', 'name', '',
5764 _('name to show in web pages (default: working directory)'), _('NAME')),
5764 _('name to show in web pages (default: working directory)'), _('NAME')),
5765 ('', 'web-conf', '',
5765 ('', 'web-conf', '',
5766 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5766 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5767 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5767 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5768 _('FILE')),
5768 _('FILE')),
5769 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5769 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5770 ('', 'stdio', None, _('for remote clients')),
5770 ('', 'stdio', None, _('for remote clients')),
5771 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5771 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5772 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5772 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5773 ('', 'style', '', _('template style to use'), _('STYLE')),
5773 ('', 'style', '', _('template style to use'), _('STYLE')),
5774 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5774 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5775 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5775 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5776 _('[OPTION]...'),
5776 _('[OPTION]...'),
5777 optionalrepo=True)
5777 optionalrepo=True)
5778 def serve(ui, repo, **opts):
5778 def serve(ui, repo, **opts):
5779 """start stand-alone webserver
5779 """start stand-alone webserver
5780
5780
5781 Start a local HTTP repository browser and pull server. You can use
5781 Start a local HTTP repository browser and pull server. You can use
5782 this for ad-hoc sharing and browsing of repositories. It is
5782 this for ad-hoc sharing and browsing of repositories. It is
5783 recommended to use a real web server to serve a repository for
5783 recommended to use a real web server to serve a repository for
5784 longer periods of time.
5784 longer periods of time.
5785
5785
5786 Please note that the server does not implement access control.
5786 Please note that the server does not implement access control.
5787 This means that, by default, anybody can read from the server and
5787 This means that, by default, anybody can read from the server and
5788 nobody can write to it by default. Set the ``web.allow_push``
5788 nobody can write to it by default. Set the ``web.allow_push``
5789 option to ``*`` to allow everybody to push to the server. You
5789 option to ``*`` to allow everybody to push to the server. You
5790 should use a real web server if you need to authenticate users.
5790 should use a real web server if you need to authenticate users.
5791
5791
5792 By default, the server logs accesses to stdout and errors to
5792 By default, the server logs accesses to stdout and errors to
5793 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5793 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5794 files.
5794 files.
5795
5795
5796 To have the server choose a free port number to listen on, specify
5796 To have the server choose a free port number to listen on, specify
5797 a port number of 0; in this case, the server will print the port
5797 a port number of 0; in this case, the server will print the port
5798 number it uses.
5798 number it uses.
5799
5799
5800 Returns 0 on success.
5800 Returns 0 on success.
5801 """
5801 """
5802
5802
5803 if opts["stdio"] and opts["cmdserver"]:
5803 if opts["stdio"] and opts["cmdserver"]:
5804 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5804 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5805
5805
5806 if opts["stdio"]:
5806 if opts["stdio"]:
5807 if repo is None:
5807 if repo is None:
5808 raise error.RepoError(_("there is no Mercurial repository here"
5808 raise error.RepoError(_("there is no Mercurial repository here"
5809 " (.hg not found)"))
5809 " (.hg not found)"))
5810 s = sshserver.sshserver(ui, repo)
5810 s = sshserver.sshserver(ui, repo)
5811 s.serve_forever()
5811 s.serve_forever()
5812
5812
5813 service = server.createservice(ui, repo, opts)
5813 service = server.createservice(ui, repo, opts)
5814 return server.runservice(opts, initfn=service.init, runfn=service.run)
5814 return server.runservice(opts, initfn=service.init, runfn=service.run)
5815
5815
5816 @command('^status|st',
5816 @command('^status|st',
5817 [('A', 'all', None, _('show status of all files')),
5817 [('A', 'all', None, _('show status of all files')),
5818 ('m', 'modified', None, _('show only modified files')),
5818 ('m', 'modified', None, _('show only modified files')),
5819 ('a', 'added', None, _('show only added files')),
5819 ('a', 'added', None, _('show only added files')),
5820 ('r', 'removed', None, _('show only removed files')),
5820 ('r', 'removed', None, _('show only removed files')),
5821 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5821 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5822 ('c', 'clean', None, _('show only files without changes')),
5822 ('c', 'clean', None, _('show only files without changes')),
5823 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5823 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5824 ('i', 'ignored', None, _('show only ignored files')),
5824 ('i', 'ignored', None, _('show only ignored files')),
5825 ('n', 'no-status', None, _('hide status prefix')),
5825 ('n', 'no-status', None, _('hide status prefix')),
5826 ('C', 'copies', None, _('show source of copied files')),
5826 ('C', 'copies', None, _('show source of copied files')),
5827 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5827 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5828 ('', 'rev', [], _('show difference from revision'), _('REV')),
5828 ('', 'rev', [], _('show difference from revision'), _('REV')),
5829 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5829 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5830 ] + walkopts + subrepoopts + formatteropts,
5830 ] + walkopts + subrepoopts + formatteropts,
5831 _('[OPTION]... [FILE]...'),
5831 _('[OPTION]... [FILE]...'),
5832 inferrepo=True)
5832 inferrepo=True)
5833 def status(ui, repo, *pats, **opts):
5833 def status(ui, repo, *pats, **opts):
5834 """show changed files in the working directory
5834 """show changed files in the working directory
5835
5835
5836 Show status of files in the repository. If names are given, only
5836 Show status of files in the repository. If names are given, only
5837 files that match are shown. Files that are clean or ignored or
5837 files that match are shown. Files that are clean or ignored or
5838 the source of a copy/move operation, are not listed unless
5838 the source of a copy/move operation, are not listed unless
5839 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5839 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5840 Unless options described with "show only ..." are given, the
5840 Unless options described with "show only ..." are given, the
5841 options -mardu are used.
5841 options -mardu are used.
5842
5842
5843 Option -q/--quiet hides untracked (unknown and ignored) files
5843 Option -q/--quiet hides untracked (unknown and ignored) files
5844 unless explicitly requested with -u/--unknown or -i/--ignored.
5844 unless explicitly requested with -u/--unknown or -i/--ignored.
5845
5845
5846 .. note::
5846 .. note::
5847
5847
5848 :hg:`status` may appear to disagree with diff if permissions have
5848 :hg:`status` may appear to disagree with diff if permissions have
5849 changed or a merge has occurred. The standard diff format does
5849 changed or a merge has occurred. The standard diff format does
5850 not report permission changes and diff only reports changes
5850 not report permission changes and diff only reports changes
5851 relative to one merge parent.
5851 relative to one merge parent.
5852
5852
5853 If one revision is given, it is used as the base revision.
5853 If one revision is given, it is used as the base revision.
5854 If two revisions are given, the differences between them are
5854 If two revisions are given, the differences between them are
5855 shown. The --change option can also be used as a shortcut to list
5855 shown. The --change option can also be used as a shortcut to list
5856 the changed files of a revision from its first parent.
5856 the changed files of a revision from its first parent.
5857
5857
5858 The codes used to show the status of files are::
5858 The codes used to show the status of files are::
5859
5859
5860 M = modified
5860 M = modified
5861 A = added
5861 A = added
5862 R = removed
5862 R = removed
5863 C = clean
5863 C = clean
5864 ! = missing (deleted by non-hg command, but still tracked)
5864 ! = missing (deleted by non-hg command, but still tracked)
5865 ? = not tracked
5865 ? = not tracked
5866 I = ignored
5866 I = ignored
5867 = origin of the previous file (with --copies)
5867 = origin of the previous file (with --copies)
5868
5868
5869 .. container:: verbose
5869 .. container:: verbose
5870
5870
5871 Examples:
5871 Examples:
5872
5872
5873 - show changes in the working directory relative to a
5873 - show changes in the working directory relative to a
5874 changeset::
5874 changeset::
5875
5875
5876 hg status --rev 9353
5876 hg status --rev 9353
5877
5877
5878 - show changes in the working directory relative to the
5878 - show changes in the working directory relative to the
5879 current directory (see :hg:`help patterns` for more information)::
5879 current directory (see :hg:`help patterns` for more information)::
5880
5880
5881 hg status re:
5881 hg status re:
5882
5882
5883 - show all changes including copies in an existing changeset::
5883 - show all changes including copies in an existing changeset::
5884
5884
5885 hg status --copies --change 9353
5885 hg status --copies --change 9353
5886
5886
5887 - get a NUL separated list of added files, suitable for xargs::
5887 - get a NUL separated list of added files, suitable for xargs::
5888
5888
5889 hg status -an0
5889 hg status -an0
5890
5890
5891 Returns 0 on success.
5891 Returns 0 on success.
5892 """
5892 """
5893
5893
5894 revs = opts.get('rev')
5894 revs = opts.get('rev')
5895 change = opts.get('change')
5895 change = opts.get('change')
5896
5896
5897 if revs and change:
5897 if revs and change:
5898 msg = _('cannot specify --rev and --change at the same time')
5898 msg = _('cannot specify --rev and --change at the same time')
5899 raise error.Abort(msg)
5899 raise error.Abort(msg)
5900 elif change:
5900 elif change:
5901 node2 = scmutil.revsingle(repo, change, None).node()
5901 node2 = scmutil.revsingle(repo, change, None).node()
5902 node1 = repo[node2].p1().node()
5902 node1 = repo[node2].p1().node()
5903 else:
5903 else:
5904 node1, node2 = scmutil.revpair(repo, revs)
5904 node1, node2 = scmutil.revpair(repo, revs)
5905
5905
5906 if pats:
5906 if pats:
5907 cwd = repo.getcwd()
5907 cwd = repo.getcwd()
5908 else:
5908 else:
5909 cwd = ''
5909 cwd = ''
5910
5910
5911 if opts.get('print0'):
5911 if opts.get('print0'):
5912 end = '\0'
5912 end = '\0'
5913 else:
5913 else:
5914 end = '\n'
5914 end = '\n'
5915 copy = {}
5915 copy = {}
5916 states = 'modified added removed deleted unknown ignored clean'.split()
5916 states = 'modified added removed deleted unknown ignored clean'.split()
5917 show = [k for k in states if opts.get(k)]
5917 show = [k for k in states if opts.get(k)]
5918 if opts.get('all'):
5918 if opts.get('all'):
5919 show += ui.quiet and (states[:4] + ['clean']) or states
5919 show += ui.quiet and (states[:4] + ['clean']) or states
5920 if not show:
5920 if not show:
5921 if ui.quiet:
5921 if ui.quiet:
5922 show = states[:4]
5922 show = states[:4]
5923 else:
5923 else:
5924 show = states[:5]
5924 show = states[:5]
5925
5925
5926 m = scmutil.match(repo[node2], pats, opts)
5926 m = scmutil.match(repo[node2], pats, opts)
5927 stat = repo.status(node1, node2, m,
5927 stat = repo.status(node1, node2, m,
5928 'ignored' in show, 'clean' in show, 'unknown' in show,
5928 'ignored' in show, 'clean' in show, 'unknown' in show,
5929 opts.get('subrepos'))
5929 opts.get('subrepos'))
5930 changestates = zip(states, 'MAR!?IC', stat)
5930 changestates = zip(states, 'MAR!?IC', stat)
5931
5931
5932 if (opts.get('all') or opts.get('copies')
5932 if (opts.get('all') or opts.get('copies')
5933 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5933 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5934 copy = copies.pathcopies(repo[node1], repo[node2], m)
5934 copy = copies.pathcopies(repo[node1], repo[node2], m)
5935
5935
5936 fm = ui.formatter('status', opts)
5936 fm = ui.formatter('status', opts)
5937 fmt = '%s' + end
5937 fmt = '%s' + end
5938 showchar = not opts.get('no_status')
5938 showchar = not opts.get('no_status')
5939
5939
5940 for state, char, files in changestates:
5940 for state, char, files in changestates:
5941 if state in show:
5941 if state in show:
5942 label = 'status.' + state
5942 label = 'status.' + state
5943 for f in files:
5943 for f in files:
5944 fm.startitem()
5944 fm.startitem()
5945 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5945 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5946 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5946 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5947 if f in copy:
5947 if f in copy:
5948 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5948 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5949 label='status.copied')
5949 label='status.copied')
5950 fm.end()
5950 fm.end()
5951
5951
5952 @command('^summary|sum',
5952 @command('^summary|sum',
5953 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5953 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5954 def summary(ui, repo, **opts):
5954 def summary(ui, repo, **opts):
5955 """summarize working directory state
5955 """summarize working directory state
5956
5956
5957 This generates a brief summary of the working directory state,
5957 This generates a brief summary of the working directory state,
5958 including parents, branch, commit status, phase and available updates.
5958 including parents, branch, commit status, phase and available updates.
5959
5959
5960 With the --remote option, this will check the default paths for
5960 With the --remote option, this will check the default paths for
5961 incoming and outgoing changes. This can be time-consuming.
5961 incoming and outgoing changes. This can be time-consuming.
5962
5962
5963 Returns 0 on success.
5963 Returns 0 on success.
5964 """
5964 """
5965
5965
5966 ctx = repo[None]
5966 ctx = repo[None]
5967 parents = ctx.parents()
5967 parents = ctx.parents()
5968 pnode = parents[0].node()
5968 pnode = parents[0].node()
5969 marks = []
5969 marks = []
5970
5970
5971 ms = None
5971 ms = None
5972 try:
5972 try:
5973 ms = mergemod.mergestate.read(repo)
5973 ms = mergemod.mergestate.read(repo)
5974 except error.UnsupportedMergeRecords as e:
5974 except error.UnsupportedMergeRecords as e:
5975 s = ' '.join(e.recordtypes)
5975 s = ' '.join(e.recordtypes)
5976 ui.warn(
5976 ui.warn(
5977 _('warning: merge state has unsupported record types: %s\n') % s)
5977 _('warning: merge state has unsupported record types: %s\n') % s)
5978 unresolved = 0
5978 unresolved = 0
5979 else:
5979 else:
5980 unresolved = [f for f in ms if ms[f] == 'u']
5980 unresolved = [f for f in ms if ms[f] == 'u']
5981
5981
5982 for p in parents:
5982 for p in parents:
5983 # label with log.changeset (instead of log.parent) since this
5983 # label with log.changeset (instead of log.parent) since this
5984 # shows a working directory parent *changeset*:
5984 # shows a working directory parent *changeset*:
5985 # i18n: column positioning for "hg summary"
5985 # i18n: column positioning for "hg summary"
5986 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5986 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5987 label='log.changeset changeset.%s' % p.phasestr())
5987 label='log.changeset changeset.%s' % p.phasestr())
5988 ui.write(' '.join(p.tags()), label='log.tag')
5988 ui.write(' '.join(p.tags()), label='log.tag')
5989 if p.bookmarks():
5989 if p.bookmarks():
5990 marks.extend(p.bookmarks())
5990 marks.extend(p.bookmarks())
5991 if p.rev() == -1:
5991 if p.rev() == -1:
5992 if not len(repo):
5992 if not len(repo):
5993 ui.write(_(' (empty repository)'))
5993 ui.write(_(' (empty repository)'))
5994 else:
5994 else:
5995 ui.write(_(' (no revision checked out)'))
5995 ui.write(_(' (no revision checked out)'))
5996 ui.write('\n')
5996 ui.write('\n')
5997 if p.description():
5997 if p.description():
5998 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5998 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5999 label='log.summary')
5999 label='log.summary')
6000
6000
6001 branch = ctx.branch()
6001 branch = ctx.branch()
6002 bheads = repo.branchheads(branch)
6002 bheads = repo.branchheads(branch)
6003 # i18n: column positioning for "hg summary"
6003 # i18n: column positioning for "hg summary"
6004 m = _('branch: %s\n') % branch
6004 m = _('branch: %s\n') % branch
6005 if branch != 'default':
6005 if branch != 'default':
6006 ui.write(m, label='log.branch')
6006 ui.write(m, label='log.branch')
6007 else:
6007 else:
6008 ui.status(m, label='log.branch')
6008 ui.status(m, label='log.branch')
6009
6009
6010 if marks:
6010 if marks:
6011 active = repo._activebookmark
6011 active = repo._activebookmark
6012 # i18n: column positioning for "hg summary"
6012 # i18n: column positioning for "hg summary"
6013 ui.write(_('bookmarks:'), label='log.bookmark')
6013 ui.write(_('bookmarks:'), label='log.bookmark')
6014 if active is not None:
6014 if active is not None:
6015 if active in marks:
6015 if active in marks:
6016 ui.write(' *' + active, label=activebookmarklabel)
6016 ui.write(' *' + active, label=activebookmarklabel)
6017 marks.remove(active)
6017 marks.remove(active)
6018 else:
6018 else:
6019 ui.write(' [%s]' % active, label=activebookmarklabel)
6019 ui.write(' [%s]' % active, label=activebookmarklabel)
6020 for m in marks:
6020 for m in marks:
6021 ui.write(' ' + m, label='log.bookmark')
6021 ui.write(' ' + m, label='log.bookmark')
6022 ui.write('\n', label='log.bookmark')
6022 ui.write('\n', label='log.bookmark')
6023
6023
6024 status = repo.status(unknown=True)
6024 status = repo.status(unknown=True)
6025
6025
6026 c = repo.dirstate.copies()
6026 c = repo.dirstate.copies()
6027 copied, renamed = [], []
6027 copied, renamed = [], []
6028 for d, s in c.iteritems():
6028 for d, s in c.iteritems():
6029 if s in status.removed:
6029 if s in status.removed:
6030 status.removed.remove(s)
6030 status.removed.remove(s)
6031 renamed.append(d)
6031 renamed.append(d)
6032 else:
6032 else:
6033 copied.append(d)
6033 copied.append(d)
6034 if d in status.added:
6034 if d in status.added:
6035 status.added.remove(d)
6035 status.added.remove(d)
6036
6036
6037 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6037 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6038
6038
6039 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6039 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6040 (ui.label(_('%d added'), 'status.added'), status.added),
6040 (ui.label(_('%d added'), 'status.added'), status.added),
6041 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6041 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6042 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6042 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6043 (ui.label(_('%d copied'), 'status.copied'), copied),
6043 (ui.label(_('%d copied'), 'status.copied'), copied),
6044 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6044 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6045 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6045 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6046 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6046 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6047 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6047 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6048 t = []
6048 t = []
6049 for l, s in labels:
6049 for l, s in labels:
6050 if s:
6050 if s:
6051 t.append(l % len(s))
6051 t.append(l % len(s))
6052
6052
6053 t = ', '.join(t)
6053 t = ', '.join(t)
6054 cleanworkdir = False
6054 cleanworkdir = False
6055
6055
6056 if repo.vfs.exists('graftstate'):
6056 if repo.vfs.exists('graftstate'):
6057 t += _(' (graft in progress)')
6057 t += _(' (graft in progress)')
6058 if repo.vfs.exists('updatestate'):
6058 if repo.vfs.exists('updatestate'):
6059 t += _(' (interrupted update)')
6059 t += _(' (interrupted update)')
6060 elif len(parents) > 1:
6060 elif len(parents) > 1:
6061 t += _(' (merge)')
6061 t += _(' (merge)')
6062 elif branch != parents[0].branch():
6062 elif branch != parents[0].branch():
6063 t += _(' (new branch)')
6063 t += _(' (new branch)')
6064 elif (parents[0].closesbranch() and
6064 elif (parents[0].closesbranch() and
6065 pnode in repo.branchheads(branch, closed=True)):
6065 pnode in repo.branchheads(branch, closed=True)):
6066 t += _(' (head closed)')
6066 t += _(' (head closed)')
6067 elif not (status.modified or status.added or status.removed or renamed or
6067 elif not (status.modified or status.added or status.removed or renamed or
6068 copied or subs):
6068 copied or subs):
6069 t += _(' (clean)')
6069 t += _(' (clean)')
6070 cleanworkdir = True
6070 cleanworkdir = True
6071 elif pnode not in bheads:
6071 elif pnode not in bheads:
6072 t += _(' (new branch head)')
6072 t += _(' (new branch head)')
6073
6073
6074 if parents:
6074 if parents:
6075 pendingphase = max(p.phase() for p in parents)
6075 pendingphase = max(p.phase() for p in parents)
6076 else:
6076 else:
6077 pendingphase = phases.public
6077 pendingphase = phases.public
6078
6078
6079 if pendingphase > phases.newcommitphase(ui):
6079 if pendingphase > phases.newcommitphase(ui):
6080 t += ' (%s)' % phases.phasenames[pendingphase]
6080 t += ' (%s)' % phases.phasenames[pendingphase]
6081
6081
6082 if cleanworkdir:
6082 if cleanworkdir:
6083 # i18n: column positioning for "hg summary"
6083 # i18n: column positioning for "hg summary"
6084 ui.status(_('commit: %s\n') % t.strip())
6084 ui.status(_('commit: %s\n') % t.strip())
6085 else:
6085 else:
6086 # i18n: column positioning for "hg summary"
6086 # i18n: column positioning for "hg summary"
6087 ui.write(_('commit: %s\n') % t.strip())
6087 ui.write(_('commit: %s\n') % t.strip())
6088
6088
6089 # all ancestors of branch heads - all ancestors of parent = new csets
6089 # all ancestors of branch heads - all ancestors of parent = new csets
6090 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6090 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6091 bheads))
6091 bheads))
6092
6092
6093 if new == 0:
6093 if new == 0:
6094 # i18n: column positioning for "hg summary"
6094 # i18n: column positioning for "hg summary"
6095 ui.status(_('update: (current)\n'))
6095 ui.status(_('update: (current)\n'))
6096 elif pnode not in bheads:
6096 elif pnode not in bheads:
6097 # i18n: column positioning for "hg summary"
6097 # i18n: column positioning for "hg summary"
6098 ui.write(_('update: %d new changesets (update)\n') % new)
6098 ui.write(_('update: %d new changesets (update)\n') % new)
6099 else:
6099 else:
6100 # i18n: column positioning for "hg summary"
6100 # i18n: column positioning for "hg summary"
6101 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6101 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6102 (new, len(bheads)))
6102 (new, len(bheads)))
6103
6103
6104 t = []
6104 t = []
6105 draft = len(repo.revs('draft()'))
6105 draft = len(repo.revs('draft()'))
6106 if draft:
6106 if draft:
6107 t.append(_('%d draft') % draft)
6107 t.append(_('%d draft') % draft)
6108 secret = len(repo.revs('secret()'))
6108 secret = len(repo.revs('secret()'))
6109 if secret:
6109 if secret:
6110 t.append(_('%d secret') % secret)
6110 t.append(_('%d secret') % secret)
6111
6111
6112 if draft or secret:
6112 if draft or secret:
6113 ui.status(_('phases: %s\n') % ', '.join(t))
6113 ui.status(_('phases: %s\n') % ', '.join(t))
6114
6114
6115 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6115 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6116 for trouble in ("unstable", "divergent", "bumped"):
6116 for trouble in ("unstable", "divergent", "bumped"):
6117 numtrouble = len(repo.revs(trouble + "()"))
6117 numtrouble = len(repo.revs(trouble + "()"))
6118 # We write all the possibilities to ease translation
6118 # We write all the possibilities to ease translation
6119 troublemsg = {
6119 troublemsg = {
6120 "unstable": _("unstable: %d changesets"),
6120 "unstable": _("unstable: %d changesets"),
6121 "divergent": _("divergent: %d changesets"),
6121 "divergent": _("divergent: %d changesets"),
6122 "bumped": _("bumped: %d changesets"),
6122 "bumped": _("bumped: %d changesets"),
6123 }
6123 }
6124 if numtrouble > 0:
6124 if numtrouble > 0:
6125 ui.status(troublemsg[trouble] % numtrouble + "\n")
6125 ui.status(troublemsg[trouble] % numtrouble + "\n")
6126
6126
6127 cmdutil.summaryhooks(ui, repo)
6127 cmdutil.summaryhooks(ui, repo)
6128
6128
6129 if opts.get('remote'):
6129 if opts.get('remote'):
6130 needsincoming, needsoutgoing = True, True
6130 needsincoming, needsoutgoing = True, True
6131 else:
6131 else:
6132 needsincoming, needsoutgoing = False, False
6132 needsincoming, needsoutgoing = False, False
6133 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6133 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6134 if i:
6134 if i:
6135 needsincoming = True
6135 needsincoming = True
6136 if o:
6136 if o:
6137 needsoutgoing = True
6137 needsoutgoing = True
6138 if not needsincoming and not needsoutgoing:
6138 if not needsincoming and not needsoutgoing:
6139 return
6139 return
6140
6140
6141 def getincoming():
6141 def getincoming():
6142 source, branches = hg.parseurl(ui.expandpath('default'))
6142 source, branches = hg.parseurl(ui.expandpath('default'))
6143 sbranch = branches[0]
6143 sbranch = branches[0]
6144 try:
6144 try:
6145 other = hg.peer(repo, {}, source)
6145 other = hg.peer(repo, {}, source)
6146 except error.RepoError:
6146 except error.RepoError:
6147 if opts.get('remote'):
6147 if opts.get('remote'):
6148 raise
6148 raise
6149 return source, sbranch, None, None, None
6149 return source, sbranch, None, None, None
6150 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6150 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6151 if revs:
6151 if revs:
6152 revs = [other.lookup(rev) for rev in revs]
6152 revs = [other.lookup(rev) for rev in revs]
6153 ui.debug('comparing with %s\n' % util.hidepassword(source))
6153 ui.debug('comparing with %s\n' % util.hidepassword(source))
6154 repo.ui.pushbuffer()
6154 repo.ui.pushbuffer()
6155 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6155 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6156 repo.ui.popbuffer()
6156 repo.ui.popbuffer()
6157 return source, sbranch, other, commoninc, commoninc[1]
6157 return source, sbranch, other, commoninc, commoninc[1]
6158
6158
6159 if needsincoming:
6159 if needsincoming:
6160 source, sbranch, sother, commoninc, incoming = getincoming()
6160 source, sbranch, sother, commoninc, incoming = getincoming()
6161 else:
6161 else:
6162 source = sbranch = sother = commoninc = incoming = None
6162 source = sbranch = sother = commoninc = incoming = None
6163
6163
6164 def getoutgoing():
6164 def getoutgoing():
6165 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6165 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6166 dbranch = branches[0]
6166 dbranch = branches[0]
6167 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6167 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6168 if source != dest:
6168 if source != dest:
6169 try:
6169 try:
6170 dother = hg.peer(repo, {}, dest)
6170 dother = hg.peer(repo, {}, dest)
6171 except error.RepoError:
6171 except error.RepoError:
6172 if opts.get('remote'):
6172 if opts.get('remote'):
6173 raise
6173 raise
6174 return dest, dbranch, None, None
6174 return dest, dbranch, None, None
6175 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6175 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6176 elif sother is None:
6176 elif sother is None:
6177 # there is no explicit destination peer, but source one is invalid
6177 # there is no explicit destination peer, but source one is invalid
6178 return dest, dbranch, None, None
6178 return dest, dbranch, None, None
6179 else:
6179 else:
6180 dother = sother
6180 dother = sother
6181 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6181 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6182 common = None
6182 common = None
6183 else:
6183 else:
6184 common = commoninc
6184 common = commoninc
6185 if revs:
6185 if revs:
6186 revs = [repo.lookup(rev) for rev in revs]
6186 revs = [repo.lookup(rev) for rev in revs]
6187 repo.ui.pushbuffer()
6187 repo.ui.pushbuffer()
6188 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6188 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6189 commoninc=common)
6189 commoninc=common)
6190 repo.ui.popbuffer()
6190 repo.ui.popbuffer()
6191 return dest, dbranch, dother, outgoing
6191 return dest, dbranch, dother, outgoing
6192
6192
6193 if needsoutgoing:
6193 if needsoutgoing:
6194 dest, dbranch, dother, outgoing = getoutgoing()
6194 dest, dbranch, dother, outgoing = getoutgoing()
6195 else:
6195 else:
6196 dest = dbranch = dother = outgoing = None
6196 dest = dbranch = dother = outgoing = None
6197
6197
6198 if opts.get('remote'):
6198 if opts.get('remote'):
6199 t = []
6199 t = []
6200 if incoming:
6200 if incoming:
6201 t.append(_('1 or more incoming'))
6201 t.append(_('1 or more incoming'))
6202 o = outgoing.missing
6202 o = outgoing.missing
6203 if o:
6203 if o:
6204 t.append(_('%d outgoing') % len(o))
6204 t.append(_('%d outgoing') % len(o))
6205 other = dother or sother
6205 other = dother or sother
6206 if 'bookmarks' in other.listkeys('namespaces'):
6206 if 'bookmarks' in other.listkeys('namespaces'):
6207 counts = bookmarks.summary(repo, other)
6207 counts = bookmarks.summary(repo, other)
6208 if counts[0] > 0:
6208 if counts[0] > 0:
6209 t.append(_('%d incoming bookmarks') % counts[0])
6209 t.append(_('%d incoming bookmarks') % counts[0])
6210 if counts[1] > 0:
6210 if counts[1] > 0:
6211 t.append(_('%d outgoing bookmarks') % counts[1])
6211 t.append(_('%d outgoing bookmarks') % counts[1])
6212
6212
6213 if t:
6213 if t:
6214 # i18n: column positioning for "hg summary"
6214 # i18n: column positioning for "hg summary"
6215 ui.write(_('remote: %s\n') % (', '.join(t)))
6215 ui.write(_('remote: %s\n') % (', '.join(t)))
6216 else:
6216 else:
6217 # i18n: column positioning for "hg summary"
6217 # i18n: column positioning for "hg summary"
6218 ui.status(_('remote: (synced)\n'))
6218 ui.status(_('remote: (synced)\n'))
6219
6219
6220 cmdutil.summaryremotehooks(ui, repo, opts,
6220 cmdutil.summaryremotehooks(ui, repo, opts,
6221 ((source, sbranch, sother, commoninc),
6221 ((source, sbranch, sother, commoninc),
6222 (dest, dbranch, dother, outgoing)))
6222 (dest, dbranch, dother, outgoing)))
6223
6223
6224 @command('tag',
6224 @command('tag',
6225 [('f', 'force', None, _('force tag')),
6225 [('f', 'force', None, _('force tag')),
6226 ('l', 'local', None, _('make the tag local')),
6226 ('l', 'local', None, _('make the tag local')),
6227 ('r', 'rev', '', _('revision to tag'), _('REV')),
6227 ('r', 'rev', '', _('revision to tag'), _('REV')),
6228 ('', 'remove', None, _('remove a tag')),
6228 ('', 'remove', None, _('remove a tag')),
6229 # -l/--local is already there, commitopts cannot be used
6229 # -l/--local is already there, commitopts cannot be used
6230 ('e', 'edit', None, _('invoke editor on commit messages')),
6230 ('e', 'edit', None, _('invoke editor on commit messages')),
6231 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6231 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6232 ] + commitopts2,
6232 ] + commitopts2,
6233 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6233 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6234 def tag(ui, repo, name1, *names, **opts):
6234 def tag(ui, repo, name1, *names, **opts):
6235 """add one or more tags for the current or given revision
6235 """add one or more tags for the current or given revision
6236
6236
6237 Name a particular revision using <name>.
6237 Name a particular revision using <name>.
6238
6238
6239 Tags are used to name particular revisions of the repository and are
6239 Tags are used to name particular revisions of the repository and are
6240 very useful to compare different revisions, to go back to significant
6240 very useful to compare different revisions, to go back to significant
6241 earlier versions or to mark branch points as releases, etc. Changing
6241 earlier versions or to mark branch points as releases, etc. Changing
6242 an existing tag is normally disallowed; use -f/--force to override.
6242 an existing tag is normally disallowed; use -f/--force to override.
6243
6243
6244 If no revision is given, the parent of the working directory is
6244 If no revision is given, the parent of the working directory is
6245 used.
6245 used.
6246
6246
6247 To facilitate version control, distribution, and merging of tags,
6247 To facilitate version control, distribution, and merging of tags,
6248 they are stored as a file named ".hgtags" which is managed similarly
6248 they are stored as a file named ".hgtags" which is managed similarly
6249 to other project files and can be hand-edited if necessary. This
6249 to other project files and can be hand-edited if necessary. This
6250 also means that tagging creates a new commit. The file
6250 also means that tagging creates a new commit. The file
6251 ".hg/localtags" is used for local tags (not shared among
6251 ".hg/localtags" is used for local tags (not shared among
6252 repositories).
6252 repositories).
6253
6253
6254 Tag commits are usually made at the head of a branch. If the parent
6254 Tag commits are usually made at the head of a branch. If the parent
6255 of the working directory is not a branch head, :hg:`tag` aborts; use
6255 of the working directory is not a branch head, :hg:`tag` aborts; use
6256 -f/--force to force the tag commit to be based on a non-head
6256 -f/--force to force the tag commit to be based on a non-head
6257 changeset.
6257 changeset.
6258
6258
6259 See :hg:`help dates` for a list of formats valid for -d/--date.
6259 See :hg:`help dates` for a list of formats valid for -d/--date.
6260
6260
6261 Since tag names have priority over branch names during revision
6261 Since tag names have priority over branch names during revision
6262 lookup, using an existing branch name as a tag name is discouraged.
6262 lookup, using an existing branch name as a tag name is discouraged.
6263
6263
6264 Returns 0 on success.
6264 Returns 0 on success.
6265 """
6265 """
6266 wlock = lock = None
6266 wlock = lock = None
6267 try:
6267 try:
6268 wlock = repo.wlock()
6268 wlock = repo.wlock()
6269 lock = repo.lock()
6269 lock = repo.lock()
6270 rev_ = "."
6270 rev_ = "."
6271 names = [t.strip() for t in (name1,) + names]
6271 names = [t.strip() for t in (name1,) + names]
6272 if len(names) != len(set(names)):
6272 if len(names) != len(set(names)):
6273 raise error.Abort(_('tag names must be unique'))
6273 raise error.Abort(_('tag names must be unique'))
6274 for n in names:
6274 for n in names:
6275 scmutil.checknewlabel(repo, n, 'tag')
6275 scmutil.checknewlabel(repo, n, 'tag')
6276 if not n:
6276 if not n:
6277 raise error.Abort(_('tag names cannot consist entirely of '
6277 raise error.Abort(_('tag names cannot consist entirely of '
6278 'whitespace'))
6278 'whitespace'))
6279 if opts.get('rev') and opts.get('remove'):
6279 if opts.get('rev') and opts.get('remove'):
6280 raise error.Abort(_("--rev and --remove are incompatible"))
6280 raise error.Abort(_("--rev and --remove are incompatible"))
6281 if opts.get('rev'):
6281 if opts.get('rev'):
6282 rev_ = opts['rev']
6282 rev_ = opts['rev']
6283 message = opts.get('message')
6283 message = opts.get('message')
6284 if opts.get('remove'):
6284 if opts.get('remove'):
6285 if opts.get('local'):
6285 if opts.get('local'):
6286 expectedtype = 'local'
6286 expectedtype = 'local'
6287 else:
6287 else:
6288 expectedtype = 'global'
6288 expectedtype = 'global'
6289
6289
6290 for n in names:
6290 for n in names:
6291 if not repo.tagtype(n):
6291 if not repo.tagtype(n):
6292 raise error.Abort(_("tag '%s' does not exist") % n)
6292 raise error.Abort(_("tag '%s' does not exist") % n)
6293 if repo.tagtype(n) != expectedtype:
6293 if repo.tagtype(n) != expectedtype:
6294 if expectedtype == 'global':
6294 if expectedtype == 'global':
6295 raise error.Abort(_("tag '%s' is not a global tag") % n)
6295 raise error.Abort(_("tag '%s' is not a global tag") % n)
6296 else:
6296 else:
6297 raise error.Abort(_("tag '%s' is not a local tag") % n)
6297 raise error.Abort(_("tag '%s' is not a local tag") % n)
6298 rev_ = 'null'
6298 rev_ = 'null'
6299 if not message:
6299 if not message:
6300 # we don't translate commit messages
6300 # we don't translate commit messages
6301 message = 'Removed tag %s' % ', '.join(names)
6301 message = 'Removed tag %s' % ', '.join(names)
6302 elif not opts.get('force'):
6302 elif not opts.get('force'):
6303 for n in names:
6303 for n in names:
6304 if n in repo.tags():
6304 if n in repo.tags():
6305 raise error.Abort(_("tag '%s' already exists "
6305 raise error.Abort(_("tag '%s' already exists "
6306 "(use -f to force)") % n)
6306 "(use -f to force)") % n)
6307 if not opts.get('local'):
6307 if not opts.get('local'):
6308 p1, p2 = repo.dirstate.parents()
6308 p1, p2 = repo.dirstate.parents()
6309 if p2 != nullid:
6309 if p2 != nullid:
6310 raise error.Abort(_('uncommitted merge'))
6310 raise error.Abort(_('uncommitted merge'))
6311 bheads = repo.branchheads()
6311 bheads = repo.branchheads()
6312 if not opts.get('force') and bheads and p1 not in bheads:
6312 if not opts.get('force') and bheads and p1 not in bheads:
6313 raise error.Abort(_('working directory is not at a branch head '
6313 raise error.Abort(_('working directory is not at a branch head '
6314 '(use -f to force)'))
6314 '(use -f to force)'))
6315 r = scmutil.revsingle(repo, rev_).node()
6315 r = scmutil.revsingle(repo, rev_).node()
6316
6316
6317 if not message:
6317 if not message:
6318 # we don't translate commit messages
6318 # we don't translate commit messages
6319 message = ('Added tag %s for changeset %s' %
6319 message = ('Added tag %s for changeset %s' %
6320 (', '.join(names), short(r)))
6320 (', '.join(names), short(r)))
6321
6321
6322 date = opts.get('date')
6322 date = opts.get('date')
6323 if date:
6323 if date:
6324 date = util.parsedate(date)
6324 date = util.parsedate(date)
6325
6325
6326 if opts.get('remove'):
6326 if opts.get('remove'):
6327 editform = 'tag.remove'
6327 editform = 'tag.remove'
6328 else:
6328 else:
6329 editform = 'tag.add'
6329 editform = 'tag.add'
6330 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6330 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6331
6331
6332 # don't allow tagging the null rev
6332 # don't allow tagging the null rev
6333 if (not opts.get('remove') and
6333 if (not opts.get('remove') and
6334 scmutil.revsingle(repo, rev_).rev() == nullrev):
6334 scmutil.revsingle(repo, rev_).rev() == nullrev):
6335 raise error.Abort(_("cannot tag null revision"))
6335 raise error.Abort(_("cannot tag null revision"))
6336
6336
6337 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6337 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6338 editor=editor)
6338 editor=editor)
6339 finally:
6339 finally:
6340 release(lock, wlock)
6340 release(lock, wlock)
6341
6341
6342 @command('tags', formatteropts, '')
6342 @command('tags', formatteropts, '')
6343 def tags(ui, repo, **opts):
6343 def tags(ui, repo, **opts):
6344 """list repository tags
6344 """list repository tags
6345
6345
6346 This lists both regular and local tags. When the -v/--verbose
6346 This lists both regular and local tags. When the -v/--verbose
6347 switch is used, a third column "local" is printed for local tags.
6347 switch is used, a third column "local" is printed for local tags.
6348 When the -q/--quiet switch is used, only the tag name is printed.
6348 When the -q/--quiet switch is used, only the tag name is printed.
6349
6349
6350 Returns 0 on success.
6350 Returns 0 on success.
6351 """
6351 """
6352
6352
6353 fm = ui.formatter('tags', opts)
6353 fm = ui.formatter('tags', opts)
6354 hexfunc = fm.hexfunc
6354 hexfunc = fm.hexfunc
6355 tagtype = ""
6355 tagtype = ""
6356
6356
6357 for t, n in reversed(repo.tagslist()):
6357 for t, n in reversed(repo.tagslist()):
6358 hn = hexfunc(n)
6358 hn = hexfunc(n)
6359 label = 'tags.normal'
6359 label = 'tags.normal'
6360 tagtype = ''
6360 tagtype = ''
6361 if repo.tagtype(t) == 'local':
6361 if repo.tagtype(t) == 'local':
6362 label = 'tags.local'
6362 label = 'tags.local'
6363 tagtype = 'local'
6363 tagtype = 'local'
6364
6364
6365 fm.startitem()
6365 fm.startitem()
6366 fm.write('tag', '%s', t, label=label)
6366 fm.write('tag', '%s', t, label=label)
6367 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6367 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6368 fm.condwrite(not ui.quiet, 'rev node', fmt,
6368 fm.condwrite(not ui.quiet, 'rev node', fmt,
6369 repo.changelog.rev(n), hn, label=label)
6369 repo.changelog.rev(n), hn, label=label)
6370 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6370 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6371 tagtype, label=label)
6371 tagtype, label=label)
6372 fm.plain('\n')
6372 fm.plain('\n')
6373 fm.end()
6373 fm.end()
6374
6374
6375 @command('tip',
6375 @command('tip',
6376 [('p', 'patch', None, _('show patch')),
6376 [('p', 'patch', None, _('show patch')),
6377 ('g', 'git', None, _('use git extended diff format')),
6377 ('g', 'git', None, _('use git extended diff format')),
6378 ] + templateopts,
6378 ] + templateopts,
6379 _('[-p] [-g]'))
6379 _('[-p] [-g]'))
6380 def tip(ui, repo, **opts):
6380 def tip(ui, repo, **opts):
6381 """show the tip revision (DEPRECATED)
6381 """show the tip revision (DEPRECATED)
6382
6382
6383 The tip revision (usually just called the tip) is the changeset
6383 The tip revision (usually just called the tip) is the changeset
6384 most recently added to the repository (and therefore the most
6384 most recently added to the repository (and therefore the most
6385 recently changed head).
6385 recently changed head).
6386
6386
6387 If you have just made a commit, that commit will be the tip. If
6387 If you have just made a commit, that commit will be the tip. If
6388 you have just pulled changes from another repository, the tip of
6388 you have just pulled changes from another repository, the tip of
6389 that repository becomes the current tip. The "tip" tag is special
6389 that repository becomes the current tip. The "tip" tag is special
6390 and cannot be renamed or assigned to a different changeset.
6390 and cannot be renamed or assigned to a different changeset.
6391
6391
6392 This command is deprecated, please use :hg:`heads` instead.
6392 This command is deprecated, please use :hg:`heads` instead.
6393
6393
6394 Returns 0 on success.
6394 Returns 0 on success.
6395 """
6395 """
6396 displayer = cmdutil.show_changeset(ui, repo, opts)
6396 displayer = cmdutil.show_changeset(ui, repo, opts)
6397 displayer.show(repo['tip'])
6397 displayer.show(repo['tip'])
6398 displayer.close()
6398 displayer.close()
6399
6399
6400 @command('unbundle',
6400 @command('unbundle',
6401 [('u', 'update', None,
6401 [('u', 'update', None,
6402 _('update to new branch head if changesets were unbundled'))],
6402 _('update to new branch head if changesets were unbundled'))],
6403 _('[-u] FILE...'))
6403 _('[-u] FILE...'))
6404 def unbundle(ui, repo, fname1, *fnames, **opts):
6404 def unbundle(ui, repo, fname1, *fnames, **opts):
6405 """apply one or more changegroup files
6405 """apply one or more changegroup files
6406
6406
6407 Apply one or more compressed changegroup files generated by the
6407 Apply one or more compressed changegroup files generated by the
6408 bundle command.
6408 bundle command.
6409
6409
6410 Returns 0 on success, 1 if an update has unresolved files.
6410 Returns 0 on success, 1 if an update has unresolved files.
6411 """
6411 """
6412 fnames = (fname1,) + fnames
6412 fnames = (fname1,) + fnames
6413
6413
6414 with repo.lock():
6414 with repo.lock():
6415 for fname in fnames:
6415 for fname in fnames:
6416 f = hg.openpath(ui, fname)
6416 f = hg.openpath(ui, fname)
6417 gen = exchange.readbundle(ui, f, fname)
6417 gen = exchange.readbundle(ui, f, fname)
6418 if isinstance(gen, bundle2.unbundle20):
6418 if isinstance(gen, bundle2.unbundle20):
6419 tr = repo.transaction('unbundle')
6419 tr = repo.transaction('unbundle')
6420 try:
6420 try:
6421 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6421 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6422 url='bundle:' + fname)
6422 url='bundle:' + fname)
6423 tr.close()
6423 tr.close()
6424 except error.BundleUnknownFeatureError as exc:
6424 except error.BundleUnknownFeatureError as exc:
6425 raise error.Abort(_('%s: unknown bundle feature, %s')
6425 raise error.Abort(_('%s: unknown bundle feature, %s')
6426 % (fname, exc),
6426 % (fname, exc),
6427 hint=_("see https://mercurial-scm.org/"
6427 hint=_("see https://mercurial-scm.org/"
6428 "wiki/BundleFeature for more "
6428 "wiki/BundleFeature for more "
6429 "information"))
6429 "information"))
6430 finally:
6430 finally:
6431 if tr:
6431 if tr:
6432 tr.release()
6432 tr.release()
6433 changes = [r.get('return', 0)
6433 changes = [r.get('return', 0)
6434 for r in op.records['changegroup']]
6434 for r in op.records['changegroup']]
6435 modheads = changegroup.combineresults(changes)
6435 modheads = changegroup.combineresults(changes)
6436 elif isinstance(gen, streamclone.streamcloneapplier):
6436 elif isinstance(gen, streamclone.streamcloneapplier):
6437 raise error.Abort(
6437 raise error.Abort(
6438 _('packed bundles cannot be applied with '
6438 _('packed bundles cannot be applied with '
6439 '"hg unbundle"'),
6439 '"hg unbundle"'),
6440 hint=_('use "hg debugapplystreamclonebundle"'))
6440 hint=_('use "hg debugapplystreamclonebundle"'))
6441 else:
6441 else:
6442 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6442 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6443
6443
6444 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
6444 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
6445
6445
6446 @command('^update|up|checkout|co',
6446 @command('^update|up|checkout|co',
6447 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6447 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6448 ('c', 'check', None, _('require clean working directory')),
6448 ('c', 'check', None, _('require clean working directory')),
6449 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6449 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6450 ('r', 'rev', '', _('revision'), _('REV'))
6450 ('r', 'rev', '', _('revision'), _('REV'))
6451 ] + mergetoolopts,
6451 ] + mergetoolopts,
6452 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6452 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6453 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6453 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6454 tool=None):
6454 tool=None):
6455 """update working directory (or switch revisions)
6455 """update working directory (or switch revisions)
6456
6456
6457 Update the repository's working directory to the specified
6457 Update the repository's working directory to the specified
6458 changeset. If no changeset is specified, update to the tip of the
6458 changeset. If no changeset is specified, update to the tip of the
6459 current named branch and move the active bookmark (see :hg:`help
6459 current named branch and move the active bookmark (see :hg:`help
6460 bookmarks`).
6460 bookmarks`).
6461
6461
6462 Update sets the working directory's parent revision to the specified
6462 Update sets the working directory's parent revision to the specified
6463 changeset (see :hg:`help parents`).
6463 changeset (see :hg:`help parents`).
6464
6464
6465 If the changeset is not a descendant or ancestor of the working
6465 If the changeset is not a descendant or ancestor of the working
6466 directory's parent, the update is aborted. With the -c/--check
6466 directory's parent, the update is aborted. With the -c/--check
6467 option, the working directory is checked for uncommitted changes; if
6467 option, the working directory is checked for uncommitted changes; if
6468 none are found, the working directory is updated to the specified
6468 none are found, the working directory is updated to the specified
6469 changeset.
6469 changeset.
6470
6470
6471 .. container:: verbose
6471 .. container:: verbose
6472
6472
6473 The following rules apply when the working directory contains
6473 The following rules apply when the working directory contains
6474 uncommitted changes:
6474 uncommitted changes:
6475
6475
6476 1. If neither -c/--check nor -C/--clean is specified, and if
6476 1. If neither -c/--check nor -C/--clean is specified, and if
6477 the requested changeset is an ancestor or descendant of
6477 the requested changeset is an ancestor or descendant of
6478 the working directory's parent, the uncommitted changes
6478 the working directory's parent, the uncommitted changes
6479 are merged into the requested changeset and the merged
6479 are merged into the requested changeset and the merged
6480 result is left uncommitted. If the requested changeset is
6480 result is left uncommitted. If the requested changeset is
6481 not an ancestor or descendant (that is, it is on another
6481 not an ancestor or descendant (that is, it is on another
6482 branch), the update is aborted and the uncommitted changes
6482 branch), the update is aborted and the uncommitted changes
6483 are preserved.
6483 are preserved.
6484
6484
6485 2. With the -c/--check option, the update is aborted and the
6485 2. With the -c/--check option, the update is aborted and the
6486 uncommitted changes are preserved.
6486 uncommitted changes are preserved.
6487
6487
6488 3. With the -C/--clean option, uncommitted changes are discarded and
6488 3. With the -C/--clean option, uncommitted changes are discarded and
6489 the working directory is updated to the requested changeset.
6489 the working directory is updated to the requested changeset.
6490
6490
6491 To cancel an uncommitted merge (and lose your changes), use
6491 To cancel an uncommitted merge (and lose your changes), use
6492 :hg:`update --clean .`.
6492 :hg:`update --clean .`.
6493
6493
6494 Use null as the changeset to remove the working directory (like
6494 Use null as the changeset to remove the working directory (like
6495 :hg:`clone -U`).
6495 :hg:`clone -U`).
6496
6496
6497 If you want to revert just one file to an older revision, use
6497 If you want to revert just one file to an older revision, use
6498 :hg:`revert [-r REV] NAME`.
6498 :hg:`revert [-r REV] NAME`.
6499
6499
6500 See :hg:`help dates` for a list of formats valid for -d/--date.
6500 See :hg:`help dates` for a list of formats valid for -d/--date.
6501
6501
6502 Returns 0 on success, 1 if there are unresolved files.
6502 Returns 0 on success, 1 if there are unresolved files.
6503 """
6503 """
6504 if rev and node:
6504 if rev and node:
6505 raise error.Abort(_("please specify just one revision"))
6505 raise error.Abort(_("please specify just one revision"))
6506
6506
6507 if rev is None or rev == '':
6507 if rev is None or rev == '':
6508 rev = node
6508 rev = node
6509
6509
6510 if date and rev is not None:
6510 if date and rev is not None:
6511 raise error.Abort(_("you can't specify a revision and a date"))
6511 raise error.Abort(_("you can't specify a revision and a date"))
6512
6512
6513 if check and clean:
6513 if check and clean:
6514 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
6514 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
6515
6515
6516 with repo.wlock():
6516 with repo.wlock():
6517 cmdutil.clearunfinished(repo)
6517 cmdutil.clearunfinished(repo)
6518
6518
6519 if date:
6519 if date:
6520 rev = cmdutil.finddate(ui, repo, date)
6520 rev = cmdutil.finddate(ui, repo, date)
6521
6521
6522 # if we defined a bookmark, we have to remember the original name
6522 # if we defined a bookmark, we have to remember the original name
6523 brev = rev
6523 brev = rev
6524 rev = scmutil.revsingle(repo, rev, rev).rev()
6524 rev = scmutil.revsingle(repo, rev, rev).rev()
6525
6525
6526 if check:
6526 if check:
6527 cmdutil.bailifchanged(repo, merge=False)
6527 cmdutil.bailifchanged(repo, merge=False)
6528
6528
6529 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6529 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6530
6530
6531 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
6531 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
6532
6532
6533 @command('verify', [])
6533 @command('verify', [])
6534 def verify(ui, repo):
6534 def verify(ui, repo):
6535 """verify the integrity of the repository
6535 """verify the integrity of the repository
6536
6536
6537 Verify the integrity of the current repository.
6537 Verify the integrity of the current repository.
6538
6538
6539 This will perform an extensive check of the repository's
6539 This will perform an extensive check of the repository's
6540 integrity, validating the hashes and checksums of each entry in
6540 integrity, validating the hashes and checksums of each entry in
6541 the changelog, manifest, and tracked files, as well as the
6541 the changelog, manifest, and tracked files, as well as the
6542 integrity of their crosslinks and indices.
6542 integrity of their crosslinks and indices.
6543
6543
6544 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6544 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6545 for more information about recovery from corruption of the
6545 for more information about recovery from corruption of the
6546 repository.
6546 repository.
6547
6547
6548 Returns 0 on success, 1 if errors are encountered.
6548 Returns 0 on success, 1 if errors are encountered.
6549 """
6549 """
6550 return hg.verify(repo)
6550 return hg.verify(repo)
6551
6551
6552 @command('version', [] + formatteropts, norepo=True)
6552 @command('version', [] + formatteropts, norepo=True)
6553 def version_(ui, **opts):
6553 def version_(ui, **opts):
6554 """output version and copyright information"""
6554 """output version and copyright information"""
6555 fm = ui.formatter("version", opts)
6555 fm = ui.formatter("version", opts)
6556 fm.startitem()
6556 fm.startitem()
6557 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6557 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6558 util.version())
6558 util.version())
6559 license = _(
6559 license = _(
6560 "(see https://mercurial-scm.org for more information)\n"
6560 "(see https://mercurial-scm.org for more information)\n"
6561 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
6561 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
6562 "This is free software; see the source for copying conditions. "
6562 "This is free software; see the source for copying conditions. "
6563 "There is NO\nwarranty; "
6563 "There is NO\nwarranty; "
6564 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6564 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6565 )
6565 )
6566 if not ui.quiet:
6566 if not ui.quiet:
6567 fm.plain(license)
6567 fm.plain(license)
6568
6568
6569 if ui.verbose:
6569 if ui.verbose:
6570 fm.plain(_("\nEnabled extensions:\n\n"))
6570 fm.plain(_("\nEnabled extensions:\n\n"))
6571 # format names and versions into columns
6571 # format names and versions into columns
6572 names = []
6572 names = []
6573 vers = []
6573 vers = []
6574 isinternals = []
6574 isinternals = []
6575 for name, module in extensions.extensions():
6575 for name, module in extensions.extensions():
6576 names.append(name)
6576 names.append(name)
6577 vers.append(extensions.moduleversion(module) or None)
6577 vers.append(extensions.moduleversion(module) or None)
6578 isinternals.append(extensions.ismoduleinternal(module))
6578 isinternals.append(extensions.ismoduleinternal(module))
6579 fn = fm.nested("extensions")
6579 fn = fm.nested("extensions")
6580 if names:
6580 if names:
6581 namefmt = " %%-%ds " % max(len(n) for n in names)
6581 namefmt = " %%-%ds " % max(len(n) for n in names)
6582 places = [_("external"), _("internal")]
6582 places = [_("external"), _("internal")]
6583 for n, v, p in zip(names, vers, isinternals):
6583 for n, v, p in zip(names, vers, isinternals):
6584 fn.startitem()
6584 fn.startitem()
6585 fn.condwrite(ui.verbose, "name", namefmt, n)
6585 fn.condwrite(ui.verbose, "name", namefmt, n)
6586 if ui.verbose:
6586 if ui.verbose:
6587 fn.plain("%s " % places[p])
6587 fn.plain("%s " % places[p])
6588 fn.data(bundled=p)
6588 fn.data(bundled=p)
6589 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6589 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6590 if ui.verbose:
6590 if ui.verbose:
6591 fn.plain("\n")
6591 fn.plain("\n")
6592 fn.end()
6592 fn.end()
6593 fm.end()
6593 fm.end()
6594
6594
6595 def loadcmdtable(ui, name, cmdtable):
6595 def loadcmdtable(ui, name, cmdtable):
6596 """Load command functions from specified cmdtable
6596 """Load command functions from specified cmdtable
6597 """
6597 """
6598 overrides = [cmd for cmd in cmdtable if cmd in table]
6598 overrides = [cmd for cmd in cmdtable if cmd in table]
6599 if overrides:
6599 if overrides:
6600 ui.warn(_("extension '%s' overrides commands: %s\n")
6600 ui.warn(_("extension '%s' overrides commands: %s\n")
6601 % (name, " ".join(overrides)))
6601 % (name, " ".join(overrides)))
6602 table.update(cmdtable)
6602 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now