##// END OF EJS Templates
debugrevspec: deprecate --optimize option...
Yuya Nishihara -
r29914:77012840 default
parent child Browse files
Show More
@@ -1,7347 +1,7348 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 operator
12 import operator
13 import os
13 import os
14 import random
14 import random
15 import re
15 import re
16 import shlex
16 import shlex
17 import socket
17 import socket
18 import sys
18 import sys
19 import tempfile
19 import tempfile
20 import time
20 import time
21
21
22 from .i18n import _
22 from .i18n import _
23 from .node import (
23 from .node import (
24 bin,
24 bin,
25 hex,
25 hex,
26 nullhex,
26 nullhex,
27 nullid,
27 nullid,
28 nullrev,
28 nullrev,
29 short,
29 short,
30 )
30 )
31 from . import (
31 from . import (
32 archival,
32 archival,
33 bookmarks,
33 bookmarks,
34 bundle2,
34 bundle2,
35 changegroup,
35 changegroup,
36 cmdutil,
36 cmdutil,
37 commandserver,
37 commandserver,
38 context,
38 context,
39 copies,
39 copies,
40 dagparser,
40 dagparser,
41 dagutil,
41 dagutil,
42 destutil,
42 destutil,
43 discovery,
43 discovery,
44 encoding,
44 encoding,
45 error,
45 error,
46 exchange,
46 exchange,
47 extensions,
47 extensions,
48 fileset,
48 fileset,
49 formatter,
49 formatter,
50 graphmod,
50 graphmod,
51 hbisect,
51 hbisect,
52 help,
52 help,
53 hg,
53 hg,
54 hgweb,
54 hgweb,
55 localrepo,
55 localrepo,
56 lock as lockmod,
56 lock as lockmod,
57 merge as mergemod,
57 merge as mergemod,
58 minirst,
58 minirst,
59 obsolete,
59 obsolete,
60 patch,
60 patch,
61 phases,
61 phases,
62 policy,
62 policy,
63 pvec,
63 pvec,
64 repair,
64 repair,
65 revlog,
65 revlog,
66 revset,
66 revset,
67 scmutil,
67 scmutil,
68 setdiscovery,
68 setdiscovery,
69 simplemerge,
69 simplemerge,
70 sshserver,
70 sshserver,
71 streamclone,
71 streamclone,
72 templatekw,
72 templatekw,
73 templater,
73 templater,
74 treediscovery,
74 treediscovery,
75 ui as uimod,
75 ui as uimod,
76 util,
76 util,
77 )
77 )
78
78
79 release = lockmod.release
79 release = lockmod.release
80
80
81 table = {}
81 table = {}
82
82
83 command = cmdutil.command(table)
83 command = cmdutil.command(table)
84
84
85 # label constants
85 # label constants
86 # until 3.5, bookmarks.current was the advertised name, not
86 # until 3.5, bookmarks.current was the advertised name, not
87 # bookmarks.active, so we must use both to avoid breaking old
87 # bookmarks.active, so we must use both to avoid breaking old
88 # custom styles
88 # custom styles
89 activebookmarklabel = 'bookmarks.active bookmarks.current'
89 activebookmarklabel = 'bookmarks.active bookmarks.current'
90
90
91 # common command options
91 # common command options
92
92
93 globalopts = [
93 globalopts = [
94 ('R', 'repository', '',
94 ('R', 'repository', '',
95 _('repository root directory or name of overlay bundle file'),
95 _('repository root directory or name of overlay bundle file'),
96 _('REPO')),
96 _('REPO')),
97 ('', 'cwd', '',
97 ('', 'cwd', '',
98 _('change working directory'), _('DIR')),
98 _('change working directory'), _('DIR')),
99 ('y', 'noninteractive', None,
99 ('y', 'noninteractive', None,
100 _('do not prompt, automatically pick the first choice for all prompts')),
100 _('do not prompt, automatically pick the first choice for all prompts')),
101 ('q', 'quiet', None, _('suppress output')),
101 ('q', 'quiet', None, _('suppress output')),
102 ('v', 'verbose', None, _('enable additional output')),
102 ('v', 'verbose', None, _('enable additional output')),
103 ('', 'config', [],
103 ('', 'config', [],
104 _('set/override config option (use \'section.name=value\')'),
104 _('set/override config option (use \'section.name=value\')'),
105 _('CONFIG')),
105 _('CONFIG')),
106 ('', 'debug', None, _('enable debugging output')),
106 ('', 'debug', None, _('enable debugging output')),
107 ('', 'debugger', None, _('start debugger')),
107 ('', 'debugger', None, _('start debugger')),
108 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
108 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
109 _('ENCODE')),
109 _('ENCODE')),
110 ('', 'encodingmode', encoding.encodingmode,
110 ('', 'encodingmode', encoding.encodingmode,
111 _('set the charset encoding mode'), _('MODE')),
111 _('set the charset encoding mode'), _('MODE')),
112 ('', 'traceback', None, _('always print a traceback on exception')),
112 ('', 'traceback', None, _('always print a traceback on exception')),
113 ('', 'time', None, _('time how long the command takes')),
113 ('', 'time', None, _('time how long the command takes')),
114 ('', 'profile', None, _('print command execution profile')),
114 ('', 'profile', None, _('print command execution profile')),
115 ('', 'version', None, _('output version information and exit')),
115 ('', 'version', None, _('output version information and exit')),
116 ('h', 'help', None, _('display help and exit')),
116 ('h', 'help', None, _('display help and exit')),
117 ('', 'hidden', False, _('consider hidden changesets')),
117 ('', 'hidden', False, _('consider hidden changesets')),
118 ]
118 ]
119
119
120 dryrunopts = [('n', 'dry-run', None,
120 dryrunopts = [('n', 'dry-run', None,
121 _('do not perform actions, just print output'))]
121 _('do not perform actions, just print output'))]
122
122
123 remoteopts = [
123 remoteopts = [
124 ('e', 'ssh', '',
124 ('e', 'ssh', '',
125 _('specify ssh command to use'), _('CMD')),
125 _('specify ssh command to use'), _('CMD')),
126 ('', 'remotecmd', '',
126 ('', 'remotecmd', '',
127 _('specify hg command to run on the remote side'), _('CMD')),
127 _('specify hg command to run on the remote side'), _('CMD')),
128 ('', 'insecure', None,
128 ('', 'insecure', None,
129 _('do not verify server certificate (ignoring web.cacerts config)')),
129 _('do not verify server certificate (ignoring web.cacerts config)')),
130 ]
130 ]
131
131
132 walkopts = [
132 walkopts = [
133 ('I', 'include', [],
133 ('I', 'include', [],
134 _('include names matching the given patterns'), _('PATTERN')),
134 _('include names matching the given patterns'), _('PATTERN')),
135 ('X', 'exclude', [],
135 ('X', 'exclude', [],
136 _('exclude names matching the given patterns'), _('PATTERN')),
136 _('exclude names matching the given patterns'), _('PATTERN')),
137 ]
137 ]
138
138
139 commitopts = [
139 commitopts = [
140 ('m', 'message', '',
140 ('m', 'message', '',
141 _('use text as commit message'), _('TEXT')),
141 _('use text as commit message'), _('TEXT')),
142 ('l', 'logfile', '',
142 ('l', 'logfile', '',
143 _('read commit message from file'), _('FILE')),
143 _('read commit message from file'), _('FILE')),
144 ]
144 ]
145
145
146 commitopts2 = [
146 commitopts2 = [
147 ('d', 'date', '',
147 ('d', 'date', '',
148 _('record the specified date as commit date'), _('DATE')),
148 _('record the specified date as commit date'), _('DATE')),
149 ('u', 'user', '',
149 ('u', 'user', '',
150 _('record the specified user as committer'), _('USER')),
150 _('record the specified user as committer'), _('USER')),
151 ]
151 ]
152
152
153 # hidden for now
153 # hidden for now
154 formatteropts = [
154 formatteropts = [
155 ('T', 'template', '',
155 ('T', 'template', '',
156 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
156 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
157 ]
157 ]
158
158
159 templateopts = [
159 templateopts = [
160 ('', 'style', '',
160 ('', 'style', '',
161 _('display using template map file (DEPRECATED)'), _('STYLE')),
161 _('display using template map file (DEPRECATED)'), _('STYLE')),
162 ('T', 'template', '',
162 ('T', 'template', '',
163 _('display with template'), _('TEMPLATE')),
163 _('display with template'), _('TEMPLATE')),
164 ]
164 ]
165
165
166 logopts = [
166 logopts = [
167 ('p', 'patch', None, _('show patch')),
167 ('p', 'patch', None, _('show patch')),
168 ('g', 'git', None, _('use git extended diff format')),
168 ('g', 'git', None, _('use git extended diff format')),
169 ('l', 'limit', '',
169 ('l', 'limit', '',
170 _('limit number of changes displayed'), _('NUM')),
170 _('limit number of changes displayed'), _('NUM')),
171 ('M', 'no-merges', None, _('do not show merges')),
171 ('M', 'no-merges', None, _('do not show merges')),
172 ('', 'stat', None, _('output diffstat-style summary of changes')),
172 ('', 'stat', None, _('output diffstat-style summary of changes')),
173 ('G', 'graph', None, _("show the revision DAG")),
173 ('G', 'graph', None, _("show the revision DAG")),
174 ] + templateopts
174 ] + templateopts
175
175
176 diffopts = [
176 diffopts = [
177 ('a', 'text', None, _('treat all files as text')),
177 ('a', 'text', None, _('treat all files as text')),
178 ('g', 'git', None, _('use git extended diff format')),
178 ('g', 'git', None, _('use git extended diff format')),
179 ('', 'nodates', None, _('omit dates from diff headers'))
179 ('', 'nodates', None, _('omit dates from diff headers'))
180 ]
180 ]
181
181
182 diffwsopts = [
182 diffwsopts = [
183 ('w', 'ignore-all-space', None,
183 ('w', 'ignore-all-space', None,
184 _('ignore white space when comparing lines')),
184 _('ignore white space when comparing lines')),
185 ('b', 'ignore-space-change', None,
185 ('b', 'ignore-space-change', None,
186 _('ignore changes in the amount of white space')),
186 _('ignore changes in the amount of white space')),
187 ('B', 'ignore-blank-lines', None,
187 ('B', 'ignore-blank-lines', None,
188 _('ignore changes whose lines are all blank')),
188 _('ignore changes whose lines are all blank')),
189 ]
189 ]
190
190
191 diffopts2 = [
191 diffopts2 = [
192 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
192 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
193 ('p', 'show-function', None, _('show which function each change is in')),
193 ('p', 'show-function', None, _('show which function each change is in')),
194 ('', 'reverse', None, _('produce a diff that undoes the changes')),
194 ('', 'reverse', None, _('produce a diff that undoes the changes')),
195 ] + diffwsopts + [
195 ] + diffwsopts + [
196 ('U', 'unified', '',
196 ('U', 'unified', '',
197 _('number of lines of context to show'), _('NUM')),
197 _('number of lines of context to show'), _('NUM')),
198 ('', 'stat', None, _('output diffstat-style summary of changes')),
198 ('', 'stat', None, _('output diffstat-style summary of changes')),
199 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
199 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
200 ]
200 ]
201
201
202 mergetoolopts = [
202 mergetoolopts = [
203 ('t', 'tool', '', _('specify merge tool')),
203 ('t', 'tool', '', _('specify merge tool')),
204 ]
204 ]
205
205
206 similarityopts = [
206 similarityopts = [
207 ('s', 'similarity', '',
207 ('s', 'similarity', '',
208 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
208 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
209 ]
209 ]
210
210
211 subrepoopts = [
211 subrepoopts = [
212 ('S', 'subrepos', None,
212 ('S', 'subrepos', None,
213 _('recurse into subrepositories'))
213 _('recurse into subrepositories'))
214 ]
214 ]
215
215
216 debugrevlogopts = [
216 debugrevlogopts = [
217 ('c', 'changelog', False, _('open changelog')),
217 ('c', 'changelog', False, _('open changelog')),
218 ('m', 'manifest', False, _('open manifest')),
218 ('m', 'manifest', False, _('open manifest')),
219 ('', 'dir', '', _('open directory manifest')),
219 ('', 'dir', '', _('open directory manifest')),
220 ]
220 ]
221
221
222 # Commands start here, listed alphabetically
222 # Commands start here, listed alphabetically
223
223
224 @command('^add',
224 @command('^add',
225 walkopts + subrepoopts + dryrunopts,
225 walkopts + subrepoopts + dryrunopts,
226 _('[OPTION]... [FILE]...'),
226 _('[OPTION]... [FILE]...'),
227 inferrepo=True)
227 inferrepo=True)
228 def add(ui, repo, *pats, **opts):
228 def add(ui, repo, *pats, **opts):
229 """add the specified files on the next commit
229 """add the specified files on the next commit
230
230
231 Schedule files to be version controlled and added to the
231 Schedule files to be version controlled and added to the
232 repository.
232 repository.
233
233
234 The files will be added to the repository at the next commit. To
234 The files will be added to the repository at the next commit. To
235 undo an add before that, see :hg:`forget`.
235 undo an add before that, see :hg:`forget`.
236
236
237 If no names are given, add all files to the repository (except
237 If no names are given, add all files to the repository (except
238 files matching ``.hgignore``).
238 files matching ``.hgignore``).
239
239
240 .. container:: verbose
240 .. container:: verbose
241
241
242 Examples:
242 Examples:
243
243
244 - New (unknown) files are added
244 - New (unknown) files are added
245 automatically by :hg:`add`::
245 automatically by :hg:`add`::
246
246
247 $ ls
247 $ ls
248 foo.c
248 foo.c
249 $ hg status
249 $ hg status
250 ? foo.c
250 ? foo.c
251 $ hg add
251 $ hg add
252 adding foo.c
252 adding foo.c
253 $ hg status
253 $ hg status
254 A foo.c
254 A foo.c
255
255
256 - Specific files to be added can be specified::
256 - Specific files to be added can be specified::
257
257
258 $ ls
258 $ ls
259 bar.c foo.c
259 bar.c foo.c
260 $ hg status
260 $ hg status
261 ? bar.c
261 ? bar.c
262 ? foo.c
262 ? foo.c
263 $ hg add bar.c
263 $ hg add bar.c
264 $ hg status
264 $ hg status
265 A bar.c
265 A bar.c
266 ? foo.c
266 ? foo.c
267
267
268 Returns 0 if all files are successfully added.
268 Returns 0 if all files are successfully added.
269 """
269 """
270
270
271 m = scmutil.match(repo[None], pats, opts)
271 m = scmutil.match(repo[None], pats, opts)
272 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
272 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
273 return rejected and 1 or 0
273 return rejected and 1 or 0
274
274
275 @command('addremove',
275 @command('addremove',
276 similarityopts + subrepoopts + walkopts + dryrunopts,
276 similarityopts + subrepoopts + walkopts + dryrunopts,
277 _('[OPTION]... [FILE]...'),
277 _('[OPTION]... [FILE]...'),
278 inferrepo=True)
278 inferrepo=True)
279 def addremove(ui, repo, *pats, **opts):
279 def addremove(ui, repo, *pats, **opts):
280 """add all new files, delete all missing files
280 """add all new files, delete all missing files
281
281
282 Add all new files and remove all missing files from the
282 Add all new files and remove all missing files from the
283 repository.
283 repository.
284
284
285 Unless names are given, new files are ignored if they match any of
285 Unless names are given, new files are ignored if they match any of
286 the patterns in ``.hgignore``. As with add, these changes take
286 the patterns in ``.hgignore``. As with add, these changes take
287 effect at the next commit.
287 effect at the next commit.
288
288
289 Use the -s/--similarity option to detect renamed files. This
289 Use the -s/--similarity option to detect renamed files. This
290 option takes a percentage between 0 (disabled) and 100 (files must
290 option takes a percentage between 0 (disabled) and 100 (files must
291 be identical) as its parameter. With a parameter greater than 0,
291 be identical) as its parameter. With a parameter greater than 0,
292 this compares every removed file with every added file and records
292 this compares every removed file with every added file and records
293 those similar enough as renames. Detecting renamed files this way
293 those similar enough as renames. Detecting renamed files this way
294 can be expensive. After using this option, :hg:`status -C` can be
294 can be expensive. After using this option, :hg:`status -C` can be
295 used to check which files were identified as moved or renamed. If
295 used to check which files were identified as moved or renamed. If
296 not specified, -s/--similarity defaults to 100 and only renames of
296 not specified, -s/--similarity defaults to 100 and only renames of
297 identical files are detected.
297 identical files are detected.
298
298
299 .. container:: verbose
299 .. container:: verbose
300
300
301 Examples:
301 Examples:
302
302
303 - A number of files (bar.c and foo.c) are new,
303 - A number of files (bar.c and foo.c) are new,
304 while foobar.c has been removed (without using :hg:`remove`)
304 while foobar.c has been removed (without using :hg:`remove`)
305 from the repository::
305 from the repository::
306
306
307 $ ls
307 $ ls
308 bar.c foo.c
308 bar.c foo.c
309 $ hg status
309 $ hg status
310 ! foobar.c
310 ! foobar.c
311 ? bar.c
311 ? bar.c
312 ? foo.c
312 ? foo.c
313 $ hg addremove
313 $ hg addremove
314 adding bar.c
314 adding bar.c
315 adding foo.c
315 adding foo.c
316 removing foobar.c
316 removing foobar.c
317 $ hg status
317 $ hg status
318 A bar.c
318 A bar.c
319 A foo.c
319 A foo.c
320 R foobar.c
320 R foobar.c
321
321
322 - A file foobar.c was moved to foo.c without using :hg:`rename`.
322 - A file foobar.c was moved to foo.c without using :hg:`rename`.
323 Afterwards, it was edited slightly::
323 Afterwards, it was edited slightly::
324
324
325 $ ls
325 $ ls
326 foo.c
326 foo.c
327 $ hg status
327 $ hg status
328 ! foobar.c
328 ! foobar.c
329 ? foo.c
329 ? foo.c
330 $ hg addremove --similarity 90
330 $ hg addremove --similarity 90
331 removing foobar.c
331 removing foobar.c
332 adding foo.c
332 adding foo.c
333 recording removal of foobar.c as rename to foo.c (94% similar)
333 recording removal of foobar.c as rename to foo.c (94% similar)
334 $ hg status -C
334 $ hg status -C
335 A foo.c
335 A foo.c
336 foobar.c
336 foobar.c
337 R foobar.c
337 R foobar.c
338
338
339 Returns 0 if all files are successfully added.
339 Returns 0 if all files are successfully added.
340 """
340 """
341 try:
341 try:
342 sim = float(opts.get('similarity') or 100)
342 sim = float(opts.get('similarity') or 100)
343 except ValueError:
343 except ValueError:
344 raise error.Abort(_('similarity must be a number'))
344 raise error.Abort(_('similarity must be a number'))
345 if sim < 0 or sim > 100:
345 if sim < 0 or sim > 100:
346 raise error.Abort(_('similarity must be between 0 and 100'))
346 raise error.Abort(_('similarity must be between 0 and 100'))
347 matcher = scmutil.match(repo[None], pats, opts)
347 matcher = scmutil.match(repo[None], pats, opts)
348 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
348 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
349
349
350 @command('^annotate|blame',
350 @command('^annotate|blame',
351 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
351 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
352 ('', 'follow', None,
352 ('', 'follow', None,
353 _('follow copies/renames and list the filename (DEPRECATED)')),
353 _('follow copies/renames and list the filename (DEPRECATED)')),
354 ('', 'no-follow', None, _("don't follow copies and renames")),
354 ('', 'no-follow', None, _("don't follow copies and renames")),
355 ('a', 'text', None, _('treat all files as text')),
355 ('a', 'text', None, _('treat all files as text')),
356 ('u', 'user', None, _('list the author (long with -v)')),
356 ('u', 'user', None, _('list the author (long with -v)')),
357 ('f', 'file', None, _('list the filename')),
357 ('f', 'file', None, _('list the filename')),
358 ('d', 'date', None, _('list the date (short with -q)')),
358 ('d', 'date', None, _('list the date (short with -q)')),
359 ('n', 'number', None, _('list the revision number (default)')),
359 ('n', 'number', None, _('list the revision number (default)')),
360 ('c', 'changeset', None, _('list the changeset')),
360 ('c', 'changeset', None, _('list the changeset')),
361 ('l', 'line-number', None, _('show line number at the first appearance'))
361 ('l', 'line-number', None, _('show line number at the first appearance'))
362 ] + diffwsopts + walkopts + formatteropts,
362 ] + diffwsopts + walkopts + formatteropts,
363 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
363 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
364 inferrepo=True)
364 inferrepo=True)
365 def annotate(ui, repo, *pats, **opts):
365 def annotate(ui, repo, *pats, **opts):
366 """show changeset information by line for each file
366 """show changeset information by line for each file
367
367
368 List changes in files, showing the revision id responsible for
368 List changes in files, showing the revision id responsible for
369 each line.
369 each line.
370
370
371 This command is useful for discovering when a change was made and
371 This command is useful for discovering when a change was made and
372 by whom.
372 by whom.
373
373
374 If you include --file, --user, or --date, the revision number is
374 If you include --file, --user, or --date, the revision number is
375 suppressed unless you also include --number.
375 suppressed unless you also include --number.
376
376
377 Without the -a/--text option, annotate will avoid processing files
377 Without the -a/--text option, annotate will avoid processing files
378 it detects as binary. With -a, annotate will annotate the file
378 it detects as binary. With -a, annotate will annotate the file
379 anyway, although the results will probably be neither useful
379 anyway, although the results will probably be neither useful
380 nor desirable.
380 nor desirable.
381
381
382 Returns 0 on success.
382 Returns 0 on success.
383 """
383 """
384 if not pats:
384 if not pats:
385 raise error.Abort(_('at least one filename or pattern is required'))
385 raise error.Abort(_('at least one filename or pattern is required'))
386
386
387 if opts.get('follow'):
387 if opts.get('follow'):
388 # --follow is deprecated and now just an alias for -f/--file
388 # --follow is deprecated and now just an alias for -f/--file
389 # to mimic the behavior of Mercurial before version 1.5
389 # to mimic the behavior of Mercurial before version 1.5
390 opts['file'] = True
390 opts['file'] = True
391
391
392 ctx = scmutil.revsingle(repo, opts.get('rev'))
392 ctx = scmutil.revsingle(repo, opts.get('rev'))
393
393
394 fm = ui.formatter('annotate', opts)
394 fm = ui.formatter('annotate', opts)
395 if ui.quiet:
395 if ui.quiet:
396 datefunc = util.shortdate
396 datefunc = util.shortdate
397 else:
397 else:
398 datefunc = util.datestr
398 datefunc = util.datestr
399 if ctx.rev() is None:
399 if ctx.rev() is None:
400 def hexfn(node):
400 def hexfn(node):
401 if node is None:
401 if node is None:
402 return None
402 return None
403 else:
403 else:
404 return fm.hexfunc(node)
404 return fm.hexfunc(node)
405 if opts.get('changeset'):
405 if opts.get('changeset'):
406 # omit "+" suffix which is appended to node hex
406 # omit "+" suffix which is appended to node hex
407 def formatrev(rev):
407 def formatrev(rev):
408 if rev is None:
408 if rev is None:
409 return '%d' % ctx.p1().rev()
409 return '%d' % ctx.p1().rev()
410 else:
410 else:
411 return '%d' % rev
411 return '%d' % rev
412 else:
412 else:
413 def formatrev(rev):
413 def formatrev(rev):
414 if rev is None:
414 if rev is None:
415 return '%d+' % ctx.p1().rev()
415 return '%d+' % ctx.p1().rev()
416 else:
416 else:
417 return '%d ' % rev
417 return '%d ' % rev
418 def formathex(hex):
418 def formathex(hex):
419 if hex is None:
419 if hex is None:
420 return '%s+' % fm.hexfunc(ctx.p1().node())
420 return '%s+' % fm.hexfunc(ctx.p1().node())
421 else:
421 else:
422 return '%s ' % hex
422 return '%s ' % hex
423 else:
423 else:
424 hexfn = fm.hexfunc
424 hexfn = fm.hexfunc
425 formatrev = formathex = str
425 formatrev = formathex = str
426
426
427 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
427 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
428 ('number', ' ', lambda x: x[0].rev(), formatrev),
428 ('number', ' ', lambda x: x[0].rev(), formatrev),
429 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
429 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
430 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
430 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
431 ('file', ' ', lambda x: x[0].path(), str),
431 ('file', ' ', lambda x: x[0].path(), str),
432 ('line_number', ':', lambda x: x[1], str),
432 ('line_number', ':', lambda x: x[1], str),
433 ]
433 ]
434 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
434 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
435
435
436 if (not opts.get('user') and not opts.get('changeset')
436 if (not opts.get('user') and not opts.get('changeset')
437 and not opts.get('date') and not opts.get('file')):
437 and not opts.get('date') and not opts.get('file')):
438 opts['number'] = True
438 opts['number'] = True
439
439
440 linenumber = opts.get('line_number') is not None
440 linenumber = opts.get('line_number') is not None
441 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
441 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
442 raise error.Abort(_('at least one of -n/-c is required for -l'))
442 raise error.Abort(_('at least one of -n/-c is required for -l'))
443
443
444 if fm:
444 if fm:
445 def makefunc(get, fmt):
445 def makefunc(get, fmt):
446 return get
446 return get
447 else:
447 else:
448 def makefunc(get, fmt):
448 def makefunc(get, fmt):
449 return lambda x: fmt(get(x))
449 return lambda x: fmt(get(x))
450 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
450 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
451 if opts.get(op)]
451 if opts.get(op)]
452 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
452 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
453 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
453 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
454 if opts.get(op))
454 if opts.get(op))
455
455
456 def bad(x, y):
456 def bad(x, y):
457 raise error.Abort("%s: %s" % (x, y))
457 raise error.Abort("%s: %s" % (x, y))
458
458
459 m = scmutil.match(ctx, pats, opts, badfn=bad)
459 m = scmutil.match(ctx, pats, opts, badfn=bad)
460
460
461 follow = not opts.get('no_follow')
461 follow = not opts.get('no_follow')
462 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
462 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
463 whitespace=True)
463 whitespace=True)
464 for abs in ctx.walk(m):
464 for abs in ctx.walk(m):
465 fctx = ctx[abs]
465 fctx = ctx[abs]
466 if not opts.get('text') and util.binary(fctx.data()):
466 if not opts.get('text') and util.binary(fctx.data()):
467 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
467 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
468 continue
468 continue
469
469
470 lines = fctx.annotate(follow=follow, linenumber=linenumber,
470 lines = fctx.annotate(follow=follow, linenumber=linenumber,
471 diffopts=diffopts)
471 diffopts=diffopts)
472 if not lines:
472 if not lines:
473 continue
473 continue
474 formats = []
474 formats = []
475 pieces = []
475 pieces = []
476
476
477 for f, sep in funcmap:
477 for f, sep in funcmap:
478 l = [f(n) for n, dummy in lines]
478 l = [f(n) for n, dummy in lines]
479 if fm:
479 if fm:
480 formats.append(['%s' for x in l])
480 formats.append(['%s' for x in l])
481 else:
481 else:
482 sizes = [encoding.colwidth(x) for x in l]
482 sizes = [encoding.colwidth(x) for x in l]
483 ml = max(sizes)
483 ml = max(sizes)
484 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
484 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
485 pieces.append(l)
485 pieces.append(l)
486
486
487 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
487 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
488 fm.startitem()
488 fm.startitem()
489 fm.write(fields, "".join(f), *p)
489 fm.write(fields, "".join(f), *p)
490 fm.write('line', ": %s", l[1])
490 fm.write('line', ": %s", l[1])
491
491
492 if not lines[-1][1].endswith('\n'):
492 if not lines[-1][1].endswith('\n'):
493 fm.plain('\n')
493 fm.plain('\n')
494
494
495 fm.end()
495 fm.end()
496
496
497 @command('archive',
497 @command('archive',
498 [('', 'no-decode', None, _('do not pass files through decoders')),
498 [('', 'no-decode', None, _('do not pass files through decoders')),
499 ('p', 'prefix', '', _('directory prefix for files in archive'),
499 ('p', 'prefix', '', _('directory prefix for files in archive'),
500 _('PREFIX')),
500 _('PREFIX')),
501 ('r', 'rev', '', _('revision to distribute'), _('REV')),
501 ('r', 'rev', '', _('revision to distribute'), _('REV')),
502 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
502 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
503 ] + subrepoopts + walkopts,
503 ] + subrepoopts + walkopts,
504 _('[OPTION]... DEST'))
504 _('[OPTION]... DEST'))
505 def archive(ui, repo, dest, **opts):
505 def archive(ui, repo, dest, **opts):
506 '''create an unversioned archive of a repository revision
506 '''create an unversioned archive of a repository revision
507
507
508 By default, the revision used is the parent of the working
508 By default, the revision used is the parent of the working
509 directory; use -r/--rev to specify a different revision.
509 directory; use -r/--rev to specify a different revision.
510
510
511 The archive type is automatically detected based on file
511 The archive type is automatically detected based on file
512 extension (to override, use -t/--type).
512 extension (to override, use -t/--type).
513
513
514 .. container:: verbose
514 .. container:: verbose
515
515
516 Examples:
516 Examples:
517
517
518 - create a zip file containing the 1.0 release::
518 - create a zip file containing the 1.0 release::
519
519
520 hg archive -r 1.0 project-1.0.zip
520 hg archive -r 1.0 project-1.0.zip
521
521
522 - create a tarball excluding .hg files::
522 - create a tarball excluding .hg files::
523
523
524 hg archive project.tar.gz -X ".hg*"
524 hg archive project.tar.gz -X ".hg*"
525
525
526 Valid types are:
526 Valid types are:
527
527
528 :``files``: a directory full of files (default)
528 :``files``: a directory full of files (default)
529 :``tar``: tar archive, uncompressed
529 :``tar``: tar archive, uncompressed
530 :``tbz2``: tar archive, compressed using bzip2
530 :``tbz2``: tar archive, compressed using bzip2
531 :``tgz``: tar archive, compressed using gzip
531 :``tgz``: tar archive, compressed using gzip
532 :``uzip``: zip archive, uncompressed
532 :``uzip``: zip archive, uncompressed
533 :``zip``: zip archive, compressed using deflate
533 :``zip``: zip archive, compressed using deflate
534
534
535 The exact name of the destination archive or directory is given
535 The exact name of the destination archive or directory is given
536 using a format string; see :hg:`help export` for details.
536 using a format string; see :hg:`help export` for details.
537
537
538 Each member added to an archive file has a directory prefix
538 Each member added to an archive file has a directory prefix
539 prepended. Use -p/--prefix to specify a format string for the
539 prepended. Use -p/--prefix to specify a format string for the
540 prefix. The default is the basename of the archive, with suffixes
540 prefix. The default is the basename of the archive, with suffixes
541 removed.
541 removed.
542
542
543 Returns 0 on success.
543 Returns 0 on success.
544 '''
544 '''
545
545
546 ctx = scmutil.revsingle(repo, opts.get('rev'))
546 ctx = scmutil.revsingle(repo, opts.get('rev'))
547 if not ctx:
547 if not ctx:
548 raise error.Abort(_('no working directory: please specify a revision'))
548 raise error.Abort(_('no working directory: please specify a revision'))
549 node = ctx.node()
549 node = ctx.node()
550 dest = cmdutil.makefilename(repo, dest, node)
550 dest = cmdutil.makefilename(repo, dest, node)
551 if os.path.realpath(dest) == repo.root:
551 if os.path.realpath(dest) == repo.root:
552 raise error.Abort(_('repository root cannot be destination'))
552 raise error.Abort(_('repository root cannot be destination'))
553
553
554 kind = opts.get('type') or archival.guesskind(dest) or 'files'
554 kind = opts.get('type') or archival.guesskind(dest) or 'files'
555 prefix = opts.get('prefix')
555 prefix = opts.get('prefix')
556
556
557 if dest == '-':
557 if dest == '-':
558 if kind == 'files':
558 if kind == 'files':
559 raise error.Abort(_('cannot archive plain files to stdout'))
559 raise error.Abort(_('cannot archive plain files to stdout'))
560 dest = cmdutil.makefileobj(repo, dest)
560 dest = cmdutil.makefileobj(repo, dest)
561 if not prefix:
561 if not prefix:
562 prefix = os.path.basename(repo.root) + '-%h'
562 prefix = os.path.basename(repo.root) + '-%h'
563
563
564 prefix = cmdutil.makefilename(repo, prefix, node)
564 prefix = cmdutil.makefilename(repo, prefix, node)
565 matchfn = scmutil.match(ctx, [], opts)
565 matchfn = scmutil.match(ctx, [], opts)
566 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
566 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
567 matchfn, prefix, subrepos=opts.get('subrepos'))
567 matchfn, prefix, subrepos=opts.get('subrepos'))
568
568
569 @command('backout',
569 @command('backout',
570 [('', 'merge', None, _('merge with old dirstate parent after backout')),
570 [('', 'merge', None, _('merge with old dirstate parent after backout')),
571 ('', 'commit', None,
571 ('', 'commit', None,
572 _('commit if no conflicts were encountered (DEPRECATED)')),
572 _('commit if no conflicts were encountered (DEPRECATED)')),
573 ('', 'no-commit', None, _('do not commit')),
573 ('', 'no-commit', None, _('do not commit')),
574 ('', 'parent', '',
574 ('', 'parent', '',
575 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
575 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
576 ('r', 'rev', '', _('revision to backout'), _('REV')),
576 ('r', 'rev', '', _('revision to backout'), _('REV')),
577 ('e', 'edit', False, _('invoke editor on commit messages')),
577 ('e', 'edit', False, _('invoke editor on commit messages')),
578 ] + mergetoolopts + walkopts + commitopts + commitopts2,
578 ] + mergetoolopts + walkopts + commitopts + commitopts2,
579 _('[OPTION]... [-r] REV'))
579 _('[OPTION]... [-r] REV'))
580 def backout(ui, repo, node=None, rev=None, **opts):
580 def backout(ui, repo, node=None, rev=None, **opts):
581 '''reverse effect of earlier changeset
581 '''reverse effect of earlier changeset
582
582
583 Prepare a new changeset with the effect of REV undone in the
583 Prepare a new changeset with the effect of REV undone in the
584 current working directory. If no conflicts were encountered,
584 current working directory. If no conflicts were encountered,
585 it will be committed immediately.
585 it will be committed immediately.
586
586
587 If REV is the parent of the working directory, then this new changeset
587 If REV is the parent of the working directory, then this new changeset
588 is committed automatically (unless --no-commit is specified).
588 is committed automatically (unless --no-commit is specified).
589
589
590 .. note::
590 .. note::
591
591
592 :hg:`backout` cannot be used to fix either an unwanted or
592 :hg:`backout` cannot be used to fix either an unwanted or
593 incorrect merge.
593 incorrect merge.
594
594
595 .. container:: verbose
595 .. container:: verbose
596
596
597 Examples:
597 Examples:
598
598
599 - Reverse the effect of the parent of the working directory.
599 - Reverse the effect of the parent of the working directory.
600 This backout will be committed immediately::
600 This backout will be committed immediately::
601
601
602 hg backout -r .
602 hg backout -r .
603
603
604 - Reverse the effect of previous bad revision 23::
604 - Reverse the effect of previous bad revision 23::
605
605
606 hg backout -r 23
606 hg backout -r 23
607
607
608 - Reverse the effect of previous bad revision 23 and
608 - Reverse the effect of previous bad revision 23 and
609 leave changes uncommitted::
609 leave changes uncommitted::
610
610
611 hg backout -r 23 --no-commit
611 hg backout -r 23 --no-commit
612 hg commit -m "Backout revision 23"
612 hg commit -m "Backout revision 23"
613
613
614 By default, the pending changeset will have one parent,
614 By default, the pending changeset will have one parent,
615 maintaining a linear history. With --merge, the pending
615 maintaining a linear history. With --merge, the pending
616 changeset will instead have two parents: the old parent of the
616 changeset will instead have two parents: the old parent of the
617 working directory and a new child of REV that simply undoes REV.
617 working directory and a new child of REV that simply undoes REV.
618
618
619 Before version 1.7, the behavior without --merge was equivalent
619 Before version 1.7, the behavior without --merge was equivalent
620 to specifying --merge followed by :hg:`update --clean .` to
620 to specifying --merge followed by :hg:`update --clean .` to
621 cancel the merge and leave the child of REV as a head to be
621 cancel the merge and leave the child of REV as a head to be
622 merged separately.
622 merged separately.
623
623
624 See :hg:`help dates` for a list of formats valid for -d/--date.
624 See :hg:`help dates` for a list of formats valid for -d/--date.
625
625
626 See :hg:`help revert` for a way to restore files to the state
626 See :hg:`help revert` for a way to restore files to the state
627 of another revision.
627 of another revision.
628
628
629 Returns 0 on success, 1 if nothing to backout or there are unresolved
629 Returns 0 on success, 1 if nothing to backout or there are unresolved
630 files.
630 files.
631 '''
631 '''
632 wlock = lock = None
632 wlock = lock = None
633 try:
633 try:
634 wlock = repo.wlock()
634 wlock = repo.wlock()
635 lock = repo.lock()
635 lock = repo.lock()
636 return _dobackout(ui, repo, node, rev, **opts)
636 return _dobackout(ui, repo, node, rev, **opts)
637 finally:
637 finally:
638 release(lock, wlock)
638 release(lock, wlock)
639
639
640 def _dobackout(ui, repo, node=None, rev=None, **opts):
640 def _dobackout(ui, repo, node=None, rev=None, **opts):
641 if opts.get('commit') and opts.get('no_commit'):
641 if opts.get('commit') and opts.get('no_commit'):
642 raise error.Abort(_("cannot use --commit with --no-commit"))
642 raise error.Abort(_("cannot use --commit with --no-commit"))
643 if opts.get('merge') and opts.get('no_commit'):
643 if opts.get('merge') and opts.get('no_commit'):
644 raise error.Abort(_("cannot use --merge with --no-commit"))
644 raise error.Abort(_("cannot use --merge with --no-commit"))
645
645
646 if rev and node:
646 if rev and node:
647 raise error.Abort(_("please specify just one revision"))
647 raise error.Abort(_("please specify just one revision"))
648
648
649 if not rev:
649 if not rev:
650 rev = node
650 rev = node
651
651
652 if not rev:
652 if not rev:
653 raise error.Abort(_("please specify a revision to backout"))
653 raise error.Abort(_("please specify a revision to backout"))
654
654
655 date = opts.get('date')
655 date = opts.get('date')
656 if date:
656 if date:
657 opts['date'] = util.parsedate(date)
657 opts['date'] = util.parsedate(date)
658
658
659 cmdutil.checkunfinished(repo)
659 cmdutil.checkunfinished(repo)
660 cmdutil.bailifchanged(repo)
660 cmdutil.bailifchanged(repo)
661 node = scmutil.revsingle(repo, rev).node()
661 node = scmutil.revsingle(repo, rev).node()
662
662
663 op1, op2 = repo.dirstate.parents()
663 op1, op2 = repo.dirstate.parents()
664 if not repo.changelog.isancestor(node, op1):
664 if not repo.changelog.isancestor(node, op1):
665 raise error.Abort(_('cannot backout change that is not an ancestor'))
665 raise error.Abort(_('cannot backout change that is not an ancestor'))
666
666
667 p1, p2 = repo.changelog.parents(node)
667 p1, p2 = repo.changelog.parents(node)
668 if p1 == nullid:
668 if p1 == nullid:
669 raise error.Abort(_('cannot backout a change with no parents'))
669 raise error.Abort(_('cannot backout a change with no parents'))
670 if p2 != nullid:
670 if p2 != nullid:
671 if not opts.get('parent'):
671 if not opts.get('parent'):
672 raise error.Abort(_('cannot backout a merge changeset'))
672 raise error.Abort(_('cannot backout a merge changeset'))
673 p = repo.lookup(opts['parent'])
673 p = repo.lookup(opts['parent'])
674 if p not in (p1, p2):
674 if p not in (p1, p2):
675 raise error.Abort(_('%s is not a parent of %s') %
675 raise error.Abort(_('%s is not a parent of %s') %
676 (short(p), short(node)))
676 (short(p), short(node)))
677 parent = p
677 parent = p
678 else:
678 else:
679 if opts.get('parent'):
679 if opts.get('parent'):
680 raise error.Abort(_('cannot use --parent on non-merge changeset'))
680 raise error.Abort(_('cannot use --parent on non-merge changeset'))
681 parent = p1
681 parent = p1
682
682
683 # the backout should appear on the same branch
683 # the backout should appear on the same branch
684 branch = repo.dirstate.branch()
684 branch = repo.dirstate.branch()
685 bheads = repo.branchheads(branch)
685 bheads = repo.branchheads(branch)
686 rctx = scmutil.revsingle(repo, hex(parent))
686 rctx = scmutil.revsingle(repo, hex(parent))
687 if not opts.get('merge') and op1 != node:
687 if not opts.get('merge') and op1 != node:
688 dsguard = cmdutil.dirstateguard(repo, 'backout')
688 dsguard = cmdutil.dirstateguard(repo, 'backout')
689 try:
689 try:
690 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
690 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
691 'backout')
691 'backout')
692 stats = mergemod.update(repo, parent, True, True, node, False)
692 stats = mergemod.update(repo, parent, True, True, node, False)
693 repo.setparents(op1, op2)
693 repo.setparents(op1, op2)
694 dsguard.close()
694 dsguard.close()
695 hg._showstats(repo, stats)
695 hg._showstats(repo, stats)
696 if stats[3]:
696 if stats[3]:
697 repo.ui.status(_("use 'hg resolve' to retry unresolved "
697 repo.ui.status(_("use 'hg resolve' to retry unresolved "
698 "file merges\n"))
698 "file merges\n"))
699 return 1
699 return 1
700 finally:
700 finally:
701 ui.setconfig('ui', 'forcemerge', '', '')
701 ui.setconfig('ui', 'forcemerge', '', '')
702 lockmod.release(dsguard)
702 lockmod.release(dsguard)
703 else:
703 else:
704 hg.clean(repo, node, show_stats=False)
704 hg.clean(repo, node, show_stats=False)
705 repo.dirstate.setbranch(branch)
705 repo.dirstate.setbranch(branch)
706 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
706 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
707
707
708 if opts.get('no_commit'):
708 if opts.get('no_commit'):
709 msg = _("changeset %s backed out, "
709 msg = _("changeset %s backed out, "
710 "don't forget to commit.\n")
710 "don't forget to commit.\n")
711 ui.status(msg % short(node))
711 ui.status(msg % short(node))
712 return 0
712 return 0
713
713
714 def commitfunc(ui, repo, message, match, opts):
714 def commitfunc(ui, repo, message, match, opts):
715 editform = 'backout'
715 editform = 'backout'
716 e = cmdutil.getcommiteditor(editform=editform, **opts)
716 e = cmdutil.getcommiteditor(editform=editform, **opts)
717 if not message:
717 if not message:
718 # we don't translate commit messages
718 # we don't translate commit messages
719 message = "Backed out changeset %s" % short(node)
719 message = "Backed out changeset %s" % short(node)
720 e = cmdutil.getcommiteditor(edit=True, editform=editform)
720 e = cmdutil.getcommiteditor(edit=True, editform=editform)
721 return repo.commit(message, opts.get('user'), opts.get('date'),
721 return repo.commit(message, opts.get('user'), opts.get('date'),
722 match, editor=e)
722 match, editor=e)
723 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
723 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
724 if not newnode:
724 if not newnode:
725 ui.status(_("nothing changed\n"))
725 ui.status(_("nothing changed\n"))
726 return 1
726 return 1
727 cmdutil.commitstatus(repo, newnode, branch, bheads)
727 cmdutil.commitstatus(repo, newnode, branch, bheads)
728
728
729 def nice(node):
729 def nice(node):
730 return '%d:%s' % (repo.changelog.rev(node), short(node))
730 return '%d:%s' % (repo.changelog.rev(node), short(node))
731 ui.status(_('changeset %s backs out changeset %s\n') %
731 ui.status(_('changeset %s backs out changeset %s\n') %
732 (nice(repo.changelog.tip()), nice(node)))
732 (nice(repo.changelog.tip()), nice(node)))
733 if opts.get('merge') and op1 != node:
733 if opts.get('merge') and op1 != node:
734 hg.clean(repo, op1, show_stats=False)
734 hg.clean(repo, op1, show_stats=False)
735 ui.status(_('merging with changeset %s\n')
735 ui.status(_('merging with changeset %s\n')
736 % nice(repo.changelog.tip()))
736 % nice(repo.changelog.tip()))
737 try:
737 try:
738 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
738 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
739 'backout')
739 'backout')
740 return hg.merge(repo, hex(repo.changelog.tip()))
740 return hg.merge(repo, hex(repo.changelog.tip()))
741 finally:
741 finally:
742 ui.setconfig('ui', 'forcemerge', '', '')
742 ui.setconfig('ui', 'forcemerge', '', '')
743 return 0
743 return 0
744
744
745 @command('bisect',
745 @command('bisect',
746 [('r', 'reset', False, _('reset bisect state')),
746 [('r', 'reset', False, _('reset bisect state')),
747 ('g', 'good', False, _('mark changeset good')),
747 ('g', 'good', False, _('mark changeset good')),
748 ('b', 'bad', False, _('mark changeset bad')),
748 ('b', 'bad', False, _('mark changeset bad')),
749 ('s', 'skip', False, _('skip testing changeset')),
749 ('s', 'skip', False, _('skip testing changeset')),
750 ('e', 'extend', False, _('extend the bisect range')),
750 ('e', 'extend', False, _('extend the bisect range')),
751 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
751 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
752 ('U', 'noupdate', False, _('do not update to target'))],
752 ('U', 'noupdate', False, _('do not update to target'))],
753 _("[-gbsr] [-U] [-c CMD] [REV]"))
753 _("[-gbsr] [-U] [-c CMD] [REV]"))
754 def bisect(ui, repo, rev=None, extra=None, command=None,
754 def bisect(ui, repo, rev=None, extra=None, command=None,
755 reset=None, good=None, bad=None, skip=None, extend=None,
755 reset=None, good=None, bad=None, skip=None, extend=None,
756 noupdate=None):
756 noupdate=None):
757 """subdivision search of changesets
757 """subdivision search of changesets
758
758
759 This command helps to find changesets which introduce problems. To
759 This command helps to find changesets which introduce problems. To
760 use, mark the earliest changeset you know exhibits the problem as
760 use, mark the earliest changeset you know exhibits the problem as
761 bad, then mark the latest changeset which is free from the problem
761 bad, then mark the latest changeset which is free from the problem
762 as good. Bisect will update your working directory to a revision
762 as good. Bisect will update your working directory to a revision
763 for testing (unless the -U/--noupdate option is specified). Once
763 for testing (unless the -U/--noupdate option is specified). Once
764 you have performed tests, mark the working directory as good or
764 you have performed tests, mark the working directory as good or
765 bad, and bisect will either update to another candidate changeset
765 bad, and bisect will either update to another candidate changeset
766 or announce that it has found the bad revision.
766 or announce that it has found the bad revision.
767
767
768 As a shortcut, you can also use the revision argument to mark a
768 As a shortcut, you can also use the revision argument to mark a
769 revision as good or bad without checking it out first.
769 revision as good or bad without checking it out first.
770
770
771 If you supply a command, it will be used for automatic bisection.
771 If you supply a command, it will be used for automatic bisection.
772 The environment variable HG_NODE will contain the ID of the
772 The environment variable HG_NODE will contain the ID of the
773 changeset being tested. The exit status of the command will be
773 changeset being tested. The exit status of the command will be
774 used to mark revisions as good or bad: status 0 means good, 125
774 used to mark revisions as good or bad: status 0 means good, 125
775 means to skip the revision, 127 (command not found) will abort the
775 means to skip the revision, 127 (command not found) will abort the
776 bisection, and any other non-zero exit status means the revision
776 bisection, and any other non-zero exit status means the revision
777 is bad.
777 is bad.
778
778
779 .. container:: verbose
779 .. container:: verbose
780
780
781 Some examples:
781 Some examples:
782
782
783 - start a bisection with known bad revision 34, and good revision 12::
783 - start a bisection with known bad revision 34, and good revision 12::
784
784
785 hg bisect --bad 34
785 hg bisect --bad 34
786 hg bisect --good 12
786 hg bisect --good 12
787
787
788 - advance the current bisection by marking current revision as good or
788 - advance the current bisection by marking current revision as good or
789 bad::
789 bad::
790
790
791 hg bisect --good
791 hg bisect --good
792 hg bisect --bad
792 hg bisect --bad
793
793
794 - mark the current revision, or a known revision, to be skipped (e.g. if
794 - mark the current revision, or a known revision, to be skipped (e.g. if
795 that revision is not usable because of another issue)::
795 that revision is not usable because of another issue)::
796
796
797 hg bisect --skip
797 hg bisect --skip
798 hg bisect --skip 23
798 hg bisect --skip 23
799
799
800 - skip all revisions that do not touch directories ``foo`` or ``bar``::
800 - skip all revisions that do not touch directories ``foo`` or ``bar``::
801
801
802 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
802 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
803
803
804 - forget the current bisection::
804 - forget the current bisection::
805
805
806 hg bisect --reset
806 hg bisect --reset
807
807
808 - use 'make && make tests' to automatically find the first broken
808 - use 'make && make tests' to automatically find the first broken
809 revision::
809 revision::
810
810
811 hg bisect --reset
811 hg bisect --reset
812 hg bisect --bad 34
812 hg bisect --bad 34
813 hg bisect --good 12
813 hg bisect --good 12
814 hg bisect --command "make && make tests"
814 hg bisect --command "make && make tests"
815
815
816 - see all changesets whose states are already known in the current
816 - see all changesets whose states are already known in the current
817 bisection::
817 bisection::
818
818
819 hg log -r "bisect(pruned)"
819 hg log -r "bisect(pruned)"
820
820
821 - see the changeset currently being bisected (especially useful
821 - see the changeset currently being bisected (especially useful
822 if running with -U/--noupdate)::
822 if running with -U/--noupdate)::
823
823
824 hg log -r "bisect(current)"
824 hg log -r "bisect(current)"
825
825
826 - see all changesets that took part in the current bisection::
826 - see all changesets that took part in the current bisection::
827
827
828 hg log -r "bisect(range)"
828 hg log -r "bisect(range)"
829
829
830 - you can even get a nice graph::
830 - you can even get a nice graph::
831
831
832 hg log --graph -r "bisect(range)"
832 hg log --graph -r "bisect(range)"
833
833
834 See :hg:`help revsets` for more about the `bisect()` keyword.
834 See :hg:`help revsets` for more about the `bisect()` keyword.
835
835
836 Returns 0 on success.
836 Returns 0 on success.
837 """
837 """
838 def extendbisectrange(nodes, good):
838 def extendbisectrange(nodes, good):
839 # bisect is incomplete when it ends on a merge node and
839 # bisect is incomplete when it ends on a merge node and
840 # one of the parent was not checked.
840 # one of the parent was not checked.
841 parents = repo[nodes[0]].parents()
841 parents = repo[nodes[0]].parents()
842 if len(parents) > 1:
842 if len(parents) > 1:
843 if good:
843 if good:
844 side = state['bad']
844 side = state['bad']
845 else:
845 else:
846 side = state['good']
846 side = state['good']
847 num = len(set(i.node() for i in parents) & set(side))
847 num = len(set(i.node() for i in parents) & set(side))
848 if num == 1:
848 if num == 1:
849 return parents[0].ancestor(parents[1])
849 return parents[0].ancestor(parents[1])
850 return None
850 return None
851
851
852 def print_result(nodes, good):
852 def print_result(nodes, good):
853 displayer = cmdutil.show_changeset(ui, repo, {})
853 displayer = cmdutil.show_changeset(ui, repo, {})
854 if len(nodes) == 1:
854 if len(nodes) == 1:
855 # narrowed it down to a single revision
855 # narrowed it down to a single revision
856 if good:
856 if good:
857 ui.write(_("The first good revision is:\n"))
857 ui.write(_("The first good revision is:\n"))
858 else:
858 else:
859 ui.write(_("The first bad revision is:\n"))
859 ui.write(_("The first bad revision is:\n"))
860 displayer.show(repo[nodes[0]])
860 displayer.show(repo[nodes[0]])
861 extendnode = extendbisectrange(nodes, good)
861 extendnode = extendbisectrange(nodes, good)
862 if extendnode is not None:
862 if extendnode is not None:
863 ui.write(_('Not all ancestors of this changeset have been'
863 ui.write(_('Not all ancestors of this changeset have been'
864 ' checked.\nUse bisect --extend to continue the '
864 ' checked.\nUse bisect --extend to continue the '
865 'bisection from\nthe common ancestor, %s.\n')
865 'bisection from\nthe common ancestor, %s.\n')
866 % extendnode)
866 % extendnode)
867 else:
867 else:
868 # multiple possible revisions
868 # multiple possible revisions
869 if good:
869 if good:
870 ui.write(_("Due to skipped revisions, the first "
870 ui.write(_("Due to skipped revisions, the first "
871 "good revision could be any of:\n"))
871 "good revision could be any of:\n"))
872 else:
872 else:
873 ui.write(_("Due to skipped revisions, the first "
873 ui.write(_("Due to skipped revisions, the first "
874 "bad revision could be any of:\n"))
874 "bad revision could be any of:\n"))
875 for n in nodes:
875 for n in nodes:
876 displayer.show(repo[n])
876 displayer.show(repo[n])
877 displayer.close()
877 displayer.close()
878
878
879 def check_state(state, interactive=True):
879 def check_state(state, interactive=True):
880 if not state['good'] or not state['bad']:
880 if not state['good'] or not state['bad']:
881 if (good or bad or skip or reset) and interactive:
881 if (good or bad or skip or reset) and interactive:
882 return
882 return
883 if not state['good']:
883 if not state['good']:
884 raise error.Abort(_('cannot bisect (no known good revisions)'))
884 raise error.Abort(_('cannot bisect (no known good revisions)'))
885 else:
885 else:
886 raise error.Abort(_('cannot bisect (no known bad revisions)'))
886 raise error.Abort(_('cannot bisect (no known bad revisions)'))
887 return True
887 return True
888
888
889 # backward compatibility
889 # backward compatibility
890 if rev in "good bad reset init".split():
890 if rev in "good bad reset init".split():
891 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
891 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
892 cmd, rev, extra = rev, extra, None
892 cmd, rev, extra = rev, extra, None
893 if cmd == "good":
893 if cmd == "good":
894 good = True
894 good = True
895 elif cmd == "bad":
895 elif cmd == "bad":
896 bad = True
896 bad = True
897 else:
897 else:
898 reset = True
898 reset = True
899 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
899 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
900 raise error.Abort(_('incompatible arguments'))
900 raise error.Abort(_('incompatible arguments'))
901
901
902 cmdutil.checkunfinished(repo)
902 cmdutil.checkunfinished(repo)
903
903
904 if reset:
904 if reset:
905 p = repo.join("bisect.state")
905 p = repo.join("bisect.state")
906 if os.path.exists(p):
906 if os.path.exists(p):
907 os.unlink(p)
907 os.unlink(p)
908 return
908 return
909
909
910 state = hbisect.load_state(repo)
910 state = hbisect.load_state(repo)
911
911
912 if command:
912 if command:
913 changesets = 1
913 changesets = 1
914 if noupdate:
914 if noupdate:
915 try:
915 try:
916 node = state['current'][0]
916 node = state['current'][0]
917 except LookupError:
917 except LookupError:
918 raise error.Abort(_('current bisect revision is unknown - '
918 raise error.Abort(_('current bisect revision is unknown - '
919 'start a new bisect to fix'))
919 'start a new bisect to fix'))
920 else:
920 else:
921 node, p2 = repo.dirstate.parents()
921 node, p2 = repo.dirstate.parents()
922 if p2 != nullid:
922 if p2 != nullid:
923 raise error.Abort(_('current bisect revision is a merge'))
923 raise error.Abort(_('current bisect revision is a merge'))
924 try:
924 try:
925 while changesets:
925 while changesets:
926 # update state
926 # update state
927 state['current'] = [node]
927 state['current'] = [node]
928 hbisect.save_state(repo, state)
928 hbisect.save_state(repo, state)
929 status = ui.system(command, environ={'HG_NODE': hex(node)})
929 status = ui.system(command, environ={'HG_NODE': hex(node)})
930 if status == 125:
930 if status == 125:
931 transition = "skip"
931 transition = "skip"
932 elif status == 0:
932 elif status == 0:
933 transition = "good"
933 transition = "good"
934 # status < 0 means process was killed
934 # status < 0 means process was killed
935 elif status == 127:
935 elif status == 127:
936 raise error.Abort(_("failed to execute %s") % command)
936 raise error.Abort(_("failed to execute %s") % command)
937 elif status < 0:
937 elif status < 0:
938 raise error.Abort(_("%s killed") % command)
938 raise error.Abort(_("%s killed") % command)
939 else:
939 else:
940 transition = "bad"
940 transition = "bad"
941 ctx = scmutil.revsingle(repo, rev, node)
941 ctx = scmutil.revsingle(repo, rev, node)
942 rev = None # clear for future iterations
942 rev = None # clear for future iterations
943 state[transition].append(ctx.node())
943 state[transition].append(ctx.node())
944 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
944 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
945 check_state(state, interactive=False)
945 check_state(state, interactive=False)
946 # bisect
946 # bisect
947 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
947 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
948 # update to next check
948 # update to next check
949 node = nodes[0]
949 node = nodes[0]
950 if not noupdate:
950 if not noupdate:
951 cmdutil.bailifchanged(repo)
951 cmdutil.bailifchanged(repo)
952 hg.clean(repo, node, show_stats=False)
952 hg.clean(repo, node, show_stats=False)
953 finally:
953 finally:
954 state['current'] = [node]
954 state['current'] = [node]
955 hbisect.save_state(repo, state)
955 hbisect.save_state(repo, state)
956 print_result(nodes, bgood)
956 print_result(nodes, bgood)
957 return
957 return
958
958
959 # update state
959 # update state
960
960
961 if rev:
961 if rev:
962 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
962 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
963 else:
963 else:
964 nodes = [repo.lookup('.')]
964 nodes = [repo.lookup('.')]
965
965
966 if good or bad or skip:
966 if good or bad or skip:
967 if good:
967 if good:
968 state['good'] += nodes
968 state['good'] += nodes
969 elif bad:
969 elif bad:
970 state['bad'] += nodes
970 state['bad'] += nodes
971 elif skip:
971 elif skip:
972 state['skip'] += nodes
972 state['skip'] += nodes
973 hbisect.save_state(repo, state)
973 hbisect.save_state(repo, state)
974
974
975 if not check_state(state):
975 if not check_state(state):
976 return
976 return
977
977
978 # actually bisect
978 # actually bisect
979 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
979 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
980 if extend:
980 if extend:
981 if not changesets:
981 if not changesets:
982 extendnode = extendbisectrange(nodes, good)
982 extendnode = extendbisectrange(nodes, good)
983 if extendnode is not None:
983 if extendnode is not None:
984 ui.write(_("Extending search to changeset %d:%s\n")
984 ui.write(_("Extending search to changeset %d:%s\n")
985 % (extendnode.rev(), extendnode))
985 % (extendnode.rev(), extendnode))
986 state['current'] = [extendnode.node()]
986 state['current'] = [extendnode.node()]
987 hbisect.save_state(repo, state)
987 hbisect.save_state(repo, state)
988 if noupdate:
988 if noupdate:
989 return
989 return
990 cmdutil.bailifchanged(repo)
990 cmdutil.bailifchanged(repo)
991 return hg.clean(repo, extendnode.node())
991 return hg.clean(repo, extendnode.node())
992 raise error.Abort(_("nothing to extend"))
992 raise error.Abort(_("nothing to extend"))
993
993
994 if changesets == 0:
994 if changesets == 0:
995 print_result(nodes, good)
995 print_result(nodes, good)
996 else:
996 else:
997 assert len(nodes) == 1 # only a single node can be tested next
997 assert len(nodes) == 1 # only a single node can be tested next
998 node = nodes[0]
998 node = nodes[0]
999 # compute the approximate number of remaining tests
999 # compute the approximate number of remaining tests
1000 tests, size = 0, 2
1000 tests, size = 0, 2
1001 while size <= changesets:
1001 while size <= changesets:
1002 tests, size = tests + 1, size * 2
1002 tests, size = tests + 1, size * 2
1003 rev = repo.changelog.rev(node)
1003 rev = repo.changelog.rev(node)
1004 ui.write(_("Testing changeset %d:%s "
1004 ui.write(_("Testing changeset %d:%s "
1005 "(%d changesets remaining, ~%d tests)\n")
1005 "(%d changesets remaining, ~%d tests)\n")
1006 % (rev, short(node), changesets, tests))
1006 % (rev, short(node), changesets, tests))
1007 state['current'] = [node]
1007 state['current'] = [node]
1008 hbisect.save_state(repo, state)
1008 hbisect.save_state(repo, state)
1009 if not noupdate:
1009 if not noupdate:
1010 cmdutil.bailifchanged(repo)
1010 cmdutil.bailifchanged(repo)
1011 return hg.clean(repo, node)
1011 return hg.clean(repo, node)
1012
1012
1013 @command('bookmarks|bookmark',
1013 @command('bookmarks|bookmark',
1014 [('f', 'force', False, _('force')),
1014 [('f', 'force', False, _('force')),
1015 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
1015 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
1016 ('d', 'delete', False, _('delete a given bookmark')),
1016 ('d', 'delete', False, _('delete a given bookmark')),
1017 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
1017 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
1018 ('i', 'inactive', False, _('mark a bookmark inactive')),
1018 ('i', 'inactive', False, _('mark a bookmark inactive')),
1019 ] + formatteropts,
1019 ] + formatteropts,
1020 _('hg bookmarks [OPTIONS]... [NAME]...'))
1020 _('hg bookmarks [OPTIONS]... [NAME]...'))
1021 def bookmark(ui, repo, *names, **opts):
1021 def bookmark(ui, repo, *names, **opts):
1022 '''create a new bookmark or list existing bookmarks
1022 '''create a new bookmark or list existing bookmarks
1023
1023
1024 Bookmarks are labels on changesets to help track lines of development.
1024 Bookmarks are labels on changesets to help track lines of development.
1025 Bookmarks are unversioned and can be moved, renamed and deleted.
1025 Bookmarks are unversioned and can be moved, renamed and deleted.
1026 Deleting or moving a bookmark has no effect on the associated changesets.
1026 Deleting or moving a bookmark has no effect on the associated changesets.
1027
1027
1028 Creating or updating to a bookmark causes it to be marked as 'active'.
1028 Creating or updating to a bookmark causes it to be marked as 'active'.
1029 The active bookmark is indicated with a '*'.
1029 The active bookmark is indicated with a '*'.
1030 When a commit is made, the active bookmark will advance to the new commit.
1030 When a commit is made, the active bookmark will advance to the new commit.
1031 A plain :hg:`update` will also advance an active bookmark, if possible.
1031 A plain :hg:`update` will also advance an active bookmark, if possible.
1032 Updating away from a bookmark will cause it to be deactivated.
1032 Updating away from a bookmark will cause it to be deactivated.
1033
1033
1034 Bookmarks can be pushed and pulled between repositories (see
1034 Bookmarks can be pushed and pulled between repositories (see
1035 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1035 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1036 diverged, a new 'divergent bookmark' of the form 'name@path' will
1036 diverged, a new 'divergent bookmark' of the form 'name@path' will
1037 be created. Using :hg:`merge` will resolve the divergence.
1037 be created. Using :hg:`merge` will resolve the divergence.
1038
1038
1039 A bookmark named '@' has the special property that :hg:`clone` will
1039 A bookmark named '@' has the special property that :hg:`clone` will
1040 check it out by default if it exists.
1040 check it out by default if it exists.
1041
1041
1042 .. container:: verbose
1042 .. container:: verbose
1043
1043
1044 Examples:
1044 Examples:
1045
1045
1046 - create an active bookmark for a new line of development::
1046 - create an active bookmark for a new line of development::
1047
1047
1048 hg book new-feature
1048 hg book new-feature
1049
1049
1050 - create an inactive bookmark as a place marker::
1050 - create an inactive bookmark as a place marker::
1051
1051
1052 hg book -i reviewed
1052 hg book -i reviewed
1053
1053
1054 - create an inactive bookmark on another changeset::
1054 - create an inactive bookmark on another changeset::
1055
1055
1056 hg book -r .^ tested
1056 hg book -r .^ tested
1057
1057
1058 - rename bookmark turkey to dinner::
1058 - rename bookmark turkey to dinner::
1059
1059
1060 hg book -m turkey dinner
1060 hg book -m turkey dinner
1061
1061
1062 - move the '@' bookmark from another branch::
1062 - move the '@' bookmark from another branch::
1063
1063
1064 hg book -f @
1064 hg book -f @
1065 '''
1065 '''
1066 force = opts.get('force')
1066 force = opts.get('force')
1067 rev = opts.get('rev')
1067 rev = opts.get('rev')
1068 delete = opts.get('delete')
1068 delete = opts.get('delete')
1069 rename = opts.get('rename')
1069 rename = opts.get('rename')
1070 inactive = opts.get('inactive')
1070 inactive = opts.get('inactive')
1071
1071
1072 def checkformat(mark):
1072 def checkformat(mark):
1073 mark = mark.strip()
1073 mark = mark.strip()
1074 if not mark:
1074 if not mark:
1075 raise error.Abort(_("bookmark names cannot consist entirely of "
1075 raise error.Abort(_("bookmark names cannot consist entirely of "
1076 "whitespace"))
1076 "whitespace"))
1077 scmutil.checknewlabel(repo, mark, 'bookmark')
1077 scmutil.checknewlabel(repo, mark, 'bookmark')
1078 return mark
1078 return mark
1079
1079
1080 def checkconflict(repo, mark, cur, force=False, target=None):
1080 def checkconflict(repo, mark, cur, force=False, target=None):
1081 if mark in marks and not force:
1081 if mark in marks and not force:
1082 if target:
1082 if target:
1083 if marks[mark] == target and target == cur:
1083 if marks[mark] == target and target == cur:
1084 # re-activating a bookmark
1084 # re-activating a bookmark
1085 return
1085 return
1086 anc = repo.changelog.ancestors([repo[target].rev()])
1086 anc = repo.changelog.ancestors([repo[target].rev()])
1087 bmctx = repo[marks[mark]]
1087 bmctx = repo[marks[mark]]
1088 divs = [repo[b].node() for b in marks
1088 divs = [repo[b].node() for b in marks
1089 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1089 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1090
1090
1091 # allow resolving a single divergent bookmark even if moving
1091 # allow resolving a single divergent bookmark even if moving
1092 # the bookmark across branches when a revision is specified
1092 # the bookmark across branches when a revision is specified
1093 # that contains a divergent bookmark
1093 # that contains a divergent bookmark
1094 if bmctx.rev() not in anc and target in divs:
1094 if bmctx.rev() not in anc and target in divs:
1095 bookmarks.deletedivergent(repo, [target], mark)
1095 bookmarks.deletedivergent(repo, [target], mark)
1096 return
1096 return
1097
1097
1098 deletefrom = [b for b in divs
1098 deletefrom = [b for b in divs
1099 if repo[b].rev() in anc or b == target]
1099 if repo[b].rev() in anc or b == target]
1100 bookmarks.deletedivergent(repo, deletefrom, mark)
1100 bookmarks.deletedivergent(repo, deletefrom, mark)
1101 if bookmarks.validdest(repo, bmctx, repo[target]):
1101 if bookmarks.validdest(repo, bmctx, repo[target]):
1102 ui.status(_("moving bookmark '%s' forward from %s\n") %
1102 ui.status(_("moving bookmark '%s' forward from %s\n") %
1103 (mark, short(bmctx.node())))
1103 (mark, short(bmctx.node())))
1104 return
1104 return
1105 raise error.Abort(_("bookmark '%s' already exists "
1105 raise error.Abort(_("bookmark '%s' already exists "
1106 "(use -f to force)") % mark)
1106 "(use -f to force)") % mark)
1107 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1107 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1108 and not force):
1108 and not force):
1109 raise error.Abort(
1109 raise error.Abort(
1110 _("a bookmark cannot have the name of an existing branch"))
1110 _("a bookmark cannot have the name of an existing branch"))
1111
1111
1112 if delete and rename:
1112 if delete and rename:
1113 raise error.Abort(_("--delete and --rename are incompatible"))
1113 raise error.Abort(_("--delete and --rename are incompatible"))
1114 if delete and rev:
1114 if delete and rev:
1115 raise error.Abort(_("--rev is incompatible with --delete"))
1115 raise error.Abort(_("--rev is incompatible with --delete"))
1116 if rename and rev:
1116 if rename and rev:
1117 raise error.Abort(_("--rev is incompatible with --rename"))
1117 raise error.Abort(_("--rev is incompatible with --rename"))
1118 if not names and (delete or rev):
1118 if not names and (delete or rev):
1119 raise error.Abort(_("bookmark name required"))
1119 raise error.Abort(_("bookmark name required"))
1120
1120
1121 if delete or rename or names or inactive:
1121 if delete or rename or names or inactive:
1122 wlock = lock = tr = None
1122 wlock = lock = tr = None
1123 try:
1123 try:
1124 wlock = repo.wlock()
1124 wlock = repo.wlock()
1125 lock = repo.lock()
1125 lock = repo.lock()
1126 cur = repo.changectx('.').node()
1126 cur = repo.changectx('.').node()
1127 marks = repo._bookmarks
1127 marks = repo._bookmarks
1128 if delete:
1128 if delete:
1129 tr = repo.transaction('bookmark')
1129 tr = repo.transaction('bookmark')
1130 for mark in names:
1130 for mark in names:
1131 if mark not in marks:
1131 if mark not in marks:
1132 raise error.Abort(_("bookmark '%s' does not exist") %
1132 raise error.Abort(_("bookmark '%s' does not exist") %
1133 mark)
1133 mark)
1134 if mark == repo._activebookmark:
1134 if mark == repo._activebookmark:
1135 bookmarks.deactivate(repo)
1135 bookmarks.deactivate(repo)
1136 del marks[mark]
1136 del marks[mark]
1137
1137
1138 elif rename:
1138 elif rename:
1139 tr = repo.transaction('bookmark')
1139 tr = repo.transaction('bookmark')
1140 if not names:
1140 if not names:
1141 raise error.Abort(_("new bookmark name required"))
1141 raise error.Abort(_("new bookmark name required"))
1142 elif len(names) > 1:
1142 elif len(names) > 1:
1143 raise error.Abort(_("only one new bookmark name allowed"))
1143 raise error.Abort(_("only one new bookmark name allowed"))
1144 mark = checkformat(names[0])
1144 mark = checkformat(names[0])
1145 if rename not in marks:
1145 if rename not in marks:
1146 raise error.Abort(_("bookmark '%s' does not exist")
1146 raise error.Abort(_("bookmark '%s' does not exist")
1147 % rename)
1147 % rename)
1148 checkconflict(repo, mark, cur, force)
1148 checkconflict(repo, mark, cur, force)
1149 marks[mark] = marks[rename]
1149 marks[mark] = marks[rename]
1150 if repo._activebookmark == rename and not inactive:
1150 if repo._activebookmark == rename and not inactive:
1151 bookmarks.activate(repo, mark)
1151 bookmarks.activate(repo, mark)
1152 del marks[rename]
1152 del marks[rename]
1153 elif names:
1153 elif names:
1154 tr = repo.transaction('bookmark')
1154 tr = repo.transaction('bookmark')
1155 newact = None
1155 newact = None
1156 for mark in names:
1156 for mark in names:
1157 mark = checkformat(mark)
1157 mark = checkformat(mark)
1158 if newact is None:
1158 if newact is None:
1159 newact = mark
1159 newact = mark
1160 if inactive and mark == repo._activebookmark:
1160 if inactive and mark == repo._activebookmark:
1161 bookmarks.deactivate(repo)
1161 bookmarks.deactivate(repo)
1162 return
1162 return
1163 tgt = cur
1163 tgt = cur
1164 if rev:
1164 if rev:
1165 tgt = scmutil.revsingle(repo, rev).node()
1165 tgt = scmutil.revsingle(repo, rev).node()
1166 checkconflict(repo, mark, cur, force, tgt)
1166 checkconflict(repo, mark, cur, force, tgt)
1167 marks[mark] = tgt
1167 marks[mark] = tgt
1168 if not inactive and cur == marks[newact] and not rev:
1168 if not inactive and cur == marks[newact] and not rev:
1169 bookmarks.activate(repo, newact)
1169 bookmarks.activate(repo, newact)
1170 elif cur != tgt and newact == repo._activebookmark:
1170 elif cur != tgt and newact == repo._activebookmark:
1171 bookmarks.deactivate(repo)
1171 bookmarks.deactivate(repo)
1172 elif inactive:
1172 elif inactive:
1173 if len(marks) == 0:
1173 if len(marks) == 0:
1174 ui.status(_("no bookmarks set\n"))
1174 ui.status(_("no bookmarks set\n"))
1175 elif not repo._activebookmark:
1175 elif not repo._activebookmark:
1176 ui.status(_("no active bookmark\n"))
1176 ui.status(_("no active bookmark\n"))
1177 else:
1177 else:
1178 bookmarks.deactivate(repo)
1178 bookmarks.deactivate(repo)
1179 if tr is not None:
1179 if tr is not None:
1180 marks.recordchange(tr)
1180 marks.recordchange(tr)
1181 tr.close()
1181 tr.close()
1182 finally:
1182 finally:
1183 lockmod.release(tr, lock, wlock)
1183 lockmod.release(tr, lock, wlock)
1184 else: # show bookmarks
1184 else: # show bookmarks
1185 fm = ui.formatter('bookmarks', opts)
1185 fm = ui.formatter('bookmarks', opts)
1186 hexfn = fm.hexfunc
1186 hexfn = fm.hexfunc
1187 marks = repo._bookmarks
1187 marks = repo._bookmarks
1188 if len(marks) == 0 and not fm:
1188 if len(marks) == 0 and not fm:
1189 ui.status(_("no bookmarks set\n"))
1189 ui.status(_("no bookmarks set\n"))
1190 for bmark, n in sorted(marks.iteritems()):
1190 for bmark, n in sorted(marks.iteritems()):
1191 active = repo._activebookmark
1191 active = repo._activebookmark
1192 if bmark == active:
1192 if bmark == active:
1193 prefix, label = '*', activebookmarklabel
1193 prefix, label = '*', activebookmarklabel
1194 else:
1194 else:
1195 prefix, label = ' ', ''
1195 prefix, label = ' ', ''
1196
1196
1197 fm.startitem()
1197 fm.startitem()
1198 if not ui.quiet:
1198 if not ui.quiet:
1199 fm.plain(' %s ' % prefix, label=label)
1199 fm.plain(' %s ' % prefix, label=label)
1200 fm.write('bookmark', '%s', bmark, label=label)
1200 fm.write('bookmark', '%s', bmark, label=label)
1201 pad = " " * (25 - encoding.colwidth(bmark))
1201 pad = " " * (25 - encoding.colwidth(bmark))
1202 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1202 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1203 repo.changelog.rev(n), hexfn(n), label=label)
1203 repo.changelog.rev(n), hexfn(n), label=label)
1204 fm.data(active=(bmark == active))
1204 fm.data(active=(bmark == active))
1205 fm.plain('\n')
1205 fm.plain('\n')
1206 fm.end()
1206 fm.end()
1207
1207
1208 @command('branch',
1208 @command('branch',
1209 [('f', 'force', None,
1209 [('f', 'force', None,
1210 _('set branch name even if it shadows an existing branch')),
1210 _('set branch name even if it shadows an existing branch')),
1211 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1211 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1212 _('[-fC] [NAME]'))
1212 _('[-fC] [NAME]'))
1213 def branch(ui, repo, label=None, **opts):
1213 def branch(ui, repo, label=None, **opts):
1214 """set or show the current branch name
1214 """set or show the current branch name
1215
1215
1216 .. note::
1216 .. note::
1217
1217
1218 Branch names are permanent and global. Use :hg:`bookmark` to create a
1218 Branch names are permanent and global. Use :hg:`bookmark` to create a
1219 light-weight bookmark instead. See :hg:`help glossary` for more
1219 light-weight bookmark instead. See :hg:`help glossary` for more
1220 information about named branches and bookmarks.
1220 information about named branches and bookmarks.
1221
1221
1222 With no argument, show the current branch name. With one argument,
1222 With no argument, show the current branch name. With one argument,
1223 set the working directory branch name (the branch will not exist
1223 set the working directory branch name (the branch will not exist
1224 in the repository until the next commit). Standard practice
1224 in the repository until the next commit). Standard practice
1225 recommends that primary development take place on the 'default'
1225 recommends that primary development take place on the 'default'
1226 branch.
1226 branch.
1227
1227
1228 Unless -f/--force is specified, branch will not let you set a
1228 Unless -f/--force is specified, branch will not let you set a
1229 branch name that already exists.
1229 branch name that already exists.
1230
1230
1231 Use -C/--clean to reset the working directory branch to that of
1231 Use -C/--clean to reset the working directory branch to that of
1232 the parent of the working directory, negating a previous branch
1232 the parent of the working directory, negating a previous branch
1233 change.
1233 change.
1234
1234
1235 Use the command :hg:`update` to switch to an existing branch. Use
1235 Use the command :hg:`update` to switch to an existing branch. Use
1236 :hg:`commit --close-branch` to mark this branch head as closed.
1236 :hg:`commit --close-branch` to mark this branch head as closed.
1237 When all heads of a branch are closed, the branch will be
1237 When all heads of a branch are closed, the branch will be
1238 considered closed.
1238 considered closed.
1239
1239
1240 Returns 0 on success.
1240 Returns 0 on success.
1241 """
1241 """
1242 if label:
1242 if label:
1243 label = label.strip()
1243 label = label.strip()
1244
1244
1245 if not opts.get('clean') and not label:
1245 if not opts.get('clean') and not label:
1246 ui.write("%s\n" % repo.dirstate.branch())
1246 ui.write("%s\n" % repo.dirstate.branch())
1247 return
1247 return
1248
1248
1249 with repo.wlock():
1249 with repo.wlock():
1250 if opts.get('clean'):
1250 if opts.get('clean'):
1251 label = repo[None].p1().branch()
1251 label = repo[None].p1().branch()
1252 repo.dirstate.setbranch(label)
1252 repo.dirstate.setbranch(label)
1253 ui.status(_('reset working directory to branch %s\n') % label)
1253 ui.status(_('reset working directory to branch %s\n') % label)
1254 elif label:
1254 elif label:
1255 if not opts.get('force') and label in repo.branchmap():
1255 if not opts.get('force') and label in repo.branchmap():
1256 if label not in [p.branch() for p in repo[None].parents()]:
1256 if label not in [p.branch() for p in repo[None].parents()]:
1257 raise error.Abort(_('a branch of the same name already'
1257 raise error.Abort(_('a branch of the same name already'
1258 ' exists'),
1258 ' exists'),
1259 # i18n: "it" refers to an existing branch
1259 # i18n: "it" refers to an existing branch
1260 hint=_("use 'hg update' to switch to it"))
1260 hint=_("use 'hg update' to switch to it"))
1261 scmutil.checknewlabel(repo, label, 'branch')
1261 scmutil.checknewlabel(repo, label, 'branch')
1262 repo.dirstate.setbranch(label)
1262 repo.dirstate.setbranch(label)
1263 ui.status(_('marked working directory as branch %s\n') % label)
1263 ui.status(_('marked working directory as branch %s\n') % label)
1264
1264
1265 # find any open named branches aside from default
1265 # find any open named branches aside from default
1266 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1266 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1267 if n != "default" and not c]
1267 if n != "default" and not c]
1268 if not others:
1268 if not others:
1269 ui.status(_('(branches are permanent and global, '
1269 ui.status(_('(branches are permanent and global, '
1270 'did you want a bookmark?)\n'))
1270 'did you want a bookmark?)\n'))
1271
1271
1272 @command('branches',
1272 @command('branches',
1273 [('a', 'active', False,
1273 [('a', 'active', False,
1274 _('show only branches that have unmerged heads (DEPRECATED)')),
1274 _('show only branches that have unmerged heads (DEPRECATED)')),
1275 ('c', 'closed', False, _('show normal and closed branches')),
1275 ('c', 'closed', False, _('show normal and closed branches')),
1276 ] + formatteropts,
1276 ] + formatteropts,
1277 _('[-c]'))
1277 _('[-c]'))
1278 def branches(ui, repo, active=False, closed=False, **opts):
1278 def branches(ui, repo, active=False, closed=False, **opts):
1279 """list repository named branches
1279 """list repository named branches
1280
1280
1281 List the repository's named branches, indicating which ones are
1281 List the repository's named branches, indicating which ones are
1282 inactive. If -c/--closed is specified, also list branches which have
1282 inactive. If -c/--closed is specified, also list branches which have
1283 been marked closed (see :hg:`commit --close-branch`).
1283 been marked closed (see :hg:`commit --close-branch`).
1284
1284
1285 Use the command :hg:`update` to switch to an existing branch.
1285 Use the command :hg:`update` to switch to an existing branch.
1286
1286
1287 Returns 0.
1287 Returns 0.
1288 """
1288 """
1289
1289
1290 fm = ui.formatter('branches', opts)
1290 fm = ui.formatter('branches', opts)
1291 hexfunc = fm.hexfunc
1291 hexfunc = fm.hexfunc
1292
1292
1293 allheads = set(repo.heads())
1293 allheads = set(repo.heads())
1294 branches = []
1294 branches = []
1295 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1295 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1296 isactive = not isclosed and bool(set(heads) & allheads)
1296 isactive = not isclosed and bool(set(heads) & allheads)
1297 branches.append((tag, repo[tip], isactive, not isclosed))
1297 branches.append((tag, repo[tip], isactive, not isclosed))
1298 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1298 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1299 reverse=True)
1299 reverse=True)
1300
1300
1301 for tag, ctx, isactive, isopen in branches:
1301 for tag, ctx, isactive, isopen in branches:
1302 if active and not isactive:
1302 if active and not isactive:
1303 continue
1303 continue
1304 if isactive:
1304 if isactive:
1305 label = 'branches.active'
1305 label = 'branches.active'
1306 notice = ''
1306 notice = ''
1307 elif not isopen:
1307 elif not isopen:
1308 if not closed:
1308 if not closed:
1309 continue
1309 continue
1310 label = 'branches.closed'
1310 label = 'branches.closed'
1311 notice = _(' (closed)')
1311 notice = _(' (closed)')
1312 else:
1312 else:
1313 label = 'branches.inactive'
1313 label = 'branches.inactive'
1314 notice = _(' (inactive)')
1314 notice = _(' (inactive)')
1315 current = (tag == repo.dirstate.branch())
1315 current = (tag == repo.dirstate.branch())
1316 if current:
1316 if current:
1317 label = 'branches.current'
1317 label = 'branches.current'
1318
1318
1319 fm.startitem()
1319 fm.startitem()
1320 fm.write('branch', '%s', tag, label=label)
1320 fm.write('branch', '%s', tag, label=label)
1321 rev = ctx.rev()
1321 rev = ctx.rev()
1322 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1322 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1323 fmt = ' ' * padsize + ' %d:%s'
1323 fmt = ' ' * padsize + ' %d:%s'
1324 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1324 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1325 label='log.changeset changeset.%s' % ctx.phasestr())
1325 label='log.changeset changeset.%s' % ctx.phasestr())
1326 fm.data(active=isactive, closed=not isopen, current=current)
1326 fm.data(active=isactive, closed=not isopen, current=current)
1327 if not ui.quiet:
1327 if not ui.quiet:
1328 fm.plain(notice)
1328 fm.plain(notice)
1329 fm.plain('\n')
1329 fm.plain('\n')
1330 fm.end()
1330 fm.end()
1331
1331
1332 @command('bundle',
1332 @command('bundle',
1333 [('f', 'force', None, _('run even when the destination is unrelated')),
1333 [('f', 'force', None, _('run even when the destination is unrelated')),
1334 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1334 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1335 _('REV')),
1335 _('REV')),
1336 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1336 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1337 _('BRANCH')),
1337 _('BRANCH')),
1338 ('', 'base', [],
1338 ('', 'base', [],
1339 _('a base changeset assumed to be available at the destination'),
1339 _('a base changeset assumed to be available at the destination'),
1340 _('REV')),
1340 _('REV')),
1341 ('a', 'all', None, _('bundle all changesets in the repository')),
1341 ('a', 'all', None, _('bundle all changesets in the repository')),
1342 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1342 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1343 ] + remoteopts,
1343 ] + remoteopts,
1344 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1344 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1345 def bundle(ui, repo, fname, dest=None, **opts):
1345 def bundle(ui, repo, fname, dest=None, **opts):
1346 """create a changegroup file
1346 """create a changegroup file
1347
1347
1348 Generate a changegroup file collecting changesets to be added
1348 Generate a changegroup file collecting changesets to be added
1349 to a repository.
1349 to a repository.
1350
1350
1351 To create a bundle containing all changesets, use -a/--all
1351 To create a bundle containing all changesets, use -a/--all
1352 (or --base null). Otherwise, hg assumes the destination will have
1352 (or --base null). Otherwise, hg assumes the destination will have
1353 all the nodes you specify with --base parameters. Otherwise, hg
1353 all the nodes you specify with --base parameters. Otherwise, hg
1354 will assume the repository has all the nodes in destination, or
1354 will assume the repository has all the nodes in destination, or
1355 default-push/default if no destination is specified.
1355 default-push/default if no destination is specified.
1356
1356
1357 You can change bundle format with the -t/--type option. You can
1357 You can change bundle format with the -t/--type option. You can
1358 specify a compression, a bundle version or both using a dash
1358 specify a compression, a bundle version or both using a dash
1359 (comp-version). The available compression methods are: none, bzip2,
1359 (comp-version). The available compression methods are: none, bzip2,
1360 and gzip (by default, bundles are compressed using bzip2). The
1360 and gzip (by default, bundles are compressed using bzip2). The
1361 available formats are: v1, v2 (default to most suitable).
1361 available formats are: v1, v2 (default to most suitable).
1362
1362
1363 The bundle file can then be transferred using conventional means
1363 The bundle file can then be transferred using conventional means
1364 and applied to another repository with the unbundle or pull
1364 and applied to another repository with the unbundle or pull
1365 command. This is useful when direct push and pull are not
1365 command. This is useful when direct push and pull are not
1366 available or when exporting an entire repository is undesirable.
1366 available or when exporting an entire repository is undesirable.
1367
1367
1368 Applying bundles preserves all changeset contents including
1368 Applying bundles preserves all changeset contents including
1369 permissions, copy/rename information, and revision history.
1369 permissions, copy/rename information, and revision history.
1370
1370
1371 Returns 0 on success, 1 if no changes found.
1371 Returns 0 on success, 1 if no changes found.
1372 """
1372 """
1373 revs = None
1373 revs = None
1374 if 'rev' in opts:
1374 if 'rev' in opts:
1375 revstrings = opts['rev']
1375 revstrings = opts['rev']
1376 revs = scmutil.revrange(repo, revstrings)
1376 revs = scmutil.revrange(repo, revstrings)
1377 if revstrings and not revs:
1377 if revstrings and not revs:
1378 raise error.Abort(_('no commits to bundle'))
1378 raise error.Abort(_('no commits to bundle'))
1379
1379
1380 bundletype = opts.get('type', 'bzip2').lower()
1380 bundletype = opts.get('type', 'bzip2').lower()
1381 try:
1381 try:
1382 bcompression, cgversion, params = exchange.parsebundlespec(
1382 bcompression, cgversion, params = exchange.parsebundlespec(
1383 repo, bundletype, strict=False)
1383 repo, bundletype, strict=False)
1384 except error.UnsupportedBundleSpecification as e:
1384 except error.UnsupportedBundleSpecification as e:
1385 raise error.Abort(str(e),
1385 raise error.Abort(str(e),
1386 hint=_('see "hg help bundle" for supported '
1386 hint=_('see "hg help bundle" for supported '
1387 'values for --type'))
1387 'values for --type'))
1388
1388
1389 # Packed bundles are a pseudo bundle format for now.
1389 # Packed bundles are a pseudo bundle format for now.
1390 if cgversion == 's1':
1390 if cgversion == 's1':
1391 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1391 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1392 hint=_("use 'hg debugcreatestreamclonebundle'"))
1392 hint=_("use 'hg debugcreatestreamclonebundle'"))
1393
1393
1394 if opts.get('all'):
1394 if opts.get('all'):
1395 if dest:
1395 if dest:
1396 raise error.Abort(_("--all is incompatible with specifying "
1396 raise error.Abort(_("--all is incompatible with specifying "
1397 "a destination"))
1397 "a destination"))
1398 if opts.get('base'):
1398 if opts.get('base'):
1399 ui.warn(_("ignoring --base because --all was specified\n"))
1399 ui.warn(_("ignoring --base because --all was specified\n"))
1400 base = ['null']
1400 base = ['null']
1401 else:
1401 else:
1402 base = scmutil.revrange(repo, opts.get('base'))
1402 base = scmutil.revrange(repo, opts.get('base'))
1403 # TODO: get desired bundlecaps from command line.
1403 # TODO: get desired bundlecaps from command line.
1404 bundlecaps = None
1404 bundlecaps = None
1405 if cgversion not in changegroup.supportedoutgoingversions(repo):
1405 if cgversion not in changegroup.supportedoutgoingversions(repo):
1406 raise error.Abort(_("repository does not support bundle version %s") %
1406 raise error.Abort(_("repository does not support bundle version %s") %
1407 cgversion)
1407 cgversion)
1408
1408
1409 if base:
1409 if base:
1410 if dest:
1410 if dest:
1411 raise error.Abort(_("--base is incompatible with specifying "
1411 raise error.Abort(_("--base is incompatible with specifying "
1412 "a destination"))
1412 "a destination"))
1413 common = [repo.lookup(rev) for rev in base]
1413 common = [repo.lookup(rev) for rev in base]
1414 heads = revs and map(repo.lookup, revs) or None
1414 heads = revs and map(repo.lookup, revs) or None
1415 outgoing = discovery.outgoing(repo, common, heads)
1415 outgoing = discovery.outgoing(repo, common, heads)
1416 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1416 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1417 bundlecaps=bundlecaps,
1417 bundlecaps=bundlecaps,
1418 version=cgversion)
1418 version=cgversion)
1419 outgoing = None
1419 outgoing = None
1420 else:
1420 else:
1421 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1421 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1422 dest, branches = hg.parseurl(dest, opts.get('branch'))
1422 dest, branches = hg.parseurl(dest, opts.get('branch'))
1423 other = hg.peer(repo, opts, dest)
1423 other = hg.peer(repo, opts, dest)
1424 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1424 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1425 heads = revs and map(repo.lookup, revs) or revs
1425 heads = revs and map(repo.lookup, revs) or revs
1426 outgoing = discovery.findcommonoutgoing(repo, other,
1426 outgoing = discovery.findcommonoutgoing(repo, other,
1427 onlyheads=heads,
1427 onlyheads=heads,
1428 force=opts.get('force'),
1428 force=opts.get('force'),
1429 portable=True)
1429 portable=True)
1430 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1430 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1431 bundlecaps, version=cgversion)
1431 bundlecaps, version=cgversion)
1432 if not cg:
1432 if not cg:
1433 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1433 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1434 return 1
1434 return 1
1435
1435
1436 if cgversion == '01': #bundle1
1436 if cgversion == '01': #bundle1
1437 if bcompression is None:
1437 if bcompression is None:
1438 bcompression = 'UN'
1438 bcompression = 'UN'
1439 bversion = 'HG10' + bcompression
1439 bversion = 'HG10' + bcompression
1440 bcompression = None
1440 bcompression = None
1441 else:
1441 else:
1442 assert cgversion == '02'
1442 assert cgversion == '02'
1443 bversion = 'HG20'
1443 bversion = 'HG20'
1444
1444
1445 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1445 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1446
1446
1447 @command('cat',
1447 @command('cat',
1448 [('o', 'output', '',
1448 [('o', 'output', '',
1449 _('print output to file with formatted name'), _('FORMAT')),
1449 _('print output to file with formatted name'), _('FORMAT')),
1450 ('r', 'rev', '', _('print the given revision'), _('REV')),
1450 ('r', 'rev', '', _('print the given revision'), _('REV')),
1451 ('', 'decode', None, _('apply any matching decode filter')),
1451 ('', 'decode', None, _('apply any matching decode filter')),
1452 ] + walkopts,
1452 ] + walkopts,
1453 _('[OPTION]... FILE...'),
1453 _('[OPTION]... FILE...'),
1454 inferrepo=True)
1454 inferrepo=True)
1455 def cat(ui, repo, file1, *pats, **opts):
1455 def cat(ui, repo, file1, *pats, **opts):
1456 """output the current or given revision of files
1456 """output the current or given revision of files
1457
1457
1458 Print the specified files as they were at the given revision. If
1458 Print the specified files as they were at the given revision. If
1459 no revision is given, the parent of the working directory is used.
1459 no revision is given, the parent of the working directory is used.
1460
1460
1461 Output may be to a file, in which case the name of the file is
1461 Output may be to a file, in which case the name of the file is
1462 given using a format string. The formatting rules as follows:
1462 given using a format string. The formatting rules as follows:
1463
1463
1464 :``%%``: literal "%" character
1464 :``%%``: literal "%" character
1465 :``%s``: basename of file being printed
1465 :``%s``: basename of file being printed
1466 :``%d``: dirname of file being printed, or '.' if in repository root
1466 :``%d``: dirname of file being printed, or '.' if in repository root
1467 :``%p``: root-relative path name of file being printed
1467 :``%p``: root-relative path name of file being printed
1468 :``%H``: changeset hash (40 hexadecimal digits)
1468 :``%H``: changeset hash (40 hexadecimal digits)
1469 :``%R``: changeset revision number
1469 :``%R``: changeset revision number
1470 :``%h``: short-form changeset hash (12 hexadecimal digits)
1470 :``%h``: short-form changeset hash (12 hexadecimal digits)
1471 :``%r``: zero-padded changeset revision number
1471 :``%r``: zero-padded changeset revision number
1472 :``%b``: basename of the exporting repository
1472 :``%b``: basename of the exporting repository
1473
1473
1474 Returns 0 on success.
1474 Returns 0 on success.
1475 """
1475 """
1476 ctx = scmutil.revsingle(repo, opts.get('rev'))
1476 ctx = scmutil.revsingle(repo, opts.get('rev'))
1477 m = scmutil.match(ctx, (file1,) + pats, opts)
1477 m = scmutil.match(ctx, (file1,) + pats, opts)
1478
1478
1479 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1479 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1480
1480
1481 @command('^clone',
1481 @command('^clone',
1482 [('U', 'noupdate', None, _('the clone will include an empty working '
1482 [('U', 'noupdate', None, _('the clone will include an empty working '
1483 'directory (only a repository)')),
1483 'directory (only a repository)')),
1484 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1484 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1485 _('REV')),
1485 _('REV')),
1486 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1486 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1487 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1487 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1488 ('', 'pull', None, _('use pull protocol to copy metadata')),
1488 ('', 'pull', None, _('use pull protocol to copy metadata')),
1489 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1489 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1490 ] + remoteopts,
1490 ] + remoteopts,
1491 _('[OPTION]... SOURCE [DEST]'),
1491 _('[OPTION]... SOURCE [DEST]'),
1492 norepo=True)
1492 norepo=True)
1493 def clone(ui, source, dest=None, **opts):
1493 def clone(ui, source, dest=None, **opts):
1494 """make a copy of an existing repository
1494 """make a copy of an existing repository
1495
1495
1496 Create a copy of an existing repository in a new directory.
1496 Create a copy of an existing repository in a new directory.
1497
1497
1498 If no destination directory name is specified, it defaults to the
1498 If no destination directory name is specified, it defaults to the
1499 basename of the source.
1499 basename of the source.
1500
1500
1501 The location of the source is added to the new repository's
1501 The location of the source is added to the new repository's
1502 ``.hg/hgrc`` file, as the default to be used for future pulls.
1502 ``.hg/hgrc`` file, as the default to be used for future pulls.
1503
1503
1504 Only local paths and ``ssh://`` URLs are supported as
1504 Only local paths and ``ssh://`` URLs are supported as
1505 destinations. For ``ssh://`` destinations, no working directory or
1505 destinations. For ``ssh://`` destinations, no working directory or
1506 ``.hg/hgrc`` will be created on the remote side.
1506 ``.hg/hgrc`` will be created on the remote side.
1507
1507
1508 If the source repository has a bookmark called '@' set, that
1508 If the source repository has a bookmark called '@' set, that
1509 revision will be checked out in the new repository by default.
1509 revision will be checked out in the new repository by default.
1510
1510
1511 To check out a particular version, use -u/--update, or
1511 To check out a particular version, use -u/--update, or
1512 -U/--noupdate to create a clone with no working directory.
1512 -U/--noupdate to create a clone with no working directory.
1513
1513
1514 To pull only a subset of changesets, specify one or more revisions
1514 To pull only a subset of changesets, specify one or more revisions
1515 identifiers with -r/--rev or branches with -b/--branch. The
1515 identifiers with -r/--rev or branches with -b/--branch. The
1516 resulting clone will contain only the specified changesets and
1516 resulting clone will contain only the specified changesets and
1517 their ancestors. These options (or 'clone src#rev dest') imply
1517 their ancestors. These options (or 'clone src#rev dest') imply
1518 --pull, even for local source repositories.
1518 --pull, even for local source repositories.
1519
1519
1520 .. note::
1520 .. note::
1521
1521
1522 Specifying a tag will include the tagged changeset but not the
1522 Specifying a tag will include the tagged changeset but not the
1523 changeset containing the tag.
1523 changeset containing the tag.
1524
1524
1525 .. container:: verbose
1525 .. container:: verbose
1526
1526
1527 For efficiency, hardlinks are used for cloning whenever the
1527 For efficiency, hardlinks are used for cloning whenever the
1528 source and destination are on the same filesystem (note this
1528 source and destination are on the same filesystem (note this
1529 applies only to the repository data, not to the working
1529 applies only to the repository data, not to the working
1530 directory). Some filesystems, such as AFS, implement hardlinking
1530 directory). Some filesystems, such as AFS, implement hardlinking
1531 incorrectly, but do not report errors. In these cases, use the
1531 incorrectly, but do not report errors. In these cases, use the
1532 --pull option to avoid hardlinking.
1532 --pull option to avoid hardlinking.
1533
1533
1534 In some cases, you can clone repositories and the working
1534 In some cases, you can clone repositories and the working
1535 directory using full hardlinks with ::
1535 directory using full hardlinks with ::
1536
1536
1537 $ cp -al REPO REPOCLONE
1537 $ cp -al REPO REPOCLONE
1538
1538
1539 This is the fastest way to clone, but it is not always safe. The
1539 This is the fastest way to clone, but it is not always safe. The
1540 operation is not atomic (making sure REPO is not modified during
1540 operation is not atomic (making sure REPO is not modified during
1541 the operation is up to you) and you have to make sure your
1541 the operation is up to you) and you have to make sure your
1542 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1542 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1543 so). Also, this is not compatible with certain extensions that
1543 so). Also, this is not compatible with certain extensions that
1544 place their metadata under the .hg directory, such as mq.
1544 place their metadata under the .hg directory, such as mq.
1545
1545
1546 Mercurial will update the working directory to the first applicable
1546 Mercurial will update the working directory to the first applicable
1547 revision from this list:
1547 revision from this list:
1548
1548
1549 a) null if -U or the source repository has no changesets
1549 a) null if -U or the source repository has no changesets
1550 b) if -u . and the source repository is local, the first parent of
1550 b) if -u . and the source repository is local, the first parent of
1551 the source repository's working directory
1551 the source repository's working directory
1552 c) the changeset specified with -u (if a branch name, this means the
1552 c) the changeset specified with -u (if a branch name, this means the
1553 latest head of that branch)
1553 latest head of that branch)
1554 d) the changeset specified with -r
1554 d) the changeset specified with -r
1555 e) the tipmost head specified with -b
1555 e) the tipmost head specified with -b
1556 f) the tipmost head specified with the url#branch source syntax
1556 f) the tipmost head specified with the url#branch source syntax
1557 g) the revision marked with the '@' bookmark, if present
1557 g) the revision marked with the '@' bookmark, if present
1558 h) the tipmost head of the default branch
1558 h) the tipmost head of the default branch
1559 i) tip
1559 i) tip
1560
1560
1561 When cloning from servers that support it, Mercurial may fetch
1561 When cloning from servers that support it, Mercurial may fetch
1562 pre-generated data from a server-advertised URL. When this is done,
1562 pre-generated data from a server-advertised URL. When this is done,
1563 hooks operating on incoming changesets and changegroups may fire twice,
1563 hooks operating on incoming changesets and changegroups may fire twice,
1564 once for the bundle fetched from the URL and another for any additional
1564 once for the bundle fetched from the URL and another for any additional
1565 data not fetched from this URL. In addition, if an error occurs, the
1565 data not fetched from this URL. In addition, if an error occurs, the
1566 repository may be rolled back to a partial clone. This behavior may
1566 repository may be rolled back to a partial clone. This behavior may
1567 change in future releases. See :hg:`help -e clonebundles` for more.
1567 change in future releases. See :hg:`help -e clonebundles` for more.
1568
1568
1569 Examples:
1569 Examples:
1570
1570
1571 - clone a remote repository to a new directory named hg/::
1571 - clone a remote repository to a new directory named hg/::
1572
1572
1573 hg clone http://selenic.com/hg
1573 hg clone http://selenic.com/hg
1574
1574
1575 - create a lightweight local clone::
1575 - create a lightweight local clone::
1576
1576
1577 hg clone project/ project-feature/
1577 hg clone project/ project-feature/
1578
1578
1579 - clone from an absolute path on an ssh server (note double-slash)::
1579 - clone from an absolute path on an ssh server (note double-slash)::
1580
1580
1581 hg clone ssh://user@server//home/projects/alpha/
1581 hg clone ssh://user@server//home/projects/alpha/
1582
1582
1583 - do a high-speed clone over a LAN while checking out a
1583 - do a high-speed clone over a LAN while checking out a
1584 specified version::
1584 specified version::
1585
1585
1586 hg clone --uncompressed http://server/repo -u 1.5
1586 hg clone --uncompressed http://server/repo -u 1.5
1587
1587
1588 - create a repository without changesets after a particular revision::
1588 - create a repository without changesets after a particular revision::
1589
1589
1590 hg clone -r 04e544 experimental/ good/
1590 hg clone -r 04e544 experimental/ good/
1591
1591
1592 - clone (and track) a particular named branch::
1592 - clone (and track) a particular named branch::
1593
1593
1594 hg clone http://selenic.com/hg#stable
1594 hg clone http://selenic.com/hg#stable
1595
1595
1596 See :hg:`help urls` for details on specifying URLs.
1596 See :hg:`help urls` for details on specifying URLs.
1597
1597
1598 Returns 0 on success.
1598 Returns 0 on success.
1599 """
1599 """
1600 if opts.get('noupdate') and opts.get('updaterev'):
1600 if opts.get('noupdate') and opts.get('updaterev'):
1601 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1601 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1602
1602
1603 r = hg.clone(ui, opts, source, dest,
1603 r = hg.clone(ui, opts, source, dest,
1604 pull=opts.get('pull'),
1604 pull=opts.get('pull'),
1605 stream=opts.get('uncompressed'),
1605 stream=opts.get('uncompressed'),
1606 rev=opts.get('rev'),
1606 rev=opts.get('rev'),
1607 update=opts.get('updaterev') or not opts.get('noupdate'),
1607 update=opts.get('updaterev') or not opts.get('noupdate'),
1608 branch=opts.get('branch'),
1608 branch=opts.get('branch'),
1609 shareopts=opts.get('shareopts'))
1609 shareopts=opts.get('shareopts'))
1610
1610
1611 return r is None
1611 return r is None
1612
1612
1613 @command('^commit|ci',
1613 @command('^commit|ci',
1614 [('A', 'addremove', None,
1614 [('A', 'addremove', None,
1615 _('mark new/missing files as added/removed before committing')),
1615 _('mark new/missing files as added/removed before committing')),
1616 ('', 'close-branch', None,
1616 ('', 'close-branch', None,
1617 _('mark a branch head as closed')),
1617 _('mark a branch head as closed')),
1618 ('', 'amend', None, _('amend the parent of the working directory')),
1618 ('', 'amend', None, _('amend the parent of the working directory')),
1619 ('s', 'secret', None, _('use the secret phase for committing')),
1619 ('s', 'secret', None, _('use the secret phase for committing')),
1620 ('e', 'edit', None, _('invoke editor on commit messages')),
1620 ('e', 'edit', None, _('invoke editor on commit messages')),
1621 ('i', 'interactive', None, _('use interactive mode')),
1621 ('i', 'interactive', None, _('use interactive mode')),
1622 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1622 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1623 _('[OPTION]... [FILE]...'),
1623 _('[OPTION]... [FILE]...'),
1624 inferrepo=True)
1624 inferrepo=True)
1625 def commit(ui, repo, *pats, **opts):
1625 def commit(ui, repo, *pats, **opts):
1626 """commit the specified files or all outstanding changes
1626 """commit the specified files or all outstanding changes
1627
1627
1628 Commit changes to the given files into the repository. Unlike a
1628 Commit changes to the given files into the repository. Unlike a
1629 centralized SCM, this operation is a local operation. See
1629 centralized SCM, this operation is a local operation. See
1630 :hg:`push` for a way to actively distribute your changes.
1630 :hg:`push` for a way to actively distribute your changes.
1631
1631
1632 If a list of files is omitted, all changes reported by :hg:`status`
1632 If a list of files is omitted, all changes reported by :hg:`status`
1633 will be committed.
1633 will be committed.
1634
1634
1635 If you are committing the result of a merge, do not provide any
1635 If you are committing the result of a merge, do not provide any
1636 filenames or -I/-X filters.
1636 filenames or -I/-X filters.
1637
1637
1638 If no commit message is specified, Mercurial starts your
1638 If no commit message is specified, Mercurial starts your
1639 configured editor where you can enter a message. In case your
1639 configured editor where you can enter a message. In case your
1640 commit fails, you will find a backup of your message in
1640 commit fails, you will find a backup of your message in
1641 ``.hg/last-message.txt``.
1641 ``.hg/last-message.txt``.
1642
1642
1643 The --close-branch flag can be used to mark the current branch
1643 The --close-branch flag can be used to mark the current branch
1644 head closed. When all heads of a branch are closed, the branch
1644 head closed. When all heads of a branch are closed, the branch
1645 will be considered closed and no longer listed.
1645 will be considered closed and no longer listed.
1646
1646
1647 The --amend flag can be used to amend the parent of the
1647 The --amend flag can be used to amend the parent of the
1648 working directory with a new commit that contains the changes
1648 working directory with a new commit that contains the changes
1649 in the parent in addition to those currently reported by :hg:`status`,
1649 in the parent in addition to those currently reported by :hg:`status`,
1650 if there are any. The old commit is stored in a backup bundle in
1650 if there are any. The old commit is stored in a backup bundle in
1651 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1651 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1652 on how to restore it).
1652 on how to restore it).
1653
1653
1654 Message, user and date are taken from the amended commit unless
1654 Message, user and date are taken from the amended commit unless
1655 specified. When a message isn't specified on the command line,
1655 specified. When a message isn't specified on the command line,
1656 the editor will open with the message of the amended commit.
1656 the editor will open with the message of the amended commit.
1657
1657
1658 It is not possible to amend public changesets (see :hg:`help phases`)
1658 It is not possible to amend public changesets (see :hg:`help phases`)
1659 or changesets that have children.
1659 or changesets that have children.
1660
1660
1661 See :hg:`help dates` for a list of formats valid for -d/--date.
1661 See :hg:`help dates` for a list of formats valid for -d/--date.
1662
1662
1663 Returns 0 on success, 1 if nothing changed.
1663 Returns 0 on success, 1 if nothing changed.
1664
1664
1665 .. container:: verbose
1665 .. container:: verbose
1666
1666
1667 Examples:
1667 Examples:
1668
1668
1669 - commit all files ending in .py::
1669 - commit all files ending in .py::
1670
1670
1671 hg commit --include "set:**.py"
1671 hg commit --include "set:**.py"
1672
1672
1673 - commit all non-binary files::
1673 - commit all non-binary files::
1674
1674
1675 hg commit --exclude "set:binary()"
1675 hg commit --exclude "set:binary()"
1676
1676
1677 - amend the current commit and set the date to now::
1677 - amend the current commit and set the date to now::
1678
1678
1679 hg commit --amend --date now
1679 hg commit --amend --date now
1680 """
1680 """
1681 wlock = lock = None
1681 wlock = lock = None
1682 try:
1682 try:
1683 wlock = repo.wlock()
1683 wlock = repo.wlock()
1684 lock = repo.lock()
1684 lock = repo.lock()
1685 return _docommit(ui, repo, *pats, **opts)
1685 return _docommit(ui, repo, *pats, **opts)
1686 finally:
1686 finally:
1687 release(lock, wlock)
1687 release(lock, wlock)
1688
1688
1689 def _docommit(ui, repo, *pats, **opts):
1689 def _docommit(ui, repo, *pats, **opts):
1690 if opts.get('interactive'):
1690 if opts.get('interactive'):
1691 opts.pop('interactive')
1691 opts.pop('interactive')
1692 cmdutil.dorecord(ui, repo, commit, None, False,
1692 cmdutil.dorecord(ui, repo, commit, None, False,
1693 cmdutil.recordfilter, *pats, **opts)
1693 cmdutil.recordfilter, *pats, **opts)
1694 return
1694 return
1695
1695
1696 if opts.get('subrepos'):
1696 if opts.get('subrepos'):
1697 if opts.get('amend'):
1697 if opts.get('amend'):
1698 raise error.Abort(_('cannot amend with --subrepos'))
1698 raise error.Abort(_('cannot amend with --subrepos'))
1699 # Let --subrepos on the command line override config setting.
1699 # Let --subrepos on the command line override config setting.
1700 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1700 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1701
1701
1702 cmdutil.checkunfinished(repo, commit=True)
1702 cmdutil.checkunfinished(repo, commit=True)
1703
1703
1704 branch = repo[None].branch()
1704 branch = repo[None].branch()
1705 bheads = repo.branchheads(branch)
1705 bheads = repo.branchheads(branch)
1706
1706
1707 extra = {}
1707 extra = {}
1708 if opts.get('close_branch'):
1708 if opts.get('close_branch'):
1709 extra['close'] = 1
1709 extra['close'] = 1
1710
1710
1711 if not bheads:
1711 if not bheads:
1712 raise error.Abort(_('can only close branch heads'))
1712 raise error.Abort(_('can only close branch heads'))
1713 elif opts.get('amend'):
1713 elif opts.get('amend'):
1714 if repo[None].parents()[0].p1().branch() != branch and \
1714 if repo[None].parents()[0].p1().branch() != branch and \
1715 repo[None].parents()[0].p2().branch() != branch:
1715 repo[None].parents()[0].p2().branch() != branch:
1716 raise error.Abort(_('can only close branch heads'))
1716 raise error.Abort(_('can only close branch heads'))
1717
1717
1718 if opts.get('amend'):
1718 if opts.get('amend'):
1719 if ui.configbool('ui', 'commitsubrepos'):
1719 if ui.configbool('ui', 'commitsubrepos'):
1720 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1720 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1721
1721
1722 old = repo['.']
1722 old = repo['.']
1723 if not old.mutable():
1723 if not old.mutable():
1724 raise error.Abort(_('cannot amend public changesets'))
1724 raise error.Abort(_('cannot amend public changesets'))
1725 if len(repo[None].parents()) > 1:
1725 if len(repo[None].parents()) > 1:
1726 raise error.Abort(_('cannot amend while merging'))
1726 raise error.Abort(_('cannot amend while merging'))
1727 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1727 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1728 if not allowunstable and old.children():
1728 if not allowunstable and old.children():
1729 raise error.Abort(_('cannot amend changeset with children'))
1729 raise error.Abort(_('cannot amend changeset with children'))
1730
1730
1731 # Currently histedit gets confused if an amend happens while histedit
1731 # Currently histedit gets confused if an amend happens while histedit
1732 # is in progress. Since we have a checkunfinished command, we are
1732 # is in progress. Since we have a checkunfinished command, we are
1733 # temporarily honoring it.
1733 # temporarily honoring it.
1734 #
1734 #
1735 # Note: eventually this guard will be removed. Please do not expect
1735 # Note: eventually this guard will be removed. Please do not expect
1736 # this behavior to remain.
1736 # this behavior to remain.
1737 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1737 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1738 cmdutil.checkunfinished(repo)
1738 cmdutil.checkunfinished(repo)
1739
1739
1740 # commitfunc is used only for temporary amend commit by cmdutil.amend
1740 # commitfunc is used only for temporary amend commit by cmdutil.amend
1741 def commitfunc(ui, repo, message, match, opts):
1741 def commitfunc(ui, repo, message, match, opts):
1742 return repo.commit(message,
1742 return repo.commit(message,
1743 opts.get('user') or old.user(),
1743 opts.get('user') or old.user(),
1744 opts.get('date') or old.date(),
1744 opts.get('date') or old.date(),
1745 match,
1745 match,
1746 extra=extra)
1746 extra=extra)
1747
1747
1748 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1748 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1749 if node == old.node():
1749 if node == old.node():
1750 ui.status(_("nothing changed\n"))
1750 ui.status(_("nothing changed\n"))
1751 return 1
1751 return 1
1752 else:
1752 else:
1753 def commitfunc(ui, repo, message, match, opts):
1753 def commitfunc(ui, repo, message, match, opts):
1754 backup = ui.backupconfig('phases', 'new-commit')
1754 backup = ui.backupconfig('phases', 'new-commit')
1755 baseui = repo.baseui
1755 baseui = repo.baseui
1756 basebackup = baseui.backupconfig('phases', 'new-commit')
1756 basebackup = baseui.backupconfig('phases', 'new-commit')
1757 try:
1757 try:
1758 if opts.get('secret'):
1758 if opts.get('secret'):
1759 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1759 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1760 # Propagate to subrepos
1760 # Propagate to subrepos
1761 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1761 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1762
1762
1763 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1763 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1764 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1764 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1765 return repo.commit(message, opts.get('user'), opts.get('date'),
1765 return repo.commit(message, opts.get('user'), opts.get('date'),
1766 match,
1766 match,
1767 editor=editor,
1767 editor=editor,
1768 extra=extra)
1768 extra=extra)
1769 finally:
1769 finally:
1770 ui.restoreconfig(backup)
1770 ui.restoreconfig(backup)
1771 repo.baseui.restoreconfig(basebackup)
1771 repo.baseui.restoreconfig(basebackup)
1772
1772
1773
1773
1774 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1774 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1775
1775
1776 if not node:
1776 if not node:
1777 stat = cmdutil.postcommitstatus(repo, pats, opts)
1777 stat = cmdutil.postcommitstatus(repo, pats, opts)
1778 if stat[3]:
1778 if stat[3]:
1779 ui.status(_("nothing changed (%d missing files, see "
1779 ui.status(_("nothing changed (%d missing files, see "
1780 "'hg status')\n") % len(stat[3]))
1780 "'hg status')\n") % len(stat[3]))
1781 else:
1781 else:
1782 ui.status(_("nothing changed\n"))
1782 ui.status(_("nothing changed\n"))
1783 return 1
1783 return 1
1784
1784
1785 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1785 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1786
1786
1787 @command('config|showconfig|debugconfig',
1787 @command('config|showconfig|debugconfig',
1788 [('u', 'untrusted', None, _('show untrusted configuration options')),
1788 [('u', 'untrusted', None, _('show untrusted configuration options')),
1789 ('e', 'edit', None, _('edit user config')),
1789 ('e', 'edit', None, _('edit user config')),
1790 ('l', 'local', None, _('edit repository config')),
1790 ('l', 'local', None, _('edit repository config')),
1791 ('g', 'global', None, _('edit global config'))],
1791 ('g', 'global', None, _('edit global config'))],
1792 _('[-u] [NAME]...'),
1792 _('[-u] [NAME]...'),
1793 optionalrepo=True)
1793 optionalrepo=True)
1794 def config(ui, repo, *values, **opts):
1794 def config(ui, repo, *values, **opts):
1795 """show combined config settings from all hgrc files
1795 """show combined config settings from all hgrc files
1796
1796
1797 With no arguments, print names and values of all config items.
1797 With no arguments, print names and values of all config items.
1798
1798
1799 With one argument of the form section.name, print just the value
1799 With one argument of the form section.name, print just the value
1800 of that config item.
1800 of that config item.
1801
1801
1802 With multiple arguments, print names and values of all config
1802 With multiple arguments, print names and values of all config
1803 items with matching section names.
1803 items with matching section names.
1804
1804
1805 With --edit, start an editor on the user-level config file. With
1805 With --edit, start an editor on the user-level config file. With
1806 --global, edit the system-wide config file. With --local, edit the
1806 --global, edit the system-wide config file. With --local, edit the
1807 repository-level config file.
1807 repository-level config file.
1808
1808
1809 With --debug, the source (filename and line number) is printed
1809 With --debug, the source (filename and line number) is printed
1810 for each config item.
1810 for each config item.
1811
1811
1812 See :hg:`help config` for more information about config files.
1812 See :hg:`help config` for more information about config files.
1813
1813
1814 Returns 0 on success, 1 if NAME does not exist.
1814 Returns 0 on success, 1 if NAME does not exist.
1815
1815
1816 """
1816 """
1817
1817
1818 if opts.get('edit') or opts.get('local') or opts.get('global'):
1818 if opts.get('edit') or opts.get('local') or opts.get('global'):
1819 if opts.get('local') and opts.get('global'):
1819 if opts.get('local') and opts.get('global'):
1820 raise error.Abort(_("can't use --local and --global together"))
1820 raise error.Abort(_("can't use --local and --global together"))
1821
1821
1822 if opts.get('local'):
1822 if opts.get('local'):
1823 if not repo:
1823 if not repo:
1824 raise error.Abort(_("can't use --local outside a repository"))
1824 raise error.Abort(_("can't use --local outside a repository"))
1825 paths = [repo.join('hgrc')]
1825 paths = [repo.join('hgrc')]
1826 elif opts.get('global'):
1826 elif opts.get('global'):
1827 paths = scmutil.systemrcpath()
1827 paths = scmutil.systemrcpath()
1828 else:
1828 else:
1829 paths = scmutil.userrcpath()
1829 paths = scmutil.userrcpath()
1830
1830
1831 for f in paths:
1831 for f in paths:
1832 if os.path.exists(f):
1832 if os.path.exists(f):
1833 break
1833 break
1834 else:
1834 else:
1835 if opts.get('global'):
1835 if opts.get('global'):
1836 samplehgrc = uimod.samplehgrcs['global']
1836 samplehgrc = uimod.samplehgrcs['global']
1837 elif opts.get('local'):
1837 elif opts.get('local'):
1838 samplehgrc = uimod.samplehgrcs['local']
1838 samplehgrc = uimod.samplehgrcs['local']
1839 else:
1839 else:
1840 samplehgrc = uimod.samplehgrcs['user']
1840 samplehgrc = uimod.samplehgrcs['user']
1841
1841
1842 f = paths[0]
1842 f = paths[0]
1843 fp = open(f, "w")
1843 fp = open(f, "w")
1844 fp.write(samplehgrc)
1844 fp.write(samplehgrc)
1845 fp.close()
1845 fp.close()
1846
1846
1847 editor = ui.geteditor()
1847 editor = ui.geteditor()
1848 ui.system("%s \"%s\"" % (editor, f),
1848 ui.system("%s \"%s\"" % (editor, f),
1849 onerr=error.Abort, errprefix=_("edit failed"))
1849 onerr=error.Abort, errprefix=_("edit failed"))
1850 return
1850 return
1851
1851
1852 for f in scmutil.rcpath():
1852 for f in scmutil.rcpath():
1853 ui.debug('read config from: %s\n' % f)
1853 ui.debug('read config from: %s\n' % f)
1854 untrusted = bool(opts.get('untrusted'))
1854 untrusted = bool(opts.get('untrusted'))
1855 if values:
1855 if values:
1856 sections = [v for v in values if '.' not in v]
1856 sections = [v for v in values if '.' not in v]
1857 items = [v for v in values if '.' in v]
1857 items = [v for v in values if '.' in v]
1858 if len(items) > 1 or items and sections:
1858 if len(items) > 1 or items and sections:
1859 raise error.Abort(_('only one config item permitted'))
1859 raise error.Abort(_('only one config item permitted'))
1860 matched = False
1860 matched = False
1861 for section, name, value in ui.walkconfig(untrusted=untrusted):
1861 for section, name, value in ui.walkconfig(untrusted=untrusted):
1862 value = str(value).replace('\n', '\\n')
1862 value = str(value).replace('\n', '\\n')
1863 sectname = section + '.' + name
1863 sectname = section + '.' + name
1864 if values:
1864 if values:
1865 for v in values:
1865 for v in values:
1866 if v == section:
1866 if v == section:
1867 ui.debug('%s: ' %
1867 ui.debug('%s: ' %
1868 ui.configsource(section, name, untrusted))
1868 ui.configsource(section, name, untrusted))
1869 ui.write('%s=%s\n' % (sectname, value))
1869 ui.write('%s=%s\n' % (sectname, value))
1870 matched = True
1870 matched = True
1871 elif v == sectname:
1871 elif v == sectname:
1872 ui.debug('%s: ' %
1872 ui.debug('%s: ' %
1873 ui.configsource(section, name, untrusted))
1873 ui.configsource(section, name, untrusted))
1874 ui.write(value, '\n')
1874 ui.write(value, '\n')
1875 matched = True
1875 matched = True
1876 else:
1876 else:
1877 ui.debug('%s: ' %
1877 ui.debug('%s: ' %
1878 ui.configsource(section, name, untrusted))
1878 ui.configsource(section, name, untrusted))
1879 ui.write('%s=%s\n' % (sectname, value))
1879 ui.write('%s=%s\n' % (sectname, value))
1880 matched = True
1880 matched = True
1881 if matched:
1881 if matched:
1882 return 0
1882 return 0
1883 return 1
1883 return 1
1884
1884
1885 @command('copy|cp',
1885 @command('copy|cp',
1886 [('A', 'after', None, _('record a copy that has already occurred')),
1886 [('A', 'after', None, _('record a copy that has already occurred')),
1887 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1887 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1888 ] + walkopts + dryrunopts,
1888 ] + walkopts + dryrunopts,
1889 _('[OPTION]... [SOURCE]... DEST'))
1889 _('[OPTION]... [SOURCE]... DEST'))
1890 def copy(ui, repo, *pats, **opts):
1890 def copy(ui, repo, *pats, **opts):
1891 """mark files as copied for the next commit
1891 """mark files as copied for the next commit
1892
1892
1893 Mark dest as having copies of source files. If dest is a
1893 Mark dest as having copies of source files. If dest is a
1894 directory, copies are put in that directory. If dest is a file,
1894 directory, copies are put in that directory. If dest is a file,
1895 the source must be a single file.
1895 the source must be a single file.
1896
1896
1897 By default, this command copies the contents of files as they
1897 By default, this command copies the contents of files as they
1898 exist in the working directory. If invoked with -A/--after, the
1898 exist in the working directory. If invoked with -A/--after, the
1899 operation is recorded, but no copying is performed.
1899 operation is recorded, but no copying is performed.
1900
1900
1901 This command takes effect with the next commit. To undo a copy
1901 This command takes effect with the next commit. To undo a copy
1902 before that, see :hg:`revert`.
1902 before that, see :hg:`revert`.
1903
1903
1904 Returns 0 on success, 1 if errors are encountered.
1904 Returns 0 on success, 1 if errors are encountered.
1905 """
1905 """
1906 with repo.wlock(False):
1906 with repo.wlock(False):
1907 return cmdutil.copy(ui, repo, pats, opts)
1907 return cmdutil.copy(ui, repo, pats, opts)
1908
1908
1909 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1909 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1910 def debugancestor(ui, repo, *args):
1910 def debugancestor(ui, repo, *args):
1911 """find the ancestor revision of two revisions in a given index"""
1911 """find the ancestor revision of two revisions in a given index"""
1912 if len(args) == 3:
1912 if len(args) == 3:
1913 index, rev1, rev2 = args
1913 index, rev1, rev2 = args
1914 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1914 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1915 lookup = r.lookup
1915 lookup = r.lookup
1916 elif len(args) == 2:
1916 elif len(args) == 2:
1917 if not repo:
1917 if not repo:
1918 raise error.Abort(_("there is no Mercurial repository here "
1918 raise error.Abort(_("there is no Mercurial repository here "
1919 "(.hg not found)"))
1919 "(.hg not found)"))
1920 rev1, rev2 = args
1920 rev1, rev2 = args
1921 r = repo.changelog
1921 r = repo.changelog
1922 lookup = repo.lookup
1922 lookup = repo.lookup
1923 else:
1923 else:
1924 raise error.Abort(_('either two or three arguments required'))
1924 raise error.Abort(_('either two or three arguments required'))
1925 a = r.ancestor(lookup(rev1), lookup(rev2))
1925 a = r.ancestor(lookup(rev1), lookup(rev2))
1926 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1926 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1927
1927
1928 @command('debugbuilddag',
1928 @command('debugbuilddag',
1929 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1929 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1930 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1930 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1931 ('n', 'new-file', None, _('add new file at each rev'))],
1931 ('n', 'new-file', None, _('add new file at each rev'))],
1932 _('[OPTION]... [TEXT]'))
1932 _('[OPTION]... [TEXT]'))
1933 def debugbuilddag(ui, repo, text=None,
1933 def debugbuilddag(ui, repo, text=None,
1934 mergeable_file=False,
1934 mergeable_file=False,
1935 overwritten_file=False,
1935 overwritten_file=False,
1936 new_file=False):
1936 new_file=False):
1937 """builds a repo with a given DAG from scratch in the current empty repo
1937 """builds a repo with a given DAG from scratch in the current empty repo
1938
1938
1939 The description of the DAG is read from stdin if not given on the
1939 The description of the DAG is read from stdin if not given on the
1940 command line.
1940 command line.
1941
1941
1942 Elements:
1942 Elements:
1943
1943
1944 - "+n" is a linear run of n nodes based on the current default parent
1944 - "+n" is a linear run of n nodes based on the current default parent
1945 - "." is a single node based on the current default parent
1945 - "." is a single node based on the current default parent
1946 - "$" resets the default parent to null (implied at the start);
1946 - "$" resets the default parent to null (implied at the start);
1947 otherwise the default parent is always the last node created
1947 otherwise the default parent is always the last node created
1948 - "<p" sets the default parent to the backref p
1948 - "<p" sets the default parent to the backref p
1949 - "*p" is a fork at parent p, which is a backref
1949 - "*p" is a fork at parent p, which is a backref
1950 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1950 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1951 - "/p2" is a merge of the preceding node and p2
1951 - "/p2" is a merge of the preceding node and p2
1952 - ":tag" defines a local tag for the preceding node
1952 - ":tag" defines a local tag for the preceding node
1953 - "@branch" sets the named branch for subsequent nodes
1953 - "@branch" sets the named branch for subsequent nodes
1954 - "#...\\n" is a comment up to the end of the line
1954 - "#...\\n" is a comment up to the end of the line
1955
1955
1956 Whitespace between the above elements is ignored.
1956 Whitespace between the above elements is ignored.
1957
1957
1958 A backref is either
1958 A backref is either
1959
1959
1960 - a number n, which references the node curr-n, where curr is the current
1960 - a number n, which references the node curr-n, where curr is the current
1961 node, or
1961 node, or
1962 - the name of a local tag you placed earlier using ":tag", or
1962 - the name of a local tag you placed earlier using ":tag", or
1963 - empty to denote the default parent.
1963 - empty to denote the default parent.
1964
1964
1965 All string valued-elements are either strictly alphanumeric, or must
1965 All string valued-elements are either strictly alphanumeric, or must
1966 be enclosed in double quotes ("..."), with "\\" as escape character.
1966 be enclosed in double quotes ("..."), with "\\" as escape character.
1967 """
1967 """
1968
1968
1969 if text is None:
1969 if text is None:
1970 ui.status(_("reading DAG from stdin\n"))
1970 ui.status(_("reading DAG from stdin\n"))
1971 text = ui.fin.read()
1971 text = ui.fin.read()
1972
1972
1973 cl = repo.changelog
1973 cl = repo.changelog
1974 if len(cl) > 0:
1974 if len(cl) > 0:
1975 raise error.Abort(_('repository is not empty'))
1975 raise error.Abort(_('repository is not empty'))
1976
1976
1977 # determine number of revs in DAG
1977 # determine number of revs in DAG
1978 total = 0
1978 total = 0
1979 for type, data in dagparser.parsedag(text):
1979 for type, data in dagparser.parsedag(text):
1980 if type == 'n':
1980 if type == 'n':
1981 total += 1
1981 total += 1
1982
1982
1983 if mergeable_file:
1983 if mergeable_file:
1984 linesperrev = 2
1984 linesperrev = 2
1985 # make a file with k lines per rev
1985 # make a file with k lines per rev
1986 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1986 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1987 initialmergedlines.append("")
1987 initialmergedlines.append("")
1988
1988
1989 tags = []
1989 tags = []
1990
1990
1991 wlock = lock = tr = None
1991 wlock = lock = tr = None
1992 try:
1992 try:
1993 wlock = repo.wlock()
1993 wlock = repo.wlock()
1994 lock = repo.lock()
1994 lock = repo.lock()
1995 tr = repo.transaction("builddag")
1995 tr = repo.transaction("builddag")
1996
1996
1997 at = -1
1997 at = -1
1998 atbranch = 'default'
1998 atbranch = 'default'
1999 nodeids = []
1999 nodeids = []
2000 id = 0
2000 id = 0
2001 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2001 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2002 for type, data in dagparser.parsedag(text):
2002 for type, data in dagparser.parsedag(text):
2003 if type == 'n':
2003 if type == 'n':
2004 ui.note(('node %s\n' % str(data)))
2004 ui.note(('node %s\n' % str(data)))
2005 id, ps = data
2005 id, ps = data
2006
2006
2007 files = []
2007 files = []
2008 fctxs = {}
2008 fctxs = {}
2009
2009
2010 p2 = None
2010 p2 = None
2011 if mergeable_file:
2011 if mergeable_file:
2012 fn = "mf"
2012 fn = "mf"
2013 p1 = repo[ps[0]]
2013 p1 = repo[ps[0]]
2014 if len(ps) > 1:
2014 if len(ps) > 1:
2015 p2 = repo[ps[1]]
2015 p2 = repo[ps[1]]
2016 pa = p1.ancestor(p2)
2016 pa = p1.ancestor(p2)
2017 base, local, other = [x[fn].data() for x in (pa, p1,
2017 base, local, other = [x[fn].data() for x in (pa, p1,
2018 p2)]
2018 p2)]
2019 m3 = simplemerge.Merge3Text(base, local, other)
2019 m3 = simplemerge.Merge3Text(base, local, other)
2020 ml = [l.strip() for l in m3.merge_lines()]
2020 ml = [l.strip() for l in m3.merge_lines()]
2021 ml.append("")
2021 ml.append("")
2022 elif at > 0:
2022 elif at > 0:
2023 ml = p1[fn].data().split("\n")
2023 ml = p1[fn].data().split("\n")
2024 else:
2024 else:
2025 ml = initialmergedlines
2025 ml = initialmergedlines
2026 ml[id * linesperrev] += " r%i" % id
2026 ml[id * linesperrev] += " r%i" % id
2027 mergedtext = "\n".join(ml)
2027 mergedtext = "\n".join(ml)
2028 files.append(fn)
2028 files.append(fn)
2029 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
2029 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
2030
2030
2031 if overwritten_file:
2031 if overwritten_file:
2032 fn = "of"
2032 fn = "of"
2033 files.append(fn)
2033 files.append(fn)
2034 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2034 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2035
2035
2036 if new_file:
2036 if new_file:
2037 fn = "nf%i" % id
2037 fn = "nf%i" % id
2038 files.append(fn)
2038 files.append(fn)
2039 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2039 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2040 if len(ps) > 1:
2040 if len(ps) > 1:
2041 if not p2:
2041 if not p2:
2042 p2 = repo[ps[1]]
2042 p2 = repo[ps[1]]
2043 for fn in p2:
2043 for fn in p2:
2044 if fn.startswith("nf"):
2044 if fn.startswith("nf"):
2045 files.append(fn)
2045 files.append(fn)
2046 fctxs[fn] = p2[fn]
2046 fctxs[fn] = p2[fn]
2047
2047
2048 def fctxfn(repo, cx, path):
2048 def fctxfn(repo, cx, path):
2049 return fctxs.get(path)
2049 return fctxs.get(path)
2050
2050
2051 if len(ps) == 0 or ps[0] < 0:
2051 if len(ps) == 0 or ps[0] < 0:
2052 pars = [None, None]
2052 pars = [None, None]
2053 elif len(ps) == 1:
2053 elif len(ps) == 1:
2054 pars = [nodeids[ps[0]], None]
2054 pars = [nodeids[ps[0]], None]
2055 else:
2055 else:
2056 pars = [nodeids[p] for p in ps]
2056 pars = [nodeids[p] for p in ps]
2057 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2057 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2058 date=(id, 0),
2058 date=(id, 0),
2059 user="debugbuilddag",
2059 user="debugbuilddag",
2060 extra={'branch': atbranch})
2060 extra={'branch': atbranch})
2061 nodeid = repo.commitctx(cx)
2061 nodeid = repo.commitctx(cx)
2062 nodeids.append(nodeid)
2062 nodeids.append(nodeid)
2063 at = id
2063 at = id
2064 elif type == 'l':
2064 elif type == 'l':
2065 id, name = data
2065 id, name = data
2066 ui.note(('tag %s\n' % name))
2066 ui.note(('tag %s\n' % name))
2067 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2067 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2068 elif type == 'a':
2068 elif type == 'a':
2069 ui.note(('branch %s\n' % data))
2069 ui.note(('branch %s\n' % data))
2070 atbranch = data
2070 atbranch = data
2071 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2071 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2072 tr.close()
2072 tr.close()
2073
2073
2074 if tags:
2074 if tags:
2075 repo.vfs.write("localtags", "".join(tags))
2075 repo.vfs.write("localtags", "".join(tags))
2076 finally:
2076 finally:
2077 ui.progress(_('building'), None)
2077 ui.progress(_('building'), None)
2078 release(tr, lock, wlock)
2078 release(tr, lock, wlock)
2079
2079
2080 @command('debugbundle',
2080 @command('debugbundle',
2081 [('a', 'all', None, _('show all details')),
2081 [('a', 'all', None, _('show all details')),
2082 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2082 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2083 _('FILE'),
2083 _('FILE'),
2084 norepo=True)
2084 norepo=True)
2085 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2085 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2086 """lists the contents of a bundle"""
2086 """lists the contents of a bundle"""
2087 with hg.openpath(ui, bundlepath) as f:
2087 with hg.openpath(ui, bundlepath) as f:
2088 if spec:
2088 if spec:
2089 spec = exchange.getbundlespec(ui, f)
2089 spec = exchange.getbundlespec(ui, f)
2090 ui.write('%s\n' % spec)
2090 ui.write('%s\n' % spec)
2091 return
2091 return
2092
2092
2093 gen = exchange.readbundle(ui, f, bundlepath)
2093 gen = exchange.readbundle(ui, f, bundlepath)
2094 if isinstance(gen, bundle2.unbundle20):
2094 if isinstance(gen, bundle2.unbundle20):
2095 return _debugbundle2(ui, gen, all=all, **opts)
2095 return _debugbundle2(ui, gen, all=all, **opts)
2096 _debugchangegroup(ui, gen, all=all, **opts)
2096 _debugchangegroup(ui, gen, all=all, **opts)
2097
2097
2098 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2098 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2099 indent_string = ' ' * indent
2099 indent_string = ' ' * indent
2100 if all:
2100 if all:
2101 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
2101 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
2102 % indent_string)
2102 % indent_string)
2103
2103
2104 def showchunks(named):
2104 def showchunks(named):
2105 ui.write("\n%s%s\n" % (indent_string, named))
2105 ui.write("\n%s%s\n" % (indent_string, named))
2106 chain = None
2106 chain = None
2107 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2107 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2108 node = chunkdata['node']
2108 node = chunkdata['node']
2109 p1 = chunkdata['p1']
2109 p1 = chunkdata['p1']
2110 p2 = chunkdata['p2']
2110 p2 = chunkdata['p2']
2111 cs = chunkdata['cs']
2111 cs = chunkdata['cs']
2112 deltabase = chunkdata['deltabase']
2112 deltabase = chunkdata['deltabase']
2113 delta = chunkdata['delta']
2113 delta = chunkdata['delta']
2114 ui.write("%s%s %s %s %s %s %s\n" %
2114 ui.write("%s%s %s %s %s %s %s\n" %
2115 (indent_string, hex(node), hex(p1), hex(p2),
2115 (indent_string, hex(node), hex(p1), hex(p2),
2116 hex(cs), hex(deltabase), len(delta)))
2116 hex(cs), hex(deltabase), len(delta)))
2117 chain = node
2117 chain = node
2118
2118
2119 chunkdata = gen.changelogheader()
2119 chunkdata = gen.changelogheader()
2120 showchunks("changelog")
2120 showchunks("changelog")
2121 chunkdata = gen.manifestheader()
2121 chunkdata = gen.manifestheader()
2122 showchunks("manifest")
2122 showchunks("manifest")
2123 for chunkdata in iter(gen.filelogheader, {}):
2123 for chunkdata in iter(gen.filelogheader, {}):
2124 fname = chunkdata['filename']
2124 fname = chunkdata['filename']
2125 showchunks(fname)
2125 showchunks(fname)
2126 else:
2126 else:
2127 if isinstance(gen, bundle2.unbundle20):
2127 if isinstance(gen, bundle2.unbundle20):
2128 raise error.Abort(_('use debugbundle2 for this file'))
2128 raise error.Abort(_('use debugbundle2 for this file'))
2129 chunkdata = gen.changelogheader()
2129 chunkdata = gen.changelogheader()
2130 chain = None
2130 chain = None
2131 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2131 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2132 node = chunkdata['node']
2132 node = chunkdata['node']
2133 ui.write("%s%s\n" % (indent_string, hex(node)))
2133 ui.write("%s%s\n" % (indent_string, hex(node)))
2134 chain = node
2134 chain = node
2135
2135
2136 def _debugbundle2(ui, gen, all=None, **opts):
2136 def _debugbundle2(ui, gen, all=None, **opts):
2137 """lists the contents of a bundle2"""
2137 """lists the contents of a bundle2"""
2138 if not isinstance(gen, bundle2.unbundle20):
2138 if not isinstance(gen, bundle2.unbundle20):
2139 raise error.Abort(_('not a bundle2 file'))
2139 raise error.Abort(_('not a bundle2 file'))
2140 ui.write(('Stream params: %s\n' % repr(gen.params)))
2140 ui.write(('Stream params: %s\n' % repr(gen.params)))
2141 for part in gen.iterparts():
2141 for part in gen.iterparts():
2142 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2142 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2143 if part.type == 'changegroup':
2143 if part.type == 'changegroup':
2144 version = part.params.get('version', '01')
2144 version = part.params.get('version', '01')
2145 cg = changegroup.getunbundler(version, part, 'UN')
2145 cg = changegroup.getunbundler(version, part, 'UN')
2146 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2146 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2147
2147
2148 @command('debugcreatestreamclonebundle', [], 'FILE')
2148 @command('debugcreatestreamclonebundle', [], 'FILE')
2149 def debugcreatestreamclonebundle(ui, repo, fname):
2149 def debugcreatestreamclonebundle(ui, repo, fname):
2150 """create a stream clone bundle file
2150 """create a stream clone bundle file
2151
2151
2152 Stream bundles are special bundles that are essentially archives of
2152 Stream bundles are special bundles that are essentially archives of
2153 revlog files. They are commonly used for cloning very quickly.
2153 revlog files. They are commonly used for cloning very quickly.
2154 """
2154 """
2155 requirements, gen = streamclone.generatebundlev1(repo)
2155 requirements, gen = streamclone.generatebundlev1(repo)
2156 changegroup.writechunks(ui, gen, fname)
2156 changegroup.writechunks(ui, gen, fname)
2157
2157
2158 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2158 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2159
2159
2160 @command('debugapplystreamclonebundle', [], 'FILE')
2160 @command('debugapplystreamclonebundle', [], 'FILE')
2161 def debugapplystreamclonebundle(ui, repo, fname):
2161 def debugapplystreamclonebundle(ui, repo, fname):
2162 """apply a stream clone bundle file"""
2162 """apply a stream clone bundle file"""
2163 f = hg.openpath(ui, fname)
2163 f = hg.openpath(ui, fname)
2164 gen = exchange.readbundle(ui, f, fname)
2164 gen = exchange.readbundle(ui, f, fname)
2165 gen.apply(repo)
2165 gen.apply(repo)
2166
2166
2167 @command('debugcheckstate', [], '')
2167 @command('debugcheckstate', [], '')
2168 def debugcheckstate(ui, repo):
2168 def debugcheckstate(ui, repo):
2169 """validate the correctness of the current dirstate"""
2169 """validate the correctness of the current dirstate"""
2170 parent1, parent2 = repo.dirstate.parents()
2170 parent1, parent2 = repo.dirstate.parents()
2171 m1 = repo[parent1].manifest()
2171 m1 = repo[parent1].manifest()
2172 m2 = repo[parent2].manifest()
2172 m2 = repo[parent2].manifest()
2173 errors = 0
2173 errors = 0
2174 for f in repo.dirstate:
2174 for f in repo.dirstate:
2175 state = repo.dirstate[f]
2175 state = repo.dirstate[f]
2176 if state in "nr" and f not in m1:
2176 if state in "nr" and f not in m1:
2177 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2177 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2178 errors += 1
2178 errors += 1
2179 if state in "a" and f in m1:
2179 if state in "a" and f in m1:
2180 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2180 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2181 errors += 1
2181 errors += 1
2182 if state in "m" and f not in m1 and f not in m2:
2182 if state in "m" and f not in m1 and f not in m2:
2183 ui.warn(_("%s in state %s, but not in either manifest\n") %
2183 ui.warn(_("%s in state %s, but not in either manifest\n") %
2184 (f, state))
2184 (f, state))
2185 errors += 1
2185 errors += 1
2186 for f in m1:
2186 for f in m1:
2187 state = repo.dirstate[f]
2187 state = repo.dirstate[f]
2188 if state not in "nrm":
2188 if state not in "nrm":
2189 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2189 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2190 errors += 1
2190 errors += 1
2191 if errors:
2191 if errors:
2192 error = _(".hg/dirstate inconsistent with current parent's manifest")
2192 error = _(".hg/dirstate inconsistent with current parent's manifest")
2193 raise error.Abort(error)
2193 raise error.Abort(error)
2194
2194
2195 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2195 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2196 def debugcommands(ui, cmd='', *args):
2196 def debugcommands(ui, cmd='', *args):
2197 """list all available commands and options"""
2197 """list all available commands and options"""
2198 for cmd, vals in sorted(table.iteritems()):
2198 for cmd, vals in sorted(table.iteritems()):
2199 cmd = cmd.split('|')[0].strip('^')
2199 cmd = cmd.split('|')[0].strip('^')
2200 opts = ', '.join([i[1] for i in vals[1]])
2200 opts = ', '.join([i[1] for i in vals[1]])
2201 ui.write('%s: %s\n' % (cmd, opts))
2201 ui.write('%s: %s\n' % (cmd, opts))
2202
2202
2203 @command('debugcomplete',
2203 @command('debugcomplete',
2204 [('o', 'options', None, _('show the command options'))],
2204 [('o', 'options', None, _('show the command options'))],
2205 _('[-o] CMD'),
2205 _('[-o] CMD'),
2206 norepo=True)
2206 norepo=True)
2207 def debugcomplete(ui, cmd='', **opts):
2207 def debugcomplete(ui, cmd='', **opts):
2208 """returns the completion list associated with the given command"""
2208 """returns the completion list associated with the given command"""
2209
2209
2210 if opts.get('options'):
2210 if opts.get('options'):
2211 options = []
2211 options = []
2212 otables = [globalopts]
2212 otables = [globalopts]
2213 if cmd:
2213 if cmd:
2214 aliases, entry = cmdutil.findcmd(cmd, table, False)
2214 aliases, entry = cmdutil.findcmd(cmd, table, False)
2215 otables.append(entry[1])
2215 otables.append(entry[1])
2216 for t in otables:
2216 for t in otables:
2217 for o in t:
2217 for o in t:
2218 if "(DEPRECATED)" in o[3]:
2218 if "(DEPRECATED)" in o[3]:
2219 continue
2219 continue
2220 if o[0]:
2220 if o[0]:
2221 options.append('-%s' % o[0])
2221 options.append('-%s' % o[0])
2222 options.append('--%s' % o[1])
2222 options.append('--%s' % o[1])
2223 ui.write("%s\n" % "\n".join(options))
2223 ui.write("%s\n" % "\n".join(options))
2224 return
2224 return
2225
2225
2226 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2226 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2227 if ui.verbose:
2227 if ui.verbose:
2228 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2228 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2229 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2229 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2230
2230
2231 @command('debugdag',
2231 @command('debugdag',
2232 [('t', 'tags', None, _('use tags as labels')),
2232 [('t', 'tags', None, _('use tags as labels')),
2233 ('b', 'branches', None, _('annotate with branch names')),
2233 ('b', 'branches', None, _('annotate with branch names')),
2234 ('', 'dots', None, _('use dots for runs')),
2234 ('', 'dots', None, _('use dots for runs')),
2235 ('s', 'spaces', None, _('separate elements by spaces'))],
2235 ('s', 'spaces', None, _('separate elements by spaces'))],
2236 _('[OPTION]... [FILE [REV]...]'),
2236 _('[OPTION]... [FILE [REV]...]'),
2237 optionalrepo=True)
2237 optionalrepo=True)
2238 def debugdag(ui, repo, file_=None, *revs, **opts):
2238 def debugdag(ui, repo, file_=None, *revs, **opts):
2239 """format the changelog or an index DAG as a concise textual description
2239 """format the changelog or an index DAG as a concise textual description
2240
2240
2241 If you pass a revlog index, the revlog's DAG is emitted. If you list
2241 If you pass a revlog index, the revlog's DAG is emitted. If you list
2242 revision numbers, they get labeled in the output as rN.
2242 revision numbers, they get labeled in the output as rN.
2243
2243
2244 Otherwise, the changelog DAG of the current repo is emitted.
2244 Otherwise, the changelog DAG of the current repo is emitted.
2245 """
2245 """
2246 spaces = opts.get('spaces')
2246 spaces = opts.get('spaces')
2247 dots = opts.get('dots')
2247 dots = opts.get('dots')
2248 if file_:
2248 if file_:
2249 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2249 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2250 revs = set((int(r) for r in revs))
2250 revs = set((int(r) for r in revs))
2251 def events():
2251 def events():
2252 for r in rlog:
2252 for r in rlog:
2253 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2253 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2254 if p != -1))
2254 if p != -1))
2255 if r in revs:
2255 if r in revs:
2256 yield 'l', (r, "r%i" % r)
2256 yield 'l', (r, "r%i" % r)
2257 elif repo:
2257 elif repo:
2258 cl = repo.changelog
2258 cl = repo.changelog
2259 tags = opts.get('tags')
2259 tags = opts.get('tags')
2260 branches = opts.get('branches')
2260 branches = opts.get('branches')
2261 if tags:
2261 if tags:
2262 labels = {}
2262 labels = {}
2263 for l, n in repo.tags().items():
2263 for l, n in repo.tags().items():
2264 labels.setdefault(cl.rev(n), []).append(l)
2264 labels.setdefault(cl.rev(n), []).append(l)
2265 def events():
2265 def events():
2266 b = "default"
2266 b = "default"
2267 for r in cl:
2267 for r in cl:
2268 if branches:
2268 if branches:
2269 newb = cl.read(cl.node(r))[5]['branch']
2269 newb = cl.read(cl.node(r))[5]['branch']
2270 if newb != b:
2270 if newb != b:
2271 yield 'a', newb
2271 yield 'a', newb
2272 b = newb
2272 b = newb
2273 yield 'n', (r, list(p for p in cl.parentrevs(r)
2273 yield 'n', (r, list(p for p in cl.parentrevs(r)
2274 if p != -1))
2274 if p != -1))
2275 if tags:
2275 if tags:
2276 ls = labels.get(r)
2276 ls = labels.get(r)
2277 if ls:
2277 if ls:
2278 for l in ls:
2278 for l in ls:
2279 yield 'l', (r, l)
2279 yield 'l', (r, l)
2280 else:
2280 else:
2281 raise error.Abort(_('need repo for changelog dag'))
2281 raise error.Abort(_('need repo for changelog dag'))
2282
2282
2283 for line in dagparser.dagtextlines(events(),
2283 for line in dagparser.dagtextlines(events(),
2284 addspaces=spaces,
2284 addspaces=spaces,
2285 wraplabels=True,
2285 wraplabels=True,
2286 wrapannotations=True,
2286 wrapannotations=True,
2287 wrapnonlinear=dots,
2287 wrapnonlinear=dots,
2288 usedots=dots,
2288 usedots=dots,
2289 maxlinewidth=70):
2289 maxlinewidth=70):
2290 ui.write(line)
2290 ui.write(line)
2291 ui.write("\n")
2291 ui.write("\n")
2292
2292
2293 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2293 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2294 def debugdata(ui, repo, file_, rev=None, **opts):
2294 def debugdata(ui, repo, file_, rev=None, **opts):
2295 """dump the contents of a data file revision"""
2295 """dump the contents of a data file revision"""
2296 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
2296 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
2297 if rev is not None:
2297 if rev is not None:
2298 raise error.CommandError('debugdata', _('invalid arguments'))
2298 raise error.CommandError('debugdata', _('invalid arguments'))
2299 file_, rev = None, file_
2299 file_, rev = None, file_
2300 elif rev is None:
2300 elif rev is None:
2301 raise error.CommandError('debugdata', _('invalid arguments'))
2301 raise error.CommandError('debugdata', _('invalid arguments'))
2302 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2302 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2303 try:
2303 try:
2304 ui.write(r.revision(r.lookup(rev)))
2304 ui.write(r.revision(r.lookup(rev)))
2305 except KeyError:
2305 except KeyError:
2306 raise error.Abort(_('invalid revision identifier %s') % rev)
2306 raise error.Abort(_('invalid revision identifier %s') % rev)
2307
2307
2308 @command('debugdate',
2308 @command('debugdate',
2309 [('e', 'extended', None, _('try extended date formats'))],
2309 [('e', 'extended', None, _('try extended date formats'))],
2310 _('[-e] DATE [RANGE]'),
2310 _('[-e] DATE [RANGE]'),
2311 norepo=True, optionalrepo=True)
2311 norepo=True, optionalrepo=True)
2312 def debugdate(ui, date, range=None, **opts):
2312 def debugdate(ui, date, range=None, **opts):
2313 """parse and display a date"""
2313 """parse and display a date"""
2314 if opts["extended"]:
2314 if opts["extended"]:
2315 d = util.parsedate(date, util.extendeddateformats)
2315 d = util.parsedate(date, util.extendeddateformats)
2316 else:
2316 else:
2317 d = util.parsedate(date)
2317 d = util.parsedate(date)
2318 ui.write(("internal: %s %s\n") % d)
2318 ui.write(("internal: %s %s\n") % d)
2319 ui.write(("standard: %s\n") % util.datestr(d))
2319 ui.write(("standard: %s\n") % util.datestr(d))
2320 if range:
2320 if range:
2321 m = util.matchdate(range)
2321 m = util.matchdate(range)
2322 ui.write(("match: %s\n") % m(d[0]))
2322 ui.write(("match: %s\n") % m(d[0]))
2323
2323
2324 @command('debugdiscovery',
2324 @command('debugdiscovery',
2325 [('', 'old', None, _('use old-style discovery')),
2325 [('', 'old', None, _('use old-style discovery')),
2326 ('', 'nonheads', None,
2326 ('', 'nonheads', None,
2327 _('use old-style discovery with non-heads included')),
2327 _('use old-style discovery with non-heads included')),
2328 ] + remoteopts,
2328 ] + remoteopts,
2329 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2329 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2330 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2330 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2331 """runs the changeset discovery protocol in isolation"""
2331 """runs the changeset discovery protocol in isolation"""
2332 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2332 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2333 opts.get('branch'))
2333 opts.get('branch'))
2334 remote = hg.peer(repo, opts, remoteurl)
2334 remote = hg.peer(repo, opts, remoteurl)
2335 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2335 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2336
2336
2337 # make sure tests are repeatable
2337 # make sure tests are repeatable
2338 random.seed(12323)
2338 random.seed(12323)
2339
2339
2340 def doit(localheads, remoteheads, remote=remote):
2340 def doit(localheads, remoteheads, remote=remote):
2341 if opts.get('old'):
2341 if opts.get('old'):
2342 if localheads:
2342 if localheads:
2343 raise error.Abort('cannot use localheads with old style '
2343 raise error.Abort('cannot use localheads with old style '
2344 'discovery')
2344 'discovery')
2345 if not util.safehasattr(remote, 'branches'):
2345 if not util.safehasattr(remote, 'branches'):
2346 # enable in-client legacy support
2346 # enable in-client legacy support
2347 remote = localrepo.locallegacypeer(remote.local())
2347 remote = localrepo.locallegacypeer(remote.local())
2348 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2348 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2349 force=True)
2349 force=True)
2350 common = set(common)
2350 common = set(common)
2351 if not opts.get('nonheads'):
2351 if not opts.get('nonheads'):
2352 ui.write(("unpruned common: %s\n") %
2352 ui.write(("unpruned common: %s\n") %
2353 " ".join(sorted(short(n) for n in common)))
2353 " ".join(sorted(short(n) for n in common)))
2354 dag = dagutil.revlogdag(repo.changelog)
2354 dag = dagutil.revlogdag(repo.changelog)
2355 all = dag.ancestorset(dag.internalizeall(common))
2355 all = dag.ancestorset(dag.internalizeall(common))
2356 common = dag.externalizeall(dag.headsetofconnecteds(all))
2356 common = dag.externalizeall(dag.headsetofconnecteds(all))
2357 else:
2357 else:
2358 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2358 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2359 common = set(common)
2359 common = set(common)
2360 rheads = set(hds)
2360 rheads = set(hds)
2361 lheads = set(repo.heads())
2361 lheads = set(repo.heads())
2362 ui.write(("common heads: %s\n") %
2362 ui.write(("common heads: %s\n") %
2363 " ".join(sorted(short(n) for n in common)))
2363 " ".join(sorted(short(n) for n in common)))
2364 if lheads <= common:
2364 if lheads <= common:
2365 ui.write(("local is subset\n"))
2365 ui.write(("local is subset\n"))
2366 elif rheads <= common:
2366 elif rheads <= common:
2367 ui.write(("remote is subset\n"))
2367 ui.write(("remote is subset\n"))
2368
2368
2369 serverlogs = opts.get('serverlog')
2369 serverlogs = opts.get('serverlog')
2370 if serverlogs:
2370 if serverlogs:
2371 for filename in serverlogs:
2371 for filename in serverlogs:
2372 with open(filename, 'r') as logfile:
2372 with open(filename, 'r') as logfile:
2373 line = logfile.readline()
2373 line = logfile.readline()
2374 while line:
2374 while line:
2375 parts = line.strip().split(';')
2375 parts = line.strip().split(';')
2376 op = parts[1]
2376 op = parts[1]
2377 if op == 'cg':
2377 if op == 'cg':
2378 pass
2378 pass
2379 elif op == 'cgss':
2379 elif op == 'cgss':
2380 doit(parts[2].split(' '), parts[3].split(' '))
2380 doit(parts[2].split(' '), parts[3].split(' '))
2381 elif op == 'unb':
2381 elif op == 'unb':
2382 doit(parts[3].split(' '), parts[2].split(' '))
2382 doit(parts[3].split(' '), parts[2].split(' '))
2383 line = logfile.readline()
2383 line = logfile.readline()
2384 else:
2384 else:
2385 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2385 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2386 opts.get('remote_head'))
2386 opts.get('remote_head'))
2387 localrevs = opts.get('local_head')
2387 localrevs = opts.get('local_head')
2388 doit(localrevs, remoterevs)
2388 doit(localrevs, remoterevs)
2389
2389
2390 @command('debugextensions', formatteropts, [], norepo=True)
2390 @command('debugextensions', formatteropts, [], norepo=True)
2391 def debugextensions(ui, **opts):
2391 def debugextensions(ui, **opts):
2392 '''show information about active extensions'''
2392 '''show information about active extensions'''
2393 exts = extensions.extensions(ui)
2393 exts = extensions.extensions(ui)
2394 hgver = util.version()
2394 hgver = util.version()
2395 fm = ui.formatter('debugextensions', opts)
2395 fm = ui.formatter('debugextensions', opts)
2396 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2396 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2397 isinternal = extensions.ismoduleinternal(extmod)
2397 isinternal = extensions.ismoduleinternal(extmod)
2398 extsource = extmod.__file__
2398 extsource = extmod.__file__
2399 if isinternal:
2399 if isinternal:
2400 exttestedwith = [] # never expose magic string to users
2400 exttestedwith = [] # never expose magic string to users
2401 else:
2401 else:
2402 exttestedwith = getattr(extmod, 'testedwith', '').split()
2402 exttestedwith = getattr(extmod, 'testedwith', '').split()
2403 extbuglink = getattr(extmod, 'buglink', None)
2403 extbuglink = getattr(extmod, 'buglink', None)
2404
2404
2405 fm.startitem()
2405 fm.startitem()
2406
2406
2407 if ui.quiet or ui.verbose:
2407 if ui.quiet or ui.verbose:
2408 fm.write('name', '%s\n', extname)
2408 fm.write('name', '%s\n', extname)
2409 else:
2409 else:
2410 fm.write('name', '%s', extname)
2410 fm.write('name', '%s', extname)
2411 if isinternal or hgver in exttestedwith:
2411 if isinternal or hgver in exttestedwith:
2412 fm.plain('\n')
2412 fm.plain('\n')
2413 elif not exttestedwith:
2413 elif not exttestedwith:
2414 fm.plain(_(' (untested!)\n'))
2414 fm.plain(_(' (untested!)\n'))
2415 else:
2415 else:
2416 lasttestedversion = exttestedwith[-1]
2416 lasttestedversion = exttestedwith[-1]
2417 fm.plain(' (%s!)\n' % lasttestedversion)
2417 fm.plain(' (%s!)\n' % lasttestedversion)
2418
2418
2419 fm.condwrite(ui.verbose and extsource, 'source',
2419 fm.condwrite(ui.verbose and extsource, 'source',
2420 _(' location: %s\n'), extsource or "")
2420 _(' location: %s\n'), extsource or "")
2421
2421
2422 if ui.verbose:
2422 if ui.verbose:
2423 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2423 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2424 fm.data(bundled=isinternal)
2424 fm.data(bundled=isinternal)
2425
2425
2426 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2426 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2427 _(' tested with: %s\n'),
2427 _(' tested with: %s\n'),
2428 fm.formatlist(exttestedwith, name='ver'))
2428 fm.formatlist(exttestedwith, name='ver'))
2429
2429
2430 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2430 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2431 _(' bug reporting: %s\n'), extbuglink or "")
2431 _(' bug reporting: %s\n'), extbuglink or "")
2432
2432
2433 fm.end()
2433 fm.end()
2434
2434
2435 @command('debugfileset',
2435 @command('debugfileset',
2436 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2436 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2437 _('[-r REV] FILESPEC'))
2437 _('[-r REV] FILESPEC'))
2438 def debugfileset(ui, repo, expr, **opts):
2438 def debugfileset(ui, repo, expr, **opts):
2439 '''parse and apply a fileset specification'''
2439 '''parse and apply a fileset specification'''
2440 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2440 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2441 if ui.verbose:
2441 if ui.verbose:
2442 tree = fileset.parse(expr)
2442 tree = fileset.parse(expr)
2443 ui.note(fileset.prettyformat(tree), "\n")
2443 ui.note(fileset.prettyformat(tree), "\n")
2444
2444
2445 for f in ctx.getfileset(expr):
2445 for f in ctx.getfileset(expr):
2446 ui.write("%s\n" % f)
2446 ui.write("%s\n" % f)
2447
2447
2448 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2448 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2449 def debugfsinfo(ui, path="."):
2449 def debugfsinfo(ui, path="."):
2450 """show information detected about current filesystem"""
2450 """show information detected about current filesystem"""
2451 util.writefile('.debugfsinfo', '')
2451 util.writefile('.debugfsinfo', '')
2452 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2452 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2453 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2453 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2454 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2454 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2455 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2455 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2456 and 'yes' or 'no'))
2456 and 'yes' or 'no'))
2457 os.unlink('.debugfsinfo')
2457 os.unlink('.debugfsinfo')
2458
2458
2459 @command('debuggetbundle',
2459 @command('debuggetbundle',
2460 [('H', 'head', [], _('id of head node'), _('ID')),
2460 [('H', 'head', [], _('id of head node'), _('ID')),
2461 ('C', 'common', [], _('id of common node'), _('ID')),
2461 ('C', 'common', [], _('id of common node'), _('ID')),
2462 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2462 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2463 _('REPO FILE [-H|-C ID]...'),
2463 _('REPO FILE [-H|-C ID]...'),
2464 norepo=True)
2464 norepo=True)
2465 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2465 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2466 """retrieves a bundle from a repo
2466 """retrieves a bundle from a repo
2467
2467
2468 Every ID must be a full-length hex node id string. Saves the bundle to the
2468 Every ID must be a full-length hex node id string. Saves the bundle to the
2469 given file.
2469 given file.
2470 """
2470 """
2471 repo = hg.peer(ui, opts, repopath)
2471 repo = hg.peer(ui, opts, repopath)
2472 if not repo.capable('getbundle'):
2472 if not repo.capable('getbundle'):
2473 raise error.Abort("getbundle() not supported by target repository")
2473 raise error.Abort("getbundle() not supported by target repository")
2474 args = {}
2474 args = {}
2475 if common:
2475 if common:
2476 args['common'] = [bin(s) for s in common]
2476 args['common'] = [bin(s) for s in common]
2477 if head:
2477 if head:
2478 args['heads'] = [bin(s) for s in head]
2478 args['heads'] = [bin(s) for s in head]
2479 # TODO: get desired bundlecaps from command line.
2479 # TODO: get desired bundlecaps from command line.
2480 args['bundlecaps'] = None
2480 args['bundlecaps'] = None
2481 bundle = repo.getbundle('debug', **args)
2481 bundle = repo.getbundle('debug', **args)
2482
2482
2483 bundletype = opts.get('type', 'bzip2').lower()
2483 bundletype = opts.get('type', 'bzip2').lower()
2484 btypes = {'none': 'HG10UN',
2484 btypes = {'none': 'HG10UN',
2485 'bzip2': 'HG10BZ',
2485 'bzip2': 'HG10BZ',
2486 'gzip': 'HG10GZ',
2486 'gzip': 'HG10GZ',
2487 'bundle2': 'HG20'}
2487 'bundle2': 'HG20'}
2488 bundletype = btypes.get(bundletype)
2488 bundletype = btypes.get(bundletype)
2489 if bundletype not in bundle2.bundletypes:
2489 if bundletype not in bundle2.bundletypes:
2490 raise error.Abort(_('unknown bundle type specified with --type'))
2490 raise error.Abort(_('unknown bundle type specified with --type'))
2491 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2491 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2492
2492
2493 @command('debugignore', [], '[FILE]')
2493 @command('debugignore', [], '[FILE]')
2494 def debugignore(ui, repo, *files, **opts):
2494 def debugignore(ui, repo, *files, **opts):
2495 """display the combined ignore pattern and information about ignored files
2495 """display the combined ignore pattern and information about ignored files
2496
2496
2497 With no argument display the combined ignore pattern.
2497 With no argument display the combined ignore pattern.
2498
2498
2499 Given space separated file names, shows if the given file is ignored and
2499 Given space separated file names, shows if the given file is ignored and
2500 if so, show the ignore rule (file and line number) that matched it.
2500 if so, show the ignore rule (file and line number) that matched it.
2501 """
2501 """
2502 ignore = repo.dirstate._ignore
2502 ignore = repo.dirstate._ignore
2503 if not files:
2503 if not files:
2504 # Show all the patterns
2504 # Show all the patterns
2505 includepat = getattr(ignore, 'includepat', None)
2505 includepat = getattr(ignore, 'includepat', None)
2506 if includepat is not None:
2506 if includepat is not None:
2507 ui.write("%s\n" % includepat)
2507 ui.write("%s\n" % includepat)
2508 else:
2508 else:
2509 raise error.Abort(_("no ignore patterns found"))
2509 raise error.Abort(_("no ignore patterns found"))
2510 else:
2510 else:
2511 for f in files:
2511 for f in files:
2512 nf = util.normpath(f)
2512 nf = util.normpath(f)
2513 ignored = None
2513 ignored = None
2514 ignoredata = None
2514 ignoredata = None
2515 if nf != '.':
2515 if nf != '.':
2516 if ignore(nf):
2516 if ignore(nf):
2517 ignored = nf
2517 ignored = nf
2518 ignoredata = repo.dirstate._ignorefileandline(nf)
2518 ignoredata = repo.dirstate._ignorefileandline(nf)
2519 else:
2519 else:
2520 for p in util.finddirs(nf):
2520 for p in util.finddirs(nf):
2521 if ignore(p):
2521 if ignore(p):
2522 ignored = p
2522 ignored = p
2523 ignoredata = repo.dirstate._ignorefileandline(p)
2523 ignoredata = repo.dirstate._ignorefileandline(p)
2524 break
2524 break
2525 if ignored:
2525 if ignored:
2526 if ignored == nf:
2526 if ignored == nf:
2527 ui.write(_("%s is ignored\n") % f)
2527 ui.write(_("%s is ignored\n") % f)
2528 else:
2528 else:
2529 ui.write(_("%s is ignored because of "
2529 ui.write(_("%s is ignored because of "
2530 "containing folder %s\n")
2530 "containing folder %s\n")
2531 % (f, ignored))
2531 % (f, ignored))
2532 ignorefile, lineno, line = ignoredata
2532 ignorefile, lineno, line = ignoredata
2533 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2533 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2534 % (ignorefile, lineno, line))
2534 % (ignorefile, lineno, line))
2535 else:
2535 else:
2536 ui.write(_("%s is not ignored\n") % f)
2536 ui.write(_("%s is not ignored\n") % f)
2537
2537
2538 @command('debugindex', debugrevlogopts +
2538 @command('debugindex', debugrevlogopts +
2539 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2539 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2540 _('[-f FORMAT] -c|-m|FILE'),
2540 _('[-f FORMAT] -c|-m|FILE'),
2541 optionalrepo=True)
2541 optionalrepo=True)
2542 def debugindex(ui, repo, file_=None, **opts):
2542 def debugindex(ui, repo, file_=None, **opts):
2543 """dump the contents of an index file"""
2543 """dump the contents of an index file"""
2544 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2544 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2545 format = opts.get('format', 0)
2545 format = opts.get('format', 0)
2546 if format not in (0, 1):
2546 if format not in (0, 1):
2547 raise error.Abort(_("unknown format %d") % format)
2547 raise error.Abort(_("unknown format %d") % format)
2548
2548
2549 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2549 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2550 if generaldelta:
2550 if generaldelta:
2551 basehdr = ' delta'
2551 basehdr = ' delta'
2552 else:
2552 else:
2553 basehdr = ' base'
2553 basehdr = ' base'
2554
2554
2555 if ui.debugflag:
2555 if ui.debugflag:
2556 shortfn = hex
2556 shortfn = hex
2557 else:
2557 else:
2558 shortfn = short
2558 shortfn = short
2559
2559
2560 # There might not be anything in r, so have a sane default
2560 # There might not be anything in r, so have a sane default
2561 idlen = 12
2561 idlen = 12
2562 for i in r:
2562 for i in r:
2563 idlen = len(shortfn(r.node(i)))
2563 idlen = len(shortfn(r.node(i)))
2564 break
2564 break
2565
2565
2566 if format == 0:
2566 if format == 0:
2567 ui.write((" rev offset length " + basehdr + " linkrev"
2567 ui.write((" rev offset length " + basehdr + " linkrev"
2568 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2568 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2569 elif format == 1:
2569 elif format == 1:
2570 ui.write((" rev flag offset length"
2570 ui.write((" rev flag offset length"
2571 " size " + basehdr + " link p1 p2"
2571 " size " + basehdr + " link p1 p2"
2572 " %s\n") % "nodeid".rjust(idlen))
2572 " %s\n") % "nodeid".rjust(idlen))
2573
2573
2574 for i in r:
2574 for i in r:
2575 node = r.node(i)
2575 node = r.node(i)
2576 if generaldelta:
2576 if generaldelta:
2577 base = r.deltaparent(i)
2577 base = r.deltaparent(i)
2578 else:
2578 else:
2579 base = r.chainbase(i)
2579 base = r.chainbase(i)
2580 if format == 0:
2580 if format == 0:
2581 try:
2581 try:
2582 pp = r.parents(node)
2582 pp = r.parents(node)
2583 except Exception:
2583 except Exception:
2584 pp = [nullid, nullid]
2584 pp = [nullid, nullid]
2585 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2585 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2586 i, r.start(i), r.length(i), base, r.linkrev(i),
2586 i, r.start(i), r.length(i), base, r.linkrev(i),
2587 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2587 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2588 elif format == 1:
2588 elif format == 1:
2589 pr = r.parentrevs(i)
2589 pr = r.parentrevs(i)
2590 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2590 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2591 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2591 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2592 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2592 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2593
2593
2594 @command('debugindexdot', debugrevlogopts,
2594 @command('debugindexdot', debugrevlogopts,
2595 _('-c|-m|FILE'), optionalrepo=True)
2595 _('-c|-m|FILE'), optionalrepo=True)
2596 def debugindexdot(ui, repo, file_=None, **opts):
2596 def debugindexdot(ui, repo, file_=None, **opts):
2597 """dump an index DAG as a graphviz dot file"""
2597 """dump an index DAG as a graphviz dot file"""
2598 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2598 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2599 ui.write(("digraph G {\n"))
2599 ui.write(("digraph G {\n"))
2600 for i in r:
2600 for i in r:
2601 node = r.node(i)
2601 node = r.node(i)
2602 pp = r.parents(node)
2602 pp = r.parents(node)
2603 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2603 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2604 if pp[1] != nullid:
2604 if pp[1] != nullid:
2605 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2605 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2606 ui.write("}\n")
2606 ui.write("}\n")
2607
2607
2608 @command('debugdeltachain',
2608 @command('debugdeltachain',
2609 debugrevlogopts + formatteropts,
2609 debugrevlogopts + formatteropts,
2610 _('-c|-m|FILE'),
2610 _('-c|-m|FILE'),
2611 optionalrepo=True)
2611 optionalrepo=True)
2612 def debugdeltachain(ui, repo, file_=None, **opts):
2612 def debugdeltachain(ui, repo, file_=None, **opts):
2613 """dump information about delta chains in a revlog
2613 """dump information about delta chains in a revlog
2614
2614
2615 Output can be templatized. Available template keywords are:
2615 Output can be templatized. Available template keywords are:
2616
2616
2617 :``rev``: revision number
2617 :``rev``: revision number
2618 :``chainid``: delta chain identifier (numbered by unique base)
2618 :``chainid``: delta chain identifier (numbered by unique base)
2619 :``chainlen``: delta chain length to this revision
2619 :``chainlen``: delta chain length to this revision
2620 :``prevrev``: previous revision in delta chain
2620 :``prevrev``: previous revision in delta chain
2621 :``deltatype``: role of delta / how it was computed
2621 :``deltatype``: role of delta / how it was computed
2622 :``compsize``: compressed size of revision
2622 :``compsize``: compressed size of revision
2623 :``uncompsize``: uncompressed size of revision
2623 :``uncompsize``: uncompressed size of revision
2624 :``chainsize``: total size of compressed revisions in chain
2624 :``chainsize``: total size of compressed revisions in chain
2625 :``chainratio``: total chain size divided by uncompressed revision size
2625 :``chainratio``: total chain size divided by uncompressed revision size
2626 (new delta chains typically start at ratio 2.00)
2626 (new delta chains typically start at ratio 2.00)
2627 :``lindist``: linear distance from base revision in delta chain to end
2627 :``lindist``: linear distance from base revision in delta chain to end
2628 of this revision
2628 of this revision
2629 :``extradist``: total size of revisions not part of this delta chain from
2629 :``extradist``: total size of revisions not part of this delta chain from
2630 base of delta chain to end of this revision; a measurement
2630 base of delta chain to end of this revision; a measurement
2631 of how much extra data we need to read/seek across to read
2631 of how much extra data we need to read/seek across to read
2632 the delta chain for this revision
2632 the delta chain for this revision
2633 :``extraratio``: extradist divided by chainsize; another representation of
2633 :``extraratio``: extradist divided by chainsize; another representation of
2634 how much unrelated data is needed to load this delta chain
2634 how much unrelated data is needed to load this delta chain
2635 """
2635 """
2636 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2636 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2637 index = r.index
2637 index = r.index
2638 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2638 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2639
2639
2640 def revinfo(rev):
2640 def revinfo(rev):
2641 e = index[rev]
2641 e = index[rev]
2642 compsize = e[1]
2642 compsize = e[1]
2643 uncompsize = e[2]
2643 uncompsize = e[2]
2644 chainsize = 0
2644 chainsize = 0
2645
2645
2646 if generaldelta:
2646 if generaldelta:
2647 if e[3] == e[5]:
2647 if e[3] == e[5]:
2648 deltatype = 'p1'
2648 deltatype = 'p1'
2649 elif e[3] == e[6]:
2649 elif e[3] == e[6]:
2650 deltatype = 'p2'
2650 deltatype = 'p2'
2651 elif e[3] == rev - 1:
2651 elif e[3] == rev - 1:
2652 deltatype = 'prev'
2652 deltatype = 'prev'
2653 elif e[3] == rev:
2653 elif e[3] == rev:
2654 deltatype = 'base'
2654 deltatype = 'base'
2655 else:
2655 else:
2656 deltatype = 'other'
2656 deltatype = 'other'
2657 else:
2657 else:
2658 if e[3] == rev:
2658 if e[3] == rev:
2659 deltatype = 'base'
2659 deltatype = 'base'
2660 else:
2660 else:
2661 deltatype = 'prev'
2661 deltatype = 'prev'
2662
2662
2663 chain = r._deltachain(rev)[0]
2663 chain = r._deltachain(rev)[0]
2664 for iterrev in chain:
2664 for iterrev in chain:
2665 e = index[iterrev]
2665 e = index[iterrev]
2666 chainsize += e[1]
2666 chainsize += e[1]
2667
2667
2668 return compsize, uncompsize, deltatype, chain, chainsize
2668 return compsize, uncompsize, deltatype, chain, chainsize
2669
2669
2670 fm = ui.formatter('debugdeltachain', opts)
2670 fm = ui.formatter('debugdeltachain', opts)
2671
2671
2672 fm.plain(' rev chain# chainlen prev delta '
2672 fm.plain(' rev chain# chainlen prev delta '
2673 'size rawsize chainsize ratio lindist extradist '
2673 'size rawsize chainsize ratio lindist extradist '
2674 'extraratio\n')
2674 'extraratio\n')
2675
2675
2676 chainbases = {}
2676 chainbases = {}
2677 for rev in r:
2677 for rev in r:
2678 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2678 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2679 chainbase = chain[0]
2679 chainbase = chain[0]
2680 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2680 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2681 basestart = r.start(chainbase)
2681 basestart = r.start(chainbase)
2682 revstart = r.start(rev)
2682 revstart = r.start(rev)
2683 lineardist = revstart + comp - basestart
2683 lineardist = revstart + comp - basestart
2684 extradist = lineardist - chainsize
2684 extradist = lineardist - chainsize
2685 try:
2685 try:
2686 prevrev = chain[-2]
2686 prevrev = chain[-2]
2687 except IndexError:
2687 except IndexError:
2688 prevrev = -1
2688 prevrev = -1
2689
2689
2690 chainratio = float(chainsize) / float(uncomp)
2690 chainratio = float(chainsize) / float(uncomp)
2691 extraratio = float(extradist) / float(chainsize)
2691 extraratio = float(extradist) / float(chainsize)
2692
2692
2693 fm.startitem()
2693 fm.startitem()
2694 fm.write('rev chainid chainlen prevrev deltatype compsize '
2694 fm.write('rev chainid chainlen prevrev deltatype compsize '
2695 'uncompsize chainsize chainratio lindist extradist '
2695 'uncompsize chainsize chainratio lindist extradist '
2696 'extraratio',
2696 'extraratio',
2697 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2697 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2698 rev, chainid, len(chain), prevrev, deltatype, comp,
2698 rev, chainid, len(chain), prevrev, deltatype, comp,
2699 uncomp, chainsize, chainratio, lineardist, extradist,
2699 uncomp, chainsize, chainratio, lineardist, extradist,
2700 extraratio,
2700 extraratio,
2701 rev=rev, chainid=chainid, chainlen=len(chain),
2701 rev=rev, chainid=chainid, chainlen=len(chain),
2702 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2702 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2703 uncompsize=uncomp, chainsize=chainsize,
2703 uncompsize=uncomp, chainsize=chainsize,
2704 chainratio=chainratio, lindist=lineardist,
2704 chainratio=chainratio, lindist=lineardist,
2705 extradist=extradist, extraratio=extraratio)
2705 extradist=extradist, extraratio=extraratio)
2706
2706
2707 fm.end()
2707 fm.end()
2708
2708
2709 @command('debuginstall', [] + formatteropts, '', norepo=True)
2709 @command('debuginstall', [] + formatteropts, '', norepo=True)
2710 def debuginstall(ui, **opts):
2710 def debuginstall(ui, **opts):
2711 '''test Mercurial installation
2711 '''test Mercurial installation
2712
2712
2713 Returns 0 on success.
2713 Returns 0 on success.
2714 '''
2714 '''
2715
2715
2716 def writetemp(contents):
2716 def writetemp(contents):
2717 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2717 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2718 f = os.fdopen(fd, "wb")
2718 f = os.fdopen(fd, "wb")
2719 f.write(contents)
2719 f.write(contents)
2720 f.close()
2720 f.close()
2721 return name
2721 return name
2722
2722
2723 problems = 0
2723 problems = 0
2724
2724
2725 fm = ui.formatter('debuginstall', opts)
2725 fm = ui.formatter('debuginstall', opts)
2726 fm.startitem()
2726 fm.startitem()
2727
2727
2728 # encoding
2728 # encoding
2729 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2729 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2730 err = None
2730 err = None
2731 try:
2731 try:
2732 encoding.fromlocal("test")
2732 encoding.fromlocal("test")
2733 except error.Abort as inst:
2733 except error.Abort as inst:
2734 err = inst
2734 err = inst
2735 problems += 1
2735 problems += 1
2736 fm.condwrite(err, 'encodingerror', _(" %s\n"
2736 fm.condwrite(err, 'encodingerror', _(" %s\n"
2737 " (check that your locale is properly set)\n"), err)
2737 " (check that your locale is properly set)\n"), err)
2738
2738
2739 # Python
2739 # Python
2740 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2740 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2741 sys.executable)
2741 sys.executable)
2742 fm.write('pythonver', _("checking Python version (%s)\n"),
2742 fm.write('pythonver', _("checking Python version (%s)\n"),
2743 ("%s.%s.%s" % sys.version_info[:3]))
2743 ("%s.%s.%s" % sys.version_info[:3]))
2744 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2744 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2745 os.path.dirname(os.__file__))
2745 os.path.dirname(os.__file__))
2746
2746
2747 # hg version
2747 # hg version
2748 hgver = util.version()
2748 hgver = util.version()
2749 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2749 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2750 hgver.split('+')[0])
2750 hgver.split('+')[0])
2751 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2751 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2752 '+'.join(hgver.split('+')[1:]))
2752 '+'.join(hgver.split('+')[1:]))
2753
2753
2754 # compiled modules
2754 # compiled modules
2755 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2755 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2756 policy.policy)
2756 policy.policy)
2757 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2757 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2758 os.path.dirname(__file__))
2758 os.path.dirname(__file__))
2759
2759
2760 err = None
2760 err = None
2761 try:
2761 try:
2762 from . import (
2762 from . import (
2763 base85,
2763 base85,
2764 bdiff,
2764 bdiff,
2765 mpatch,
2765 mpatch,
2766 osutil,
2766 osutil,
2767 )
2767 )
2768 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2768 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2769 except Exception as inst:
2769 except Exception as inst:
2770 err = inst
2770 err = inst
2771 problems += 1
2771 problems += 1
2772 fm.condwrite(err, 'extensionserror', " %s\n", err)
2772 fm.condwrite(err, 'extensionserror', " %s\n", err)
2773
2773
2774 # templates
2774 # templates
2775 p = templater.templatepaths()
2775 p = templater.templatepaths()
2776 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2776 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2777 fm.condwrite(not p, '', _(" no template directories found\n"))
2777 fm.condwrite(not p, '', _(" no template directories found\n"))
2778 if p:
2778 if p:
2779 m = templater.templatepath("map-cmdline.default")
2779 m = templater.templatepath("map-cmdline.default")
2780 if m:
2780 if m:
2781 # template found, check if it is working
2781 # template found, check if it is working
2782 err = None
2782 err = None
2783 try:
2783 try:
2784 templater.templater.frommapfile(m)
2784 templater.templater.frommapfile(m)
2785 except Exception as inst:
2785 except Exception as inst:
2786 err = inst
2786 err = inst
2787 p = None
2787 p = None
2788 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2788 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2789 else:
2789 else:
2790 p = None
2790 p = None
2791 fm.condwrite(p, 'defaulttemplate',
2791 fm.condwrite(p, 'defaulttemplate',
2792 _("checking default template (%s)\n"), m)
2792 _("checking default template (%s)\n"), m)
2793 fm.condwrite(not m, 'defaulttemplatenotfound',
2793 fm.condwrite(not m, 'defaulttemplatenotfound',
2794 _(" template '%s' not found\n"), "default")
2794 _(" template '%s' not found\n"), "default")
2795 if not p:
2795 if not p:
2796 problems += 1
2796 problems += 1
2797 fm.condwrite(not p, '',
2797 fm.condwrite(not p, '',
2798 _(" (templates seem to have been installed incorrectly)\n"))
2798 _(" (templates seem to have been installed incorrectly)\n"))
2799
2799
2800 # editor
2800 # editor
2801 editor = ui.geteditor()
2801 editor = ui.geteditor()
2802 editor = util.expandpath(editor)
2802 editor = util.expandpath(editor)
2803 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2803 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2804 cmdpath = util.findexe(shlex.split(editor)[0])
2804 cmdpath = util.findexe(shlex.split(editor)[0])
2805 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2805 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2806 _(" No commit editor set and can't find %s in PATH\n"
2806 _(" No commit editor set and can't find %s in PATH\n"
2807 " (specify a commit editor in your configuration"
2807 " (specify a commit editor in your configuration"
2808 " file)\n"), not cmdpath and editor == 'vi' and editor)
2808 " file)\n"), not cmdpath and editor == 'vi' and editor)
2809 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2809 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2810 _(" Can't find editor '%s' in PATH\n"
2810 _(" Can't find editor '%s' in PATH\n"
2811 " (specify a commit editor in your configuration"
2811 " (specify a commit editor in your configuration"
2812 " file)\n"), not cmdpath and editor)
2812 " file)\n"), not cmdpath and editor)
2813 if not cmdpath and editor != 'vi':
2813 if not cmdpath and editor != 'vi':
2814 problems += 1
2814 problems += 1
2815
2815
2816 # check username
2816 # check username
2817 username = None
2817 username = None
2818 err = None
2818 err = None
2819 try:
2819 try:
2820 username = ui.username()
2820 username = ui.username()
2821 except error.Abort as e:
2821 except error.Abort as e:
2822 err = e
2822 err = e
2823 problems += 1
2823 problems += 1
2824
2824
2825 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2825 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2826 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2826 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2827 " (specify a username in your configuration file)\n"), err)
2827 " (specify a username in your configuration file)\n"), err)
2828
2828
2829 fm.condwrite(not problems, '',
2829 fm.condwrite(not problems, '',
2830 _("no problems detected\n"))
2830 _("no problems detected\n"))
2831 if not problems:
2831 if not problems:
2832 fm.data(problems=problems)
2832 fm.data(problems=problems)
2833 fm.condwrite(problems, 'problems',
2833 fm.condwrite(problems, 'problems',
2834 _("%s problems detected,"
2834 _("%s problems detected,"
2835 " please check your install!\n"), problems)
2835 " please check your install!\n"), problems)
2836 fm.end()
2836 fm.end()
2837
2837
2838 return problems
2838 return problems
2839
2839
2840 @command('debugknown', [], _('REPO ID...'), norepo=True)
2840 @command('debugknown', [], _('REPO ID...'), norepo=True)
2841 def debugknown(ui, repopath, *ids, **opts):
2841 def debugknown(ui, repopath, *ids, **opts):
2842 """test whether node ids are known to a repo
2842 """test whether node ids are known to a repo
2843
2843
2844 Every ID must be a full-length hex node id string. Returns a list of 0s
2844 Every ID must be a full-length hex node id string. Returns a list of 0s
2845 and 1s indicating unknown/known.
2845 and 1s indicating unknown/known.
2846 """
2846 """
2847 repo = hg.peer(ui, opts, repopath)
2847 repo = hg.peer(ui, opts, repopath)
2848 if not repo.capable('known'):
2848 if not repo.capable('known'):
2849 raise error.Abort("known() not supported by target repository")
2849 raise error.Abort("known() not supported by target repository")
2850 flags = repo.known([bin(s) for s in ids])
2850 flags = repo.known([bin(s) for s in ids])
2851 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2851 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2852
2852
2853 @command('debuglabelcomplete', [], _('LABEL...'))
2853 @command('debuglabelcomplete', [], _('LABEL...'))
2854 def debuglabelcomplete(ui, repo, *args):
2854 def debuglabelcomplete(ui, repo, *args):
2855 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2855 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2856 debugnamecomplete(ui, repo, *args)
2856 debugnamecomplete(ui, repo, *args)
2857
2857
2858 @command('debugmergestate', [], '')
2858 @command('debugmergestate', [], '')
2859 def debugmergestate(ui, repo, *args):
2859 def debugmergestate(ui, repo, *args):
2860 """print merge state
2860 """print merge state
2861
2861
2862 Use --verbose to print out information about whether v1 or v2 merge state
2862 Use --verbose to print out information about whether v1 or v2 merge state
2863 was chosen."""
2863 was chosen."""
2864 def _hashornull(h):
2864 def _hashornull(h):
2865 if h == nullhex:
2865 if h == nullhex:
2866 return 'null'
2866 return 'null'
2867 else:
2867 else:
2868 return h
2868 return h
2869
2869
2870 def printrecords(version):
2870 def printrecords(version):
2871 ui.write(('* version %s records\n') % version)
2871 ui.write(('* version %s records\n') % version)
2872 if version == 1:
2872 if version == 1:
2873 records = v1records
2873 records = v1records
2874 else:
2874 else:
2875 records = v2records
2875 records = v2records
2876
2876
2877 for rtype, record in records:
2877 for rtype, record in records:
2878 # pretty print some record types
2878 # pretty print some record types
2879 if rtype == 'L':
2879 if rtype == 'L':
2880 ui.write(('local: %s\n') % record)
2880 ui.write(('local: %s\n') % record)
2881 elif rtype == 'O':
2881 elif rtype == 'O':
2882 ui.write(('other: %s\n') % record)
2882 ui.write(('other: %s\n') % record)
2883 elif rtype == 'm':
2883 elif rtype == 'm':
2884 driver, mdstate = record.split('\0', 1)
2884 driver, mdstate = record.split('\0', 1)
2885 ui.write(('merge driver: %s (state "%s")\n')
2885 ui.write(('merge driver: %s (state "%s")\n')
2886 % (driver, mdstate))
2886 % (driver, mdstate))
2887 elif rtype in 'FDC':
2887 elif rtype in 'FDC':
2888 r = record.split('\0')
2888 r = record.split('\0')
2889 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2889 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2890 if version == 1:
2890 if version == 1:
2891 onode = 'not stored in v1 format'
2891 onode = 'not stored in v1 format'
2892 flags = r[7]
2892 flags = r[7]
2893 else:
2893 else:
2894 onode, flags = r[7:9]
2894 onode, flags = r[7:9]
2895 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2895 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2896 % (f, rtype, state, _hashornull(hash)))
2896 % (f, rtype, state, _hashornull(hash)))
2897 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2897 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2898 ui.write((' ancestor path: %s (node %s)\n')
2898 ui.write((' ancestor path: %s (node %s)\n')
2899 % (afile, _hashornull(anode)))
2899 % (afile, _hashornull(anode)))
2900 ui.write((' other path: %s (node %s)\n')
2900 ui.write((' other path: %s (node %s)\n')
2901 % (ofile, _hashornull(onode)))
2901 % (ofile, _hashornull(onode)))
2902 elif rtype == 'f':
2902 elif rtype == 'f':
2903 filename, rawextras = record.split('\0', 1)
2903 filename, rawextras = record.split('\0', 1)
2904 extras = rawextras.split('\0')
2904 extras = rawextras.split('\0')
2905 i = 0
2905 i = 0
2906 extrastrings = []
2906 extrastrings = []
2907 while i < len(extras):
2907 while i < len(extras):
2908 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2908 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2909 i += 2
2909 i += 2
2910
2910
2911 ui.write(('file extras: %s (%s)\n')
2911 ui.write(('file extras: %s (%s)\n')
2912 % (filename, ', '.join(extrastrings)))
2912 % (filename, ', '.join(extrastrings)))
2913 elif rtype == 'l':
2913 elif rtype == 'l':
2914 labels = record.split('\0', 2)
2914 labels = record.split('\0', 2)
2915 labels = [l for l in labels if len(l) > 0]
2915 labels = [l for l in labels if len(l) > 0]
2916 ui.write(('labels:\n'))
2916 ui.write(('labels:\n'))
2917 ui.write((' local: %s\n' % labels[0]))
2917 ui.write((' local: %s\n' % labels[0]))
2918 ui.write((' other: %s\n' % labels[1]))
2918 ui.write((' other: %s\n' % labels[1]))
2919 if len(labels) > 2:
2919 if len(labels) > 2:
2920 ui.write((' base: %s\n' % labels[2]))
2920 ui.write((' base: %s\n' % labels[2]))
2921 else:
2921 else:
2922 ui.write(('unrecognized entry: %s\t%s\n')
2922 ui.write(('unrecognized entry: %s\t%s\n')
2923 % (rtype, record.replace('\0', '\t')))
2923 % (rtype, record.replace('\0', '\t')))
2924
2924
2925 # Avoid mergestate.read() since it may raise an exception for unsupported
2925 # Avoid mergestate.read() since it may raise an exception for unsupported
2926 # merge state records. We shouldn't be doing this, but this is OK since this
2926 # merge state records. We shouldn't be doing this, but this is OK since this
2927 # command is pretty low-level.
2927 # command is pretty low-level.
2928 ms = mergemod.mergestate(repo)
2928 ms = mergemod.mergestate(repo)
2929
2929
2930 # sort so that reasonable information is on top
2930 # sort so that reasonable information is on top
2931 v1records = ms._readrecordsv1()
2931 v1records = ms._readrecordsv1()
2932 v2records = ms._readrecordsv2()
2932 v2records = ms._readrecordsv2()
2933 order = 'LOml'
2933 order = 'LOml'
2934 def key(r):
2934 def key(r):
2935 idx = order.find(r[0])
2935 idx = order.find(r[0])
2936 if idx == -1:
2936 if idx == -1:
2937 return (1, r[1])
2937 return (1, r[1])
2938 else:
2938 else:
2939 return (0, idx)
2939 return (0, idx)
2940 v1records.sort(key=key)
2940 v1records.sort(key=key)
2941 v2records.sort(key=key)
2941 v2records.sort(key=key)
2942
2942
2943 if not v1records and not v2records:
2943 if not v1records and not v2records:
2944 ui.write(('no merge state found\n'))
2944 ui.write(('no merge state found\n'))
2945 elif not v2records:
2945 elif not v2records:
2946 ui.note(('no version 2 merge state\n'))
2946 ui.note(('no version 2 merge state\n'))
2947 printrecords(1)
2947 printrecords(1)
2948 elif ms._v1v2match(v1records, v2records):
2948 elif ms._v1v2match(v1records, v2records):
2949 ui.note(('v1 and v2 states match: using v2\n'))
2949 ui.note(('v1 and v2 states match: using v2\n'))
2950 printrecords(2)
2950 printrecords(2)
2951 else:
2951 else:
2952 ui.note(('v1 and v2 states mismatch: using v1\n'))
2952 ui.note(('v1 and v2 states mismatch: using v1\n'))
2953 printrecords(1)
2953 printrecords(1)
2954 if ui.verbose:
2954 if ui.verbose:
2955 printrecords(2)
2955 printrecords(2)
2956
2956
2957 @command('debugnamecomplete', [], _('NAME...'))
2957 @command('debugnamecomplete', [], _('NAME...'))
2958 def debugnamecomplete(ui, repo, *args):
2958 def debugnamecomplete(ui, repo, *args):
2959 '''complete "names" - tags, open branch names, bookmark names'''
2959 '''complete "names" - tags, open branch names, bookmark names'''
2960
2960
2961 names = set()
2961 names = set()
2962 # since we previously only listed open branches, we will handle that
2962 # since we previously only listed open branches, we will handle that
2963 # specially (after this for loop)
2963 # specially (after this for loop)
2964 for name, ns in repo.names.iteritems():
2964 for name, ns in repo.names.iteritems():
2965 if name != 'branches':
2965 if name != 'branches':
2966 names.update(ns.listnames(repo))
2966 names.update(ns.listnames(repo))
2967 names.update(tag for (tag, heads, tip, closed)
2967 names.update(tag for (tag, heads, tip, closed)
2968 in repo.branchmap().iterbranches() if not closed)
2968 in repo.branchmap().iterbranches() if not closed)
2969 completions = set()
2969 completions = set()
2970 if not args:
2970 if not args:
2971 args = ['']
2971 args = ['']
2972 for a in args:
2972 for a in args:
2973 completions.update(n for n in names if n.startswith(a))
2973 completions.update(n for n in names if n.startswith(a))
2974 ui.write('\n'.join(sorted(completions)))
2974 ui.write('\n'.join(sorted(completions)))
2975 ui.write('\n')
2975 ui.write('\n')
2976
2976
2977 @command('debuglocks',
2977 @command('debuglocks',
2978 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2978 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2979 ('W', 'force-wlock', None,
2979 ('W', 'force-wlock', None,
2980 _('free the working state lock (DANGEROUS)'))],
2980 _('free the working state lock (DANGEROUS)'))],
2981 _('[OPTION]...'))
2981 _('[OPTION]...'))
2982 def debuglocks(ui, repo, **opts):
2982 def debuglocks(ui, repo, **opts):
2983 """show or modify state of locks
2983 """show or modify state of locks
2984
2984
2985 By default, this command will show which locks are held. This
2985 By default, this command will show which locks are held. This
2986 includes the user and process holding the lock, the amount of time
2986 includes the user and process holding the lock, the amount of time
2987 the lock has been held, and the machine name where the process is
2987 the lock has been held, and the machine name where the process is
2988 running if it's not local.
2988 running if it's not local.
2989
2989
2990 Locks protect the integrity of Mercurial's data, so should be
2990 Locks protect the integrity of Mercurial's data, so should be
2991 treated with care. System crashes or other interruptions may cause
2991 treated with care. System crashes or other interruptions may cause
2992 locks to not be properly released, though Mercurial will usually
2992 locks to not be properly released, though Mercurial will usually
2993 detect and remove such stale locks automatically.
2993 detect and remove such stale locks automatically.
2994
2994
2995 However, detecting stale locks may not always be possible (for
2995 However, detecting stale locks may not always be possible (for
2996 instance, on a shared filesystem). Removing locks may also be
2996 instance, on a shared filesystem). Removing locks may also be
2997 blocked by filesystem permissions.
2997 blocked by filesystem permissions.
2998
2998
2999 Returns 0 if no locks are held.
2999 Returns 0 if no locks are held.
3000
3000
3001 """
3001 """
3002
3002
3003 if opts.get('force_lock'):
3003 if opts.get('force_lock'):
3004 repo.svfs.unlink('lock')
3004 repo.svfs.unlink('lock')
3005 if opts.get('force_wlock'):
3005 if opts.get('force_wlock'):
3006 repo.vfs.unlink('wlock')
3006 repo.vfs.unlink('wlock')
3007 if opts.get('force_lock') or opts.get('force_lock'):
3007 if opts.get('force_lock') or opts.get('force_lock'):
3008 return 0
3008 return 0
3009
3009
3010 now = time.time()
3010 now = time.time()
3011 held = 0
3011 held = 0
3012
3012
3013 def report(vfs, name, method):
3013 def report(vfs, name, method):
3014 # this causes stale locks to get reaped for more accurate reporting
3014 # this causes stale locks to get reaped for more accurate reporting
3015 try:
3015 try:
3016 l = method(False)
3016 l = method(False)
3017 except error.LockHeld:
3017 except error.LockHeld:
3018 l = None
3018 l = None
3019
3019
3020 if l:
3020 if l:
3021 l.release()
3021 l.release()
3022 else:
3022 else:
3023 try:
3023 try:
3024 stat = vfs.lstat(name)
3024 stat = vfs.lstat(name)
3025 age = now - stat.st_mtime
3025 age = now - stat.st_mtime
3026 user = util.username(stat.st_uid)
3026 user = util.username(stat.st_uid)
3027 locker = vfs.readlock(name)
3027 locker = vfs.readlock(name)
3028 if ":" in locker:
3028 if ":" in locker:
3029 host, pid = locker.split(':')
3029 host, pid = locker.split(':')
3030 if host == socket.gethostname():
3030 if host == socket.gethostname():
3031 locker = 'user %s, process %s' % (user, pid)
3031 locker = 'user %s, process %s' % (user, pid)
3032 else:
3032 else:
3033 locker = 'user %s, process %s, host %s' \
3033 locker = 'user %s, process %s, host %s' \
3034 % (user, pid, host)
3034 % (user, pid, host)
3035 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3035 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3036 return 1
3036 return 1
3037 except OSError as e:
3037 except OSError as e:
3038 if e.errno != errno.ENOENT:
3038 if e.errno != errno.ENOENT:
3039 raise
3039 raise
3040
3040
3041 ui.write(("%-6s free\n") % (name + ":"))
3041 ui.write(("%-6s free\n") % (name + ":"))
3042 return 0
3042 return 0
3043
3043
3044 held += report(repo.svfs, "lock", repo.lock)
3044 held += report(repo.svfs, "lock", repo.lock)
3045 held += report(repo.vfs, "wlock", repo.wlock)
3045 held += report(repo.vfs, "wlock", repo.wlock)
3046
3046
3047 return held
3047 return held
3048
3048
3049 @command('debugobsolete',
3049 @command('debugobsolete',
3050 [('', 'flags', 0, _('markers flag')),
3050 [('', 'flags', 0, _('markers flag')),
3051 ('', 'record-parents', False,
3051 ('', 'record-parents', False,
3052 _('record parent information for the precursor')),
3052 _('record parent information for the precursor')),
3053 ('r', 'rev', [], _('display markers relevant to REV')),
3053 ('r', 'rev', [], _('display markers relevant to REV')),
3054 ('', 'index', False, _('display index of the marker')),
3054 ('', 'index', False, _('display index of the marker')),
3055 ('', 'delete', [], _('delete markers specified by indices')),
3055 ('', 'delete', [], _('delete markers specified by indices')),
3056 ] + commitopts2 + formatteropts,
3056 ] + commitopts2 + formatteropts,
3057 _('[OBSOLETED [REPLACEMENT ...]]'))
3057 _('[OBSOLETED [REPLACEMENT ...]]'))
3058 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3058 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3059 """create arbitrary obsolete marker
3059 """create arbitrary obsolete marker
3060
3060
3061 With no arguments, displays the list of obsolescence markers."""
3061 With no arguments, displays the list of obsolescence markers."""
3062
3062
3063 def parsenodeid(s):
3063 def parsenodeid(s):
3064 try:
3064 try:
3065 # We do not use revsingle/revrange functions here to accept
3065 # We do not use revsingle/revrange functions here to accept
3066 # arbitrary node identifiers, possibly not present in the
3066 # arbitrary node identifiers, possibly not present in the
3067 # local repository.
3067 # local repository.
3068 n = bin(s)
3068 n = bin(s)
3069 if len(n) != len(nullid):
3069 if len(n) != len(nullid):
3070 raise TypeError()
3070 raise TypeError()
3071 return n
3071 return n
3072 except TypeError:
3072 except TypeError:
3073 raise error.Abort('changeset references must be full hexadecimal '
3073 raise error.Abort('changeset references must be full hexadecimal '
3074 'node identifiers')
3074 'node identifiers')
3075
3075
3076 if opts.get('delete'):
3076 if opts.get('delete'):
3077 indices = []
3077 indices = []
3078 for v in opts.get('delete'):
3078 for v in opts.get('delete'):
3079 try:
3079 try:
3080 indices.append(int(v))
3080 indices.append(int(v))
3081 except ValueError:
3081 except ValueError:
3082 raise error.Abort(_('invalid index value: %r') % v,
3082 raise error.Abort(_('invalid index value: %r') % v,
3083 hint=_('use integers for indices'))
3083 hint=_('use integers for indices'))
3084
3084
3085 if repo.currenttransaction():
3085 if repo.currenttransaction():
3086 raise error.Abort(_('cannot delete obsmarkers in the middle '
3086 raise error.Abort(_('cannot delete obsmarkers in the middle '
3087 'of transaction.'))
3087 'of transaction.'))
3088
3088
3089 with repo.lock():
3089 with repo.lock():
3090 n = repair.deleteobsmarkers(repo.obsstore, indices)
3090 n = repair.deleteobsmarkers(repo.obsstore, indices)
3091 ui.write(_('deleted %i obsolescense markers\n') % n)
3091 ui.write(_('deleted %i obsolescense markers\n') % n)
3092
3092
3093 return
3093 return
3094
3094
3095 if precursor is not None:
3095 if precursor is not None:
3096 if opts['rev']:
3096 if opts['rev']:
3097 raise error.Abort('cannot select revision when creating marker')
3097 raise error.Abort('cannot select revision when creating marker')
3098 metadata = {}
3098 metadata = {}
3099 metadata['user'] = opts['user'] or ui.username()
3099 metadata['user'] = opts['user'] or ui.username()
3100 succs = tuple(parsenodeid(succ) for succ in successors)
3100 succs = tuple(parsenodeid(succ) for succ in successors)
3101 l = repo.lock()
3101 l = repo.lock()
3102 try:
3102 try:
3103 tr = repo.transaction('debugobsolete')
3103 tr = repo.transaction('debugobsolete')
3104 try:
3104 try:
3105 date = opts.get('date')
3105 date = opts.get('date')
3106 if date:
3106 if date:
3107 date = util.parsedate(date)
3107 date = util.parsedate(date)
3108 else:
3108 else:
3109 date = None
3109 date = None
3110 prec = parsenodeid(precursor)
3110 prec = parsenodeid(precursor)
3111 parents = None
3111 parents = None
3112 if opts['record_parents']:
3112 if opts['record_parents']:
3113 if prec not in repo.unfiltered():
3113 if prec not in repo.unfiltered():
3114 raise error.Abort('cannot used --record-parents on '
3114 raise error.Abort('cannot used --record-parents on '
3115 'unknown changesets')
3115 'unknown changesets')
3116 parents = repo.unfiltered()[prec].parents()
3116 parents = repo.unfiltered()[prec].parents()
3117 parents = tuple(p.node() for p in parents)
3117 parents = tuple(p.node() for p in parents)
3118 repo.obsstore.create(tr, prec, succs, opts['flags'],
3118 repo.obsstore.create(tr, prec, succs, opts['flags'],
3119 parents=parents, date=date,
3119 parents=parents, date=date,
3120 metadata=metadata)
3120 metadata=metadata)
3121 tr.close()
3121 tr.close()
3122 except ValueError as exc:
3122 except ValueError as exc:
3123 raise error.Abort(_('bad obsmarker input: %s') % exc)
3123 raise error.Abort(_('bad obsmarker input: %s') % exc)
3124 finally:
3124 finally:
3125 tr.release()
3125 tr.release()
3126 finally:
3126 finally:
3127 l.release()
3127 l.release()
3128 else:
3128 else:
3129 if opts['rev']:
3129 if opts['rev']:
3130 revs = scmutil.revrange(repo, opts['rev'])
3130 revs = scmutil.revrange(repo, opts['rev'])
3131 nodes = [repo[r].node() for r in revs]
3131 nodes = [repo[r].node() for r in revs]
3132 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3132 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3133 markers.sort(key=lambda x: x._data)
3133 markers.sort(key=lambda x: x._data)
3134 else:
3134 else:
3135 markers = obsolete.getmarkers(repo)
3135 markers = obsolete.getmarkers(repo)
3136
3136
3137 markerstoiter = markers
3137 markerstoiter = markers
3138 isrelevant = lambda m: True
3138 isrelevant = lambda m: True
3139 if opts.get('rev') and opts.get('index'):
3139 if opts.get('rev') and opts.get('index'):
3140 markerstoiter = obsolete.getmarkers(repo)
3140 markerstoiter = obsolete.getmarkers(repo)
3141 markerset = set(markers)
3141 markerset = set(markers)
3142 isrelevant = lambda m: m in markerset
3142 isrelevant = lambda m: m in markerset
3143
3143
3144 fm = ui.formatter('debugobsolete', opts)
3144 fm = ui.formatter('debugobsolete', opts)
3145 for i, m in enumerate(markerstoiter):
3145 for i, m in enumerate(markerstoiter):
3146 if not isrelevant(m):
3146 if not isrelevant(m):
3147 # marker can be irrelevant when we're iterating over a set
3147 # marker can be irrelevant when we're iterating over a set
3148 # of markers (markerstoiter) which is bigger than the set
3148 # of markers (markerstoiter) which is bigger than the set
3149 # of markers we want to display (markers)
3149 # of markers we want to display (markers)
3150 # this can happen if both --index and --rev options are
3150 # this can happen if both --index and --rev options are
3151 # provided and thus we need to iterate over all of the markers
3151 # provided and thus we need to iterate over all of the markers
3152 # to get the correct indices, but only display the ones that
3152 # to get the correct indices, but only display the ones that
3153 # are relevant to --rev value
3153 # are relevant to --rev value
3154 continue
3154 continue
3155 fm.startitem()
3155 fm.startitem()
3156 ind = i if opts.get('index') else None
3156 ind = i if opts.get('index') else None
3157 cmdutil.showmarker(fm, m, index=ind)
3157 cmdutil.showmarker(fm, m, index=ind)
3158 fm.end()
3158 fm.end()
3159
3159
3160 @command('debugpathcomplete',
3160 @command('debugpathcomplete',
3161 [('f', 'full', None, _('complete an entire path')),
3161 [('f', 'full', None, _('complete an entire path')),
3162 ('n', 'normal', None, _('show only normal files')),
3162 ('n', 'normal', None, _('show only normal files')),
3163 ('a', 'added', None, _('show only added files')),
3163 ('a', 'added', None, _('show only added files')),
3164 ('r', 'removed', None, _('show only removed files'))],
3164 ('r', 'removed', None, _('show only removed files'))],
3165 _('FILESPEC...'))
3165 _('FILESPEC...'))
3166 def debugpathcomplete(ui, repo, *specs, **opts):
3166 def debugpathcomplete(ui, repo, *specs, **opts):
3167 '''complete part or all of a tracked path
3167 '''complete part or all of a tracked path
3168
3168
3169 This command supports shells that offer path name completion. It
3169 This command supports shells that offer path name completion. It
3170 currently completes only files already known to the dirstate.
3170 currently completes only files already known to the dirstate.
3171
3171
3172 Completion extends only to the next path segment unless
3172 Completion extends only to the next path segment unless
3173 --full is specified, in which case entire paths are used.'''
3173 --full is specified, in which case entire paths are used.'''
3174
3174
3175 def complete(path, acceptable):
3175 def complete(path, acceptable):
3176 dirstate = repo.dirstate
3176 dirstate = repo.dirstate
3177 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3177 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3178 rootdir = repo.root + os.sep
3178 rootdir = repo.root + os.sep
3179 if spec != repo.root and not spec.startswith(rootdir):
3179 if spec != repo.root and not spec.startswith(rootdir):
3180 return [], []
3180 return [], []
3181 if os.path.isdir(spec):
3181 if os.path.isdir(spec):
3182 spec += '/'
3182 spec += '/'
3183 spec = spec[len(rootdir):]
3183 spec = spec[len(rootdir):]
3184 fixpaths = os.sep != '/'
3184 fixpaths = os.sep != '/'
3185 if fixpaths:
3185 if fixpaths:
3186 spec = spec.replace(os.sep, '/')
3186 spec = spec.replace(os.sep, '/')
3187 speclen = len(spec)
3187 speclen = len(spec)
3188 fullpaths = opts['full']
3188 fullpaths = opts['full']
3189 files, dirs = set(), set()
3189 files, dirs = set(), set()
3190 adddir, addfile = dirs.add, files.add
3190 adddir, addfile = dirs.add, files.add
3191 for f, st in dirstate.iteritems():
3191 for f, st in dirstate.iteritems():
3192 if f.startswith(spec) and st[0] in acceptable:
3192 if f.startswith(spec) and st[0] in acceptable:
3193 if fixpaths:
3193 if fixpaths:
3194 f = f.replace('/', os.sep)
3194 f = f.replace('/', os.sep)
3195 if fullpaths:
3195 if fullpaths:
3196 addfile(f)
3196 addfile(f)
3197 continue
3197 continue
3198 s = f.find(os.sep, speclen)
3198 s = f.find(os.sep, speclen)
3199 if s >= 0:
3199 if s >= 0:
3200 adddir(f[:s])
3200 adddir(f[:s])
3201 else:
3201 else:
3202 addfile(f)
3202 addfile(f)
3203 return files, dirs
3203 return files, dirs
3204
3204
3205 acceptable = ''
3205 acceptable = ''
3206 if opts['normal']:
3206 if opts['normal']:
3207 acceptable += 'nm'
3207 acceptable += 'nm'
3208 if opts['added']:
3208 if opts['added']:
3209 acceptable += 'a'
3209 acceptable += 'a'
3210 if opts['removed']:
3210 if opts['removed']:
3211 acceptable += 'r'
3211 acceptable += 'r'
3212 cwd = repo.getcwd()
3212 cwd = repo.getcwd()
3213 if not specs:
3213 if not specs:
3214 specs = ['.']
3214 specs = ['.']
3215
3215
3216 files, dirs = set(), set()
3216 files, dirs = set(), set()
3217 for spec in specs:
3217 for spec in specs:
3218 f, d = complete(spec, acceptable or 'nmar')
3218 f, d = complete(spec, acceptable or 'nmar')
3219 files.update(f)
3219 files.update(f)
3220 dirs.update(d)
3220 dirs.update(d)
3221 files.update(dirs)
3221 files.update(dirs)
3222 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3222 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3223 ui.write('\n')
3223 ui.write('\n')
3224
3224
3225 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3225 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3226 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3226 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3227 '''access the pushkey key/value protocol
3227 '''access the pushkey key/value protocol
3228
3228
3229 With two args, list the keys in the given namespace.
3229 With two args, list the keys in the given namespace.
3230
3230
3231 With five args, set a key to new if it currently is set to old.
3231 With five args, set a key to new if it currently is set to old.
3232 Reports success or failure.
3232 Reports success or failure.
3233 '''
3233 '''
3234
3234
3235 target = hg.peer(ui, {}, repopath)
3235 target = hg.peer(ui, {}, repopath)
3236 if keyinfo:
3236 if keyinfo:
3237 key, old, new = keyinfo
3237 key, old, new = keyinfo
3238 r = target.pushkey(namespace, key, old, new)
3238 r = target.pushkey(namespace, key, old, new)
3239 ui.status(str(r) + '\n')
3239 ui.status(str(r) + '\n')
3240 return not r
3240 return not r
3241 else:
3241 else:
3242 for k, v in sorted(target.listkeys(namespace).iteritems()):
3242 for k, v in sorted(target.listkeys(namespace).iteritems()):
3243 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3243 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3244 v.encode('string-escape')))
3244 v.encode('string-escape')))
3245
3245
3246 @command('debugpvec', [], _('A B'))
3246 @command('debugpvec', [], _('A B'))
3247 def debugpvec(ui, repo, a, b=None):
3247 def debugpvec(ui, repo, a, b=None):
3248 ca = scmutil.revsingle(repo, a)
3248 ca = scmutil.revsingle(repo, a)
3249 cb = scmutil.revsingle(repo, b)
3249 cb = scmutil.revsingle(repo, b)
3250 pa = pvec.ctxpvec(ca)
3250 pa = pvec.ctxpvec(ca)
3251 pb = pvec.ctxpvec(cb)
3251 pb = pvec.ctxpvec(cb)
3252 if pa == pb:
3252 if pa == pb:
3253 rel = "="
3253 rel = "="
3254 elif pa > pb:
3254 elif pa > pb:
3255 rel = ">"
3255 rel = ">"
3256 elif pa < pb:
3256 elif pa < pb:
3257 rel = "<"
3257 rel = "<"
3258 elif pa | pb:
3258 elif pa | pb:
3259 rel = "|"
3259 rel = "|"
3260 ui.write(_("a: %s\n") % pa)
3260 ui.write(_("a: %s\n") % pa)
3261 ui.write(_("b: %s\n") % pb)
3261 ui.write(_("b: %s\n") % pb)
3262 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3262 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3263 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3263 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3264 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3264 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3265 pa.distance(pb), rel))
3265 pa.distance(pb), rel))
3266
3266
3267 @command('debugrebuilddirstate|debugrebuildstate',
3267 @command('debugrebuilddirstate|debugrebuildstate',
3268 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3268 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3269 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3269 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3270 'the working copy parent')),
3270 'the working copy parent')),
3271 ],
3271 ],
3272 _('[-r REV]'))
3272 _('[-r REV]'))
3273 def debugrebuilddirstate(ui, repo, rev, **opts):
3273 def debugrebuilddirstate(ui, repo, rev, **opts):
3274 """rebuild the dirstate as it would look like for the given revision
3274 """rebuild the dirstate as it would look like for the given revision
3275
3275
3276 If no revision is specified the first current parent will be used.
3276 If no revision is specified the first current parent will be used.
3277
3277
3278 The dirstate will be set to the files of the given revision.
3278 The dirstate will be set to the files of the given revision.
3279 The actual working directory content or existing dirstate
3279 The actual working directory content or existing dirstate
3280 information such as adds or removes is not considered.
3280 information such as adds or removes is not considered.
3281
3281
3282 ``minimal`` will only rebuild the dirstate status for files that claim to be
3282 ``minimal`` will only rebuild the dirstate status for files that claim to be
3283 tracked but are not in the parent manifest, or that exist in the parent
3283 tracked but are not in the parent manifest, or that exist in the parent
3284 manifest but are not in the dirstate. It will not change adds, removes, or
3284 manifest but are not in the dirstate. It will not change adds, removes, or
3285 modified files that are in the working copy parent.
3285 modified files that are in the working copy parent.
3286
3286
3287 One use of this command is to make the next :hg:`status` invocation
3287 One use of this command is to make the next :hg:`status` invocation
3288 check the actual file content.
3288 check the actual file content.
3289 """
3289 """
3290 ctx = scmutil.revsingle(repo, rev)
3290 ctx = scmutil.revsingle(repo, rev)
3291 with repo.wlock():
3291 with repo.wlock():
3292 dirstate = repo.dirstate
3292 dirstate = repo.dirstate
3293 changedfiles = None
3293 changedfiles = None
3294 # See command doc for what minimal does.
3294 # See command doc for what minimal does.
3295 if opts.get('minimal'):
3295 if opts.get('minimal'):
3296 manifestfiles = set(ctx.manifest().keys())
3296 manifestfiles = set(ctx.manifest().keys())
3297 dirstatefiles = set(dirstate)
3297 dirstatefiles = set(dirstate)
3298 manifestonly = manifestfiles - dirstatefiles
3298 manifestonly = manifestfiles - dirstatefiles
3299 dsonly = dirstatefiles - manifestfiles
3299 dsonly = dirstatefiles - manifestfiles
3300 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3300 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3301 changedfiles = manifestonly | dsnotadded
3301 changedfiles = manifestonly | dsnotadded
3302
3302
3303 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3303 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3304
3304
3305 @command('debugrebuildfncache', [], '')
3305 @command('debugrebuildfncache', [], '')
3306 def debugrebuildfncache(ui, repo):
3306 def debugrebuildfncache(ui, repo):
3307 """rebuild the fncache file"""
3307 """rebuild the fncache file"""
3308 repair.rebuildfncache(ui, repo)
3308 repair.rebuildfncache(ui, repo)
3309
3309
3310 @command('debugrename',
3310 @command('debugrename',
3311 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3311 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3312 _('[-r REV] FILE'))
3312 _('[-r REV] FILE'))
3313 def debugrename(ui, repo, file1, *pats, **opts):
3313 def debugrename(ui, repo, file1, *pats, **opts):
3314 """dump rename information"""
3314 """dump rename information"""
3315
3315
3316 ctx = scmutil.revsingle(repo, opts.get('rev'))
3316 ctx = scmutil.revsingle(repo, opts.get('rev'))
3317 m = scmutil.match(ctx, (file1,) + pats, opts)
3317 m = scmutil.match(ctx, (file1,) + pats, opts)
3318 for abs in ctx.walk(m):
3318 for abs in ctx.walk(m):
3319 fctx = ctx[abs]
3319 fctx = ctx[abs]
3320 o = fctx.filelog().renamed(fctx.filenode())
3320 o = fctx.filelog().renamed(fctx.filenode())
3321 rel = m.rel(abs)
3321 rel = m.rel(abs)
3322 if o:
3322 if o:
3323 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3323 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3324 else:
3324 else:
3325 ui.write(_("%s not renamed\n") % rel)
3325 ui.write(_("%s not renamed\n") % rel)
3326
3326
3327 @command('debugrevlog', debugrevlogopts +
3327 @command('debugrevlog', debugrevlogopts +
3328 [('d', 'dump', False, _('dump index data'))],
3328 [('d', 'dump', False, _('dump index data'))],
3329 _('-c|-m|FILE'),
3329 _('-c|-m|FILE'),
3330 optionalrepo=True)
3330 optionalrepo=True)
3331 def debugrevlog(ui, repo, file_=None, **opts):
3331 def debugrevlog(ui, repo, file_=None, **opts):
3332 """show data and statistics about a revlog"""
3332 """show data and statistics about a revlog"""
3333 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3333 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3334
3334
3335 if opts.get("dump"):
3335 if opts.get("dump"):
3336 numrevs = len(r)
3336 numrevs = len(r)
3337 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3337 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3338 " rawsize totalsize compression heads chainlen\n"))
3338 " rawsize totalsize compression heads chainlen\n"))
3339 ts = 0
3339 ts = 0
3340 heads = set()
3340 heads = set()
3341
3341
3342 for rev in xrange(numrevs):
3342 for rev in xrange(numrevs):
3343 dbase = r.deltaparent(rev)
3343 dbase = r.deltaparent(rev)
3344 if dbase == -1:
3344 if dbase == -1:
3345 dbase = rev
3345 dbase = rev
3346 cbase = r.chainbase(rev)
3346 cbase = r.chainbase(rev)
3347 clen = r.chainlen(rev)
3347 clen = r.chainlen(rev)
3348 p1, p2 = r.parentrevs(rev)
3348 p1, p2 = r.parentrevs(rev)
3349 rs = r.rawsize(rev)
3349 rs = r.rawsize(rev)
3350 ts = ts + rs
3350 ts = ts + rs
3351 heads -= set(r.parentrevs(rev))
3351 heads -= set(r.parentrevs(rev))
3352 heads.add(rev)
3352 heads.add(rev)
3353 try:
3353 try:
3354 compression = ts / r.end(rev)
3354 compression = ts / r.end(rev)
3355 except ZeroDivisionError:
3355 except ZeroDivisionError:
3356 compression = 0
3356 compression = 0
3357 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3357 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3358 "%11d %5d %8d\n" %
3358 "%11d %5d %8d\n" %
3359 (rev, p1, p2, r.start(rev), r.end(rev),
3359 (rev, p1, p2, r.start(rev), r.end(rev),
3360 r.start(dbase), r.start(cbase),
3360 r.start(dbase), r.start(cbase),
3361 r.start(p1), r.start(p2),
3361 r.start(p1), r.start(p2),
3362 rs, ts, compression, len(heads), clen))
3362 rs, ts, compression, len(heads), clen))
3363 return 0
3363 return 0
3364
3364
3365 v = r.version
3365 v = r.version
3366 format = v & 0xFFFF
3366 format = v & 0xFFFF
3367 flags = []
3367 flags = []
3368 gdelta = False
3368 gdelta = False
3369 if v & revlog.REVLOGNGINLINEDATA:
3369 if v & revlog.REVLOGNGINLINEDATA:
3370 flags.append('inline')
3370 flags.append('inline')
3371 if v & revlog.REVLOGGENERALDELTA:
3371 if v & revlog.REVLOGGENERALDELTA:
3372 gdelta = True
3372 gdelta = True
3373 flags.append('generaldelta')
3373 flags.append('generaldelta')
3374 if not flags:
3374 if not flags:
3375 flags = ['(none)']
3375 flags = ['(none)']
3376
3376
3377 nummerges = 0
3377 nummerges = 0
3378 numfull = 0
3378 numfull = 0
3379 numprev = 0
3379 numprev = 0
3380 nump1 = 0
3380 nump1 = 0
3381 nump2 = 0
3381 nump2 = 0
3382 numother = 0
3382 numother = 0
3383 nump1prev = 0
3383 nump1prev = 0
3384 nump2prev = 0
3384 nump2prev = 0
3385 chainlengths = []
3385 chainlengths = []
3386
3386
3387 datasize = [None, 0, 0]
3387 datasize = [None, 0, 0]
3388 fullsize = [None, 0, 0]
3388 fullsize = [None, 0, 0]
3389 deltasize = [None, 0, 0]
3389 deltasize = [None, 0, 0]
3390
3390
3391 def addsize(size, l):
3391 def addsize(size, l):
3392 if l[0] is None or size < l[0]:
3392 if l[0] is None or size < l[0]:
3393 l[0] = size
3393 l[0] = size
3394 if size > l[1]:
3394 if size > l[1]:
3395 l[1] = size
3395 l[1] = size
3396 l[2] += size
3396 l[2] += size
3397
3397
3398 numrevs = len(r)
3398 numrevs = len(r)
3399 for rev in xrange(numrevs):
3399 for rev in xrange(numrevs):
3400 p1, p2 = r.parentrevs(rev)
3400 p1, p2 = r.parentrevs(rev)
3401 delta = r.deltaparent(rev)
3401 delta = r.deltaparent(rev)
3402 if format > 0:
3402 if format > 0:
3403 addsize(r.rawsize(rev), datasize)
3403 addsize(r.rawsize(rev), datasize)
3404 if p2 != nullrev:
3404 if p2 != nullrev:
3405 nummerges += 1
3405 nummerges += 1
3406 size = r.length(rev)
3406 size = r.length(rev)
3407 if delta == nullrev:
3407 if delta == nullrev:
3408 chainlengths.append(0)
3408 chainlengths.append(0)
3409 numfull += 1
3409 numfull += 1
3410 addsize(size, fullsize)
3410 addsize(size, fullsize)
3411 else:
3411 else:
3412 chainlengths.append(chainlengths[delta] + 1)
3412 chainlengths.append(chainlengths[delta] + 1)
3413 addsize(size, deltasize)
3413 addsize(size, deltasize)
3414 if delta == rev - 1:
3414 if delta == rev - 1:
3415 numprev += 1
3415 numprev += 1
3416 if delta == p1:
3416 if delta == p1:
3417 nump1prev += 1
3417 nump1prev += 1
3418 elif delta == p2:
3418 elif delta == p2:
3419 nump2prev += 1
3419 nump2prev += 1
3420 elif delta == p1:
3420 elif delta == p1:
3421 nump1 += 1
3421 nump1 += 1
3422 elif delta == p2:
3422 elif delta == p2:
3423 nump2 += 1
3423 nump2 += 1
3424 elif delta != nullrev:
3424 elif delta != nullrev:
3425 numother += 1
3425 numother += 1
3426
3426
3427 # Adjust size min value for empty cases
3427 # Adjust size min value for empty cases
3428 for size in (datasize, fullsize, deltasize):
3428 for size in (datasize, fullsize, deltasize):
3429 if size[0] is None:
3429 if size[0] is None:
3430 size[0] = 0
3430 size[0] = 0
3431
3431
3432 numdeltas = numrevs - numfull
3432 numdeltas = numrevs - numfull
3433 numoprev = numprev - nump1prev - nump2prev
3433 numoprev = numprev - nump1prev - nump2prev
3434 totalrawsize = datasize[2]
3434 totalrawsize = datasize[2]
3435 datasize[2] /= numrevs
3435 datasize[2] /= numrevs
3436 fulltotal = fullsize[2]
3436 fulltotal = fullsize[2]
3437 fullsize[2] /= numfull
3437 fullsize[2] /= numfull
3438 deltatotal = deltasize[2]
3438 deltatotal = deltasize[2]
3439 if numrevs - numfull > 0:
3439 if numrevs - numfull > 0:
3440 deltasize[2] /= numrevs - numfull
3440 deltasize[2] /= numrevs - numfull
3441 totalsize = fulltotal + deltatotal
3441 totalsize = fulltotal + deltatotal
3442 avgchainlen = sum(chainlengths) / numrevs
3442 avgchainlen = sum(chainlengths) / numrevs
3443 maxchainlen = max(chainlengths)
3443 maxchainlen = max(chainlengths)
3444 compratio = 1
3444 compratio = 1
3445 if totalsize:
3445 if totalsize:
3446 compratio = totalrawsize / totalsize
3446 compratio = totalrawsize / totalsize
3447
3447
3448 basedfmtstr = '%%%dd\n'
3448 basedfmtstr = '%%%dd\n'
3449 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3449 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3450
3450
3451 def dfmtstr(max):
3451 def dfmtstr(max):
3452 return basedfmtstr % len(str(max))
3452 return basedfmtstr % len(str(max))
3453 def pcfmtstr(max, padding=0):
3453 def pcfmtstr(max, padding=0):
3454 return basepcfmtstr % (len(str(max)), ' ' * padding)
3454 return basepcfmtstr % (len(str(max)), ' ' * padding)
3455
3455
3456 def pcfmt(value, total):
3456 def pcfmt(value, total):
3457 if total:
3457 if total:
3458 return (value, 100 * float(value) / total)
3458 return (value, 100 * float(value) / total)
3459 else:
3459 else:
3460 return value, 100.0
3460 return value, 100.0
3461
3461
3462 ui.write(('format : %d\n') % format)
3462 ui.write(('format : %d\n') % format)
3463 ui.write(('flags : %s\n') % ', '.join(flags))
3463 ui.write(('flags : %s\n') % ', '.join(flags))
3464
3464
3465 ui.write('\n')
3465 ui.write('\n')
3466 fmt = pcfmtstr(totalsize)
3466 fmt = pcfmtstr(totalsize)
3467 fmt2 = dfmtstr(totalsize)
3467 fmt2 = dfmtstr(totalsize)
3468 ui.write(('revisions : ') + fmt2 % numrevs)
3468 ui.write(('revisions : ') + fmt2 % numrevs)
3469 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3469 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3470 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3470 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3471 ui.write(('revisions : ') + fmt2 % numrevs)
3471 ui.write(('revisions : ') + fmt2 % numrevs)
3472 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3472 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3473 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3473 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3474 ui.write(('revision size : ') + fmt2 % totalsize)
3474 ui.write(('revision size : ') + fmt2 % totalsize)
3475 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3475 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3476 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3476 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3477
3477
3478 ui.write('\n')
3478 ui.write('\n')
3479 fmt = dfmtstr(max(avgchainlen, compratio))
3479 fmt = dfmtstr(max(avgchainlen, compratio))
3480 ui.write(('avg chain length : ') + fmt % avgchainlen)
3480 ui.write(('avg chain length : ') + fmt % avgchainlen)
3481 ui.write(('max chain length : ') + fmt % maxchainlen)
3481 ui.write(('max chain length : ') + fmt % maxchainlen)
3482 ui.write(('compression ratio : ') + fmt % compratio)
3482 ui.write(('compression ratio : ') + fmt % compratio)
3483
3483
3484 if format > 0:
3484 if format > 0:
3485 ui.write('\n')
3485 ui.write('\n')
3486 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3486 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3487 % tuple(datasize))
3487 % tuple(datasize))
3488 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3488 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3489 % tuple(fullsize))
3489 % tuple(fullsize))
3490 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3490 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3491 % tuple(deltasize))
3491 % tuple(deltasize))
3492
3492
3493 if numdeltas > 0:
3493 if numdeltas > 0:
3494 ui.write('\n')
3494 ui.write('\n')
3495 fmt = pcfmtstr(numdeltas)
3495 fmt = pcfmtstr(numdeltas)
3496 fmt2 = pcfmtstr(numdeltas, 4)
3496 fmt2 = pcfmtstr(numdeltas, 4)
3497 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3497 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3498 if numprev > 0:
3498 if numprev > 0:
3499 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3499 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3500 numprev))
3500 numprev))
3501 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3501 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3502 numprev))
3502 numprev))
3503 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3503 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3504 numprev))
3504 numprev))
3505 if gdelta:
3505 if gdelta:
3506 ui.write(('deltas against p1 : ')
3506 ui.write(('deltas against p1 : ')
3507 + fmt % pcfmt(nump1, numdeltas))
3507 + fmt % pcfmt(nump1, numdeltas))
3508 ui.write(('deltas against p2 : ')
3508 ui.write(('deltas against p2 : ')
3509 + fmt % pcfmt(nump2, numdeltas))
3509 + fmt % pcfmt(nump2, numdeltas))
3510 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3510 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3511 numdeltas))
3511 numdeltas))
3512
3512
3513 @command('debugrevspec',
3513 @command('debugrevspec',
3514 [('', 'optimize', None, _('print parsed tree after optimizing')),
3514 [('', 'optimize', None,
3515 _('print parsed tree after optimizing (DEPRECATED)')),
3515 ('p', 'show-stage', [],
3516 ('p', 'show-stage', [],
3516 _('print parsed tree at the given stage'), _('NAME')),
3517 _('print parsed tree at the given stage'), _('NAME')),
3517 ],
3518 ],
3518 ('REVSPEC'))
3519 ('REVSPEC'))
3519 def debugrevspec(ui, repo, expr, **opts):
3520 def debugrevspec(ui, repo, expr, **opts):
3520 """parse and apply a revision specification
3521 """parse and apply a revision specification
3521
3522
3522 Use -p/--show-stage option to print the parsed tree at the given stages.
3523 Use -p/--show-stage option to print the parsed tree at the given stages.
3523 Use -p all to print tree at every stage.
3524 Use -p all to print tree at every stage.
3524 """
3525 """
3525 stages = [
3526 stages = [
3526 ('parsed', lambda tree: tree),
3527 ('parsed', lambda tree: tree),
3527 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
3528 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
3528 ('concatenated', revset.foldconcat),
3529 ('concatenated', revset.foldconcat),
3529 ('analyzed', revset.analyze),
3530 ('analyzed', revset.analyze),
3530 ('optimized', revset.optimize),
3531 ('optimized', revset.optimize),
3531 ]
3532 ]
3532 stagenames = set(n for n, f in stages)
3533 stagenames = set(n for n, f in stages)
3533
3534
3534 showalways = set()
3535 showalways = set()
3535 showchanged = set()
3536 showchanged = set()
3536 if ui.verbose and not opts['show_stage']:
3537 if ui.verbose and not opts['show_stage']:
3537 # show parsed tree by --verbose (deprecated)
3538 # show parsed tree by --verbose (deprecated)
3538 showalways.add('parsed')
3539 showalways.add('parsed')
3539 showchanged.update(['expanded', 'concatenated'])
3540 showchanged.update(['expanded', 'concatenated'])
3540 if opts['optimize']:
3541 if opts['optimize']:
3541 showalways.add('optimized')
3542 showalways.add('optimized')
3542 if opts['show_stage'] and opts['optimize']:
3543 if opts['show_stage'] and opts['optimize']:
3543 raise error.Abort(_('cannot use --optimize with --show-stage'))
3544 raise error.Abort(_('cannot use --optimize with --show-stage'))
3544 if opts['show_stage'] == ['all']:
3545 if opts['show_stage'] == ['all']:
3545 showalways.update(stagenames)
3546 showalways.update(stagenames)
3546 else:
3547 else:
3547 for n in opts['show_stage']:
3548 for n in opts['show_stage']:
3548 if n not in stagenames:
3549 if n not in stagenames:
3549 raise error.Abort(_('invalid stage name: %s') % n)
3550 raise error.Abort(_('invalid stage name: %s') % n)
3550 showalways.update(opts['show_stage'])
3551 showalways.update(opts['show_stage'])
3551
3552
3552 printedtree = None
3553 printedtree = None
3553 tree = revset.parse(expr, lookup=repo.__contains__)
3554 tree = revset.parse(expr, lookup=repo.__contains__)
3554 for n, f in stages:
3555 for n, f in stages:
3555 tree = f(tree)
3556 tree = f(tree)
3556 if n in showalways or (n in showchanged and tree != printedtree):
3557 if n in showalways or (n in showchanged and tree != printedtree):
3557 if opts['show_stage'] or n != 'parsed':
3558 if opts['show_stage'] or n != 'parsed':
3558 ui.write(("* %s:\n") % n)
3559 ui.write(("* %s:\n") % n)
3559 ui.write(revset.prettyformat(tree), "\n")
3560 ui.write(revset.prettyformat(tree), "\n")
3560 printedtree = tree
3561 printedtree = tree
3561
3562
3562 func = revset.match(ui, expr, repo)
3563 func = revset.match(ui, expr, repo)
3563 revs = func(repo)
3564 revs = func(repo)
3564 if ui.verbose:
3565 if ui.verbose:
3565 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3566 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3566 for c in revs:
3567 for c in revs:
3567 ui.write("%s\n" % c)
3568 ui.write("%s\n" % c)
3568
3569
3569 @command('debugsetparents', [], _('REV1 [REV2]'))
3570 @command('debugsetparents', [], _('REV1 [REV2]'))
3570 def debugsetparents(ui, repo, rev1, rev2=None):
3571 def debugsetparents(ui, repo, rev1, rev2=None):
3571 """manually set the parents of the current working directory
3572 """manually set the parents of the current working directory
3572
3573
3573 This is useful for writing repository conversion tools, but should
3574 This is useful for writing repository conversion tools, but should
3574 be used with care. For example, neither the working directory nor the
3575 be used with care. For example, neither the working directory nor the
3575 dirstate is updated, so file status may be incorrect after running this
3576 dirstate is updated, so file status may be incorrect after running this
3576 command.
3577 command.
3577
3578
3578 Returns 0 on success.
3579 Returns 0 on success.
3579 """
3580 """
3580
3581
3581 r1 = scmutil.revsingle(repo, rev1).node()
3582 r1 = scmutil.revsingle(repo, rev1).node()
3582 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3583 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3583
3584
3584 with repo.wlock():
3585 with repo.wlock():
3585 repo.setparents(r1, r2)
3586 repo.setparents(r1, r2)
3586
3587
3587 @command('debugdirstate|debugstate',
3588 @command('debugdirstate|debugstate',
3588 [('', 'nodates', None, _('do not display the saved mtime')),
3589 [('', 'nodates', None, _('do not display the saved mtime')),
3589 ('', 'datesort', None, _('sort by saved mtime'))],
3590 ('', 'datesort', None, _('sort by saved mtime'))],
3590 _('[OPTION]...'))
3591 _('[OPTION]...'))
3591 def debugstate(ui, repo, **opts):
3592 def debugstate(ui, repo, **opts):
3592 """show the contents of the current dirstate"""
3593 """show the contents of the current dirstate"""
3593
3594
3594 nodates = opts.get('nodates')
3595 nodates = opts.get('nodates')
3595 datesort = opts.get('datesort')
3596 datesort = opts.get('datesort')
3596
3597
3597 timestr = ""
3598 timestr = ""
3598 if datesort:
3599 if datesort:
3599 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3600 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3600 else:
3601 else:
3601 keyfunc = None # sort by filename
3602 keyfunc = None # sort by filename
3602 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3603 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3603 if ent[3] == -1:
3604 if ent[3] == -1:
3604 timestr = 'unset '
3605 timestr = 'unset '
3605 elif nodates:
3606 elif nodates:
3606 timestr = 'set '
3607 timestr = 'set '
3607 else:
3608 else:
3608 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3609 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3609 time.localtime(ent[3]))
3610 time.localtime(ent[3]))
3610 if ent[1] & 0o20000:
3611 if ent[1] & 0o20000:
3611 mode = 'lnk'
3612 mode = 'lnk'
3612 else:
3613 else:
3613 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3614 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3614 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3615 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3615 for f in repo.dirstate.copies():
3616 for f in repo.dirstate.copies():
3616 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3617 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3617
3618
3618 @command('debugsub',
3619 @command('debugsub',
3619 [('r', 'rev', '',
3620 [('r', 'rev', '',
3620 _('revision to check'), _('REV'))],
3621 _('revision to check'), _('REV'))],
3621 _('[-r REV] [REV]'))
3622 _('[-r REV] [REV]'))
3622 def debugsub(ui, repo, rev=None):
3623 def debugsub(ui, repo, rev=None):
3623 ctx = scmutil.revsingle(repo, rev, None)
3624 ctx = scmutil.revsingle(repo, rev, None)
3624 for k, v in sorted(ctx.substate.items()):
3625 for k, v in sorted(ctx.substate.items()):
3625 ui.write(('path %s\n') % k)
3626 ui.write(('path %s\n') % k)
3626 ui.write((' source %s\n') % v[0])
3627 ui.write((' source %s\n') % v[0])
3627 ui.write((' revision %s\n') % v[1])
3628 ui.write((' revision %s\n') % v[1])
3628
3629
3629 @command('debugsuccessorssets',
3630 @command('debugsuccessorssets',
3630 [],
3631 [],
3631 _('[REV]'))
3632 _('[REV]'))
3632 def debugsuccessorssets(ui, repo, *revs):
3633 def debugsuccessorssets(ui, repo, *revs):
3633 """show set of successors for revision
3634 """show set of successors for revision
3634
3635
3635 A successors set of changeset A is a consistent group of revisions that
3636 A successors set of changeset A is a consistent group of revisions that
3636 succeed A. It contains non-obsolete changesets only.
3637 succeed A. It contains non-obsolete changesets only.
3637
3638
3638 In most cases a changeset A has a single successors set containing a single
3639 In most cases a changeset A has a single successors set containing a single
3639 successor (changeset A replaced by A').
3640 successor (changeset A replaced by A').
3640
3641
3641 A changeset that is made obsolete with no successors are called "pruned".
3642 A changeset that is made obsolete with no successors are called "pruned".
3642 Such changesets have no successors sets at all.
3643 Such changesets have no successors sets at all.
3643
3644
3644 A changeset that has been "split" will have a successors set containing
3645 A changeset that has been "split" will have a successors set containing
3645 more than one successor.
3646 more than one successor.
3646
3647
3647 A changeset that has been rewritten in multiple different ways is called
3648 A changeset that has been rewritten in multiple different ways is called
3648 "divergent". Such changesets have multiple successor sets (each of which
3649 "divergent". Such changesets have multiple successor sets (each of which
3649 may also be split, i.e. have multiple successors).
3650 may also be split, i.e. have multiple successors).
3650
3651
3651 Results are displayed as follows::
3652 Results are displayed as follows::
3652
3653
3653 <rev1>
3654 <rev1>
3654 <successors-1A>
3655 <successors-1A>
3655 <rev2>
3656 <rev2>
3656 <successors-2A>
3657 <successors-2A>
3657 <successors-2B1> <successors-2B2> <successors-2B3>
3658 <successors-2B1> <successors-2B2> <successors-2B3>
3658
3659
3659 Here rev2 has two possible (i.e. divergent) successors sets. The first
3660 Here rev2 has two possible (i.e. divergent) successors sets. The first
3660 holds one element, whereas the second holds three (i.e. the changeset has
3661 holds one element, whereas the second holds three (i.e. the changeset has
3661 been split).
3662 been split).
3662 """
3663 """
3663 # passed to successorssets caching computation from one call to another
3664 # passed to successorssets caching computation from one call to another
3664 cache = {}
3665 cache = {}
3665 ctx2str = str
3666 ctx2str = str
3666 node2str = short
3667 node2str = short
3667 if ui.debug():
3668 if ui.debug():
3668 def ctx2str(ctx):
3669 def ctx2str(ctx):
3669 return ctx.hex()
3670 return ctx.hex()
3670 node2str = hex
3671 node2str = hex
3671 for rev in scmutil.revrange(repo, revs):
3672 for rev in scmutil.revrange(repo, revs):
3672 ctx = repo[rev]
3673 ctx = repo[rev]
3673 ui.write('%s\n'% ctx2str(ctx))
3674 ui.write('%s\n'% ctx2str(ctx))
3674 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3675 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3675 if succsset:
3676 if succsset:
3676 ui.write(' ')
3677 ui.write(' ')
3677 ui.write(node2str(succsset[0]))
3678 ui.write(node2str(succsset[0]))
3678 for node in succsset[1:]:
3679 for node in succsset[1:]:
3679 ui.write(' ')
3680 ui.write(' ')
3680 ui.write(node2str(node))
3681 ui.write(node2str(node))
3681 ui.write('\n')
3682 ui.write('\n')
3682
3683
3683 @command('debugtemplate',
3684 @command('debugtemplate',
3684 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3685 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3685 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3686 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3686 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3687 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3687 optionalrepo=True)
3688 optionalrepo=True)
3688 def debugtemplate(ui, repo, tmpl, **opts):
3689 def debugtemplate(ui, repo, tmpl, **opts):
3689 """parse and apply a template
3690 """parse and apply a template
3690
3691
3691 If -r/--rev is given, the template is processed as a log template and
3692 If -r/--rev is given, the template is processed as a log template and
3692 applied to the given changesets. Otherwise, it is processed as a generic
3693 applied to the given changesets. Otherwise, it is processed as a generic
3693 template.
3694 template.
3694
3695
3695 Use --verbose to print the parsed tree.
3696 Use --verbose to print the parsed tree.
3696 """
3697 """
3697 revs = None
3698 revs = None
3698 if opts['rev']:
3699 if opts['rev']:
3699 if repo is None:
3700 if repo is None:
3700 raise error.RepoError(_('there is no Mercurial repository here '
3701 raise error.RepoError(_('there is no Mercurial repository here '
3701 '(.hg not found)'))
3702 '(.hg not found)'))
3702 revs = scmutil.revrange(repo, opts['rev'])
3703 revs = scmutil.revrange(repo, opts['rev'])
3703
3704
3704 props = {}
3705 props = {}
3705 for d in opts['define']:
3706 for d in opts['define']:
3706 try:
3707 try:
3707 k, v = (e.strip() for e in d.split('=', 1))
3708 k, v = (e.strip() for e in d.split('=', 1))
3708 if not k:
3709 if not k:
3709 raise ValueError
3710 raise ValueError
3710 props[k] = v
3711 props[k] = v
3711 except ValueError:
3712 except ValueError:
3712 raise error.Abort(_('malformed keyword definition: %s') % d)
3713 raise error.Abort(_('malformed keyword definition: %s') % d)
3713
3714
3714 if ui.verbose:
3715 if ui.verbose:
3715 aliases = ui.configitems('templatealias')
3716 aliases = ui.configitems('templatealias')
3716 tree = templater.parse(tmpl)
3717 tree = templater.parse(tmpl)
3717 ui.note(templater.prettyformat(tree), '\n')
3718 ui.note(templater.prettyformat(tree), '\n')
3718 newtree = templater.expandaliases(tree, aliases)
3719 newtree = templater.expandaliases(tree, aliases)
3719 if newtree != tree:
3720 if newtree != tree:
3720 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3721 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3721
3722
3722 mapfile = None
3723 mapfile = None
3723 if revs is None:
3724 if revs is None:
3724 k = 'debugtemplate'
3725 k = 'debugtemplate'
3725 t = formatter.maketemplater(ui, k, tmpl)
3726 t = formatter.maketemplater(ui, k, tmpl)
3726 ui.write(templater.stringify(t(k, **props)))
3727 ui.write(templater.stringify(t(k, **props)))
3727 else:
3728 else:
3728 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3729 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3729 mapfile, buffered=False)
3730 mapfile, buffered=False)
3730 for r in revs:
3731 for r in revs:
3731 displayer.show(repo[r], **props)
3732 displayer.show(repo[r], **props)
3732 displayer.close()
3733 displayer.close()
3733
3734
3734 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3735 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3735 def debugwalk(ui, repo, *pats, **opts):
3736 def debugwalk(ui, repo, *pats, **opts):
3736 """show how files match on given patterns"""
3737 """show how files match on given patterns"""
3737 m = scmutil.match(repo[None], pats, opts)
3738 m = scmutil.match(repo[None], pats, opts)
3738 items = list(repo.walk(m))
3739 items = list(repo.walk(m))
3739 if not items:
3740 if not items:
3740 return
3741 return
3741 f = lambda fn: fn
3742 f = lambda fn: fn
3742 if ui.configbool('ui', 'slash') and os.sep != '/':
3743 if ui.configbool('ui', 'slash') and os.sep != '/':
3743 f = lambda fn: util.normpath(fn)
3744 f = lambda fn: util.normpath(fn)
3744 fmt = 'f %%-%ds %%-%ds %%s' % (
3745 fmt = 'f %%-%ds %%-%ds %%s' % (
3745 max([len(abs) for abs in items]),
3746 max([len(abs) for abs in items]),
3746 max([len(m.rel(abs)) for abs in items]))
3747 max([len(m.rel(abs)) for abs in items]))
3747 for abs in items:
3748 for abs in items:
3748 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3749 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3749 ui.write("%s\n" % line.rstrip())
3750 ui.write("%s\n" % line.rstrip())
3750
3751
3751 @command('debugwireargs',
3752 @command('debugwireargs',
3752 [('', 'three', '', 'three'),
3753 [('', 'three', '', 'three'),
3753 ('', 'four', '', 'four'),
3754 ('', 'four', '', 'four'),
3754 ('', 'five', '', 'five'),
3755 ('', 'five', '', 'five'),
3755 ] + remoteopts,
3756 ] + remoteopts,
3756 _('REPO [OPTIONS]... [ONE [TWO]]'),
3757 _('REPO [OPTIONS]... [ONE [TWO]]'),
3757 norepo=True)
3758 norepo=True)
3758 def debugwireargs(ui, repopath, *vals, **opts):
3759 def debugwireargs(ui, repopath, *vals, **opts):
3759 repo = hg.peer(ui, opts, repopath)
3760 repo = hg.peer(ui, opts, repopath)
3760 for opt in remoteopts:
3761 for opt in remoteopts:
3761 del opts[opt[1]]
3762 del opts[opt[1]]
3762 args = {}
3763 args = {}
3763 for k, v in opts.iteritems():
3764 for k, v in opts.iteritems():
3764 if v:
3765 if v:
3765 args[k] = v
3766 args[k] = v
3766 # run twice to check that we don't mess up the stream for the next command
3767 # run twice to check that we don't mess up the stream for the next command
3767 res1 = repo.debugwireargs(*vals, **args)
3768 res1 = repo.debugwireargs(*vals, **args)
3768 res2 = repo.debugwireargs(*vals, **args)
3769 res2 = repo.debugwireargs(*vals, **args)
3769 ui.write("%s\n" % res1)
3770 ui.write("%s\n" % res1)
3770 if res1 != res2:
3771 if res1 != res2:
3771 ui.warn("%s\n" % res2)
3772 ui.warn("%s\n" % res2)
3772
3773
3773 @command('^diff',
3774 @command('^diff',
3774 [('r', 'rev', [], _('revision'), _('REV')),
3775 [('r', 'rev', [], _('revision'), _('REV')),
3775 ('c', 'change', '', _('change made by revision'), _('REV'))
3776 ('c', 'change', '', _('change made by revision'), _('REV'))
3776 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3777 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3777 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3778 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3778 inferrepo=True)
3779 inferrepo=True)
3779 def diff(ui, repo, *pats, **opts):
3780 def diff(ui, repo, *pats, **opts):
3780 """diff repository (or selected files)
3781 """diff repository (or selected files)
3781
3782
3782 Show differences between revisions for the specified files.
3783 Show differences between revisions for the specified files.
3783
3784
3784 Differences between files are shown using the unified diff format.
3785 Differences between files are shown using the unified diff format.
3785
3786
3786 .. note::
3787 .. note::
3787
3788
3788 :hg:`diff` may generate unexpected results for merges, as it will
3789 :hg:`diff` may generate unexpected results for merges, as it will
3789 default to comparing against the working directory's first
3790 default to comparing against the working directory's first
3790 parent changeset if no revisions are specified.
3791 parent changeset if no revisions are specified.
3791
3792
3792 When two revision arguments are given, then changes are shown
3793 When two revision arguments are given, then changes are shown
3793 between those revisions. If only one revision is specified then
3794 between those revisions. If only one revision is specified then
3794 that revision is compared to the working directory, and, when no
3795 that revision is compared to the working directory, and, when no
3795 revisions are specified, the working directory files are compared
3796 revisions are specified, the working directory files are compared
3796 to its first parent.
3797 to its first parent.
3797
3798
3798 Alternatively you can specify -c/--change with a revision to see
3799 Alternatively you can specify -c/--change with a revision to see
3799 the changes in that changeset relative to its first parent.
3800 the changes in that changeset relative to its first parent.
3800
3801
3801 Without the -a/--text option, diff will avoid generating diffs of
3802 Without the -a/--text option, diff will avoid generating diffs of
3802 files it detects as binary. With -a, diff will generate a diff
3803 files it detects as binary. With -a, diff will generate a diff
3803 anyway, probably with undesirable results.
3804 anyway, probably with undesirable results.
3804
3805
3805 Use the -g/--git option to generate diffs in the git extended diff
3806 Use the -g/--git option to generate diffs in the git extended diff
3806 format. For more information, read :hg:`help diffs`.
3807 format. For more information, read :hg:`help diffs`.
3807
3808
3808 .. container:: verbose
3809 .. container:: verbose
3809
3810
3810 Examples:
3811 Examples:
3811
3812
3812 - compare a file in the current working directory to its parent::
3813 - compare a file in the current working directory to its parent::
3813
3814
3814 hg diff foo.c
3815 hg diff foo.c
3815
3816
3816 - compare two historical versions of a directory, with rename info::
3817 - compare two historical versions of a directory, with rename info::
3817
3818
3818 hg diff --git -r 1.0:1.2 lib/
3819 hg diff --git -r 1.0:1.2 lib/
3819
3820
3820 - get change stats relative to the last change on some date::
3821 - get change stats relative to the last change on some date::
3821
3822
3822 hg diff --stat -r "date('may 2')"
3823 hg diff --stat -r "date('may 2')"
3823
3824
3824 - diff all newly-added files that contain a keyword::
3825 - diff all newly-added files that contain a keyword::
3825
3826
3826 hg diff "set:added() and grep(GNU)"
3827 hg diff "set:added() and grep(GNU)"
3827
3828
3828 - compare a revision and its parents::
3829 - compare a revision and its parents::
3829
3830
3830 hg diff -c 9353 # compare against first parent
3831 hg diff -c 9353 # compare against first parent
3831 hg diff -r 9353^:9353 # same using revset syntax
3832 hg diff -r 9353^:9353 # same using revset syntax
3832 hg diff -r 9353^2:9353 # compare against the second parent
3833 hg diff -r 9353^2:9353 # compare against the second parent
3833
3834
3834 Returns 0 on success.
3835 Returns 0 on success.
3835 """
3836 """
3836
3837
3837 revs = opts.get('rev')
3838 revs = opts.get('rev')
3838 change = opts.get('change')
3839 change = opts.get('change')
3839 stat = opts.get('stat')
3840 stat = opts.get('stat')
3840 reverse = opts.get('reverse')
3841 reverse = opts.get('reverse')
3841
3842
3842 if revs and change:
3843 if revs and change:
3843 msg = _('cannot specify --rev and --change at the same time')
3844 msg = _('cannot specify --rev and --change at the same time')
3844 raise error.Abort(msg)
3845 raise error.Abort(msg)
3845 elif change:
3846 elif change:
3846 node2 = scmutil.revsingle(repo, change, None).node()
3847 node2 = scmutil.revsingle(repo, change, None).node()
3847 node1 = repo[node2].p1().node()
3848 node1 = repo[node2].p1().node()
3848 else:
3849 else:
3849 node1, node2 = scmutil.revpair(repo, revs)
3850 node1, node2 = scmutil.revpair(repo, revs)
3850
3851
3851 if reverse:
3852 if reverse:
3852 node1, node2 = node2, node1
3853 node1, node2 = node2, node1
3853
3854
3854 diffopts = patch.diffallopts(ui, opts)
3855 diffopts = patch.diffallopts(ui, opts)
3855 m = scmutil.match(repo[node2], pats, opts)
3856 m = scmutil.match(repo[node2], pats, opts)
3856 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3857 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3857 listsubrepos=opts.get('subrepos'),
3858 listsubrepos=opts.get('subrepos'),
3858 root=opts.get('root'))
3859 root=opts.get('root'))
3859
3860
3860 @command('^export',
3861 @command('^export',
3861 [('o', 'output', '',
3862 [('o', 'output', '',
3862 _('print output to file with formatted name'), _('FORMAT')),
3863 _('print output to file with formatted name'), _('FORMAT')),
3863 ('', 'switch-parent', None, _('diff against the second parent')),
3864 ('', 'switch-parent', None, _('diff against the second parent')),
3864 ('r', 'rev', [], _('revisions to export'), _('REV')),
3865 ('r', 'rev', [], _('revisions to export'), _('REV')),
3865 ] + diffopts,
3866 ] + diffopts,
3866 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3867 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3867 def export(ui, repo, *changesets, **opts):
3868 def export(ui, repo, *changesets, **opts):
3868 """dump the header and diffs for one or more changesets
3869 """dump the header and diffs for one or more changesets
3869
3870
3870 Print the changeset header and diffs for one or more revisions.
3871 Print the changeset header and diffs for one or more revisions.
3871 If no revision is given, the parent of the working directory is used.
3872 If no revision is given, the parent of the working directory is used.
3872
3873
3873 The information shown in the changeset header is: author, date,
3874 The information shown in the changeset header is: author, date,
3874 branch name (if non-default), changeset hash, parent(s) and commit
3875 branch name (if non-default), changeset hash, parent(s) and commit
3875 comment.
3876 comment.
3876
3877
3877 .. note::
3878 .. note::
3878
3879
3879 :hg:`export` may generate unexpected diff output for merge
3880 :hg:`export` may generate unexpected diff output for merge
3880 changesets, as it will compare the merge changeset against its
3881 changesets, as it will compare the merge changeset against its
3881 first parent only.
3882 first parent only.
3882
3883
3883 Output may be to a file, in which case the name of the file is
3884 Output may be to a file, in which case the name of the file is
3884 given using a format string. The formatting rules are as follows:
3885 given using a format string. The formatting rules are as follows:
3885
3886
3886 :``%%``: literal "%" character
3887 :``%%``: literal "%" character
3887 :``%H``: changeset hash (40 hexadecimal digits)
3888 :``%H``: changeset hash (40 hexadecimal digits)
3888 :``%N``: number of patches being generated
3889 :``%N``: number of patches being generated
3889 :``%R``: changeset revision number
3890 :``%R``: changeset revision number
3890 :``%b``: basename of the exporting repository
3891 :``%b``: basename of the exporting repository
3891 :``%h``: short-form changeset hash (12 hexadecimal digits)
3892 :``%h``: short-form changeset hash (12 hexadecimal digits)
3892 :``%m``: first line of the commit message (only alphanumeric characters)
3893 :``%m``: first line of the commit message (only alphanumeric characters)
3893 :``%n``: zero-padded sequence number, starting at 1
3894 :``%n``: zero-padded sequence number, starting at 1
3894 :``%r``: zero-padded changeset revision number
3895 :``%r``: zero-padded changeset revision number
3895
3896
3896 Without the -a/--text option, export will avoid generating diffs
3897 Without the -a/--text option, export will avoid generating diffs
3897 of files it detects as binary. With -a, export will generate a
3898 of files it detects as binary. With -a, export will generate a
3898 diff anyway, probably with undesirable results.
3899 diff anyway, probably with undesirable results.
3899
3900
3900 Use the -g/--git option to generate diffs in the git extended diff
3901 Use the -g/--git option to generate diffs in the git extended diff
3901 format. See :hg:`help diffs` for more information.
3902 format. See :hg:`help diffs` for more information.
3902
3903
3903 With the --switch-parent option, the diff will be against the
3904 With the --switch-parent option, the diff will be against the
3904 second parent. It can be useful to review a merge.
3905 second parent. It can be useful to review a merge.
3905
3906
3906 .. container:: verbose
3907 .. container:: verbose
3907
3908
3908 Examples:
3909 Examples:
3909
3910
3910 - use export and import to transplant a bugfix to the current
3911 - use export and import to transplant a bugfix to the current
3911 branch::
3912 branch::
3912
3913
3913 hg export -r 9353 | hg import -
3914 hg export -r 9353 | hg import -
3914
3915
3915 - export all the changesets between two revisions to a file with
3916 - export all the changesets between two revisions to a file with
3916 rename information::
3917 rename information::
3917
3918
3918 hg export --git -r 123:150 > changes.txt
3919 hg export --git -r 123:150 > changes.txt
3919
3920
3920 - split outgoing changes into a series of patches with
3921 - split outgoing changes into a series of patches with
3921 descriptive names::
3922 descriptive names::
3922
3923
3923 hg export -r "outgoing()" -o "%n-%m.patch"
3924 hg export -r "outgoing()" -o "%n-%m.patch"
3924
3925
3925 Returns 0 on success.
3926 Returns 0 on success.
3926 """
3927 """
3927 changesets += tuple(opts.get('rev', []))
3928 changesets += tuple(opts.get('rev', []))
3928 if not changesets:
3929 if not changesets:
3929 changesets = ['.']
3930 changesets = ['.']
3930 revs = scmutil.revrange(repo, changesets)
3931 revs = scmutil.revrange(repo, changesets)
3931 if not revs:
3932 if not revs:
3932 raise error.Abort(_("export requires at least one changeset"))
3933 raise error.Abort(_("export requires at least one changeset"))
3933 if len(revs) > 1:
3934 if len(revs) > 1:
3934 ui.note(_('exporting patches:\n'))
3935 ui.note(_('exporting patches:\n'))
3935 else:
3936 else:
3936 ui.note(_('exporting patch:\n'))
3937 ui.note(_('exporting patch:\n'))
3937 cmdutil.export(repo, revs, template=opts.get('output'),
3938 cmdutil.export(repo, revs, template=opts.get('output'),
3938 switch_parent=opts.get('switch_parent'),
3939 switch_parent=opts.get('switch_parent'),
3939 opts=patch.diffallopts(ui, opts))
3940 opts=patch.diffallopts(ui, opts))
3940
3941
3941 @command('files',
3942 @command('files',
3942 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3943 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3943 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3944 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3944 ] + walkopts + formatteropts + subrepoopts,
3945 ] + walkopts + formatteropts + subrepoopts,
3945 _('[OPTION]... [FILE]...'))
3946 _('[OPTION]... [FILE]...'))
3946 def files(ui, repo, *pats, **opts):
3947 def files(ui, repo, *pats, **opts):
3947 """list tracked files
3948 """list tracked files
3948
3949
3949 Print files under Mercurial control in the working directory or
3950 Print files under Mercurial control in the working directory or
3950 specified revision for given files (excluding removed files).
3951 specified revision for given files (excluding removed files).
3951 Files can be specified as filenames or filesets.
3952 Files can be specified as filenames or filesets.
3952
3953
3953 If no files are given to match, this command prints the names
3954 If no files are given to match, this command prints the names
3954 of all files under Mercurial control.
3955 of all files under Mercurial control.
3955
3956
3956 .. container:: verbose
3957 .. container:: verbose
3957
3958
3958 Examples:
3959 Examples:
3959
3960
3960 - list all files under the current directory::
3961 - list all files under the current directory::
3961
3962
3962 hg files .
3963 hg files .
3963
3964
3964 - shows sizes and flags for current revision::
3965 - shows sizes and flags for current revision::
3965
3966
3966 hg files -vr .
3967 hg files -vr .
3967
3968
3968 - list all files named README::
3969 - list all files named README::
3969
3970
3970 hg files -I "**/README"
3971 hg files -I "**/README"
3971
3972
3972 - list all binary files::
3973 - list all binary files::
3973
3974
3974 hg files "set:binary()"
3975 hg files "set:binary()"
3975
3976
3976 - find files containing a regular expression::
3977 - find files containing a regular expression::
3977
3978
3978 hg files "set:grep('bob')"
3979 hg files "set:grep('bob')"
3979
3980
3980 - search tracked file contents with xargs and grep::
3981 - search tracked file contents with xargs and grep::
3981
3982
3982 hg files -0 | xargs -0 grep foo
3983 hg files -0 | xargs -0 grep foo
3983
3984
3984 See :hg:`help patterns` and :hg:`help filesets` for more information
3985 See :hg:`help patterns` and :hg:`help filesets` for more information
3985 on specifying file patterns.
3986 on specifying file patterns.
3986
3987
3987 Returns 0 if a match is found, 1 otherwise.
3988 Returns 0 if a match is found, 1 otherwise.
3988
3989
3989 """
3990 """
3990 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3991 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3991
3992
3992 end = '\n'
3993 end = '\n'
3993 if opts.get('print0'):
3994 if opts.get('print0'):
3994 end = '\0'
3995 end = '\0'
3995 fmt = '%s' + end
3996 fmt = '%s' + end
3996
3997
3997 m = scmutil.match(ctx, pats, opts)
3998 m = scmutil.match(ctx, pats, opts)
3998 with ui.formatter('files', opts) as fm:
3999 with ui.formatter('files', opts) as fm:
3999 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
4000 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
4000
4001
4001 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
4002 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
4002 def forget(ui, repo, *pats, **opts):
4003 def forget(ui, repo, *pats, **opts):
4003 """forget the specified files on the next commit
4004 """forget the specified files on the next commit
4004
4005
4005 Mark the specified files so they will no longer be tracked
4006 Mark the specified files so they will no longer be tracked
4006 after the next commit.
4007 after the next commit.
4007
4008
4008 This only removes files from the current branch, not from the
4009 This only removes files from the current branch, not from the
4009 entire project history, and it does not delete them from the
4010 entire project history, and it does not delete them from the
4010 working directory.
4011 working directory.
4011
4012
4012 To delete the file from the working directory, see :hg:`remove`.
4013 To delete the file from the working directory, see :hg:`remove`.
4013
4014
4014 To undo a forget before the next commit, see :hg:`add`.
4015 To undo a forget before the next commit, see :hg:`add`.
4015
4016
4016 .. container:: verbose
4017 .. container:: verbose
4017
4018
4018 Examples:
4019 Examples:
4019
4020
4020 - forget newly-added binary files::
4021 - forget newly-added binary files::
4021
4022
4022 hg forget "set:added() and binary()"
4023 hg forget "set:added() and binary()"
4023
4024
4024 - forget files that would be excluded by .hgignore::
4025 - forget files that would be excluded by .hgignore::
4025
4026
4026 hg forget "set:hgignore()"
4027 hg forget "set:hgignore()"
4027
4028
4028 Returns 0 on success.
4029 Returns 0 on success.
4029 """
4030 """
4030
4031
4031 if not pats:
4032 if not pats:
4032 raise error.Abort(_('no files specified'))
4033 raise error.Abort(_('no files specified'))
4033
4034
4034 m = scmutil.match(repo[None], pats, opts)
4035 m = scmutil.match(repo[None], pats, opts)
4035 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4036 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4036 return rejected and 1 or 0
4037 return rejected and 1 or 0
4037
4038
4038 @command(
4039 @command(
4039 'graft',
4040 'graft',
4040 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4041 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4041 ('c', 'continue', False, _('resume interrupted graft')),
4042 ('c', 'continue', False, _('resume interrupted graft')),
4042 ('e', 'edit', False, _('invoke editor on commit messages')),
4043 ('e', 'edit', False, _('invoke editor on commit messages')),
4043 ('', 'log', None, _('append graft info to log message')),
4044 ('', 'log', None, _('append graft info to log message')),
4044 ('f', 'force', False, _('force graft')),
4045 ('f', 'force', False, _('force graft')),
4045 ('D', 'currentdate', False,
4046 ('D', 'currentdate', False,
4046 _('record the current date as commit date')),
4047 _('record the current date as commit date')),
4047 ('U', 'currentuser', False,
4048 ('U', 'currentuser', False,
4048 _('record the current user as committer'), _('DATE'))]
4049 _('record the current user as committer'), _('DATE'))]
4049 + commitopts2 + mergetoolopts + dryrunopts,
4050 + commitopts2 + mergetoolopts + dryrunopts,
4050 _('[OPTION]... [-r REV]... REV...'))
4051 _('[OPTION]... [-r REV]... REV...'))
4051 def graft(ui, repo, *revs, **opts):
4052 def graft(ui, repo, *revs, **opts):
4052 '''copy changes from other branches onto the current branch
4053 '''copy changes from other branches onto the current branch
4053
4054
4054 This command uses Mercurial's merge logic to copy individual
4055 This command uses Mercurial's merge logic to copy individual
4055 changes from other branches without merging branches in the
4056 changes from other branches without merging branches in the
4056 history graph. This is sometimes known as 'backporting' or
4057 history graph. This is sometimes known as 'backporting' or
4057 'cherry-picking'. By default, graft will copy user, date, and
4058 'cherry-picking'. By default, graft will copy user, date, and
4058 description from the source changesets.
4059 description from the source changesets.
4059
4060
4060 Changesets that are ancestors of the current revision, that have
4061 Changesets that are ancestors of the current revision, that have
4061 already been grafted, or that are merges will be skipped.
4062 already been grafted, or that are merges will be skipped.
4062
4063
4063 If --log is specified, log messages will have a comment appended
4064 If --log is specified, log messages will have a comment appended
4064 of the form::
4065 of the form::
4065
4066
4066 (grafted from CHANGESETHASH)
4067 (grafted from CHANGESETHASH)
4067
4068
4068 If --force is specified, revisions will be grafted even if they
4069 If --force is specified, revisions will be grafted even if they
4069 are already ancestors of or have been grafted to the destination.
4070 are already ancestors of or have been grafted to the destination.
4070 This is useful when the revisions have since been backed out.
4071 This is useful when the revisions have since been backed out.
4071
4072
4072 If a graft merge results in conflicts, the graft process is
4073 If a graft merge results in conflicts, the graft process is
4073 interrupted so that the current merge can be manually resolved.
4074 interrupted so that the current merge can be manually resolved.
4074 Once all conflicts are addressed, the graft process can be
4075 Once all conflicts are addressed, the graft process can be
4075 continued with the -c/--continue option.
4076 continued with the -c/--continue option.
4076
4077
4077 .. note::
4078 .. note::
4078
4079
4079 The -c/--continue option does not reapply earlier options, except
4080 The -c/--continue option does not reapply earlier options, except
4080 for --force.
4081 for --force.
4081
4082
4082 .. container:: verbose
4083 .. container:: verbose
4083
4084
4084 Examples:
4085 Examples:
4085
4086
4086 - copy a single change to the stable branch and edit its description::
4087 - copy a single change to the stable branch and edit its description::
4087
4088
4088 hg update stable
4089 hg update stable
4089 hg graft --edit 9393
4090 hg graft --edit 9393
4090
4091
4091 - graft a range of changesets with one exception, updating dates::
4092 - graft a range of changesets with one exception, updating dates::
4092
4093
4093 hg graft -D "2085::2093 and not 2091"
4094 hg graft -D "2085::2093 and not 2091"
4094
4095
4095 - continue a graft after resolving conflicts::
4096 - continue a graft after resolving conflicts::
4096
4097
4097 hg graft -c
4098 hg graft -c
4098
4099
4099 - show the source of a grafted changeset::
4100 - show the source of a grafted changeset::
4100
4101
4101 hg log --debug -r .
4102 hg log --debug -r .
4102
4103
4103 - show revisions sorted by date::
4104 - show revisions sorted by date::
4104
4105
4105 hg log -r "sort(all(), date)"
4106 hg log -r "sort(all(), date)"
4106
4107
4107 See :hg:`help revisions` and :hg:`help revsets` for more about
4108 See :hg:`help revisions` and :hg:`help revsets` for more about
4108 specifying revisions.
4109 specifying revisions.
4109
4110
4110 Returns 0 on successful completion.
4111 Returns 0 on successful completion.
4111 '''
4112 '''
4112 with repo.wlock():
4113 with repo.wlock():
4113 return _dograft(ui, repo, *revs, **opts)
4114 return _dograft(ui, repo, *revs, **opts)
4114
4115
4115 def _dograft(ui, repo, *revs, **opts):
4116 def _dograft(ui, repo, *revs, **opts):
4116 if revs and opts.get('rev'):
4117 if revs and opts.get('rev'):
4117 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4118 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4118 'revision ordering!\n'))
4119 'revision ordering!\n'))
4119
4120
4120 revs = list(revs)
4121 revs = list(revs)
4121 revs.extend(opts.get('rev'))
4122 revs.extend(opts.get('rev'))
4122
4123
4123 if not opts.get('user') and opts.get('currentuser'):
4124 if not opts.get('user') and opts.get('currentuser'):
4124 opts['user'] = ui.username()
4125 opts['user'] = ui.username()
4125 if not opts.get('date') and opts.get('currentdate'):
4126 if not opts.get('date') and opts.get('currentdate'):
4126 opts['date'] = "%d %d" % util.makedate()
4127 opts['date'] = "%d %d" % util.makedate()
4127
4128
4128 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4129 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4129
4130
4130 cont = False
4131 cont = False
4131 if opts.get('continue'):
4132 if opts.get('continue'):
4132 cont = True
4133 cont = True
4133 if revs:
4134 if revs:
4134 raise error.Abort(_("can't specify --continue and revisions"))
4135 raise error.Abort(_("can't specify --continue and revisions"))
4135 # read in unfinished revisions
4136 # read in unfinished revisions
4136 try:
4137 try:
4137 nodes = repo.vfs.read('graftstate').splitlines()
4138 nodes = repo.vfs.read('graftstate').splitlines()
4138 revs = [repo[node].rev() for node in nodes]
4139 revs = [repo[node].rev() for node in nodes]
4139 except IOError as inst:
4140 except IOError as inst:
4140 if inst.errno != errno.ENOENT:
4141 if inst.errno != errno.ENOENT:
4141 raise
4142 raise
4142 cmdutil.wrongtooltocontinue(repo, _('graft'))
4143 cmdutil.wrongtooltocontinue(repo, _('graft'))
4143 else:
4144 else:
4144 cmdutil.checkunfinished(repo)
4145 cmdutil.checkunfinished(repo)
4145 cmdutil.bailifchanged(repo)
4146 cmdutil.bailifchanged(repo)
4146 if not revs:
4147 if not revs:
4147 raise error.Abort(_('no revisions specified'))
4148 raise error.Abort(_('no revisions specified'))
4148 revs = scmutil.revrange(repo, revs)
4149 revs = scmutil.revrange(repo, revs)
4149
4150
4150 skipped = set()
4151 skipped = set()
4151 # check for merges
4152 # check for merges
4152 for rev in repo.revs('%ld and merge()', revs):
4153 for rev in repo.revs('%ld and merge()', revs):
4153 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4154 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4154 skipped.add(rev)
4155 skipped.add(rev)
4155 revs = [r for r in revs if r not in skipped]
4156 revs = [r for r in revs if r not in skipped]
4156 if not revs:
4157 if not revs:
4157 return -1
4158 return -1
4158
4159
4159 # Don't check in the --continue case, in effect retaining --force across
4160 # Don't check in the --continue case, in effect retaining --force across
4160 # --continues. That's because without --force, any revisions we decided to
4161 # --continues. That's because without --force, any revisions we decided to
4161 # skip would have been filtered out here, so they wouldn't have made their
4162 # skip would have been filtered out here, so they wouldn't have made their
4162 # way to the graftstate. With --force, any revisions we would have otherwise
4163 # way to the graftstate. With --force, any revisions we would have otherwise
4163 # skipped would not have been filtered out, and if they hadn't been applied
4164 # skipped would not have been filtered out, and if they hadn't been applied
4164 # already, they'd have been in the graftstate.
4165 # already, they'd have been in the graftstate.
4165 if not (cont or opts.get('force')):
4166 if not (cont or opts.get('force')):
4166 # check for ancestors of dest branch
4167 # check for ancestors of dest branch
4167 crev = repo['.'].rev()
4168 crev = repo['.'].rev()
4168 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4169 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4169 # XXX make this lazy in the future
4170 # XXX make this lazy in the future
4170 # don't mutate while iterating, create a copy
4171 # don't mutate while iterating, create a copy
4171 for rev in list(revs):
4172 for rev in list(revs):
4172 if rev in ancestors:
4173 if rev in ancestors:
4173 ui.warn(_('skipping ancestor revision %d:%s\n') %
4174 ui.warn(_('skipping ancestor revision %d:%s\n') %
4174 (rev, repo[rev]))
4175 (rev, repo[rev]))
4175 # XXX remove on list is slow
4176 # XXX remove on list is slow
4176 revs.remove(rev)
4177 revs.remove(rev)
4177 if not revs:
4178 if not revs:
4178 return -1
4179 return -1
4179
4180
4180 # analyze revs for earlier grafts
4181 # analyze revs for earlier grafts
4181 ids = {}
4182 ids = {}
4182 for ctx in repo.set("%ld", revs):
4183 for ctx in repo.set("%ld", revs):
4183 ids[ctx.hex()] = ctx.rev()
4184 ids[ctx.hex()] = ctx.rev()
4184 n = ctx.extra().get('source')
4185 n = ctx.extra().get('source')
4185 if n:
4186 if n:
4186 ids[n] = ctx.rev()
4187 ids[n] = ctx.rev()
4187
4188
4188 # check ancestors for earlier grafts
4189 # check ancestors for earlier grafts
4189 ui.debug('scanning for duplicate grafts\n')
4190 ui.debug('scanning for duplicate grafts\n')
4190
4191
4191 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4192 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4192 ctx = repo[rev]
4193 ctx = repo[rev]
4193 n = ctx.extra().get('source')
4194 n = ctx.extra().get('source')
4194 if n in ids:
4195 if n in ids:
4195 try:
4196 try:
4196 r = repo[n].rev()
4197 r = repo[n].rev()
4197 except error.RepoLookupError:
4198 except error.RepoLookupError:
4198 r = None
4199 r = None
4199 if r in revs:
4200 if r in revs:
4200 ui.warn(_('skipping revision %d:%s '
4201 ui.warn(_('skipping revision %d:%s '
4201 '(already grafted to %d:%s)\n')
4202 '(already grafted to %d:%s)\n')
4202 % (r, repo[r], rev, ctx))
4203 % (r, repo[r], rev, ctx))
4203 revs.remove(r)
4204 revs.remove(r)
4204 elif ids[n] in revs:
4205 elif ids[n] in revs:
4205 if r is None:
4206 if r is None:
4206 ui.warn(_('skipping already grafted revision %d:%s '
4207 ui.warn(_('skipping already grafted revision %d:%s '
4207 '(%d:%s also has unknown origin %s)\n')
4208 '(%d:%s also has unknown origin %s)\n')
4208 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4209 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4209 else:
4210 else:
4210 ui.warn(_('skipping already grafted revision %d:%s '
4211 ui.warn(_('skipping already grafted revision %d:%s '
4211 '(%d:%s also has origin %d:%s)\n')
4212 '(%d:%s also has origin %d:%s)\n')
4212 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4213 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4213 revs.remove(ids[n])
4214 revs.remove(ids[n])
4214 elif ctx.hex() in ids:
4215 elif ctx.hex() in ids:
4215 r = ids[ctx.hex()]
4216 r = ids[ctx.hex()]
4216 ui.warn(_('skipping already grafted revision %d:%s '
4217 ui.warn(_('skipping already grafted revision %d:%s '
4217 '(was grafted from %d:%s)\n') %
4218 '(was grafted from %d:%s)\n') %
4218 (r, repo[r], rev, ctx))
4219 (r, repo[r], rev, ctx))
4219 revs.remove(r)
4220 revs.remove(r)
4220 if not revs:
4221 if not revs:
4221 return -1
4222 return -1
4222
4223
4223 for pos, ctx in enumerate(repo.set("%ld", revs)):
4224 for pos, ctx in enumerate(repo.set("%ld", revs)):
4224 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4225 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4225 ctx.description().split('\n', 1)[0])
4226 ctx.description().split('\n', 1)[0])
4226 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4227 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4227 if names:
4228 if names:
4228 desc += ' (%s)' % ' '.join(names)
4229 desc += ' (%s)' % ' '.join(names)
4229 ui.status(_('grafting %s\n') % desc)
4230 ui.status(_('grafting %s\n') % desc)
4230 if opts.get('dry_run'):
4231 if opts.get('dry_run'):
4231 continue
4232 continue
4232
4233
4233 source = ctx.extra().get('source')
4234 source = ctx.extra().get('source')
4234 extra = {}
4235 extra = {}
4235 if source:
4236 if source:
4236 extra['source'] = source
4237 extra['source'] = source
4237 extra['intermediate-source'] = ctx.hex()
4238 extra['intermediate-source'] = ctx.hex()
4238 else:
4239 else:
4239 extra['source'] = ctx.hex()
4240 extra['source'] = ctx.hex()
4240 user = ctx.user()
4241 user = ctx.user()
4241 if opts.get('user'):
4242 if opts.get('user'):
4242 user = opts['user']
4243 user = opts['user']
4243 date = ctx.date()
4244 date = ctx.date()
4244 if opts.get('date'):
4245 if opts.get('date'):
4245 date = opts['date']
4246 date = opts['date']
4246 message = ctx.description()
4247 message = ctx.description()
4247 if opts.get('log'):
4248 if opts.get('log'):
4248 message += '\n(grafted from %s)' % ctx.hex()
4249 message += '\n(grafted from %s)' % ctx.hex()
4249
4250
4250 # we don't merge the first commit when continuing
4251 # we don't merge the first commit when continuing
4251 if not cont:
4252 if not cont:
4252 # perform the graft merge with p1(rev) as 'ancestor'
4253 # perform the graft merge with p1(rev) as 'ancestor'
4253 try:
4254 try:
4254 # ui.forcemerge is an internal variable, do not document
4255 # ui.forcemerge is an internal variable, do not document
4255 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4256 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4256 'graft')
4257 'graft')
4257 stats = mergemod.graft(repo, ctx, ctx.p1(),
4258 stats = mergemod.graft(repo, ctx, ctx.p1(),
4258 ['local', 'graft'])
4259 ['local', 'graft'])
4259 finally:
4260 finally:
4260 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4261 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4261 # report any conflicts
4262 # report any conflicts
4262 if stats and stats[3] > 0:
4263 if stats and stats[3] > 0:
4263 # write out state for --continue
4264 # write out state for --continue
4264 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4265 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4265 repo.vfs.write('graftstate', ''.join(nodelines))
4266 repo.vfs.write('graftstate', ''.join(nodelines))
4266 extra = ''
4267 extra = ''
4267 if opts.get('user'):
4268 if opts.get('user'):
4268 extra += ' --user %s' % util.shellquote(opts['user'])
4269 extra += ' --user %s' % util.shellquote(opts['user'])
4269 if opts.get('date'):
4270 if opts.get('date'):
4270 extra += ' --date %s' % util.shellquote(opts['date'])
4271 extra += ' --date %s' % util.shellquote(opts['date'])
4271 if opts.get('log'):
4272 if opts.get('log'):
4272 extra += ' --log'
4273 extra += ' --log'
4273 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4274 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4274 raise error.Abort(
4275 raise error.Abort(
4275 _("unresolved conflicts, can't continue"),
4276 _("unresolved conflicts, can't continue"),
4276 hint=hint)
4277 hint=hint)
4277 else:
4278 else:
4278 cont = False
4279 cont = False
4279
4280
4280 # commit
4281 # commit
4281 node = repo.commit(text=message, user=user,
4282 node = repo.commit(text=message, user=user,
4282 date=date, extra=extra, editor=editor)
4283 date=date, extra=extra, editor=editor)
4283 if node is None:
4284 if node is None:
4284 ui.warn(
4285 ui.warn(
4285 _('note: graft of %d:%s created no changes to commit\n') %
4286 _('note: graft of %d:%s created no changes to commit\n') %
4286 (ctx.rev(), ctx))
4287 (ctx.rev(), ctx))
4287
4288
4288 # remove state when we complete successfully
4289 # remove state when we complete successfully
4289 if not opts.get('dry_run'):
4290 if not opts.get('dry_run'):
4290 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4291 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4291
4292
4292 return 0
4293 return 0
4293
4294
4294 @command('grep',
4295 @command('grep',
4295 [('0', 'print0', None, _('end fields with NUL')),
4296 [('0', 'print0', None, _('end fields with NUL')),
4296 ('', 'all', None, _('print all revisions that match')),
4297 ('', 'all', None, _('print all revisions that match')),
4297 ('a', 'text', None, _('treat all files as text')),
4298 ('a', 'text', None, _('treat all files as text')),
4298 ('f', 'follow', None,
4299 ('f', 'follow', None,
4299 _('follow changeset history,'
4300 _('follow changeset history,'
4300 ' or file history across copies and renames')),
4301 ' or file history across copies and renames')),
4301 ('i', 'ignore-case', None, _('ignore case when matching')),
4302 ('i', 'ignore-case', None, _('ignore case when matching')),
4302 ('l', 'files-with-matches', None,
4303 ('l', 'files-with-matches', None,
4303 _('print only filenames and revisions that match')),
4304 _('print only filenames and revisions that match')),
4304 ('n', 'line-number', None, _('print matching line numbers')),
4305 ('n', 'line-number', None, _('print matching line numbers')),
4305 ('r', 'rev', [],
4306 ('r', 'rev', [],
4306 _('only search files changed within revision range'), _('REV')),
4307 _('only search files changed within revision range'), _('REV')),
4307 ('u', 'user', None, _('list the author (long with -v)')),
4308 ('u', 'user', None, _('list the author (long with -v)')),
4308 ('d', 'date', None, _('list the date (short with -q)')),
4309 ('d', 'date', None, _('list the date (short with -q)')),
4309 ] + formatteropts + walkopts,
4310 ] + formatteropts + walkopts,
4310 _('[OPTION]... PATTERN [FILE]...'),
4311 _('[OPTION]... PATTERN [FILE]...'),
4311 inferrepo=True)
4312 inferrepo=True)
4312 def grep(ui, repo, pattern, *pats, **opts):
4313 def grep(ui, repo, pattern, *pats, **opts):
4313 """search for a pattern in specified files and revisions
4314 """search for a pattern in specified files and revisions
4314
4315
4315 Search revisions of files for a regular expression.
4316 Search revisions of files for a regular expression.
4316
4317
4317 This command behaves differently than Unix grep. It only accepts
4318 This command behaves differently than Unix grep. It only accepts
4318 Python/Perl regexps. It searches repository history, not the
4319 Python/Perl regexps. It searches repository history, not the
4319 working directory. It always prints the revision number in which a
4320 working directory. It always prints the revision number in which a
4320 match appears.
4321 match appears.
4321
4322
4322 By default, grep only prints output for the first revision of a
4323 By default, grep only prints output for the first revision of a
4323 file in which it finds a match. To get it to print every revision
4324 file in which it finds a match. To get it to print every revision
4324 that contains a change in match status ("-" for a match that
4325 that contains a change in match status ("-" for a match that
4325 becomes a non-match, or "+" for a non-match that becomes a match),
4326 becomes a non-match, or "+" for a non-match that becomes a match),
4326 use the --all flag.
4327 use the --all flag.
4327
4328
4328 Returns 0 if a match is found, 1 otherwise.
4329 Returns 0 if a match is found, 1 otherwise.
4329 """
4330 """
4330 reflags = re.M
4331 reflags = re.M
4331 if opts.get('ignore_case'):
4332 if opts.get('ignore_case'):
4332 reflags |= re.I
4333 reflags |= re.I
4333 try:
4334 try:
4334 regexp = util.re.compile(pattern, reflags)
4335 regexp = util.re.compile(pattern, reflags)
4335 except re.error as inst:
4336 except re.error as inst:
4336 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4337 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4337 return 1
4338 return 1
4338 sep, eol = ':', '\n'
4339 sep, eol = ':', '\n'
4339 if opts.get('print0'):
4340 if opts.get('print0'):
4340 sep = eol = '\0'
4341 sep = eol = '\0'
4341
4342
4342 getfile = util.lrucachefunc(repo.file)
4343 getfile = util.lrucachefunc(repo.file)
4343
4344
4344 def matchlines(body):
4345 def matchlines(body):
4345 begin = 0
4346 begin = 0
4346 linenum = 0
4347 linenum = 0
4347 while begin < len(body):
4348 while begin < len(body):
4348 match = regexp.search(body, begin)
4349 match = regexp.search(body, begin)
4349 if not match:
4350 if not match:
4350 break
4351 break
4351 mstart, mend = match.span()
4352 mstart, mend = match.span()
4352 linenum += body.count('\n', begin, mstart) + 1
4353 linenum += body.count('\n', begin, mstart) + 1
4353 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4354 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4354 begin = body.find('\n', mend) + 1 or len(body) + 1
4355 begin = body.find('\n', mend) + 1 or len(body) + 1
4355 lend = begin - 1
4356 lend = begin - 1
4356 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4357 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4357
4358
4358 class linestate(object):
4359 class linestate(object):
4359 def __init__(self, line, linenum, colstart, colend):
4360 def __init__(self, line, linenum, colstart, colend):
4360 self.line = line
4361 self.line = line
4361 self.linenum = linenum
4362 self.linenum = linenum
4362 self.colstart = colstart
4363 self.colstart = colstart
4363 self.colend = colend
4364 self.colend = colend
4364
4365
4365 def __hash__(self):
4366 def __hash__(self):
4366 return hash((self.linenum, self.line))
4367 return hash((self.linenum, self.line))
4367
4368
4368 def __eq__(self, other):
4369 def __eq__(self, other):
4369 return self.line == other.line
4370 return self.line == other.line
4370
4371
4371 def findpos(self):
4372 def findpos(self):
4372 """Iterate all (start, end) indices of matches"""
4373 """Iterate all (start, end) indices of matches"""
4373 yield self.colstart, self.colend
4374 yield self.colstart, self.colend
4374 p = self.colend
4375 p = self.colend
4375 while p < len(self.line):
4376 while p < len(self.line):
4376 m = regexp.search(self.line, p)
4377 m = regexp.search(self.line, p)
4377 if not m:
4378 if not m:
4378 break
4379 break
4379 yield m.span()
4380 yield m.span()
4380 p = m.end()
4381 p = m.end()
4381
4382
4382 matches = {}
4383 matches = {}
4383 copies = {}
4384 copies = {}
4384 def grepbody(fn, rev, body):
4385 def grepbody(fn, rev, body):
4385 matches[rev].setdefault(fn, [])
4386 matches[rev].setdefault(fn, [])
4386 m = matches[rev][fn]
4387 m = matches[rev][fn]
4387 for lnum, cstart, cend, line in matchlines(body):
4388 for lnum, cstart, cend, line in matchlines(body):
4388 s = linestate(line, lnum, cstart, cend)
4389 s = linestate(line, lnum, cstart, cend)
4389 m.append(s)
4390 m.append(s)
4390
4391
4391 def difflinestates(a, b):
4392 def difflinestates(a, b):
4392 sm = difflib.SequenceMatcher(None, a, b)
4393 sm = difflib.SequenceMatcher(None, a, b)
4393 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4394 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4394 if tag == 'insert':
4395 if tag == 'insert':
4395 for i in xrange(blo, bhi):
4396 for i in xrange(blo, bhi):
4396 yield ('+', b[i])
4397 yield ('+', b[i])
4397 elif tag == 'delete':
4398 elif tag == 'delete':
4398 for i in xrange(alo, ahi):
4399 for i in xrange(alo, ahi):
4399 yield ('-', a[i])
4400 yield ('-', a[i])
4400 elif tag == 'replace':
4401 elif tag == 'replace':
4401 for i in xrange(alo, ahi):
4402 for i in xrange(alo, ahi):
4402 yield ('-', a[i])
4403 yield ('-', a[i])
4403 for i in xrange(blo, bhi):
4404 for i in xrange(blo, bhi):
4404 yield ('+', b[i])
4405 yield ('+', b[i])
4405
4406
4406 def display(fm, fn, ctx, pstates, states):
4407 def display(fm, fn, ctx, pstates, states):
4407 rev = ctx.rev()
4408 rev = ctx.rev()
4408 if fm:
4409 if fm:
4409 formatuser = str
4410 formatuser = str
4410 else:
4411 else:
4411 formatuser = ui.shortuser
4412 formatuser = ui.shortuser
4412 if ui.quiet:
4413 if ui.quiet:
4413 datefmt = '%Y-%m-%d'
4414 datefmt = '%Y-%m-%d'
4414 else:
4415 else:
4415 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4416 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4416 found = False
4417 found = False
4417 @util.cachefunc
4418 @util.cachefunc
4418 def binary():
4419 def binary():
4419 flog = getfile(fn)
4420 flog = getfile(fn)
4420 return util.binary(flog.read(ctx.filenode(fn)))
4421 return util.binary(flog.read(ctx.filenode(fn)))
4421
4422
4422 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4423 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4423 if opts.get('all'):
4424 if opts.get('all'):
4424 iter = difflinestates(pstates, states)
4425 iter = difflinestates(pstates, states)
4425 else:
4426 else:
4426 iter = [('', l) for l in states]
4427 iter = [('', l) for l in states]
4427 for change, l in iter:
4428 for change, l in iter:
4428 fm.startitem()
4429 fm.startitem()
4429 fm.data(node=fm.hexfunc(ctx.node()))
4430 fm.data(node=fm.hexfunc(ctx.node()))
4430 cols = [
4431 cols = [
4431 ('filename', fn, True),
4432 ('filename', fn, True),
4432 ('rev', rev, True),
4433 ('rev', rev, True),
4433 ('linenumber', l.linenum, opts.get('line_number')),
4434 ('linenumber', l.linenum, opts.get('line_number')),
4434 ]
4435 ]
4435 if opts.get('all'):
4436 if opts.get('all'):
4436 cols.append(('change', change, True))
4437 cols.append(('change', change, True))
4437 cols.extend([
4438 cols.extend([
4438 ('user', formatuser(ctx.user()), opts.get('user')),
4439 ('user', formatuser(ctx.user()), opts.get('user')),
4439 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4440 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4440 ])
4441 ])
4441 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4442 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4442 for name, data, cond in cols:
4443 for name, data, cond in cols:
4443 field = fieldnamemap.get(name, name)
4444 field = fieldnamemap.get(name, name)
4444 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4445 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4445 if cond and name != lastcol:
4446 if cond and name != lastcol:
4446 fm.plain(sep, label='grep.sep')
4447 fm.plain(sep, label='grep.sep')
4447 if not opts.get('files_with_matches'):
4448 if not opts.get('files_with_matches'):
4448 fm.plain(sep, label='grep.sep')
4449 fm.plain(sep, label='grep.sep')
4449 if not opts.get('text') and binary():
4450 if not opts.get('text') and binary():
4450 fm.plain(_(" Binary file matches"))
4451 fm.plain(_(" Binary file matches"))
4451 else:
4452 else:
4452 displaymatches(fm.nested('texts'), l)
4453 displaymatches(fm.nested('texts'), l)
4453 fm.plain(eol)
4454 fm.plain(eol)
4454 found = True
4455 found = True
4455 if opts.get('files_with_matches'):
4456 if opts.get('files_with_matches'):
4456 break
4457 break
4457 return found
4458 return found
4458
4459
4459 def displaymatches(fm, l):
4460 def displaymatches(fm, l):
4460 p = 0
4461 p = 0
4461 for s, e in l.findpos():
4462 for s, e in l.findpos():
4462 if p < s:
4463 if p < s:
4463 fm.startitem()
4464 fm.startitem()
4464 fm.write('text', '%s', l.line[p:s])
4465 fm.write('text', '%s', l.line[p:s])
4465 fm.data(matched=False)
4466 fm.data(matched=False)
4466 fm.startitem()
4467 fm.startitem()
4467 fm.write('text', '%s', l.line[s:e], label='grep.match')
4468 fm.write('text', '%s', l.line[s:e], label='grep.match')
4468 fm.data(matched=True)
4469 fm.data(matched=True)
4469 p = e
4470 p = e
4470 if p < len(l.line):
4471 if p < len(l.line):
4471 fm.startitem()
4472 fm.startitem()
4472 fm.write('text', '%s', l.line[p:])
4473 fm.write('text', '%s', l.line[p:])
4473 fm.data(matched=False)
4474 fm.data(matched=False)
4474 fm.end()
4475 fm.end()
4475
4476
4476 skip = {}
4477 skip = {}
4477 revfiles = {}
4478 revfiles = {}
4478 matchfn = scmutil.match(repo[None], pats, opts)
4479 matchfn = scmutil.match(repo[None], pats, opts)
4479 found = False
4480 found = False
4480 follow = opts.get('follow')
4481 follow = opts.get('follow')
4481
4482
4482 def prep(ctx, fns):
4483 def prep(ctx, fns):
4483 rev = ctx.rev()
4484 rev = ctx.rev()
4484 pctx = ctx.p1()
4485 pctx = ctx.p1()
4485 parent = pctx.rev()
4486 parent = pctx.rev()
4486 matches.setdefault(rev, {})
4487 matches.setdefault(rev, {})
4487 matches.setdefault(parent, {})
4488 matches.setdefault(parent, {})
4488 files = revfiles.setdefault(rev, [])
4489 files = revfiles.setdefault(rev, [])
4489 for fn in fns:
4490 for fn in fns:
4490 flog = getfile(fn)
4491 flog = getfile(fn)
4491 try:
4492 try:
4492 fnode = ctx.filenode(fn)
4493 fnode = ctx.filenode(fn)
4493 except error.LookupError:
4494 except error.LookupError:
4494 continue
4495 continue
4495
4496
4496 copied = flog.renamed(fnode)
4497 copied = flog.renamed(fnode)
4497 copy = follow and copied and copied[0]
4498 copy = follow and copied and copied[0]
4498 if copy:
4499 if copy:
4499 copies.setdefault(rev, {})[fn] = copy
4500 copies.setdefault(rev, {})[fn] = copy
4500 if fn in skip:
4501 if fn in skip:
4501 if copy:
4502 if copy:
4502 skip[copy] = True
4503 skip[copy] = True
4503 continue
4504 continue
4504 files.append(fn)
4505 files.append(fn)
4505
4506
4506 if fn not in matches[rev]:
4507 if fn not in matches[rev]:
4507 grepbody(fn, rev, flog.read(fnode))
4508 grepbody(fn, rev, flog.read(fnode))
4508
4509
4509 pfn = copy or fn
4510 pfn = copy or fn
4510 if pfn not in matches[parent]:
4511 if pfn not in matches[parent]:
4511 try:
4512 try:
4512 fnode = pctx.filenode(pfn)
4513 fnode = pctx.filenode(pfn)
4513 grepbody(pfn, parent, flog.read(fnode))
4514 grepbody(pfn, parent, flog.read(fnode))
4514 except error.LookupError:
4515 except error.LookupError:
4515 pass
4516 pass
4516
4517
4517 fm = ui.formatter('grep', opts)
4518 fm = ui.formatter('grep', opts)
4518 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4519 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4519 rev = ctx.rev()
4520 rev = ctx.rev()
4520 parent = ctx.p1().rev()
4521 parent = ctx.p1().rev()
4521 for fn in sorted(revfiles.get(rev, [])):
4522 for fn in sorted(revfiles.get(rev, [])):
4522 states = matches[rev][fn]
4523 states = matches[rev][fn]
4523 copy = copies.get(rev, {}).get(fn)
4524 copy = copies.get(rev, {}).get(fn)
4524 if fn in skip:
4525 if fn in skip:
4525 if copy:
4526 if copy:
4526 skip[copy] = True
4527 skip[copy] = True
4527 continue
4528 continue
4528 pstates = matches.get(parent, {}).get(copy or fn, [])
4529 pstates = matches.get(parent, {}).get(copy or fn, [])
4529 if pstates or states:
4530 if pstates or states:
4530 r = display(fm, fn, ctx, pstates, states)
4531 r = display(fm, fn, ctx, pstates, states)
4531 found = found or r
4532 found = found or r
4532 if r and not opts.get('all'):
4533 if r and not opts.get('all'):
4533 skip[fn] = True
4534 skip[fn] = True
4534 if copy:
4535 if copy:
4535 skip[copy] = True
4536 skip[copy] = True
4536 del matches[rev]
4537 del matches[rev]
4537 del revfiles[rev]
4538 del revfiles[rev]
4538 fm.end()
4539 fm.end()
4539
4540
4540 return not found
4541 return not found
4541
4542
4542 @command('heads',
4543 @command('heads',
4543 [('r', 'rev', '',
4544 [('r', 'rev', '',
4544 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4545 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4545 ('t', 'topo', False, _('show topological heads only')),
4546 ('t', 'topo', False, _('show topological heads only')),
4546 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4547 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4547 ('c', 'closed', False, _('show normal and closed branch heads')),
4548 ('c', 'closed', False, _('show normal and closed branch heads')),
4548 ] + templateopts,
4549 ] + templateopts,
4549 _('[-ct] [-r STARTREV] [REV]...'))
4550 _('[-ct] [-r STARTREV] [REV]...'))
4550 def heads(ui, repo, *branchrevs, **opts):
4551 def heads(ui, repo, *branchrevs, **opts):
4551 """show branch heads
4552 """show branch heads
4552
4553
4553 With no arguments, show all open branch heads in the repository.
4554 With no arguments, show all open branch heads in the repository.
4554 Branch heads are changesets that have no descendants on the
4555 Branch heads are changesets that have no descendants on the
4555 same branch. They are where development generally takes place and
4556 same branch. They are where development generally takes place and
4556 are the usual targets for update and merge operations.
4557 are the usual targets for update and merge operations.
4557
4558
4558 If one or more REVs are given, only open branch heads on the
4559 If one or more REVs are given, only open branch heads on the
4559 branches associated with the specified changesets are shown. This
4560 branches associated with the specified changesets are shown. This
4560 means that you can use :hg:`heads .` to see the heads on the
4561 means that you can use :hg:`heads .` to see the heads on the
4561 currently checked-out branch.
4562 currently checked-out branch.
4562
4563
4563 If -c/--closed is specified, also show branch heads marked closed
4564 If -c/--closed is specified, also show branch heads marked closed
4564 (see :hg:`commit --close-branch`).
4565 (see :hg:`commit --close-branch`).
4565
4566
4566 If STARTREV is specified, only those heads that are descendants of
4567 If STARTREV is specified, only those heads that are descendants of
4567 STARTREV will be displayed.
4568 STARTREV will be displayed.
4568
4569
4569 If -t/--topo is specified, named branch mechanics will be ignored and only
4570 If -t/--topo is specified, named branch mechanics will be ignored and only
4570 topological heads (changesets with no children) will be shown.
4571 topological heads (changesets with no children) will be shown.
4571
4572
4572 Returns 0 if matching heads are found, 1 if not.
4573 Returns 0 if matching heads are found, 1 if not.
4573 """
4574 """
4574
4575
4575 start = None
4576 start = None
4576 if 'rev' in opts:
4577 if 'rev' in opts:
4577 start = scmutil.revsingle(repo, opts['rev'], None).node()
4578 start = scmutil.revsingle(repo, opts['rev'], None).node()
4578
4579
4579 if opts.get('topo'):
4580 if opts.get('topo'):
4580 heads = [repo[h] for h in repo.heads(start)]
4581 heads = [repo[h] for h in repo.heads(start)]
4581 else:
4582 else:
4582 heads = []
4583 heads = []
4583 for branch in repo.branchmap():
4584 for branch in repo.branchmap():
4584 heads += repo.branchheads(branch, start, opts.get('closed'))
4585 heads += repo.branchheads(branch, start, opts.get('closed'))
4585 heads = [repo[h] for h in heads]
4586 heads = [repo[h] for h in heads]
4586
4587
4587 if branchrevs:
4588 if branchrevs:
4588 branches = set(repo[br].branch() for br in branchrevs)
4589 branches = set(repo[br].branch() for br in branchrevs)
4589 heads = [h for h in heads if h.branch() in branches]
4590 heads = [h for h in heads if h.branch() in branches]
4590
4591
4591 if opts.get('active') and branchrevs:
4592 if opts.get('active') and branchrevs:
4592 dagheads = repo.heads(start)
4593 dagheads = repo.heads(start)
4593 heads = [h for h in heads if h.node() in dagheads]
4594 heads = [h for h in heads if h.node() in dagheads]
4594
4595
4595 if branchrevs:
4596 if branchrevs:
4596 haveheads = set(h.branch() for h in heads)
4597 haveheads = set(h.branch() for h in heads)
4597 if branches - haveheads:
4598 if branches - haveheads:
4598 headless = ', '.join(b for b in branches - haveheads)
4599 headless = ', '.join(b for b in branches - haveheads)
4599 msg = _('no open branch heads found on branches %s')
4600 msg = _('no open branch heads found on branches %s')
4600 if opts.get('rev'):
4601 if opts.get('rev'):
4601 msg += _(' (started at %s)') % opts['rev']
4602 msg += _(' (started at %s)') % opts['rev']
4602 ui.warn((msg + '\n') % headless)
4603 ui.warn((msg + '\n') % headless)
4603
4604
4604 if not heads:
4605 if not heads:
4605 return 1
4606 return 1
4606
4607
4607 heads = sorted(heads, key=lambda x: -x.rev())
4608 heads = sorted(heads, key=lambda x: -x.rev())
4608 displayer = cmdutil.show_changeset(ui, repo, opts)
4609 displayer = cmdutil.show_changeset(ui, repo, opts)
4609 for ctx in heads:
4610 for ctx in heads:
4610 displayer.show(ctx)
4611 displayer.show(ctx)
4611 displayer.close()
4612 displayer.close()
4612
4613
4613 @command('help',
4614 @command('help',
4614 [('e', 'extension', None, _('show only help for extensions')),
4615 [('e', 'extension', None, _('show only help for extensions')),
4615 ('c', 'command', None, _('show only help for commands')),
4616 ('c', 'command', None, _('show only help for commands')),
4616 ('k', 'keyword', None, _('show topics matching keyword')),
4617 ('k', 'keyword', None, _('show topics matching keyword')),
4617 ('s', 'system', [], _('show help for specific platform(s)')),
4618 ('s', 'system', [], _('show help for specific platform(s)')),
4618 ],
4619 ],
4619 _('[-ecks] [TOPIC]'),
4620 _('[-ecks] [TOPIC]'),
4620 norepo=True)
4621 norepo=True)
4621 def help_(ui, name=None, **opts):
4622 def help_(ui, name=None, **opts):
4622 """show help for a given topic or a help overview
4623 """show help for a given topic or a help overview
4623
4624
4624 With no arguments, print a list of commands with short help messages.
4625 With no arguments, print a list of commands with short help messages.
4625
4626
4626 Given a topic, extension, or command name, print help for that
4627 Given a topic, extension, or command name, print help for that
4627 topic.
4628 topic.
4628
4629
4629 Returns 0 if successful.
4630 Returns 0 if successful.
4630 """
4631 """
4631
4632
4632 textwidth = ui.configint('ui', 'textwidth', 78)
4633 textwidth = ui.configint('ui', 'textwidth', 78)
4633 termwidth = ui.termwidth() - 2
4634 termwidth = ui.termwidth() - 2
4634 if textwidth <= 0 or termwidth < textwidth:
4635 if textwidth <= 0 or termwidth < textwidth:
4635 textwidth = termwidth
4636 textwidth = termwidth
4636
4637
4637 keep = opts.get('system') or []
4638 keep = opts.get('system') or []
4638 if len(keep) == 0:
4639 if len(keep) == 0:
4639 if sys.platform.startswith('win'):
4640 if sys.platform.startswith('win'):
4640 keep.append('windows')
4641 keep.append('windows')
4641 elif sys.platform == 'OpenVMS':
4642 elif sys.platform == 'OpenVMS':
4642 keep.append('vms')
4643 keep.append('vms')
4643 elif sys.platform == 'plan9':
4644 elif sys.platform == 'plan9':
4644 keep.append('plan9')
4645 keep.append('plan9')
4645 else:
4646 else:
4646 keep.append('unix')
4647 keep.append('unix')
4647 keep.append(sys.platform.lower())
4648 keep.append(sys.platform.lower())
4648 if ui.verbose:
4649 if ui.verbose:
4649 keep.append('verbose')
4650 keep.append('verbose')
4650
4651
4651 section = None
4652 section = None
4652 subtopic = None
4653 subtopic = None
4653 if name and '.' in name:
4654 if name and '.' in name:
4654 name, remaining = name.split('.', 1)
4655 name, remaining = name.split('.', 1)
4655 remaining = encoding.lower(remaining)
4656 remaining = encoding.lower(remaining)
4656 if '.' in remaining:
4657 if '.' in remaining:
4657 subtopic, section = remaining.split('.', 1)
4658 subtopic, section = remaining.split('.', 1)
4658 else:
4659 else:
4659 if name in help.subtopics:
4660 if name in help.subtopics:
4660 subtopic = remaining
4661 subtopic = remaining
4661 else:
4662 else:
4662 section = remaining
4663 section = remaining
4663
4664
4664 text = help.help_(ui, name, subtopic=subtopic, **opts)
4665 text = help.help_(ui, name, subtopic=subtopic, **opts)
4665
4666
4666 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4667 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4667 section=section)
4668 section=section)
4668
4669
4669 # We could have been given a weird ".foo" section without a name
4670 # We could have been given a weird ".foo" section without a name
4670 # to look for, or we could have simply failed to found "foo.bar"
4671 # to look for, or we could have simply failed to found "foo.bar"
4671 # because bar isn't a section of foo
4672 # because bar isn't a section of foo
4672 if section and not (formatted and name):
4673 if section and not (formatted and name):
4673 raise error.Abort(_("help section not found"))
4674 raise error.Abort(_("help section not found"))
4674
4675
4675 if 'verbose' in pruned:
4676 if 'verbose' in pruned:
4676 keep.append('omitted')
4677 keep.append('omitted')
4677 else:
4678 else:
4678 keep.append('notomitted')
4679 keep.append('notomitted')
4679 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4680 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4680 section=section)
4681 section=section)
4681 ui.write(formatted)
4682 ui.write(formatted)
4682
4683
4683
4684
4684 @command('identify|id',
4685 @command('identify|id',
4685 [('r', 'rev', '',
4686 [('r', 'rev', '',
4686 _('identify the specified revision'), _('REV')),
4687 _('identify the specified revision'), _('REV')),
4687 ('n', 'num', None, _('show local revision number')),
4688 ('n', 'num', None, _('show local revision number')),
4688 ('i', 'id', None, _('show global revision id')),
4689 ('i', 'id', None, _('show global revision id')),
4689 ('b', 'branch', None, _('show branch')),
4690 ('b', 'branch', None, _('show branch')),
4690 ('t', 'tags', None, _('show tags')),
4691 ('t', 'tags', None, _('show tags')),
4691 ('B', 'bookmarks', None, _('show bookmarks')),
4692 ('B', 'bookmarks', None, _('show bookmarks')),
4692 ] + remoteopts,
4693 ] + remoteopts,
4693 _('[-nibtB] [-r REV] [SOURCE]'),
4694 _('[-nibtB] [-r REV] [SOURCE]'),
4694 optionalrepo=True)
4695 optionalrepo=True)
4695 def identify(ui, repo, source=None, rev=None,
4696 def identify(ui, repo, source=None, rev=None,
4696 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4697 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4697 """identify the working directory or specified revision
4698 """identify the working directory or specified revision
4698
4699
4699 Print a summary identifying the repository state at REV using one or
4700 Print a summary identifying the repository state at REV using one or
4700 two parent hash identifiers, followed by a "+" if the working
4701 two parent hash identifiers, followed by a "+" if the working
4701 directory has uncommitted changes, the branch name (if not default),
4702 directory has uncommitted changes, the branch name (if not default),
4702 a list of tags, and a list of bookmarks.
4703 a list of tags, and a list of bookmarks.
4703
4704
4704 When REV is not given, print a summary of the current state of the
4705 When REV is not given, print a summary of the current state of the
4705 repository.
4706 repository.
4706
4707
4707 Specifying a path to a repository root or Mercurial bundle will
4708 Specifying a path to a repository root or Mercurial bundle will
4708 cause lookup to operate on that repository/bundle.
4709 cause lookup to operate on that repository/bundle.
4709
4710
4710 .. container:: verbose
4711 .. container:: verbose
4711
4712
4712 Examples:
4713 Examples:
4713
4714
4714 - generate a build identifier for the working directory::
4715 - generate a build identifier for the working directory::
4715
4716
4716 hg id --id > build-id.dat
4717 hg id --id > build-id.dat
4717
4718
4718 - find the revision corresponding to a tag::
4719 - find the revision corresponding to a tag::
4719
4720
4720 hg id -n -r 1.3
4721 hg id -n -r 1.3
4721
4722
4722 - check the most recent revision of a remote repository::
4723 - check the most recent revision of a remote repository::
4723
4724
4724 hg id -r tip http://selenic.com/hg/
4725 hg id -r tip http://selenic.com/hg/
4725
4726
4726 See :hg:`log` for generating more information about specific revisions,
4727 See :hg:`log` for generating more information about specific revisions,
4727 including full hash identifiers.
4728 including full hash identifiers.
4728
4729
4729 Returns 0 if successful.
4730 Returns 0 if successful.
4730 """
4731 """
4731
4732
4732 if not repo and not source:
4733 if not repo and not source:
4733 raise error.Abort(_("there is no Mercurial repository here "
4734 raise error.Abort(_("there is no Mercurial repository here "
4734 "(.hg not found)"))
4735 "(.hg not found)"))
4735
4736
4736 if ui.debugflag:
4737 if ui.debugflag:
4737 hexfunc = hex
4738 hexfunc = hex
4738 else:
4739 else:
4739 hexfunc = short
4740 hexfunc = short
4740 default = not (num or id or branch or tags or bookmarks)
4741 default = not (num or id or branch or tags or bookmarks)
4741 output = []
4742 output = []
4742 revs = []
4743 revs = []
4743
4744
4744 if source:
4745 if source:
4745 source, branches = hg.parseurl(ui.expandpath(source))
4746 source, branches = hg.parseurl(ui.expandpath(source))
4746 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4747 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4747 repo = peer.local()
4748 repo = peer.local()
4748 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4749 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4749
4750
4750 if not repo:
4751 if not repo:
4751 if num or branch or tags:
4752 if num or branch or tags:
4752 raise error.Abort(
4753 raise error.Abort(
4753 _("can't query remote revision number, branch, or tags"))
4754 _("can't query remote revision number, branch, or tags"))
4754 if not rev and revs:
4755 if not rev and revs:
4755 rev = revs[0]
4756 rev = revs[0]
4756 if not rev:
4757 if not rev:
4757 rev = "tip"
4758 rev = "tip"
4758
4759
4759 remoterev = peer.lookup(rev)
4760 remoterev = peer.lookup(rev)
4760 if default or id:
4761 if default or id:
4761 output = [hexfunc(remoterev)]
4762 output = [hexfunc(remoterev)]
4762
4763
4763 def getbms():
4764 def getbms():
4764 bms = []
4765 bms = []
4765
4766
4766 if 'bookmarks' in peer.listkeys('namespaces'):
4767 if 'bookmarks' in peer.listkeys('namespaces'):
4767 hexremoterev = hex(remoterev)
4768 hexremoterev = hex(remoterev)
4768 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4769 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4769 if bmr == hexremoterev]
4770 if bmr == hexremoterev]
4770
4771
4771 return sorted(bms)
4772 return sorted(bms)
4772
4773
4773 if bookmarks:
4774 if bookmarks:
4774 output.extend(getbms())
4775 output.extend(getbms())
4775 elif default and not ui.quiet:
4776 elif default and not ui.quiet:
4776 # multiple bookmarks for a single parent separated by '/'
4777 # multiple bookmarks for a single parent separated by '/'
4777 bm = '/'.join(getbms())
4778 bm = '/'.join(getbms())
4778 if bm:
4779 if bm:
4779 output.append(bm)
4780 output.append(bm)
4780 else:
4781 else:
4781 ctx = scmutil.revsingle(repo, rev, None)
4782 ctx = scmutil.revsingle(repo, rev, None)
4782
4783
4783 if ctx.rev() is None:
4784 if ctx.rev() is None:
4784 ctx = repo[None]
4785 ctx = repo[None]
4785 parents = ctx.parents()
4786 parents = ctx.parents()
4786 taglist = []
4787 taglist = []
4787 for p in parents:
4788 for p in parents:
4788 taglist.extend(p.tags())
4789 taglist.extend(p.tags())
4789
4790
4790 changed = ""
4791 changed = ""
4791 if default or id or num:
4792 if default or id or num:
4792 if (any(repo.status())
4793 if (any(repo.status())
4793 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4794 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4794 changed = '+'
4795 changed = '+'
4795 if default or id:
4796 if default or id:
4796 output = ["%s%s" %
4797 output = ["%s%s" %
4797 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4798 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4798 if num:
4799 if num:
4799 output.append("%s%s" %
4800 output.append("%s%s" %
4800 ('+'.join([str(p.rev()) for p in parents]), changed))
4801 ('+'.join([str(p.rev()) for p in parents]), changed))
4801 else:
4802 else:
4802 if default or id:
4803 if default or id:
4803 output = [hexfunc(ctx.node())]
4804 output = [hexfunc(ctx.node())]
4804 if num:
4805 if num:
4805 output.append(str(ctx.rev()))
4806 output.append(str(ctx.rev()))
4806 taglist = ctx.tags()
4807 taglist = ctx.tags()
4807
4808
4808 if default and not ui.quiet:
4809 if default and not ui.quiet:
4809 b = ctx.branch()
4810 b = ctx.branch()
4810 if b != 'default':
4811 if b != 'default':
4811 output.append("(%s)" % b)
4812 output.append("(%s)" % b)
4812
4813
4813 # multiple tags for a single parent separated by '/'
4814 # multiple tags for a single parent separated by '/'
4814 t = '/'.join(taglist)
4815 t = '/'.join(taglist)
4815 if t:
4816 if t:
4816 output.append(t)
4817 output.append(t)
4817
4818
4818 # multiple bookmarks for a single parent separated by '/'
4819 # multiple bookmarks for a single parent separated by '/'
4819 bm = '/'.join(ctx.bookmarks())
4820 bm = '/'.join(ctx.bookmarks())
4820 if bm:
4821 if bm:
4821 output.append(bm)
4822 output.append(bm)
4822 else:
4823 else:
4823 if branch:
4824 if branch:
4824 output.append(ctx.branch())
4825 output.append(ctx.branch())
4825
4826
4826 if tags:
4827 if tags:
4827 output.extend(taglist)
4828 output.extend(taglist)
4828
4829
4829 if bookmarks:
4830 if bookmarks:
4830 output.extend(ctx.bookmarks())
4831 output.extend(ctx.bookmarks())
4831
4832
4832 ui.write("%s\n" % ' '.join(output))
4833 ui.write("%s\n" % ' '.join(output))
4833
4834
4834 @command('import|patch',
4835 @command('import|patch',
4835 [('p', 'strip', 1,
4836 [('p', 'strip', 1,
4836 _('directory strip option for patch. This has the same '
4837 _('directory strip option for patch. This has the same '
4837 'meaning as the corresponding patch option'), _('NUM')),
4838 'meaning as the corresponding patch option'), _('NUM')),
4838 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4839 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4839 ('e', 'edit', False, _('invoke editor on commit messages')),
4840 ('e', 'edit', False, _('invoke editor on commit messages')),
4840 ('f', 'force', None,
4841 ('f', 'force', None,
4841 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4842 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4842 ('', 'no-commit', None,
4843 ('', 'no-commit', None,
4843 _("don't commit, just update the working directory")),
4844 _("don't commit, just update the working directory")),
4844 ('', 'bypass', None,
4845 ('', 'bypass', None,
4845 _("apply patch without touching the working directory")),
4846 _("apply patch without touching the working directory")),
4846 ('', 'partial', None,
4847 ('', 'partial', None,
4847 _('commit even if some hunks fail')),
4848 _('commit even if some hunks fail')),
4848 ('', 'exact', None,
4849 ('', 'exact', None,
4849 _('abort if patch would apply lossily')),
4850 _('abort if patch would apply lossily')),
4850 ('', 'prefix', '',
4851 ('', 'prefix', '',
4851 _('apply patch to subdirectory'), _('DIR')),
4852 _('apply patch to subdirectory'), _('DIR')),
4852 ('', 'import-branch', None,
4853 ('', 'import-branch', None,
4853 _('use any branch information in patch (implied by --exact)'))] +
4854 _('use any branch information in patch (implied by --exact)'))] +
4854 commitopts + commitopts2 + similarityopts,
4855 commitopts + commitopts2 + similarityopts,
4855 _('[OPTION]... PATCH...'))
4856 _('[OPTION]... PATCH...'))
4856 def import_(ui, repo, patch1=None, *patches, **opts):
4857 def import_(ui, repo, patch1=None, *patches, **opts):
4857 """import an ordered set of patches
4858 """import an ordered set of patches
4858
4859
4859 Import a list of patches and commit them individually (unless
4860 Import a list of patches and commit them individually (unless
4860 --no-commit is specified).
4861 --no-commit is specified).
4861
4862
4862 To read a patch from standard input, use "-" as the patch name. If
4863 To read a patch from standard input, use "-" as the patch name. If
4863 a URL is specified, the patch will be downloaded from there.
4864 a URL is specified, the patch will be downloaded from there.
4864
4865
4865 Import first applies changes to the working directory (unless
4866 Import first applies changes to the working directory (unless
4866 --bypass is specified), import will abort if there are outstanding
4867 --bypass is specified), import will abort if there are outstanding
4867 changes.
4868 changes.
4868
4869
4869 Use --bypass to apply and commit patches directly to the
4870 Use --bypass to apply and commit patches directly to the
4870 repository, without affecting the working directory. Without
4871 repository, without affecting the working directory. Without
4871 --exact, patches will be applied on top of the working directory
4872 --exact, patches will be applied on top of the working directory
4872 parent revision.
4873 parent revision.
4873
4874
4874 You can import a patch straight from a mail message. Even patches
4875 You can import a patch straight from a mail message. Even patches
4875 as attachments work (to use the body part, it must have type
4876 as attachments work (to use the body part, it must have type
4876 text/plain or text/x-patch). From and Subject headers of email
4877 text/plain or text/x-patch). From and Subject headers of email
4877 message are used as default committer and commit message. All
4878 message are used as default committer and commit message. All
4878 text/plain body parts before first diff are added to the commit
4879 text/plain body parts before first diff are added to the commit
4879 message.
4880 message.
4880
4881
4881 If the imported patch was generated by :hg:`export`, user and
4882 If the imported patch was generated by :hg:`export`, user and
4882 description from patch override values from message headers and
4883 description from patch override values from message headers and
4883 body. Values given on command line with -m/--message and -u/--user
4884 body. Values given on command line with -m/--message and -u/--user
4884 override these.
4885 override these.
4885
4886
4886 If --exact is specified, import will set the working directory to
4887 If --exact is specified, import will set the working directory to
4887 the parent of each patch before applying it, and will abort if the
4888 the parent of each patch before applying it, and will abort if the
4888 resulting changeset has a different ID than the one recorded in
4889 resulting changeset has a different ID than the one recorded in
4889 the patch. This will guard against various ways that portable
4890 the patch. This will guard against various ways that portable
4890 patch formats and mail systems might fail to transfer Mercurial
4891 patch formats and mail systems might fail to transfer Mercurial
4891 data or metadata. See :hg:`bundle` for lossless transmission.
4892 data or metadata. See :hg:`bundle` for lossless transmission.
4892
4893
4893 Use --partial to ensure a changeset will be created from the patch
4894 Use --partial to ensure a changeset will be created from the patch
4894 even if some hunks fail to apply. Hunks that fail to apply will be
4895 even if some hunks fail to apply. Hunks that fail to apply will be
4895 written to a <target-file>.rej file. Conflicts can then be resolved
4896 written to a <target-file>.rej file. Conflicts can then be resolved
4896 by hand before :hg:`commit --amend` is run to update the created
4897 by hand before :hg:`commit --amend` is run to update the created
4897 changeset. This flag exists to let people import patches that
4898 changeset. This flag exists to let people import patches that
4898 partially apply without losing the associated metadata (author,
4899 partially apply without losing the associated metadata (author,
4899 date, description, ...).
4900 date, description, ...).
4900
4901
4901 .. note::
4902 .. note::
4902
4903
4903 When no hunks apply cleanly, :hg:`import --partial` will create
4904 When no hunks apply cleanly, :hg:`import --partial` will create
4904 an empty changeset, importing only the patch metadata.
4905 an empty changeset, importing only the patch metadata.
4905
4906
4906 With -s/--similarity, hg will attempt to discover renames and
4907 With -s/--similarity, hg will attempt to discover renames and
4907 copies in the patch in the same way as :hg:`addremove`.
4908 copies in the patch in the same way as :hg:`addremove`.
4908
4909
4909 It is possible to use external patch programs to perform the patch
4910 It is possible to use external patch programs to perform the patch
4910 by setting the ``ui.patch`` configuration option. For the default
4911 by setting the ``ui.patch`` configuration option. For the default
4911 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4912 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4912 See :hg:`help config` for more information about configuration
4913 See :hg:`help config` for more information about configuration
4913 files and how to use these options.
4914 files and how to use these options.
4914
4915
4915 See :hg:`help dates` for a list of formats valid for -d/--date.
4916 See :hg:`help dates` for a list of formats valid for -d/--date.
4916
4917
4917 .. container:: verbose
4918 .. container:: verbose
4918
4919
4919 Examples:
4920 Examples:
4920
4921
4921 - import a traditional patch from a website and detect renames::
4922 - import a traditional patch from a website and detect renames::
4922
4923
4923 hg import -s 80 http://example.com/bugfix.patch
4924 hg import -s 80 http://example.com/bugfix.patch
4924
4925
4925 - import a changeset from an hgweb server::
4926 - import a changeset from an hgweb server::
4926
4927
4927 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4928 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4928
4929
4929 - import all the patches in an Unix-style mbox::
4930 - import all the patches in an Unix-style mbox::
4930
4931
4931 hg import incoming-patches.mbox
4932 hg import incoming-patches.mbox
4932
4933
4933 - attempt to exactly restore an exported changeset (not always
4934 - attempt to exactly restore an exported changeset (not always
4934 possible)::
4935 possible)::
4935
4936
4936 hg import --exact proposed-fix.patch
4937 hg import --exact proposed-fix.patch
4937
4938
4938 - use an external tool to apply a patch which is too fuzzy for
4939 - use an external tool to apply a patch which is too fuzzy for
4939 the default internal tool.
4940 the default internal tool.
4940
4941
4941 hg import --config ui.patch="patch --merge" fuzzy.patch
4942 hg import --config ui.patch="patch --merge" fuzzy.patch
4942
4943
4943 - change the default fuzzing from 2 to a less strict 7
4944 - change the default fuzzing from 2 to a less strict 7
4944
4945
4945 hg import --config ui.fuzz=7 fuzz.patch
4946 hg import --config ui.fuzz=7 fuzz.patch
4946
4947
4947 Returns 0 on success, 1 on partial success (see --partial).
4948 Returns 0 on success, 1 on partial success (see --partial).
4948 """
4949 """
4949
4950
4950 if not patch1:
4951 if not patch1:
4951 raise error.Abort(_('need at least one patch to import'))
4952 raise error.Abort(_('need at least one patch to import'))
4952
4953
4953 patches = (patch1,) + patches
4954 patches = (patch1,) + patches
4954
4955
4955 date = opts.get('date')
4956 date = opts.get('date')
4956 if date:
4957 if date:
4957 opts['date'] = util.parsedate(date)
4958 opts['date'] = util.parsedate(date)
4958
4959
4959 exact = opts.get('exact')
4960 exact = opts.get('exact')
4960 update = not opts.get('bypass')
4961 update = not opts.get('bypass')
4961 if not update and opts.get('no_commit'):
4962 if not update and opts.get('no_commit'):
4962 raise error.Abort(_('cannot use --no-commit with --bypass'))
4963 raise error.Abort(_('cannot use --no-commit with --bypass'))
4963 try:
4964 try:
4964 sim = float(opts.get('similarity') or 0)
4965 sim = float(opts.get('similarity') or 0)
4965 except ValueError:
4966 except ValueError:
4966 raise error.Abort(_('similarity must be a number'))
4967 raise error.Abort(_('similarity must be a number'))
4967 if sim < 0 or sim > 100:
4968 if sim < 0 or sim > 100:
4968 raise error.Abort(_('similarity must be between 0 and 100'))
4969 raise error.Abort(_('similarity must be between 0 and 100'))
4969 if sim and not update:
4970 if sim and not update:
4970 raise error.Abort(_('cannot use --similarity with --bypass'))
4971 raise error.Abort(_('cannot use --similarity with --bypass'))
4971 if exact:
4972 if exact:
4972 if opts.get('edit'):
4973 if opts.get('edit'):
4973 raise error.Abort(_('cannot use --exact with --edit'))
4974 raise error.Abort(_('cannot use --exact with --edit'))
4974 if opts.get('prefix'):
4975 if opts.get('prefix'):
4975 raise error.Abort(_('cannot use --exact with --prefix'))
4976 raise error.Abort(_('cannot use --exact with --prefix'))
4976
4977
4977 base = opts["base"]
4978 base = opts["base"]
4978 wlock = dsguard = lock = tr = None
4979 wlock = dsguard = lock = tr = None
4979 msgs = []
4980 msgs = []
4980 ret = 0
4981 ret = 0
4981
4982
4982
4983
4983 try:
4984 try:
4984 wlock = repo.wlock()
4985 wlock = repo.wlock()
4985
4986
4986 if update:
4987 if update:
4987 cmdutil.checkunfinished(repo)
4988 cmdutil.checkunfinished(repo)
4988 if (exact or not opts.get('force')):
4989 if (exact or not opts.get('force')):
4989 cmdutil.bailifchanged(repo)
4990 cmdutil.bailifchanged(repo)
4990
4991
4991 if not opts.get('no_commit'):
4992 if not opts.get('no_commit'):
4992 lock = repo.lock()
4993 lock = repo.lock()
4993 tr = repo.transaction('import')
4994 tr = repo.transaction('import')
4994 else:
4995 else:
4995 dsguard = cmdutil.dirstateguard(repo, 'import')
4996 dsguard = cmdutil.dirstateguard(repo, 'import')
4996 parents = repo[None].parents()
4997 parents = repo[None].parents()
4997 for patchurl in patches:
4998 for patchurl in patches:
4998 if patchurl == '-':
4999 if patchurl == '-':
4999 ui.status(_('applying patch from stdin\n'))
5000 ui.status(_('applying patch from stdin\n'))
5000 patchfile = ui.fin
5001 patchfile = ui.fin
5001 patchurl = 'stdin' # for error message
5002 patchurl = 'stdin' # for error message
5002 else:
5003 else:
5003 patchurl = os.path.join(base, patchurl)
5004 patchurl = os.path.join(base, patchurl)
5004 ui.status(_('applying %s\n') % patchurl)
5005 ui.status(_('applying %s\n') % patchurl)
5005 patchfile = hg.openpath(ui, patchurl)
5006 patchfile = hg.openpath(ui, patchurl)
5006
5007
5007 haspatch = False
5008 haspatch = False
5008 for hunk in patch.split(patchfile):
5009 for hunk in patch.split(patchfile):
5009 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
5010 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
5010 parents, opts,
5011 parents, opts,
5011 msgs, hg.clean)
5012 msgs, hg.clean)
5012 if msg:
5013 if msg:
5013 haspatch = True
5014 haspatch = True
5014 ui.note(msg + '\n')
5015 ui.note(msg + '\n')
5015 if update or exact:
5016 if update or exact:
5016 parents = repo[None].parents()
5017 parents = repo[None].parents()
5017 else:
5018 else:
5018 parents = [repo[node]]
5019 parents = [repo[node]]
5019 if rej:
5020 if rej:
5020 ui.write_err(_("patch applied partially\n"))
5021 ui.write_err(_("patch applied partially\n"))
5021 ui.write_err(_("(fix the .rej files and run "
5022 ui.write_err(_("(fix the .rej files and run "
5022 "`hg commit --amend`)\n"))
5023 "`hg commit --amend`)\n"))
5023 ret = 1
5024 ret = 1
5024 break
5025 break
5025
5026
5026 if not haspatch:
5027 if not haspatch:
5027 raise error.Abort(_('%s: no diffs found') % patchurl)
5028 raise error.Abort(_('%s: no diffs found') % patchurl)
5028
5029
5029 if tr:
5030 if tr:
5030 tr.close()
5031 tr.close()
5031 if msgs:
5032 if msgs:
5032 repo.savecommitmessage('\n* * *\n'.join(msgs))
5033 repo.savecommitmessage('\n* * *\n'.join(msgs))
5033 if dsguard:
5034 if dsguard:
5034 dsguard.close()
5035 dsguard.close()
5035 return ret
5036 return ret
5036 finally:
5037 finally:
5037 if tr:
5038 if tr:
5038 tr.release()
5039 tr.release()
5039 release(lock, dsguard, wlock)
5040 release(lock, dsguard, wlock)
5040
5041
5041 @command('incoming|in',
5042 @command('incoming|in',
5042 [('f', 'force', None,
5043 [('f', 'force', None,
5043 _('run even if remote repository is unrelated')),
5044 _('run even if remote repository is unrelated')),
5044 ('n', 'newest-first', None, _('show newest record first')),
5045 ('n', 'newest-first', None, _('show newest record first')),
5045 ('', 'bundle', '',
5046 ('', 'bundle', '',
5046 _('file to store the bundles into'), _('FILE')),
5047 _('file to store the bundles into'), _('FILE')),
5047 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5048 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5048 ('B', 'bookmarks', False, _("compare bookmarks")),
5049 ('B', 'bookmarks', False, _("compare bookmarks")),
5049 ('b', 'branch', [],
5050 ('b', 'branch', [],
5050 _('a specific branch you would like to pull'), _('BRANCH')),
5051 _('a specific branch you would like to pull'), _('BRANCH')),
5051 ] + logopts + remoteopts + subrepoopts,
5052 ] + logopts + remoteopts + subrepoopts,
5052 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5053 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5053 def incoming(ui, repo, source="default", **opts):
5054 def incoming(ui, repo, source="default", **opts):
5054 """show new changesets found in source
5055 """show new changesets found in source
5055
5056
5056 Show new changesets found in the specified path/URL or the default
5057 Show new changesets found in the specified path/URL or the default
5057 pull location. These are the changesets that would have been pulled
5058 pull location. These are the changesets that would have been pulled
5058 if a pull at the time you issued this command.
5059 if a pull at the time you issued this command.
5059
5060
5060 See pull for valid source format details.
5061 See pull for valid source format details.
5061
5062
5062 .. container:: verbose
5063 .. container:: verbose
5063
5064
5064 With -B/--bookmarks, the result of bookmark comparison between
5065 With -B/--bookmarks, the result of bookmark comparison between
5065 local and remote repositories is displayed. With -v/--verbose,
5066 local and remote repositories is displayed. With -v/--verbose,
5066 status is also displayed for each bookmark like below::
5067 status is also displayed for each bookmark like below::
5067
5068
5068 BM1 01234567890a added
5069 BM1 01234567890a added
5069 BM2 1234567890ab advanced
5070 BM2 1234567890ab advanced
5070 BM3 234567890abc diverged
5071 BM3 234567890abc diverged
5071 BM4 34567890abcd changed
5072 BM4 34567890abcd changed
5072
5073
5073 The action taken locally when pulling depends on the
5074 The action taken locally when pulling depends on the
5074 status of each bookmark:
5075 status of each bookmark:
5075
5076
5076 :``added``: pull will create it
5077 :``added``: pull will create it
5077 :``advanced``: pull will update it
5078 :``advanced``: pull will update it
5078 :``diverged``: pull will create a divergent bookmark
5079 :``diverged``: pull will create a divergent bookmark
5079 :``changed``: result depends on remote changesets
5080 :``changed``: result depends on remote changesets
5080
5081
5081 From the point of view of pulling behavior, bookmark
5082 From the point of view of pulling behavior, bookmark
5082 existing only in the remote repository are treated as ``added``,
5083 existing only in the remote repository are treated as ``added``,
5083 even if it is in fact locally deleted.
5084 even if it is in fact locally deleted.
5084
5085
5085 .. container:: verbose
5086 .. container:: verbose
5086
5087
5087 For remote repository, using --bundle avoids downloading the
5088 For remote repository, using --bundle avoids downloading the
5088 changesets twice if the incoming is followed by a pull.
5089 changesets twice if the incoming is followed by a pull.
5089
5090
5090 Examples:
5091 Examples:
5091
5092
5092 - show incoming changes with patches and full description::
5093 - show incoming changes with patches and full description::
5093
5094
5094 hg incoming -vp
5095 hg incoming -vp
5095
5096
5096 - show incoming changes excluding merges, store a bundle::
5097 - show incoming changes excluding merges, store a bundle::
5097
5098
5098 hg in -vpM --bundle incoming.hg
5099 hg in -vpM --bundle incoming.hg
5099 hg pull incoming.hg
5100 hg pull incoming.hg
5100
5101
5101 - briefly list changes inside a bundle::
5102 - briefly list changes inside a bundle::
5102
5103
5103 hg in changes.hg -T "{desc|firstline}\\n"
5104 hg in changes.hg -T "{desc|firstline}\\n"
5104
5105
5105 Returns 0 if there are incoming changes, 1 otherwise.
5106 Returns 0 if there are incoming changes, 1 otherwise.
5106 """
5107 """
5107 if opts.get('graph'):
5108 if opts.get('graph'):
5108 cmdutil.checkunsupportedgraphflags([], opts)
5109 cmdutil.checkunsupportedgraphflags([], opts)
5109 def display(other, chlist, displayer):
5110 def display(other, chlist, displayer):
5110 revdag = cmdutil.graphrevs(other, chlist, opts)
5111 revdag = cmdutil.graphrevs(other, chlist, opts)
5111 cmdutil.displaygraph(ui, repo, revdag, displayer,
5112 cmdutil.displaygraph(ui, repo, revdag, displayer,
5112 graphmod.asciiedges)
5113 graphmod.asciiedges)
5113
5114
5114 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5115 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5115 return 0
5116 return 0
5116
5117
5117 if opts.get('bundle') and opts.get('subrepos'):
5118 if opts.get('bundle') and opts.get('subrepos'):
5118 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5119 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5119
5120
5120 if opts.get('bookmarks'):
5121 if opts.get('bookmarks'):
5121 source, branches = hg.parseurl(ui.expandpath(source),
5122 source, branches = hg.parseurl(ui.expandpath(source),
5122 opts.get('branch'))
5123 opts.get('branch'))
5123 other = hg.peer(repo, opts, source)
5124 other = hg.peer(repo, opts, source)
5124 if 'bookmarks' not in other.listkeys('namespaces'):
5125 if 'bookmarks' not in other.listkeys('namespaces'):
5125 ui.warn(_("remote doesn't support bookmarks\n"))
5126 ui.warn(_("remote doesn't support bookmarks\n"))
5126 return 0
5127 return 0
5127 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5128 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5128 return bookmarks.incoming(ui, repo, other)
5129 return bookmarks.incoming(ui, repo, other)
5129
5130
5130 repo._subtoppath = ui.expandpath(source)
5131 repo._subtoppath = ui.expandpath(source)
5131 try:
5132 try:
5132 return hg.incoming(ui, repo, source, opts)
5133 return hg.incoming(ui, repo, source, opts)
5133 finally:
5134 finally:
5134 del repo._subtoppath
5135 del repo._subtoppath
5135
5136
5136
5137
5137 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5138 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5138 norepo=True)
5139 norepo=True)
5139 def init(ui, dest=".", **opts):
5140 def init(ui, dest=".", **opts):
5140 """create a new repository in the given directory
5141 """create a new repository in the given directory
5141
5142
5142 Initialize a new repository in the given directory. If the given
5143 Initialize a new repository in the given directory. If the given
5143 directory does not exist, it will be created.
5144 directory does not exist, it will be created.
5144
5145
5145 If no directory is given, the current directory is used.
5146 If no directory is given, the current directory is used.
5146
5147
5147 It is possible to specify an ``ssh://`` URL as the destination.
5148 It is possible to specify an ``ssh://`` URL as the destination.
5148 See :hg:`help urls` for more information.
5149 See :hg:`help urls` for more information.
5149
5150
5150 Returns 0 on success.
5151 Returns 0 on success.
5151 """
5152 """
5152 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5153 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5153
5154
5154 @command('locate',
5155 @command('locate',
5155 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5156 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5156 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5157 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5157 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5158 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5158 ] + walkopts,
5159 ] + walkopts,
5159 _('[OPTION]... [PATTERN]...'))
5160 _('[OPTION]... [PATTERN]...'))
5160 def locate(ui, repo, *pats, **opts):
5161 def locate(ui, repo, *pats, **opts):
5161 """locate files matching specific patterns (DEPRECATED)
5162 """locate files matching specific patterns (DEPRECATED)
5162
5163
5163 Print files under Mercurial control in the working directory whose
5164 Print files under Mercurial control in the working directory whose
5164 names match the given patterns.
5165 names match the given patterns.
5165
5166
5166 By default, this command searches all directories in the working
5167 By default, this command searches all directories in the working
5167 directory. To search just the current directory and its
5168 directory. To search just the current directory and its
5168 subdirectories, use "--include .".
5169 subdirectories, use "--include .".
5169
5170
5170 If no patterns are given to match, this command prints the names
5171 If no patterns are given to match, this command prints the names
5171 of all files under Mercurial control in the working directory.
5172 of all files under Mercurial control in the working directory.
5172
5173
5173 If you want to feed the output of this command into the "xargs"
5174 If you want to feed the output of this command into the "xargs"
5174 command, use the -0 option to both this command and "xargs". This
5175 command, use the -0 option to both this command and "xargs". This
5175 will avoid the problem of "xargs" treating single filenames that
5176 will avoid the problem of "xargs" treating single filenames that
5176 contain whitespace as multiple filenames.
5177 contain whitespace as multiple filenames.
5177
5178
5178 See :hg:`help files` for a more versatile command.
5179 See :hg:`help files` for a more versatile command.
5179
5180
5180 Returns 0 if a match is found, 1 otherwise.
5181 Returns 0 if a match is found, 1 otherwise.
5181 """
5182 """
5182 if opts.get('print0'):
5183 if opts.get('print0'):
5183 end = '\0'
5184 end = '\0'
5184 else:
5185 else:
5185 end = '\n'
5186 end = '\n'
5186 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5187 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5187
5188
5188 ret = 1
5189 ret = 1
5189 ctx = repo[rev]
5190 ctx = repo[rev]
5190 m = scmutil.match(ctx, pats, opts, default='relglob',
5191 m = scmutil.match(ctx, pats, opts, default='relglob',
5191 badfn=lambda x, y: False)
5192 badfn=lambda x, y: False)
5192
5193
5193 for abs in ctx.matches(m):
5194 for abs in ctx.matches(m):
5194 if opts.get('fullpath'):
5195 if opts.get('fullpath'):
5195 ui.write(repo.wjoin(abs), end)
5196 ui.write(repo.wjoin(abs), end)
5196 else:
5197 else:
5197 ui.write(((pats and m.rel(abs)) or abs), end)
5198 ui.write(((pats and m.rel(abs)) or abs), end)
5198 ret = 0
5199 ret = 0
5199
5200
5200 return ret
5201 return ret
5201
5202
5202 @command('^log|history',
5203 @command('^log|history',
5203 [('f', 'follow', None,
5204 [('f', 'follow', None,
5204 _('follow changeset history, or file history across copies and renames')),
5205 _('follow changeset history, or file history across copies and renames')),
5205 ('', 'follow-first', None,
5206 ('', 'follow-first', None,
5206 _('only follow the first parent of merge changesets (DEPRECATED)')),
5207 _('only follow the first parent of merge changesets (DEPRECATED)')),
5207 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5208 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5208 ('C', 'copies', None, _('show copied files')),
5209 ('C', 'copies', None, _('show copied files')),
5209 ('k', 'keyword', [],
5210 ('k', 'keyword', [],
5210 _('do case-insensitive search for a given text'), _('TEXT')),
5211 _('do case-insensitive search for a given text'), _('TEXT')),
5211 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5212 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5212 ('', 'removed', None, _('include revisions where files were removed')),
5213 ('', 'removed', None, _('include revisions where files were removed')),
5213 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5214 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5214 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5215 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5215 ('', 'only-branch', [],
5216 ('', 'only-branch', [],
5216 _('show only changesets within the given named branch (DEPRECATED)'),
5217 _('show only changesets within the given named branch (DEPRECATED)'),
5217 _('BRANCH')),
5218 _('BRANCH')),
5218 ('b', 'branch', [],
5219 ('b', 'branch', [],
5219 _('show changesets within the given named branch'), _('BRANCH')),
5220 _('show changesets within the given named branch'), _('BRANCH')),
5220 ('P', 'prune', [],
5221 ('P', 'prune', [],
5221 _('do not display revision or any of its ancestors'), _('REV')),
5222 _('do not display revision or any of its ancestors'), _('REV')),
5222 ] + logopts + walkopts,
5223 ] + logopts + walkopts,
5223 _('[OPTION]... [FILE]'),
5224 _('[OPTION]... [FILE]'),
5224 inferrepo=True)
5225 inferrepo=True)
5225 def log(ui, repo, *pats, **opts):
5226 def log(ui, repo, *pats, **opts):
5226 """show revision history of entire repository or files
5227 """show revision history of entire repository or files
5227
5228
5228 Print the revision history of the specified files or the entire
5229 Print the revision history of the specified files or the entire
5229 project.
5230 project.
5230
5231
5231 If no revision range is specified, the default is ``tip:0`` unless
5232 If no revision range is specified, the default is ``tip:0`` unless
5232 --follow is set, in which case the working directory parent is
5233 --follow is set, in which case the working directory parent is
5233 used as the starting revision.
5234 used as the starting revision.
5234
5235
5235 File history is shown without following rename or copy history of
5236 File history is shown without following rename or copy history of
5236 files. Use -f/--follow with a filename to follow history across
5237 files. Use -f/--follow with a filename to follow history across
5237 renames and copies. --follow without a filename will only show
5238 renames and copies. --follow without a filename will only show
5238 ancestors or descendants of the starting revision.
5239 ancestors or descendants of the starting revision.
5239
5240
5240 By default this command prints revision number and changeset id,
5241 By default this command prints revision number and changeset id,
5241 tags, non-trivial parents, user, date and time, and a summary for
5242 tags, non-trivial parents, user, date and time, and a summary for
5242 each commit. When the -v/--verbose switch is used, the list of
5243 each commit. When the -v/--verbose switch is used, the list of
5243 changed files and full commit message are shown.
5244 changed files and full commit message are shown.
5244
5245
5245 With --graph the revisions are shown as an ASCII art DAG with the most
5246 With --graph the revisions are shown as an ASCII art DAG with the most
5246 recent changeset at the top.
5247 recent changeset at the top.
5247 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5248 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5248 and '+' represents a fork where the changeset from the lines below is a
5249 and '+' represents a fork where the changeset from the lines below is a
5249 parent of the 'o' merge on the same line.
5250 parent of the 'o' merge on the same line.
5250
5251
5251 .. note::
5252 .. note::
5252
5253
5253 :hg:`log --patch` may generate unexpected diff output for merge
5254 :hg:`log --patch` may generate unexpected diff output for merge
5254 changesets, as it will only compare the merge changeset against
5255 changesets, as it will only compare the merge changeset against
5255 its first parent. Also, only files different from BOTH parents
5256 its first parent. Also, only files different from BOTH parents
5256 will appear in files:.
5257 will appear in files:.
5257
5258
5258 .. note::
5259 .. note::
5259
5260
5260 For performance reasons, :hg:`log FILE` may omit duplicate changes
5261 For performance reasons, :hg:`log FILE` may omit duplicate changes
5261 made on branches and will not show removals or mode changes. To
5262 made on branches and will not show removals or mode changes. To
5262 see all such changes, use the --removed switch.
5263 see all such changes, use the --removed switch.
5263
5264
5264 .. container:: verbose
5265 .. container:: verbose
5265
5266
5266 Some examples:
5267 Some examples:
5267
5268
5268 - changesets with full descriptions and file lists::
5269 - changesets with full descriptions and file lists::
5269
5270
5270 hg log -v
5271 hg log -v
5271
5272
5272 - changesets ancestral to the working directory::
5273 - changesets ancestral to the working directory::
5273
5274
5274 hg log -f
5275 hg log -f
5275
5276
5276 - last 10 commits on the current branch::
5277 - last 10 commits on the current branch::
5277
5278
5278 hg log -l 10 -b .
5279 hg log -l 10 -b .
5279
5280
5280 - changesets showing all modifications of a file, including removals::
5281 - changesets showing all modifications of a file, including removals::
5281
5282
5282 hg log --removed file.c
5283 hg log --removed file.c
5283
5284
5284 - all changesets that touch a directory, with diffs, excluding merges::
5285 - all changesets that touch a directory, with diffs, excluding merges::
5285
5286
5286 hg log -Mp lib/
5287 hg log -Mp lib/
5287
5288
5288 - all revision numbers that match a keyword::
5289 - all revision numbers that match a keyword::
5289
5290
5290 hg log -k bug --template "{rev}\\n"
5291 hg log -k bug --template "{rev}\\n"
5291
5292
5292 - the full hash identifier of the working directory parent::
5293 - the full hash identifier of the working directory parent::
5293
5294
5294 hg log -r . --template "{node}\\n"
5295 hg log -r . --template "{node}\\n"
5295
5296
5296 - list available log templates::
5297 - list available log templates::
5297
5298
5298 hg log -T list
5299 hg log -T list
5299
5300
5300 - check if a given changeset is included in a tagged release::
5301 - check if a given changeset is included in a tagged release::
5301
5302
5302 hg log -r "a21ccf and ancestor(1.9)"
5303 hg log -r "a21ccf and ancestor(1.9)"
5303
5304
5304 - find all changesets by some user in a date range::
5305 - find all changesets by some user in a date range::
5305
5306
5306 hg log -k alice -d "may 2008 to jul 2008"
5307 hg log -k alice -d "may 2008 to jul 2008"
5307
5308
5308 - summary of all changesets after the last tag::
5309 - summary of all changesets after the last tag::
5309
5310
5310 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5311 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5311
5312
5312 See :hg:`help dates` for a list of formats valid for -d/--date.
5313 See :hg:`help dates` for a list of formats valid for -d/--date.
5313
5314
5314 See :hg:`help revisions` and :hg:`help revsets` for more about
5315 See :hg:`help revisions` and :hg:`help revsets` for more about
5315 specifying and ordering revisions.
5316 specifying and ordering revisions.
5316
5317
5317 See :hg:`help templates` for more about pre-packaged styles and
5318 See :hg:`help templates` for more about pre-packaged styles and
5318 specifying custom templates.
5319 specifying custom templates.
5319
5320
5320 Returns 0 on success.
5321 Returns 0 on success.
5321
5322
5322 """
5323 """
5323 if opts.get('follow') and opts.get('rev'):
5324 if opts.get('follow') and opts.get('rev'):
5324 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5325 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5325 del opts['follow']
5326 del opts['follow']
5326
5327
5327 if opts.get('graph'):
5328 if opts.get('graph'):
5328 return cmdutil.graphlog(ui, repo, *pats, **opts)
5329 return cmdutil.graphlog(ui, repo, *pats, **opts)
5329
5330
5330 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5331 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5331 limit = cmdutil.loglimit(opts)
5332 limit = cmdutil.loglimit(opts)
5332 count = 0
5333 count = 0
5333
5334
5334 getrenamed = None
5335 getrenamed = None
5335 if opts.get('copies'):
5336 if opts.get('copies'):
5336 endrev = None
5337 endrev = None
5337 if opts.get('rev'):
5338 if opts.get('rev'):
5338 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5339 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5339 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5340 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5340
5341
5341 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5342 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5342 for rev in revs:
5343 for rev in revs:
5343 if count == limit:
5344 if count == limit:
5344 break
5345 break
5345 ctx = repo[rev]
5346 ctx = repo[rev]
5346 copies = None
5347 copies = None
5347 if getrenamed is not None and rev:
5348 if getrenamed is not None and rev:
5348 copies = []
5349 copies = []
5349 for fn in ctx.files():
5350 for fn in ctx.files():
5350 rename = getrenamed(fn, rev)
5351 rename = getrenamed(fn, rev)
5351 if rename:
5352 if rename:
5352 copies.append((fn, rename[0]))
5353 copies.append((fn, rename[0]))
5353 if filematcher:
5354 if filematcher:
5354 revmatchfn = filematcher(ctx.rev())
5355 revmatchfn = filematcher(ctx.rev())
5355 else:
5356 else:
5356 revmatchfn = None
5357 revmatchfn = None
5357 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5358 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5358 if displayer.flush(ctx):
5359 if displayer.flush(ctx):
5359 count += 1
5360 count += 1
5360
5361
5361 displayer.close()
5362 displayer.close()
5362
5363
5363 @command('manifest',
5364 @command('manifest',
5364 [('r', 'rev', '', _('revision to display'), _('REV')),
5365 [('r', 'rev', '', _('revision to display'), _('REV')),
5365 ('', 'all', False, _("list files from all revisions"))]
5366 ('', 'all', False, _("list files from all revisions"))]
5366 + formatteropts,
5367 + formatteropts,
5367 _('[-r REV]'))
5368 _('[-r REV]'))
5368 def manifest(ui, repo, node=None, rev=None, **opts):
5369 def manifest(ui, repo, node=None, rev=None, **opts):
5369 """output the current or given revision of the project manifest
5370 """output the current or given revision of the project manifest
5370
5371
5371 Print a list of version controlled files for the given revision.
5372 Print a list of version controlled files for the given revision.
5372 If no revision is given, the first parent of the working directory
5373 If no revision is given, the first parent of the working directory
5373 is used, or the null revision if no revision is checked out.
5374 is used, or the null revision if no revision is checked out.
5374
5375
5375 With -v, print file permissions, symlink and executable bits.
5376 With -v, print file permissions, symlink and executable bits.
5376 With --debug, print file revision hashes.
5377 With --debug, print file revision hashes.
5377
5378
5378 If option --all is specified, the list of all files from all revisions
5379 If option --all is specified, the list of all files from all revisions
5379 is printed. This includes deleted and renamed files.
5380 is printed. This includes deleted and renamed files.
5380
5381
5381 Returns 0 on success.
5382 Returns 0 on success.
5382 """
5383 """
5383
5384
5384 fm = ui.formatter('manifest', opts)
5385 fm = ui.formatter('manifest', opts)
5385
5386
5386 if opts.get('all'):
5387 if opts.get('all'):
5387 if rev or node:
5388 if rev or node:
5388 raise error.Abort(_("can't specify a revision with --all"))
5389 raise error.Abort(_("can't specify a revision with --all"))
5389
5390
5390 res = []
5391 res = []
5391 prefix = "data/"
5392 prefix = "data/"
5392 suffix = ".i"
5393 suffix = ".i"
5393 plen = len(prefix)
5394 plen = len(prefix)
5394 slen = len(suffix)
5395 slen = len(suffix)
5395 with repo.lock():
5396 with repo.lock():
5396 for fn, b, size in repo.store.datafiles():
5397 for fn, b, size in repo.store.datafiles():
5397 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5398 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5398 res.append(fn[plen:-slen])
5399 res.append(fn[plen:-slen])
5399 for f in res:
5400 for f in res:
5400 fm.startitem()
5401 fm.startitem()
5401 fm.write("path", '%s\n', f)
5402 fm.write("path", '%s\n', f)
5402 fm.end()
5403 fm.end()
5403 return
5404 return
5404
5405
5405 if rev and node:
5406 if rev and node:
5406 raise error.Abort(_("please specify just one revision"))
5407 raise error.Abort(_("please specify just one revision"))
5407
5408
5408 if not node:
5409 if not node:
5409 node = rev
5410 node = rev
5410
5411
5411 char = {'l': '@', 'x': '*', '': ''}
5412 char = {'l': '@', 'x': '*', '': ''}
5412 mode = {'l': '644', 'x': '755', '': '644'}
5413 mode = {'l': '644', 'x': '755', '': '644'}
5413 ctx = scmutil.revsingle(repo, node)
5414 ctx = scmutil.revsingle(repo, node)
5414 mf = ctx.manifest()
5415 mf = ctx.manifest()
5415 for f in ctx:
5416 for f in ctx:
5416 fm.startitem()
5417 fm.startitem()
5417 fl = ctx[f].flags()
5418 fl = ctx[f].flags()
5418 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5419 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5419 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5420 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5420 fm.write('path', '%s\n', f)
5421 fm.write('path', '%s\n', f)
5421 fm.end()
5422 fm.end()
5422
5423
5423 @command('^merge',
5424 @command('^merge',
5424 [('f', 'force', None,
5425 [('f', 'force', None,
5425 _('force a merge including outstanding changes (DEPRECATED)')),
5426 _('force a merge including outstanding changes (DEPRECATED)')),
5426 ('r', 'rev', '', _('revision to merge'), _('REV')),
5427 ('r', 'rev', '', _('revision to merge'), _('REV')),
5427 ('P', 'preview', None,
5428 ('P', 'preview', None,
5428 _('review revisions to merge (no merge is performed)'))
5429 _('review revisions to merge (no merge is performed)'))
5429 ] + mergetoolopts,
5430 ] + mergetoolopts,
5430 _('[-P] [[-r] REV]'))
5431 _('[-P] [[-r] REV]'))
5431 def merge(ui, repo, node=None, **opts):
5432 def merge(ui, repo, node=None, **opts):
5432 """merge another revision into working directory
5433 """merge another revision into working directory
5433
5434
5434 The current working directory is updated with all changes made in
5435 The current working directory is updated with all changes made in
5435 the requested revision since the last common predecessor revision.
5436 the requested revision since the last common predecessor revision.
5436
5437
5437 Files that changed between either parent are marked as changed for
5438 Files that changed between either parent are marked as changed for
5438 the next commit and a commit must be performed before any further
5439 the next commit and a commit must be performed before any further
5439 updates to the repository are allowed. The next commit will have
5440 updates to the repository are allowed. The next commit will have
5440 two parents.
5441 two parents.
5441
5442
5442 ``--tool`` can be used to specify the merge tool used for file
5443 ``--tool`` can be used to specify the merge tool used for file
5443 merges. It overrides the HGMERGE environment variable and your
5444 merges. It overrides the HGMERGE environment variable and your
5444 configuration files. See :hg:`help merge-tools` for options.
5445 configuration files. See :hg:`help merge-tools` for options.
5445
5446
5446 If no revision is specified, the working directory's parent is a
5447 If no revision is specified, the working directory's parent is a
5447 head revision, and the current branch contains exactly one other
5448 head revision, and the current branch contains exactly one other
5448 head, the other head is merged with by default. Otherwise, an
5449 head, the other head is merged with by default. Otherwise, an
5449 explicit revision with which to merge with must be provided.
5450 explicit revision with which to merge with must be provided.
5450
5451
5451 See :hg:`help resolve` for information on handling file conflicts.
5452 See :hg:`help resolve` for information on handling file conflicts.
5452
5453
5453 To undo an uncommitted merge, use :hg:`update --clean .` which
5454 To undo an uncommitted merge, use :hg:`update --clean .` which
5454 will check out a clean copy of the original merge parent, losing
5455 will check out a clean copy of the original merge parent, losing
5455 all changes.
5456 all changes.
5456
5457
5457 Returns 0 on success, 1 if there are unresolved files.
5458 Returns 0 on success, 1 if there are unresolved files.
5458 """
5459 """
5459
5460
5460 if opts.get('rev') and node:
5461 if opts.get('rev') and node:
5461 raise error.Abort(_("please specify just one revision"))
5462 raise error.Abort(_("please specify just one revision"))
5462 if not node:
5463 if not node:
5463 node = opts.get('rev')
5464 node = opts.get('rev')
5464
5465
5465 if node:
5466 if node:
5466 node = scmutil.revsingle(repo, node).node()
5467 node = scmutil.revsingle(repo, node).node()
5467
5468
5468 if not node:
5469 if not node:
5469 node = repo[destutil.destmerge(repo)].node()
5470 node = repo[destutil.destmerge(repo)].node()
5470
5471
5471 if opts.get('preview'):
5472 if opts.get('preview'):
5472 # find nodes that are ancestors of p2 but not of p1
5473 # find nodes that are ancestors of p2 but not of p1
5473 p1 = repo.lookup('.')
5474 p1 = repo.lookup('.')
5474 p2 = repo.lookup(node)
5475 p2 = repo.lookup(node)
5475 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5476 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5476
5477
5477 displayer = cmdutil.show_changeset(ui, repo, opts)
5478 displayer = cmdutil.show_changeset(ui, repo, opts)
5478 for node in nodes:
5479 for node in nodes:
5479 displayer.show(repo[node])
5480 displayer.show(repo[node])
5480 displayer.close()
5481 displayer.close()
5481 return 0
5482 return 0
5482
5483
5483 try:
5484 try:
5484 # ui.forcemerge is an internal variable, do not document
5485 # ui.forcemerge is an internal variable, do not document
5485 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5486 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5486 force = opts.get('force')
5487 force = opts.get('force')
5487 return hg.merge(repo, node, force=force, mergeforce=force)
5488 return hg.merge(repo, node, force=force, mergeforce=force)
5488 finally:
5489 finally:
5489 ui.setconfig('ui', 'forcemerge', '', 'merge')
5490 ui.setconfig('ui', 'forcemerge', '', 'merge')
5490
5491
5491 @command('outgoing|out',
5492 @command('outgoing|out',
5492 [('f', 'force', None, _('run even when the destination is unrelated')),
5493 [('f', 'force', None, _('run even when the destination is unrelated')),
5493 ('r', 'rev', [],
5494 ('r', 'rev', [],
5494 _('a changeset intended to be included in the destination'), _('REV')),
5495 _('a changeset intended to be included in the destination'), _('REV')),
5495 ('n', 'newest-first', None, _('show newest record first')),
5496 ('n', 'newest-first', None, _('show newest record first')),
5496 ('B', 'bookmarks', False, _('compare bookmarks')),
5497 ('B', 'bookmarks', False, _('compare bookmarks')),
5497 ('b', 'branch', [], _('a specific branch you would like to push'),
5498 ('b', 'branch', [], _('a specific branch you would like to push'),
5498 _('BRANCH')),
5499 _('BRANCH')),
5499 ] + logopts + remoteopts + subrepoopts,
5500 ] + logopts + remoteopts + subrepoopts,
5500 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5501 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5501 def outgoing(ui, repo, dest=None, **opts):
5502 def outgoing(ui, repo, dest=None, **opts):
5502 """show changesets not found in the destination
5503 """show changesets not found in the destination
5503
5504
5504 Show changesets not found in the specified destination repository
5505 Show changesets not found in the specified destination repository
5505 or the default push location. These are the changesets that would
5506 or the default push location. These are the changesets that would
5506 be pushed if a push was requested.
5507 be pushed if a push was requested.
5507
5508
5508 See pull for details of valid destination formats.
5509 See pull for details of valid destination formats.
5509
5510
5510 .. container:: verbose
5511 .. container:: verbose
5511
5512
5512 With -B/--bookmarks, the result of bookmark comparison between
5513 With -B/--bookmarks, the result of bookmark comparison between
5513 local and remote repositories is displayed. With -v/--verbose,
5514 local and remote repositories is displayed. With -v/--verbose,
5514 status is also displayed for each bookmark like below::
5515 status is also displayed for each bookmark like below::
5515
5516
5516 BM1 01234567890a added
5517 BM1 01234567890a added
5517 BM2 deleted
5518 BM2 deleted
5518 BM3 234567890abc advanced
5519 BM3 234567890abc advanced
5519 BM4 34567890abcd diverged
5520 BM4 34567890abcd diverged
5520 BM5 4567890abcde changed
5521 BM5 4567890abcde changed
5521
5522
5522 The action taken when pushing depends on the
5523 The action taken when pushing depends on the
5523 status of each bookmark:
5524 status of each bookmark:
5524
5525
5525 :``added``: push with ``-B`` will create it
5526 :``added``: push with ``-B`` will create it
5526 :``deleted``: push with ``-B`` will delete it
5527 :``deleted``: push with ``-B`` will delete it
5527 :``advanced``: push will update it
5528 :``advanced``: push will update it
5528 :``diverged``: push with ``-B`` will update it
5529 :``diverged``: push with ``-B`` will update it
5529 :``changed``: push with ``-B`` will update it
5530 :``changed``: push with ``-B`` will update it
5530
5531
5531 From the point of view of pushing behavior, bookmarks
5532 From the point of view of pushing behavior, bookmarks
5532 existing only in the remote repository are treated as
5533 existing only in the remote repository are treated as
5533 ``deleted``, even if it is in fact added remotely.
5534 ``deleted``, even if it is in fact added remotely.
5534
5535
5535 Returns 0 if there are outgoing changes, 1 otherwise.
5536 Returns 0 if there are outgoing changes, 1 otherwise.
5536 """
5537 """
5537 if opts.get('graph'):
5538 if opts.get('graph'):
5538 cmdutil.checkunsupportedgraphflags([], opts)
5539 cmdutil.checkunsupportedgraphflags([], opts)
5539 o, other = hg._outgoing(ui, repo, dest, opts)
5540 o, other = hg._outgoing(ui, repo, dest, opts)
5540 if not o:
5541 if not o:
5541 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5542 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5542 return
5543 return
5543
5544
5544 revdag = cmdutil.graphrevs(repo, o, opts)
5545 revdag = cmdutil.graphrevs(repo, o, opts)
5545 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5546 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5546 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5547 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5547 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5548 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5548 return 0
5549 return 0
5549
5550
5550 if opts.get('bookmarks'):
5551 if opts.get('bookmarks'):
5551 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5552 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5552 dest, branches = hg.parseurl(dest, opts.get('branch'))
5553 dest, branches = hg.parseurl(dest, opts.get('branch'))
5553 other = hg.peer(repo, opts, dest)
5554 other = hg.peer(repo, opts, dest)
5554 if 'bookmarks' not in other.listkeys('namespaces'):
5555 if 'bookmarks' not in other.listkeys('namespaces'):
5555 ui.warn(_("remote doesn't support bookmarks\n"))
5556 ui.warn(_("remote doesn't support bookmarks\n"))
5556 return 0
5557 return 0
5557 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5558 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5558 return bookmarks.outgoing(ui, repo, other)
5559 return bookmarks.outgoing(ui, repo, other)
5559
5560
5560 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5561 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5561 try:
5562 try:
5562 return hg.outgoing(ui, repo, dest, opts)
5563 return hg.outgoing(ui, repo, dest, opts)
5563 finally:
5564 finally:
5564 del repo._subtoppath
5565 del repo._subtoppath
5565
5566
5566 @command('parents',
5567 @command('parents',
5567 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5568 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5568 ] + templateopts,
5569 ] + templateopts,
5569 _('[-r REV] [FILE]'),
5570 _('[-r REV] [FILE]'),
5570 inferrepo=True)
5571 inferrepo=True)
5571 def parents(ui, repo, file_=None, **opts):
5572 def parents(ui, repo, file_=None, **opts):
5572 """show the parents of the working directory or revision (DEPRECATED)
5573 """show the parents of the working directory or revision (DEPRECATED)
5573
5574
5574 Print the working directory's parent revisions. If a revision is
5575 Print the working directory's parent revisions. If a revision is
5575 given via -r/--rev, the parent of that revision will be printed.
5576 given via -r/--rev, the parent of that revision will be printed.
5576 If a file argument is given, the revision in which the file was
5577 If a file argument is given, the revision in which the file was
5577 last changed (before the working directory revision or the
5578 last changed (before the working directory revision or the
5578 argument to --rev if given) is printed.
5579 argument to --rev if given) is printed.
5579
5580
5580 This command is equivalent to::
5581 This command is equivalent to::
5581
5582
5582 hg log -r "p1()+p2()" or
5583 hg log -r "p1()+p2()" or
5583 hg log -r "p1(REV)+p2(REV)" or
5584 hg log -r "p1(REV)+p2(REV)" or
5584 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5585 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5585 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5586 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5586
5587
5587 See :hg:`summary` and :hg:`help revsets` for related information.
5588 See :hg:`summary` and :hg:`help revsets` for related information.
5588
5589
5589 Returns 0 on success.
5590 Returns 0 on success.
5590 """
5591 """
5591
5592
5592 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5593 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5593
5594
5594 if file_:
5595 if file_:
5595 m = scmutil.match(ctx, (file_,), opts)
5596 m = scmutil.match(ctx, (file_,), opts)
5596 if m.anypats() or len(m.files()) != 1:
5597 if m.anypats() or len(m.files()) != 1:
5597 raise error.Abort(_('can only specify an explicit filename'))
5598 raise error.Abort(_('can only specify an explicit filename'))
5598 file_ = m.files()[0]
5599 file_ = m.files()[0]
5599 filenodes = []
5600 filenodes = []
5600 for cp in ctx.parents():
5601 for cp in ctx.parents():
5601 if not cp:
5602 if not cp:
5602 continue
5603 continue
5603 try:
5604 try:
5604 filenodes.append(cp.filenode(file_))
5605 filenodes.append(cp.filenode(file_))
5605 except error.LookupError:
5606 except error.LookupError:
5606 pass
5607 pass
5607 if not filenodes:
5608 if not filenodes:
5608 raise error.Abort(_("'%s' not found in manifest!") % file_)
5609 raise error.Abort(_("'%s' not found in manifest!") % file_)
5609 p = []
5610 p = []
5610 for fn in filenodes:
5611 for fn in filenodes:
5611 fctx = repo.filectx(file_, fileid=fn)
5612 fctx = repo.filectx(file_, fileid=fn)
5612 p.append(fctx.node())
5613 p.append(fctx.node())
5613 else:
5614 else:
5614 p = [cp.node() for cp in ctx.parents()]
5615 p = [cp.node() for cp in ctx.parents()]
5615
5616
5616 displayer = cmdutil.show_changeset(ui, repo, opts)
5617 displayer = cmdutil.show_changeset(ui, repo, opts)
5617 for n in p:
5618 for n in p:
5618 if n != nullid:
5619 if n != nullid:
5619 displayer.show(repo[n])
5620 displayer.show(repo[n])
5620 displayer.close()
5621 displayer.close()
5621
5622
5622 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5623 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5623 def paths(ui, repo, search=None, **opts):
5624 def paths(ui, repo, search=None, **opts):
5624 """show aliases for remote repositories
5625 """show aliases for remote repositories
5625
5626
5626 Show definition of symbolic path name NAME. If no name is given,
5627 Show definition of symbolic path name NAME. If no name is given,
5627 show definition of all available names.
5628 show definition of all available names.
5628
5629
5629 Option -q/--quiet suppresses all output when searching for NAME
5630 Option -q/--quiet suppresses all output when searching for NAME
5630 and shows only the path names when listing all definitions.
5631 and shows only the path names when listing all definitions.
5631
5632
5632 Path names are defined in the [paths] section of your
5633 Path names are defined in the [paths] section of your
5633 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5634 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5634 repository, ``.hg/hgrc`` is used, too.
5635 repository, ``.hg/hgrc`` is used, too.
5635
5636
5636 The path names ``default`` and ``default-push`` have a special
5637 The path names ``default`` and ``default-push`` have a special
5637 meaning. When performing a push or pull operation, they are used
5638 meaning. When performing a push or pull operation, they are used
5638 as fallbacks if no location is specified on the command-line.
5639 as fallbacks if no location is specified on the command-line.
5639 When ``default-push`` is set, it will be used for push and
5640 When ``default-push`` is set, it will be used for push and
5640 ``default`` will be used for pull; otherwise ``default`` is used
5641 ``default`` will be used for pull; otherwise ``default`` is used
5641 as the fallback for both. When cloning a repository, the clone
5642 as the fallback for both. When cloning a repository, the clone
5642 source is written as ``default`` in ``.hg/hgrc``.
5643 source is written as ``default`` in ``.hg/hgrc``.
5643
5644
5644 .. note::
5645 .. note::
5645
5646
5646 ``default`` and ``default-push`` apply to all inbound (e.g.
5647 ``default`` and ``default-push`` apply to all inbound (e.g.
5647 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5648 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5648 and :hg:`bundle`) operations.
5649 and :hg:`bundle`) operations.
5649
5650
5650 See :hg:`help urls` for more information.
5651 See :hg:`help urls` for more information.
5651
5652
5652 Returns 0 on success.
5653 Returns 0 on success.
5653 """
5654 """
5654 if search:
5655 if search:
5655 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5656 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5656 if name == search]
5657 if name == search]
5657 else:
5658 else:
5658 pathitems = sorted(ui.paths.iteritems())
5659 pathitems = sorted(ui.paths.iteritems())
5659
5660
5660 fm = ui.formatter('paths', opts)
5661 fm = ui.formatter('paths', opts)
5661 if fm:
5662 if fm:
5662 hidepassword = str
5663 hidepassword = str
5663 else:
5664 else:
5664 hidepassword = util.hidepassword
5665 hidepassword = util.hidepassword
5665 if ui.quiet:
5666 if ui.quiet:
5666 namefmt = '%s\n'
5667 namefmt = '%s\n'
5667 else:
5668 else:
5668 namefmt = '%s = '
5669 namefmt = '%s = '
5669 showsubopts = not search and not ui.quiet
5670 showsubopts = not search and not ui.quiet
5670
5671
5671 for name, path in pathitems:
5672 for name, path in pathitems:
5672 fm.startitem()
5673 fm.startitem()
5673 fm.condwrite(not search, 'name', namefmt, name)
5674 fm.condwrite(not search, 'name', namefmt, name)
5674 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5675 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5675 for subopt, value in sorted(path.suboptions.items()):
5676 for subopt, value in sorted(path.suboptions.items()):
5676 assert subopt not in ('name', 'url')
5677 assert subopt not in ('name', 'url')
5677 if showsubopts:
5678 if showsubopts:
5678 fm.plain('%s:%s = ' % (name, subopt))
5679 fm.plain('%s:%s = ' % (name, subopt))
5679 fm.condwrite(showsubopts, subopt, '%s\n', value)
5680 fm.condwrite(showsubopts, subopt, '%s\n', value)
5680
5681
5681 fm.end()
5682 fm.end()
5682
5683
5683 if search and not pathitems:
5684 if search and not pathitems:
5684 if not ui.quiet:
5685 if not ui.quiet:
5685 ui.warn(_("not found!\n"))
5686 ui.warn(_("not found!\n"))
5686 return 1
5687 return 1
5687 else:
5688 else:
5688 return 0
5689 return 0
5689
5690
5690 @command('phase',
5691 @command('phase',
5691 [('p', 'public', False, _('set changeset phase to public')),
5692 [('p', 'public', False, _('set changeset phase to public')),
5692 ('d', 'draft', False, _('set changeset phase to draft')),
5693 ('d', 'draft', False, _('set changeset phase to draft')),
5693 ('s', 'secret', False, _('set changeset phase to secret')),
5694 ('s', 'secret', False, _('set changeset phase to secret')),
5694 ('f', 'force', False, _('allow to move boundary backward')),
5695 ('f', 'force', False, _('allow to move boundary backward')),
5695 ('r', 'rev', [], _('target revision'), _('REV')),
5696 ('r', 'rev', [], _('target revision'), _('REV')),
5696 ],
5697 ],
5697 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5698 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5698 def phase(ui, repo, *revs, **opts):
5699 def phase(ui, repo, *revs, **opts):
5699 """set or show the current phase name
5700 """set or show the current phase name
5700
5701
5701 With no argument, show the phase name of the current revision(s).
5702 With no argument, show the phase name of the current revision(s).
5702
5703
5703 With one of -p/--public, -d/--draft or -s/--secret, change the
5704 With one of -p/--public, -d/--draft or -s/--secret, change the
5704 phase value of the specified revisions.
5705 phase value of the specified revisions.
5705
5706
5706 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5707 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5707 lower phase to an higher phase. Phases are ordered as follows::
5708 lower phase to an higher phase. Phases are ordered as follows::
5708
5709
5709 public < draft < secret
5710 public < draft < secret
5710
5711
5711 Returns 0 on success, 1 if some phases could not be changed.
5712 Returns 0 on success, 1 if some phases could not be changed.
5712
5713
5713 (For more information about the phases concept, see :hg:`help phases`.)
5714 (For more information about the phases concept, see :hg:`help phases`.)
5714 """
5715 """
5715 # search for a unique phase argument
5716 # search for a unique phase argument
5716 targetphase = None
5717 targetphase = None
5717 for idx, name in enumerate(phases.phasenames):
5718 for idx, name in enumerate(phases.phasenames):
5718 if opts[name]:
5719 if opts[name]:
5719 if targetphase is not None:
5720 if targetphase is not None:
5720 raise error.Abort(_('only one phase can be specified'))
5721 raise error.Abort(_('only one phase can be specified'))
5721 targetphase = idx
5722 targetphase = idx
5722
5723
5723 # look for specified revision
5724 # look for specified revision
5724 revs = list(revs)
5725 revs = list(revs)
5725 revs.extend(opts['rev'])
5726 revs.extend(opts['rev'])
5726 if not revs:
5727 if not revs:
5727 # display both parents as the second parent phase can influence
5728 # display both parents as the second parent phase can influence
5728 # the phase of a merge commit
5729 # the phase of a merge commit
5729 revs = [c.rev() for c in repo[None].parents()]
5730 revs = [c.rev() for c in repo[None].parents()]
5730
5731
5731 revs = scmutil.revrange(repo, revs)
5732 revs = scmutil.revrange(repo, revs)
5732
5733
5733 lock = None
5734 lock = None
5734 ret = 0
5735 ret = 0
5735 if targetphase is None:
5736 if targetphase is None:
5736 # display
5737 # display
5737 for r in revs:
5738 for r in revs:
5738 ctx = repo[r]
5739 ctx = repo[r]
5739 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5740 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5740 else:
5741 else:
5741 tr = None
5742 tr = None
5742 lock = repo.lock()
5743 lock = repo.lock()
5743 try:
5744 try:
5744 tr = repo.transaction("phase")
5745 tr = repo.transaction("phase")
5745 # set phase
5746 # set phase
5746 if not revs:
5747 if not revs:
5747 raise error.Abort(_('empty revision set'))
5748 raise error.Abort(_('empty revision set'))
5748 nodes = [repo[r].node() for r in revs]
5749 nodes = [repo[r].node() for r in revs]
5749 # moving revision from public to draft may hide them
5750 # moving revision from public to draft may hide them
5750 # We have to check result on an unfiltered repository
5751 # We have to check result on an unfiltered repository
5751 unfi = repo.unfiltered()
5752 unfi = repo.unfiltered()
5752 getphase = unfi._phasecache.phase
5753 getphase = unfi._phasecache.phase
5753 olddata = [getphase(unfi, r) for r in unfi]
5754 olddata = [getphase(unfi, r) for r in unfi]
5754 phases.advanceboundary(repo, tr, targetphase, nodes)
5755 phases.advanceboundary(repo, tr, targetphase, nodes)
5755 if opts['force']:
5756 if opts['force']:
5756 phases.retractboundary(repo, tr, targetphase, nodes)
5757 phases.retractboundary(repo, tr, targetphase, nodes)
5757 tr.close()
5758 tr.close()
5758 finally:
5759 finally:
5759 if tr is not None:
5760 if tr is not None:
5760 tr.release()
5761 tr.release()
5761 lock.release()
5762 lock.release()
5762 getphase = unfi._phasecache.phase
5763 getphase = unfi._phasecache.phase
5763 newdata = [getphase(unfi, r) for r in unfi]
5764 newdata = [getphase(unfi, r) for r in unfi]
5764 changes = sum(newdata[r] != olddata[r] for r in unfi)
5765 changes = sum(newdata[r] != olddata[r] for r in unfi)
5765 cl = unfi.changelog
5766 cl = unfi.changelog
5766 rejected = [n for n in nodes
5767 rejected = [n for n in nodes
5767 if newdata[cl.rev(n)] < targetphase]
5768 if newdata[cl.rev(n)] < targetphase]
5768 if rejected:
5769 if rejected:
5769 ui.warn(_('cannot move %i changesets to a higher '
5770 ui.warn(_('cannot move %i changesets to a higher '
5770 'phase, use --force\n') % len(rejected))
5771 'phase, use --force\n') % len(rejected))
5771 ret = 1
5772 ret = 1
5772 if changes:
5773 if changes:
5773 msg = _('phase changed for %i changesets\n') % changes
5774 msg = _('phase changed for %i changesets\n') % changes
5774 if ret:
5775 if ret:
5775 ui.status(msg)
5776 ui.status(msg)
5776 else:
5777 else:
5777 ui.note(msg)
5778 ui.note(msg)
5778 else:
5779 else:
5779 ui.warn(_('no phases changed\n'))
5780 ui.warn(_('no phases changed\n'))
5780 return ret
5781 return ret
5781
5782
5782 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5783 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5783 """Run after a changegroup has been added via pull/unbundle
5784 """Run after a changegroup has been added via pull/unbundle
5784
5785
5785 This takes arguments below:
5786 This takes arguments below:
5786
5787
5787 :modheads: change of heads by pull/unbundle
5788 :modheads: change of heads by pull/unbundle
5788 :optupdate: updating working directory is needed or not
5789 :optupdate: updating working directory is needed or not
5789 :checkout: update destination revision (or None to default destination)
5790 :checkout: update destination revision (or None to default destination)
5790 :brev: a name, which might be a bookmark to be activated after updating
5791 :brev: a name, which might be a bookmark to be activated after updating
5791 """
5792 """
5792 if modheads == 0:
5793 if modheads == 0:
5793 return
5794 return
5794 if optupdate:
5795 if optupdate:
5795 try:
5796 try:
5796 return hg.updatetotally(ui, repo, checkout, brev)
5797 return hg.updatetotally(ui, repo, checkout, brev)
5797 except error.UpdateAbort as inst:
5798 except error.UpdateAbort as inst:
5798 msg = _("not updating: %s") % str(inst)
5799 msg = _("not updating: %s") % str(inst)
5799 hint = inst.hint
5800 hint = inst.hint
5800 raise error.UpdateAbort(msg, hint=hint)
5801 raise error.UpdateAbort(msg, hint=hint)
5801 if modheads > 1:
5802 if modheads > 1:
5802 currentbranchheads = len(repo.branchheads())
5803 currentbranchheads = len(repo.branchheads())
5803 if currentbranchheads == modheads:
5804 if currentbranchheads == modheads:
5804 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5805 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5805 elif currentbranchheads > 1:
5806 elif currentbranchheads > 1:
5806 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5807 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5807 "merge)\n"))
5808 "merge)\n"))
5808 else:
5809 else:
5809 ui.status(_("(run 'hg heads' to see heads)\n"))
5810 ui.status(_("(run 'hg heads' to see heads)\n"))
5810 else:
5811 else:
5811 ui.status(_("(run 'hg update' to get a working copy)\n"))
5812 ui.status(_("(run 'hg update' to get a working copy)\n"))
5812
5813
5813 @command('^pull',
5814 @command('^pull',
5814 [('u', 'update', None,
5815 [('u', 'update', None,
5815 _('update to new branch head if changesets were pulled')),
5816 _('update to new branch head if changesets were pulled')),
5816 ('f', 'force', None, _('run even when remote repository is unrelated')),
5817 ('f', 'force', None, _('run even when remote repository is unrelated')),
5817 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5818 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5818 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5819 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5819 ('b', 'branch', [], _('a specific branch you would like to pull'),
5820 ('b', 'branch', [], _('a specific branch you would like to pull'),
5820 _('BRANCH')),
5821 _('BRANCH')),
5821 ] + remoteopts,
5822 ] + remoteopts,
5822 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5823 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5823 def pull(ui, repo, source="default", **opts):
5824 def pull(ui, repo, source="default", **opts):
5824 """pull changes from the specified source
5825 """pull changes from the specified source
5825
5826
5826 Pull changes from a remote repository to a local one.
5827 Pull changes from a remote repository to a local one.
5827
5828
5828 This finds all changes from the repository at the specified path
5829 This finds all changes from the repository at the specified path
5829 or URL and adds them to a local repository (the current one unless
5830 or URL and adds them to a local repository (the current one unless
5830 -R is specified). By default, this does not update the copy of the
5831 -R is specified). By default, this does not update the copy of the
5831 project in the working directory.
5832 project in the working directory.
5832
5833
5833 Use :hg:`incoming` if you want to see what would have been added
5834 Use :hg:`incoming` if you want to see what would have been added
5834 by a pull at the time you issued this command. If you then decide
5835 by a pull at the time you issued this command. If you then decide
5835 to add those changes to the repository, you should use :hg:`pull
5836 to add those changes to the repository, you should use :hg:`pull
5836 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5837 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5837
5838
5838 If SOURCE is omitted, the 'default' path will be used.
5839 If SOURCE is omitted, the 'default' path will be used.
5839 See :hg:`help urls` for more information.
5840 See :hg:`help urls` for more information.
5840
5841
5841 Specifying bookmark as ``.`` is equivalent to specifying the active
5842 Specifying bookmark as ``.`` is equivalent to specifying the active
5842 bookmark's name.
5843 bookmark's name.
5843
5844
5844 Returns 0 on success, 1 if an update had unresolved files.
5845 Returns 0 on success, 1 if an update had unresolved files.
5845 """
5846 """
5846 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5847 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5847 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5848 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5848 other = hg.peer(repo, opts, source)
5849 other = hg.peer(repo, opts, source)
5849 try:
5850 try:
5850 revs, checkout = hg.addbranchrevs(repo, other, branches,
5851 revs, checkout = hg.addbranchrevs(repo, other, branches,
5851 opts.get('rev'))
5852 opts.get('rev'))
5852
5853
5853
5854
5854 pullopargs = {}
5855 pullopargs = {}
5855 if opts.get('bookmark'):
5856 if opts.get('bookmark'):
5856 if not revs:
5857 if not revs:
5857 revs = []
5858 revs = []
5858 # The list of bookmark used here is not the one used to actually
5859 # The list of bookmark used here is not the one used to actually
5859 # update the bookmark name. This can result in the revision pulled
5860 # update the bookmark name. This can result in the revision pulled
5860 # not ending up with the name of the bookmark because of a race
5861 # not ending up with the name of the bookmark because of a race
5861 # condition on the server. (See issue 4689 for details)
5862 # condition on the server. (See issue 4689 for details)
5862 remotebookmarks = other.listkeys('bookmarks')
5863 remotebookmarks = other.listkeys('bookmarks')
5863 pullopargs['remotebookmarks'] = remotebookmarks
5864 pullopargs['remotebookmarks'] = remotebookmarks
5864 for b in opts['bookmark']:
5865 for b in opts['bookmark']:
5865 b = repo._bookmarks.expandname(b)
5866 b = repo._bookmarks.expandname(b)
5866 if b not in remotebookmarks:
5867 if b not in remotebookmarks:
5867 raise error.Abort(_('remote bookmark %s not found!') % b)
5868 raise error.Abort(_('remote bookmark %s not found!') % b)
5868 revs.append(remotebookmarks[b])
5869 revs.append(remotebookmarks[b])
5869
5870
5870 if revs:
5871 if revs:
5871 try:
5872 try:
5872 # When 'rev' is a bookmark name, we cannot guarantee that it
5873 # When 'rev' is a bookmark name, we cannot guarantee that it
5873 # will be updated with that name because of a race condition
5874 # will be updated with that name because of a race condition
5874 # server side. (See issue 4689 for details)
5875 # server side. (See issue 4689 for details)
5875 oldrevs = revs
5876 oldrevs = revs
5876 revs = [] # actually, nodes
5877 revs = [] # actually, nodes
5877 for r in oldrevs:
5878 for r in oldrevs:
5878 node = other.lookup(r)
5879 node = other.lookup(r)
5879 revs.append(node)
5880 revs.append(node)
5880 if r == checkout:
5881 if r == checkout:
5881 checkout = node
5882 checkout = node
5882 except error.CapabilityError:
5883 except error.CapabilityError:
5883 err = _("other repository doesn't support revision lookup, "
5884 err = _("other repository doesn't support revision lookup, "
5884 "so a rev cannot be specified.")
5885 "so a rev cannot be specified.")
5885 raise error.Abort(err)
5886 raise error.Abort(err)
5886
5887
5887 pullopargs.update(opts.get('opargs', {}))
5888 pullopargs.update(opts.get('opargs', {}))
5888 modheads = exchange.pull(repo, other, heads=revs,
5889 modheads = exchange.pull(repo, other, heads=revs,
5889 force=opts.get('force'),
5890 force=opts.get('force'),
5890 bookmarks=opts.get('bookmark', ()),
5891 bookmarks=opts.get('bookmark', ()),
5891 opargs=pullopargs).cgresult
5892 opargs=pullopargs).cgresult
5892
5893
5893 # brev is a name, which might be a bookmark to be activated at
5894 # brev is a name, which might be a bookmark to be activated at
5894 # the end of the update. In other words, it is an explicit
5895 # the end of the update. In other words, it is an explicit
5895 # destination of the update
5896 # destination of the update
5896 brev = None
5897 brev = None
5897
5898
5898 if checkout:
5899 if checkout:
5899 checkout = str(repo.changelog.rev(checkout))
5900 checkout = str(repo.changelog.rev(checkout))
5900
5901
5901 # order below depends on implementation of
5902 # order below depends on implementation of
5902 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5903 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5903 # because 'checkout' is determined without it.
5904 # because 'checkout' is determined without it.
5904 if opts.get('rev'):
5905 if opts.get('rev'):
5905 brev = opts['rev'][0]
5906 brev = opts['rev'][0]
5906 elif opts.get('branch'):
5907 elif opts.get('branch'):
5907 brev = opts['branch'][0]
5908 brev = opts['branch'][0]
5908 else:
5909 else:
5909 brev = branches[0]
5910 brev = branches[0]
5910 repo._subtoppath = source
5911 repo._subtoppath = source
5911 try:
5912 try:
5912 ret = postincoming(ui, repo, modheads, opts.get('update'),
5913 ret = postincoming(ui, repo, modheads, opts.get('update'),
5913 checkout, brev)
5914 checkout, brev)
5914
5915
5915 finally:
5916 finally:
5916 del repo._subtoppath
5917 del repo._subtoppath
5917
5918
5918 finally:
5919 finally:
5919 other.close()
5920 other.close()
5920 return ret
5921 return ret
5921
5922
5922 @command('^push',
5923 @command('^push',
5923 [('f', 'force', None, _('force push')),
5924 [('f', 'force', None, _('force push')),
5924 ('r', 'rev', [],
5925 ('r', 'rev', [],
5925 _('a changeset intended to be included in the destination'),
5926 _('a changeset intended to be included in the destination'),
5926 _('REV')),
5927 _('REV')),
5927 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5928 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5928 ('b', 'branch', [],
5929 ('b', 'branch', [],
5929 _('a specific branch you would like to push'), _('BRANCH')),
5930 _('a specific branch you would like to push'), _('BRANCH')),
5930 ('', 'new-branch', False, _('allow pushing a new branch')),
5931 ('', 'new-branch', False, _('allow pushing a new branch')),
5931 ] + remoteopts,
5932 ] + remoteopts,
5932 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5933 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5933 def push(ui, repo, dest=None, **opts):
5934 def push(ui, repo, dest=None, **opts):
5934 """push changes to the specified destination
5935 """push changes to the specified destination
5935
5936
5936 Push changesets from the local repository to the specified
5937 Push changesets from the local repository to the specified
5937 destination.
5938 destination.
5938
5939
5939 This operation is symmetrical to pull: it is identical to a pull
5940 This operation is symmetrical to pull: it is identical to a pull
5940 in the destination repository from the current one.
5941 in the destination repository from the current one.
5941
5942
5942 By default, push will not allow creation of new heads at the
5943 By default, push will not allow creation of new heads at the
5943 destination, since multiple heads would make it unclear which head
5944 destination, since multiple heads would make it unclear which head
5944 to use. In this situation, it is recommended to pull and merge
5945 to use. In this situation, it is recommended to pull and merge
5945 before pushing.
5946 before pushing.
5946
5947
5947 Use --new-branch if you want to allow push to create a new named
5948 Use --new-branch if you want to allow push to create a new named
5948 branch that is not present at the destination. This allows you to
5949 branch that is not present at the destination. This allows you to
5949 only create a new branch without forcing other changes.
5950 only create a new branch without forcing other changes.
5950
5951
5951 .. note::
5952 .. note::
5952
5953
5953 Extra care should be taken with the -f/--force option,
5954 Extra care should be taken with the -f/--force option,
5954 which will push all new heads on all branches, an action which will
5955 which will push all new heads on all branches, an action which will
5955 almost always cause confusion for collaborators.
5956 almost always cause confusion for collaborators.
5956
5957
5957 If -r/--rev is used, the specified revision and all its ancestors
5958 If -r/--rev is used, the specified revision and all its ancestors
5958 will be pushed to the remote repository.
5959 will be pushed to the remote repository.
5959
5960
5960 If -B/--bookmark is used, the specified bookmarked revision, its
5961 If -B/--bookmark is used, the specified bookmarked revision, its
5961 ancestors, and the bookmark will be pushed to the remote
5962 ancestors, and the bookmark will be pushed to the remote
5962 repository. Specifying ``.`` is equivalent to specifying the active
5963 repository. Specifying ``.`` is equivalent to specifying the active
5963 bookmark's name.
5964 bookmark's name.
5964
5965
5965 Please see :hg:`help urls` for important details about ``ssh://``
5966 Please see :hg:`help urls` for important details about ``ssh://``
5966 URLs. If DESTINATION is omitted, a default path will be used.
5967 URLs. If DESTINATION is omitted, a default path will be used.
5967
5968
5968 Returns 0 if push was successful, 1 if nothing to push.
5969 Returns 0 if push was successful, 1 if nothing to push.
5969 """
5970 """
5970
5971
5971 if opts.get('bookmark'):
5972 if opts.get('bookmark'):
5972 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5973 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5973 for b in opts['bookmark']:
5974 for b in opts['bookmark']:
5974 # translate -B options to -r so changesets get pushed
5975 # translate -B options to -r so changesets get pushed
5975 b = repo._bookmarks.expandname(b)
5976 b = repo._bookmarks.expandname(b)
5976 if b in repo._bookmarks:
5977 if b in repo._bookmarks:
5977 opts.setdefault('rev', []).append(b)
5978 opts.setdefault('rev', []).append(b)
5978 else:
5979 else:
5979 # if we try to push a deleted bookmark, translate it to null
5980 # if we try to push a deleted bookmark, translate it to null
5980 # this lets simultaneous -r, -b options continue working
5981 # this lets simultaneous -r, -b options continue working
5981 opts.setdefault('rev', []).append("null")
5982 opts.setdefault('rev', []).append("null")
5982
5983
5983 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5984 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5984 if not path:
5985 if not path:
5985 raise error.Abort(_('default repository not configured!'),
5986 raise error.Abort(_('default repository not configured!'),
5986 hint=_('see the "path" section in "hg help config"'))
5987 hint=_('see the "path" section in "hg help config"'))
5987 dest = path.pushloc or path.loc
5988 dest = path.pushloc or path.loc
5988 branches = (path.branch, opts.get('branch') or [])
5989 branches = (path.branch, opts.get('branch') or [])
5989 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5990 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5990 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5991 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5991 other = hg.peer(repo, opts, dest)
5992 other = hg.peer(repo, opts, dest)
5992
5993
5993 if revs:
5994 if revs:
5994 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5995 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5995 if not revs:
5996 if not revs:
5996 raise error.Abort(_("specified revisions evaluate to an empty set"),
5997 raise error.Abort(_("specified revisions evaluate to an empty set"),
5997 hint=_("use different revision arguments"))
5998 hint=_("use different revision arguments"))
5998 elif path.pushrev:
5999 elif path.pushrev:
5999 # It doesn't make any sense to specify ancestor revisions. So limit
6000 # It doesn't make any sense to specify ancestor revisions. So limit
6000 # to DAG heads to make discovery simpler.
6001 # to DAG heads to make discovery simpler.
6001 expr = revset.formatspec('heads(%r)', path.pushrev)
6002 expr = revset.formatspec('heads(%r)', path.pushrev)
6002 revs = scmutil.revrange(repo, [expr])
6003 revs = scmutil.revrange(repo, [expr])
6003 revs = [repo[rev].node() for rev in revs]
6004 revs = [repo[rev].node() for rev in revs]
6004 if not revs:
6005 if not revs:
6005 raise error.Abort(_('default push revset for path evaluates to an '
6006 raise error.Abort(_('default push revset for path evaluates to an '
6006 'empty set'))
6007 'empty set'))
6007
6008
6008 repo._subtoppath = dest
6009 repo._subtoppath = dest
6009 try:
6010 try:
6010 # push subrepos depth-first for coherent ordering
6011 # push subrepos depth-first for coherent ordering
6011 c = repo['']
6012 c = repo['']
6012 subs = c.substate # only repos that are committed
6013 subs = c.substate # only repos that are committed
6013 for s in sorted(subs):
6014 for s in sorted(subs):
6014 result = c.sub(s).push(opts)
6015 result = c.sub(s).push(opts)
6015 if result == 0:
6016 if result == 0:
6016 return not result
6017 return not result
6017 finally:
6018 finally:
6018 del repo._subtoppath
6019 del repo._subtoppath
6019 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
6020 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
6020 newbranch=opts.get('new_branch'),
6021 newbranch=opts.get('new_branch'),
6021 bookmarks=opts.get('bookmark', ()),
6022 bookmarks=opts.get('bookmark', ()),
6022 opargs=opts.get('opargs'))
6023 opargs=opts.get('opargs'))
6023
6024
6024 result = not pushop.cgresult
6025 result = not pushop.cgresult
6025
6026
6026 if pushop.bkresult is not None:
6027 if pushop.bkresult is not None:
6027 if pushop.bkresult == 2:
6028 if pushop.bkresult == 2:
6028 result = 2
6029 result = 2
6029 elif not result and pushop.bkresult:
6030 elif not result and pushop.bkresult:
6030 result = 2
6031 result = 2
6031
6032
6032 return result
6033 return result
6033
6034
6034 @command('recover', [])
6035 @command('recover', [])
6035 def recover(ui, repo):
6036 def recover(ui, repo):
6036 """roll back an interrupted transaction
6037 """roll back an interrupted transaction
6037
6038
6038 Recover from an interrupted commit or pull.
6039 Recover from an interrupted commit or pull.
6039
6040
6040 This command tries to fix the repository status after an
6041 This command tries to fix the repository status after an
6041 interrupted operation. It should only be necessary when Mercurial
6042 interrupted operation. It should only be necessary when Mercurial
6042 suggests it.
6043 suggests it.
6043
6044
6044 Returns 0 if successful, 1 if nothing to recover or verify fails.
6045 Returns 0 if successful, 1 if nothing to recover or verify fails.
6045 """
6046 """
6046 if repo.recover():
6047 if repo.recover():
6047 return hg.verify(repo)
6048 return hg.verify(repo)
6048 return 1
6049 return 1
6049
6050
6050 @command('^remove|rm',
6051 @command('^remove|rm',
6051 [('A', 'after', None, _('record delete for missing files')),
6052 [('A', 'after', None, _('record delete for missing files')),
6052 ('f', 'force', None,
6053 ('f', 'force', None,
6053 _('forget added files, delete modified files')),
6054 _('forget added files, delete modified files')),
6054 ] + subrepoopts + walkopts,
6055 ] + subrepoopts + walkopts,
6055 _('[OPTION]... FILE...'),
6056 _('[OPTION]... FILE...'),
6056 inferrepo=True)
6057 inferrepo=True)
6057 def remove(ui, repo, *pats, **opts):
6058 def remove(ui, repo, *pats, **opts):
6058 """remove the specified files on the next commit
6059 """remove the specified files on the next commit
6059
6060
6060 Schedule the indicated files for removal from the current branch.
6061 Schedule the indicated files for removal from the current branch.
6061
6062
6062 This command schedules the files to be removed at the next commit.
6063 This command schedules the files to be removed at the next commit.
6063 To undo a remove before that, see :hg:`revert`. To undo added
6064 To undo a remove before that, see :hg:`revert`. To undo added
6064 files, see :hg:`forget`.
6065 files, see :hg:`forget`.
6065
6066
6066 .. container:: verbose
6067 .. container:: verbose
6067
6068
6068 -A/--after can be used to remove only files that have already
6069 -A/--after can be used to remove only files that have already
6069 been deleted, -f/--force can be used to force deletion, and -Af
6070 been deleted, -f/--force can be used to force deletion, and -Af
6070 can be used to remove files from the next revision without
6071 can be used to remove files from the next revision without
6071 deleting them from the working directory.
6072 deleting them from the working directory.
6072
6073
6073 The following table details the behavior of remove for different
6074 The following table details the behavior of remove for different
6074 file states (columns) and option combinations (rows). The file
6075 file states (columns) and option combinations (rows). The file
6075 states are Added [A], Clean [C], Modified [M] and Missing [!]
6076 states are Added [A], Clean [C], Modified [M] and Missing [!]
6076 (as reported by :hg:`status`). The actions are Warn, Remove
6077 (as reported by :hg:`status`). The actions are Warn, Remove
6077 (from branch) and Delete (from disk):
6078 (from branch) and Delete (from disk):
6078
6079
6079 ========= == == == ==
6080 ========= == == == ==
6080 opt/state A C M !
6081 opt/state A C M !
6081 ========= == == == ==
6082 ========= == == == ==
6082 none W RD W R
6083 none W RD W R
6083 -f R RD RD R
6084 -f R RD RD R
6084 -A W W W R
6085 -A W W W R
6085 -Af R R R R
6086 -Af R R R R
6086 ========= == == == ==
6087 ========= == == == ==
6087
6088
6088 .. note::
6089 .. note::
6089
6090
6090 :hg:`remove` never deletes files in Added [A] state from the
6091 :hg:`remove` never deletes files in Added [A] state from the
6091 working directory, not even if ``--force`` is specified.
6092 working directory, not even if ``--force`` is specified.
6092
6093
6093 Returns 0 on success, 1 if any warnings encountered.
6094 Returns 0 on success, 1 if any warnings encountered.
6094 """
6095 """
6095
6096
6096 after, force = opts.get('after'), opts.get('force')
6097 after, force = opts.get('after'), opts.get('force')
6097 if not pats and not after:
6098 if not pats and not after:
6098 raise error.Abort(_('no files specified'))
6099 raise error.Abort(_('no files specified'))
6099
6100
6100 m = scmutil.match(repo[None], pats, opts)
6101 m = scmutil.match(repo[None], pats, opts)
6101 subrepos = opts.get('subrepos')
6102 subrepos = opts.get('subrepos')
6102 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6103 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6103
6104
6104 @command('rename|move|mv',
6105 @command('rename|move|mv',
6105 [('A', 'after', None, _('record a rename that has already occurred')),
6106 [('A', 'after', None, _('record a rename that has already occurred')),
6106 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6107 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6107 ] + walkopts + dryrunopts,
6108 ] + walkopts + dryrunopts,
6108 _('[OPTION]... SOURCE... DEST'))
6109 _('[OPTION]... SOURCE... DEST'))
6109 def rename(ui, repo, *pats, **opts):
6110 def rename(ui, repo, *pats, **opts):
6110 """rename files; equivalent of copy + remove
6111 """rename files; equivalent of copy + remove
6111
6112
6112 Mark dest as copies of sources; mark sources for deletion. If dest
6113 Mark dest as copies of sources; mark sources for deletion. If dest
6113 is a directory, copies are put in that directory. If dest is a
6114 is a directory, copies are put in that directory. If dest is a
6114 file, there can only be one source.
6115 file, there can only be one source.
6115
6116
6116 By default, this command copies the contents of files as they
6117 By default, this command copies the contents of files as they
6117 exist in the working directory. If invoked with -A/--after, the
6118 exist in the working directory. If invoked with -A/--after, the
6118 operation is recorded, but no copying is performed.
6119 operation is recorded, but no copying is performed.
6119
6120
6120 This command takes effect at the next commit. To undo a rename
6121 This command takes effect at the next commit. To undo a rename
6121 before that, see :hg:`revert`.
6122 before that, see :hg:`revert`.
6122
6123
6123 Returns 0 on success, 1 if errors are encountered.
6124 Returns 0 on success, 1 if errors are encountered.
6124 """
6125 """
6125 with repo.wlock(False):
6126 with repo.wlock(False):
6126 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6127 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6127
6128
6128 @command('resolve',
6129 @command('resolve',
6129 [('a', 'all', None, _('select all unresolved files')),
6130 [('a', 'all', None, _('select all unresolved files')),
6130 ('l', 'list', None, _('list state of files needing merge')),
6131 ('l', 'list', None, _('list state of files needing merge')),
6131 ('m', 'mark', None, _('mark files as resolved')),
6132 ('m', 'mark', None, _('mark files as resolved')),
6132 ('u', 'unmark', None, _('mark files as unresolved')),
6133 ('u', 'unmark', None, _('mark files as unresolved')),
6133 ('n', 'no-status', None, _('hide status prefix'))]
6134 ('n', 'no-status', None, _('hide status prefix'))]
6134 + mergetoolopts + walkopts + formatteropts,
6135 + mergetoolopts + walkopts + formatteropts,
6135 _('[OPTION]... [FILE]...'),
6136 _('[OPTION]... [FILE]...'),
6136 inferrepo=True)
6137 inferrepo=True)
6137 def resolve(ui, repo, *pats, **opts):
6138 def resolve(ui, repo, *pats, **opts):
6138 """redo merges or set/view the merge status of files
6139 """redo merges or set/view the merge status of files
6139
6140
6140 Merges with unresolved conflicts are often the result of
6141 Merges with unresolved conflicts are often the result of
6141 non-interactive merging using the ``internal:merge`` configuration
6142 non-interactive merging using the ``internal:merge`` configuration
6142 setting, or a command-line merge tool like ``diff3``. The resolve
6143 setting, or a command-line merge tool like ``diff3``. The resolve
6143 command is used to manage the files involved in a merge, after
6144 command is used to manage the files involved in a merge, after
6144 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6145 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6145 working directory must have two parents). See :hg:`help
6146 working directory must have two parents). See :hg:`help
6146 merge-tools` for information on configuring merge tools.
6147 merge-tools` for information on configuring merge tools.
6147
6148
6148 The resolve command can be used in the following ways:
6149 The resolve command can be used in the following ways:
6149
6150
6150 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6151 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6151 files, discarding any previous merge attempts. Re-merging is not
6152 files, discarding any previous merge attempts. Re-merging is not
6152 performed for files already marked as resolved. Use ``--all/-a``
6153 performed for files already marked as resolved. Use ``--all/-a``
6153 to select all unresolved files. ``--tool`` can be used to specify
6154 to select all unresolved files. ``--tool`` can be used to specify
6154 the merge tool used for the given files. It overrides the HGMERGE
6155 the merge tool used for the given files. It overrides the HGMERGE
6155 environment variable and your configuration files. Previous file
6156 environment variable and your configuration files. Previous file
6156 contents are saved with a ``.orig`` suffix.
6157 contents are saved with a ``.orig`` suffix.
6157
6158
6158 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6159 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6159 (e.g. after having manually fixed-up the files). The default is
6160 (e.g. after having manually fixed-up the files). The default is
6160 to mark all unresolved files.
6161 to mark all unresolved files.
6161
6162
6162 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6163 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6163 default is to mark all resolved files.
6164 default is to mark all resolved files.
6164
6165
6165 - :hg:`resolve -l`: list files which had or still have conflicts.
6166 - :hg:`resolve -l`: list files which had or still have conflicts.
6166 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6167 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6167
6168
6168 .. note::
6169 .. note::
6169
6170
6170 Mercurial will not let you commit files with unresolved merge
6171 Mercurial will not let you commit files with unresolved merge
6171 conflicts. You must use :hg:`resolve -m ...` before you can
6172 conflicts. You must use :hg:`resolve -m ...` before you can
6172 commit after a conflicting merge.
6173 commit after a conflicting merge.
6173
6174
6174 Returns 0 on success, 1 if any files fail a resolve attempt.
6175 Returns 0 on success, 1 if any files fail a resolve attempt.
6175 """
6176 """
6176
6177
6177 flaglist = 'all mark unmark list no_status'.split()
6178 flaglist = 'all mark unmark list no_status'.split()
6178 all, mark, unmark, show, nostatus = \
6179 all, mark, unmark, show, nostatus = \
6179 [opts.get(o) for o in flaglist]
6180 [opts.get(o) for o in flaglist]
6180
6181
6181 if (show and (mark or unmark)) or (mark and unmark):
6182 if (show and (mark or unmark)) or (mark and unmark):
6182 raise error.Abort(_("too many options specified"))
6183 raise error.Abort(_("too many options specified"))
6183 if pats and all:
6184 if pats and all:
6184 raise error.Abort(_("can't specify --all and patterns"))
6185 raise error.Abort(_("can't specify --all and patterns"))
6185 if not (all or pats or show or mark or unmark):
6186 if not (all or pats or show or mark or unmark):
6186 raise error.Abort(_('no files or directories specified'),
6187 raise error.Abort(_('no files or directories specified'),
6187 hint=('use --all to re-merge all unresolved files'))
6188 hint=('use --all to re-merge all unresolved files'))
6188
6189
6189 if show:
6190 if show:
6190 fm = ui.formatter('resolve', opts)
6191 fm = ui.formatter('resolve', opts)
6191 ms = mergemod.mergestate.read(repo)
6192 ms = mergemod.mergestate.read(repo)
6192 m = scmutil.match(repo[None], pats, opts)
6193 m = scmutil.match(repo[None], pats, opts)
6193 for f in ms:
6194 for f in ms:
6194 if not m(f):
6195 if not m(f):
6195 continue
6196 continue
6196 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6197 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6197 'd': 'driverresolved'}[ms[f]]
6198 'd': 'driverresolved'}[ms[f]]
6198 fm.startitem()
6199 fm.startitem()
6199 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6200 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6200 fm.write('path', '%s\n', f, label=l)
6201 fm.write('path', '%s\n', f, label=l)
6201 fm.end()
6202 fm.end()
6202 return 0
6203 return 0
6203
6204
6204 with repo.wlock():
6205 with repo.wlock():
6205 ms = mergemod.mergestate.read(repo)
6206 ms = mergemod.mergestate.read(repo)
6206
6207
6207 if not (ms.active() or repo.dirstate.p2() != nullid):
6208 if not (ms.active() or repo.dirstate.p2() != nullid):
6208 raise error.Abort(
6209 raise error.Abort(
6209 _('resolve command not applicable when not merging'))
6210 _('resolve command not applicable when not merging'))
6210
6211
6211 wctx = repo[None]
6212 wctx = repo[None]
6212
6213
6213 if ms.mergedriver and ms.mdstate() == 'u':
6214 if ms.mergedriver and ms.mdstate() == 'u':
6214 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6215 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6215 ms.commit()
6216 ms.commit()
6216 # allow mark and unmark to go through
6217 # allow mark and unmark to go through
6217 if not mark and not unmark and not proceed:
6218 if not mark and not unmark and not proceed:
6218 return 1
6219 return 1
6219
6220
6220 m = scmutil.match(wctx, pats, opts)
6221 m = scmutil.match(wctx, pats, opts)
6221 ret = 0
6222 ret = 0
6222 didwork = False
6223 didwork = False
6223 runconclude = False
6224 runconclude = False
6224
6225
6225 tocomplete = []
6226 tocomplete = []
6226 for f in ms:
6227 for f in ms:
6227 if not m(f):
6228 if not m(f):
6228 continue
6229 continue
6229
6230
6230 didwork = True
6231 didwork = True
6231
6232
6232 # don't let driver-resolved files be marked, and run the conclude
6233 # don't let driver-resolved files be marked, and run the conclude
6233 # step if asked to resolve
6234 # step if asked to resolve
6234 if ms[f] == "d":
6235 if ms[f] == "d":
6235 exact = m.exact(f)
6236 exact = m.exact(f)
6236 if mark:
6237 if mark:
6237 if exact:
6238 if exact:
6238 ui.warn(_('not marking %s as it is driver-resolved\n')
6239 ui.warn(_('not marking %s as it is driver-resolved\n')
6239 % f)
6240 % f)
6240 elif unmark:
6241 elif unmark:
6241 if exact:
6242 if exact:
6242 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6243 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6243 % f)
6244 % f)
6244 else:
6245 else:
6245 runconclude = True
6246 runconclude = True
6246 continue
6247 continue
6247
6248
6248 if mark:
6249 if mark:
6249 ms.mark(f, "r")
6250 ms.mark(f, "r")
6250 elif unmark:
6251 elif unmark:
6251 ms.mark(f, "u")
6252 ms.mark(f, "u")
6252 else:
6253 else:
6253 # backup pre-resolve (merge uses .orig for its own purposes)
6254 # backup pre-resolve (merge uses .orig for its own purposes)
6254 a = repo.wjoin(f)
6255 a = repo.wjoin(f)
6255 try:
6256 try:
6256 util.copyfile(a, a + ".resolve")
6257 util.copyfile(a, a + ".resolve")
6257 except (IOError, OSError) as inst:
6258 except (IOError, OSError) as inst:
6258 if inst.errno != errno.ENOENT:
6259 if inst.errno != errno.ENOENT:
6259 raise
6260 raise
6260
6261
6261 try:
6262 try:
6262 # preresolve file
6263 # preresolve file
6263 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6264 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6264 'resolve')
6265 'resolve')
6265 complete, r = ms.preresolve(f, wctx)
6266 complete, r = ms.preresolve(f, wctx)
6266 if not complete:
6267 if not complete:
6267 tocomplete.append(f)
6268 tocomplete.append(f)
6268 elif r:
6269 elif r:
6269 ret = 1
6270 ret = 1
6270 finally:
6271 finally:
6271 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6272 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6272 ms.commit()
6273 ms.commit()
6273
6274
6274 # replace filemerge's .orig file with our resolve file, but only
6275 # replace filemerge's .orig file with our resolve file, but only
6275 # for merges that are complete
6276 # for merges that are complete
6276 if complete:
6277 if complete:
6277 try:
6278 try:
6278 util.rename(a + ".resolve",
6279 util.rename(a + ".resolve",
6279 scmutil.origpath(ui, repo, a))
6280 scmutil.origpath(ui, repo, a))
6280 except OSError as inst:
6281 except OSError as inst:
6281 if inst.errno != errno.ENOENT:
6282 if inst.errno != errno.ENOENT:
6282 raise
6283 raise
6283
6284
6284 for f in tocomplete:
6285 for f in tocomplete:
6285 try:
6286 try:
6286 # resolve file
6287 # resolve file
6287 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6288 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6288 'resolve')
6289 'resolve')
6289 r = ms.resolve(f, wctx)
6290 r = ms.resolve(f, wctx)
6290 if r:
6291 if r:
6291 ret = 1
6292 ret = 1
6292 finally:
6293 finally:
6293 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6294 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6294 ms.commit()
6295 ms.commit()
6295
6296
6296 # replace filemerge's .orig file with our resolve file
6297 # replace filemerge's .orig file with our resolve file
6297 a = repo.wjoin(f)
6298 a = repo.wjoin(f)
6298 try:
6299 try:
6299 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6300 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6300 except OSError as inst:
6301 except OSError as inst:
6301 if inst.errno != errno.ENOENT:
6302 if inst.errno != errno.ENOENT:
6302 raise
6303 raise
6303
6304
6304 ms.commit()
6305 ms.commit()
6305 ms.recordactions()
6306 ms.recordactions()
6306
6307
6307 if not didwork and pats:
6308 if not didwork and pats:
6308 hint = None
6309 hint = None
6309 if not any([p for p in pats if p.find(':') >= 0]):
6310 if not any([p for p in pats if p.find(':') >= 0]):
6310 pats = ['path:%s' % p for p in pats]
6311 pats = ['path:%s' % p for p in pats]
6311 m = scmutil.match(wctx, pats, opts)
6312 m = scmutil.match(wctx, pats, opts)
6312 for f in ms:
6313 for f in ms:
6313 if not m(f):
6314 if not m(f):
6314 continue
6315 continue
6315 flags = ''.join(['-%s ' % o[0] for o in flaglist
6316 flags = ''.join(['-%s ' % o[0] for o in flaglist
6316 if opts.get(o)])
6317 if opts.get(o)])
6317 hint = _("(try: hg resolve %s%s)\n") % (
6318 hint = _("(try: hg resolve %s%s)\n") % (
6318 flags,
6319 flags,
6319 ' '.join(pats))
6320 ' '.join(pats))
6320 break
6321 break
6321 ui.warn(_("arguments do not match paths that need resolving\n"))
6322 ui.warn(_("arguments do not match paths that need resolving\n"))
6322 if hint:
6323 if hint:
6323 ui.warn(hint)
6324 ui.warn(hint)
6324 elif ms.mergedriver and ms.mdstate() != 's':
6325 elif ms.mergedriver and ms.mdstate() != 's':
6325 # run conclude step when either a driver-resolved file is requested
6326 # run conclude step when either a driver-resolved file is requested
6326 # or there are no driver-resolved files
6327 # or there are no driver-resolved files
6327 # we can't use 'ret' to determine whether any files are unresolved
6328 # we can't use 'ret' to determine whether any files are unresolved
6328 # because we might not have tried to resolve some
6329 # because we might not have tried to resolve some
6329 if ((runconclude or not list(ms.driverresolved()))
6330 if ((runconclude or not list(ms.driverresolved()))
6330 and not list(ms.unresolved())):
6331 and not list(ms.unresolved())):
6331 proceed = mergemod.driverconclude(repo, ms, wctx)
6332 proceed = mergemod.driverconclude(repo, ms, wctx)
6332 ms.commit()
6333 ms.commit()
6333 if not proceed:
6334 if not proceed:
6334 return 1
6335 return 1
6335
6336
6336 # Nudge users into finishing an unfinished operation
6337 # Nudge users into finishing an unfinished operation
6337 unresolvedf = list(ms.unresolved())
6338 unresolvedf = list(ms.unresolved())
6338 driverresolvedf = list(ms.driverresolved())
6339 driverresolvedf = list(ms.driverresolved())
6339 if not unresolvedf and not driverresolvedf:
6340 if not unresolvedf and not driverresolvedf:
6340 ui.status(_('(no more unresolved files)\n'))
6341 ui.status(_('(no more unresolved files)\n'))
6341 cmdutil.checkafterresolved(repo)
6342 cmdutil.checkafterresolved(repo)
6342 elif not unresolvedf:
6343 elif not unresolvedf:
6343 ui.status(_('(no more unresolved files -- '
6344 ui.status(_('(no more unresolved files -- '
6344 'run "hg resolve --all" to conclude)\n'))
6345 'run "hg resolve --all" to conclude)\n'))
6345
6346
6346 return ret
6347 return ret
6347
6348
6348 @command('revert',
6349 @command('revert',
6349 [('a', 'all', None, _('revert all changes when no arguments given')),
6350 [('a', 'all', None, _('revert all changes when no arguments given')),
6350 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6351 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6351 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6352 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6352 ('C', 'no-backup', None, _('do not save backup copies of files')),
6353 ('C', 'no-backup', None, _('do not save backup copies of files')),
6353 ('i', 'interactive', None,
6354 ('i', 'interactive', None,
6354 _('interactively select the changes (EXPERIMENTAL)')),
6355 _('interactively select the changes (EXPERIMENTAL)')),
6355 ] + walkopts + dryrunopts,
6356 ] + walkopts + dryrunopts,
6356 _('[OPTION]... [-r REV] [NAME]...'))
6357 _('[OPTION]... [-r REV] [NAME]...'))
6357 def revert(ui, repo, *pats, **opts):
6358 def revert(ui, repo, *pats, **opts):
6358 """restore files to their checkout state
6359 """restore files to their checkout state
6359
6360
6360 .. note::
6361 .. note::
6361
6362
6362 To check out earlier revisions, you should use :hg:`update REV`.
6363 To check out earlier revisions, you should use :hg:`update REV`.
6363 To cancel an uncommitted merge (and lose your changes),
6364 To cancel an uncommitted merge (and lose your changes),
6364 use :hg:`update --clean .`.
6365 use :hg:`update --clean .`.
6365
6366
6366 With no revision specified, revert the specified files or directories
6367 With no revision specified, revert the specified files or directories
6367 to the contents they had in the parent of the working directory.
6368 to the contents they had in the parent of the working directory.
6368 This restores the contents of files to an unmodified
6369 This restores the contents of files to an unmodified
6369 state and unschedules adds, removes, copies, and renames. If the
6370 state and unschedules adds, removes, copies, and renames. If the
6370 working directory has two parents, you must explicitly specify a
6371 working directory has two parents, you must explicitly specify a
6371 revision.
6372 revision.
6372
6373
6373 Using the -r/--rev or -d/--date options, revert the given files or
6374 Using the -r/--rev or -d/--date options, revert the given files or
6374 directories to their states as of a specific revision. Because
6375 directories to their states as of a specific revision. Because
6375 revert does not change the working directory parents, this will
6376 revert does not change the working directory parents, this will
6376 cause these files to appear modified. This can be helpful to "back
6377 cause these files to appear modified. This can be helpful to "back
6377 out" some or all of an earlier change. See :hg:`backout` for a
6378 out" some or all of an earlier change. See :hg:`backout` for a
6378 related method.
6379 related method.
6379
6380
6380 Modified files are saved with a .orig suffix before reverting.
6381 Modified files are saved with a .orig suffix before reverting.
6381 To disable these backups, use --no-backup. It is possible to store
6382 To disable these backups, use --no-backup. It is possible to store
6382 the backup files in a custom directory relative to the root of the
6383 the backup files in a custom directory relative to the root of the
6383 repository by setting the ``ui.origbackuppath`` configuration
6384 repository by setting the ``ui.origbackuppath`` configuration
6384 option.
6385 option.
6385
6386
6386 See :hg:`help dates` for a list of formats valid for -d/--date.
6387 See :hg:`help dates` for a list of formats valid for -d/--date.
6387
6388
6388 See :hg:`help backout` for a way to reverse the effect of an
6389 See :hg:`help backout` for a way to reverse the effect of an
6389 earlier changeset.
6390 earlier changeset.
6390
6391
6391 Returns 0 on success.
6392 Returns 0 on success.
6392 """
6393 """
6393
6394
6394 if opts.get("date"):
6395 if opts.get("date"):
6395 if opts.get("rev"):
6396 if opts.get("rev"):
6396 raise error.Abort(_("you can't specify a revision and a date"))
6397 raise error.Abort(_("you can't specify a revision and a date"))
6397 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6398 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6398
6399
6399 parent, p2 = repo.dirstate.parents()
6400 parent, p2 = repo.dirstate.parents()
6400 if not opts.get('rev') and p2 != nullid:
6401 if not opts.get('rev') and p2 != nullid:
6401 # revert after merge is a trap for new users (issue2915)
6402 # revert after merge is a trap for new users (issue2915)
6402 raise error.Abort(_('uncommitted merge with no revision specified'),
6403 raise error.Abort(_('uncommitted merge with no revision specified'),
6403 hint=_("use 'hg update' or see 'hg help revert'"))
6404 hint=_("use 'hg update' or see 'hg help revert'"))
6404
6405
6405 ctx = scmutil.revsingle(repo, opts.get('rev'))
6406 ctx = scmutil.revsingle(repo, opts.get('rev'))
6406
6407
6407 if (not (pats or opts.get('include') or opts.get('exclude') or
6408 if (not (pats or opts.get('include') or opts.get('exclude') or
6408 opts.get('all') or opts.get('interactive'))):
6409 opts.get('all') or opts.get('interactive'))):
6409 msg = _("no files or directories specified")
6410 msg = _("no files or directories specified")
6410 if p2 != nullid:
6411 if p2 != nullid:
6411 hint = _("uncommitted merge, use --all to discard all changes,"
6412 hint = _("uncommitted merge, use --all to discard all changes,"
6412 " or 'hg update -C .' to abort the merge")
6413 " or 'hg update -C .' to abort the merge")
6413 raise error.Abort(msg, hint=hint)
6414 raise error.Abort(msg, hint=hint)
6414 dirty = any(repo.status())
6415 dirty = any(repo.status())
6415 node = ctx.node()
6416 node = ctx.node()
6416 if node != parent:
6417 if node != parent:
6417 if dirty:
6418 if dirty:
6418 hint = _("uncommitted changes, use --all to discard all"
6419 hint = _("uncommitted changes, use --all to discard all"
6419 " changes, or 'hg update %s' to update") % ctx.rev()
6420 " changes, or 'hg update %s' to update") % ctx.rev()
6420 else:
6421 else:
6421 hint = _("use --all to revert all files,"
6422 hint = _("use --all to revert all files,"
6422 " or 'hg update %s' to update") % ctx.rev()
6423 " or 'hg update %s' to update") % ctx.rev()
6423 elif dirty:
6424 elif dirty:
6424 hint = _("uncommitted changes, use --all to discard all changes")
6425 hint = _("uncommitted changes, use --all to discard all changes")
6425 else:
6426 else:
6426 hint = _("use --all to revert all files")
6427 hint = _("use --all to revert all files")
6427 raise error.Abort(msg, hint=hint)
6428 raise error.Abort(msg, hint=hint)
6428
6429
6429 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6430 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6430
6431
6431 @command('rollback', dryrunopts +
6432 @command('rollback', dryrunopts +
6432 [('f', 'force', False, _('ignore safety measures'))])
6433 [('f', 'force', False, _('ignore safety measures'))])
6433 def rollback(ui, repo, **opts):
6434 def rollback(ui, repo, **opts):
6434 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6435 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6435
6436
6436 Please use :hg:`commit --amend` instead of rollback to correct
6437 Please use :hg:`commit --amend` instead of rollback to correct
6437 mistakes in the last commit.
6438 mistakes in the last commit.
6438
6439
6439 This command should be used with care. There is only one level of
6440 This command should be used with care. There is only one level of
6440 rollback, and there is no way to undo a rollback. It will also
6441 rollback, and there is no way to undo a rollback. It will also
6441 restore the dirstate at the time of the last transaction, losing
6442 restore the dirstate at the time of the last transaction, losing
6442 any dirstate changes since that time. This command does not alter
6443 any dirstate changes since that time. This command does not alter
6443 the working directory.
6444 the working directory.
6444
6445
6445 Transactions are used to encapsulate the effects of all commands
6446 Transactions are used to encapsulate the effects of all commands
6446 that create new changesets or propagate existing changesets into a
6447 that create new changesets or propagate existing changesets into a
6447 repository.
6448 repository.
6448
6449
6449 .. container:: verbose
6450 .. container:: verbose
6450
6451
6451 For example, the following commands are transactional, and their
6452 For example, the following commands are transactional, and their
6452 effects can be rolled back:
6453 effects can be rolled back:
6453
6454
6454 - commit
6455 - commit
6455 - import
6456 - import
6456 - pull
6457 - pull
6457 - push (with this repository as the destination)
6458 - push (with this repository as the destination)
6458 - unbundle
6459 - unbundle
6459
6460
6460 To avoid permanent data loss, rollback will refuse to rollback a
6461 To avoid permanent data loss, rollback will refuse to rollback a
6461 commit transaction if it isn't checked out. Use --force to
6462 commit transaction if it isn't checked out. Use --force to
6462 override this protection.
6463 override this protection.
6463
6464
6464 The rollback command can be entirely disabled by setting the
6465 The rollback command can be entirely disabled by setting the
6465 ``ui.rollback`` configuration setting to false. If you're here
6466 ``ui.rollback`` configuration setting to false. If you're here
6466 because you want to use rollback and it's disabled, you can
6467 because you want to use rollback and it's disabled, you can
6467 re-enable the command by setting ``ui.rollback`` to true.
6468 re-enable the command by setting ``ui.rollback`` to true.
6468
6469
6469 This command is not intended for use on public repositories. Once
6470 This command is not intended for use on public repositories. Once
6470 changes are visible for pull by other users, rolling a transaction
6471 changes are visible for pull by other users, rolling a transaction
6471 back locally is ineffective (someone else may already have pulled
6472 back locally is ineffective (someone else may already have pulled
6472 the changes). Furthermore, a race is possible with readers of the
6473 the changes). Furthermore, a race is possible with readers of the
6473 repository; for example an in-progress pull from the repository
6474 repository; for example an in-progress pull from the repository
6474 may fail if a rollback is performed.
6475 may fail if a rollback is performed.
6475
6476
6476 Returns 0 on success, 1 if no rollback data is available.
6477 Returns 0 on success, 1 if no rollback data is available.
6477 """
6478 """
6478 if not ui.configbool('ui', 'rollback', True):
6479 if not ui.configbool('ui', 'rollback', True):
6479 raise error.Abort(_('rollback is disabled because it is unsafe'),
6480 raise error.Abort(_('rollback is disabled because it is unsafe'),
6480 hint=('see `hg help -v rollback` for information'))
6481 hint=('see `hg help -v rollback` for information'))
6481 return repo.rollback(dryrun=opts.get('dry_run'),
6482 return repo.rollback(dryrun=opts.get('dry_run'),
6482 force=opts.get('force'))
6483 force=opts.get('force'))
6483
6484
6484 @command('root', [])
6485 @command('root', [])
6485 def root(ui, repo):
6486 def root(ui, repo):
6486 """print the root (top) of the current working directory
6487 """print the root (top) of the current working directory
6487
6488
6488 Print the root directory of the current repository.
6489 Print the root directory of the current repository.
6489
6490
6490 Returns 0 on success.
6491 Returns 0 on success.
6491 """
6492 """
6492 ui.write(repo.root + "\n")
6493 ui.write(repo.root + "\n")
6493
6494
6494 @command('^serve',
6495 @command('^serve',
6495 [('A', 'accesslog', '', _('name of access log file to write to'),
6496 [('A', 'accesslog', '', _('name of access log file to write to'),
6496 _('FILE')),
6497 _('FILE')),
6497 ('d', 'daemon', None, _('run server in background')),
6498 ('d', 'daemon', None, _('run server in background')),
6498 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6499 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6499 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6500 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6500 # use string type, then we can check if something was passed
6501 # use string type, then we can check if something was passed
6501 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6502 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6502 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6503 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6503 _('ADDR')),
6504 _('ADDR')),
6504 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6505 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6505 _('PREFIX')),
6506 _('PREFIX')),
6506 ('n', 'name', '',
6507 ('n', 'name', '',
6507 _('name to show in web pages (default: working directory)'), _('NAME')),
6508 _('name to show in web pages (default: working directory)'), _('NAME')),
6508 ('', 'web-conf', '',
6509 ('', 'web-conf', '',
6509 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6510 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6510 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6511 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6511 _('FILE')),
6512 _('FILE')),
6512 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6513 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6513 ('', 'stdio', None, _('for remote clients')),
6514 ('', 'stdio', None, _('for remote clients')),
6514 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6515 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6515 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6516 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6516 ('', 'style', '', _('template style to use'), _('STYLE')),
6517 ('', 'style', '', _('template style to use'), _('STYLE')),
6517 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6518 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6518 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6519 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6519 _('[OPTION]...'),
6520 _('[OPTION]...'),
6520 optionalrepo=True)
6521 optionalrepo=True)
6521 def serve(ui, repo, **opts):
6522 def serve(ui, repo, **opts):
6522 """start stand-alone webserver
6523 """start stand-alone webserver
6523
6524
6524 Start a local HTTP repository browser and pull server. You can use
6525 Start a local HTTP repository browser and pull server. You can use
6525 this for ad-hoc sharing and browsing of repositories. It is
6526 this for ad-hoc sharing and browsing of repositories. It is
6526 recommended to use a real web server to serve a repository for
6527 recommended to use a real web server to serve a repository for
6527 longer periods of time.
6528 longer periods of time.
6528
6529
6529 Please note that the server does not implement access control.
6530 Please note that the server does not implement access control.
6530 This means that, by default, anybody can read from the server and
6531 This means that, by default, anybody can read from the server and
6531 nobody can write to it by default. Set the ``web.allow_push``
6532 nobody can write to it by default. Set the ``web.allow_push``
6532 option to ``*`` to allow everybody to push to the server. You
6533 option to ``*`` to allow everybody to push to the server. You
6533 should use a real web server if you need to authenticate users.
6534 should use a real web server if you need to authenticate users.
6534
6535
6535 By default, the server logs accesses to stdout and errors to
6536 By default, the server logs accesses to stdout and errors to
6536 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6537 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6537 files.
6538 files.
6538
6539
6539 To have the server choose a free port number to listen on, specify
6540 To have the server choose a free port number to listen on, specify
6540 a port number of 0; in this case, the server will print the port
6541 a port number of 0; in this case, the server will print the port
6541 number it uses.
6542 number it uses.
6542
6543
6543 Returns 0 on success.
6544 Returns 0 on success.
6544 """
6545 """
6545
6546
6546 if opts["stdio"] and opts["cmdserver"]:
6547 if opts["stdio"] and opts["cmdserver"]:
6547 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6548 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6548
6549
6549 if opts["stdio"]:
6550 if opts["stdio"]:
6550 if repo is None:
6551 if repo is None:
6551 raise error.RepoError(_("there is no Mercurial repository here"
6552 raise error.RepoError(_("there is no Mercurial repository here"
6552 " (.hg not found)"))
6553 " (.hg not found)"))
6553 s = sshserver.sshserver(ui, repo)
6554 s = sshserver.sshserver(ui, repo)
6554 s.serve_forever()
6555 s.serve_forever()
6555
6556
6556 if opts["cmdserver"]:
6557 if opts["cmdserver"]:
6557 service = commandserver.createservice(ui, repo, opts)
6558 service = commandserver.createservice(ui, repo, opts)
6558 else:
6559 else:
6559 service = hgweb.createservice(ui, repo, opts)
6560 service = hgweb.createservice(ui, repo, opts)
6560 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6561 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6561
6562
6562 @command('^status|st',
6563 @command('^status|st',
6563 [('A', 'all', None, _('show status of all files')),
6564 [('A', 'all', None, _('show status of all files')),
6564 ('m', 'modified', None, _('show only modified files')),
6565 ('m', 'modified', None, _('show only modified files')),
6565 ('a', 'added', None, _('show only added files')),
6566 ('a', 'added', None, _('show only added files')),
6566 ('r', 'removed', None, _('show only removed files')),
6567 ('r', 'removed', None, _('show only removed files')),
6567 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6568 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6568 ('c', 'clean', None, _('show only files without changes')),
6569 ('c', 'clean', None, _('show only files without changes')),
6569 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6570 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6570 ('i', 'ignored', None, _('show only ignored files')),
6571 ('i', 'ignored', None, _('show only ignored files')),
6571 ('n', 'no-status', None, _('hide status prefix')),
6572 ('n', 'no-status', None, _('hide status prefix')),
6572 ('C', 'copies', None, _('show source of copied files')),
6573 ('C', 'copies', None, _('show source of copied files')),
6573 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6574 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6574 ('', 'rev', [], _('show difference from revision'), _('REV')),
6575 ('', 'rev', [], _('show difference from revision'), _('REV')),
6575 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6576 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6576 ] + walkopts + subrepoopts + formatteropts,
6577 ] + walkopts + subrepoopts + formatteropts,
6577 _('[OPTION]... [FILE]...'),
6578 _('[OPTION]... [FILE]...'),
6578 inferrepo=True)
6579 inferrepo=True)
6579 def status(ui, repo, *pats, **opts):
6580 def status(ui, repo, *pats, **opts):
6580 """show changed files in the working directory
6581 """show changed files in the working directory
6581
6582
6582 Show status of files in the repository. If names are given, only
6583 Show status of files in the repository. If names are given, only
6583 files that match are shown. Files that are clean or ignored or
6584 files that match are shown. Files that are clean or ignored or
6584 the source of a copy/move operation, are not listed unless
6585 the source of a copy/move operation, are not listed unless
6585 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6586 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6586 Unless options described with "show only ..." are given, the
6587 Unless options described with "show only ..." are given, the
6587 options -mardu are used.
6588 options -mardu are used.
6588
6589
6589 Option -q/--quiet hides untracked (unknown and ignored) files
6590 Option -q/--quiet hides untracked (unknown and ignored) files
6590 unless explicitly requested with -u/--unknown or -i/--ignored.
6591 unless explicitly requested with -u/--unknown or -i/--ignored.
6591
6592
6592 .. note::
6593 .. note::
6593
6594
6594 :hg:`status` may appear to disagree with diff if permissions have
6595 :hg:`status` may appear to disagree with diff if permissions have
6595 changed or a merge has occurred. The standard diff format does
6596 changed or a merge has occurred. The standard diff format does
6596 not report permission changes and diff only reports changes
6597 not report permission changes and diff only reports changes
6597 relative to one merge parent.
6598 relative to one merge parent.
6598
6599
6599 If one revision is given, it is used as the base revision.
6600 If one revision is given, it is used as the base revision.
6600 If two revisions are given, the differences between them are
6601 If two revisions are given, the differences between them are
6601 shown. The --change option can also be used as a shortcut to list
6602 shown. The --change option can also be used as a shortcut to list
6602 the changed files of a revision from its first parent.
6603 the changed files of a revision from its first parent.
6603
6604
6604 The codes used to show the status of files are::
6605 The codes used to show the status of files are::
6605
6606
6606 M = modified
6607 M = modified
6607 A = added
6608 A = added
6608 R = removed
6609 R = removed
6609 C = clean
6610 C = clean
6610 ! = missing (deleted by non-hg command, but still tracked)
6611 ! = missing (deleted by non-hg command, but still tracked)
6611 ? = not tracked
6612 ? = not tracked
6612 I = ignored
6613 I = ignored
6613 = origin of the previous file (with --copies)
6614 = origin of the previous file (with --copies)
6614
6615
6615 .. container:: verbose
6616 .. container:: verbose
6616
6617
6617 Examples:
6618 Examples:
6618
6619
6619 - show changes in the working directory relative to a
6620 - show changes in the working directory relative to a
6620 changeset::
6621 changeset::
6621
6622
6622 hg status --rev 9353
6623 hg status --rev 9353
6623
6624
6624 - show changes in the working directory relative to the
6625 - show changes in the working directory relative to the
6625 current directory (see :hg:`help patterns` for more information)::
6626 current directory (see :hg:`help patterns` for more information)::
6626
6627
6627 hg status re:
6628 hg status re:
6628
6629
6629 - show all changes including copies in an existing changeset::
6630 - show all changes including copies in an existing changeset::
6630
6631
6631 hg status --copies --change 9353
6632 hg status --copies --change 9353
6632
6633
6633 - get a NUL separated list of added files, suitable for xargs::
6634 - get a NUL separated list of added files, suitable for xargs::
6634
6635
6635 hg status -an0
6636 hg status -an0
6636
6637
6637 Returns 0 on success.
6638 Returns 0 on success.
6638 """
6639 """
6639
6640
6640 revs = opts.get('rev')
6641 revs = opts.get('rev')
6641 change = opts.get('change')
6642 change = opts.get('change')
6642
6643
6643 if revs and change:
6644 if revs and change:
6644 msg = _('cannot specify --rev and --change at the same time')
6645 msg = _('cannot specify --rev and --change at the same time')
6645 raise error.Abort(msg)
6646 raise error.Abort(msg)
6646 elif change:
6647 elif change:
6647 node2 = scmutil.revsingle(repo, change, None).node()
6648 node2 = scmutil.revsingle(repo, change, None).node()
6648 node1 = repo[node2].p1().node()
6649 node1 = repo[node2].p1().node()
6649 else:
6650 else:
6650 node1, node2 = scmutil.revpair(repo, revs)
6651 node1, node2 = scmutil.revpair(repo, revs)
6651
6652
6652 if pats:
6653 if pats:
6653 cwd = repo.getcwd()
6654 cwd = repo.getcwd()
6654 else:
6655 else:
6655 cwd = ''
6656 cwd = ''
6656
6657
6657 if opts.get('print0'):
6658 if opts.get('print0'):
6658 end = '\0'
6659 end = '\0'
6659 else:
6660 else:
6660 end = '\n'
6661 end = '\n'
6661 copy = {}
6662 copy = {}
6662 states = 'modified added removed deleted unknown ignored clean'.split()
6663 states = 'modified added removed deleted unknown ignored clean'.split()
6663 show = [k for k in states if opts.get(k)]
6664 show = [k for k in states if opts.get(k)]
6664 if opts.get('all'):
6665 if opts.get('all'):
6665 show += ui.quiet and (states[:4] + ['clean']) or states
6666 show += ui.quiet and (states[:4] + ['clean']) or states
6666 if not show:
6667 if not show:
6667 if ui.quiet:
6668 if ui.quiet:
6668 show = states[:4]
6669 show = states[:4]
6669 else:
6670 else:
6670 show = states[:5]
6671 show = states[:5]
6671
6672
6672 m = scmutil.match(repo[node2], pats, opts)
6673 m = scmutil.match(repo[node2], pats, opts)
6673 stat = repo.status(node1, node2, m,
6674 stat = repo.status(node1, node2, m,
6674 'ignored' in show, 'clean' in show, 'unknown' in show,
6675 'ignored' in show, 'clean' in show, 'unknown' in show,
6675 opts.get('subrepos'))
6676 opts.get('subrepos'))
6676 changestates = zip(states, 'MAR!?IC', stat)
6677 changestates = zip(states, 'MAR!?IC', stat)
6677
6678
6678 if (opts.get('all') or opts.get('copies')
6679 if (opts.get('all') or opts.get('copies')
6679 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6680 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6680 copy = copies.pathcopies(repo[node1], repo[node2], m)
6681 copy = copies.pathcopies(repo[node1], repo[node2], m)
6681
6682
6682 fm = ui.formatter('status', opts)
6683 fm = ui.formatter('status', opts)
6683 fmt = '%s' + end
6684 fmt = '%s' + end
6684 showchar = not opts.get('no_status')
6685 showchar = not opts.get('no_status')
6685
6686
6686 for state, char, files in changestates:
6687 for state, char, files in changestates:
6687 if state in show:
6688 if state in show:
6688 label = 'status.' + state
6689 label = 'status.' + state
6689 for f in files:
6690 for f in files:
6690 fm.startitem()
6691 fm.startitem()
6691 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6692 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6692 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6693 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6693 if f in copy:
6694 if f in copy:
6694 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6695 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6695 label='status.copied')
6696 label='status.copied')
6696 fm.end()
6697 fm.end()
6697
6698
6698 @command('^summary|sum',
6699 @command('^summary|sum',
6699 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6700 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6700 def summary(ui, repo, **opts):
6701 def summary(ui, repo, **opts):
6701 """summarize working directory state
6702 """summarize working directory state
6702
6703
6703 This generates a brief summary of the working directory state,
6704 This generates a brief summary of the working directory state,
6704 including parents, branch, commit status, phase and available updates.
6705 including parents, branch, commit status, phase and available updates.
6705
6706
6706 With the --remote option, this will check the default paths for
6707 With the --remote option, this will check the default paths for
6707 incoming and outgoing changes. This can be time-consuming.
6708 incoming and outgoing changes. This can be time-consuming.
6708
6709
6709 Returns 0 on success.
6710 Returns 0 on success.
6710 """
6711 """
6711
6712
6712 ctx = repo[None]
6713 ctx = repo[None]
6713 parents = ctx.parents()
6714 parents = ctx.parents()
6714 pnode = parents[0].node()
6715 pnode = parents[0].node()
6715 marks = []
6716 marks = []
6716
6717
6717 ms = None
6718 ms = None
6718 try:
6719 try:
6719 ms = mergemod.mergestate.read(repo)
6720 ms = mergemod.mergestate.read(repo)
6720 except error.UnsupportedMergeRecords as e:
6721 except error.UnsupportedMergeRecords as e:
6721 s = ' '.join(e.recordtypes)
6722 s = ' '.join(e.recordtypes)
6722 ui.warn(
6723 ui.warn(
6723 _('warning: merge state has unsupported record types: %s\n') % s)
6724 _('warning: merge state has unsupported record types: %s\n') % s)
6724 unresolved = 0
6725 unresolved = 0
6725 else:
6726 else:
6726 unresolved = [f for f in ms if ms[f] == 'u']
6727 unresolved = [f for f in ms if ms[f] == 'u']
6727
6728
6728 for p in parents:
6729 for p in parents:
6729 # label with log.changeset (instead of log.parent) since this
6730 # label with log.changeset (instead of log.parent) since this
6730 # shows a working directory parent *changeset*:
6731 # shows a working directory parent *changeset*:
6731 # i18n: column positioning for "hg summary"
6732 # i18n: column positioning for "hg summary"
6732 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6733 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6733 label='log.changeset changeset.%s' % p.phasestr())
6734 label='log.changeset changeset.%s' % p.phasestr())
6734 ui.write(' '.join(p.tags()), label='log.tag')
6735 ui.write(' '.join(p.tags()), label='log.tag')
6735 if p.bookmarks():
6736 if p.bookmarks():
6736 marks.extend(p.bookmarks())
6737 marks.extend(p.bookmarks())
6737 if p.rev() == -1:
6738 if p.rev() == -1:
6738 if not len(repo):
6739 if not len(repo):
6739 ui.write(_(' (empty repository)'))
6740 ui.write(_(' (empty repository)'))
6740 else:
6741 else:
6741 ui.write(_(' (no revision checked out)'))
6742 ui.write(_(' (no revision checked out)'))
6742 ui.write('\n')
6743 ui.write('\n')
6743 if p.description():
6744 if p.description():
6744 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6745 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6745 label='log.summary')
6746 label='log.summary')
6746
6747
6747 branch = ctx.branch()
6748 branch = ctx.branch()
6748 bheads = repo.branchheads(branch)
6749 bheads = repo.branchheads(branch)
6749 # i18n: column positioning for "hg summary"
6750 # i18n: column positioning for "hg summary"
6750 m = _('branch: %s\n') % branch
6751 m = _('branch: %s\n') % branch
6751 if branch != 'default':
6752 if branch != 'default':
6752 ui.write(m, label='log.branch')
6753 ui.write(m, label='log.branch')
6753 else:
6754 else:
6754 ui.status(m, label='log.branch')
6755 ui.status(m, label='log.branch')
6755
6756
6756 if marks:
6757 if marks:
6757 active = repo._activebookmark
6758 active = repo._activebookmark
6758 # i18n: column positioning for "hg summary"
6759 # i18n: column positioning for "hg summary"
6759 ui.write(_('bookmarks:'), label='log.bookmark')
6760 ui.write(_('bookmarks:'), label='log.bookmark')
6760 if active is not None:
6761 if active is not None:
6761 if active in marks:
6762 if active in marks:
6762 ui.write(' *' + active, label=activebookmarklabel)
6763 ui.write(' *' + active, label=activebookmarklabel)
6763 marks.remove(active)
6764 marks.remove(active)
6764 else:
6765 else:
6765 ui.write(' [%s]' % active, label=activebookmarklabel)
6766 ui.write(' [%s]' % active, label=activebookmarklabel)
6766 for m in marks:
6767 for m in marks:
6767 ui.write(' ' + m, label='log.bookmark')
6768 ui.write(' ' + m, label='log.bookmark')
6768 ui.write('\n', label='log.bookmark')
6769 ui.write('\n', label='log.bookmark')
6769
6770
6770 status = repo.status(unknown=True)
6771 status = repo.status(unknown=True)
6771
6772
6772 c = repo.dirstate.copies()
6773 c = repo.dirstate.copies()
6773 copied, renamed = [], []
6774 copied, renamed = [], []
6774 for d, s in c.iteritems():
6775 for d, s in c.iteritems():
6775 if s in status.removed:
6776 if s in status.removed:
6776 status.removed.remove(s)
6777 status.removed.remove(s)
6777 renamed.append(d)
6778 renamed.append(d)
6778 else:
6779 else:
6779 copied.append(d)
6780 copied.append(d)
6780 if d in status.added:
6781 if d in status.added:
6781 status.added.remove(d)
6782 status.added.remove(d)
6782
6783
6783 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6784 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6784
6785
6785 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6786 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6786 (ui.label(_('%d added'), 'status.added'), status.added),
6787 (ui.label(_('%d added'), 'status.added'), status.added),
6787 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6788 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6788 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6789 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6789 (ui.label(_('%d copied'), 'status.copied'), copied),
6790 (ui.label(_('%d copied'), 'status.copied'), copied),
6790 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6791 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6791 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6792 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6792 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6793 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6793 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6794 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6794 t = []
6795 t = []
6795 for l, s in labels:
6796 for l, s in labels:
6796 if s:
6797 if s:
6797 t.append(l % len(s))
6798 t.append(l % len(s))
6798
6799
6799 t = ', '.join(t)
6800 t = ', '.join(t)
6800 cleanworkdir = False
6801 cleanworkdir = False
6801
6802
6802 if repo.vfs.exists('graftstate'):
6803 if repo.vfs.exists('graftstate'):
6803 t += _(' (graft in progress)')
6804 t += _(' (graft in progress)')
6804 if repo.vfs.exists('updatestate'):
6805 if repo.vfs.exists('updatestate'):
6805 t += _(' (interrupted update)')
6806 t += _(' (interrupted update)')
6806 elif len(parents) > 1:
6807 elif len(parents) > 1:
6807 t += _(' (merge)')
6808 t += _(' (merge)')
6808 elif branch != parents[0].branch():
6809 elif branch != parents[0].branch():
6809 t += _(' (new branch)')
6810 t += _(' (new branch)')
6810 elif (parents[0].closesbranch() and
6811 elif (parents[0].closesbranch() and
6811 pnode in repo.branchheads(branch, closed=True)):
6812 pnode in repo.branchheads(branch, closed=True)):
6812 t += _(' (head closed)')
6813 t += _(' (head closed)')
6813 elif not (status.modified or status.added or status.removed or renamed or
6814 elif not (status.modified or status.added or status.removed or renamed or
6814 copied or subs):
6815 copied or subs):
6815 t += _(' (clean)')
6816 t += _(' (clean)')
6816 cleanworkdir = True
6817 cleanworkdir = True
6817 elif pnode not in bheads:
6818 elif pnode not in bheads:
6818 t += _(' (new branch head)')
6819 t += _(' (new branch head)')
6819
6820
6820 if parents:
6821 if parents:
6821 pendingphase = max(p.phase() for p in parents)
6822 pendingphase = max(p.phase() for p in parents)
6822 else:
6823 else:
6823 pendingphase = phases.public
6824 pendingphase = phases.public
6824
6825
6825 if pendingphase > phases.newcommitphase(ui):
6826 if pendingphase > phases.newcommitphase(ui):
6826 t += ' (%s)' % phases.phasenames[pendingphase]
6827 t += ' (%s)' % phases.phasenames[pendingphase]
6827
6828
6828 if cleanworkdir:
6829 if cleanworkdir:
6829 # i18n: column positioning for "hg summary"
6830 # i18n: column positioning for "hg summary"
6830 ui.status(_('commit: %s\n') % t.strip())
6831 ui.status(_('commit: %s\n') % t.strip())
6831 else:
6832 else:
6832 # i18n: column positioning for "hg summary"
6833 # i18n: column positioning for "hg summary"
6833 ui.write(_('commit: %s\n') % t.strip())
6834 ui.write(_('commit: %s\n') % t.strip())
6834
6835
6835 # all ancestors of branch heads - all ancestors of parent = new csets
6836 # all ancestors of branch heads - all ancestors of parent = new csets
6836 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6837 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6837 bheads))
6838 bheads))
6838
6839
6839 if new == 0:
6840 if new == 0:
6840 # i18n: column positioning for "hg summary"
6841 # i18n: column positioning for "hg summary"
6841 ui.status(_('update: (current)\n'))
6842 ui.status(_('update: (current)\n'))
6842 elif pnode not in bheads:
6843 elif pnode not in bheads:
6843 # i18n: column positioning for "hg summary"
6844 # i18n: column positioning for "hg summary"
6844 ui.write(_('update: %d new changesets (update)\n') % new)
6845 ui.write(_('update: %d new changesets (update)\n') % new)
6845 else:
6846 else:
6846 # i18n: column positioning for "hg summary"
6847 # i18n: column positioning for "hg summary"
6847 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6848 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6848 (new, len(bheads)))
6849 (new, len(bheads)))
6849
6850
6850 t = []
6851 t = []
6851 draft = len(repo.revs('draft()'))
6852 draft = len(repo.revs('draft()'))
6852 if draft:
6853 if draft:
6853 t.append(_('%d draft') % draft)
6854 t.append(_('%d draft') % draft)
6854 secret = len(repo.revs('secret()'))
6855 secret = len(repo.revs('secret()'))
6855 if secret:
6856 if secret:
6856 t.append(_('%d secret') % secret)
6857 t.append(_('%d secret') % secret)
6857
6858
6858 if draft or secret:
6859 if draft or secret:
6859 ui.status(_('phases: %s\n') % ', '.join(t))
6860 ui.status(_('phases: %s\n') % ', '.join(t))
6860
6861
6861 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6862 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6862 for trouble in ("unstable", "divergent", "bumped"):
6863 for trouble in ("unstable", "divergent", "bumped"):
6863 numtrouble = len(repo.revs(trouble + "()"))
6864 numtrouble = len(repo.revs(trouble + "()"))
6864 # We write all the possibilities to ease translation
6865 # We write all the possibilities to ease translation
6865 troublemsg = {
6866 troublemsg = {
6866 "unstable": _("unstable: %d changesets"),
6867 "unstable": _("unstable: %d changesets"),
6867 "divergent": _("divergent: %d changesets"),
6868 "divergent": _("divergent: %d changesets"),
6868 "bumped": _("bumped: %d changesets"),
6869 "bumped": _("bumped: %d changesets"),
6869 }
6870 }
6870 if numtrouble > 0:
6871 if numtrouble > 0:
6871 ui.status(troublemsg[trouble] % numtrouble + "\n")
6872 ui.status(troublemsg[trouble] % numtrouble + "\n")
6872
6873
6873 cmdutil.summaryhooks(ui, repo)
6874 cmdutil.summaryhooks(ui, repo)
6874
6875
6875 if opts.get('remote'):
6876 if opts.get('remote'):
6876 needsincoming, needsoutgoing = True, True
6877 needsincoming, needsoutgoing = True, True
6877 else:
6878 else:
6878 needsincoming, needsoutgoing = False, False
6879 needsincoming, needsoutgoing = False, False
6879 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6880 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6880 if i:
6881 if i:
6881 needsincoming = True
6882 needsincoming = True
6882 if o:
6883 if o:
6883 needsoutgoing = True
6884 needsoutgoing = True
6884 if not needsincoming and not needsoutgoing:
6885 if not needsincoming and not needsoutgoing:
6885 return
6886 return
6886
6887
6887 def getincoming():
6888 def getincoming():
6888 source, branches = hg.parseurl(ui.expandpath('default'))
6889 source, branches = hg.parseurl(ui.expandpath('default'))
6889 sbranch = branches[0]
6890 sbranch = branches[0]
6890 try:
6891 try:
6891 other = hg.peer(repo, {}, source)
6892 other = hg.peer(repo, {}, source)
6892 except error.RepoError:
6893 except error.RepoError:
6893 if opts.get('remote'):
6894 if opts.get('remote'):
6894 raise
6895 raise
6895 return source, sbranch, None, None, None
6896 return source, sbranch, None, None, None
6896 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6897 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6897 if revs:
6898 if revs:
6898 revs = [other.lookup(rev) for rev in revs]
6899 revs = [other.lookup(rev) for rev in revs]
6899 ui.debug('comparing with %s\n' % util.hidepassword(source))
6900 ui.debug('comparing with %s\n' % util.hidepassword(source))
6900 repo.ui.pushbuffer()
6901 repo.ui.pushbuffer()
6901 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6902 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6902 repo.ui.popbuffer()
6903 repo.ui.popbuffer()
6903 return source, sbranch, other, commoninc, commoninc[1]
6904 return source, sbranch, other, commoninc, commoninc[1]
6904
6905
6905 if needsincoming:
6906 if needsincoming:
6906 source, sbranch, sother, commoninc, incoming = getincoming()
6907 source, sbranch, sother, commoninc, incoming = getincoming()
6907 else:
6908 else:
6908 source = sbranch = sother = commoninc = incoming = None
6909 source = sbranch = sother = commoninc = incoming = None
6909
6910
6910 def getoutgoing():
6911 def getoutgoing():
6911 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6912 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6912 dbranch = branches[0]
6913 dbranch = branches[0]
6913 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6914 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6914 if source != dest:
6915 if source != dest:
6915 try:
6916 try:
6916 dother = hg.peer(repo, {}, dest)
6917 dother = hg.peer(repo, {}, dest)
6917 except error.RepoError:
6918 except error.RepoError:
6918 if opts.get('remote'):
6919 if opts.get('remote'):
6919 raise
6920 raise
6920 return dest, dbranch, None, None
6921 return dest, dbranch, None, None
6921 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6922 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6922 elif sother is None:
6923 elif sother is None:
6923 # there is no explicit destination peer, but source one is invalid
6924 # there is no explicit destination peer, but source one is invalid
6924 return dest, dbranch, None, None
6925 return dest, dbranch, None, None
6925 else:
6926 else:
6926 dother = sother
6927 dother = sother
6927 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6928 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6928 common = None
6929 common = None
6929 else:
6930 else:
6930 common = commoninc
6931 common = commoninc
6931 if revs:
6932 if revs:
6932 revs = [repo.lookup(rev) for rev in revs]
6933 revs = [repo.lookup(rev) for rev in revs]
6933 repo.ui.pushbuffer()
6934 repo.ui.pushbuffer()
6934 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6935 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6935 commoninc=common)
6936 commoninc=common)
6936 repo.ui.popbuffer()
6937 repo.ui.popbuffer()
6937 return dest, dbranch, dother, outgoing
6938 return dest, dbranch, dother, outgoing
6938
6939
6939 if needsoutgoing:
6940 if needsoutgoing:
6940 dest, dbranch, dother, outgoing = getoutgoing()
6941 dest, dbranch, dother, outgoing = getoutgoing()
6941 else:
6942 else:
6942 dest = dbranch = dother = outgoing = None
6943 dest = dbranch = dother = outgoing = None
6943
6944
6944 if opts.get('remote'):
6945 if opts.get('remote'):
6945 t = []
6946 t = []
6946 if incoming:
6947 if incoming:
6947 t.append(_('1 or more incoming'))
6948 t.append(_('1 or more incoming'))
6948 o = outgoing.missing
6949 o = outgoing.missing
6949 if o:
6950 if o:
6950 t.append(_('%d outgoing') % len(o))
6951 t.append(_('%d outgoing') % len(o))
6951 other = dother or sother
6952 other = dother or sother
6952 if 'bookmarks' in other.listkeys('namespaces'):
6953 if 'bookmarks' in other.listkeys('namespaces'):
6953 counts = bookmarks.summary(repo, other)
6954 counts = bookmarks.summary(repo, other)
6954 if counts[0] > 0:
6955 if counts[0] > 0:
6955 t.append(_('%d incoming bookmarks') % counts[0])
6956 t.append(_('%d incoming bookmarks') % counts[0])
6956 if counts[1] > 0:
6957 if counts[1] > 0:
6957 t.append(_('%d outgoing bookmarks') % counts[1])
6958 t.append(_('%d outgoing bookmarks') % counts[1])
6958
6959
6959 if t:
6960 if t:
6960 # i18n: column positioning for "hg summary"
6961 # i18n: column positioning for "hg summary"
6961 ui.write(_('remote: %s\n') % (', '.join(t)))
6962 ui.write(_('remote: %s\n') % (', '.join(t)))
6962 else:
6963 else:
6963 # i18n: column positioning for "hg summary"
6964 # i18n: column positioning for "hg summary"
6964 ui.status(_('remote: (synced)\n'))
6965 ui.status(_('remote: (synced)\n'))
6965
6966
6966 cmdutil.summaryremotehooks(ui, repo, opts,
6967 cmdutil.summaryremotehooks(ui, repo, opts,
6967 ((source, sbranch, sother, commoninc),
6968 ((source, sbranch, sother, commoninc),
6968 (dest, dbranch, dother, outgoing)))
6969 (dest, dbranch, dother, outgoing)))
6969
6970
6970 @command('tag',
6971 @command('tag',
6971 [('f', 'force', None, _('force tag')),
6972 [('f', 'force', None, _('force tag')),
6972 ('l', 'local', None, _('make the tag local')),
6973 ('l', 'local', None, _('make the tag local')),
6973 ('r', 'rev', '', _('revision to tag'), _('REV')),
6974 ('r', 'rev', '', _('revision to tag'), _('REV')),
6974 ('', 'remove', None, _('remove a tag')),
6975 ('', 'remove', None, _('remove a tag')),
6975 # -l/--local is already there, commitopts cannot be used
6976 # -l/--local is already there, commitopts cannot be used
6976 ('e', 'edit', None, _('invoke editor on commit messages')),
6977 ('e', 'edit', None, _('invoke editor on commit messages')),
6977 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6978 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6978 ] + commitopts2,
6979 ] + commitopts2,
6979 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6980 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6980 def tag(ui, repo, name1, *names, **opts):
6981 def tag(ui, repo, name1, *names, **opts):
6981 """add one or more tags for the current or given revision
6982 """add one or more tags for the current or given revision
6982
6983
6983 Name a particular revision using <name>.
6984 Name a particular revision using <name>.
6984
6985
6985 Tags are used to name particular revisions of the repository and are
6986 Tags are used to name particular revisions of the repository and are
6986 very useful to compare different revisions, to go back to significant
6987 very useful to compare different revisions, to go back to significant
6987 earlier versions or to mark branch points as releases, etc. Changing
6988 earlier versions or to mark branch points as releases, etc. Changing
6988 an existing tag is normally disallowed; use -f/--force to override.
6989 an existing tag is normally disallowed; use -f/--force to override.
6989
6990
6990 If no revision is given, the parent of the working directory is
6991 If no revision is given, the parent of the working directory is
6991 used.
6992 used.
6992
6993
6993 To facilitate version control, distribution, and merging of tags,
6994 To facilitate version control, distribution, and merging of tags,
6994 they are stored as a file named ".hgtags" which is managed similarly
6995 they are stored as a file named ".hgtags" which is managed similarly
6995 to other project files and can be hand-edited if necessary. This
6996 to other project files and can be hand-edited if necessary. This
6996 also means that tagging creates a new commit. The file
6997 also means that tagging creates a new commit. The file
6997 ".hg/localtags" is used for local tags (not shared among
6998 ".hg/localtags" is used for local tags (not shared among
6998 repositories).
6999 repositories).
6999
7000
7000 Tag commits are usually made at the head of a branch. If the parent
7001 Tag commits are usually made at the head of a branch. If the parent
7001 of the working directory is not a branch head, :hg:`tag` aborts; use
7002 of the working directory is not a branch head, :hg:`tag` aborts; use
7002 -f/--force to force the tag commit to be based on a non-head
7003 -f/--force to force the tag commit to be based on a non-head
7003 changeset.
7004 changeset.
7004
7005
7005 See :hg:`help dates` for a list of formats valid for -d/--date.
7006 See :hg:`help dates` for a list of formats valid for -d/--date.
7006
7007
7007 Since tag names have priority over branch names during revision
7008 Since tag names have priority over branch names during revision
7008 lookup, using an existing branch name as a tag name is discouraged.
7009 lookup, using an existing branch name as a tag name is discouraged.
7009
7010
7010 Returns 0 on success.
7011 Returns 0 on success.
7011 """
7012 """
7012 wlock = lock = None
7013 wlock = lock = None
7013 try:
7014 try:
7014 wlock = repo.wlock()
7015 wlock = repo.wlock()
7015 lock = repo.lock()
7016 lock = repo.lock()
7016 rev_ = "."
7017 rev_ = "."
7017 names = [t.strip() for t in (name1,) + names]
7018 names = [t.strip() for t in (name1,) + names]
7018 if len(names) != len(set(names)):
7019 if len(names) != len(set(names)):
7019 raise error.Abort(_('tag names must be unique'))
7020 raise error.Abort(_('tag names must be unique'))
7020 for n in names:
7021 for n in names:
7021 scmutil.checknewlabel(repo, n, 'tag')
7022 scmutil.checknewlabel(repo, n, 'tag')
7022 if not n:
7023 if not n:
7023 raise error.Abort(_('tag names cannot consist entirely of '
7024 raise error.Abort(_('tag names cannot consist entirely of '
7024 'whitespace'))
7025 'whitespace'))
7025 if opts.get('rev') and opts.get('remove'):
7026 if opts.get('rev') and opts.get('remove'):
7026 raise error.Abort(_("--rev and --remove are incompatible"))
7027 raise error.Abort(_("--rev and --remove are incompatible"))
7027 if opts.get('rev'):
7028 if opts.get('rev'):
7028 rev_ = opts['rev']
7029 rev_ = opts['rev']
7029 message = opts.get('message')
7030 message = opts.get('message')
7030 if opts.get('remove'):
7031 if opts.get('remove'):
7031 if opts.get('local'):
7032 if opts.get('local'):
7032 expectedtype = 'local'
7033 expectedtype = 'local'
7033 else:
7034 else:
7034 expectedtype = 'global'
7035 expectedtype = 'global'
7035
7036
7036 for n in names:
7037 for n in names:
7037 if not repo.tagtype(n):
7038 if not repo.tagtype(n):
7038 raise error.Abort(_("tag '%s' does not exist") % n)
7039 raise error.Abort(_("tag '%s' does not exist") % n)
7039 if repo.tagtype(n) != expectedtype:
7040 if repo.tagtype(n) != expectedtype:
7040 if expectedtype == 'global':
7041 if expectedtype == 'global':
7041 raise error.Abort(_("tag '%s' is not a global tag") % n)
7042 raise error.Abort(_("tag '%s' is not a global tag") % n)
7042 else:
7043 else:
7043 raise error.Abort(_("tag '%s' is not a local tag") % n)
7044 raise error.Abort(_("tag '%s' is not a local tag") % n)
7044 rev_ = 'null'
7045 rev_ = 'null'
7045 if not message:
7046 if not message:
7046 # we don't translate commit messages
7047 # we don't translate commit messages
7047 message = 'Removed tag %s' % ', '.join(names)
7048 message = 'Removed tag %s' % ', '.join(names)
7048 elif not opts.get('force'):
7049 elif not opts.get('force'):
7049 for n in names:
7050 for n in names:
7050 if n in repo.tags():
7051 if n in repo.tags():
7051 raise error.Abort(_("tag '%s' already exists "
7052 raise error.Abort(_("tag '%s' already exists "
7052 "(use -f to force)") % n)
7053 "(use -f to force)") % n)
7053 if not opts.get('local'):
7054 if not opts.get('local'):
7054 p1, p2 = repo.dirstate.parents()
7055 p1, p2 = repo.dirstate.parents()
7055 if p2 != nullid:
7056 if p2 != nullid:
7056 raise error.Abort(_('uncommitted merge'))
7057 raise error.Abort(_('uncommitted merge'))
7057 bheads = repo.branchheads()
7058 bheads = repo.branchheads()
7058 if not opts.get('force') and bheads and p1 not in bheads:
7059 if not opts.get('force') and bheads and p1 not in bheads:
7059 raise error.Abort(_('not at a branch head (use -f to force)'))
7060 raise error.Abort(_('not at a branch head (use -f to force)'))
7060 r = scmutil.revsingle(repo, rev_).node()
7061 r = scmutil.revsingle(repo, rev_).node()
7061
7062
7062 if not message:
7063 if not message:
7063 # we don't translate commit messages
7064 # we don't translate commit messages
7064 message = ('Added tag %s for changeset %s' %
7065 message = ('Added tag %s for changeset %s' %
7065 (', '.join(names), short(r)))
7066 (', '.join(names), short(r)))
7066
7067
7067 date = opts.get('date')
7068 date = opts.get('date')
7068 if date:
7069 if date:
7069 date = util.parsedate(date)
7070 date = util.parsedate(date)
7070
7071
7071 if opts.get('remove'):
7072 if opts.get('remove'):
7072 editform = 'tag.remove'
7073 editform = 'tag.remove'
7073 else:
7074 else:
7074 editform = 'tag.add'
7075 editform = 'tag.add'
7075 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7076 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7076
7077
7077 # don't allow tagging the null rev
7078 # don't allow tagging the null rev
7078 if (not opts.get('remove') and
7079 if (not opts.get('remove') and
7079 scmutil.revsingle(repo, rev_).rev() == nullrev):
7080 scmutil.revsingle(repo, rev_).rev() == nullrev):
7080 raise error.Abort(_("cannot tag null revision"))
7081 raise error.Abort(_("cannot tag null revision"))
7081
7082
7082 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7083 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7083 editor=editor)
7084 editor=editor)
7084 finally:
7085 finally:
7085 release(lock, wlock)
7086 release(lock, wlock)
7086
7087
7087 @command('tags', formatteropts, '')
7088 @command('tags', formatteropts, '')
7088 def tags(ui, repo, **opts):
7089 def tags(ui, repo, **opts):
7089 """list repository tags
7090 """list repository tags
7090
7091
7091 This lists both regular and local tags. When the -v/--verbose
7092 This lists both regular and local tags. When the -v/--verbose
7092 switch is used, a third column "local" is printed for local tags.
7093 switch is used, a third column "local" is printed for local tags.
7093 When the -q/--quiet switch is used, only the tag name is printed.
7094 When the -q/--quiet switch is used, only the tag name is printed.
7094
7095
7095 Returns 0 on success.
7096 Returns 0 on success.
7096 """
7097 """
7097
7098
7098 fm = ui.formatter('tags', opts)
7099 fm = ui.formatter('tags', opts)
7099 hexfunc = fm.hexfunc
7100 hexfunc = fm.hexfunc
7100 tagtype = ""
7101 tagtype = ""
7101
7102
7102 for t, n in reversed(repo.tagslist()):
7103 for t, n in reversed(repo.tagslist()):
7103 hn = hexfunc(n)
7104 hn = hexfunc(n)
7104 label = 'tags.normal'
7105 label = 'tags.normal'
7105 tagtype = ''
7106 tagtype = ''
7106 if repo.tagtype(t) == 'local':
7107 if repo.tagtype(t) == 'local':
7107 label = 'tags.local'
7108 label = 'tags.local'
7108 tagtype = 'local'
7109 tagtype = 'local'
7109
7110
7110 fm.startitem()
7111 fm.startitem()
7111 fm.write('tag', '%s', t, label=label)
7112 fm.write('tag', '%s', t, label=label)
7112 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7113 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7113 fm.condwrite(not ui.quiet, 'rev node', fmt,
7114 fm.condwrite(not ui.quiet, 'rev node', fmt,
7114 repo.changelog.rev(n), hn, label=label)
7115 repo.changelog.rev(n), hn, label=label)
7115 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7116 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7116 tagtype, label=label)
7117 tagtype, label=label)
7117 fm.plain('\n')
7118 fm.plain('\n')
7118 fm.end()
7119 fm.end()
7119
7120
7120 @command('tip',
7121 @command('tip',
7121 [('p', 'patch', None, _('show patch')),
7122 [('p', 'patch', None, _('show patch')),
7122 ('g', 'git', None, _('use git extended diff format')),
7123 ('g', 'git', None, _('use git extended diff format')),
7123 ] + templateopts,
7124 ] + templateopts,
7124 _('[-p] [-g]'))
7125 _('[-p] [-g]'))
7125 def tip(ui, repo, **opts):
7126 def tip(ui, repo, **opts):
7126 """show the tip revision (DEPRECATED)
7127 """show the tip revision (DEPRECATED)
7127
7128
7128 The tip revision (usually just called the tip) is the changeset
7129 The tip revision (usually just called the tip) is the changeset
7129 most recently added to the repository (and therefore the most
7130 most recently added to the repository (and therefore the most
7130 recently changed head).
7131 recently changed head).
7131
7132
7132 If you have just made a commit, that commit will be the tip. If
7133 If you have just made a commit, that commit will be the tip. If
7133 you have just pulled changes from another repository, the tip of
7134 you have just pulled changes from another repository, the tip of
7134 that repository becomes the current tip. The "tip" tag is special
7135 that repository becomes the current tip. The "tip" tag is special
7135 and cannot be renamed or assigned to a different changeset.
7136 and cannot be renamed or assigned to a different changeset.
7136
7137
7137 This command is deprecated, please use :hg:`heads` instead.
7138 This command is deprecated, please use :hg:`heads` instead.
7138
7139
7139 Returns 0 on success.
7140 Returns 0 on success.
7140 """
7141 """
7141 displayer = cmdutil.show_changeset(ui, repo, opts)
7142 displayer = cmdutil.show_changeset(ui, repo, opts)
7142 displayer.show(repo['tip'])
7143 displayer.show(repo['tip'])
7143 displayer.close()
7144 displayer.close()
7144
7145
7145 @command('unbundle',
7146 @command('unbundle',
7146 [('u', 'update', None,
7147 [('u', 'update', None,
7147 _('update to new branch head if changesets were unbundled'))],
7148 _('update to new branch head if changesets were unbundled'))],
7148 _('[-u] FILE...'))
7149 _('[-u] FILE...'))
7149 def unbundle(ui, repo, fname1, *fnames, **opts):
7150 def unbundle(ui, repo, fname1, *fnames, **opts):
7150 """apply one or more changegroup files
7151 """apply one or more changegroup files
7151
7152
7152 Apply one or more compressed changegroup files generated by the
7153 Apply one or more compressed changegroup files generated by the
7153 bundle command.
7154 bundle command.
7154
7155
7155 Returns 0 on success, 1 if an update has unresolved files.
7156 Returns 0 on success, 1 if an update has unresolved files.
7156 """
7157 """
7157 fnames = (fname1,) + fnames
7158 fnames = (fname1,) + fnames
7158
7159
7159 with repo.lock():
7160 with repo.lock():
7160 for fname in fnames:
7161 for fname in fnames:
7161 f = hg.openpath(ui, fname)
7162 f = hg.openpath(ui, fname)
7162 gen = exchange.readbundle(ui, f, fname)
7163 gen = exchange.readbundle(ui, f, fname)
7163 if isinstance(gen, bundle2.unbundle20):
7164 if isinstance(gen, bundle2.unbundle20):
7164 tr = repo.transaction('unbundle')
7165 tr = repo.transaction('unbundle')
7165 try:
7166 try:
7166 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7167 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7167 url='bundle:' + fname)
7168 url='bundle:' + fname)
7168 tr.close()
7169 tr.close()
7169 except error.BundleUnknownFeatureError as exc:
7170 except error.BundleUnknownFeatureError as exc:
7170 raise error.Abort(_('%s: unknown bundle feature, %s')
7171 raise error.Abort(_('%s: unknown bundle feature, %s')
7171 % (fname, exc),
7172 % (fname, exc),
7172 hint=_("see https://mercurial-scm.org/"
7173 hint=_("see https://mercurial-scm.org/"
7173 "wiki/BundleFeature for more "
7174 "wiki/BundleFeature for more "
7174 "information"))
7175 "information"))
7175 finally:
7176 finally:
7176 if tr:
7177 if tr:
7177 tr.release()
7178 tr.release()
7178 changes = [r.get('return', 0)
7179 changes = [r.get('return', 0)
7179 for r in op.records['changegroup']]
7180 for r in op.records['changegroup']]
7180 modheads = changegroup.combineresults(changes)
7181 modheads = changegroup.combineresults(changes)
7181 elif isinstance(gen, streamclone.streamcloneapplier):
7182 elif isinstance(gen, streamclone.streamcloneapplier):
7182 raise error.Abort(
7183 raise error.Abort(
7183 _('packed bundles cannot be applied with '
7184 _('packed bundles cannot be applied with '
7184 '"hg unbundle"'),
7185 '"hg unbundle"'),
7185 hint=_('use "hg debugapplystreamclonebundle"'))
7186 hint=_('use "hg debugapplystreamclonebundle"'))
7186 else:
7187 else:
7187 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7188 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7188
7189
7189 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7190 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7190
7191
7191 @command('^update|up|checkout|co',
7192 @command('^update|up|checkout|co',
7192 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7193 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7193 ('c', 'check', None, _('require clean working directory')),
7194 ('c', 'check', None, _('require clean working directory')),
7194 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7195 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7195 ('r', 'rev', '', _('revision'), _('REV'))
7196 ('r', 'rev', '', _('revision'), _('REV'))
7196 ] + mergetoolopts,
7197 ] + mergetoolopts,
7197 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7198 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7198 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7199 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7199 tool=None):
7200 tool=None):
7200 """update working directory (or switch revisions)
7201 """update working directory (or switch revisions)
7201
7202
7202 Update the repository's working directory to the specified
7203 Update the repository's working directory to the specified
7203 changeset. If no changeset is specified, update to the tip of the
7204 changeset. If no changeset is specified, update to the tip of the
7204 current named branch and move the active bookmark (see :hg:`help
7205 current named branch and move the active bookmark (see :hg:`help
7205 bookmarks`).
7206 bookmarks`).
7206
7207
7207 Update sets the working directory's parent revision to the specified
7208 Update sets the working directory's parent revision to the specified
7208 changeset (see :hg:`help parents`).
7209 changeset (see :hg:`help parents`).
7209
7210
7210 If the changeset is not a descendant or ancestor of the working
7211 If the changeset is not a descendant or ancestor of the working
7211 directory's parent, the update is aborted. With the -c/--check
7212 directory's parent, the update is aborted. With the -c/--check
7212 option, the working directory is checked for uncommitted changes; if
7213 option, the working directory is checked for uncommitted changes; if
7213 none are found, the working directory is updated to the specified
7214 none are found, the working directory is updated to the specified
7214 changeset.
7215 changeset.
7215
7216
7216 .. container:: verbose
7217 .. container:: verbose
7217
7218
7218 The following rules apply when the working directory contains
7219 The following rules apply when the working directory contains
7219 uncommitted changes:
7220 uncommitted changes:
7220
7221
7221 1. If neither -c/--check nor -C/--clean is specified, and if
7222 1. If neither -c/--check nor -C/--clean is specified, and if
7222 the requested changeset is an ancestor or descendant of
7223 the requested changeset is an ancestor or descendant of
7223 the working directory's parent, the uncommitted changes
7224 the working directory's parent, the uncommitted changes
7224 are merged into the requested changeset and the merged
7225 are merged into the requested changeset and the merged
7225 result is left uncommitted. If the requested changeset is
7226 result is left uncommitted. If the requested changeset is
7226 not an ancestor or descendant (that is, it is on another
7227 not an ancestor or descendant (that is, it is on another
7227 branch), the update is aborted and the uncommitted changes
7228 branch), the update is aborted and the uncommitted changes
7228 are preserved.
7229 are preserved.
7229
7230
7230 2. With the -c/--check option, the update is aborted and the
7231 2. With the -c/--check option, the update is aborted and the
7231 uncommitted changes are preserved.
7232 uncommitted changes are preserved.
7232
7233
7233 3. With the -C/--clean option, uncommitted changes are discarded and
7234 3. With the -C/--clean option, uncommitted changes are discarded and
7234 the working directory is updated to the requested changeset.
7235 the working directory is updated to the requested changeset.
7235
7236
7236 To cancel an uncommitted merge (and lose your changes), use
7237 To cancel an uncommitted merge (and lose your changes), use
7237 :hg:`update --clean .`.
7238 :hg:`update --clean .`.
7238
7239
7239 Use null as the changeset to remove the working directory (like
7240 Use null as the changeset to remove the working directory (like
7240 :hg:`clone -U`).
7241 :hg:`clone -U`).
7241
7242
7242 If you want to revert just one file to an older revision, use
7243 If you want to revert just one file to an older revision, use
7243 :hg:`revert [-r REV] NAME`.
7244 :hg:`revert [-r REV] NAME`.
7244
7245
7245 See :hg:`help dates` for a list of formats valid for -d/--date.
7246 See :hg:`help dates` for a list of formats valid for -d/--date.
7246
7247
7247 Returns 0 on success, 1 if there are unresolved files.
7248 Returns 0 on success, 1 if there are unresolved files.
7248 """
7249 """
7249 if rev and node:
7250 if rev and node:
7250 raise error.Abort(_("please specify just one revision"))
7251 raise error.Abort(_("please specify just one revision"))
7251
7252
7252 if rev is None or rev == '':
7253 if rev is None or rev == '':
7253 rev = node
7254 rev = node
7254
7255
7255 if date and rev is not None:
7256 if date and rev is not None:
7256 raise error.Abort(_("you can't specify a revision and a date"))
7257 raise error.Abort(_("you can't specify a revision and a date"))
7257
7258
7258 if check and clean:
7259 if check and clean:
7259 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7260 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7260
7261
7261 with repo.wlock():
7262 with repo.wlock():
7262 cmdutil.clearunfinished(repo)
7263 cmdutil.clearunfinished(repo)
7263
7264
7264 if date:
7265 if date:
7265 rev = cmdutil.finddate(ui, repo, date)
7266 rev = cmdutil.finddate(ui, repo, date)
7266
7267
7267 # if we defined a bookmark, we have to remember the original name
7268 # if we defined a bookmark, we have to remember the original name
7268 brev = rev
7269 brev = rev
7269 rev = scmutil.revsingle(repo, rev, rev).rev()
7270 rev = scmutil.revsingle(repo, rev, rev).rev()
7270
7271
7271 if check:
7272 if check:
7272 cmdutil.bailifchanged(repo, merge=False)
7273 cmdutil.bailifchanged(repo, merge=False)
7273
7274
7274 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7275 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7275
7276
7276 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7277 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7277
7278
7278 @command('verify', [])
7279 @command('verify', [])
7279 def verify(ui, repo):
7280 def verify(ui, repo):
7280 """verify the integrity of the repository
7281 """verify the integrity of the repository
7281
7282
7282 Verify the integrity of the current repository.
7283 Verify the integrity of the current repository.
7283
7284
7284 This will perform an extensive check of the repository's
7285 This will perform an extensive check of the repository's
7285 integrity, validating the hashes and checksums of each entry in
7286 integrity, validating the hashes and checksums of each entry in
7286 the changelog, manifest, and tracked files, as well as the
7287 the changelog, manifest, and tracked files, as well as the
7287 integrity of their crosslinks and indices.
7288 integrity of their crosslinks and indices.
7288
7289
7289 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7290 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7290 for more information about recovery from corruption of the
7291 for more information about recovery from corruption of the
7291 repository.
7292 repository.
7292
7293
7293 Returns 0 on success, 1 if errors are encountered.
7294 Returns 0 on success, 1 if errors are encountered.
7294 """
7295 """
7295 return hg.verify(repo)
7296 return hg.verify(repo)
7296
7297
7297 @command('version', [] + formatteropts, norepo=True)
7298 @command('version', [] + formatteropts, norepo=True)
7298 def version_(ui, **opts):
7299 def version_(ui, **opts):
7299 """output version and copyright information"""
7300 """output version and copyright information"""
7300 fm = ui.formatter("version", opts)
7301 fm = ui.formatter("version", opts)
7301 fm.startitem()
7302 fm.startitem()
7302 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7303 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7303 util.version())
7304 util.version())
7304 license = _(
7305 license = _(
7305 "(see https://mercurial-scm.org for more information)\n"
7306 "(see https://mercurial-scm.org for more information)\n"
7306 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7307 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7307 "This is free software; see the source for copying conditions. "
7308 "This is free software; see the source for copying conditions. "
7308 "There is NO\nwarranty; "
7309 "There is NO\nwarranty; "
7309 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7310 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7310 )
7311 )
7311 if not ui.quiet:
7312 if not ui.quiet:
7312 fm.plain(license)
7313 fm.plain(license)
7313
7314
7314 if ui.verbose:
7315 if ui.verbose:
7315 fm.plain(_("\nEnabled extensions:\n\n"))
7316 fm.plain(_("\nEnabled extensions:\n\n"))
7316 # format names and versions into columns
7317 # format names and versions into columns
7317 names = []
7318 names = []
7318 vers = []
7319 vers = []
7319 isinternals = []
7320 isinternals = []
7320 for name, module in extensions.extensions():
7321 for name, module in extensions.extensions():
7321 names.append(name)
7322 names.append(name)
7322 vers.append(extensions.moduleversion(module) or None)
7323 vers.append(extensions.moduleversion(module) or None)
7323 isinternals.append(extensions.ismoduleinternal(module))
7324 isinternals.append(extensions.ismoduleinternal(module))
7324 fn = fm.nested("extensions")
7325 fn = fm.nested("extensions")
7325 if names:
7326 if names:
7326 namefmt = " %%-%ds " % max(len(n) for n in names)
7327 namefmt = " %%-%ds " % max(len(n) for n in names)
7327 places = [_("external"), _("internal")]
7328 places = [_("external"), _("internal")]
7328 for n, v, p in zip(names, vers, isinternals):
7329 for n, v, p in zip(names, vers, isinternals):
7329 fn.startitem()
7330 fn.startitem()
7330 fn.condwrite(ui.verbose, "name", namefmt, n)
7331 fn.condwrite(ui.verbose, "name", namefmt, n)
7331 if ui.verbose:
7332 if ui.verbose:
7332 fn.plain("%s " % places[p])
7333 fn.plain("%s " % places[p])
7333 fn.data(bundled=p)
7334 fn.data(bundled=p)
7334 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7335 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7335 if ui.verbose:
7336 if ui.verbose:
7336 fn.plain("\n")
7337 fn.plain("\n")
7337 fn.end()
7338 fn.end()
7338 fm.end()
7339 fm.end()
7339
7340
7340 def loadcmdtable(ui, name, cmdtable):
7341 def loadcmdtable(ui, name, cmdtable):
7341 """Load command functions from specified cmdtable
7342 """Load command functions from specified cmdtable
7342 """
7343 """
7343 overrides = [cmd for cmd in cmdtable if cmd in table]
7344 overrides = [cmd for cmd in cmdtable if cmd in table]
7344 if overrides:
7345 if overrides:
7345 ui.warn(_("extension '%s' overrides commands: %s\n")
7346 ui.warn(_("extension '%s' overrides commands: %s\n")
7346 % (name, " ".join(overrides)))
7347 % (name, " ".join(overrides)))
7347 table.update(cmdtable)
7348 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now