##// END OF EJS Templates
debugrevspec: transform and print parsed tree by stages...
Yuya Nishihara -
r29912:1c1c2bce default
parent child Browse files
Show More
@@ -1,7322 +1,7330 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, _('print parsed tree after optimizing'))],
3515 ('REVSPEC'))
3515 ('REVSPEC'))
3516 def debugrevspec(ui, repo, expr, **opts):
3516 def debugrevspec(ui, repo, expr, **opts):
3517 """parse and apply a revision specification
3517 """parse and apply a revision specification
3518
3518
3519 Use --verbose to print the parsed tree before and after aliases
3519 Use --verbose to print the parsed tree before and after aliases
3520 expansion.
3520 expansion.
3521 """
3521 """
3522 stages = [
3523 ('parsed', lambda tree: tree),
3524 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
3525 ('concatenated', revset.foldconcat),
3526 ('analyzed', revset.analyze),
3527 ('optimized', revset.optimize),
3528 ]
3529
3530 showalways = set(['parsed'])
3531 showchanged = set(['expanded', 'concatenated'])
3532 if opts['optimize']:
3533 showalways.add('optimized')
3534
3535 printedtree = None
3522 tree = revset.parse(expr, lookup=repo.__contains__)
3536 tree = revset.parse(expr, lookup=repo.__contains__)
3523 ui.note(revset.prettyformat(tree), "\n")
3537 for n, f in stages:
3524 newtree = revset.expandaliases(ui, tree)
3538 tree = f(tree)
3525 if newtree != tree:
3539 if n in showalways or (n in showchanged and tree != printedtree):
3526 ui.note(("* expanded:\n"), revset.prettyformat(newtree), "\n")
3540 if n != 'parsed':
3527 tree = newtree
3541 ui.note(("* %s:\n") % n)
3528 newtree = revset.foldconcat(tree)
3542 ui.note(revset.prettyformat(tree), "\n")
3529 if newtree != tree:
3543 printedtree = tree
3530 ui.note(("* concatenated:\n"), revset.prettyformat(newtree), "\n")
3531 if opts["optimize"]:
3532 newtree = revset.analyze(newtree)
3533 optimizedtree = revset.optimize(newtree)
3534 ui.note(("* optimized:\n"),
3535 revset.prettyformat(optimizedtree), "\n")
3536
3544
3537 func = revset.match(ui, expr, repo)
3545 func = revset.match(ui, expr, repo)
3538 revs = func(repo)
3546 revs = func(repo)
3539 if ui.verbose:
3547 if ui.verbose:
3540 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3548 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3541 for c in revs:
3549 for c in revs:
3542 ui.write("%s\n" % c)
3550 ui.write("%s\n" % c)
3543
3551
3544 @command('debugsetparents', [], _('REV1 [REV2]'))
3552 @command('debugsetparents', [], _('REV1 [REV2]'))
3545 def debugsetparents(ui, repo, rev1, rev2=None):
3553 def debugsetparents(ui, repo, rev1, rev2=None):
3546 """manually set the parents of the current working directory
3554 """manually set the parents of the current working directory
3547
3555
3548 This is useful for writing repository conversion tools, but should
3556 This is useful for writing repository conversion tools, but should
3549 be used with care. For example, neither the working directory nor the
3557 be used with care. For example, neither the working directory nor the
3550 dirstate is updated, so file status may be incorrect after running this
3558 dirstate is updated, so file status may be incorrect after running this
3551 command.
3559 command.
3552
3560
3553 Returns 0 on success.
3561 Returns 0 on success.
3554 """
3562 """
3555
3563
3556 r1 = scmutil.revsingle(repo, rev1).node()
3564 r1 = scmutil.revsingle(repo, rev1).node()
3557 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3565 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3558
3566
3559 with repo.wlock():
3567 with repo.wlock():
3560 repo.setparents(r1, r2)
3568 repo.setparents(r1, r2)
3561
3569
3562 @command('debugdirstate|debugstate',
3570 @command('debugdirstate|debugstate',
3563 [('', 'nodates', None, _('do not display the saved mtime')),
3571 [('', 'nodates', None, _('do not display the saved mtime')),
3564 ('', 'datesort', None, _('sort by saved mtime'))],
3572 ('', 'datesort', None, _('sort by saved mtime'))],
3565 _('[OPTION]...'))
3573 _('[OPTION]...'))
3566 def debugstate(ui, repo, **opts):
3574 def debugstate(ui, repo, **opts):
3567 """show the contents of the current dirstate"""
3575 """show the contents of the current dirstate"""
3568
3576
3569 nodates = opts.get('nodates')
3577 nodates = opts.get('nodates')
3570 datesort = opts.get('datesort')
3578 datesort = opts.get('datesort')
3571
3579
3572 timestr = ""
3580 timestr = ""
3573 if datesort:
3581 if datesort:
3574 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3582 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3575 else:
3583 else:
3576 keyfunc = None # sort by filename
3584 keyfunc = None # sort by filename
3577 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3585 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3578 if ent[3] == -1:
3586 if ent[3] == -1:
3579 timestr = 'unset '
3587 timestr = 'unset '
3580 elif nodates:
3588 elif nodates:
3581 timestr = 'set '
3589 timestr = 'set '
3582 else:
3590 else:
3583 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3591 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3584 time.localtime(ent[3]))
3592 time.localtime(ent[3]))
3585 if ent[1] & 0o20000:
3593 if ent[1] & 0o20000:
3586 mode = 'lnk'
3594 mode = 'lnk'
3587 else:
3595 else:
3588 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3596 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3589 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3597 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3590 for f in repo.dirstate.copies():
3598 for f in repo.dirstate.copies():
3591 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3599 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3592
3600
3593 @command('debugsub',
3601 @command('debugsub',
3594 [('r', 'rev', '',
3602 [('r', 'rev', '',
3595 _('revision to check'), _('REV'))],
3603 _('revision to check'), _('REV'))],
3596 _('[-r REV] [REV]'))
3604 _('[-r REV] [REV]'))
3597 def debugsub(ui, repo, rev=None):
3605 def debugsub(ui, repo, rev=None):
3598 ctx = scmutil.revsingle(repo, rev, None)
3606 ctx = scmutil.revsingle(repo, rev, None)
3599 for k, v in sorted(ctx.substate.items()):
3607 for k, v in sorted(ctx.substate.items()):
3600 ui.write(('path %s\n') % k)
3608 ui.write(('path %s\n') % k)
3601 ui.write((' source %s\n') % v[0])
3609 ui.write((' source %s\n') % v[0])
3602 ui.write((' revision %s\n') % v[1])
3610 ui.write((' revision %s\n') % v[1])
3603
3611
3604 @command('debugsuccessorssets',
3612 @command('debugsuccessorssets',
3605 [],
3613 [],
3606 _('[REV]'))
3614 _('[REV]'))
3607 def debugsuccessorssets(ui, repo, *revs):
3615 def debugsuccessorssets(ui, repo, *revs):
3608 """show set of successors for revision
3616 """show set of successors for revision
3609
3617
3610 A successors set of changeset A is a consistent group of revisions that
3618 A successors set of changeset A is a consistent group of revisions that
3611 succeed A. It contains non-obsolete changesets only.
3619 succeed A. It contains non-obsolete changesets only.
3612
3620
3613 In most cases a changeset A has a single successors set containing a single
3621 In most cases a changeset A has a single successors set containing a single
3614 successor (changeset A replaced by A').
3622 successor (changeset A replaced by A').
3615
3623
3616 A changeset that is made obsolete with no successors are called "pruned".
3624 A changeset that is made obsolete with no successors are called "pruned".
3617 Such changesets have no successors sets at all.
3625 Such changesets have no successors sets at all.
3618
3626
3619 A changeset that has been "split" will have a successors set containing
3627 A changeset that has been "split" will have a successors set containing
3620 more than one successor.
3628 more than one successor.
3621
3629
3622 A changeset that has been rewritten in multiple different ways is called
3630 A changeset that has been rewritten in multiple different ways is called
3623 "divergent". Such changesets have multiple successor sets (each of which
3631 "divergent". Such changesets have multiple successor sets (each of which
3624 may also be split, i.e. have multiple successors).
3632 may also be split, i.e. have multiple successors).
3625
3633
3626 Results are displayed as follows::
3634 Results are displayed as follows::
3627
3635
3628 <rev1>
3636 <rev1>
3629 <successors-1A>
3637 <successors-1A>
3630 <rev2>
3638 <rev2>
3631 <successors-2A>
3639 <successors-2A>
3632 <successors-2B1> <successors-2B2> <successors-2B3>
3640 <successors-2B1> <successors-2B2> <successors-2B3>
3633
3641
3634 Here rev2 has two possible (i.e. divergent) successors sets. The first
3642 Here rev2 has two possible (i.e. divergent) successors sets. The first
3635 holds one element, whereas the second holds three (i.e. the changeset has
3643 holds one element, whereas the second holds three (i.e. the changeset has
3636 been split).
3644 been split).
3637 """
3645 """
3638 # passed to successorssets caching computation from one call to another
3646 # passed to successorssets caching computation from one call to another
3639 cache = {}
3647 cache = {}
3640 ctx2str = str
3648 ctx2str = str
3641 node2str = short
3649 node2str = short
3642 if ui.debug():
3650 if ui.debug():
3643 def ctx2str(ctx):
3651 def ctx2str(ctx):
3644 return ctx.hex()
3652 return ctx.hex()
3645 node2str = hex
3653 node2str = hex
3646 for rev in scmutil.revrange(repo, revs):
3654 for rev in scmutil.revrange(repo, revs):
3647 ctx = repo[rev]
3655 ctx = repo[rev]
3648 ui.write('%s\n'% ctx2str(ctx))
3656 ui.write('%s\n'% ctx2str(ctx))
3649 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3657 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3650 if succsset:
3658 if succsset:
3651 ui.write(' ')
3659 ui.write(' ')
3652 ui.write(node2str(succsset[0]))
3660 ui.write(node2str(succsset[0]))
3653 for node in succsset[1:]:
3661 for node in succsset[1:]:
3654 ui.write(' ')
3662 ui.write(' ')
3655 ui.write(node2str(node))
3663 ui.write(node2str(node))
3656 ui.write('\n')
3664 ui.write('\n')
3657
3665
3658 @command('debugtemplate',
3666 @command('debugtemplate',
3659 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3667 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3660 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3668 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3661 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3669 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3662 optionalrepo=True)
3670 optionalrepo=True)
3663 def debugtemplate(ui, repo, tmpl, **opts):
3671 def debugtemplate(ui, repo, tmpl, **opts):
3664 """parse and apply a template
3672 """parse and apply a template
3665
3673
3666 If -r/--rev is given, the template is processed as a log template and
3674 If -r/--rev is given, the template is processed as a log template and
3667 applied to the given changesets. Otherwise, it is processed as a generic
3675 applied to the given changesets. Otherwise, it is processed as a generic
3668 template.
3676 template.
3669
3677
3670 Use --verbose to print the parsed tree.
3678 Use --verbose to print the parsed tree.
3671 """
3679 """
3672 revs = None
3680 revs = None
3673 if opts['rev']:
3681 if opts['rev']:
3674 if repo is None:
3682 if repo is None:
3675 raise error.RepoError(_('there is no Mercurial repository here '
3683 raise error.RepoError(_('there is no Mercurial repository here '
3676 '(.hg not found)'))
3684 '(.hg not found)'))
3677 revs = scmutil.revrange(repo, opts['rev'])
3685 revs = scmutil.revrange(repo, opts['rev'])
3678
3686
3679 props = {}
3687 props = {}
3680 for d in opts['define']:
3688 for d in opts['define']:
3681 try:
3689 try:
3682 k, v = (e.strip() for e in d.split('=', 1))
3690 k, v = (e.strip() for e in d.split('=', 1))
3683 if not k:
3691 if not k:
3684 raise ValueError
3692 raise ValueError
3685 props[k] = v
3693 props[k] = v
3686 except ValueError:
3694 except ValueError:
3687 raise error.Abort(_('malformed keyword definition: %s') % d)
3695 raise error.Abort(_('malformed keyword definition: %s') % d)
3688
3696
3689 if ui.verbose:
3697 if ui.verbose:
3690 aliases = ui.configitems('templatealias')
3698 aliases = ui.configitems('templatealias')
3691 tree = templater.parse(tmpl)
3699 tree = templater.parse(tmpl)
3692 ui.note(templater.prettyformat(tree), '\n')
3700 ui.note(templater.prettyformat(tree), '\n')
3693 newtree = templater.expandaliases(tree, aliases)
3701 newtree = templater.expandaliases(tree, aliases)
3694 if newtree != tree:
3702 if newtree != tree:
3695 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3703 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3696
3704
3697 mapfile = None
3705 mapfile = None
3698 if revs is None:
3706 if revs is None:
3699 k = 'debugtemplate'
3707 k = 'debugtemplate'
3700 t = formatter.maketemplater(ui, k, tmpl)
3708 t = formatter.maketemplater(ui, k, tmpl)
3701 ui.write(templater.stringify(t(k, **props)))
3709 ui.write(templater.stringify(t(k, **props)))
3702 else:
3710 else:
3703 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3711 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3704 mapfile, buffered=False)
3712 mapfile, buffered=False)
3705 for r in revs:
3713 for r in revs:
3706 displayer.show(repo[r], **props)
3714 displayer.show(repo[r], **props)
3707 displayer.close()
3715 displayer.close()
3708
3716
3709 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3717 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3710 def debugwalk(ui, repo, *pats, **opts):
3718 def debugwalk(ui, repo, *pats, **opts):
3711 """show how files match on given patterns"""
3719 """show how files match on given patterns"""
3712 m = scmutil.match(repo[None], pats, opts)
3720 m = scmutil.match(repo[None], pats, opts)
3713 items = list(repo.walk(m))
3721 items = list(repo.walk(m))
3714 if not items:
3722 if not items:
3715 return
3723 return
3716 f = lambda fn: fn
3724 f = lambda fn: fn
3717 if ui.configbool('ui', 'slash') and os.sep != '/':
3725 if ui.configbool('ui', 'slash') and os.sep != '/':
3718 f = lambda fn: util.normpath(fn)
3726 f = lambda fn: util.normpath(fn)
3719 fmt = 'f %%-%ds %%-%ds %%s' % (
3727 fmt = 'f %%-%ds %%-%ds %%s' % (
3720 max([len(abs) for abs in items]),
3728 max([len(abs) for abs in items]),
3721 max([len(m.rel(abs)) for abs in items]))
3729 max([len(m.rel(abs)) for abs in items]))
3722 for abs in items:
3730 for abs in items:
3723 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3731 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3724 ui.write("%s\n" % line.rstrip())
3732 ui.write("%s\n" % line.rstrip())
3725
3733
3726 @command('debugwireargs',
3734 @command('debugwireargs',
3727 [('', 'three', '', 'three'),
3735 [('', 'three', '', 'three'),
3728 ('', 'four', '', 'four'),
3736 ('', 'four', '', 'four'),
3729 ('', 'five', '', 'five'),
3737 ('', 'five', '', 'five'),
3730 ] + remoteopts,
3738 ] + remoteopts,
3731 _('REPO [OPTIONS]... [ONE [TWO]]'),
3739 _('REPO [OPTIONS]... [ONE [TWO]]'),
3732 norepo=True)
3740 norepo=True)
3733 def debugwireargs(ui, repopath, *vals, **opts):
3741 def debugwireargs(ui, repopath, *vals, **opts):
3734 repo = hg.peer(ui, opts, repopath)
3742 repo = hg.peer(ui, opts, repopath)
3735 for opt in remoteopts:
3743 for opt in remoteopts:
3736 del opts[opt[1]]
3744 del opts[opt[1]]
3737 args = {}
3745 args = {}
3738 for k, v in opts.iteritems():
3746 for k, v in opts.iteritems():
3739 if v:
3747 if v:
3740 args[k] = v
3748 args[k] = v
3741 # run twice to check that we don't mess up the stream for the next command
3749 # run twice to check that we don't mess up the stream for the next command
3742 res1 = repo.debugwireargs(*vals, **args)
3750 res1 = repo.debugwireargs(*vals, **args)
3743 res2 = repo.debugwireargs(*vals, **args)
3751 res2 = repo.debugwireargs(*vals, **args)
3744 ui.write("%s\n" % res1)
3752 ui.write("%s\n" % res1)
3745 if res1 != res2:
3753 if res1 != res2:
3746 ui.warn("%s\n" % res2)
3754 ui.warn("%s\n" % res2)
3747
3755
3748 @command('^diff',
3756 @command('^diff',
3749 [('r', 'rev', [], _('revision'), _('REV')),
3757 [('r', 'rev', [], _('revision'), _('REV')),
3750 ('c', 'change', '', _('change made by revision'), _('REV'))
3758 ('c', 'change', '', _('change made by revision'), _('REV'))
3751 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3759 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3752 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3760 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3753 inferrepo=True)
3761 inferrepo=True)
3754 def diff(ui, repo, *pats, **opts):
3762 def diff(ui, repo, *pats, **opts):
3755 """diff repository (or selected files)
3763 """diff repository (or selected files)
3756
3764
3757 Show differences between revisions for the specified files.
3765 Show differences between revisions for the specified files.
3758
3766
3759 Differences between files are shown using the unified diff format.
3767 Differences between files are shown using the unified diff format.
3760
3768
3761 .. note::
3769 .. note::
3762
3770
3763 :hg:`diff` may generate unexpected results for merges, as it will
3771 :hg:`diff` may generate unexpected results for merges, as it will
3764 default to comparing against the working directory's first
3772 default to comparing against the working directory's first
3765 parent changeset if no revisions are specified.
3773 parent changeset if no revisions are specified.
3766
3774
3767 When two revision arguments are given, then changes are shown
3775 When two revision arguments are given, then changes are shown
3768 between those revisions. If only one revision is specified then
3776 between those revisions. If only one revision is specified then
3769 that revision is compared to the working directory, and, when no
3777 that revision is compared to the working directory, and, when no
3770 revisions are specified, the working directory files are compared
3778 revisions are specified, the working directory files are compared
3771 to its first parent.
3779 to its first parent.
3772
3780
3773 Alternatively you can specify -c/--change with a revision to see
3781 Alternatively you can specify -c/--change with a revision to see
3774 the changes in that changeset relative to its first parent.
3782 the changes in that changeset relative to its first parent.
3775
3783
3776 Without the -a/--text option, diff will avoid generating diffs of
3784 Without the -a/--text option, diff will avoid generating diffs of
3777 files it detects as binary. With -a, diff will generate a diff
3785 files it detects as binary. With -a, diff will generate a diff
3778 anyway, probably with undesirable results.
3786 anyway, probably with undesirable results.
3779
3787
3780 Use the -g/--git option to generate diffs in the git extended diff
3788 Use the -g/--git option to generate diffs in the git extended diff
3781 format. For more information, read :hg:`help diffs`.
3789 format. For more information, read :hg:`help diffs`.
3782
3790
3783 .. container:: verbose
3791 .. container:: verbose
3784
3792
3785 Examples:
3793 Examples:
3786
3794
3787 - compare a file in the current working directory to its parent::
3795 - compare a file in the current working directory to its parent::
3788
3796
3789 hg diff foo.c
3797 hg diff foo.c
3790
3798
3791 - compare two historical versions of a directory, with rename info::
3799 - compare two historical versions of a directory, with rename info::
3792
3800
3793 hg diff --git -r 1.0:1.2 lib/
3801 hg diff --git -r 1.0:1.2 lib/
3794
3802
3795 - get change stats relative to the last change on some date::
3803 - get change stats relative to the last change on some date::
3796
3804
3797 hg diff --stat -r "date('may 2')"
3805 hg diff --stat -r "date('may 2')"
3798
3806
3799 - diff all newly-added files that contain a keyword::
3807 - diff all newly-added files that contain a keyword::
3800
3808
3801 hg diff "set:added() and grep(GNU)"
3809 hg diff "set:added() and grep(GNU)"
3802
3810
3803 - compare a revision and its parents::
3811 - compare a revision and its parents::
3804
3812
3805 hg diff -c 9353 # compare against first parent
3813 hg diff -c 9353 # compare against first parent
3806 hg diff -r 9353^:9353 # same using revset syntax
3814 hg diff -r 9353^:9353 # same using revset syntax
3807 hg diff -r 9353^2:9353 # compare against the second parent
3815 hg diff -r 9353^2:9353 # compare against the second parent
3808
3816
3809 Returns 0 on success.
3817 Returns 0 on success.
3810 """
3818 """
3811
3819
3812 revs = opts.get('rev')
3820 revs = opts.get('rev')
3813 change = opts.get('change')
3821 change = opts.get('change')
3814 stat = opts.get('stat')
3822 stat = opts.get('stat')
3815 reverse = opts.get('reverse')
3823 reverse = opts.get('reverse')
3816
3824
3817 if revs and change:
3825 if revs and change:
3818 msg = _('cannot specify --rev and --change at the same time')
3826 msg = _('cannot specify --rev and --change at the same time')
3819 raise error.Abort(msg)
3827 raise error.Abort(msg)
3820 elif change:
3828 elif change:
3821 node2 = scmutil.revsingle(repo, change, None).node()
3829 node2 = scmutil.revsingle(repo, change, None).node()
3822 node1 = repo[node2].p1().node()
3830 node1 = repo[node2].p1().node()
3823 else:
3831 else:
3824 node1, node2 = scmutil.revpair(repo, revs)
3832 node1, node2 = scmutil.revpair(repo, revs)
3825
3833
3826 if reverse:
3834 if reverse:
3827 node1, node2 = node2, node1
3835 node1, node2 = node2, node1
3828
3836
3829 diffopts = patch.diffallopts(ui, opts)
3837 diffopts = patch.diffallopts(ui, opts)
3830 m = scmutil.match(repo[node2], pats, opts)
3838 m = scmutil.match(repo[node2], pats, opts)
3831 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3839 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3832 listsubrepos=opts.get('subrepos'),
3840 listsubrepos=opts.get('subrepos'),
3833 root=opts.get('root'))
3841 root=opts.get('root'))
3834
3842
3835 @command('^export',
3843 @command('^export',
3836 [('o', 'output', '',
3844 [('o', 'output', '',
3837 _('print output to file with formatted name'), _('FORMAT')),
3845 _('print output to file with formatted name'), _('FORMAT')),
3838 ('', 'switch-parent', None, _('diff against the second parent')),
3846 ('', 'switch-parent', None, _('diff against the second parent')),
3839 ('r', 'rev', [], _('revisions to export'), _('REV')),
3847 ('r', 'rev', [], _('revisions to export'), _('REV')),
3840 ] + diffopts,
3848 ] + diffopts,
3841 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3849 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3842 def export(ui, repo, *changesets, **opts):
3850 def export(ui, repo, *changesets, **opts):
3843 """dump the header and diffs for one or more changesets
3851 """dump the header and diffs for one or more changesets
3844
3852
3845 Print the changeset header and diffs for one or more revisions.
3853 Print the changeset header and diffs for one or more revisions.
3846 If no revision is given, the parent of the working directory is used.
3854 If no revision is given, the parent of the working directory is used.
3847
3855
3848 The information shown in the changeset header is: author, date,
3856 The information shown in the changeset header is: author, date,
3849 branch name (if non-default), changeset hash, parent(s) and commit
3857 branch name (if non-default), changeset hash, parent(s) and commit
3850 comment.
3858 comment.
3851
3859
3852 .. note::
3860 .. note::
3853
3861
3854 :hg:`export` may generate unexpected diff output for merge
3862 :hg:`export` may generate unexpected diff output for merge
3855 changesets, as it will compare the merge changeset against its
3863 changesets, as it will compare the merge changeset against its
3856 first parent only.
3864 first parent only.
3857
3865
3858 Output may be to a file, in which case the name of the file is
3866 Output may be to a file, in which case the name of the file is
3859 given using a format string. The formatting rules are as follows:
3867 given using a format string. The formatting rules are as follows:
3860
3868
3861 :``%%``: literal "%" character
3869 :``%%``: literal "%" character
3862 :``%H``: changeset hash (40 hexadecimal digits)
3870 :``%H``: changeset hash (40 hexadecimal digits)
3863 :``%N``: number of patches being generated
3871 :``%N``: number of patches being generated
3864 :``%R``: changeset revision number
3872 :``%R``: changeset revision number
3865 :``%b``: basename of the exporting repository
3873 :``%b``: basename of the exporting repository
3866 :``%h``: short-form changeset hash (12 hexadecimal digits)
3874 :``%h``: short-form changeset hash (12 hexadecimal digits)
3867 :``%m``: first line of the commit message (only alphanumeric characters)
3875 :``%m``: first line of the commit message (only alphanumeric characters)
3868 :``%n``: zero-padded sequence number, starting at 1
3876 :``%n``: zero-padded sequence number, starting at 1
3869 :``%r``: zero-padded changeset revision number
3877 :``%r``: zero-padded changeset revision number
3870
3878
3871 Without the -a/--text option, export will avoid generating diffs
3879 Without the -a/--text option, export will avoid generating diffs
3872 of files it detects as binary. With -a, export will generate a
3880 of files it detects as binary. With -a, export will generate a
3873 diff anyway, probably with undesirable results.
3881 diff anyway, probably with undesirable results.
3874
3882
3875 Use the -g/--git option to generate diffs in the git extended diff
3883 Use the -g/--git option to generate diffs in the git extended diff
3876 format. See :hg:`help diffs` for more information.
3884 format. See :hg:`help diffs` for more information.
3877
3885
3878 With the --switch-parent option, the diff will be against the
3886 With the --switch-parent option, the diff will be against the
3879 second parent. It can be useful to review a merge.
3887 second parent. It can be useful to review a merge.
3880
3888
3881 .. container:: verbose
3889 .. container:: verbose
3882
3890
3883 Examples:
3891 Examples:
3884
3892
3885 - use export and import to transplant a bugfix to the current
3893 - use export and import to transplant a bugfix to the current
3886 branch::
3894 branch::
3887
3895
3888 hg export -r 9353 | hg import -
3896 hg export -r 9353 | hg import -
3889
3897
3890 - export all the changesets between two revisions to a file with
3898 - export all the changesets between two revisions to a file with
3891 rename information::
3899 rename information::
3892
3900
3893 hg export --git -r 123:150 > changes.txt
3901 hg export --git -r 123:150 > changes.txt
3894
3902
3895 - split outgoing changes into a series of patches with
3903 - split outgoing changes into a series of patches with
3896 descriptive names::
3904 descriptive names::
3897
3905
3898 hg export -r "outgoing()" -o "%n-%m.patch"
3906 hg export -r "outgoing()" -o "%n-%m.patch"
3899
3907
3900 Returns 0 on success.
3908 Returns 0 on success.
3901 """
3909 """
3902 changesets += tuple(opts.get('rev', []))
3910 changesets += tuple(opts.get('rev', []))
3903 if not changesets:
3911 if not changesets:
3904 changesets = ['.']
3912 changesets = ['.']
3905 revs = scmutil.revrange(repo, changesets)
3913 revs = scmutil.revrange(repo, changesets)
3906 if not revs:
3914 if not revs:
3907 raise error.Abort(_("export requires at least one changeset"))
3915 raise error.Abort(_("export requires at least one changeset"))
3908 if len(revs) > 1:
3916 if len(revs) > 1:
3909 ui.note(_('exporting patches:\n'))
3917 ui.note(_('exporting patches:\n'))
3910 else:
3918 else:
3911 ui.note(_('exporting patch:\n'))
3919 ui.note(_('exporting patch:\n'))
3912 cmdutil.export(repo, revs, template=opts.get('output'),
3920 cmdutil.export(repo, revs, template=opts.get('output'),
3913 switch_parent=opts.get('switch_parent'),
3921 switch_parent=opts.get('switch_parent'),
3914 opts=patch.diffallopts(ui, opts))
3922 opts=patch.diffallopts(ui, opts))
3915
3923
3916 @command('files',
3924 @command('files',
3917 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3925 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3918 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3926 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3919 ] + walkopts + formatteropts + subrepoopts,
3927 ] + walkopts + formatteropts + subrepoopts,
3920 _('[OPTION]... [FILE]...'))
3928 _('[OPTION]... [FILE]...'))
3921 def files(ui, repo, *pats, **opts):
3929 def files(ui, repo, *pats, **opts):
3922 """list tracked files
3930 """list tracked files
3923
3931
3924 Print files under Mercurial control in the working directory or
3932 Print files under Mercurial control in the working directory or
3925 specified revision for given files (excluding removed files).
3933 specified revision for given files (excluding removed files).
3926 Files can be specified as filenames or filesets.
3934 Files can be specified as filenames or filesets.
3927
3935
3928 If no files are given to match, this command prints the names
3936 If no files are given to match, this command prints the names
3929 of all files under Mercurial control.
3937 of all files under Mercurial control.
3930
3938
3931 .. container:: verbose
3939 .. container:: verbose
3932
3940
3933 Examples:
3941 Examples:
3934
3942
3935 - list all files under the current directory::
3943 - list all files under the current directory::
3936
3944
3937 hg files .
3945 hg files .
3938
3946
3939 - shows sizes and flags for current revision::
3947 - shows sizes and flags for current revision::
3940
3948
3941 hg files -vr .
3949 hg files -vr .
3942
3950
3943 - list all files named README::
3951 - list all files named README::
3944
3952
3945 hg files -I "**/README"
3953 hg files -I "**/README"
3946
3954
3947 - list all binary files::
3955 - list all binary files::
3948
3956
3949 hg files "set:binary()"
3957 hg files "set:binary()"
3950
3958
3951 - find files containing a regular expression::
3959 - find files containing a regular expression::
3952
3960
3953 hg files "set:grep('bob')"
3961 hg files "set:grep('bob')"
3954
3962
3955 - search tracked file contents with xargs and grep::
3963 - search tracked file contents with xargs and grep::
3956
3964
3957 hg files -0 | xargs -0 grep foo
3965 hg files -0 | xargs -0 grep foo
3958
3966
3959 See :hg:`help patterns` and :hg:`help filesets` for more information
3967 See :hg:`help patterns` and :hg:`help filesets` for more information
3960 on specifying file patterns.
3968 on specifying file patterns.
3961
3969
3962 Returns 0 if a match is found, 1 otherwise.
3970 Returns 0 if a match is found, 1 otherwise.
3963
3971
3964 """
3972 """
3965 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3973 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3966
3974
3967 end = '\n'
3975 end = '\n'
3968 if opts.get('print0'):
3976 if opts.get('print0'):
3969 end = '\0'
3977 end = '\0'
3970 fmt = '%s' + end
3978 fmt = '%s' + end
3971
3979
3972 m = scmutil.match(ctx, pats, opts)
3980 m = scmutil.match(ctx, pats, opts)
3973 with ui.formatter('files', opts) as fm:
3981 with ui.formatter('files', opts) as fm:
3974 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3982 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3975
3983
3976 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3984 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3977 def forget(ui, repo, *pats, **opts):
3985 def forget(ui, repo, *pats, **opts):
3978 """forget the specified files on the next commit
3986 """forget the specified files on the next commit
3979
3987
3980 Mark the specified files so they will no longer be tracked
3988 Mark the specified files so they will no longer be tracked
3981 after the next commit.
3989 after the next commit.
3982
3990
3983 This only removes files from the current branch, not from the
3991 This only removes files from the current branch, not from the
3984 entire project history, and it does not delete them from the
3992 entire project history, and it does not delete them from the
3985 working directory.
3993 working directory.
3986
3994
3987 To delete the file from the working directory, see :hg:`remove`.
3995 To delete the file from the working directory, see :hg:`remove`.
3988
3996
3989 To undo a forget before the next commit, see :hg:`add`.
3997 To undo a forget before the next commit, see :hg:`add`.
3990
3998
3991 .. container:: verbose
3999 .. container:: verbose
3992
4000
3993 Examples:
4001 Examples:
3994
4002
3995 - forget newly-added binary files::
4003 - forget newly-added binary files::
3996
4004
3997 hg forget "set:added() and binary()"
4005 hg forget "set:added() and binary()"
3998
4006
3999 - forget files that would be excluded by .hgignore::
4007 - forget files that would be excluded by .hgignore::
4000
4008
4001 hg forget "set:hgignore()"
4009 hg forget "set:hgignore()"
4002
4010
4003 Returns 0 on success.
4011 Returns 0 on success.
4004 """
4012 """
4005
4013
4006 if not pats:
4014 if not pats:
4007 raise error.Abort(_('no files specified'))
4015 raise error.Abort(_('no files specified'))
4008
4016
4009 m = scmutil.match(repo[None], pats, opts)
4017 m = scmutil.match(repo[None], pats, opts)
4010 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4018 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4011 return rejected and 1 or 0
4019 return rejected and 1 or 0
4012
4020
4013 @command(
4021 @command(
4014 'graft',
4022 'graft',
4015 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4023 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4016 ('c', 'continue', False, _('resume interrupted graft')),
4024 ('c', 'continue', False, _('resume interrupted graft')),
4017 ('e', 'edit', False, _('invoke editor on commit messages')),
4025 ('e', 'edit', False, _('invoke editor on commit messages')),
4018 ('', 'log', None, _('append graft info to log message')),
4026 ('', 'log', None, _('append graft info to log message')),
4019 ('f', 'force', False, _('force graft')),
4027 ('f', 'force', False, _('force graft')),
4020 ('D', 'currentdate', False,
4028 ('D', 'currentdate', False,
4021 _('record the current date as commit date')),
4029 _('record the current date as commit date')),
4022 ('U', 'currentuser', False,
4030 ('U', 'currentuser', False,
4023 _('record the current user as committer'), _('DATE'))]
4031 _('record the current user as committer'), _('DATE'))]
4024 + commitopts2 + mergetoolopts + dryrunopts,
4032 + commitopts2 + mergetoolopts + dryrunopts,
4025 _('[OPTION]... [-r REV]... REV...'))
4033 _('[OPTION]... [-r REV]... REV...'))
4026 def graft(ui, repo, *revs, **opts):
4034 def graft(ui, repo, *revs, **opts):
4027 '''copy changes from other branches onto the current branch
4035 '''copy changes from other branches onto the current branch
4028
4036
4029 This command uses Mercurial's merge logic to copy individual
4037 This command uses Mercurial's merge logic to copy individual
4030 changes from other branches without merging branches in the
4038 changes from other branches without merging branches in the
4031 history graph. This is sometimes known as 'backporting' or
4039 history graph. This is sometimes known as 'backporting' or
4032 'cherry-picking'. By default, graft will copy user, date, and
4040 'cherry-picking'. By default, graft will copy user, date, and
4033 description from the source changesets.
4041 description from the source changesets.
4034
4042
4035 Changesets that are ancestors of the current revision, that have
4043 Changesets that are ancestors of the current revision, that have
4036 already been grafted, or that are merges will be skipped.
4044 already been grafted, or that are merges will be skipped.
4037
4045
4038 If --log is specified, log messages will have a comment appended
4046 If --log is specified, log messages will have a comment appended
4039 of the form::
4047 of the form::
4040
4048
4041 (grafted from CHANGESETHASH)
4049 (grafted from CHANGESETHASH)
4042
4050
4043 If --force is specified, revisions will be grafted even if they
4051 If --force is specified, revisions will be grafted even if they
4044 are already ancestors of or have been grafted to the destination.
4052 are already ancestors of or have been grafted to the destination.
4045 This is useful when the revisions have since been backed out.
4053 This is useful when the revisions have since been backed out.
4046
4054
4047 If a graft merge results in conflicts, the graft process is
4055 If a graft merge results in conflicts, the graft process is
4048 interrupted so that the current merge can be manually resolved.
4056 interrupted so that the current merge can be manually resolved.
4049 Once all conflicts are addressed, the graft process can be
4057 Once all conflicts are addressed, the graft process can be
4050 continued with the -c/--continue option.
4058 continued with the -c/--continue option.
4051
4059
4052 .. note::
4060 .. note::
4053
4061
4054 The -c/--continue option does not reapply earlier options, except
4062 The -c/--continue option does not reapply earlier options, except
4055 for --force.
4063 for --force.
4056
4064
4057 .. container:: verbose
4065 .. container:: verbose
4058
4066
4059 Examples:
4067 Examples:
4060
4068
4061 - copy a single change to the stable branch and edit its description::
4069 - copy a single change to the stable branch and edit its description::
4062
4070
4063 hg update stable
4071 hg update stable
4064 hg graft --edit 9393
4072 hg graft --edit 9393
4065
4073
4066 - graft a range of changesets with one exception, updating dates::
4074 - graft a range of changesets with one exception, updating dates::
4067
4075
4068 hg graft -D "2085::2093 and not 2091"
4076 hg graft -D "2085::2093 and not 2091"
4069
4077
4070 - continue a graft after resolving conflicts::
4078 - continue a graft after resolving conflicts::
4071
4079
4072 hg graft -c
4080 hg graft -c
4073
4081
4074 - show the source of a grafted changeset::
4082 - show the source of a grafted changeset::
4075
4083
4076 hg log --debug -r .
4084 hg log --debug -r .
4077
4085
4078 - show revisions sorted by date::
4086 - show revisions sorted by date::
4079
4087
4080 hg log -r "sort(all(), date)"
4088 hg log -r "sort(all(), date)"
4081
4089
4082 See :hg:`help revisions` and :hg:`help revsets` for more about
4090 See :hg:`help revisions` and :hg:`help revsets` for more about
4083 specifying revisions.
4091 specifying revisions.
4084
4092
4085 Returns 0 on successful completion.
4093 Returns 0 on successful completion.
4086 '''
4094 '''
4087 with repo.wlock():
4095 with repo.wlock():
4088 return _dograft(ui, repo, *revs, **opts)
4096 return _dograft(ui, repo, *revs, **opts)
4089
4097
4090 def _dograft(ui, repo, *revs, **opts):
4098 def _dograft(ui, repo, *revs, **opts):
4091 if revs and opts.get('rev'):
4099 if revs and opts.get('rev'):
4092 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4100 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4093 'revision ordering!\n'))
4101 'revision ordering!\n'))
4094
4102
4095 revs = list(revs)
4103 revs = list(revs)
4096 revs.extend(opts.get('rev'))
4104 revs.extend(opts.get('rev'))
4097
4105
4098 if not opts.get('user') and opts.get('currentuser'):
4106 if not opts.get('user') and opts.get('currentuser'):
4099 opts['user'] = ui.username()
4107 opts['user'] = ui.username()
4100 if not opts.get('date') and opts.get('currentdate'):
4108 if not opts.get('date') and opts.get('currentdate'):
4101 opts['date'] = "%d %d" % util.makedate()
4109 opts['date'] = "%d %d" % util.makedate()
4102
4110
4103 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4111 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4104
4112
4105 cont = False
4113 cont = False
4106 if opts.get('continue'):
4114 if opts.get('continue'):
4107 cont = True
4115 cont = True
4108 if revs:
4116 if revs:
4109 raise error.Abort(_("can't specify --continue and revisions"))
4117 raise error.Abort(_("can't specify --continue and revisions"))
4110 # read in unfinished revisions
4118 # read in unfinished revisions
4111 try:
4119 try:
4112 nodes = repo.vfs.read('graftstate').splitlines()
4120 nodes = repo.vfs.read('graftstate').splitlines()
4113 revs = [repo[node].rev() for node in nodes]
4121 revs = [repo[node].rev() for node in nodes]
4114 except IOError as inst:
4122 except IOError as inst:
4115 if inst.errno != errno.ENOENT:
4123 if inst.errno != errno.ENOENT:
4116 raise
4124 raise
4117 cmdutil.wrongtooltocontinue(repo, _('graft'))
4125 cmdutil.wrongtooltocontinue(repo, _('graft'))
4118 else:
4126 else:
4119 cmdutil.checkunfinished(repo)
4127 cmdutil.checkunfinished(repo)
4120 cmdutil.bailifchanged(repo)
4128 cmdutil.bailifchanged(repo)
4121 if not revs:
4129 if not revs:
4122 raise error.Abort(_('no revisions specified'))
4130 raise error.Abort(_('no revisions specified'))
4123 revs = scmutil.revrange(repo, revs)
4131 revs = scmutil.revrange(repo, revs)
4124
4132
4125 skipped = set()
4133 skipped = set()
4126 # check for merges
4134 # check for merges
4127 for rev in repo.revs('%ld and merge()', revs):
4135 for rev in repo.revs('%ld and merge()', revs):
4128 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4136 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4129 skipped.add(rev)
4137 skipped.add(rev)
4130 revs = [r for r in revs if r not in skipped]
4138 revs = [r for r in revs if r not in skipped]
4131 if not revs:
4139 if not revs:
4132 return -1
4140 return -1
4133
4141
4134 # Don't check in the --continue case, in effect retaining --force across
4142 # Don't check in the --continue case, in effect retaining --force across
4135 # --continues. That's because without --force, any revisions we decided to
4143 # --continues. That's because without --force, any revisions we decided to
4136 # skip would have been filtered out here, so they wouldn't have made their
4144 # skip would have been filtered out here, so they wouldn't have made their
4137 # way to the graftstate. With --force, any revisions we would have otherwise
4145 # way to the graftstate. With --force, any revisions we would have otherwise
4138 # skipped would not have been filtered out, and if they hadn't been applied
4146 # skipped would not have been filtered out, and if they hadn't been applied
4139 # already, they'd have been in the graftstate.
4147 # already, they'd have been in the graftstate.
4140 if not (cont or opts.get('force')):
4148 if not (cont or opts.get('force')):
4141 # check for ancestors of dest branch
4149 # check for ancestors of dest branch
4142 crev = repo['.'].rev()
4150 crev = repo['.'].rev()
4143 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4151 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4144 # XXX make this lazy in the future
4152 # XXX make this lazy in the future
4145 # don't mutate while iterating, create a copy
4153 # don't mutate while iterating, create a copy
4146 for rev in list(revs):
4154 for rev in list(revs):
4147 if rev in ancestors:
4155 if rev in ancestors:
4148 ui.warn(_('skipping ancestor revision %d:%s\n') %
4156 ui.warn(_('skipping ancestor revision %d:%s\n') %
4149 (rev, repo[rev]))
4157 (rev, repo[rev]))
4150 # XXX remove on list is slow
4158 # XXX remove on list is slow
4151 revs.remove(rev)
4159 revs.remove(rev)
4152 if not revs:
4160 if not revs:
4153 return -1
4161 return -1
4154
4162
4155 # analyze revs for earlier grafts
4163 # analyze revs for earlier grafts
4156 ids = {}
4164 ids = {}
4157 for ctx in repo.set("%ld", revs):
4165 for ctx in repo.set("%ld", revs):
4158 ids[ctx.hex()] = ctx.rev()
4166 ids[ctx.hex()] = ctx.rev()
4159 n = ctx.extra().get('source')
4167 n = ctx.extra().get('source')
4160 if n:
4168 if n:
4161 ids[n] = ctx.rev()
4169 ids[n] = ctx.rev()
4162
4170
4163 # check ancestors for earlier grafts
4171 # check ancestors for earlier grafts
4164 ui.debug('scanning for duplicate grafts\n')
4172 ui.debug('scanning for duplicate grafts\n')
4165
4173
4166 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4174 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4167 ctx = repo[rev]
4175 ctx = repo[rev]
4168 n = ctx.extra().get('source')
4176 n = ctx.extra().get('source')
4169 if n in ids:
4177 if n in ids:
4170 try:
4178 try:
4171 r = repo[n].rev()
4179 r = repo[n].rev()
4172 except error.RepoLookupError:
4180 except error.RepoLookupError:
4173 r = None
4181 r = None
4174 if r in revs:
4182 if r in revs:
4175 ui.warn(_('skipping revision %d:%s '
4183 ui.warn(_('skipping revision %d:%s '
4176 '(already grafted to %d:%s)\n')
4184 '(already grafted to %d:%s)\n')
4177 % (r, repo[r], rev, ctx))
4185 % (r, repo[r], rev, ctx))
4178 revs.remove(r)
4186 revs.remove(r)
4179 elif ids[n] in revs:
4187 elif ids[n] in revs:
4180 if r is None:
4188 if r is None:
4181 ui.warn(_('skipping already grafted revision %d:%s '
4189 ui.warn(_('skipping already grafted revision %d:%s '
4182 '(%d:%s also has unknown origin %s)\n')
4190 '(%d:%s also has unknown origin %s)\n')
4183 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4191 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4184 else:
4192 else:
4185 ui.warn(_('skipping already grafted revision %d:%s '
4193 ui.warn(_('skipping already grafted revision %d:%s '
4186 '(%d:%s also has origin %d:%s)\n')
4194 '(%d:%s also has origin %d:%s)\n')
4187 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4195 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4188 revs.remove(ids[n])
4196 revs.remove(ids[n])
4189 elif ctx.hex() in ids:
4197 elif ctx.hex() in ids:
4190 r = ids[ctx.hex()]
4198 r = ids[ctx.hex()]
4191 ui.warn(_('skipping already grafted revision %d:%s '
4199 ui.warn(_('skipping already grafted revision %d:%s '
4192 '(was grafted from %d:%s)\n') %
4200 '(was grafted from %d:%s)\n') %
4193 (r, repo[r], rev, ctx))
4201 (r, repo[r], rev, ctx))
4194 revs.remove(r)
4202 revs.remove(r)
4195 if not revs:
4203 if not revs:
4196 return -1
4204 return -1
4197
4205
4198 for pos, ctx in enumerate(repo.set("%ld", revs)):
4206 for pos, ctx in enumerate(repo.set("%ld", revs)):
4199 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4207 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4200 ctx.description().split('\n', 1)[0])
4208 ctx.description().split('\n', 1)[0])
4201 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4209 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4202 if names:
4210 if names:
4203 desc += ' (%s)' % ' '.join(names)
4211 desc += ' (%s)' % ' '.join(names)
4204 ui.status(_('grafting %s\n') % desc)
4212 ui.status(_('grafting %s\n') % desc)
4205 if opts.get('dry_run'):
4213 if opts.get('dry_run'):
4206 continue
4214 continue
4207
4215
4208 source = ctx.extra().get('source')
4216 source = ctx.extra().get('source')
4209 extra = {}
4217 extra = {}
4210 if source:
4218 if source:
4211 extra['source'] = source
4219 extra['source'] = source
4212 extra['intermediate-source'] = ctx.hex()
4220 extra['intermediate-source'] = ctx.hex()
4213 else:
4221 else:
4214 extra['source'] = ctx.hex()
4222 extra['source'] = ctx.hex()
4215 user = ctx.user()
4223 user = ctx.user()
4216 if opts.get('user'):
4224 if opts.get('user'):
4217 user = opts['user']
4225 user = opts['user']
4218 date = ctx.date()
4226 date = ctx.date()
4219 if opts.get('date'):
4227 if opts.get('date'):
4220 date = opts['date']
4228 date = opts['date']
4221 message = ctx.description()
4229 message = ctx.description()
4222 if opts.get('log'):
4230 if opts.get('log'):
4223 message += '\n(grafted from %s)' % ctx.hex()
4231 message += '\n(grafted from %s)' % ctx.hex()
4224
4232
4225 # we don't merge the first commit when continuing
4233 # we don't merge the first commit when continuing
4226 if not cont:
4234 if not cont:
4227 # perform the graft merge with p1(rev) as 'ancestor'
4235 # perform the graft merge with p1(rev) as 'ancestor'
4228 try:
4236 try:
4229 # ui.forcemerge is an internal variable, do not document
4237 # ui.forcemerge is an internal variable, do not document
4230 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4238 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4231 'graft')
4239 'graft')
4232 stats = mergemod.graft(repo, ctx, ctx.p1(),
4240 stats = mergemod.graft(repo, ctx, ctx.p1(),
4233 ['local', 'graft'])
4241 ['local', 'graft'])
4234 finally:
4242 finally:
4235 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4243 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4236 # report any conflicts
4244 # report any conflicts
4237 if stats and stats[3] > 0:
4245 if stats and stats[3] > 0:
4238 # write out state for --continue
4246 # write out state for --continue
4239 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4247 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4240 repo.vfs.write('graftstate', ''.join(nodelines))
4248 repo.vfs.write('graftstate', ''.join(nodelines))
4241 extra = ''
4249 extra = ''
4242 if opts.get('user'):
4250 if opts.get('user'):
4243 extra += ' --user %s' % util.shellquote(opts['user'])
4251 extra += ' --user %s' % util.shellquote(opts['user'])
4244 if opts.get('date'):
4252 if opts.get('date'):
4245 extra += ' --date %s' % util.shellquote(opts['date'])
4253 extra += ' --date %s' % util.shellquote(opts['date'])
4246 if opts.get('log'):
4254 if opts.get('log'):
4247 extra += ' --log'
4255 extra += ' --log'
4248 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4256 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4249 raise error.Abort(
4257 raise error.Abort(
4250 _("unresolved conflicts, can't continue"),
4258 _("unresolved conflicts, can't continue"),
4251 hint=hint)
4259 hint=hint)
4252 else:
4260 else:
4253 cont = False
4261 cont = False
4254
4262
4255 # commit
4263 # commit
4256 node = repo.commit(text=message, user=user,
4264 node = repo.commit(text=message, user=user,
4257 date=date, extra=extra, editor=editor)
4265 date=date, extra=extra, editor=editor)
4258 if node is None:
4266 if node is None:
4259 ui.warn(
4267 ui.warn(
4260 _('note: graft of %d:%s created no changes to commit\n') %
4268 _('note: graft of %d:%s created no changes to commit\n') %
4261 (ctx.rev(), ctx))
4269 (ctx.rev(), ctx))
4262
4270
4263 # remove state when we complete successfully
4271 # remove state when we complete successfully
4264 if not opts.get('dry_run'):
4272 if not opts.get('dry_run'):
4265 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4273 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4266
4274
4267 return 0
4275 return 0
4268
4276
4269 @command('grep',
4277 @command('grep',
4270 [('0', 'print0', None, _('end fields with NUL')),
4278 [('0', 'print0', None, _('end fields with NUL')),
4271 ('', 'all', None, _('print all revisions that match')),
4279 ('', 'all', None, _('print all revisions that match')),
4272 ('a', 'text', None, _('treat all files as text')),
4280 ('a', 'text', None, _('treat all files as text')),
4273 ('f', 'follow', None,
4281 ('f', 'follow', None,
4274 _('follow changeset history,'
4282 _('follow changeset history,'
4275 ' or file history across copies and renames')),
4283 ' or file history across copies and renames')),
4276 ('i', 'ignore-case', None, _('ignore case when matching')),
4284 ('i', 'ignore-case', None, _('ignore case when matching')),
4277 ('l', 'files-with-matches', None,
4285 ('l', 'files-with-matches', None,
4278 _('print only filenames and revisions that match')),
4286 _('print only filenames and revisions that match')),
4279 ('n', 'line-number', None, _('print matching line numbers')),
4287 ('n', 'line-number', None, _('print matching line numbers')),
4280 ('r', 'rev', [],
4288 ('r', 'rev', [],
4281 _('only search files changed within revision range'), _('REV')),
4289 _('only search files changed within revision range'), _('REV')),
4282 ('u', 'user', None, _('list the author (long with -v)')),
4290 ('u', 'user', None, _('list the author (long with -v)')),
4283 ('d', 'date', None, _('list the date (short with -q)')),
4291 ('d', 'date', None, _('list the date (short with -q)')),
4284 ] + formatteropts + walkopts,
4292 ] + formatteropts + walkopts,
4285 _('[OPTION]... PATTERN [FILE]...'),
4293 _('[OPTION]... PATTERN [FILE]...'),
4286 inferrepo=True)
4294 inferrepo=True)
4287 def grep(ui, repo, pattern, *pats, **opts):
4295 def grep(ui, repo, pattern, *pats, **opts):
4288 """search for a pattern in specified files and revisions
4296 """search for a pattern in specified files and revisions
4289
4297
4290 Search revisions of files for a regular expression.
4298 Search revisions of files for a regular expression.
4291
4299
4292 This command behaves differently than Unix grep. It only accepts
4300 This command behaves differently than Unix grep. It only accepts
4293 Python/Perl regexps. It searches repository history, not the
4301 Python/Perl regexps. It searches repository history, not the
4294 working directory. It always prints the revision number in which a
4302 working directory. It always prints the revision number in which a
4295 match appears.
4303 match appears.
4296
4304
4297 By default, grep only prints output for the first revision of a
4305 By default, grep only prints output for the first revision of a
4298 file in which it finds a match. To get it to print every revision
4306 file in which it finds a match. To get it to print every revision
4299 that contains a change in match status ("-" for a match that
4307 that contains a change in match status ("-" for a match that
4300 becomes a non-match, or "+" for a non-match that becomes a match),
4308 becomes a non-match, or "+" for a non-match that becomes a match),
4301 use the --all flag.
4309 use the --all flag.
4302
4310
4303 Returns 0 if a match is found, 1 otherwise.
4311 Returns 0 if a match is found, 1 otherwise.
4304 """
4312 """
4305 reflags = re.M
4313 reflags = re.M
4306 if opts.get('ignore_case'):
4314 if opts.get('ignore_case'):
4307 reflags |= re.I
4315 reflags |= re.I
4308 try:
4316 try:
4309 regexp = util.re.compile(pattern, reflags)
4317 regexp = util.re.compile(pattern, reflags)
4310 except re.error as inst:
4318 except re.error as inst:
4311 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4319 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4312 return 1
4320 return 1
4313 sep, eol = ':', '\n'
4321 sep, eol = ':', '\n'
4314 if opts.get('print0'):
4322 if opts.get('print0'):
4315 sep = eol = '\0'
4323 sep = eol = '\0'
4316
4324
4317 getfile = util.lrucachefunc(repo.file)
4325 getfile = util.lrucachefunc(repo.file)
4318
4326
4319 def matchlines(body):
4327 def matchlines(body):
4320 begin = 0
4328 begin = 0
4321 linenum = 0
4329 linenum = 0
4322 while begin < len(body):
4330 while begin < len(body):
4323 match = regexp.search(body, begin)
4331 match = regexp.search(body, begin)
4324 if not match:
4332 if not match:
4325 break
4333 break
4326 mstart, mend = match.span()
4334 mstart, mend = match.span()
4327 linenum += body.count('\n', begin, mstart) + 1
4335 linenum += body.count('\n', begin, mstart) + 1
4328 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4336 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4329 begin = body.find('\n', mend) + 1 or len(body) + 1
4337 begin = body.find('\n', mend) + 1 or len(body) + 1
4330 lend = begin - 1
4338 lend = begin - 1
4331 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4339 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4332
4340
4333 class linestate(object):
4341 class linestate(object):
4334 def __init__(self, line, linenum, colstart, colend):
4342 def __init__(self, line, linenum, colstart, colend):
4335 self.line = line
4343 self.line = line
4336 self.linenum = linenum
4344 self.linenum = linenum
4337 self.colstart = colstart
4345 self.colstart = colstart
4338 self.colend = colend
4346 self.colend = colend
4339
4347
4340 def __hash__(self):
4348 def __hash__(self):
4341 return hash((self.linenum, self.line))
4349 return hash((self.linenum, self.line))
4342
4350
4343 def __eq__(self, other):
4351 def __eq__(self, other):
4344 return self.line == other.line
4352 return self.line == other.line
4345
4353
4346 def findpos(self):
4354 def findpos(self):
4347 """Iterate all (start, end) indices of matches"""
4355 """Iterate all (start, end) indices of matches"""
4348 yield self.colstart, self.colend
4356 yield self.colstart, self.colend
4349 p = self.colend
4357 p = self.colend
4350 while p < len(self.line):
4358 while p < len(self.line):
4351 m = regexp.search(self.line, p)
4359 m = regexp.search(self.line, p)
4352 if not m:
4360 if not m:
4353 break
4361 break
4354 yield m.span()
4362 yield m.span()
4355 p = m.end()
4363 p = m.end()
4356
4364
4357 matches = {}
4365 matches = {}
4358 copies = {}
4366 copies = {}
4359 def grepbody(fn, rev, body):
4367 def grepbody(fn, rev, body):
4360 matches[rev].setdefault(fn, [])
4368 matches[rev].setdefault(fn, [])
4361 m = matches[rev][fn]
4369 m = matches[rev][fn]
4362 for lnum, cstart, cend, line in matchlines(body):
4370 for lnum, cstart, cend, line in matchlines(body):
4363 s = linestate(line, lnum, cstart, cend)
4371 s = linestate(line, lnum, cstart, cend)
4364 m.append(s)
4372 m.append(s)
4365
4373
4366 def difflinestates(a, b):
4374 def difflinestates(a, b):
4367 sm = difflib.SequenceMatcher(None, a, b)
4375 sm = difflib.SequenceMatcher(None, a, b)
4368 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4376 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4369 if tag == 'insert':
4377 if tag == 'insert':
4370 for i in xrange(blo, bhi):
4378 for i in xrange(blo, bhi):
4371 yield ('+', b[i])
4379 yield ('+', b[i])
4372 elif tag == 'delete':
4380 elif tag == 'delete':
4373 for i in xrange(alo, ahi):
4381 for i in xrange(alo, ahi):
4374 yield ('-', a[i])
4382 yield ('-', a[i])
4375 elif tag == 'replace':
4383 elif tag == 'replace':
4376 for i in xrange(alo, ahi):
4384 for i in xrange(alo, ahi):
4377 yield ('-', a[i])
4385 yield ('-', a[i])
4378 for i in xrange(blo, bhi):
4386 for i in xrange(blo, bhi):
4379 yield ('+', b[i])
4387 yield ('+', b[i])
4380
4388
4381 def display(fm, fn, ctx, pstates, states):
4389 def display(fm, fn, ctx, pstates, states):
4382 rev = ctx.rev()
4390 rev = ctx.rev()
4383 if fm:
4391 if fm:
4384 formatuser = str
4392 formatuser = str
4385 else:
4393 else:
4386 formatuser = ui.shortuser
4394 formatuser = ui.shortuser
4387 if ui.quiet:
4395 if ui.quiet:
4388 datefmt = '%Y-%m-%d'
4396 datefmt = '%Y-%m-%d'
4389 else:
4397 else:
4390 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4398 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4391 found = False
4399 found = False
4392 @util.cachefunc
4400 @util.cachefunc
4393 def binary():
4401 def binary():
4394 flog = getfile(fn)
4402 flog = getfile(fn)
4395 return util.binary(flog.read(ctx.filenode(fn)))
4403 return util.binary(flog.read(ctx.filenode(fn)))
4396
4404
4397 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4405 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4398 if opts.get('all'):
4406 if opts.get('all'):
4399 iter = difflinestates(pstates, states)
4407 iter = difflinestates(pstates, states)
4400 else:
4408 else:
4401 iter = [('', l) for l in states]
4409 iter = [('', l) for l in states]
4402 for change, l in iter:
4410 for change, l in iter:
4403 fm.startitem()
4411 fm.startitem()
4404 fm.data(node=fm.hexfunc(ctx.node()))
4412 fm.data(node=fm.hexfunc(ctx.node()))
4405 cols = [
4413 cols = [
4406 ('filename', fn, True),
4414 ('filename', fn, True),
4407 ('rev', rev, True),
4415 ('rev', rev, True),
4408 ('linenumber', l.linenum, opts.get('line_number')),
4416 ('linenumber', l.linenum, opts.get('line_number')),
4409 ]
4417 ]
4410 if opts.get('all'):
4418 if opts.get('all'):
4411 cols.append(('change', change, True))
4419 cols.append(('change', change, True))
4412 cols.extend([
4420 cols.extend([
4413 ('user', formatuser(ctx.user()), opts.get('user')),
4421 ('user', formatuser(ctx.user()), opts.get('user')),
4414 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4422 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4415 ])
4423 ])
4416 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4424 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4417 for name, data, cond in cols:
4425 for name, data, cond in cols:
4418 field = fieldnamemap.get(name, name)
4426 field = fieldnamemap.get(name, name)
4419 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4427 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4420 if cond and name != lastcol:
4428 if cond and name != lastcol:
4421 fm.plain(sep, label='grep.sep')
4429 fm.plain(sep, label='grep.sep')
4422 if not opts.get('files_with_matches'):
4430 if not opts.get('files_with_matches'):
4423 fm.plain(sep, label='grep.sep')
4431 fm.plain(sep, label='grep.sep')
4424 if not opts.get('text') and binary():
4432 if not opts.get('text') and binary():
4425 fm.plain(_(" Binary file matches"))
4433 fm.plain(_(" Binary file matches"))
4426 else:
4434 else:
4427 displaymatches(fm.nested('texts'), l)
4435 displaymatches(fm.nested('texts'), l)
4428 fm.plain(eol)
4436 fm.plain(eol)
4429 found = True
4437 found = True
4430 if opts.get('files_with_matches'):
4438 if opts.get('files_with_matches'):
4431 break
4439 break
4432 return found
4440 return found
4433
4441
4434 def displaymatches(fm, l):
4442 def displaymatches(fm, l):
4435 p = 0
4443 p = 0
4436 for s, e in l.findpos():
4444 for s, e in l.findpos():
4437 if p < s:
4445 if p < s:
4438 fm.startitem()
4446 fm.startitem()
4439 fm.write('text', '%s', l.line[p:s])
4447 fm.write('text', '%s', l.line[p:s])
4440 fm.data(matched=False)
4448 fm.data(matched=False)
4441 fm.startitem()
4449 fm.startitem()
4442 fm.write('text', '%s', l.line[s:e], label='grep.match')
4450 fm.write('text', '%s', l.line[s:e], label='grep.match')
4443 fm.data(matched=True)
4451 fm.data(matched=True)
4444 p = e
4452 p = e
4445 if p < len(l.line):
4453 if p < len(l.line):
4446 fm.startitem()
4454 fm.startitem()
4447 fm.write('text', '%s', l.line[p:])
4455 fm.write('text', '%s', l.line[p:])
4448 fm.data(matched=False)
4456 fm.data(matched=False)
4449 fm.end()
4457 fm.end()
4450
4458
4451 skip = {}
4459 skip = {}
4452 revfiles = {}
4460 revfiles = {}
4453 matchfn = scmutil.match(repo[None], pats, opts)
4461 matchfn = scmutil.match(repo[None], pats, opts)
4454 found = False
4462 found = False
4455 follow = opts.get('follow')
4463 follow = opts.get('follow')
4456
4464
4457 def prep(ctx, fns):
4465 def prep(ctx, fns):
4458 rev = ctx.rev()
4466 rev = ctx.rev()
4459 pctx = ctx.p1()
4467 pctx = ctx.p1()
4460 parent = pctx.rev()
4468 parent = pctx.rev()
4461 matches.setdefault(rev, {})
4469 matches.setdefault(rev, {})
4462 matches.setdefault(parent, {})
4470 matches.setdefault(parent, {})
4463 files = revfiles.setdefault(rev, [])
4471 files = revfiles.setdefault(rev, [])
4464 for fn in fns:
4472 for fn in fns:
4465 flog = getfile(fn)
4473 flog = getfile(fn)
4466 try:
4474 try:
4467 fnode = ctx.filenode(fn)
4475 fnode = ctx.filenode(fn)
4468 except error.LookupError:
4476 except error.LookupError:
4469 continue
4477 continue
4470
4478
4471 copied = flog.renamed(fnode)
4479 copied = flog.renamed(fnode)
4472 copy = follow and copied and copied[0]
4480 copy = follow and copied and copied[0]
4473 if copy:
4481 if copy:
4474 copies.setdefault(rev, {})[fn] = copy
4482 copies.setdefault(rev, {})[fn] = copy
4475 if fn in skip:
4483 if fn in skip:
4476 if copy:
4484 if copy:
4477 skip[copy] = True
4485 skip[copy] = True
4478 continue
4486 continue
4479 files.append(fn)
4487 files.append(fn)
4480
4488
4481 if fn not in matches[rev]:
4489 if fn not in matches[rev]:
4482 grepbody(fn, rev, flog.read(fnode))
4490 grepbody(fn, rev, flog.read(fnode))
4483
4491
4484 pfn = copy or fn
4492 pfn = copy or fn
4485 if pfn not in matches[parent]:
4493 if pfn not in matches[parent]:
4486 try:
4494 try:
4487 fnode = pctx.filenode(pfn)
4495 fnode = pctx.filenode(pfn)
4488 grepbody(pfn, parent, flog.read(fnode))
4496 grepbody(pfn, parent, flog.read(fnode))
4489 except error.LookupError:
4497 except error.LookupError:
4490 pass
4498 pass
4491
4499
4492 fm = ui.formatter('grep', opts)
4500 fm = ui.formatter('grep', opts)
4493 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4501 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4494 rev = ctx.rev()
4502 rev = ctx.rev()
4495 parent = ctx.p1().rev()
4503 parent = ctx.p1().rev()
4496 for fn in sorted(revfiles.get(rev, [])):
4504 for fn in sorted(revfiles.get(rev, [])):
4497 states = matches[rev][fn]
4505 states = matches[rev][fn]
4498 copy = copies.get(rev, {}).get(fn)
4506 copy = copies.get(rev, {}).get(fn)
4499 if fn in skip:
4507 if fn in skip:
4500 if copy:
4508 if copy:
4501 skip[copy] = True
4509 skip[copy] = True
4502 continue
4510 continue
4503 pstates = matches.get(parent, {}).get(copy or fn, [])
4511 pstates = matches.get(parent, {}).get(copy or fn, [])
4504 if pstates or states:
4512 if pstates or states:
4505 r = display(fm, fn, ctx, pstates, states)
4513 r = display(fm, fn, ctx, pstates, states)
4506 found = found or r
4514 found = found or r
4507 if r and not opts.get('all'):
4515 if r and not opts.get('all'):
4508 skip[fn] = True
4516 skip[fn] = True
4509 if copy:
4517 if copy:
4510 skip[copy] = True
4518 skip[copy] = True
4511 del matches[rev]
4519 del matches[rev]
4512 del revfiles[rev]
4520 del revfiles[rev]
4513 fm.end()
4521 fm.end()
4514
4522
4515 return not found
4523 return not found
4516
4524
4517 @command('heads',
4525 @command('heads',
4518 [('r', 'rev', '',
4526 [('r', 'rev', '',
4519 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4527 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4520 ('t', 'topo', False, _('show topological heads only')),
4528 ('t', 'topo', False, _('show topological heads only')),
4521 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4529 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4522 ('c', 'closed', False, _('show normal and closed branch heads')),
4530 ('c', 'closed', False, _('show normal and closed branch heads')),
4523 ] + templateopts,
4531 ] + templateopts,
4524 _('[-ct] [-r STARTREV] [REV]...'))
4532 _('[-ct] [-r STARTREV] [REV]...'))
4525 def heads(ui, repo, *branchrevs, **opts):
4533 def heads(ui, repo, *branchrevs, **opts):
4526 """show branch heads
4534 """show branch heads
4527
4535
4528 With no arguments, show all open branch heads in the repository.
4536 With no arguments, show all open branch heads in the repository.
4529 Branch heads are changesets that have no descendants on the
4537 Branch heads are changesets that have no descendants on the
4530 same branch. They are where development generally takes place and
4538 same branch. They are where development generally takes place and
4531 are the usual targets for update and merge operations.
4539 are the usual targets for update and merge operations.
4532
4540
4533 If one or more REVs are given, only open branch heads on the
4541 If one or more REVs are given, only open branch heads on the
4534 branches associated with the specified changesets are shown. This
4542 branches associated with the specified changesets are shown. This
4535 means that you can use :hg:`heads .` to see the heads on the
4543 means that you can use :hg:`heads .` to see the heads on the
4536 currently checked-out branch.
4544 currently checked-out branch.
4537
4545
4538 If -c/--closed is specified, also show branch heads marked closed
4546 If -c/--closed is specified, also show branch heads marked closed
4539 (see :hg:`commit --close-branch`).
4547 (see :hg:`commit --close-branch`).
4540
4548
4541 If STARTREV is specified, only those heads that are descendants of
4549 If STARTREV is specified, only those heads that are descendants of
4542 STARTREV will be displayed.
4550 STARTREV will be displayed.
4543
4551
4544 If -t/--topo is specified, named branch mechanics will be ignored and only
4552 If -t/--topo is specified, named branch mechanics will be ignored and only
4545 topological heads (changesets with no children) will be shown.
4553 topological heads (changesets with no children) will be shown.
4546
4554
4547 Returns 0 if matching heads are found, 1 if not.
4555 Returns 0 if matching heads are found, 1 if not.
4548 """
4556 """
4549
4557
4550 start = None
4558 start = None
4551 if 'rev' in opts:
4559 if 'rev' in opts:
4552 start = scmutil.revsingle(repo, opts['rev'], None).node()
4560 start = scmutil.revsingle(repo, opts['rev'], None).node()
4553
4561
4554 if opts.get('topo'):
4562 if opts.get('topo'):
4555 heads = [repo[h] for h in repo.heads(start)]
4563 heads = [repo[h] for h in repo.heads(start)]
4556 else:
4564 else:
4557 heads = []
4565 heads = []
4558 for branch in repo.branchmap():
4566 for branch in repo.branchmap():
4559 heads += repo.branchheads(branch, start, opts.get('closed'))
4567 heads += repo.branchheads(branch, start, opts.get('closed'))
4560 heads = [repo[h] for h in heads]
4568 heads = [repo[h] for h in heads]
4561
4569
4562 if branchrevs:
4570 if branchrevs:
4563 branches = set(repo[br].branch() for br in branchrevs)
4571 branches = set(repo[br].branch() for br in branchrevs)
4564 heads = [h for h in heads if h.branch() in branches]
4572 heads = [h for h in heads if h.branch() in branches]
4565
4573
4566 if opts.get('active') and branchrevs:
4574 if opts.get('active') and branchrevs:
4567 dagheads = repo.heads(start)
4575 dagheads = repo.heads(start)
4568 heads = [h for h in heads if h.node() in dagheads]
4576 heads = [h for h in heads if h.node() in dagheads]
4569
4577
4570 if branchrevs:
4578 if branchrevs:
4571 haveheads = set(h.branch() for h in heads)
4579 haveheads = set(h.branch() for h in heads)
4572 if branches - haveheads:
4580 if branches - haveheads:
4573 headless = ', '.join(b for b in branches - haveheads)
4581 headless = ', '.join(b for b in branches - haveheads)
4574 msg = _('no open branch heads found on branches %s')
4582 msg = _('no open branch heads found on branches %s')
4575 if opts.get('rev'):
4583 if opts.get('rev'):
4576 msg += _(' (started at %s)') % opts['rev']
4584 msg += _(' (started at %s)') % opts['rev']
4577 ui.warn((msg + '\n') % headless)
4585 ui.warn((msg + '\n') % headless)
4578
4586
4579 if not heads:
4587 if not heads:
4580 return 1
4588 return 1
4581
4589
4582 heads = sorted(heads, key=lambda x: -x.rev())
4590 heads = sorted(heads, key=lambda x: -x.rev())
4583 displayer = cmdutil.show_changeset(ui, repo, opts)
4591 displayer = cmdutil.show_changeset(ui, repo, opts)
4584 for ctx in heads:
4592 for ctx in heads:
4585 displayer.show(ctx)
4593 displayer.show(ctx)
4586 displayer.close()
4594 displayer.close()
4587
4595
4588 @command('help',
4596 @command('help',
4589 [('e', 'extension', None, _('show only help for extensions')),
4597 [('e', 'extension', None, _('show only help for extensions')),
4590 ('c', 'command', None, _('show only help for commands')),
4598 ('c', 'command', None, _('show only help for commands')),
4591 ('k', 'keyword', None, _('show topics matching keyword')),
4599 ('k', 'keyword', None, _('show topics matching keyword')),
4592 ('s', 'system', [], _('show help for specific platform(s)')),
4600 ('s', 'system', [], _('show help for specific platform(s)')),
4593 ],
4601 ],
4594 _('[-ecks] [TOPIC]'),
4602 _('[-ecks] [TOPIC]'),
4595 norepo=True)
4603 norepo=True)
4596 def help_(ui, name=None, **opts):
4604 def help_(ui, name=None, **opts):
4597 """show help for a given topic or a help overview
4605 """show help for a given topic or a help overview
4598
4606
4599 With no arguments, print a list of commands with short help messages.
4607 With no arguments, print a list of commands with short help messages.
4600
4608
4601 Given a topic, extension, or command name, print help for that
4609 Given a topic, extension, or command name, print help for that
4602 topic.
4610 topic.
4603
4611
4604 Returns 0 if successful.
4612 Returns 0 if successful.
4605 """
4613 """
4606
4614
4607 textwidth = ui.configint('ui', 'textwidth', 78)
4615 textwidth = ui.configint('ui', 'textwidth', 78)
4608 termwidth = ui.termwidth() - 2
4616 termwidth = ui.termwidth() - 2
4609 if textwidth <= 0 or termwidth < textwidth:
4617 if textwidth <= 0 or termwidth < textwidth:
4610 textwidth = termwidth
4618 textwidth = termwidth
4611
4619
4612 keep = opts.get('system') or []
4620 keep = opts.get('system') or []
4613 if len(keep) == 0:
4621 if len(keep) == 0:
4614 if sys.platform.startswith('win'):
4622 if sys.platform.startswith('win'):
4615 keep.append('windows')
4623 keep.append('windows')
4616 elif sys.platform == 'OpenVMS':
4624 elif sys.platform == 'OpenVMS':
4617 keep.append('vms')
4625 keep.append('vms')
4618 elif sys.platform == 'plan9':
4626 elif sys.platform == 'plan9':
4619 keep.append('plan9')
4627 keep.append('plan9')
4620 else:
4628 else:
4621 keep.append('unix')
4629 keep.append('unix')
4622 keep.append(sys.platform.lower())
4630 keep.append(sys.platform.lower())
4623 if ui.verbose:
4631 if ui.verbose:
4624 keep.append('verbose')
4632 keep.append('verbose')
4625
4633
4626 section = None
4634 section = None
4627 subtopic = None
4635 subtopic = None
4628 if name and '.' in name:
4636 if name and '.' in name:
4629 name, remaining = name.split('.', 1)
4637 name, remaining = name.split('.', 1)
4630 remaining = encoding.lower(remaining)
4638 remaining = encoding.lower(remaining)
4631 if '.' in remaining:
4639 if '.' in remaining:
4632 subtopic, section = remaining.split('.', 1)
4640 subtopic, section = remaining.split('.', 1)
4633 else:
4641 else:
4634 if name in help.subtopics:
4642 if name in help.subtopics:
4635 subtopic = remaining
4643 subtopic = remaining
4636 else:
4644 else:
4637 section = remaining
4645 section = remaining
4638
4646
4639 text = help.help_(ui, name, subtopic=subtopic, **opts)
4647 text = help.help_(ui, name, subtopic=subtopic, **opts)
4640
4648
4641 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4649 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4642 section=section)
4650 section=section)
4643
4651
4644 # We could have been given a weird ".foo" section without a name
4652 # We could have been given a weird ".foo" section without a name
4645 # to look for, or we could have simply failed to found "foo.bar"
4653 # to look for, or we could have simply failed to found "foo.bar"
4646 # because bar isn't a section of foo
4654 # because bar isn't a section of foo
4647 if section and not (formatted and name):
4655 if section and not (formatted and name):
4648 raise error.Abort(_("help section not found"))
4656 raise error.Abort(_("help section not found"))
4649
4657
4650 if 'verbose' in pruned:
4658 if 'verbose' in pruned:
4651 keep.append('omitted')
4659 keep.append('omitted')
4652 else:
4660 else:
4653 keep.append('notomitted')
4661 keep.append('notomitted')
4654 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4662 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4655 section=section)
4663 section=section)
4656 ui.write(formatted)
4664 ui.write(formatted)
4657
4665
4658
4666
4659 @command('identify|id',
4667 @command('identify|id',
4660 [('r', 'rev', '',
4668 [('r', 'rev', '',
4661 _('identify the specified revision'), _('REV')),
4669 _('identify the specified revision'), _('REV')),
4662 ('n', 'num', None, _('show local revision number')),
4670 ('n', 'num', None, _('show local revision number')),
4663 ('i', 'id', None, _('show global revision id')),
4671 ('i', 'id', None, _('show global revision id')),
4664 ('b', 'branch', None, _('show branch')),
4672 ('b', 'branch', None, _('show branch')),
4665 ('t', 'tags', None, _('show tags')),
4673 ('t', 'tags', None, _('show tags')),
4666 ('B', 'bookmarks', None, _('show bookmarks')),
4674 ('B', 'bookmarks', None, _('show bookmarks')),
4667 ] + remoteopts,
4675 ] + remoteopts,
4668 _('[-nibtB] [-r REV] [SOURCE]'),
4676 _('[-nibtB] [-r REV] [SOURCE]'),
4669 optionalrepo=True)
4677 optionalrepo=True)
4670 def identify(ui, repo, source=None, rev=None,
4678 def identify(ui, repo, source=None, rev=None,
4671 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4679 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4672 """identify the working directory or specified revision
4680 """identify the working directory or specified revision
4673
4681
4674 Print a summary identifying the repository state at REV using one or
4682 Print a summary identifying the repository state at REV using one or
4675 two parent hash identifiers, followed by a "+" if the working
4683 two parent hash identifiers, followed by a "+" if the working
4676 directory has uncommitted changes, the branch name (if not default),
4684 directory has uncommitted changes, the branch name (if not default),
4677 a list of tags, and a list of bookmarks.
4685 a list of tags, and a list of bookmarks.
4678
4686
4679 When REV is not given, print a summary of the current state of the
4687 When REV is not given, print a summary of the current state of the
4680 repository.
4688 repository.
4681
4689
4682 Specifying a path to a repository root or Mercurial bundle will
4690 Specifying a path to a repository root or Mercurial bundle will
4683 cause lookup to operate on that repository/bundle.
4691 cause lookup to operate on that repository/bundle.
4684
4692
4685 .. container:: verbose
4693 .. container:: verbose
4686
4694
4687 Examples:
4695 Examples:
4688
4696
4689 - generate a build identifier for the working directory::
4697 - generate a build identifier for the working directory::
4690
4698
4691 hg id --id > build-id.dat
4699 hg id --id > build-id.dat
4692
4700
4693 - find the revision corresponding to a tag::
4701 - find the revision corresponding to a tag::
4694
4702
4695 hg id -n -r 1.3
4703 hg id -n -r 1.3
4696
4704
4697 - check the most recent revision of a remote repository::
4705 - check the most recent revision of a remote repository::
4698
4706
4699 hg id -r tip http://selenic.com/hg/
4707 hg id -r tip http://selenic.com/hg/
4700
4708
4701 See :hg:`log` for generating more information about specific revisions,
4709 See :hg:`log` for generating more information about specific revisions,
4702 including full hash identifiers.
4710 including full hash identifiers.
4703
4711
4704 Returns 0 if successful.
4712 Returns 0 if successful.
4705 """
4713 """
4706
4714
4707 if not repo and not source:
4715 if not repo and not source:
4708 raise error.Abort(_("there is no Mercurial repository here "
4716 raise error.Abort(_("there is no Mercurial repository here "
4709 "(.hg not found)"))
4717 "(.hg not found)"))
4710
4718
4711 if ui.debugflag:
4719 if ui.debugflag:
4712 hexfunc = hex
4720 hexfunc = hex
4713 else:
4721 else:
4714 hexfunc = short
4722 hexfunc = short
4715 default = not (num or id or branch or tags or bookmarks)
4723 default = not (num or id or branch or tags or bookmarks)
4716 output = []
4724 output = []
4717 revs = []
4725 revs = []
4718
4726
4719 if source:
4727 if source:
4720 source, branches = hg.parseurl(ui.expandpath(source))
4728 source, branches = hg.parseurl(ui.expandpath(source))
4721 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4729 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4722 repo = peer.local()
4730 repo = peer.local()
4723 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4731 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4724
4732
4725 if not repo:
4733 if not repo:
4726 if num or branch or tags:
4734 if num or branch or tags:
4727 raise error.Abort(
4735 raise error.Abort(
4728 _("can't query remote revision number, branch, or tags"))
4736 _("can't query remote revision number, branch, or tags"))
4729 if not rev and revs:
4737 if not rev and revs:
4730 rev = revs[0]
4738 rev = revs[0]
4731 if not rev:
4739 if not rev:
4732 rev = "tip"
4740 rev = "tip"
4733
4741
4734 remoterev = peer.lookup(rev)
4742 remoterev = peer.lookup(rev)
4735 if default or id:
4743 if default or id:
4736 output = [hexfunc(remoterev)]
4744 output = [hexfunc(remoterev)]
4737
4745
4738 def getbms():
4746 def getbms():
4739 bms = []
4747 bms = []
4740
4748
4741 if 'bookmarks' in peer.listkeys('namespaces'):
4749 if 'bookmarks' in peer.listkeys('namespaces'):
4742 hexremoterev = hex(remoterev)
4750 hexremoterev = hex(remoterev)
4743 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4751 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4744 if bmr == hexremoterev]
4752 if bmr == hexremoterev]
4745
4753
4746 return sorted(bms)
4754 return sorted(bms)
4747
4755
4748 if bookmarks:
4756 if bookmarks:
4749 output.extend(getbms())
4757 output.extend(getbms())
4750 elif default and not ui.quiet:
4758 elif default and not ui.quiet:
4751 # multiple bookmarks for a single parent separated by '/'
4759 # multiple bookmarks for a single parent separated by '/'
4752 bm = '/'.join(getbms())
4760 bm = '/'.join(getbms())
4753 if bm:
4761 if bm:
4754 output.append(bm)
4762 output.append(bm)
4755 else:
4763 else:
4756 ctx = scmutil.revsingle(repo, rev, None)
4764 ctx = scmutil.revsingle(repo, rev, None)
4757
4765
4758 if ctx.rev() is None:
4766 if ctx.rev() is None:
4759 ctx = repo[None]
4767 ctx = repo[None]
4760 parents = ctx.parents()
4768 parents = ctx.parents()
4761 taglist = []
4769 taglist = []
4762 for p in parents:
4770 for p in parents:
4763 taglist.extend(p.tags())
4771 taglist.extend(p.tags())
4764
4772
4765 changed = ""
4773 changed = ""
4766 if default or id or num:
4774 if default or id or num:
4767 if (any(repo.status())
4775 if (any(repo.status())
4768 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4776 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4769 changed = '+'
4777 changed = '+'
4770 if default or id:
4778 if default or id:
4771 output = ["%s%s" %
4779 output = ["%s%s" %
4772 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4780 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4773 if num:
4781 if num:
4774 output.append("%s%s" %
4782 output.append("%s%s" %
4775 ('+'.join([str(p.rev()) for p in parents]), changed))
4783 ('+'.join([str(p.rev()) for p in parents]), changed))
4776 else:
4784 else:
4777 if default or id:
4785 if default or id:
4778 output = [hexfunc(ctx.node())]
4786 output = [hexfunc(ctx.node())]
4779 if num:
4787 if num:
4780 output.append(str(ctx.rev()))
4788 output.append(str(ctx.rev()))
4781 taglist = ctx.tags()
4789 taglist = ctx.tags()
4782
4790
4783 if default and not ui.quiet:
4791 if default and not ui.quiet:
4784 b = ctx.branch()
4792 b = ctx.branch()
4785 if b != 'default':
4793 if b != 'default':
4786 output.append("(%s)" % b)
4794 output.append("(%s)" % b)
4787
4795
4788 # multiple tags for a single parent separated by '/'
4796 # multiple tags for a single parent separated by '/'
4789 t = '/'.join(taglist)
4797 t = '/'.join(taglist)
4790 if t:
4798 if t:
4791 output.append(t)
4799 output.append(t)
4792
4800
4793 # multiple bookmarks for a single parent separated by '/'
4801 # multiple bookmarks for a single parent separated by '/'
4794 bm = '/'.join(ctx.bookmarks())
4802 bm = '/'.join(ctx.bookmarks())
4795 if bm:
4803 if bm:
4796 output.append(bm)
4804 output.append(bm)
4797 else:
4805 else:
4798 if branch:
4806 if branch:
4799 output.append(ctx.branch())
4807 output.append(ctx.branch())
4800
4808
4801 if tags:
4809 if tags:
4802 output.extend(taglist)
4810 output.extend(taglist)
4803
4811
4804 if bookmarks:
4812 if bookmarks:
4805 output.extend(ctx.bookmarks())
4813 output.extend(ctx.bookmarks())
4806
4814
4807 ui.write("%s\n" % ' '.join(output))
4815 ui.write("%s\n" % ' '.join(output))
4808
4816
4809 @command('import|patch',
4817 @command('import|patch',
4810 [('p', 'strip', 1,
4818 [('p', 'strip', 1,
4811 _('directory strip option for patch. This has the same '
4819 _('directory strip option for patch. This has the same '
4812 'meaning as the corresponding patch option'), _('NUM')),
4820 'meaning as the corresponding patch option'), _('NUM')),
4813 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4821 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4814 ('e', 'edit', False, _('invoke editor on commit messages')),
4822 ('e', 'edit', False, _('invoke editor on commit messages')),
4815 ('f', 'force', None,
4823 ('f', 'force', None,
4816 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4824 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4817 ('', 'no-commit', None,
4825 ('', 'no-commit', None,
4818 _("don't commit, just update the working directory")),
4826 _("don't commit, just update the working directory")),
4819 ('', 'bypass', None,
4827 ('', 'bypass', None,
4820 _("apply patch without touching the working directory")),
4828 _("apply patch without touching the working directory")),
4821 ('', 'partial', None,
4829 ('', 'partial', None,
4822 _('commit even if some hunks fail')),
4830 _('commit even if some hunks fail')),
4823 ('', 'exact', None,
4831 ('', 'exact', None,
4824 _('abort if patch would apply lossily')),
4832 _('abort if patch would apply lossily')),
4825 ('', 'prefix', '',
4833 ('', 'prefix', '',
4826 _('apply patch to subdirectory'), _('DIR')),
4834 _('apply patch to subdirectory'), _('DIR')),
4827 ('', 'import-branch', None,
4835 ('', 'import-branch', None,
4828 _('use any branch information in patch (implied by --exact)'))] +
4836 _('use any branch information in patch (implied by --exact)'))] +
4829 commitopts + commitopts2 + similarityopts,
4837 commitopts + commitopts2 + similarityopts,
4830 _('[OPTION]... PATCH...'))
4838 _('[OPTION]... PATCH...'))
4831 def import_(ui, repo, patch1=None, *patches, **opts):
4839 def import_(ui, repo, patch1=None, *patches, **opts):
4832 """import an ordered set of patches
4840 """import an ordered set of patches
4833
4841
4834 Import a list of patches and commit them individually (unless
4842 Import a list of patches and commit them individually (unless
4835 --no-commit is specified).
4843 --no-commit is specified).
4836
4844
4837 To read a patch from standard input, use "-" as the patch name. If
4845 To read a patch from standard input, use "-" as the patch name. If
4838 a URL is specified, the patch will be downloaded from there.
4846 a URL is specified, the patch will be downloaded from there.
4839
4847
4840 Import first applies changes to the working directory (unless
4848 Import first applies changes to the working directory (unless
4841 --bypass is specified), import will abort if there are outstanding
4849 --bypass is specified), import will abort if there are outstanding
4842 changes.
4850 changes.
4843
4851
4844 Use --bypass to apply and commit patches directly to the
4852 Use --bypass to apply and commit patches directly to the
4845 repository, without affecting the working directory. Without
4853 repository, without affecting the working directory. Without
4846 --exact, patches will be applied on top of the working directory
4854 --exact, patches will be applied on top of the working directory
4847 parent revision.
4855 parent revision.
4848
4856
4849 You can import a patch straight from a mail message. Even patches
4857 You can import a patch straight from a mail message. Even patches
4850 as attachments work (to use the body part, it must have type
4858 as attachments work (to use the body part, it must have type
4851 text/plain or text/x-patch). From and Subject headers of email
4859 text/plain or text/x-patch). From and Subject headers of email
4852 message are used as default committer and commit message. All
4860 message are used as default committer and commit message. All
4853 text/plain body parts before first diff are added to the commit
4861 text/plain body parts before first diff are added to the commit
4854 message.
4862 message.
4855
4863
4856 If the imported patch was generated by :hg:`export`, user and
4864 If the imported patch was generated by :hg:`export`, user and
4857 description from patch override values from message headers and
4865 description from patch override values from message headers and
4858 body. Values given on command line with -m/--message and -u/--user
4866 body. Values given on command line with -m/--message and -u/--user
4859 override these.
4867 override these.
4860
4868
4861 If --exact is specified, import will set the working directory to
4869 If --exact is specified, import will set the working directory to
4862 the parent of each patch before applying it, and will abort if the
4870 the parent of each patch before applying it, and will abort if the
4863 resulting changeset has a different ID than the one recorded in
4871 resulting changeset has a different ID than the one recorded in
4864 the patch. This will guard against various ways that portable
4872 the patch. This will guard against various ways that portable
4865 patch formats and mail systems might fail to transfer Mercurial
4873 patch formats and mail systems might fail to transfer Mercurial
4866 data or metadata. See :hg:`bundle` for lossless transmission.
4874 data or metadata. See :hg:`bundle` for lossless transmission.
4867
4875
4868 Use --partial to ensure a changeset will be created from the patch
4876 Use --partial to ensure a changeset will be created from the patch
4869 even if some hunks fail to apply. Hunks that fail to apply will be
4877 even if some hunks fail to apply. Hunks that fail to apply will be
4870 written to a <target-file>.rej file. Conflicts can then be resolved
4878 written to a <target-file>.rej file. Conflicts can then be resolved
4871 by hand before :hg:`commit --amend` is run to update the created
4879 by hand before :hg:`commit --amend` is run to update the created
4872 changeset. This flag exists to let people import patches that
4880 changeset. This flag exists to let people import patches that
4873 partially apply without losing the associated metadata (author,
4881 partially apply without losing the associated metadata (author,
4874 date, description, ...).
4882 date, description, ...).
4875
4883
4876 .. note::
4884 .. note::
4877
4885
4878 When no hunks apply cleanly, :hg:`import --partial` will create
4886 When no hunks apply cleanly, :hg:`import --partial` will create
4879 an empty changeset, importing only the patch metadata.
4887 an empty changeset, importing only the patch metadata.
4880
4888
4881 With -s/--similarity, hg will attempt to discover renames and
4889 With -s/--similarity, hg will attempt to discover renames and
4882 copies in the patch in the same way as :hg:`addremove`.
4890 copies in the patch in the same way as :hg:`addremove`.
4883
4891
4884 It is possible to use external patch programs to perform the patch
4892 It is possible to use external patch programs to perform the patch
4885 by setting the ``ui.patch`` configuration option. For the default
4893 by setting the ``ui.patch`` configuration option. For the default
4886 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4894 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4887 See :hg:`help config` for more information about configuration
4895 See :hg:`help config` for more information about configuration
4888 files and how to use these options.
4896 files and how to use these options.
4889
4897
4890 See :hg:`help dates` for a list of formats valid for -d/--date.
4898 See :hg:`help dates` for a list of formats valid for -d/--date.
4891
4899
4892 .. container:: verbose
4900 .. container:: verbose
4893
4901
4894 Examples:
4902 Examples:
4895
4903
4896 - import a traditional patch from a website and detect renames::
4904 - import a traditional patch from a website and detect renames::
4897
4905
4898 hg import -s 80 http://example.com/bugfix.patch
4906 hg import -s 80 http://example.com/bugfix.patch
4899
4907
4900 - import a changeset from an hgweb server::
4908 - import a changeset from an hgweb server::
4901
4909
4902 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4910 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4903
4911
4904 - import all the patches in an Unix-style mbox::
4912 - import all the patches in an Unix-style mbox::
4905
4913
4906 hg import incoming-patches.mbox
4914 hg import incoming-patches.mbox
4907
4915
4908 - attempt to exactly restore an exported changeset (not always
4916 - attempt to exactly restore an exported changeset (not always
4909 possible)::
4917 possible)::
4910
4918
4911 hg import --exact proposed-fix.patch
4919 hg import --exact proposed-fix.patch
4912
4920
4913 - use an external tool to apply a patch which is too fuzzy for
4921 - use an external tool to apply a patch which is too fuzzy for
4914 the default internal tool.
4922 the default internal tool.
4915
4923
4916 hg import --config ui.patch="patch --merge" fuzzy.patch
4924 hg import --config ui.patch="patch --merge" fuzzy.patch
4917
4925
4918 - change the default fuzzing from 2 to a less strict 7
4926 - change the default fuzzing from 2 to a less strict 7
4919
4927
4920 hg import --config ui.fuzz=7 fuzz.patch
4928 hg import --config ui.fuzz=7 fuzz.patch
4921
4929
4922 Returns 0 on success, 1 on partial success (see --partial).
4930 Returns 0 on success, 1 on partial success (see --partial).
4923 """
4931 """
4924
4932
4925 if not patch1:
4933 if not patch1:
4926 raise error.Abort(_('need at least one patch to import'))
4934 raise error.Abort(_('need at least one patch to import'))
4927
4935
4928 patches = (patch1,) + patches
4936 patches = (patch1,) + patches
4929
4937
4930 date = opts.get('date')
4938 date = opts.get('date')
4931 if date:
4939 if date:
4932 opts['date'] = util.parsedate(date)
4940 opts['date'] = util.parsedate(date)
4933
4941
4934 exact = opts.get('exact')
4942 exact = opts.get('exact')
4935 update = not opts.get('bypass')
4943 update = not opts.get('bypass')
4936 if not update and opts.get('no_commit'):
4944 if not update and opts.get('no_commit'):
4937 raise error.Abort(_('cannot use --no-commit with --bypass'))
4945 raise error.Abort(_('cannot use --no-commit with --bypass'))
4938 try:
4946 try:
4939 sim = float(opts.get('similarity') or 0)
4947 sim = float(opts.get('similarity') or 0)
4940 except ValueError:
4948 except ValueError:
4941 raise error.Abort(_('similarity must be a number'))
4949 raise error.Abort(_('similarity must be a number'))
4942 if sim < 0 or sim > 100:
4950 if sim < 0 or sim > 100:
4943 raise error.Abort(_('similarity must be between 0 and 100'))
4951 raise error.Abort(_('similarity must be between 0 and 100'))
4944 if sim and not update:
4952 if sim and not update:
4945 raise error.Abort(_('cannot use --similarity with --bypass'))
4953 raise error.Abort(_('cannot use --similarity with --bypass'))
4946 if exact:
4954 if exact:
4947 if opts.get('edit'):
4955 if opts.get('edit'):
4948 raise error.Abort(_('cannot use --exact with --edit'))
4956 raise error.Abort(_('cannot use --exact with --edit'))
4949 if opts.get('prefix'):
4957 if opts.get('prefix'):
4950 raise error.Abort(_('cannot use --exact with --prefix'))
4958 raise error.Abort(_('cannot use --exact with --prefix'))
4951
4959
4952 base = opts["base"]
4960 base = opts["base"]
4953 wlock = dsguard = lock = tr = None
4961 wlock = dsguard = lock = tr = None
4954 msgs = []
4962 msgs = []
4955 ret = 0
4963 ret = 0
4956
4964
4957
4965
4958 try:
4966 try:
4959 wlock = repo.wlock()
4967 wlock = repo.wlock()
4960
4968
4961 if update:
4969 if update:
4962 cmdutil.checkunfinished(repo)
4970 cmdutil.checkunfinished(repo)
4963 if (exact or not opts.get('force')):
4971 if (exact or not opts.get('force')):
4964 cmdutil.bailifchanged(repo)
4972 cmdutil.bailifchanged(repo)
4965
4973
4966 if not opts.get('no_commit'):
4974 if not opts.get('no_commit'):
4967 lock = repo.lock()
4975 lock = repo.lock()
4968 tr = repo.transaction('import')
4976 tr = repo.transaction('import')
4969 else:
4977 else:
4970 dsguard = cmdutil.dirstateguard(repo, 'import')
4978 dsguard = cmdutil.dirstateguard(repo, 'import')
4971 parents = repo[None].parents()
4979 parents = repo[None].parents()
4972 for patchurl in patches:
4980 for patchurl in patches:
4973 if patchurl == '-':
4981 if patchurl == '-':
4974 ui.status(_('applying patch from stdin\n'))
4982 ui.status(_('applying patch from stdin\n'))
4975 patchfile = ui.fin
4983 patchfile = ui.fin
4976 patchurl = 'stdin' # for error message
4984 patchurl = 'stdin' # for error message
4977 else:
4985 else:
4978 patchurl = os.path.join(base, patchurl)
4986 patchurl = os.path.join(base, patchurl)
4979 ui.status(_('applying %s\n') % patchurl)
4987 ui.status(_('applying %s\n') % patchurl)
4980 patchfile = hg.openpath(ui, patchurl)
4988 patchfile = hg.openpath(ui, patchurl)
4981
4989
4982 haspatch = False
4990 haspatch = False
4983 for hunk in patch.split(patchfile):
4991 for hunk in patch.split(patchfile):
4984 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4992 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4985 parents, opts,
4993 parents, opts,
4986 msgs, hg.clean)
4994 msgs, hg.clean)
4987 if msg:
4995 if msg:
4988 haspatch = True
4996 haspatch = True
4989 ui.note(msg + '\n')
4997 ui.note(msg + '\n')
4990 if update or exact:
4998 if update or exact:
4991 parents = repo[None].parents()
4999 parents = repo[None].parents()
4992 else:
5000 else:
4993 parents = [repo[node]]
5001 parents = [repo[node]]
4994 if rej:
5002 if rej:
4995 ui.write_err(_("patch applied partially\n"))
5003 ui.write_err(_("patch applied partially\n"))
4996 ui.write_err(_("(fix the .rej files and run "
5004 ui.write_err(_("(fix the .rej files and run "
4997 "`hg commit --amend`)\n"))
5005 "`hg commit --amend`)\n"))
4998 ret = 1
5006 ret = 1
4999 break
5007 break
5000
5008
5001 if not haspatch:
5009 if not haspatch:
5002 raise error.Abort(_('%s: no diffs found') % patchurl)
5010 raise error.Abort(_('%s: no diffs found') % patchurl)
5003
5011
5004 if tr:
5012 if tr:
5005 tr.close()
5013 tr.close()
5006 if msgs:
5014 if msgs:
5007 repo.savecommitmessage('\n* * *\n'.join(msgs))
5015 repo.savecommitmessage('\n* * *\n'.join(msgs))
5008 if dsguard:
5016 if dsguard:
5009 dsguard.close()
5017 dsguard.close()
5010 return ret
5018 return ret
5011 finally:
5019 finally:
5012 if tr:
5020 if tr:
5013 tr.release()
5021 tr.release()
5014 release(lock, dsguard, wlock)
5022 release(lock, dsguard, wlock)
5015
5023
5016 @command('incoming|in',
5024 @command('incoming|in',
5017 [('f', 'force', None,
5025 [('f', 'force', None,
5018 _('run even if remote repository is unrelated')),
5026 _('run even if remote repository is unrelated')),
5019 ('n', 'newest-first', None, _('show newest record first')),
5027 ('n', 'newest-first', None, _('show newest record first')),
5020 ('', 'bundle', '',
5028 ('', 'bundle', '',
5021 _('file to store the bundles into'), _('FILE')),
5029 _('file to store the bundles into'), _('FILE')),
5022 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5030 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5023 ('B', 'bookmarks', False, _("compare bookmarks")),
5031 ('B', 'bookmarks', False, _("compare bookmarks")),
5024 ('b', 'branch', [],
5032 ('b', 'branch', [],
5025 _('a specific branch you would like to pull'), _('BRANCH')),
5033 _('a specific branch you would like to pull'), _('BRANCH')),
5026 ] + logopts + remoteopts + subrepoopts,
5034 ] + logopts + remoteopts + subrepoopts,
5027 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5035 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5028 def incoming(ui, repo, source="default", **opts):
5036 def incoming(ui, repo, source="default", **opts):
5029 """show new changesets found in source
5037 """show new changesets found in source
5030
5038
5031 Show new changesets found in the specified path/URL or the default
5039 Show new changesets found in the specified path/URL or the default
5032 pull location. These are the changesets that would have been pulled
5040 pull location. These are the changesets that would have been pulled
5033 if a pull at the time you issued this command.
5041 if a pull at the time you issued this command.
5034
5042
5035 See pull for valid source format details.
5043 See pull for valid source format details.
5036
5044
5037 .. container:: verbose
5045 .. container:: verbose
5038
5046
5039 With -B/--bookmarks, the result of bookmark comparison between
5047 With -B/--bookmarks, the result of bookmark comparison between
5040 local and remote repositories is displayed. With -v/--verbose,
5048 local and remote repositories is displayed. With -v/--verbose,
5041 status is also displayed for each bookmark like below::
5049 status is also displayed for each bookmark like below::
5042
5050
5043 BM1 01234567890a added
5051 BM1 01234567890a added
5044 BM2 1234567890ab advanced
5052 BM2 1234567890ab advanced
5045 BM3 234567890abc diverged
5053 BM3 234567890abc diverged
5046 BM4 34567890abcd changed
5054 BM4 34567890abcd changed
5047
5055
5048 The action taken locally when pulling depends on the
5056 The action taken locally when pulling depends on the
5049 status of each bookmark:
5057 status of each bookmark:
5050
5058
5051 :``added``: pull will create it
5059 :``added``: pull will create it
5052 :``advanced``: pull will update it
5060 :``advanced``: pull will update it
5053 :``diverged``: pull will create a divergent bookmark
5061 :``diverged``: pull will create a divergent bookmark
5054 :``changed``: result depends on remote changesets
5062 :``changed``: result depends on remote changesets
5055
5063
5056 From the point of view of pulling behavior, bookmark
5064 From the point of view of pulling behavior, bookmark
5057 existing only in the remote repository are treated as ``added``,
5065 existing only in the remote repository are treated as ``added``,
5058 even if it is in fact locally deleted.
5066 even if it is in fact locally deleted.
5059
5067
5060 .. container:: verbose
5068 .. container:: verbose
5061
5069
5062 For remote repository, using --bundle avoids downloading the
5070 For remote repository, using --bundle avoids downloading the
5063 changesets twice if the incoming is followed by a pull.
5071 changesets twice if the incoming is followed by a pull.
5064
5072
5065 Examples:
5073 Examples:
5066
5074
5067 - show incoming changes with patches and full description::
5075 - show incoming changes with patches and full description::
5068
5076
5069 hg incoming -vp
5077 hg incoming -vp
5070
5078
5071 - show incoming changes excluding merges, store a bundle::
5079 - show incoming changes excluding merges, store a bundle::
5072
5080
5073 hg in -vpM --bundle incoming.hg
5081 hg in -vpM --bundle incoming.hg
5074 hg pull incoming.hg
5082 hg pull incoming.hg
5075
5083
5076 - briefly list changes inside a bundle::
5084 - briefly list changes inside a bundle::
5077
5085
5078 hg in changes.hg -T "{desc|firstline}\\n"
5086 hg in changes.hg -T "{desc|firstline}\\n"
5079
5087
5080 Returns 0 if there are incoming changes, 1 otherwise.
5088 Returns 0 if there are incoming changes, 1 otherwise.
5081 """
5089 """
5082 if opts.get('graph'):
5090 if opts.get('graph'):
5083 cmdutil.checkunsupportedgraphflags([], opts)
5091 cmdutil.checkunsupportedgraphflags([], opts)
5084 def display(other, chlist, displayer):
5092 def display(other, chlist, displayer):
5085 revdag = cmdutil.graphrevs(other, chlist, opts)
5093 revdag = cmdutil.graphrevs(other, chlist, opts)
5086 cmdutil.displaygraph(ui, repo, revdag, displayer,
5094 cmdutil.displaygraph(ui, repo, revdag, displayer,
5087 graphmod.asciiedges)
5095 graphmod.asciiedges)
5088
5096
5089 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5097 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5090 return 0
5098 return 0
5091
5099
5092 if opts.get('bundle') and opts.get('subrepos'):
5100 if opts.get('bundle') and opts.get('subrepos'):
5093 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5101 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5094
5102
5095 if opts.get('bookmarks'):
5103 if opts.get('bookmarks'):
5096 source, branches = hg.parseurl(ui.expandpath(source),
5104 source, branches = hg.parseurl(ui.expandpath(source),
5097 opts.get('branch'))
5105 opts.get('branch'))
5098 other = hg.peer(repo, opts, source)
5106 other = hg.peer(repo, opts, source)
5099 if 'bookmarks' not in other.listkeys('namespaces'):
5107 if 'bookmarks' not in other.listkeys('namespaces'):
5100 ui.warn(_("remote doesn't support bookmarks\n"))
5108 ui.warn(_("remote doesn't support bookmarks\n"))
5101 return 0
5109 return 0
5102 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5110 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5103 return bookmarks.incoming(ui, repo, other)
5111 return bookmarks.incoming(ui, repo, other)
5104
5112
5105 repo._subtoppath = ui.expandpath(source)
5113 repo._subtoppath = ui.expandpath(source)
5106 try:
5114 try:
5107 return hg.incoming(ui, repo, source, opts)
5115 return hg.incoming(ui, repo, source, opts)
5108 finally:
5116 finally:
5109 del repo._subtoppath
5117 del repo._subtoppath
5110
5118
5111
5119
5112 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5120 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5113 norepo=True)
5121 norepo=True)
5114 def init(ui, dest=".", **opts):
5122 def init(ui, dest=".", **opts):
5115 """create a new repository in the given directory
5123 """create a new repository in the given directory
5116
5124
5117 Initialize a new repository in the given directory. If the given
5125 Initialize a new repository in the given directory. If the given
5118 directory does not exist, it will be created.
5126 directory does not exist, it will be created.
5119
5127
5120 If no directory is given, the current directory is used.
5128 If no directory is given, the current directory is used.
5121
5129
5122 It is possible to specify an ``ssh://`` URL as the destination.
5130 It is possible to specify an ``ssh://`` URL as the destination.
5123 See :hg:`help urls` for more information.
5131 See :hg:`help urls` for more information.
5124
5132
5125 Returns 0 on success.
5133 Returns 0 on success.
5126 """
5134 """
5127 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5135 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5128
5136
5129 @command('locate',
5137 @command('locate',
5130 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5138 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5131 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5139 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5132 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5140 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5133 ] + walkopts,
5141 ] + walkopts,
5134 _('[OPTION]... [PATTERN]...'))
5142 _('[OPTION]... [PATTERN]...'))
5135 def locate(ui, repo, *pats, **opts):
5143 def locate(ui, repo, *pats, **opts):
5136 """locate files matching specific patterns (DEPRECATED)
5144 """locate files matching specific patterns (DEPRECATED)
5137
5145
5138 Print files under Mercurial control in the working directory whose
5146 Print files under Mercurial control in the working directory whose
5139 names match the given patterns.
5147 names match the given patterns.
5140
5148
5141 By default, this command searches all directories in the working
5149 By default, this command searches all directories in the working
5142 directory. To search just the current directory and its
5150 directory. To search just the current directory and its
5143 subdirectories, use "--include .".
5151 subdirectories, use "--include .".
5144
5152
5145 If no patterns are given to match, this command prints the names
5153 If no patterns are given to match, this command prints the names
5146 of all files under Mercurial control in the working directory.
5154 of all files under Mercurial control in the working directory.
5147
5155
5148 If you want to feed the output of this command into the "xargs"
5156 If you want to feed the output of this command into the "xargs"
5149 command, use the -0 option to both this command and "xargs". This
5157 command, use the -0 option to both this command and "xargs". This
5150 will avoid the problem of "xargs" treating single filenames that
5158 will avoid the problem of "xargs" treating single filenames that
5151 contain whitespace as multiple filenames.
5159 contain whitespace as multiple filenames.
5152
5160
5153 See :hg:`help files` for a more versatile command.
5161 See :hg:`help files` for a more versatile command.
5154
5162
5155 Returns 0 if a match is found, 1 otherwise.
5163 Returns 0 if a match is found, 1 otherwise.
5156 """
5164 """
5157 if opts.get('print0'):
5165 if opts.get('print0'):
5158 end = '\0'
5166 end = '\0'
5159 else:
5167 else:
5160 end = '\n'
5168 end = '\n'
5161 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5169 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5162
5170
5163 ret = 1
5171 ret = 1
5164 ctx = repo[rev]
5172 ctx = repo[rev]
5165 m = scmutil.match(ctx, pats, opts, default='relglob',
5173 m = scmutil.match(ctx, pats, opts, default='relglob',
5166 badfn=lambda x, y: False)
5174 badfn=lambda x, y: False)
5167
5175
5168 for abs in ctx.matches(m):
5176 for abs in ctx.matches(m):
5169 if opts.get('fullpath'):
5177 if opts.get('fullpath'):
5170 ui.write(repo.wjoin(abs), end)
5178 ui.write(repo.wjoin(abs), end)
5171 else:
5179 else:
5172 ui.write(((pats and m.rel(abs)) or abs), end)
5180 ui.write(((pats and m.rel(abs)) or abs), end)
5173 ret = 0
5181 ret = 0
5174
5182
5175 return ret
5183 return ret
5176
5184
5177 @command('^log|history',
5185 @command('^log|history',
5178 [('f', 'follow', None,
5186 [('f', 'follow', None,
5179 _('follow changeset history, or file history across copies and renames')),
5187 _('follow changeset history, or file history across copies and renames')),
5180 ('', 'follow-first', None,
5188 ('', 'follow-first', None,
5181 _('only follow the first parent of merge changesets (DEPRECATED)')),
5189 _('only follow the first parent of merge changesets (DEPRECATED)')),
5182 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5190 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5183 ('C', 'copies', None, _('show copied files')),
5191 ('C', 'copies', None, _('show copied files')),
5184 ('k', 'keyword', [],
5192 ('k', 'keyword', [],
5185 _('do case-insensitive search for a given text'), _('TEXT')),
5193 _('do case-insensitive search for a given text'), _('TEXT')),
5186 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5194 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5187 ('', 'removed', None, _('include revisions where files were removed')),
5195 ('', 'removed', None, _('include revisions where files were removed')),
5188 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5196 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5189 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5197 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5190 ('', 'only-branch', [],
5198 ('', 'only-branch', [],
5191 _('show only changesets within the given named branch (DEPRECATED)'),
5199 _('show only changesets within the given named branch (DEPRECATED)'),
5192 _('BRANCH')),
5200 _('BRANCH')),
5193 ('b', 'branch', [],
5201 ('b', 'branch', [],
5194 _('show changesets within the given named branch'), _('BRANCH')),
5202 _('show changesets within the given named branch'), _('BRANCH')),
5195 ('P', 'prune', [],
5203 ('P', 'prune', [],
5196 _('do not display revision or any of its ancestors'), _('REV')),
5204 _('do not display revision or any of its ancestors'), _('REV')),
5197 ] + logopts + walkopts,
5205 ] + logopts + walkopts,
5198 _('[OPTION]... [FILE]'),
5206 _('[OPTION]... [FILE]'),
5199 inferrepo=True)
5207 inferrepo=True)
5200 def log(ui, repo, *pats, **opts):
5208 def log(ui, repo, *pats, **opts):
5201 """show revision history of entire repository or files
5209 """show revision history of entire repository or files
5202
5210
5203 Print the revision history of the specified files or the entire
5211 Print the revision history of the specified files or the entire
5204 project.
5212 project.
5205
5213
5206 If no revision range is specified, the default is ``tip:0`` unless
5214 If no revision range is specified, the default is ``tip:0`` unless
5207 --follow is set, in which case the working directory parent is
5215 --follow is set, in which case the working directory parent is
5208 used as the starting revision.
5216 used as the starting revision.
5209
5217
5210 File history is shown without following rename or copy history of
5218 File history is shown without following rename or copy history of
5211 files. Use -f/--follow with a filename to follow history across
5219 files. Use -f/--follow with a filename to follow history across
5212 renames and copies. --follow without a filename will only show
5220 renames and copies. --follow without a filename will only show
5213 ancestors or descendants of the starting revision.
5221 ancestors or descendants of the starting revision.
5214
5222
5215 By default this command prints revision number and changeset id,
5223 By default this command prints revision number and changeset id,
5216 tags, non-trivial parents, user, date and time, and a summary for
5224 tags, non-trivial parents, user, date and time, and a summary for
5217 each commit. When the -v/--verbose switch is used, the list of
5225 each commit. When the -v/--verbose switch is used, the list of
5218 changed files and full commit message are shown.
5226 changed files and full commit message are shown.
5219
5227
5220 With --graph the revisions are shown as an ASCII art DAG with the most
5228 With --graph the revisions are shown as an ASCII art DAG with the most
5221 recent changeset at the top.
5229 recent changeset at the top.
5222 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5230 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5223 and '+' represents a fork where the changeset from the lines below is a
5231 and '+' represents a fork where the changeset from the lines below is a
5224 parent of the 'o' merge on the same line.
5232 parent of the 'o' merge on the same line.
5225
5233
5226 .. note::
5234 .. note::
5227
5235
5228 :hg:`log --patch` may generate unexpected diff output for merge
5236 :hg:`log --patch` may generate unexpected diff output for merge
5229 changesets, as it will only compare the merge changeset against
5237 changesets, as it will only compare the merge changeset against
5230 its first parent. Also, only files different from BOTH parents
5238 its first parent. Also, only files different from BOTH parents
5231 will appear in files:.
5239 will appear in files:.
5232
5240
5233 .. note::
5241 .. note::
5234
5242
5235 For performance reasons, :hg:`log FILE` may omit duplicate changes
5243 For performance reasons, :hg:`log FILE` may omit duplicate changes
5236 made on branches and will not show removals or mode changes. To
5244 made on branches and will not show removals or mode changes. To
5237 see all such changes, use the --removed switch.
5245 see all such changes, use the --removed switch.
5238
5246
5239 .. container:: verbose
5247 .. container:: verbose
5240
5248
5241 Some examples:
5249 Some examples:
5242
5250
5243 - changesets with full descriptions and file lists::
5251 - changesets with full descriptions and file lists::
5244
5252
5245 hg log -v
5253 hg log -v
5246
5254
5247 - changesets ancestral to the working directory::
5255 - changesets ancestral to the working directory::
5248
5256
5249 hg log -f
5257 hg log -f
5250
5258
5251 - last 10 commits on the current branch::
5259 - last 10 commits on the current branch::
5252
5260
5253 hg log -l 10 -b .
5261 hg log -l 10 -b .
5254
5262
5255 - changesets showing all modifications of a file, including removals::
5263 - changesets showing all modifications of a file, including removals::
5256
5264
5257 hg log --removed file.c
5265 hg log --removed file.c
5258
5266
5259 - all changesets that touch a directory, with diffs, excluding merges::
5267 - all changesets that touch a directory, with diffs, excluding merges::
5260
5268
5261 hg log -Mp lib/
5269 hg log -Mp lib/
5262
5270
5263 - all revision numbers that match a keyword::
5271 - all revision numbers that match a keyword::
5264
5272
5265 hg log -k bug --template "{rev}\\n"
5273 hg log -k bug --template "{rev}\\n"
5266
5274
5267 - the full hash identifier of the working directory parent::
5275 - the full hash identifier of the working directory parent::
5268
5276
5269 hg log -r . --template "{node}\\n"
5277 hg log -r . --template "{node}\\n"
5270
5278
5271 - list available log templates::
5279 - list available log templates::
5272
5280
5273 hg log -T list
5281 hg log -T list
5274
5282
5275 - check if a given changeset is included in a tagged release::
5283 - check if a given changeset is included in a tagged release::
5276
5284
5277 hg log -r "a21ccf and ancestor(1.9)"
5285 hg log -r "a21ccf and ancestor(1.9)"
5278
5286
5279 - find all changesets by some user in a date range::
5287 - find all changesets by some user in a date range::
5280
5288
5281 hg log -k alice -d "may 2008 to jul 2008"
5289 hg log -k alice -d "may 2008 to jul 2008"
5282
5290
5283 - summary of all changesets after the last tag::
5291 - summary of all changesets after the last tag::
5284
5292
5285 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5293 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5286
5294
5287 See :hg:`help dates` for a list of formats valid for -d/--date.
5295 See :hg:`help dates` for a list of formats valid for -d/--date.
5288
5296
5289 See :hg:`help revisions` and :hg:`help revsets` for more about
5297 See :hg:`help revisions` and :hg:`help revsets` for more about
5290 specifying and ordering revisions.
5298 specifying and ordering revisions.
5291
5299
5292 See :hg:`help templates` for more about pre-packaged styles and
5300 See :hg:`help templates` for more about pre-packaged styles and
5293 specifying custom templates.
5301 specifying custom templates.
5294
5302
5295 Returns 0 on success.
5303 Returns 0 on success.
5296
5304
5297 """
5305 """
5298 if opts.get('follow') and opts.get('rev'):
5306 if opts.get('follow') and opts.get('rev'):
5299 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5307 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5300 del opts['follow']
5308 del opts['follow']
5301
5309
5302 if opts.get('graph'):
5310 if opts.get('graph'):
5303 return cmdutil.graphlog(ui, repo, *pats, **opts)
5311 return cmdutil.graphlog(ui, repo, *pats, **opts)
5304
5312
5305 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5313 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5306 limit = cmdutil.loglimit(opts)
5314 limit = cmdutil.loglimit(opts)
5307 count = 0
5315 count = 0
5308
5316
5309 getrenamed = None
5317 getrenamed = None
5310 if opts.get('copies'):
5318 if opts.get('copies'):
5311 endrev = None
5319 endrev = None
5312 if opts.get('rev'):
5320 if opts.get('rev'):
5313 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5321 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5314 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5322 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5315
5323
5316 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5324 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5317 for rev in revs:
5325 for rev in revs:
5318 if count == limit:
5326 if count == limit:
5319 break
5327 break
5320 ctx = repo[rev]
5328 ctx = repo[rev]
5321 copies = None
5329 copies = None
5322 if getrenamed is not None and rev:
5330 if getrenamed is not None and rev:
5323 copies = []
5331 copies = []
5324 for fn in ctx.files():
5332 for fn in ctx.files():
5325 rename = getrenamed(fn, rev)
5333 rename = getrenamed(fn, rev)
5326 if rename:
5334 if rename:
5327 copies.append((fn, rename[0]))
5335 copies.append((fn, rename[0]))
5328 if filematcher:
5336 if filematcher:
5329 revmatchfn = filematcher(ctx.rev())
5337 revmatchfn = filematcher(ctx.rev())
5330 else:
5338 else:
5331 revmatchfn = None
5339 revmatchfn = None
5332 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5340 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5333 if displayer.flush(ctx):
5341 if displayer.flush(ctx):
5334 count += 1
5342 count += 1
5335
5343
5336 displayer.close()
5344 displayer.close()
5337
5345
5338 @command('manifest',
5346 @command('manifest',
5339 [('r', 'rev', '', _('revision to display'), _('REV')),
5347 [('r', 'rev', '', _('revision to display'), _('REV')),
5340 ('', 'all', False, _("list files from all revisions"))]
5348 ('', 'all', False, _("list files from all revisions"))]
5341 + formatteropts,
5349 + formatteropts,
5342 _('[-r REV]'))
5350 _('[-r REV]'))
5343 def manifest(ui, repo, node=None, rev=None, **opts):
5351 def manifest(ui, repo, node=None, rev=None, **opts):
5344 """output the current or given revision of the project manifest
5352 """output the current or given revision of the project manifest
5345
5353
5346 Print a list of version controlled files for the given revision.
5354 Print a list of version controlled files for the given revision.
5347 If no revision is given, the first parent of the working directory
5355 If no revision is given, the first parent of the working directory
5348 is used, or the null revision if no revision is checked out.
5356 is used, or the null revision if no revision is checked out.
5349
5357
5350 With -v, print file permissions, symlink and executable bits.
5358 With -v, print file permissions, symlink and executable bits.
5351 With --debug, print file revision hashes.
5359 With --debug, print file revision hashes.
5352
5360
5353 If option --all is specified, the list of all files from all revisions
5361 If option --all is specified, the list of all files from all revisions
5354 is printed. This includes deleted and renamed files.
5362 is printed. This includes deleted and renamed files.
5355
5363
5356 Returns 0 on success.
5364 Returns 0 on success.
5357 """
5365 """
5358
5366
5359 fm = ui.formatter('manifest', opts)
5367 fm = ui.formatter('manifest', opts)
5360
5368
5361 if opts.get('all'):
5369 if opts.get('all'):
5362 if rev or node:
5370 if rev or node:
5363 raise error.Abort(_("can't specify a revision with --all"))
5371 raise error.Abort(_("can't specify a revision with --all"))
5364
5372
5365 res = []
5373 res = []
5366 prefix = "data/"
5374 prefix = "data/"
5367 suffix = ".i"
5375 suffix = ".i"
5368 plen = len(prefix)
5376 plen = len(prefix)
5369 slen = len(suffix)
5377 slen = len(suffix)
5370 with repo.lock():
5378 with repo.lock():
5371 for fn, b, size in repo.store.datafiles():
5379 for fn, b, size in repo.store.datafiles():
5372 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5380 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5373 res.append(fn[plen:-slen])
5381 res.append(fn[plen:-slen])
5374 for f in res:
5382 for f in res:
5375 fm.startitem()
5383 fm.startitem()
5376 fm.write("path", '%s\n', f)
5384 fm.write("path", '%s\n', f)
5377 fm.end()
5385 fm.end()
5378 return
5386 return
5379
5387
5380 if rev and node:
5388 if rev and node:
5381 raise error.Abort(_("please specify just one revision"))
5389 raise error.Abort(_("please specify just one revision"))
5382
5390
5383 if not node:
5391 if not node:
5384 node = rev
5392 node = rev
5385
5393
5386 char = {'l': '@', 'x': '*', '': ''}
5394 char = {'l': '@', 'x': '*', '': ''}
5387 mode = {'l': '644', 'x': '755', '': '644'}
5395 mode = {'l': '644', 'x': '755', '': '644'}
5388 ctx = scmutil.revsingle(repo, node)
5396 ctx = scmutil.revsingle(repo, node)
5389 mf = ctx.manifest()
5397 mf = ctx.manifest()
5390 for f in ctx:
5398 for f in ctx:
5391 fm.startitem()
5399 fm.startitem()
5392 fl = ctx[f].flags()
5400 fl = ctx[f].flags()
5393 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5401 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5394 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5402 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5395 fm.write('path', '%s\n', f)
5403 fm.write('path', '%s\n', f)
5396 fm.end()
5404 fm.end()
5397
5405
5398 @command('^merge',
5406 @command('^merge',
5399 [('f', 'force', None,
5407 [('f', 'force', None,
5400 _('force a merge including outstanding changes (DEPRECATED)')),
5408 _('force a merge including outstanding changes (DEPRECATED)')),
5401 ('r', 'rev', '', _('revision to merge'), _('REV')),
5409 ('r', 'rev', '', _('revision to merge'), _('REV')),
5402 ('P', 'preview', None,
5410 ('P', 'preview', None,
5403 _('review revisions to merge (no merge is performed)'))
5411 _('review revisions to merge (no merge is performed)'))
5404 ] + mergetoolopts,
5412 ] + mergetoolopts,
5405 _('[-P] [[-r] REV]'))
5413 _('[-P] [[-r] REV]'))
5406 def merge(ui, repo, node=None, **opts):
5414 def merge(ui, repo, node=None, **opts):
5407 """merge another revision into working directory
5415 """merge another revision into working directory
5408
5416
5409 The current working directory is updated with all changes made in
5417 The current working directory is updated with all changes made in
5410 the requested revision since the last common predecessor revision.
5418 the requested revision since the last common predecessor revision.
5411
5419
5412 Files that changed between either parent are marked as changed for
5420 Files that changed between either parent are marked as changed for
5413 the next commit and a commit must be performed before any further
5421 the next commit and a commit must be performed before any further
5414 updates to the repository are allowed. The next commit will have
5422 updates to the repository are allowed. The next commit will have
5415 two parents.
5423 two parents.
5416
5424
5417 ``--tool`` can be used to specify the merge tool used for file
5425 ``--tool`` can be used to specify the merge tool used for file
5418 merges. It overrides the HGMERGE environment variable and your
5426 merges. It overrides the HGMERGE environment variable and your
5419 configuration files. See :hg:`help merge-tools` for options.
5427 configuration files. See :hg:`help merge-tools` for options.
5420
5428
5421 If no revision is specified, the working directory's parent is a
5429 If no revision is specified, the working directory's parent is a
5422 head revision, and the current branch contains exactly one other
5430 head revision, and the current branch contains exactly one other
5423 head, the other head is merged with by default. Otherwise, an
5431 head, the other head is merged with by default. Otherwise, an
5424 explicit revision with which to merge with must be provided.
5432 explicit revision with which to merge with must be provided.
5425
5433
5426 See :hg:`help resolve` for information on handling file conflicts.
5434 See :hg:`help resolve` for information on handling file conflicts.
5427
5435
5428 To undo an uncommitted merge, use :hg:`update --clean .` which
5436 To undo an uncommitted merge, use :hg:`update --clean .` which
5429 will check out a clean copy of the original merge parent, losing
5437 will check out a clean copy of the original merge parent, losing
5430 all changes.
5438 all changes.
5431
5439
5432 Returns 0 on success, 1 if there are unresolved files.
5440 Returns 0 on success, 1 if there are unresolved files.
5433 """
5441 """
5434
5442
5435 if opts.get('rev') and node:
5443 if opts.get('rev') and node:
5436 raise error.Abort(_("please specify just one revision"))
5444 raise error.Abort(_("please specify just one revision"))
5437 if not node:
5445 if not node:
5438 node = opts.get('rev')
5446 node = opts.get('rev')
5439
5447
5440 if node:
5448 if node:
5441 node = scmutil.revsingle(repo, node).node()
5449 node = scmutil.revsingle(repo, node).node()
5442
5450
5443 if not node:
5451 if not node:
5444 node = repo[destutil.destmerge(repo)].node()
5452 node = repo[destutil.destmerge(repo)].node()
5445
5453
5446 if opts.get('preview'):
5454 if opts.get('preview'):
5447 # find nodes that are ancestors of p2 but not of p1
5455 # find nodes that are ancestors of p2 but not of p1
5448 p1 = repo.lookup('.')
5456 p1 = repo.lookup('.')
5449 p2 = repo.lookup(node)
5457 p2 = repo.lookup(node)
5450 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5458 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5451
5459
5452 displayer = cmdutil.show_changeset(ui, repo, opts)
5460 displayer = cmdutil.show_changeset(ui, repo, opts)
5453 for node in nodes:
5461 for node in nodes:
5454 displayer.show(repo[node])
5462 displayer.show(repo[node])
5455 displayer.close()
5463 displayer.close()
5456 return 0
5464 return 0
5457
5465
5458 try:
5466 try:
5459 # ui.forcemerge is an internal variable, do not document
5467 # ui.forcemerge is an internal variable, do not document
5460 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5468 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5461 force = opts.get('force')
5469 force = opts.get('force')
5462 return hg.merge(repo, node, force=force, mergeforce=force)
5470 return hg.merge(repo, node, force=force, mergeforce=force)
5463 finally:
5471 finally:
5464 ui.setconfig('ui', 'forcemerge', '', 'merge')
5472 ui.setconfig('ui', 'forcemerge', '', 'merge')
5465
5473
5466 @command('outgoing|out',
5474 @command('outgoing|out',
5467 [('f', 'force', None, _('run even when the destination is unrelated')),
5475 [('f', 'force', None, _('run even when the destination is unrelated')),
5468 ('r', 'rev', [],
5476 ('r', 'rev', [],
5469 _('a changeset intended to be included in the destination'), _('REV')),
5477 _('a changeset intended to be included in the destination'), _('REV')),
5470 ('n', 'newest-first', None, _('show newest record first')),
5478 ('n', 'newest-first', None, _('show newest record first')),
5471 ('B', 'bookmarks', False, _('compare bookmarks')),
5479 ('B', 'bookmarks', False, _('compare bookmarks')),
5472 ('b', 'branch', [], _('a specific branch you would like to push'),
5480 ('b', 'branch', [], _('a specific branch you would like to push'),
5473 _('BRANCH')),
5481 _('BRANCH')),
5474 ] + logopts + remoteopts + subrepoopts,
5482 ] + logopts + remoteopts + subrepoopts,
5475 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5483 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5476 def outgoing(ui, repo, dest=None, **opts):
5484 def outgoing(ui, repo, dest=None, **opts):
5477 """show changesets not found in the destination
5485 """show changesets not found in the destination
5478
5486
5479 Show changesets not found in the specified destination repository
5487 Show changesets not found in the specified destination repository
5480 or the default push location. These are the changesets that would
5488 or the default push location. These are the changesets that would
5481 be pushed if a push was requested.
5489 be pushed if a push was requested.
5482
5490
5483 See pull for details of valid destination formats.
5491 See pull for details of valid destination formats.
5484
5492
5485 .. container:: verbose
5493 .. container:: verbose
5486
5494
5487 With -B/--bookmarks, the result of bookmark comparison between
5495 With -B/--bookmarks, the result of bookmark comparison between
5488 local and remote repositories is displayed. With -v/--verbose,
5496 local and remote repositories is displayed. With -v/--verbose,
5489 status is also displayed for each bookmark like below::
5497 status is also displayed for each bookmark like below::
5490
5498
5491 BM1 01234567890a added
5499 BM1 01234567890a added
5492 BM2 deleted
5500 BM2 deleted
5493 BM3 234567890abc advanced
5501 BM3 234567890abc advanced
5494 BM4 34567890abcd diverged
5502 BM4 34567890abcd diverged
5495 BM5 4567890abcde changed
5503 BM5 4567890abcde changed
5496
5504
5497 The action taken when pushing depends on the
5505 The action taken when pushing depends on the
5498 status of each bookmark:
5506 status of each bookmark:
5499
5507
5500 :``added``: push with ``-B`` will create it
5508 :``added``: push with ``-B`` will create it
5501 :``deleted``: push with ``-B`` will delete it
5509 :``deleted``: push with ``-B`` will delete it
5502 :``advanced``: push will update it
5510 :``advanced``: push will update it
5503 :``diverged``: push with ``-B`` will update it
5511 :``diverged``: push with ``-B`` will update it
5504 :``changed``: push with ``-B`` will update it
5512 :``changed``: push with ``-B`` will update it
5505
5513
5506 From the point of view of pushing behavior, bookmarks
5514 From the point of view of pushing behavior, bookmarks
5507 existing only in the remote repository are treated as
5515 existing only in the remote repository are treated as
5508 ``deleted``, even if it is in fact added remotely.
5516 ``deleted``, even if it is in fact added remotely.
5509
5517
5510 Returns 0 if there are outgoing changes, 1 otherwise.
5518 Returns 0 if there are outgoing changes, 1 otherwise.
5511 """
5519 """
5512 if opts.get('graph'):
5520 if opts.get('graph'):
5513 cmdutil.checkunsupportedgraphflags([], opts)
5521 cmdutil.checkunsupportedgraphflags([], opts)
5514 o, other = hg._outgoing(ui, repo, dest, opts)
5522 o, other = hg._outgoing(ui, repo, dest, opts)
5515 if not o:
5523 if not o:
5516 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5524 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5517 return
5525 return
5518
5526
5519 revdag = cmdutil.graphrevs(repo, o, opts)
5527 revdag = cmdutil.graphrevs(repo, o, opts)
5520 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5528 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5521 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5529 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5522 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5530 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5523 return 0
5531 return 0
5524
5532
5525 if opts.get('bookmarks'):
5533 if opts.get('bookmarks'):
5526 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5534 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5527 dest, branches = hg.parseurl(dest, opts.get('branch'))
5535 dest, branches = hg.parseurl(dest, opts.get('branch'))
5528 other = hg.peer(repo, opts, dest)
5536 other = hg.peer(repo, opts, dest)
5529 if 'bookmarks' not in other.listkeys('namespaces'):
5537 if 'bookmarks' not in other.listkeys('namespaces'):
5530 ui.warn(_("remote doesn't support bookmarks\n"))
5538 ui.warn(_("remote doesn't support bookmarks\n"))
5531 return 0
5539 return 0
5532 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5540 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5533 return bookmarks.outgoing(ui, repo, other)
5541 return bookmarks.outgoing(ui, repo, other)
5534
5542
5535 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5543 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5536 try:
5544 try:
5537 return hg.outgoing(ui, repo, dest, opts)
5545 return hg.outgoing(ui, repo, dest, opts)
5538 finally:
5546 finally:
5539 del repo._subtoppath
5547 del repo._subtoppath
5540
5548
5541 @command('parents',
5549 @command('parents',
5542 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5550 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5543 ] + templateopts,
5551 ] + templateopts,
5544 _('[-r REV] [FILE]'),
5552 _('[-r REV] [FILE]'),
5545 inferrepo=True)
5553 inferrepo=True)
5546 def parents(ui, repo, file_=None, **opts):
5554 def parents(ui, repo, file_=None, **opts):
5547 """show the parents of the working directory or revision (DEPRECATED)
5555 """show the parents of the working directory or revision (DEPRECATED)
5548
5556
5549 Print the working directory's parent revisions. If a revision is
5557 Print the working directory's parent revisions. If a revision is
5550 given via -r/--rev, the parent of that revision will be printed.
5558 given via -r/--rev, the parent of that revision will be printed.
5551 If a file argument is given, the revision in which the file was
5559 If a file argument is given, the revision in which the file was
5552 last changed (before the working directory revision or the
5560 last changed (before the working directory revision or the
5553 argument to --rev if given) is printed.
5561 argument to --rev if given) is printed.
5554
5562
5555 This command is equivalent to::
5563 This command is equivalent to::
5556
5564
5557 hg log -r "p1()+p2()" or
5565 hg log -r "p1()+p2()" or
5558 hg log -r "p1(REV)+p2(REV)" or
5566 hg log -r "p1(REV)+p2(REV)" or
5559 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5567 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5560 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5568 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5561
5569
5562 See :hg:`summary` and :hg:`help revsets` for related information.
5570 See :hg:`summary` and :hg:`help revsets` for related information.
5563
5571
5564 Returns 0 on success.
5572 Returns 0 on success.
5565 """
5573 """
5566
5574
5567 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5575 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5568
5576
5569 if file_:
5577 if file_:
5570 m = scmutil.match(ctx, (file_,), opts)
5578 m = scmutil.match(ctx, (file_,), opts)
5571 if m.anypats() or len(m.files()) != 1:
5579 if m.anypats() or len(m.files()) != 1:
5572 raise error.Abort(_('can only specify an explicit filename'))
5580 raise error.Abort(_('can only specify an explicit filename'))
5573 file_ = m.files()[0]
5581 file_ = m.files()[0]
5574 filenodes = []
5582 filenodes = []
5575 for cp in ctx.parents():
5583 for cp in ctx.parents():
5576 if not cp:
5584 if not cp:
5577 continue
5585 continue
5578 try:
5586 try:
5579 filenodes.append(cp.filenode(file_))
5587 filenodes.append(cp.filenode(file_))
5580 except error.LookupError:
5588 except error.LookupError:
5581 pass
5589 pass
5582 if not filenodes:
5590 if not filenodes:
5583 raise error.Abort(_("'%s' not found in manifest!") % file_)
5591 raise error.Abort(_("'%s' not found in manifest!") % file_)
5584 p = []
5592 p = []
5585 for fn in filenodes:
5593 for fn in filenodes:
5586 fctx = repo.filectx(file_, fileid=fn)
5594 fctx = repo.filectx(file_, fileid=fn)
5587 p.append(fctx.node())
5595 p.append(fctx.node())
5588 else:
5596 else:
5589 p = [cp.node() for cp in ctx.parents()]
5597 p = [cp.node() for cp in ctx.parents()]
5590
5598
5591 displayer = cmdutil.show_changeset(ui, repo, opts)
5599 displayer = cmdutil.show_changeset(ui, repo, opts)
5592 for n in p:
5600 for n in p:
5593 if n != nullid:
5601 if n != nullid:
5594 displayer.show(repo[n])
5602 displayer.show(repo[n])
5595 displayer.close()
5603 displayer.close()
5596
5604
5597 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5605 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5598 def paths(ui, repo, search=None, **opts):
5606 def paths(ui, repo, search=None, **opts):
5599 """show aliases for remote repositories
5607 """show aliases for remote repositories
5600
5608
5601 Show definition of symbolic path name NAME. If no name is given,
5609 Show definition of symbolic path name NAME. If no name is given,
5602 show definition of all available names.
5610 show definition of all available names.
5603
5611
5604 Option -q/--quiet suppresses all output when searching for NAME
5612 Option -q/--quiet suppresses all output when searching for NAME
5605 and shows only the path names when listing all definitions.
5613 and shows only the path names when listing all definitions.
5606
5614
5607 Path names are defined in the [paths] section of your
5615 Path names are defined in the [paths] section of your
5608 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5616 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5609 repository, ``.hg/hgrc`` is used, too.
5617 repository, ``.hg/hgrc`` is used, too.
5610
5618
5611 The path names ``default`` and ``default-push`` have a special
5619 The path names ``default`` and ``default-push`` have a special
5612 meaning. When performing a push or pull operation, they are used
5620 meaning. When performing a push or pull operation, they are used
5613 as fallbacks if no location is specified on the command-line.
5621 as fallbacks if no location is specified on the command-line.
5614 When ``default-push`` is set, it will be used for push and
5622 When ``default-push`` is set, it will be used for push and
5615 ``default`` will be used for pull; otherwise ``default`` is used
5623 ``default`` will be used for pull; otherwise ``default`` is used
5616 as the fallback for both. When cloning a repository, the clone
5624 as the fallback for both. When cloning a repository, the clone
5617 source is written as ``default`` in ``.hg/hgrc``.
5625 source is written as ``default`` in ``.hg/hgrc``.
5618
5626
5619 .. note::
5627 .. note::
5620
5628
5621 ``default`` and ``default-push`` apply to all inbound (e.g.
5629 ``default`` and ``default-push`` apply to all inbound (e.g.
5622 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5630 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5623 and :hg:`bundle`) operations.
5631 and :hg:`bundle`) operations.
5624
5632
5625 See :hg:`help urls` for more information.
5633 See :hg:`help urls` for more information.
5626
5634
5627 Returns 0 on success.
5635 Returns 0 on success.
5628 """
5636 """
5629 if search:
5637 if search:
5630 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5638 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5631 if name == search]
5639 if name == search]
5632 else:
5640 else:
5633 pathitems = sorted(ui.paths.iteritems())
5641 pathitems = sorted(ui.paths.iteritems())
5634
5642
5635 fm = ui.formatter('paths', opts)
5643 fm = ui.formatter('paths', opts)
5636 if fm:
5644 if fm:
5637 hidepassword = str
5645 hidepassword = str
5638 else:
5646 else:
5639 hidepassword = util.hidepassword
5647 hidepassword = util.hidepassword
5640 if ui.quiet:
5648 if ui.quiet:
5641 namefmt = '%s\n'
5649 namefmt = '%s\n'
5642 else:
5650 else:
5643 namefmt = '%s = '
5651 namefmt = '%s = '
5644 showsubopts = not search and not ui.quiet
5652 showsubopts = not search and not ui.quiet
5645
5653
5646 for name, path in pathitems:
5654 for name, path in pathitems:
5647 fm.startitem()
5655 fm.startitem()
5648 fm.condwrite(not search, 'name', namefmt, name)
5656 fm.condwrite(not search, 'name', namefmt, name)
5649 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5657 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5650 for subopt, value in sorted(path.suboptions.items()):
5658 for subopt, value in sorted(path.suboptions.items()):
5651 assert subopt not in ('name', 'url')
5659 assert subopt not in ('name', 'url')
5652 if showsubopts:
5660 if showsubopts:
5653 fm.plain('%s:%s = ' % (name, subopt))
5661 fm.plain('%s:%s = ' % (name, subopt))
5654 fm.condwrite(showsubopts, subopt, '%s\n', value)
5662 fm.condwrite(showsubopts, subopt, '%s\n', value)
5655
5663
5656 fm.end()
5664 fm.end()
5657
5665
5658 if search and not pathitems:
5666 if search and not pathitems:
5659 if not ui.quiet:
5667 if not ui.quiet:
5660 ui.warn(_("not found!\n"))
5668 ui.warn(_("not found!\n"))
5661 return 1
5669 return 1
5662 else:
5670 else:
5663 return 0
5671 return 0
5664
5672
5665 @command('phase',
5673 @command('phase',
5666 [('p', 'public', False, _('set changeset phase to public')),
5674 [('p', 'public', False, _('set changeset phase to public')),
5667 ('d', 'draft', False, _('set changeset phase to draft')),
5675 ('d', 'draft', False, _('set changeset phase to draft')),
5668 ('s', 'secret', False, _('set changeset phase to secret')),
5676 ('s', 'secret', False, _('set changeset phase to secret')),
5669 ('f', 'force', False, _('allow to move boundary backward')),
5677 ('f', 'force', False, _('allow to move boundary backward')),
5670 ('r', 'rev', [], _('target revision'), _('REV')),
5678 ('r', 'rev', [], _('target revision'), _('REV')),
5671 ],
5679 ],
5672 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5680 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5673 def phase(ui, repo, *revs, **opts):
5681 def phase(ui, repo, *revs, **opts):
5674 """set or show the current phase name
5682 """set or show the current phase name
5675
5683
5676 With no argument, show the phase name of the current revision(s).
5684 With no argument, show the phase name of the current revision(s).
5677
5685
5678 With one of -p/--public, -d/--draft or -s/--secret, change the
5686 With one of -p/--public, -d/--draft or -s/--secret, change the
5679 phase value of the specified revisions.
5687 phase value of the specified revisions.
5680
5688
5681 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5689 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5682 lower phase to an higher phase. Phases are ordered as follows::
5690 lower phase to an higher phase. Phases are ordered as follows::
5683
5691
5684 public < draft < secret
5692 public < draft < secret
5685
5693
5686 Returns 0 on success, 1 if some phases could not be changed.
5694 Returns 0 on success, 1 if some phases could not be changed.
5687
5695
5688 (For more information about the phases concept, see :hg:`help phases`.)
5696 (For more information about the phases concept, see :hg:`help phases`.)
5689 """
5697 """
5690 # search for a unique phase argument
5698 # search for a unique phase argument
5691 targetphase = None
5699 targetphase = None
5692 for idx, name in enumerate(phases.phasenames):
5700 for idx, name in enumerate(phases.phasenames):
5693 if opts[name]:
5701 if opts[name]:
5694 if targetphase is not None:
5702 if targetphase is not None:
5695 raise error.Abort(_('only one phase can be specified'))
5703 raise error.Abort(_('only one phase can be specified'))
5696 targetphase = idx
5704 targetphase = idx
5697
5705
5698 # look for specified revision
5706 # look for specified revision
5699 revs = list(revs)
5707 revs = list(revs)
5700 revs.extend(opts['rev'])
5708 revs.extend(opts['rev'])
5701 if not revs:
5709 if not revs:
5702 # display both parents as the second parent phase can influence
5710 # display both parents as the second parent phase can influence
5703 # the phase of a merge commit
5711 # the phase of a merge commit
5704 revs = [c.rev() for c in repo[None].parents()]
5712 revs = [c.rev() for c in repo[None].parents()]
5705
5713
5706 revs = scmutil.revrange(repo, revs)
5714 revs = scmutil.revrange(repo, revs)
5707
5715
5708 lock = None
5716 lock = None
5709 ret = 0
5717 ret = 0
5710 if targetphase is None:
5718 if targetphase is None:
5711 # display
5719 # display
5712 for r in revs:
5720 for r in revs:
5713 ctx = repo[r]
5721 ctx = repo[r]
5714 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5722 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5715 else:
5723 else:
5716 tr = None
5724 tr = None
5717 lock = repo.lock()
5725 lock = repo.lock()
5718 try:
5726 try:
5719 tr = repo.transaction("phase")
5727 tr = repo.transaction("phase")
5720 # set phase
5728 # set phase
5721 if not revs:
5729 if not revs:
5722 raise error.Abort(_('empty revision set'))
5730 raise error.Abort(_('empty revision set'))
5723 nodes = [repo[r].node() for r in revs]
5731 nodes = [repo[r].node() for r in revs]
5724 # moving revision from public to draft may hide them
5732 # moving revision from public to draft may hide them
5725 # We have to check result on an unfiltered repository
5733 # We have to check result on an unfiltered repository
5726 unfi = repo.unfiltered()
5734 unfi = repo.unfiltered()
5727 getphase = unfi._phasecache.phase
5735 getphase = unfi._phasecache.phase
5728 olddata = [getphase(unfi, r) for r in unfi]
5736 olddata = [getphase(unfi, r) for r in unfi]
5729 phases.advanceboundary(repo, tr, targetphase, nodes)
5737 phases.advanceboundary(repo, tr, targetphase, nodes)
5730 if opts['force']:
5738 if opts['force']:
5731 phases.retractboundary(repo, tr, targetphase, nodes)
5739 phases.retractboundary(repo, tr, targetphase, nodes)
5732 tr.close()
5740 tr.close()
5733 finally:
5741 finally:
5734 if tr is not None:
5742 if tr is not None:
5735 tr.release()
5743 tr.release()
5736 lock.release()
5744 lock.release()
5737 getphase = unfi._phasecache.phase
5745 getphase = unfi._phasecache.phase
5738 newdata = [getphase(unfi, r) for r in unfi]
5746 newdata = [getphase(unfi, r) for r in unfi]
5739 changes = sum(newdata[r] != olddata[r] for r in unfi)
5747 changes = sum(newdata[r] != olddata[r] for r in unfi)
5740 cl = unfi.changelog
5748 cl = unfi.changelog
5741 rejected = [n for n in nodes
5749 rejected = [n for n in nodes
5742 if newdata[cl.rev(n)] < targetphase]
5750 if newdata[cl.rev(n)] < targetphase]
5743 if rejected:
5751 if rejected:
5744 ui.warn(_('cannot move %i changesets to a higher '
5752 ui.warn(_('cannot move %i changesets to a higher '
5745 'phase, use --force\n') % len(rejected))
5753 'phase, use --force\n') % len(rejected))
5746 ret = 1
5754 ret = 1
5747 if changes:
5755 if changes:
5748 msg = _('phase changed for %i changesets\n') % changes
5756 msg = _('phase changed for %i changesets\n') % changes
5749 if ret:
5757 if ret:
5750 ui.status(msg)
5758 ui.status(msg)
5751 else:
5759 else:
5752 ui.note(msg)
5760 ui.note(msg)
5753 else:
5761 else:
5754 ui.warn(_('no phases changed\n'))
5762 ui.warn(_('no phases changed\n'))
5755 return ret
5763 return ret
5756
5764
5757 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5765 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5758 """Run after a changegroup has been added via pull/unbundle
5766 """Run after a changegroup has been added via pull/unbundle
5759
5767
5760 This takes arguments below:
5768 This takes arguments below:
5761
5769
5762 :modheads: change of heads by pull/unbundle
5770 :modheads: change of heads by pull/unbundle
5763 :optupdate: updating working directory is needed or not
5771 :optupdate: updating working directory is needed or not
5764 :checkout: update destination revision (or None to default destination)
5772 :checkout: update destination revision (or None to default destination)
5765 :brev: a name, which might be a bookmark to be activated after updating
5773 :brev: a name, which might be a bookmark to be activated after updating
5766 """
5774 """
5767 if modheads == 0:
5775 if modheads == 0:
5768 return
5776 return
5769 if optupdate:
5777 if optupdate:
5770 try:
5778 try:
5771 return hg.updatetotally(ui, repo, checkout, brev)
5779 return hg.updatetotally(ui, repo, checkout, brev)
5772 except error.UpdateAbort as inst:
5780 except error.UpdateAbort as inst:
5773 msg = _("not updating: %s") % str(inst)
5781 msg = _("not updating: %s") % str(inst)
5774 hint = inst.hint
5782 hint = inst.hint
5775 raise error.UpdateAbort(msg, hint=hint)
5783 raise error.UpdateAbort(msg, hint=hint)
5776 if modheads > 1:
5784 if modheads > 1:
5777 currentbranchheads = len(repo.branchheads())
5785 currentbranchheads = len(repo.branchheads())
5778 if currentbranchheads == modheads:
5786 if currentbranchheads == modheads:
5779 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5787 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5780 elif currentbranchheads > 1:
5788 elif currentbranchheads > 1:
5781 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5789 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5782 "merge)\n"))
5790 "merge)\n"))
5783 else:
5791 else:
5784 ui.status(_("(run 'hg heads' to see heads)\n"))
5792 ui.status(_("(run 'hg heads' to see heads)\n"))
5785 else:
5793 else:
5786 ui.status(_("(run 'hg update' to get a working copy)\n"))
5794 ui.status(_("(run 'hg update' to get a working copy)\n"))
5787
5795
5788 @command('^pull',
5796 @command('^pull',
5789 [('u', 'update', None,
5797 [('u', 'update', None,
5790 _('update to new branch head if changesets were pulled')),
5798 _('update to new branch head if changesets were pulled')),
5791 ('f', 'force', None, _('run even when remote repository is unrelated')),
5799 ('f', 'force', None, _('run even when remote repository is unrelated')),
5792 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5800 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5793 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5801 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5794 ('b', 'branch', [], _('a specific branch you would like to pull'),
5802 ('b', 'branch', [], _('a specific branch you would like to pull'),
5795 _('BRANCH')),
5803 _('BRANCH')),
5796 ] + remoteopts,
5804 ] + remoteopts,
5797 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5805 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5798 def pull(ui, repo, source="default", **opts):
5806 def pull(ui, repo, source="default", **opts):
5799 """pull changes from the specified source
5807 """pull changes from the specified source
5800
5808
5801 Pull changes from a remote repository to a local one.
5809 Pull changes from a remote repository to a local one.
5802
5810
5803 This finds all changes from the repository at the specified path
5811 This finds all changes from the repository at the specified path
5804 or URL and adds them to a local repository (the current one unless
5812 or URL and adds them to a local repository (the current one unless
5805 -R is specified). By default, this does not update the copy of the
5813 -R is specified). By default, this does not update the copy of the
5806 project in the working directory.
5814 project in the working directory.
5807
5815
5808 Use :hg:`incoming` if you want to see what would have been added
5816 Use :hg:`incoming` if you want to see what would have been added
5809 by a pull at the time you issued this command. If you then decide
5817 by a pull at the time you issued this command. If you then decide
5810 to add those changes to the repository, you should use :hg:`pull
5818 to add those changes to the repository, you should use :hg:`pull
5811 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5819 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5812
5820
5813 If SOURCE is omitted, the 'default' path will be used.
5821 If SOURCE is omitted, the 'default' path will be used.
5814 See :hg:`help urls` for more information.
5822 See :hg:`help urls` for more information.
5815
5823
5816 Specifying bookmark as ``.`` is equivalent to specifying the active
5824 Specifying bookmark as ``.`` is equivalent to specifying the active
5817 bookmark's name.
5825 bookmark's name.
5818
5826
5819 Returns 0 on success, 1 if an update had unresolved files.
5827 Returns 0 on success, 1 if an update had unresolved files.
5820 """
5828 """
5821 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5829 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5822 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5830 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5823 other = hg.peer(repo, opts, source)
5831 other = hg.peer(repo, opts, source)
5824 try:
5832 try:
5825 revs, checkout = hg.addbranchrevs(repo, other, branches,
5833 revs, checkout = hg.addbranchrevs(repo, other, branches,
5826 opts.get('rev'))
5834 opts.get('rev'))
5827
5835
5828
5836
5829 pullopargs = {}
5837 pullopargs = {}
5830 if opts.get('bookmark'):
5838 if opts.get('bookmark'):
5831 if not revs:
5839 if not revs:
5832 revs = []
5840 revs = []
5833 # The list of bookmark used here is not the one used to actually
5841 # The list of bookmark used here is not the one used to actually
5834 # update the bookmark name. This can result in the revision pulled
5842 # update the bookmark name. This can result in the revision pulled
5835 # not ending up with the name of the bookmark because of a race
5843 # not ending up with the name of the bookmark because of a race
5836 # condition on the server. (See issue 4689 for details)
5844 # condition on the server. (See issue 4689 for details)
5837 remotebookmarks = other.listkeys('bookmarks')
5845 remotebookmarks = other.listkeys('bookmarks')
5838 pullopargs['remotebookmarks'] = remotebookmarks
5846 pullopargs['remotebookmarks'] = remotebookmarks
5839 for b in opts['bookmark']:
5847 for b in opts['bookmark']:
5840 b = repo._bookmarks.expandname(b)
5848 b = repo._bookmarks.expandname(b)
5841 if b not in remotebookmarks:
5849 if b not in remotebookmarks:
5842 raise error.Abort(_('remote bookmark %s not found!') % b)
5850 raise error.Abort(_('remote bookmark %s not found!') % b)
5843 revs.append(remotebookmarks[b])
5851 revs.append(remotebookmarks[b])
5844
5852
5845 if revs:
5853 if revs:
5846 try:
5854 try:
5847 # When 'rev' is a bookmark name, we cannot guarantee that it
5855 # When 'rev' is a bookmark name, we cannot guarantee that it
5848 # will be updated with that name because of a race condition
5856 # will be updated with that name because of a race condition
5849 # server side. (See issue 4689 for details)
5857 # server side. (See issue 4689 for details)
5850 oldrevs = revs
5858 oldrevs = revs
5851 revs = [] # actually, nodes
5859 revs = [] # actually, nodes
5852 for r in oldrevs:
5860 for r in oldrevs:
5853 node = other.lookup(r)
5861 node = other.lookup(r)
5854 revs.append(node)
5862 revs.append(node)
5855 if r == checkout:
5863 if r == checkout:
5856 checkout = node
5864 checkout = node
5857 except error.CapabilityError:
5865 except error.CapabilityError:
5858 err = _("other repository doesn't support revision lookup, "
5866 err = _("other repository doesn't support revision lookup, "
5859 "so a rev cannot be specified.")
5867 "so a rev cannot be specified.")
5860 raise error.Abort(err)
5868 raise error.Abort(err)
5861
5869
5862 pullopargs.update(opts.get('opargs', {}))
5870 pullopargs.update(opts.get('opargs', {}))
5863 modheads = exchange.pull(repo, other, heads=revs,
5871 modheads = exchange.pull(repo, other, heads=revs,
5864 force=opts.get('force'),
5872 force=opts.get('force'),
5865 bookmarks=opts.get('bookmark', ()),
5873 bookmarks=opts.get('bookmark', ()),
5866 opargs=pullopargs).cgresult
5874 opargs=pullopargs).cgresult
5867
5875
5868 # brev is a name, which might be a bookmark to be activated at
5876 # brev is a name, which might be a bookmark to be activated at
5869 # the end of the update. In other words, it is an explicit
5877 # the end of the update. In other words, it is an explicit
5870 # destination of the update
5878 # destination of the update
5871 brev = None
5879 brev = None
5872
5880
5873 if checkout:
5881 if checkout:
5874 checkout = str(repo.changelog.rev(checkout))
5882 checkout = str(repo.changelog.rev(checkout))
5875
5883
5876 # order below depends on implementation of
5884 # order below depends on implementation of
5877 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5885 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5878 # because 'checkout' is determined without it.
5886 # because 'checkout' is determined without it.
5879 if opts.get('rev'):
5887 if opts.get('rev'):
5880 brev = opts['rev'][0]
5888 brev = opts['rev'][0]
5881 elif opts.get('branch'):
5889 elif opts.get('branch'):
5882 brev = opts['branch'][0]
5890 brev = opts['branch'][0]
5883 else:
5891 else:
5884 brev = branches[0]
5892 brev = branches[0]
5885 repo._subtoppath = source
5893 repo._subtoppath = source
5886 try:
5894 try:
5887 ret = postincoming(ui, repo, modheads, opts.get('update'),
5895 ret = postincoming(ui, repo, modheads, opts.get('update'),
5888 checkout, brev)
5896 checkout, brev)
5889
5897
5890 finally:
5898 finally:
5891 del repo._subtoppath
5899 del repo._subtoppath
5892
5900
5893 finally:
5901 finally:
5894 other.close()
5902 other.close()
5895 return ret
5903 return ret
5896
5904
5897 @command('^push',
5905 @command('^push',
5898 [('f', 'force', None, _('force push')),
5906 [('f', 'force', None, _('force push')),
5899 ('r', 'rev', [],
5907 ('r', 'rev', [],
5900 _('a changeset intended to be included in the destination'),
5908 _('a changeset intended to be included in the destination'),
5901 _('REV')),
5909 _('REV')),
5902 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5910 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5903 ('b', 'branch', [],
5911 ('b', 'branch', [],
5904 _('a specific branch you would like to push'), _('BRANCH')),
5912 _('a specific branch you would like to push'), _('BRANCH')),
5905 ('', 'new-branch', False, _('allow pushing a new branch')),
5913 ('', 'new-branch', False, _('allow pushing a new branch')),
5906 ] + remoteopts,
5914 ] + remoteopts,
5907 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5915 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5908 def push(ui, repo, dest=None, **opts):
5916 def push(ui, repo, dest=None, **opts):
5909 """push changes to the specified destination
5917 """push changes to the specified destination
5910
5918
5911 Push changesets from the local repository to the specified
5919 Push changesets from the local repository to the specified
5912 destination.
5920 destination.
5913
5921
5914 This operation is symmetrical to pull: it is identical to a pull
5922 This operation is symmetrical to pull: it is identical to a pull
5915 in the destination repository from the current one.
5923 in the destination repository from the current one.
5916
5924
5917 By default, push will not allow creation of new heads at the
5925 By default, push will not allow creation of new heads at the
5918 destination, since multiple heads would make it unclear which head
5926 destination, since multiple heads would make it unclear which head
5919 to use. In this situation, it is recommended to pull and merge
5927 to use. In this situation, it is recommended to pull and merge
5920 before pushing.
5928 before pushing.
5921
5929
5922 Use --new-branch if you want to allow push to create a new named
5930 Use --new-branch if you want to allow push to create a new named
5923 branch that is not present at the destination. This allows you to
5931 branch that is not present at the destination. This allows you to
5924 only create a new branch without forcing other changes.
5932 only create a new branch without forcing other changes.
5925
5933
5926 .. note::
5934 .. note::
5927
5935
5928 Extra care should be taken with the -f/--force option,
5936 Extra care should be taken with the -f/--force option,
5929 which will push all new heads on all branches, an action which will
5937 which will push all new heads on all branches, an action which will
5930 almost always cause confusion for collaborators.
5938 almost always cause confusion for collaborators.
5931
5939
5932 If -r/--rev is used, the specified revision and all its ancestors
5940 If -r/--rev is used, the specified revision and all its ancestors
5933 will be pushed to the remote repository.
5941 will be pushed to the remote repository.
5934
5942
5935 If -B/--bookmark is used, the specified bookmarked revision, its
5943 If -B/--bookmark is used, the specified bookmarked revision, its
5936 ancestors, and the bookmark will be pushed to the remote
5944 ancestors, and the bookmark will be pushed to the remote
5937 repository. Specifying ``.`` is equivalent to specifying the active
5945 repository. Specifying ``.`` is equivalent to specifying the active
5938 bookmark's name.
5946 bookmark's name.
5939
5947
5940 Please see :hg:`help urls` for important details about ``ssh://``
5948 Please see :hg:`help urls` for important details about ``ssh://``
5941 URLs. If DESTINATION is omitted, a default path will be used.
5949 URLs. If DESTINATION is omitted, a default path will be used.
5942
5950
5943 Returns 0 if push was successful, 1 if nothing to push.
5951 Returns 0 if push was successful, 1 if nothing to push.
5944 """
5952 """
5945
5953
5946 if opts.get('bookmark'):
5954 if opts.get('bookmark'):
5947 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5955 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5948 for b in opts['bookmark']:
5956 for b in opts['bookmark']:
5949 # translate -B options to -r so changesets get pushed
5957 # translate -B options to -r so changesets get pushed
5950 b = repo._bookmarks.expandname(b)
5958 b = repo._bookmarks.expandname(b)
5951 if b in repo._bookmarks:
5959 if b in repo._bookmarks:
5952 opts.setdefault('rev', []).append(b)
5960 opts.setdefault('rev', []).append(b)
5953 else:
5961 else:
5954 # if we try to push a deleted bookmark, translate it to null
5962 # if we try to push a deleted bookmark, translate it to null
5955 # this lets simultaneous -r, -b options continue working
5963 # this lets simultaneous -r, -b options continue working
5956 opts.setdefault('rev', []).append("null")
5964 opts.setdefault('rev', []).append("null")
5957
5965
5958 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5966 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5959 if not path:
5967 if not path:
5960 raise error.Abort(_('default repository not configured!'),
5968 raise error.Abort(_('default repository not configured!'),
5961 hint=_('see the "path" section in "hg help config"'))
5969 hint=_('see the "path" section in "hg help config"'))
5962 dest = path.pushloc or path.loc
5970 dest = path.pushloc or path.loc
5963 branches = (path.branch, opts.get('branch') or [])
5971 branches = (path.branch, opts.get('branch') or [])
5964 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5972 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5965 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5973 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5966 other = hg.peer(repo, opts, dest)
5974 other = hg.peer(repo, opts, dest)
5967
5975
5968 if revs:
5976 if revs:
5969 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5977 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5970 if not revs:
5978 if not revs:
5971 raise error.Abort(_("specified revisions evaluate to an empty set"),
5979 raise error.Abort(_("specified revisions evaluate to an empty set"),
5972 hint=_("use different revision arguments"))
5980 hint=_("use different revision arguments"))
5973 elif path.pushrev:
5981 elif path.pushrev:
5974 # It doesn't make any sense to specify ancestor revisions. So limit
5982 # It doesn't make any sense to specify ancestor revisions. So limit
5975 # to DAG heads to make discovery simpler.
5983 # to DAG heads to make discovery simpler.
5976 expr = revset.formatspec('heads(%r)', path.pushrev)
5984 expr = revset.formatspec('heads(%r)', path.pushrev)
5977 revs = scmutil.revrange(repo, [expr])
5985 revs = scmutil.revrange(repo, [expr])
5978 revs = [repo[rev].node() for rev in revs]
5986 revs = [repo[rev].node() for rev in revs]
5979 if not revs:
5987 if not revs:
5980 raise error.Abort(_('default push revset for path evaluates to an '
5988 raise error.Abort(_('default push revset for path evaluates to an '
5981 'empty set'))
5989 'empty set'))
5982
5990
5983 repo._subtoppath = dest
5991 repo._subtoppath = dest
5984 try:
5992 try:
5985 # push subrepos depth-first for coherent ordering
5993 # push subrepos depth-first for coherent ordering
5986 c = repo['']
5994 c = repo['']
5987 subs = c.substate # only repos that are committed
5995 subs = c.substate # only repos that are committed
5988 for s in sorted(subs):
5996 for s in sorted(subs):
5989 result = c.sub(s).push(opts)
5997 result = c.sub(s).push(opts)
5990 if result == 0:
5998 if result == 0:
5991 return not result
5999 return not result
5992 finally:
6000 finally:
5993 del repo._subtoppath
6001 del repo._subtoppath
5994 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
6002 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5995 newbranch=opts.get('new_branch'),
6003 newbranch=opts.get('new_branch'),
5996 bookmarks=opts.get('bookmark', ()),
6004 bookmarks=opts.get('bookmark', ()),
5997 opargs=opts.get('opargs'))
6005 opargs=opts.get('opargs'))
5998
6006
5999 result = not pushop.cgresult
6007 result = not pushop.cgresult
6000
6008
6001 if pushop.bkresult is not None:
6009 if pushop.bkresult is not None:
6002 if pushop.bkresult == 2:
6010 if pushop.bkresult == 2:
6003 result = 2
6011 result = 2
6004 elif not result and pushop.bkresult:
6012 elif not result and pushop.bkresult:
6005 result = 2
6013 result = 2
6006
6014
6007 return result
6015 return result
6008
6016
6009 @command('recover', [])
6017 @command('recover', [])
6010 def recover(ui, repo):
6018 def recover(ui, repo):
6011 """roll back an interrupted transaction
6019 """roll back an interrupted transaction
6012
6020
6013 Recover from an interrupted commit or pull.
6021 Recover from an interrupted commit or pull.
6014
6022
6015 This command tries to fix the repository status after an
6023 This command tries to fix the repository status after an
6016 interrupted operation. It should only be necessary when Mercurial
6024 interrupted operation. It should only be necessary when Mercurial
6017 suggests it.
6025 suggests it.
6018
6026
6019 Returns 0 if successful, 1 if nothing to recover or verify fails.
6027 Returns 0 if successful, 1 if nothing to recover or verify fails.
6020 """
6028 """
6021 if repo.recover():
6029 if repo.recover():
6022 return hg.verify(repo)
6030 return hg.verify(repo)
6023 return 1
6031 return 1
6024
6032
6025 @command('^remove|rm',
6033 @command('^remove|rm',
6026 [('A', 'after', None, _('record delete for missing files')),
6034 [('A', 'after', None, _('record delete for missing files')),
6027 ('f', 'force', None,
6035 ('f', 'force', None,
6028 _('forget added files, delete modified files')),
6036 _('forget added files, delete modified files')),
6029 ] + subrepoopts + walkopts,
6037 ] + subrepoopts + walkopts,
6030 _('[OPTION]... FILE...'),
6038 _('[OPTION]... FILE...'),
6031 inferrepo=True)
6039 inferrepo=True)
6032 def remove(ui, repo, *pats, **opts):
6040 def remove(ui, repo, *pats, **opts):
6033 """remove the specified files on the next commit
6041 """remove the specified files on the next commit
6034
6042
6035 Schedule the indicated files for removal from the current branch.
6043 Schedule the indicated files for removal from the current branch.
6036
6044
6037 This command schedules the files to be removed at the next commit.
6045 This command schedules the files to be removed at the next commit.
6038 To undo a remove before that, see :hg:`revert`. To undo added
6046 To undo a remove before that, see :hg:`revert`. To undo added
6039 files, see :hg:`forget`.
6047 files, see :hg:`forget`.
6040
6048
6041 .. container:: verbose
6049 .. container:: verbose
6042
6050
6043 -A/--after can be used to remove only files that have already
6051 -A/--after can be used to remove only files that have already
6044 been deleted, -f/--force can be used to force deletion, and -Af
6052 been deleted, -f/--force can be used to force deletion, and -Af
6045 can be used to remove files from the next revision without
6053 can be used to remove files from the next revision without
6046 deleting them from the working directory.
6054 deleting them from the working directory.
6047
6055
6048 The following table details the behavior of remove for different
6056 The following table details the behavior of remove for different
6049 file states (columns) and option combinations (rows). The file
6057 file states (columns) and option combinations (rows). The file
6050 states are Added [A], Clean [C], Modified [M] and Missing [!]
6058 states are Added [A], Clean [C], Modified [M] and Missing [!]
6051 (as reported by :hg:`status`). The actions are Warn, Remove
6059 (as reported by :hg:`status`). The actions are Warn, Remove
6052 (from branch) and Delete (from disk):
6060 (from branch) and Delete (from disk):
6053
6061
6054 ========= == == == ==
6062 ========= == == == ==
6055 opt/state A C M !
6063 opt/state A C M !
6056 ========= == == == ==
6064 ========= == == == ==
6057 none W RD W R
6065 none W RD W R
6058 -f R RD RD R
6066 -f R RD RD R
6059 -A W W W R
6067 -A W W W R
6060 -Af R R R R
6068 -Af R R R R
6061 ========= == == == ==
6069 ========= == == == ==
6062
6070
6063 .. note::
6071 .. note::
6064
6072
6065 :hg:`remove` never deletes files in Added [A] state from the
6073 :hg:`remove` never deletes files in Added [A] state from the
6066 working directory, not even if ``--force`` is specified.
6074 working directory, not even if ``--force`` is specified.
6067
6075
6068 Returns 0 on success, 1 if any warnings encountered.
6076 Returns 0 on success, 1 if any warnings encountered.
6069 """
6077 """
6070
6078
6071 after, force = opts.get('after'), opts.get('force')
6079 after, force = opts.get('after'), opts.get('force')
6072 if not pats and not after:
6080 if not pats and not after:
6073 raise error.Abort(_('no files specified'))
6081 raise error.Abort(_('no files specified'))
6074
6082
6075 m = scmutil.match(repo[None], pats, opts)
6083 m = scmutil.match(repo[None], pats, opts)
6076 subrepos = opts.get('subrepos')
6084 subrepos = opts.get('subrepos')
6077 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6085 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6078
6086
6079 @command('rename|move|mv',
6087 @command('rename|move|mv',
6080 [('A', 'after', None, _('record a rename that has already occurred')),
6088 [('A', 'after', None, _('record a rename that has already occurred')),
6081 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6089 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6082 ] + walkopts + dryrunopts,
6090 ] + walkopts + dryrunopts,
6083 _('[OPTION]... SOURCE... DEST'))
6091 _('[OPTION]... SOURCE... DEST'))
6084 def rename(ui, repo, *pats, **opts):
6092 def rename(ui, repo, *pats, **opts):
6085 """rename files; equivalent of copy + remove
6093 """rename files; equivalent of copy + remove
6086
6094
6087 Mark dest as copies of sources; mark sources for deletion. If dest
6095 Mark dest as copies of sources; mark sources for deletion. If dest
6088 is a directory, copies are put in that directory. If dest is a
6096 is a directory, copies are put in that directory. If dest is a
6089 file, there can only be one source.
6097 file, there can only be one source.
6090
6098
6091 By default, this command copies the contents of files as they
6099 By default, this command copies the contents of files as they
6092 exist in the working directory. If invoked with -A/--after, the
6100 exist in the working directory. If invoked with -A/--after, the
6093 operation is recorded, but no copying is performed.
6101 operation is recorded, but no copying is performed.
6094
6102
6095 This command takes effect at the next commit. To undo a rename
6103 This command takes effect at the next commit. To undo a rename
6096 before that, see :hg:`revert`.
6104 before that, see :hg:`revert`.
6097
6105
6098 Returns 0 on success, 1 if errors are encountered.
6106 Returns 0 on success, 1 if errors are encountered.
6099 """
6107 """
6100 with repo.wlock(False):
6108 with repo.wlock(False):
6101 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6109 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6102
6110
6103 @command('resolve',
6111 @command('resolve',
6104 [('a', 'all', None, _('select all unresolved files')),
6112 [('a', 'all', None, _('select all unresolved files')),
6105 ('l', 'list', None, _('list state of files needing merge')),
6113 ('l', 'list', None, _('list state of files needing merge')),
6106 ('m', 'mark', None, _('mark files as resolved')),
6114 ('m', 'mark', None, _('mark files as resolved')),
6107 ('u', 'unmark', None, _('mark files as unresolved')),
6115 ('u', 'unmark', None, _('mark files as unresolved')),
6108 ('n', 'no-status', None, _('hide status prefix'))]
6116 ('n', 'no-status', None, _('hide status prefix'))]
6109 + mergetoolopts + walkopts + formatteropts,
6117 + mergetoolopts + walkopts + formatteropts,
6110 _('[OPTION]... [FILE]...'),
6118 _('[OPTION]... [FILE]...'),
6111 inferrepo=True)
6119 inferrepo=True)
6112 def resolve(ui, repo, *pats, **opts):
6120 def resolve(ui, repo, *pats, **opts):
6113 """redo merges or set/view the merge status of files
6121 """redo merges or set/view the merge status of files
6114
6122
6115 Merges with unresolved conflicts are often the result of
6123 Merges with unresolved conflicts are often the result of
6116 non-interactive merging using the ``internal:merge`` configuration
6124 non-interactive merging using the ``internal:merge`` configuration
6117 setting, or a command-line merge tool like ``diff3``. The resolve
6125 setting, or a command-line merge tool like ``diff3``. The resolve
6118 command is used to manage the files involved in a merge, after
6126 command is used to manage the files involved in a merge, after
6119 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6127 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6120 working directory must have two parents). See :hg:`help
6128 working directory must have two parents). See :hg:`help
6121 merge-tools` for information on configuring merge tools.
6129 merge-tools` for information on configuring merge tools.
6122
6130
6123 The resolve command can be used in the following ways:
6131 The resolve command can be used in the following ways:
6124
6132
6125 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6133 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6126 files, discarding any previous merge attempts. Re-merging is not
6134 files, discarding any previous merge attempts. Re-merging is not
6127 performed for files already marked as resolved. Use ``--all/-a``
6135 performed for files already marked as resolved. Use ``--all/-a``
6128 to select all unresolved files. ``--tool`` can be used to specify
6136 to select all unresolved files. ``--tool`` can be used to specify
6129 the merge tool used for the given files. It overrides the HGMERGE
6137 the merge tool used for the given files. It overrides the HGMERGE
6130 environment variable and your configuration files. Previous file
6138 environment variable and your configuration files. Previous file
6131 contents are saved with a ``.orig`` suffix.
6139 contents are saved with a ``.orig`` suffix.
6132
6140
6133 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6141 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6134 (e.g. after having manually fixed-up the files). The default is
6142 (e.g. after having manually fixed-up the files). The default is
6135 to mark all unresolved files.
6143 to mark all unresolved files.
6136
6144
6137 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6145 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6138 default is to mark all resolved files.
6146 default is to mark all resolved files.
6139
6147
6140 - :hg:`resolve -l`: list files which had or still have conflicts.
6148 - :hg:`resolve -l`: list files which had or still have conflicts.
6141 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6149 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6142
6150
6143 .. note::
6151 .. note::
6144
6152
6145 Mercurial will not let you commit files with unresolved merge
6153 Mercurial will not let you commit files with unresolved merge
6146 conflicts. You must use :hg:`resolve -m ...` before you can
6154 conflicts. You must use :hg:`resolve -m ...` before you can
6147 commit after a conflicting merge.
6155 commit after a conflicting merge.
6148
6156
6149 Returns 0 on success, 1 if any files fail a resolve attempt.
6157 Returns 0 on success, 1 if any files fail a resolve attempt.
6150 """
6158 """
6151
6159
6152 flaglist = 'all mark unmark list no_status'.split()
6160 flaglist = 'all mark unmark list no_status'.split()
6153 all, mark, unmark, show, nostatus = \
6161 all, mark, unmark, show, nostatus = \
6154 [opts.get(o) for o in flaglist]
6162 [opts.get(o) for o in flaglist]
6155
6163
6156 if (show and (mark or unmark)) or (mark and unmark):
6164 if (show and (mark or unmark)) or (mark and unmark):
6157 raise error.Abort(_("too many options specified"))
6165 raise error.Abort(_("too many options specified"))
6158 if pats and all:
6166 if pats and all:
6159 raise error.Abort(_("can't specify --all and patterns"))
6167 raise error.Abort(_("can't specify --all and patterns"))
6160 if not (all or pats or show or mark or unmark):
6168 if not (all or pats or show or mark or unmark):
6161 raise error.Abort(_('no files or directories specified'),
6169 raise error.Abort(_('no files or directories specified'),
6162 hint=('use --all to re-merge all unresolved files'))
6170 hint=('use --all to re-merge all unresolved files'))
6163
6171
6164 if show:
6172 if show:
6165 fm = ui.formatter('resolve', opts)
6173 fm = ui.formatter('resolve', opts)
6166 ms = mergemod.mergestate.read(repo)
6174 ms = mergemod.mergestate.read(repo)
6167 m = scmutil.match(repo[None], pats, opts)
6175 m = scmutil.match(repo[None], pats, opts)
6168 for f in ms:
6176 for f in ms:
6169 if not m(f):
6177 if not m(f):
6170 continue
6178 continue
6171 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6179 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6172 'd': 'driverresolved'}[ms[f]]
6180 'd': 'driverresolved'}[ms[f]]
6173 fm.startitem()
6181 fm.startitem()
6174 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6182 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6175 fm.write('path', '%s\n', f, label=l)
6183 fm.write('path', '%s\n', f, label=l)
6176 fm.end()
6184 fm.end()
6177 return 0
6185 return 0
6178
6186
6179 with repo.wlock():
6187 with repo.wlock():
6180 ms = mergemod.mergestate.read(repo)
6188 ms = mergemod.mergestate.read(repo)
6181
6189
6182 if not (ms.active() or repo.dirstate.p2() != nullid):
6190 if not (ms.active() or repo.dirstate.p2() != nullid):
6183 raise error.Abort(
6191 raise error.Abort(
6184 _('resolve command not applicable when not merging'))
6192 _('resolve command not applicable when not merging'))
6185
6193
6186 wctx = repo[None]
6194 wctx = repo[None]
6187
6195
6188 if ms.mergedriver and ms.mdstate() == 'u':
6196 if ms.mergedriver and ms.mdstate() == 'u':
6189 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6197 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6190 ms.commit()
6198 ms.commit()
6191 # allow mark and unmark to go through
6199 # allow mark and unmark to go through
6192 if not mark and not unmark and not proceed:
6200 if not mark and not unmark and not proceed:
6193 return 1
6201 return 1
6194
6202
6195 m = scmutil.match(wctx, pats, opts)
6203 m = scmutil.match(wctx, pats, opts)
6196 ret = 0
6204 ret = 0
6197 didwork = False
6205 didwork = False
6198 runconclude = False
6206 runconclude = False
6199
6207
6200 tocomplete = []
6208 tocomplete = []
6201 for f in ms:
6209 for f in ms:
6202 if not m(f):
6210 if not m(f):
6203 continue
6211 continue
6204
6212
6205 didwork = True
6213 didwork = True
6206
6214
6207 # don't let driver-resolved files be marked, and run the conclude
6215 # don't let driver-resolved files be marked, and run the conclude
6208 # step if asked to resolve
6216 # step if asked to resolve
6209 if ms[f] == "d":
6217 if ms[f] == "d":
6210 exact = m.exact(f)
6218 exact = m.exact(f)
6211 if mark:
6219 if mark:
6212 if exact:
6220 if exact:
6213 ui.warn(_('not marking %s as it is driver-resolved\n')
6221 ui.warn(_('not marking %s as it is driver-resolved\n')
6214 % f)
6222 % f)
6215 elif unmark:
6223 elif unmark:
6216 if exact:
6224 if exact:
6217 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6225 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6218 % f)
6226 % f)
6219 else:
6227 else:
6220 runconclude = True
6228 runconclude = True
6221 continue
6229 continue
6222
6230
6223 if mark:
6231 if mark:
6224 ms.mark(f, "r")
6232 ms.mark(f, "r")
6225 elif unmark:
6233 elif unmark:
6226 ms.mark(f, "u")
6234 ms.mark(f, "u")
6227 else:
6235 else:
6228 # backup pre-resolve (merge uses .orig for its own purposes)
6236 # backup pre-resolve (merge uses .orig for its own purposes)
6229 a = repo.wjoin(f)
6237 a = repo.wjoin(f)
6230 try:
6238 try:
6231 util.copyfile(a, a + ".resolve")
6239 util.copyfile(a, a + ".resolve")
6232 except (IOError, OSError) as inst:
6240 except (IOError, OSError) as inst:
6233 if inst.errno != errno.ENOENT:
6241 if inst.errno != errno.ENOENT:
6234 raise
6242 raise
6235
6243
6236 try:
6244 try:
6237 # preresolve file
6245 # preresolve file
6238 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6246 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6239 'resolve')
6247 'resolve')
6240 complete, r = ms.preresolve(f, wctx)
6248 complete, r = ms.preresolve(f, wctx)
6241 if not complete:
6249 if not complete:
6242 tocomplete.append(f)
6250 tocomplete.append(f)
6243 elif r:
6251 elif r:
6244 ret = 1
6252 ret = 1
6245 finally:
6253 finally:
6246 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6254 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6247 ms.commit()
6255 ms.commit()
6248
6256
6249 # replace filemerge's .orig file with our resolve file, but only
6257 # replace filemerge's .orig file with our resolve file, but only
6250 # for merges that are complete
6258 # for merges that are complete
6251 if complete:
6259 if complete:
6252 try:
6260 try:
6253 util.rename(a + ".resolve",
6261 util.rename(a + ".resolve",
6254 scmutil.origpath(ui, repo, a))
6262 scmutil.origpath(ui, repo, a))
6255 except OSError as inst:
6263 except OSError as inst:
6256 if inst.errno != errno.ENOENT:
6264 if inst.errno != errno.ENOENT:
6257 raise
6265 raise
6258
6266
6259 for f in tocomplete:
6267 for f in tocomplete:
6260 try:
6268 try:
6261 # resolve file
6269 # resolve file
6262 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6270 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6263 'resolve')
6271 'resolve')
6264 r = ms.resolve(f, wctx)
6272 r = ms.resolve(f, wctx)
6265 if r:
6273 if r:
6266 ret = 1
6274 ret = 1
6267 finally:
6275 finally:
6268 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6276 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6269 ms.commit()
6277 ms.commit()
6270
6278
6271 # replace filemerge's .orig file with our resolve file
6279 # replace filemerge's .orig file with our resolve file
6272 a = repo.wjoin(f)
6280 a = repo.wjoin(f)
6273 try:
6281 try:
6274 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6282 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6275 except OSError as inst:
6283 except OSError as inst:
6276 if inst.errno != errno.ENOENT:
6284 if inst.errno != errno.ENOENT:
6277 raise
6285 raise
6278
6286
6279 ms.commit()
6287 ms.commit()
6280 ms.recordactions()
6288 ms.recordactions()
6281
6289
6282 if not didwork and pats:
6290 if not didwork and pats:
6283 hint = None
6291 hint = None
6284 if not any([p for p in pats if p.find(':') >= 0]):
6292 if not any([p for p in pats if p.find(':') >= 0]):
6285 pats = ['path:%s' % p for p in pats]
6293 pats = ['path:%s' % p for p in pats]
6286 m = scmutil.match(wctx, pats, opts)
6294 m = scmutil.match(wctx, pats, opts)
6287 for f in ms:
6295 for f in ms:
6288 if not m(f):
6296 if not m(f):
6289 continue
6297 continue
6290 flags = ''.join(['-%s ' % o[0] for o in flaglist
6298 flags = ''.join(['-%s ' % o[0] for o in flaglist
6291 if opts.get(o)])
6299 if opts.get(o)])
6292 hint = _("(try: hg resolve %s%s)\n") % (
6300 hint = _("(try: hg resolve %s%s)\n") % (
6293 flags,
6301 flags,
6294 ' '.join(pats))
6302 ' '.join(pats))
6295 break
6303 break
6296 ui.warn(_("arguments do not match paths that need resolving\n"))
6304 ui.warn(_("arguments do not match paths that need resolving\n"))
6297 if hint:
6305 if hint:
6298 ui.warn(hint)
6306 ui.warn(hint)
6299 elif ms.mergedriver and ms.mdstate() != 's':
6307 elif ms.mergedriver and ms.mdstate() != 's':
6300 # run conclude step when either a driver-resolved file is requested
6308 # run conclude step when either a driver-resolved file is requested
6301 # or there are no driver-resolved files
6309 # or there are no driver-resolved files
6302 # we can't use 'ret' to determine whether any files are unresolved
6310 # we can't use 'ret' to determine whether any files are unresolved
6303 # because we might not have tried to resolve some
6311 # because we might not have tried to resolve some
6304 if ((runconclude or not list(ms.driverresolved()))
6312 if ((runconclude or not list(ms.driverresolved()))
6305 and not list(ms.unresolved())):
6313 and not list(ms.unresolved())):
6306 proceed = mergemod.driverconclude(repo, ms, wctx)
6314 proceed = mergemod.driverconclude(repo, ms, wctx)
6307 ms.commit()
6315 ms.commit()
6308 if not proceed:
6316 if not proceed:
6309 return 1
6317 return 1
6310
6318
6311 # Nudge users into finishing an unfinished operation
6319 # Nudge users into finishing an unfinished operation
6312 unresolvedf = list(ms.unresolved())
6320 unresolvedf = list(ms.unresolved())
6313 driverresolvedf = list(ms.driverresolved())
6321 driverresolvedf = list(ms.driverresolved())
6314 if not unresolvedf and not driverresolvedf:
6322 if not unresolvedf and not driverresolvedf:
6315 ui.status(_('(no more unresolved files)\n'))
6323 ui.status(_('(no more unresolved files)\n'))
6316 cmdutil.checkafterresolved(repo)
6324 cmdutil.checkafterresolved(repo)
6317 elif not unresolvedf:
6325 elif not unresolvedf:
6318 ui.status(_('(no more unresolved files -- '
6326 ui.status(_('(no more unresolved files -- '
6319 'run "hg resolve --all" to conclude)\n'))
6327 'run "hg resolve --all" to conclude)\n'))
6320
6328
6321 return ret
6329 return ret
6322
6330
6323 @command('revert',
6331 @command('revert',
6324 [('a', 'all', None, _('revert all changes when no arguments given')),
6332 [('a', 'all', None, _('revert all changes when no arguments given')),
6325 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6333 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6326 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6334 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6327 ('C', 'no-backup', None, _('do not save backup copies of files')),
6335 ('C', 'no-backup', None, _('do not save backup copies of files')),
6328 ('i', 'interactive', None,
6336 ('i', 'interactive', None,
6329 _('interactively select the changes (EXPERIMENTAL)')),
6337 _('interactively select the changes (EXPERIMENTAL)')),
6330 ] + walkopts + dryrunopts,
6338 ] + walkopts + dryrunopts,
6331 _('[OPTION]... [-r REV] [NAME]...'))
6339 _('[OPTION]... [-r REV] [NAME]...'))
6332 def revert(ui, repo, *pats, **opts):
6340 def revert(ui, repo, *pats, **opts):
6333 """restore files to their checkout state
6341 """restore files to their checkout state
6334
6342
6335 .. note::
6343 .. note::
6336
6344
6337 To check out earlier revisions, you should use :hg:`update REV`.
6345 To check out earlier revisions, you should use :hg:`update REV`.
6338 To cancel an uncommitted merge (and lose your changes),
6346 To cancel an uncommitted merge (and lose your changes),
6339 use :hg:`update --clean .`.
6347 use :hg:`update --clean .`.
6340
6348
6341 With no revision specified, revert the specified files or directories
6349 With no revision specified, revert the specified files or directories
6342 to the contents they had in the parent of the working directory.
6350 to the contents they had in the parent of the working directory.
6343 This restores the contents of files to an unmodified
6351 This restores the contents of files to an unmodified
6344 state and unschedules adds, removes, copies, and renames. If the
6352 state and unschedules adds, removes, copies, and renames. If the
6345 working directory has two parents, you must explicitly specify a
6353 working directory has two parents, you must explicitly specify a
6346 revision.
6354 revision.
6347
6355
6348 Using the -r/--rev or -d/--date options, revert the given files or
6356 Using the -r/--rev or -d/--date options, revert the given files or
6349 directories to their states as of a specific revision. Because
6357 directories to their states as of a specific revision. Because
6350 revert does not change the working directory parents, this will
6358 revert does not change the working directory parents, this will
6351 cause these files to appear modified. This can be helpful to "back
6359 cause these files to appear modified. This can be helpful to "back
6352 out" some or all of an earlier change. See :hg:`backout` for a
6360 out" some or all of an earlier change. See :hg:`backout` for a
6353 related method.
6361 related method.
6354
6362
6355 Modified files are saved with a .orig suffix before reverting.
6363 Modified files are saved with a .orig suffix before reverting.
6356 To disable these backups, use --no-backup. It is possible to store
6364 To disable these backups, use --no-backup. It is possible to store
6357 the backup files in a custom directory relative to the root of the
6365 the backup files in a custom directory relative to the root of the
6358 repository by setting the ``ui.origbackuppath`` configuration
6366 repository by setting the ``ui.origbackuppath`` configuration
6359 option.
6367 option.
6360
6368
6361 See :hg:`help dates` for a list of formats valid for -d/--date.
6369 See :hg:`help dates` for a list of formats valid for -d/--date.
6362
6370
6363 See :hg:`help backout` for a way to reverse the effect of an
6371 See :hg:`help backout` for a way to reverse the effect of an
6364 earlier changeset.
6372 earlier changeset.
6365
6373
6366 Returns 0 on success.
6374 Returns 0 on success.
6367 """
6375 """
6368
6376
6369 if opts.get("date"):
6377 if opts.get("date"):
6370 if opts.get("rev"):
6378 if opts.get("rev"):
6371 raise error.Abort(_("you can't specify a revision and a date"))
6379 raise error.Abort(_("you can't specify a revision and a date"))
6372 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6380 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6373
6381
6374 parent, p2 = repo.dirstate.parents()
6382 parent, p2 = repo.dirstate.parents()
6375 if not opts.get('rev') and p2 != nullid:
6383 if not opts.get('rev') and p2 != nullid:
6376 # revert after merge is a trap for new users (issue2915)
6384 # revert after merge is a trap for new users (issue2915)
6377 raise error.Abort(_('uncommitted merge with no revision specified'),
6385 raise error.Abort(_('uncommitted merge with no revision specified'),
6378 hint=_("use 'hg update' or see 'hg help revert'"))
6386 hint=_("use 'hg update' or see 'hg help revert'"))
6379
6387
6380 ctx = scmutil.revsingle(repo, opts.get('rev'))
6388 ctx = scmutil.revsingle(repo, opts.get('rev'))
6381
6389
6382 if (not (pats or opts.get('include') or opts.get('exclude') or
6390 if (not (pats or opts.get('include') or opts.get('exclude') or
6383 opts.get('all') or opts.get('interactive'))):
6391 opts.get('all') or opts.get('interactive'))):
6384 msg = _("no files or directories specified")
6392 msg = _("no files or directories specified")
6385 if p2 != nullid:
6393 if p2 != nullid:
6386 hint = _("uncommitted merge, use --all to discard all changes,"
6394 hint = _("uncommitted merge, use --all to discard all changes,"
6387 " or 'hg update -C .' to abort the merge")
6395 " or 'hg update -C .' to abort the merge")
6388 raise error.Abort(msg, hint=hint)
6396 raise error.Abort(msg, hint=hint)
6389 dirty = any(repo.status())
6397 dirty = any(repo.status())
6390 node = ctx.node()
6398 node = ctx.node()
6391 if node != parent:
6399 if node != parent:
6392 if dirty:
6400 if dirty:
6393 hint = _("uncommitted changes, use --all to discard all"
6401 hint = _("uncommitted changes, use --all to discard all"
6394 " changes, or 'hg update %s' to update") % ctx.rev()
6402 " changes, or 'hg update %s' to update") % ctx.rev()
6395 else:
6403 else:
6396 hint = _("use --all to revert all files,"
6404 hint = _("use --all to revert all files,"
6397 " or 'hg update %s' to update") % ctx.rev()
6405 " or 'hg update %s' to update") % ctx.rev()
6398 elif dirty:
6406 elif dirty:
6399 hint = _("uncommitted changes, use --all to discard all changes")
6407 hint = _("uncommitted changes, use --all to discard all changes")
6400 else:
6408 else:
6401 hint = _("use --all to revert all files")
6409 hint = _("use --all to revert all files")
6402 raise error.Abort(msg, hint=hint)
6410 raise error.Abort(msg, hint=hint)
6403
6411
6404 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6412 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6405
6413
6406 @command('rollback', dryrunopts +
6414 @command('rollback', dryrunopts +
6407 [('f', 'force', False, _('ignore safety measures'))])
6415 [('f', 'force', False, _('ignore safety measures'))])
6408 def rollback(ui, repo, **opts):
6416 def rollback(ui, repo, **opts):
6409 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6417 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6410
6418
6411 Please use :hg:`commit --amend` instead of rollback to correct
6419 Please use :hg:`commit --amend` instead of rollback to correct
6412 mistakes in the last commit.
6420 mistakes in the last commit.
6413
6421
6414 This command should be used with care. There is only one level of
6422 This command should be used with care. There is only one level of
6415 rollback, and there is no way to undo a rollback. It will also
6423 rollback, and there is no way to undo a rollback. It will also
6416 restore the dirstate at the time of the last transaction, losing
6424 restore the dirstate at the time of the last transaction, losing
6417 any dirstate changes since that time. This command does not alter
6425 any dirstate changes since that time. This command does not alter
6418 the working directory.
6426 the working directory.
6419
6427
6420 Transactions are used to encapsulate the effects of all commands
6428 Transactions are used to encapsulate the effects of all commands
6421 that create new changesets or propagate existing changesets into a
6429 that create new changesets or propagate existing changesets into a
6422 repository.
6430 repository.
6423
6431
6424 .. container:: verbose
6432 .. container:: verbose
6425
6433
6426 For example, the following commands are transactional, and their
6434 For example, the following commands are transactional, and their
6427 effects can be rolled back:
6435 effects can be rolled back:
6428
6436
6429 - commit
6437 - commit
6430 - import
6438 - import
6431 - pull
6439 - pull
6432 - push (with this repository as the destination)
6440 - push (with this repository as the destination)
6433 - unbundle
6441 - unbundle
6434
6442
6435 To avoid permanent data loss, rollback will refuse to rollback a
6443 To avoid permanent data loss, rollback will refuse to rollback a
6436 commit transaction if it isn't checked out. Use --force to
6444 commit transaction if it isn't checked out. Use --force to
6437 override this protection.
6445 override this protection.
6438
6446
6439 The rollback command can be entirely disabled by setting the
6447 The rollback command can be entirely disabled by setting the
6440 ``ui.rollback`` configuration setting to false. If you're here
6448 ``ui.rollback`` configuration setting to false. If you're here
6441 because you want to use rollback and it's disabled, you can
6449 because you want to use rollback and it's disabled, you can
6442 re-enable the command by setting ``ui.rollback`` to true.
6450 re-enable the command by setting ``ui.rollback`` to true.
6443
6451
6444 This command is not intended for use on public repositories. Once
6452 This command is not intended for use on public repositories. Once
6445 changes are visible for pull by other users, rolling a transaction
6453 changes are visible for pull by other users, rolling a transaction
6446 back locally is ineffective (someone else may already have pulled
6454 back locally is ineffective (someone else may already have pulled
6447 the changes). Furthermore, a race is possible with readers of the
6455 the changes). Furthermore, a race is possible with readers of the
6448 repository; for example an in-progress pull from the repository
6456 repository; for example an in-progress pull from the repository
6449 may fail if a rollback is performed.
6457 may fail if a rollback is performed.
6450
6458
6451 Returns 0 on success, 1 if no rollback data is available.
6459 Returns 0 on success, 1 if no rollback data is available.
6452 """
6460 """
6453 if not ui.configbool('ui', 'rollback', True):
6461 if not ui.configbool('ui', 'rollback', True):
6454 raise error.Abort(_('rollback is disabled because it is unsafe'),
6462 raise error.Abort(_('rollback is disabled because it is unsafe'),
6455 hint=('see `hg help -v rollback` for information'))
6463 hint=('see `hg help -v rollback` for information'))
6456 return repo.rollback(dryrun=opts.get('dry_run'),
6464 return repo.rollback(dryrun=opts.get('dry_run'),
6457 force=opts.get('force'))
6465 force=opts.get('force'))
6458
6466
6459 @command('root', [])
6467 @command('root', [])
6460 def root(ui, repo):
6468 def root(ui, repo):
6461 """print the root (top) of the current working directory
6469 """print the root (top) of the current working directory
6462
6470
6463 Print the root directory of the current repository.
6471 Print the root directory of the current repository.
6464
6472
6465 Returns 0 on success.
6473 Returns 0 on success.
6466 """
6474 """
6467 ui.write(repo.root + "\n")
6475 ui.write(repo.root + "\n")
6468
6476
6469 @command('^serve',
6477 @command('^serve',
6470 [('A', 'accesslog', '', _('name of access log file to write to'),
6478 [('A', 'accesslog', '', _('name of access log file to write to'),
6471 _('FILE')),
6479 _('FILE')),
6472 ('d', 'daemon', None, _('run server in background')),
6480 ('d', 'daemon', None, _('run server in background')),
6473 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6481 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6474 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6482 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6475 # use string type, then we can check if something was passed
6483 # use string type, then we can check if something was passed
6476 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6484 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6477 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6485 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6478 _('ADDR')),
6486 _('ADDR')),
6479 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6487 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6480 _('PREFIX')),
6488 _('PREFIX')),
6481 ('n', 'name', '',
6489 ('n', 'name', '',
6482 _('name to show in web pages (default: working directory)'), _('NAME')),
6490 _('name to show in web pages (default: working directory)'), _('NAME')),
6483 ('', 'web-conf', '',
6491 ('', 'web-conf', '',
6484 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6492 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6485 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6493 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6486 _('FILE')),
6494 _('FILE')),
6487 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6495 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6488 ('', 'stdio', None, _('for remote clients')),
6496 ('', 'stdio', None, _('for remote clients')),
6489 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6497 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6490 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6498 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6491 ('', 'style', '', _('template style to use'), _('STYLE')),
6499 ('', 'style', '', _('template style to use'), _('STYLE')),
6492 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6500 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6493 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6501 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6494 _('[OPTION]...'),
6502 _('[OPTION]...'),
6495 optionalrepo=True)
6503 optionalrepo=True)
6496 def serve(ui, repo, **opts):
6504 def serve(ui, repo, **opts):
6497 """start stand-alone webserver
6505 """start stand-alone webserver
6498
6506
6499 Start a local HTTP repository browser and pull server. You can use
6507 Start a local HTTP repository browser and pull server. You can use
6500 this for ad-hoc sharing and browsing of repositories. It is
6508 this for ad-hoc sharing and browsing of repositories. It is
6501 recommended to use a real web server to serve a repository for
6509 recommended to use a real web server to serve a repository for
6502 longer periods of time.
6510 longer periods of time.
6503
6511
6504 Please note that the server does not implement access control.
6512 Please note that the server does not implement access control.
6505 This means that, by default, anybody can read from the server and
6513 This means that, by default, anybody can read from the server and
6506 nobody can write to it by default. Set the ``web.allow_push``
6514 nobody can write to it by default. Set the ``web.allow_push``
6507 option to ``*`` to allow everybody to push to the server. You
6515 option to ``*`` to allow everybody to push to the server. You
6508 should use a real web server if you need to authenticate users.
6516 should use a real web server if you need to authenticate users.
6509
6517
6510 By default, the server logs accesses to stdout and errors to
6518 By default, the server logs accesses to stdout and errors to
6511 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6519 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6512 files.
6520 files.
6513
6521
6514 To have the server choose a free port number to listen on, specify
6522 To have the server choose a free port number to listen on, specify
6515 a port number of 0; in this case, the server will print the port
6523 a port number of 0; in this case, the server will print the port
6516 number it uses.
6524 number it uses.
6517
6525
6518 Returns 0 on success.
6526 Returns 0 on success.
6519 """
6527 """
6520
6528
6521 if opts["stdio"] and opts["cmdserver"]:
6529 if opts["stdio"] and opts["cmdserver"]:
6522 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6530 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6523
6531
6524 if opts["stdio"]:
6532 if opts["stdio"]:
6525 if repo is None:
6533 if repo is None:
6526 raise error.RepoError(_("there is no Mercurial repository here"
6534 raise error.RepoError(_("there is no Mercurial repository here"
6527 " (.hg not found)"))
6535 " (.hg not found)"))
6528 s = sshserver.sshserver(ui, repo)
6536 s = sshserver.sshserver(ui, repo)
6529 s.serve_forever()
6537 s.serve_forever()
6530
6538
6531 if opts["cmdserver"]:
6539 if opts["cmdserver"]:
6532 service = commandserver.createservice(ui, repo, opts)
6540 service = commandserver.createservice(ui, repo, opts)
6533 else:
6541 else:
6534 service = hgweb.createservice(ui, repo, opts)
6542 service = hgweb.createservice(ui, repo, opts)
6535 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6543 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6536
6544
6537 @command('^status|st',
6545 @command('^status|st',
6538 [('A', 'all', None, _('show status of all files')),
6546 [('A', 'all', None, _('show status of all files')),
6539 ('m', 'modified', None, _('show only modified files')),
6547 ('m', 'modified', None, _('show only modified files')),
6540 ('a', 'added', None, _('show only added files')),
6548 ('a', 'added', None, _('show only added files')),
6541 ('r', 'removed', None, _('show only removed files')),
6549 ('r', 'removed', None, _('show only removed files')),
6542 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6550 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6543 ('c', 'clean', None, _('show only files without changes')),
6551 ('c', 'clean', None, _('show only files without changes')),
6544 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6552 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6545 ('i', 'ignored', None, _('show only ignored files')),
6553 ('i', 'ignored', None, _('show only ignored files')),
6546 ('n', 'no-status', None, _('hide status prefix')),
6554 ('n', 'no-status', None, _('hide status prefix')),
6547 ('C', 'copies', None, _('show source of copied files')),
6555 ('C', 'copies', None, _('show source of copied files')),
6548 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6556 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6549 ('', 'rev', [], _('show difference from revision'), _('REV')),
6557 ('', 'rev', [], _('show difference from revision'), _('REV')),
6550 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6558 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6551 ] + walkopts + subrepoopts + formatteropts,
6559 ] + walkopts + subrepoopts + formatteropts,
6552 _('[OPTION]... [FILE]...'),
6560 _('[OPTION]... [FILE]...'),
6553 inferrepo=True)
6561 inferrepo=True)
6554 def status(ui, repo, *pats, **opts):
6562 def status(ui, repo, *pats, **opts):
6555 """show changed files in the working directory
6563 """show changed files in the working directory
6556
6564
6557 Show status of files in the repository. If names are given, only
6565 Show status of files in the repository. If names are given, only
6558 files that match are shown. Files that are clean or ignored or
6566 files that match are shown. Files that are clean or ignored or
6559 the source of a copy/move operation, are not listed unless
6567 the source of a copy/move operation, are not listed unless
6560 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6568 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6561 Unless options described with "show only ..." are given, the
6569 Unless options described with "show only ..." are given, the
6562 options -mardu are used.
6570 options -mardu are used.
6563
6571
6564 Option -q/--quiet hides untracked (unknown and ignored) files
6572 Option -q/--quiet hides untracked (unknown and ignored) files
6565 unless explicitly requested with -u/--unknown or -i/--ignored.
6573 unless explicitly requested with -u/--unknown or -i/--ignored.
6566
6574
6567 .. note::
6575 .. note::
6568
6576
6569 :hg:`status` may appear to disagree with diff if permissions have
6577 :hg:`status` may appear to disagree with diff if permissions have
6570 changed or a merge has occurred. The standard diff format does
6578 changed or a merge has occurred. The standard diff format does
6571 not report permission changes and diff only reports changes
6579 not report permission changes and diff only reports changes
6572 relative to one merge parent.
6580 relative to one merge parent.
6573
6581
6574 If one revision is given, it is used as the base revision.
6582 If one revision is given, it is used as the base revision.
6575 If two revisions are given, the differences between them are
6583 If two revisions are given, the differences between them are
6576 shown. The --change option can also be used as a shortcut to list
6584 shown. The --change option can also be used as a shortcut to list
6577 the changed files of a revision from its first parent.
6585 the changed files of a revision from its first parent.
6578
6586
6579 The codes used to show the status of files are::
6587 The codes used to show the status of files are::
6580
6588
6581 M = modified
6589 M = modified
6582 A = added
6590 A = added
6583 R = removed
6591 R = removed
6584 C = clean
6592 C = clean
6585 ! = missing (deleted by non-hg command, but still tracked)
6593 ! = missing (deleted by non-hg command, but still tracked)
6586 ? = not tracked
6594 ? = not tracked
6587 I = ignored
6595 I = ignored
6588 = origin of the previous file (with --copies)
6596 = origin of the previous file (with --copies)
6589
6597
6590 .. container:: verbose
6598 .. container:: verbose
6591
6599
6592 Examples:
6600 Examples:
6593
6601
6594 - show changes in the working directory relative to a
6602 - show changes in the working directory relative to a
6595 changeset::
6603 changeset::
6596
6604
6597 hg status --rev 9353
6605 hg status --rev 9353
6598
6606
6599 - show changes in the working directory relative to the
6607 - show changes in the working directory relative to the
6600 current directory (see :hg:`help patterns` for more information)::
6608 current directory (see :hg:`help patterns` for more information)::
6601
6609
6602 hg status re:
6610 hg status re:
6603
6611
6604 - show all changes including copies in an existing changeset::
6612 - show all changes including copies in an existing changeset::
6605
6613
6606 hg status --copies --change 9353
6614 hg status --copies --change 9353
6607
6615
6608 - get a NUL separated list of added files, suitable for xargs::
6616 - get a NUL separated list of added files, suitable for xargs::
6609
6617
6610 hg status -an0
6618 hg status -an0
6611
6619
6612 Returns 0 on success.
6620 Returns 0 on success.
6613 """
6621 """
6614
6622
6615 revs = opts.get('rev')
6623 revs = opts.get('rev')
6616 change = opts.get('change')
6624 change = opts.get('change')
6617
6625
6618 if revs and change:
6626 if revs and change:
6619 msg = _('cannot specify --rev and --change at the same time')
6627 msg = _('cannot specify --rev and --change at the same time')
6620 raise error.Abort(msg)
6628 raise error.Abort(msg)
6621 elif change:
6629 elif change:
6622 node2 = scmutil.revsingle(repo, change, None).node()
6630 node2 = scmutil.revsingle(repo, change, None).node()
6623 node1 = repo[node2].p1().node()
6631 node1 = repo[node2].p1().node()
6624 else:
6632 else:
6625 node1, node2 = scmutil.revpair(repo, revs)
6633 node1, node2 = scmutil.revpair(repo, revs)
6626
6634
6627 if pats:
6635 if pats:
6628 cwd = repo.getcwd()
6636 cwd = repo.getcwd()
6629 else:
6637 else:
6630 cwd = ''
6638 cwd = ''
6631
6639
6632 if opts.get('print0'):
6640 if opts.get('print0'):
6633 end = '\0'
6641 end = '\0'
6634 else:
6642 else:
6635 end = '\n'
6643 end = '\n'
6636 copy = {}
6644 copy = {}
6637 states = 'modified added removed deleted unknown ignored clean'.split()
6645 states = 'modified added removed deleted unknown ignored clean'.split()
6638 show = [k for k in states if opts.get(k)]
6646 show = [k for k in states if opts.get(k)]
6639 if opts.get('all'):
6647 if opts.get('all'):
6640 show += ui.quiet and (states[:4] + ['clean']) or states
6648 show += ui.quiet and (states[:4] + ['clean']) or states
6641 if not show:
6649 if not show:
6642 if ui.quiet:
6650 if ui.quiet:
6643 show = states[:4]
6651 show = states[:4]
6644 else:
6652 else:
6645 show = states[:5]
6653 show = states[:5]
6646
6654
6647 m = scmutil.match(repo[node2], pats, opts)
6655 m = scmutil.match(repo[node2], pats, opts)
6648 stat = repo.status(node1, node2, m,
6656 stat = repo.status(node1, node2, m,
6649 'ignored' in show, 'clean' in show, 'unknown' in show,
6657 'ignored' in show, 'clean' in show, 'unknown' in show,
6650 opts.get('subrepos'))
6658 opts.get('subrepos'))
6651 changestates = zip(states, 'MAR!?IC', stat)
6659 changestates = zip(states, 'MAR!?IC', stat)
6652
6660
6653 if (opts.get('all') or opts.get('copies')
6661 if (opts.get('all') or opts.get('copies')
6654 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6662 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6655 copy = copies.pathcopies(repo[node1], repo[node2], m)
6663 copy = copies.pathcopies(repo[node1], repo[node2], m)
6656
6664
6657 fm = ui.formatter('status', opts)
6665 fm = ui.formatter('status', opts)
6658 fmt = '%s' + end
6666 fmt = '%s' + end
6659 showchar = not opts.get('no_status')
6667 showchar = not opts.get('no_status')
6660
6668
6661 for state, char, files in changestates:
6669 for state, char, files in changestates:
6662 if state in show:
6670 if state in show:
6663 label = 'status.' + state
6671 label = 'status.' + state
6664 for f in files:
6672 for f in files:
6665 fm.startitem()
6673 fm.startitem()
6666 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6674 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6667 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6675 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6668 if f in copy:
6676 if f in copy:
6669 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6677 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6670 label='status.copied')
6678 label='status.copied')
6671 fm.end()
6679 fm.end()
6672
6680
6673 @command('^summary|sum',
6681 @command('^summary|sum',
6674 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6682 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6675 def summary(ui, repo, **opts):
6683 def summary(ui, repo, **opts):
6676 """summarize working directory state
6684 """summarize working directory state
6677
6685
6678 This generates a brief summary of the working directory state,
6686 This generates a brief summary of the working directory state,
6679 including parents, branch, commit status, phase and available updates.
6687 including parents, branch, commit status, phase and available updates.
6680
6688
6681 With the --remote option, this will check the default paths for
6689 With the --remote option, this will check the default paths for
6682 incoming and outgoing changes. This can be time-consuming.
6690 incoming and outgoing changes. This can be time-consuming.
6683
6691
6684 Returns 0 on success.
6692 Returns 0 on success.
6685 """
6693 """
6686
6694
6687 ctx = repo[None]
6695 ctx = repo[None]
6688 parents = ctx.parents()
6696 parents = ctx.parents()
6689 pnode = parents[0].node()
6697 pnode = parents[0].node()
6690 marks = []
6698 marks = []
6691
6699
6692 ms = None
6700 ms = None
6693 try:
6701 try:
6694 ms = mergemod.mergestate.read(repo)
6702 ms = mergemod.mergestate.read(repo)
6695 except error.UnsupportedMergeRecords as e:
6703 except error.UnsupportedMergeRecords as e:
6696 s = ' '.join(e.recordtypes)
6704 s = ' '.join(e.recordtypes)
6697 ui.warn(
6705 ui.warn(
6698 _('warning: merge state has unsupported record types: %s\n') % s)
6706 _('warning: merge state has unsupported record types: %s\n') % s)
6699 unresolved = 0
6707 unresolved = 0
6700 else:
6708 else:
6701 unresolved = [f for f in ms if ms[f] == 'u']
6709 unresolved = [f for f in ms if ms[f] == 'u']
6702
6710
6703 for p in parents:
6711 for p in parents:
6704 # label with log.changeset (instead of log.parent) since this
6712 # label with log.changeset (instead of log.parent) since this
6705 # shows a working directory parent *changeset*:
6713 # shows a working directory parent *changeset*:
6706 # i18n: column positioning for "hg summary"
6714 # i18n: column positioning for "hg summary"
6707 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6715 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6708 label='log.changeset changeset.%s' % p.phasestr())
6716 label='log.changeset changeset.%s' % p.phasestr())
6709 ui.write(' '.join(p.tags()), label='log.tag')
6717 ui.write(' '.join(p.tags()), label='log.tag')
6710 if p.bookmarks():
6718 if p.bookmarks():
6711 marks.extend(p.bookmarks())
6719 marks.extend(p.bookmarks())
6712 if p.rev() == -1:
6720 if p.rev() == -1:
6713 if not len(repo):
6721 if not len(repo):
6714 ui.write(_(' (empty repository)'))
6722 ui.write(_(' (empty repository)'))
6715 else:
6723 else:
6716 ui.write(_(' (no revision checked out)'))
6724 ui.write(_(' (no revision checked out)'))
6717 ui.write('\n')
6725 ui.write('\n')
6718 if p.description():
6726 if p.description():
6719 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6727 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6720 label='log.summary')
6728 label='log.summary')
6721
6729
6722 branch = ctx.branch()
6730 branch = ctx.branch()
6723 bheads = repo.branchheads(branch)
6731 bheads = repo.branchheads(branch)
6724 # i18n: column positioning for "hg summary"
6732 # i18n: column positioning for "hg summary"
6725 m = _('branch: %s\n') % branch
6733 m = _('branch: %s\n') % branch
6726 if branch != 'default':
6734 if branch != 'default':
6727 ui.write(m, label='log.branch')
6735 ui.write(m, label='log.branch')
6728 else:
6736 else:
6729 ui.status(m, label='log.branch')
6737 ui.status(m, label='log.branch')
6730
6738
6731 if marks:
6739 if marks:
6732 active = repo._activebookmark
6740 active = repo._activebookmark
6733 # i18n: column positioning for "hg summary"
6741 # i18n: column positioning for "hg summary"
6734 ui.write(_('bookmarks:'), label='log.bookmark')
6742 ui.write(_('bookmarks:'), label='log.bookmark')
6735 if active is not None:
6743 if active is not None:
6736 if active in marks:
6744 if active in marks:
6737 ui.write(' *' + active, label=activebookmarklabel)
6745 ui.write(' *' + active, label=activebookmarklabel)
6738 marks.remove(active)
6746 marks.remove(active)
6739 else:
6747 else:
6740 ui.write(' [%s]' % active, label=activebookmarklabel)
6748 ui.write(' [%s]' % active, label=activebookmarklabel)
6741 for m in marks:
6749 for m in marks:
6742 ui.write(' ' + m, label='log.bookmark')
6750 ui.write(' ' + m, label='log.bookmark')
6743 ui.write('\n', label='log.bookmark')
6751 ui.write('\n', label='log.bookmark')
6744
6752
6745 status = repo.status(unknown=True)
6753 status = repo.status(unknown=True)
6746
6754
6747 c = repo.dirstate.copies()
6755 c = repo.dirstate.copies()
6748 copied, renamed = [], []
6756 copied, renamed = [], []
6749 for d, s in c.iteritems():
6757 for d, s in c.iteritems():
6750 if s in status.removed:
6758 if s in status.removed:
6751 status.removed.remove(s)
6759 status.removed.remove(s)
6752 renamed.append(d)
6760 renamed.append(d)
6753 else:
6761 else:
6754 copied.append(d)
6762 copied.append(d)
6755 if d in status.added:
6763 if d in status.added:
6756 status.added.remove(d)
6764 status.added.remove(d)
6757
6765
6758 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6766 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6759
6767
6760 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6768 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6761 (ui.label(_('%d added'), 'status.added'), status.added),
6769 (ui.label(_('%d added'), 'status.added'), status.added),
6762 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6770 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6763 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6771 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6764 (ui.label(_('%d copied'), 'status.copied'), copied),
6772 (ui.label(_('%d copied'), 'status.copied'), copied),
6765 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6773 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6766 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6774 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6767 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6775 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6768 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6776 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6769 t = []
6777 t = []
6770 for l, s in labels:
6778 for l, s in labels:
6771 if s:
6779 if s:
6772 t.append(l % len(s))
6780 t.append(l % len(s))
6773
6781
6774 t = ', '.join(t)
6782 t = ', '.join(t)
6775 cleanworkdir = False
6783 cleanworkdir = False
6776
6784
6777 if repo.vfs.exists('graftstate'):
6785 if repo.vfs.exists('graftstate'):
6778 t += _(' (graft in progress)')
6786 t += _(' (graft in progress)')
6779 if repo.vfs.exists('updatestate'):
6787 if repo.vfs.exists('updatestate'):
6780 t += _(' (interrupted update)')
6788 t += _(' (interrupted update)')
6781 elif len(parents) > 1:
6789 elif len(parents) > 1:
6782 t += _(' (merge)')
6790 t += _(' (merge)')
6783 elif branch != parents[0].branch():
6791 elif branch != parents[0].branch():
6784 t += _(' (new branch)')
6792 t += _(' (new branch)')
6785 elif (parents[0].closesbranch() and
6793 elif (parents[0].closesbranch() and
6786 pnode in repo.branchheads(branch, closed=True)):
6794 pnode in repo.branchheads(branch, closed=True)):
6787 t += _(' (head closed)')
6795 t += _(' (head closed)')
6788 elif not (status.modified or status.added or status.removed or renamed or
6796 elif not (status.modified or status.added or status.removed or renamed or
6789 copied or subs):
6797 copied or subs):
6790 t += _(' (clean)')
6798 t += _(' (clean)')
6791 cleanworkdir = True
6799 cleanworkdir = True
6792 elif pnode not in bheads:
6800 elif pnode not in bheads:
6793 t += _(' (new branch head)')
6801 t += _(' (new branch head)')
6794
6802
6795 if parents:
6803 if parents:
6796 pendingphase = max(p.phase() for p in parents)
6804 pendingphase = max(p.phase() for p in parents)
6797 else:
6805 else:
6798 pendingphase = phases.public
6806 pendingphase = phases.public
6799
6807
6800 if pendingphase > phases.newcommitphase(ui):
6808 if pendingphase > phases.newcommitphase(ui):
6801 t += ' (%s)' % phases.phasenames[pendingphase]
6809 t += ' (%s)' % phases.phasenames[pendingphase]
6802
6810
6803 if cleanworkdir:
6811 if cleanworkdir:
6804 # i18n: column positioning for "hg summary"
6812 # i18n: column positioning for "hg summary"
6805 ui.status(_('commit: %s\n') % t.strip())
6813 ui.status(_('commit: %s\n') % t.strip())
6806 else:
6814 else:
6807 # i18n: column positioning for "hg summary"
6815 # i18n: column positioning for "hg summary"
6808 ui.write(_('commit: %s\n') % t.strip())
6816 ui.write(_('commit: %s\n') % t.strip())
6809
6817
6810 # all ancestors of branch heads - all ancestors of parent = new csets
6818 # all ancestors of branch heads - all ancestors of parent = new csets
6811 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6819 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6812 bheads))
6820 bheads))
6813
6821
6814 if new == 0:
6822 if new == 0:
6815 # i18n: column positioning for "hg summary"
6823 # i18n: column positioning for "hg summary"
6816 ui.status(_('update: (current)\n'))
6824 ui.status(_('update: (current)\n'))
6817 elif pnode not in bheads:
6825 elif pnode not in bheads:
6818 # i18n: column positioning for "hg summary"
6826 # i18n: column positioning for "hg summary"
6819 ui.write(_('update: %d new changesets (update)\n') % new)
6827 ui.write(_('update: %d new changesets (update)\n') % new)
6820 else:
6828 else:
6821 # i18n: column positioning for "hg summary"
6829 # i18n: column positioning for "hg summary"
6822 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6830 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6823 (new, len(bheads)))
6831 (new, len(bheads)))
6824
6832
6825 t = []
6833 t = []
6826 draft = len(repo.revs('draft()'))
6834 draft = len(repo.revs('draft()'))
6827 if draft:
6835 if draft:
6828 t.append(_('%d draft') % draft)
6836 t.append(_('%d draft') % draft)
6829 secret = len(repo.revs('secret()'))
6837 secret = len(repo.revs('secret()'))
6830 if secret:
6838 if secret:
6831 t.append(_('%d secret') % secret)
6839 t.append(_('%d secret') % secret)
6832
6840
6833 if draft or secret:
6841 if draft or secret:
6834 ui.status(_('phases: %s\n') % ', '.join(t))
6842 ui.status(_('phases: %s\n') % ', '.join(t))
6835
6843
6836 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6844 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6837 for trouble in ("unstable", "divergent", "bumped"):
6845 for trouble in ("unstable", "divergent", "bumped"):
6838 numtrouble = len(repo.revs(trouble + "()"))
6846 numtrouble = len(repo.revs(trouble + "()"))
6839 # We write all the possibilities to ease translation
6847 # We write all the possibilities to ease translation
6840 troublemsg = {
6848 troublemsg = {
6841 "unstable": _("unstable: %d changesets"),
6849 "unstable": _("unstable: %d changesets"),
6842 "divergent": _("divergent: %d changesets"),
6850 "divergent": _("divergent: %d changesets"),
6843 "bumped": _("bumped: %d changesets"),
6851 "bumped": _("bumped: %d changesets"),
6844 }
6852 }
6845 if numtrouble > 0:
6853 if numtrouble > 0:
6846 ui.status(troublemsg[trouble] % numtrouble + "\n")
6854 ui.status(troublemsg[trouble] % numtrouble + "\n")
6847
6855
6848 cmdutil.summaryhooks(ui, repo)
6856 cmdutil.summaryhooks(ui, repo)
6849
6857
6850 if opts.get('remote'):
6858 if opts.get('remote'):
6851 needsincoming, needsoutgoing = True, True
6859 needsincoming, needsoutgoing = True, True
6852 else:
6860 else:
6853 needsincoming, needsoutgoing = False, False
6861 needsincoming, needsoutgoing = False, False
6854 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6862 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6855 if i:
6863 if i:
6856 needsincoming = True
6864 needsincoming = True
6857 if o:
6865 if o:
6858 needsoutgoing = True
6866 needsoutgoing = True
6859 if not needsincoming and not needsoutgoing:
6867 if not needsincoming and not needsoutgoing:
6860 return
6868 return
6861
6869
6862 def getincoming():
6870 def getincoming():
6863 source, branches = hg.parseurl(ui.expandpath('default'))
6871 source, branches = hg.parseurl(ui.expandpath('default'))
6864 sbranch = branches[0]
6872 sbranch = branches[0]
6865 try:
6873 try:
6866 other = hg.peer(repo, {}, source)
6874 other = hg.peer(repo, {}, source)
6867 except error.RepoError:
6875 except error.RepoError:
6868 if opts.get('remote'):
6876 if opts.get('remote'):
6869 raise
6877 raise
6870 return source, sbranch, None, None, None
6878 return source, sbranch, None, None, None
6871 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6879 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6872 if revs:
6880 if revs:
6873 revs = [other.lookup(rev) for rev in revs]
6881 revs = [other.lookup(rev) for rev in revs]
6874 ui.debug('comparing with %s\n' % util.hidepassword(source))
6882 ui.debug('comparing with %s\n' % util.hidepassword(source))
6875 repo.ui.pushbuffer()
6883 repo.ui.pushbuffer()
6876 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6884 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6877 repo.ui.popbuffer()
6885 repo.ui.popbuffer()
6878 return source, sbranch, other, commoninc, commoninc[1]
6886 return source, sbranch, other, commoninc, commoninc[1]
6879
6887
6880 if needsincoming:
6888 if needsincoming:
6881 source, sbranch, sother, commoninc, incoming = getincoming()
6889 source, sbranch, sother, commoninc, incoming = getincoming()
6882 else:
6890 else:
6883 source = sbranch = sother = commoninc = incoming = None
6891 source = sbranch = sother = commoninc = incoming = None
6884
6892
6885 def getoutgoing():
6893 def getoutgoing():
6886 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6894 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6887 dbranch = branches[0]
6895 dbranch = branches[0]
6888 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6896 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6889 if source != dest:
6897 if source != dest:
6890 try:
6898 try:
6891 dother = hg.peer(repo, {}, dest)
6899 dother = hg.peer(repo, {}, dest)
6892 except error.RepoError:
6900 except error.RepoError:
6893 if opts.get('remote'):
6901 if opts.get('remote'):
6894 raise
6902 raise
6895 return dest, dbranch, None, None
6903 return dest, dbranch, None, None
6896 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6904 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6897 elif sother is None:
6905 elif sother is None:
6898 # there is no explicit destination peer, but source one is invalid
6906 # there is no explicit destination peer, but source one is invalid
6899 return dest, dbranch, None, None
6907 return dest, dbranch, None, None
6900 else:
6908 else:
6901 dother = sother
6909 dother = sother
6902 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6910 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6903 common = None
6911 common = None
6904 else:
6912 else:
6905 common = commoninc
6913 common = commoninc
6906 if revs:
6914 if revs:
6907 revs = [repo.lookup(rev) for rev in revs]
6915 revs = [repo.lookup(rev) for rev in revs]
6908 repo.ui.pushbuffer()
6916 repo.ui.pushbuffer()
6909 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6917 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6910 commoninc=common)
6918 commoninc=common)
6911 repo.ui.popbuffer()
6919 repo.ui.popbuffer()
6912 return dest, dbranch, dother, outgoing
6920 return dest, dbranch, dother, outgoing
6913
6921
6914 if needsoutgoing:
6922 if needsoutgoing:
6915 dest, dbranch, dother, outgoing = getoutgoing()
6923 dest, dbranch, dother, outgoing = getoutgoing()
6916 else:
6924 else:
6917 dest = dbranch = dother = outgoing = None
6925 dest = dbranch = dother = outgoing = None
6918
6926
6919 if opts.get('remote'):
6927 if opts.get('remote'):
6920 t = []
6928 t = []
6921 if incoming:
6929 if incoming:
6922 t.append(_('1 or more incoming'))
6930 t.append(_('1 or more incoming'))
6923 o = outgoing.missing
6931 o = outgoing.missing
6924 if o:
6932 if o:
6925 t.append(_('%d outgoing') % len(o))
6933 t.append(_('%d outgoing') % len(o))
6926 other = dother or sother
6934 other = dother or sother
6927 if 'bookmarks' in other.listkeys('namespaces'):
6935 if 'bookmarks' in other.listkeys('namespaces'):
6928 counts = bookmarks.summary(repo, other)
6936 counts = bookmarks.summary(repo, other)
6929 if counts[0] > 0:
6937 if counts[0] > 0:
6930 t.append(_('%d incoming bookmarks') % counts[0])
6938 t.append(_('%d incoming bookmarks') % counts[0])
6931 if counts[1] > 0:
6939 if counts[1] > 0:
6932 t.append(_('%d outgoing bookmarks') % counts[1])
6940 t.append(_('%d outgoing bookmarks') % counts[1])
6933
6941
6934 if t:
6942 if t:
6935 # i18n: column positioning for "hg summary"
6943 # i18n: column positioning for "hg summary"
6936 ui.write(_('remote: %s\n') % (', '.join(t)))
6944 ui.write(_('remote: %s\n') % (', '.join(t)))
6937 else:
6945 else:
6938 # i18n: column positioning for "hg summary"
6946 # i18n: column positioning for "hg summary"
6939 ui.status(_('remote: (synced)\n'))
6947 ui.status(_('remote: (synced)\n'))
6940
6948
6941 cmdutil.summaryremotehooks(ui, repo, opts,
6949 cmdutil.summaryremotehooks(ui, repo, opts,
6942 ((source, sbranch, sother, commoninc),
6950 ((source, sbranch, sother, commoninc),
6943 (dest, dbranch, dother, outgoing)))
6951 (dest, dbranch, dother, outgoing)))
6944
6952
6945 @command('tag',
6953 @command('tag',
6946 [('f', 'force', None, _('force tag')),
6954 [('f', 'force', None, _('force tag')),
6947 ('l', 'local', None, _('make the tag local')),
6955 ('l', 'local', None, _('make the tag local')),
6948 ('r', 'rev', '', _('revision to tag'), _('REV')),
6956 ('r', 'rev', '', _('revision to tag'), _('REV')),
6949 ('', 'remove', None, _('remove a tag')),
6957 ('', 'remove', None, _('remove a tag')),
6950 # -l/--local is already there, commitopts cannot be used
6958 # -l/--local is already there, commitopts cannot be used
6951 ('e', 'edit', None, _('invoke editor on commit messages')),
6959 ('e', 'edit', None, _('invoke editor on commit messages')),
6952 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6960 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6953 ] + commitopts2,
6961 ] + commitopts2,
6954 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6962 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6955 def tag(ui, repo, name1, *names, **opts):
6963 def tag(ui, repo, name1, *names, **opts):
6956 """add one or more tags for the current or given revision
6964 """add one or more tags for the current or given revision
6957
6965
6958 Name a particular revision using <name>.
6966 Name a particular revision using <name>.
6959
6967
6960 Tags are used to name particular revisions of the repository and are
6968 Tags are used to name particular revisions of the repository and are
6961 very useful to compare different revisions, to go back to significant
6969 very useful to compare different revisions, to go back to significant
6962 earlier versions or to mark branch points as releases, etc. Changing
6970 earlier versions or to mark branch points as releases, etc. Changing
6963 an existing tag is normally disallowed; use -f/--force to override.
6971 an existing tag is normally disallowed; use -f/--force to override.
6964
6972
6965 If no revision is given, the parent of the working directory is
6973 If no revision is given, the parent of the working directory is
6966 used.
6974 used.
6967
6975
6968 To facilitate version control, distribution, and merging of tags,
6976 To facilitate version control, distribution, and merging of tags,
6969 they are stored as a file named ".hgtags" which is managed similarly
6977 they are stored as a file named ".hgtags" which is managed similarly
6970 to other project files and can be hand-edited if necessary. This
6978 to other project files and can be hand-edited if necessary. This
6971 also means that tagging creates a new commit. The file
6979 also means that tagging creates a new commit. The file
6972 ".hg/localtags" is used for local tags (not shared among
6980 ".hg/localtags" is used for local tags (not shared among
6973 repositories).
6981 repositories).
6974
6982
6975 Tag commits are usually made at the head of a branch. If the parent
6983 Tag commits are usually made at the head of a branch. If the parent
6976 of the working directory is not a branch head, :hg:`tag` aborts; use
6984 of the working directory is not a branch head, :hg:`tag` aborts; use
6977 -f/--force to force the tag commit to be based on a non-head
6985 -f/--force to force the tag commit to be based on a non-head
6978 changeset.
6986 changeset.
6979
6987
6980 See :hg:`help dates` for a list of formats valid for -d/--date.
6988 See :hg:`help dates` for a list of formats valid for -d/--date.
6981
6989
6982 Since tag names have priority over branch names during revision
6990 Since tag names have priority over branch names during revision
6983 lookup, using an existing branch name as a tag name is discouraged.
6991 lookup, using an existing branch name as a tag name is discouraged.
6984
6992
6985 Returns 0 on success.
6993 Returns 0 on success.
6986 """
6994 """
6987 wlock = lock = None
6995 wlock = lock = None
6988 try:
6996 try:
6989 wlock = repo.wlock()
6997 wlock = repo.wlock()
6990 lock = repo.lock()
6998 lock = repo.lock()
6991 rev_ = "."
6999 rev_ = "."
6992 names = [t.strip() for t in (name1,) + names]
7000 names = [t.strip() for t in (name1,) + names]
6993 if len(names) != len(set(names)):
7001 if len(names) != len(set(names)):
6994 raise error.Abort(_('tag names must be unique'))
7002 raise error.Abort(_('tag names must be unique'))
6995 for n in names:
7003 for n in names:
6996 scmutil.checknewlabel(repo, n, 'tag')
7004 scmutil.checknewlabel(repo, n, 'tag')
6997 if not n:
7005 if not n:
6998 raise error.Abort(_('tag names cannot consist entirely of '
7006 raise error.Abort(_('tag names cannot consist entirely of '
6999 'whitespace'))
7007 'whitespace'))
7000 if opts.get('rev') and opts.get('remove'):
7008 if opts.get('rev') and opts.get('remove'):
7001 raise error.Abort(_("--rev and --remove are incompatible"))
7009 raise error.Abort(_("--rev and --remove are incompatible"))
7002 if opts.get('rev'):
7010 if opts.get('rev'):
7003 rev_ = opts['rev']
7011 rev_ = opts['rev']
7004 message = opts.get('message')
7012 message = opts.get('message')
7005 if opts.get('remove'):
7013 if opts.get('remove'):
7006 if opts.get('local'):
7014 if opts.get('local'):
7007 expectedtype = 'local'
7015 expectedtype = 'local'
7008 else:
7016 else:
7009 expectedtype = 'global'
7017 expectedtype = 'global'
7010
7018
7011 for n in names:
7019 for n in names:
7012 if not repo.tagtype(n):
7020 if not repo.tagtype(n):
7013 raise error.Abort(_("tag '%s' does not exist") % n)
7021 raise error.Abort(_("tag '%s' does not exist") % n)
7014 if repo.tagtype(n) != expectedtype:
7022 if repo.tagtype(n) != expectedtype:
7015 if expectedtype == 'global':
7023 if expectedtype == 'global':
7016 raise error.Abort(_("tag '%s' is not a global tag") % n)
7024 raise error.Abort(_("tag '%s' is not a global tag") % n)
7017 else:
7025 else:
7018 raise error.Abort(_("tag '%s' is not a local tag") % n)
7026 raise error.Abort(_("tag '%s' is not a local tag") % n)
7019 rev_ = 'null'
7027 rev_ = 'null'
7020 if not message:
7028 if not message:
7021 # we don't translate commit messages
7029 # we don't translate commit messages
7022 message = 'Removed tag %s' % ', '.join(names)
7030 message = 'Removed tag %s' % ', '.join(names)
7023 elif not opts.get('force'):
7031 elif not opts.get('force'):
7024 for n in names:
7032 for n in names:
7025 if n in repo.tags():
7033 if n in repo.tags():
7026 raise error.Abort(_("tag '%s' already exists "
7034 raise error.Abort(_("tag '%s' already exists "
7027 "(use -f to force)") % n)
7035 "(use -f to force)") % n)
7028 if not opts.get('local'):
7036 if not opts.get('local'):
7029 p1, p2 = repo.dirstate.parents()
7037 p1, p2 = repo.dirstate.parents()
7030 if p2 != nullid:
7038 if p2 != nullid:
7031 raise error.Abort(_('uncommitted merge'))
7039 raise error.Abort(_('uncommitted merge'))
7032 bheads = repo.branchheads()
7040 bheads = repo.branchheads()
7033 if not opts.get('force') and bheads and p1 not in bheads:
7041 if not opts.get('force') and bheads and p1 not in bheads:
7034 raise error.Abort(_('not at a branch head (use -f to force)'))
7042 raise error.Abort(_('not at a branch head (use -f to force)'))
7035 r = scmutil.revsingle(repo, rev_).node()
7043 r = scmutil.revsingle(repo, rev_).node()
7036
7044
7037 if not message:
7045 if not message:
7038 # we don't translate commit messages
7046 # we don't translate commit messages
7039 message = ('Added tag %s for changeset %s' %
7047 message = ('Added tag %s for changeset %s' %
7040 (', '.join(names), short(r)))
7048 (', '.join(names), short(r)))
7041
7049
7042 date = opts.get('date')
7050 date = opts.get('date')
7043 if date:
7051 if date:
7044 date = util.parsedate(date)
7052 date = util.parsedate(date)
7045
7053
7046 if opts.get('remove'):
7054 if opts.get('remove'):
7047 editform = 'tag.remove'
7055 editform = 'tag.remove'
7048 else:
7056 else:
7049 editform = 'tag.add'
7057 editform = 'tag.add'
7050 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7058 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7051
7059
7052 # don't allow tagging the null rev
7060 # don't allow tagging the null rev
7053 if (not opts.get('remove') and
7061 if (not opts.get('remove') and
7054 scmutil.revsingle(repo, rev_).rev() == nullrev):
7062 scmutil.revsingle(repo, rev_).rev() == nullrev):
7055 raise error.Abort(_("cannot tag null revision"))
7063 raise error.Abort(_("cannot tag null revision"))
7056
7064
7057 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7065 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7058 editor=editor)
7066 editor=editor)
7059 finally:
7067 finally:
7060 release(lock, wlock)
7068 release(lock, wlock)
7061
7069
7062 @command('tags', formatteropts, '')
7070 @command('tags', formatteropts, '')
7063 def tags(ui, repo, **opts):
7071 def tags(ui, repo, **opts):
7064 """list repository tags
7072 """list repository tags
7065
7073
7066 This lists both regular and local tags. When the -v/--verbose
7074 This lists both regular and local tags. When the -v/--verbose
7067 switch is used, a third column "local" is printed for local tags.
7075 switch is used, a third column "local" is printed for local tags.
7068 When the -q/--quiet switch is used, only the tag name is printed.
7076 When the -q/--quiet switch is used, only the tag name is printed.
7069
7077
7070 Returns 0 on success.
7078 Returns 0 on success.
7071 """
7079 """
7072
7080
7073 fm = ui.formatter('tags', opts)
7081 fm = ui.formatter('tags', opts)
7074 hexfunc = fm.hexfunc
7082 hexfunc = fm.hexfunc
7075 tagtype = ""
7083 tagtype = ""
7076
7084
7077 for t, n in reversed(repo.tagslist()):
7085 for t, n in reversed(repo.tagslist()):
7078 hn = hexfunc(n)
7086 hn = hexfunc(n)
7079 label = 'tags.normal'
7087 label = 'tags.normal'
7080 tagtype = ''
7088 tagtype = ''
7081 if repo.tagtype(t) == 'local':
7089 if repo.tagtype(t) == 'local':
7082 label = 'tags.local'
7090 label = 'tags.local'
7083 tagtype = 'local'
7091 tagtype = 'local'
7084
7092
7085 fm.startitem()
7093 fm.startitem()
7086 fm.write('tag', '%s', t, label=label)
7094 fm.write('tag', '%s', t, label=label)
7087 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7095 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7088 fm.condwrite(not ui.quiet, 'rev node', fmt,
7096 fm.condwrite(not ui.quiet, 'rev node', fmt,
7089 repo.changelog.rev(n), hn, label=label)
7097 repo.changelog.rev(n), hn, label=label)
7090 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7098 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7091 tagtype, label=label)
7099 tagtype, label=label)
7092 fm.plain('\n')
7100 fm.plain('\n')
7093 fm.end()
7101 fm.end()
7094
7102
7095 @command('tip',
7103 @command('tip',
7096 [('p', 'patch', None, _('show patch')),
7104 [('p', 'patch', None, _('show patch')),
7097 ('g', 'git', None, _('use git extended diff format')),
7105 ('g', 'git', None, _('use git extended diff format')),
7098 ] + templateopts,
7106 ] + templateopts,
7099 _('[-p] [-g]'))
7107 _('[-p] [-g]'))
7100 def tip(ui, repo, **opts):
7108 def tip(ui, repo, **opts):
7101 """show the tip revision (DEPRECATED)
7109 """show the tip revision (DEPRECATED)
7102
7110
7103 The tip revision (usually just called the tip) is the changeset
7111 The tip revision (usually just called the tip) is the changeset
7104 most recently added to the repository (and therefore the most
7112 most recently added to the repository (and therefore the most
7105 recently changed head).
7113 recently changed head).
7106
7114
7107 If you have just made a commit, that commit will be the tip. If
7115 If you have just made a commit, that commit will be the tip. If
7108 you have just pulled changes from another repository, the tip of
7116 you have just pulled changes from another repository, the tip of
7109 that repository becomes the current tip. The "tip" tag is special
7117 that repository becomes the current tip. The "tip" tag is special
7110 and cannot be renamed or assigned to a different changeset.
7118 and cannot be renamed or assigned to a different changeset.
7111
7119
7112 This command is deprecated, please use :hg:`heads` instead.
7120 This command is deprecated, please use :hg:`heads` instead.
7113
7121
7114 Returns 0 on success.
7122 Returns 0 on success.
7115 """
7123 """
7116 displayer = cmdutil.show_changeset(ui, repo, opts)
7124 displayer = cmdutil.show_changeset(ui, repo, opts)
7117 displayer.show(repo['tip'])
7125 displayer.show(repo['tip'])
7118 displayer.close()
7126 displayer.close()
7119
7127
7120 @command('unbundle',
7128 @command('unbundle',
7121 [('u', 'update', None,
7129 [('u', 'update', None,
7122 _('update to new branch head if changesets were unbundled'))],
7130 _('update to new branch head if changesets were unbundled'))],
7123 _('[-u] FILE...'))
7131 _('[-u] FILE...'))
7124 def unbundle(ui, repo, fname1, *fnames, **opts):
7132 def unbundle(ui, repo, fname1, *fnames, **opts):
7125 """apply one or more changegroup files
7133 """apply one or more changegroup files
7126
7134
7127 Apply one or more compressed changegroup files generated by the
7135 Apply one or more compressed changegroup files generated by the
7128 bundle command.
7136 bundle command.
7129
7137
7130 Returns 0 on success, 1 if an update has unresolved files.
7138 Returns 0 on success, 1 if an update has unresolved files.
7131 """
7139 """
7132 fnames = (fname1,) + fnames
7140 fnames = (fname1,) + fnames
7133
7141
7134 with repo.lock():
7142 with repo.lock():
7135 for fname in fnames:
7143 for fname in fnames:
7136 f = hg.openpath(ui, fname)
7144 f = hg.openpath(ui, fname)
7137 gen = exchange.readbundle(ui, f, fname)
7145 gen = exchange.readbundle(ui, f, fname)
7138 if isinstance(gen, bundle2.unbundle20):
7146 if isinstance(gen, bundle2.unbundle20):
7139 tr = repo.transaction('unbundle')
7147 tr = repo.transaction('unbundle')
7140 try:
7148 try:
7141 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7149 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7142 url='bundle:' + fname)
7150 url='bundle:' + fname)
7143 tr.close()
7151 tr.close()
7144 except error.BundleUnknownFeatureError as exc:
7152 except error.BundleUnknownFeatureError as exc:
7145 raise error.Abort(_('%s: unknown bundle feature, %s')
7153 raise error.Abort(_('%s: unknown bundle feature, %s')
7146 % (fname, exc),
7154 % (fname, exc),
7147 hint=_("see https://mercurial-scm.org/"
7155 hint=_("see https://mercurial-scm.org/"
7148 "wiki/BundleFeature for more "
7156 "wiki/BundleFeature for more "
7149 "information"))
7157 "information"))
7150 finally:
7158 finally:
7151 if tr:
7159 if tr:
7152 tr.release()
7160 tr.release()
7153 changes = [r.get('return', 0)
7161 changes = [r.get('return', 0)
7154 for r in op.records['changegroup']]
7162 for r in op.records['changegroup']]
7155 modheads = changegroup.combineresults(changes)
7163 modheads = changegroup.combineresults(changes)
7156 elif isinstance(gen, streamclone.streamcloneapplier):
7164 elif isinstance(gen, streamclone.streamcloneapplier):
7157 raise error.Abort(
7165 raise error.Abort(
7158 _('packed bundles cannot be applied with '
7166 _('packed bundles cannot be applied with '
7159 '"hg unbundle"'),
7167 '"hg unbundle"'),
7160 hint=_('use "hg debugapplystreamclonebundle"'))
7168 hint=_('use "hg debugapplystreamclonebundle"'))
7161 else:
7169 else:
7162 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7170 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7163
7171
7164 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7172 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7165
7173
7166 @command('^update|up|checkout|co',
7174 @command('^update|up|checkout|co',
7167 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7175 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7168 ('c', 'check', None, _('require clean working directory')),
7176 ('c', 'check', None, _('require clean working directory')),
7169 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7177 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7170 ('r', 'rev', '', _('revision'), _('REV'))
7178 ('r', 'rev', '', _('revision'), _('REV'))
7171 ] + mergetoolopts,
7179 ] + mergetoolopts,
7172 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7180 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7173 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7181 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7174 tool=None):
7182 tool=None):
7175 """update working directory (or switch revisions)
7183 """update working directory (or switch revisions)
7176
7184
7177 Update the repository's working directory to the specified
7185 Update the repository's working directory to the specified
7178 changeset. If no changeset is specified, update to the tip of the
7186 changeset. If no changeset is specified, update to the tip of the
7179 current named branch and move the active bookmark (see :hg:`help
7187 current named branch and move the active bookmark (see :hg:`help
7180 bookmarks`).
7188 bookmarks`).
7181
7189
7182 Update sets the working directory's parent revision to the specified
7190 Update sets the working directory's parent revision to the specified
7183 changeset (see :hg:`help parents`).
7191 changeset (see :hg:`help parents`).
7184
7192
7185 If the changeset is not a descendant or ancestor of the working
7193 If the changeset is not a descendant or ancestor of the working
7186 directory's parent, the update is aborted. With the -c/--check
7194 directory's parent, the update is aborted. With the -c/--check
7187 option, the working directory is checked for uncommitted changes; if
7195 option, the working directory is checked for uncommitted changes; if
7188 none are found, the working directory is updated to the specified
7196 none are found, the working directory is updated to the specified
7189 changeset.
7197 changeset.
7190
7198
7191 .. container:: verbose
7199 .. container:: verbose
7192
7200
7193 The following rules apply when the working directory contains
7201 The following rules apply when the working directory contains
7194 uncommitted changes:
7202 uncommitted changes:
7195
7203
7196 1. If neither -c/--check nor -C/--clean is specified, and if
7204 1. If neither -c/--check nor -C/--clean is specified, and if
7197 the requested changeset is an ancestor or descendant of
7205 the requested changeset is an ancestor or descendant of
7198 the working directory's parent, the uncommitted changes
7206 the working directory's parent, the uncommitted changes
7199 are merged into the requested changeset and the merged
7207 are merged into the requested changeset and the merged
7200 result is left uncommitted. If the requested changeset is
7208 result is left uncommitted. If the requested changeset is
7201 not an ancestor or descendant (that is, it is on another
7209 not an ancestor or descendant (that is, it is on another
7202 branch), the update is aborted and the uncommitted changes
7210 branch), the update is aborted and the uncommitted changes
7203 are preserved.
7211 are preserved.
7204
7212
7205 2. With the -c/--check option, the update is aborted and the
7213 2. With the -c/--check option, the update is aborted and the
7206 uncommitted changes are preserved.
7214 uncommitted changes are preserved.
7207
7215
7208 3. With the -C/--clean option, uncommitted changes are discarded and
7216 3. With the -C/--clean option, uncommitted changes are discarded and
7209 the working directory is updated to the requested changeset.
7217 the working directory is updated to the requested changeset.
7210
7218
7211 To cancel an uncommitted merge (and lose your changes), use
7219 To cancel an uncommitted merge (and lose your changes), use
7212 :hg:`update --clean .`.
7220 :hg:`update --clean .`.
7213
7221
7214 Use null as the changeset to remove the working directory (like
7222 Use null as the changeset to remove the working directory (like
7215 :hg:`clone -U`).
7223 :hg:`clone -U`).
7216
7224
7217 If you want to revert just one file to an older revision, use
7225 If you want to revert just one file to an older revision, use
7218 :hg:`revert [-r REV] NAME`.
7226 :hg:`revert [-r REV] NAME`.
7219
7227
7220 See :hg:`help dates` for a list of formats valid for -d/--date.
7228 See :hg:`help dates` for a list of formats valid for -d/--date.
7221
7229
7222 Returns 0 on success, 1 if there are unresolved files.
7230 Returns 0 on success, 1 if there are unresolved files.
7223 """
7231 """
7224 if rev and node:
7232 if rev and node:
7225 raise error.Abort(_("please specify just one revision"))
7233 raise error.Abort(_("please specify just one revision"))
7226
7234
7227 if rev is None or rev == '':
7235 if rev is None or rev == '':
7228 rev = node
7236 rev = node
7229
7237
7230 if date and rev is not None:
7238 if date and rev is not None:
7231 raise error.Abort(_("you can't specify a revision and a date"))
7239 raise error.Abort(_("you can't specify a revision and a date"))
7232
7240
7233 if check and clean:
7241 if check and clean:
7234 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7242 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7235
7243
7236 with repo.wlock():
7244 with repo.wlock():
7237 cmdutil.clearunfinished(repo)
7245 cmdutil.clearunfinished(repo)
7238
7246
7239 if date:
7247 if date:
7240 rev = cmdutil.finddate(ui, repo, date)
7248 rev = cmdutil.finddate(ui, repo, date)
7241
7249
7242 # if we defined a bookmark, we have to remember the original name
7250 # if we defined a bookmark, we have to remember the original name
7243 brev = rev
7251 brev = rev
7244 rev = scmutil.revsingle(repo, rev, rev).rev()
7252 rev = scmutil.revsingle(repo, rev, rev).rev()
7245
7253
7246 if check:
7254 if check:
7247 cmdutil.bailifchanged(repo, merge=False)
7255 cmdutil.bailifchanged(repo, merge=False)
7248
7256
7249 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7257 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7250
7258
7251 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7259 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7252
7260
7253 @command('verify', [])
7261 @command('verify', [])
7254 def verify(ui, repo):
7262 def verify(ui, repo):
7255 """verify the integrity of the repository
7263 """verify the integrity of the repository
7256
7264
7257 Verify the integrity of the current repository.
7265 Verify the integrity of the current repository.
7258
7266
7259 This will perform an extensive check of the repository's
7267 This will perform an extensive check of the repository's
7260 integrity, validating the hashes and checksums of each entry in
7268 integrity, validating the hashes and checksums of each entry in
7261 the changelog, manifest, and tracked files, as well as the
7269 the changelog, manifest, and tracked files, as well as the
7262 integrity of their crosslinks and indices.
7270 integrity of their crosslinks and indices.
7263
7271
7264 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7272 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7265 for more information about recovery from corruption of the
7273 for more information about recovery from corruption of the
7266 repository.
7274 repository.
7267
7275
7268 Returns 0 on success, 1 if errors are encountered.
7276 Returns 0 on success, 1 if errors are encountered.
7269 """
7277 """
7270 return hg.verify(repo)
7278 return hg.verify(repo)
7271
7279
7272 @command('version', [] + formatteropts, norepo=True)
7280 @command('version', [] + formatteropts, norepo=True)
7273 def version_(ui, **opts):
7281 def version_(ui, **opts):
7274 """output version and copyright information"""
7282 """output version and copyright information"""
7275 fm = ui.formatter("version", opts)
7283 fm = ui.formatter("version", opts)
7276 fm.startitem()
7284 fm.startitem()
7277 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7285 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7278 util.version())
7286 util.version())
7279 license = _(
7287 license = _(
7280 "(see https://mercurial-scm.org for more information)\n"
7288 "(see https://mercurial-scm.org for more information)\n"
7281 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7289 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7282 "This is free software; see the source for copying conditions. "
7290 "This is free software; see the source for copying conditions. "
7283 "There is NO\nwarranty; "
7291 "There is NO\nwarranty; "
7284 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7292 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7285 )
7293 )
7286 if not ui.quiet:
7294 if not ui.quiet:
7287 fm.plain(license)
7295 fm.plain(license)
7288
7296
7289 if ui.verbose:
7297 if ui.verbose:
7290 fm.plain(_("\nEnabled extensions:\n\n"))
7298 fm.plain(_("\nEnabled extensions:\n\n"))
7291 # format names and versions into columns
7299 # format names and versions into columns
7292 names = []
7300 names = []
7293 vers = []
7301 vers = []
7294 isinternals = []
7302 isinternals = []
7295 for name, module in extensions.extensions():
7303 for name, module in extensions.extensions():
7296 names.append(name)
7304 names.append(name)
7297 vers.append(extensions.moduleversion(module) or None)
7305 vers.append(extensions.moduleversion(module) or None)
7298 isinternals.append(extensions.ismoduleinternal(module))
7306 isinternals.append(extensions.ismoduleinternal(module))
7299 fn = fm.nested("extensions")
7307 fn = fm.nested("extensions")
7300 if names:
7308 if names:
7301 namefmt = " %%-%ds " % max(len(n) for n in names)
7309 namefmt = " %%-%ds " % max(len(n) for n in names)
7302 places = [_("external"), _("internal")]
7310 places = [_("external"), _("internal")]
7303 for n, v, p in zip(names, vers, isinternals):
7311 for n, v, p in zip(names, vers, isinternals):
7304 fn.startitem()
7312 fn.startitem()
7305 fn.condwrite(ui.verbose, "name", namefmt, n)
7313 fn.condwrite(ui.verbose, "name", namefmt, n)
7306 if ui.verbose:
7314 if ui.verbose:
7307 fn.plain("%s " % places[p])
7315 fn.plain("%s " % places[p])
7308 fn.data(bundled=p)
7316 fn.data(bundled=p)
7309 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7317 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7310 if ui.verbose:
7318 if ui.verbose:
7311 fn.plain("\n")
7319 fn.plain("\n")
7312 fn.end()
7320 fn.end()
7313 fm.end()
7321 fm.end()
7314
7322
7315 def loadcmdtable(ui, name, cmdtable):
7323 def loadcmdtable(ui, name, cmdtable):
7316 """Load command functions from specified cmdtable
7324 """Load command functions from specified cmdtable
7317 """
7325 """
7318 overrides = [cmd for cmd in cmdtable if cmd in table]
7326 overrides = [cmd for cmd in cmdtable if cmd in table]
7319 if overrides:
7327 if overrides:
7320 ui.warn(_("extension '%s' overrides commands: %s\n")
7328 ui.warn(_("extension '%s' overrides commands: %s\n")
7321 % (name, " ".join(overrides)))
7329 % (name, " ".join(overrides)))
7322 table.update(cmdtable)
7330 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now