##// END OF EJS Templates
debugextensions: show ships-with-hg-core state as a separate field...
Yuya Nishihara -
r29892:b64eaf94 default
parent child Browse files
Show More
@@ -1,7320 +1,7324 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 revs
1414 heads = revs and map(repo.lookup, revs) or revs
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 exttestedwith = getattr(extmod, 'testedwith', '').split()
2399 exttestedwith = getattr(extmod, 'testedwith', '').split()
2400 if isinternal:
2400 if isinternal:
2401 showtestedwith = ['internal']
2401 showtestedwith = ['internal']
2402 else:
2402 else:
2403 showtestedwith = exttestedwith
2403 showtestedwith = exttestedwith
2404 extbuglink = getattr(extmod, 'buglink', None)
2404 extbuglink = getattr(extmod, 'buglink', None)
2405
2405
2406 fm.startitem()
2406 fm.startitem()
2407
2407
2408 if ui.quiet or ui.verbose:
2408 if ui.quiet or ui.verbose:
2409 fm.write('name', '%s\n', extname)
2409 fm.write('name', '%s\n', extname)
2410 else:
2410 else:
2411 fm.write('name', '%s', extname)
2411 fm.write('name', '%s', extname)
2412 if not exttestedwith:
2412 if not exttestedwith:
2413 fm.plain(_(' (untested!)\n'))
2413 fm.plain(_(' (untested!)\n'))
2414 elif isinternal or hgver in exttestedwith:
2414 elif isinternal or hgver in exttestedwith:
2415 fm.plain('\n')
2415 fm.plain('\n')
2416 else:
2416 else:
2417 lasttestedversion = exttestedwith[-1]
2417 lasttestedversion = exttestedwith[-1]
2418 fm.plain(' (%s!)\n' % lasttestedversion)
2418 fm.plain(' (%s!)\n' % lasttestedversion)
2419
2419
2420 fm.condwrite(ui.verbose and extsource, 'source',
2420 fm.condwrite(ui.verbose and extsource, 'source',
2421 _(' location: %s\n'), extsource or "")
2421 _(' location: %s\n'), extsource or "")
2422
2422
2423 if ui.verbose:
2424 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2425 fm.data(bundled=isinternal)
2426
2423 fm.condwrite(ui.verbose and showtestedwith, 'testedwith',
2427 fm.condwrite(ui.verbose and showtestedwith, 'testedwith',
2424 _(' tested with: %s\n'),
2428 _(' tested with: %s\n'),
2425 fm.formatlist(showtestedwith, name='ver'))
2429 fm.formatlist(showtestedwith, name='ver'))
2426
2430
2427 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2431 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2428 _(' bug reporting: %s\n'), extbuglink or "")
2432 _(' bug reporting: %s\n'), extbuglink or "")
2429
2433
2430 fm.end()
2434 fm.end()
2431
2435
2432 @command('debugfileset',
2436 @command('debugfileset',
2433 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2437 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2434 _('[-r REV] FILESPEC'))
2438 _('[-r REV] FILESPEC'))
2435 def debugfileset(ui, repo, expr, **opts):
2439 def debugfileset(ui, repo, expr, **opts):
2436 '''parse and apply a fileset specification'''
2440 '''parse and apply a fileset specification'''
2437 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2441 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2438 if ui.verbose:
2442 if ui.verbose:
2439 tree = fileset.parse(expr)
2443 tree = fileset.parse(expr)
2440 ui.note(fileset.prettyformat(tree), "\n")
2444 ui.note(fileset.prettyformat(tree), "\n")
2441
2445
2442 for f in ctx.getfileset(expr):
2446 for f in ctx.getfileset(expr):
2443 ui.write("%s\n" % f)
2447 ui.write("%s\n" % f)
2444
2448
2445 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2449 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2446 def debugfsinfo(ui, path="."):
2450 def debugfsinfo(ui, path="."):
2447 """show information detected about current filesystem"""
2451 """show information detected about current filesystem"""
2448 util.writefile('.debugfsinfo', '')
2452 util.writefile('.debugfsinfo', '')
2449 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2453 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2450 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2454 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2451 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2455 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2452 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2456 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2453 and 'yes' or 'no'))
2457 and 'yes' or 'no'))
2454 os.unlink('.debugfsinfo')
2458 os.unlink('.debugfsinfo')
2455
2459
2456 @command('debuggetbundle',
2460 @command('debuggetbundle',
2457 [('H', 'head', [], _('id of head node'), _('ID')),
2461 [('H', 'head', [], _('id of head node'), _('ID')),
2458 ('C', 'common', [], _('id of common node'), _('ID')),
2462 ('C', 'common', [], _('id of common node'), _('ID')),
2459 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2463 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2460 _('REPO FILE [-H|-C ID]...'),
2464 _('REPO FILE [-H|-C ID]...'),
2461 norepo=True)
2465 norepo=True)
2462 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2466 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2463 """retrieves a bundle from a repo
2467 """retrieves a bundle from a repo
2464
2468
2465 Every ID must be a full-length hex node id string. Saves the bundle to the
2469 Every ID must be a full-length hex node id string. Saves the bundle to the
2466 given file.
2470 given file.
2467 """
2471 """
2468 repo = hg.peer(ui, opts, repopath)
2472 repo = hg.peer(ui, opts, repopath)
2469 if not repo.capable('getbundle'):
2473 if not repo.capable('getbundle'):
2470 raise error.Abort("getbundle() not supported by target repository")
2474 raise error.Abort("getbundle() not supported by target repository")
2471 args = {}
2475 args = {}
2472 if common:
2476 if common:
2473 args['common'] = [bin(s) for s in common]
2477 args['common'] = [bin(s) for s in common]
2474 if head:
2478 if head:
2475 args['heads'] = [bin(s) for s in head]
2479 args['heads'] = [bin(s) for s in head]
2476 # TODO: get desired bundlecaps from command line.
2480 # TODO: get desired bundlecaps from command line.
2477 args['bundlecaps'] = None
2481 args['bundlecaps'] = None
2478 bundle = repo.getbundle('debug', **args)
2482 bundle = repo.getbundle('debug', **args)
2479
2483
2480 bundletype = opts.get('type', 'bzip2').lower()
2484 bundletype = opts.get('type', 'bzip2').lower()
2481 btypes = {'none': 'HG10UN',
2485 btypes = {'none': 'HG10UN',
2482 'bzip2': 'HG10BZ',
2486 'bzip2': 'HG10BZ',
2483 'gzip': 'HG10GZ',
2487 'gzip': 'HG10GZ',
2484 'bundle2': 'HG20'}
2488 'bundle2': 'HG20'}
2485 bundletype = btypes.get(bundletype)
2489 bundletype = btypes.get(bundletype)
2486 if bundletype not in bundle2.bundletypes:
2490 if bundletype not in bundle2.bundletypes:
2487 raise error.Abort(_('unknown bundle type specified with --type'))
2491 raise error.Abort(_('unknown bundle type specified with --type'))
2488 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2492 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2489
2493
2490 @command('debugignore', [], '[FILE]')
2494 @command('debugignore', [], '[FILE]')
2491 def debugignore(ui, repo, *files, **opts):
2495 def debugignore(ui, repo, *files, **opts):
2492 """display the combined ignore pattern and information about ignored files
2496 """display the combined ignore pattern and information about ignored files
2493
2497
2494 With no argument display the combined ignore pattern.
2498 With no argument display the combined ignore pattern.
2495
2499
2496 Given space separated file names, shows if the given file is ignored and
2500 Given space separated file names, shows if the given file is ignored and
2497 if so, show the ignore rule (file and line number) that matched it.
2501 if so, show the ignore rule (file and line number) that matched it.
2498 """
2502 """
2499 ignore = repo.dirstate._ignore
2503 ignore = repo.dirstate._ignore
2500 if not files:
2504 if not files:
2501 # Show all the patterns
2505 # Show all the patterns
2502 includepat = getattr(ignore, 'includepat', None)
2506 includepat = getattr(ignore, 'includepat', None)
2503 if includepat is not None:
2507 if includepat is not None:
2504 ui.write("%s\n" % includepat)
2508 ui.write("%s\n" % includepat)
2505 else:
2509 else:
2506 raise error.Abort(_("no ignore patterns found"))
2510 raise error.Abort(_("no ignore patterns found"))
2507 else:
2511 else:
2508 for f in files:
2512 for f in files:
2509 nf = util.normpath(f)
2513 nf = util.normpath(f)
2510 ignored = None
2514 ignored = None
2511 ignoredata = None
2515 ignoredata = None
2512 if nf != '.':
2516 if nf != '.':
2513 if ignore(nf):
2517 if ignore(nf):
2514 ignored = nf
2518 ignored = nf
2515 ignoredata = repo.dirstate._ignorefileandline(nf)
2519 ignoredata = repo.dirstate._ignorefileandline(nf)
2516 else:
2520 else:
2517 for p in util.finddirs(nf):
2521 for p in util.finddirs(nf):
2518 if ignore(p):
2522 if ignore(p):
2519 ignored = p
2523 ignored = p
2520 ignoredata = repo.dirstate._ignorefileandline(p)
2524 ignoredata = repo.dirstate._ignorefileandline(p)
2521 break
2525 break
2522 if ignored:
2526 if ignored:
2523 if ignored == nf:
2527 if ignored == nf:
2524 ui.write(_("%s is ignored\n") % f)
2528 ui.write(_("%s is ignored\n") % f)
2525 else:
2529 else:
2526 ui.write(_("%s is ignored because of "
2530 ui.write(_("%s is ignored because of "
2527 "containing folder %s\n")
2531 "containing folder %s\n")
2528 % (f, ignored))
2532 % (f, ignored))
2529 ignorefile, lineno, line = ignoredata
2533 ignorefile, lineno, line = ignoredata
2530 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2534 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2531 % (ignorefile, lineno, line))
2535 % (ignorefile, lineno, line))
2532 else:
2536 else:
2533 ui.write(_("%s is not ignored\n") % f)
2537 ui.write(_("%s is not ignored\n") % f)
2534
2538
2535 @command('debugindex', debugrevlogopts +
2539 @command('debugindex', debugrevlogopts +
2536 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2540 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2537 _('[-f FORMAT] -c|-m|FILE'),
2541 _('[-f FORMAT] -c|-m|FILE'),
2538 optionalrepo=True)
2542 optionalrepo=True)
2539 def debugindex(ui, repo, file_=None, **opts):
2543 def debugindex(ui, repo, file_=None, **opts):
2540 """dump the contents of an index file"""
2544 """dump the contents of an index file"""
2541 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2545 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2542 format = opts.get('format', 0)
2546 format = opts.get('format', 0)
2543 if format not in (0, 1):
2547 if format not in (0, 1):
2544 raise error.Abort(_("unknown format %d") % format)
2548 raise error.Abort(_("unknown format %d") % format)
2545
2549
2546 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2550 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2547 if generaldelta:
2551 if generaldelta:
2548 basehdr = ' delta'
2552 basehdr = ' delta'
2549 else:
2553 else:
2550 basehdr = ' base'
2554 basehdr = ' base'
2551
2555
2552 if ui.debugflag:
2556 if ui.debugflag:
2553 shortfn = hex
2557 shortfn = hex
2554 else:
2558 else:
2555 shortfn = short
2559 shortfn = short
2556
2560
2557 # There might not be anything in r, so have a sane default
2561 # There might not be anything in r, so have a sane default
2558 idlen = 12
2562 idlen = 12
2559 for i in r:
2563 for i in r:
2560 idlen = len(shortfn(r.node(i)))
2564 idlen = len(shortfn(r.node(i)))
2561 break
2565 break
2562
2566
2563 if format == 0:
2567 if format == 0:
2564 ui.write((" rev offset length " + basehdr + " linkrev"
2568 ui.write((" rev offset length " + basehdr + " linkrev"
2565 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2569 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2566 elif format == 1:
2570 elif format == 1:
2567 ui.write((" rev flag offset length"
2571 ui.write((" rev flag offset length"
2568 " size " + basehdr + " link p1 p2"
2572 " size " + basehdr + " link p1 p2"
2569 " %s\n") % "nodeid".rjust(idlen))
2573 " %s\n") % "nodeid".rjust(idlen))
2570
2574
2571 for i in r:
2575 for i in r:
2572 node = r.node(i)
2576 node = r.node(i)
2573 if generaldelta:
2577 if generaldelta:
2574 base = r.deltaparent(i)
2578 base = r.deltaparent(i)
2575 else:
2579 else:
2576 base = r.chainbase(i)
2580 base = r.chainbase(i)
2577 if format == 0:
2581 if format == 0:
2578 try:
2582 try:
2579 pp = r.parents(node)
2583 pp = r.parents(node)
2580 except Exception:
2584 except Exception:
2581 pp = [nullid, nullid]
2585 pp = [nullid, nullid]
2582 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2586 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2583 i, r.start(i), r.length(i), base, r.linkrev(i),
2587 i, r.start(i), r.length(i), base, r.linkrev(i),
2584 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2588 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2585 elif format == 1:
2589 elif format == 1:
2586 pr = r.parentrevs(i)
2590 pr = r.parentrevs(i)
2587 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2591 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2588 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2592 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2589 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2593 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2590
2594
2591 @command('debugindexdot', debugrevlogopts,
2595 @command('debugindexdot', debugrevlogopts,
2592 _('-c|-m|FILE'), optionalrepo=True)
2596 _('-c|-m|FILE'), optionalrepo=True)
2593 def debugindexdot(ui, repo, file_=None, **opts):
2597 def debugindexdot(ui, repo, file_=None, **opts):
2594 """dump an index DAG as a graphviz dot file"""
2598 """dump an index DAG as a graphviz dot file"""
2595 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2599 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2596 ui.write(("digraph G {\n"))
2600 ui.write(("digraph G {\n"))
2597 for i in r:
2601 for i in r:
2598 node = r.node(i)
2602 node = r.node(i)
2599 pp = r.parents(node)
2603 pp = r.parents(node)
2600 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2604 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2601 if pp[1] != nullid:
2605 if pp[1] != nullid:
2602 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2606 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2603 ui.write("}\n")
2607 ui.write("}\n")
2604
2608
2605 @command('debugdeltachain',
2609 @command('debugdeltachain',
2606 debugrevlogopts + formatteropts,
2610 debugrevlogopts + formatteropts,
2607 _('-c|-m|FILE'),
2611 _('-c|-m|FILE'),
2608 optionalrepo=True)
2612 optionalrepo=True)
2609 def debugdeltachain(ui, repo, file_=None, **opts):
2613 def debugdeltachain(ui, repo, file_=None, **opts):
2610 """dump information about delta chains in a revlog
2614 """dump information about delta chains in a revlog
2611
2615
2612 Output can be templatized. Available template keywords are:
2616 Output can be templatized. Available template keywords are:
2613
2617
2614 :``rev``: revision number
2618 :``rev``: revision number
2615 :``chainid``: delta chain identifier (numbered by unique base)
2619 :``chainid``: delta chain identifier (numbered by unique base)
2616 :``chainlen``: delta chain length to this revision
2620 :``chainlen``: delta chain length to this revision
2617 :``prevrev``: previous revision in delta chain
2621 :``prevrev``: previous revision in delta chain
2618 :``deltatype``: role of delta / how it was computed
2622 :``deltatype``: role of delta / how it was computed
2619 :``compsize``: compressed size of revision
2623 :``compsize``: compressed size of revision
2620 :``uncompsize``: uncompressed size of revision
2624 :``uncompsize``: uncompressed size of revision
2621 :``chainsize``: total size of compressed revisions in chain
2625 :``chainsize``: total size of compressed revisions in chain
2622 :``chainratio``: total chain size divided by uncompressed revision size
2626 :``chainratio``: total chain size divided by uncompressed revision size
2623 (new delta chains typically start at ratio 2.00)
2627 (new delta chains typically start at ratio 2.00)
2624 :``lindist``: linear distance from base revision in delta chain to end
2628 :``lindist``: linear distance from base revision in delta chain to end
2625 of this revision
2629 of this revision
2626 :``extradist``: total size of revisions not part of this delta chain from
2630 :``extradist``: total size of revisions not part of this delta chain from
2627 base of delta chain to end of this revision; a measurement
2631 base of delta chain to end of this revision; a measurement
2628 of how much extra data we need to read/seek across to read
2632 of how much extra data we need to read/seek across to read
2629 the delta chain for this revision
2633 the delta chain for this revision
2630 :``extraratio``: extradist divided by chainsize; another representation of
2634 :``extraratio``: extradist divided by chainsize; another representation of
2631 how much unrelated data is needed to load this delta chain
2635 how much unrelated data is needed to load this delta chain
2632 """
2636 """
2633 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2637 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2634 index = r.index
2638 index = r.index
2635 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2639 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2636
2640
2637 def revinfo(rev):
2641 def revinfo(rev):
2638 e = index[rev]
2642 e = index[rev]
2639 compsize = e[1]
2643 compsize = e[1]
2640 uncompsize = e[2]
2644 uncompsize = e[2]
2641 chainsize = 0
2645 chainsize = 0
2642
2646
2643 if generaldelta:
2647 if generaldelta:
2644 if e[3] == e[5]:
2648 if e[3] == e[5]:
2645 deltatype = 'p1'
2649 deltatype = 'p1'
2646 elif e[3] == e[6]:
2650 elif e[3] == e[6]:
2647 deltatype = 'p2'
2651 deltatype = 'p2'
2648 elif e[3] == rev - 1:
2652 elif e[3] == rev - 1:
2649 deltatype = 'prev'
2653 deltatype = 'prev'
2650 elif e[3] == rev:
2654 elif e[3] == rev:
2651 deltatype = 'base'
2655 deltatype = 'base'
2652 else:
2656 else:
2653 deltatype = 'other'
2657 deltatype = 'other'
2654 else:
2658 else:
2655 if e[3] == rev:
2659 if e[3] == rev:
2656 deltatype = 'base'
2660 deltatype = 'base'
2657 else:
2661 else:
2658 deltatype = 'prev'
2662 deltatype = 'prev'
2659
2663
2660 chain = r._deltachain(rev)[0]
2664 chain = r._deltachain(rev)[0]
2661 for iterrev in chain:
2665 for iterrev in chain:
2662 e = index[iterrev]
2666 e = index[iterrev]
2663 chainsize += e[1]
2667 chainsize += e[1]
2664
2668
2665 return compsize, uncompsize, deltatype, chain, chainsize
2669 return compsize, uncompsize, deltatype, chain, chainsize
2666
2670
2667 fm = ui.formatter('debugdeltachain', opts)
2671 fm = ui.formatter('debugdeltachain', opts)
2668
2672
2669 fm.plain(' rev chain# chainlen prev delta '
2673 fm.plain(' rev chain# chainlen prev delta '
2670 'size rawsize chainsize ratio lindist extradist '
2674 'size rawsize chainsize ratio lindist extradist '
2671 'extraratio\n')
2675 'extraratio\n')
2672
2676
2673 chainbases = {}
2677 chainbases = {}
2674 for rev in r:
2678 for rev in r:
2675 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2679 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2676 chainbase = chain[0]
2680 chainbase = chain[0]
2677 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2681 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2678 basestart = r.start(chainbase)
2682 basestart = r.start(chainbase)
2679 revstart = r.start(rev)
2683 revstart = r.start(rev)
2680 lineardist = revstart + comp - basestart
2684 lineardist = revstart + comp - basestart
2681 extradist = lineardist - chainsize
2685 extradist = lineardist - chainsize
2682 try:
2686 try:
2683 prevrev = chain[-2]
2687 prevrev = chain[-2]
2684 except IndexError:
2688 except IndexError:
2685 prevrev = -1
2689 prevrev = -1
2686
2690
2687 chainratio = float(chainsize) / float(uncomp)
2691 chainratio = float(chainsize) / float(uncomp)
2688 extraratio = float(extradist) / float(chainsize)
2692 extraratio = float(extradist) / float(chainsize)
2689
2693
2690 fm.startitem()
2694 fm.startitem()
2691 fm.write('rev chainid chainlen prevrev deltatype compsize '
2695 fm.write('rev chainid chainlen prevrev deltatype compsize '
2692 'uncompsize chainsize chainratio lindist extradist '
2696 'uncompsize chainsize chainratio lindist extradist '
2693 'extraratio',
2697 'extraratio',
2694 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2698 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2695 rev, chainid, len(chain), prevrev, deltatype, comp,
2699 rev, chainid, len(chain), prevrev, deltatype, comp,
2696 uncomp, chainsize, chainratio, lineardist, extradist,
2700 uncomp, chainsize, chainratio, lineardist, extradist,
2697 extraratio,
2701 extraratio,
2698 rev=rev, chainid=chainid, chainlen=len(chain),
2702 rev=rev, chainid=chainid, chainlen=len(chain),
2699 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2703 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2700 uncompsize=uncomp, chainsize=chainsize,
2704 uncompsize=uncomp, chainsize=chainsize,
2701 chainratio=chainratio, lindist=lineardist,
2705 chainratio=chainratio, lindist=lineardist,
2702 extradist=extradist, extraratio=extraratio)
2706 extradist=extradist, extraratio=extraratio)
2703
2707
2704 fm.end()
2708 fm.end()
2705
2709
2706 @command('debuginstall', [] + formatteropts, '', norepo=True)
2710 @command('debuginstall', [] + formatteropts, '', norepo=True)
2707 def debuginstall(ui, **opts):
2711 def debuginstall(ui, **opts):
2708 '''test Mercurial installation
2712 '''test Mercurial installation
2709
2713
2710 Returns 0 on success.
2714 Returns 0 on success.
2711 '''
2715 '''
2712
2716
2713 def writetemp(contents):
2717 def writetemp(contents):
2714 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2718 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2715 f = os.fdopen(fd, "wb")
2719 f = os.fdopen(fd, "wb")
2716 f.write(contents)
2720 f.write(contents)
2717 f.close()
2721 f.close()
2718 return name
2722 return name
2719
2723
2720 problems = 0
2724 problems = 0
2721
2725
2722 fm = ui.formatter('debuginstall', opts)
2726 fm = ui.formatter('debuginstall', opts)
2723 fm.startitem()
2727 fm.startitem()
2724
2728
2725 # encoding
2729 # encoding
2726 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2730 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2727 err = None
2731 err = None
2728 try:
2732 try:
2729 encoding.fromlocal("test")
2733 encoding.fromlocal("test")
2730 except error.Abort as inst:
2734 except error.Abort as inst:
2731 err = inst
2735 err = inst
2732 problems += 1
2736 problems += 1
2733 fm.condwrite(err, 'encodingerror', _(" %s\n"
2737 fm.condwrite(err, 'encodingerror', _(" %s\n"
2734 " (check that your locale is properly set)\n"), err)
2738 " (check that your locale is properly set)\n"), err)
2735
2739
2736 # Python
2740 # Python
2737 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2741 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2738 sys.executable)
2742 sys.executable)
2739 fm.write('pythonver', _("checking Python version (%s)\n"),
2743 fm.write('pythonver', _("checking Python version (%s)\n"),
2740 ("%s.%s.%s" % sys.version_info[:3]))
2744 ("%s.%s.%s" % sys.version_info[:3]))
2741 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2745 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2742 os.path.dirname(os.__file__))
2746 os.path.dirname(os.__file__))
2743
2747
2744 # hg version
2748 # hg version
2745 hgver = util.version()
2749 hgver = util.version()
2746 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2750 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2747 hgver.split('+')[0])
2751 hgver.split('+')[0])
2748 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2752 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2749 '+'.join(hgver.split('+')[1:]))
2753 '+'.join(hgver.split('+')[1:]))
2750
2754
2751 # compiled modules
2755 # compiled modules
2752 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2756 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2753 policy.policy)
2757 policy.policy)
2754 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2758 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2755 os.path.dirname(__file__))
2759 os.path.dirname(__file__))
2756
2760
2757 err = None
2761 err = None
2758 try:
2762 try:
2759 from . import (
2763 from . import (
2760 base85,
2764 base85,
2761 bdiff,
2765 bdiff,
2762 mpatch,
2766 mpatch,
2763 osutil,
2767 osutil,
2764 )
2768 )
2765 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2769 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2766 except Exception as inst:
2770 except Exception as inst:
2767 err = inst
2771 err = inst
2768 problems += 1
2772 problems += 1
2769 fm.condwrite(err, 'extensionserror', " %s\n", err)
2773 fm.condwrite(err, 'extensionserror', " %s\n", err)
2770
2774
2771 # templates
2775 # templates
2772 p = templater.templatepaths()
2776 p = templater.templatepaths()
2773 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2777 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2774 fm.condwrite(not p, '', _(" no template directories found\n"))
2778 fm.condwrite(not p, '', _(" no template directories found\n"))
2775 if p:
2779 if p:
2776 m = templater.templatepath("map-cmdline.default")
2780 m = templater.templatepath("map-cmdline.default")
2777 if m:
2781 if m:
2778 # template found, check if it is working
2782 # template found, check if it is working
2779 err = None
2783 err = None
2780 try:
2784 try:
2781 templater.templater.frommapfile(m)
2785 templater.templater.frommapfile(m)
2782 except Exception as inst:
2786 except Exception as inst:
2783 err = inst
2787 err = inst
2784 p = None
2788 p = None
2785 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2789 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2786 else:
2790 else:
2787 p = None
2791 p = None
2788 fm.condwrite(p, 'defaulttemplate',
2792 fm.condwrite(p, 'defaulttemplate',
2789 _("checking default template (%s)\n"), m)
2793 _("checking default template (%s)\n"), m)
2790 fm.condwrite(not m, 'defaulttemplatenotfound',
2794 fm.condwrite(not m, 'defaulttemplatenotfound',
2791 _(" template '%s' not found\n"), "default")
2795 _(" template '%s' not found\n"), "default")
2792 if not p:
2796 if not p:
2793 problems += 1
2797 problems += 1
2794 fm.condwrite(not p, '',
2798 fm.condwrite(not p, '',
2795 _(" (templates seem to have been installed incorrectly)\n"))
2799 _(" (templates seem to have been installed incorrectly)\n"))
2796
2800
2797 # editor
2801 # editor
2798 editor = ui.geteditor()
2802 editor = ui.geteditor()
2799 editor = util.expandpath(editor)
2803 editor = util.expandpath(editor)
2800 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2804 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2801 cmdpath = util.findexe(shlex.split(editor)[0])
2805 cmdpath = util.findexe(shlex.split(editor)[0])
2802 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2806 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2803 _(" No commit editor set and can't find %s in PATH\n"
2807 _(" No commit editor set and can't find %s in PATH\n"
2804 " (specify a commit editor in your configuration"
2808 " (specify a commit editor in your configuration"
2805 " file)\n"), not cmdpath and editor == 'vi' and editor)
2809 " file)\n"), not cmdpath and editor == 'vi' and editor)
2806 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2810 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2807 _(" Can't find editor '%s' in PATH\n"
2811 _(" Can't find editor '%s' in PATH\n"
2808 " (specify a commit editor in your configuration"
2812 " (specify a commit editor in your configuration"
2809 " file)\n"), not cmdpath and editor)
2813 " file)\n"), not cmdpath and editor)
2810 if not cmdpath and editor != 'vi':
2814 if not cmdpath and editor != 'vi':
2811 problems += 1
2815 problems += 1
2812
2816
2813 # check username
2817 # check username
2814 username = None
2818 username = None
2815 err = None
2819 err = None
2816 try:
2820 try:
2817 username = ui.username()
2821 username = ui.username()
2818 except error.Abort as e:
2822 except error.Abort as e:
2819 err = e
2823 err = e
2820 problems += 1
2824 problems += 1
2821
2825
2822 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2826 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2823 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2827 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2824 " (specify a username in your configuration file)\n"), err)
2828 " (specify a username in your configuration file)\n"), err)
2825
2829
2826 fm.condwrite(not problems, '',
2830 fm.condwrite(not problems, '',
2827 _("no problems detected\n"))
2831 _("no problems detected\n"))
2828 if not problems:
2832 if not problems:
2829 fm.data(problems=problems)
2833 fm.data(problems=problems)
2830 fm.condwrite(problems, 'problems',
2834 fm.condwrite(problems, 'problems',
2831 _("%s problems detected,"
2835 _("%s problems detected,"
2832 " please check your install!\n"), problems)
2836 " please check your install!\n"), problems)
2833 fm.end()
2837 fm.end()
2834
2838
2835 return problems
2839 return problems
2836
2840
2837 @command('debugknown', [], _('REPO ID...'), norepo=True)
2841 @command('debugknown', [], _('REPO ID...'), norepo=True)
2838 def debugknown(ui, repopath, *ids, **opts):
2842 def debugknown(ui, repopath, *ids, **opts):
2839 """test whether node ids are known to a repo
2843 """test whether node ids are known to a repo
2840
2844
2841 Every ID must be a full-length hex node id string. Returns a list of 0s
2845 Every ID must be a full-length hex node id string. Returns a list of 0s
2842 and 1s indicating unknown/known.
2846 and 1s indicating unknown/known.
2843 """
2847 """
2844 repo = hg.peer(ui, opts, repopath)
2848 repo = hg.peer(ui, opts, repopath)
2845 if not repo.capable('known'):
2849 if not repo.capable('known'):
2846 raise error.Abort("known() not supported by target repository")
2850 raise error.Abort("known() not supported by target repository")
2847 flags = repo.known([bin(s) for s in ids])
2851 flags = repo.known([bin(s) for s in ids])
2848 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2852 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2849
2853
2850 @command('debuglabelcomplete', [], _('LABEL...'))
2854 @command('debuglabelcomplete', [], _('LABEL...'))
2851 def debuglabelcomplete(ui, repo, *args):
2855 def debuglabelcomplete(ui, repo, *args):
2852 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2856 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2853 debugnamecomplete(ui, repo, *args)
2857 debugnamecomplete(ui, repo, *args)
2854
2858
2855 @command('debugmergestate', [], '')
2859 @command('debugmergestate', [], '')
2856 def debugmergestate(ui, repo, *args):
2860 def debugmergestate(ui, repo, *args):
2857 """print merge state
2861 """print merge state
2858
2862
2859 Use --verbose to print out information about whether v1 or v2 merge state
2863 Use --verbose to print out information about whether v1 or v2 merge state
2860 was chosen."""
2864 was chosen."""
2861 def _hashornull(h):
2865 def _hashornull(h):
2862 if h == nullhex:
2866 if h == nullhex:
2863 return 'null'
2867 return 'null'
2864 else:
2868 else:
2865 return h
2869 return h
2866
2870
2867 def printrecords(version):
2871 def printrecords(version):
2868 ui.write(('* version %s records\n') % version)
2872 ui.write(('* version %s records\n') % version)
2869 if version == 1:
2873 if version == 1:
2870 records = v1records
2874 records = v1records
2871 else:
2875 else:
2872 records = v2records
2876 records = v2records
2873
2877
2874 for rtype, record in records:
2878 for rtype, record in records:
2875 # pretty print some record types
2879 # pretty print some record types
2876 if rtype == 'L':
2880 if rtype == 'L':
2877 ui.write(('local: %s\n') % record)
2881 ui.write(('local: %s\n') % record)
2878 elif rtype == 'O':
2882 elif rtype == 'O':
2879 ui.write(('other: %s\n') % record)
2883 ui.write(('other: %s\n') % record)
2880 elif rtype == 'm':
2884 elif rtype == 'm':
2881 driver, mdstate = record.split('\0', 1)
2885 driver, mdstate = record.split('\0', 1)
2882 ui.write(('merge driver: %s (state "%s")\n')
2886 ui.write(('merge driver: %s (state "%s")\n')
2883 % (driver, mdstate))
2887 % (driver, mdstate))
2884 elif rtype in 'FDC':
2888 elif rtype in 'FDC':
2885 r = record.split('\0')
2889 r = record.split('\0')
2886 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2890 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2887 if version == 1:
2891 if version == 1:
2888 onode = 'not stored in v1 format'
2892 onode = 'not stored in v1 format'
2889 flags = r[7]
2893 flags = r[7]
2890 else:
2894 else:
2891 onode, flags = r[7:9]
2895 onode, flags = r[7:9]
2892 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2896 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2893 % (f, rtype, state, _hashornull(hash)))
2897 % (f, rtype, state, _hashornull(hash)))
2894 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2898 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2895 ui.write((' ancestor path: %s (node %s)\n')
2899 ui.write((' ancestor path: %s (node %s)\n')
2896 % (afile, _hashornull(anode)))
2900 % (afile, _hashornull(anode)))
2897 ui.write((' other path: %s (node %s)\n')
2901 ui.write((' other path: %s (node %s)\n')
2898 % (ofile, _hashornull(onode)))
2902 % (ofile, _hashornull(onode)))
2899 elif rtype == 'f':
2903 elif rtype == 'f':
2900 filename, rawextras = record.split('\0', 1)
2904 filename, rawextras = record.split('\0', 1)
2901 extras = rawextras.split('\0')
2905 extras = rawextras.split('\0')
2902 i = 0
2906 i = 0
2903 extrastrings = []
2907 extrastrings = []
2904 while i < len(extras):
2908 while i < len(extras):
2905 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2909 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2906 i += 2
2910 i += 2
2907
2911
2908 ui.write(('file extras: %s (%s)\n')
2912 ui.write(('file extras: %s (%s)\n')
2909 % (filename, ', '.join(extrastrings)))
2913 % (filename, ', '.join(extrastrings)))
2910 elif rtype == 'l':
2914 elif rtype == 'l':
2911 labels = record.split('\0', 2)
2915 labels = record.split('\0', 2)
2912 labels = [l for l in labels if len(l) > 0]
2916 labels = [l for l in labels if len(l) > 0]
2913 ui.write(('labels:\n'))
2917 ui.write(('labels:\n'))
2914 ui.write((' local: %s\n' % labels[0]))
2918 ui.write((' local: %s\n' % labels[0]))
2915 ui.write((' other: %s\n' % labels[1]))
2919 ui.write((' other: %s\n' % labels[1]))
2916 if len(labels) > 2:
2920 if len(labels) > 2:
2917 ui.write((' base: %s\n' % labels[2]))
2921 ui.write((' base: %s\n' % labels[2]))
2918 else:
2922 else:
2919 ui.write(('unrecognized entry: %s\t%s\n')
2923 ui.write(('unrecognized entry: %s\t%s\n')
2920 % (rtype, record.replace('\0', '\t')))
2924 % (rtype, record.replace('\0', '\t')))
2921
2925
2922 # Avoid mergestate.read() since it may raise an exception for unsupported
2926 # Avoid mergestate.read() since it may raise an exception for unsupported
2923 # merge state records. We shouldn't be doing this, but this is OK since this
2927 # merge state records. We shouldn't be doing this, but this is OK since this
2924 # command is pretty low-level.
2928 # command is pretty low-level.
2925 ms = mergemod.mergestate(repo)
2929 ms = mergemod.mergestate(repo)
2926
2930
2927 # sort so that reasonable information is on top
2931 # sort so that reasonable information is on top
2928 v1records = ms._readrecordsv1()
2932 v1records = ms._readrecordsv1()
2929 v2records = ms._readrecordsv2()
2933 v2records = ms._readrecordsv2()
2930 order = 'LOml'
2934 order = 'LOml'
2931 def key(r):
2935 def key(r):
2932 idx = order.find(r[0])
2936 idx = order.find(r[0])
2933 if idx == -1:
2937 if idx == -1:
2934 return (1, r[1])
2938 return (1, r[1])
2935 else:
2939 else:
2936 return (0, idx)
2940 return (0, idx)
2937 v1records.sort(key=key)
2941 v1records.sort(key=key)
2938 v2records.sort(key=key)
2942 v2records.sort(key=key)
2939
2943
2940 if not v1records and not v2records:
2944 if not v1records and not v2records:
2941 ui.write(('no merge state found\n'))
2945 ui.write(('no merge state found\n'))
2942 elif not v2records:
2946 elif not v2records:
2943 ui.note(('no version 2 merge state\n'))
2947 ui.note(('no version 2 merge state\n'))
2944 printrecords(1)
2948 printrecords(1)
2945 elif ms._v1v2match(v1records, v2records):
2949 elif ms._v1v2match(v1records, v2records):
2946 ui.note(('v1 and v2 states match: using v2\n'))
2950 ui.note(('v1 and v2 states match: using v2\n'))
2947 printrecords(2)
2951 printrecords(2)
2948 else:
2952 else:
2949 ui.note(('v1 and v2 states mismatch: using v1\n'))
2953 ui.note(('v1 and v2 states mismatch: using v1\n'))
2950 printrecords(1)
2954 printrecords(1)
2951 if ui.verbose:
2955 if ui.verbose:
2952 printrecords(2)
2956 printrecords(2)
2953
2957
2954 @command('debugnamecomplete', [], _('NAME...'))
2958 @command('debugnamecomplete', [], _('NAME...'))
2955 def debugnamecomplete(ui, repo, *args):
2959 def debugnamecomplete(ui, repo, *args):
2956 '''complete "names" - tags, open branch names, bookmark names'''
2960 '''complete "names" - tags, open branch names, bookmark names'''
2957
2961
2958 names = set()
2962 names = set()
2959 # since we previously only listed open branches, we will handle that
2963 # since we previously only listed open branches, we will handle that
2960 # specially (after this for loop)
2964 # specially (after this for loop)
2961 for name, ns in repo.names.iteritems():
2965 for name, ns in repo.names.iteritems():
2962 if name != 'branches':
2966 if name != 'branches':
2963 names.update(ns.listnames(repo))
2967 names.update(ns.listnames(repo))
2964 names.update(tag for (tag, heads, tip, closed)
2968 names.update(tag for (tag, heads, tip, closed)
2965 in repo.branchmap().iterbranches() if not closed)
2969 in repo.branchmap().iterbranches() if not closed)
2966 completions = set()
2970 completions = set()
2967 if not args:
2971 if not args:
2968 args = ['']
2972 args = ['']
2969 for a in args:
2973 for a in args:
2970 completions.update(n for n in names if n.startswith(a))
2974 completions.update(n for n in names if n.startswith(a))
2971 ui.write('\n'.join(sorted(completions)))
2975 ui.write('\n'.join(sorted(completions)))
2972 ui.write('\n')
2976 ui.write('\n')
2973
2977
2974 @command('debuglocks',
2978 @command('debuglocks',
2975 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2979 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2976 ('W', 'force-wlock', None,
2980 ('W', 'force-wlock', None,
2977 _('free the working state lock (DANGEROUS)'))],
2981 _('free the working state lock (DANGEROUS)'))],
2978 _('[OPTION]...'))
2982 _('[OPTION]...'))
2979 def debuglocks(ui, repo, **opts):
2983 def debuglocks(ui, repo, **opts):
2980 """show or modify state of locks
2984 """show or modify state of locks
2981
2985
2982 By default, this command will show which locks are held. This
2986 By default, this command will show which locks are held. This
2983 includes the user and process holding the lock, the amount of time
2987 includes the user and process holding the lock, the amount of time
2984 the lock has been held, and the machine name where the process is
2988 the lock has been held, and the machine name where the process is
2985 running if it's not local.
2989 running if it's not local.
2986
2990
2987 Locks protect the integrity of Mercurial's data, so should be
2991 Locks protect the integrity of Mercurial's data, so should be
2988 treated with care. System crashes or other interruptions may cause
2992 treated with care. System crashes or other interruptions may cause
2989 locks to not be properly released, though Mercurial will usually
2993 locks to not be properly released, though Mercurial will usually
2990 detect and remove such stale locks automatically.
2994 detect and remove such stale locks automatically.
2991
2995
2992 However, detecting stale locks may not always be possible (for
2996 However, detecting stale locks may not always be possible (for
2993 instance, on a shared filesystem). Removing locks may also be
2997 instance, on a shared filesystem). Removing locks may also be
2994 blocked by filesystem permissions.
2998 blocked by filesystem permissions.
2995
2999
2996 Returns 0 if no locks are held.
3000 Returns 0 if no locks are held.
2997
3001
2998 """
3002 """
2999
3003
3000 if opts.get('force_lock'):
3004 if opts.get('force_lock'):
3001 repo.svfs.unlink('lock')
3005 repo.svfs.unlink('lock')
3002 if opts.get('force_wlock'):
3006 if opts.get('force_wlock'):
3003 repo.vfs.unlink('wlock')
3007 repo.vfs.unlink('wlock')
3004 if opts.get('force_lock') or opts.get('force_lock'):
3008 if opts.get('force_lock') or opts.get('force_lock'):
3005 return 0
3009 return 0
3006
3010
3007 now = time.time()
3011 now = time.time()
3008 held = 0
3012 held = 0
3009
3013
3010 def report(vfs, name, method):
3014 def report(vfs, name, method):
3011 # this causes stale locks to get reaped for more accurate reporting
3015 # this causes stale locks to get reaped for more accurate reporting
3012 try:
3016 try:
3013 l = method(False)
3017 l = method(False)
3014 except error.LockHeld:
3018 except error.LockHeld:
3015 l = None
3019 l = None
3016
3020
3017 if l:
3021 if l:
3018 l.release()
3022 l.release()
3019 else:
3023 else:
3020 try:
3024 try:
3021 stat = vfs.lstat(name)
3025 stat = vfs.lstat(name)
3022 age = now - stat.st_mtime
3026 age = now - stat.st_mtime
3023 user = util.username(stat.st_uid)
3027 user = util.username(stat.st_uid)
3024 locker = vfs.readlock(name)
3028 locker = vfs.readlock(name)
3025 if ":" in locker:
3029 if ":" in locker:
3026 host, pid = locker.split(':')
3030 host, pid = locker.split(':')
3027 if host == socket.gethostname():
3031 if host == socket.gethostname():
3028 locker = 'user %s, process %s' % (user, pid)
3032 locker = 'user %s, process %s' % (user, pid)
3029 else:
3033 else:
3030 locker = 'user %s, process %s, host %s' \
3034 locker = 'user %s, process %s, host %s' \
3031 % (user, pid, host)
3035 % (user, pid, host)
3032 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3036 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3033 return 1
3037 return 1
3034 except OSError as e:
3038 except OSError as e:
3035 if e.errno != errno.ENOENT:
3039 if e.errno != errno.ENOENT:
3036 raise
3040 raise
3037
3041
3038 ui.write(("%-6s free\n") % (name + ":"))
3042 ui.write(("%-6s free\n") % (name + ":"))
3039 return 0
3043 return 0
3040
3044
3041 held += report(repo.svfs, "lock", repo.lock)
3045 held += report(repo.svfs, "lock", repo.lock)
3042 held += report(repo.vfs, "wlock", repo.wlock)
3046 held += report(repo.vfs, "wlock", repo.wlock)
3043
3047
3044 return held
3048 return held
3045
3049
3046 @command('debugobsolete',
3050 @command('debugobsolete',
3047 [('', 'flags', 0, _('markers flag')),
3051 [('', 'flags', 0, _('markers flag')),
3048 ('', 'record-parents', False,
3052 ('', 'record-parents', False,
3049 _('record parent information for the precursor')),
3053 _('record parent information for the precursor')),
3050 ('r', 'rev', [], _('display markers relevant to REV')),
3054 ('r', 'rev', [], _('display markers relevant to REV')),
3051 ('', 'index', False, _('display index of the marker')),
3055 ('', 'index', False, _('display index of the marker')),
3052 ('', 'delete', [], _('delete markers specified by indices')),
3056 ('', 'delete', [], _('delete markers specified by indices')),
3053 ] + commitopts2 + formatteropts,
3057 ] + commitopts2 + formatteropts,
3054 _('[OBSOLETED [REPLACEMENT ...]]'))
3058 _('[OBSOLETED [REPLACEMENT ...]]'))
3055 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3059 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3056 """create arbitrary obsolete marker
3060 """create arbitrary obsolete marker
3057
3061
3058 With no arguments, displays the list of obsolescence markers."""
3062 With no arguments, displays the list of obsolescence markers."""
3059
3063
3060 def parsenodeid(s):
3064 def parsenodeid(s):
3061 try:
3065 try:
3062 # We do not use revsingle/revrange functions here to accept
3066 # We do not use revsingle/revrange functions here to accept
3063 # arbitrary node identifiers, possibly not present in the
3067 # arbitrary node identifiers, possibly not present in the
3064 # local repository.
3068 # local repository.
3065 n = bin(s)
3069 n = bin(s)
3066 if len(n) != len(nullid):
3070 if len(n) != len(nullid):
3067 raise TypeError()
3071 raise TypeError()
3068 return n
3072 return n
3069 except TypeError:
3073 except TypeError:
3070 raise error.Abort('changeset references must be full hexadecimal '
3074 raise error.Abort('changeset references must be full hexadecimal '
3071 'node identifiers')
3075 'node identifiers')
3072
3076
3073 if opts.get('delete'):
3077 if opts.get('delete'):
3074 indices = []
3078 indices = []
3075 for v in opts.get('delete'):
3079 for v in opts.get('delete'):
3076 try:
3080 try:
3077 indices.append(int(v))
3081 indices.append(int(v))
3078 except ValueError:
3082 except ValueError:
3079 raise error.Abort(_('invalid index value: %r') % v,
3083 raise error.Abort(_('invalid index value: %r') % v,
3080 hint=_('use integers for indices'))
3084 hint=_('use integers for indices'))
3081
3085
3082 if repo.currenttransaction():
3086 if repo.currenttransaction():
3083 raise error.Abort(_('cannot delete obsmarkers in the middle '
3087 raise error.Abort(_('cannot delete obsmarkers in the middle '
3084 'of transaction.'))
3088 'of transaction.'))
3085
3089
3086 with repo.lock():
3090 with repo.lock():
3087 n = repair.deleteobsmarkers(repo.obsstore, indices)
3091 n = repair.deleteobsmarkers(repo.obsstore, indices)
3088 ui.write(_('deleted %i obsolescense markers\n') % n)
3092 ui.write(_('deleted %i obsolescense markers\n') % n)
3089
3093
3090 return
3094 return
3091
3095
3092 if precursor is not None:
3096 if precursor is not None:
3093 if opts['rev']:
3097 if opts['rev']:
3094 raise error.Abort('cannot select revision when creating marker')
3098 raise error.Abort('cannot select revision when creating marker')
3095 metadata = {}
3099 metadata = {}
3096 metadata['user'] = opts['user'] or ui.username()
3100 metadata['user'] = opts['user'] or ui.username()
3097 succs = tuple(parsenodeid(succ) for succ in successors)
3101 succs = tuple(parsenodeid(succ) for succ in successors)
3098 l = repo.lock()
3102 l = repo.lock()
3099 try:
3103 try:
3100 tr = repo.transaction('debugobsolete')
3104 tr = repo.transaction('debugobsolete')
3101 try:
3105 try:
3102 date = opts.get('date')
3106 date = opts.get('date')
3103 if date:
3107 if date:
3104 date = util.parsedate(date)
3108 date = util.parsedate(date)
3105 else:
3109 else:
3106 date = None
3110 date = None
3107 prec = parsenodeid(precursor)
3111 prec = parsenodeid(precursor)
3108 parents = None
3112 parents = None
3109 if opts['record_parents']:
3113 if opts['record_parents']:
3110 if prec not in repo.unfiltered():
3114 if prec not in repo.unfiltered():
3111 raise error.Abort('cannot used --record-parents on '
3115 raise error.Abort('cannot used --record-parents on '
3112 'unknown changesets')
3116 'unknown changesets')
3113 parents = repo.unfiltered()[prec].parents()
3117 parents = repo.unfiltered()[prec].parents()
3114 parents = tuple(p.node() for p in parents)
3118 parents = tuple(p.node() for p in parents)
3115 repo.obsstore.create(tr, prec, succs, opts['flags'],
3119 repo.obsstore.create(tr, prec, succs, opts['flags'],
3116 parents=parents, date=date,
3120 parents=parents, date=date,
3117 metadata=metadata)
3121 metadata=metadata)
3118 tr.close()
3122 tr.close()
3119 except ValueError as exc:
3123 except ValueError as exc:
3120 raise error.Abort(_('bad obsmarker input: %s') % exc)
3124 raise error.Abort(_('bad obsmarker input: %s') % exc)
3121 finally:
3125 finally:
3122 tr.release()
3126 tr.release()
3123 finally:
3127 finally:
3124 l.release()
3128 l.release()
3125 else:
3129 else:
3126 if opts['rev']:
3130 if opts['rev']:
3127 revs = scmutil.revrange(repo, opts['rev'])
3131 revs = scmutil.revrange(repo, opts['rev'])
3128 nodes = [repo[r].node() for r in revs]
3132 nodes = [repo[r].node() for r in revs]
3129 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3133 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3130 markers.sort(key=lambda x: x._data)
3134 markers.sort(key=lambda x: x._data)
3131 else:
3135 else:
3132 markers = obsolete.getmarkers(repo)
3136 markers = obsolete.getmarkers(repo)
3133
3137
3134 markerstoiter = markers
3138 markerstoiter = markers
3135 isrelevant = lambda m: True
3139 isrelevant = lambda m: True
3136 if opts.get('rev') and opts.get('index'):
3140 if opts.get('rev') and opts.get('index'):
3137 markerstoiter = obsolete.getmarkers(repo)
3141 markerstoiter = obsolete.getmarkers(repo)
3138 markerset = set(markers)
3142 markerset = set(markers)
3139 isrelevant = lambda m: m in markerset
3143 isrelevant = lambda m: m in markerset
3140
3144
3141 fm = ui.formatter('debugobsolete', opts)
3145 fm = ui.formatter('debugobsolete', opts)
3142 for i, m in enumerate(markerstoiter):
3146 for i, m in enumerate(markerstoiter):
3143 if not isrelevant(m):
3147 if not isrelevant(m):
3144 # marker can be irrelevant when we're iterating over a set
3148 # marker can be irrelevant when we're iterating over a set
3145 # of markers (markerstoiter) which is bigger than the set
3149 # of markers (markerstoiter) which is bigger than the set
3146 # of markers we want to display (markers)
3150 # of markers we want to display (markers)
3147 # this can happen if both --index and --rev options are
3151 # this can happen if both --index and --rev options are
3148 # provided and thus we need to iterate over all of the markers
3152 # provided and thus we need to iterate over all of the markers
3149 # to get the correct indices, but only display the ones that
3153 # to get the correct indices, but only display the ones that
3150 # are relevant to --rev value
3154 # are relevant to --rev value
3151 continue
3155 continue
3152 fm.startitem()
3156 fm.startitem()
3153 ind = i if opts.get('index') else None
3157 ind = i if opts.get('index') else None
3154 cmdutil.showmarker(fm, m, index=ind)
3158 cmdutil.showmarker(fm, m, index=ind)
3155 fm.end()
3159 fm.end()
3156
3160
3157 @command('debugpathcomplete',
3161 @command('debugpathcomplete',
3158 [('f', 'full', None, _('complete an entire path')),
3162 [('f', 'full', None, _('complete an entire path')),
3159 ('n', 'normal', None, _('show only normal files')),
3163 ('n', 'normal', None, _('show only normal files')),
3160 ('a', 'added', None, _('show only added files')),
3164 ('a', 'added', None, _('show only added files')),
3161 ('r', 'removed', None, _('show only removed files'))],
3165 ('r', 'removed', None, _('show only removed files'))],
3162 _('FILESPEC...'))
3166 _('FILESPEC...'))
3163 def debugpathcomplete(ui, repo, *specs, **opts):
3167 def debugpathcomplete(ui, repo, *specs, **opts):
3164 '''complete part or all of a tracked path
3168 '''complete part or all of a tracked path
3165
3169
3166 This command supports shells that offer path name completion. It
3170 This command supports shells that offer path name completion. It
3167 currently completes only files already known to the dirstate.
3171 currently completes only files already known to the dirstate.
3168
3172
3169 Completion extends only to the next path segment unless
3173 Completion extends only to the next path segment unless
3170 --full is specified, in which case entire paths are used.'''
3174 --full is specified, in which case entire paths are used.'''
3171
3175
3172 def complete(path, acceptable):
3176 def complete(path, acceptable):
3173 dirstate = repo.dirstate
3177 dirstate = repo.dirstate
3174 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3178 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3175 rootdir = repo.root + os.sep
3179 rootdir = repo.root + os.sep
3176 if spec != repo.root and not spec.startswith(rootdir):
3180 if spec != repo.root and not spec.startswith(rootdir):
3177 return [], []
3181 return [], []
3178 if os.path.isdir(spec):
3182 if os.path.isdir(spec):
3179 spec += '/'
3183 spec += '/'
3180 spec = spec[len(rootdir):]
3184 spec = spec[len(rootdir):]
3181 fixpaths = os.sep != '/'
3185 fixpaths = os.sep != '/'
3182 if fixpaths:
3186 if fixpaths:
3183 spec = spec.replace(os.sep, '/')
3187 spec = spec.replace(os.sep, '/')
3184 speclen = len(spec)
3188 speclen = len(spec)
3185 fullpaths = opts['full']
3189 fullpaths = opts['full']
3186 files, dirs = set(), set()
3190 files, dirs = set(), set()
3187 adddir, addfile = dirs.add, files.add
3191 adddir, addfile = dirs.add, files.add
3188 for f, st in dirstate.iteritems():
3192 for f, st in dirstate.iteritems():
3189 if f.startswith(spec) and st[0] in acceptable:
3193 if f.startswith(spec) and st[0] in acceptable:
3190 if fixpaths:
3194 if fixpaths:
3191 f = f.replace('/', os.sep)
3195 f = f.replace('/', os.sep)
3192 if fullpaths:
3196 if fullpaths:
3193 addfile(f)
3197 addfile(f)
3194 continue
3198 continue
3195 s = f.find(os.sep, speclen)
3199 s = f.find(os.sep, speclen)
3196 if s >= 0:
3200 if s >= 0:
3197 adddir(f[:s])
3201 adddir(f[:s])
3198 else:
3202 else:
3199 addfile(f)
3203 addfile(f)
3200 return files, dirs
3204 return files, dirs
3201
3205
3202 acceptable = ''
3206 acceptable = ''
3203 if opts['normal']:
3207 if opts['normal']:
3204 acceptable += 'nm'
3208 acceptable += 'nm'
3205 if opts['added']:
3209 if opts['added']:
3206 acceptable += 'a'
3210 acceptable += 'a'
3207 if opts['removed']:
3211 if opts['removed']:
3208 acceptable += 'r'
3212 acceptable += 'r'
3209 cwd = repo.getcwd()
3213 cwd = repo.getcwd()
3210 if not specs:
3214 if not specs:
3211 specs = ['.']
3215 specs = ['.']
3212
3216
3213 files, dirs = set(), set()
3217 files, dirs = set(), set()
3214 for spec in specs:
3218 for spec in specs:
3215 f, d = complete(spec, acceptable or 'nmar')
3219 f, d = complete(spec, acceptable or 'nmar')
3216 files.update(f)
3220 files.update(f)
3217 dirs.update(d)
3221 dirs.update(d)
3218 files.update(dirs)
3222 files.update(dirs)
3219 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3223 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3220 ui.write('\n')
3224 ui.write('\n')
3221
3225
3222 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3226 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3223 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3227 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3224 '''access the pushkey key/value protocol
3228 '''access the pushkey key/value protocol
3225
3229
3226 With two args, list the keys in the given namespace.
3230 With two args, list the keys in the given namespace.
3227
3231
3228 With five args, set a key to new if it currently is set to old.
3232 With five args, set a key to new if it currently is set to old.
3229 Reports success or failure.
3233 Reports success or failure.
3230 '''
3234 '''
3231
3235
3232 target = hg.peer(ui, {}, repopath)
3236 target = hg.peer(ui, {}, repopath)
3233 if keyinfo:
3237 if keyinfo:
3234 key, old, new = keyinfo
3238 key, old, new = keyinfo
3235 r = target.pushkey(namespace, key, old, new)
3239 r = target.pushkey(namespace, key, old, new)
3236 ui.status(str(r) + '\n')
3240 ui.status(str(r) + '\n')
3237 return not r
3241 return not r
3238 else:
3242 else:
3239 for k, v in sorted(target.listkeys(namespace).iteritems()):
3243 for k, v in sorted(target.listkeys(namespace).iteritems()):
3240 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3244 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3241 v.encode('string-escape')))
3245 v.encode('string-escape')))
3242
3246
3243 @command('debugpvec', [], _('A B'))
3247 @command('debugpvec', [], _('A B'))
3244 def debugpvec(ui, repo, a, b=None):
3248 def debugpvec(ui, repo, a, b=None):
3245 ca = scmutil.revsingle(repo, a)
3249 ca = scmutil.revsingle(repo, a)
3246 cb = scmutil.revsingle(repo, b)
3250 cb = scmutil.revsingle(repo, b)
3247 pa = pvec.ctxpvec(ca)
3251 pa = pvec.ctxpvec(ca)
3248 pb = pvec.ctxpvec(cb)
3252 pb = pvec.ctxpvec(cb)
3249 if pa == pb:
3253 if pa == pb:
3250 rel = "="
3254 rel = "="
3251 elif pa > pb:
3255 elif pa > pb:
3252 rel = ">"
3256 rel = ">"
3253 elif pa < pb:
3257 elif pa < pb:
3254 rel = "<"
3258 rel = "<"
3255 elif pa | pb:
3259 elif pa | pb:
3256 rel = "|"
3260 rel = "|"
3257 ui.write(_("a: %s\n") % pa)
3261 ui.write(_("a: %s\n") % pa)
3258 ui.write(_("b: %s\n") % pb)
3262 ui.write(_("b: %s\n") % pb)
3259 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3263 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3260 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3264 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3261 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3265 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3262 pa.distance(pb), rel))
3266 pa.distance(pb), rel))
3263
3267
3264 @command('debugrebuilddirstate|debugrebuildstate',
3268 @command('debugrebuilddirstate|debugrebuildstate',
3265 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3269 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3266 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3270 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3267 'the working copy parent')),
3271 'the working copy parent')),
3268 ],
3272 ],
3269 _('[-r REV]'))
3273 _('[-r REV]'))
3270 def debugrebuilddirstate(ui, repo, rev, **opts):
3274 def debugrebuilddirstate(ui, repo, rev, **opts):
3271 """rebuild the dirstate as it would look like for the given revision
3275 """rebuild the dirstate as it would look like for the given revision
3272
3276
3273 If no revision is specified the first current parent will be used.
3277 If no revision is specified the first current parent will be used.
3274
3278
3275 The dirstate will be set to the files of the given revision.
3279 The dirstate will be set to the files of the given revision.
3276 The actual working directory content or existing dirstate
3280 The actual working directory content or existing dirstate
3277 information such as adds or removes is not considered.
3281 information such as adds or removes is not considered.
3278
3282
3279 ``minimal`` will only rebuild the dirstate status for files that claim to be
3283 ``minimal`` will only rebuild the dirstate status for files that claim to be
3280 tracked but are not in the parent manifest, or that exist in the parent
3284 tracked but are not in the parent manifest, or that exist in the parent
3281 manifest but are not in the dirstate. It will not change adds, removes, or
3285 manifest but are not in the dirstate. It will not change adds, removes, or
3282 modified files that are in the working copy parent.
3286 modified files that are in the working copy parent.
3283
3287
3284 One use of this command is to make the next :hg:`status` invocation
3288 One use of this command is to make the next :hg:`status` invocation
3285 check the actual file content.
3289 check the actual file content.
3286 """
3290 """
3287 ctx = scmutil.revsingle(repo, rev)
3291 ctx = scmutil.revsingle(repo, rev)
3288 with repo.wlock():
3292 with repo.wlock():
3289 dirstate = repo.dirstate
3293 dirstate = repo.dirstate
3290 changedfiles = None
3294 changedfiles = None
3291 # See command doc for what minimal does.
3295 # See command doc for what minimal does.
3292 if opts.get('minimal'):
3296 if opts.get('minimal'):
3293 manifestfiles = set(ctx.manifest().keys())
3297 manifestfiles = set(ctx.manifest().keys())
3294 dirstatefiles = set(dirstate)
3298 dirstatefiles = set(dirstate)
3295 manifestonly = manifestfiles - dirstatefiles
3299 manifestonly = manifestfiles - dirstatefiles
3296 dsonly = dirstatefiles - manifestfiles
3300 dsonly = dirstatefiles - manifestfiles
3297 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3301 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3298 changedfiles = manifestonly | dsnotadded
3302 changedfiles = manifestonly | dsnotadded
3299
3303
3300 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3304 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3301
3305
3302 @command('debugrebuildfncache', [], '')
3306 @command('debugrebuildfncache', [], '')
3303 def debugrebuildfncache(ui, repo):
3307 def debugrebuildfncache(ui, repo):
3304 """rebuild the fncache file"""
3308 """rebuild the fncache file"""
3305 repair.rebuildfncache(ui, repo)
3309 repair.rebuildfncache(ui, repo)
3306
3310
3307 @command('debugrename',
3311 @command('debugrename',
3308 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3312 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3309 _('[-r REV] FILE'))
3313 _('[-r REV] FILE'))
3310 def debugrename(ui, repo, file1, *pats, **opts):
3314 def debugrename(ui, repo, file1, *pats, **opts):
3311 """dump rename information"""
3315 """dump rename information"""
3312
3316
3313 ctx = scmutil.revsingle(repo, opts.get('rev'))
3317 ctx = scmutil.revsingle(repo, opts.get('rev'))
3314 m = scmutil.match(ctx, (file1,) + pats, opts)
3318 m = scmutil.match(ctx, (file1,) + pats, opts)
3315 for abs in ctx.walk(m):
3319 for abs in ctx.walk(m):
3316 fctx = ctx[abs]
3320 fctx = ctx[abs]
3317 o = fctx.filelog().renamed(fctx.filenode())
3321 o = fctx.filelog().renamed(fctx.filenode())
3318 rel = m.rel(abs)
3322 rel = m.rel(abs)
3319 if o:
3323 if o:
3320 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3324 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3321 else:
3325 else:
3322 ui.write(_("%s not renamed\n") % rel)
3326 ui.write(_("%s not renamed\n") % rel)
3323
3327
3324 @command('debugrevlog', debugrevlogopts +
3328 @command('debugrevlog', debugrevlogopts +
3325 [('d', 'dump', False, _('dump index data'))],
3329 [('d', 'dump', False, _('dump index data'))],
3326 _('-c|-m|FILE'),
3330 _('-c|-m|FILE'),
3327 optionalrepo=True)
3331 optionalrepo=True)
3328 def debugrevlog(ui, repo, file_=None, **opts):
3332 def debugrevlog(ui, repo, file_=None, **opts):
3329 """show data and statistics about a revlog"""
3333 """show data and statistics about a revlog"""
3330 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3334 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3331
3335
3332 if opts.get("dump"):
3336 if opts.get("dump"):
3333 numrevs = len(r)
3337 numrevs = len(r)
3334 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3338 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3335 " rawsize totalsize compression heads chainlen\n"))
3339 " rawsize totalsize compression heads chainlen\n"))
3336 ts = 0
3340 ts = 0
3337 heads = set()
3341 heads = set()
3338
3342
3339 for rev in xrange(numrevs):
3343 for rev in xrange(numrevs):
3340 dbase = r.deltaparent(rev)
3344 dbase = r.deltaparent(rev)
3341 if dbase == -1:
3345 if dbase == -1:
3342 dbase = rev
3346 dbase = rev
3343 cbase = r.chainbase(rev)
3347 cbase = r.chainbase(rev)
3344 clen = r.chainlen(rev)
3348 clen = r.chainlen(rev)
3345 p1, p2 = r.parentrevs(rev)
3349 p1, p2 = r.parentrevs(rev)
3346 rs = r.rawsize(rev)
3350 rs = r.rawsize(rev)
3347 ts = ts + rs
3351 ts = ts + rs
3348 heads -= set(r.parentrevs(rev))
3352 heads -= set(r.parentrevs(rev))
3349 heads.add(rev)
3353 heads.add(rev)
3350 try:
3354 try:
3351 compression = ts / r.end(rev)
3355 compression = ts / r.end(rev)
3352 except ZeroDivisionError:
3356 except ZeroDivisionError:
3353 compression = 0
3357 compression = 0
3354 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3358 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3355 "%11d %5d %8d\n" %
3359 "%11d %5d %8d\n" %
3356 (rev, p1, p2, r.start(rev), r.end(rev),
3360 (rev, p1, p2, r.start(rev), r.end(rev),
3357 r.start(dbase), r.start(cbase),
3361 r.start(dbase), r.start(cbase),
3358 r.start(p1), r.start(p2),
3362 r.start(p1), r.start(p2),
3359 rs, ts, compression, len(heads), clen))
3363 rs, ts, compression, len(heads), clen))
3360 return 0
3364 return 0
3361
3365
3362 v = r.version
3366 v = r.version
3363 format = v & 0xFFFF
3367 format = v & 0xFFFF
3364 flags = []
3368 flags = []
3365 gdelta = False
3369 gdelta = False
3366 if v & revlog.REVLOGNGINLINEDATA:
3370 if v & revlog.REVLOGNGINLINEDATA:
3367 flags.append('inline')
3371 flags.append('inline')
3368 if v & revlog.REVLOGGENERALDELTA:
3372 if v & revlog.REVLOGGENERALDELTA:
3369 gdelta = True
3373 gdelta = True
3370 flags.append('generaldelta')
3374 flags.append('generaldelta')
3371 if not flags:
3375 if not flags:
3372 flags = ['(none)']
3376 flags = ['(none)']
3373
3377
3374 nummerges = 0
3378 nummerges = 0
3375 numfull = 0
3379 numfull = 0
3376 numprev = 0
3380 numprev = 0
3377 nump1 = 0
3381 nump1 = 0
3378 nump2 = 0
3382 nump2 = 0
3379 numother = 0
3383 numother = 0
3380 nump1prev = 0
3384 nump1prev = 0
3381 nump2prev = 0
3385 nump2prev = 0
3382 chainlengths = []
3386 chainlengths = []
3383
3387
3384 datasize = [None, 0, 0]
3388 datasize = [None, 0, 0]
3385 fullsize = [None, 0, 0]
3389 fullsize = [None, 0, 0]
3386 deltasize = [None, 0, 0]
3390 deltasize = [None, 0, 0]
3387
3391
3388 def addsize(size, l):
3392 def addsize(size, l):
3389 if l[0] is None or size < l[0]:
3393 if l[0] is None or size < l[0]:
3390 l[0] = size
3394 l[0] = size
3391 if size > l[1]:
3395 if size > l[1]:
3392 l[1] = size
3396 l[1] = size
3393 l[2] += size
3397 l[2] += size
3394
3398
3395 numrevs = len(r)
3399 numrevs = len(r)
3396 for rev in xrange(numrevs):
3400 for rev in xrange(numrevs):
3397 p1, p2 = r.parentrevs(rev)
3401 p1, p2 = r.parentrevs(rev)
3398 delta = r.deltaparent(rev)
3402 delta = r.deltaparent(rev)
3399 if format > 0:
3403 if format > 0:
3400 addsize(r.rawsize(rev), datasize)
3404 addsize(r.rawsize(rev), datasize)
3401 if p2 != nullrev:
3405 if p2 != nullrev:
3402 nummerges += 1
3406 nummerges += 1
3403 size = r.length(rev)
3407 size = r.length(rev)
3404 if delta == nullrev:
3408 if delta == nullrev:
3405 chainlengths.append(0)
3409 chainlengths.append(0)
3406 numfull += 1
3410 numfull += 1
3407 addsize(size, fullsize)
3411 addsize(size, fullsize)
3408 else:
3412 else:
3409 chainlengths.append(chainlengths[delta] + 1)
3413 chainlengths.append(chainlengths[delta] + 1)
3410 addsize(size, deltasize)
3414 addsize(size, deltasize)
3411 if delta == rev - 1:
3415 if delta == rev - 1:
3412 numprev += 1
3416 numprev += 1
3413 if delta == p1:
3417 if delta == p1:
3414 nump1prev += 1
3418 nump1prev += 1
3415 elif delta == p2:
3419 elif delta == p2:
3416 nump2prev += 1
3420 nump2prev += 1
3417 elif delta == p1:
3421 elif delta == p1:
3418 nump1 += 1
3422 nump1 += 1
3419 elif delta == p2:
3423 elif delta == p2:
3420 nump2 += 1
3424 nump2 += 1
3421 elif delta != nullrev:
3425 elif delta != nullrev:
3422 numother += 1
3426 numother += 1
3423
3427
3424 # Adjust size min value for empty cases
3428 # Adjust size min value for empty cases
3425 for size in (datasize, fullsize, deltasize):
3429 for size in (datasize, fullsize, deltasize):
3426 if size[0] is None:
3430 if size[0] is None:
3427 size[0] = 0
3431 size[0] = 0
3428
3432
3429 numdeltas = numrevs - numfull
3433 numdeltas = numrevs - numfull
3430 numoprev = numprev - nump1prev - nump2prev
3434 numoprev = numprev - nump1prev - nump2prev
3431 totalrawsize = datasize[2]
3435 totalrawsize = datasize[2]
3432 datasize[2] /= numrevs
3436 datasize[2] /= numrevs
3433 fulltotal = fullsize[2]
3437 fulltotal = fullsize[2]
3434 fullsize[2] /= numfull
3438 fullsize[2] /= numfull
3435 deltatotal = deltasize[2]
3439 deltatotal = deltasize[2]
3436 if numrevs - numfull > 0:
3440 if numrevs - numfull > 0:
3437 deltasize[2] /= numrevs - numfull
3441 deltasize[2] /= numrevs - numfull
3438 totalsize = fulltotal + deltatotal
3442 totalsize = fulltotal + deltatotal
3439 avgchainlen = sum(chainlengths) / numrevs
3443 avgchainlen = sum(chainlengths) / numrevs
3440 maxchainlen = max(chainlengths)
3444 maxchainlen = max(chainlengths)
3441 compratio = 1
3445 compratio = 1
3442 if totalsize:
3446 if totalsize:
3443 compratio = totalrawsize / totalsize
3447 compratio = totalrawsize / totalsize
3444
3448
3445 basedfmtstr = '%%%dd\n'
3449 basedfmtstr = '%%%dd\n'
3446 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3450 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3447
3451
3448 def dfmtstr(max):
3452 def dfmtstr(max):
3449 return basedfmtstr % len(str(max))
3453 return basedfmtstr % len(str(max))
3450 def pcfmtstr(max, padding=0):
3454 def pcfmtstr(max, padding=0):
3451 return basepcfmtstr % (len(str(max)), ' ' * padding)
3455 return basepcfmtstr % (len(str(max)), ' ' * padding)
3452
3456
3453 def pcfmt(value, total):
3457 def pcfmt(value, total):
3454 if total:
3458 if total:
3455 return (value, 100 * float(value) / total)
3459 return (value, 100 * float(value) / total)
3456 else:
3460 else:
3457 return value, 100.0
3461 return value, 100.0
3458
3462
3459 ui.write(('format : %d\n') % format)
3463 ui.write(('format : %d\n') % format)
3460 ui.write(('flags : %s\n') % ', '.join(flags))
3464 ui.write(('flags : %s\n') % ', '.join(flags))
3461
3465
3462 ui.write('\n')
3466 ui.write('\n')
3463 fmt = pcfmtstr(totalsize)
3467 fmt = pcfmtstr(totalsize)
3464 fmt2 = dfmtstr(totalsize)
3468 fmt2 = dfmtstr(totalsize)
3465 ui.write(('revisions : ') + fmt2 % numrevs)
3469 ui.write(('revisions : ') + fmt2 % numrevs)
3466 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3470 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3467 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3471 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3468 ui.write(('revisions : ') + fmt2 % numrevs)
3472 ui.write(('revisions : ') + fmt2 % numrevs)
3469 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3473 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3470 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3474 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3471 ui.write(('revision size : ') + fmt2 % totalsize)
3475 ui.write(('revision size : ') + fmt2 % totalsize)
3472 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3476 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3473 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3477 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3474
3478
3475 ui.write('\n')
3479 ui.write('\n')
3476 fmt = dfmtstr(max(avgchainlen, compratio))
3480 fmt = dfmtstr(max(avgchainlen, compratio))
3477 ui.write(('avg chain length : ') + fmt % avgchainlen)
3481 ui.write(('avg chain length : ') + fmt % avgchainlen)
3478 ui.write(('max chain length : ') + fmt % maxchainlen)
3482 ui.write(('max chain length : ') + fmt % maxchainlen)
3479 ui.write(('compression ratio : ') + fmt % compratio)
3483 ui.write(('compression ratio : ') + fmt % compratio)
3480
3484
3481 if format > 0:
3485 if format > 0:
3482 ui.write('\n')
3486 ui.write('\n')
3483 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3487 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3484 % tuple(datasize))
3488 % tuple(datasize))
3485 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3489 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3486 % tuple(fullsize))
3490 % tuple(fullsize))
3487 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3491 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3488 % tuple(deltasize))
3492 % tuple(deltasize))
3489
3493
3490 if numdeltas > 0:
3494 if numdeltas > 0:
3491 ui.write('\n')
3495 ui.write('\n')
3492 fmt = pcfmtstr(numdeltas)
3496 fmt = pcfmtstr(numdeltas)
3493 fmt2 = pcfmtstr(numdeltas, 4)
3497 fmt2 = pcfmtstr(numdeltas, 4)
3494 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3498 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3495 if numprev > 0:
3499 if numprev > 0:
3496 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3500 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3497 numprev))
3501 numprev))
3498 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3502 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3499 numprev))
3503 numprev))
3500 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3504 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3501 numprev))
3505 numprev))
3502 if gdelta:
3506 if gdelta:
3503 ui.write(('deltas against p1 : ')
3507 ui.write(('deltas against p1 : ')
3504 + fmt % pcfmt(nump1, numdeltas))
3508 + fmt % pcfmt(nump1, numdeltas))
3505 ui.write(('deltas against p2 : ')
3509 ui.write(('deltas against p2 : ')
3506 + fmt % pcfmt(nump2, numdeltas))
3510 + fmt % pcfmt(nump2, numdeltas))
3507 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3511 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3508 numdeltas))
3512 numdeltas))
3509
3513
3510 @command('debugrevspec',
3514 @command('debugrevspec',
3511 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3515 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3512 ('REVSPEC'))
3516 ('REVSPEC'))
3513 def debugrevspec(ui, repo, expr, **opts):
3517 def debugrevspec(ui, repo, expr, **opts):
3514 """parse and apply a revision specification
3518 """parse and apply a revision specification
3515
3519
3516 Use --verbose to print the parsed tree before and after aliases
3520 Use --verbose to print the parsed tree before and after aliases
3517 expansion.
3521 expansion.
3518 """
3522 """
3519 if ui.verbose:
3523 if ui.verbose:
3520 tree = revset.parse(expr, lookup=repo.__contains__)
3524 tree = revset.parse(expr, lookup=repo.__contains__)
3521 ui.note(revset.prettyformat(tree), "\n")
3525 ui.note(revset.prettyformat(tree), "\n")
3522 newtree = revset.expandaliases(ui, tree)
3526 newtree = revset.expandaliases(ui, tree)
3523 if newtree != tree:
3527 if newtree != tree:
3524 ui.note(("* expanded:\n"), revset.prettyformat(newtree), "\n")
3528 ui.note(("* expanded:\n"), revset.prettyformat(newtree), "\n")
3525 tree = newtree
3529 tree = newtree
3526 newtree = revset.foldconcat(tree)
3530 newtree = revset.foldconcat(tree)
3527 if newtree != tree:
3531 if newtree != tree:
3528 ui.note(("* concatenated:\n"), revset.prettyformat(newtree), "\n")
3532 ui.note(("* concatenated:\n"), revset.prettyformat(newtree), "\n")
3529 if opts["optimize"]:
3533 if opts["optimize"]:
3530 optimizedtree = revset.optimize(newtree)
3534 optimizedtree = revset.optimize(newtree)
3531 ui.note(("* optimized:\n"),
3535 ui.note(("* optimized:\n"),
3532 revset.prettyformat(optimizedtree), "\n")
3536 revset.prettyformat(optimizedtree), "\n")
3533 func = revset.match(ui, expr, repo)
3537 func = revset.match(ui, expr, repo)
3534 revs = func(repo)
3538 revs = func(repo)
3535 if ui.verbose:
3539 if ui.verbose:
3536 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3540 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3537 for c in revs:
3541 for c in revs:
3538 ui.write("%s\n" % c)
3542 ui.write("%s\n" % c)
3539
3543
3540 @command('debugsetparents', [], _('REV1 [REV2]'))
3544 @command('debugsetparents', [], _('REV1 [REV2]'))
3541 def debugsetparents(ui, repo, rev1, rev2=None):
3545 def debugsetparents(ui, repo, rev1, rev2=None):
3542 """manually set the parents of the current working directory
3546 """manually set the parents of the current working directory
3543
3547
3544 This is useful for writing repository conversion tools, but should
3548 This is useful for writing repository conversion tools, but should
3545 be used with care. For example, neither the working directory nor the
3549 be used with care. For example, neither the working directory nor the
3546 dirstate is updated, so file status may be incorrect after running this
3550 dirstate is updated, so file status may be incorrect after running this
3547 command.
3551 command.
3548
3552
3549 Returns 0 on success.
3553 Returns 0 on success.
3550 """
3554 """
3551
3555
3552 r1 = scmutil.revsingle(repo, rev1).node()
3556 r1 = scmutil.revsingle(repo, rev1).node()
3553 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3557 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3554
3558
3555 with repo.wlock():
3559 with repo.wlock():
3556 repo.setparents(r1, r2)
3560 repo.setparents(r1, r2)
3557
3561
3558 @command('debugdirstate|debugstate',
3562 @command('debugdirstate|debugstate',
3559 [('', 'nodates', None, _('do not display the saved mtime')),
3563 [('', 'nodates', None, _('do not display the saved mtime')),
3560 ('', 'datesort', None, _('sort by saved mtime'))],
3564 ('', 'datesort', None, _('sort by saved mtime'))],
3561 _('[OPTION]...'))
3565 _('[OPTION]...'))
3562 def debugstate(ui, repo, **opts):
3566 def debugstate(ui, repo, **opts):
3563 """show the contents of the current dirstate"""
3567 """show the contents of the current dirstate"""
3564
3568
3565 nodates = opts.get('nodates')
3569 nodates = opts.get('nodates')
3566 datesort = opts.get('datesort')
3570 datesort = opts.get('datesort')
3567
3571
3568 timestr = ""
3572 timestr = ""
3569 if datesort:
3573 if datesort:
3570 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3574 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3571 else:
3575 else:
3572 keyfunc = None # sort by filename
3576 keyfunc = None # sort by filename
3573 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3577 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3574 if ent[3] == -1:
3578 if ent[3] == -1:
3575 timestr = 'unset '
3579 timestr = 'unset '
3576 elif nodates:
3580 elif nodates:
3577 timestr = 'set '
3581 timestr = 'set '
3578 else:
3582 else:
3579 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3583 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3580 time.localtime(ent[3]))
3584 time.localtime(ent[3]))
3581 if ent[1] & 0o20000:
3585 if ent[1] & 0o20000:
3582 mode = 'lnk'
3586 mode = 'lnk'
3583 else:
3587 else:
3584 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3588 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3585 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3589 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3586 for f in repo.dirstate.copies():
3590 for f in repo.dirstate.copies():
3587 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3591 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3588
3592
3589 @command('debugsub',
3593 @command('debugsub',
3590 [('r', 'rev', '',
3594 [('r', 'rev', '',
3591 _('revision to check'), _('REV'))],
3595 _('revision to check'), _('REV'))],
3592 _('[-r REV] [REV]'))
3596 _('[-r REV] [REV]'))
3593 def debugsub(ui, repo, rev=None):
3597 def debugsub(ui, repo, rev=None):
3594 ctx = scmutil.revsingle(repo, rev, None)
3598 ctx = scmutil.revsingle(repo, rev, None)
3595 for k, v in sorted(ctx.substate.items()):
3599 for k, v in sorted(ctx.substate.items()):
3596 ui.write(('path %s\n') % k)
3600 ui.write(('path %s\n') % k)
3597 ui.write((' source %s\n') % v[0])
3601 ui.write((' source %s\n') % v[0])
3598 ui.write((' revision %s\n') % v[1])
3602 ui.write((' revision %s\n') % v[1])
3599
3603
3600 @command('debugsuccessorssets',
3604 @command('debugsuccessorssets',
3601 [],
3605 [],
3602 _('[REV]'))
3606 _('[REV]'))
3603 def debugsuccessorssets(ui, repo, *revs):
3607 def debugsuccessorssets(ui, repo, *revs):
3604 """show set of successors for revision
3608 """show set of successors for revision
3605
3609
3606 A successors set of changeset A is a consistent group of revisions that
3610 A successors set of changeset A is a consistent group of revisions that
3607 succeed A. It contains non-obsolete changesets only.
3611 succeed A. It contains non-obsolete changesets only.
3608
3612
3609 In most cases a changeset A has a single successors set containing a single
3613 In most cases a changeset A has a single successors set containing a single
3610 successor (changeset A replaced by A').
3614 successor (changeset A replaced by A').
3611
3615
3612 A changeset that is made obsolete with no successors are called "pruned".
3616 A changeset that is made obsolete with no successors are called "pruned".
3613 Such changesets have no successors sets at all.
3617 Such changesets have no successors sets at all.
3614
3618
3615 A changeset that has been "split" will have a successors set containing
3619 A changeset that has been "split" will have a successors set containing
3616 more than one successor.
3620 more than one successor.
3617
3621
3618 A changeset that has been rewritten in multiple different ways is called
3622 A changeset that has been rewritten in multiple different ways is called
3619 "divergent". Such changesets have multiple successor sets (each of which
3623 "divergent". Such changesets have multiple successor sets (each of which
3620 may also be split, i.e. have multiple successors).
3624 may also be split, i.e. have multiple successors).
3621
3625
3622 Results are displayed as follows::
3626 Results are displayed as follows::
3623
3627
3624 <rev1>
3628 <rev1>
3625 <successors-1A>
3629 <successors-1A>
3626 <rev2>
3630 <rev2>
3627 <successors-2A>
3631 <successors-2A>
3628 <successors-2B1> <successors-2B2> <successors-2B3>
3632 <successors-2B1> <successors-2B2> <successors-2B3>
3629
3633
3630 Here rev2 has two possible (i.e. divergent) successors sets. The first
3634 Here rev2 has two possible (i.e. divergent) successors sets. The first
3631 holds one element, whereas the second holds three (i.e. the changeset has
3635 holds one element, whereas the second holds three (i.e. the changeset has
3632 been split).
3636 been split).
3633 """
3637 """
3634 # passed to successorssets caching computation from one call to another
3638 # passed to successorssets caching computation from one call to another
3635 cache = {}
3639 cache = {}
3636 ctx2str = str
3640 ctx2str = str
3637 node2str = short
3641 node2str = short
3638 if ui.debug():
3642 if ui.debug():
3639 def ctx2str(ctx):
3643 def ctx2str(ctx):
3640 return ctx.hex()
3644 return ctx.hex()
3641 node2str = hex
3645 node2str = hex
3642 for rev in scmutil.revrange(repo, revs):
3646 for rev in scmutil.revrange(repo, revs):
3643 ctx = repo[rev]
3647 ctx = repo[rev]
3644 ui.write('%s\n'% ctx2str(ctx))
3648 ui.write('%s\n'% ctx2str(ctx))
3645 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3649 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3646 if succsset:
3650 if succsset:
3647 ui.write(' ')
3651 ui.write(' ')
3648 ui.write(node2str(succsset[0]))
3652 ui.write(node2str(succsset[0]))
3649 for node in succsset[1:]:
3653 for node in succsset[1:]:
3650 ui.write(' ')
3654 ui.write(' ')
3651 ui.write(node2str(node))
3655 ui.write(node2str(node))
3652 ui.write('\n')
3656 ui.write('\n')
3653
3657
3654 @command('debugtemplate',
3658 @command('debugtemplate',
3655 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3659 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3656 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3660 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3657 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3661 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3658 optionalrepo=True)
3662 optionalrepo=True)
3659 def debugtemplate(ui, repo, tmpl, **opts):
3663 def debugtemplate(ui, repo, tmpl, **opts):
3660 """parse and apply a template
3664 """parse and apply a template
3661
3665
3662 If -r/--rev is given, the template is processed as a log template and
3666 If -r/--rev is given, the template is processed as a log template and
3663 applied to the given changesets. Otherwise, it is processed as a generic
3667 applied to the given changesets. Otherwise, it is processed as a generic
3664 template.
3668 template.
3665
3669
3666 Use --verbose to print the parsed tree.
3670 Use --verbose to print the parsed tree.
3667 """
3671 """
3668 revs = None
3672 revs = None
3669 if opts['rev']:
3673 if opts['rev']:
3670 if repo is None:
3674 if repo is None:
3671 raise error.RepoError(_('there is no Mercurial repository here '
3675 raise error.RepoError(_('there is no Mercurial repository here '
3672 '(.hg not found)'))
3676 '(.hg not found)'))
3673 revs = scmutil.revrange(repo, opts['rev'])
3677 revs = scmutil.revrange(repo, opts['rev'])
3674
3678
3675 props = {}
3679 props = {}
3676 for d in opts['define']:
3680 for d in opts['define']:
3677 try:
3681 try:
3678 k, v = (e.strip() for e in d.split('=', 1))
3682 k, v = (e.strip() for e in d.split('=', 1))
3679 if not k:
3683 if not k:
3680 raise ValueError
3684 raise ValueError
3681 props[k] = v
3685 props[k] = v
3682 except ValueError:
3686 except ValueError:
3683 raise error.Abort(_('malformed keyword definition: %s') % d)
3687 raise error.Abort(_('malformed keyword definition: %s') % d)
3684
3688
3685 if ui.verbose:
3689 if ui.verbose:
3686 aliases = ui.configitems('templatealias')
3690 aliases = ui.configitems('templatealias')
3687 tree = templater.parse(tmpl)
3691 tree = templater.parse(tmpl)
3688 ui.note(templater.prettyformat(tree), '\n')
3692 ui.note(templater.prettyformat(tree), '\n')
3689 newtree = templater.expandaliases(tree, aliases)
3693 newtree = templater.expandaliases(tree, aliases)
3690 if newtree != tree:
3694 if newtree != tree:
3691 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3695 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3692
3696
3693 mapfile = None
3697 mapfile = None
3694 if revs is None:
3698 if revs is None:
3695 k = 'debugtemplate'
3699 k = 'debugtemplate'
3696 t = formatter.maketemplater(ui, k, tmpl)
3700 t = formatter.maketemplater(ui, k, tmpl)
3697 ui.write(templater.stringify(t(k, **props)))
3701 ui.write(templater.stringify(t(k, **props)))
3698 else:
3702 else:
3699 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3703 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3700 mapfile, buffered=False)
3704 mapfile, buffered=False)
3701 for r in revs:
3705 for r in revs:
3702 displayer.show(repo[r], **props)
3706 displayer.show(repo[r], **props)
3703 displayer.close()
3707 displayer.close()
3704
3708
3705 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3709 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3706 def debugwalk(ui, repo, *pats, **opts):
3710 def debugwalk(ui, repo, *pats, **opts):
3707 """show how files match on given patterns"""
3711 """show how files match on given patterns"""
3708 m = scmutil.match(repo[None], pats, opts)
3712 m = scmutil.match(repo[None], pats, opts)
3709 items = list(repo.walk(m))
3713 items = list(repo.walk(m))
3710 if not items:
3714 if not items:
3711 return
3715 return
3712 f = lambda fn: fn
3716 f = lambda fn: fn
3713 if ui.configbool('ui', 'slash') and os.sep != '/':
3717 if ui.configbool('ui', 'slash') and os.sep != '/':
3714 f = lambda fn: util.normpath(fn)
3718 f = lambda fn: util.normpath(fn)
3715 fmt = 'f %%-%ds %%-%ds %%s' % (
3719 fmt = 'f %%-%ds %%-%ds %%s' % (
3716 max([len(abs) for abs in items]),
3720 max([len(abs) for abs in items]),
3717 max([len(m.rel(abs)) for abs in items]))
3721 max([len(m.rel(abs)) for abs in items]))
3718 for abs in items:
3722 for abs in items:
3719 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3723 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3720 ui.write("%s\n" % line.rstrip())
3724 ui.write("%s\n" % line.rstrip())
3721
3725
3722 @command('debugwireargs',
3726 @command('debugwireargs',
3723 [('', 'three', '', 'three'),
3727 [('', 'three', '', 'three'),
3724 ('', 'four', '', 'four'),
3728 ('', 'four', '', 'four'),
3725 ('', 'five', '', 'five'),
3729 ('', 'five', '', 'five'),
3726 ] + remoteopts,
3730 ] + remoteopts,
3727 _('REPO [OPTIONS]... [ONE [TWO]]'),
3731 _('REPO [OPTIONS]... [ONE [TWO]]'),
3728 norepo=True)
3732 norepo=True)
3729 def debugwireargs(ui, repopath, *vals, **opts):
3733 def debugwireargs(ui, repopath, *vals, **opts):
3730 repo = hg.peer(ui, opts, repopath)
3734 repo = hg.peer(ui, opts, repopath)
3731 for opt in remoteopts:
3735 for opt in remoteopts:
3732 del opts[opt[1]]
3736 del opts[opt[1]]
3733 args = {}
3737 args = {}
3734 for k, v in opts.iteritems():
3738 for k, v in opts.iteritems():
3735 if v:
3739 if v:
3736 args[k] = v
3740 args[k] = v
3737 # run twice to check that we don't mess up the stream for the next command
3741 # run twice to check that we don't mess up the stream for the next command
3738 res1 = repo.debugwireargs(*vals, **args)
3742 res1 = repo.debugwireargs(*vals, **args)
3739 res2 = repo.debugwireargs(*vals, **args)
3743 res2 = repo.debugwireargs(*vals, **args)
3740 ui.write("%s\n" % res1)
3744 ui.write("%s\n" % res1)
3741 if res1 != res2:
3745 if res1 != res2:
3742 ui.warn("%s\n" % res2)
3746 ui.warn("%s\n" % res2)
3743
3747
3744 @command('^diff',
3748 @command('^diff',
3745 [('r', 'rev', [], _('revision'), _('REV')),
3749 [('r', 'rev', [], _('revision'), _('REV')),
3746 ('c', 'change', '', _('change made by revision'), _('REV'))
3750 ('c', 'change', '', _('change made by revision'), _('REV'))
3747 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3751 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3748 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3752 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3749 inferrepo=True)
3753 inferrepo=True)
3750 def diff(ui, repo, *pats, **opts):
3754 def diff(ui, repo, *pats, **opts):
3751 """diff repository (or selected files)
3755 """diff repository (or selected files)
3752
3756
3753 Show differences between revisions for the specified files.
3757 Show differences between revisions for the specified files.
3754
3758
3755 Differences between files are shown using the unified diff format.
3759 Differences between files are shown using the unified diff format.
3756
3760
3757 .. note::
3761 .. note::
3758
3762
3759 :hg:`diff` may generate unexpected results for merges, as it will
3763 :hg:`diff` may generate unexpected results for merges, as it will
3760 default to comparing against the working directory's first
3764 default to comparing against the working directory's first
3761 parent changeset if no revisions are specified.
3765 parent changeset if no revisions are specified.
3762
3766
3763 When two revision arguments are given, then changes are shown
3767 When two revision arguments are given, then changes are shown
3764 between those revisions. If only one revision is specified then
3768 between those revisions. If only one revision is specified then
3765 that revision is compared to the working directory, and, when no
3769 that revision is compared to the working directory, and, when no
3766 revisions are specified, the working directory files are compared
3770 revisions are specified, the working directory files are compared
3767 to its first parent.
3771 to its first parent.
3768
3772
3769 Alternatively you can specify -c/--change with a revision to see
3773 Alternatively you can specify -c/--change with a revision to see
3770 the changes in that changeset relative to its first parent.
3774 the changes in that changeset relative to its first parent.
3771
3775
3772 Without the -a/--text option, diff will avoid generating diffs of
3776 Without the -a/--text option, diff will avoid generating diffs of
3773 files it detects as binary. With -a, diff will generate a diff
3777 files it detects as binary. With -a, diff will generate a diff
3774 anyway, probably with undesirable results.
3778 anyway, probably with undesirable results.
3775
3779
3776 Use the -g/--git option to generate diffs in the git extended diff
3780 Use the -g/--git option to generate diffs in the git extended diff
3777 format. For more information, read :hg:`help diffs`.
3781 format. For more information, read :hg:`help diffs`.
3778
3782
3779 .. container:: verbose
3783 .. container:: verbose
3780
3784
3781 Examples:
3785 Examples:
3782
3786
3783 - compare a file in the current working directory to its parent::
3787 - compare a file in the current working directory to its parent::
3784
3788
3785 hg diff foo.c
3789 hg diff foo.c
3786
3790
3787 - compare two historical versions of a directory, with rename info::
3791 - compare two historical versions of a directory, with rename info::
3788
3792
3789 hg diff --git -r 1.0:1.2 lib/
3793 hg diff --git -r 1.0:1.2 lib/
3790
3794
3791 - get change stats relative to the last change on some date::
3795 - get change stats relative to the last change on some date::
3792
3796
3793 hg diff --stat -r "date('may 2')"
3797 hg diff --stat -r "date('may 2')"
3794
3798
3795 - diff all newly-added files that contain a keyword::
3799 - diff all newly-added files that contain a keyword::
3796
3800
3797 hg diff "set:added() and grep(GNU)"
3801 hg diff "set:added() and grep(GNU)"
3798
3802
3799 - compare a revision and its parents::
3803 - compare a revision and its parents::
3800
3804
3801 hg diff -c 9353 # compare against first parent
3805 hg diff -c 9353 # compare against first parent
3802 hg diff -r 9353^:9353 # same using revset syntax
3806 hg diff -r 9353^:9353 # same using revset syntax
3803 hg diff -r 9353^2:9353 # compare against the second parent
3807 hg diff -r 9353^2:9353 # compare against the second parent
3804
3808
3805 Returns 0 on success.
3809 Returns 0 on success.
3806 """
3810 """
3807
3811
3808 revs = opts.get('rev')
3812 revs = opts.get('rev')
3809 change = opts.get('change')
3813 change = opts.get('change')
3810 stat = opts.get('stat')
3814 stat = opts.get('stat')
3811 reverse = opts.get('reverse')
3815 reverse = opts.get('reverse')
3812
3816
3813 if revs and change:
3817 if revs and change:
3814 msg = _('cannot specify --rev and --change at the same time')
3818 msg = _('cannot specify --rev and --change at the same time')
3815 raise error.Abort(msg)
3819 raise error.Abort(msg)
3816 elif change:
3820 elif change:
3817 node2 = scmutil.revsingle(repo, change, None).node()
3821 node2 = scmutil.revsingle(repo, change, None).node()
3818 node1 = repo[node2].p1().node()
3822 node1 = repo[node2].p1().node()
3819 else:
3823 else:
3820 node1, node2 = scmutil.revpair(repo, revs)
3824 node1, node2 = scmutil.revpair(repo, revs)
3821
3825
3822 if reverse:
3826 if reverse:
3823 node1, node2 = node2, node1
3827 node1, node2 = node2, node1
3824
3828
3825 diffopts = patch.diffallopts(ui, opts)
3829 diffopts = patch.diffallopts(ui, opts)
3826 m = scmutil.match(repo[node2], pats, opts)
3830 m = scmutil.match(repo[node2], pats, opts)
3827 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3831 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3828 listsubrepos=opts.get('subrepos'),
3832 listsubrepos=opts.get('subrepos'),
3829 root=opts.get('root'))
3833 root=opts.get('root'))
3830
3834
3831 @command('^export',
3835 @command('^export',
3832 [('o', 'output', '',
3836 [('o', 'output', '',
3833 _('print output to file with formatted name'), _('FORMAT')),
3837 _('print output to file with formatted name'), _('FORMAT')),
3834 ('', 'switch-parent', None, _('diff against the second parent')),
3838 ('', 'switch-parent', None, _('diff against the second parent')),
3835 ('r', 'rev', [], _('revisions to export'), _('REV')),
3839 ('r', 'rev', [], _('revisions to export'), _('REV')),
3836 ] + diffopts,
3840 ] + diffopts,
3837 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3841 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3838 def export(ui, repo, *changesets, **opts):
3842 def export(ui, repo, *changesets, **opts):
3839 """dump the header and diffs for one or more changesets
3843 """dump the header and diffs for one or more changesets
3840
3844
3841 Print the changeset header and diffs for one or more revisions.
3845 Print the changeset header and diffs for one or more revisions.
3842 If no revision is given, the parent of the working directory is used.
3846 If no revision is given, the parent of the working directory is used.
3843
3847
3844 The information shown in the changeset header is: author, date,
3848 The information shown in the changeset header is: author, date,
3845 branch name (if non-default), changeset hash, parent(s) and commit
3849 branch name (if non-default), changeset hash, parent(s) and commit
3846 comment.
3850 comment.
3847
3851
3848 .. note::
3852 .. note::
3849
3853
3850 :hg:`export` may generate unexpected diff output for merge
3854 :hg:`export` may generate unexpected diff output for merge
3851 changesets, as it will compare the merge changeset against its
3855 changesets, as it will compare the merge changeset against its
3852 first parent only.
3856 first parent only.
3853
3857
3854 Output may be to a file, in which case the name of the file is
3858 Output may be to a file, in which case the name of the file is
3855 given using a format string. The formatting rules are as follows:
3859 given using a format string. The formatting rules are as follows:
3856
3860
3857 :``%%``: literal "%" character
3861 :``%%``: literal "%" character
3858 :``%H``: changeset hash (40 hexadecimal digits)
3862 :``%H``: changeset hash (40 hexadecimal digits)
3859 :``%N``: number of patches being generated
3863 :``%N``: number of patches being generated
3860 :``%R``: changeset revision number
3864 :``%R``: changeset revision number
3861 :``%b``: basename of the exporting repository
3865 :``%b``: basename of the exporting repository
3862 :``%h``: short-form changeset hash (12 hexadecimal digits)
3866 :``%h``: short-form changeset hash (12 hexadecimal digits)
3863 :``%m``: first line of the commit message (only alphanumeric characters)
3867 :``%m``: first line of the commit message (only alphanumeric characters)
3864 :``%n``: zero-padded sequence number, starting at 1
3868 :``%n``: zero-padded sequence number, starting at 1
3865 :``%r``: zero-padded changeset revision number
3869 :``%r``: zero-padded changeset revision number
3866
3870
3867 Without the -a/--text option, export will avoid generating diffs
3871 Without the -a/--text option, export will avoid generating diffs
3868 of files it detects as binary. With -a, export will generate a
3872 of files it detects as binary. With -a, export will generate a
3869 diff anyway, probably with undesirable results.
3873 diff anyway, probably with undesirable results.
3870
3874
3871 Use the -g/--git option to generate diffs in the git extended diff
3875 Use the -g/--git option to generate diffs in the git extended diff
3872 format. See :hg:`help diffs` for more information.
3876 format. See :hg:`help diffs` for more information.
3873
3877
3874 With the --switch-parent option, the diff will be against the
3878 With the --switch-parent option, the diff will be against the
3875 second parent. It can be useful to review a merge.
3879 second parent. It can be useful to review a merge.
3876
3880
3877 .. container:: verbose
3881 .. container:: verbose
3878
3882
3879 Examples:
3883 Examples:
3880
3884
3881 - use export and import to transplant a bugfix to the current
3885 - use export and import to transplant a bugfix to the current
3882 branch::
3886 branch::
3883
3887
3884 hg export -r 9353 | hg import -
3888 hg export -r 9353 | hg import -
3885
3889
3886 - export all the changesets between two revisions to a file with
3890 - export all the changesets between two revisions to a file with
3887 rename information::
3891 rename information::
3888
3892
3889 hg export --git -r 123:150 > changes.txt
3893 hg export --git -r 123:150 > changes.txt
3890
3894
3891 - split outgoing changes into a series of patches with
3895 - split outgoing changes into a series of patches with
3892 descriptive names::
3896 descriptive names::
3893
3897
3894 hg export -r "outgoing()" -o "%n-%m.patch"
3898 hg export -r "outgoing()" -o "%n-%m.patch"
3895
3899
3896 Returns 0 on success.
3900 Returns 0 on success.
3897 """
3901 """
3898 changesets += tuple(opts.get('rev', []))
3902 changesets += tuple(opts.get('rev', []))
3899 if not changesets:
3903 if not changesets:
3900 changesets = ['.']
3904 changesets = ['.']
3901 revs = scmutil.revrange(repo, changesets)
3905 revs = scmutil.revrange(repo, changesets)
3902 if not revs:
3906 if not revs:
3903 raise error.Abort(_("export requires at least one changeset"))
3907 raise error.Abort(_("export requires at least one changeset"))
3904 if len(revs) > 1:
3908 if len(revs) > 1:
3905 ui.note(_('exporting patches:\n'))
3909 ui.note(_('exporting patches:\n'))
3906 else:
3910 else:
3907 ui.note(_('exporting patch:\n'))
3911 ui.note(_('exporting patch:\n'))
3908 cmdutil.export(repo, revs, template=opts.get('output'),
3912 cmdutil.export(repo, revs, template=opts.get('output'),
3909 switch_parent=opts.get('switch_parent'),
3913 switch_parent=opts.get('switch_parent'),
3910 opts=patch.diffallopts(ui, opts))
3914 opts=patch.diffallopts(ui, opts))
3911
3915
3912 @command('files',
3916 @command('files',
3913 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3917 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3914 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3918 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3915 ] + walkopts + formatteropts + subrepoopts,
3919 ] + walkopts + formatteropts + subrepoopts,
3916 _('[OPTION]... [FILE]...'))
3920 _('[OPTION]... [FILE]...'))
3917 def files(ui, repo, *pats, **opts):
3921 def files(ui, repo, *pats, **opts):
3918 """list tracked files
3922 """list tracked files
3919
3923
3920 Print files under Mercurial control in the working directory or
3924 Print files under Mercurial control in the working directory or
3921 specified revision for given files (excluding removed files).
3925 specified revision for given files (excluding removed files).
3922 Files can be specified as filenames or filesets.
3926 Files can be specified as filenames or filesets.
3923
3927
3924 If no files are given to match, this command prints the names
3928 If no files are given to match, this command prints the names
3925 of all files under Mercurial control.
3929 of all files under Mercurial control.
3926
3930
3927 .. container:: verbose
3931 .. container:: verbose
3928
3932
3929 Examples:
3933 Examples:
3930
3934
3931 - list all files under the current directory::
3935 - list all files under the current directory::
3932
3936
3933 hg files .
3937 hg files .
3934
3938
3935 - shows sizes and flags for current revision::
3939 - shows sizes and flags for current revision::
3936
3940
3937 hg files -vr .
3941 hg files -vr .
3938
3942
3939 - list all files named README::
3943 - list all files named README::
3940
3944
3941 hg files -I "**/README"
3945 hg files -I "**/README"
3942
3946
3943 - list all binary files::
3947 - list all binary files::
3944
3948
3945 hg files "set:binary()"
3949 hg files "set:binary()"
3946
3950
3947 - find files containing a regular expression::
3951 - find files containing a regular expression::
3948
3952
3949 hg files "set:grep('bob')"
3953 hg files "set:grep('bob')"
3950
3954
3951 - search tracked file contents with xargs and grep::
3955 - search tracked file contents with xargs and grep::
3952
3956
3953 hg files -0 | xargs -0 grep foo
3957 hg files -0 | xargs -0 grep foo
3954
3958
3955 See :hg:`help patterns` and :hg:`help filesets` for more information
3959 See :hg:`help patterns` and :hg:`help filesets` for more information
3956 on specifying file patterns.
3960 on specifying file patterns.
3957
3961
3958 Returns 0 if a match is found, 1 otherwise.
3962 Returns 0 if a match is found, 1 otherwise.
3959
3963
3960 """
3964 """
3961 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3965 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3962
3966
3963 end = '\n'
3967 end = '\n'
3964 if opts.get('print0'):
3968 if opts.get('print0'):
3965 end = '\0'
3969 end = '\0'
3966 fmt = '%s' + end
3970 fmt = '%s' + end
3967
3971
3968 m = scmutil.match(ctx, pats, opts)
3972 m = scmutil.match(ctx, pats, opts)
3969 with ui.formatter('files', opts) as fm:
3973 with ui.formatter('files', opts) as fm:
3970 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3974 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3971
3975
3972 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3976 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3973 def forget(ui, repo, *pats, **opts):
3977 def forget(ui, repo, *pats, **opts):
3974 """forget the specified files on the next commit
3978 """forget the specified files on the next commit
3975
3979
3976 Mark the specified files so they will no longer be tracked
3980 Mark the specified files so they will no longer be tracked
3977 after the next commit.
3981 after the next commit.
3978
3982
3979 This only removes files from the current branch, not from the
3983 This only removes files from the current branch, not from the
3980 entire project history, and it does not delete them from the
3984 entire project history, and it does not delete them from the
3981 working directory.
3985 working directory.
3982
3986
3983 To delete the file from the working directory, see :hg:`remove`.
3987 To delete the file from the working directory, see :hg:`remove`.
3984
3988
3985 To undo a forget before the next commit, see :hg:`add`.
3989 To undo a forget before the next commit, see :hg:`add`.
3986
3990
3987 .. container:: verbose
3991 .. container:: verbose
3988
3992
3989 Examples:
3993 Examples:
3990
3994
3991 - forget newly-added binary files::
3995 - forget newly-added binary files::
3992
3996
3993 hg forget "set:added() and binary()"
3997 hg forget "set:added() and binary()"
3994
3998
3995 - forget files that would be excluded by .hgignore::
3999 - forget files that would be excluded by .hgignore::
3996
4000
3997 hg forget "set:hgignore()"
4001 hg forget "set:hgignore()"
3998
4002
3999 Returns 0 on success.
4003 Returns 0 on success.
4000 """
4004 """
4001
4005
4002 if not pats:
4006 if not pats:
4003 raise error.Abort(_('no files specified'))
4007 raise error.Abort(_('no files specified'))
4004
4008
4005 m = scmutil.match(repo[None], pats, opts)
4009 m = scmutil.match(repo[None], pats, opts)
4006 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4010 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4007 return rejected and 1 or 0
4011 return rejected and 1 or 0
4008
4012
4009 @command(
4013 @command(
4010 'graft',
4014 'graft',
4011 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4015 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4012 ('c', 'continue', False, _('resume interrupted graft')),
4016 ('c', 'continue', False, _('resume interrupted graft')),
4013 ('e', 'edit', False, _('invoke editor on commit messages')),
4017 ('e', 'edit', False, _('invoke editor on commit messages')),
4014 ('', 'log', None, _('append graft info to log message')),
4018 ('', 'log', None, _('append graft info to log message')),
4015 ('f', 'force', False, _('force graft')),
4019 ('f', 'force', False, _('force graft')),
4016 ('D', 'currentdate', False,
4020 ('D', 'currentdate', False,
4017 _('record the current date as commit date')),
4021 _('record the current date as commit date')),
4018 ('U', 'currentuser', False,
4022 ('U', 'currentuser', False,
4019 _('record the current user as committer'), _('DATE'))]
4023 _('record the current user as committer'), _('DATE'))]
4020 + commitopts2 + mergetoolopts + dryrunopts,
4024 + commitopts2 + mergetoolopts + dryrunopts,
4021 _('[OPTION]... [-r REV]... REV...'))
4025 _('[OPTION]... [-r REV]... REV...'))
4022 def graft(ui, repo, *revs, **opts):
4026 def graft(ui, repo, *revs, **opts):
4023 '''copy changes from other branches onto the current branch
4027 '''copy changes from other branches onto the current branch
4024
4028
4025 This command uses Mercurial's merge logic to copy individual
4029 This command uses Mercurial's merge logic to copy individual
4026 changes from other branches without merging branches in the
4030 changes from other branches without merging branches in the
4027 history graph. This is sometimes known as 'backporting' or
4031 history graph. This is sometimes known as 'backporting' or
4028 'cherry-picking'. By default, graft will copy user, date, and
4032 'cherry-picking'. By default, graft will copy user, date, and
4029 description from the source changesets.
4033 description from the source changesets.
4030
4034
4031 Changesets that are ancestors of the current revision, that have
4035 Changesets that are ancestors of the current revision, that have
4032 already been grafted, or that are merges will be skipped.
4036 already been grafted, or that are merges will be skipped.
4033
4037
4034 If --log is specified, log messages will have a comment appended
4038 If --log is specified, log messages will have a comment appended
4035 of the form::
4039 of the form::
4036
4040
4037 (grafted from CHANGESETHASH)
4041 (grafted from CHANGESETHASH)
4038
4042
4039 If --force is specified, revisions will be grafted even if they
4043 If --force is specified, revisions will be grafted even if they
4040 are already ancestors of or have been grafted to the destination.
4044 are already ancestors of or have been grafted to the destination.
4041 This is useful when the revisions have since been backed out.
4045 This is useful when the revisions have since been backed out.
4042
4046
4043 If a graft merge results in conflicts, the graft process is
4047 If a graft merge results in conflicts, the graft process is
4044 interrupted so that the current merge can be manually resolved.
4048 interrupted so that the current merge can be manually resolved.
4045 Once all conflicts are addressed, the graft process can be
4049 Once all conflicts are addressed, the graft process can be
4046 continued with the -c/--continue option.
4050 continued with the -c/--continue option.
4047
4051
4048 .. note::
4052 .. note::
4049
4053
4050 The -c/--continue option does not reapply earlier options, except
4054 The -c/--continue option does not reapply earlier options, except
4051 for --force.
4055 for --force.
4052
4056
4053 .. container:: verbose
4057 .. container:: verbose
4054
4058
4055 Examples:
4059 Examples:
4056
4060
4057 - copy a single change to the stable branch and edit its description::
4061 - copy a single change to the stable branch and edit its description::
4058
4062
4059 hg update stable
4063 hg update stable
4060 hg graft --edit 9393
4064 hg graft --edit 9393
4061
4065
4062 - graft a range of changesets with one exception, updating dates::
4066 - graft a range of changesets with one exception, updating dates::
4063
4067
4064 hg graft -D "2085::2093 and not 2091"
4068 hg graft -D "2085::2093 and not 2091"
4065
4069
4066 - continue a graft after resolving conflicts::
4070 - continue a graft after resolving conflicts::
4067
4071
4068 hg graft -c
4072 hg graft -c
4069
4073
4070 - show the source of a grafted changeset::
4074 - show the source of a grafted changeset::
4071
4075
4072 hg log --debug -r .
4076 hg log --debug -r .
4073
4077
4074 - show revisions sorted by date::
4078 - show revisions sorted by date::
4075
4079
4076 hg log -r "sort(all(), date)"
4080 hg log -r "sort(all(), date)"
4077
4081
4078 See :hg:`help revisions` and :hg:`help revsets` for more about
4082 See :hg:`help revisions` and :hg:`help revsets` for more about
4079 specifying revisions.
4083 specifying revisions.
4080
4084
4081 Returns 0 on successful completion.
4085 Returns 0 on successful completion.
4082 '''
4086 '''
4083 with repo.wlock():
4087 with repo.wlock():
4084 return _dograft(ui, repo, *revs, **opts)
4088 return _dograft(ui, repo, *revs, **opts)
4085
4089
4086 def _dograft(ui, repo, *revs, **opts):
4090 def _dograft(ui, repo, *revs, **opts):
4087 if revs and opts.get('rev'):
4091 if revs and opts.get('rev'):
4088 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4092 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4089 'revision ordering!\n'))
4093 'revision ordering!\n'))
4090
4094
4091 revs = list(revs)
4095 revs = list(revs)
4092 revs.extend(opts.get('rev'))
4096 revs.extend(opts.get('rev'))
4093
4097
4094 if not opts.get('user') and opts.get('currentuser'):
4098 if not opts.get('user') and opts.get('currentuser'):
4095 opts['user'] = ui.username()
4099 opts['user'] = ui.username()
4096 if not opts.get('date') and opts.get('currentdate'):
4100 if not opts.get('date') and opts.get('currentdate'):
4097 opts['date'] = "%d %d" % util.makedate()
4101 opts['date'] = "%d %d" % util.makedate()
4098
4102
4099 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4103 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4100
4104
4101 cont = False
4105 cont = False
4102 if opts.get('continue'):
4106 if opts.get('continue'):
4103 cont = True
4107 cont = True
4104 if revs:
4108 if revs:
4105 raise error.Abort(_("can't specify --continue and revisions"))
4109 raise error.Abort(_("can't specify --continue and revisions"))
4106 # read in unfinished revisions
4110 # read in unfinished revisions
4107 try:
4111 try:
4108 nodes = repo.vfs.read('graftstate').splitlines()
4112 nodes = repo.vfs.read('graftstate').splitlines()
4109 revs = [repo[node].rev() for node in nodes]
4113 revs = [repo[node].rev() for node in nodes]
4110 except IOError as inst:
4114 except IOError as inst:
4111 if inst.errno != errno.ENOENT:
4115 if inst.errno != errno.ENOENT:
4112 raise
4116 raise
4113 cmdutil.wrongtooltocontinue(repo, _('graft'))
4117 cmdutil.wrongtooltocontinue(repo, _('graft'))
4114 else:
4118 else:
4115 cmdutil.checkunfinished(repo)
4119 cmdutil.checkunfinished(repo)
4116 cmdutil.bailifchanged(repo)
4120 cmdutil.bailifchanged(repo)
4117 if not revs:
4121 if not revs:
4118 raise error.Abort(_('no revisions specified'))
4122 raise error.Abort(_('no revisions specified'))
4119 revs = scmutil.revrange(repo, revs)
4123 revs = scmutil.revrange(repo, revs)
4120
4124
4121 skipped = set()
4125 skipped = set()
4122 # check for merges
4126 # check for merges
4123 for rev in repo.revs('%ld and merge()', revs):
4127 for rev in repo.revs('%ld and merge()', revs):
4124 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4128 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4125 skipped.add(rev)
4129 skipped.add(rev)
4126 revs = [r for r in revs if r not in skipped]
4130 revs = [r for r in revs if r not in skipped]
4127 if not revs:
4131 if not revs:
4128 return -1
4132 return -1
4129
4133
4130 # Don't check in the --continue case, in effect retaining --force across
4134 # Don't check in the --continue case, in effect retaining --force across
4131 # --continues. That's because without --force, any revisions we decided to
4135 # --continues. That's because without --force, any revisions we decided to
4132 # skip would have been filtered out here, so they wouldn't have made their
4136 # skip would have been filtered out here, so they wouldn't have made their
4133 # way to the graftstate. With --force, any revisions we would have otherwise
4137 # way to the graftstate. With --force, any revisions we would have otherwise
4134 # skipped would not have been filtered out, and if they hadn't been applied
4138 # skipped would not have been filtered out, and if they hadn't been applied
4135 # already, they'd have been in the graftstate.
4139 # already, they'd have been in the graftstate.
4136 if not (cont or opts.get('force')):
4140 if not (cont or opts.get('force')):
4137 # check for ancestors of dest branch
4141 # check for ancestors of dest branch
4138 crev = repo['.'].rev()
4142 crev = repo['.'].rev()
4139 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4143 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4140 # Cannot use x.remove(y) on smart set, this has to be a list.
4144 # Cannot use x.remove(y) on smart set, this has to be a list.
4141 # XXX make this lazy in the future
4145 # XXX make this lazy in the future
4142 revs = list(revs)
4146 revs = list(revs)
4143 # don't mutate while iterating, create a copy
4147 # don't mutate while iterating, create a copy
4144 for rev in list(revs):
4148 for rev in list(revs):
4145 if rev in ancestors:
4149 if rev in ancestors:
4146 ui.warn(_('skipping ancestor revision %d:%s\n') %
4150 ui.warn(_('skipping ancestor revision %d:%s\n') %
4147 (rev, repo[rev]))
4151 (rev, repo[rev]))
4148 # XXX remove on list is slow
4152 # XXX remove on list is slow
4149 revs.remove(rev)
4153 revs.remove(rev)
4150 if not revs:
4154 if not revs:
4151 return -1
4155 return -1
4152
4156
4153 # analyze revs for earlier grafts
4157 # analyze revs for earlier grafts
4154 ids = {}
4158 ids = {}
4155 for ctx in repo.set("%ld", revs):
4159 for ctx in repo.set("%ld", revs):
4156 ids[ctx.hex()] = ctx.rev()
4160 ids[ctx.hex()] = ctx.rev()
4157 n = ctx.extra().get('source')
4161 n = ctx.extra().get('source')
4158 if n:
4162 if n:
4159 ids[n] = ctx.rev()
4163 ids[n] = ctx.rev()
4160
4164
4161 # check ancestors for earlier grafts
4165 # check ancestors for earlier grafts
4162 ui.debug('scanning for duplicate grafts\n')
4166 ui.debug('scanning for duplicate grafts\n')
4163
4167
4164 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4168 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4165 ctx = repo[rev]
4169 ctx = repo[rev]
4166 n = ctx.extra().get('source')
4170 n = ctx.extra().get('source')
4167 if n in ids:
4171 if n in ids:
4168 try:
4172 try:
4169 r = repo[n].rev()
4173 r = repo[n].rev()
4170 except error.RepoLookupError:
4174 except error.RepoLookupError:
4171 r = None
4175 r = None
4172 if r in revs:
4176 if r in revs:
4173 ui.warn(_('skipping revision %d:%s '
4177 ui.warn(_('skipping revision %d:%s '
4174 '(already grafted to %d:%s)\n')
4178 '(already grafted to %d:%s)\n')
4175 % (r, repo[r], rev, ctx))
4179 % (r, repo[r], rev, ctx))
4176 revs.remove(r)
4180 revs.remove(r)
4177 elif ids[n] in revs:
4181 elif ids[n] in revs:
4178 if r is None:
4182 if r is None:
4179 ui.warn(_('skipping already grafted revision %d:%s '
4183 ui.warn(_('skipping already grafted revision %d:%s '
4180 '(%d:%s also has unknown origin %s)\n')
4184 '(%d:%s also has unknown origin %s)\n')
4181 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4185 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4182 else:
4186 else:
4183 ui.warn(_('skipping already grafted revision %d:%s '
4187 ui.warn(_('skipping already grafted revision %d:%s '
4184 '(%d:%s also has origin %d:%s)\n')
4188 '(%d:%s also has origin %d:%s)\n')
4185 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4189 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4186 revs.remove(ids[n])
4190 revs.remove(ids[n])
4187 elif ctx.hex() in ids:
4191 elif ctx.hex() in ids:
4188 r = ids[ctx.hex()]
4192 r = ids[ctx.hex()]
4189 ui.warn(_('skipping already grafted revision %d:%s '
4193 ui.warn(_('skipping already grafted revision %d:%s '
4190 '(was grafted from %d:%s)\n') %
4194 '(was grafted from %d:%s)\n') %
4191 (r, repo[r], rev, ctx))
4195 (r, repo[r], rev, ctx))
4192 revs.remove(r)
4196 revs.remove(r)
4193 if not revs:
4197 if not revs:
4194 return -1
4198 return -1
4195
4199
4196 for pos, ctx in enumerate(repo.set("%ld", revs)):
4200 for pos, ctx in enumerate(repo.set("%ld", revs)):
4197 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4201 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4198 ctx.description().split('\n', 1)[0])
4202 ctx.description().split('\n', 1)[0])
4199 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4203 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4200 if names:
4204 if names:
4201 desc += ' (%s)' % ' '.join(names)
4205 desc += ' (%s)' % ' '.join(names)
4202 ui.status(_('grafting %s\n') % desc)
4206 ui.status(_('grafting %s\n') % desc)
4203 if opts.get('dry_run'):
4207 if opts.get('dry_run'):
4204 continue
4208 continue
4205
4209
4206 source = ctx.extra().get('source')
4210 source = ctx.extra().get('source')
4207 extra = {}
4211 extra = {}
4208 if source:
4212 if source:
4209 extra['source'] = source
4213 extra['source'] = source
4210 extra['intermediate-source'] = ctx.hex()
4214 extra['intermediate-source'] = ctx.hex()
4211 else:
4215 else:
4212 extra['source'] = ctx.hex()
4216 extra['source'] = ctx.hex()
4213 user = ctx.user()
4217 user = ctx.user()
4214 if opts.get('user'):
4218 if opts.get('user'):
4215 user = opts['user']
4219 user = opts['user']
4216 date = ctx.date()
4220 date = ctx.date()
4217 if opts.get('date'):
4221 if opts.get('date'):
4218 date = opts['date']
4222 date = opts['date']
4219 message = ctx.description()
4223 message = ctx.description()
4220 if opts.get('log'):
4224 if opts.get('log'):
4221 message += '\n(grafted from %s)' % ctx.hex()
4225 message += '\n(grafted from %s)' % ctx.hex()
4222
4226
4223 # we don't merge the first commit when continuing
4227 # we don't merge the first commit when continuing
4224 if not cont:
4228 if not cont:
4225 # perform the graft merge with p1(rev) as 'ancestor'
4229 # perform the graft merge with p1(rev) as 'ancestor'
4226 try:
4230 try:
4227 # ui.forcemerge is an internal variable, do not document
4231 # ui.forcemerge is an internal variable, do not document
4228 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4232 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4229 'graft')
4233 'graft')
4230 stats = mergemod.graft(repo, ctx, ctx.p1(),
4234 stats = mergemod.graft(repo, ctx, ctx.p1(),
4231 ['local', 'graft'])
4235 ['local', 'graft'])
4232 finally:
4236 finally:
4233 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4237 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4234 # report any conflicts
4238 # report any conflicts
4235 if stats and stats[3] > 0:
4239 if stats and stats[3] > 0:
4236 # write out state for --continue
4240 # write out state for --continue
4237 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4241 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4238 repo.vfs.write('graftstate', ''.join(nodelines))
4242 repo.vfs.write('graftstate', ''.join(nodelines))
4239 extra = ''
4243 extra = ''
4240 if opts.get('user'):
4244 if opts.get('user'):
4241 extra += ' --user %s' % util.shellquote(opts['user'])
4245 extra += ' --user %s' % util.shellquote(opts['user'])
4242 if opts.get('date'):
4246 if opts.get('date'):
4243 extra += ' --date %s' % util.shellquote(opts['date'])
4247 extra += ' --date %s' % util.shellquote(opts['date'])
4244 if opts.get('log'):
4248 if opts.get('log'):
4245 extra += ' --log'
4249 extra += ' --log'
4246 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4250 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4247 raise error.Abort(
4251 raise error.Abort(
4248 _("unresolved conflicts, can't continue"),
4252 _("unresolved conflicts, can't continue"),
4249 hint=hint)
4253 hint=hint)
4250 else:
4254 else:
4251 cont = False
4255 cont = False
4252
4256
4253 # commit
4257 # commit
4254 node = repo.commit(text=message, user=user,
4258 node = repo.commit(text=message, user=user,
4255 date=date, extra=extra, editor=editor)
4259 date=date, extra=extra, editor=editor)
4256 if node is None:
4260 if node is None:
4257 ui.warn(
4261 ui.warn(
4258 _('note: graft of %d:%s created no changes to commit\n') %
4262 _('note: graft of %d:%s created no changes to commit\n') %
4259 (ctx.rev(), ctx))
4263 (ctx.rev(), ctx))
4260
4264
4261 # remove state when we complete successfully
4265 # remove state when we complete successfully
4262 if not opts.get('dry_run'):
4266 if not opts.get('dry_run'):
4263 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4267 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4264
4268
4265 return 0
4269 return 0
4266
4270
4267 @command('grep',
4271 @command('grep',
4268 [('0', 'print0', None, _('end fields with NUL')),
4272 [('0', 'print0', None, _('end fields with NUL')),
4269 ('', 'all', None, _('print all revisions that match')),
4273 ('', 'all', None, _('print all revisions that match')),
4270 ('a', 'text', None, _('treat all files as text')),
4274 ('a', 'text', None, _('treat all files as text')),
4271 ('f', 'follow', None,
4275 ('f', 'follow', None,
4272 _('follow changeset history,'
4276 _('follow changeset history,'
4273 ' or file history across copies and renames')),
4277 ' or file history across copies and renames')),
4274 ('i', 'ignore-case', None, _('ignore case when matching')),
4278 ('i', 'ignore-case', None, _('ignore case when matching')),
4275 ('l', 'files-with-matches', None,
4279 ('l', 'files-with-matches', None,
4276 _('print only filenames and revisions that match')),
4280 _('print only filenames and revisions that match')),
4277 ('n', 'line-number', None, _('print matching line numbers')),
4281 ('n', 'line-number', None, _('print matching line numbers')),
4278 ('r', 'rev', [],
4282 ('r', 'rev', [],
4279 _('only search files changed within revision range'), _('REV')),
4283 _('only search files changed within revision range'), _('REV')),
4280 ('u', 'user', None, _('list the author (long with -v)')),
4284 ('u', 'user', None, _('list the author (long with -v)')),
4281 ('d', 'date', None, _('list the date (short with -q)')),
4285 ('d', 'date', None, _('list the date (short with -q)')),
4282 ] + formatteropts + walkopts,
4286 ] + formatteropts + walkopts,
4283 _('[OPTION]... PATTERN [FILE]...'),
4287 _('[OPTION]... PATTERN [FILE]...'),
4284 inferrepo=True)
4288 inferrepo=True)
4285 def grep(ui, repo, pattern, *pats, **opts):
4289 def grep(ui, repo, pattern, *pats, **opts):
4286 """search for a pattern in specified files and revisions
4290 """search for a pattern in specified files and revisions
4287
4291
4288 Search revisions of files for a regular expression.
4292 Search revisions of files for a regular expression.
4289
4293
4290 This command behaves differently than Unix grep. It only accepts
4294 This command behaves differently than Unix grep. It only accepts
4291 Python/Perl regexps. It searches repository history, not the
4295 Python/Perl regexps. It searches repository history, not the
4292 working directory. It always prints the revision number in which a
4296 working directory. It always prints the revision number in which a
4293 match appears.
4297 match appears.
4294
4298
4295 By default, grep only prints output for the first revision of a
4299 By default, grep only prints output for the first revision of a
4296 file in which it finds a match. To get it to print every revision
4300 file in which it finds a match. To get it to print every revision
4297 that contains a change in match status ("-" for a match that
4301 that contains a change in match status ("-" for a match that
4298 becomes a non-match, or "+" for a non-match that becomes a match),
4302 becomes a non-match, or "+" for a non-match that becomes a match),
4299 use the --all flag.
4303 use the --all flag.
4300
4304
4301 Returns 0 if a match is found, 1 otherwise.
4305 Returns 0 if a match is found, 1 otherwise.
4302 """
4306 """
4303 reflags = re.M
4307 reflags = re.M
4304 if opts.get('ignore_case'):
4308 if opts.get('ignore_case'):
4305 reflags |= re.I
4309 reflags |= re.I
4306 try:
4310 try:
4307 regexp = util.re.compile(pattern, reflags)
4311 regexp = util.re.compile(pattern, reflags)
4308 except re.error as inst:
4312 except re.error as inst:
4309 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4313 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4310 return 1
4314 return 1
4311 sep, eol = ':', '\n'
4315 sep, eol = ':', '\n'
4312 if opts.get('print0'):
4316 if opts.get('print0'):
4313 sep = eol = '\0'
4317 sep = eol = '\0'
4314
4318
4315 getfile = util.lrucachefunc(repo.file)
4319 getfile = util.lrucachefunc(repo.file)
4316
4320
4317 def matchlines(body):
4321 def matchlines(body):
4318 begin = 0
4322 begin = 0
4319 linenum = 0
4323 linenum = 0
4320 while begin < len(body):
4324 while begin < len(body):
4321 match = regexp.search(body, begin)
4325 match = regexp.search(body, begin)
4322 if not match:
4326 if not match:
4323 break
4327 break
4324 mstart, mend = match.span()
4328 mstart, mend = match.span()
4325 linenum += body.count('\n', begin, mstart) + 1
4329 linenum += body.count('\n', begin, mstart) + 1
4326 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4330 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4327 begin = body.find('\n', mend) + 1 or len(body) + 1
4331 begin = body.find('\n', mend) + 1 or len(body) + 1
4328 lend = begin - 1
4332 lend = begin - 1
4329 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4333 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4330
4334
4331 class linestate(object):
4335 class linestate(object):
4332 def __init__(self, line, linenum, colstart, colend):
4336 def __init__(self, line, linenum, colstart, colend):
4333 self.line = line
4337 self.line = line
4334 self.linenum = linenum
4338 self.linenum = linenum
4335 self.colstart = colstart
4339 self.colstart = colstart
4336 self.colend = colend
4340 self.colend = colend
4337
4341
4338 def __hash__(self):
4342 def __hash__(self):
4339 return hash((self.linenum, self.line))
4343 return hash((self.linenum, self.line))
4340
4344
4341 def __eq__(self, other):
4345 def __eq__(self, other):
4342 return self.line == other.line
4346 return self.line == other.line
4343
4347
4344 def findpos(self):
4348 def findpos(self):
4345 """Iterate all (start, end) indices of matches"""
4349 """Iterate all (start, end) indices of matches"""
4346 yield self.colstart, self.colend
4350 yield self.colstart, self.colend
4347 p = self.colend
4351 p = self.colend
4348 while p < len(self.line):
4352 while p < len(self.line):
4349 m = regexp.search(self.line, p)
4353 m = regexp.search(self.line, p)
4350 if not m:
4354 if not m:
4351 break
4355 break
4352 yield m.span()
4356 yield m.span()
4353 p = m.end()
4357 p = m.end()
4354
4358
4355 matches = {}
4359 matches = {}
4356 copies = {}
4360 copies = {}
4357 def grepbody(fn, rev, body):
4361 def grepbody(fn, rev, body):
4358 matches[rev].setdefault(fn, [])
4362 matches[rev].setdefault(fn, [])
4359 m = matches[rev][fn]
4363 m = matches[rev][fn]
4360 for lnum, cstart, cend, line in matchlines(body):
4364 for lnum, cstart, cend, line in matchlines(body):
4361 s = linestate(line, lnum, cstart, cend)
4365 s = linestate(line, lnum, cstart, cend)
4362 m.append(s)
4366 m.append(s)
4363
4367
4364 def difflinestates(a, b):
4368 def difflinestates(a, b):
4365 sm = difflib.SequenceMatcher(None, a, b)
4369 sm = difflib.SequenceMatcher(None, a, b)
4366 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4370 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4367 if tag == 'insert':
4371 if tag == 'insert':
4368 for i in xrange(blo, bhi):
4372 for i in xrange(blo, bhi):
4369 yield ('+', b[i])
4373 yield ('+', b[i])
4370 elif tag == 'delete':
4374 elif tag == 'delete':
4371 for i in xrange(alo, ahi):
4375 for i in xrange(alo, ahi):
4372 yield ('-', a[i])
4376 yield ('-', a[i])
4373 elif tag == 'replace':
4377 elif tag == 'replace':
4374 for i in xrange(alo, ahi):
4378 for i in xrange(alo, ahi):
4375 yield ('-', a[i])
4379 yield ('-', a[i])
4376 for i in xrange(blo, bhi):
4380 for i in xrange(blo, bhi):
4377 yield ('+', b[i])
4381 yield ('+', b[i])
4378
4382
4379 def display(fm, fn, ctx, pstates, states):
4383 def display(fm, fn, ctx, pstates, states):
4380 rev = ctx.rev()
4384 rev = ctx.rev()
4381 if fm:
4385 if fm:
4382 formatuser = str
4386 formatuser = str
4383 else:
4387 else:
4384 formatuser = ui.shortuser
4388 formatuser = ui.shortuser
4385 if ui.quiet:
4389 if ui.quiet:
4386 datefmt = '%Y-%m-%d'
4390 datefmt = '%Y-%m-%d'
4387 else:
4391 else:
4388 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4392 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4389 found = False
4393 found = False
4390 @util.cachefunc
4394 @util.cachefunc
4391 def binary():
4395 def binary():
4392 flog = getfile(fn)
4396 flog = getfile(fn)
4393 return util.binary(flog.read(ctx.filenode(fn)))
4397 return util.binary(flog.read(ctx.filenode(fn)))
4394
4398
4395 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4399 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4396 if opts.get('all'):
4400 if opts.get('all'):
4397 iter = difflinestates(pstates, states)
4401 iter = difflinestates(pstates, states)
4398 else:
4402 else:
4399 iter = [('', l) for l in states]
4403 iter = [('', l) for l in states]
4400 for change, l in iter:
4404 for change, l in iter:
4401 fm.startitem()
4405 fm.startitem()
4402 fm.data(node=fm.hexfunc(ctx.node()))
4406 fm.data(node=fm.hexfunc(ctx.node()))
4403 cols = [
4407 cols = [
4404 ('filename', fn, True),
4408 ('filename', fn, True),
4405 ('rev', rev, True),
4409 ('rev', rev, True),
4406 ('linenumber', l.linenum, opts.get('line_number')),
4410 ('linenumber', l.linenum, opts.get('line_number')),
4407 ]
4411 ]
4408 if opts.get('all'):
4412 if opts.get('all'):
4409 cols.append(('change', change, True))
4413 cols.append(('change', change, True))
4410 cols.extend([
4414 cols.extend([
4411 ('user', formatuser(ctx.user()), opts.get('user')),
4415 ('user', formatuser(ctx.user()), opts.get('user')),
4412 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4416 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4413 ])
4417 ])
4414 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4418 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4415 for name, data, cond in cols:
4419 for name, data, cond in cols:
4416 field = fieldnamemap.get(name, name)
4420 field = fieldnamemap.get(name, name)
4417 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4421 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4418 if cond and name != lastcol:
4422 if cond and name != lastcol:
4419 fm.plain(sep, label='grep.sep')
4423 fm.plain(sep, label='grep.sep')
4420 if not opts.get('files_with_matches'):
4424 if not opts.get('files_with_matches'):
4421 fm.plain(sep, label='grep.sep')
4425 fm.plain(sep, label='grep.sep')
4422 if not opts.get('text') and binary():
4426 if not opts.get('text') and binary():
4423 fm.plain(_(" Binary file matches"))
4427 fm.plain(_(" Binary file matches"))
4424 else:
4428 else:
4425 displaymatches(fm.nested('texts'), l)
4429 displaymatches(fm.nested('texts'), l)
4426 fm.plain(eol)
4430 fm.plain(eol)
4427 found = True
4431 found = True
4428 if opts.get('files_with_matches'):
4432 if opts.get('files_with_matches'):
4429 break
4433 break
4430 return found
4434 return found
4431
4435
4432 def displaymatches(fm, l):
4436 def displaymatches(fm, l):
4433 p = 0
4437 p = 0
4434 for s, e in l.findpos():
4438 for s, e in l.findpos():
4435 if p < s:
4439 if p < s:
4436 fm.startitem()
4440 fm.startitem()
4437 fm.write('text', '%s', l.line[p:s])
4441 fm.write('text', '%s', l.line[p:s])
4438 fm.data(matched=False)
4442 fm.data(matched=False)
4439 fm.startitem()
4443 fm.startitem()
4440 fm.write('text', '%s', l.line[s:e], label='grep.match')
4444 fm.write('text', '%s', l.line[s:e], label='grep.match')
4441 fm.data(matched=True)
4445 fm.data(matched=True)
4442 p = e
4446 p = e
4443 if p < len(l.line):
4447 if p < len(l.line):
4444 fm.startitem()
4448 fm.startitem()
4445 fm.write('text', '%s', l.line[p:])
4449 fm.write('text', '%s', l.line[p:])
4446 fm.data(matched=False)
4450 fm.data(matched=False)
4447 fm.end()
4451 fm.end()
4448
4452
4449 skip = {}
4453 skip = {}
4450 revfiles = {}
4454 revfiles = {}
4451 matchfn = scmutil.match(repo[None], pats, opts)
4455 matchfn = scmutil.match(repo[None], pats, opts)
4452 found = False
4456 found = False
4453 follow = opts.get('follow')
4457 follow = opts.get('follow')
4454
4458
4455 def prep(ctx, fns):
4459 def prep(ctx, fns):
4456 rev = ctx.rev()
4460 rev = ctx.rev()
4457 pctx = ctx.p1()
4461 pctx = ctx.p1()
4458 parent = pctx.rev()
4462 parent = pctx.rev()
4459 matches.setdefault(rev, {})
4463 matches.setdefault(rev, {})
4460 matches.setdefault(parent, {})
4464 matches.setdefault(parent, {})
4461 files = revfiles.setdefault(rev, [])
4465 files = revfiles.setdefault(rev, [])
4462 for fn in fns:
4466 for fn in fns:
4463 flog = getfile(fn)
4467 flog = getfile(fn)
4464 try:
4468 try:
4465 fnode = ctx.filenode(fn)
4469 fnode = ctx.filenode(fn)
4466 except error.LookupError:
4470 except error.LookupError:
4467 continue
4471 continue
4468
4472
4469 copied = flog.renamed(fnode)
4473 copied = flog.renamed(fnode)
4470 copy = follow and copied and copied[0]
4474 copy = follow and copied and copied[0]
4471 if copy:
4475 if copy:
4472 copies.setdefault(rev, {})[fn] = copy
4476 copies.setdefault(rev, {})[fn] = copy
4473 if fn in skip:
4477 if fn in skip:
4474 if copy:
4478 if copy:
4475 skip[copy] = True
4479 skip[copy] = True
4476 continue
4480 continue
4477 files.append(fn)
4481 files.append(fn)
4478
4482
4479 if fn not in matches[rev]:
4483 if fn not in matches[rev]:
4480 grepbody(fn, rev, flog.read(fnode))
4484 grepbody(fn, rev, flog.read(fnode))
4481
4485
4482 pfn = copy or fn
4486 pfn = copy or fn
4483 if pfn not in matches[parent]:
4487 if pfn not in matches[parent]:
4484 try:
4488 try:
4485 fnode = pctx.filenode(pfn)
4489 fnode = pctx.filenode(pfn)
4486 grepbody(pfn, parent, flog.read(fnode))
4490 grepbody(pfn, parent, flog.read(fnode))
4487 except error.LookupError:
4491 except error.LookupError:
4488 pass
4492 pass
4489
4493
4490 fm = ui.formatter('grep', opts)
4494 fm = ui.formatter('grep', opts)
4491 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4495 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4492 rev = ctx.rev()
4496 rev = ctx.rev()
4493 parent = ctx.p1().rev()
4497 parent = ctx.p1().rev()
4494 for fn in sorted(revfiles.get(rev, [])):
4498 for fn in sorted(revfiles.get(rev, [])):
4495 states = matches[rev][fn]
4499 states = matches[rev][fn]
4496 copy = copies.get(rev, {}).get(fn)
4500 copy = copies.get(rev, {}).get(fn)
4497 if fn in skip:
4501 if fn in skip:
4498 if copy:
4502 if copy:
4499 skip[copy] = True
4503 skip[copy] = True
4500 continue
4504 continue
4501 pstates = matches.get(parent, {}).get(copy or fn, [])
4505 pstates = matches.get(parent, {}).get(copy or fn, [])
4502 if pstates or states:
4506 if pstates or states:
4503 r = display(fm, fn, ctx, pstates, states)
4507 r = display(fm, fn, ctx, pstates, states)
4504 found = found or r
4508 found = found or r
4505 if r and not opts.get('all'):
4509 if r and not opts.get('all'):
4506 skip[fn] = True
4510 skip[fn] = True
4507 if copy:
4511 if copy:
4508 skip[copy] = True
4512 skip[copy] = True
4509 del matches[rev]
4513 del matches[rev]
4510 del revfiles[rev]
4514 del revfiles[rev]
4511 fm.end()
4515 fm.end()
4512
4516
4513 return not found
4517 return not found
4514
4518
4515 @command('heads',
4519 @command('heads',
4516 [('r', 'rev', '',
4520 [('r', 'rev', '',
4517 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4521 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4518 ('t', 'topo', False, _('show topological heads only')),
4522 ('t', 'topo', False, _('show topological heads only')),
4519 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4523 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4520 ('c', 'closed', False, _('show normal and closed branch heads')),
4524 ('c', 'closed', False, _('show normal and closed branch heads')),
4521 ] + templateopts,
4525 ] + templateopts,
4522 _('[-ct] [-r STARTREV] [REV]...'))
4526 _('[-ct] [-r STARTREV] [REV]...'))
4523 def heads(ui, repo, *branchrevs, **opts):
4527 def heads(ui, repo, *branchrevs, **opts):
4524 """show branch heads
4528 """show branch heads
4525
4529
4526 With no arguments, show all open branch heads in the repository.
4530 With no arguments, show all open branch heads in the repository.
4527 Branch heads are changesets that have no descendants on the
4531 Branch heads are changesets that have no descendants on the
4528 same branch. They are where development generally takes place and
4532 same branch. They are where development generally takes place and
4529 are the usual targets for update and merge operations.
4533 are the usual targets for update and merge operations.
4530
4534
4531 If one or more REVs are given, only open branch heads on the
4535 If one or more REVs are given, only open branch heads on the
4532 branches associated with the specified changesets are shown. This
4536 branches associated with the specified changesets are shown. This
4533 means that you can use :hg:`heads .` to see the heads on the
4537 means that you can use :hg:`heads .` to see the heads on the
4534 currently checked-out branch.
4538 currently checked-out branch.
4535
4539
4536 If -c/--closed is specified, also show branch heads marked closed
4540 If -c/--closed is specified, also show branch heads marked closed
4537 (see :hg:`commit --close-branch`).
4541 (see :hg:`commit --close-branch`).
4538
4542
4539 If STARTREV is specified, only those heads that are descendants of
4543 If STARTREV is specified, only those heads that are descendants of
4540 STARTREV will be displayed.
4544 STARTREV will be displayed.
4541
4545
4542 If -t/--topo is specified, named branch mechanics will be ignored and only
4546 If -t/--topo is specified, named branch mechanics will be ignored and only
4543 topological heads (changesets with no children) will be shown.
4547 topological heads (changesets with no children) will be shown.
4544
4548
4545 Returns 0 if matching heads are found, 1 if not.
4549 Returns 0 if matching heads are found, 1 if not.
4546 """
4550 """
4547
4551
4548 start = None
4552 start = None
4549 if 'rev' in opts:
4553 if 'rev' in opts:
4550 start = scmutil.revsingle(repo, opts['rev'], None).node()
4554 start = scmutil.revsingle(repo, opts['rev'], None).node()
4551
4555
4552 if opts.get('topo'):
4556 if opts.get('topo'):
4553 heads = [repo[h] for h in repo.heads(start)]
4557 heads = [repo[h] for h in repo.heads(start)]
4554 else:
4558 else:
4555 heads = []
4559 heads = []
4556 for branch in repo.branchmap():
4560 for branch in repo.branchmap():
4557 heads += repo.branchheads(branch, start, opts.get('closed'))
4561 heads += repo.branchheads(branch, start, opts.get('closed'))
4558 heads = [repo[h] for h in heads]
4562 heads = [repo[h] for h in heads]
4559
4563
4560 if branchrevs:
4564 if branchrevs:
4561 branches = set(repo[br].branch() for br in branchrevs)
4565 branches = set(repo[br].branch() for br in branchrevs)
4562 heads = [h for h in heads if h.branch() in branches]
4566 heads = [h for h in heads if h.branch() in branches]
4563
4567
4564 if opts.get('active') and branchrevs:
4568 if opts.get('active') and branchrevs:
4565 dagheads = repo.heads(start)
4569 dagheads = repo.heads(start)
4566 heads = [h for h in heads if h.node() in dagheads]
4570 heads = [h for h in heads if h.node() in dagheads]
4567
4571
4568 if branchrevs:
4572 if branchrevs:
4569 haveheads = set(h.branch() for h in heads)
4573 haveheads = set(h.branch() for h in heads)
4570 if branches - haveheads:
4574 if branches - haveheads:
4571 headless = ', '.join(b for b in branches - haveheads)
4575 headless = ', '.join(b for b in branches - haveheads)
4572 msg = _('no open branch heads found on branches %s')
4576 msg = _('no open branch heads found on branches %s')
4573 if opts.get('rev'):
4577 if opts.get('rev'):
4574 msg += _(' (started at %s)') % opts['rev']
4578 msg += _(' (started at %s)') % opts['rev']
4575 ui.warn((msg + '\n') % headless)
4579 ui.warn((msg + '\n') % headless)
4576
4580
4577 if not heads:
4581 if not heads:
4578 return 1
4582 return 1
4579
4583
4580 heads = sorted(heads, key=lambda x: -x.rev())
4584 heads = sorted(heads, key=lambda x: -x.rev())
4581 displayer = cmdutil.show_changeset(ui, repo, opts)
4585 displayer = cmdutil.show_changeset(ui, repo, opts)
4582 for ctx in heads:
4586 for ctx in heads:
4583 displayer.show(ctx)
4587 displayer.show(ctx)
4584 displayer.close()
4588 displayer.close()
4585
4589
4586 @command('help',
4590 @command('help',
4587 [('e', 'extension', None, _('show only help for extensions')),
4591 [('e', 'extension', None, _('show only help for extensions')),
4588 ('c', 'command', None, _('show only help for commands')),
4592 ('c', 'command', None, _('show only help for commands')),
4589 ('k', 'keyword', None, _('show topics matching keyword')),
4593 ('k', 'keyword', None, _('show topics matching keyword')),
4590 ('s', 'system', [], _('show help for specific platform(s)')),
4594 ('s', 'system', [], _('show help for specific platform(s)')),
4591 ],
4595 ],
4592 _('[-ecks] [TOPIC]'),
4596 _('[-ecks] [TOPIC]'),
4593 norepo=True)
4597 norepo=True)
4594 def help_(ui, name=None, **opts):
4598 def help_(ui, name=None, **opts):
4595 """show help for a given topic or a help overview
4599 """show help for a given topic or a help overview
4596
4600
4597 With no arguments, print a list of commands with short help messages.
4601 With no arguments, print a list of commands with short help messages.
4598
4602
4599 Given a topic, extension, or command name, print help for that
4603 Given a topic, extension, or command name, print help for that
4600 topic.
4604 topic.
4601
4605
4602 Returns 0 if successful.
4606 Returns 0 if successful.
4603 """
4607 """
4604
4608
4605 textwidth = ui.configint('ui', 'textwidth', 78)
4609 textwidth = ui.configint('ui', 'textwidth', 78)
4606 termwidth = ui.termwidth() - 2
4610 termwidth = ui.termwidth() - 2
4607 if textwidth <= 0 or termwidth < textwidth:
4611 if textwidth <= 0 or termwidth < textwidth:
4608 textwidth = termwidth
4612 textwidth = termwidth
4609
4613
4610 keep = opts.get('system') or []
4614 keep = opts.get('system') or []
4611 if len(keep) == 0:
4615 if len(keep) == 0:
4612 if sys.platform.startswith('win'):
4616 if sys.platform.startswith('win'):
4613 keep.append('windows')
4617 keep.append('windows')
4614 elif sys.platform == 'OpenVMS':
4618 elif sys.platform == 'OpenVMS':
4615 keep.append('vms')
4619 keep.append('vms')
4616 elif sys.platform == 'plan9':
4620 elif sys.platform == 'plan9':
4617 keep.append('plan9')
4621 keep.append('plan9')
4618 else:
4622 else:
4619 keep.append('unix')
4623 keep.append('unix')
4620 keep.append(sys.platform.lower())
4624 keep.append(sys.platform.lower())
4621 if ui.verbose:
4625 if ui.verbose:
4622 keep.append('verbose')
4626 keep.append('verbose')
4623
4627
4624 section = None
4628 section = None
4625 subtopic = None
4629 subtopic = None
4626 if name and '.' in name:
4630 if name and '.' in name:
4627 name, remaining = name.split('.', 1)
4631 name, remaining = name.split('.', 1)
4628 remaining = encoding.lower(remaining)
4632 remaining = encoding.lower(remaining)
4629 if '.' in remaining:
4633 if '.' in remaining:
4630 subtopic, section = remaining.split('.', 1)
4634 subtopic, section = remaining.split('.', 1)
4631 else:
4635 else:
4632 if name in help.subtopics:
4636 if name in help.subtopics:
4633 subtopic = remaining
4637 subtopic = remaining
4634 else:
4638 else:
4635 section = remaining
4639 section = remaining
4636
4640
4637 text = help.help_(ui, name, subtopic=subtopic, **opts)
4641 text = help.help_(ui, name, subtopic=subtopic, **opts)
4638
4642
4639 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4643 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4640 section=section)
4644 section=section)
4641
4645
4642 # We could have been given a weird ".foo" section without a name
4646 # We could have been given a weird ".foo" section without a name
4643 # to look for, or we could have simply failed to found "foo.bar"
4647 # to look for, or we could have simply failed to found "foo.bar"
4644 # because bar isn't a section of foo
4648 # because bar isn't a section of foo
4645 if section and not (formatted and name):
4649 if section and not (formatted and name):
4646 raise error.Abort(_("help section not found"))
4650 raise error.Abort(_("help section not found"))
4647
4651
4648 if 'verbose' in pruned:
4652 if 'verbose' in pruned:
4649 keep.append('omitted')
4653 keep.append('omitted')
4650 else:
4654 else:
4651 keep.append('notomitted')
4655 keep.append('notomitted')
4652 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4656 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4653 section=section)
4657 section=section)
4654 ui.write(formatted)
4658 ui.write(formatted)
4655
4659
4656
4660
4657 @command('identify|id',
4661 @command('identify|id',
4658 [('r', 'rev', '',
4662 [('r', 'rev', '',
4659 _('identify the specified revision'), _('REV')),
4663 _('identify the specified revision'), _('REV')),
4660 ('n', 'num', None, _('show local revision number')),
4664 ('n', 'num', None, _('show local revision number')),
4661 ('i', 'id', None, _('show global revision id')),
4665 ('i', 'id', None, _('show global revision id')),
4662 ('b', 'branch', None, _('show branch')),
4666 ('b', 'branch', None, _('show branch')),
4663 ('t', 'tags', None, _('show tags')),
4667 ('t', 'tags', None, _('show tags')),
4664 ('B', 'bookmarks', None, _('show bookmarks')),
4668 ('B', 'bookmarks', None, _('show bookmarks')),
4665 ] + remoteopts,
4669 ] + remoteopts,
4666 _('[-nibtB] [-r REV] [SOURCE]'),
4670 _('[-nibtB] [-r REV] [SOURCE]'),
4667 optionalrepo=True)
4671 optionalrepo=True)
4668 def identify(ui, repo, source=None, rev=None,
4672 def identify(ui, repo, source=None, rev=None,
4669 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4673 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4670 """identify the working directory or specified revision
4674 """identify the working directory or specified revision
4671
4675
4672 Print a summary identifying the repository state at REV using one or
4676 Print a summary identifying the repository state at REV using one or
4673 two parent hash identifiers, followed by a "+" if the working
4677 two parent hash identifiers, followed by a "+" if the working
4674 directory has uncommitted changes, the branch name (if not default),
4678 directory has uncommitted changes, the branch name (if not default),
4675 a list of tags, and a list of bookmarks.
4679 a list of tags, and a list of bookmarks.
4676
4680
4677 When REV is not given, print a summary of the current state of the
4681 When REV is not given, print a summary of the current state of the
4678 repository.
4682 repository.
4679
4683
4680 Specifying a path to a repository root or Mercurial bundle will
4684 Specifying a path to a repository root or Mercurial bundle will
4681 cause lookup to operate on that repository/bundle.
4685 cause lookup to operate on that repository/bundle.
4682
4686
4683 .. container:: verbose
4687 .. container:: verbose
4684
4688
4685 Examples:
4689 Examples:
4686
4690
4687 - generate a build identifier for the working directory::
4691 - generate a build identifier for the working directory::
4688
4692
4689 hg id --id > build-id.dat
4693 hg id --id > build-id.dat
4690
4694
4691 - find the revision corresponding to a tag::
4695 - find the revision corresponding to a tag::
4692
4696
4693 hg id -n -r 1.3
4697 hg id -n -r 1.3
4694
4698
4695 - check the most recent revision of a remote repository::
4699 - check the most recent revision of a remote repository::
4696
4700
4697 hg id -r tip http://selenic.com/hg/
4701 hg id -r tip http://selenic.com/hg/
4698
4702
4699 See :hg:`log` for generating more information about specific revisions,
4703 See :hg:`log` for generating more information about specific revisions,
4700 including full hash identifiers.
4704 including full hash identifiers.
4701
4705
4702 Returns 0 if successful.
4706 Returns 0 if successful.
4703 """
4707 """
4704
4708
4705 if not repo and not source:
4709 if not repo and not source:
4706 raise error.Abort(_("there is no Mercurial repository here "
4710 raise error.Abort(_("there is no Mercurial repository here "
4707 "(.hg not found)"))
4711 "(.hg not found)"))
4708
4712
4709 if ui.debugflag:
4713 if ui.debugflag:
4710 hexfunc = hex
4714 hexfunc = hex
4711 else:
4715 else:
4712 hexfunc = short
4716 hexfunc = short
4713 default = not (num or id or branch or tags or bookmarks)
4717 default = not (num or id or branch or tags or bookmarks)
4714 output = []
4718 output = []
4715 revs = []
4719 revs = []
4716
4720
4717 if source:
4721 if source:
4718 source, branches = hg.parseurl(ui.expandpath(source))
4722 source, branches = hg.parseurl(ui.expandpath(source))
4719 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4723 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4720 repo = peer.local()
4724 repo = peer.local()
4721 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4725 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4722
4726
4723 if not repo:
4727 if not repo:
4724 if num or branch or tags:
4728 if num or branch or tags:
4725 raise error.Abort(
4729 raise error.Abort(
4726 _("can't query remote revision number, branch, or tags"))
4730 _("can't query remote revision number, branch, or tags"))
4727 if not rev and revs:
4731 if not rev and revs:
4728 rev = revs[0]
4732 rev = revs[0]
4729 if not rev:
4733 if not rev:
4730 rev = "tip"
4734 rev = "tip"
4731
4735
4732 remoterev = peer.lookup(rev)
4736 remoterev = peer.lookup(rev)
4733 if default or id:
4737 if default or id:
4734 output = [hexfunc(remoterev)]
4738 output = [hexfunc(remoterev)]
4735
4739
4736 def getbms():
4740 def getbms():
4737 bms = []
4741 bms = []
4738
4742
4739 if 'bookmarks' in peer.listkeys('namespaces'):
4743 if 'bookmarks' in peer.listkeys('namespaces'):
4740 hexremoterev = hex(remoterev)
4744 hexremoterev = hex(remoterev)
4741 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4745 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4742 if bmr == hexremoterev]
4746 if bmr == hexremoterev]
4743
4747
4744 return sorted(bms)
4748 return sorted(bms)
4745
4749
4746 if bookmarks:
4750 if bookmarks:
4747 output.extend(getbms())
4751 output.extend(getbms())
4748 elif default and not ui.quiet:
4752 elif default and not ui.quiet:
4749 # multiple bookmarks for a single parent separated by '/'
4753 # multiple bookmarks for a single parent separated by '/'
4750 bm = '/'.join(getbms())
4754 bm = '/'.join(getbms())
4751 if bm:
4755 if bm:
4752 output.append(bm)
4756 output.append(bm)
4753 else:
4757 else:
4754 ctx = scmutil.revsingle(repo, rev, None)
4758 ctx = scmutil.revsingle(repo, rev, None)
4755
4759
4756 if ctx.rev() is None:
4760 if ctx.rev() is None:
4757 ctx = repo[None]
4761 ctx = repo[None]
4758 parents = ctx.parents()
4762 parents = ctx.parents()
4759 taglist = []
4763 taglist = []
4760 for p in parents:
4764 for p in parents:
4761 taglist.extend(p.tags())
4765 taglist.extend(p.tags())
4762
4766
4763 changed = ""
4767 changed = ""
4764 if default or id or num:
4768 if default or id or num:
4765 if (any(repo.status())
4769 if (any(repo.status())
4766 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4770 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4767 changed = '+'
4771 changed = '+'
4768 if default or id:
4772 if default or id:
4769 output = ["%s%s" %
4773 output = ["%s%s" %
4770 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4774 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4771 if num:
4775 if num:
4772 output.append("%s%s" %
4776 output.append("%s%s" %
4773 ('+'.join([str(p.rev()) for p in parents]), changed))
4777 ('+'.join([str(p.rev()) for p in parents]), changed))
4774 else:
4778 else:
4775 if default or id:
4779 if default or id:
4776 output = [hexfunc(ctx.node())]
4780 output = [hexfunc(ctx.node())]
4777 if num:
4781 if num:
4778 output.append(str(ctx.rev()))
4782 output.append(str(ctx.rev()))
4779 taglist = ctx.tags()
4783 taglist = ctx.tags()
4780
4784
4781 if default and not ui.quiet:
4785 if default and not ui.quiet:
4782 b = ctx.branch()
4786 b = ctx.branch()
4783 if b != 'default':
4787 if b != 'default':
4784 output.append("(%s)" % b)
4788 output.append("(%s)" % b)
4785
4789
4786 # multiple tags for a single parent separated by '/'
4790 # multiple tags for a single parent separated by '/'
4787 t = '/'.join(taglist)
4791 t = '/'.join(taglist)
4788 if t:
4792 if t:
4789 output.append(t)
4793 output.append(t)
4790
4794
4791 # multiple bookmarks for a single parent separated by '/'
4795 # multiple bookmarks for a single parent separated by '/'
4792 bm = '/'.join(ctx.bookmarks())
4796 bm = '/'.join(ctx.bookmarks())
4793 if bm:
4797 if bm:
4794 output.append(bm)
4798 output.append(bm)
4795 else:
4799 else:
4796 if branch:
4800 if branch:
4797 output.append(ctx.branch())
4801 output.append(ctx.branch())
4798
4802
4799 if tags:
4803 if tags:
4800 output.extend(taglist)
4804 output.extend(taglist)
4801
4805
4802 if bookmarks:
4806 if bookmarks:
4803 output.extend(ctx.bookmarks())
4807 output.extend(ctx.bookmarks())
4804
4808
4805 ui.write("%s\n" % ' '.join(output))
4809 ui.write("%s\n" % ' '.join(output))
4806
4810
4807 @command('import|patch',
4811 @command('import|patch',
4808 [('p', 'strip', 1,
4812 [('p', 'strip', 1,
4809 _('directory strip option for patch. This has the same '
4813 _('directory strip option for patch. This has the same '
4810 'meaning as the corresponding patch option'), _('NUM')),
4814 'meaning as the corresponding patch option'), _('NUM')),
4811 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4815 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4812 ('e', 'edit', False, _('invoke editor on commit messages')),
4816 ('e', 'edit', False, _('invoke editor on commit messages')),
4813 ('f', 'force', None,
4817 ('f', 'force', None,
4814 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4818 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4815 ('', 'no-commit', None,
4819 ('', 'no-commit', None,
4816 _("don't commit, just update the working directory")),
4820 _("don't commit, just update the working directory")),
4817 ('', 'bypass', None,
4821 ('', 'bypass', None,
4818 _("apply patch without touching the working directory")),
4822 _("apply patch without touching the working directory")),
4819 ('', 'partial', None,
4823 ('', 'partial', None,
4820 _('commit even if some hunks fail')),
4824 _('commit even if some hunks fail')),
4821 ('', 'exact', None,
4825 ('', 'exact', None,
4822 _('abort if patch would apply lossily')),
4826 _('abort if patch would apply lossily')),
4823 ('', 'prefix', '',
4827 ('', 'prefix', '',
4824 _('apply patch to subdirectory'), _('DIR')),
4828 _('apply patch to subdirectory'), _('DIR')),
4825 ('', 'import-branch', None,
4829 ('', 'import-branch', None,
4826 _('use any branch information in patch (implied by --exact)'))] +
4830 _('use any branch information in patch (implied by --exact)'))] +
4827 commitopts + commitopts2 + similarityopts,
4831 commitopts + commitopts2 + similarityopts,
4828 _('[OPTION]... PATCH...'))
4832 _('[OPTION]... PATCH...'))
4829 def import_(ui, repo, patch1=None, *patches, **opts):
4833 def import_(ui, repo, patch1=None, *patches, **opts):
4830 """import an ordered set of patches
4834 """import an ordered set of patches
4831
4835
4832 Import a list of patches and commit them individually (unless
4836 Import a list of patches and commit them individually (unless
4833 --no-commit is specified).
4837 --no-commit is specified).
4834
4838
4835 To read a patch from standard input, use "-" as the patch name. If
4839 To read a patch from standard input, use "-" as the patch name. If
4836 a URL is specified, the patch will be downloaded from there.
4840 a URL is specified, the patch will be downloaded from there.
4837
4841
4838 Import first applies changes to the working directory (unless
4842 Import first applies changes to the working directory (unless
4839 --bypass is specified), import will abort if there are outstanding
4843 --bypass is specified), import will abort if there are outstanding
4840 changes.
4844 changes.
4841
4845
4842 Use --bypass to apply and commit patches directly to the
4846 Use --bypass to apply and commit patches directly to the
4843 repository, without affecting the working directory. Without
4847 repository, without affecting the working directory. Without
4844 --exact, patches will be applied on top of the working directory
4848 --exact, patches will be applied on top of the working directory
4845 parent revision.
4849 parent revision.
4846
4850
4847 You can import a patch straight from a mail message. Even patches
4851 You can import a patch straight from a mail message. Even patches
4848 as attachments work (to use the body part, it must have type
4852 as attachments work (to use the body part, it must have type
4849 text/plain or text/x-patch). From and Subject headers of email
4853 text/plain or text/x-patch). From and Subject headers of email
4850 message are used as default committer and commit message. All
4854 message are used as default committer and commit message. All
4851 text/plain body parts before first diff are added to the commit
4855 text/plain body parts before first diff are added to the commit
4852 message.
4856 message.
4853
4857
4854 If the imported patch was generated by :hg:`export`, user and
4858 If the imported patch was generated by :hg:`export`, user and
4855 description from patch override values from message headers and
4859 description from patch override values from message headers and
4856 body. Values given on command line with -m/--message and -u/--user
4860 body. Values given on command line with -m/--message and -u/--user
4857 override these.
4861 override these.
4858
4862
4859 If --exact is specified, import will set the working directory to
4863 If --exact is specified, import will set the working directory to
4860 the parent of each patch before applying it, and will abort if the
4864 the parent of each patch before applying it, and will abort if the
4861 resulting changeset has a different ID than the one recorded in
4865 resulting changeset has a different ID than the one recorded in
4862 the patch. This will guard against various ways that portable
4866 the patch. This will guard against various ways that portable
4863 patch formats and mail systems might fail to transfer Mercurial
4867 patch formats and mail systems might fail to transfer Mercurial
4864 data or metadata. See :hg:`bundle` for lossless transmission.
4868 data or metadata. See :hg:`bundle` for lossless transmission.
4865
4869
4866 Use --partial to ensure a changeset will be created from the patch
4870 Use --partial to ensure a changeset will be created from the patch
4867 even if some hunks fail to apply. Hunks that fail to apply will be
4871 even if some hunks fail to apply. Hunks that fail to apply will be
4868 written to a <target-file>.rej file. Conflicts can then be resolved
4872 written to a <target-file>.rej file. Conflicts can then be resolved
4869 by hand before :hg:`commit --amend` is run to update the created
4873 by hand before :hg:`commit --amend` is run to update the created
4870 changeset. This flag exists to let people import patches that
4874 changeset. This flag exists to let people import patches that
4871 partially apply without losing the associated metadata (author,
4875 partially apply without losing the associated metadata (author,
4872 date, description, ...).
4876 date, description, ...).
4873
4877
4874 .. note::
4878 .. note::
4875
4879
4876 When no hunks apply cleanly, :hg:`import --partial` will create
4880 When no hunks apply cleanly, :hg:`import --partial` will create
4877 an empty changeset, importing only the patch metadata.
4881 an empty changeset, importing only the patch metadata.
4878
4882
4879 With -s/--similarity, hg will attempt to discover renames and
4883 With -s/--similarity, hg will attempt to discover renames and
4880 copies in the patch in the same way as :hg:`addremove`.
4884 copies in the patch in the same way as :hg:`addremove`.
4881
4885
4882 It is possible to use external patch programs to perform the patch
4886 It is possible to use external patch programs to perform the patch
4883 by setting the ``ui.patch`` configuration option. For the default
4887 by setting the ``ui.patch`` configuration option. For the default
4884 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4888 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4885 See :hg:`help config` for more information about configuration
4889 See :hg:`help config` for more information about configuration
4886 files and how to use these options.
4890 files and how to use these options.
4887
4891
4888 See :hg:`help dates` for a list of formats valid for -d/--date.
4892 See :hg:`help dates` for a list of formats valid for -d/--date.
4889
4893
4890 .. container:: verbose
4894 .. container:: verbose
4891
4895
4892 Examples:
4896 Examples:
4893
4897
4894 - import a traditional patch from a website and detect renames::
4898 - import a traditional patch from a website and detect renames::
4895
4899
4896 hg import -s 80 http://example.com/bugfix.patch
4900 hg import -s 80 http://example.com/bugfix.patch
4897
4901
4898 - import a changeset from an hgweb server::
4902 - import a changeset from an hgweb server::
4899
4903
4900 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4904 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4901
4905
4902 - import all the patches in an Unix-style mbox::
4906 - import all the patches in an Unix-style mbox::
4903
4907
4904 hg import incoming-patches.mbox
4908 hg import incoming-patches.mbox
4905
4909
4906 - attempt to exactly restore an exported changeset (not always
4910 - attempt to exactly restore an exported changeset (not always
4907 possible)::
4911 possible)::
4908
4912
4909 hg import --exact proposed-fix.patch
4913 hg import --exact proposed-fix.patch
4910
4914
4911 - use an external tool to apply a patch which is too fuzzy for
4915 - use an external tool to apply a patch which is too fuzzy for
4912 the default internal tool.
4916 the default internal tool.
4913
4917
4914 hg import --config ui.patch="patch --merge" fuzzy.patch
4918 hg import --config ui.patch="patch --merge" fuzzy.patch
4915
4919
4916 - change the default fuzzing from 2 to a less strict 7
4920 - change the default fuzzing from 2 to a less strict 7
4917
4921
4918 hg import --config ui.fuzz=7 fuzz.patch
4922 hg import --config ui.fuzz=7 fuzz.patch
4919
4923
4920 Returns 0 on success, 1 on partial success (see --partial).
4924 Returns 0 on success, 1 on partial success (see --partial).
4921 """
4925 """
4922
4926
4923 if not patch1:
4927 if not patch1:
4924 raise error.Abort(_('need at least one patch to import'))
4928 raise error.Abort(_('need at least one patch to import'))
4925
4929
4926 patches = (patch1,) + patches
4930 patches = (patch1,) + patches
4927
4931
4928 date = opts.get('date')
4932 date = opts.get('date')
4929 if date:
4933 if date:
4930 opts['date'] = util.parsedate(date)
4934 opts['date'] = util.parsedate(date)
4931
4935
4932 exact = opts.get('exact')
4936 exact = opts.get('exact')
4933 update = not opts.get('bypass')
4937 update = not opts.get('bypass')
4934 if not update and opts.get('no_commit'):
4938 if not update and opts.get('no_commit'):
4935 raise error.Abort(_('cannot use --no-commit with --bypass'))
4939 raise error.Abort(_('cannot use --no-commit with --bypass'))
4936 try:
4940 try:
4937 sim = float(opts.get('similarity') or 0)
4941 sim = float(opts.get('similarity') or 0)
4938 except ValueError:
4942 except ValueError:
4939 raise error.Abort(_('similarity must be a number'))
4943 raise error.Abort(_('similarity must be a number'))
4940 if sim < 0 or sim > 100:
4944 if sim < 0 or sim > 100:
4941 raise error.Abort(_('similarity must be between 0 and 100'))
4945 raise error.Abort(_('similarity must be between 0 and 100'))
4942 if sim and not update:
4946 if sim and not update:
4943 raise error.Abort(_('cannot use --similarity with --bypass'))
4947 raise error.Abort(_('cannot use --similarity with --bypass'))
4944 if exact:
4948 if exact:
4945 if opts.get('edit'):
4949 if opts.get('edit'):
4946 raise error.Abort(_('cannot use --exact with --edit'))
4950 raise error.Abort(_('cannot use --exact with --edit'))
4947 if opts.get('prefix'):
4951 if opts.get('prefix'):
4948 raise error.Abort(_('cannot use --exact with --prefix'))
4952 raise error.Abort(_('cannot use --exact with --prefix'))
4949
4953
4950 base = opts["base"]
4954 base = opts["base"]
4951 wlock = dsguard = lock = tr = None
4955 wlock = dsguard = lock = tr = None
4952 msgs = []
4956 msgs = []
4953 ret = 0
4957 ret = 0
4954
4958
4955
4959
4956 try:
4960 try:
4957 wlock = repo.wlock()
4961 wlock = repo.wlock()
4958
4962
4959 if update:
4963 if update:
4960 cmdutil.checkunfinished(repo)
4964 cmdutil.checkunfinished(repo)
4961 if (exact or not opts.get('force')):
4965 if (exact or not opts.get('force')):
4962 cmdutil.bailifchanged(repo)
4966 cmdutil.bailifchanged(repo)
4963
4967
4964 if not opts.get('no_commit'):
4968 if not opts.get('no_commit'):
4965 lock = repo.lock()
4969 lock = repo.lock()
4966 tr = repo.transaction('import')
4970 tr = repo.transaction('import')
4967 else:
4971 else:
4968 dsguard = cmdutil.dirstateguard(repo, 'import')
4972 dsguard = cmdutil.dirstateguard(repo, 'import')
4969 parents = repo[None].parents()
4973 parents = repo[None].parents()
4970 for patchurl in patches:
4974 for patchurl in patches:
4971 if patchurl == '-':
4975 if patchurl == '-':
4972 ui.status(_('applying patch from stdin\n'))
4976 ui.status(_('applying patch from stdin\n'))
4973 patchfile = ui.fin
4977 patchfile = ui.fin
4974 patchurl = 'stdin' # for error message
4978 patchurl = 'stdin' # for error message
4975 else:
4979 else:
4976 patchurl = os.path.join(base, patchurl)
4980 patchurl = os.path.join(base, patchurl)
4977 ui.status(_('applying %s\n') % patchurl)
4981 ui.status(_('applying %s\n') % patchurl)
4978 patchfile = hg.openpath(ui, patchurl)
4982 patchfile = hg.openpath(ui, patchurl)
4979
4983
4980 haspatch = False
4984 haspatch = False
4981 for hunk in patch.split(patchfile):
4985 for hunk in patch.split(patchfile):
4982 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4986 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4983 parents, opts,
4987 parents, opts,
4984 msgs, hg.clean)
4988 msgs, hg.clean)
4985 if msg:
4989 if msg:
4986 haspatch = True
4990 haspatch = True
4987 ui.note(msg + '\n')
4991 ui.note(msg + '\n')
4988 if update or exact:
4992 if update or exact:
4989 parents = repo[None].parents()
4993 parents = repo[None].parents()
4990 else:
4994 else:
4991 parents = [repo[node]]
4995 parents = [repo[node]]
4992 if rej:
4996 if rej:
4993 ui.write_err(_("patch applied partially\n"))
4997 ui.write_err(_("patch applied partially\n"))
4994 ui.write_err(_("(fix the .rej files and run "
4998 ui.write_err(_("(fix the .rej files and run "
4995 "`hg commit --amend`)\n"))
4999 "`hg commit --amend`)\n"))
4996 ret = 1
5000 ret = 1
4997 break
5001 break
4998
5002
4999 if not haspatch:
5003 if not haspatch:
5000 raise error.Abort(_('%s: no diffs found') % patchurl)
5004 raise error.Abort(_('%s: no diffs found') % patchurl)
5001
5005
5002 if tr:
5006 if tr:
5003 tr.close()
5007 tr.close()
5004 if msgs:
5008 if msgs:
5005 repo.savecommitmessage('\n* * *\n'.join(msgs))
5009 repo.savecommitmessage('\n* * *\n'.join(msgs))
5006 if dsguard:
5010 if dsguard:
5007 dsguard.close()
5011 dsguard.close()
5008 return ret
5012 return ret
5009 finally:
5013 finally:
5010 if tr:
5014 if tr:
5011 tr.release()
5015 tr.release()
5012 release(lock, dsguard, wlock)
5016 release(lock, dsguard, wlock)
5013
5017
5014 @command('incoming|in',
5018 @command('incoming|in',
5015 [('f', 'force', None,
5019 [('f', 'force', None,
5016 _('run even if remote repository is unrelated')),
5020 _('run even if remote repository is unrelated')),
5017 ('n', 'newest-first', None, _('show newest record first')),
5021 ('n', 'newest-first', None, _('show newest record first')),
5018 ('', 'bundle', '',
5022 ('', 'bundle', '',
5019 _('file to store the bundles into'), _('FILE')),
5023 _('file to store the bundles into'), _('FILE')),
5020 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5024 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5021 ('B', 'bookmarks', False, _("compare bookmarks")),
5025 ('B', 'bookmarks', False, _("compare bookmarks")),
5022 ('b', 'branch', [],
5026 ('b', 'branch', [],
5023 _('a specific branch you would like to pull'), _('BRANCH')),
5027 _('a specific branch you would like to pull'), _('BRANCH')),
5024 ] + logopts + remoteopts + subrepoopts,
5028 ] + logopts + remoteopts + subrepoopts,
5025 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5029 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5026 def incoming(ui, repo, source="default", **opts):
5030 def incoming(ui, repo, source="default", **opts):
5027 """show new changesets found in source
5031 """show new changesets found in source
5028
5032
5029 Show new changesets found in the specified path/URL or the default
5033 Show new changesets found in the specified path/URL or the default
5030 pull location. These are the changesets that would have been pulled
5034 pull location. These are the changesets that would have been pulled
5031 if a pull at the time you issued this command.
5035 if a pull at the time you issued this command.
5032
5036
5033 See pull for valid source format details.
5037 See pull for valid source format details.
5034
5038
5035 .. container:: verbose
5039 .. container:: verbose
5036
5040
5037 With -B/--bookmarks, the result of bookmark comparison between
5041 With -B/--bookmarks, the result of bookmark comparison between
5038 local and remote repositories is displayed. With -v/--verbose,
5042 local and remote repositories is displayed. With -v/--verbose,
5039 status is also displayed for each bookmark like below::
5043 status is also displayed for each bookmark like below::
5040
5044
5041 BM1 01234567890a added
5045 BM1 01234567890a added
5042 BM2 1234567890ab advanced
5046 BM2 1234567890ab advanced
5043 BM3 234567890abc diverged
5047 BM3 234567890abc diverged
5044 BM4 34567890abcd changed
5048 BM4 34567890abcd changed
5045
5049
5046 The action taken locally when pulling depends on the
5050 The action taken locally when pulling depends on the
5047 status of each bookmark:
5051 status of each bookmark:
5048
5052
5049 :``added``: pull will create it
5053 :``added``: pull will create it
5050 :``advanced``: pull will update it
5054 :``advanced``: pull will update it
5051 :``diverged``: pull will create a divergent bookmark
5055 :``diverged``: pull will create a divergent bookmark
5052 :``changed``: result depends on remote changesets
5056 :``changed``: result depends on remote changesets
5053
5057
5054 From the point of view of pulling behavior, bookmark
5058 From the point of view of pulling behavior, bookmark
5055 existing only in the remote repository are treated as ``added``,
5059 existing only in the remote repository are treated as ``added``,
5056 even if it is in fact locally deleted.
5060 even if it is in fact locally deleted.
5057
5061
5058 .. container:: verbose
5062 .. container:: verbose
5059
5063
5060 For remote repository, using --bundle avoids downloading the
5064 For remote repository, using --bundle avoids downloading the
5061 changesets twice if the incoming is followed by a pull.
5065 changesets twice if the incoming is followed by a pull.
5062
5066
5063 Examples:
5067 Examples:
5064
5068
5065 - show incoming changes with patches and full description::
5069 - show incoming changes with patches and full description::
5066
5070
5067 hg incoming -vp
5071 hg incoming -vp
5068
5072
5069 - show incoming changes excluding merges, store a bundle::
5073 - show incoming changes excluding merges, store a bundle::
5070
5074
5071 hg in -vpM --bundle incoming.hg
5075 hg in -vpM --bundle incoming.hg
5072 hg pull incoming.hg
5076 hg pull incoming.hg
5073
5077
5074 - briefly list changes inside a bundle::
5078 - briefly list changes inside a bundle::
5075
5079
5076 hg in changes.hg -T "{desc|firstline}\\n"
5080 hg in changes.hg -T "{desc|firstline}\\n"
5077
5081
5078 Returns 0 if there are incoming changes, 1 otherwise.
5082 Returns 0 if there are incoming changes, 1 otherwise.
5079 """
5083 """
5080 if opts.get('graph'):
5084 if opts.get('graph'):
5081 cmdutil.checkunsupportedgraphflags([], opts)
5085 cmdutil.checkunsupportedgraphflags([], opts)
5082 def display(other, chlist, displayer):
5086 def display(other, chlist, displayer):
5083 revdag = cmdutil.graphrevs(other, chlist, opts)
5087 revdag = cmdutil.graphrevs(other, chlist, opts)
5084 cmdutil.displaygraph(ui, repo, revdag, displayer,
5088 cmdutil.displaygraph(ui, repo, revdag, displayer,
5085 graphmod.asciiedges)
5089 graphmod.asciiedges)
5086
5090
5087 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5091 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5088 return 0
5092 return 0
5089
5093
5090 if opts.get('bundle') and opts.get('subrepos'):
5094 if opts.get('bundle') and opts.get('subrepos'):
5091 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5095 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5092
5096
5093 if opts.get('bookmarks'):
5097 if opts.get('bookmarks'):
5094 source, branches = hg.parseurl(ui.expandpath(source),
5098 source, branches = hg.parseurl(ui.expandpath(source),
5095 opts.get('branch'))
5099 opts.get('branch'))
5096 other = hg.peer(repo, opts, source)
5100 other = hg.peer(repo, opts, source)
5097 if 'bookmarks' not in other.listkeys('namespaces'):
5101 if 'bookmarks' not in other.listkeys('namespaces'):
5098 ui.warn(_("remote doesn't support bookmarks\n"))
5102 ui.warn(_("remote doesn't support bookmarks\n"))
5099 return 0
5103 return 0
5100 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5104 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5101 return bookmarks.incoming(ui, repo, other)
5105 return bookmarks.incoming(ui, repo, other)
5102
5106
5103 repo._subtoppath = ui.expandpath(source)
5107 repo._subtoppath = ui.expandpath(source)
5104 try:
5108 try:
5105 return hg.incoming(ui, repo, source, opts)
5109 return hg.incoming(ui, repo, source, opts)
5106 finally:
5110 finally:
5107 del repo._subtoppath
5111 del repo._subtoppath
5108
5112
5109
5113
5110 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5114 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5111 norepo=True)
5115 norepo=True)
5112 def init(ui, dest=".", **opts):
5116 def init(ui, dest=".", **opts):
5113 """create a new repository in the given directory
5117 """create a new repository in the given directory
5114
5118
5115 Initialize a new repository in the given directory. If the given
5119 Initialize a new repository in the given directory. If the given
5116 directory does not exist, it will be created.
5120 directory does not exist, it will be created.
5117
5121
5118 If no directory is given, the current directory is used.
5122 If no directory is given, the current directory is used.
5119
5123
5120 It is possible to specify an ``ssh://`` URL as the destination.
5124 It is possible to specify an ``ssh://`` URL as the destination.
5121 See :hg:`help urls` for more information.
5125 See :hg:`help urls` for more information.
5122
5126
5123 Returns 0 on success.
5127 Returns 0 on success.
5124 """
5128 """
5125 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5129 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5126
5130
5127 @command('locate',
5131 @command('locate',
5128 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5132 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5129 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5133 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5130 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5134 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5131 ] + walkopts,
5135 ] + walkopts,
5132 _('[OPTION]... [PATTERN]...'))
5136 _('[OPTION]... [PATTERN]...'))
5133 def locate(ui, repo, *pats, **opts):
5137 def locate(ui, repo, *pats, **opts):
5134 """locate files matching specific patterns (DEPRECATED)
5138 """locate files matching specific patterns (DEPRECATED)
5135
5139
5136 Print files under Mercurial control in the working directory whose
5140 Print files under Mercurial control in the working directory whose
5137 names match the given patterns.
5141 names match the given patterns.
5138
5142
5139 By default, this command searches all directories in the working
5143 By default, this command searches all directories in the working
5140 directory. To search just the current directory and its
5144 directory. To search just the current directory and its
5141 subdirectories, use "--include .".
5145 subdirectories, use "--include .".
5142
5146
5143 If no patterns are given to match, this command prints the names
5147 If no patterns are given to match, this command prints the names
5144 of all files under Mercurial control in the working directory.
5148 of all files under Mercurial control in the working directory.
5145
5149
5146 If you want to feed the output of this command into the "xargs"
5150 If you want to feed the output of this command into the "xargs"
5147 command, use the -0 option to both this command and "xargs". This
5151 command, use the -0 option to both this command and "xargs". This
5148 will avoid the problem of "xargs" treating single filenames that
5152 will avoid the problem of "xargs" treating single filenames that
5149 contain whitespace as multiple filenames.
5153 contain whitespace as multiple filenames.
5150
5154
5151 See :hg:`help files` for a more versatile command.
5155 See :hg:`help files` for a more versatile command.
5152
5156
5153 Returns 0 if a match is found, 1 otherwise.
5157 Returns 0 if a match is found, 1 otherwise.
5154 """
5158 """
5155 if opts.get('print0'):
5159 if opts.get('print0'):
5156 end = '\0'
5160 end = '\0'
5157 else:
5161 else:
5158 end = '\n'
5162 end = '\n'
5159 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5163 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5160
5164
5161 ret = 1
5165 ret = 1
5162 ctx = repo[rev]
5166 ctx = repo[rev]
5163 m = scmutil.match(ctx, pats, opts, default='relglob',
5167 m = scmutil.match(ctx, pats, opts, default='relglob',
5164 badfn=lambda x, y: False)
5168 badfn=lambda x, y: False)
5165
5169
5166 for abs in ctx.matches(m):
5170 for abs in ctx.matches(m):
5167 if opts.get('fullpath'):
5171 if opts.get('fullpath'):
5168 ui.write(repo.wjoin(abs), end)
5172 ui.write(repo.wjoin(abs), end)
5169 else:
5173 else:
5170 ui.write(((pats and m.rel(abs)) or abs), end)
5174 ui.write(((pats and m.rel(abs)) or abs), end)
5171 ret = 0
5175 ret = 0
5172
5176
5173 return ret
5177 return ret
5174
5178
5175 @command('^log|history',
5179 @command('^log|history',
5176 [('f', 'follow', None,
5180 [('f', 'follow', None,
5177 _('follow changeset history, or file history across copies and renames')),
5181 _('follow changeset history, or file history across copies and renames')),
5178 ('', 'follow-first', None,
5182 ('', 'follow-first', None,
5179 _('only follow the first parent of merge changesets (DEPRECATED)')),
5183 _('only follow the first parent of merge changesets (DEPRECATED)')),
5180 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5184 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5181 ('C', 'copies', None, _('show copied files')),
5185 ('C', 'copies', None, _('show copied files')),
5182 ('k', 'keyword', [],
5186 ('k', 'keyword', [],
5183 _('do case-insensitive search for a given text'), _('TEXT')),
5187 _('do case-insensitive search for a given text'), _('TEXT')),
5184 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5188 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5185 ('', 'removed', None, _('include revisions where files were removed')),
5189 ('', 'removed', None, _('include revisions where files were removed')),
5186 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5190 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5187 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5191 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5188 ('', 'only-branch', [],
5192 ('', 'only-branch', [],
5189 _('show only changesets within the given named branch (DEPRECATED)'),
5193 _('show only changesets within the given named branch (DEPRECATED)'),
5190 _('BRANCH')),
5194 _('BRANCH')),
5191 ('b', 'branch', [],
5195 ('b', 'branch', [],
5192 _('show changesets within the given named branch'), _('BRANCH')),
5196 _('show changesets within the given named branch'), _('BRANCH')),
5193 ('P', 'prune', [],
5197 ('P', 'prune', [],
5194 _('do not display revision or any of its ancestors'), _('REV')),
5198 _('do not display revision or any of its ancestors'), _('REV')),
5195 ] + logopts + walkopts,
5199 ] + logopts + walkopts,
5196 _('[OPTION]... [FILE]'),
5200 _('[OPTION]... [FILE]'),
5197 inferrepo=True)
5201 inferrepo=True)
5198 def log(ui, repo, *pats, **opts):
5202 def log(ui, repo, *pats, **opts):
5199 """show revision history of entire repository or files
5203 """show revision history of entire repository or files
5200
5204
5201 Print the revision history of the specified files or the entire
5205 Print the revision history of the specified files or the entire
5202 project.
5206 project.
5203
5207
5204 If no revision range is specified, the default is ``tip:0`` unless
5208 If no revision range is specified, the default is ``tip:0`` unless
5205 --follow is set, in which case the working directory parent is
5209 --follow is set, in which case the working directory parent is
5206 used as the starting revision.
5210 used as the starting revision.
5207
5211
5208 File history is shown without following rename or copy history of
5212 File history is shown without following rename or copy history of
5209 files. Use -f/--follow with a filename to follow history across
5213 files. Use -f/--follow with a filename to follow history across
5210 renames and copies. --follow without a filename will only show
5214 renames and copies. --follow without a filename will only show
5211 ancestors or descendants of the starting revision.
5215 ancestors or descendants of the starting revision.
5212
5216
5213 By default this command prints revision number and changeset id,
5217 By default this command prints revision number and changeset id,
5214 tags, non-trivial parents, user, date and time, and a summary for
5218 tags, non-trivial parents, user, date and time, and a summary for
5215 each commit. When the -v/--verbose switch is used, the list of
5219 each commit. When the -v/--verbose switch is used, the list of
5216 changed files and full commit message are shown.
5220 changed files and full commit message are shown.
5217
5221
5218 With --graph the revisions are shown as an ASCII art DAG with the most
5222 With --graph the revisions are shown as an ASCII art DAG with the most
5219 recent changeset at the top.
5223 recent changeset at the top.
5220 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5224 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5221 and '+' represents a fork where the changeset from the lines below is a
5225 and '+' represents a fork where the changeset from the lines below is a
5222 parent of the 'o' merge on the same line.
5226 parent of the 'o' merge on the same line.
5223
5227
5224 .. note::
5228 .. note::
5225
5229
5226 :hg:`log --patch` may generate unexpected diff output for merge
5230 :hg:`log --patch` may generate unexpected diff output for merge
5227 changesets, as it will only compare the merge changeset against
5231 changesets, as it will only compare the merge changeset against
5228 its first parent. Also, only files different from BOTH parents
5232 its first parent. Also, only files different from BOTH parents
5229 will appear in files:.
5233 will appear in files:.
5230
5234
5231 .. note::
5235 .. note::
5232
5236
5233 For performance reasons, :hg:`log FILE` may omit duplicate changes
5237 For performance reasons, :hg:`log FILE` may omit duplicate changes
5234 made on branches and will not show removals or mode changes. To
5238 made on branches and will not show removals or mode changes. To
5235 see all such changes, use the --removed switch.
5239 see all such changes, use the --removed switch.
5236
5240
5237 .. container:: verbose
5241 .. container:: verbose
5238
5242
5239 Some examples:
5243 Some examples:
5240
5244
5241 - changesets with full descriptions and file lists::
5245 - changesets with full descriptions and file lists::
5242
5246
5243 hg log -v
5247 hg log -v
5244
5248
5245 - changesets ancestral to the working directory::
5249 - changesets ancestral to the working directory::
5246
5250
5247 hg log -f
5251 hg log -f
5248
5252
5249 - last 10 commits on the current branch::
5253 - last 10 commits on the current branch::
5250
5254
5251 hg log -l 10 -b .
5255 hg log -l 10 -b .
5252
5256
5253 - changesets showing all modifications of a file, including removals::
5257 - changesets showing all modifications of a file, including removals::
5254
5258
5255 hg log --removed file.c
5259 hg log --removed file.c
5256
5260
5257 - all changesets that touch a directory, with diffs, excluding merges::
5261 - all changesets that touch a directory, with diffs, excluding merges::
5258
5262
5259 hg log -Mp lib/
5263 hg log -Mp lib/
5260
5264
5261 - all revision numbers that match a keyword::
5265 - all revision numbers that match a keyword::
5262
5266
5263 hg log -k bug --template "{rev}\\n"
5267 hg log -k bug --template "{rev}\\n"
5264
5268
5265 - the full hash identifier of the working directory parent::
5269 - the full hash identifier of the working directory parent::
5266
5270
5267 hg log -r . --template "{node}\\n"
5271 hg log -r . --template "{node}\\n"
5268
5272
5269 - list available log templates::
5273 - list available log templates::
5270
5274
5271 hg log -T list
5275 hg log -T list
5272
5276
5273 - check if a given changeset is included in a tagged release::
5277 - check if a given changeset is included in a tagged release::
5274
5278
5275 hg log -r "a21ccf and ancestor(1.9)"
5279 hg log -r "a21ccf and ancestor(1.9)"
5276
5280
5277 - find all changesets by some user in a date range::
5281 - find all changesets by some user in a date range::
5278
5282
5279 hg log -k alice -d "may 2008 to jul 2008"
5283 hg log -k alice -d "may 2008 to jul 2008"
5280
5284
5281 - summary of all changesets after the last tag::
5285 - summary of all changesets after the last tag::
5282
5286
5283 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5287 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5284
5288
5285 See :hg:`help dates` for a list of formats valid for -d/--date.
5289 See :hg:`help dates` for a list of formats valid for -d/--date.
5286
5290
5287 See :hg:`help revisions` and :hg:`help revsets` for more about
5291 See :hg:`help revisions` and :hg:`help revsets` for more about
5288 specifying and ordering revisions.
5292 specifying and ordering revisions.
5289
5293
5290 See :hg:`help templates` for more about pre-packaged styles and
5294 See :hg:`help templates` for more about pre-packaged styles and
5291 specifying custom templates.
5295 specifying custom templates.
5292
5296
5293 Returns 0 on success.
5297 Returns 0 on success.
5294
5298
5295 """
5299 """
5296 if opts.get('follow') and opts.get('rev'):
5300 if opts.get('follow') and opts.get('rev'):
5297 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5301 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5298 del opts['follow']
5302 del opts['follow']
5299
5303
5300 if opts.get('graph'):
5304 if opts.get('graph'):
5301 return cmdutil.graphlog(ui, repo, *pats, **opts)
5305 return cmdutil.graphlog(ui, repo, *pats, **opts)
5302
5306
5303 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5307 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5304 limit = cmdutil.loglimit(opts)
5308 limit = cmdutil.loglimit(opts)
5305 count = 0
5309 count = 0
5306
5310
5307 getrenamed = None
5311 getrenamed = None
5308 if opts.get('copies'):
5312 if opts.get('copies'):
5309 endrev = None
5313 endrev = None
5310 if opts.get('rev'):
5314 if opts.get('rev'):
5311 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5315 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5312 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5316 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5313
5317
5314 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5318 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5315 for rev in revs:
5319 for rev in revs:
5316 if count == limit:
5320 if count == limit:
5317 break
5321 break
5318 ctx = repo[rev]
5322 ctx = repo[rev]
5319 copies = None
5323 copies = None
5320 if getrenamed is not None and rev:
5324 if getrenamed is not None and rev:
5321 copies = []
5325 copies = []
5322 for fn in ctx.files():
5326 for fn in ctx.files():
5323 rename = getrenamed(fn, rev)
5327 rename = getrenamed(fn, rev)
5324 if rename:
5328 if rename:
5325 copies.append((fn, rename[0]))
5329 copies.append((fn, rename[0]))
5326 if filematcher:
5330 if filematcher:
5327 revmatchfn = filematcher(ctx.rev())
5331 revmatchfn = filematcher(ctx.rev())
5328 else:
5332 else:
5329 revmatchfn = None
5333 revmatchfn = None
5330 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5334 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5331 if displayer.flush(ctx):
5335 if displayer.flush(ctx):
5332 count += 1
5336 count += 1
5333
5337
5334 displayer.close()
5338 displayer.close()
5335
5339
5336 @command('manifest',
5340 @command('manifest',
5337 [('r', 'rev', '', _('revision to display'), _('REV')),
5341 [('r', 'rev', '', _('revision to display'), _('REV')),
5338 ('', 'all', False, _("list files from all revisions"))]
5342 ('', 'all', False, _("list files from all revisions"))]
5339 + formatteropts,
5343 + formatteropts,
5340 _('[-r REV]'))
5344 _('[-r REV]'))
5341 def manifest(ui, repo, node=None, rev=None, **opts):
5345 def manifest(ui, repo, node=None, rev=None, **opts):
5342 """output the current or given revision of the project manifest
5346 """output the current or given revision of the project manifest
5343
5347
5344 Print a list of version controlled files for the given revision.
5348 Print a list of version controlled files for the given revision.
5345 If no revision is given, the first parent of the working directory
5349 If no revision is given, the first parent of the working directory
5346 is used, or the null revision if no revision is checked out.
5350 is used, or the null revision if no revision is checked out.
5347
5351
5348 With -v, print file permissions, symlink and executable bits.
5352 With -v, print file permissions, symlink and executable bits.
5349 With --debug, print file revision hashes.
5353 With --debug, print file revision hashes.
5350
5354
5351 If option --all is specified, the list of all files from all revisions
5355 If option --all is specified, the list of all files from all revisions
5352 is printed. This includes deleted and renamed files.
5356 is printed. This includes deleted and renamed files.
5353
5357
5354 Returns 0 on success.
5358 Returns 0 on success.
5355 """
5359 """
5356
5360
5357 fm = ui.formatter('manifest', opts)
5361 fm = ui.formatter('manifest', opts)
5358
5362
5359 if opts.get('all'):
5363 if opts.get('all'):
5360 if rev or node:
5364 if rev or node:
5361 raise error.Abort(_("can't specify a revision with --all"))
5365 raise error.Abort(_("can't specify a revision with --all"))
5362
5366
5363 res = []
5367 res = []
5364 prefix = "data/"
5368 prefix = "data/"
5365 suffix = ".i"
5369 suffix = ".i"
5366 plen = len(prefix)
5370 plen = len(prefix)
5367 slen = len(suffix)
5371 slen = len(suffix)
5368 with repo.lock():
5372 with repo.lock():
5369 for fn, b, size in repo.store.datafiles():
5373 for fn, b, size in repo.store.datafiles():
5370 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5374 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5371 res.append(fn[plen:-slen])
5375 res.append(fn[plen:-slen])
5372 for f in res:
5376 for f in res:
5373 fm.startitem()
5377 fm.startitem()
5374 fm.write("path", '%s\n', f)
5378 fm.write("path", '%s\n', f)
5375 fm.end()
5379 fm.end()
5376 return
5380 return
5377
5381
5378 if rev and node:
5382 if rev and node:
5379 raise error.Abort(_("please specify just one revision"))
5383 raise error.Abort(_("please specify just one revision"))
5380
5384
5381 if not node:
5385 if not node:
5382 node = rev
5386 node = rev
5383
5387
5384 char = {'l': '@', 'x': '*', '': ''}
5388 char = {'l': '@', 'x': '*', '': ''}
5385 mode = {'l': '644', 'x': '755', '': '644'}
5389 mode = {'l': '644', 'x': '755', '': '644'}
5386 ctx = scmutil.revsingle(repo, node)
5390 ctx = scmutil.revsingle(repo, node)
5387 mf = ctx.manifest()
5391 mf = ctx.manifest()
5388 for f in ctx:
5392 for f in ctx:
5389 fm.startitem()
5393 fm.startitem()
5390 fl = ctx[f].flags()
5394 fl = ctx[f].flags()
5391 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5395 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5392 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5396 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5393 fm.write('path', '%s\n', f)
5397 fm.write('path', '%s\n', f)
5394 fm.end()
5398 fm.end()
5395
5399
5396 @command('^merge',
5400 @command('^merge',
5397 [('f', 'force', None,
5401 [('f', 'force', None,
5398 _('force a merge including outstanding changes (DEPRECATED)')),
5402 _('force a merge including outstanding changes (DEPRECATED)')),
5399 ('r', 'rev', '', _('revision to merge'), _('REV')),
5403 ('r', 'rev', '', _('revision to merge'), _('REV')),
5400 ('P', 'preview', None,
5404 ('P', 'preview', None,
5401 _('review revisions to merge (no merge is performed)'))
5405 _('review revisions to merge (no merge is performed)'))
5402 ] + mergetoolopts,
5406 ] + mergetoolopts,
5403 _('[-P] [[-r] REV]'))
5407 _('[-P] [[-r] REV]'))
5404 def merge(ui, repo, node=None, **opts):
5408 def merge(ui, repo, node=None, **opts):
5405 """merge another revision into working directory
5409 """merge another revision into working directory
5406
5410
5407 The current working directory is updated with all changes made in
5411 The current working directory is updated with all changes made in
5408 the requested revision since the last common predecessor revision.
5412 the requested revision since the last common predecessor revision.
5409
5413
5410 Files that changed between either parent are marked as changed for
5414 Files that changed between either parent are marked as changed for
5411 the next commit and a commit must be performed before any further
5415 the next commit and a commit must be performed before any further
5412 updates to the repository are allowed. The next commit will have
5416 updates to the repository are allowed. The next commit will have
5413 two parents.
5417 two parents.
5414
5418
5415 ``--tool`` can be used to specify the merge tool used for file
5419 ``--tool`` can be used to specify the merge tool used for file
5416 merges. It overrides the HGMERGE environment variable and your
5420 merges. It overrides the HGMERGE environment variable and your
5417 configuration files. See :hg:`help merge-tools` for options.
5421 configuration files. See :hg:`help merge-tools` for options.
5418
5422
5419 If no revision is specified, the working directory's parent is a
5423 If no revision is specified, the working directory's parent is a
5420 head revision, and the current branch contains exactly one other
5424 head revision, and the current branch contains exactly one other
5421 head, the other head is merged with by default. Otherwise, an
5425 head, the other head is merged with by default. Otherwise, an
5422 explicit revision with which to merge with must be provided.
5426 explicit revision with which to merge with must be provided.
5423
5427
5424 See :hg:`help resolve` for information on handling file conflicts.
5428 See :hg:`help resolve` for information on handling file conflicts.
5425
5429
5426 To undo an uncommitted merge, use :hg:`update --clean .` which
5430 To undo an uncommitted merge, use :hg:`update --clean .` which
5427 will check out a clean copy of the original merge parent, losing
5431 will check out a clean copy of the original merge parent, losing
5428 all changes.
5432 all changes.
5429
5433
5430 Returns 0 on success, 1 if there are unresolved files.
5434 Returns 0 on success, 1 if there are unresolved files.
5431 """
5435 """
5432
5436
5433 if opts.get('rev') and node:
5437 if opts.get('rev') and node:
5434 raise error.Abort(_("please specify just one revision"))
5438 raise error.Abort(_("please specify just one revision"))
5435 if not node:
5439 if not node:
5436 node = opts.get('rev')
5440 node = opts.get('rev')
5437
5441
5438 if node:
5442 if node:
5439 node = scmutil.revsingle(repo, node).node()
5443 node = scmutil.revsingle(repo, node).node()
5440
5444
5441 if not node:
5445 if not node:
5442 node = repo[destutil.destmerge(repo)].node()
5446 node = repo[destutil.destmerge(repo)].node()
5443
5447
5444 if opts.get('preview'):
5448 if opts.get('preview'):
5445 # find nodes that are ancestors of p2 but not of p1
5449 # find nodes that are ancestors of p2 but not of p1
5446 p1 = repo.lookup('.')
5450 p1 = repo.lookup('.')
5447 p2 = repo.lookup(node)
5451 p2 = repo.lookup(node)
5448 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5452 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5449
5453
5450 displayer = cmdutil.show_changeset(ui, repo, opts)
5454 displayer = cmdutil.show_changeset(ui, repo, opts)
5451 for node in nodes:
5455 for node in nodes:
5452 displayer.show(repo[node])
5456 displayer.show(repo[node])
5453 displayer.close()
5457 displayer.close()
5454 return 0
5458 return 0
5455
5459
5456 try:
5460 try:
5457 # ui.forcemerge is an internal variable, do not document
5461 # ui.forcemerge is an internal variable, do not document
5458 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5462 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5459 force = opts.get('force')
5463 force = opts.get('force')
5460 return hg.merge(repo, node, force=force, mergeforce=force)
5464 return hg.merge(repo, node, force=force, mergeforce=force)
5461 finally:
5465 finally:
5462 ui.setconfig('ui', 'forcemerge', '', 'merge')
5466 ui.setconfig('ui', 'forcemerge', '', 'merge')
5463
5467
5464 @command('outgoing|out',
5468 @command('outgoing|out',
5465 [('f', 'force', None, _('run even when the destination is unrelated')),
5469 [('f', 'force', None, _('run even when the destination is unrelated')),
5466 ('r', 'rev', [],
5470 ('r', 'rev', [],
5467 _('a changeset intended to be included in the destination'), _('REV')),
5471 _('a changeset intended to be included in the destination'), _('REV')),
5468 ('n', 'newest-first', None, _('show newest record first')),
5472 ('n', 'newest-first', None, _('show newest record first')),
5469 ('B', 'bookmarks', False, _('compare bookmarks')),
5473 ('B', 'bookmarks', False, _('compare bookmarks')),
5470 ('b', 'branch', [], _('a specific branch you would like to push'),
5474 ('b', 'branch', [], _('a specific branch you would like to push'),
5471 _('BRANCH')),
5475 _('BRANCH')),
5472 ] + logopts + remoteopts + subrepoopts,
5476 ] + logopts + remoteopts + subrepoopts,
5473 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5477 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5474 def outgoing(ui, repo, dest=None, **opts):
5478 def outgoing(ui, repo, dest=None, **opts):
5475 """show changesets not found in the destination
5479 """show changesets not found in the destination
5476
5480
5477 Show changesets not found in the specified destination repository
5481 Show changesets not found in the specified destination repository
5478 or the default push location. These are the changesets that would
5482 or the default push location. These are the changesets that would
5479 be pushed if a push was requested.
5483 be pushed if a push was requested.
5480
5484
5481 See pull for details of valid destination formats.
5485 See pull for details of valid destination formats.
5482
5486
5483 .. container:: verbose
5487 .. container:: verbose
5484
5488
5485 With -B/--bookmarks, the result of bookmark comparison between
5489 With -B/--bookmarks, the result of bookmark comparison between
5486 local and remote repositories is displayed. With -v/--verbose,
5490 local and remote repositories is displayed. With -v/--verbose,
5487 status is also displayed for each bookmark like below::
5491 status is also displayed for each bookmark like below::
5488
5492
5489 BM1 01234567890a added
5493 BM1 01234567890a added
5490 BM2 deleted
5494 BM2 deleted
5491 BM3 234567890abc advanced
5495 BM3 234567890abc advanced
5492 BM4 34567890abcd diverged
5496 BM4 34567890abcd diverged
5493 BM5 4567890abcde changed
5497 BM5 4567890abcde changed
5494
5498
5495 The action taken when pushing depends on the
5499 The action taken when pushing depends on the
5496 status of each bookmark:
5500 status of each bookmark:
5497
5501
5498 :``added``: push with ``-B`` will create it
5502 :``added``: push with ``-B`` will create it
5499 :``deleted``: push with ``-B`` will delete it
5503 :``deleted``: push with ``-B`` will delete it
5500 :``advanced``: push will update it
5504 :``advanced``: push will update it
5501 :``diverged``: push with ``-B`` will update it
5505 :``diverged``: push with ``-B`` will update it
5502 :``changed``: push with ``-B`` will update it
5506 :``changed``: push with ``-B`` will update it
5503
5507
5504 From the point of view of pushing behavior, bookmarks
5508 From the point of view of pushing behavior, bookmarks
5505 existing only in the remote repository are treated as
5509 existing only in the remote repository are treated as
5506 ``deleted``, even if it is in fact added remotely.
5510 ``deleted``, even if it is in fact added remotely.
5507
5511
5508 Returns 0 if there are outgoing changes, 1 otherwise.
5512 Returns 0 if there are outgoing changes, 1 otherwise.
5509 """
5513 """
5510 if opts.get('graph'):
5514 if opts.get('graph'):
5511 cmdutil.checkunsupportedgraphflags([], opts)
5515 cmdutil.checkunsupportedgraphflags([], opts)
5512 o, other = hg._outgoing(ui, repo, dest, opts)
5516 o, other = hg._outgoing(ui, repo, dest, opts)
5513 if not o:
5517 if not o:
5514 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5518 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5515 return
5519 return
5516
5520
5517 revdag = cmdutil.graphrevs(repo, o, opts)
5521 revdag = cmdutil.graphrevs(repo, o, opts)
5518 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5522 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5519 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5523 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5520 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5524 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5521 return 0
5525 return 0
5522
5526
5523 if opts.get('bookmarks'):
5527 if opts.get('bookmarks'):
5524 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5528 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5525 dest, branches = hg.parseurl(dest, opts.get('branch'))
5529 dest, branches = hg.parseurl(dest, opts.get('branch'))
5526 other = hg.peer(repo, opts, dest)
5530 other = hg.peer(repo, opts, dest)
5527 if 'bookmarks' not in other.listkeys('namespaces'):
5531 if 'bookmarks' not in other.listkeys('namespaces'):
5528 ui.warn(_("remote doesn't support bookmarks\n"))
5532 ui.warn(_("remote doesn't support bookmarks\n"))
5529 return 0
5533 return 0
5530 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5534 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5531 return bookmarks.outgoing(ui, repo, other)
5535 return bookmarks.outgoing(ui, repo, other)
5532
5536
5533 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5537 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5534 try:
5538 try:
5535 return hg.outgoing(ui, repo, dest, opts)
5539 return hg.outgoing(ui, repo, dest, opts)
5536 finally:
5540 finally:
5537 del repo._subtoppath
5541 del repo._subtoppath
5538
5542
5539 @command('parents',
5543 @command('parents',
5540 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5544 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5541 ] + templateopts,
5545 ] + templateopts,
5542 _('[-r REV] [FILE]'),
5546 _('[-r REV] [FILE]'),
5543 inferrepo=True)
5547 inferrepo=True)
5544 def parents(ui, repo, file_=None, **opts):
5548 def parents(ui, repo, file_=None, **opts):
5545 """show the parents of the working directory or revision (DEPRECATED)
5549 """show the parents of the working directory or revision (DEPRECATED)
5546
5550
5547 Print the working directory's parent revisions. If a revision is
5551 Print the working directory's parent revisions. If a revision is
5548 given via -r/--rev, the parent of that revision will be printed.
5552 given via -r/--rev, the parent of that revision will be printed.
5549 If a file argument is given, the revision in which the file was
5553 If a file argument is given, the revision in which the file was
5550 last changed (before the working directory revision or the
5554 last changed (before the working directory revision or the
5551 argument to --rev if given) is printed.
5555 argument to --rev if given) is printed.
5552
5556
5553 This command is equivalent to::
5557 This command is equivalent to::
5554
5558
5555 hg log -r "p1()+p2()" or
5559 hg log -r "p1()+p2()" or
5556 hg log -r "p1(REV)+p2(REV)" or
5560 hg log -r "p1(REV)+p2(REV)" or
5557 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5561 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5558 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5562 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5559
5563
5560 See :hg:`summary` and :hg:`help revsets` for related information.
5564 See :hg:`summary` and :hg:`help revsets` for related information.
5561
5565
5562 Returns 0 on success.
5566 Returns 0 on success.
5563 """
5567 """
5564
5568
5565 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5569 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5566
5570
5567 if file_:
5571 if file_:
5568 m = scmutil.match(ctx, (file_,), opts)
5572 m = scmutil.match(ctx, (file_,), opts)
5569 if m.anypats() or len(m.files()) != 1:
5573 if m.anypats() or len(m.files()) != 1:
5570 raise error.Abort(_('can only specify an explicit filename'))
5574 raise error.Abort(_('can only specify an explicit filename'))
5571 file_ = m.files()[0]
5575 file_ = m.files()[0]
5572 filenodes = []
5576 filenodes = []
5573 for cp in ctx.parents():
5577 for cp in ctx.parents():
5574 if not cp:
5578 if not cp:
5575 continue
5579 continue
5576 try:
5580 try:
5577 filenodes.append(cp.filenode(file_))
5581 filenodes.append(cp.filenode(file_))
5578 except error.LookupError:
5582 except error.LookupError:
5579 pass
5583 pass
5580 if not filenodes:
5584 if not filenodes:
5581 raise error.Abort(_("'%s' not found in manifest!") % file_)
5585 raise error.Abort(_("'%s' not found in manifest!") % file_)
5582 p = []
5586 p = []
5583 for fn in filenodes:
5587 for fn in filenodes:
5584 fctx = repo.filectx(file_, fileid=fn)
5588 fctx = repo.filectx(file_, fileid=fn)
5585 p.append(fctx.node())
5589 p.append(fctx.node())
5586 else:
5590 else:
5587 p = [cp.node() for cp in ctx.parents()]
5591 p = [cp.node() for cp in ctx.parents()]
5588
5592
5589 displayer = cmdutil.show_changeset(ui, repo, opts)
5593 displayer = cmdutil.show_changeset(ui, repo, opts)
5590 for n in p:
5594 for n in p:
5591 if n != nullid:
5595 if n != nullid:
5592 displayer.show(repo[n])
5596 displayer.show(repo[n])
5593 displayer.close()
5597 displayer.close()
5594
5598
5595 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5599 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5596 def paths(ui, repo, search=None, **opts):
5600 def paths(ui, repo, search=None, **opts):
5597 """show aliases for remote repositories
5601 """show aliases for remote repositories
5598
5602
5599 Show definition of symbolic path name NAME. If no name is given,
5603 Show definition of symbolic path name NAME. If no name is given,
5600 show definition of all available names.
5604 show definition of all available names.
5601
5605
5602 Option -q/--quiet suppresses all output when searching for NAME
5606 Option -q/--quiet suppresses all output when searching for NAME
5603 and shows only the path names when listing all definitions.
5607 and shows only the path names when listing all definitions.
5604
5608
5605 Path names are defined in the [paths] section of your
5609 Path names are defined in the [paths] section of your
5606 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5610 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5607 repository, ``.hg/hgrc`` is used, too.
5611 repository, ``.hg/hgrc`` is used, too.
5608
5612
5609 The path names ``default`` and ``default-push`` have a special
5613 The path names ``default`` and ``default-push`` have a special
5610 meaning. When performing a push or pull operation, they are used
5614 meaning. When performing a push or pull operation, they are used
5611 as fallbacks if no location is specified on the command-line.
5615 as fallbacks if no location is specified on the command-line.
5612 When ``default-push`` is set, it will be used for push and
5616 When ``default-push`` is set, it will be used for push and
5613 ``default`` will be used for pull; otherwise ``default`` is used
5617 ``default`` will be used for pull; otherwise ``default`` is used
5614 as the fallback for both. When cloning a repository, the clone
5618 as the fallback for both. When cloning a repository, the clone
5615 source is written as ``default`` in ``.hg/hgrc``.
5619 source is written as ``default`` in ``.hg/hgrc``.
5616
5620
5617 .. note::
5621 .. note::
5618
5622
5619 ``default`` and ``default-push`` apply to all inbound (e.g.
5623 ``default`` and ``default-push`` apply to all inbound (e.g.
5620 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5624 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5621 and :hg:`bundle`) operations.
5625 and :hg:`bundle`) operations.
5622
5626
5623 See :hg:`help urls` for more information.
5627 See :hg:`help urls` for more information.
5624
5628
5625 Returns 0 on success.
5629 Returns 0 on success.
5626 """
5630 """
5627 if search:
5631 if search:
5628 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5632 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5629 if name == search]
5633 if name == search]
5630 else:
5634 else:
5631 pathitems = sorted(ui.paths.iteritems())
5635 pathitems = sorted(ui.paths.iteritems())
5632
5636
5633 fm = ui.formatter('paths', opts)
5637 fm = ui.formatter('paths', opts)
5634 if fm:
5638 if fm:
5635 hidepassword = str
5639 hidepassword = str
5636 else:
5640 else:
5637 hidepassword = util.hidepassword
5641 hidepassword = util.hidepassword
5638 if ui.quiet:
5642 if ui.quiet:
5639 namefmt = '%s\n'
5643 namefmt = '%s\n'
5640 else:
5644 else:
5641 namefmt = '%s = '
5645 namefmt = '%s = '
5642 showsubopts = not search and not ui.quiet
5646 showsubopts = not search and not ui.quiet
5643
5647
5644 for name, path in pathitems:
5648 for name, path in pathitems:
5645 fm.startitem()
5649 fm.startitem()
5646 fm.condwrite(not search, 'name', namefmt, name)
5650 fm.condwrite(not search, 'name', namefmt, name)
5647 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5651 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5648 for subopt, value in sorted(path.suboptions.items()):
5652 for subopt, value in sorted(path.suboptions.items()):
5649 assert subopt not in ('name', 'url')
5653 assert subopt not in ('name', 'url')
5650 if showsubopts:
5654 if showsubopts:
5651 fm.plain('%s:%s = ' % (name, subopt))
5655 fm.plain('%s:%s = ' % (name, subopt))
5652 fm.condwrite(showsubopts, subopt, '%s\n', value)
5656 fm.condwrite(showsubopts, subopt, '%s\n', value)
5653
5657
5654 fm.end()
5658 fm.end()
5655
5659
5656 if search and not pathitems:
5660 if search and not pathitems:
5657 if not ui.quiet:
5661 if not ui.quiet:
5658 ui.warn(_("not found!\n"))
5662 ui.warn(_("not found!\n"))
5659 return 1
5663 return 1
5660 else:
5664 else:
5661 return 0
5665 return 0
5662
5666
5663 @command('phase',
5667 @command('phase',
5664 [('p', 'public', False, _('set changeset phase to public')),
5668 [('p', 'public', False, _('set changeset phase to public')),
5665 ('d', 'draft', False, _('set changeset phase to draft')),
5669 ('d', 'draft', False, _('set changeset phase to draft')),
5666 ('s', 'secret', False, _('set changeset phase to secret')),
5670 ('s', 'secret', False, _('set changeset phase to secret')),
5667 ('f', 'force', False, _('allow to move boundary backward')),
5671 ('f', 'force', False, _('allow to move boundary backward')),
5668 ('r', 'rev', [], _('target revision'), _('REV')),
5672 ('r', 'rev', [], _('target revision'), _('REV')),
5669 ],
5673 ],
5670 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5674 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5671 def phase(ui, repo, *revs, **opts):
5675 def phase(ui, repo, *revs, **opts):
5672 """set or show the current phase name
5676 """set or show the current phase name
5673
5677
5674 With no argument, show the phase name of the current revision(s).
5678 With no argument, show the phase name of the current revision(s).
5675
5679
5676 With one of -p/--public, -d/--draft or -s/--secret, change the
5680 With one of -p/--public, -d/--draft or -s/--secret, change the
5677 phase value of the specified revisions.
5681 phase value of the specified revisions.
5678
5682
5679 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5683 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5680 lower phase to an higher phase. Phases are ordered as follows::
5684 lower phase to an higher phase. Phases are ordered as follows::
5681
5685
5682 public < draft < secret
5686 public < draft < secret
5683
5687
5684 Returns 0 on success, 1 if some phases could not be changed.
5688 Returns 0 on success, 1 if some phases could not be changed.
5685
5689
5686 (For more information about the phases concept, see :hg:`help phases`.)
5690 (For more information about the phases concept, see :hg:`help phases`.)
5687 """
5691 """
5688 # search for a unique phase argument
5692 # search for a unique phase argument
5689 targetphase = None
5693 targetphase = None
5690 for idx, name in enumerate(phases.phasenames):
5694 for idx, name in enumerate(phases.phasenames):
5691 if opts[name]:
5695 if opts[name]:
5692 if targetphase is not None:
5696 if targetphase is not None:
5693 raise error.Abort(_('only one phase can be specified'))
5697 raise error.Abort(_('only one phase can be specified'))
5694 targetphase = idx
5698 targetphase = idx
5695
5699
5696 # look for specified revision
5700 # look for specified revision
5697 revs = list(revs)
5701 revs = list(revs)
5698 revs.extend(opts['rev'])
5702 revs.extend(opts['rev'])
5699 if not revs:
5703 if not revs:
5700 # display both parents as the second parent phase can influence
5704 # display both parents as the second parent phase can influence
5701 # the phase of a merge commit
5705 # the phase of a merge commit
5702 revs = [c.rev() for c in repo[None].parents()]
5706 revs = [c.rev() for c in repo[None].parents()]
5703
5707
5704 revs = scmutil.revrange(repo, revs)
5708 revs = scmutil.revrange(repo, revs)
5705
5709
5706 lock = None
5710 lock = None
5707 ret = 0
5711 ret = 0
5708 if targetphase is None:
5712 if targetphase is None:
5709 # display
5713 # display
5710 for r in revs:
5714 for r in revs:
5711 ctx = repo[r]
5715 ctx = repo[r]
5712 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5716 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5713 else:
5717 else:
5714 tr = None
5718 tr = None
5715 lock = repo.lock()
5719 lock = repo.lock()
5716 try:
5720 try:
5717 tr = repo.transaction("phase")
5721 tr = repo.transaction("phase")
5718 # set phase
5722 # set phase
5719 if not revs:
5723 if not revs:
5720 raise error.Abort(_('empty revision set'))
5724 raise error.Abort(_('empty revision set'))
5721 nodes = [repo[r].node() for r in revs]
5725 nodes = [repo[r].node() for r in revs]
5722 # moving revision from public to draft may hide them
5726 # moving revision from public to draft may hide them
5723 # We have to check result on an unfiltered repository
5727 # We have to check result on an unfiltered repository
5724 unfi = repo.unfiltered()
5728 unfi = repo.unfiltered()
5725 getphase = unfi._phasecache.phase
5729 getphase = unfi._phasecache.phase
5726 olddata = [getphase(unfi, r) for r in unfi]
5730 olddata = [getphase(unfi, r) for r in unfi]
5727 phases.advanceboundary(repo, tr, targetphase, nodes)
5731 phases.advanceboundary(repo, tr, targetphase, nodes)
5728 if opts['force']:
5732 if opts['force']:
5729 phases.retractboundary(repo, tr, targetphase, nodes)
5733 phases.retractboundary(repo, tr, targetphase, nodes)
5730 tr.close()
5734 tr.close()
5731 finally:
5735 finally:
5732 if tr is not None:
5736 if tr is not None:
5733 tr.release()
5737 tr.release()
5734 lock.release()
5738 lock.release()
5735 getphase = unfi._phasecache.phase
5739 getphase = unfi._phasecache.phase
5736 newdata = [getphase(unfi, r) for r in unfi]
5740 newdata = [getphase(unfi, r) for r in unfi]
5737 changes = sum(newdata[r] != olddata[r] for r in unfi)
5741 changes = sum(newdata[r] != olddata[r] for r in unfi)
5738 cl = unfi.changelog
5742 cl = unfi.changelog
5739 rejected = [n for n in nodes
5743 rejected = [n for n in nodes
5740 if newdata[cl.rev(n)] < targetphase]
5744 if newdata[cl.rev(n)] < targetphase]
5741 if rejected:
5745 if rejected:
5742 ui.warn(_('cannot move %i changesets to a higher '
5746 ui.warn(_('cannot move %i changesets to a higher '
5743 'phase, use --force\n') % len(rejected))
5747 'phase, use --force\n') % len(rejected))
5744 ret = 1
5748 ret = 1
5745 if changes:
5749 if changes:
5746 msg = _('phase changed for %i changesets\n') % changes
5750 msg = _('phase changed for %i changesets\n') % changes
5747 if ret:
5751 if ret:
5748 ui.status(msg)
5752 ui.status(msg)
5749 else:
5753 else:
5750 ui.note(msg)
5754 ui.note(msg)
5751 else:
5755 else:
5752 ui.warn(_('no phases changed\n'))
5756 ui.warn(_('no phases changed\n'))
5753 return ret
5757 return ret
5754
5758
5755 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5759 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5756 """Run after a changegroup has been added via pull/unbundle
5760 """Run after a changegroup has been added via pull/unbundle
5757
5761
5758 This takes arguments below:
5762 This takes arguments below:
5759
5763
5760 :modheads: change of heads by pull/unbundle
5764 :modheads: change of heads by pull/unbundle
5761 :optupdate: updating working directory is needed or not
5765 :optupdate: updating working directory is needed or not
5762 :checkout: update destination revision (or None to default destination)
5766 :checkout: update destination revision (or None to default destination)
5763 :brev: a name, which might be a bookmark to be activated after updating
5767 :brev: a name, which might be a bookmark to be activated after updating
5764 """
5768 """
5765 if modheads == 0:
5769 if modheads == 0:
5766 return
5770 return
5767 if optupdate:
5771 if optupdate:
5768 try:
5772 try:
5769 return hg.updatetotally(ui, repo, checkout, brev)
5773 return hg.updatetotally(ui, repo, checkout, brev)
5770 except error.UpdateAbort as inst:
5774 except error.UpdateAbort as inst:
5771 msg = _("not updating: %s") % str(inst)
5775 msg = _("not updating: %s") % str(inst)
5772 hint = inst.hint
5776 hint = inst.hint
5773 raise error.UpdateAbort(msg, hint=hint)
5777 raise error.UpdateAbort(msg, hint=hint)
5774 if modheads > 1:
5778 if modheads > 1:
5775 currentbranchheads = len(repo.branchheads())
5779 currentbranchheads = len(repo.branchheads())
5776 if currentbranchheads == modheads:
5780 if currentbranchheads == modheads:
5777 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5781 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5778 elif currentbranchheads > 1:
5782 elif currentbranchheads > 1:
5779 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5783 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5780 "merge)\n"))
5784 "merge)\n"))
5781 else:
5785 else:
5782 ui.status(_("(run 'hg heads' to see heads)\n"))
5786 ui.status(_("(run 'hg heads' to see heads)\n"))
5783 else:
5787 else:
5784 ui.status(_("(run 'hg update' to get a working copy)\n"))
5788 ui.status(_("(run 'hg update' to get a working copy)\n"))
5785
5789
5786 @command('^pull',
5790 @command('^pull',
5787 [('u', 'update', None,
5791 [('u', 'update', None,
5788 _('update to new branch head if changesets were pulled')),
5792 _('update to new branch head if changesets were pulled')),
5789 ('f', 'force', None, _('run even when remote repository is unrelated')),
5793 ('f', 'force', None, _('run even when remote repository is unrelated')),
5790 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5794 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5791 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5795 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5792 ('b', 'branch', [], _('a specific branch you would like to pull'),
5796 ('b', 'branch', [], _('a specific branch you would like to pull'),
5793 _('BRANCH')),
5797 _('BRANCH')),
5794 ] + remoteopts,
5798 ] + remoteopts,
5795 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5799 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5796 def pull(ui, repo, source="default", **opts):
5800 def pull(ui, repo, source="default", **opts):
5797 """pull changes from the specified source
5801 """pull changes from the specified source
5798
5802
5799 Pull changes from a remote repository to a local one.
5803 Pull changes from a remote repository to a local one.
5800
5804
5801 This finds all changes from the repository at the specified path
5805 This finds all changes from the repository at the specified path
5802 or URL and adds them to a local repository (the current one unless
5806 or URL and adds them to a local repository (the current one unless
5803 -R is specified). By default, this does not update the copy of the
5807 -R is specified). By default, this does not update the copy of the
5804 project in the working directory.
5808 project in the working directory.
5805
5809
5806 Use :hg:`incoming` if you want to see what would have been added
5810 Use :hg:`incoming` if you want to see what would have been added
5807 by a pull at the time you issued this command. If you then decide
5811 by a pull at the time you issued this command. If you then decide
5808 to add those changes to the repository, you should use :hg:`pull
5812 to add those changes to the repository, you should use :hg:`pull
5809 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5813 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5810
5814
5811 If SOURCE is omitted, the 'default' path will be used.
5815 If SOURCE is omitted, the 'default' path will be used.
5812 See :hg:`help urls` for more information.
5816 See :hg:`help urls` for more information.
5813
5817
5814 Specifying bookmark as ``.`` is equivalent to specifying the active
5818 Specifying bookmark as ``.`` is equivalent to specifying the active
5815 bookmark's name.
5819 bookmark's name.
5816
5820
5817 Returns 0 on success, 1 if an update had unresolved files.
5821 Returns 0 on success, 1 if an update had unresolved files.
5818 """
5822 """
5819 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5823 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5820 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5824 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5821 other = hg.peer(repo, opts, source)
5825 other = hg.peer(repo, opts, source)
5822 try:
5826 try:
5823 revs, checkout = hg.addbranchrevs(repo, other, branches,
5827 revs, checkout = hg.addbranchrevs(repo, other, branches,
5824 opts.get('rev'))
5828 opts.get('rev'))
5825
5829
5826
5830
5827 pullopargs = {}
5831 pullopargs = {}
5828 if opts.get('bookmark'):
5832 if opts.get('bookmark'):
5829 if not revs:
5833 if not revs:
5830 revs = []
5834 revs = []
5831 # The list of bookmark used here is not the one used to actually
5835 # The list of bookmark used here is not the one used to actually
5832 # update the bookmark name. This can result in the revision pulled
5836 # update the bookmark name. This can result in the revision pulled
5833 # not ending up with the name of the bookmark because of a race
5837 # not ending up with the name of the bookmark because of a race
5834 # condition on the server. (See issue 4689 for details)
5838 # condition on the server. (See issue 4689 for details)
5835 remotebookmarks = other.listkeys('bookmarks')
5839 remotebookmarks = other.listkeys('bookmarks')
5836 pullopargs['remotebookmarks'] = remotebookmarks
5840 pullopargs['remotebookmarks'] = remotebookmarks
5837 for b in opts['bookmark']:
5841 for b in opts['bookmark']:
5838 b = repo._bookmarks.expandname(b)
5842 b = repo._bookmarks.expandname(b)
5839 if b not in remotebookmarks:
5843 if b not in remotebookmarks:
5840 raise error.Abort(_('remote bookmark %s not found!') % b)
5844 raise error.Abort(_('remote bookmark %s not found!') % b)
5841 revs.append(remotebookmarks[b])
5845 revs.append(remotebookmarks[b])
5842
5846
5843 if revs:
5847 if revs:
5844 try:
5848 try:
5845 # When 'rev' is a bookmark name, we cannot guarantee that it
5849 # When 'rev' is a bookmark name, we cannot guarantee that it
5846 # will be updated with that name because of a race condition
5850 # will be updated with that name because of a race condition
5847 # server side. (See issue 4689 for details)
5851 # server side. (See issue 4689 for details)
5848 oldrevs = revs
5852 oldrevs = revs
5849 revs = [] # actually, nodes
5853 revs = [] # actually, nodes
5850 for r in oldrevs:
5854 for r in oldrevs:
5851 node = other.lookup(r)
5855 node = other.lookup(r)
5852 revs.append(node)
5856 revs.append(node)
5853 if r == checkout:
5857 if r == checkout:
5854 checkout = node
5858 checkout = node
5855 except error.CapabilityError:
5859 except error.CapabilityError:
5856 err = _("other repository doesn't support revision lookup, "
5860 err = _("other repository doesn't support revision lookup, "
5857 "so a rev cannot be specified.")
5861 "so a rev cannot be specified.")
5858 raise error.Abort(err)
5862 raise error.Abort(err)
5859
5863
5860 pullopargs.update(opts.get('opargs', {}))
5864 pullopargs.update(opts.get('opargs', {}))
5861 modheads = exchange.pull(repo, other, heads=revs,
5865 modheads = exchange.pull(repo, other, heads=revs,
5862 force=opts.get('force'),
5866 force=opts.get('force'),
5863 bookmarks=opts.get('bookmark', ()),
5867 bookmarks=opts.get('bookmark', ()),
5864 opargs=pullopargs).cgresult
5868 opargs=pullopargs).cgresult
5865
5869
5866 # brev is a name, which might be a bookmark to be activated at
5870 # brev is a name, which might be a bookmark to be activated at
5867 # the end of the update. In other words, it is an explicit
5871 # the end of the update. In other words, it is an explicit
5868 # destination of the update
5872 # destination of the update
5869 brev = None
5873 brev = None
5870
5874
5871 if checkout:
5875 if checkout:
5872 checkout = str(repo.changelog.rev(checkout))
5876 checkout = str(repo.changelog.rev(checkout))
5873
5877
5874 # order below depends on implementation of
5878 # order below depends on implementation of
5875 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5879 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5876 # because 'checkout' is determined without it.
5880 # because 'checkout' is determined without it.
5877 if opts.get('rev'):
5881 if opts.get('rev'):
5878 brev = opts['rev'][0]
5882 brev = opts['rev'][0]
5879 elif opts.get('branch'):
5883 elif opts.get('branch'):
5880 brev = opts['branch'][0]
5884 brev = opts['branch'][0]
5881 else:
5885 else:
5882 brev = branches[0]
5886 brev = branches[0]
5883 repo._subtoppath = source
5887 repo._subtoppath = source
5884 try:
5888 try:
5885 ret = postincoming(ui, repo, modheads, opts.get('update'),
5889 ret = postincoming(ui, repo, modheads, opts.get('update'),
5886 checkout, brev)
5890 checkout, brev)
5887
5891
5888 finally:
5892 finally:
5889 del repo._subtoppath
5893 del repo._subtoppath
5890
5894
5891 finally:
5895 finally:
5892 other.close()
5896 other.close()
5893 return ret
5897 return ret
5894
5898
5895 @command('^push',
5899 @command('^push',
5896 [('f', 'force', None, _('force push')),
5900 [('f', 'force', None, _('force push')),
5897 ('r', 'rev', [],
5901 ('r', 'rev', [],
5898 _('a changeset intended to be included in the destination'),
5902 _('a changeset intended to be included in the destination'),
5899 _('REV')),
5903 _('REV')),
5900 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5904 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5901 ('b', 'branch', [],
5905 ('b', 'branch', [],
5902 _('a specific branch you would like to push'), _('BRANCH')),
5906 _('a specific branch you would like to push'), _('BRANCH')),
5903 ('', 'new-branch', False, _('allow pushing a new branch')),
5907 ('', 'new-branch', False, _('allow pushing a new branch')),
5904 ] + remoteopts,
5908 ] + remoteopts,
5905 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5909 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5906 def push(ui, repo, dest=None, **opts):
5910 def push(ui, repo, dest=None, **opts):
5907 """push changes to the specified destination
5911 """push changes to the specified destination
5908
5912
5909 Push changesets from the local repository to the specified
5913 Push changesets from the local repository to the specified
5910 destination.
5914 destination.
5911
5915
5912 This operation is symmetrical to pull: it is identical to a pull
5916 This operation is symmetrical to pull: it is identical to a pull
5913 in the destination repository from the current one.
5917 in the destination repository from the current one.
5914
5918
5915 By default, push will not allow creation of new heads at the
5919 By default, push will not allow creation of new heads at the
5916 destination, since multiple heads would make it unclear which head
5920 destination, since multiple heads would make it unclear which head
5917 to use. In this situation, it is recommended to pull and merge
5921 to use. In this situation, it is recommended to pull and merge
5918 before pushing.
5922 before pushing.
5919
5923
5920 Use --new-branch if you want to allow push to create a new named
5924 Use --new-branch if you want to allow push to create a new named
5921 branch that is not present at the destination. This allows you to
5925 branch that is not present at the destination. This allows you to
5922 only create a new branch without forcing other changes.
5926 only create a new branch without forcing other changes.
5923
5927
5924 .. note::
5928 .. note::
5925
5929
5926 Extra care should be taken with the -f/--force option,
5930 Extra care should be taken with the -f/--force option,
5927 which will push all new heads on all branches, an action which will
5931 which will push all new heads on all branches, an action which will
5928 almost always cause confusion for collaborators.
5932 almost always cause confusion for collaborators.
5929
5933
5930 If -r/--rev is used, the specified revision and all its ancestors
5934 If -r/--rev is used, the specified revision and all its ancestors
5931 will be pushed to the remote repository.
5935 will be pushed to the remote repository.
5932
5936
5933 If -B/--bookmark is used, the specified bookmarked revision, its
5937 If -B/--bookmark is used, the specified bookmarked revision, its
5934 ancestors, and the bookmark will be pushed to the remote
5938 ancestors, and the bookmark will be pushed to the remote
5935 repository. Specifying ``.`` is equivalent to specifying the active
5939 repository. Specifying ``.`` is equivalent to specifying the active
5936 bookmark's name.
5940 bookmark's name.
5937
5941
5938 Please see :hg:`help urls` for important details about ``ssh://``
5942 Please see :hg:`help urls` for important details about ``ssh://``
5939 URLs. If DESTINATION is omitted, a default path will be used.
5943 URLs. If DESTINATION is omitted, a default path will be used.
5940
5944
5941 Returns 0 if push was successful, 1 if nothing to push.
5945 Returns 0 if push was successful, 1 if nothing to push.
5942 """
5946 """
5943
5947
5944 if opts.get('bookmark'):
5948 if opts.get('bookmark'):
5945 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5949 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5946 for b in opts['bookmark']:
5950 for b in opts['bookmark']:
5947 # translate -B options to -r so changesets get pushed
5951 # translate -B options to -r so changesets get pushed
5948 b = repo._bookmarks.expandname(b)
5952 b = repo._bookmarks.expandname(b)
5949 if b in repo._bookmarks:
5953 if b in repo._bookmarks:
5950 opts.setdefault('rev', []).append(b)
5954 opts.setdefault('rev', []).append(b)
5951 else:
5955 else:
5952 # if we try to push a deleted bookmark, translate it to null
5956 # if we try to push a deleted bookmark, translate it to null
5953 # this lets simultaneous -r, -b options continue working
5957 # this lets simultaneous -r, -b options continue working
5954 opts.setdefault('rev', []).append("null")
5958 opts.setdefault('rev', []).append("null")
5955
5959
5956 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5960 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5957 if not path:
5961 if not path:
5958 raise error.Abort(_('default repository not configured!'),
5962 raise error.Abort(_('default repository not configured!'),
5959 hint=_('see the "path" section in "hg help config"'))
5963 hint=_('see the "path" section in "hg help config"'))
5960 dest = path.pushloc or path.loc
5964 dest = path.pushloc or path.loc
5961 branches = (path.branch, opts.get('branch') or [])
5965 branches = (path.branch, opts.get('branch') or [])
5962 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5966 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5963 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5967 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5964 other = hg.peer(repo, opts, dest)
5968 other = hg.peer(repo, opts, dest)
5965
5969
5966 if revs:
5970 if revs:
5967 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5971 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5968 if not revs:
5972 if not revs:
5969 raise error.Abort(_("specified revisions evaluate to an empty set"),
5973 raise error.Abort(_("specified revisions evaluate to an empty set"),
5970 hint=_("use different revision arguments"))
5974 hint=_("use different revision arguments"))
5971 elif path.pushrev:
5975 elif path.pushrev:
5972 # It doesn't make any sense to specify ancestor revisions. So limit
5976 # It doesn't make any sense to specify ancestor revisions. So limit
5973 # to DAG heads to make discovery simpler.
5977 # to DAG heads to make discovery simpler.
5974 expr = revset.formatspec('heads(%r)', path.pushrev)
5978 expr = revset.formatspec('heads(%r)', path.pushrev)
5975 revs = scmutil.revrange(repo, [expr])
5979 revs = scmutil.revrange(repo, [expr])
5976 revs = [repo[rev].node() for rev in revs]
5980 revs = [repo[rev].node() for rev in revs]
5977 if not revs:
5981 if not revs:
5978 raise error.Abort(_('default push revset for path evaluates to an '
5982 raise error.Abort(_('default push revset for path evaluates to an '
5979 'empty set'))
5983 'empty set'))
5980
5984
5981 repo._subtoppath = dest
5985 repo._subtoppath = dest
5982 try:
5986 try:
5983 # push subrepos depth-first for coherent ordering
5987 # push subrepos depth-first for coherent ordering
5984 c = repo['']
5988 c = repo['']
5985 subs = c.substate # only repos that are committed
5989 subs = c.substate # only repos that are committed
5986 for s in sorted(subs):
5990 for s in sorted(subs):
5987 result = c.sub(s).push(opts)
5991 result = c.sub(s).push(opts)
5988 if result == 0:
5992 if result == 0:
5989 return not result
5993 return not result
5990 finally:
5994 finally:
5991 del repo._subtoppath
5995 del repo._subtoppath
5992 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5996 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5993 newbranch=opts.get('new_branch'),
5997 newbranch=opts.get('new_branch'),
5994 bookmarks=opts.get('bookmark', ()),
5998 bookmarks=opts.get('bookmark', ()),
5995 opargs=opts.get('opargs'))
5999 opargs=opts.get('opargs'))
5996
6000
5997 result = not pushop.cgresult
6001 result = not pushop.cgresult
5998
6002
5999 if pushop.bkresult is not None:
6003 if pushop.bkresult is not None:
6000 if pushop.bkresult == 2:
6004 if pushop.bkresult == 2:
6001 result = 2
6005 result = 2
6002 elif not result and pushop.bkresult:
6006 elif not result and pushop.bkresult:
6003 result = 2
6007 result = 2
6004
6008
6005 return result
6009 return result
6006
6010
6007 @command('recover', [])
6011 @command('recover', [])
6008 def recover(ui, repo):
6012 def recover(ui, repo):
6009 """roll back an interrupted transaction
6013 """roll back an interrupted transaction
6010
6014
6011 Recover from an interrupted commit or pull.
6015 Recover from an interrupted commit or pull.
6012
6016
6013 This command tries to fix the repository status after an
6017 This command tries to fix the repository status after an
6014 interrupted operation. It should only be necessary when Mercurial
6018 interrupted operation. It should only be necessary when Mercurial
6015 suggests it.
6019 suggests it.
6016
6020
6017 Returns 0 if successful, 1 if nothing to recover or verify fails.
6021 Returns 0 if successful, 1 if nothing to recover or verify fails.
6018 """
6022 """
6019 if repo.recover():
6023 if repo.recover():
6020 return hg.verify(repo)
6024 return hg.verify(repo)
6021 return 1
6025 return 1
6022
6026
6023 @command('^remove|rm',
6027 @command('^remove|rm',
6024 [('A', 'after', None, _('record delete for missing files')),
6028 [('A', 'after', None, _('record delete for missing files')),
6025 ('f', 'force', None,
6029 ('f', 'force', None,
6026 _('forget added files, delete modified files')),
6030 _('forget added files, delete modified files')),
6027 ] + subrepoopts + walkopts,
6031 ] + subrepoopts + walkopts,
6028 _('[OPTION]... FILE...'),
6032 _('[OPTION]... FILE...'),
6029 inferrepo=True)
6033 inferrepo=True)
6030 def remove(ui, repo, *pats, **opts):
6034 def remove(ui, repo, *pats, **opts):
6031 """remove the specified files on the next commit
6035 """remove the specified files on the next commit
6032
6036
6033 Schedule the indicated files for removal from the current branch.
6037 Schedule the indicated files for removal from the current branch.
6034
6038
6035 This command schedules the files to be removed at the next commit.
6039 This command schedules the files to be removed at the next commit.
6036 To undo a remove before that, see :hg:`revert`. To undo added
6040 To undo a remove before that, see :hg:`revert`. To undo added
6037 files, see :hg:`forget`.
6041 files, see :hg:`forget`.
6038
6042
6039 .. container:: verbose
6043 .. container:: verbose
6040
6044
6041 -A/--after can be used to remove only files that have already
6045 -A/--after can be used to remove only files that have already
6042 been deleted, -f/--force can be used to force deletion, and -Af
6046 been deleted, -f/--force can be used to force deletion, and -Af
6043 can be used to remove files from the next revision without
6047 can be used to remove files from the next revision without
6044 deleting them from the working directory.
6048 deleting them from the working directory.
6045
6049
6046 The following table details the behavior of remove for different
6050 The following table details the behavior of remove for different
6047 file states (columns) and option combinations (rows). The file
6051 file states (columns) and option combinations (rows). The file
6048 states are Added [A], Clean [C], Modified [M] and Missing [!]
6052 states are Added [A], Clean [C], Modified [M] and Missing [!]
6049 (as reported by :hg:`status`). The actions are Warn, Remove
6053 (as reported by :hg:`status`). The actions are Warn, Remove
6050 (from branch) and Delete (from disk):
6054 (from branch) and Delete (from disk):
6051
6055
6052 ========= == == == ==
6056 ========= == == == ==
6053 opt/state A C M !
6057 opt/state A C M !
6054 ========= == == == ==
6058 ========= == == == ==
6055 none W RD W R
6059 none W RD W R
6056 -f R RD RD R
6060 -f R RD RD R
6057 -A W W W R
6061 -A W W W R
6058 -Af R R R R
6062 -Af R R R R
6059 ========= == == == ==
6063 ========= == == == ==
6060
6064
6061 .. note::
6065 .. note::
6062
6066
6063 :hg:`remove` never deletes files in Added [A] state from the
6067 :hg:`remove` never deletes files in Added [A] state from the
6064 working directory, not even if ``--force`` is specified.
6068 working directory, not even if ``--force`` is specified.
6065
6069
6066 Returns 0 on success, 1 if any warnings encountered.
6070 Returns 0 on success, 1 if any warnings encountered.
6067 """
6071 """
6068
6072
6069 after, force = opts.get('after'), opts.get('force')
6073 after, force = opts.get('after'), opts.get('force')
6070 if not pats and not after:
6074 if not pats and not after:
6071 raise error.Abort(_('no files specified'))
6075 raise error.Abort(_('no files specified'))
6072
6076
6073 m = scmutil.match(repo[None], pats, opts)
6077 m = scmutil.match(repo[None], pats, opts)
6074 subrepos = opts.get('subrepos')
6078 subrepos = opts.get('subrepos')
6075 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6079 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6076
6080
6077 @command('rename|move|mv',
6081 @command('rename|move|mv',
6078 [('A', 'after', None, _('record a rename that has already occurred')),
6082 [('A', 'after', None, _('record a rename that has already occurred')),
6079 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6083 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6080 ] + walkopts + dryrunopts,
6084 ] + walkopts + dryrunopts,
6081 _('[OPTION]... SOURCE... DEST'))
6085 _('[OPTION]... SOURCE... DEST'))
6082 def rename(ui, repo, *pats, **opts):
6086 def rename(ui, repo, *pats, **opts):
6083 """rename files; equivalent of copy + remove
6087 """rename files; equivalent of copy + remove
6084
6088
6085 Mark dest as copies of sources; mark sources for deletion. If dest
6089 Mark dest as copies of sources; mark sources for deletion. If dest
6086 is a directory, copies are put in that directory. If dest is a
6090 is a directory, copies are put in that directory. If dest is a
6087 file, there can only be one source.
6091 file, there can only be one source.
6088
6092
6089 By default, this command copies the contents of files as they
6093 By default, this command copies the contents of files as they
6090 exist in the working directory. If invoked with -A/--after, the
6094 exist in the working directory. If invoked with -A/--after, the
6091 operation is recorded, but no copying is performed.
6095 operation is recorded, but no copying is performed.
6092
6096
6093 This command takes effect at the next commit. To undo a rename
6097 This command takes effect at the next commit. To undo a rename
6094 before that, see :hg:`revert`.
6098 before that, see :hg:`revert`.
6095
6099
6096 Returns 0 on success, 1 if errors are encountered.
6100 Returns 0 on success, 1 if errors are encountered.
6097 """
6101 """
6098 with repo.wlock(False):
6102 with repo.wlock(False):
6099 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6103 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6100
6104
6101 @command('resolve',
6105 @command('resolve',
6102 [('a', 'all', None, _('select all unresolved files')),
6106 [('a', 'all', None, _('select all unresolved files')),
6103 ('l', 'list', None, _('list state of files needing merge')),
6107 ('l', 'list', None, _('list state of files needing merge')),
6104 ('m', 'mark', None, _('mark files as resolved')),
6108 ('m', 'mark', None, _('mark files as resolved')),
6105 ('u', 'unmark', None, _('mark files as unresolved')),
6109 ('u', 'unmark', None, _('mark files as unresolved')),
6106 ('n', 'no-status', None, _('hide status prefix'))]
6110 ('n', 'no-status', None, _('hide status prefix'))]
6107 + mergetoolopts + walkopts + formatteropts,
6111 + mergetoolopts + walkopts + formatteropts,
6108 _('[OPTION]... [FILE]...'),
6112 _('[OPTION]... [FILE]...'),
6109 inferrepo=True)
6113 inferrepo=True)
6110 def resolve(ui, repo, *pats, **opts):
6114 def resolve(ui, repo, *pats, **opts):
6111 """redo merges or set/view the merge status of files
6115 """redo merges or set/view the merge status of files
6112
6116
6113 Merges with unresolved conflicts are often the result of
6117 Merges with unresolved conflicts are often the result of
6114 non-interactive merging using the ``internal:merge`` configuration
6118 non-interactive merging using the ``internal:merge`` configuration
6115 setting, or a command-line merge tool like ``diff3``. The resolve
6119 setting, or a command-line merge tool like ``diff3``. The resolve
6116 command is used to manage the files involved in a merge, after
6120 command is used to manage the files involved in a merge, after
6117 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6121 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6118 working directory must have two parents). See :hg:`help
6122 working directory must have two parents). See :hg:`help
6119 merge-tools` for information on configuring merge tools.
6123 merge-tools` for information on configuring merge tools.
6120
6124
6121 The resolve command can be used in the following ways:
6125 The resolve command can be used in the following ways:
6122
6126
6123 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6127 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6124 files, discarding any previous merge attempts. Re-merging is not
6128 files, discarding any previous merge attempts. Re-merging is not
6125 performed for files already marked as resolved. Use ``--all/-a``
6129 performed for files already marked as resolved. Use ``--all/-a``
6126 to select all unresolved files. ``--tool`` can be used to specify
6130 to select all unresolved files. ``--tool`` can be used to specify
6127 the merge tool used for the given files. It overrides the HGMERGE
6131 the merge tool used for the given files. It overrides the HGMERGE
6128 environment variable and your configuration files. Previous file
6132 environment variable and your configuration files. Previous file
6129 contents are saved with a ``.orig`` suffix.
6133 contents are saved with a ``.orig`` suffix.
6130
6134
6131 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6135 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6132 (e.g. after having manually fixed-up the files). The default is
6136 (e.g. after having manually fixed-up the files). The default is
6133 to mark all unresolved files.
6137 to mark all unresolved files.
6134
6138
6135 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6139 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6136 default is to mark all resolved files.
6140 default is to mark all resolved files.
6137
6141
6138 - :hg:`resolve -l`: list files which had or still have conflicts.
6142 - :hg:`resolve -l`: list files which had or still have conflicts.
6139 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6143 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6140
6144
6141 .. note::
6145 .. note::
6142
6146
6143 Mercurial will not let you commit files with unresolved merge
6147 Mercurial will not let you commit files with unresolved merge
6144 conflicts. You must use :hg:`resolve -m ...` before you can
6148 conflicts. You must use :hg:`resolve -m ...` before you can
6145 commit after a conflicting merge.
6149 commit after a conflicting merge.
6146
6150
6147 Returns 0 on success, 1 if any files fail a resolve attempt.
6151 Returns 0 on success, 1 if any files fail a resolve attempt.
6148 """
6152 """
6149
6153
6150 flaglist = 'all mark unmark list no_status'.split()
6154 flaglist = 'all mark unmark list no_status'.split()
6151 all, mark, unmark, show, nostatus = \
6155 all, mark, unmark, show, nostatus = \
6152 [opts.get(o) for o in flaglist]
6156 [opts.get(o) for o in flaglist]
6153
6157
6154 if (show and (mark or unmark)) or (mark and unmark):
6158 if (show and (mark or unmark)) or (mark and unmark):
6155 raise error.Abort(_("too many options specified"))
6159 raise error.Abort(_("too many options specified"))
6156 if pats and all:
6160 if pats and all:
6157 raise error.Abort(_("can't specify --all and patterns"))
6161 raise error.Abort(_("can't specify --all and patterns"))
6158 if not (all or pats or show or mark or unmark):
6162 if not (all or pats or show or mark or unmark):
6159 raise error.Abort(_('no files or directories specified'),
6163 raise error.Abort(_('no files or directories specified'),
6160 hint=('use --all to re-merge all unresolved files'))
6164 hint=('use --all to re-merge all unresolved files'))
6161
6165
6162 if show:
6166 if show:
6163 fm = ui.formatter('resolve', opts)
6167 fm = ui.formatter('resolve', opts)
6164 ms = mergemod.mergestate.read(repo)
6168 ms = mergemod.mergestate.read(repo)
6165 m = scmutil.match(repo[None], pats, opts)
6169 m = scmutil.match(repo[None], pats, opts)
6166 for f in ms:
6170 for f in ms:
6167 if not m(f):
6171 if not m(f):
6168 continue
6172 continue
6169 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6173 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6170 'd': 'driverresolved'}[ms[f]]
6174 'd': 'driverresolved'}[ms[f]]
6171 fm.startitem()
6175 fm.startitem()
6172 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6176 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6173 fm.write('path', '%s\n', f, label=l)
6177 fm.write('path', '%s\n', f, label=l)
6174 fm.end()
6178 fm.end()
6175 return 0
6179 return 0
6176
6180
6177 with repo.wlock():
6181 with repo.wlock():
6178 ms = mergemod.mergestate.read(repo)
6182 ms = mergemod.mergestate.read(repo)
6179
6183
6180 if not (ms.active() or repo.dirstate.p2() != nullid):
6184 if not (ms.active() or repo.dirstate.p2() != nullid):
6181 raise error.Abort(
6185 raise error.Abort(
6182 _('resolve command not applicable when not merging'))
6186 _('resolve command not applicable when not merging'))
6183
6187
6184 wctx = repo[None]
6188 wctx = repo[None]
6185
6189
6186 if ms.mergedriver and ms.mdstate() == 'u':
6190 if ms.mergedriver and ms.mdstate() == 'u':
6187 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6191 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6188 ms.commit()
6192 ms.commit()
6189 # allow mark and unmark to go through
6193 # allow mark and unmark to go through
6190 if not mark and not unmark and not proceed:
6194 if not mark and not unmark and not proceed:
6191 return 1
6195 return 1
6192
6196
6193 m = scmutil.match(wctx, pats, opts)
6197 m = scmutil.match(wctx, pats, opts)
6194 ret = 0
6198 ret = 0
6195 didwork = False
6199 didwork = False
6196 runconclude = False
6200 runconclude = False
6197
6201
6198 tocomplete = []
6202 tocomplete = []
6199 for f in ms:
6203 for f in ms:
6200 if not m(f):
6204 if not m(f):
6201 continue
6205 continue
6202
6206
6203 didwork = True
6207 didwork = True
6204
6208
6205 # don't let driver-resolved files be marked, and run the conclude
6209 # don't let driver-resolved files be marked, and run the conclude
6206 # step if asked to resolve
6210 # step if asked to resolve
6207 if ms[f] == "d":
6211 if ms[f] == "d":
6208 exact = m.exact(f)
6212 exact = m.exact(f)
6209 if mark:
6213 if mark:
6210 if exact:
6214 if exact:
6211 ui.warn(_('not marking %s as it is driver-resolved\n')
6215 ui.warn(_('not marking %s as it is driver-resolved\n')
6212 % f)
6216 % f)
6213 elif unmark:
6217 elif unmark:
6214 if exact:
6218 if exact:
6215 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6219 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6216 % f)
6220 % f)
6217 else:
6221 else:
6218 runconclude = True
6222 runconclude = True
6219 continue
6223 continue
6220
6224
6221 if mark:
6225 if mark:
6222 ms.mark(f, "r")
6226 ms.mark(f, "r")
6223 elif unmark:
6227 elif unmark:
6224 ms.mark(f, "u")
6228 ms.mark(f, "u")
6225 else:
6229 else:
6226 # backup pre-resolve (merge uses .orig for its own purposes)
6230 # backup pre-resolve (merge uses .orig for its own purposes)
6227 a = repo.wjoin(f)
6231 a = repo.wjoin(f)
6228 try:
6232 try:
6229 util.copyfile(a, a + ".resolve")
6233 util.copyfile(a, a + ".resolve")
6230 except (IOError, OSError) as inst:
6234 except (IOError, OSError) as inst:
6231 if inst.errno != errno.ENOENT:
6235 if inst.errno != errno.ENOENT:
6232 raise
6236 raise
6233
6237
6234 try:
6238 try:
6235 # preresolve file
6239 # preresolve file
6236 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6240 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6237 'resolve')
6241 'resolve')
6238 complete, r = ms.preresolve(f, wctx)
6242 complete, r = ms.preresolve(f, wctx)
6239 if not complete:
6243 if not complete:
6240 tocomplete.append(f)
6244 tocomplete.append(f)
6241 elif r:
6245 elif r:
6242 ret = 1
6246 ret = 1
6243 finally:
6247 finally:
6244 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6248 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6245 ms.commit()
6249 ms.commit()
6246
6250
6247 # replace filemerge's .orig file with our resolve file, but only
6251 # replace filemerge's .orig file with our resolve file, but only
6248 # for merges that are complete
6252 # for merges that are complete
6249 if complete:
6253 if complete:
6250 try:
6254 try:
6251 util.rename(a + ".resolve",
6255 util.rename(a + ".resolve",
6252 scmutil.origpath(ui, repo, a))
6256 scmutil.origpath(ui, repo, a))
6253 except OSError as inst:
6257 except OSError as inst:
6254 if inst.errno != errno.ENOENT:
6258 if inst.errno != errno.ENOENT:
6255 raise
6259 raise
6256
6260
6257 for f in tocomplete:
6261 for f in tocomplete:
6258 try:
6262 try:
6259 # resolve file
6263 # resolve file
6260 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6264 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6261 'resolve')
6265 'resolve')
6262 r = ms.resolve(f, wctx)
6266 r = ms.resolve(f, wctx)
6263 if r:
6267 if r:
6264 ret = 1
6268 ret = 1
6265 finally:
6269 finally:
6266 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6270 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6267 ms.commit()
6271 ms.commit()
6268
6272
6269 # replace filemerge's .orig file with our resolve file
6273 # replace filemerge's .orig file with our resolve file
6270 a = repo.wjoin(f)
6274 a = repo.wjoin(f)
6271 try:
6275 try:
6272 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6276 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6273 except OSError as inst:
6277 except OSError as inst:
6274 if inst.errno != errno.ENOENT:
6278 if inst.errno != errno.ENOENT:
6275 raise
6279 raise
6276
6280
6277 ms.commit()
6281 ms.commit()
6278 ms.recordactions()
6282 ms.recordactions()
6279
6283
6280 if not didwork and pats:
6284 if not didwork and pats:
6281 hint = None
6285 hint = None
6282 if not any([p for p in pats if p.find(':') >= 0]):
6286 if not any([p for p in pats if p.find(':') >= 0]):
6283 pats = ['path:%s' % p for p in pats]
6287 pats = ['path:%s' % p for p in pats]
6284 m = scmutil.match(wctx, pats, opts)
6288 m = scmutil.match(wctx, pats, opts)
6285 for f in ms:
6289 for f in ms:
6286 if not m(f):
6290 if not m(f):
6287 continue
6291 continue
6288 flags = ''.join(['-%s ' % o[0] for o in flaglist
6292 flags = ''.join(['-%s ' % o[0] for o in flaglist
6289 if opts.get(o)])
6293 if opts.get(o)])
6290 hint = _("(try: hg resolve %s%s)\n") % (
6294 hint = _("(try: hg resolve %s%s)\n") % (
6291 flags,
6295 flags,
6292 ' '.join(pats))
6296 ' '.join(pats))
6293 break
6297 break
6294 ui.warn(_("arguments do not match paths that need resolving\n"))
6298 ui.warn(_("arguments do not match paths that need resolving\n"))
6295 if hint:
6299 if hint:
6296 ui.warn(hint)
6300 ui.warn(hint)
6297 elif ms.mergedriver and ms.mdstate() != 's':
6301 elif ms.mergedriver and ms.mdstate() != 's':
6298 # run conclude step when either a driver-resolved file is requested
6302 # run conclude step when either a driver-resolved file is requested
6299 # or there are no driver-resolved files
6303 # or there are no driver-resolved files
6300 # we can't use 'ret' to determine whether any files are unresolved
6304 # we can't use 'ret' to determine whether any files are unresolved
6301 # because we might not have tried to resolve some
6305 # because we might not have tried to resolve some
6302 if ((runconclude or not list(ms.driverresolved()))
6306 if ((runconclude or not list(ms.driverresolved()))
6303 and not list(ms.unresolved())):
6307 and not list(ms.unresolved())):
6304 proceed = mergemod.driverconclude(repo, ms, wctx)
6308 proceed = mergemod.driverconclude(repo, ms, wctx)
6305 ms.commit()
6309 ms.commit()
6306 if not proceed:
6310 if not proceed:
6307 return 1
6311 return 1
6308
6312
6309 # Nudge users into finishing an unfinished operation
6313 # Nudge users into finishing an unfinished operation
6310 unresolvedf = list(ms.unresolved())
6314 unresolvedf = list(ms.unresolved())
6311 driverresolvedf = list(ms.driverresolved())
6315 driverresolvedf = list(ms.driverresolved())
6312 if not unresolvedf and not driverresolvedf:
6316 if not unresolvedf and not driverresolvedf:
6313 ui.status(_('(no more unresolved files)\n'))
6317 ui.status(_('(no more unresolved files)\n'))
6314 cmdutil.checkafterresolved(repo)
6318 cmdutil.checkafterresolved(repo)
6315 elif not unresolvedf:
6319 elif not unresolvedf:
6316 ui.status(_('(no more unresolved files -- '
6320 ui.status(_('(no more unresolved files -- '
6317 'run "hg resolve --all" to conclude)\n'))
6321 'run "hg resolve --all" to conclude)\n'))
6318
6322
6319 return ret
6323 return ret
6320
6324
6321 @command('revert',
6325 @command('revert',
6322 [('a', 'all', None, _('revert all changes when no arguments given')),
6326 [('a', 'all', None, _('revert all changes when no arguments given')),
6323 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6327 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6324 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6328 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6325 ('C', 'no-backup', None, _('do not save backup copies of files')),
6329 ('C', 'no-backup', None, _('do not save backup copies of files')),
6326 ('i', 'interactive', None,
6330 ('i', 'interactive', None,
6327 _('interactively select the changes (EXPERIMENTAL)')),
6331 _('interactively select the changes (EXPERIMENTAL)')),
6328 ] + walkopts + dryrunopts,
6332 ] + walkopts + dryrunopts,
6329 _('[OPTION]... [-r REV] [NAME]...'))
6333 _('[OPTION]... [-r REV] [NAME]...'))
6330 def revert(ui, repo, *pats, **opts):
6334 def revert(ui, repo, *pats, **opts):
6331 """restore files to their checkout state
6335 """restore files to their checkout state
6332
6336
6333 .. note::
6337 .. note::
6334
6338
6335 To check out earlier revisions, you should use :hg:`update REV`.
6339 To check out earlier revisions, you should use :hg:`update REV`.
6336 To cancel an uncommitted merge (and lose your changes),
6340 To cancel an uncommitted merge (and lose your changes),
6337 use :hg:`update --clean .`.
6341 use :hg:`update --clean .`.
6338
6342
6339 With no revision specified, revert the specified files or directories
6343 With no revision specified, revert the specified files or directories
6340 to the contents they had in the parent of the working directory.
6344 to the contents they had in the parent of the working directory.
6341 This restores the contents of files to an unmodified
6345 This restores the contents of files to an unmodified
6342 state and unschedules adds, removes, copies, and renames. If the
6346 state and unschedules adds, removes, copies, and renames. If the
6343 working directory has two parents, you must explicitly specify a
6347 working directory has two parents, you must explicitly specify a
6344 revision.
6348 revision.
6345
6349
6346 Using the -r/--rev or -d/--date options, revert the given files or
6350 Using the -r/--rev or -d/--date options, revert the given files or
6347 directories to their states as of a specific revision. Because
6351 directories to their states as of a specific revision. Because
6348 revert does not change the working directory parents, this will
6352 revert does not change the working directory parents, this will
6349 cause these files to appear modified. This can be helpful to "back
6353 cause these files to appear modified. This can be helpful to "back
6350 out" some or all of an earlier change. See :hg:`backout` for a
6354 out" some or all of an earlier change. See :hg:`backout` for a
6351 related method.
6355 related method.
6352
6356
6353 Modified files are saved with a .orig suffix before reverting.
6357 Modified files are saved with a .orig suffix before reverting.
6354 To disable these backups, use --no-backup. It is possible to store
6358 To disable these backups, use --no-backup. It is possible to store
6355 the backup files in a custom directory relative to the root of the
6359 the backup files in a custom directory relative to the root of the
6356 repository by setting the ``ui.origbackuppath`` configuration
6360 repository by setting the ``ui.origbackuppath`` configuration
6357 option.
6361 option.
6358
6362
6359 See :hg:`help dates` for a list of formats valid for -d/--date.
6363 See :hg:`help dates` for a list of formats valid for -d/--date.
6360
6364
6361 See :hg:`help backout` for a way to reverse the effect of an
6365 See :hg:`help backout` for a way to reverse the effect of an
6362 earlier changeset.
6366 earlier changeset.
6363
6367
6364 Returns 0 on success.
6368 Returns 0 on success.
6365 """
6369 """
6366
6370
6367 if opts.get("date"):
6371 if opts.get("date"):
6368 if opts.get("rev"):
6372 if opts.get("rev"):
6369 raise error.Abort(_("you can't specify a revision and a date"))
6373 raise error.Abort(_("you can't specify a revision and a date"))
6370 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6374 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6371
6375
6372 parent, p2 = repo.dirstate.parents()
6376 parent, p2 = repo.dirstate.parents()
6373 if not opts.get('rev') and p2 != nullid:
6377 if not opts.get('rev') and p2 != nullid:
6374 # revert after merge is a trap for new users (issue2915)
6378 # revert after merge is a trap for new users (issue2915)
6375 raise error.Abort(_('uncommitted merge with no revision specified'),
6379 raise error.Abort(_('uncommitted merge with no revision specified'),
6376 hint=_("use 'hg update' or see 'hg help revert'"))
6380 hint=_("use 'hg update' or see 'hg help revert'"))
6377
6381
6378 ctx = scmutil.revsingle(repo, opts.get('rev'))
6382 ctx = scmutil.revsingle(repo, opts.get('rev'))
6379
6383
6380 if (not (pats or opts.get('include') or opts.get('exclude') or
6384 if (not (pats or opts.get('include') or opts.get('exclude') or
6381 opts.get('all') or opts.get('interactive'))):
6385 opts.get('all') or opts.get('interactive'))):
6382 msg = _("no files or directories specified")
6386 msg = _("no files or directories specified")
6383 if p2 != nullid:
6387 if p2 != nullid:
6384 hint = _("uncommitted merge, use --all to discard all changes,"
6388 hint = _("uncommitted merge, use --all to discard all changes,"
6385 " or 'hg update -C .' to abort the merge")
6389 " or 'hg update -C .' to abort the merge")
6386 raise error.Abort(msg, hint=hint)
6390 raise error.Abort(msg, hint=hint)
6387 dirty = any(repo.status())
6391 dirty = any(repo.status())
6388 node = ctx.node()
6392 node = ctx.node()
6389 if node != parent:
6393 if node != parent:
6390 if dirty:
6394 if dirty:
6391 hint = _("uncommitted changes, use --all to discard all"
6395 hint = _("uncommitted changes, use --all to discard all"
6392 " changes, or 'hg update %s' to update") % ctx.rev()
6396 " changes, or 'hg update %s' to update") % ctx.rev()
6393 else:
6397 else:
6394 hint = _("use --all to revert all files,"
6398 hint = _("use --all to revert all files,"
6395 " or 'hg update %s' to update") % ctx.rev()
6399 " or 'hg update %s' to update") % ctx.rev()
6396 elif dirty:
6400 elif dirty:
6397 hint = _("uncommitted changes, use --all to discard all changes")
6401 hint = _("uncommitted changes, use --all to discard all changes")
6398 else:
6402 else:
6399 hint = _("use --all to revert all files")
6403 hint = _("use --all to revert all files")
6400 raise error.Abort(msg, hint=hint)
6404 raise error.Abort(msg, hint=hint)
6401
6405
6402 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6406 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6403
6407
6404 @command('rollback', dryrunopts +
6408 @command('rollback', dryrunopts +
6405 [('f', 'force', False, _('ignore safety measures'))])
6409 [('f', 'force', False, _('ignore safety measures'))])
6406 def rollback(ui, repo, **opts):
6410 def rollback(ui, repo, **opts):
6407 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6411 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6408
6412
6409 Please use :hg:`commit --amend` instead of rollback to correct
6413 Please use :hg:`commit --amend` instead of rollback to correct
6410 mistakes in the last commit.
6414 mistakes in the last commit.
6411
6415
6412 This command should be used with care. There is only one level of
6416 This command should be used with care. There is only one level of
6413 rollback, and there is no way to undo a rollback. It will also
6417 rollback, and there is no way to undo a rollback. It will also
6414 restore the dirstate at the time of the last transaction, losing
6418 restore the dirstate at the time of the last transaction, losing
6415 any dirstate changes since that time. This command does not alter
6419 any dirstate changes since that time. This command does not alter
6416 the working directory.
6420 the working directory.
6417
6421
6418 Transactions are used to encapsulate the effects of all commands
6422 Transactions are used to encapsulate the effects of all commands
6419 that create new changesets or propagate existing changesets into a
6423 that create new changesets or propagate existing changesets into a
6420 repository.
6424 repository.
6421
6425
6422 .. container:: verbose
6426 .. container:: verbose
6423
6427
6424 For example, the following commands are transactional, and their
6428 For example, the following commands are transactional, and their
6425 effects can be rolled back:
6429 effects can be rolled back:
6426
6430
6427 - commit
6431 - commit
6428 - import
6432 - import
6429 - pull
6433 - pull
6430 - push (with this repository as the destination)
6434 - push (with this repository as the destination)
6431 - unbundle
6435 - unbundle
6432
6436
6433 To avoid permanent data loss, rollback will refuse to rollback a
6437 To avoid permanent data loss, rollback will refuse to rollback a
6434 commit transaction if it isn't checked out. Use --force to
6438 commit transaction if it isn't checked out. Use --force to
6435 override this protection.
6439 override this protection.
6436
6440
6437 The rollback command can be entirely disabled by setting the
6441 The rollback command can be entirely disabled by setting the
6438 ``ui.rollback`` configuration setting to false. If you're here
6442 ``ui.rollback`` configuration setting to false. If you're here
6439 because you want to use rollback and it's disabled, you can
6443 because you want to use rollback and it's disabled, you can
6440 re-enable the command by setting ``ui.rollback`` to true.
6444 re-enable the command by setting ``ui.rollback`` to true.
6441
6445
6442 This command is not intended for use on public repositories. Once
6446 This command is not intended for use on public repositories. Once
6443 changes are visible for pull by other users, rolling a transaction
6447 changes are visible for pull by other users, rolling a transaction
6444 back locally is ineffective (someone else may already have pulled
6448 back locally is ineffective (someone else may already have pulled
6445 the changes). Furthermore, a race is possible with readers of the
6449 the changes). Furthermore, a race is possible with readers of the
6446 repository; for example an in-progress pull from the repository
6450 repository; for example an in-progress pull from the repository
6447 may fail if a rollback is performed.
6451 may fail if a rollback is performed.
6448
6452
6449 Returns 0 on success, 1 if no rollback data is available.
6453 Returns 0 on success, 1 if no rollback data is available.
6450 """
6454 """
6451 if not ui.configbool('ui', 'rollback', True):
6455 if not ui.configbool('ui', 'rollback', True):
6452 raise error.Abort(_('rollback is disabled because it is unsafe'),
6456 raise error.Abort(_('rollback is disabled because it is unsafe'),
6453 hint=('see `hg help -v rollback` for information'))
6457 hint=('see `hg help -v rollback` for information'))
6454 return repo.rollback(dryrun=opts.get('dry_run'),
6458 return repo.rollback(dryrun=opts.get('dry_run'),
6455 force=opts.get('force'))
6459 force=opts.get('force'))
6456
6460
6457 @command('root', [])
6461 @command('root', [])
6458 def root(ui, repo):
6462 def root(ui, repo):
6459 """print the root (top) of the current working directory
6463 """print the root (top) of the current working directory
6460
6464
6461 Print the root directory of the current repository.
6465 Print the root directory of the current repository.
6462
6466
6463 Returns 0 on success.
6467 Returns 0 on success.
6464 """
6468 """
6465 ui.write(repo.root + "\n")
6469 ui.write(repo.root + "\n")
6466
6470
6467 @command('^serve',
6471 @command('^serve',
6468 [('A', 'accesslog', '', _('name of access log file to write to'),
6472 [('A', 'accesslog', '', _('name of access log file to write to'),
6469 _('FILE')),
6473 _('FILE')),
6470 ('d', 'daemon', None, _('run server in background')),
6474 ('d', 'daemon', None, _('run server in background')),
6471 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6475 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6472 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6476 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6473 # use string type, then we can check if something was passed
6477 # use string type, then we can check if something was passed
6474 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6478 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6475 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6479 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6476 _('ADDR')),
6480 _('ADDR')),
6477 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6481 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6478 _('PREFIX')),
6482 _('PREFIX')),
6479 ('n', 'name', '',
6483 ('n', 'name', '',
6480 _('name to show in web pages (default: working directory)'), _('NAME')),
6484 _('name to show in web pages (default: working directory)'), _('NAME')),
6481 ('', 'web-conf', '',
6485 ('', 'web-conf', '',
6482 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6486 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6483 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6487 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6484 _('FILE')),
6488 _('FILE')),
6485 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6489 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6486 ('', 'stdio', None, _('for remote clients')),
6490 ('', 'stdio', None, _('for remote clients')),
6487 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6491 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6488 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6492 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6489 ('', 'style', '', _('template style to use'), _('STYLE')),
6493 ('', 'style', '', _('template style to use'), _('STYLE')),
6490 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6494 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6491 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6495 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6492 _('[OPTION]...'),
6496 _('[OPTION]...'),
6493 optionalrepo=True)
6497 optionalrepo=True)
6494 def serve(ui, repo, **opts):
6498 def serve(ui, repo, **opts):
6495 """start stand-alone webserver
6499 """start stand-alone webserver
6496
6500
6497 Start a local HTTP repository browser and pull server. You can use
6501 Start a local HTTP repository browser and pull server. You can use
6498 this for ad-hoc sharing and browsing of repositories. It is
6502 this for ad-hoc sharing and browsing of repositories. It is
6499 recommended to use a real web server to serve a repository for
6503 recommended to use a real web server to serve a repository for
6500 longer periods of time.
6504 longer periods of time.
6501
6505
6502 Please note that the server does not implement access control.
6506 Please note that the server does not implement access control.
6503 This means that, by default, anybody can read from the server and
6507 This means that, by default, anybody can read from the server and
6504 nobody can write to it by default. Set the ``web.allow_push``
6508 nobody can write to it by default. Set the ``web.allow_push``
6505 option to ``*`` to allow everybody to push to the server. You
6509 option to ``*`` to allow everybody to push to the server. You
6506 should use a real web server if you need to authenticate users.
6510 should use a real web server if you need to authenticate users.
6507
6511
6508 By default, the server logs accesses to stdout and errors to
6512 By default, the server logs accesses to stdout and errors to
6509 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6513 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6510 files.
6514 files.
6511
6515
6512 To have the server choose a free port number to listen on, specify
6516 To have the server choose a free port number to listen on, specify
6513 a port number of 0; in this case, the server will print the port
6517 a port number of 0; in this case, the server will print the port
6514 number it uses.
6518 number it uses.
6515
6519
6516 Returns 0 on success.
6520 Returns 0 on success.
6517 """
6521 """
6518
6522
6519 if opts["stdio"] and opts["cmdserver"]:
6523 if opts["stdio"] and opts["cmdserver"]:
6520 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6524 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6521
6525
6522 if opts["stdio"]:
6526 if opts["stdio"]:
6523 if repo is None:
6527 if repo is None:
6524 raise error.RepoError(_("there is no Mercurial repository here"
6528 raise error.RepoError(_("there is no Mercurial repository here"
6525 " (.hg not found)"))
6529 " (.hg not found)"))
6526 s = sshserver.sshserver(ui, repo)
6530 s = sshserver.sshserver(ui, repo)
6527 s.serve_forever()
6531 s.serve_forever()
6528
6532
6529 if opts["cmdserver"]:
6533 if opts["cmdserver"]:
6530 service = commandserver.createservice(ui, repo, opts)
6534 service = commandserver.createservice(ui, repo, opts)
6531 else:
6535 else:
6532 service = hgweb.createservice(ui, repo, opts)
6536 service = hgweb.createservice(ui, repo, opts)
6533 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6537 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6534
6538
6535 @command('^status|st',
6539 @command('^status|st',
6536 [('A', 'all', None, _('show status of all files')),
6540 [('A', 'all', None, _('show status of all files')),
6537 ('m', 'modified', None, _('show only modified files')),
6541 ('m', 'modified', None, _('show only modified files')),
6538 ('a', 'added', None, _('show only added files')),
6542 ('a', 'added', None, _('show only added files')),
6539 ('r', 'removed', None, _('show only removed files')),
6543 ('r', 'removed', None, _('show only removed files')),
6540 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6544 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6541 ('c', 'clean', None, _('show only files without changes')),
6545 ('c', 'clean', None, _('show only files without changes')),
6542 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6546 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6543 ('i', 'ignored', None, _('show only ignored files')),
6547 ('i', 'ignored', None, _('show only ignored files')),
6544 ('n', 'no-status', None, _('hide status prefix')),
6548 ('n', 'no-status', None, _('hide status prefix')),
6545 ('C', 'copies', None, _('show source of copied files')),
6549 ('C', 'copies', None, _('show source of copied files')),
6546 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6550 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6547 ('', 'rev', [], _('show difference from revision'), _('REV')),
6551 ('', 'rev', [], _('show difference from revision'), _('REV')),
6548 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6552 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6549 ] + walkopts + subrepoopts + formatteropts,
6553 ] + walkopts + subrepoopts + formatteropts,
6550 _('[OPTION]... [FILE]...'),
6554 _('[OPTION]... [FILE]...'),
6551 inferrepo=True)
6555 inferrepo=True)
6552 def status(ui, repo, *pats, **opts):
6556 def status(ui, repo, *pats, **opts):
6553 """show changed files in the working directory
6557 """show changed files in the working directory
6554
6558
6555 Show status of files in the repository. If names are given, only
6559 Show status of files in the repository. If names are given, only
6556 files that match are shown. Files that are clean or ignored or
6560 files that match are shown. Files that are clean or ignored or
6557 the source of a copy/move operation, are not listed unless
6561 the source of a copy/move operation, are not listed unless
6558 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6562 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6559 Unless options described with "show only ..." are given, the
6563 Unless options described with "show only ..." are given, the
6560 options -mardu are used.
6564 options -mardu are used.
6561
6565
6562 Option -q/--quiet hides untracked (unknown and ignored) files
6566 Option -q/--quiet hides untracked (unknown and ignored) files
6563 unless explicitly requested with -u/--unknown or -i/--ignored.
6567 unless explicitly requested with -u/--unknown or -i/--ignored.
6564
6568
6565 .. note::
6569 .. note::
6566
6570
6567 :hg:`status` may appear to disagree with diff if permissions have
6571 :hg:`status` may appear to disagree with diff if permissions have
6568 changed or a merge has occurred. The standard diff format does
6572 changed or a merge has occurred. The standard diff format does
6569 not report permission changes and diff only reports changes
6573 not report permission changes and diff only reports changes
6570 relative to one merge parent.
6574 relative to one merge parent.
6571
6575
6572 If one revision is given, it is used as the base revision.
6576 If one revision is given, it is used as the base revision.
6573 If two revisions are given, the differences between them are
6577 If two revisions are given, the differences between them are
6574 shown. The --change option can also be used as a shortcut to list
6578 shown. The --change option can also be used as a shortcut to list
6575 the changed files of a revision from its first parent.
6579 the changed files of a revision from its first parent.
6576
6580
6577 The codes used to show the status of files are::
6581 The codes used to show the status of files are::
6578
6582
6579 M = modified
6583 M = modified
6580 A = added
6584 A = added
6581 R = removed
6585 R = removed
6582 C = clean
6586 C = clean
6583 ! = missing (deleted by non-hg command, but still tracked)
6587 ! = missing (deleted by non-hg command, but still tracked)
6584 ? = not tracked
6588 ? = not tracked
6585 I = ignored
6589 I = ignored
6586 = origin of the previous file (with --copies)
6590 = origin of the previous file (with --copies)
6587
6591
6588 .. container:: verbose
6592 .. container:: verbose
6589
6593
6590 Examples:
6594 Examples:
6591
6595
6592 - show changes in the working directory relative to a
6596 - show changes in the working directory relative to a
6593 changeset::
6597 changeset::
6594
6598
6595 hg status --rev 9353
6599 hg status --rev 9353
6596
6600
6597 - show changes in the working directory relative to the
6601 - show changes in the working directory relative to the
6598 current directory (see :hg:`help patterns` for more information)::
6602 current directory (see :hg:`help patterns` for more information)::
6599
6603
6600 hg status re:
6604 hg status re:
6601
6605
6602 - show all changes including copies in an existing changeset::
6606 - show all changes including copies in an existing changeset::
6603
6607
6604 hg status --copies --change 9353
6608 hg status --copies --change 9353
6605
6609
6606 - get a NUL separated list of added files, suitable for xargs::
6610 - get a NUL separated list of added files, suitable for xargs::
6607
6611
6608 hg status -an0
6612 hg status -an0
6609
6613
6610 Returns 0 on success.
6614 Returns 0 on success.
6611 """
6615 """
6612
6616
6613 revs = opts.get('rev')
6617 revs = opts.get('rev')
6614 change = opts.get('change')
6618 change = opts.get('change')
6615
6619
6616 if revs and change:
6620 if revs and change:
6617 msg = _('cannot specify --rev and --change at the same time')
6621 msg = _('cannot specify --rev and --change at the same time')
6618 raise error.Abort(msg)
6622 raise error.Abort(msg)
6619 elif change:
6623 elif change:
6620 node2 = scmutil.revsingle(repo, change, None).node()
6624 node2 = scmutil.revsingle(repo, change, None).node()
6621 node1 = repo[node2].p1().node()
6625 node1 = repo[node2].p1().node()
6622 else:
6626 else:
6623 node1, node2 = scmutil.revpair(repo, revs)
6627 node1, node2 = scmutil.revpair(repo, revs)
6624
6628
6625 if pats:
6629 if pats:
6626 cwd = repo.getcwd()
6630 cwd = repo.getcwd()
6627 else:
6631 else:
6628 cwd = ''
6632 cwd = ''
6629
6633
6630 if opts.get('print0'):
6634 if opts.get('print0'):
6631 end = '\0'
6635 end = '\0'
6632 else:
6636 else:
6633 end = '\n'
6637 end = '\n'
6634 copy = {}
6638 copy = {}
6635 states = 'modified added removed deleted unknown ignored clean'.split()
6639 states = 'modified added removed deleted unknown ignored clean'.split()
6636 show = [k for k in states if opts.get(k)]
6640 show = [k for k in states if opts.get(k)]
6637 if opts.get('all'):
6641 if opts.get('all'):
6638 show += ui.quiet and (states[:4] + ['clean']) or states
6642 show += ui.quiet and (states[:4] + ['clean']) or states
6639 if not show:
6643 if not show:
6640 if ui.quiet:
6644 if ui.quiet:
6641 show = states[:4]
6645 show = states[:4]
6642 else:
6646 else:
6643 show = states[:5]
6647 show = states[:5]
6644
6648
6645 m = scmutil.match(repo[node2], pats, opts)
6649 m = scmutil.match(repo[node2], pats, opts)
6646 stat = repo.status(node1, node2, m,
6650 stat = repo.status(node1, node2, m,
6647 'ignored' in show, 'clean' in show, 'unknown' in show,
6651 'ignored' in show, 'clean' in show, 'unknown' in show,
6648 opts.get('subrepos'))
6652 opts.get('subrepos'))
6649 changestates = zip(states, 'MAR!?IC', stat)
6653 changestates = zip(states, 'MAR!?IC', stat)
6650
6654
6651 if (opts.get('all') or opts.get('copies')
6655 if (opts.get('all') or opts.get('copies')
6652 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6656 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6653 copy = copies.pathcopies(repo[node1], repo[node2], m)
6657 copy = copies.pathcopies(repo[node1], repo[node2], m)
6654
6658
6655 fm = ui.formatter('status', opts)
6659 fm = ui.formatter('status', opts)
6656 fmt = '%s' + end
6660 fmt = '%s' + end
6657 showchar = not opts.get('no_status')
6661 showchar = not opts.get('no_status')
6658
6662
6659 for state, char, files in changestates:
6663 for state, char, files in changestates:
6660 if state in show:
6664 if state in show:
6661 label = 'status.' + state
6665 label = 'status.' + state
6662 for f in files:
6666 for f in files:
6663 fm.startitem()
6667 fm.startitem()
6664 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6668 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6665 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6669 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6666 if f in copy:
6670 if f in copy:
6667 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6671 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6668 label='status.copied')
6672 label='status.copied')
6669 fm.end()
6673 fm.end()
6670
6674
6671 @command('^summary|sum',
6675 @command('^summary|sum',
6672 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6676 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6673 def summary(ui, repo, **opts):
6677 def summary(ui, repo, **opts):
6674 """summarize working directory state
6678 """summarize working directory state
6675
6679
6676 This generates a brief summary of the working directory state,
6680 This generates a brief summary of the working directory state,
6677 including parents, branch, commit status, phase and available updates.
6681 including parents, branch, commit status, phase and available updates.
6678
6682
6679 With the --remote option, this will check the default paths for
6683 With the --remote option, this will check the default paths for
6680 incoming and outgoing changes. This can be time-consuming.
6684 incoming and outgoing changes. This can be time-consuming.
6681
6685
6682 Returns 0 on success.
6686 Returns 0 on success.
6683 """
6687 """
6684
6688
6685 ctx = repo[None]
6689 ctx = repo[None]
6686 parents = ctx.parents()
6690 parents = ctx.parents()
6687 pnode = parents[0].node()
6691 pnode = parents[0].node()
6688 marks = []
6692 marks = []
6689
6693
6690 ms = None
6694 ms = None
6691 try:
6695 try:
6692 ms = mergemod.mergestate.read(repo)
6696 ms = mergemod.mergestate.read(repo)
6693 except error.UnsupportedMergeRecords as e:
6697 except error.UnsupportedMergeRecords as e:
6694 s = ' '.join(e.recordtypes)
6698 s = ' '.join(e.recordtypes)
6695 ui.warn(
6699 ui.warn(
6696 _('warning: merge state has unsupported record types: %s\n') % s)
6700 _('warning: merge state has unsupported record types: %s\n') % s)
6697 unresolved = 0
6701 unresolved = 0
6698 else:
6702 else:
6699 unresolved = [f for f in ms if ms[f] == 'u']
6703 unresolved = [f for f in ms if ms[f] == 'u']
6700
6704
6701 for p in parents:
6705 for p in parents:
6702 # label with log.changeset (instead of log.parent) since this
6706 # label with log.changeset (instead of log.parent) since this
6703 # shows a working directory parent *changeset*:
6707 # shows a working directory parent *changeset*:
6704 # i18n: column positioning for "hg summary"
6708 # i18n: column positioning for "hg summary"
6705 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6709 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6706 label='log.changeset changeset.%s' % p.phasestr())
6710 label='log.changeset changeset.%s' % p.phasestr())
6707 ui.write(' '.join(p.tags()), label='log.tag')
6711 ui.write(' '.join(p.tags()), label='log.tag')
6708 if p.bookmarks():
6712 if p.bookmarks():
6709 marks.extend(p.bookmarks())
6713 marks.extend(p.bookmarks())
6710 if p.rev() == -1:
6714 if p.rev() == -1:
6711 if not len(repo):
6715 if not len(repo):
6712 ui.write(_(' (empty repository)'))
6716 ui.write(_(' (empty repository)'))
6713 else:
6717 else:
6714 ui.write(_(' (no revision checked out)'))
6718 ui.write(_(' (no revision checked out)'))
6715 ui.write('\n')
6719 ui.write('\n')
6716 if p.description():
6720 if p.description():
6717 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6721 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6718 label='log.summary')
6722 label='log.summary')
6719
6723
6720 branch = ctx.branch()
6724 branch = ctx.branch()
6721 bheads = repo.branchheads(branch)
6725 bheads = repo.branchheads(branch)
6722 # i18n: column positioning for "hg summary"
6726 # i18n: column positioning for "hg summary"
6723 m = _('branch: %s\n') % branch
6727 m = _('branch: %s\n') % branch
6724 if branch != 'default':
6728 if branch != 'default':
6725 ui.write(m, label='log.branch')
6729 ui.write(m, label='log.branch')
6726 else:
6730 else:
6727 ui.status(m, label='log.branch')
6731 ui.status(m, label='log.branch')
6728
6732
6729 if marks:
6733 if marks:
6730 active = repo._activebookmark
6734 active = repo._activebookmark
6731 # i18n: column positioning for "hg summary"
6735 # i18n: column positioning for "hg summary"
6732 ui.write(_('bookmarks:'), label='log.bookmark')
6736 ui.write(_('bookmarks:'), label='log.bookmark')
6733 if active is not None:
6737 if active is not None:
6734 if active in marks:
6738 if active in marks:
6735 ui.write(' *' + active, label=activebookmarklabel)
6739 ui.write(' *' + active, label=activebookmarklabel)
6736 marks.remove(active)
6740 marks.remove(active)
6737 else:
6741 else:
6738 ui.write(' [%s]' % active, label=activebookmarklabel)
6742 ui.write(' [%s]' % active, label=activebookmarklabel)
6739 for m in marks:
6743 for m in marks:
6740 ui.write(' ' + m, label='log.bookmark')
6744 ui.write(' ' + m, label='log.bookmark')
6741 ui.write('\n', label='log.bookmark')
6745 ui.write('\n', label='log.bookmark')
6742
6746
6743 status = repo.status(unknown=True)
6747 status = repo.status(unknown=True)
6744
6748
6745 c = repo.dirstate.copies()
6749 c = repo.dirstate.copies()
6746 copied, renamed = [], []
6750 copied, renamed = [], []
6747 for d, s in c.iteritems():
6751 for d, s in c.iteritems():
6748 if s in status.removed:
6752 if s in status.removed:
6749 status.removed.remove(s)
6753 status.removed.remove(s)
6750 renamed.append(d)
6754 renamed.append(d)
6751 else:
6755 else:
6752 copied.append(d)
6756 copied.append(d)
6753 if d in status.added:
6757 if d in status.added:
6754 status.added.remove(d)
6758 status.added.remove(d)
6755
6759
6756 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6760 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6757
6761
6758 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6762 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6759 (ui.label(_('%d added'), 'status.added'), status.added),
6763 (ui.label(_('%d added'), 'status.added'), status.added),
6760 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6764 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6761 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6765 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6762 (ui.label(_('%d copied'), 'status.copied'), copied),
6766 (ui.label(_('%d copied'), 'status.copied'), copied),
6763 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6767 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6764 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6768 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6765 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6769 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6766 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6770 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6767 t = []
6771 t = []
6768 for l, s in labels:
6772 for l, s in labels:
6769 if s:
6773 if s:
6770 t.append(l % len(s))
6774 t.append(l % len(s))
6771
6775
6772 t = ', '.join(t)
6776 t = ', '.join(t)
6773 cleanworkdir = False
6777 cleanworkdir = False
6774
6778
6775 if repo.vfs.exists('graftstate'):
6779 if repo.vfs.exists('graftstate'):
6776 t += _(' (graft in progress)')
6780 t += _(' (graft in progress)')
6777 if repo.vfs.exists('updatestate'):
6781 if repo.vfs.exists('updatestate'):
6778 t += _(' (interrupted update)')
6782 t += _(' (interrupted update)')
6779 elif len(parents) > 1:
6783 elif len(parents) > 1:
6780 t += _(' (merge)')
6784 t += _(' (merge)')
6781 elif branch != parents[0].branch():
6785 elif branch != parents[0].branch():
6782 t += _(' (new branch)')
6786 t += _(' (new branch)')
6783 elif (parents[0].closesbranch() and
6787 elif (parents[0].closesbranch() and
6784 pnode in repo.branchheads(branch, closed=True)):
6788 pnode in repo.branchheads(branch, closed=True)):
6785 t += _(' (head closed)')
6789 t += _(' (head closed)')
6786 elif not (status.modified or status.added or status.removed or renamed or
6790 elif not (status.modified or status.added or status.removed or renamed or
6787 copied or subs):
6791 copied or subs):
6788 t += _(' (clean)')
6792 t += _(' (clean)')
6789 cleanworkdir = True
6793 cleanworkdir = True
6790 elif pnode not in bheads:
6794 elif pnode not in bheads:
6791 t += _(' (new branch head)')
6795 t += _(' (new branch head)')
6792
6796
6793 if parents:
6797 if parents:
6794 pendingphase = max(p.phase() for p in parents)
6798 pendingphase = max(p.phase() for p in parents)
6795 else:
6799 else:
6796 pendingphase = phases.public
6800 pendingphase = phases.public
6797
6801
6798 if pendingphase > phases.newcommitphase(ui):
6802 if pendingphase > phases.newcommitphase(ui):
6799 t += ' (%s)' % phases.phasenames[pendingphase]
6803 t += ' (%s)' % phases.phasenames[pendingphase]
6800
6804
6801 if cleanworkdir:
6805 if cleanworkdir:
6802 # i18n: column positioning for "hg summary"
6806 # i18n: column positioning for "hg summary"
6803 ui.status(_('commit: %s\n') % t.strip())
6807 ui.status(_('commit: %s\n') % t.strip())
6804 else:
6808 else:
6805 # i18n: column positioning for "hg summary"
6809 # i18n: column positioning for "hg summary"
6806 ui.write(_('commit: %s\n') % t.strip())
6810 ui.write(_('commit: %s\n') % t.strip())
6807
6811
6808 # all ancestors of branch heads - all ancestors of parent = new csets
6812 # all ancestors of branch heads - all ancestors of parent = new csets
6809 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6813 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6810 bheads))
6814 bheads))
6811
6815
6812 if new == 0:
6816 if new == 0:
6813 # i18n: column positioning for "hg summary"
6817 # i18n: column positioning for "hg summary"
6814 ui.status(_('update: (current)\n'))
6818 ui.status(_('update: (current)\n'))
6815 elif pnode not in bheads:
6819 elif pnode not in bheads:
6816 # i18n: column positioning for "hg summary"
6820 # i18n: column positioning for "hg summary"
6817 ui.write(_('update: %d new changesets (update)\n') % new)
6821 ui.write(_('update: %d new changesets (update)\n') % new)
6818 else:
6822 else:
6819 # i18n: column positioning for "hg summary"
6823 # i18n: column positioning for "hg summary"
6820 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6824 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6821 (new, len(bheads)))
6825 (new, len(bheads)))
6822
6826
6823 t = []
6827 t = []
6824 draft = len(repo.revs('draft()'))
6828 draft = len(repo.revs('draft()'))
6825 if draft:
6829 if draft:
6826 t.append(_('%d draft') % draft)
6830 t.append(_('%d draft') % draft)
6827 secret = len(repo.revs('secret()'))
6831 secret = len(repo.revs('secret()'))
6828 if secret:
6832 if secret:
6829 t.append(_('%d secret') % secret)
6833 t.append(_('%d secret') % secret)
6830
6834
6831 if draft or secret:
6835 if draft or secret:
6832 ui.status(_('phases: %s\n') % ', '.join(t))
6836 ui.status(_('phases: %s\n') % ', '.join(t))
6833
6837
6834 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6838 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6835 for trouble in ("unstable", "divergent", "bumped"):
6839 for trouble in ("unstable", "divergent", "bumped"):
6836 numtrouble = len(repo.revs(trouble + "()"))
6840 numtrouble = len(repo.revs(trouble + "()"))
6837 # We write all the possibilities to ease translation
6841 # We write all the possibilities to ease translation
6838 troublemsg = {
6842 troublemsg = {
6839 "unstable": _("unstable: %d changesets"),
6843 "unstable": _("unstable: %d changesets"),
6840 "divergent": _("divergent: %d changesets"),
6844 "divergent": _("divergent: %d changesets"),
6841 "bumped": _("bumped: %d changesets"),
6845 "bumped": _("bumped: %d changesets"),
6842 }
6846 }
6843 if numtrouble > 0:
6847 if numtrouble > 0:
6844 ui.status(troublemsg[trouble] % numtrouble + "\n")
6848 ui.status(troublemsg[trouble] % numtrouble + "\n")
6845
6849
6846 cmdutil.summaryhooks(ui, repo)
6850 cmdutil.summaryhooks(ui, repo)
6847
6851
6848 if opts.get('remote'):
6852 if opts.get('remote'):
6849 needsincoming, needsoutgoing = True, True
6853 needsincoming, needsoutgoing = True, True
6850 else:
6854 else:
6851 needsincoming, needsoutgoing = False, False
6855 needsincoming, needsoutgoing = False, False
6852 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6856 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6853 if i:
6857 if i:
6854 needsincoming = True
6858 needsincoming = True
6855 if o:
6859 if o:
6856 needsoutgoing = True
6860 needsoutgoing = True
6857 if not needsincoming and not needsoutgoing:
6861 if not needsincoming and not needsoutgoing:
6858 return
6862 return
6859
6863
6860 def getincoming():
6864 def getincoming():
6861 source, branches = hg.parseurl(ui.expandpath('default'))
6865 source, branches = hg.parseurl(ui.expandpath('default'))
6862 sbranch = branches[0]
6866 sbranch = branches[0]
6863 try:
6867 try:
6864 other = hg.peer(repo, {}, source)
6868 other = hg.peer(repo, {}, source)
6865 except error.RepoError:
6869 except error.RepoError:
6866 if opts.get('remote'):
6870 if opts.get('remote'):
6867 raise
6871 raise
6868 return source, sbranch, None, None, None
6872 return source, sbranch, None, None, None
6869 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6873 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6870 if revs:
6874 if revs:
6871 revs = [other.lookup(rev) for rev in revs]
6875 revs = [other.lookup(rev) for rev in revs]
6872 ui.debug('comparing with %s\n' % util.hidepassword(source))
6876 ui.debug('comparing with %s\n' % util.hidepassword(source))
6873 repo.ui.pushbuffer()
6877 repo.ui.pushbuffer()
6874 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6878 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6875 repo.ui.popbuffer()
6879 repo.ui.popbuffer()
6876 return source, sbranch, other, commoninc, commoninc[1]
6880 return source, sbranch, other, commoninc, commoninc[1]
6877
6881
6878 if needsincoming:
6882 if needsincoming:
6879 source, sbranch, sother, commoninc, incoming = getincoming()
6883 source, sbranch, sother, commoninc, incoming = getincoming()
6880 else:
6884 else:
6881 source = sbranch = sother = commoninc = incoming = None
6885 source = sbranch = sother = commoninc = incoming = None
6882
6886
6883 def getoutgoing():
6887 def getoutgoing():
6884 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6888 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6885 dbranch = branches[0]
6889 dbranch = branches[0]
6886 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6890 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6887 if source != dest:
6891 if source != dest:
6888 try:
6892 try:
6889 dother = hg.peer(repo, {}, dest)
6893 dother = hg.peer(repo, {}, dest)
6890 except error.RepoError:
6894 except error.RepoError:
6891 if opts.get('remote'):
6895 if opts.get('remote'):
6892 raise
6896 raise
6893 return dest, dbranch, None, None
6897 return dest, dbranch, None, None
6894 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6898 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6895 elif sother is None:
6899 elif sother is None:
6896 # there is no explicit destination peer, but source one is invalid
6900 # there is no explicit destination peer, but source one is invalid
6897 return dest, dbranch, None, None
6901 return dest, dbranch, None, None
6898 else:
6902 else:
6899 dother = sother
6903 dother = sother
6900 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6904 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6901 common = None
6905 common = None
6902 else:
6906 else:
6903 common = commoninc
6907 common = commoninc
6904 if revs:
6908 if revs:
6905 revs = [repo.lookup(rev) for rev in revs]
6909 revs = [repo.lookup(rev) for rev in revs]
6906 repo.ui.pushbuffer()
6910 repo.ui.pushbuffer()
6907 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6911 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6908 commoninc=common)
6912 commoninc=common)
6909 repo.ui.popbuffer()
6913 repo.ui.popbuffer()
6910 return dest, dbranch, dother, outgoing
6914 return dest, dbranch, dother, outgoing
6911
6915
6912 if needsoutgoing:
6916 if needsoutgoing:
6913 dest, dbranch, dother, outgoing = getoutgoing()
6917 dest, dbranch, dother, outgoing = getoutgoing()
6914 else:
6918 else:
6915 dest = dbranch = dother = outgoing = None
6919 dest = dbranch = dother = outgoing = None
6916
6920
6917 if opts.get('remote'):
6921 if opts.get('remote'):
6918 t = []
6922 t = []
6919 if incoming:
6923 if incoming:
6920 t.append(_('1 or more incoming'))
6924 t.append(_('1 or more incoming'))
6921 o = outgoing.missing
6925 o = outgoing.missing
6922 if o:
6926 if o:
6923 t.append(_('%d outgoing') % len(o))
6927 t.append(_('%d outgoing') % len(o))
6924 other = dother or sother
6928 other = dother or sother
6925 if 'bookmarks' in other.listkeys('namespaces'):
6929 if 'bookmarks' in other.listkeys('namespaces'):
6926 counts = bookmarks.summary(repo, other)
6930 counts = bookmarks.summary(repo, other)
6927 if counts[0] > 0:
6931 if counts[0] > 0:
6928 t.append(_('%d incoming bookmarks') % counts[0])
6932 t.append(_('%d incoming bookmarks') % counts[0])
6929 if counts[1] > 0:
6933 if counts[1] > 0:
6930 t.append(_('%d outgoing bookmarks') % counts[1])
6934 t.append(_('%d outgoing bookmarks') % counts[1])
6931
6935
6932 if t:
6936 if t:
6933 # i18n: column positioning for "hg summary"
6937 # i18n: column positioning for "hg summary"
6934 ui.write(_('remote: %s\n') % (', '.join(t)))
6938 ui.write(_('remote: %s\n') % (', '.join(t)))
6935 else:
6939 else:
6936 # i18n: column positioning for "hg summary"
6940 # i18n: column positioning for "hg summary"
6937 ui.status(_('remote: (synced)\n'))
6941 ui.status(_('remote: (synced)\n'))
6938
6942
6939 cmdutil.summaryremotehooks(ui, repo, opts,
6943 cmdutil.summaryremotehooks(ui, repo, opts,
6940 ((source, sbranch, sother, commoninc),
6944 ((source, sbranch, sother, commoninc),
6941 (dest, dbranch, dother, outgoing)))
6945 (dest, dbranch, dother, outgoing)))
6942
6946
6943 @command('tag',
6947 @command('tag',
6944 [('f', 'force', None, _('force tag')),
6948 [('f', 'force', None, _('force tag')),
6945 ('l', 'local', None, _('make the tag local')),
6949 ('l', 'local', None, _('make the tag local')),
6946 ('r', 'rev', '', _('revision to tag'), _('REV')),
6950 ('r', 'rev', '', _('revision to tag'), _('REV')),
6947 ('', 'remove', None, _('remove a tag')),
6951 ('', 'remove', None, _('remove a tag')),
6948 # -l/--local is already there, commitopts cannot be used
6952 # -l/--local is already there, commitopts cannot be used
6949 ('e', 'edit', None, _('invoke editor on commit messages')),
6953 ('e', 'edit', None, _('invoke editor on commit messages')),
6950 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6954 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6951 ] + commitopts2,
6955 ] + commitopts2,
6952 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6956 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6953 def tag(ui, repo, name1, *names, **opts):
6957 def tag(ui, repo, name1, *names, **opts):
6954 """add one or more tags for the current or given revision
6958 """add one or more tags for the current or given revision
6955
6959
6956 Name a particular revision using <name>.
6960 Name a particular revision using <name>.
6957
6961
6958 Tags are used to name particular revisions of the repository and are
6962 Tags are used to name particular revisions of the repository and are
6959 very useful to compare different revisions, to go back to significant
6963 very useful to compare different revisions, to go back to significant
6960 earlier versions or to mark branch points as releases, etc. Changing
6964 earlier versions or to mark branch points as releases, etc. Changing
6961 an existing tag is normally disallowed; use -f/--force to override.
6965 an existing tag is normally disallowed; use -f/--force to override.
6962
6966
6963 If no revision is given, the parent of the working directory is
6967 If no revision is given, the parent of the working directory is
6964 used.
6968 used.
6965
6969
6966 To facilitate version control, distribution, and merging of tags,
6970 To facilitate version control, distribution, and merging of tags,
6967 they are stored as a file named ".hgtags" which is managed similarly
6971 they are stored as a file named ".hgtags" which is managed similarly
6968 to other project files and can be hand-edited if necessary. This
6972 to other project files and can be hand-edited if necessary. This
6969 also means that tagging creates a new commit. The file
6973 also means that tagging creates a new commit. The file
6970 ".hg/localtags" is used for local tags (not shared among
6974 ".hg/localtags" is used for local tags (not shared among
6971 repositories).
6975 repositories).
6972
6976
6973 Tag commits are usually made at the head of a branch. If the parent
6977 Tag commits are usually made at the head of a branch. If the parent
6974 of the working directory is not a branch head, :hg:`tag` aborts; use
6978 of the working directory is not a branch head, :hg:`tag` aborts; use
6975 -f/--force to force the tag commit to be based on a non-head
6979 -f/--force to force the tag commit to be based on a non-head
6976 changeset.
6980 changeset.
6977
6981
6978 See :hg:`help dates` for a list of formats valid for -d/--date.
6982 See :hg:`help dates` for a list of formats valid for -d/--date.
6979
6983
6980 Since tag names have priority over branch names during revision
6984 Since tag names have priority over branch names during revision
6981 lookup, using an existing branch name as a tag name is discouraged.
6985 lookup, using an existing branch name as a tag name is discouraged.
6982
6986
6983 Returns 0 on success.
6987 Returns 0 on success.
6984 """
6988 """
6985 wlock = lock = None
6989 wlock = lock = None
6986 try:
6990 try:
6987 wlock = repo.wlock()
6991 wlock = repo.wlock()
6988 lock = repo.lock()
6992 lock = repo.lock()
6989 rev_ = "."
6993 rev_ = "."
6990 names = [t.strip() for t in (name1,) + names]
6994 names = [t.strip() for t in (name1,) + names]
6991 if len(names) != len(set(names)):
6995 if len(names) != len(set(names)):
6992 raise error.Abort(_('tag names must be unique'))
6996 raise error.Abort(_('tag names must be unique'))
6993 for n in names:
6997 for n in names:
6994 scmutil.checknewlabel(repo, n, 'tag')
6998 scmutil.checknewlabel(repo, n, 'tag')
6995 if not n:
6999 if not n:
6996 raise error.Abort(_('tag names cannot consist entirely of '
7000 raise error.Abort(_('tag names cannot consist entirely of '
6997 'whitespace'))
7001 'whitespace'))
6998 if opts.get('rev') and opts.get('remove'):
7002 if opts.get('rev') and opts.get('remove'):
6999 raise error.Abort(_("--rev and --remove are incompatible"))
7003 raise error.Abort(_("--rev and --remove are incompatible"))
7000 if opts.get('rev'):
7004 if opts.get('rev'):
7001 rev_ = opts['rev']
7005 rev_ = opts['rev']
7002 message = opts.get('message')
7006 message = opts.get('message')
7003 if opts.get('remove'):
7007 if opts.get('remove'):
7004 if opts.get('local'):
7008 if opts.get('local'):
7005 expectedtype = 'local'
7009 expectedtype = 'local'
7006 else:
7010 else:
7007 expectedtype = 'global'
7011 expectedtype = 'global'
7008
7012
7009 for n in names:
7013 for n in names:
7010 if not repo.tagtype(n):
7014 if not repo.tagtype(n):
7011 raise error.Abort(_("tag '%s' does not exist") % n)
7015 raise error.Abort(_("tag '%s' does not exist") % n)
7012 if repo.tagtype(n) != expectedtype:
7016 if repo.tagtype(n) != expectedtype:
7013 if expectedtype == 'global':
7017 if expectedtype == 'global':
7014 raise error.Abort(_("tag '%s' is not a global tag") % n)
7018 raise error.Abort(_("tag '%s' is not a global tag") % n)
7015 else:
7019 else:
7016 raise error.Abort(_("tag '%s' is not a local tag") % n)
7020 raise error.Abort(_("tag '%s' is not a local tag") % n)
7017 rev_ = 'null'
7021 rev_ = 'null'
7018 if not message:
7022 if not message:
7019 # we don't translate commit messages
7023 # we don't translate commit messages
7020 message = 'Removed tag %s' % ', '.join(names)
7024 message = 'Removed tag %s' % ', '.join(names)
7021 elif not opts.get('force'):
7025 elif not opts.get('force'):
7022 for n in names:
7026 for n in names:
7023 if n in repo.tags():
7027 if n in repo.tags():
7024 raise error.Abort(_("tag '%s' already exists "
7028 raise error.Abort(_("tag '%s' already exists "
7025 "(use -f to force)") % n)
7029 "(use -f to force)") % n)
7026 if not opts.get('local'):
7030 if not opts.get('local'):
7027 p1, p2 = repo.dirstate.parents()
7031 p1, p2 = repo.dirstate.parents()
7028 if p2 != nullid:
7032 if p2 != nullid:
7029 raise error.Abort(_('uncommitted merge'))
7033 raise error.Abort(_('uncommitted merge'))
7030 bheads = repo.branchheads()
7034 bheads = repo.branchheads()
7031 if not opts.get('force') and bheads and p1 not in bheads:
7035 if not opts.get('force') and bheads and p1 not in bheads:
7032 raise error.Abort(_('not at a branch head (use -f to force)'))
7036 raise error.Abort(_('not at a branch head (use -f to force)'))
7033 r = scmutil.revsingle(repo, rev_).node()
7037 r = scmutil.revsingle(repo, rev_).node()
7034
7038
7035 if not message:
7039 if not message:
7036 # we don't translate commit messages
7040 # we don't translate commit messages
7037 message = ('Added tag %s for changeset %s' %
7041 message = ('Added tag %s for changeset %s' %
7038 (', '.join(names), short(r)))
7042 (', '.join(names), short(r)))
7039
7043
7040 date = opts.get('date')
7044 date = opts.get('date')
7041 if date:
7045 if date:
7042 date = util.parsedate(date)
7046 date = util.parsedate(date)
7043
7047
7044 if opts.get('remove'):
7048 if opts.get('remove'):
7045 editform = 'tag.remove'
7049 editform = 'tag.remove'
7046 else:
7050 else:
7047 editform = 'tag.add'
7051 editform = 'tag.add'
7048 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7052 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7049
7053
7050 # don't allow tagging the null rev
7054 # don't allow tagging the null rev
7051 if (not opts.get('remove') and
7055 if (not opts.get('remove') and
7052 scmutil.revsingle(repo, rev_).rev() == nullrev):
7056 scmutil.revsingle(repo, rev_).rev() == nullrev):
7053 raise error.Abort(_("cannot tag null revision"))
7057 raise error.Abort(_("cannot tag null revision"))
7054
7058
7055 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7059 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7056 editor=editor)
7060 editor=editor)
7057 finally:
7061 finally:
7058 release(lock, wlock)
7062 release(lock, wlock)
7059
7063
7060 @command('tags', formatteropts, '')
7064 @command('tags', formatteropts, '')
7061 def tags(ui, repo, **opts):
7065 def tags(ui, repo, **opts):
7062 """list repository tags
7066 """list repository tags
7063
7067
7064 This lists both regular and local tags. When the -v/--verbose
7068 This lists both regular and local tags. When the -v/--verbose
7065 switch is used, a third column "local" is printed for local tags.
7069 switch is used, a third column "local" is printed for local tags.
7066 When the -q/--quiet switch is used, only the tag name is printed.
7070 When the -q/--quiet switch is used, only the tag name is printed.
7067
7071
7068 Returns 0 on success.
7072 Returns 0 on success.
7069 """
7073 """
7070
7074
7071 fm = ui.formatter('tags', opts)
7075 fm = ui.formatter('tags', opts)
7072 hexfunc = fm.hexfunc
7076 hexfunc = fm.hexfunc
7073 tagtype = ""
7077 tagtype = ""
7074
7078
7075 for t, n in reversed(repo.tagslist()):
7079 for t, n in reversed(repo.tagslist()):
7076 hn = hexfunc(n)
7080 hn = hexfunc(n)
7077 label = 'tags.normal'
7081 label = 'tags.normal'
7078 tagtype = ''
7082 tagtype = ''
7079 if repo.tagtype(t) == 'local':
7083 if repo.tagtype(t) == 'local':
7080 label = 'tags.local'
7084 label = 'tags.local'
7081 tagtype = 'local'
7085 tagtype = 'local'
7082
7086
7083 fm.startitem()
7087 fm.startitem()
7084 fm.write('tag', '%s', t, label=label)
7088 fm.write('tag', '%s', t, label=label)
7085 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7089 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7086 fm.condwrite(not ui.quiet, 'rev node', fmt,
7090 fm.condwrite(not ui.quiet, 'rev node', fmt,
7087 repo.changelog.rev(n), hn, label=label)
7091 repo.changelog.rev(n), hn, label=label)
7088 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7092 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7089 tagtype, label=label)
7093 tagtype, label=label)
7090 fm.plain('\n')
7094 fm.plain('\n')
7091 fm.end()
7095 fm.end()
7092
7096
7093 @command('tip',
7097 @command('tip',
7094 [('p', 'patch', None, _('show patch')),
7098 [('p', 'patch', None, _('show patch')),
7095 ('g', 'git', None, _('use git extended diff format')),
7099 ('g', 'git', None, _('use git extended diff format')),
7096 ] + templateopts,
7100 ] + templateopts,
7097 _('[-p] [-g]'))
7101 _('[-p] [-g]'))
7098 def tip(ui, repo, **opts):
7102 def tip(ui, repo, **opts):
7099 """show the tip revision (DEPRECATED)
7103 """show the tip revision (DEPRECATED)
7100
7104
7101 The tip revision (usually just called the tip) is the changeset
7105 The tip revision (usually just called the tip) is the changeset
7102 most recently added to the repository (and therefore the most
7106 most recently added to the repository (and therefore the most
7103 recently changed head).
7107 recently changed head).
7104
7108
7105 If you have just made a commit, that commit will be the tip. If
7109 If you have just made a commit, that commit will be the tip. If
7106 you have just pulled changes from another repository, the tip of
7110 you have just pulled changes from another repository, the tip of
7107 that repository becomes the current tip. The "tip" tag is special
7111 that repository becomes the current tip. The "tip" tag is special
7108 and cannot be renamed or assigned to a different changeset.
7112 and cannot be renamed or assigned to a different changeset.
7109
7113
7110 This command is deprecated, please use :hg:`heads` instead.
7114 This command is deprecated, please use :hg:`heads` instead.
7111
7115
7112 Returns 0 on success.
7116 Returns 0 on success.
7113 """
7117 """
7114 displayer = cmdutil.show_changeset(ui, repo, opts)
7118 displayer = cmdutil.show_changeset(ui, repo, opts)
7115 displayer.show(repo['tip'])
7119 displayer.show(repo['tip'])
7116 displayer.close()
7120 displayer.close()
7117
7121
7118 @command('unbundle',
7122 @command('unbundle',
7119 [('u', 'update', None,
7123 [('u', 'update', None,
7120 _('update to new branch head if changesets were unbundled'))],
7124 _('update to new branch head if changesets were unbundled'))],
7121 _('[-u] FILE...'))
7125 _('[-u] FILE...'))
7122 def unbundle(ui, repo, fname1, *fnames, **opts):
7126 def unbundle(ui, repo, fname1, *fnames, **opts):
7123 """apply one or more changegroup files
7127 """apply one or more changegroup files
7124
7128
7125 Apply one or more compressed changegroup files generated by the
7129 Apply one or more compressed changegroup files generated by the
7126 bundle command.
7130 bundle command.
7127
7131
7128 Returns 0 on success, 1 if an update has unresolved files.
7132 Returns 0 on success, 1 if an update has unresolved files.
7129 """
7133 """
7130 fnames = (fname1,) + fnames
7134 fnames = (fname1,) + fnames
7131
7135
7132 with repo.lock():
7136 with repo.lock():
7133 for fname in fnames:
7137 for fname in fnames:
7134 f = hg.openpath(ui, fname)
7138 f = hg.openpath(ui, fname)
7135 gen = exchange.readbundle(ui, f, fname)
7139 gen = exchange.readbundle(ui, f, fname)
7136 if isinstance(gen, bundle2.unbundle20):
7140 if isinstance(gen, bundle2.unbundle20):
7137 tr = repo.transaction('unbundle')
7141 tr = repo.transaction('unbundle')
7138 try:
7142 try:
7139 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7143 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7140 url='bundle:' + fname)
7144 url='bundle:' + fname)
7141 tr.close()
7145 tr.close()
7142 except error.BundleUnknownFeatureError as exc:
7146 except error.BundleUnknownFeatureError as exc:
7143 raise error.Abort(_('%s: unknown bundle feature, %s')
7147 raise error.Abort(_('%s: unknown bundle feature, %s')
7144 % (fname, exc),
7148 % (fname, exc),
7145 hint=_("see https://mercurial-scm.org/"
7149 hint=_("see https://mercurial-scm.org/"
7146 "wiki/BundleFeature for more "
7150 "wiki/BundleFeature for more "
7147 "information"))
7151 "information"))
7148 finally:
7152 finally:
7149 if tr:
7153 if tr:
7150 tr.release()
7154 tr.release()
7151 changes = [r.get('return', 0)
7155 changes = [r.get('return', 0)
7152 for r in op.records['changegroup']]
7156 for r in op.records['changegroup']]
7153 modheads = changegroup.combineresults(changes)
7157 modheads = changegroup.combineresults(changes)
7154 elif isinstance(gen, streamclone.streamcloneapplier):
7158 elif isinstance(gen, streamclone.streamcloneapplier):
7155 raise error.Abort(
7159 raise error.Abort(
7156 _('packed bundles cannot be applied with '
7160 _('packed bundles cannot be applied with '
7157 '"hg unbundle"'),
7161 '"hg unbundle"'),
7158 hint=_('use "hg debugapplystreamclonebundle"'))
7162 hint=_('use "hg debugapplystreamclonebundle"'))
7159 else:
7163 else:
7160 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7164 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7161
7165
7162 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7166 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7163
7167
7164 @command('^update|up|checkout|co',
7168 @command('^update|up|checkout|co',
7165 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7169 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7166 ('c', 'check', None, _('require clean working directory')),
7170 ('c', 'check', None, _('require clean working directory')),
7167 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7171 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7168 ('r', 'rev', '', _('revision'), _('REV'))
7172 ('r', 'rev', '', _('revision'), _('REV'))
7169 ] + mergetoolopts,
7173 ] + mergetoolopts,
7170 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7174 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7171 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7175 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7172 tool=None):
7176 tool=None):
7173 """update working directory (or switch revisions)
7177 """update working directory (or switch revisions)
7174
7178
7175 Update the repository's working directory to the specified
7179 Update the repository's working directory to the specified
7176 changeset. If no changeset is specified, update to the tip of the
7180 changeset. If no changeset is specified, update to the tip of the
7177 current named branch and move the active bookmark (see :hg:`help
7181 current named branch and move the active bookmark (see :hg:`help
7178 bookmarks`).
7182 bookmarks`).
7179
7183
7180 Update sets the working directory's parent revision to the specified
7184 Update sets the working directory's parent revision to the specified
7181 changeset (see :hg:`help parents`).
7185 changeset (see :hg:`help parents`).
7182
7186
7183 If the changeset is not a descendant or ancestor of the working
7187 If the changeset is not a descendant or ancestor of the working
7184 directory's parent, the update is aborted. With the -c/--check
7188 directory's parent, the update is aborted. With the -c/--check
7185 option, the working directory is checked for uncommitted changes; if
7189 option, the working directory is checked for uncommitted changes; if
7186 none are found, the working directory is updated to the specified
7190 none are found, the working directory is updated to the specified
7187 changeset.
7191 changeset.
7188
7192
7189 .. container:: verbose
7193 .. container:: verbose
7190
7194
7191 The following rules apply when the working directory contains
7195 The following rules apply when the working directory contains
7192 uncommitted changes:
7196 uncommitted changes:
7193
7197
7194 1. If neither -c/--check nor -C/--clean is specified, and if
7198 1. If neither -c/--check nor -C/--clean is specified, and if
7195 the requested changeset is an ancestor or descendant of
7199 the requested changeset is an ancestor or descendant of
7196 the working directory's parent, the uncommitted changes
7200 the working directory's parent, the uncommitted changes
7197 are merged into the requested changeset and the merged
7201 are merged into the requested changeset and the merged
7198 result is left uncommitted. If the requested changeset is
7202 result is left uncommitted. If the requested changeset is
7199 not an ancestor or descendant (that is, it is on another
7203 not an ancestor or descendant (that is, it is on another
7200 branch), the update is aborted and the uncommitted changes
7204 branch), the update is aborted and the uncommitted changes
7201 are preserved.
7205 are preserved.
7202
7206
7203 2. With the -c/--check option, the update is aborted and the
7207 2. With the -c/--check option, the update is aborted and the
7204 uncommitted changes are preserved.
7208 uncommitted changes are preserved.
7205
7209
7206 3. With the -C/--clean option, uncommitted changes are discarded and
7210 3. With the -C/--clean option, uncommitted changes are discarded and
7207 the working directory is updated to the requested changeset.
7211 the working directory is updated to the requested changeset.
7208
7212
7209 To cancel an uncommitted merge (and lose your changes), use
7213 To cancel an uncommitted merge (and lose your changes), use
7210 :hg:`update --clean .`.
7214 :hg:`update --clean .`.
7211
7215
7212 Use null as the changeset to remove the working directory (like
7216 Use null as the changeset to remove the working directory (like
7213 :hg:`clone -U`).
7217 :hg:`clone -U`).
7214
7218
7215 If you want to revert just one file to an older revision, use
7219 If you want to revert just one file to an older revision, use
7216 :hg:`revert [-r REV] NAME`.
7220 :hg:`revert [-r REV] NAME`.
7217
7221
7218 See :hg:`help dates` for a list of formats valid for -d/--date.
7222 See :hg:`help dates` for a list of formats valid for -d/--date.
7219
7223
7220 Returns 0 on success, 1 if there are unresolved files.
7224 Returns 0 on success, 1 if there are unresolved files.
7221 """
7225 """
7222 if rev and node:
7226 if rev and node:
7223 raise error.Abort(_("please specify just one revision"))
7227 raise error.Abort(_("please specify just one revision"))
7224
7228
7225 if rev is None or rev == '':
7229 if rev is None or rev == '':
7226 rev = node
7230 rev = node
7227
7231
7228 if date and rev is not None:
7232 if date and rev is not None:
7229 raise error.Abort(_("you can't specify a revision and a date"))
7233 raise error.Abort(_("you can't specify a revision and a date"))
7230
7234
7231 if check and clean:
7235 if check and clean:
7232 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7236 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7233
7237
7234 with repo.wlock():
7238 with repo.wlock():
7235 cmdutil.clearunfinished(repo)
7239 cmdutil.clearunfinished(repo)
7236
7240
7237 if date:
7241 if date:
7238 rev = cmdutil.finddate(ui, repo, date)
7242 rev = cmdutil.finddate(ui, repo, date)
7239
7243
7240 # if we defined a bookmark, we have to remember the original name
7244 # if we defined a bookmark, we have to remember the original name
7241 brev = rev
7245 brev = rev
7242 rev = scmutil.revsingle(repo, rev, rev).rev()
7246 rev = scmutil.revsingle(repo, rev, rev).rev()
7243
7247
7244 if check:
7248 if check:
7245 cmdutil.bailifchanged(repo, merge=False)
7249 cmdutil.bailifchanged(repo, merge=False)
7246
7250
7247 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7251 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7248
7252
7249 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7253 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7250
7254
7251 @command('verify', [])
7255 @command('verify', [])
7252 def verify(ui, repo):
7256 def verify(ui, repo):
7253 """verify the integrity of the repository
7257 """verify the integrity of the repository
7254
7258
7255 Verify the integrity of the current repository.
7259 Verify the integrity of the current repository.
7256
7260
7257 This will perform an extensive check of the repository's
7261 This will perform an extensive check of the repository's
7258 integrity, validating the hashes and checksums of each entry in
7262 integrity, validating the hashes and checksums of each entry in
7259 the changelog, manifest, and tracked files, as well as the
7263 the changelog, manifest, and tracked files, as well as the
7260 integrity of their crosslinks and indices.
7264 integrity of their crosslinks and indices.
7261
7265
7262 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7266 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7263 for more information about recovery from corruption of the
7267 for more information about recovery from corruption of the
7264 repository.
7268 repository.
7265
7269
7266 Returns 0 on success, 1 if errors are encountered.
7270 Returns 0 on success, 1 if errors are encountered.
7267 """
7271 """
7268 return hg.verify(repo)
7272 return hg.verify(repo)
7269
7273
7270 @command('version', [] + formatteropts, norepo=True)
7274 @command('version', [] + formatteropts, norepo=True)
7271 def version_(ui, **opts):
7275 def version_(ui, **opts):
7272 """output version and copyright information"""
7276 """output version and copyright information"""
7273 fm = ui.formatter("version", opts)
7277 fm = ui.formatter("version", opts)
7274 fm.startitem()
7278 fm.startitem()
7275 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7279 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7276 util.version())
7280 util.version())
7277 license = _(
7281 license = _(
7278 "(see https://mercurial-scm.org for more information)\n"
7282 "(see https://mercurial-scm.org for more information)\n"
7279 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7283 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7280 "This is free software; see the source for copying conditions. "
7284 "This is free software; see the source for copying conditions. "
7281 "There is NO\nwarranty; "
7285 "There is NO\nwarranty; "
7282 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7286 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7283 )
7287 )
7284 if not ui.quiet:
7288 if not ui.quiet:
7285 fm.plain(license)
7289 fm.plain(license)
7286
7290
7287 if ui.verbose:
7291 if ui.verbose:
7288 fm.plain(_("\nEnabled extensions:\n\n"))
7292 fm.plain(_("\nEnabled extensions:\n\n"))
7289 # format names and versions into columns
7293 # format names and versions into columns
7290 names = []
7294 names = []
7291 vers = []
7295 vers = []
7292 isinternals = []
7296 isinternals = []
7293 for name, module in extensions.extensions():
7297 for name, module in extensions.extensions():
7294 names.append(name)
7298 names.append(name)
7295 vers.append(extensions.moduleversion(module) or None)
7299 vers.append(extensions.moduleversion(module) or None)
7296 isinternals.append(extensions.ismoduleinternal(module))
7300 isinternals.append(extensions.ismoduleinternal(module))
7297 fn = fm.nested("extensions")
7301 fn = fm.nested("extensions")
7298 if names:
7302 if names:
7299 namefmt = " %%-%ds " % max(len(n) for n in names)
7303 namefmt = " %%-%ds " % max(len(n) for n in names)
7300 places = [_("external"), _("internal")]
7304 places = [_("external"), _("internal")]
7301 for n, v, p in zip(names, vers, isinternals):
7305 for n, v, p in zip(names, vers, isinternals):
7302 fn.startitem()
7306 fn.startitem()
7303 fn.condwrite(ui.verbose, "name", namefmt, n)
7307 fn.condwrite(ui.verbose, "name", namefmt, n)
7304 if ui.verbose:
7308 if ui.verbose:
7305 fn.plain("%s " % places[p])
7309 fn.plain("%s " % places[p])
7306 fn.data(bundled=p)
7310 fn.data(bundled=p)
7307 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7311 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7308 if ui.verbose:
7312 if ui.verbose:
7309 fn.plain("\n")
7313 fn.plain("\n")
7310 fn.end()
7314 fn.end()
7311 fm.end()
7315 fm.end()
7312
7316
7313 def loadcmdtable(ui, name, cmdtable):
7317 def loadcmdtable(ui, name, cmdtable):
7314 """Load command functions from specified cmdtable
7318 """Load command functions from specified cmdtable
7315 """
7319 """
7316 overrides = [cmd for cmd in cmdtable if cmd in table]
7320 overrides = [cmd for cmd in cmdtable if cmd in table]
7317 if overrides:
7321 if overrides:
7318 ui.warn(_("extension '%s' overrides commands: %s\n")
7322 ui.warn(_("extension '%s' overrides commands: %s\n")
7319 % (name, " ".join(overrides)))
7323 % (name, " ".join(overrides)))
7320 table.update(cmdtable)
7324 table.update(cmdtable)
@@ -1,104 +1,118 b''
1 $ hg debugextensions
1 $ hg debugextensions
2
2
3 $ debugpath=`pwd`/extwithoutinfos.py
3 $ debugpath=`pwd`/extwithoutinfos.py
4
4
5 $ cat > extwithoutinfos.py <<EOF
5 $ cat > extwithoutinfos.py <<EOF
6 > EOF
6 > EOF
7 $ cat > extwithinfos.py <<EOF
7 $ cat > extwithinfos.py <<EOF
8 > testedwith = '3.0 3.1 3.2.1'
8 > testedwith = '3.0 3.1 3.2.1'
9 > buglink = 'https://example.org/bts'
9 > buglink = 'https://example.org/bts'
10 > EOF
10 > EOF
11
11
12 $ cat >> $HGRCPATH <<EOF
12 $ cat >> $HGRCPATH <<EOF
13 > [extensions]
13 > [extensions]
14 > color=
14 > color=
15 > histedit=
15 > histedit=
16 > patchbomb=
16 > patchbomb=
17 > rebase=
17 > rebase=
18 > mq=
18 > mq=
19 > ext1 = $debugpath
19 > ext1 = $debugpath
20 > ext2 = `pwd`/extwithinfos.py
20 > ext2 = `pwd`/extwithinfos.py
21 > EOF
21 > EOF
22
22
23 $ hg debugextensions
23 $ hg debugextensions
24 color
24 color
25 ext1 (untested!)
25 ext1 (untested!)
26 ext2 (3.2.1!)
26 ext2 (3.2.1!)
27 histedit
27 histedit
28 mq
28 mq
29 patchbomb
29 patchbomb
30 rebase
30 rebase
31
31
32 $ hg debugextensions -v
32 $ hg debugextensions -v
33 color
33 color
34 location: */hgext/color.py* (glob)
34 location: */hgext/color.py* (glob)
35 bundled: yes
35 tested with: internal
36 tested with: internal
36 ext1
37 ext1
37 location: */extwithoutinfos.py* (glob)
38 location: */extwithoutinfos.py* (glob)
39 bundled: no
38 ext2
40 ext2
39 location: */extwithinfos.py* (glob)
41 location: */extwithinfos.py* (glob)
42 bundled: no
40 tested with: 3.0 3.1 3.2.1
43 tested with: 3.0 3.1 3.2.1
41 bug reporting: https://example.org/bts
44 bug reporting: https://example.org/bts
42 histedit
45 histedit
43 location: */hgext/histedit.py* (glob)
46 location: */hgext/histedit.py* (glob)
47 bundled: yes
44 tested with: internal
48 tested with: internal
45 mq
49 mq
46 location: */hgext/mq.py* (glob)
50 location: */hgext/mq.py* (glob)
51 bundled: yes
47 tested with: internal
52 tested with: internal
48 patchbomb
53 patchbomb
49 location: */hgext/patchbomb.py* (glob)
54 location: */hgext/patchbomb.py* (glob)
55 bundled: yes
50 tested with: internal
56 tested with: internal
51 rebase
57 rebase
52 location: */hgext/rebase.py* (glob)
58 location: */hgext/rebase.py* (glob)
59 bundled: yes
53 tested with: internal
60 tested with: internal
54
61
55 $ hg debugextensions -Tjson | sed 's|\\\\|/|g'
62 $ hg debugextensions -Tjson | sed 's|\\\\|/|g'
56 [
63 [
57 {
64 {
58 "buglink": "",
65 "buglink": "",
66 "bundled": true,
59 "name": "color",
67 "name": "color",
60 "source": "*/hgext/color.py*", (glob)
68 "source": "*/hgext/color.py*", (glob)
61 "testedwith": ["internal"]
69 "testedwith": ["internal"]
62 },
70 },
63 {
71 {
64 "buglink": "",
72 "buglink": "",
73 "bundled": false,
65 "name": "ext1",
74 "name": "ext1",
66 "source": "*/extwithoutinfos.py*", (glob)
75 "source": "*/extwithoutinfos.py*", (glob)
67 "testedwith": []
76 "testedwith": []
68 },
77 },
69 {
78 {
70 "buglink": "https://example.org/bts",
79 "buglink": "https://example.org/bts",
80 "bundled": false,
71 "name": "ext2",
81 "name": "ext2",
72 "source": "*/extwithinfos.py*", (glob)
82 "source": "*/extwithinfos.py*", (glob)
73 "testedwith": ["3.0", "3.1", "3.2.1"]
83 "testedwith": ["3.0", "3.1", "3.2.1"]
74 },
84 },
75 {
85 {
76 "buglink": "",
86 "buglink": "",
87 "bundled": true,
77 "name": "histedit",
88 "name": "histedit",
78 "source": "*/hgext/histedit.py*", (glob)
89 "source": "*/hgext/histedit.py*", (glob)
79 "testedwith": ["internal"]
90 "testedwith": ["internal"]
80 },
91 },
81 {
92 {
82 "buglink": "",
93 "buglink": "",
94 "bundled": true,
83 "name": "mq",
95 "name": "mq",
84 "source": "*/hgext/mq.py*", (glob)
96 "source": "*/hgext/mq.py*", (glob)
85 "testedwith": ["internal"]
97 "testedwith": ["internal"]
86 },
98 },
87 {
99 {
88 "buglink": "",
100 "buglink": "",
101 "bundled": true,
89 "name": "patchbomb",
102 "name": "patchbomb",
90 "source": "*/hgext/patchbomb.py*", (glob)
103 "source": "*/hgext/patchbomb.py*", (glob)
91 "testedwith": ["internal"]
104 "testedwith": ["internal"]
92 },
105 },
93 {
106 {
94 "buglink": "",
107 "buglink": "",
108 "bundled": true,
95 "name": "rebase",
109 "name": "rebase",
96 "source": "*/hgext/rebase.py*", (glob)
110 "source": "*/hgext/rebase.py*", (glob)
97 "testedwith": ["internal"]
111 "testedwith": ["internal"]
98 }
112 }
99 ]
113 ]
100
114
101 $ hg debugextensions -T '{ifcontains("3.1", testedwith, "{name}\n")}'
115 $ hg debugextensions -T '{ifcontains("3.1", testedwith, "{name}\n")}'
102 ext2
116 ext2
103 $ hg debugextensions \
117 $ hg debugextensions \
104 > -T '{ifcontains("3.2", testedwith, "no substring match: {name}\n")}'
118 > -T '{ifcontains("3.2", testedwith, "no substring match: {name}\n")}'
General Comments 0
You need to be logged in to leave comments. Login now